diff options
author | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-15 14:29:18 +0700 |
---|---|---|
committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-15 14:29:18 +0700 |
commit | 4eb185bd6af35b31c9bc8ab9fca170f9440c696a (patch) | |
tree | b1d77c4b82321fe3286225b036af65bf9c81961f /pkgs/data/misc | |
parent | 0e49ba1b645fcf7b1840b688e130f988cad6d7a3 (diff) |
pkgs/data: stdenv.lib -> lib
Diffstat (limited to 'pkgs/data/misc')
-rw-r--r-- | pkgs/data/misc/cacert/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/misc/ddccontrol-db/default.nix | 2 | ||||
-rw-r--r-- | pkgs/data/misc/prjxray-db/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/misc/scowl/default.nix | 12 | ||||
-rw-r--r-- | pkgs/data/misc/symbiflow-arch-defs/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/misc/xorg-rgb/default.nix | 8 |
6 files changed, 17 insertions, 17 deletions
diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index ad8c39831736..e50aa81656a9 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, nss, python3 +{ lib, stdenv, fetchurl, nss, python3 , blacklist ? [] # Used for tests only @@ -7,7 +7,7 @@ , openssl }: -with stdenv.lib; +with lib; let diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix index 6cb0c46e5f55..38f72b5a2efe 100644 --- a/pkgs/data/misc/ddccontrol-db/default.nix +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation { homepage = "https://github.com/ddccontrol/ddccontrol-db"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = [ stdenv.lib.maintainers.pakhfn ]; + maintainers = [ lib.maintainers.pakhfn ]; }; } diff --git a/pkgs/data/misc/prjxray-db/default.nix b/pkgs/data/misc/prjxray-db/default.nix index d498fdb1cc8b..edc3c86438f6 100644 --- a/pkgs/data/misc/prjxray-db/default.nix +++ b/pkgs/data/misc/prjxray-db/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub }: @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Project X-Ray - Xilinx Series 7 Bitstream Documentation"; homepage = "https://github.com/SymbiFlow/prjxray-db"; license = licenses.cc0; diff --git a/pkgs/data/misc/scowl/default.nix b/pkgs/data/misc/scowl/default.nix index 686582b48ce1..a4d91eeb037a 100644 --- a/pkgs/data/misc/scowl/default.nix +++ b/pkgs/data/misc/scowl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, unzip, zip, libiconv, perl, aspell, dos2unix +{ lib, stdenv, fetchFromGitHub, unzip, zip, libiconv, perl, aspell, dos2unix , singleWordlist ? null }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ unzip zip perl aspell dos2unix ]; - buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv; + buildInputs = lib.optional (!stdenv.isLinux) libiconv; NIX_CFLAGS_COMPILE = "-Wno-narrowing"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}$PWD/varcon" ''; - postBuild = stdenv.lib.optionalString (singleWordlist == null) '' + postBuild = lib.optionalString (singleWordlist == null) '' ( cd scowl/speller make aspell @@ -104,9 +104,9 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "Spell checker oriented word lists"; - license = stdenv.lib.licenses.mit; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; homepage = "http://wordlist.aspell.net/"; }; } diff --git a/pkgs/data/misc/symbiflow-arch-defs/default.nix b/pkgs/data/misc/symbiflow-arch-defs/default.nix index 89549da85dcb..3f6e39d85f90 100644 --- a/pkgs/data/misc/symbiflow-arch-defs/default.nix +++ b/pkgs/data/misc/symbiflow-arch-defs/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , autoPatchelfHook , python3Packages @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Project X-Ray - Xilinx Series 7 Bitstream Documentation"; homepage = "https://github.com/SymbiFlow/symbiflow-arch-defs"; hydraPlatforms = []; diff --git a/pkgs/data/misc/xorg-rgb/default.nix b/pkgs/data/misc/xorg-rgb/default.nix index e976fe1358d2..c74c4b826ed0 100644 --- a/pkgs/data/misc/xorg-rgb/default.nix +++ b/pkgs/data/misc/xorg-rgb/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, xorgproto}: +{lib, stdenv, fetchurl, pkgconfig, xorgproto}: stdenv.mkDerivation rec { pname = "rgb"; version = "1.0.6"; @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "X11 colorname to RGB mapping database"; - license = stdenv.lib.licenses.mit; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "http://xorg.freedesktop.org/"; }; } |