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

pijul: 0.11.0 -> 0.12.0

Browse Source 
https://pijul.org/posts/2019-04-23-pijul-0.12/

* add new dep on nettle, all the crypto libraries :)
* libclang needed
* clang input is not quite right AFAIK, but fixes the build.
  idea from other package,
  seems to resolve problems finding headers via libclang?
This commit is contained in:
Will Dietz 2019-05-17 15:40:08 -05:00 committed by zimbatm
parent 9a81e9cd9e
commit 11fc7674b9
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,17 +1,17 @@
{ stdenv, fetchurl, rustPlatform, darwin, openssl, libsodium, pkgconfig }: { stdenv, fetchurl, rustPlatform, darwin, openssl, libsodium, nettle, clang, libclang, pkgconfig }:
with rustPlatform; with rustPlatform;
buildRustPackage rec { buildRustPackage rec {
name = "pijul-${version}"; name = "pijul-${version}";
version = "0.11.0"; version = "0.12.0";
src = fetchurl { src = fetchurl {
url = "https://pijul.org/releases/${name}.tar.gz"; url = "https://pijul.org/releases/${name}.tar.gz";
sha256 = "e60793ab124e9054c1d5509698acbae507ebb2fab5364d964067bc9ae8b6b5e5"; sha256 = "1rm787kkh3ya8ix0rjvj7sbrg9armm0rnpkga6gjmsbg5bx20y4q";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig clang ];
postInstall = '' postInstall = ''
mkdir -p $out/share/{bash-completion/completions,zsh/site-functions,fish/vendor_completions.d} mkdir -p $out/share/{bash-completion/completions,zsh/site-functions,fish/vendor_completions.d}
@ -20,12 +20,14 @@ buildRustPackage rec {
$out/bin/pijul generate-completions --fish > $out/share/fish/vendor_completions.d/pijul.fish $out/bin/pijul generate-completions --fish > $out/share/fish/vendor_completions.d/pijul.fish
''; '';
buildInputs = [ openssl libsodium ] ++ stdenv.lib.optionals stdenv.isDarwin LIBCLANG_PATH = libclang + "/lib";
buildInputs = [ openssl libsodium nettle libclang ] ++ stdenv.lib.optionals stdenv.isDarwin
(with darwin.apple_sdk.frameworks; [ Security ]); (with darwin.apple_sdk.frameworks; [ Security ]);
doCheck = false; doCheck = false;
cargoSha256 = "1r76azmka1d76ff0ddfhzr24b0ry496qrp13945i3vs0fgzk2sdz"; cargoSha256 = "1w77s5q18yr1gqqif15wmrfdvv2chq8rq3w4dnmxg2gn0r7bmz2k";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A distributed version control system"; description = "A distributed version control system";

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

@ -19114,7 +19114,9 @@ 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 { };