From 9141f46cc970d73d0b9d7e4a1b510c2d3d9ee7d1 Mon Sep 17 00:00:00 2001 From: Zev Isert Date: Fri, 21 Mar 2025 17:20:01 -0700 Subject: [PATCH] dive: 0.12.0 -> 0.13.0 Also removes unneccessary patches that have been merged upstream --- pkgs/by-name/di/dive/package.nix | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/pkgs/by-name/di/dive/package.nix b/pkgs/by-name/di/dive/package.nix index a6b005d2d034..cccb45755f5d 100644 --- a/pkgs/by-name/di/dive/package.nix +++ b/pkgs/by-name/di/dive/package.nix @@ -3,25 +3,23 @@ stdenv, buildGoModule, fetchFromGitHub, - fetchpatch, pkg-config, btrfs-progs, gpgme, lvm2, }: - buildGoModule rec { pname = "dive"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "wagoodman"; repo = "dive"; rev = "v${version}"; - hash = "sha256-CuVRFybsn7PVPgz3fz5ghpjOEOsTYTv6uUAgRgFewFw="; + hash = "sha256-kVFXidcvSlYi+aD+3yEPYy1Esm0bl02ioX1DmO0L1Hs="; }; - vendorHash = "sha256-uzzawa/Doo6j/Fh9dJMzGKbpp24UTLAo9VGmuQ80IZE="; + vendorHash = "sha256-9lNtKpfGDVE3U0ZX0QcaCJrqCxoubvWqR26IvSKkImM="; nativeBuildInputs = [ pkg-config ]; @@ -31,26 +29,6 @@ buildGoModule rec { lvm2 ]; - patches = [ - # fix scrolling - # See https://github.com/wagoodman/dive/pull/447 - (fetchpatch { - name = "fix-scrolling.patch"; - url = "https://github.com/wagoodman/dive/pull/473/commits/a885fa6e68b3763d52de20603ee1b9cd8949276f.patch"; - hash = "sha256-6gTWfyvK19xDqc7Ah33ewgz/WQRcQHLYwerrwUtRpJc="; - }) - (fetchpatch { - name = "add-scrolling-layers.patch"; - url = "https://github.com/wagoodman/dive/pull/473/commits/840653158e235bdd59b4c4621cf282ce6499c714.patch"; - hash = "sha256-dYqg5JpWKOzy3hVjIVCHA2vmKCtCgc8W+oHEzuGpyxc="; - }) - (fetchpatch { - name = "fix-render-update.patch"; - url = "https://github.com/wagoodman/dive/pull/473/commits/36177a9154eebe9e3ae9461a9e6f6b368f7974e1.patch"; - hash = "sha256-rSeEYxUaYlEZGv+NWYK+nATBYS4P2swqjC3HimHyqNI="; - }) - ]; - ldflags = [ "-s" "-w"