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

Merge branch 'master' into staging

Browse Source 
Resolved the following conflicts (by carefully applying patches from the both
branches since the fork point):

   pkgs/development/libraries/epoxy/default.nix
   pkgs/development/libraries/gtk+/3.x.nix
   pkgs/development/python-modules/asgiref/default.nix
   pkgs/development/python-modules/daphne/default.nix
   pkgs/os-specific/linux/systemd/default.nix
This commit is contained in:
Jan Malakhovski
2018-03-10 20:38:13 +00:00
parent 4eec6bc9c9 ddddca5c2f
commit 7079e744d4
927 changed files with 18154 additions and 12101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/http/apache-modules/mod_wsgi/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "mod_wsgi-${version}";
version = "3.5";
version = "4.5.24";
src = fetchurl {
url = "https://github.com/GrahamDumpleton/mod_wsgi/archive/${version}.tar.gz";
sha256 = "14xz422jlakdhxzsl8xs9if86yf1fnkwdg0havjyqs7my0w4qrzh";
sha256 = "1anxml8i3q90x8n30xfydpmv41cxlwqrg3vr98ayzaak02maxr99";
};
buildInputs = [ apacheHttpd python2 ];
pkgs/servers/http/nginx/mainline.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ callPackage, ... }@args:
callPackage ./generic.nix (args // {
version = "1.13.8";
sha256 = "1ib4hkngj9z7pl73lnn96d85m7v2wwb56nkypwx7d6pm3z1vc444";
version = "1.13.9";
sha256 = "0hpsyxpxj89p5vrzv9p1hp7xjbnj5c1w6fdy626ycvsiay4a3bjz";
})
pkgs/servers/http/openresty/default.nix
+21 -20
View File
@@ -1,25 +1,30 @@
{ stdenv, fetchurl, fetchgit, openssl, zlib, pcre, libxml2, libxslt, gd, geoip
, perl }:
assert stdenv.isLinux;
{ stdenv, fetchurl, fetchgit, openssl, zlib, pcre, postgresql, libxml2, libxslt,
gd, geoip, perl }:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "openresty-${version}";
version = "1.9.3.1";
version = "1.13.6.1";
src = fetchurl {
url = "http://openresty.org/download/ngx_openresty-${version}.tar.gz";
sha256 = "1fw8yxjndf5gsk44l4bsixm270fxv7f5cdiwzq9ps6j3hhgx5kyv";
url = "http://openresty.org/download/openresty-${version}.tar.gz";
sha256 = "0sv93nw1j597mdpnibmgaa3nnghdk0z6k27vavm8w2c1z9n6w96i";
};
buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip perl ];
buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip postgresql ];
nativeBuildInputs = [ perl ];
NIX_CFLAGS_COMPILE = ["-I${libxml2.dev}/include/libxml2"];
preConfigure = ''
patchShebangs .
'';
configureFlags = [
"--with-pcre-jit"
"--with-http_ssl_module"
"--with-http_spdy_module"
"--with-http_v2_module"
"--with-http_realip_module"
"--with-http_addition_module"
"--with-http_xslt_module"
@@ -36,26 +41,22 @@ stdenv.mkDerivation rec {
"--with-http_secure_link_module"
"--with-http_degradation_module"
"--with-http_stub_status_module"
"--with-http_postgres_module"
"--with-ipv6"
];
postInstall = ''
mv $out/nginx/sbin/nginx $out/bin
mv $out/luajit/bin/luajit-2.1.0-alpha $out/bin/luajit-openresty
ln -s $out/bin/nginx $out/bin/openresty
'';
enableParallelBuilding = true;
preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2.dev}/include/libxml2 $additionalFlags"
export PATH="$PATH:${stdenv.cc.libc.bin}/bin"
patchShebangs .
postInstall = ''
ln -s $out/luajit/bin/luajit-2.1.0-beta3 $out/bin/luajit-openresty
ln -s $out/nginx/sbin/nginx $out/bin/nginx
'';
meta = {
description = "A fast web application server built on Nginx";
homepage = http://openresty.org;
license = licenses.bsd2;
platforms = platforms.linux;
maintainers = with maintainers; [ thoughtpolice ];
platforms = platforms.all;
maintainers = with maintainers; [ thoughtpolice lblasc ];
};
}