diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-10 11:17:52 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-10 11:17:52 +0200 |
commit | 30f14243c33f1b386273d08a4776aa679c42143d (patch) | |
tree | bd123d5c2ab4fef012ae7de6a225c092f8d611b8 /pkgs/servers/http | |
parent | 50fccad5828fb459760fd7578951bb961a18c0fc (diff) | |
parent | 2463e0917318581da94e7ba92703b63128c40424 (diff) | |
download | nixlib-30f14243c33f1b386273d08a4776aa679c42143d.tar nixlib-30f14243c33f1b386273d08a4776aa679c42143d.tar.gz nixlib-30f14243c33f1b386273d08a4776aa679c42143d.tar.bz2 nixlib-30f14243c33f1b386273d08a4776aa679c42143d.tar.lz nixlib-30f14243c33f1b386273d08a4776aa679c42143d.tar.xz nixlib-30f14243c33f1b386273d08a4776aa679c42143d.tar.zst nixlib-30f14243c33f1b386273d08a4776aa679c42143d.zip |
Merge branch 'master' into closure-size
Comparison to master evaluations on Hydra: - 1255515 for nixos - 1255502 for nixpkgs
Diffstat (limited to 'pkgs/servers/http')
-rw-r--r-- | pkgs/servers/http/apt-cacher-ng/default.nix | 1 | ||||
-rw-r--r-- | pkgs/servers/http/mini-httpd/default.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/http/thttpd/default.nix | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/servers/http/apt-cacher-ng/default.nix b/pkgs/servers/http/apt-cacher-ng/default.nix index 9e485946a18d..8958b51e873a 100644 --- a/pkgs/servers/http/apt-cacher-ng/default.nix +++ b/pkgs/servers/http/apt-cacher-ng/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { description = "A caching proxy specialized for linux distribution files"; homepage = https://www.unix-ag.uni-kl.de/~bloch/acng/; license = licenses.gpl2; + platforms = platforms.linux; maintainers = [ maintainers.makefu ]; }; } diff --git a/pkgs/servers/http/mini-httpd/default.nix b/pkgs/servers/http/mini-httpd/default.nix index 4cba9bc06687..7fb6a16dd1c3 100644 --- a/pkgs/servers/http/mini-httpd/default.nix +++ b/pkgs/servers/http/mini-httpd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, boost }: stdenv.mkDerivation rec { - name = "mini-httpd-1.5"; + name = "mini-httpd-1.6"; src = fetchurl { - url = "mirror://savannah/mini-httpd/${name}.tar.gz"; - sha256 = "1x4b6x40ymbaamqqq9p97lc0mnah4q7bza04fjs35c8agpm19zir"; + url = "http://download-mirror.savannah.gnu.org/releases/mini-httpd/${name}.tar.gz"; + sha256 = "04azr1qa70l0fnpbx7nmyxz1lkykjjs2b6p4lhkpg86hs3lrmxly"; }; buildInputs = [ boost ]; diff --git a/pkgs/servers/http/thttpd/default.nix b/pkgs/servers/http/thttpd/default.nix index 706911aeef15..030aa486daa7 100644 --- a/pkgs/servers/http/thttpd/default.nix +++ b/pkgs/servers/http/thttpd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "thttpd-${version}"; - version = "2.26"; + version = "2.27"; src = fetchurl { url = "http://acme.com/software/thttpd/${name}.tar.gz"; - sha256 = "1idlpnwrd5fpmnfh477h1lzanavx8jxir2d8adax46zy472dg4s6"; + sha256 = "0ykda5k1zzzag59zbd4bkzj1psavq0xnpy7vpk19rhx7mlvvri5i"; }; prePatch = '' |