From 94d38b8321805c569be447573004205a93b942ac Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Mon, 23 May 2022 19:56:22 +0200 Subject: [PATCH 01/55] dolphin-emu-beta: 5.0-16101 -> 5.0-16380 --- pkgs/applications/emulators/dolphin-emu/master.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/dolphin-emu/master.nix b/pkgs/applications/emulators/dolphin-emu/master.nix index 8780975a84ad..6fbdb36ff4f9 100644 --- a/pkgs/applications/emulators/dolphin-emu/master.nix +++ b/pkgs/applications/emulators/dolphin-emu/master.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "dolphin-emu"; - version = "5.0-16101"; + version = "5.0-16380"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "8ecfa537a242de74d2e372e30d9d79b14584b2fb"; - sha256 = "3jLGVzTDzEtHWvIb9DFTbJiA9dE9Pm14vYER998Zln0="; + rev = "8335ec70e5fe253eb21509408ca6b5736ed57dfc"; + sha256 = "sha256-WRQ3WfMTlIPoYrEFWLHL9KSfhzQl24AlkbWjh3a4fPE="; fetchSubmodules = true; }; From ed8f89cc125ed521cc71852c516b10f2f215c63f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 May 2022 01:26:37 +0000 Subject: [PATCH 02/55] asciigraph: 0.5.3 -> 0.5.5 --- pkgs/tools/text/asciigraph/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/asciigraph/default.nix b/pkgs/tools/text/asciigraph/default.nix index 221f7c3d5528..d1bf36a744bc 100644 --- a/pkgs/tools/text/asciigraph/default.nix +++ b/pkgs/tools/text/asciigraph/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "asciigraph"; - version = "0.5.3"; + version = "0.5.5"; src = fetchFromGitHub { owner = "guptarohit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GzFJT4LI1QZzghs9g2A+pqkTg68XC+m9F14rYpMxEXM="; + sha256 = "sha256-7sobelRCDY8mC5FYyGZmNsvUsEMxRulqPnUucNRN5J8="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; ldflags = [ "-s" "-w" ]; From aa09c8a387d7ff123dcca8eccb6c353e943645eb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 May 2022 03:02:10 +0000 Subject: [PATCH 03/55] cudatext: 1.164.0 -> 1.165.0 --- pkgs/applications/editors/cudatext/default.nix | 4 ++-- pkgs/applications/editors/cudatext/deps.json | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index 9a872c91c95a..3df5fb7c6e16 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.164.0"; + version = "1.165.0"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - sha256 = "sha256-LKLWZiA3Ya8xI2QvNW2f+5akndBloj5pQ7QNaVMoYSI="; + sha256 = "sha256-Ri/3rDZu+r0++yEO9K9V25z0PiJxc+EOz0RZUz4yGVE="; }; postPatch = '' diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 0eac78393711..6200249b45df 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -16,13 +16,13 @@ }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2022.05.09", - "sha256": "sha256-bzBO9Uf8Zkt/kFouQuiPagL7e+86ezH/mOpDCuInJlE=" + "rev": "2022.05.16", + "sha256": "sha256-cEHGEMVcOjuq0mIIhrMqrBDaskWvLQoGrFLagOqkdwU=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", - "rev": "2022.01.21", - "sha256": "sha256-el5YtzewnHV0fRPgVhApZUVP7huSQseqrO2ibvm6Ctg=" + "rev": "2022.05.04", + "sha256": "sha256-6O4RijSejPogokLSBuC6pKrOpihMi/ykS06YyV64Sak=" }, "EControl": { "owner": "Alexey-T", @@ -31,8 +31,8 @@ }, "ATSynEdit_Ex": { "owner": "Alexey-T", - "rev": "2022.05.08", - "sha256": "sha256-mAxqJ3PO1BCOYNctKfw/4fKbJsI7Ckb5PVcKdALZu0Q=" + "rev": "2022.05.15", + "sha256": "sha256-iqadjpIr+Kn1r7MDQtHQsgtr97IZ8+HQ+q5DiUWASAQ=" }, "Python-for-Lazarus": { "owner": "Alexey-T", From c9adf9483744ac7c2acfa2219f253c7c0bb42be1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 May 2022 03:55:21 +0000 Subject: [PATCH 04/55] armadillo: 11.0.1 -> 11.1.1 --- pkgs/development/libraries/armadillo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index ce41240ecf72..6513d4be3964 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "11.0.1"; + version = "11.1.1"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "sha256-5D1ESTdsH8i1YglUMbuCz5xP+Yp5GiKiXQ+W5eeTfCI="; + sha256 = "sha256-v6YVSl/v2DLSjVMKWCIf5KLP8qO729guEJveU/sp3Ns="; }; nativeBuildInputs = [ cmake ]; From 95191d4f6131a892caf5bb46833f7d39108b4ce0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 May 2022 06:11:06 +0000 Subject: [PATCH 05/55] hydrus: 483 -> 484 --- pkgs/applications/graphics/hydrus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 39eefb003452..13d5017125fc 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "483"; + version = "484"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - sha256 = "sha256-UU3XQ0NC/apJ0S/uDDNG+8DOD+sRyX98yMcjtL2Htig="; + sha256 = "sha256-W0oWETj0xnuS2XAORRb5sb39gbpvyE+cHqgIU+grolQ="; }; nativeBuildInputs = [ From 7e83b1b896ae51096c029995e1e8cbd83e38d441 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 May 2022 07:18:41 +0000 Subject: [PATCH 06/55] cargo-geiger: 0.11.2 -> 0.11.3 --- pkgs/development/tools/rust/cargo-geiger/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-geiger/default.nix b/pkgs/development/tools/rust/cargo-geiger/default.nix index 808fa580db3b..3e5c8e2b9eab 100644 --- a/pkgs/development/tools/rust/cargo-geiger/default.nix +++ b/pkgs/development/tools/rust/cargo-geiger/default.nix @@ -13,15 +13,15 @@ rustPlatform.buildRustPackage rec { pname = "cargo-geiger"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = "rust-secure-code"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-KkOLDSnLneal3m+CrYKKIoeO61rjXEDq4GK3kPwQxj4="; + sha256 = "sha256-xymDV/FHJABw1s94m8fl8D51PQwkF5dX+1XD96++RX8="; }; - cargoSha256 = "sha256-i7xDEzZAN2ubW1Q6MhY+xsb9XiUajNDHLdtDuO5r6jA="; + cargoSha256 = "sha256-2szgR9N3PGjGCIjqgtGNFSnzfSv57sGfslZ/PZyqMjI="; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv curl ]; From c1ab8c327a5099d7d311eaa06c76b272b338a585 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 May 2022 07:48:30 +0000 Subject: [PATCH 07/55] clingo: 5.5.1 -> 5.5.2 --- pkgs/applications/science/logic/potassco/clingo.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/potassco/clingo.nix b/pkgs/applications/science/logic/potassco/clingo.nix index 754e12c03eea..41c5eb5733e5 100644 --- a/pkgs/applications/science/logic/potassco/clingo.nix +++ b/pkgs/applications/science/logic/potassco/clingo.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "clingo"; - version = "5.5.1"; + version = "5.5.2"; src = fetchFromGitHub { owner = "potassco"; repo = "clingo"; rev = "v${version}"; - sha256 = "sha256-KBCwGNkz5HqbgXbDxPVcqxMXC8B2+wRI8eZVVXMVpLI="; + sha256 = "sha256-fBf7MRFkd5SfHDQ5OvWx4lP/N716SrF9uY4JF7SiWRk="; }; nativeBuildInputs = [ cmake ]; From 95bd896f64429c8ca94ff80342c8e8f97e259bff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 May 2022 08:31:46 +0000 Subject: [PATCH 08/55] chamber: 2.10.9 -> 2.10.10 --- pkgs/tools/admin/chamber/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/chamber/default.nix b/pkgs/tools/admin/chamber/default.nix index 56d4213481c0..25b304819951 100644 --- a/pkgs/tools/admin/chamber/default.nix +++ b/pkgs/tools/admin/chamber/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "chamber"; - version = "2.10.9"; + version = "2.10.10"; src = fetchFromGitHub { owner = "segmentio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rOOpwLoEiTS41VIPvqoq8yGP4GOOCOJNFfLLxt9mfvM="; + sha256 = "sha256-W/yuCQ1kE300//if/H73ZEJh/r2vttJ0GotZkBZNM+4="; }; CGO_ENABLED = 0; From 723f468d549c53fe6f368834acd0c3e2ea8b5090 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 May 2022 09:37:20 +0000 Subject: [PATCH 09/55] cilium-cli: 0.11.1 -> 0.11.7 --- pkgs/applications/networking/cluster/cilium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix index bde7a21b33ef..648b0048e3e2 100644 --- a/pkgs/applications/networking/cluster/cilium/default.nix +++ b/pkgs/applications/networking/cluster/cilium/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.11.1"; + version = "0.11.7"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8twqA8aUuk5+LzjxMRbRA3m6qiEbk60A0q3nw9uzCvU="; + sha256 = "sha256-4+4E7v/b74DDekqymH8PR7/GfH3GGzSQFQk24VJisQ0="; }; vendorSha256 = null; From 3ff99d8e4c91098c673635f94a2b597f52e93576 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 May 2022 16:48:38 +0000 Subject: [PATCH 10/55] dcmtk: 3.6.6 -> 3.6.7 --- pkgs/applications/science/medicine/dcmtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/medicine/dcmtk/default.nix b/pkgs/applications/science/medicine/dcmtk/default.nix index b6a9c161638a..a1f4b455ce79 100644 --- a/pkgs/applications/science/medicine/dcmtk/default.nix +++ b/pkgs/applications/science/medicine/dcmtk/default.nix @@ -3,12 +3,12 @@ with lib; stdenv.mkDerivation rec { pname = "dcmtk"; - version = "3.6.6"; + version = "3.6.7"; src = fetchFromGitHub { owner = "DCMTK"; repo = pname; rev = "DCMTK-${version}"; - sha256 = "sha256-bpvf2JJXikV/CqmXZb3w4Ua3VBEQcQk7PXw9ie0t8xo="; + sha256 = "sha256-Pw99R6oGcLX6Z7s8ZnpbBBqcIvY9Rl/nw2PVGjpD3gY="; }; nativeBuildInputs = [ cmake ]; From d13e216e3c7c23a1096265cb7b26046b73fca2c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 May 2022 20:51:22 +0000 Subject: [PATCH 11/55] evans: 0.10.5 -> 0.10.6 --- pkgs/development/tools/evans/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/evans/default.nix b/pkgs/development/tools/evans/default.nix index 82238d65d4ac..3172d3679896 100644 --- a/pkgs/development/tools/evans/default.nix +++ b/pkgs/development/tools/evans/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "evans"; - version = "0.10.5"; + version = "0.10.6"; src = fetchFromGitHub { owner = "ktr0731"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3gl4m0zTe8y4KLMAy3I7YD4Q7gLrRf3QsJap2IGX9Tk="; + sha256 = "sha256-rQwoiV87XMz/5GbVOyLDkfIKIgMzBcwY4ln73XCI/so="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-BYOrby7tlQJ0ZjZHCeDWzsCv7jBfwX9RX1weLfEz+cU="; + vendorSha256 = "sha256-3R/HRfr1GjJwkCT6xQ51Y/zRcuvknunYKgVpM6jg+wY="; meta = with lib; { description = "More expressive universal gRPC client"; From 84108a677546e4b44ba199f62f3af5a8f1c9207b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 May 2022 01:46:29 +0000 Subject: [PATCH 12/55] apkeep: 0.12.0 -> 0.13.0 --- 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 d1bb7d85d18f..59a2edf41544 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.12.0"; + version = "0.13.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-SmzsFXS/geFpssy18pIluoCYGsJql9TAgYUNgAZlXmI="; + sha256 = "sha256-wFrpzemqBdhEO8cahSV9Qjw4HxCk+TgAVpGaa/IaO0Q="; }; - cargoSha256 = "sha256-bL79CW6X9pHx/Cn58KDxf8bVDwvrGRKkK9v/+Ygp5D4="; + cargoSha256 = "sha256-6DAzNiNHmzOwg7RlRCorUCW33FTYdfLf6PnTygcL1ok="; prePatch = '' rm .cargo/config.toml From c9da0db396b6aab22f879cdbde825bf72e70f6ec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 May 2022 01:53:14 +0000 Subject: [PATCH 13/55] argo-rollouts: 1.2.0 -> 1.2.1 --- .../applications/networking/cluster/argo-rollouts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/argo-rollouts/default.nix b/pkgs/applications/networking/cluster/argo-rollouts/default.nix index deb61af1ae88..371d0b3a55d6 100644 --- a/pkgs/applications/networking/cluster/argo-rollouts/default.nix +++ b/pkgs/applications/networking/cluster/argo-rollouts/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "argo-rollouts"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-rollouts"; rev = "v${version}"; - sha256 = "sha256-RgjoRvLsd+WHTpFy1WbJtrVaMnRp6/7A921+abCMGu0="; + sha256 = "sha256-1oF93+pN9wyCq5R5bTeMN/uzg9DHpc/AkX/d1lB5r1g="; }; vendorSha256 = "sha256-URuIeF1ejKdMGxziJbujLctYheiIr/Jfo+gTzppZG9E="; From 52e1786cff9500d7ce867e1ef5dd6ce9f51e324b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 May 2022 01:59:55 +0000 Subject: [PATCH 14/55] arkade: 0.8.24 -> 0.8.25 --- pkgs/applications/networking/cluster/arkade/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index 98101aafb209..ec0547baddf2 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.8.24"; + version = "0.8.25"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - sha256 = "sha256-TK81Cqhddbqh6cizyOoLuBTE2KxFQzy07EdkQ9bYNs0="; + sha256 = "sha256-m4vgQ4K73qmUMwPtviUQuRC2jNIDlE516WEZkFr3Upw="; }; CGO_ENABLED = 0; From 8dcffcf9678e2b7511d24ffb3aaae0727faf78cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 May 2022 04:24:10 +0000 Subject: [PATCH 15/55] cargo-fund: 0.2.0 -> 0.2.1 --- pkgs/development/tools/rust/cargo-fund/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-fund/default.nix b/pkgs/development/tools/rust/cargo-fund/default.nix index 43655fd6a89e..116f408fb1ea 100644 --- a/pkgs/development/tools/rust/cargo-fund/default.nix +++ b/pkgs/development/tools/rust/cargo-fund/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-fund"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "acfoltzer"; repo = pname; rev = version; - sha256 = "1jim5bgq3fc33391qpa1q1csbzqf4hk1qyfzwxpcs5pb4ixb6vgk"; + sha256 = "sha256-MlAFnwX++OYRzqhEcSjxNzmSyJiVE5t6UuCKy9J+SsQ="; }; - cargoSha256 = "1c2zryxn1bbg3ksp8azk9xmwfgwr6663hlmdv9c358hzqdfp9hli"; + cargoSha256 = "sha256-pI5iz/V7/2jH3t3W3fuLzqd6oJC3PqHIWEJhDLmjLI0="; # The tests need a GitHub API token. doCheck = false; From 9aa556a4c5bf1801473648ac5b86dd908e79e5e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 May 2022 05:04:35 +0000 Subject: [PATCH 16/55] cargo-update: 8.1.2 -> 8.1.4 --- pkgs/tools/package-management/cargo-update/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/cargo-update/default.nix b/pkgs/tools/package-management/cargo-update/default.nix index 28ba43e9d662..383eeac432d9 100644 --- a/pkgs/tools/package-management/cargo-update/default.nix +++ b/pkgs/tools/package-management/cargo-update/default.nix @@ -15,14 +15,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-update"; - version = "8.1.2"; + version = "8.1.4"; src = fetchCrate { inherit pname version; - sha256 = "sha256-9/4HQbf6wPNzsYqXbtrWoe9n2iKQoNILhjhwrbOY3Z0="; + sha256 = "sha256-Q8Cd//QDQ6kWgp+QEn9/h69jfaUNE1/+oqQne/2wvAg="; }; - cargoSha256 = "sha256-iUJBhBKWYRpzwMcOvMIP8smmw5OnsTv1olv61pel5dY="; + cargoSha256 = "sha256-khJ6EZVJ96geD1VzvR8E2ZgHfxhX/NTPVoVIMhCh+c4="; nativeBuildInputs = [ cmake installShellFiles pkg-config ronn ]; From 6fe03699a89ced63ff432eefe295e44ff2a75346 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 May 2022 07:04:03 +0000 Subject: [PATCH 17/55] convco: 0.3.9 -> 0.3.10 --- pkgs/development/tools/convco/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/convco/default.nix b/pkgs/development/tools/convco/default.nix index 6094df8757a0..720423472c30 100644 --- a/pkgs/development/tools/convco/default.nix +++ b/pkgs/development/tools/convco/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "convco"; - version = "0.3.9"; + version = "0.3.10"; src = fetchFromGitHub { owner = "convco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ys7fuaD1jj3tWD6U+BRvqFneZEdKV5c1RO2FLEtqIUk="; + sha256 = "sha256-Jr1rNxVguASl6fPfGNx2/MDlMC+KokgQyzhBnvqnwFs="; }; - cargoSha256 = "sha256-5/uF0aPNNNUruRF8euuEnGSJHsRehSZipa0677zc12c="; + cargoSha256 = "sha256-mStoWH/SusAcbAR3MeBWaY21TdJZJcKm1VxmA3zmlTw="; nativeBuildInputs = [ cmake pkg-config ]; From bea44774e0cace6f3fe124148436f1309417e64b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 May 2022 09:36:46 +0000 Subject: [PATCH 18/55] dyff: 1.5.2 -> 1.5.3 --- pkgs/development/tools/dyff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/dyff/default.nix b/pkgs/development/tools/dyff/default.nix index 306de76dd923..33590f4a4e10 100644 --- a/pkgs/development/tools/dyff/default.nix +++ b/pkgs/development/tools/dyff/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dyff"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "homeport"; repo = "dyff"; rev = "v${version}"; - sha256 = "sha256-OjI1WpkRvDjghJqUlV9iP1qpzqZKRrVZJwAsK5rBy2Q="; + sha256 = "sha256-On3n4qJUcGhJfh0B1ESE5zl1fb/RW12eFPxx5sTqfpw="; }; vendorSha256 = "sha256-eI3E83bYSMfi7fInBsPflE3zUGHF6diSkXDy04+CeqQ="; From 1b2da758157490d3364ddbd835be9810d9417f66 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 May 2022 11:20:39 +0000 Subject: [PATCH 19/55] fioctl: 0.24 -> 0.25 --- pkgs/tools/admin/fioctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/fioctl/default.nix b/pkgs/tools/admin/fioctl/default.nix index 95f5ee789f2d..8ae6c1e5a48e 100644 --- a/pkgs/tools/admin/fioctl/default.nix +++ b/pkgs/tools/admin/fioctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fioctl"; - version = "0.24"; + version = "0.25"; src = fetchFromGitHub { owner = "foundriesio"; repo = "fioctl"; rev = "v${version}"; - sha256 = "sha256-nlSJ6JxC5MTS/ltSB9qnhtoRjDL1A5NlXWM/2A4duGU="; + sha256 = "sha256-wRjSg0jOXDfzF4kZboFawVvujCmAeB9xDOGE0tGYl4g="; }; - vendorSha256 = "sha256-Cr9etq9E16vj2AL9OkIQom/gATjj9QT9+keUR1WQJR0="; + vendorSha256 = "sha256-B3VL2ZHPdx9iWK++ckzz2H8zV7ESQZCw39AEffXNu+w="; ldflags = [ "-s" "-w" "-X github.com/foundriesio/fioctl/subcommands/version.Commit=${src.rev}" From 99a44d9707f6ad7eaecd0df6ca166ec2c1a85616 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 May 2022 12:12:33 +0000 Subject: [PATCH 20/55] flyctl: 0.0.328 -> 0.0.330 --- pkgs/development/web/flyctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 9f48c92cb708..4a2ed0a33f4e 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.328"; + version = "0.0.330"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-hcRdFkYZ3IqrxdGMdLWwHvJgGNkXfxsCQMHgPfy8cOk="; + sha256 = "sha256-lgyr2NgurOZPqJv8ZUD8ut7ELxMZqLZ+rXYTjZauv8Y="; }; - vendorSha256 = "sha256-5mYa41bUOnBQgbaPv7/9BjpaN+/MXIPrieJQL2M58gw="; + vendorSha256 = "sha256-T1E2VJiaGKhk/rDVKYEju3AyDPEUMGFNvj/KrMjLKEc="; subPackages = [ "." ]; From 1601db5d02e3af409881c62e7001c4ff4e271c1b Mon Sep 17 00:00:00 2001 From: Alexander Tomokhov Date: Fri, 27 May 2022 21:23:58 +0300 Subject: [PATCH 21/55] lincity_ng: 2.9beta.20170715 -> 2.9beta.20211125 --- pkgs/games/lincity/ng.nix | 51 ++++++++++++++++++++++++++++++--------- 1 file changed, 40 insertions(+), 11 deletions(-) diff --git a/pkgs/games/lincity/ng.nix b/pkgs/games/lincity/ng.nix index 1fe2223886a7..9901255be4dc 100644 --- a/pkgs/games/lincity/ng.nix +++ b/pkgs/games/lincity/ng.nix @@ -1,28 +1,57 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, jam, pkg-config -, zlib, libxml2, libxslt, xorgproto, libX11, libGLU, libGL, SDL -, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, physfs +{ stdenv +, SDL2 +, SDL2_gfx +, SDL2_image +, SDL2_mixer +, SDL2_ttf +, autoreconfHook +, fetchFromGitHub +, jam +, lib +, libGL +, libGLU +, libX11 +, libxml2 +, libxslt +, physfs +, pkg-config +, xorgproto +, zlib }: stdenv.mkDerivation { pname = "lincity-ng"; - version = "2.9beta.20170715"; + version = "2.9beta.20211125"; src = fetchFromGitHub { - owner = "lincity-ng"; - repo = "lincity-ng"; - rev = "0c19714b811225238f310633e59f428934185e6b"; - sha256 = "1gaj9fq97zmb0jsdw4rzrw34pimkmkwbfqps0glpqij4w3srz5f3"; + owner = "lincity-ng"; + repo = "lincity-ng"; + rev = "b9062bec252632ca5d26b98d71453b8762c63173"; + sha256 = "0l07cn8rmpmlqdppjc2ikh5c7xmwib27504zpmn3n9pryp394r46"; }; hardeningDisable = [ "format" ]; nativeBuildInputs = [ - autoreconfHook jam pkg-config + autoreconfHook + jam + pkg-config ]; buildInputs = [ - zlib libxml2 libxslt xorgproto libX11 libGLU libGL SDL SDL_mixer SDL_image - SDL_ttf SDL_gfx physfs + SDL2 + SDL2_gfx + SDL2_image + SDL2_mixer + SDL2_ttf + libGL + libGLU + libX11 + libxml2 + libxslt + physfs + xorgproto + zlib ]; autoreconfPhase = '' From 5e496906b855a451b437bf05af58718aba8e9132 Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Fri, 27 May 2022 16:11:11 -0300 Subject: [PATCH 22/55] irpf: 2022-1.5 -> 2022-1.6 --- pkgs/applications/finance/irpf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/finance/irpf/default.nix b/pkgs/applications/finance/irpf/default.nix index 2c821b73ba78..1a95145cf40e 100644 --- a/pkgs/applications/finance/irpf/default.nix +++ b/pkgs/applications/finance/irpf/default.nix @@ -11,13 +11,13 @@ stdenvNoCC.mkDerivation rec { pname = "irpf"; - version = "2022-1.5"; + version = "2022-1.6"; src = let year = lib.head (lib.splitVersion version); in fetchzip { url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${version}.zip"; - sha256 = "sha256-FJqLjERTVQC6KvLSrCzR9RTIiJEfHvOwX7CRdUmHf/U="; + sha256 = "sha256-/4dND4CMl4xnGGIb+FWqgL0wbt7fqUE78m737U0kAdw="; }; nativeBuildInputs = [ unzip makeWrapper copyDesktopItems ]; From 3605f7a3430e78ff7638676379079c4d9113c7f0 Mon Sep 17 00:00:00 2001 From: Patrick Jackson Date: Wed, 25 May 2022 16:09:24 -0700 Subject: [PATCH 23/55] textadept11: 11.1 -> 11.3 --- .../editors/textadept/11/default.nix | 10 ++- .../editors/textadept/11/deps.nix | 90 +++++++++---------- 2 files changed, 48 insertions(+), 52 deletions(-) diff --git a/pkgs/applications/editors/textadept/11/default.nix b/pkgs/applications/editors/textadept/11/default.nix index 3050599ba580..6b47ba461eb7 100644 --- a/pkgs/applications/editors/textadept/11/default.nix +++ b/pkgs/applications/editors/textadept/11/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, fetchurl, gtk2, glib, pkg-config, unzip, ncurses, zip }: stdenv.mkDerivation rec { - version = "11.1"; + version = "11.3"; pname = "textadept11"; nativeBuildInputs = [ pkg-config unzip zip ]; @@ -9,12 +9,14 @@ stdenv.mkDerivation rec { gtk2 ncurses glib ]; + enableParallelBuilding = true; + src = fetchFromGitHub { name = "textadept11"; owner = "orbitalquark"; repo = "textadept"; - rev = "1df99d561dd2055a01efa9183bb9e1b2ad43babc"; - sha256 = "0g4bh5dp391vi32aa796vszpbxyl2dm5231v9dwc8l9v0b2786qn"; + rev = "textadept_${version}"; + sha256 = "sha256-C7J/Qr/58hLbyw39R+GU4wot1gbAXf51Cv6KGk3kg30="; }; preConfigure = @@ -46,7 +48,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "An extensible text editor based on Scintilla with Lua scripting. Version 11_beta"; + description = "An extensible text editor based on Scintilla with Lua scripting."; homepage = "http://foicica.com/textadept"; license = licenses.mit; maintainers = with maintainers; [ raskin mirrexagon ]; diff --git a/pkgs/applications/editors/textadept/11/deps.nix b/pkgs/applications/editors/textadept/11/deps.nix index b9c7e94ee3bc..c0744875e7a8 100644 --- a/pkgs/applications/editors/textadept/11/deps.nix +++ b/pkgs/applications/editors/textadept/11/deps.nix @@ -1,50 +1,44 @@ { - "scintilla445.tgz" = { - url = "https://www.scintilla.org/scintilla445.tgz"; - sha256 = "1v1kyxj7rv5rxadbg8gl8wh1jafpy7zj0wr6dcyxq9209dl6h8ag"; - }; - "6a774158d8a3c7bc7ea120bc01cdb016fa351a7e.zip" = { - url = "https://github.com/orbitalquark/scinterm/archive/6a774158d8a3c7bc7ea120bc01cdb016fa351a7e.zip"; - sha256 = "083xvpw14dxbyrv4i48q76bmr44hs637qv363n6ibfs8xv1kq7iv"; - }; - "scintillua_4.4.5-2.zip" = { - url = "https://github.com/orbitalquark/scintillua/archive/scintillua_4.4.5-2.zip"; - sha256 = "1061y2gg78zb2mml8msyarxgdwbf7g8g2v08fr1qqsqi2pbb7mfc"; - }; - "lua-5.3.5.tar.gz" = { - url = "http://www.lua.org/ftp/lua-5.3.5.tar.gz"; - sha256 = "1b2qn2rv96nmbm6zab4l877bd4zq7wpwm8drwjiy2ih4jqzysbhc"; - }; - "lpeg-1.0.2.tar.gz" = { - url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz"; - sha256 = "1zjzl7acvcdavmcg5l7wi12jd4rh95q9pl5aiww7hv0v0mv6bmj8"; - }; - "v1_8_0.zip" = { - url = "https://github.com/keplerproject/luafilesystem/archive/v1_8_0.zip"; - sha256 = "12p1p5qpdql44y3cc035h8rs8rgdqp6nrnrixlp5544agb5bx9p3"; - }; - "64587546482a1a6324706d75c80b77d2f87118a4.zip" = { - url = "https://github.com/orbitalquark/gtdialog/archive/64587546482a1a6324706d75c80b77d2f87118a4.zip"; - sha256 = "10mglbnn8r1cakqn9h285pwfnh7kfa98v7j8qh83c24n66blyfh9"; - }; - "cdk-5.0-20200923.tgz" = { - url = "http://invisible-mirror.net/archives/cdk/cdk-5.0-20200923.tgz"; - sha256 = "1vdakz119a13d7p7w53hk56fdmbkhv6y9xvdapcfnbnbh3l5szq0"; - }; - "libtermkey-0.20.tar.gz" = { - url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.20.tar.gz"; - sha256 = "1xfj6lchhfljmbcl6dz8dpakppyy13nbl4ykxiv5x4dr9b4qf3bc"; - }; - "pdcurs39.zip" = { - url = "https://github.com/wmcbrine/PDCurses/archive/3.9.zip"; - sha256 = "0ydsa15d6fgk15zcavbxsi4vj3knlr2495dc5v4f5xzvv2qwlb2w"; - }; - "bombay.zip" = { - url = "http://foicica.com/hg/bombay/archive/b25520cc76bb.zip"; - sha256 = "07spq7jmkfyq20gv67yffara3ln3ns2xi0k02m2mxdms3xm1q36h"; - }; - "cloc-1.60.pl" = { - url = "http://prdownloads.sourceforge.net/cloc/cloc-1.60.pl"; - sha256 = "0p504bi19va3dh274v7lb7giqrydwa5yyry60f7jpz84y6z71a2a"; - }; + "scintilla514.tgz" = { + url = "https://www.scintilla.org/scintilla514.tgz"; + sha256 = "sha256-3IJcVUmJBWsmMURsfKKLFHyUw2XZI90Kkoq3oR3To2U="; + }; + "lexilla510.tgz" = { + url = "https://www.scintilla.org/lexilla510.tgz"; + sha256 = "sha256-azWVJ0AFSYZxuFTPV73uwiVJZvNxcS/POnFtl6p/P9g="; + }; + "475d8d43f3418590c28bd2fb07ee9229d1fa2d07.zip" = { + url = + "https://github.com/orbitalquark/scinterm/archive/475d8d43f3418590c28bd2fb07ee9229d1fa2d07.zip"; + sha256 = "sha256-lNMK0RFcOLg9RRE5a6VelhSzUYVl5TiAiXcje2JOedE="; + }; + "4cb1464ef738a098f008d6530b776fe780b19c34.zip" = { + url = + "https://github.com/orbitalquark/scintillua/archive/4cb1464ef738a098f008d6530b776fe780b19c34.zip"; + sha256 = "sha256-OgmZ5iWnjG1cI6wprHOyeLY86DcLpU/4omGJ6stEe0c="; + }; + "lua-5.4.2.tar.gz" = { + url = "http://www.lua.org/ftp/lua-5.4.2.tar.gz"; + sha256 = "sha256-EVcNl+nXMDwKWVZ+0ax8ZINAzQ2xDV/VlMCSI+8vUk8="; + }; + "lpeg-1.0.2.tar.gz" = { + url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz"; + sha256 = "sha256-SNZldgUbbHg4j6rQm3BJMJMmRYj80PJY3aqxzdShX/4="; + }; + "v1_8_0.zip" = { + url = "https://github.com/keplerproject/luafilesystem/archive/v1_8_0.zip"; + sha256 = "sha256-46a+ynqKkFIu7THbbM3F7WWkM4JlAMaGJ4TidnG54Yo="; + }; + "gtdialog_1.5.zip" = { + url = "https://github.com/orbitalquark/gtdialog/archive/gtdialog_1.5.zip"; + sha256 = "sha256-kk85ajgMG0okUwPAyL0TYq6BfS5cuyFmsk6i8pn7pbw="; + }; + "cdk-5.0-20200923.tgz" = { + url = "http://invisible-mirror.net/archives/cdk/cdk-5.0-20200923.tgz"; + sha256 = "sha256-AH9d6IDLLuvYVW335M2Gc9XmTJlwFH7uaSOoFMKfqu0="; + }; + "libtermkey-0.20.tar.gz" = { + url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.20.tar.gz"; + sha256 = "sha256-bA2HyUq5kV527NMTuuwI3t871W3oN0PZqpI6CBk10vU="; + }; } From 5bf9868f7564346f3f678312db40642c80922dcc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 27 May 2022 22:57:42 +0200 Subject: [PATCH 24/55] python310Packages.regenmaschine: 2022.01.0 -> 2022.05.0 --- pkgs/development/python-modules/regenmaschine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/regenmaschine/default.nix b/pkgs/development/python-modules/regenmaschine/default.nix index 50d29c1923d2..33ecd8f7bfe4 100644 --- a/pkgs/development/python-modules/regenmaschine/default.nix +++ b/pkgs/development/python-modules/regenmaschine/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "regenmaschine"; - version = "2022.01.0"; + version = "2022.05.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-TPiz3d1GbcIWCKRz3Hq4JU9+df/Fw4dUXQkIM6QO1Fs="; + sha256 = "sha256-8tc/7XaHqgnuQgQc1ZlkoiBnl/d+OKKXjKNWwY+vCaU="; }; nativeBuildInputs = [ From 136f34ff120b842592ac3ccefc74b3ca23897d89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 28 May 2022 00:00:47 +0200 Subject: [PATCH 25/55] goreleaser: 1.9.0 -> 1.9.2 --- pkgs/tools/misc/goreleaser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index 9b9505c9beb0..a5f1f21e0204 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "1.9.0"; + version = "1.9.2"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-R20mzPpbFDUw/wrif3ZJCt2wgmV+yqSkGaxyuw/9z0E="; + sha256 = "sha256-lr/yTxtWjTZoiZjfqstl53V1CBf16IRkSo7+YkZ6Yxc="; }; - vendorSha256 = "sha256-+Rj2hb9Sul5ntVGfuWf7JibKdG03zALiMWaaNTJFC8k="; + vendorSha256 = "sha256-MyhrFXg/A3zb2p/OlJ//lkqjFjNiEP0B0/vO0iuHDRo="; ldflags = [ "-s" From 125e0b9f5cbc7a120911a1b6c155394e624ebb01 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 28 May 2022 00:36:55 +0200 Subject: [PATCH 26/55] packer: 1.8.0 -> 1.8.1 ChangeLog: https://github.com/hashicorp/packer/blob/v1.8.1/CHANGELOG.md#181-may-27-2022 --- pkgs/development/tools/packer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index d42bb9e2860a..0d901f14863e 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "packer"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "sha256-rvOfDMALzZx8LfChgB3nC4GCTlSET43SkhW1EkA59zo="; + sha256 = "sha256-NqXmeBQrDnCGruJTZjAryxCmEdm1CZMPhW6JhZB0log="; }; - vendorSha256 = "sha256-ZQ+7F49VnpPtxWlZVBez2mpVCx8gIPEDKBD5qM9NcMo="; + vendorSha256 = "sha256-Wit5DWTjVrxLLWpfOo/6JrSxqeZvC4Vjv+cW19wNHyw="; subPackages = [ "." ]; From aa8447dd0c3688a2d04dbd3bab324a4b0a5f8220 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sat, 28 May 2022 02:21:13 +0300 Subject: [PATCH 27/55] clingcon: fix build Fix build https://hydra.nixos.org/build/178237905 --- .../science/logic/potassco/clingcon.nix | 4 ++++ .../logic/potassco/clingcon_limits.patch | 24 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/applications/science/logic/potassco/clingcon_limits.patch diff --git a/pkgs/applications/science/logic/potassco/clingcon.nix b/pkgs/applications/science/logic/potassco/clingcon.nix index d7ec2e72433e..2238e490a603 100644 --- a/pkgs/applications/science/logic/potassco/clingcon.nix +++ b/pkgs/applications/science/logic/potassco/clingcon.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { sha256 = "1g2xkz9nsgqnrw3fdf5jchl16f0skj5mm32va61scc2yrchll166"; }; + patches = [ + ./clingcon_limits.patch + ]; + postPatch = '' cp ${catch2}/include/catch2/catch.hpp libclingcon/tests/catch.hpp ''; diff --git a/pkgs/applications/science/logic/potassco/clingcon_limits.patch b/pkgs/applications/science/logic/potassco/clingcon_limits.patch new file mode 100644 index 000000000000..0343e10e2112 --- /dev/null +++ b/pkgs/applications/science/logic/potassco/clingcon_limits.patch @@ -0,0 +1,24 @@ +diff --git i/libclingcon/clingcon/base.hh w/libclingcon/clingcon/base.hh +index 2d449fe..0b5fa17 100644 +--- i/libclingcon/clingcon/base.hh ++++ w/libclingcon/clingcon/base.hh +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + //! @file clingcon/base.hh + //! Basic data types. +diff --git i/libclingcon/clingcon/util.hh w/libclingcon/clingcon/util.hh +index df4cddd..308259e 100644 +--- i/libclingcon/clingcon/util.hh ++++ w/libclingcon/clingcon/util.hh +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + //! @file clingcon/util.hh + //! Very general utility functions. From 2d1461363fc473b2667446372fcd32369d4de98a Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Fri, 27 May 2022 17:00:33 -0700 Subject: [PATCH 28/55] python3Packages.flask-silk: add 'unstable' prefix to version --- pkgs/development/python-modules/flask-silk/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/flask-silk/default.nix b/pkgs/development/python-modules/flask-silk/default.nix index f6b6fd81528f..8a40b6d4b56f 100644 --- a/pkgs/development/python-modules/flask-silk/default.nix +++ b/pkgs/development/python-modules/flask-silk/default.nix @@ -6,7 +6,7 @@ buildPythonPackage { pname = "Flask-Silk"; - version = "2018-06-28"; + version = "unstable-2018-06-28"; # master fixes flask import syntax and has no major changes # new release requested: https://github.com/sublee/flask-silk/pull/6 From e741166e6255f98cabc1f54731e967dc67e68cbb Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 28 May 2022 10:24:17 +0800 Subject: [PATCH 29/55] pantheon.elementary-feedback: 6.1.0 -> 6.1.1 --- .../apps/elementary-feedback/default.nix | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix index f589f4234ca5..7d9b5fa1d413 100644 --- a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pkg-config , meson @@ -13,33 +12,22 @@ , granite , libgee , libhandy -, gettext , wrapGAppsHook , appstream }: stdenv.mkDerivation rec { pname = "elementary-feedback"; - version = "6.1.0"; + version = "6.1.1"; src = fetchFromGitHub { owner = "elementary"; repo = "feedback"; rev = version; - sha256 = "02wydbpa5qaa4xmmh4m7rbj4djbrn2i44zjakj5i6mzwjlj6sv5n"; + sha256 = "sha256-YLYHaFQAAeSt25xHF7xDJWhw+rbH9SpzoRoXaYP42jg="; }; - patches = [ - # Upstream code not respecting our localedir - # https://github.com/elementary/feedback/pull/48 - (fetchpatch { - url = "https://github.com/elementary/feedback/commit/080005153977a86d10099eff6a5b3e68f7b12847.patch"; - sha256 = "01710i90qsaqsrjs92ahwwj198bdrrif6mnw29l9har2rncfkfk2"; - }) - ]; - nativeBuildInputs = [ - gettext meson ninja pkg-config From 208b83c576aff0707744e1ec8f687b3112094662 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 May 2022 03:32:32 +0000 Subject: [PATCH 30/55] python310Packages.stumpy: 1.10.2 -> 1.11.1 --- pkgs/development/python-modules/stumpy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/stumpy/default.nix b/pkgs/development/python-modules/stumpy/default.nix index 66a9b7e0d82c..cbfb81b701ac 100644 --- a/pkgs/development/python-modules/stumpy/default.nix +++ b/pkgs/development/python-modules/stumpy/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "stumpy"; - version = "1.10.2"; + version = "1.11.1"; src = fetchFromGitHub { owner = "TDAmeritrade"; repo = "stumpy"; - rev = "v${version}"; - sha256 = "1v17lxqgvkd3n33c2y1j1zy74xy92vsx2l89yhan89msnnb7aafr"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-ARpXqZpWkbvIEDVkxA1SwlWoxq+3WO6tvv/e7WZ/25c="; }; propagatedBuildInputs = [ From 0d8b7fb2fc44c8a6f4728cbc9705478dfd3c3704 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 May 2022 03:52:20 +0000 Subject: [PATCH 31/55] python310Packages.peaqevcore: 0.1.3 -> 0.1.4 --- pkgs/development/python-modules/peaqevcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index 5c4a3a096838..9049d7b53925 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "0.1.3"; + version = "0.1.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-kvQOSy0PdI9zfo0w3merPdbKybBIQpxv5KZQ2GA/WtM="; + hash = "sha256-+L730I30dN+d6oc5HWq578B0Io5j5CjAy3SuIGGjOR8="; }; postPatch = '' From c8fa27ea0074b2056e04829df6ddbc20cfdd7088 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 May 2022 04:01:35 +0000 Subject: [PATCH 32/55] python310Packages.pysqueezebox: 0.5.5 -> 0.6.0 --- pkgs/development/python-modules/pysqueezebox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysqueezebox/default.nix b/pkgs/development/python-modules/pysqueezebox/default.nix index 8445f6d7e89e..17d69ac467da 100644 --- a/pkgs/development/python-modules/pysqueezebox/default.nix +++ b/pkgs/development/python-modules/pysqueezebox/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pysqueezebox"; - version = "0.5.5"; + version = "0.6.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "93e6a3824b560d4ea2b2e5f0a67fdf3b309b6194fbf9927e44fc0d12c7fdc6c0"; + sha256 = "sha256-qc6ffWk62EF+IOLb2XVWtDrrZ0LVs7VtxJG1qrrUPPg="; }; propagatedBuildInputs = [ From dab999d5416a1e7feb2ad237a664385690b14129 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 28 May 2022 04:20:00 +0000 Subject: [PATCH 33/55] _1password: fix hashes The latest version bump only updated the hash for x86_64-linux. --- pkgs/applications/misc/1password/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 5fe1bff41b55..619e01f57847 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -14,10 +14,10 @@ let pname = "1password-cli"; version = "2.3.1"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-fKW2qSQkkC4GcnHcLLszX1pcqK67SaofVX017/cIkD0=" "zip"; - i686-linux = fetch "linux_386" "sha256-TmQ3nWG12DTpAJaxbK+hnJak0RrFhhw6rJWfV7q8wb4=" "zip"; + aarch64-linux = fetch "linux_arm64" "sha256-MikzcVqlhVSKzr1ttOCAg4p57sjsalSuwcqBhVUr5Ng=" "zip"; + i686-linux = fetch "linux_386" "sha256-ElOhd3n38xAPtVePjQb8qMUCCAWqEfBKlX9Vuz5/Zns=" "zip"; x86_64-linux = fetch "linux_amd64" "sha256-r8yl9dDiiIQBooePrq/dGw2RU9tJXmeblx+qk3qq5Ys=" "zip"; - aarch64-darwin = fetch "apple_universal" "sha256-DD1j093SjnaPtkQ4XuU1zkRi6XPXtwnBxiqC6wZbV+w=" "pkg"; + aarch64-darwin = fetch "apple_universal" "sha256-sXdYInNBOEW/zIEPjhKbFOMxZdrMlE8pOwhmXLUJgsk=" "pkg"; x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; From 874fb627c429ff4186bdc5cb70dabdd87c86a759 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 28 May 2022 12:21:51 +0800 Subject: [PATCH 34/55] pantheon.elementary-feedback: load metadata from correct location --- .../apps/elementary-feedback/default.nix | 8 ++++++++ .../elementary-feedback/fix-metadata-path.patch | 17 +++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/desktops/pantheon/apps/elementary-feedback/fix-metadata-path.patch diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix index 7d9b5fa1d413..6c6113e6be92 100644 --- a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix @@ -27,6 +27,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-YLYHaFQAAeSt25xHF7xDJWhw+rbH9SpzoRoXaYP42jg="; }; + patches = [ + # The standard location to the metadata pool where metadata + # will be read from is likely hardcoded as /usr/share/metainfo + # https://github.com/ximion/appstream/blob/v0.15.2/src/as-pool.c#L117 + # https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#spec-component-location + ./fix-metadata-path.patch + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/fix-metadata-path.patch b/pkgs/desktops/pantheon/apps/elementary-feedback/fix-metadata-path.patch new file mode 100644 index 000000000000..20676937e0a7 --- /dev/null +++ b/pkgs/desktops/pantheon/apps/elementary-feedback/fix-metadata-path.patch @@ -0,0 +1,17 @@ +diff --git a/src/MainWindow.vala b/src/MainWindow.vala +index 6fee9d3..b0eb28c 100644 +--- a/src/MainWindow.vala ++++ b/src/MainWindow.vala +@@ -89,6 +89,12 @@ public class Feedback.MainWindow : Gtk.ApplicationWindow { + #endif + } + ++#if HAS_APPSTREAM_0_15 ++ appstream_pool.add_extra_data_location ("/run/current-system/sw/share/metainfo/", AppStream.FormatStyle.METAINFO); ++#else ++ appstream_pool.add_metadata_location ("/run/current-system/sw/share/metainfo/"); ++#endif ++ + // flatpak's appstream files exists only inside they sandbox + unowned var appdata_dir = "/var/lib/flatpak/app/%s/current/active/files/share/appdata"; + foreach (var app in app_entries) { From 2189d24a3b2038dece3ba2f837177e9a3c6332aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 May 2022 07:31:07 +0000 Subject: [PATCH 35/55] python310Packages.ttp-templates: 0.1.3 -> 0.1.4 --- pkgs/development/python-modules/ttp-templates/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ttp-templates/default.nix b/pkgs/development/python-modules/ttp-templates/default.nix index 45548ee21c2b..9c7899462cb8 100644 --- a/pkgs/development/python-modules/ttp-templates/default.nix +++ b/pkgs/development/python-modules/ttp-templates/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "ttp-templates"; - version = "0.1.3"; + version = "0.1.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -14,8 +14,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dmulyalin"; repo = "ttp_templates"; - rev = version; - hash = "sha256-Qx+z/srYgD67FjXzYrc8xtA99n8shWK7yWj/r/ETN2U="; + rev = "refs/tags/${version}"; + hash = "sha256-yVDJAJXZU4pwvXSKRKUfSHqU23NcdgedOMmynMAD/Po="; }; postPatch = '' From a3a93502f1f1ee8aecc2777482e7bb24e1af75ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 28 May 2022 09:36:31 +0200 Subject: [PATCH 36/55] picoscope: fix sources --- .../electronics/picoscope/sources.json | 78 +++++++++---------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/pkgs/applications/science/electronics/picoscope/sources.json b/pkgs/applications/science/electronics/picoscope/sources.json index aca5f8f4a0f2..15a748dc7cee 100644 --- a/pkgs/applications/science/electronics/picoscope/sources.json +++ b/pkgs/applications/science/electronics/picoscope/sources.json @@ -1,69 +1,69 @@ { "x86_64-linux": { "libpicocv": { - "sha256": "c2e74c2b0679df0226993d063b38d0eda5b05ff59f29bbfa12ded5226df37024", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpicocv/libpicocv_1.1.27-1r153_amd64.deb", - "version": "1.1.27-1r153" + "sha256": "feddc1cb9082005e80c4e2c2732ee4c537915c463ea327aa53a642aab95b8691", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpicocv/libpicocv_1.1.33-beta2r167_amd64.deb", + "version": "1.1.33-beta2r167" }, "libpicoipp": { - "sha256": "0e414ad547f506a39ff11a64772baec923e54f8ca98b81fc9b9cbd19ed573b22", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpicoipp/libpicoipp_1.3.0-4r130_amd64.deb", - "version": "1.3.0-4r130" + "sha256": "2d749b8fd5dbd811c270e4aa78c5ee9cd33832b90d089ae386b0f85aed2d0204", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpicoipp/libpicoipp_1.4.0-4r136_amd64.deb", + "version": "1.4.0-4r136" }, "libps2000": { - "sha256": "d1e94148719a03b70f233cea9a686ed48be03224f2931c9cd282571819a780c7", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps2000/libps2000_3.0.76-3r2981_amd64.deb", - "version": "3.0.76-3r2981" + "sha256": "d306890d1e87651ae83ef00143c8e62b82fae2be39886b6884408751cb910fa4", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps2000/libps2000_3.0.89-3r3163_amd64.deb", + "version": "3.0.89-3r3163" }, "libps2000a": { - "sha256": "c665b70c04203c98bb1b509830ec522f58906b2f393f35c1b4f9c27217ac3572", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps2000a/libps2000a_2.1.76-5r2981_amd64.deb", - "version": "2.1.76-5r2981" + "sha256": "38391dfbe6c6c04ba5b5c99bd53404d5342e40c9eca703e3d95cbc6302114270", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps2000a/libps2000a_2.1.89-5r3163_amd64.deb", + "version": "2.1.89-5r3163" }, "libps3000": { - "sha256": "dbb9f9afdc694c4451e652f22a4c4c67ef609407f45229d26330ce7cfbb02b1c", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps3000/libps3000_4.0.76-3r2981_amd64.deb", - "version": "4.0.76-3r2981" + "sha256": "39b4b56a839eb5d7abcf1de2bab472c2de2d8aa5ffc3ba445e99d5aa8178ba07", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps3000/libps3000_4.0.89-3r3163_amd64.deb", + "version": "4.0.89-3r3163" }, "libps3000a": { - "sha256": "5ab3daadc5d804b224215d138ca94abecc3c311bb91624638e2758ac2a490d25", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps3000a/libps3000a_2.1.76-6r2981_amd64.deb", - "version": "2.1.76-6r2981" + "sha256": "ea96735b90d02c72c9c7b517413fed0d366ac634100e22467a39c780985669e4", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps3000a/libps3000a_2.1.89-6r3163_amd64.deb", + "version": "2.1.89-6r3163" }, "libps4000": { - "sha256": "13504936207f1a7410f726c93358bb21c0c0cd1bd8b473332308a345ff6692c7", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps4000/libps4000_2.1.76-2r2981_amd64.deb", - "version": "2.1.76-2r2981" + "sha256": "7177cd4debf811fa7d7105703a4fc546fe1a79fc3275e3f36326b014c1334f55", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps4000/libps4000_2.1.89-2r3163_amd64.deb", + "version": "2.1.89-2r3163" }, "libps4000a": { - "sha256": "196ccce96e8cf29f5168cda83748857172ae43dc2b990adbacb3327511784492", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps4000a/libps4000a_2.1.76-2r2981_amd64.deb", - "version": "2.1.76-2r2981" + "sha256": "ebe94d6d9f349e5082dcbed55d059ac77c0129b967467786d1cef3f662ebac99", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps4000a/libps4000a_2.1.89-2r3163_amd64.deb", + "version": "2.1.89-2r3163" }, "libps5000": { - "sha256": "1793180d4067df12080ba7b01cbdf38397c2931a7f4915f13dbdb9295cc77cb3", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps5000/libps5000_2.1.76-3r2981_amd64.deb", - "version": "2.1.76-3r2981" + "sha256": "732164658acb4bdfdbf3fc785419ea6a4944ed2892be9dde134b345a976c3318", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps5000/libps5000_2.1.89-3r3163_amd64.deb", + "version": "2.1.89-3r3163" }, "libps5000a": { - "sha256": "b08a73f43bdcfa2bc02d01f398147da9b8cf2599477144b5a2b2af924d0bf0e9", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps5000a/libps5000a_2.1.76-5r2981_amd64.deb", - "version": "2.1.76-5r2981" + "sha256": "3438f51c8646e3ac5a479c88aa7a89b3dfcce2090720317b4efb8db538372cdb", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps5000a/libps5000a_2.1.89-5r3163_amd64.deb", + "version": "2.1.89-5r3163" }, "libps6000": { - "sha256": "dda0fcb8b346f77a715053b52ad9e26b323991f8336001de7ff1bb6d04c716b4", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps6000/libps6000_2.1.76-6r2981_amd64.deb", - "version": "2.1.76-6r2981" + "sha256": "fe4165ab0d323728b473347b61439b074486809d673e47f169d0062cf917191c", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps6000/libps6000_2.1.89-6r3163_amd64.deb", + "version": "2.1.89-6r3163" }, "libps6000a": { - "sha256": "786e5772055500e2e445ddfd5402fed359a9afa54177bd731912d24522729004", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps6000a/libps6000a_1.0.76-0r2981_amd64.deb", - "version": "1.0.76-0r2981" + "sha256": "0552811f92a015ef47b09947631f5f5d8c30b122425de083bea79df88957a9c7", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps6000a/libps6000a_1.0.89-0r3163_amd64.deb", + "version": "1.0.89-0r3163" }, "picoscope": { - "sha256": "12afae7992b9d60c93e5e39c7fe3f93955be3bdff554b52894064d5f320347f4", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/p/picoscope/picoscope_7.0.86-1r9656_amd64.deb", - "version": "7.0.86-1r9656" + "sha256": "b060edb02bc2de5d10a45d31d4b7f9c767d18511e2f65a1ebdd70cc3e8780262", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/p/picoscope/picoscope_7.0.100-1r11387_amd64.deb", + "version": "7.0.100-1r11387" } } } From 0aae17ec5a449371264323e81ac97137330e8073 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 28 May 2022 09:57:28 +0200 Subject: [PATCH 37/55] python310Packages.stumpy: add pythonImportsCheck --- pkgs/development/python-modules/stumpy/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/stumpy/default.nix b/pkgs/development/python-modules/stumpy/default.nix index cbfb81b701ac..190ee6ccfa8a 100644 --- a/pkgs/development/python-modules/stumpy/default.nix +++ b/pkgs/development/python-modules/stumpy/default.nix @@ -8,17 +8,21 @@ , dask , distributed , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "stumpy"; version = "1.11.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "TDAmeritrade"; repo = "stumpy"; rev = "refs/tags/v${version}"; - sha256 = "sha256-ARpXqZpWkbvIEDVkxA1SwlWoxq+3WO6tvv/e7WZ/25c="; + hash = "sha256-ARpXqZpWkbvIEDVkxA1SwlWoxq+3WO6tvv/e7WZ/25c="; }; propagatedBuildInputs = [ @@ -34,6 +38,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pythonImportsCheck = [ + "stumpy" + ]; + pytestFlagsArray = [ # whole testsuite is very CPU intensive, only run core tests # TODO: move entire test suite to passthru.tests @@ -41,9 +49,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "A powerful and scalable library that can be used for a variety of time series data mining tasks"; + description = "Library that can be used for a variety of time series data mining tasks"; homepage = "https://github.com/TDAmeritrade/stumpy"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } From 265f39214fd54d4e91a5da9d6f1ec6af5bdc595e Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sat, 28 May 2022 10:14:16 +0200 Subject: [PATCH 38/55] vial: 0.5.2 -> 0.6 --- pkgs/tools/misc/vial/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/vial/default.nix b/pkgs/tools/misc/vial/default.nix index 81979c0903f5..6834a53bb6ec 100644 --- a/pkgs/tools/misc/vial/default.nix +++ b/pkgs/tools/misc/vial/default.nix @@ -1,12 +1,12 @@ { lib, fetchurl, appimageTools }: let name = "vial-${version}"; - version = "0.5.2"; + version = "0.6"; pname = "Vial"; src = fetchurl { url = "https://github.com/vial-kb/vial-gui/releases/download/v${version}/${pname}-v${version}-x86_64.AppImage"; - sha256 = "sha256-wKgkEn2BoJfk3kMXOAKlFvXgCcnwHlgu2VgwL2QM06Q="; + sha256 = "sha256-2EapikmY79KQdoHnz1A7gErVXBN8D80r1GJMKQ5gIM0="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; From 763aa2ba89c78d0a04e03f314a42881d6a822687 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 May 2022 08:23:02 +0000 Subject: [PATCH 39/55] python310Packages.qiskit-machine-learning: 0.3.1 -> 0.4.0 --- .../python-modules/qiskit-machine-learning/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-machine-learning/default.nix b/pkgs/development/python-modules/qiskit-machine-learning/default.nix index ad00a16a880e..c74e6c53bdea 100644 --- a/pkgs/development/python-modules/qiskit-machine-learning/default.nix +++ b/pkgs/development/python-modules/qiskit-machine-learning/default.nix @@ -23,15 +23,15 @@ buildPythonPackage rec { pname = "qiskit-machine-learning"; - version = "0.3.1"; + version = "0.4.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "qiskit"; repo = pname; - rev = version; - sha256 = "sha256-8tnd6+tqofKuK/sBdqmClBtywHbu3VvwLjO9k4YoChA="; + rev = "refs/tags/${version}"; + sha256 = "sha256-WZSXt+sVeO64wCVbDgBhuGvo5jTn/JKh9oNSO7ZY9wo="; }; propagatedBuildInputs = [ From b665beb911bf98993463013018d9a81ad5b728a5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 28 May 2022 10:36:34 +0200 Subject: [PATCH 40/55] python3Packages.transformers: add optional-dependencies --- .../python-modules/transformers/default.nix | 73 +++++++++++++++---- 1 file changed, 58 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index 1716cd44f8df..adef7a19afcf 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -1,5 +1,5 @@ -{ buildPythonPackage -, lib +{ lib +, buildPythonPackage , fetchFromGitHub , pythonOlder , cookiecutter @@ -10,9 +10,14 @@ , requests , numpy , packaging +, tensorflow +, sagemaker +, ftfy , protobuf +, scikit-learn +, pillow , pyyaml -, sacremoses +, torch , tokenizers , tqdm }: @@ -20,42 +25,80 @@ buildPythonPackage rec { pname = "transformers"; version = "4.19.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-9r/1vW7Rhv9+Swxdzu5PTnlQlT8ofJeZamHf5X4ql8w="; + hash = "sha256-9r/1vW7Rhv9+Swxdzu5PTnlQlT8ofJeZamHf5X4ql8w="; }; - nativeBuildInputs = [ packaging ]; - propagatedBuildInputs = [ - cookiecutter filelock huggingface-hub numpy protobuf + packaging pyyaml regex requests - sacremoses tokenizers tqdm - ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; + + passthru.optional-dependencies = { + ja = [ + # fugashi + # ipadic + # unidic_lite + # unidic + ]; + sklearn = [ + scikit-learn + ]; + tf = [ + tensorflow + # onnxconverter-common + # tf2onnx + ]; + torch = [ + torch + ]; + tokenizers = [ + tokenizers + ]; + modelcreation = [ + cookiecutter + ]; + sagemaker = [ + sagemaker + ]; + ftfy = [ ftfy ]; + onnx = [ + # onnxconverter-common + # tf2onnx + ]; + vision = [ + pillow + ]; + }; + # Many tests require internet access. doCheck = false; - postPatch = '' - sed -ri 's/tokenizers[=>]=[^"]+/tokenizers/g' setup.py src/transformers/dependency_versions_table.py - ''; - - pythonImportsCheck = [ "transformers" ]; + pythonImportsCheck = [ + "transformers" + ]; meta = with lib; { homepage = "https://github.com/huggingface/transformers"; - description = "State-of-the-art Natural Language Processing for TensorFlow 2.0 and PyTorch"; + description = "Natural Language Processing for TensorFlow 2.0 and PyTorch"; changelog = "https://github.com/huggingface/transformers/releases/tag/v${version}"; license = licenses.asl20; platforms = platforms.unix; From 97597c4f22ab7ec4015b2c04a330289a831f865d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 28 May 2022 10:45:40 +0200 Subject: [PATCH 41/55] python310Packages.spacy-transformers: relax transformers constraint --- .../python-modules/spacy-transformers/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/spacy-transformers/default.nix b/pkgs/development/python-modules/spacy-transformers/default.nix index afc3ffbd25ed..70bc4925ae44 100644 --- a/pkgs/development/python-modules/spacy-transformers/default.nix +++ b/pkgs/development/python-modules/spacy-transformers/default.nix @@ -33,6 +33,11 @@ buildPythonPackage rec { dataclasses ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "transformers>=3.4.0,<4.18.0" "transformers>=3.4.0 # ,<4.18.0" + ''; + # Test fails due to missing arguments for trfs2arrays(). doCheck = false; From 254d2ff6a125dd99175c52f24282d76c81f21ab7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 28 May 2022 11:09:20 +0200 Subject: [PATCH 42/55] python310Packages.pysqueezebox: enable tests --- .../python-modules/pysqueezebox/default.nix | 35 +++++++++++++++---- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pysqueezebox/default.nix b/pkgs/development/python-modules/pysqueezebox/default.nix index 17d69ac467da..67344d8a5744 100644 --- a/pkgs/development/python-modules/pysqueezebox/default.nix +++ b/pkgs/development/python-modules/pysqueezebox/default.nix @@ -1,22 +1,43 @@ -{ lib, fetchPypi, buildPythonPackage, pythonOlder, aiohttp }: +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "pysqueezebox"; version = "0.6.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-qc6ffWk62EF+IOLb2XVWtDrrZ0LVs7VtxJG1qrrUPPg="; + src = fetchFromGitHub { + owner = "rajlaud"; + repo = pname; + rev = "v${version}"; + hash = "sha256-0ArKVRy4H0NWShlQMziKvbHp9OjpAkEKp4zrvpVlXOk="; }; propagatedBuildInputs = [ aiohttp ]; - # No tests in the Pypi distribution - doCheck = false; - pythonImportsCheck = [ "pysqueezebox" ]; + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pysqueezebox" + ]; + + disabledTestPaths = [ + # Tests require network access + "tests/test_integration.py" + ]; meta = with lib; { description = "Asynchronous library to control Logitech Media Server"; From ed459276f68b0e784d550ad52d80ab31755b5336 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 May 2022 09:19:26 +0000 Subject: [PATCH 43/55] python310Packages.dask-ml: 2022.1.22 -> 2022.5.27 --- pkgs/development/python-modules/dask-ml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix index 31be98f45912..634abe06b062 100644 --- a/pkgs/development/python-modules/dask-ml/default.nix +++ b/pkgs/development/python-modules/dask-ml/default.nix @@ -17,13 +17,13 @@ }: buildPythonPackage rec { - version = "2022.1.22"; + version = "2022.5.27"; pname = "dask-ml"; disabled = pythonOlder "3.6"; # >= 3.6 src = fetchPypi { inherit pname version; - sha256 = "21a128e9f4f10e3b39cf82b36266eae28b17d16f2f6aa351bd73eb361e49326a"; + sha256 = "sha256-Y2nTk0GSvMGSP87oTD+4+8zsoQITeQEHC6Px2eOGzOQ="; }; nativeBuildInputs = [ From e73f1c5827b44d5d027d3fb59ad47076ce96ef67 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 28 May 2022 11:20:42 +0200 Subject: [PATCH 44/55] python310Packages.pypoolstation: 0.4.1 -> 0.4.2 --- pkgs/development/python-modules/pypoolstation/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pypoolstation/default.nix b/pkgs/development/python-modules/pypoolstation/default.nix index f1fc1e94e51c..e967314c5e89 100644 --- a/pkgs/development/python-modules/pypoolstation/default.nix +++ b/pkgs/development/python-modules/pypoolstation/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pypoolstation"; - version = "0.4.1"; + version = "0.4.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyPoolstation"; inherit version; - sha256 = "sha256-GsEYlaoitHS2cOBHtgwhlREcps4q2ObnWywvCSak0NY="; + sha256 = "sha256-86y/JnTSV+MEr0np3bbwqFMkVrWpMAeyn9WVuNod9xQ="; }; nativeBuildInputs = [ From 8cb56ba64a05ee579e31b8c72691d14f9d6b56eb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 May 2022 01:20:43 +0000 Subject: [PATCH 45/55] allure: 2.17.3 -> 2.18.1 --- pkgs/development/tools/allure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/allure/default.nix b/pkgs/development/tools/allure/default.nix index 2988a559aa72..a85de41c2493 100644 --- a/pkgs/development/tools/allure/default.nix +++ b/pkgs/development/tools/allure/default.nix @@ -2,7 +2,7 @@ let pname = "allure"; - version = "2.17.3"; + version = "2.18.1"; in stdenv.mkDerivation rec { inherit pname version; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/allure-framework/allure2/releases/download/${version}/allure-${version}.tgz"; - sha256 = "sha256-WGeCzWwyLEb4WmlA6Vs8L2TL3NTL6sky5TLeiwV8iJY="; + sha256 = "sha256-6psHHmU9TN0iugmPErdeLHevm+T2/3IJIp7kMdUSFd8="; }; dontConfigure = true; dontBuild = true; From 824addbc33bedcd877cbb65f030dd0949a80ddf0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 28 May 2022 11:34:34 +0200 Subject: [PATCH 46/55] step-cli: 0.19.0 -> 0.20.0 --- pkgs/tools/security/step-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/step-cli/default.nix b/pkgs/tools/security/step-cli/default.nix index dc09e8476bf3..f371168aa7b3 100644 --- a/pkgs/tools/security/step-cli/default.nix +++ b/pkgs/tools/security/step-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "step-cli"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "smallstep"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-ZH3OrJGh7TekODW5rh8JShNHKfuxPr5HhVD7wsvi8M0="; + sha256 = "sha256-CCtK7FuOOO6Ht4WjBpFVcfCL4XE3XR52WDahP4JDJ7M="; }; ldflags = [ @@ -25,7 +25,7 @@ buildGoModule rec { rm command/certificate/remote_test.go ''; - vendorSha256 = "sha256-hJEL6kUc6aXKq7X23dRWhAni5oRDJ3CuNTx6JL049gA="; + vendorSha256 = "sha256-O2B8NMsFxyRLsOi8Zznr2NaqktX9k8ZtWPeaFlkNUnE="; meta = with lib; { description = "A zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc"; From a4942116be0d951bfcbc62744f28b35c2cfeafd0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 May 2022 09:40:38 +0000 Subject: [PATCH 47/55] python310Packages.watermark: 2.3.0 -> 2.3.1 --- pkgs/development/python-modules/watermark/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/watermark/default.nix b/pkgs/development/python-modules/watermark/default.nix index b6403a38dfb0..470e7e19c3dc 100644 --- a/pkgs/development/python-modules/watermark/default.nix +++ b/pkgs/development/python-modules/watermark/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "watermark"; - version = "2.3.0"; + version = "2.3.1"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "rasbt"; repo = pname; - rev = "v${version}"; - sha256 = "1kl9yn1pkl84d3lcz7bvphqkydsgs0p5k0ja0msy3hrxxfzdzd16"; + rev = "refs/tags/${version}"; + sha256 = "sha256-E3UxdGlxTcvkiKa3RoG9as6LybyW+QrCUZvA9VHwxlk="; }; propagatedBuildInputs = [ From 512e594958070350047fab44bc2c7ce438cdf7c7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 28 May 2022 11:43:00 +0200 Subject: [PATCH 48/55] ssldump: 1.4 -> 1.5 --- pkgs/tools/networking/ssldump/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/ssldump/default.nix b/pkgs/tools/networking/ssldump/default.nix index dd01bf504404..766c9a095021 100644 --- a/pkgs/tools/networking/ssldump/default.nix +++ b/pkgs/tools/networking/ssldump/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "ssldump"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "adulau"; repo = "ssldump"; rev = "v${version}"; - sha256 = "1xnlfqsl93nxbcv4x4xsgxa6mnhcx37hijrpdb7vzla6q7xvg8qr"; + sha256 = "sha256-nk1sXQN9cPIZD7Xlg8CHmKySfvfWl2j0CGxmIyvA6z4="; }; nativeBuildInputs = [ From 28be75ad0265fc22791c965f2e49547b96f4b8cf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 28 May 2022 11:58:02 +0200 Subject: [PATCH 49/55] python310Packages.watermark: update meta --- .../python-modules/watermark/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/watermark/default.nix b/pkgs/development/python-modules/watermark/default.nix index 470e7e19c3dc..10be7466063c 100644 --- a/pkgs/development/python-modules/watermark/default.nix +++ b/pkgs/development/python-modules/watermark/default.nix @@ -10,27 +10,33 @@ buildPythonPackage rec { pname = "watermark"; version = "2.3.1"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "rasbt"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-E3UxdGlxTcvkiKa3RoG9as6LybyW+QrCUZvA9VHwxlk="; + hash = "sha256-E3UxdGlxTcvkiKa3RoG9as6LybyW+QrCUZvA9VHwxlk="; }; propagatedBuildInputs = [ ipython - ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; checkInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "watermark" ]; + pythonImportsCheck = [ + "watermark" + ]; meta = with lib; { - description = "IPython extension for printing date and time stamps, version numbers, and hardware information."; + description = "IPython extension for printing date and timestamps, version numbers, and hardware information"; homepage = "https://github.com/rasbt/watermark"; license = licenses.bsd3; maintainers = with maintainers; [ nphilou ]; From f94c658564363eae55c375d2e043308ab3c1cdbd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 28 May 2022 12:05:36 +0200 Subject: [PATCH 50/55] python310Packages.dask-ml: update meta --- .../python-modules/dask-ml/default.nix | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix index 634abe06b062..d069532cffad 100644 --- a/pkgs/development/python-modules/dask-ml/default.nix +++ b/pkgs/development/python-modules/dask-ml/default.nix @@ -1,29 +1,31 @@ { lib , buildPythonPackage -, fetchPypi -, pythonOlder , dask -, numpy, toolz # dask[array] +, dask-glm +, distributed +, fetchPypi +, multipledispatch , numba +, numpy +, packaging , pandas +, pythonOlder , scikit-learn , scipy -, dask-glm -, six -, multipledispatch -, packaging -, distributed , setuptools-scm +, toolz }: buildPythonPackage rec { - version = "2022.5.27"; pname = "dask-ml"; - disabled = pythonOlder "3.6"; # >= 3.6 + version = "2022.5.27"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Y2nTk0GSvMGSP87oTD+4+8zsoQITeQEHC6Px2eOGzOQ="; + hash = "sha256-Y2nTk0GSvMGSP87oTD+4+8zsoQITeQEHC6Px2eOGzOQ="; }; nativeBuildInputs = [ @@ -41,14 +43,12 @@ buildPythonPackage rec { pandas scikit-learn scipy - six toolz ]; # has non-standard build from source, and pypi doesn't include tests doCheck = false; - # in lieu of proper tests pythonImportsCheck = [ "dask_ml" "dask_ml.naive_bayes" @@ -57,9 +57,9 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://github.com/dask/dask-ml"; description = "Scalable Machine Learn with Dask"; + homepage = "https://github.com/dask/dask-ml"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } From 0dfde4541e6024213136e3dc255b28cc08f04a52 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 May 2022 04:30:31 +0000 Subject: [PATCH 51/55] gnome.nautilus: 42.1.1 -> 42.2 --- pkgs/desktops/gnome/core/nautilus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/nautilus/default.nix b/pkgs/desktops/gnome/core/nautilus/default.nix index ccc19728b0b5..53d68c12080a 100644 --- a/pkgs/desktops/gnome/core/nautilus/default.nix +++ b/pkgs/desktops/gnome/core/nautilus/default.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation rec { pname = "nautilus"; - version = "42.1.1"; + version = "42.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "hRnUVl6EKqPTHQ/jmyHUisVO3A8GWP4djqLaTnBMG2Y="; + sha256 = "mSEtLrdZlvGBcorQSi4thvJXewZOaKNMi4GnA330zLI="; }; patches = [ From 305fc8571778a81fcbde085129aeb906e7944907 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 May 2022 04:13:47 +0000 Subject: [PATCH 52/55] gnome.gnome-control-center: 42.1 -> 42.2 --- pkgs/desktops/gnome/core/gnome-control-center/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index dbe3665f1ef8..b8cf3765714c 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -63,11 +63,11 @@ stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "42.1"; + version = "42.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-+zCv+Q++HSrVYQfW6fX4pKOq82NbvYiSDXW1aLt3Z4U="; + sha256 = "sha256-eLolewn73cBYh5F00Tg3p5zVnpWoSQEX5Myi5SLJ6wA="; }; patches = [ From fa776fc15078e2839c19213824266a96815486ca Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 28 May 2022 12:08:30 +0200 Subject: [PATCH 53/55] stunnel: 5.63 -> 5.64 --- pkgs/tools/networking/stunnel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index 4895c95bba19..b8737724cc0e 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "stunnel"; - version = "5.63"; + version = "5.64"; src = fetchurl { url = "https://www.stunnel.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "sha256-x0xOFRRKOuNLi4kLsxyQkgcwFJC9HlG/qqX/6wqZRhc="; + sha256 = "sha256-7r5T7RFrpDsueGdisMK5FRHnt0hXrUdlgk5xmeb6+IM="; # please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256", # not the output of `nix-prefetch-url` }; From d77b9e43ebdd657f3cfc132b245c9600c8af35b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 May 2022 02:55:19 +0000 Subject: [PATCH 54/55] evolution-data-server: 3.44.1 -> 3.44.2 --- pkgs/desktops/gnome/core/evolution-data-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix index 15d22674b3c9..d0252bc39c38 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -45,13 +45,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.44.1"; + version = "3.44.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "bgWpAgSidvmdkyCX8QMswX3R2OJlx8VnJ8YyQP1MDM8="; + sha256 = "Ltcq/k1rsXD4co+uoJB/7hAhLf3nqfq4L7zIPQ8i8Cg="; }; patches = [ From a30de3b849bb29b4d2206e1a652707fba8ea18a4 Mon Sep 17 00:00:00 2001 From: Matthias Treydte Date: Fri, 13 May 2022 12:09:25 +0200 Subject: [PATCH 55/55] nixos/systemd-boot: fix systemd-boot-builder dowgrade to fail Since, 4ddc78818e4d69605f49f5f8faa22fb4601b0a0c systemd-boot-builder is broken in two ways: * if no systemd-boot is currently installed *and* the NIXOS_INSTALL_BOOTLOADER env variable is not set, it will try to run "bootctl update", which will fail * if the currently installed systemd-boot version is newer than the version we're about to install, it will also try to run "bootctl update", which will fail This patch changes the behaviour, * for the first case to still fail, but not even bother to try running "bootctl update" and instead erroring out with an exception * for the second case to leave the newer version in place, restoring the pre - 4ddc78818e4d69605f49f5f8faa22fb4601b0a0c behaviour To do the proper version check a new "should_update" helper function was introduced, mimicing the compare_product C function from bootctl. If the following systemd issue gets resolved, we would have a nice way to get rid of this function: > https://github.com/systemd/systemd/issues/23450 This change allows to again switch to a different NixOS configuration which contains an older systemd-boot. Co-authored-by: Martin Weinelt --- .../systemd-boot/systemd-boot-builder.py | 46 +++++++++++++------ 1 file changed, 31 insertions(+), 15 deletions(-) diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index fa879437fd81..4bb39811434c 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -204,6 +204,20 @@ def get_profiles() -> List[str]: else: return [] +def should_update(v_from: str, v_to: str) -> bool: + # see https://github.com/systemd/systemd/blob/main/src/boot/bootctl.c compare_product function + + len_from = len(v_from) + len_to = len(v_to) + + if len_from < len_to: + return False + + if len_from > len_to: + return True + + return v_from < v_to + def main() -> None: parser = argparse.ArgumentParser(description='Update NixOS-related systemd-boot files') @@ -244,27 +258,29 @@ def main() -> None: subprocess.check_call(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@"] + flags + ["install"]) else: # Update bootloader to latest if needed - systemd_version = subprocess.check_output(["@systemd@/bin/bootctl", "--version"], universal_newlines=True).split()[2] - sdboot_status = subprocess.check_output(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "status"], universal_newlines=True) + available_out = subprocess.check_output(["@systemd@/bin/bootctl", "--version"], universal_newlines=True).split()[2] + installed_out = subprocess.check_output(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "status"], universal_newlines=True) # See status_binaries() in systemd bootctl.c for code which generates this - m = re.search("^\W+File:.*/EFI/(BOOT|systemd)/.*\.efi \(systemd-boot ([\d.]+[^)]*)\)$", - sdboot_status, re.IGNORECASE | re.MULTILINE) + installed_match = re.search(r"^\W+File:.*/EFI/(?:BOOT|systemd)/.*\.efi \(systemd-boot ([\d.]+[^)]*)\)$", + installed_out, re.IGNORECASE | re.MULTILINE) - needs_install = False + available_match = re.search(r"^\((.*)\)$", available_out) - if m is None: - print("could not find any previously installed systemd-boot, installing.") - # Let systemd-boot attempt an installation if a previous one wasn't found - needs_install = True - else: - sdboot_version = f'({m.group(2)})' - if systemd_version != sdboot_version: - print("updating systemd-boot from %s to %s" % (sdboot_version, systemd_version)) - needs_install = True + if installed_match is None: + raise Exception("could not find any previously installed systemd-boot") - if needs_install: + if available_match is None: + raise Exception("could not determine systemd-boot version") + + installed_version = installed_match.group(1) + available_version = available_match.group(1) + + if should_update(installed_version, available_version): + print("updating systemd-boot from %s to %s" % (installed_version, available_version)) subprocess.check_call(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "update"]) + else: + print("leaving systemd-boot %s in place (%s is not newer)" % (installed_version, available_version)) mkdir_p("@efiSysMountPoint@/efi/nixos") mkdir_p("@efiSysMountPoint@/loader/entries")