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/nosql/apache-jena/binary.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, java, makeWrapper}:
{lib, stdenv, fetchurl, java, makeWrapper}:
let
s = # Generated upstream information
rec {
@@ -27,9 +27,9 @@ stdenv.mkDerivation {
meta = {
inherit (s) version;
description = ''RDF database'';
license = stdenv.lib.licenses.asl20;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.asl20;
maintainers = [lib.maintainers.raskin];
platforms = lib.platforms.linux;
homepage = "http://jena.apache.org";
downloadPage = "http://archive.apache.org/dist/jena/binaries/";
updateWalker = true;
pkgs/servers/nosql/apache-jena/fuseki-binary.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, java, makeWrapper}:
{lib, stdenv, fetchurl, java, makeWrapper}:
let
s = # Generated upstream information
rec {
@@ -31,9 +31,9 @@ stdenv.mkDerivation {
meta = {
inherit (s) version;
description = ''SPARQL server'';
license = stdenv.lib.licenses.asl20;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.asl20;
maintainers = [lib.maintainers.raskin];
platforms = lib.platforms.linux;
homepage = "http://jena.apache.org";
downloadPage = "http://archive.apache.org/dist/jena/binaries/";
downloadURLRegexp = "apache-jena-fuseki-.*[.]tar[.]gz\$";
pkgs/servers/nosql/cassandra/generic.nix
+2 -2
View File
@@ -7,8 +7,8 @@
}:
let
libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ];
binPath = with stdenv.lib; makeBinPath ([
libPath = lib.makeLibraryPath [ stdenv.cc.cc ];
binPath = with lib; makeBinPath ([
bash
getopt
gawk
pkgs/servers/nosql/eventstore/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv
{ lib, stdenv
, fetchFromGitHub
, fetchurl
, makeWrapper
@@ -74,8 +74,8 @@ stdenv.mkDerivation rec {
meta = {
homepage = "https://geteventstore.com/";
description = "Event sourcing database with processing logic in JavaScript";
license = stdenv.lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [ puffnfresh ];
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ puffnfresh ];
platforms = [ "x86_64-linux" ];
};
pkgs/servers/nosql/mongodb/mongodb.nix
+8 -8
View File
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, sconsPackages, boost, gperftools, pcre-cpp, snappy, zlib, libyamlcpp
{ lib, stdenv, fetchurl, sconsPackages, boost, gperftools, pcre-cpp, snappy, zlib, libyamlcpp
, sasl, openssl, libpcap, python27, python38, curl, Security, CoreFoundation, cctools }:
# Note:
# The command line tools are written in Go as part of a different package (mongodb-tools)
with stdenv.lib;
with lib;
{ version, sha256, patches ? []
, license ? stdenv.lib.licenses.sspl
, license ? lib.licenses.sspl
}@args:
let
@@ -34,7 +34,7 @@ let
#"valgrind" -- mongodb only requires valgrind.h, which is vendored in the source.
#"wiredtiger"
] ++ optionals stdenv.isLinux [ "tcmalloc" ];
inherit (stdenv.lib) systems subtractLists;
inherit (lib) systems subtractLists;
in stdenv.mkDerivation rec {
inherit version;
@@ -58,7 +58,7 @@ in stdenv.mkDerivation rec {
sasl
snappy
zlib
] ++ stdenv.lib.optionals stdenv.isDarwin [ Security CoreFoundation cctools ];
] ++ lib.optionals stdenv.isDarwin [ Security CoreFoundation cctools ];
# MongoDB keeps track of its build parameters, which tricks nix into
# keeping dependencies to build inputs in the final output.
@@ -69,7 +69,7 @@ in stdenv.mkDerivation rec {
# fix environment variable reading
substituteInPlace SConstruct \
--replace "env = Environment(" "env = Environment(ENV = os.environ,"
'' + stdenv.lib.optionalString stdenv.isDarwin ''
'' + lib.optionalString stdenv.isDarwin ''
substituteInPlace src/third_party/mozjs-${variants.mozjsVersion}/extract/js/src/jsmath.cpp --replace '${variants.mozjsReplace}' 0
substituteInPlace src/third_party/s2/s1angle.cc --replace drem remainder
@@ -77,14 +77,14 @@ in stdenv.mkDerivation rec {
substituteInPlace src/third_party/s2/s2cap.cc --replace drem remainder
substituteInPlace src/third_party/s2/s2latlng.cc --replace drem remainder
substituteInPlace src/third_party/s2/s2latlngrect.cc --replace drem remainder
'' + stdenv.lib.optionalString stdenv.isi686 ''
'' + lib.optionalString stdenv.isi686 ''
# don't fail by default on i686
substituteInPlace src/mongo/db/storage/storage_options.h \
--replace 'engine("wiredTiger")' 'engine("mmapv1")'
'';
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang
"-Wno-unused-command-line-argument";
sconsFlags = [
pkgs/servers/nosql/mongodb/v3_4.nix
+1 -1
View File
@@ -12,5 +12,5 @@ in buildMongoDB {
version = "3.4.24";
sha256 = "0j6mvgv0jnsnvgkl8505bl88kbxkba66qijlpi1la0dd5pd1imfr";
patches = [ ./forget-build-dependencies-3-4.patch ];
license = stdenv.lib.licenses.agpl3;
license = lib.licenses.agpl3;
}
pkgs/servers/nosql/mongodb/v3_6.nix
+1 -1
View File
@@ -12,5 +12,5 @@ in buildMongoDB {
version = "3.6.13";
sha256 = "1mbvk4bmabrswjdm01jssxcygjpq5799zqyx901nsi12vlcymwg4";
patches = [ ./forget-build-dependencies.patch ]
++ stdenv.lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view.patch ];
++ lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view.patch ];
}
pkgs/servers/nosql/mongodb/v4_0.nix
+1 -1
View File
@@ -13,5 +13,5 @@ in buildMongoDB {
sha256 = "1j8dqa4jr623y87jrdanyib9r7x18srrvdx952q4azcc8zrdwci1";
patches =
[ ./forget-build-dependencies.patch ./mozjs-45_fix-3-byte-opcode.patch ]
++ stdenv.lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view.patch ];
++ lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view.patch ];
}
pkgs/servers/nosql/mongodb/v4_2.nix
+1 -1
View File
@@ -13,5 +13,5 @@ in buildMongoDB {
sha256 = "13yvhi1258skdni00bh6ph609whqsmhiimhyqy1gs2liwdvh5278";
patches =
[ ./forget-build-dependencies-4-2.patch ]
++ stdenv.lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view-4-2.patch ];
++ lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view-4-2.patch ];
}
pkgs/servers/nosql/neo4j/default.nix
+3 -3
View File
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, makeWrapper, jre8, which, gawk }:
with stdenv.lib;
with lib;
stdenv.mkDerivation rec {
pname = "neo4j";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
do
makeWrapper "$out/share/neo4j/bin/$NEO4J_SCRIPT" \
"$out/bin/$NEO4J_SCRIPT" \
--prefix PATH : "${stdenv.lib.makeBinPath [ jre8 which gawk ]}" \
--prefix PATH : "${lib.makeBinPath [ jre8 which gawk ]}" \
--set JAVA_HOME "$jre8"
done
'';
@@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3;
maintainers = [ maintainers.offline ];
platforms = stdenv.lib.platforms.unix;
platforms = lib.platforms.unix;
};
}
pkgs/servers/nosql/redis/default.nix
+6 -6
View File
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
# Cross-compiling fixes
configurePhase = ''
${stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
${lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
# This fixes hiredis, which has the AR awkwardly coded.
# Probably a good candidate for a patch upstream.
makeFlagsArray+=('STLIB_MAKE_CMD=${stdenv.cc.targetPrefix}ar rcs $(STLIBNAME)')
@@ -23,16 +23,16 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ lua ]
++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) systemd
++ stdenv.lib.optionals tlsSupport [ openssl ];
++ lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) systemd
++ lib.optionals tlsSupport [ openssl ];
# More cross-compiling fixes.
# Note: this enables libc malloc as a temporary fix for cross-compiling.
# Due to hardcoded configure flags in jemalloc, we can't cross-compile vendored jemalloc properly, and so we're forced to use libc allocator.
# It's weird that the build isn't failing because of failure to compile dependencies, it's from failure to link them!
makeFlags = [ "PREFIX=$(out)" ]
++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" "MALLOC=libc" ]
++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) ["USE_SYSTEMD=yes"]
++ stdenv.lib.optionals tlsSupport [ "BUILD_TLS=yes" ];
++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" "MALLOC=libc" ]
++ lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) ["USE_SYSTEMD=yes"]
++ lib.optionals tlsSupport [ "BUILD_TLS=yes" ];
enableParallelBuilding = true;
pkgs/servers/nosql/rethinkdb/default.nix
+8 -8
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, which, m4
{ lib, stdenv, fetchurl, which, m4
, protobuf, boost, zlib, curl, openssl, icu, jemalloc, libtool
, python2Packages, makeWrapper
}:
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "5f1786c94797a0f8973597796e22545849dc214805cf1962ef76969e0b7d495b";
};
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
postPatch = lib.optionalString stdenv.isDarwin ''
sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' external/v8_3.30.33.16/build/gyp/pylib/gyp/xcode_emulation.py
# very meta
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
patchShebangs .
'';
configureFlags = stdenv.lib.optionals (!stdenv.isDarwin) [
configureFlags = lib.optionals (!stdenv.isDarwin) [
"--with-jemalloc"
"--lib-path=${jemalloc}/lib"
];
@@ -32,8 +32,8 @@ stdenv.mkDerivation rec {
makeFlags = [ "rethinkdb" ];
buildInputs = [ protobuf boost zlib curl openssl icu makeWrapper ]
++ stdenv.lib.optional (!stdenv.isDarwin) jemalloc
++ stdenv.lib.optional stdenv.isDarwin libtool;
++ lib.optional (!stdenv.isDarwin) jemalloc
++ lib.optional stdenv.isDarwin libtool;
nativeBuildInputs = [ which m4 python2Packages.python ];
@@ -53,8 +53,8 @@ stdenv.mkDerivation rec {
joins and group by, and is easy to setup and learn.
'';
homepage = "http://www.rethinkdb.com";
license = stdenv.lib.licenses.asl20;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ thoughtpolice bluescreen303 ];
license = lib.licenses.asl20;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ thoughtpolice bluescreen303 ];
};
}