From a4f6f92cb651259938d8258f5dd20116bf659c9a Mon Sep 17 00:00:00 2001 From: pacien Date: Fri, 19 Feb 2021 14:23:52 +0100 Subject: [PATCH 01/16] perlPackages.Glib: re-enable tests The tests for this package have been fixed since 1.3291. --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c4fb9b2aabd..3ac7695f441 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8727,7 +8727,6 @@ let sha256 = "005m3inz12xcsd5sr056cm1kbhmxsx2ly88ifbdv6p6cwz0s05kk"; }; buildInputs = [ pkgs.glib ]; - doCheck = false; # tests failing with glib 2.60 https://rt.cpan.org/Public/Bug/Display.html?id=128165 meta = { homepage = "http://gtk2-perl.sourceforge.net/"; description = "Perl wrappers for the GLib utility and Object libraries"; From 6f2890041ee795c807c68905c603f78007a701bf Mon Sep 17 00:00:00 2001 From: pacien Date: Fri, 19 Feb 2021 18:16:19 +0100 Subject: [PATCH 02/16] perlPackages.GlibObjectIntrospection: fix test and unmark as broken The patched GIR path was referring to the not-yet built package. Note that the package was working fine and that only the tests were failing due to some GIR path issues. It shouldn't have been marked as broken in the first place. GitHub: follows #68115 GitHub: closes #68116 --- pkgs/top-level/perl-packages.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3ac7695f441..66e869dd873 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8742,13 +8742,20 @@ let url = "mirror://cpan/authors/id/X/XA/XAOC/Glib-Object-Introspection-0.049.tar.gz"; sha256 = "0mxg6pz8qfyipw0ypr54alij0c4adzg94f62702b2a6hkp5jhij6"; }; - checkInputs = [ pkgs.cairo ]; + checkInputs = [ pkgs.cairo CairoGObject ]; propagatedBuildInputs = [ pkgs.gobject-introspection Glib ]; + preCheck = '' + # Our gobject-introspection patches make the shared library paths absolute + # in the GIR files. When running tests, the library is not yet installed, + # though, so we need to replace the absolute path with a local one during build. + # We are using a symlink that we will delete after the execution of the tests. + mkdir -p $out/lib + ln -s $PWD/build/*.so $out/lib/ + ''; + postCheck = '' + rm -r $out/lib + ''; meta = { - broken = true; # TODO: tests failing because "failed to load libregress.so" - # see https://github.com/NixOS/nixpkgs/pull/68115 - # and https://github.com/NixOS/nixpkgs/issues/68116 - # adding pkgs.gnome3.gjs does not fix it description = "Dynamically create Perl language bindings"; license = lib.licenses.lgpl2Plus; }; From c210176f786a26d3d2ad361e2e9b55a0040410cc Mon Sep 17 00:00:00 2001 From: pacien Date: Fri, 19 Feb 2021 19:13:27 +0100 Subject: [PATCH 03/16] perlPackages.PDFBuilder: init at 3.021 --- pkgs/top-level/perl-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 66e869dd873..21f72623b75 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16379,6 +16379,21 @@ let }; }; + PDFBuilder = buildPerlPackage { + pname = "PDF-Builder"; + version = "3.021"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PM/PMPERRY/PDF-Builder-3.021.tar.gz"; + sha256 = "1hc22s5gdspr5nyfmix3cwdzcw7z66pcqxy422ksmbninbzv4z93"; + }; + checkInputs = [ TestException TestMemoryCycle ]; + propagatedBuildInputs = [ FontTTF ]; + meta = { + description = "Facilitates the creation and modification of PDF files"; + license = lib.licenses.lgpl21Plus; + }; + }; + PDL = buildPerlPackage rec { pname = "PDL"; version = "2.025"; From 151ee1e4996058b88a6f3637120ed5522db5878d Mon Sep 17 00:00:00 2001 From: pacien Date: Fri, 19 Feb 2021 20:01:23 +0100 Subject: [PATCH 04/16] perlPackages.ImagePNGLibpng: init at 0.56 --- pkgs/top-level/perl-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 21f72623b75..18bcc0f00f7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10014,6 +10014,20 @@ let }; }; + ImagePNGLibpng = buildPerlPackage { + pname = "Image-PNG-Libpng"; + version = "0.56"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BK/BKB/Image-PNG-Libpng-0.56.tar.gz"; + sha256 = "1nf7qcql7b2w98i859f76q1vb4b2zd0k0ypjbsw7ngs2zzmvzyzs"; + }; + buildInputs = [ pkgs.libpng ]; + meta = { + description = "Perl interface to the C library \"libpng\""; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + Imager = buildPerlPackage { pname = "Imager"; version = "1.012"; From 3e85cb06cea002ef57ecd667f6f8e0521bb5ce37 Mon Sep 17 00:00:00 2001 From: pacien Date: Fri, 19 Feb 2021 22:59:45 +0100 Subject: [PATCH 05/16] perlPackages.GraphicsTIFF: init at 9 --- pkgs/top-level/perl-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 18bcc0f00f7..e767d1be43d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8916,6 +8916,22 @@ let propagatedBuildInputs = [ HeapFibonacci ]; }; + GraphicsTIFF = buildPerlPackage { + pname = "Graphics-TIFF"; + version = "9"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RA/RATCLIFFE/Graphics-TIFF-9.tar.gz"; + sha256 = "1n1r9r7f6hp2s6l361pyvb1i1pm9xqy0w9n3z5ygm7j64160kz9a"; + }; + buildInputs = [ pkgs.libtiff ExtUtilsDepends ExtUtilsPkgConfig ]; + propagatedBuildInputs = [ Readonly ]; + checkInputs = [ TestRequires TestDeep pkgs.hexdump ]; + meta = { + description = "Perl extension for the libtiff library"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + GraphViz = buildPerlPackage { pname = "GraphViz"; version = "2.24"; From 1794dab89942a7d5c76d9d50ef6f6d4a0df3ebea Mon Sep 17 00:00:00 2001 From: pacien Date: Fri, 19 Feb 2021 23:59:29 +0100 Subject: [PATCH 06/16] perlPackages.Gtk3ImageView: init at 6 --- pkgs/top-level/perl-packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e767d1be43d..5dd97953474 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9105,6 +9105,26 @@ let }; }; + Gtk3ImageView = buildPerlPackage { + pname = "Gtk3-ImageView"; + version = "6"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RA/RATCLIFFE/Gtk3-ImageView-6.tar.gz"; + sha256 = "0krkif9i3hrgjdskw05pcks40fmb43d21lxf4h8aclv0g8z647f0"; + }; + buildInputs = [ pkgs.gtk3 ]; + propagatedBuildInputs = [ Readonly Gtk3 ]; + checkInputs = [ TestDifferences PerlMagick TryTiny TestMockObject CarpAlways pkgs.librsvg ]; + checkPhase = '' + ${pkgs.xvfb_run}/bin/xvfb-run -s '-screen 0 800x600x24' \ + make test + ''; + meta = { + description = "Image viewer widget for Gtk3"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + Gtk3SimpleList = buildPerlPackage { pname = "Gtk3-SimpleList"; version = "0.21"; From f87bcfb69f14ca041d7e0a4d6c19a6c05600e19a Mon Sep 17 00:00:00 2001 From: pacien Date: Sat, 20 Feb 2021 00:01:33 +0100 Subject: [PATCH 07/16] gscan2pdf: 2.9.1 -> 2.11.1 New dependencies have been added and a dubiously failing test has been disabled. Manually tested and confirmed to work: * opening the application, * scanning a document, * saving as PDF. --- .../graphics/gscan2pdf/default.nix | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix index 0e65d3199ab..616a0b71356 100644 --- a/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/pkgs/applications/graphics/gscan2pdf/default.nix @@ -10,11 +10,11 @@ with lib; perlPackages.buildPerlPackage rec { pname = "gscan2pdf"; - version = "2.9.1"; + version = "2.11.1"; src = fetchurl { url = "mirror://sourceforge/gscan2pdf/${version}/${pname}-${version}.tar.xz"; - sha256 = "1ls6n1a8vjgwkb40drpc3rapjligaf9fp218539fnwvhv26div69"; + sha256 = "0aigngfi5dbjihn43c6sg865i1ybfzj0w81zclzy8r9nqiqq0wma"; }; nativeBuildInputs = [ wrapGAppsHook ]; @@ -23,15 +23,19 @@ perlPackages.buildPerlPackage rec { [ librsvg sane-backends sane-frontends ] ++ (with perlPackages; [ Gtk3 + Gtk3ImageView Gtk3SimpleList Cairo CairoGObject Glib GlibObjectIntrospection GooCanvas2 + GraphicsTIFF + IPCSystemSimple LocaleCodes LocaleGettext - PDFAPI2 + PDFBuilder + ImagePNGLibpng ImageSane SetIntSpan PerlMagick @@ -93,9 +97,21 @@ perlPackages.buildPerlPackage rec { xvfb_run file tesseract # tests are expecting tesseract 3.x precisely - ]; + ] ++ (with perlPackages; [ + TestPod + ]); checkPhase = '' + # Temporarily disable a dubiously failing test: + # t/169_import_scan.t ........................... 1/1 + # # Failed test 'variable-height scan imported with expected size' + # # at t/169_import_scan.t line 50. + # # got: '179' + # # expected: '296' + # # Looks like you failed 1 test of 1. + # t/169_import_scan.t ........................... Dubious, test returned 1 (wstat 256, 0x100) + rm t/169_import_scan.t + xvfb-run -s '-screen 0 800x600x24' \ make test ''; From eb53531b6f8d13dc0d9a178db23b322bb4eb0c58 Mon Sep 17 00:00:00 2001 From: Graham Bennett Date: Sat, 20 Feb 2021 00:02:53 +0000 Subject: [PATCH 08/16] teslajsonpy: fix tests teslajsonpy has some dependencies between tests, which were masked upstream but caused failures in nixpkgs because all the asyncio tests were skipped. Tests pass as they do upstream with pytest-asyncio added. Test isolation issue is being dealt with here: https://github.com/zabuldon/teslajsonpy/issues/121. --- .../python-modules/teslajsonpy/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index 46c8a2853b5..59af2b33d2b 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -5,6 +5,7 @@ , buildPythonPackage , fetchFromGitHub , fetchpatch +, pytest-asyncio , pytestCheckHook , wrapt }: @@ -35,15 +36,11 @@ buildPythonPackage rec { wrapt ]; - checkInputs = [ pytestCheckHook ]; - - # Not all Home Assistant related check pass - # https://github.com/zabuldon/teslajsonpy/issues/121 - # https://github.com/zabuldon/teslajsonpy/pull/124 - disabledTests = [ - "test_values_on_init" - "test_get_value_on_init" + checkInputs = [ + pytest-asyncio + pytestCheckHook ]; + pythonImportsCheck = [ "teslajsonpy" ]; meta = with lib; { From 9d9a8a0ce1dbd97f384c2e77a9466c31de41c6d6 Mon Sep 17 00:00:00 2001 From: Ente Date: Sat, 20 Feb 2021 01:05:28 +0100 Subject: [PATCH 09/16] deltachat-electron: 1.3.0 -> 1.4.1 * Also apply nixpkgs-fmt --- .../instant-messengers/deltachat-electron/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix index e58e73fdc85..a18a5198d05 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix @@ -1,19 +1,19 @@ { lib, fetchurl, appimageTools }: - let pname = "deltachat-electron"; - version = "1.3.0"; + version = "1.14.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://download.delta.chat/desktop/v${version}/DeltaChat-${version}.AppImage"; - sha256 = "1xyp8cg11px8rras12sncjmq85alyvz7ycw1v1py8w8rlz60wkij"; + sha256 = "0w00qr8wwrxwa2g71biyz42k8y5y766m6k876bnzq927vcjilq6b"; }; appimageContents = appimageTools.extract { inherit name src; }; -in appimageTools.wrapType2 { +in +appimageTools.wrapType2 { inherit name src; extraInstallCommands = '' From df790a9626787df163dfc378cb49d8fb3f552226 Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Sat, 20 Feb 2021 10:32:52 +0000 Subject: [PATCH 10/16] netdata: remove unused imports, fix suggestions --- pkgs/tools/system/netdata/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 6fd15d3d20d..09050868826 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, callPackage, fetchFromGitHub, autoreconfHook, pkg-config , CoreFoundation, IOKit, libossp_uuid -, curl, libcap, libuuid, lm_sensors, zlib, fetchpatch +, curl, libcap, libuuid, lm_sensors, zlib , nixosTests , withCups ? false, cups , withDBengine ? true, libuv, lz4, judy @@ -36,6 +36,8 @@ in stdenv.mkDerivation rec { ++ optionals withSsl [ openssl.dev ]; patches = [ + # required to prevent plugins from relying on /etc + # and /var ./no-files-in-etc-and-var.patch ]; @@ -77,7 +79,7 @@ in stdenv.mkDerivation rec { meta = { description = "Real-time performance monitoring tool"; homepage = "https://www.netdata.cloud/"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = [ maintainers.lethalman ]; }; From 39f824d1d627682df2ba5552124f3d51e98036a3 Mon Sep 17 00:00:00 2001 From: Antonio Yang Date: Sat, 20 Feb 2021 10:40:43 +0800 Subject: [PATCH 11/16] krapslog: init at 0.1.2 --- pkgs/tools/misc/krapslog/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/misc/krapslog/default.nix diff --git a/pkgs/tools/misc/krapslog/default.nix b/pkgs/tools/misc/krapslog/default.nix new file mode 100644 index 00000000000..4574d6c3534 --- /dev/null +++ b/pkgs/tools/misc/krapslog/default.nix @@ -0,0 +1,22 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "krapslog"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "acj"; + repo = "krapslog-rs"; + rev = version; + sha256 = "1yllvy3z3115aqxhnjn9rq2z67rgf2w53naygnl6ixpjhpafcr3k"; + }; + + cargoSha256 = "05gvl6yiyibcdscdf9a6k28xizdr5kfqbhynfbjny2hpqqjmnxzl"; + + meta = with lib; { + description = "Visualize a log file with sparklines"; + homepage = "https://github.com/acj/krapslog-rs"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ yanganto ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ddecc16470..cb2deb7e91a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2540,6 +2540,8 @@ in klog = qt5.callPackage ../applications/radio/klog { }; + krapslog = callPackage ../tools/misc/krapslog { }; + lcdproc = callPackage ../servers/monitoring/lcdproc { }; languagetool = callPackage ../tools/text/languagetool { }; From b0d4b68b44b6730ef3e2bcc3d4575b66e2e38d95 Mon Sep 17 00:00:00 2001 From: Owen Shepherd Date: Sat, 20 Feb 2021 14:36:36 +0000 Subject: [PATCH 12/16] maintainers: add _414owen --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 747ce847541..b957f14cd6d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -82,6 +82,12 @@ githubId = 882455; name = "Elliot Cameron"; }; + _414owen = { + email = "owen@owen.cafe"; + github = "414owen"; + githubId = 1714287; + name = "Owen Shepherd"; + }; _6AA4FD = { email = "f6442954@gmail.com"; github = "6AA4FD"; From ed08ba414e2a324ae24b33fc379a6f4c10c412f7 Mon Sep 17 00:00:00 2001 From: Owen Shepherd Date: Sat, 20 Feb 2021 03:16:46 +0000 Subject: [PATCH 13/16] cen64: init at unstable-2020-02-20 --- pkgs/misc/emulators/cen64/default.nix | 29 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/misc/emulators/cen64/default.nix diff --git a/pkgs/misc/emulators/cen64/default.nix b/pkgs/misc/emulators/cen64/default.nix new file mode 100644 index 00000000000..0153ed11cd2 --- /dev/null +++ b/pkgs/misc/emulators/cen64/default.nix @@ -0,0 +1,29 @@ +{ lib, cmake, fetchFromGitHub, libGL, libiconv, libX11, openal, stdenv }: + +stdenv.mkDerivation rec { + pname = "cen64"; + version = "unstable-2020-02-20"; + + src = fetchFromGitHub { + owner = "n64dev"; + repo = "cen64"; + rev = "6f9f5784bf0a720522c4ecb0915e20229c126aed"; + sha256 = "08q0a3b2ilb95zlz4cw681gwz45n2wrb2gp2z414cf0bhn90vz0s"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libGL libiconv openal libX11 ]; + + installPhase = '' + mkdir -p $out/bin + mv cen64 $out/bin + ''; + + meta = with lib; { + description = "A Cycle-Accurate Nintendo 64 Emulator"; + license = licenses.bsd3; + homepage = "https://github.com/n64dev/cen64"; + maintainers = [ maintainers._414owen ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9edb546f796..d7bca752e1d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -192,6 +192,8 @@ in castxml = callPackage ../development/tools/castxml { }; + cen64 = callPackage ../misc/emulators/cen64 { }; + cereal = callPackage ../development/libraries/cereal { }; checkov = callPackage ../development/tools/analysis/checkov {}; From e735b86183b5051eae2492fcf944b45c67d5d9c3 Mon Sep 17 00:00:00 2001 From: Meghea Iulian Date: Sat, 20 Feb 2021 17:23:53 +0200 Subject: [PATCH 14/16] ma1sd: 2.1.1 -> 2.4.0 (#113720) --- pkgs/servers/ma1sd/0001-gradle.patch | 20 -------------------- pkgs/servers/ma1sd/default.nix | 24 +++++++++++++----------- 2 files changed, 13 insertions(+), 31 deletions(-) delete mode 100644 pkgs/servers/ma1sd/0001-gradle.patch diff --git a/pkgs/servers/ma1sd/0001-gradle.patch b/pkgs/servers/ma1sd/0001-gradle.patch deleted file mode 100644 index 0980ec9a5df..00000000000 --- a/pkgs/servers/ma1sd/0001-gradle.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/build.gradle 2019-09-01 16:17:17.815513296 +0200 -+++ b/build.gradle 2019-09-01 16:21:14.688832785 +0200 -@@ -73,7 +73,7 @@ - - buildscript { - repositories { -- jcenter() -+REPLACE - } - - dependencies { -@@ -83,7 +83,7 @@ - } - - repositories { -- jcenter() -+REPLACE - } - - dependencies { diff --git a/pkgs/servers/ma1sd/default.nix b/pkgs/servers/ma1sd/default.nix index 055136c2071..5947d18eb9e 100644 --- a/pkgs/servers/ma1sd/default.nix +++ b/pkgs/servers/ma1sd/default.nix @@ -1,22 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, jre, git, gradle_5, perl, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, jre, git, gradle, perl, makeWrapper }: let name = "ma1sd-${version}"; - version = "2.1.1"; - rev = "a112a5e57cb38ad282939d2dcb9c1476e038af39"; + version = "2.4.0"; + rev = version; src = fetchFromGitHub { inherit rev; owner = "ma1uta"; repo = "ma1sd"; - sha256 = "1qibn6m6mvxwnbiypxlgkaqg6in358vkf0q47410rv1dx1gjcnv5"; + hash = "sha256-8UnhrGa8KKmMAAkzUXztMkxgYOX8MU1ioXuEStGi4Vc="; }; deps = stdenv.mkDerivation { name = "${name}-deps"; inherit src; - nativeBuildInputs = [ gradle_5 perl git ]; + nativeBuildInputs = [ gradle perl git ]; buildPhase = '' export MA1SD_BUILD_VERSION=${rev} @@ -35,34 +35,36 @@ let outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "1w9cxq0rlzyh7bzqr3v3vn2cjhpn7hhc5lk9qzwj7sdj4jn2qxq6"; + outputHash = "0x2wmmhjgnb6p72d3kvnv2vg52l0c4151rs4jrazs9rvxjfc88dr"; }; in stdenv.mkDerivation { inherit name src version; - nativeBuildInputs = [ gradle_5 perl makeWrapper ]; + nativeBuildInputs = [ gradle perl makeWrapper ]; buildInputs = [ jre ]; - patches = [ ./0001-gradle.patch ]; - buildPhase = '' + runHook preBuild export MA1SD_BUILD_VERSION=${rev} export GRADLE_USER_HOME=$(mktemp -d) - sed -ie "s#REPLACE#mavenLocal(); maven { url '${deps}' }#g" build.gradle + sed -ie "s#jcenter()#mavenLocal(); maven { url '${deps}' }#g" build.gradle gradle --offline --no-daemon build -x test + runHook postBuild ''; installPhase = '' + runHook preInstall install -D build/libs/source.jar $out/lib/ma1sd.jar makeWrapper ${jre}/bin/java $out/bin/ma1sd --add-flags "-jar $out/lib/ma1sd.jar" + runHook postInstall ''; meta = with lib; { description = "a federated matrix identity server; fork of mxisd"; homepage = "https://github.com/ma1uta/ma1sd"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ mguentner ]; platforms = platforms.all; }; From e1eb2c16b99d83d69fd9a8d8e73fb1f385189c51 Mon Sep 17 00:00:00 2001 From: Travis Whitton Date: Sat, 20 Feb 2021 10:24:20 -0500 Subject: [PATCH 15/16] fairymax: enable clang/darwin build (#113728) * fairymax: enable clang/darwin build * fairymax: enable all platforms --- pkgs/games/fairymax/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/fairymax/default.nix b/pkgs/games/fairymax/default.nix index 5c7cad879d1..d7433950451 100644 --- a/pkgs/games/fairymax/default.nix +++ b/pkgs/games/fairymax/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { cp ${ini} fmax.ini ''; buildPhase = '' - gcc *.c -o fairymax -DINI_FILE='"'"$out/share/fairymax/fmax.ini"'"' + $CC *.c -Wno-return-type -o fairymax -DINI_FILE='"'"$out/share/fairymax/fmax.ini"'"' ''; installPhase = '' mkdir -p "$out"/{bin,share/fairymax} @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; license = lib.licenses.free ; maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; homepage = "http://home.hccnet.nl/h.g.muller/dwnldpage.html"; }; } From 6d771e5330157de230a8431577edb20a8733112b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 18 Feb 2021 00:54:41 +0000 Subject: [PATCH 16/16] python37Packages.breathe: 4.26.1 -> 4.27.0 --- pkgs/development/python-modules/breathe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index 29de26ac495..be51e87c95c 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -1,13 +1,13 @@ { lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k, isPy27 }: buildPythonPackage rec { - version = "4.26.1"; + version = "4.27.0"; pname = "breathe"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "f59ecadebbb76e3b4710e8c9d2f8f98d51e54701930a38ddf732930653dcf6b5"; + sha256 = "5b21f86d0cc99d3168f0d9730e07c1438057083ccc9a9c54de322e59e1f4e740"; }; propagatedBuildInputs = [ docutils six sphinx ];