diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-04-03 02:22:54 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-04-03 02:22:54 +0300 |
| commit | 747ebe3f660ea4a6e7bd03831f4e95a66d59b526 (patch) | |
| tree | b9575026aa7949f51541135be0059b54eda07bbe /pkgs/tools/misc/parallel/default.nix | |
| parent | 4c46f13f15c602a88dfd87a37acdc94653232a1d (diff) | |
| parent | 00fc66dc7dcda7fc38a9cc7f4dbd7bb66f28c5f9 (diff) | |
| download | nixpkgs-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.tar nixpkgs-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.tar.gz nixpkgs-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.tar.bz2 nixpkgs-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.tar.lz nixpkgs-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.tar.xz nixpkgs-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.tar.zst nixpkgs-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/tools/misc/parallel/default.nix')
| -rw-r--r-- | pkgs/tools/misc/parallel/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index b7116b53b11..093633e2114 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20180222"; + name = "parallel-20180322"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "1bwx1rcrqz04d8fajlllhrfkjqxg0mfvsd86wf6p067gmgdrf6g8"; + sha256 = "15v46pv4z98xm3fkwy7335faw4r7pilrxp4xis5a4zi4319sv2b3"; }; nativeBuildInputs = [ makeWrapper perl ]; |