diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-12-06 03:28:13 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-12-06 03:28:13 +0100 |
| commit | 6ce08f74dc7518d35aa52f9b83fa84ae716854b8 (patch) | |
| tree | c12cdeb6c62a403a2c3ac9c275569b3913b3c2b6 /pkgs/applications/version-management | |
| parent | 72b795557e2040a58c936185cb87ecb136e66df3 (diff) | |
| parent | 18493dab889d8afbefde6380c7b00fae3d376d3e (diff) | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications/version-management')
| -rw-r--r-- | pkgs/applications/version-management/pijul/default.nix | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index bb720df3f27a..0f7e2bc9486c 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -2,8 +2,6 @@ , fetchCrate , rustPlatform , pkg-config -, clang -, libclang , libsodium , openssl , xxHash @@ -15,21 +13,20 @@ rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "1.0.0-alpha.11"; + version = "1.0.0-alpha.17"; src = fetchCrate { inherit version pname; - sha256 = "1y2xgbzclmk0i98iydmqgvf6acx0v326dmj9j2hiwrld193fc4dx"; + sha256 = "03r383fkqx17sb2c0kz71lbn0rdas7nd9yw7ni5fbmrq8rlk9brv"; }; - cargoSha256 = "0i1rr8jg34g4b8i2lvh9gy2rpfa01ma9jpcpyp5zklrzk5f1ksvf"; + cargoSha256 = "0dfmldklklax8nb3pry0h80kih1k1idfjgaxinxkk1iflcm3cwqn"; cargoBuildFlags = stdenv.lib.optional gitImportSupport "--features=git"; - LIBCLANG_PATH = "${libclang}/lib"; doCheck = false; - nativeBuildInputs = [ pkg-config clang ]; - buildInputs = [ openssl libclang libsodium xxHash zstd ] + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl libsodium xxHash zstd ] ++ (stdenv.lib.optionals gitImportSupport [ libgit2 ]) ++ (stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreServices Security SystemConfiguration |