diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2020-12-06 03:04:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-06 03:04:43 +0100 |
| commit | baa943952573230592acbd4de4cedaeeef1d9728 (patch) | |
| tree | 28f6b284b6f646323926c8dd39b0a515751453a6 | |
| parent | e45a472c221bbe1e13804bdee8f8e8c3bff02fe3 (diff) | |
| parent | 8de71d243b4ad0e3eb4bfcab4d1755cb4574140d (diff) | |
Merge pull request #105978 from dywedir/pijul
pijul: 1.0.0-alpha.11 -> 1.0.0-alpha.17
| -rw-r--r-- | pkgs/applications/version-management/pijul/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 6 insertions, 11 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa109ec49a4f..1f26c2316c04 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22879,9 +22879,7 @@ in pig = callPackage ../applications/networking/cluster/pig { }; - pijul = callPackage ../applications/version-management/pijul { - inherit (llvmPackages) clang libclang; - }; + pijul = callPackage ../applications/version-management/pijul { }; ping = callPackage ../applications/networking/ping { }; |