pkgs/servers: stdenv.lib -> lib

pkgs/servers/sql/cockroachdb/default.nix

@@ -24,7 +24,7 @@ buildGoPackage rec {
     sha256 = "0mm3hfr778c7djza8gr1clwa8wca4d3ldh9hlg80avw4x664y5zi";
   };
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isGNU [ "-Wno-error=deprecated-copy" "-Wno-error=redundant-move" "-Wno-error=pessimizing-move" ];
+  NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-error=deprecated-copy" "-Wno-error=redundant-move" "-Wno-error=pessimizing-move" ];
 
   inherit nativeBuildInputs buildInputs;
 

pkgs/servers/sql/mariadb/connector-c/default.nix

@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, cmake
+{ lib, stdenv, fetchurl, cmake
 , curl, openssl, zlib
 , libiconv
 , version, sha256, ...
 }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation {
   pname = "mariadb-connector-c";

pkgs/servers/sql/mariadb/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, makeWrapper, ncurses, nixosTests
+{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, makeWrapper, ncurses, nixosTests
 , libiconv, openssl, pcre2, boost, judy, bison, libxml2, libkrb5, linux-pam, curl
 , libaio, libevent, jemalloc, cracklib, systemd, perl
 , bzip2, lz4, lzo, snappy, xz, zlib, zstd
@@ -8,7 +8,7 @@
 , withStorageRocks ? true
 }:
 
-with stdenv.lib;
+with lib;
 
 let # in mariadb # spans the whole file
 

pkgs/servers/sql/mssql/jdbc/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   pname = "mssql-jdbc";
@@ -11,6 +11,6 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }

pkgs/servers/sql/mysql/5.7.x.nix

@@ -16,7 +16,7 @@ self = stdenv.mkDerivation rec {
     sha256 = "1fhv16zr46pxm1j8vb8x8mh3nwzglg01arz8gnazbmjqldr5idpq";
   };
 
-  preConfigure = stdenv.lib.optional stdenv.isDarwin ''
+  preConfigure = lib.optional stdenv.isDarwin ''
     ln -s /bin/ps $TMPDIR/ps
     export PATH=$PATH:$TMPDIR
   '';
@@ -24,7 +24,7 @@ self = stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake bison pkgconfig rpcsvc-proto ];
 
   buildInputs = [ boost libedit libevent lz4 ncurses openssl protobuf readline zlib libtirpc ]
-     ++ stdenv.lib.optionals stdenv.isDarwin [ perl cctools CoreServices developer_cmds ];
+     ++ lib.optionals stdenv.isDarwin [ perl cctools CoreServices developer_cmds ];
 
   outputs = [ "out" "static" ];
 
@@ -58,7 +58,7 @@ self = stdenv.mkDerivation rec {
   ];
 
   CXXFLAGS = "-fpermissive -std=c++11";
-  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
+  NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s";
 
   prePatch = ''
     sed -i -e "s|/usr/bin/libtool|libtool|" cmake/merge_archives.cmake.in

pkgs/servers/sql/mysql/jdbc/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ant, unzip}:
+{lib, stdenv, fetchurl, ant, unzip}:
 
 stdenv.mkDerivation rec {
   name = "mysql-connector-java-5.1.46";
@@ -12,6 +12,6 @@ stdenv.mkDerivation rec {
   buildInputs = [ unzip ant ];
 
   meta = {
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }

pkgs/servers/sql/pgpool/default.nix

@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
     "--sysconfdir=/etc"
     "--localstatedir=/var"
     "--with-openssl"
-  ] ++ stdenv.lib.optional (pam != null) "--with-pam"
-    ++ stdenv.lib.optional (libmemcached != null) "--with-memcached=${libmemcached}";
+  ] ++ lib.optional (pam != null) "--with-pam"
+    ++ lib.optional (libmemcached != null) "--with-memcached=${libmemcached}";
 
   installFlags = [
     "sysconfdir=\${out}/etc"

pkgs/servers/sql/postgresql/ext/pg_similarity.nix

@@ -25,7 +25,7 @@ stdenv.mkDerivation {
        operators (= and <>) you can use ~~~ and ~!~ (any of these operators represents a similarity function).
     '';
     platforms = postgresql.meta.platforms;
-    license = stdenv.lib.licenses.gpl2;
+    license = lib.licenses.gpl2;
     maintainers = with lib.maintainers; [ danbst ];
   };
 }

pkgs/servers/sql/postgresql/ext/postgis.nix

@@ -25,12 +25,12 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ]
-                ++ stdenv.lib.optional stdenv.isDarwin libiconv;
+                ++ lib.optional stdenv.isDarwin libiconv;
   nativeBuildInputs = [ perl pkgconfig ];
   dontDisableStatic = true;
 
   # postgis config directory assumes /include /lib from the same root for json-c library
-  NIX_LDFLAGS = "-L${stdenv.lib.getLib json_c}/lib";
+  NIX_LDFLAGS = "-L${lib.getLib json_c}/lib";
 
   preConfigure = ''
     sed -i 's@/usr/bin/file@${file}/bin/file@' configure