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

Merge remote-tracking branch 'upstream/master' into gcc-8

Browse Source
This commit is contained in:
Robin Gloster
2019-08-25 18:55:46 +02:00
parent 45d6ccea33 48191315aa
commit 616b8343c4
5048 changed files with 266048 additions and 268080 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/http/nginx/generic.nix
+1 -1
View File
@@ -113,6 +113,6 @@ stdenv.mkDerivation {
homepage = http://nginx.org;
license = licenses.bsd2;
platforms = platforms.all;
maintainers = with maintainers; [ thoughtpolice raskin fpletz ];
maintainers = with maintainers; [ thoughtpolice raskin fpletz globin ];
};
}
pkgs/servers/http/nginx/mainline.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ callPackage, ... }@args:
callPackage ./generic.nix (args // {
version = "1.16.0";
sha256 = "0i8krbi1pc39myspwlvb8ck969c8207hz84lh3qyg5w7syx7dlsg";
version = "1.17.3";
sha256 = "0g0g9prwjy0rnv6n5smny5yl5dhnmflqdr3hwgyj5jpr5hfgx11v";
})
pkgs/servers/http/nginx/stable.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix (args // {
version = "1.16.0";
sha256 = "0i8krbi1pc39myspwlvb8ck969c8207hz84lh3qyg5w7syx7dlsg";
version = "1.16.1";
sha256 = "0az3vf463b538ajvaq94hsz9ipmjgnamfj1jy0v5flfks5njl77i";
})