diff options
| author | Domen Kožar <domen@enlambda.com> | 2017-03-20 14:03:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-20 14:03:58 +0100 |
| commit | f5581d0221a58e1cd67fd1b1be81dc5b63bb3b3d (patch) | |
| tree | 528205017f5b845b50b6afafd4e43ae642e6e97c | |
| parent | 21439ef4168c3e1b363d3cba471ff2b50b195a9b (diff) | |
| parent | ea80c91bd3ed42f74dee05a9d3c4866f1ba8cede (diff) | |
| download | nixlib-f5581d0221a58e1cd67fd1b1be81dc5b63bb3b3d.tar nixlib-f5581d0221a58e1cd67fd1b1be81dc5b63bb3b3d.tar.gz nixlib-f5581d0221a58e1cd67fd1b1be81dc5b63bb3b3d.tar.bz2 nixlib-f5581d0221a58e1cd67fd1b1be81dc5b63bb3b3d.tar.lz nixlib-f5581d0221a58e1cd67fd1b1be81dc5b63bb3b3d.tar.xz nixlib-f5581d0221a58e1cd67fd1b1be81dc5b63bb3b3d.tar.zst nixlib-f5581d0221a58e1cd67fd1b1be81dc5b63bb3b3d.zip | |
Merge pull request #24113 from FlorentBecker/the_return_of_pijul
Reintroduce pijul (at 0.3.0)
| -rw-r--r-- | pkgs/applications/version-management/pijul/default.nix | 30 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/rust-packages.nix | 6 |
3 files changed, 35 insertions, 3 deletions
diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix new file mode 100644 index 000000000000..3bbb9ba1bbf6 --- /dev/null +++ b/pkgs/applications/version-management/pijul/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, rustPlatform, perl, darwin }: + +with rustPlatform; + +buildRustPackage rec { + name = "pijul-${version}"; + version = "0.3"; + + src = fetchurl { + url = "https://pijul.org/releases/${name}.tar.gz"; + sha256 = "2c7b354b4ab142ac50a85d70c80949ff864377b37727b862d103d3407e2c7818"; + }; + + sourceRoot = "pijul/pijul"; + + buildInputs = [ perl ]++ stdenv.lib.optionals stdenv.isDarwin + (with darwin.apple_sdk.frameworks; [ Security ]); + + doCheck = false; + + depsSha256 = "03bb92mn16d38l49x4p1z21k7gvq3l3ki10brr13p7yv45rwvmzc"; + + meta = with stdenv.lib; { + description = "A distributed version control system"; + homepage = https://pijul.org; + license = with licenses; [ gpl2Plus ]; + maintainers = [ maintainers.gal_bolle ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 341bb0286257..166a0dfc16e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14717,6 +14717,8 @@ with pkgs; pig = callPackage ../applications/networking/cluster/pig { }; + pijul = callPackage ../applications/version-management/pijul {}; + planner = callPackage ../applications/office/planner { }; playonlinux = callPackage ../applications/misc/playonlinux { diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index 1659208f76f2..ad147179f68f 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,9 +7,9 @@ { runCommand, fetchFromGitHub, git }: let - version = "2017-03-13"; - rev = "e5b7b45fa4e1168715a1132a65ad89fbc1d5ed82"; - sha256 = "1glwd7b5ckiw2nzc28djyarml21cqdajc1jn03vzf4sl58bvahyb"; + version = "2017-03-19"; + rev = "6ac4724ed839594a132f5199d70d40fa15bd6b7a"; + sha256 = "159b82zma3y0kcg55c6zm6ddsw4jm0c4y85b6l1ny108l9k3hy79"; src = fetchFromGitHub { inherit rev; |