summary refs log tree commit diff
diff options
context:
space:
mode:
authorMuhammad Falak R Wani <falakreyaz@gmail.com>2023-09-07 08:54:01 +0530
committerAustin Seipp <aseipp@pobox.com>2023-09-08 15:28:07 -0500
commitb37283985bf2d755aeb3ddba399021f65b68758b (patch)
tree15fc6471e7b55bb6bc4cd9d53d5d7ab3dfcecb1b
parentf802f6d1376a0a031c0aafe809d89ab6e3dd6554 (diff)
downloadnixpkgs-b37283985bf2d755aeb3ddba399021f65b68758b.tar
nixpkgs-b37283985bf2d755aeb3ddba399021f65b68758b.tar.gz
nixpkgs-b37283985bf2d755aeb3ddba399021f65b68758b.tar.bz2
nixpkgs-b37283985bf2d755aeb3ddba399021f65b68758b.tar.lz
nixpkgs-b37283985bf2d755aeb3ddba399021f65b68758b.tar.xz
nixpkgs-b37283985bf2d755aeb3ddba399021f65b68758b.tar.zst
nixpkgs-b37283985bf2d755aeb3ddba399021f65b68758b.zip
jujutsu: 0.8.0 -> 0.9.0
Diff: https://github.com/martinvonz/jj/compare/v0.8.0...0.9.0

Changelog: https://github.com/martinvonz/jj/blob/v0.9.0/CHANGELOG.md
-rw-r--r--pkgs/applications/version-management/jujutsu/default.nix16
1 files changed, 3 insertions, 13 deletions
diff --git a/pkgs/applications/version-management/jujutsu/default.nix b/pkgs/applications/version-management/jujutsu/default.nix
index 568460d7ce5..b9eb870b43a 100644
--- a/pkgs/applications/version-management/jujutsu/default.nix
+++ b/pkgs/applications/version-management/jujutsu/default.nix
@@ -20,16 +20,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "jujutsu";
-  version = "0.8.0";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "martinvonz";
     repo = "jj";
     rev = "v${version}";
-    sha256 = "sha256-kbJWkCnb77VRKemA8WejaChaQYCxNiVMbqW5PCrDoE8=";
+    sha256 = "sha256-5RN2xaH591/83iNXRcW9i/TyU5ndPZq3P/BesHM9I6w=";
   };
 
-  cargoHash = "sha256-qbCOVcKpNGWGonRAwPsr3o3yd+7qUTy3IVmC3Ifn4xE=";
+  cargoHash = "sha256-G4W3GeTWTuIZO1PupuZ0hACwhNoNBQhULyT9f6qVckg=";
 
   buildNoDefaultFeatures = true;
   buildFeatures = [
@@ -38,16 +38,6 @@ rustPlatform.buildRustPackage rec {
     "packaging"
   ];
 
-  patches = [
-    # this patch (hopefully!) fixes a very, very rare test failure that can
-    # occasionally be cajoled out of Nix and GitHub CI builds. go ahead and
-    # apply it to be safe.
-    (fetchpatch {
-      url = "https://github.com/martinvonz/jj/commit/8e7e32710d29010423f3992bb920aaf2a0fa04ec.patch";
-      hash = "sha256-ySieobB1P/DpWOurcCb4BXoHk9IqrjzMfzdc3O5cTXk=";
-    })
-  ];
-
   cargoBuildFlags = [ "--bin" "jj" ]; # don't install the fake editors
   useNextest = true; # nextest is the upstream integration framework
   ZSTD_SYS_USE_PKG_CONFIG = "1";    # disable vendored zlib