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

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

Browse Source
This commit is contained in:
Matthew Bauer
2019-01-27 00:01:13 -05:00
parent 319ebef3a3 4866cbe341
commit 92f0f8dd68
403 changed files with 4759 additions and 3164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/zeromq/3.x.nix
-1
View File
@@ -18,6 +18,5 @@ stdenv.mkDerivation rec {
description = "The Intelligent Transport Layer";
license = licenses.gpl3;
platforms = platforms.all;
maintainers = with maintainers; [ wkennington ];
};
}
pkgs/development/libraries/zeromq/4.x.nix
+1 -1
View File
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
description = "The Intelligent Transport Layer";
license = licenses.gpl3;
platforms = platforms.all;
maintainers = with maintainers; [ wkennington fpletz ];
maintainers = with maintainers; [ fpletz ];
};
}