From f85fe2b15d63170ad3d91a3a885e508df7e5a5ae Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 6 Mar 2025 00:42:03 +0000 Subject: [PATCH 1/2] jujutsu: 0.26.0 -> 0.27.0 Diff: https://github.com/jj-vcs/jj/compare/refs/tags/v0.26.0...refs/tags/v0.27.0 Changelog: https://github.com/jj-vcs/jj/blob/v0.27.0/CHANGELOG.md --- pkgs/by-name/ju/jujutsu/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix index 10f08174a88c..8244fc9b029a 100644 --- a/pkgs/by-name/ju/jujutsu/package.nix +++ b/pkgs/by-name/ju/jujutsu/package.nix @@ -21,7 +21,7 @@ }: let - version = "0.26.0"; + version = "0.27.0"; in rustPlatform.buildRustPackage { @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage { owner = "jj-vcs"; repo = "jj"; tag = "v${version}"; - hash = "sha256-jGy+0VDxQrgNhj+eX06FRhPP31V8QZVAM4j4yBosAGE="; + hash = "sha256-fBgJrSglH46+NHu3spk5mC51ASDHWnOoW6veKZ0R2YA="; }; useFetchCargoVendor = true; @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage { ./libgit2-1.9.0.patch ]; - cargoHash = "sha256-CtyRekrbRwUvQq2HsFwNo46RCDEGwy9e4ZU8/TwGxSU="; + cargoHash = "sha256-35DJdAUXc2gb/EXECScwinSzzp7uaxFbUxedjqRGfj8="; nativeBuildInputs = [ installShellFiles From 520bf50f44e69af16332d328ae39c3e5bcb643e0 Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 6 Mar 2025 01:04:40 +0000 Subject: [PATCH 2/2] jujutsu: remove old Darwin SDK detritus --- pkgs/by-name/ju/jujutsu/package.nix | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix index 8244fc9b029a..f07cb3d35ce5 100644 --- a/pkgs/by-name/ju/jujutsu/package.nix +++ b/pkgs/by-name/ju/jujutsu/package.nix @@ -9,8 +9,6 @@ libgit2, libssh2, openssl, - darwin, - libiconv, git, gnupg, openssh, @@ -49,18 +47,11 @@ rustPlatform.buildRustPackage { pkg-config ]; - buildInputs = - [ - zstd - libgit2 - libssh2 - ] - ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - libiconv - ]; + buildInputs = [ + zstd + libgit2 + libssh2 + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ]; nativeCheckInputs = [ git