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

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

Browse Source
This commit is contained in:
Franz Pletz
2019-09-03 22:15:07 +02:00
parent d512362e77 1f49035aca
commit de85797565
5995 changed files with 34112 additions and 20763 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/http/4store/default.nix
+1 -1
View File
@@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
name = "4store-${version}";
pname = "4store";
version = "1.1.6";
src = fetchFromGitHub {
pkgs/servers/http/apache-httpd/2.4.nix
+1 -1
View File
@@ -17,7 +17,7 @@ assert http2Support -> nghttp2 != null;
stdenv.mkDerivation rec {
version = "2.4.39";
name = "apache-httpd-${version}";
pname = "apache-httpd";
src = fetchurl {
url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
+1 -1
View File
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
name = "mod_auth_mellon-${version}";
pname = "mod_auth_mellon";
version = "0.13.1";
src = fetchFromGitHub {
pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
+2 -1
View File
@@ -10,7 +10,8 @@ let
};
in
stdenv.mkDerivation {
name = "mod_fastcgi-${version}";
pname = "mod_fastcgi";
inherit version;
src = fetchurl {
url = "https://github.com/FastCGI-Archives/mod_fastcgi/archive/${version}.tar.gz";
pkgs/servers/http/apache-modules/mod_wsgi/default.nix
+3 -3
View File
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, apacheHttpd, python2 }:
{ stdenv, fetchurl, apacheHttpd, python, ncurses }:
stdenv.mkDerivation rec {
name = "mod_wsgi-${version}";
pname = "mod_wsgi";
version = "4.6.7";
src = fetchurl {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1j8pqn0xhd502ardlmkqx8y85s1npmk9nifqps60wjh29nny03f2";
};
buildInputs = [ apacheHttpd python2 ];
buildInputs = [ apacheHttpd python ncurses ];
patchPhase = ''
sed -r -i -e "s|^LIBEXECDIR=.*$|LIBEXECDIR=$out/modules|" \
pkgs/servers/http/apt-cacher-ng/default.nix
+1 -1
View File
@@ -13,7 +13,7 @@
}:
stdenv.mkDerivation rec {
name = "apt-cacher-ng-${version}";
pname = "apt-cacher-ng";
version = "3.2";
src = fetchurl {
pkgs/servers/http/couchdb/2.0.0.nix
+2 -2
View File
@@ -2,14 +2,14 @@
, coreutils, bash, makeWrapper, python3 }:
stdenv.mkDerivation rec {
name = "couchdb-${version}";
pname = "couchdb";
version = "2.3.1";
# when updating this, please consider bumping the OTP version
# in all-packages.nix
src = fetchurl {
url = "mirror://apache/couchdb/source/${version}/apache-${name}.tar.gz";
url = "mirror://apache/couchdb/source/${version}/apache-${pname}-${version}.tar.gz";
sha256 = "0z926hjqyhxhyr65kqxwpmp80nyfqbig6d9dy8dqflpb87n8rss3";
};
pkgs/servers/http/couchdb/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
, sphinx, which, file, pkgconfig, getopt }:
stdenv.mkDerivation rec {
name = "couchdb-${version}";
pname = "couchdb";
version = "1.7.1";
src = fetchurl {
url = "mirror://apache/couchdb/source/${version}/apache-${name}.tar.gz";
url = "mirror://apache/couchdb/source/${version}/apache-${pname}-${version}.tar.gz";
sha256 = "1b9cbdrmh1i71mrwvhm17v4cf7lckpil1vvq7lpmxyn6zfk0l84i";
};
pkgs/servers/http/darkhttpd/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "darkhttpd-${version}";
pname = "darkhttpd";
version = "1.12";
src = fetchurl {
url = "https://unix4lyfe.org/darkhttpd/${name}.tar.bz2";
url = "https://unix4lyfe.org/darkhttpd/${pname}-${version}.tar.bz2";
sha256 = "0185wlyx4iqiwfigp1zvql14zw7gxfacncii3d15yaxk4av1f155";
};
pkgs/servers/http/gatling/default.nix
+3 -2
View File
@@ -4,10 +4,11 @@ let
version = "0.15";
in
stdenv.mkDerivation rec {
name = "gatling-${version}";
pname = "gatling";
inherit version;
src = fetchurl {
url = "https://www.fefe.de/gatling/${name}.tar.xz";
url = "https://www.fefe.de/gatling/${pname}-${version}.tar.xz";
sha256 = "194srqyja3pczpbl6l169zlvx179v7ln0m6yipmhvj6hrv82k8vg";
};
pkgs/servers/http/h2o/default.nix
+1 -1
View File
@@ -6,7 +6,7 @@
with builtins;
stdenv.mkDerivation rec {
name = "h2o-${version}";
pname = "h2o";
version = "2.2.6";
src = fetchFromGitHub {
pkgs/servers/http/hiawatha/default.nix
+1 -1
View File
@@ -16,7 +16,7 @@
}:
stdenv.mkDerivation rec {
name = "hiawatha-${version}";
pname = "hiawatha";
version = "10.9";
src = fetchFromGitLab {
pkgs/servers/http/jetty/default.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "jetty-${version}";
pname = "jetty";
version = "9.4.16.v20190411";
src = fetchurl {
url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz";
pkgs/servers/http/lwan/default.nix
-1
View File
@@ -3,7 +3,6 @@
stdenv.mkDerivation rec {
pname = "lwan";
version = "0.1";
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "lpereira";
pkgs/servers/http/myserver/default.nix
+3 -2
View File
@@ -4,10 +4,11 @@
let version = "0.11"; in
stdenv.mkDerivation rec {
name = "myserver-${version}";
pname = "myserver";
inherit version;
src = fetchurl {
url = "mirror://gnu/myserver/${version}/${name}.tar.xz";
url = "mirror://gnu/myserver/${version}/${pname}-${version}.tar.xz";
sha256 = "02y3vv4hxpy5h710y79s8ipzshhc370gbz1wm85x0lnq5nqxj2ax";
};
pkgs/servers/http/nginx/generic.nix
+2 -1
View File
@@ -21,7 +21,8 @@ let
in
stdenv.mkDerivation {
name = "nginx-${version}";
pname = "nginx";
inherit version;
src = fetchurl {
url = "https://nginx.org/download/nginx-${version}.tar.gz";
pkgs/servers/http/nix-binary-cache/default.nix
+1 -1
View File
@@ -3,7 +3,7 @@
, lighttpd, iproute }:
stdenv.mkDerivation rec {
version = "2014-06-29-1";
name = "nix-binary-cache-${version}";
pname = "nix-binary-cache";
phases = ["installPhase"];
pkgs/servers/http/openresty/default.nix
+1 -1
View File
@@ -4,7 +4,7 @@ gd, geoip, perl }:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "openresty-${version}";
pname = "openresty";
version = "1.15.8.1";
src = fetchurl {
pkgs/servers/http/pshs/default.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libevent, file, qrencode, miniupnpc }:
stdenv.mkDerivation rec {
name = "pshs-${version}";
pname = "pshs";
version = "0.3.3";
src = fetchFromGitHub {
pkgs/servers/http/spawn-fcgi/default.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ stdenv, fetchsvn, autoconf, automake }:
stdenv.mkDerivation rec {
name = "spawn-fcgi-${version}";
pname = "spawn-fcgi";
version = "1.6.4";
src = fetchsvn {
pkgs/servers/http/tengine/default.nix
+1 -1
View File
@@ -11,7 +11,7 @@ with stdenv.lib;
stdenv.mkDerivation rec {
version = "2.3.1";
name = "tengine-${version}";
pname = "tengine";
src = fetchurl {
url = "https://github.com/alibaba/tengine/archive/${version}.tar.gz";
pkgs/servers/http/thttpd/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "thttpd-${version}";
pname = "thttpd";
version = "2.29";
src = fetchurl {
url = "https://acme.com/software/thttpd/${name}.tar.gz";
url = "https://acme.com/software/thttpd/${pname}-${version}.tar.gz";
sha256 = "15x3h4b49wgfywn82i3wwbf38mdns94mbi4ma9xiwsrjv93rzh4r";
};
pkgs/servers/http/tomcat/axis2/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, apacheAnt, jdk, unzip }:
stdenv.mkDerivation rec {
name = "axis2-${version}";
pname = "axis2";
version = "1.7.9";
src = fetchurl {
url = "http://apache.proserve.nl/axis/axis2/java/core/${version}/${name}-bin.zip";
url = "http://apache.proserve.nl/axis/axis2/java/core/${version}/${pname}-${version}-bin.zip";
sha256 = "0dh0s9bfh95wmmw8nyf2yw95biq7d9zmrbg8k4vzcyz1if228lac";
};
pkgs/servers/http/tomcat/default.nix
+2 -2
View File
@@ -3,11 +3,11 @@
let
common = { versionMajor, versionMinor, sha256 }: stdenv.mkDerivation (rec {
name = "apache-tomcat-${version}";
pname = "apache-tomcat";
version = "${versionMajor}.${versionMinor}";
src = fetchurl {
url = "mirror://apache/tomcat/tomcat-${versionMajor}/v${version}/bin/${name}.tar.gz";
url = "mirror://apache/tomcat/tomcat-${versionMajor}/v${version}/bin/${pname}-${version}.tar.gz";
inherit sha256;
};
pkgs/servers/http/unit/default.nix
+1 -1
View File
@@ -16,7 +16,7 @@ with stdenv.lib;
stdenv.mkDerivation rec {
version = "1.10.0";
name = "unit-${version}";
pname = "unit";
src = fetchFromGitHub {
owner = "nginx";
pkgs/servers/http/webfs/default.nix
+2 -2
View File
@@ -7,11 +7,11 @@ let
};
in
stdenv.mkDerivation rec {
name = "webfs-${version}";
pname = "webfs";
version = "1.21";
src = fetchurl {
url = "https://www.kraxel.org/releases/webfs/${name}.tar.gz";
url = "https://www.kraxel.org/releases/webfs/${pname}-${version}.tar.gz";
sha256 = "98c1cb93473df08e166e848e549f86402e94a2f727366925b1c54ab31064a62a";
};
pkgs/servers/http/webhook/default.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "webhook-${version}";
pname = "webhook";
version = "2.6.8";
goPackagePath = "github.com/adnanh/webhook";
pkgs/servers/http/yaws/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{stdenv, fetchurl, erlang, pam, perl }:
stdenv.mkDerivation rec {
name = "yaws-${version}";
pname = "yaws";
version = "2.0.6";
src = fetchurl {
url = "http://yaws.hyber.org/download/${name}.tar.gz";
url = "http://yaws.hyber.org/download/${pname}-${version}.tar.gz";
sha256 = "03nh97g7smsgm6sw5asssmlq7zgx6y2gnn7jn0lv2x5mkf5nzyb9";
};