From 138471e084aff615eabfa879a9fad772492bf92a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 05:23:45 +0000 Subject: [PATCH 01/19] coredns: 1.9.0 -> 1.9.1 --- pkgs/servers/dns/coredns/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix index 7e6347e9ba36..d6d80d3f5187 100644 --- a/pkgs/servers/dns/coredns/default.nix +++ b/pkgs/servers/dns/coredns/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "coredns"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "coredns"; repo = "coredns"; rev = "v${version}"; - sha256 = "sha256-8IYJxb+HssS2xTboBRo3lz9czklt/Sn098ATlDaO7Gs="; + sha256 = "sha256-1lJrbazEgsRHI10qIgA9KgglsxpnMIdxEWpu6RiJ0pQ="; }; - vendorSha256 = "sha256-Vxs+k4WF55xwjgdlW/1NM4NWnYqj2EOLOONflj+BoY4="; + vendorSha256 = "sha256-ueEuduZ76FUs2wE8oiHGON9+s91jaHhS6gOKr7MNh8g="; doCheck = false; From fff16ecd628a6fe2ab1f845c4cd394be88647ef5 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 16 Mar 2022 20:15:37 -0400 Subject: [PATCH 02/19] boundary: 0.7.5 -> 0.7.6 --- 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 3745856a8c0b..c86c9c5fd681 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.5"; + version = "0.7.6"; src = let @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-wqNeeEQhR8cj7Gpbzp7UQV0j+w0peo41uKqgK9BoLH4="; - aarch64-linux = "sha256-HK/6eMBWUW1IbYE5RpInhcQuIw16X9vQEZmOBje9Yzk="; - x86_64-darwin = "sha256-ghgkPlEN9DHFviQzcGS/+oG+9Qqy2AfJ2IEyiSMJwwY="; - aarch64-darwin = "sha256-F4iOCxAm8s34KktuS5PRPkIg9A0179H6zlOM3OuTyUw="; + x86_64-linux = "sha256-nsc8S63OUEo9db/hs9oA53Lk+amIsxB/O4TJCs4zdNw="; + aarch64-linux = "sha256-KttqYuF7xC88L49f7JKKr77FbKBihptoBIoemgFInm0="; + x86_64-darwin = "sha256-ov4CtiWsOU/AWfAo7x99RshW6+eU9lFD5ypo6MKyPM0="; + aarch64-darwin = "sha256-3E9fv8BSu7XXIwRmTrDECLNQKdoeUqitKbsTrXs+tTE="; }; in fetchzip { From bf9dd018b012bc173cbc7d2ff8acaee1c5f4e7d8 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Thu, 17 Mar 2022 13:54:18 +0000 Subject: [PATCH 03/19] driftctl: 0.23.0 -> 0.23.2 --- pkgs/applications/networking/cluster/driftctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/driftctl/default.nix b/pkgs/applications/networking/cluster/driftctl/default.nix index 4c22b9adca5f..03f5ccda4009 100644 --- a/pkgs/applications/networking/cluster/driftctl/default.nix +++ b/pkgs/applications/networking/cluster/driftctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "driftctl"; - version = "0.23.0"; + version = "0.23.2"; src = fetchFromGitHub { owner = "snyk"; repo = "driftctl"; rev = "v${version}"; - sha256 = "sha256-TUwTvCsWB+n+shVU1hTzLYROG9Wp4ySzJwAnappK7TY="; + sha256 = "sha256-hGwQdR2LF1uuq11d2BD4hVjcXpPCbRNovOqJpj0J1Sw="; }; vendorSha256 = "sha256-I0OCRhUvuaF4k5qqPaV6R24mrd9AG5GgQCCF6yodK0E="; From 23ed2e1816664d3de38b015b086dffd3d32eb045 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Mar 2022 18:46:48 +0000 Subject: [PATCH 04/19] opentelemetry-collector: 0.46.0 -> 0.47.0 --- pkgs/tools/misc/opentelemetry-collector/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix index 851d4f2dc182..1feb290bb137 100644 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -12,17 +12,17 @@ let in buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.46.0"; + version = "0.47.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "v${version}"; - sha256 = "sha256-ibaA9oCSsId9A4ul5sfM+L8ExBl+Wv7rhGnb6TZ4WJw="; + sha256 = "sha256-1dMdQWV+gxbMc/2iVsB1LCsYxR0bt5AJEvoFq2/KHCg="; }; # there is a nested go.mod sourceRoot = "source/cmd/otelcorecol"; - vendorSha256 = "sha256-Okmsd/skfBmkyLv9oPFH0QvewFZFPpUH2ahWxHt7cy8="; + vendorSha256 = "sha256-ps6fUVg7vhGgy47WTJv/U1qHQ2MGXIWXNZ5Rddo1yQY="; preBuild = '' # set the build version, can't be done via ldflags From 6fd43b8e74384708b2d39aa8b8dec6fd7adde04c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Mar 2022 21:17:25 +0000 Subject: [PATCH 05/19] v2ray-geoip: 202203100039 -> 202203170039 --- pkgs/data/misc/v2ray-geoip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index b92014b30e06..7e2b12e863fb 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202203100039"; + version = "202203170039"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "564c2c8de36d3680a1d5f209d6bb05e4f3f70dfc"; - sha256 = "sha256-JPpzIppgKQox8T6VC/kzhpLy+YAcuHdH5L6zqciOXow="; + rev = "0b5c94c368dc5f70ebf995e87188aa8f40d45489"; + sha256 = "sha256-iaqU6CkrewICONps43nbZaUiM2aahSwfSD5bZz1P4Zc="; }; installPhase = '' From f40c61ef507b966312a609a73964362d6f18c888 Mon Sep 17 00:00:00 2001 From: Joel Date: Fri, 18 Mar 2022 09:42:40 +1000 Subject: [PATCH 06/19] apkeep: 0.9.0 -> 0.10.0 https://github.com/EFForg/apkeep/blob/master/CHANGELOG.md#0100---2022-03-17 --- pkgs/tools/misc/apkeep/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/apkeep/default.nix b/pkgs/tools/misc/apkeep/default.nix index d405302282f5..ef7699ccf284 100644 --- a/pkgs/tools/misc/apkeep/default.nix +++ b/pkgs/tools/misc/apkeep/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "apkeep"; - version = "0.9.0"; + version = "0.10.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-ST1ifON25mizKZQX3fKeqBloXWW9LXDq5JkZIeiguRY="; + sha256 = "14vm3b2gbmn9pil0aagwchn4kyvi9311id6qv4a376qfb6r1aybf"; }; - cargoSha256 = "sha256-/Xh1s4PO336B1ioKe0IKVGDACpMuXOpxA82U6zn2lj0="; + cargoSha256 = "0i8wzc58ji317kjdw3ls1908z4bqlh1cgjph0fxsvs5i552qjkzp"; prePatch = '' rm .cargo/config.toml From 55dae422e271c4583756913760f2e2d1a0f5557b Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 20 Feb 2022 21:35:14 -0800 Subject: [PATCH 07/19] go: add mips64 support --- pkgs/development/compilers/go/1.16.nix | 3 ++- pkgs/development/compilers/go/1.17.nix | 3 ++- pkgs/development/compilers/go/1.18.nix | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/go/1.16.nix b/pkgs/development/compilers/go/1.16.nix index 872ade45946d..add1e70bbe3d 100644 --- a/pkgs/development/compilers/go/1.16.nix +++ b/pkgs/development/compilers/go/1.16.nix @@ -45,7 +45,8 @@ let "riscv64" = "riscv64"; "s390x" = "s390x"; "powerpc64le" = "ppc64le"; - }.${platform.parsed.cpu.name} or (throw "Unsupported system"); + "mips64el" = "mips64le"; + }.${platform.parsed.cpu.name} or (throw "Unsupported system: ${platform.parsed.cpu.name}"); # We need a target compiler which is still runnable at build time, # to handle the cross-building case where build != host == target diff --git a/pkgs/development/compilers/go/1.17.nix b/pkgs/development/compilers/go/1.17.nix index a72593587490..69537dc899e8 100644 --- a/pkgs/development/compilers/go/1.17.nix +++ b/pkgs/development/compilers/go/1.17.nix @@ -45,7 +45,8 @@ let "riscv64" = "riscv64"; "s390x" = "s390x"; "powerpc64le" = "ppc64le"; - }.${platform.parsed.cpu.name} or (throw "Unsupported system"); + "mips64el" = "mips64le"; + }.${platform.parsed.cpu.name} or (throw "Unsupported system: ${platform.parsed.cpu.name}"); # We need a target compiler which is still runnable at build time, # to handle the cross-building case where build != host == target diff --git a/pkgs/development/compilers/go/1.18.nix b/pkgs/development/compilers/go/1.18.nix index 23e9f70d4da2..a4cb013d94f2 100644 --- a/pkgs/development/compilers/go/1.18.nix +++ b/pkgs/development/compilers/go/1.18.nix @@ -45,7 +45,8 @@ let "riscv64" = "riscv64"; "s390x" = "s390x"; "powerpc64le" = "ppc64le"; - }.${platform.parsed.cpu.name} or (throw "Unsupported system"); + "mips64el" = "mips64le"; + }.${platform.parsed.cpu.name} or (throw "Unsupported system: ${platform.parsed.cpu.name}"); # We need a target compiler which is still runnable at build time, # to handle the cross-building case where build != host == target From a05a02a88a6eab9d7b98aa1a0237862945134036 Mon Sep 17 00:00:00 2001 From: nixpkgs-upkeep-bot Date: Fri, 18 Mar 2022 00:37:10 +0000 Subject: [PATCH 08/19] python3Packages.jax: 0.3.1 -> 0.3.3 --- pkgs/development/python-modules/jax/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index d5e536540195..34665bb82756 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -19,7 +19,7 @@ let in buildPythonPackage rec { pname = "jax"; - version = "0.3.1"; + version = "0.3.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "google"; repo = pname; rev = "${pname}-v${version}"; - sha256 = "0bpqmyc4hg25i8cfnrx3y2bwgp6h5rri2a1q9i8gb6r0id97zvcn"; + sha256 = "12k5kzgs2cxf9nvcc10a9ldl4zn68b5cnkhchfj1s7f61abx6nq3"; }; patches = [ From cc1e9f425796770d9906d3cf79d74003a6b16803 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 17 Mar 2022 21:05:41 -0300 Subject: [PATCH 09/19] abook: set platforms to unix --- pkgs/applications/misc/abook/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/abook/default.nix b/pkgs/applications/misc/abook/default.nix index de463cfd6665..e822f869619b 100644 --- a/pkgs/applications/misc/abook/default.nix +++ b/pkgs/applications/misc/abook/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { description = "Text-based addressbook program designed to use with mutt mail client"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.edwtjo ]; - platforms = with lib.platforms; linux; + platforms = with lib.platforms; unix; }; } From 10ac0aa57cf333d91d081044d45a2ad0e2a49301 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Mar 2022 04:15:45 +0000 Subject: [PATCH 10/19] cargo-about: 0.4.8 -> 0.5.0 --- pkgs/tools/package-management/cargo-about/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/cargo-about/default.nix b/pkgs/tools/package-management/cargo-about/default.nix index a61aff2107de..0ed6f978ba96 100644 --- a/pkgs/tools/package-management/cargo-about/default.nix +++ b/pkgs/tools/package-management/cargo-about/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "cargo-about"; - version = "0.4.8"; + version = "0.5.0"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-about"; rev = version; - sha256 = "sha256-cKzGg3fAXKqnBZES3YUMbv1ZAcLqo6AdrXKXSFSAnis="; + sha256 = "sha256-M09X7UwrTtrOhOphhpGHSAqxneY50jNrFKJCeBQhRfc="; }; # enable pkg-config feature of zstd cargoPatches = [ ./zstd-pkg-config.patch ]; - cargoSha256 = "sha256-OLrxqbTIhHMNPEnSAUbTqoYnaZi/BxbWUCxaTo9Zyww="; + cargoSha256 = "sha256-E1+OfVAzrezXoUz9Nlyhdq1xxEWm4UJhVyp+nG7UmYY="; nativeBuildInputs = [ pkg-config ]; From f105bc3c289be7adc68d898d4cfd98a4c82c42ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Mar 2022 13:12:39 +0000 Subject: [PATCH 11/19] jql: 3.1.1 -> 3.1.2 --- pkgs/development/tools/jql/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/jql/default.nix b/pkgs/development/tools/jql/default.nix index 732175edab9c..7607b1307f44 100644 --- a/pkgs/development/tools/jql/default.nix +++ b/pkgs/development/tools/jql/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "jql"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "yamafaktory"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CntAxOsAaKkCvQanLZ4d99VEGrbsVM+IYOhUuimvjlA="; + sha256 = "sha256-UC+1I87PPDuu+/A5zO2Q/Z5KbO/5jHuxsJ0r7a+uDLM="; }; - cargoSha256 = "sha256-mzHLAmm0wvF35ku+wg6QG/pKwIFjb22fOtBmMhgC0Ik="; + cargoSha256 = "sha256-0ezrcploLboYExcRzNnKj/vWgbJuBhteWi/Imlr4Wsg="; meta = with lib; { description = "A JSON Query Language CLI tool built with Rust"; From 6d9ad3ba4a87e0e02acc658440b1647f4b6b1652 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 21:01:59 +0000 Subject: [PATCH 12/19] rust-analyzer-unwrapped: 2022-02-28 -> 2022-03-07 --- pkgs/development/tools/rust/rust-analyzer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 2221ae0a14b3..f155fdbaf788 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2022-02-28"; - cargoSha256 = "sha256-dTw6xp99uGtGp6YuqAX3r3GDD6Wto3KHTaO2DUUE2FA="; + version = "2022-03-07"; + cargoSha256 = "sha256-geMzdo5frW5VkuTwBHKHXCTJZrHDUIRSTs2kkCfA5Vc="; src = fetchFromGitHub { owner = "rust-analyzer"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-GQ1cPO4povnozLl0MTFs0ZXpmBn+AZeFWQVnxHHWf9g="; + sha256 = "sha256-/qKh4utesAjlyG8A3hEmSx+HBgh48Uje6ZRtUGz5f0g="; }; patches = [ From a62722a794e9caf1d6d92423ef358942ad12d8de Mon Sep 17 00:00:00 2001 From: Gabriel Lievano Date: Thu, 17 Mar 2022 17:54:43 -0700 Subject: [PATCH 13/19] maintainers: add rgnns --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e26d693c39c1..3acbd8d23438 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10386,6 +10386,12 @@ githubId = 22803888; name = "Lu Hongxu"; }; + rgnns = { + email = "jglievano@gmail.com"; + github = "rgnns"; + githubId = 811827; + name = "Gabriel Lievano"; + }; rgrunbla = { email = "remy@grunblatt.org"; github = "rgrunbla"; From 4e630bb272defb86d3d68a023574cd3411cb9af1 Mon Sep 17 00:00:00 2001 From: Gabriel Lievano Date: Thu, 17 Mar 2022 17:59:05 -0700 Subject: [PATCH 14/19] zld: init at 1.3.3 --- pkgs/development/tools/zld/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/tools/zld/default.nix diff --git a/pkgs/development/tools/zld/default.nix b/pkgs/development/tools/zld/default.nix new file mode 100644 index 000000000000..408e3308b658 --- /dev/null +++ b/pkgs/development/tools/zld/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, fetchzip }: + +stdenv.mkDerivation rec { + pname = "zld"; + version = "1.3.3"; + src = fetchzip { + url = "https://github.com/michaeleisel/zld/releases/download/${version}/zld.zip"; + sha256 = "0qb4l7a4vhpnzkgzhw0jivz40jr5gdhqfyynhbkhn7ryh5s52d1p"; + }; + + installPhase = '' + mkdir -p $out/bin + cp zld $out/bin/ + ''; + + meta = with lib; { + description = "A faster version of Apple's linker"; + homepage = "https://github.com/michaeleisel/zld"; + license = licenses.mit; + maintainers = [ maintainers.rgnns ]; + platforms = platforms.darwin; + hydraPlatforms = []; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2191b7ace9ca..0a6a4013d350 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11565,6 +11565,8 @@ with pkgs; zimwriterfs = callPackage ../tools/text/zimwriterfs { }; + zld = callPackage ../development/tools/zld { }; + par = callPackage ../tools/text/par { }; zip = callPackage ../tools/archivers/zip { }; From 027787bb532d9900d413e55ec837f3198f594423 Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 17 Mar 2022 20:20:31 -0400 Subject: [PATCH 15/19] pythonPackages.google-auth: fix darwin aarch64 build --- pkgs/development/python-modules/google-auth/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix index c7fcb1a48ed1..203053d53cd7 100644 --- a/pkgs/development/python-modules/google-auth/default.nix +++ b/pkgs/development/python-modules/google-auth/default.nix @@ -59,6 +59,15 @@ buildPythonPackage rec { "test_request_headers" "test_request_error" "test_request_basic" + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # E MemoryError: Cannot allocate write+execute memory for ffi.callback(). + # You might be running on a system that prevents this. + # For more information, see https://cffi.readthedocs.io/en/latest/using.html#callbacks + "test_configure_mtls_channel_with_callback" + "test_configure_mtls_channel_with_metadata" + "TestDecryptPrivateKey" + "TestMakeMutualTlsHttp" + "TestMutualTlsAdapter" ]; meta = with lib; { From c6108020ffa61b55d823f11da85c24566c582217 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 27 Feb 2022 03:53:10 -0800 Subject: [PATCH 16/19] rust: add mips64el to list of bootstrap tarballs --- pkgs/development/compilers/rust/print-hashes.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/rust/print-hashes.sh b/pkgs/development/compilers/rust/print-hashes.sh index ebf8d900bb3b..dd2c116a341b 100755 --- a/pkgs/development/compilers/rust/print-hashes.sh +++ b/pkgs/development/compilers/rust/print-hashes.sh @@ -19,6 +19,7 @@ PLATFORMS=( aarch64-apple-darwin powerpc64le-unknown-linux-gnu riscv64gc-unknown-linux-gnu + mips64el-unknown-linux-gnuabi64 ) BASEURL=https://static.rust-lang.org/dist VERSION=${1:-} From c12cec8bc39c3c1153a42032a03a83d149d1e2ac Mon Sep 17 00:00:00 2001 From: j-k Date: Fri, 18 Mar 2022 04:47:19 +0000 Subject: [PATCH 17/19] _7zz: correct license (#163999) * _7zz: correct license and remove p7zip dependency The code under Compress/Rar* is licensed under a specific unRAR license Also Compress/LzfseDecoder.cpp is covered by BSD3 The unRAR code is removed from the `.tar.xz` since the license posits you agree or remove the code from your hard drive This adds some complexity to updating 7zz so there is also an update script Meta has been updated and tweaked Source is now downloaded from sourceforge in the `.tar.xz` version to avoid depending on p7zip * _7zz: add notice of the license updates and optional unRAR licenced code --- .../from_md/release-notes/rl-2205.section.xml | 6 ++ .../manual/release-notes/rl-2205.section.md | 2 + pkgs/tools/archivers/7zz/default.nix | 58 ++++++++++++++++--- pkgs/tools/archivers/7zz/update.sh | 50 ++++++++++++++++ 4 files changed, 109 insertions(+), 7 deletions(-) create mode 100755 pkgs/tools/archivers/7zz/update.sh diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 7ef03b1f5e1c..ee0f94bfce31 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -760,6 +760,12 @@ unmaintained + + + pkgs._7zz is now correctly licensed as + LGPL3+ and BSD3 with optional unfree unRAR licensed code + + tilp2 was removed together with its module diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index d592d6896116..148543802d00 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -304,6 +304,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `pkgs.docbookrx` was removed since it's unmaintained +- `pkgs._7zz` is now correctly licensed as LGPL3+ and BSD3 with optional unfree unRAR licensed code + - `tilp2` was removed together with its module - The F-PROT antivirus (`fprot` package) and its service module were removed because it diff --git a/pkgs/tools/archivers/7zz/default.nix b/pkgs/tools/archivers/7zz/default.nix index c93a750e48f0..c4ccae0272eb 100644 --- a/pkgs/tools/archivers/7zz/default.nix +++ b/pkgs/tools/archivers/7zz/default.nix @@ -1,4 +1,14 @@ -{ stdenv, lib, fetchurl, p7zip, uasm, useUasm ? stdenv.isx86_64 }: +{ stdenv +, lib +, fetchurl + +, uasm +, useUasm ? stdenv.isx86_64 + + # RAR code is under non-free unRAR license + # see the meta.license section below for more details +, enableUnfree ? false +}: let inherit (stdenv.hostPlatform) system; @@ -14,17 +24,38 @@ stdenv.mkDerivation rec { version = "21.07"; src = fetchurl { - url = "https://7-zip.org/a/7z${lib.replaceStrings [ "." ] [ "" ] version}-src.7z"; - sha256 = "sha256-0QdNVvQVqrmdmeWXp7ZtxFXbpjSa6KTInfdkdbahKEw="; + url = "https://7-zip.org/a/7z${lib.replaceStrings [ "." ] [ "" ] version}-src.tar.xz"; + sha256 = { + free = "sha256-SMM6kQ6AZ05s4miJjMoE4NnsXQ0tlkdWx0q2HKjhaM8="; + unfree = "sha256-IT1ZRAfLjvy6NmELFSykkh7aFBYzELQ5A9E+aDE+Hjk="; + }.${if enableUnfree then "unfree" else "free"}; + downloadToTemp = (!enableUnfree); + # remove the unRAR related code from the src drv + # > the license requires that you agree to these use restrictions, + # > or you must remove the software (source and binary) from your hard disks + # https://fedoraproject.org/wiki/Licensing:Unrar + postFetch = lib.optionalString (!enableUnfree) '' + mkdir tmp + tar xf $downloadedFile -C ./tmp + rm -r ./tmp/CPP/7zip/Compress/Rar* + tar cfJ $out -C ./tmp . \ + --sort=name \ + --mtime="@$SOURCE_DATE_EPOCH" \ + --owner=0 --group=0 --numeric-owner \ + --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime + ''; }; sourceRoot = "CPP/7zip/Bundles/Alone2"; - makeFlags = lib.optionals useUasm [ "MY_ASM=uasm" ]; + makeFlags = + lib.optionals useUasm [ "MY_ASM=uasm" ] ++ + # it's the compression code with the restriction, see DOC/License.txt + lib.optionals (!enableUnfree) [ "DISABLE_RAR_COMPRESS=true" ]; makefile = "../../cmpl_gcc${platformSuffix}.mak"; - nativeBuildInputs = [ p7zip ] ++ lib.optionals useUasm [ uasm ]; + nativeBuildInputs = lib.optionals useUasm [ uasm ]; enableParallelBuilding = true; @@ -40,14 +71,27 @@ stdenv.mkDerivation rec { doInstallCheck = true; installCheckPhase = '' + runHook preInstallCheck + $out/bin/7zz --help | grep ${version} + + runHook postInstallCheck ''; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "Command line archiver utility"; homepage = "https://7-zip.org"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ anna328p peterhoeg ]; + license = with licenses; + # 7zip code is largely lgpl2Plus + # CPP/7zip/Compress/LzfseDecoder.cpp is bsd3 + [ lgpl2Plus /* and */ bsd3 ] ++ + # and CPP/7zip/Compress/Rar* are unfree with the unRAR license restriction + # the unRAR compression code is disabled by default + lib.optionals enableUnfree [ unfree ]; + maintainers = with maintainers; [ anna328p peterhoeg jk ]; platforms = platforms.linux; + mainProgram = "7zz"; }; } diff --git a/pkgs/tools/archivers/7zz/update.sh b/pkgs/tools/archivers/7zz/update.sh new file mode 100755 index 000000000000..bbc9804799ab --- /dev/null +++ b/pkgs/tools/archivers/7zz/update.sh @@ -0,0 +1,50 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p coreutils gnused curl jq +set -euo pipefail +cd "$(dirname "${BASH_SOURCE[0]}")" + +DRV_DIR="$PWD" + +OLD_VERSION="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" + +NEW_VERSION="$(curl "https://sourceforge.net/projects/sevenzip/best_release.json" | jq '.platform_releases.linux.filename' -r | cut -d/ -f3)" + +echo "comparing versions $OLD_VERSION => $NEW_VERSION" +if [[ "$OLD_VERSION" == "$NEW_VERSION" ]]; then + echo "Already up to date! Doing nothing" + exit 0 +fi + +NIXPKGS_ROOT="$(realpath "$DRV_DIR/../../../..")" + +echo "getting free source hash" +OLD_FREE_HASH="$(nix-instantiate --eval --strict -E "with import $NIXPKGS_ROOT {}; _7zz.src.drvAttrs.outputHash" | tr -d '"')" +echo "getting unfree source hash" +OLD_UNFREE_HASH="$(nix-instantiate --eval --strict -E "with import $NIXPKGS_ROOT {}; (_7zz.override { enableUnfree = true; }).src.drvAttrs.outputHash" | tr -d '"')" + +NEW_VERSION_FORMATTED="$(echo "$NEW_VERSION" | tr -d '.')" +URL="https://7-zip.org/a/7z${NEW_VERSION_FORMATTED}-src.tar.xz" + + +NEW_FREE_HASH=$(nix-prefetch -f "$NIXPKGS_ROOT" -E "_7zz.src" --url "$URL") + +NEW_UNFREE_OUT=$(nix-prefetch -f "$NIXPKGS_ROOT" -E "(_7zz.override { enableUnfree = true; }).src" --url "$URL" --output raw --print-path) +# first line of raw output is the hash +NEW_UNFREE_HASH="$(echo "$NEW_UNFREE_OUT" | sed -n 1p)" +# second line of raw output is the src path +NEW_UNFREE_SRC="$(echo "$NEW_UNFREE_OUT" | sed -n 2p)" +# make sure to nuke the unfree src from the updater's machine +# > the license requires that you agree to these use restrictions, or you must remove the software (source and binary) from your hard disks +# https://fedoraproject.org/wiki/Licensing:Unrar +nix-store --delete "$NEW_UNFREE_SRC" + + +echo "updating version" +sed -i "s/version = \"$OLD_VERSION\";/version = \"$NEW_VERSION\";/" "$DRV_DIR/default.nix" + +echo "updating free hash" +sed -i "s@free = \"$OLD_FREE_HASH\";@free = \"$NEW_FREE_HASH\";@" "$DRV_DIR/default.nix" +echo "updating unfree hash" +sed -i "s@unfree = \"$OLD_UNFREE_HASH\";@unfree = \"$NEW_UNFREE_HASH\";@" "$DRV_DIR/default.nix" + +echo "done" From 88d93f50320574f10f2e72e669582c30984928c9 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 17 Mar 2022 22:31:53 -0700 Subject: [PATCH 18/19] python3Packages.flatdict: init at 4.0.0 --- .../python-modules/flatdict/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/flatdict/default.nix diff --git a/pkgs/development/python-modules/flatdict/default.nix b/pkgs/development/python-modules/flatdict/default.nix new file mode 100644 index 000000000000..186118d30100 --- /dev/null +++ b/pkgs/development/python-modules/flatdict/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "flatdict"; + version = "4.0.0"; + + src = fetchFromGitHub { + owner = "gmr"; + repo = pname; + rev = version; + hash = "sha256-qH4MMDSXf92BPavnRdCka6lRoWZg+2KnHpHA8kt5JaM="; + }; + + pythonImportsCheck = [ + "flatdict" + ]; + + meta = with lib; { + description = "Python module for interacting with nested dicts as a single level dict with delimited keys"; + homepage = "https://github.com/gmr/flatdict"; + license = licenses.bsd3; + maintainers = with maintainers; [ lovesegfault ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a8c3a4de4210..a77639b027ea 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3027,6 +3027,8 @@ in { inherit (pkgs) flatbuffers; }; + flatdict = callPackage ../development/python-modules/flatdict { }; + flatten-dict = callPackage ../development/python-modules/flatten-dict { }; flax = callPackage ../development/python-modules/flax { }; From 24d9901b7c50721b3568f43aa07399bf002c76f6 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 17 Mar 2022 22:45:46 -0700 Subject: [PATCH 19/19] python3Packages.keyrings-google-artifactregistry-auth: init at 1.0.0 --- .../default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/keyrings-google-artifactregistry-auth/default.nix diff --git a/pkgs/development/python-modules/keyrings-google-artifactregistry-auth/default.nix b/pkgs/development/python-modules/keyrings-google-artifactregistry-auth/default.nix new file mode 100644 index 000000000000..d77dc444f80d --- /dev/null +++ b/pkgs/development/python-modules/keyrings-google-artifactregistry-auth/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchPypi +, google-auth +, keyring +, pluggy +, requests +, setuptools-scm +, toml +}: + +buildPythonPackage rec { + pname = "keyrings.google-artifactregistry-auth"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-gvoX5SP0A39Ke0VRlplETJF8gIP+QzK6xNReRxM8UnA="; + }; + + buildInputs = [ + setuptools-scm + toml + ]; + + propagatedBuildInputs = [ + google-auth + keyring + pluggy + requests + ]; + + pythonImportsCheck = [ + "keyrings.gauth" + ]; + + + meta = with lib; { + description = "Python package which allows you to configure keyring to interact with Python repositories stored in Artifact Registry"; + homepage = "https://pypi.org/project/keyrings.google-artifactregistry-auth"; + license = licenses.asl20; + maintainers = with maintainers; [ lovesegfault ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a8c3a4de4210..4dac47db2b82 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4462,6 +4462,8 @@ in { keyrings-cryptfile = callPackage ../development/python-modules/keyrings-cryptfile { }; + keyrings-google-artifactregistry-auth = callPackage ../development/python-modules/keyrings-google-artifactregistry-auth { }; + keyrings-alt = callPackage ../development/python-modules/keyrings-alt { }; keystone-engine = callPackage ../development/python-modules/keystone-engine { };