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

Merge staging into staging-next

Browse Source 
Merging staging into staging-next even though we haven't merged staging-next into master yet.
The motivation for this merge is that it's been a while since we merged into master causing
the 3 branches to diverge too much.
This commit is contained in:
Frederik Rietdijk
2018-11-03 12:45:23 +01:00
parent ea3935a6c4 7f4b26681d
commit 64e19fdeda
374 changed files with 10255 additions and 7124 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-20180922";
name = "parallel-20181022";
src = fetchurl {
url = "mirror://gnu/parallel/${name}.tar.bz2";
sha256 = "07q7lzway2qf8mx6fb4q45jmirsc8pw6rgv03ifrp32jw3q8w1za";
sha256 = "1v6vrfnn6acjjlp8xiizvcrb3zzs94av5xcl6xm8zfvcapixx11f";
};
nativeBuildInputs = [ makeWrapper ];