From 963874e2dbbe0f830da7d4b06bce91119c3c4bde Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 26 Mar 2022 00:00:49 +0800 Subject: [PATCH 1/6] crystal: remove pointless reference to crystal.lib (cherry picked from commit ba70ac13715900e0eb8f2f895369b9d0add5359e) --- .../compilers/crystal/build-package.nix | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/crystal/build-package.nix b/pkgs/development/compilers/crystal/build-package.nix index 2328e76ad770..4e0e8a193492 100644 --- a/pkgs/development/compilers/crystal/build-package.nix +++ b/pkgs/development/compilers/crystal/build-package.nix @@ -1,4 +1,15 @@ -{ stdenv, lib, crystal, shards, git, pkg-config, which, linkFarm, fetchFromGitHub, installShellFiles }: +{ stdenv +, lib +, crystal +, shards +, git +, pkg-config +, which +, linkFarm +, fetchFromGitHub +, installShellFiles +, removeReferencesTo +}: { # Some projects do not include a lock file, so you can pass one @@ -60,7 +71,13 @@ stdenv.mkDerivation (mkDerivationArgs // { buildInputs = args.buildInputs or [ ] ++ [ crystal ] ++ lib.optional (format != "crystal") shards; - nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [ git installShellFiles pkg-config which ]; + nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [ + git + installShellFiles + removeReferencesTo + pkg-config + which + ]; buildPhase = args.buildPhase or (lib.concatStringsSep "\n" ([ "runHook preBuild" @@ -102,6 +119,7 @@ stdenv.mkDerivation (mkDerivationArgs // { installManPage man/*.? fi '') ++ [ + "remove-references-to -t ${lib.getLib crystal} $out/bin/*" "runHook postInstall" ])); From 40fd7022ed5fea1c484b64991db96b90a5bab1b9 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Sat, 12 Mar 2022 09:15:36 +0100 Subject: [PATCH 2/6] tsm-client: 8.1.13.3 -> 8.1.14.0 This update fixes a denial-of-service vulnerability. Links to IBM's "Authorized Program Analysis Report"s (something like release notes) for 8.1.14.x: https://www.ibm.com/support/pages/node/6559268 README for 8.1.14.x: https://www.ibm.com/support/pages/node/6561875 Security Bulletin: https://www.ibm.com/support/pages/node/6562383 (CVE-2021-35517, CVE-2021-36090) (cherry picked from commit ea84f6b9e93d44fe586dc2af91fca101ee2dd8b9) --- pkgs/tools/backup/tsm-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/tsm-client/default.nix b/pkgs/tools/backup/tsm-client/default.nix index 74ffcd274b9e..7255c9c361a2 100644 --- a/pkgs/tools/backup/tsm-client/default.nix +++ b/pkgs/tools/backup/tsm-client/default.nix @@ -97,10 +97,10 @@ let unwrapped = stdenv.mkDerivation rec { name = "tsm-client-${version}-unwrapped"; - version = "8.1.13.3"; + version = "8.1.14.0"; src = fetchurl { url = mkSrcUrl version; - sha256 = "1dwczf236drdaf4jcfzz5154vdwvxf5zraxhrhiddl6n80hnvbcd"; + sha256 = "1iczc4w8rwzqnw01r89kwxcdr7pnwh3nqr3a0q8ncrxrhsy3qwn0"; }; inherit meta; From 2a89839d48b0cd730f72f63c3a5fbf2a01e299ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EF=BD=88=EF=BD=89=EF=BD=8C=EF=BD=8A=EF=BD=95=EF=BD=93?= =?UTF-8?q?=EF=BD=94=EF=BD=89?= Date: Fri, 6 May 2022 23:48:07 -0700 Subject: [PATCH 3/6] sigi: 3.2.1 -> 3.3.0 (cherry picked from commit b006d76fa527379bc7f64dbe4e22c689832cc592) --- pkgs/applications/misc/sigi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/sigi/default.nix b/pkgs/applications/misc/sigi/default.nix index 2513476ad74e..13f73a7d595c 100644 --- a/pkgs/applications/misc/sigi/default.nix +++ b/pkgs/applications/misc/sigi/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "sigi"; - version = "3.2.1"; + version = "3.3.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-1eZ6i0CvjNyYlWb7c0OPlGtvVSFpi8hiOl/7qeeE9wA="; + sha256 = "sha256-dcfzCac4dT2X1hgTSh30G7h2XtvVj1jMUmrUzqZ11y8="; }; - cargoSha256 = "sha256-Tyrcu/BYt9k4igiEIiZ2I7VIGiBZ3D2i6XfT/XGlU+U="; + cargoSha256 = "sha256-CQofC9Y0y8XASLpjk9B6mMlSQqiXnoGZ8kJh16txiPA="; nativeBuildInputs = [ installShellFiles ]; # In case anything goes wrong. From 7c3396e114ea54b1e5dcf47e2c35a35c019caaa0 Mon Sep 17 00:00:00 2001 From: misuzu Date: Thu, 14 Apr 2022 13:04:57 +0300 Subject: [PATCH 4/6] alfis: 0.6.11 -> 0.7.0 (cherry picked from commit 1e1c29aa78ae20dc4be3540b35d58ef51a5de2f2) --- pkgs/applications/blockchains/alfis/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/alfis/default.nix b/pkgs/applications/blockchains/alfis/default.nix index 28ce7512129e..d42ee291cf05 100644 --- a/pkgs/applications/blockchains/alfis/default.nix +++ b/pkgs/applications/blockchains/alfis/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "alfis"; - version = "0.6.11"; + version = "0.7.0"; src = fetchFromGitHub { owner = "Revertron"; repo = "Alfis"; rev = "v${version}"; - sha256 = "sha256-vm/JBJh58UaSem18RpJuPUzM2GCy4RfCb6Hr1B7KWQA="; + sha256 = "sha256-lamobXaDY+v8NpoI+TuuBO5Cdol9+7VPhdmLEH6sZIo="; }; - cargoSha256 = "sha256-8ijGO8up0qVQ/kVX5/DveKyovYLh7jm+d7vooS1waAA="; + cargoSha256 = "sha256-C5MCT4EG/lI4s2rVGSm9DgBu43FKpp3iTBbCf7N1jOA="; checkFlags = [ # these want internet access, disable them From 9a7c282f66fe0709be602dd7fce42bf0872cd91c Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 8 May 2022 23:53:49 -0300 Subject: [PATCH 5/6] recutils: 1.8 -> 1.9 (cherry picked from commit ae9a9ee9419244c2ba13a8386d4e5844e665ca79) --- pkgs/tools/misc/recutils/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/recutils/default.nix b/pkgs/tools/misc/recutils/default.nix index 1501f8edda1f..972b60d36490 100644 --- a/pkgs/tools/misc/recutils/default.nix +++ b/pkgs/tools/misc/recutils/default.nix @@ -8,23 +8,22 @@ stdenv.mkDerivation rec { pname = "recutils"; - version = "1.8"; + version = "1.9"; src = fetchurl { url = "mirror://gnu/recutils/${pname}-${version}.tar.gz"; - hash = "sha256-346uaVk/26U+Jky/SyMH37ghIMCbb6sj4trVGomlsZM="; + hash = "sha256-YwFZKwAgwUtFZ1fvXUNNSfYCe45fOkmdEzYvIFxIbg4="; }; - hardeningDisable = [ "format" ]; - buildInputs = [ curl ]; checkInputs = [ - check bc + check ]; + doCheck = true; meta = with lib; { From eb24cfd219072c266bd94cb6c4da748d0629bd21 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Mon, 9 May 2022 15:23:26 -0500 Subject: [PATCH 6/6] recutils: disable Clang "format" hardening Remove the -Werror=format-security compiler option when using Clang, because recutils does not build with it enabled. (cherry picked from commit 3ece875b6007e383428aea745429f3ef8cbe3fff) --- pkgs/tools/misc/recutils/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/misc/recutils/default.nix b/pkgs/tools/misc/recutils/default.nix index 972b60d36490..0299cf382181 100644 --- a/pkgs/tools/misc/recutils/default.nix +++ b/pkgs/tools/misc/recutils/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { hash = "sha256-YwFZKwAgwUtFZ1fvXUNNSfYCe45fOkmdEzYvIFxIbg4="; }; + hardeningDisable = lib.optional stdenv.cc.isClang "format"; + buildInputs = [ curl ];