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

Merge remote-tracking branch 'upstream/master' into staging

Browse Source 
Conflicts:
	pkgs/top-level/all-packages.nix
This commit is contained in:
Tuomas Tynkkynen
2018-04-03 02:22:54 +03:00
parent 4c46f13f15 00fc66dc7d
commit 747ebe3f66
263 changed files with 9700 additions and 7232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/misc/parallel/default.nix
View File

@@ -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 ];