diff --git a/modules/git.nix b/modules/git.nix --- a/modules/git.nix +++ b/modules/git.nix @@ -22,12 +22,14 @@ # manual.manpages.enable = true; 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 --- a/pkgs/prr.nix +++ b/pkgs/prr.nix @@ -2,6 +2,7 @@ { stdenv, rustPlatform, openssl, + zlib, darwin, fetchFromGitHub, lib, @@ -9,7 +10,7 @@ pkg-config, }: rustPlatform.buildRustPackage rec { pname = "prr"; - version = "0.16.0"; + version = "0.17.0"; nativeBuildInputs = [ pkg-config @@ -18,6 +19,7 @@ buildInputs = [ openssl + zlib ] ++ lib.optional stdenv.isDarwin (with darwin.apple_sdk; [ frameworks.Security @@ -28,10 +30,10 @@ src = fetchFromGitHub { 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";