about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/tools/git-ps-rs
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2023-08-08 16:04:42 +0000
committerAlyssa Ross <hi@alyssa.is>2023-08-13 06:35:37 +0000
commit12aaa58dac35800b5b7d77f81cf2a87c21ee55da (patch)
treebe0add9e5c22a85d20b5d78206aa74f956eb2a1b /nixpkgs/pkgs/development/tools/git-ps-rs
parent45892a5591202f75a1c2f1ca7c62a92c7566e3c5 (diff)
parent5a8e9243812ba528000995b294292d3b5e120947 (diff)
downloadnixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar
nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.gz
nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.bz2
nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.lz
nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.xz
nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.zst
nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.zip
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts:
	nixpkgs/pkgs/applications/window-managers/sway/default.nix
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
	nixpkgs/pkgs/development/libraries/mesa/default.nix
	nixpkgs/pkgs/servers/dict/dictd-db.nix

Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391
Diffstat (limited to 'nixpkgs/pkgs/development/tools/git-ps-rs')
-rw-r--r--nixpkgs/pkgs/development/tools/git-ps-rs/Cargo.lock2
-rw-r--r--nixpkgs/pkgs/development/tools/git-ps-rs/default.nix4
2 files changed, 3 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/tools/git-ps-rs/Cargo.lock b/nixpkgs/pkgs/development/tools/git-ps-rs/Cargo.lock
index 39c615f36a5f..18c685badbde 100644
--- a/nixpkgs/pkgs/development/tools/git-ps-rs/Cargo.lock
+++ b/nixpkgs/pkgs/development/tools/git-ps-rs/Cargo.lock
@@ -258,7 +258,7 @@ dependencies = [
 
 [[package]]
 name = "gps"
-version = "6.7.0"
+version = "6.8.0"
 dependencies = [
  "ansi_term",
  "git2",
diff --git a/nixpkgs/pkgs/development/tools/git-ps-rs/default.nix b/nixpkgs/pkgs/development/tools/git-ps-rs/default.nix
index c5f35ac69e2f..27e08245a59a 100644
--- a/nixpkgs/pkgs/development/tools/git-ps-rs/default.nix
+++ b/nixpkgs/pkgs/development/tools/git-ps-rs/default.nix
@@ -12,13 +12,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "git-ps-rs";
-  version = "6.7.0";
+  version = "6.8.0";
 
   src = fetchFromGitHub {
     owner = "uptech";
     repo = "git-ps-rs";
     rev = version;
-    hash = "sha256-yBZ+YJxiVO8+rI7FLtI0xse8hoirjt5Bc2KxPeBidd0=";
+    hash = "sha256-M5VLQY+0QOKKygnNHjOutwniWO90y4RReAJoxwWpRSA=";
   };
 
   cargoLock = {