diff options
author | annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> | 2024-03-28 13:02:34 +0000 |
---|---|---|
committer | annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> | 2024-03-28 13:02:34 +0000 |
commit | 675fb1648e6925ca87437bc98fce2077648e8be3 (patch) | |
tree | 7f48f889770fe72ecdc74d853af022bb8bc214d7 /pkgs/by-name/pi/pixi/package.nix | |
parent | 035b7f36aa1367c00845f669ef0617e55d31104f (diff) | |
parent | 69de1e1beb4fa322688a2bac5761e59a2b17e15e (diff) |
Merge remote-tracking branch 'upstream/staging-next' into staging
Conflicts: pkgs/development/python-modules/apsw/default.nix pkgs/development/python-modules/deal/default.nix pkgs/development/python-modules/kubernetes/default.nix
Diffstat (limited to 'pkgs/by-name/pi/pixi/package.nix')
-rw-r--r-- | pkgs/by-name/pi/pixi/package.nix | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/pkgs/by-name/pi/pixi/package.nix b/pkgs/by-name/pi/pixi/package.nix index 2c7a1d8f207e2..4f11547fae1f5 100644 --- a/pkgs/by-name/pi/pixi/package.nix +++ b/pkgs/by-name/pi/pixi/package.nix @@ -3,6 +3,7 @@ , rustPlatform , fetchFromGitHub , pkg-config +, libgit2 , openssl , installShellFiles , darwin @@ -12,16 +13,23 @@ rustPlatform.buildRustPackage rec { pname = "pixi"; - version = "0.15.2"; + version = "0.17.1"; src = fetchFromGitHub { owner = "prefix-dev"; repo = "pixi"; rev = "v${version}"; - hash = "sha256-bh8Uu6Q2AND50Qzivc6k1Z8JWudkHC2i4YW1Hxa69SM="; + hash = "sha256-wYk77i/33J+VJeT+Bi3L8DJv9quP7VJkcq3voA6U/1s="; }; - cargoHash = "sha256-yMIcPwnuN7F2ZrOtJw8T+nxeSzLsYn+iC34bYeWpi/w="; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "async_zip-0.0.16" = "sha256-M94ceTCtyQc1AtPXYrVGplShQhItqZZa/x5qLiL+gs0="; + "cache-key-0.0.1" = "sha256-CvaYXtgd8eqzPNoXukjPwaoT/QOlUVKYNzD8Db6on9Q="; + "pubgrub-0.2.1" = "sha256-1teDXUkXPbL7LZAYrlm2w5CEyb8g0bDqNhg5Jn0/puc="; + }; + }; nativeBuildInputs = [ pkg-config @@ -29,12 +37,17 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ + libgit2 openssl - ] - ++ lib.optionals stdenv.isDarwin ( + ] ++ lib.optionals stdenv.isDarwin ( with darwin.apple_sdk_11_0.frameworks; [ CoreFoundation IOKit SystemConfiguration Security ] ); + env = { + LIBGIT2_NO_VENDOR = 1; + OPENSSL_NO_VENDOR = 1; + }; + # There are some CI failures with Rattler. Tests on Aarch64 has been skipped. # See https://github.com/prefix-dev/pixi/pull/241. doCheck = !stdenv.isAarch64; |