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

pkgs/servers: stdenv.lib -> lib

Browse Source
This commit is contained in:
Ben Siraphob
2021-01-15 14:24:03 +07:00
parent e245ae3c3a
commit 872973d7d1
172 changed files with 454 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/http/apache-httpd/2.4.nix
+12 -12
View File
@@ -8,7 +8,7 @@
, luaSupport ? false, lua5
}:
let inherit (stdenv.lib) optional;
let inherit (lib) optional;
in
assert sslSupport -> aprutil.sslSupport && openssl != null;
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
'';
# Required for ‘pthread_cancel’.
NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
NIX_LDFLAGS = lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
configureFlags = [
"--with-apr=${apr.dev}"
@@ -57,19 +57,19 @@ stdenv.mkDerivation rec {
"--enable-imagemap"
"--enable-cgi"
"--includedir=${placeholder "dev"}/include"
(stdenv.lib.enableFeature proxySupport "proxy")
(stdenv.lib.enableFeature sslSupport "ssl")
(stdenv.lib.withFeatureAs libxml2Support "libxml2" "${libxml2.dev}/include/libxml2")
(lib.enableFeature proxySupport "proxy")
(lib.enableFeature sslSupport "ssl")
(lib.withFeatureAs libxml2Support "libxml2" "${libxml2.dev}/include/libxml2")
"--docdir=$(doc)/share/doc"
(stdenv.lib.enableFeature brotliSupport "brotli")
(stdenv.lib.withFeatureAs brotliSupport "brotli" brotli)
(lib.enableFeature brotliSupport "brotli")
(lib.withFeatureAs brotliSupport "brotli" brotli)
(stdenv.lib.enableFeature http2Support "http2")
(stdenv.lib.withFeature http2Support "nghttp2")
(lib.enableFeature http2Support "http2")
(lib.withFeature http2Support "nghttp2")
(stdenv.lib.enableFeature luaSupport "lua")
(stdenv.lib.withFeatureAs luaSupport "lua" lua5)
(lib.enableFeature luaSupport "lua")
(lib.withFeatureAs luaSupport "lua" lua5)
];
enableParallelBuilding = true;
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
description = "Apache HTTPD, the world's most popular web server";
homepage = "http://httpd.apache.org/";
license = licenses.asl20;
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin;
maintainers = with maintainers; [ lovek323 peti ];
};
}
pkgs/servers/http/apache-modules/mod_evasive/default.nix
+1 -1
View File
@@ -30,6 +30,6 @@ stdenv.mkDerivation {
meta = {
homepage = "http://www.zdziarski.com/blog/?page_id=442";
description = "Evasive maneuvers module for Apache to provide evasive action in the event of an HTTP DoS or DDoS attack or brute force attack";
platforms = stdenv.lib.platforms.linux;
platforms = lib.platforms.linux;
};
}
pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, apacheHttpd }:
{ lib, stdenv, fetchurl, apacheHttpd }:
let
version = "2.4.7.1";
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
more scalable.
'';
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.peti ];
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.peti ];
};
}
pkgs/servers/http/apache-modules/mod_python/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, apacheHttpd, python2 }:
{ lib, stdenv, fetchurl, apacheHttpd, python2 }:
stdenv.mkDerivation rec {
name = "mod_python-3.5.0";
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://modpython.org/";
description = "An Apache module that embeds the Python interpreter within the server";
platforms = stdenv.lib.platforms.unix;
platforms = lib.platforms.unix;
};
}
pkgs/servers/http/apache-modules/mod_wsgi/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, apacheHttpd, python, ncurses }:
{ lib, stdenv, fetchurl, apacheHttpd, python, ncurses }:
stdenv.mkDerivation rec {
pname = "mod_wsgi";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "https://github.com/GrahamDumpleton/mod_wsgi";
description = "Host Python applications in Apache through the WSGI interface";
license = stdenv.lib.licenses.asl20;
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.asl20;
platforms = lib.platforms.linux;
};
}
pkgs/servers/http/gatling/default.nix
+1 -1
View File
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A high performance web server";
homepage = "http://www.fefe.de/gatling/";
license = stdenv.lib.licenses.gpl2;
license = lib.licenses.gpl2;
platforms = platforms.linux;
};
}
pkgs/servers/http/hiawatha/default.nix
+1 -1
View File
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake ninja ];
buildInputs = [ mbedtls ] ++ stdenv.lib.optionals enableXslt [ libxslt libxml2 ];
buildInputs = [ mbedtls ] ++ lib.optionals enableXslt [ libxslt libxml2 ];
prePatch = ''
substituteInPlace CMakeLists.txt --replace SETUID ""
pkgs/servers/http/jboss/jdbc/mysql/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, mysql_jdbc }:
{ lib, stdenv, mysql_jdbc }:
stdenv.mkDerivation {
name = "jboss-mysql-jdbc";
@@ -8,6 +8,6 @@ stdenv.mkDerivation {
inherit mysql_jdbc;
meta = {
platforms = stdenv.lib.platforms.unix;
platforms = lib.platforms.unix;
};
}
pkgs/servers/http/jetty/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl }:
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "jetty";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A Web server and javax.servlet container";
homepage = "https://www.eclipse.org/jetty/";
platforms = stdenv.lib.platforms.all;
license = [ stdenv.lib.licenses.asl20 stdenv.lib.licenses.epl10 ];
platforms = lib.platforms.all;
license = [ lib.licenses.asl20 stdenv.lib.licenses.epl10 ];
};
}
pkgs/servers/http/lighttpd/default.nix
+12 -12
View File
@@ -32,19 +32,19 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ pcre pcre.dev libxml2 zlib bzip2 which file openssl ]
++ stdenv.lib.optional enableMagnet lua5_1
++ stdenv.lib.optional enableMysql libmysqlclient
++ stdenv.lib.optional enableLdap openldap
++ stdenv.lib.optional enableWebDAV sqlite
++ stdenv.lib.optional enableWebDAV libuuid;
++ lib.optional enableMagnet lua5_1
++ lib.optional enableMysql libmysqlclient
++ lib.optional enableLdap openldap
++ lib.optional enableWebDAV sqlite
++ lib.optional enableWebDAV libuuid;
configureFlags = [ "--with-openssl" ]
++ stdenv.lib.optional enableMagnet "--with-lua"
++ stdenv.lib.optional enableMysql "--with-mysql"
++ stdenv.lib.optional enableLdap "--with-ldap"
++ stdenv.lib.optional enableWebDAV "--with-webdav-props"
++ stdenv.lib.optional enableWebDAV "--with-webdav-locks"
++ stdenv.lib.optional enableExtendedAttrs "--with-attr";
++ lib.optional enableMagnet "--with-lua"
++ lib.optional enableMysql "--with-mysql"
++ lib.optional enableLdap "--with-ldap"
++ lib.optional enableWebDAV "--with-webdav-props"
++ lib.optional enableWebDAV "--with-webdav-locks"
++ lib.optional enableExtendedAttrs "--with-attr";
preConfigure = ''
export PATH=$PATH:${pcre.dev}/bin
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Lightweight high-performance web server";
homepage = "http://www.lighttpd.net/";
license = stdenv.lib.licenses.bsd3;
license = lib.licenses.bsd3;
platforms = platforms.linux ++ platforms.darwin;
maintainers = [ maintainers.bjornfor ];
};
pkgs/servers/http/mini-httpd/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, boost }:
{ lib, stdenv, fetchurl, boost }:
stdenv.mkDerivation rec {
name = "mini-httpd-1.7";
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://mini-httpd.nongnu.org/";
description = "minimalistic high-performance web server";
license = stdenv.lib.licenses.gpl3;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.peti ];
license = lib.licenses.gpl3;
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.peti ];
};
}
pkgs/servers/http/nginx/generic.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, openssl, zlib, pcre, libxml2, libxslt
{ lib, stdenv, fetchurl, fetchpatch, openssl, zlib, pcre, libxml2, libxslt
, nixosTests
, substituteAll, gd, geoip, perl
, withDebug ? false
@@ -22,7 +22,7 @@
, meta ? null
}:
with stdenv.lib;
with lib;
let
pkgs/servers/http/nix-binary-cache/default.nix
+6 -6
View File
@@ -1,4 +1,4 @@
{stdenv
{lib, stdenv
, coreutils, findutils, nix, xz, bzip2, gnused, gnugrep, openssl
, lighttpd, iproute }:
stdenv.mkDerivation rec {
@@ -47,15 +47,15 @@ stdenv.mkDerivation rec {
meta = {
description = ''A set of scripts to serve the Nix store as a binary cache'';
longDescription = ''
This package installs a CGI script that serves Nix store path in the
binary cache format. It also installs a launcher called
This package installs a CGI script that serves Nix store path in the
binary cache format. It also installs a launcher called
nix-binary-cache-start that can be run without any setup to launch
a binary cache and get the example arguments for its usage.
'';
maintainers = [stdenv.lib.maintainers.raskin];
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [lib.maintainers.raskin];
license = lib.licenses.gpl2Plus;
inherit version;
platforms = stdenv.lib.platforms.all;
platforms = lib.platforms.all;
hydraPlatforms = [];
};
}
pkgs/servers/http/pshs/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libevent, file, qrencode, miniupnpc }:
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libevent, file, qrencode, miniupnpc }:
stdenv.mkDerivation rec {
pname = "pshs";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Pretty small HTTP server - a command-line tool to share files";
homepage = "https://github.com/mgorny/pshs";
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.bsd3;
platforms = lib.platforms.linux;
};
}
pkgs/servers/http/redstore/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, redland, pkgconfig, gmp, zlib, librdf_raptor2
{ lib, stdenv, fetchurl, redland, pkgconfig, gmp, zlib, librdf_raptor2
, librdf_rasqal }:
stdenv.mkDerivation rec {
@@ -22,9 +22,9 @@ stdenv.mkDerivation rec {
meta = {
description = "An HTTP interface to Redland RDF store";
homepage = "https://www.aelius.com/njh/redstore/";
maintainers = [ stdenv.lib.maintainers.raskin ];
platforms = with stdenv.lib.platforms;
maintainers = [ lib.maintainers.raskin ];
platforms = with lib.platforms;
linux ++ freebsd ++ gnu;
license = stdenv.lib.licenses.gpl3Plus;
license = lib.licenses.gpl3Plus;
};
}
pkgs/servers/http/tengine/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt
{ lib, stdenv, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt
, substituteAll, gd, geoip, gperftools, jemalloc
, withDebug ? false
, withMail ? false
@@ -7,7 +7,7 @@
, ...
}:
with stdenv.lib;
with lib;
stdenv.mkDerivation rec {
version = "2.3.2";
pkgs/servers/http/thttpd/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl }:
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "thttpd";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Tiny/turbo/throttling HTTP server";
homepage = "http://www.acme.com/software/thttpd/";
license = stdenv.lib.licenses.bsd2;
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.bsd2;
platforms = lib.platforms.linux;
};
}
pkgs/servers/http/tomcat/axis2/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, apacheAnt, jdk, unzip }:
{ lib, stdenv, fetchurl, apacheAnt, jdk, unzip }:
stdenv.mkDerivation rec {
pname = "axis2";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Web Services / SOAP / WSDL engine, the successor to the widely used Apache Axis SOAP stack";
platforms = stdenv.lib.platforms.unix;
license = stdenv.lib.licenses.asl20;
platforms = lib.platforms.unix;
license = lib.licenses.asl20;
};
}
pkgs/servers/http/tomcat/jdbc/mysql/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, mysql_jdbc }:
{ lib, stdenv, mysql_jdbc }:
stdenv.mkDerivation {
name = "tomcat-mysql-jdbc";
@@ -8,6 +8,6 @@ stdenv.mkDerivation {
inherit mysql_jdbc;
meta = {
platforms = stdenv.lib.platforms.unix;
platforms = lib.platforms.unix;
};
}
pkgs/servers/http/unit/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, nixosTests, which
{ lib, stdenv, fetchFromGitHub, nixosTests, which
, pcre2
, withPython2 ? false, python2
, withPython3 ? true, python3, ncurses
@@ -15,7 +15,7 @@
, withDebug ? false
}:
with stdenv.lib;
with lib;
let
phpConfig = {