From 7cccd548fd78833a3b5b6bc51a95c5740428cf28 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Dec 2021 14:31:58 +0000 Subject: [PATCH 01/34] smcroute: 2.5.3 -> 2.5.5 --- pkgs/servers/smcroute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/smcroute/default.nix b/pkgs/servers/smcroute/default.nix index afb1c9e70e56..be504ec62ab8 100644 --- a/pkgs/servers/smcroute/default.nix +++ b/pkgs/servers/smcroute/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "smcroute"; - version = "2.5.3"; + version = "2.5.5"; src = fetchFromGitHub { owner = "troglobit"; repo = "smcroute"; rev = version; - sha256 = "sha256-0s4BIJbbygt7Wpxlp13QGbXpvZsdIBszE7TOaN2aq/E="; + sha256 = "sha256-kMK2XLyI9GG83gxjVh4I7wSMEPM5iJSmgtwVJNHn9OQ="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 9534eb0f3c52a8a218a07a01c415173426c7177d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 07:56:25 +0000 Subject: [PATCH 02/34] khronos-ocl-icd-loader: 2020.06.16 -> 2021.06.30 --- pkgs/development/libraries/khronos-ocl-icd-loader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix index b0f1f0eae257..1d4afb973fbb 100644 --- a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix +++ b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "khronos-ocl-icd-loader-${version}"; - version = "2020.06.16"; + version = "2021.06.30"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCL-ICD-Loader"; rev = "v${version}"; - sha256 = "0v2yi6d3g5qshzy6pjic09c5irwgds106yvr93q62f32psfblnmy"; + sha256 = "sha256-1bSeGI8IufKtdcyxVHX4DVxkPKfJrUBVzzIGe8rQ/AA="; }; patches = lib.optional withTracing ./tracing.patch; From d337b164d665374023db68112fd8da46f12a4289 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 15:04:36 +0000 Subject: [PATCH 03/34] minimap2: 2.22 -> 2.23 --- pkgs/applications/science/biology/minimap2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/minimap2/default.nix b/pkgs/applications/science/biology/minimap2/default.nix index 072826c40615..062cdd56c7c4 100644 --- a/pkgs/applications/science/biology/minimap2/default.nix +++ b/pkgs/applications/science/biology/minimap2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "minimap2"; - version = "2.22"; + version = "2.23"; src = fetchFromGitHub { repo = pname; owner = "lh3"; rev = "v${version}"; - sha256 = "sha256-jYXJr2T1enZfSABVV5Kmd5OBtWZtQ2D/2eAlW2WHtGU="; + sha256 = "sha256-oNVpSINcXO2eKzOCr/Fl8tSMguRxzmlDNu7hLZeopoQ="; }; buildInputs = [ zlib ]; From c94b5c5618e56474d0f32ecb6867f31428dcfeda Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Dec 2021 17:01:06 +0000 Subject: [PATCH 04/34] bitlbee-mastodon: 1.4.4 -> 1.4.5 --- .../instant-messengers/bitlbee-mastodon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix index f1b2df658a6b..abd50868e030 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix @@ -3,12 +3,12 @@ with lib; stdenv.mkDerivation rec { pname = "bitlbee-mastodon"; - version = "1.4.4"; + version = "1.4.5"; src = fetchgit { url = "https://alexschroeder.ch/cgit/bitlbee-mastodon"; rev = "v${version}"; - sha256 = "0a8196pyr6bjnqg82zn7jdhiv7xsg4npbpzalla1i2h99j30q8pk"; + sha256 = "sha256-8vmq/YstuBYUxe00P4NrxD/eMYI++R9uvn1sCcMTr7I="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 1c4d16c184cda25bad797891965065f63d1f75ea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Dec 2021 16:05:54 +0000 Subject: [PATCH 05/34] snapraid: 11.6 -> 12.0 --- pkgs/tools/filesystems/snapraid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/snapraid/default.nix b/pkgs/tools/filesystems/snapraid/default.nix index 9365497f5fba..9f5980a07e7d 100644 --- a/pkgs/tools/filesystems/snapraid/default.nix +++ b/pkgs/tools/filesystems/snapraid/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "snapraid"; - version = "11.6"; + version = "12.0"; src = fetchFromGitHub { owner = "amadvance"; repo = "snapraid"; rev = "v${version}"; - sha256 = "sha256-nO0Ujo9je59C+zP7l9Pp7JEdsSfVAv+9EnAq4OtJ78o="; + sha256 = "sha256-CcJaxnbRvGYiQjU38qnTgNyim5aDQWmxhQv16ZT1F00="; }; VERSION = version; From d9f7da0156d95ef0b39dc3f6b2e38cc89d099c73 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Dec 2021 12:09:46 +0000 Subject: [PATCH 06/34] dpt-rp1-py: 0.1.14 -> 0.1.15 --- pkgs/tools/misc/dpt-rp1-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/dpt-rp1-py/default.nix b/pkgs/tools/misc/dpt-rp1-py/default.nix index b888d3bb7bd2..75a95d153035 100644 --- a/pkgs/tools/misc/dpt-rp1-py/default.nix +++ b/pkgs/tools/misc/dpt-rp1-py/default.nix @@ -1,13 +1,13 @@ { lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { pname = "dpt-rp1-py"; - version = "0.1.14"; + version = "0.1.15"; src = fetchFromGitHub { owner = "janten"; repo = pname; rev = "v${version}"; - sha256 = "0584xwf5nli94b060gysmv4civ83p4a88phpkyxaddlks0w7fc5h"; + sha256 = "0kmhsx6n3wjzqcvfnpvdxiiwzxr51khgrl0kgaaas8hwq246l65d"; }; doCheck = false; From 3d3a40f16bb1c4434fa0d15816b924cdfd97e459 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 20 Dec 2021 18:09:40 +0000 Subject: [PATCH 07/34] halibut: 1.2 -> 1.3 --- pkgs/tools/typesetting/halibut/default.nix | 24 +++++----------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/pkgs/tools/typesetting/halibut/default.nix b/pkgs/tools/typesetting/halibut/default.nix index ec5598e4d689..de76c4956d7a 100644 --- a/pkgs/tools/typesetting/halibut/default.nix +++ b/pkgs/tools/typesetting/halibut/default.nix @@ -1,29 +1,15 @@ -{lib, stdenv, fetchurl, perl}: +{lib, stdenv, fetchurl, cmake, perl}: stdenv.mkDerivation rec { pname = "halibut"; - version = "1.2"; + version = "1.3"; src = fetchurl { - url = "http://ww.chiark.greenend.org.uk/~sgtatham/halibut/halibut-${version}/halibut-${version}.tar.gz"; - sha256 = "0gqnhfqf555rfpk5xj1imbdxnbkkrv4wl3rrdb1r0wgj81igpv8s"; + url = "https://www.chiark.greenend.org.uk/~sgtatham/halibut/halibut-${version}/halibut-${version}.tar.gz"; + sha256 = "0ciikn878vivs4ayvwvr63nnhpcg12m8023xv514zxqpdxlzg85a"; }; - buildInputs = [ perl ]; - - patchPhase = '' - sed -i -e s@/usr/local@$out@ Makefile - sed -i -e 's@(prefix)/man@(prefix)/share/man@' doc/Makefile - ''; - - installPhase = '' - mkdir -p $out/bin - mkdir -p $out/share/man/man1 - pushd doc - make halibut.1 - popd - make install - ''; + nativeBuildInputs = [ cmake perl ]; meta = with lib; { description = "Documentation production system for software manuals"; From 73050d70fc0c9946fb4cdfa73f89c9c2893117da Mon Sep 17 00:00:00 2001 From: Steven Kou Date: Wed, 22 Dec 2021 03:21:09 +0800 Subject: [PATCH 08/34] thinkfan: fix typo in level One of the valid values for the fan speed is "level disengaged", however, it is represented as "level disengage" and does not match what thinkfan expects. --- nixos/modules/services/hardware/thinkfan.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/hardware/thinkfan.nix b/nixos/modules/services/hardware/thinkfan.nix index 7a5a7e1c41ce..4ea829e496e8 100644 --- a/nixos/modules/services/hardware/thinkfan.nix +++ b/nixos/modules/services/hardware/thinkfan.nix @@ -19,7 +19,7 @@ let description = "tuple of" + concatMapStrings (t: " (${t.description})") ts; }; level = ints.unsigned; - special = enum [ "level auto" "level full-speed" "level disengage" ]; + special = enum [ "level auto" "level full-speed" "level disengaged" ]; in tuple [ (either level special) level level ]; @@ -164,7 +164,7 @@ in { LEVEL is the fan level to use: it can be an integer (0-7 with thinkpad_acpi), "level auto" (to keep the default firmware behavior), "level full-speed" or - "level disengage" (to run the fan as fast as possible). + "level disengaged" (to run the fan as fast as possible). LOW is the temperature at which to step down to the previous level. HIGH is the temperature at which to step up to the next level. All numbers are integers. From f7a22e309c12831985d46a9e08f21de2bb16d0d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Dec 2021 12:09:28 +0000 Subject: [PATCH 09/34] skate: 0.1.2 -> 0.1.3 --- pkgs/applications/misc/skate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/skate/default.nix b/pkgs/applications/misc/skate/default.nix index f16807ba2666..f7d3173b0f2a 100644 --- a/pkgs/applications/misc/skate/default.nix +++ b/pkgs/applications/misc/skate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "skate"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "skate"; rev = "v${version}"; - sha256 = "sha256-Z+7unYmwPLOhJAMAhMwjapAmslTNxmP01myjgEOBfu8="; + sha256 = "sha256-rUOFx0ebZs3xmsSz9oFvjINaHp9gIe7E/5UoJJ47aZc="; }; - vendorSha256 = "sha256-CdYyiUiy2q2boEHjdXkgRzVI+6fEb+fBrlInl6IrFjk="; + vendorSha256 = "sha256-3+KXirGwZvPhqCeglPqHJ9wEt6naJiRE3TAX7/jxJpk="; doCheck = false; From 44b49e1b6c52e24f49bb1ec7af7e6da099dd3f76 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 22 Dec 2021 01:14:09 +0100 Subject: [PATCH 10/34] fltk13: 1.3.6 -> 1.3.8 --- pkgs/development/libraries/fltk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index 831a96f71f3e..61d73b83e497 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -1,5 +1,5 @@ import ./common.nix rec { - version = "1.3.6"; + version = "1.3.8"; rev = "release-${version}"; - sha256 = "0vzk4d6j927v7dxywr5xlqlf70myal1xikkdfvd11p94rcdf9bsv"; + sha256 = "1pw4ndwn9rr1cxw5qiw32r9la2z9zbjphgsqq1hj2yy4blwv419r"; } From 64d7b2b59e7fe488a0f66d1460ed19ffbd4dc10f Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 22 Dec 2021 17:21:29 +0100 Subject: [PATCH 11/34] fltk14: 1.4.x-2021-07-04 -> 1.4.x-2021-12-21 --- pkgs/development/libraries/fltk/1.4.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/fltk/1.4.nix b/pkgs/development/libraries/fltk/1.4.nix index 2a430844ebe7..d5aa780affa7 100644 --- a/pkgs/development/libraries/fltk/1.4.nix +++ b/pkgs/development/libraries/fltk/1.4.nix @@ -1,5 +1,5 @@ import ./common.nix rec { - version = "1.4.x-2021-07-04"; - rev = "1008cdfab27609a6f6a0e82dadad9fd9cbd8a66d"; - sha256 = "1h057dyhd04b9bjci952b2l7brxv183l9jw9i50mn9qjfljmvqim"; + version = "1.4.x-2021-12-21"; + rev = "c8bb2a35850be7c6eaec5ad5a2936a77f7913de2"; + sha256 = "1fwfg1hp1ajqh2b4ra4phi96854q9i8c0gbyi7pr35ljyv848295"; } From 54a9d3edd14d6baeb90071edc7a70bd93265c052 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 23 Dec 2021 12:10:41 +0100 Subject: [PATCH 12/34] fldigi: use fltk13, enableParallelBuilding Configure script warns about FLTK 1.4 potentially causing problems, and it currently does. --- pkgs/applications/radio/fldigi/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix index 0de04e26ff36..8650cf59613a 100644 --- a/pkgs/applications/radio/fldigi/default.nix +++ b/pkgs/applications/radio/fldigi/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , hamlib -, fltk14 +, fltk13 , libjpeg , libpng , portaudio @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { libXinerama gettext hamlib - fltk14 + fltk13 libjpeg libpng portaudio @@ -39,6 +39,8 @@ stdenv.mkDerivation rec { libsamplerate ] ++ lib.optionals (stdenv.isLinux) [ libpulseaudio alsa-lib udev ]; + enableParallelBuilding = true; + meta = with lib; { description = "Digital modem program"; homepage = "https://sourceforge.net/projects/fldigi/"; From 95dc917f68c5a97acaec5ceb01b7396d4c7cb2b2 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 23 Dec 2021 14:29:04 +0100 Subject: [PATCH 13/34] fldigi: Mark broken on x86_64-darwin Build hasn't succeeded on Hydra for awhile. --- pkgs/applications/radio/fldigi/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix index 8650cf59613a..4b33d331f5b6 100644 --- a/pkgs/applications/radio/fldigi/default.nix +++ b/pkgs/applications/radio/fldigi/default.nix @@ -47,5 +47,8 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ relrod ftrvxmtrx ]; platforms = platforms.unix; + # unable to execute command: posix_spawn failed: Argument list too long + # Builds fine on aarch64-darwin + broken = stdenv.system == "x86_64-darwin"; }; } From c5ff49ebd160404662ba55843b88f61cafb97b9e Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 23 Dec 2021 14:32:39 +0100 Subject: [PATCH 14/34] librsb: Mark broken on Darwin Builds haven't succeeded on Hydra in close to a year. --- pkgs/development/libraries/librsb/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/librsb/default.nix b/pkgs/development/libraries/librsb/default.nix index ef8b9ee441d3..0acca9ae24fc 100644 --- a/pkgs/development/libraries/librsb/default.nix +++ b/pkgs/development/libraries/librsb/default.nix @@ -82,5 +82,7 @@ stdenv.mkDerivation rec { license = with licenses; [ lgpl3Plus ]; maintainers = with maintainers; [ KarlJoad ]; platforms = platforms.all; + # ./rsb_common.h:56:10: fatal error: 'omp.h' file not found + broken = stdenv.isDarwin; }; } From 8b79afab5d8a9cda57d1074fc75c7ec8b7618843 Mon Sep 17 00:00:00 2001 From: superwhiskers Date: Thu, 23 Dec 2021 17:40:15 -0600 Subject: [PATCH 15/34] nqp: 2021.10 -> 2021.12 --- pkgs/development/interpreters/rakudo/nqp.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix index 96ac0b40febc..8a64430d24a0 100644 --- a/pkgs/development/interpreters/rakudo/nqp.nix +++ b/pkgs/development/interpreters/rakudo/nqp.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nqp"; - version = "2021.10"; + version = "2021.12"; src = fetchurl { - url = "https://github.com/raku/nqp/releases/download/${version}/nqp-${version}.tar.gz"; - sha256 = "sha256-SBNbwbPOIsHFfM70ZTHnaI7sg9a5BbUC/879bCMpS0k="; + url = "https://github.com/raku/nqp/releases/download/${version}/nqp-${version}.tar.gz"; + sha256 = "sha256-Dh1TT9HuYaTIByMJuvvARmDprnLYhhjaoOjxUCLw2RM="; }; buildInputs = [ perl ]; @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Not Quite Perl -- a lightweight Raku-like environment for virtual machines"; - homepage = "https://github.com/perl6/nqp"; - license = licenses.artistic2; - platforms = platforms.unix; + homepage = "https://github.com/Raku/nqp"; + license = licenses.artistic2; + platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice vrthra sgo ]; }; } From 4d19a57c5f7fa990e2f29debb377d75b0abd8a85 Mon Sep 17 00:00:00 2001 From: superwhiskers Date: Thu, 23 Dec 2021 17:40:25 -0600 Subject: [PATCH 16/34] moarvm: 2021.10 -> 2021.12 --- .../interpreters/rakudo/moarvm.nix | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix index b8ed60c69a99..cbc283ce25f2 100644 --- a/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -1,14 +1,19 @@ -{ lib, stdenv, fetchurl, perl -, CoreServices, ApplicationServices }: +{ lib +, stdenv +, fetchurl +, perl +, CoreServices +, ApplicationServices +}: stdenv.mkDerivation rec { pname = "moarvm"; - version = "2021.10"; + version = "2021.12"; src = fetchurl { url = "https://moarvm.org/releases/MoarVM-${version}.tar.gz"; - sha256 = "sha256-fzSHpw6Ld74OTi8SsUxJ9qAdA3jglAyGlYyQFsSVrXU="; - }; + sha256 = "sha256-1Ju+sQ2WFsLYen+t0ca7elzhHBnHxEu7i+928ltQXE8="; + }; postPatch = '' patchShebangs . @@ -28,9 +33,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "VM with adaptive optimization and JIT compilation, built for Rakudo"; - homepage = "https://moarvm.org"; - license = licenses.artistic2; - platforms = platforms.unix; + homepage = "https://moarvm.org"; + license = licenses.artistic2; + platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice vrthra sgo ]; }; } From c31dac8ab1cf3a13fbbd68f14e97e2ac4125f11b Mon Sep 17 00:00:00 2001 From: superwhiskers Date: Thu, 23 Dec 2021 17:40:32 -0600 Subject: [PATCH 17/34] rakudo: 2021.10 -> 2021.12 --- pkgs/development/interpreters/rakudo/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index ede9fe0bed0b..254228ea55bb 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rakudo"; - version = "2021.10"; + version = "2021.12"; src = fetchurl { - url = "https://rakudo.org/dl/rakudo/rakudo-${version}.tar.gz"; - sha256 = "sha256-sXTHU3Mo77Xj90JF55+nFZtwExuExZeRbPWmXCrKJKE="; + url = "https://rakudo.org/dl/rakudo/rakudo-${version}.tar.gz"; + sha256 = "sha256-f1PSxxONE6sBaS1b19vCjz8p7Ya9ltUoCFb1WhqwVAY="; }; nativeBuildInputs = [ removeReferencesTo ]; @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Raku implementation on top of Moar virtual machine"; - homepage = "https://rakudo.org"; - license = licenses.artistic2; - platforms = platforms.unix; + homepage = "https://rakudo.org"; + license = licenses.artistic2; + platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice vrthra sgo ]; }; } From fb5e054a5c32a21d02df5c1b11a9f05ff8f4156a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Dec 2021 16:26:40 +0000 Subject: [PATCH 18/34] mill: 0.9.10 -> 0.9.11 --- pkgs/development/tools/build-managers/mill/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index b258a45ca988..bc335da78a7b 100644 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ b/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mill"; - version = "0.9.10"; + version = "0.9.11"; src = fetchurl { url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly"; - sha256 = "sha256-JbZorHeBznBb+R9JjPQBNKlTdNNzg1G82OxWvBtNg5Q="; + sha256 = "sha256-qYwCt7+//GJHJyDrZ8rcGCKLshKebIDBQCyn6rLOhJQ="; }; nativeBuildInputs = [ makeWrapper ]; From 2b0efd5ea54fcce8cc0c13f45bece2f761fb62b4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Dec 2021 16:38:06 +0000 Subject: [PATCH 19/34] mdcat: 0.24.2 -> 0.25.0 --- pkgs/tools/text/mdcat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index ea02fdde0c48..6cdd90f2be3d 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -12,20 +12,20 @@ rustPlatform.buildRustPackage rec { pname = "mdcat"; - version = "0.24.2"; + version = "0.25.0"; src = fetchFromGitHub { owner = "lunaryorn"; repo = pname; rev = "mdcat-${version}"; - sha256 = "sha256-9XVKLe1Kyq5SpJFpXg/GD/V+uiieljk7UoDzJ1MZBlA="; + sha256 = "sha256-wrtvVFOSqpNBWLRGPL+08WBS4ltQyZwRE3/dqqT6IXg="; }; nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; - cargoSha256 = "sha256-cgX/jPmOU3o5gAwbneGeQLU2hIrGdrAvOaA/TOXSZgg="; + cargoSha256 = "sha256-9I6/lt5VXfZp2/W6EoXtagcNj2kfxB5ZT2GkWgsUyM8="; checkInputs = [ ansi2html ]; # Skip tests that use the network and that include files. From 69dbc934e962f1741e56446ed14742357ac6e201 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Dec 2021 23:27:35 +0100 Subject: [PATCH 20/34] trivy: 0.21.2 -> 0.22.0 --- pkgs/tools/admin/trivy/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index a7f57c088dab..957ad7f51efc 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "trivy"; - version = "0.21.2"; + version = "0.22.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-k8bjwKoAXt9XFQX7rHhdrcu3FoaU31Ra78PQHNVCfq0="; + sha256 = "sha256-DH4vr6WiGwzT9zTMs/UqVoCHhpOSoT5t8P9plTPt8ZQ="; }; - vendorSha256 = "sha256-rJvmY0557QOb8D1/LhN8w64ds3HwqolLmGdntS5CJPQ="; + vendorSha256 = "sha256-1m3izHfxMUvUiz21NRjqdNS95sXf8Rwlu5TuQ411190="; excludedPackages = "misc"; @@ -24,7 +24,11 @@ buildGoModule rec { "-X main.version=v${version}" ]; + # Tests requires network access + doCheck = false; + doInstallCheck = true; + installCheckPhase = '' runHook preInstallCheck $out/bin/trivy --help From d03a75a45a21d555610ae8cedce9b6249eb89c28 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 26 Dec 2021 00:34:43 +0100 Subject: [PATCH 21/34] fast-ssh: init at 0.3.1 --- pkgs/tools/networking/fast-ssh/default.nix | 29 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/networking/fast-ssh/default.nix diff --git a/pkgs/tools/networking/fast-ssh/default.nix b/pkgs/tools/networking/fast-ssh/default.nix new file mode 100644 index 000000000000..912cac758650 --- /dev/null +++ b/pkgs/tools/networking/fast-ssh/default.nix @@ -0,0 +1,29 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "fast-ssh"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "julien-r44"; + repo = "fast-ssh"; + rev = "v${version}"; + sha256 = "sha256-eHJdMe8RU6Meg/9+NCfIneD5BqNUc2yIiQ8Z5UqUBUI="; + }; + + cargoSha256 = "sha256-sIQNoH3UWX3SwCFCPZEREIFR7C28ml4oGsrq6wuOAT0="; + + buildInputs = lib.optional stdenv.isDarwin Security; + + meta = with lib; { + description = "TUI tool to use the SSH config for connections"; + homepage = "https://github.com/julien-r44/fast-ssh"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 65d8b9e9648f..72c825c2e325 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2990,6 +2990,10 @@ with pkgs; fast-cpp-csv-parser = callPackage ../development/libraries/fast-cpp-csv-parser { }; + fast-ssh = callPackage ../tools/networking/fast-ssh { + inherit (darwin.apple_sdk.frameworks) Security; + }; + faudio = callPackage ../development/libraries/faudio { }; fd = callPackage ../tools/misc/fd { }; From b072f7ec195ca2da515bb487d7e4b1deb9ca40b9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 26 Dec 2021 15:16:03 +0100 Subject: [PATCH 22/34] =?UTF-8?q?gegl:=200.4.32=20=E2=86=92=200.4.34?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gegl/-/compare/GEGL_0_4_32...GEGL_0_4_34 --- pkgs/development/libraries/gegl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index 3277faa4c2d6..6acb93c82bed 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -36,14 +36,14 @@ stdenv.mkDerivation rec { pname = "gegl"; - version = "0.4.32"; + version = "0.4.34"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Zo48a5+vdfsAUScBw2J0q28iqLoF7GLb8YfTS40pj6E="; + sha256 = "sha256-72PwvKW0McYRmt3YNMp/u1B8kAxIYcV7Nme29Mz8qqo="; }; nativeBuildInputs = [ From e6c3e3d3948cdea2c816d280c7caca88330b4d38 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 26 Dec 2021 15:13:02 +0100 Subject: [PATCH 23/34] =?UTF-8?q?gimp:=202.10.28=20=E2=86=92=202.10.30?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://www.gimp.org/news/2021/12/21/gimp-2-10-30-released/ --- pkgs/applications/graphics/gimp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index c9472e9a15dd..9a91e5f8c6e9 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -53,13 +53,13 @@ let python = python2.withPackages (pp: [ pp.pygtk ]); in stdenv.mkDerivation rec { pname = "gimp"; - version = "2.10.28"; + version = "2.10.30"; outputs = [ "out" "dev" ]; src = fetchurl { url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "T03CLP8atfAm/qoqtV4Fd1s6EeGYGGtHvat5y/oHiCY="; + sha256 = "iIFdqnbtfUJ37rNTNYuvoRbNL80shh2VuVE1wdUrZ9w="; }; patches = [ From 12469b7ed01f61c7cfd0d38aa58ca16d069e7028 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Dec 2021 18:25:18 +0000 Subject: [PATCH 24/34] vpn-slice: 0.16 -> 0.16.1 --- pkgs/tools/networking/vpn-slice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/vpn-slice/default.nix b/pkgs/tools/networking/vpn-slice/default.nix index 288a871f72f6..0e98212ad5a5 100644 --- a/pkgs/tools/networking/vpn-slice/default.nix +++ b/pkgs/tools/networking/vpn-slice/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "vpn-slice"; - version = "0.16"; + version = "0.16.1"; src = fetchFromGitHub { owner = "dlenski"; repo = pname; rev = "v${version}"; - sha256 = "sha256-szJLw+TtpYcTaqeOTzMiQ0HVjNb9A5SLL4mGMX8xUnw="; + sha256 = "sha256-T6VULLNRLWO4OcAsuTmhty6H4EhinyxQSg0dfv2DUJs="; }; propagatedBuildInputs = with python3Packages; [ setproctitle dnspython ]; From 4a81937388d5da2b92bab96168b199921a0e086e Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sun, 5 Sep 2021 09:07:13 +0200 Subject: [PATCH 25/34] Chowtapemodel: unstable-2020-12-12 -> 2.10.0 --- .../audio/CHOWTapeModel/default.nix | 72 ++++++++++--------- 1 file changed, 40 insertions(+), 32 deletions(-) diff --git a/pkgs/applications/audio/CHOWTapeModel/default.nix b/pkgs/applications/audio/CHOWTapeModel/default.nix index 9b9649cf9f8a..3eff818cca90 100644 --- a/pkgs/applications/audio/CHOWTapeModel/default.nix +++ b/pkgs/applications/audio/CHOWTapeModel/default.nix @@ -1,68 +1,76 @@ -{ alsa-lib -, curl -, fetchFromGitHub -, freeglut -, freetype -, libGL -, libXcursor -, libXext -, libXinerama -, libXrandr -, libjack2 -, pkg-config -, python3 -, stdenv -, lib -}: +{ alsa-lib, at-spi2-core, cmake, curl, dbus, libepoxy, fetchFromGitHub, freeglut +, freetype, gcc-unwrapped, gtk3, lib, libGL, libXcursor, libXdmcp, libXext +, libXinerama, libXrandr, libXtst, libdatrie, libjack2, libpsl, libselinux +, libsepol, libsysprof-capture, libthai, libxkbcommon, lv2, pcre, pkg-config +, python3, sqlite, stdenv }: stdenv.mkDerivation rec { pname = "CHOWTapeModel"; - version = "unstable-2020-12-12"; + version = "2.10.0"; src = fetchFromGitHub { owner = "jatinchowdhury18"; repo = "AnalogTapeModel"; - rev = "a7cf10c3f790d306ce5743bb731e4bc2c1230d70"; - sha256 = "09nq8x2dwabncbp039dqm1brzcz55zg9kpxd4p5348xlaz5m4661"; + rev = "v${version}"; + sha256 = "sha256-iuT7OBRBtMkjcTHayCcne1mNqkcxzKnEYl62n65V7Z4="; fetchSubmodules = true; }; - nativeBuildInputs = [ - pkg-config - ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ alsa-lib + at-spi2-core curl + dbus + libepoxy freeglut freetype + gtk3 libGL libXcursor + libXdmcp libXext libXinerama libXrandr + libXtst + libdatrie libjack2 + libpsl + libselinux + libsepol + libsysprof-capture + libthai + libxkbcommon + lv2 + pcre python3 + sqlite + gcc-unwrapped ]; - buildPhase = '' - cd Plugin/ - ./build_linux.sh - ''; + cmakeFlags = [ + "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar" + "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib" + "-DCMAKE_NM=${gcc-unwrapped}/bin/gcc-nm" + ]; + + postPatch = "cd Plugin"; installPhase = '' mkdir -p $out/lib/lv2 $out/lib/vst3 $out/bin $out/share/doc/CHOWTapeModel/ - cd Builds/LinuxMakefile/build/ - cp CHOWTapeModel.a $out/lib - cp -r CHOWTapeModel.lv2 $out/lib/lv2 - cp -r CHOWTapeModel.vst3 $out/lib/vst3 - cp CHOWTapeModel $out/bin + cd CHOWTapeModel_artefacts/Release + cp libCHOWTapeModel_SharedCode.a $out/lib + cp -r LV2/CHOWTapeModel.lv2 $out/lib/lv2 + cp -r VST3/CHOWTapeModel.vst3 $out/lib/vst3 + cp Standalone/CHOWTapeModel $out/bin cp ../../../../Manual/ChowTapeManual.pdf $out/share/doc/CHOWTapeModel/ ''; meta = with lib; { homepage = "https://github.com/jatinchowdhury18/AnalogTapeModel"; - description = "Physical modelling signal processing for analog tape recording. LV2, VST3 and standalone"; + description = + "Physical modelling signal processing for analog tape recording. LV2, VST3 and standalone"; license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ magnetophon ]; platforms = platforms.linux; From 26a59d42422e22b16c6f65268e79a9349dbbe2c3 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 26 Dec 2021 23:40:32 +0100 Subject: [PATCH 26/34] octavePackages.gsl: Mark broken on Darwin --- pkgs/development/octave-modules/gsl/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/octave-modules/gsl/default.nix b/pkgs/development/octave-modules/gsl/default.nix index 5922c015dbdf..e050f381a914 100644 --- a/pkgs/development/octave-modules/gsl/default.nix +++ b/pkgs/development/octave-modules/gsl/default.nix @@ -1,4 +1,5 @@ { buildOctavePackage +, stdenv , lib , fetchurl , gsl @@ -22,5 +23,8 @@ buildOctavePackage rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ KarlJoad ]; description = "Octave bindings to the GNU Scientific Library"; + # error: use of undeclared identifier 'feval'; did you mean 'octave::feval'? + # error: no member named 'is_real_type' in 'octave_value' + broken = stdenv.isDarwin; }; } From 183a8e9846727092e2c8ed5f1f54cdcf989e63e7 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 26 Dec 2021 23:40:50 +0100 Subject: [PATCH 27/34] octavePackages.level-set: Mark broken on Darwin --- pkgs/development/octave-modules/level-set/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/octave-modules/level-set/default.nix b/pkgs/development/octave-modules/level-set/default.nix index d1f882904d59..3cce6f2cad55 100644 --- a/pkgs/development/octave-modules/level-set/default.nix +++ b/pkgs/development/octave-modules/level-set/default.nix @@ -1,4 +1,5 @@ { buildOctavePackage +, stdenv , lib , fetchgit , automake @@ -50,5 +51,7 @@ buildOctavePackage rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ KarlJoad ]; description = "Routines for calculating the time-evolution of the level-set equation and extracting geometric information from the level-set function"; + # /build/level-set-2019-04-13.tar.gz: Cannot open: No such file or directory + broken = stdenv.isDarwin; }; } From af8c2038fd499676f2c819acf6f08aa36e7aae33 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 26 Dec 2021 23:40:58 +0100 Subject: [PATCH 28/34] octavePackages.ocl: Mark broken on Darwin --- pkgs/development/octave-modules/ocl/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/octave-modules/ocl/default.nix b/pkgs/development/octave-modules/ocl/default.nix index 0e47160ad0ea..095b386e0736 100644 --- a/pkgs/development/octave-modules/ocl/default.nix +++ b/pkgs/development/octave-modules/ocl/default.nix @@ -1,4 +1,5 @@ { buildOctavePackage +, stdenv , lib , fetchurl }: @@ -22,5 +23,7 @@ buildOctavePackage rec { Single-Instruction-Multiple-Data (SIMD) computations, selectively using available OpenCL hardware and drivers. ''; + # error: structure has no member 'dir' + broken = stdenv.isDarwin; }; } From b17386836df954570a4f385c77fb99fed386e889 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 26 Dec 2021 23:41:06 +0100 Subject: [PATCH 29/34] octavePackages.strings: Mark broken on Darwin --- pkgs/development/octave-modules/strings/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/octave-modules/strings/default.nix b/pkgs/development/octave-modules/strings/default.nix index 7b556272f5da..cf5acd36855b 100644 --- a/pkgs/development/octave-modules/strings/default.nix +++ b/pkgs/development/octave-modules/strings/default.nix @@ -1,4 +1,5 @@ { buildOctavePackage +, stdenv , lib , fetchurl , pcre @@ -33,5 +34,7 @@ buildOctavePackage rec { # Claims to have a freebsd license, but I found none. maintainers = with maintainers; [ KarlJoad ]; description = "Additional functions for manipulation and analysis of strings"; + # Some pcre symbols claimed to be missing + broken = stdenv.isDarwin; }; } From fe5e896f470d120834ae4d9abb643486c71f45cb Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 26 Dec 2021 23:41:16 +0100 Subject: [PATCH 30/34] octavePackages.tisean: Mark broken on Darwin --- pkgs/development/octave-modules/tisean/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/octave-modules/tisean/default.nix b/pkgs/development/octave-modules/tisean/default.nix index b21ef0a5f56a..bfe01f10f2ff 100644 --- a/pkgs/development/octave-modules/tisean/default.nix +++ b/pkgs/development/octave-modules/tisean/default.nix @@ -1,4 +1,5 @@ { buildOctavePackage +, stdenv , lib , fetchurl # Octave dependencies @@ -29,5 +30,7 @@ buildOctavePackage rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ KarlJoad ]; description = "Port of TISEAN 3.0.1"; + # Some gfortran symbols claimed to be missing + broken = stdenv.isDarwin; }; } From a1dc23c17fe5254fe2aa15f63ee313a8e733f2e2 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 26 Dec 2021 23:41:25 +0100 Subject: [PATCH 31/34] octavePackages.video: Mark broken on Darwin --- pkgs/development/octave-modules/video/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/octave-modules/video/default.nix b/pkgs/development/octave-modules/video/default.nix index 8467da98be99..57868e83f55e 100644 --- a/pkgs/development/octave-modules/video/default.nix +++ b/pkgs/development/octave-modules/video/default.nix @@ -1,4 +1,5 @@ { buildOctavePackage +, stdenv , lib , fetchurl , pkg-config @@ -27,5 +28,7 @@ buildOctavePackage rec { license = with licenses; [ gpl3Plus bsd3 ]; maintainers = with maintainers; [ KarlJoad ]; description = "Wrapper for OpenCV's CvCapture_FFMPEG and CvVideoWriter_FFMPEG"; + # error: declaration of 'panic' has a different language linkage + broken = stdenv.isDarwin; }; } From 343de1eb120a74d7084591f72257d06520c5125b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Dec 2021 04:22:12 +0000 Subject: [PATCH 32/34] dalfox: 2.6.1 -> 2.7.0 --- pkgs/tools/security/dalfox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/dalfox/default.nix b/pkgs/tools/security/dalfox/default.nix index 8a795049b071..2919354db4ec 100644 --- a/pkgs/tools/security/dalfox/default.nix +++ b/pkgs/tools/security/dalfox/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dalfox"; - version = "2.6.1"; + version = "2.7.0"; src = fetchFromGitHub { owner = "hahwul"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4jqlMZ6/5m12+ZT0HCtskXq6jlcsQq05Vem+jw82RFs="; + sha256 = "sha256-QSIaqHUNsVpb1qbQLIxxjoDH1DMM1XpXxWZtImMV1yM="; }; - vendorSha256 = "sha256-MoOnRsL8DO7Mx7JzvpnEOiqoLEyBPi2cRiQ2m+460V4="; + vendorSha256 = "sha256-QtSWlGsbCxLpb4+TZgV0/wfSb5flGG3qHquO2maIOKU="; meta = with lib; { description = "Tool for analysing parameter and XSS scanning"; From ab886f7939ce9c046bfda3975419d05b771ba790 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Dec 2021 18:58:49 +0000 Subject: [PATCH 33/34] mcfly: 0.5.10 -> 0.5.11 --- pkgs/tools/misc/mcfly/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix index 4d55e6405ac1..612d35ffeb38 100644 --- a/pkgs/tools/misc/mcfly/default.nix +++ b/pkgs/tools/misc/mcfly/default.nix @@ -2,22 +2,22 @@ rustPlatform.buildRustPackage rec { pname = "mcfly"; - version = "0.5.10"; + version = "0.5.11"; src = fetchFromGitHub { owner = "cantino"; repo = "mcfly"; rev = "v${version}"; - sha256 = "sha256-auIerSfEKBK47mIhfmjREJohnhCmtzruobRXaoz5fqA="; + sha256 = "sha256-JyNrEIgvL4TQHpAEefDnLirXplGjJcUqsmALKY44VuM="; }; postPatch = '' - substituteInPlace mcfly.bash --replace '$(which mcfly)' '${placeholder "out"}/bin/mcfly' - substituteInPlace mcfly.zsh --replace '$(which mcfly)' '${placeholder "out"}/bin/mcfly' - substituteInPlace mcfly.fish --replace '(which mcfly)' '${placeholder "out"}/bin/mcfly' + substituteInPlace mcfly.bash --replace '$(command which mcfly)' '${placeholder "out"}/bin/mcfly' + substituteInPlace mcfly.zsh --replace '$(command which mcfly)' '${placeholder "out"}/bin/mcfly' + substituteInPlace mcfly.fish --replace '(command which mcfly)' '${placeholder "out"}/bin/mcfly' ''; - cargoSha256 = "sha256-f9kpD295syRCntwvyjZ9AeAUV61RMbfRRMgNxKAJL8g="; + cargoSha256 = "sha256-7wyRHViPL+Hb9Rwrb1dAmmz+faOl9ddNlTdQ/XvTWE8="; meta = with lib; { homepage = "https://github.com/cantino/mcfly"; From aecc901b4ba9f36aeb3572f8ac110e7bc57d8079 Mon Sep 17 00:00:00 2001 From: Philipp Date: Mon, 27 Dec 2021 12:38:09 +0100 Subject: [PATCH 34/34] nixos/hydra: Removing self as maintainer --- nixos/tests/hydra/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/hydra/default.nix b/nixos/tests/hydra/default.nix index d92f032b8292..ef5e677953dc 100644 --- a/nixos/tests/hydra/default.nix +++ b/nixos/tests/hydra/default.nix @@ -17,7 +17,7 @@ let makeHydraTest = with pkgs.lib; name: package: makeTest { name = "hydra-${name}"; meta = with pkgs.lib.maintainers; { - maintainers = [ pstn lewo ma27 ]; + maintainers = [ lewo ma27 ]; }; machine = { pkgs, lib, ... }: {