From 15b108b54ae239d550488c8447de8cc0aa3fdba6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Niemier?= <~@hauleth.dev>
Date: Mon, 3 Feb 2025 10:46:55 +0100
Subject: [PATCH] fix: git-branchless do not need custom derivation but prr
 does

---
 modules/git.nix | 6 ++++--
 pkgs/prr.nix    | 8 +++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules/git.nix b/modules/git.nix
index 414b6bc..2ce752b 100644
--- a/modules/git.nix
+++ b/modules/git.nix
@@ -22,12 +22,14 @@
 
   home.packages = [
     pkgs.git-absorb
-    (inputs.self.lib.dontCheck inputs.git-branchless.packages.${pkgs.stdenv.hostPlatform.system}.git-branchless)
+    # (inputs.self.lib.dontCheck inputs.git-branchless.packages.${pkgs.stdenv.hostPlatform.system}.git-branchless)
+    pkgs.git-branchless
     pkgs.git-gone
     pkgs.git-cliff
     pkgs.git-revise
     pkgs.gitAndTools.git-imerge
-    pkgs.prr
+    # pkgs.prr
+    inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.prr
     pkgs.hut
     pkgs.patch2pr
     pkgs.revup
diff --git a/pkgs/prr.nix b/pkgs/prr.nix
index 305be02..d29eda1 100644
--- a/pkgs/prr.nix
+++ b/pkgs/prr.nix
@@ -2,6 +2,7 @@
   stdenv,
   rustPlatform,
   openssl,
+  zlib,
   darwin,
   fetchFromGitHub,
   lib,
@@ -9,7 +10,7 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "prr";
-  version = "0.16.0";
+  version = "0.17.0";
 
   nativeBuildInputs = [
     pkg-config
@@ -18,6 +19,7 @@ rustPlatform.buildRustPackage rec {
   buildInputs =
     [
       openssl
+      zlib
     ]
     ++ lib.optional stdenv.isDarwin (with darwin.apple_sdk; [
       frameworks.Security
@@ -28,10 +30,10 @@ rustPlatform.buildRustPackage rec {
     owner = "danobi";
     repo = pname;
     rev = "v${version}";
-    hash = lib.fakeHash;
+    hash = "sha256-siQZ3rDKv2lnn1bmisRsexWwfvmMhK+z4GZGPsrfPgc=";
   };
 
-  cargoHash = lib.fakeHash;
+  cargoHash = "sha256-vCZjgmBYO+I6MZLCOMp50bWEeHwLbZsxSz5gRmBykvI=";
 
   meta = with lib; {
     description = "Mailing list style code reviews for GitHub";
-- 
2.51.2