summary refs log tree commit diff
path: root/pkgs/applications/version-management/git-and-tools
diff options
context:
space:
mode:
authorJonathan Ringer <jonringer117@gmail.com>2022-02-08 21:19:24 -0800
committerJonathan Ringer <jonringer117@gmail.com>2022-02-08 21:19:24 -0800
commit5df08e00cd308a9a1630656d02ef75ba89b861ed (patch)
tree9f15d3f5793b359617fe1c66d298b14c4a4344ee /pkgs/applications/version-management/git-and-tools
parent335510eb84fa270800feef5bfef6efb6ef907f8a (diff)
parentd818fd7e7115f0e0a3d821d454f818d7003ffa36 (diff)
downloadnixpkgs-5df08e00cd308a9a1630656d02ef75ba89b861ed.tar
nixpkgs-5df08e00cd308a9a1630656d02ef75ba89b861ed.tar.gz
nixpkgs-5df08e00cd308a9a1630656d02ef75ba89b861ed.tar.bz2
nixpkgs-5df08e00cd308a9a1630656d02ef75ba89b861ed.tar.lz
nixpkgs-5df08e00cd308a9a1630656d02ef75ba89b861ed.tar.xz
nixpkgs-5df08e00cd308a9a1630656d02ef75ba89b861ed.tar.zst
nixpkgs-5df08e00cd308a9a1630656d02ef75ba89b861ed.zip
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/python-modules/opensimplex/default.nix
	pkgs/development/python-modules/pygame-gui/default.nix
	pkgs/top-level/aliases.nix
	pkgs/top-level/python-aliases.nix
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools')
-rw-r--r--pkgs/applications/version-management/git-and-tools/git-branchless/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix b/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix
index 9a4d3878e8a..8cedd24be05 100644
--- a/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix
@@ -15,16 +15,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "git-branchless";
-  version = "0.3.8";
+  version = "0.3.9";
 
   src = fetchFromGitHub {
     owner = "arxanas";
     repo = "git-branchless";
     rev = "v${version}";
-    sha256 = "sha256-eDVC1tvAkCioV0Mi5f/Qkc0MMTNaoFXuvWXpllZ7PgE=";
+    sha256 = "sha256-SEmIZy8ql1MxcFR6zeif03DVha/SRZHajVwt3QOBBYU=";
   };
 
-  cargoSha256 = "sha256-wtG/WTmZ13jxIawI9j9QKQm7jPx5TUs7MjqX+lq/Vf0=";
+  cargoSha256 = "sha256-mKfPxU1JoN/xLdPdwy3vo1M0qF9ag0T4Ls4dfvHn6Pc=";
 
   nativeBuildInputs = [ pkg-config ];