summary refs log tree commit diff
diff options
context:
space:
mode:
authorSandro Jäckel <sandro.jaeckel@gmail.com>2023-07-07 23:33:59 +0200
committerSandro Jäckel <sandro.jaeckel@gmail.com>2023-07-07 23:33:59 +0200
commit4284224643c954bf568abeee6e2547991bd09c6c (patch)
tree73426549b79d2384aef7ba6f90cb4a715a2e0b24
parentf11a761f3fe228bb17fe4a6bf0124c206e5ab655 (diff)
downloadnixpkgs-4284224643c954bf568abeee6e2547991bd09c6c.tar
nixpkgs-4284224643c954bf568abeee6e2547991bd09c6c.tar.gz
nixpkgs-4284224643c954bf568abeee6e2547991bd09c6c.tar.bz2
nixpkgs-4284224643c954bf568abeee6e2547991bd09c6c.tar.lz
nixpkgs-4284224643c954bf568abeee6e2547991bd09c6c.tar.xz
nixpkgs-4284224643c954bf568abeee6e2547991bd09c6c.tar.zst
nixpkgs-4284224643c954bf568abeee6e2547991bd09c6c.zip
dive: 0.10.0 -> 0.11.0
-rw-r--r--pkgs/development/tools/dive/default.nix16
1 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/development/tools/dive/default.nix b/pkgs/development/tools/dive/default.nix
index 0d19a1071dc..d7ce887c281 100644
--- a/pkgs/development/tools/dive/default.nix
+++ b/pkgs/development/tools/dive/default.nix
@@ -11,23 +11,25 @@
 
 buildGoModule rec {
   pname = "dive";
-  version = "0.10.0";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "wagoodman";
-    repo = pname;
+    repo = "dive";
     rev = "v${version}";
-    sha256 = "sha256-1pmw8pUlek5FlI1oAuvLSqDow7hw5rw86DRDZ7pFAmA=";
+    hash = "sha256-9REthyb+bzsb7NBXkU9XyUZJFQHHrV1cG4//lTLgTgw=";
   };
 
   patches = [
+    # fixes: unsafe.Slice requires go1.17 or later (-lang was set to go1.16; check go.mod)
+    # https://github.com/wagoodman/dive/pull/461
     (fetchpatch {
-      url = "https://github.com/wagoodman/dive/commit/fe9411c414418d839a8638bb9a12ccfc892b5845.patch";
-      sha256 = "sha256-c0TcUQ87CeOiXHoTQ3z/04i72aDr403DL7fIbXTJ9cY=";
+      url = "https://github.com/wagoodman/dive/commit/555555d777f961ad0a2d1bb843e87f434d731dba.patch";
+      hash = "sha256-tPSgvENiVgrlQSkT7LbQPRYhkkaYQeWRJ0P4bA3XOiI=";
     })
   ];
 
-  vendorSha256 = "sha256-YPkEei7d7mXP+5FhooNoMDARQLosH2fdSaLXGZ5C27o=";
+  vendorHash = "sha256-6KIbTrkvdugsUKdFBqtPUFzs/6h2xslLFpr6S2nSBiY=";
 
   nativeBuildInputs = [ pkg-config ];
 
@@ -39,6 +41,6 @@ buildGoModule rec {
     description = "A tool for exploring each layer in a docker image";
     homepage = "https://github.com/wagoodman/dive";
     license = licenses.mit;
-    maintainers = with maintainers; [ marsam spacekookie SuperSandro2000 ];
+    maintainers = with maintainers; [ marsam SuperSandro2000 ];
   };
 }