diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-09-11 15:24:55 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-09-16 22:14:45 +0000 |
| commit | 89c4dccbd5f33f71808d4b1baafe619696af1162 (patch) | |
| tree | fb1b8d3a2f171164a05d404ab2340cfb1a9d3e21 /nixpkgs/pkgs/servers/http | |
| parent | 8920a0e4d962a919238bab69ddc607d7f3396f70 (diff) | |
| parent | e19054ab3cd5b7cc9a01d0efc71c8fe310541065 (diff) | |
| download | nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.gz nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.bz2 nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.lz nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.xz nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.zst nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.zip | |
Merge commit 'e19054ab3cd5b7cc9a01d0efc71c8fe310541065'
Diffstat (limited to 'nixpkgs/pkgs/servers/http')
| -rw-r--r-- | nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix | 4 | ||||
| -rw-r--r-- | nixpkgs/pkgs/servers/http/micro-httpd/default.nix | 2 | ||||
| -rw-r--r-- | nixpkgs/pkgs/servers/http/unit/default.nix | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix b/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix index 4ffbb0100167..638617141457 100644 --- a/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix +++ b/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix @@ -16,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null; assert http2Support -> nghttp2 != null; stdenv.mkDerivation rec { - version = "2.4.39"; + version = "2.4.41"; pname = "apache-httpd"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "18ngvsjq65qxk3biggnkhkq8jlll9dsg9n3csra9p99sfw2rvjml"; + sha256 = "0h7a31yxwyh7h521frnmlppl0h7sh9icc3ka6vlmlcg5iwllhg8k"; }; # FIXME: -dev depends on -doc diff --git a/nixpkgs/pkgs/servers/http/micro-httpd/default.nix b/nixpkgs/pkgs/servers/http/micro-httpd/default.nix index b636f79e6c60..d99af7a81aef 100644 --- a/nixpkgs/pkgs/servers/http/micro-httpd/default.nix +++ b/nixpkgs/pkgs/servers/http/micro-httpd/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "micro-httpd-20140814"; src = fetchurl { diff --git a/nixpkgs/pkgs/servers/http/unit/default.nix b/nixpkgs/pkgs/servers/http/unit/default.nix index 0c0f118d0b91..1dbf7eb2388b 100644 --- a/nixpkgs/pkgs/servers/http/unit/default.nix +++ b/nixpkgs/pkgs/servers/http/unit/default.nix @@ -4,7 +4,6 @@ , withPHP73 ? false, php73 , withPerl ? true, perl , withPerldevel ? false, perldevel -, withRuby_2_3 ? false, ruby_2_3 , withRuby_2_4 ? false, ruby_2_4 , withRuby ? true, ruby , withSSL ? true, openssl ? null @@ -33,7 +32,6 @@ stdenv.mkDerivation rec { ++ optional withPHP73 php73 ++ optional withPerl perl ++ optional withPerldevel perldevel - ++ optional withRuby_2_3 ruby_2_3 ++ optional withRuby_2_4 ruby_2_4 ++ optional withRuby ruby ++ optional withSSL openssl; @@ -53,7 +51,6 @@ stdenv.mkDerivation rec { ${optionalString withPHP73 "./configure php --module=php73 --config=${php73.dev}/bin/php-config --lib-path=${php73}/lib"} ${optionalString withPerl "./configure perl --module=perl --perl=${perl}/bin/perl"} ${optionalString withPerldevel "./configure perl --module=perl529 --perl=${perldevel}/bin/perl"} - ${optionalString withRuby_2_3 "./configure ruby --module=ruby23 --ruby=${ruby_2_3}/bin/ruby"} ${optionalString withRuby_2_4 "./configure ruby --module=ruby24 --ruby=${ruby_2_4}/bin/ruby"} ${optionalString withRuby "./configure ruby --module=ruby --ruby=${ruby}/bin/ruby"} ''; |