From 8801913fc28a7100dbce888787f22e48b118d2f5 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Sun, 28 May 2023 22:30:53 -0400 Subject: [PATCH 1/2] make-tarball.nix: support an absent revcount When run out of a tarball, it is possible for revCount to be missing. (cherry picked from commit e1de9a317d5e3ac1a501e25be58e0f617de4d085) --- pkgs/top-level/make-tarball.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index 61ed61192d5c..0d9a89d0e3fa 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -19,7 +19,7 @@ pkgs.releaseTools.sourceTarball { versionSuffix = "pre${ if nixpkgs ? lastModified then builtins.substring 0 8 (nixpkgs.lastModifiedDate or nixpkgs.lastModified) - else toString nixpkgs.revCount}.${nixpkgs.shortRev or "dirty"}"; + else toString (nixpkgs.revCount or 0)}.${nixpkgs.shortRev or "dirty"}"; buildInputs = with pkgs; [ nix.out jq lib-tests brotli ]; From e46913811b846b8f8a710912bf400be47bb021d1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Jun 2023 08:24:45 +0000 Subject: [PATCH 2/2] imagemagick: 7.1.1-10 -> 7.1.1-11 (cherry picked from commit 4cf3652aac6f921b8a35a74f4a457137d6a8cd04) --- pkgs/applications/graphics/ImageMagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 55b61fb5169d..77e1adeb619b 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -47,13 +47,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.1-10"; + version = "7.1.1-11"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = finalAttrs.version; - hash = "sha256-W7s/j4R4C22hYVhye8TjDYHtDq/1Q4GGu/9lxyjk6sA="; + hash = "sha256-/CZRnNy/p87sEcH94RkRYgYXexFSU0Bm809pcvDFdV4="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big