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

Merge remote-tracking branch 'origin/master' into hardened-stdenv

Browse Source
This commit is contained in:
Franz Pletz
2016-05-18 17:10:02 +02:00
parent 9fbc20e2f8 3cd63ade16
commit f8d481754c
1470 changed files with 62103 additions and 28701 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/http/4store/default.nix
+34 -38
View File
@@ -1,48 +1,44 @@
x@{builderDefsPackage
, librdf_raptor, librdf_rasqal,
glib, libxml2, pcre, avahi,
readline, ncurses, expat,
zlib, pkgconfig, which,
perl, libuuid, gmp, mpfr
, db_dir ? "/var/lib/4store"
, ...}:
builderDefsPackage
(a :
let
s = import ./src-for-default.nix;
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
["db_dir"];
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
in
rec {
src = a.fetchUrlFromSrcInfo s;
{ stdenv, fetchFromGitHub, librdf_raptor
, librdf_rasqal, glib, libxml2, pcre
, avahi, readline, ncurses, expat, autoreconfHook
, zlib, pkgconfig, which, perl, libuuid
, gmp, mpfr
, db_dir ? "/var/lib/4store" }:
inherit (s) name;
inherit buildInputs;
/* doConfigure should be removed if not needed */
phaseNames = ["doFixConfigure" "doConfigure" "doMakeInstall"
"fixInterpreter"];
stdenv.mkDerivation rec {
name = "4store-${version}";
version = "1.1.6";
doFixConfigure = a.fullDepEntry ''
sed -e 's@#! */bin/bash@#! ${a.stdenv.shell}@' -i configure
src = fetchFromGitHub {
owner = "garlik";
repo = "4store";
rev = "v${version}";
sha256 = "1kzdfmwpzy64cgqlkcz5v4klwx99w0jk7afckyf7yqbqb4rydmpk";
};
buildInputs = [ librdf_raptor librdf_rasqal glib libxml2 pcre
avahi readline ncurses expat zlib pkgconfig which perl libuuid
gmp mpfr autoreconfHook ];
# needed for ./autogen.sh
prePatch = ''
echo "${version}" > .version
'';
preConfigure = ''
sed -e 's@#! */bin/bash@#! ${stdenv.shell}@' -i configure
find . -name Makefile -exec sed -e "s@/usr/local@$out@g" -i '{}' ';'
sed -e 's@/var/lib/4store@${db_dir}@g' -i src/common/params.h src/utilities/*
rm src/utilities/4s-backend
sed -e 's@/var/lib/4store@${db_dir}@g' -i configure.ac src/utilities/*
sed -e '/FS_STORE_ROOT/d' -i src/utilities/Makefile*
'' ["minInit" "doUnpack"];
'';
fixInterpreter = (a.doPatchShebangs "$out/bin");
meta = {
meta = with stdenv.lib; {
description = "SparQL query server (RDF storage)";
homepage = http://4store.org/;
maintainers = with a.lib.maintainers;
[
raskin
];
platforms = with a.lib.platforms;
linux;
maintainers = with maintainers; [ raskin ];
platforms = platforms.linux;
};
}) x
}
pkgs/servers/http/apache-httpd/2.2.nix
+1 -1
View File
@@ -75,6 +75,6 @@ stdenv.mkDerivation rec {
homepage = http://httpd.apache.org/;
license = stdenv.lib.licenses.asl20;
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
maintainers = with stdenv.lib.maintainers; [ eelco simons lovek323 ];
maintainers = with stdenv.lib.maintainers; [ eelco lovek323 ];
};
}
pkgs/servers/http/apache-httpd/2.4.nix
+1 -1
View File
@@ -83,6 +83,6 @@ stdenv.mkDerivation rec {
homepage = http://httpd.apache.org/;
license = licenses.asl20;
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
maintainers = with maintainers; [ lovek323 simons ];
maintainers = with maintainers; [ lovek323 peti ];
};
}
pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
+1 -1
View File
@@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
'';
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.simons ];
maintainers = [ stdenv.lib.maintainers.peti ];
};
}
pkgs/servers/http/apache-modules/mod_wsgi/default.nix
-2
View File
@@ -21,8 +21,6 @@ stdenv.mkDerivation rec {
homepage = http://code.google.com/p/modwsgi/;
description = "Host Python applications in Apache through the WSGI interface";
license = stdenv.lib.licenses.asl20;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.simons ];
};
}
pkgs/servers/http/lighttpd/default.nix
+2 -2
View File
@@ -7,11 +7,11 @@ assert enableMagnet -> lua5_1 != null;
assert enableMysql -> mysql != null;
stdenv.mkDerivation rec {
name = "lighttpd-1.4.37";
name = "lighttpd-1.4.39";
src = fetchurl {
url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz";
sha256 = "1gbri5avg1jv2g585wk0jp53mf9jjdz2py9774mxm8bwarh6ykl0";
sha256 = "0nrnhxl1ypzgsms0ky6zdf6ib94vf8x77c422s2xav9x7j2s3fby";
};
buildInputs = [ pkgconfig pcre libxml2 zlib attr bzip2 which file openssl ]
pkgs/servers/http/mini-httpd/default.nix
+1 -1
View File
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
description = "a minimalistic high-performance web server";
license = stdenv.lib.licenses.gpl3;
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.simons ];
maintainers = [ stdenv.lib.maintainers.peti ];
};
}
pkgs/servers/http/nginx/default.nix
+16 -17
View File
@@ -1,34 +1,29 @@
{ stdenv, fetchurl, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt, expat
, gd, geoip
, withStream ? false
, modules ? []
, hardening ? true
}:
with stdenv.lib;
let
version = "1.8.1";
mainSrc = fetchurl {
url = "http://nginx.org/download/nginx-${version}.tar.gz";
sha256 = "1dwpyw4pvhj68vxramqxm8f79pqz9lrm8mvifbn49h3615ikqjwg";
};
in
stdenv.mkDerivation rec {
name = "nginx-${version}";
src = mainSrc;
version = "1.10.0";
src = fetchurl {
url = "http://nginx.org/download/nginx-${version}.tar.gz";
sha256 = "0kdyqa5xaxvhz6y75ixs05mzygk3kszzdq5h0gnlrg35vp1lgmlf";
};
buildInputs =
[ openssl zlib pcre libxml2 libxslt gd geoip ]
++ concatMap (mod: mod.inputs or []) modules;
configureFlags = [
"--with-select_module"
"--with-poll_module"
"--with-threads"
"--with-http_ssl_module"
"--with-http_spdy_module"
"--with-http_v2_module"
"--with-http_realip_module"
"--with-http_addition_module"
"--with-http_xslt_module"
@@ -48,16 +43,20 @@ stdenv.mkDerivation rec {
"--with-ipv6"
# Install destination problems
# "--with-http_perl_module"
] ++ optionals (elem stdenv.system (with platforms; linux ++ freebsd))
[ "--with-file-aio" "--with-aio_module" ]
] ++ optional withStream "--with-stream"
++ optional (elem stdenv.system (with platforms; linux ++ freebsd)) "--with-file-aio"
++ map (mod: "--add-module=${mod.src}") modules;
NIX_CFLAGS_COMPILE = [ "-I${libxml2.dev}/include/libxml2" ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations -Wno-error=conditional-uninitialized";
NIX_CFLAGS_COMPILE = [ "-I${libxml2.dev}/include/libxml2" ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations";
preConfigure = (concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules);
hardeningEnable = [ "pie" ];
postInstall = ''
mv $out/sbin $out/bin
'';
meta = {
description = "A reverse proxy and lightweight webserver";
homepage = http://nginx.org;
pkgs/servers/http/nginx/unstable.nix
-70
View File
@@ -1,70 +0,0 @@
{ stdenv, fetchurl, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt, expat
, gd, geoip
, withStream ? false
, modules ? []
, hardening ? true
}:
with stdenv.lib;
let
version = "1.9.14";
mainSrc = fetchurl {
url = "http://nginx.org/download/nginx-${version}.tar.gz";
sha256 = "1ljpyigqb6sbm4f8mi4fyvwfcvfapzg4z35s9cwb9ri8dl3r6j1b";
};
in
stdenv.mkDerivation rec {
name = "nginx-${version}";
src = mainSrc;
buildInputs =
[ openssl zlib pcre libxml2 libxslt gd geoip ]
++ concatMap (mod: mod.inputs or []) modules;
configureFlags = [
"--with-http_ssl_module"
"--with-http_v2_module"
"--with-http_realip_module"
"--with-http_addition_module"
"--with-http_xslt_module"
"--with-http_image_filter_module"
"--with-http_geoip_module"
"--with-http_sub_module"
"--with-http_dav_module"
"--with-http_flv_module"
"--with-http_mp4_module"
"--with-http_gunzip_module"
"--with-http_gzip_static_module"
"--with-http_auth_request_module"
"--with-http_random_index_module"
"--with-http_secure_link_module"
"--with-http_degradation_module"
"--with-http_stub_status_module"
"--with-ipv6"
# Install destination problems
# "--with-http_perl_module"
] ++ optional withStream "--with-stream"
++ optional (elem stdenv.system (with platforms; linux ++ freebsd)) "--with-file-aio"
++ map (mod: "--add-module=${mod.src}") modules;
NIX_CFLAGS_COMPILE = [ "-I${libxml2.dev}/include/libxml2" ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations";
preConfigure = (concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules);
hardeningEnable = [ "pie" ];
postInstall = ''
mv $out/sbin $out/bin
'';
meta = {
description = "A reverse proxy and lightweight webserver";
homepage = http://nginx.org;
license = licenses.bsd2;
platforms = platforms.all;
maintainers = with maintainers; [ thoughtpolice raskin ];
};
}