From 33c3d1b4523d15fee70674f81a304a4f16a3acf7 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Mon, 4 Apr 2022 03:43:41 +0000 Subject: [PATCH 01/11] xurls: 2.3.0 -> 2.4.0 --- pkgs/tools/text/xurls/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/text/xurls/default.nix b/pkgs/tools/text/xurls/default.nix index 774626561c9..40fd854adca 100644 --- a/pkgs/tools/text/xurls/default.nix +++ b/pkgs/tools/text/xurls/default.nix @@ -1,18 +1,19 @@ -{ buildGoPackage, lib, fetchFromGitHub }: +{ buildGoModule, lib, fetchFromGitHub }: -buildGoPackage rec { - version = "2.3.0"; +buildGoModule rec { pname = "xurls"; + version = "2.4.0"; src = fetchFromGitHub { owner = "mvdan"; repo = "xurls"; rev = "v${version}"; - sha256 = "sha256-+oWYW7ZigkNS6VADNmVwarIsYyd730RAdDwnNIAYvlA="; + sha256 = "sha256-lyDcwbdVKyFRfsYCcPAgIgvrEEdwK0lxmJTvMJcFBCw="; }; - goPackagePath = "mvdan.cc/xurls/v2"; - subPackages = [ "cmd/xurls" ]; + vendorSha256 = "sha256-lJzgJxW/GW3J09uKQGoEX+UsHnB1pGG71U/zy4b9rXo="; + + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "Extract urls from text"; @@ -20,5 +21,6 @@ buildGoPackage rec { maintainers = with maintainers; [ koral ]; platforms = platforms.unix; license = licenses.bsd3; + mainProgram = "xurls"; }; } From f24f2d04ee2a4805e29e1071298cea37c11c287d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 May 2022 08:44:11 +0000 Subject: [PATCH 02/11] p2pool: 1.9 -> 2.0 --- pkgs/applications/misc/p2pool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/p2pool/default.nix b/pkgs/applications/misc/p2pool/default.nix index cb0b53e887b..9d432556b9e 100644 --- a/pkgs/applications/misc/p2pool/default.nix +++ b/pkgs/applications/misc/p2pool/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "p2pool"; - version = "1.9"; + version = "2.0"; src = fetchFromGitHub { owner = "SChernykh"; repo = "p2pool"; rev = "v${version}"; - sha256 = "sha256-nqJ0F99QjrpwXHRPxZ7kLCYA9VJWGH2ahcr/MBQrhyY="; + sha256 = "sha256-lJJZ0ZsPTPEaYyzi8chAPo1OlZQ6p9QVqwtSOyJD7W4="; fetchSubmodules = true; }; From 689eed6ca6be0995d65cf012cf7a0b683ff76102 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Tue, 3 May 2022 20:01:52 -0400 Subject: [PATCH 03/11] boundary: 0.7.6 -> 0.8.0 --- pkgs/tools/networking/boundary/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/boundary/default.nix b/pkgs/tools/networking/boundary/default.nix index c86c9c5fd68..a03bedcabbf 100644 --- a/pkgs/tools/networking/boundary/default.nix +++ b/pkgs/tools/networking/boundary/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "boundary"; - version = "0.7.6"; + version = "0.8.0"; src = let @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-nsc8S63OUEo9db/hs9oA53Lk+amIsxB/O4TJCs4zdNw="; - aarch64-linux = "sha256-KttqYuF7xC88L49f7JKKr77FbKBihptoBIoemgFInm0="; - x86_64-darwin = "sha256-ov4CtiWsOU/AWfAo7x99RshW6+eU9lFD5ypo6MKyPM0="; - aarch64-darwin = "sha256-3E9fv8BSu7XXIwRmTrDECLNQKdoeUqitKbsTrXs+tTE="; + x86_64-linux = "sha256-cZ41+VwbTQ/X/A0+OL1ZVXVv3eu90H5kMLiHqyc3688="; + aarch64-linux = "sha256-2svJx3rp0swyuXz3WCLRvDTRkweLMVIKrgYekcG8LdE="; + x86_64-darwin = "sha256-zkSESscsapyoMlFdaTzmooOEjUTte8MDNIGVhy9knzc="; + aarch64-darwin = "sha256-A7KNhTWuLjNaO2GyldCDquRur0i5KoXl6GZYQIqt0cI="; }; in fetchzip { From 6eab3568fad850e2bfc67264f5ed1077bc1b683d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 May 2022 02:07:39 +0000 Subject: [PATCH 04/11] fheroes2: 0.9.14 -> 0.9.15 --- pkgs/games/fheroes2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/fheroes2/default.nix b/pkgs/games/fheroes2/default.nix index ff3537cfae9..2125a0ec815 100644 --- a/pkgs/games/fheroes2/default.nix +++ b/pkgs/games/fheroes2/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "fheroes2"; - version = "0.9.14"; + version = "0.9.15"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; rev = version; - sha256 = "sha256-M5sUEOKU7KSenAAE7dUI8algB5XsbQQ1s3sDflZLsiA="; + sha256 = "sha256-bT6asrre16NuavG7X28aHdEPeHdxMBdz2o2KCB+mrbg="; }; buildInputs = [ gettext libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ]; From f26abaa2ef8d4f17d79ef60a4f4a1389d840b7f8 Mon Sep 17 00:00:00 2001 From: Noah Fontes Date: Fri, 13 May 2022 18:53:50 -0700 Subject: [PATCH 05/11] electron: (mostly) remove dependency on libXss.so Electron 10, which is built from Chromium 85.0.4183.84, no longer depends on libXScrnSaver. This was removed from Chromium upstream in revision 782094 (https://chromium-review.googlesource.com/c/chromium/src/+/2261490), which landed in Chromium 85.0.4182.0 (https://storage.googleapis.com/chromium-find-releases-static/aa5.html#aa5c637805cd33366f2181ed6ec54e0ed174a6f9). This change removes the LD_PRELOAD of libXss.so.1 and simply includes libXScrnSaver in the rpath for Electron versions prior to 10.0.0. --- pkgs/development/tools/electron/generic.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/electron/generic.nix b/pkgs/development/tools/electron/generic.nix index 05d9facf60b..72cce135e04 100644 --- a/pkgs/development/tools/electron/generic.nix +++ b/pkgs/development/tools/electron/generic.nix @@ -63,6 +63,7 @@ let electronLibPath = with lib; makeLibraryPath ( [ libuuid at-spi2-atk at-spi2-core libappindicator-gtk3 ] ++ optionals (versionAtLeast version "9.0.0") [ libdrm mesa ] + ++ optionals (versionOlder version "10.0.0") [ libXScrnSaver ] ++ optionals (versionAtLeast version "11.0.0") [ libxkbcommon ] ++ optionals (versionAtLeast version "12.0.0") [ libxshmfence ] ++ optionals (versionAtLeast version "17.0.0") [ libglvnd ] @@ -95,9 +96,7 @@ let $out/lib/electron/electron \ ${lib.optionalString (lib.versionAtLeast version "15.0.0") "$out/lib/electron/chrome_crashpad_handler" } - wrapProgram $out/lib/electron/electron \ - --prefix LD_PRELOAD : ${lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 \ - "''${gappsWrapperArgs[@]}" + wrapProgram $out/lib/electron/electron "''${gappsWrapperArgs[@]}" ''; }; From f4ab23a73b7173849d4eb66a4bc4dcdba1a9bd72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Gia=20Phong?= Date: Sat, 14 May 2022 16:04:03 +0900 Subject: [PATCH 06/11] dendrite: 0.8.4 -> 0.8.5 --- pkgs/servers/dendrite/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/dendrite/default.nix b/pkgs/servers/dendrite/default.nix index 2b12a47edc8..71843ee8c76 100644 --- a/pkgs/servers/dendrite/default.nix +++ b/pkgs/servers/dendrite/default.nix @@ -1,17 +1,18 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchurl, nixosTests, postgresql, postgresqlTestHook }: +{ lib, buildGoModule, fetchFromGitHub +, nixosTests, postgresql, postgresqlTestHook }: buildGoModule rec { pname = "matrix-dendrite"; - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "matrix-org"; repo = "dendrite"; rev = "v${version}"; - sha256 = "sha256-w4un+TdFTzfVZltvo6ZAPQ3B9HJvnGlJW+LmZHuYk1M="; + sha256 = "sha256-MPWvBUI6Mqt3f5UY6lpTBwPpihW+QSNq1M3FnIff+mM="; }; - vendorSha256 = "sha256-AJ7Hn23aji/cXioDaOSyF8XD3Mr135DZf7KbUW1SoJ4="; + vendorSha256 = "sha256-OXy2xuwTLPNvBnVB6wj/YRW/XMiekjTubRRPVX9bxdQ="; checkInputs = [ postgresqlTestHook @@ -31,8 +32,8 @@ buildGoModule rec { }; meta = with lib; { - homepage = "https://matrix.org"; - description = "Dendrite is a second-generation Matrix homeserver written in Go!"; + homepage = "https://matrix-org.github.io/dendrite"; + description = "A second-generation Matrix homeserver written in Go"; license = licenses.asl20; maintainers = teams.matrix.members; platforms = platforms.unix; From 7e65f4e8651c74659844b07f22e2d3ddd9c2eb02 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 May 2022 16:08:02 +0200 Subject: [PATCH 07/11] python310Packages.pymbolic: remove pytest --- .../python-modules/pymbolic/default.nix | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pymbolic/default.nix b/pkgs/development/python-modules/pymbolic/default.nix index 9d6d799fc32..44aa012d57d 100644 --- a/pkgs/development/python-modules/pymbolic/default.nix +++ b/pkgs/development/python-modules/pymbolic/default.nix @@ -2,17 +2,21 @@ , buildPythonPackage , fetchPypi , matchpy -, pytools , pytestCheckHook +, pythonOlder +, pytools }: buildPythonPackage rec { pname = "pymbolic"; version = "2022.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-tS9FHdC5gD4D3jMgrzt85XIwcAYcbSMcACFvbaQlkBI="; + hash = "sha256-tS9FHdC5gD4D3jMgrzt85XIwcAYcbSMcACFvbaQlkBI="; }; propagatedBuildInputs = [ @@ -24,10 +28,20 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + # pytest is a test requirement not a run-time one + substituteInPlace setup.py \ + --replace '"pytest>=2.3",' "" + ''; + + pythonImportsCheck = [ + "pymbolic" + ]; + meta = with lib; { description = "A package for symbolic computation"; homepage = "https://documen.tician.de/pymbolic/"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } From d42fd31f18375219239e2ca64ed789e05e9cb161 Mon Sep 17 00:00:00 2001 From: Michael Livshin Date: Thu, 5 May 2022 11:59:36 +0300 Subject: [PATCH 08/11] zerotierone: 1.8.4 -> 1.8.9 --- pkgs/tools/networking/zerotierone/default.nix | 64 ++++++++++++++----- 1 file changed, 49 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index 3062befe2d3..5a9239e2737 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -1,15 +1,37 @@ -{ lib, stdenv, buildPackages, fetchFromGitHub, openssl, lzo, zlib, iproute2, ronn }: +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, fetchurl -stdenv.mkDerivation rec { +, buildPackages +, iproute2 +, lzo +, openssl +, pkg-config +, ronn +, zlib +}: + +let pname = "zerotierone"; - version = "1.8.4"; + version = "1.8.9"; src = fetchFromGitHub { owner = "zerotier"; repo = "ZeroTierOne"; rev = version; - sha256 = "sha256-aM0FkcrSd5dEJVdJryIGuyWNFwvKH0SBfOuy4dIMK4A="; + sha256 = "sha256-N1VqzjaFJRJiSG4qHqRy4Fs8TlkUqyDoq0/3JQdGwfA="; + }; +in stdenv.mkDerivation { + inherit pname version src; + + cargoDeps = rustPlatform.fetchCargoTarball { + src = "${src}/zeroidc"; + name = "${pname}-${version}"; + sha256 = "sha256-PDsJtz279P2IpgiL0T92IbcANeGSUnGKhEH1dj9VtbM="; }; + postPatch = "cp ${src}/zeroidc/Cargo.lock Cargo.lock"; preConfigure = '' patchShebangs ./doc/build.sh @@ -20,9 +42,19 @@ stdenv.mkDerivation rec { --replace 'armv5' 'armv6' ''; - - nativeBuildInputs = [ ronn ]; - buildInputs = [ openssl lzo zlib iproute2 ]; + nativeBuildInputs = [ + pkg-config + ronn + rustPlatform.cargoSetupHook + rustPlatform.rust.cargo + rustPlatform.rust.rustc + ]; + buildInputs = [ + iproute2 + lzo + openssl + zlib + ]; enableParallelBuilding = true; @@ -30,18 +62,20 @@ stdenv.mkDerivation rec { doCheck = stdenv.hostPlatform == stdenv.buildPlatform; checkPhase = '' + runHook preCheck ./zerotier-selftest + runHook postCheck ''; - installPhase = '' - install -Dt "$out/bin/" zerotier-one - ln -s $out/bin/zerotier-one $out/bin/zerotier-idtool - ln -s $out/bin/zerotier-one $out/bin/zerotier-cli + installFlags = [ "DESTDIR=$$out/upstream" ]; + + postInstall = '' + mv $out/upstream/usr/sbin $out/bin + + mkdir -p $man/share + mv $out/upstream/usr/share/man $man/share/man - mkdir -p $man/share/man/man8 - for cmd in zerotier-one.8 zerotier-cli.1 zerotier-idtool.1; do - cat doc/$cmd | gzip -9n > $man/share/man/man8/$cmd.gz - done + rm -rf $out/upstream ''; outputs = [ "out" "man" ]; From 3f1452773af62af4ad8683fb4d23fb4bde44f9f7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 May 2022 16:51:51 +0200 Subject: [PATCH 09/11] python310Packages.pynetdicom: disable failing test --- pkgs/development/python-modules/pynetdicom/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pynetdicom/default.nix b/pkgs/development/python-modules/pynetdicom/default.nix index 32c93b50e55..52860b00174 100644 --- a/pkgs/development/python-modules/pynetdicom/default.nix +++ b/pkgs/development/python-modules/pynetdicom/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pydicom"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/JWQUtFBW4uqCbs/nUxj1pRBfTCXV4wcqTkqvzpdFrM="; + hash = "sha256-/JWQUtFBW4uqCbs/nUxj1pRBfTCXV4wcqTkqvzpdFrM="; }; propagatedBuildInputs = [ @@ -41,6 +41,7 @@ buildPythonPackage rec { "TestEchoSCP" "TestEchoSCPCLI" "TestEventHandlingAcceptor" + "TestEventHandlingRequestor" "TestFindSCP" "TestFindSCPCLI" "TestGetSCP" From 7591fec329e34f31739aea31cbd582174063e737 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 16 May 2022 00:21:26 +0800 Subject: [PATCH 10/11] xurls: remove unnecessary platforms and mainProgram --- pkgs/tools/text/xurls/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/tools/text/xurls/default.nix b/pkgs/tools/text/xurls/default.nix index 40fd854adca..4da65d9af02 100644 --- a/pkgs/tools/text/xurls/default.nix +++ b/pkgs/tools/text/xurls/default.nix @@ -19,8 +19,6 @@ buildGoModule rec { description = "Extract urls from text"; homepage = "https://github.com/mvdan/xurls"; maintainers = with maintainers; [ koral ]; - platforms = platforms.unix; license = licenses.bsd3; - mainProgram = "xurls"; }; } From 47c4c68fdf2dc0711e2d5cb17405a931d4bbb141 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 15 May 2022 19:08:40 +0200 Subject: [PATCH 11/11] php: Remove fixes for abandoned PHP versions --- pkgs/development/php-packages/memcached/default.nix | 2 -- pkgs/development/php-packages/openswoole/default.nix | 1 - pkgs/development/php-packages/redis/default.nix | 2 -- pkgs/development/php-packages/snuffleupagus/default.nix | 2 -- pkgs/development/php-packages/swoole/default.nix | 1 - 5 files changed, 8 deletions(-) diff --git a/pkgs/development/php-packages/memcached/default.nix b/pkgs/development/php-packages/memcached/default.nix index 5e56882c9d2..9724904d52b 100644 --- a/pkgs/development/php-packages/memcached/default.nix +++ b/pkgs/development/php-packages/memcached/default.nix @@ -13,8 +13,6 @@ buildPecl rec { internalDeps = [ php.extensions.session - ] ++ lib.optionals (lib.versionOlder php.version "7.4") [ - php.extensions.hash ]; configureFlags = [ diff --git a/pkgs/development/php-packages/openswoole/default.nix b/pkgs/development/php-packages/openswoole/default.nix index 49379dfd541..d43ed40f8ce 100644 --- a/pkgs/development/php-packages/openswoole/default.nix +++ b/pkgs/development/php-packages/openswoole/default.nix @@ -9,7 +9,6 @@ buildPecl { sha256 = "sha256-Rhoa4ny86dwB3e86/1W30AlDGRUDYjK8RusquKF5Izg="; buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin) [ valgrind ]; - internalDeps = lib.optionals (lib.versionOlder php.version "7.4") [ php.extensions.hash ]; meta = with lib; { changelog = "https://pecl.php.net/package/openswoole/${version}"; diff --git a/pkgs/development/php-packages/redis/default.nix b/pkgs/development/php-packages/redis/default.nix index 070112ba655..e4b16dd991a 100644 --- a/pkgs/development/php-packages/redis/default.nix +++ b/pkgs/development/php-packages/redis/default.nix @@ -10,8 +10,6 @@ buildPecl { session ] ++ lib.optionals (lib.versionOlder php.version "8.0") [ json - ] ++ lib.optionals (lib.versionOlder php.version "7.4") [ - hash ]; meta = with lib; { diff --git a/pkgs/development/php-packages/snuffleupagus/default.nix b/pkgs/development/php-packages/snuffleupagus/default.nix index 4318a49a8aa..7a1c401b93a 100644 --- a/pkgs/development/php-packages/snuffleupagus/default.nix +++ b/pkgs/development/php-packages/snuffleupagus/default.nix @@ -22,8 +22,6 @@ buildPecl rec { internalDeps = with php.extensions; [ session - ] ++ lib.optionals (lib.versionOlder php.version "7.4") [ - hash ]; patches = [ diff --git a/pkgs/development/php-packages/swoole/default.nix b/pkgs/development/php-packages/swoole/default.nix index 201b78e4966..fb69c18710a 100644 --- a/pkgs/development/php-packages/swoole/default.nix +++ b/pkgs/development/php-packages/swoole/default.nix @@ -7,7 +7,6 @@ buildPecl { sha256 = "sha256-SnhDRC7/a7BTHn87c6YCz/R8jI6aES1ibSD6YAl6R+I="; buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin) [ valgrind ]; - internalDeps = lib.optionals (lib.versionOlder php.version "7.4") [ php.extensions.hash ]; doCheck = true; checkTarget = "tests";