diff options
52 files changed, 132 insertions, 132 deletions
diff --git a/pkgs/data/documentation/gnome-user-docs/default.nix b/pkgs/data/documentation/gnome-user-docs/default.nix index 30f8d736d32e..ebd171c65455 100644 --- a/pkgs/data/documentation/gnome-user-docs/default.nix +++ b/pkgs/data/documentation/gnome-user-docs/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { version = "3.38.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1h9lyn80zccmgi6gpymabgrcj7km0sb1axll5z490qnx74xbn37m"; }; diff --git a/pkgs/data/documentation/man-pages-posix/default.nix b/pkgs/data/documentation/man-pages-posix/default.nix index 8a76bcb2c448..a65b176f88fc 100644 --- a/pkgs/data/documentation/man-pages-posix/default.nix +++ b/pkgs/data/documentation/man-pages-posix/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "man-pages-posix-2013-a"; @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { meta = { description = "POSIX man-pages (0p, 1p, 3p)"; homepage = "https://www.kernel.org/doc/man-pages/"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/data/fonts/cantarell-fonts/default.nix b/pkgs/data/fonts/cantarell-fonts/default.nix index 4c3459d0f114..5129cf271886 100644 --- a/pkgs/data/fonts/cantarell-fonts/default.nix +++ b/pkgs/data/fonts/cantarell-fonts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, gettext, appstream-glib, gnome3 }: +{ lib, stdenv, fetchurl, meson, ninja, gettext, appstream-glib, gnome3 }: let pname = "cantarell-fonts"; @@ -7,7 +7,7 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "05hpnhihwm9sxlq1qn993g03pwkmpjbn0dvnba71r1gfjv0jp2w5"; }; @@ -31,8 +31,8 @@ in stdenv.mkDerivation rec { meta = { description = "Default typeface used in the user interface of GNOME since version 3.0"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.ofl; - maintainers = with stdenv.lib.maintainers; [ ]; + platforms = lib.platforms.all; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix index 839cb80a6b99..aed90b103b4e 100644 --- a/pkgs/data/fonts/dejavu-fonts/default.nix +++ b/pkgs/data/fonts/dejavu-fonts/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, fontforge, perl, perlPackages }: +{ fetchFromGitHub, lib, stdenv, fontforge, perl, perlPackages }: let version = "2.37"; @@ -18,9 +18,9 @@ let # Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved. # DejaVu changes are in public domain # See http://dejavu-fonts.org/wiki/License for details - license = stdenv.lib.licenses.free; + license = lib.licenses.free; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; full-ttf = stdenv.mkDerivation { @@ -31,7 +31,7 @@ let src = fetchFromGitHub { owner = "dejavu-fonts"; repo = "dejavu-fonts"; - rev = "version_${stdenv.lib.replaceStrings ["."] ["_"] version}"; + rev = "version_${lib.replaceStrings ["."] ["_"] version}"; sha256 = "1xknlg2h287dx34v2n5r33bpcl4biqf0cv7nak657rjki7s0k4bk"; }; diff --git a/pkgs/data/fonts/fixedsys-excelsior/default.nix b/pkgs/data/fonts/fixedsys-excelsior/default.nix index 4222b802d55c..e55ae0bcf11b 100644 --- a/pkgs/data/fonts/fixedsys-excelsior/default.nix +++ b/pkgs/data/fonts/fixedsys-excelsior/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl } : +{ lib, stdenv, fetchurl } : let major = "3"; @@ -23,8 +23,8 @@ in fetchurl rec { meta = { description = "Pan-unicode version of Fixedsys, a classic DOS font"; homepage = "http://www.fixedsysexcelsior.com/"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.publicDomain; - maintainers = [ stdenv.lib.maintainers.ninjatrappeur ]; + platforms = lib.platforms.all; + license = lib.licenses.publicDomain; + maintainers = [ lib.maintainers.ninjatrappeur ]; }; } diff --git a/pkgs/data/fonts/go-font/default.nix b/pkgs/data/fonts/go-font/default.nix index b2225f5b49bf..056cd621394f 100644 --- a/pkgs/data/fonts/go-font/default.nix +++ b/pkgs/data/fonts/go-font/default.nix @@ -22,7 +22,7 @@ in (fetchgit { description = "The Go font family"; license = licenses.bsd3; maintainers = with maintainers; [ sternenseemann ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; hydraPlatforms = []; }; } diff --git a/pkgs/data/fonts/kochi-substitute/default.nix b/pkgs/data/fonts/kochi-substitute/default.nix index cf89a8fcb8f1..071db9b13dfb 100644 --- a/pkgs/data/fonts/kochi-substitute/default.nix +++ b/pkgs/data/fonts/kochi-substitute/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dpkg }: +{ lib, stdenv, fetchurl, dpkg }: let version = "20030809"; in @@ -42,7 +42,7 @@ stdenv.mkDerivation { from the naga10 font. ''; homepage = "https://osdn.net/projects/efont/"; - license = stdenv.lib.licenses.wadalab; - maintainers = [ stdenv.lib.maintainers.auntie ]; + license = lib.licenses.wadalab; + maintainers = [ lib.maintainers.auntie ]; }; } diff --git a/pkgs/data/fonts/league-of-moveable-type/default.nix b/pkgs/data/fonts/league-of-moveable-type/default.nix index 9a80b9a43df8..f6855dc99d66 100644 --- a/pkgs/data/fonts/league-of-moveable-type/default.nix +++ b/pkgs/data/fonts/league-of-moveable-type/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip, raleway}: +{lib, stdenv, fetchurl, unzip, raleway}: let @@ -43,9 +43,9 @@ stdenv.mkDerivation rec { homepage = "https://www.theleagueofmoveabletype.com/"; - license = stdenv.lib.licenses.ofl; + license = lib.licenses.ofl; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ bergey Profpatsch ]; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ bergey Profpatsch ]; }; } diff --git a/pkgs/data/fonts/meslo-lg/default.nix b/pkgs/data/fonts/meslo-lg/default.nix index 2837e488389b..7083b9e00313 100644 --- a/pkgs/data/fonts/meslo-lg/default.nix +++ b/pkgs/data/fonts/meslo-lg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { version = "1.2.1"; @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { meta = { description = "A customized version of Apple’s Menlo-Regular font"; homepage = "https://github.com/andreberg/Meslo-Font/"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ balajisivaraman ]; - platforms = with stdenv.lib.platforms; all; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ balajisivaraman ]; + platforms = with lib.platforms; all; }; } diff --git a/pkgs/data/fonts/nafees/default.nix b/pkgs/data/fonts/nafees/default.nix index 11e1ccb56451..e23528aefe80 100644 --- a/pkgs/data/fonts/nafees/default.nix +++ b/pkgs/data/fonts/nafees/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip}: +{lib, stdenv, fetchurl, unzip}: stdenv.mkDerivation { name = "nafees"; @@ -56,7 +56,7 @@ stdenv.mkDerivation { # more like a modified BSD, but still contains the GPLv2 embedded # font exception, and some not-for-resale language. license = "unknown"; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ bergey ]; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ bergey ]; }; } diff --git a/pkgs/data/fonts/navilu/default.nix b/pkgs/data/fonts/navilu/default.nix index 0433ad22de53..afd9f85741c3 100644 --- a/pkgs/data/fonts/navilu/default.nix +++ b/pkgs/data/fonts/navilu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fontforge }: +{ lib, stdenv, fetchFromGitHub, fontforge }: stdenv.mkDerivation rec { pname = "navilu-font"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { installPhase = "install -Dm444 -t $out/share/fonts/truetype/ Navilu.ttf"; - meta = with stdenv.lib; src.meta // { + meta = with lib; src.meta // { description = "A Kannada handwriting font"; license = licenses.gpl3Plus; platforms = platforms.all; diff --git a/pkgs/data/fonts/poly/default.nix b/pkgs/data/fonts/poly/default.nix index 05b411a5ba30..50dfb5020354 100644 --- a/pkgs/data/fonts/poly/default.nix +++ b/pkgs/data/fonts/poly/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { name = "poly"; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { and languages that use the Latin script and its variants. ''; homepage = "http://www.fontsquirrel.com/fonts/poly"; - license = stdenv.lib.licenses.ofl; - maintainers = with stdenv.lib.maintainers; [ relrod ]; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ relrod ]; }; } diff --git a/pkgs/data/fonts/tempora-lgc/default.nix b/pkgs/data/fonts/tempora-lgc/default.nix index d20acad663c1..c7be70f800de 100644 --- a/pkgs/data/fonts/tempora-lgc/default.nix +++ b/pkgs/data/fonts/tempora-lgc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: let srcs = [ (fetchurl { @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = { description = ''Tempora font''; - license = stdenv.lib.licenses.gpl2 ; - maintainers = [stdenv.lib.maintainers.raskin]; + license = lib.licenses.gpl2 ; + maintainers = [lib.maintainers.raskin]; }; } diff --git a/pkgs/data/fonts/tex-gyre-math/default.nix b/pkgs/data/fonts/tex-gyre-math/default.nix index 92898be0f3ff..95038d3f9cfe 100644 --- a/pkgs/data/fonts/tex-gyre-math/default.nix +++ b/pkgs/data/fonts/tex-gyre-math/default.nix @@ -64,4 +64,4 @@ let }; }; in - stdenv.lib.mapAttrs mkVariant variants + lib.mapAttrs mkVariant variants diff --git a/pkgs/data/fonts/tex-gyre/default.nix b/pkgs/data/fonts/tex-gyre/default.nix index 333da24e95f3..6ce5bd207862 100644 --- a/pkgs/data/fonts/tex-gyre/default.nix +++ b/pkgs/data/fonts/tex-gyre/default.nix @@ -32,7 +32,7 @@ let platforms = platforms.all; }; }; -in stdenv.lib.mapAttrs mkVariant { +in lib.mapAttrs mkVariant { adventor = { version = "2_501"; sha256 = "0qjg3x0adfppyx3x33cm07ww9i9sl88xaq07m7wfip8rmyp567fn"; diff --git a/pkgs/data/fonts/ttf-bitstream-vera/default.nix b/pkgs/data/fonts/ttf-bitstream-vera/default.nix index f485f43b60c6..bcf6cefb8d67 100644 --- a/pkgs/data/fonts/ttf-bitstream-vera/default.nix +++ b/pkgs/data/fonts/ttf-bitstream-vera/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: let pname = "ttf-bitstream-vera"; version = "1.10"; @@ -6,7 +6,7 @@ in fetchzip rec { name = "${pname}-${version}"; - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.bz2"; postFetch = '' tar -xjf $downloadedFile --strip-components=1 diff --git a/pkgs/data/fonts/twitter-color-emoji/default.nix b/pkgs/data/fonts/twitter-color-emoji/default.nix index de70a0b6c6a0..f86c47994929 100644 --- a/pkgs/data/fonts/twitter-color-emoji/default.nix +++ b/pkgs/data/fonts/twitter-color-emoji/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ]; postPatch = let - templateSubstitutions = stdenv.lib.concatStringsSep "; " [ + templateSubstitutions = lib.concatStringsSep "; " [ ''s#Noto Color Emoji#Twitter Color Emoji#'' ''s#NotoColorEmoji#TwitterColorEmoji#'' ''s#Copyright .* Google Inc\.#Twitter, Inc and other contributors.#'' diff --git a/pkgs/data/fonts/uni-vga/default.nix b/pkgs/data/fonts/uni-vga/default.nix index 65db46ca2ca7..56ba36b1eb41 100644 --- a/pkgs/data/fonts/uni-vga/default.nix +++ b/pkgs/data/fonts/uni-vga/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, perl, kbd, bdftopcf +{ lib, stdenv, fetchurl, perl, kbd, bdftopcf , libfaketime, fonttosfnt, mkfontscale }: -with stdenv.lib; +with lib; stdenv.mkDerivation { name = "uni-vga"; diff --git a/pkgs/data/fonts/unscii/default.nix b/pkgs/data/fonts/unscii/default.nix index 724d015a7c31..5aaa68f9796f 100644 --- a/pkgs/data/fonts/unscii/default.nix +++ b/pkgs/data/fonts/unscii/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, bdftopcf +{ lib, stdenv, fetchurl, perl, bdftopcf , fontforge, SDL, SDL_image, mkfontscale }: @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { # Basically GPL2+ with font exception — because of the Unifont-augmented # version. The reduced version is public domain. license = "http://unifoundry.com/LICENSE.txt"; - maintainers = [ stdenv.lib.maintainers.raskin ]; + maintainers = [ lib.maintainers.raskin ]; homepage = "http://pelulamu.net/unscii/"; }; } diff --git a/pkgs/data/fonts/vista-fonts/default.nix b/pkgs/data/fonts/vista-fonts/default.nix index 3a5ee616a0ef..b71ef7c99ec8 100644 --- a/pkgs/data/fonts/vista-fonts/default.nix +++ b/pkgs/data/fonts/vista-fonts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, cabextract }: +{ lib, stdenv, fetchzip, cabextract }: fetchzip { name = "vista-fonts-1"; @@ -26,7 +26,7 @@ fetchzip { meta = { description = "Some TrueType fonts from Microsoft Windows Vista (Calibri, Cambria, Candara, Consolas, Constantia, Corbel)"; homepage = "http://www.microsoft.com/typography/ClearTypeFonts.mspx"; - license = stdenv.lib.licenses.unfree; # haven't read the EULA, but we probably can't redistribute these files, so... + license = lib.licenses.unfree; # haven't read the EULA, but we probably can't redistribute these files, so... # Set a non-zero priority to allow easy overriding of the # fontconfig configuration files. diff --git a/pkgs/data/icons/gnome-icon-theme/default.nix b/pkgs/data/icons/gnome-icon-theme/default.nix index 9879f8da342d..b9a4fd48fb67 100644 --- a/pkgs/data/icons/gnome-icon-theme/default.nix +++ b/pkgs/data/icons/gnome-icon-theme/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.12.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-icon-theme/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-icon-theme/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0fjh9qmmgj34zlgxb09231ld7khys562qxbpsjlaplq2j85p57im"; }; diff --git a/pkgs/data/icons/tango-icon-theme/default.nix b/pkgs/data/icons/tango-icon-theme/default.nix index f1b59c2f5386..b69bf4d46f53 100644 --- a/pkgs/data/icons/tango-icon-theme/default.nix +++ b/pkgs/data/icons/tango-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, iconnamingutils, imagemagick, librsvg +{ lib, stdenv, fetchurl, intltool, pkgconfig, iconnamingutils, imagemagick, librsvg , gtk/*any version*/, gnome-icon-theme, hicolor-icon-theme }: @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { meta = { description = "A basic set of icons"; homepage = "http://tango.freedesktop.org/Tango_Icon_Library"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } 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 { |