diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-03-11 00:43:18 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-03-11 00:43:18 +0000 |
| commit | a6dea5a6f496ea38f56e3c3b4c5d628361cc029f (patch) | |
| tree | 8300ad67b0135e6816ab38a6ac6f8fdaeccda2f0 /nixpkgs/pkgs/servers/http | |
| parent | 8779e0045c9f218caeb1dd1bcdc87e2715ed5be5 (diff) | |
| parent | 5d3fd3674a66c5b1ada63e2eace140519849c967 (diff) | |
| download | nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.tar nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.tar.gz nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.tar.bz2 nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.tar.lz nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.tar.xz nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.tar.zst nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.zip | |
Merge commit '5d3fd3674a66c5b1ada63e2eace140519849c967'
Diffstat (limited to 'nixpkgs/pkgs/servers/http')
| -rw-r--r-- | nixpkgs/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix | 25 | ||||
| -rw-r--r-- | nixpkgs/pkgs/servers/http/nginx/mainline.nix | 4 |
2 files changed, 16 insertions, 13 deletions
diff --git a/nixpkgs/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/nixpkgs/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix index 647589621029..ff767d9ad437 100644 --- a/nixpkgs/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix +++ b/nixpkgs/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix @@ -1,20 +1,23 @@ { stdenv, fetchurl, apacheHttpd }: -stdenv.mkDerivation rec { - name = "mod_fastcgi-2.4.6"; +let + version = "2.4.7.1"; + + apache-24-patch = fetchurl { + name = "compile-against-apache24.diff"; + url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/compile-against-apache24.diff?h=packages/mod_fastcgi&id=81c7cb99d15682df3bdb1edcaeea5259e9e43a42"; + sha256 = "000qvrf5jb979i37rimrdivcgjijcffgrpkx38c0rn62z9jz61g4"; + }; +in +stdenv.mkDerivation { + name = "mod_fastcgi-${version}"; src = fetchurl { - url = "http://www.fastcgi.com/dist/${name}.tar.gz"; + url = "https://github.com/FastCGI-Archives/mod_fastcgi/archive/${version}.tar.gz"; sha256 = "12g6vcfl9jl8rqf8lzrkdxg2ngca310d3d6an563xqcgrkp8ga55"; }; - patches = - [ (fetchurl { - name = "compile-against-apache24.diff"; - url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/compile-against-apache24.diff?h=packages/mod_fastcgi&id=81c7cb99d15682df3bdb1edcaeea5259e9e43a42"; - sha256 = "000qvrf5jb979i37rimrdivcgjijcffgrpkx38c0rn62z9jz61g4"; - }) - ]; + patches = [ apache-24-patch ]; buildInputs = [ apacheHttpd ]; @@ -24,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.fastcgi.com/; + homepage = https://github.com/FastCGI-Archives/mod_fastcgi; description = "Provide support for the FastCGI protocol"; longDescription = '' diff --git a/nixpkgs/pkgs/servers/http/nginx/mainline.nix b/nixpkgs/pkgs/servers/http/nginx/mainline.nix index 3f4f99acbc65..d86a78187e5f 100644 --- a/nixpkgs/pkgs/servers/http/nginx/mainline.nix +++ b/nixpkgs/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix (args // { - version = "1.15.8"; - sha256 = "11q7njr0khv8hb96bclyw5f75gvm12nw3jjgmq9rifbym2yazgd8"; + version = "1.15.9"; + sha256 = "0hxfsz1117r91b9fb5hjddyrf1czvb36lh1z7zalqqdskfcbmkz4"; }) |