JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #105978 from dywedir/pijul

Browse Source 
pijul: 1.0.0-alpha.11 -> 1.0.0-alpha.17
This commit is contained in:
Sandro 2020-12-06 03:04:43 +01:00 committed by GitHub
commit baa9439525
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/version-management/pijul/default.nix
View File

@ -2,8 +2,6 @@
, fetchCrate , fetchCrate
, rustPlatform , rustPlatform
, pkg-config , pkg-config
, clang
, libclang
, libsodium , libsodium
, openssl , openssl
, xxHash , xxHash
@ -15,21 +13,20 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "pijul"; pname = "pijul";
version = "1.0.0-alpha.11"; version = "1.0.0-alpha.17";
src = fetchCrate { src = fetchCrate {
inherit version pname; inherit version pname;
sha256 = "1y2xgbzclmk0i98iydmqgvf6acx0v326dmj9j2hiwrld193fc4dx"; sha256 = "03r383fkqx17sb2c0kz71lbn0rdas7nd9yw7ni5fbmrq8rlk9brv";
}; };
cargoSha256 = "0i1rr8jg34g4b8i2lvh9gy2rpfa01ma9jpcpyp5zklrzk5f1ksvf"; cargoSha256 = "0dfmldklklax8nb3pry0h80kih1k1idfjgaxinxkk1iflcm3cwqn";
cargoBuildFlags = stdenv.lib.optional gitImportSupport "--features=git"; cargoBuildFlags = stdenv.lib.optional gitImportSupport "--features=git";
LIBCLANG_PATH = "${libclang}/lib";
doCheck = false; doCheck = false;
nativeBuildInputs = [ pkg-config clang ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl libclang libsodium xxHash zstd ] buildInputs = [ openssl libsodium xxHash zstd ]
++ (stdenv.lib.optionals gitImportSupport [ libgit2 ]) ++ (stdenv.lib.optionals gitImportSupport [ libgit2 ])
++ (stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ++ (stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
CoreServices Security SystemConfiguration CoreServices Security SystemConfiguration

4
pkgs/top-level/all-packages.nix
View File

@ -22879,9 +22879,7 @@ in
pig = callPackage ../applications/networking/cluster/pig { }; pig = callPackage ../applications/networking/cluster/pig { };
pijul = callPackage ../applications/version-management/pijul { pijul = callPackage ../applications/version-management/pijul { };
inherit (llvmPackages) clang libclang;
};
ping = callPackage ../applications/networking/ping { }; ping = callPackage ../applications/networking/ping { };