diff options
Diffstat (limited to 'nixpkgs/pkgs/data')
227 files changed, 705 insertions, 622 deletions
diff --git a/nixpkgs/pkgs/data/documentation/anarchism/default.nix b/nixpkgs/pkgs/data/documentation/anarchism/default.nix index 3acb215db14a..8f95a371ae22 100644 --- a/nixpkgs/pkgs/data/documentation/anarchism/default.nix +++ b/nixpkgs/pkgs/data/documentation/anarchism/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, xdg_utils }: +{ lib, stdenv, fetchFromGitLab, xdg_utils }: stdenv.mkDerivation rec { pname = "anarchism"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { cp debian/anarchism.desktop $out/share/applications ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.anarchistfaq.org/"; changelog = "http://anarchism.pageabode.com/afaq/new.html"; description = "Exhaustive exploration of Anarchist theory and practice"; diff --git a/nixpkgs/pkgs/data/documentation/gnome-user-docs/default.nix b/nixpkgs/pkgs/data/documentation/gnome-user-docs/default.nix index a344dbca2f38..ebd171c65455 100644 --- a/nixpkgs/pkgs/data/documentation/gnome-user-docs/default.nix +++ b/nixpkgs/pkgs/data/documentation/gnome-user-docs/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , gettext , gnome3 @@ -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"; }; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "User and system administration help for the GNOME desktop"; homepage = "https://help.gnome.org/users/gnome-help/"; license = licenses.cc-by-30; diff --git a/nixpkgs/pkgs/data/documentation/man-pages-posix/default.nix b/nixpkgs/pkgs/data/documentation/man-pages-posix/default.nix index 8a76bcb2c448..a65b176f88fc 100644 --- a/nixpkgs/pkgs/data/documentation/man-pages-posix/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/data/documentation/man-pages/default.nix b/nixpkgs/pkgs/data/documentation/man-pages/default.nix index d4fc2eb98eb4..a8f38b1a6c6a 100644 --- a/nixpkgs/pkgs/data/documentation/man-pages/default.nix +++ b/nixpkgs/pkgs/data/documentation/man-pages/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "man-pages"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; outputDocdev = "out"; - meta = with stdenv.lib; { + meta = with lib; { description = "Linux development manual pages"; homepage = "https://www.kernel.org/doc/man-pages/"; repositories.git = "http://git.kernel.org/pub/scm/docs/man-pages/man-pages"; diff --git a/nixpkgs/pkgs/data/documentation/rnrs/common.nix b/nixpkgs/pkgs/data/documentation/rnrs/common.nix index 3443846c83cc..7ba5fe074500 100644 --- a/nixpkgs/pkgs/data/documentation/rnrs/common.nix +++ b/nixpkgs/pkgs/data/documentation/rnrs/common.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { buildInputs = [ texinfo ]; - # Tell the builder about the name of the report. + # Tell the builder about the name of the report. reportName = name; builder = ./builder.sh; diff --git a/nixpkgs/pkgs/data/documentation/scheme-manpages/default.nix b/nixpkgs/pkgs/data/documentation/scheme-manpages/default.nix index 345fb99b7bb4..2915430d9f24 100644 --- a/nixpkgs/pkgs/data/documentation/scheme-manpages/default.nix +++ b/nixpkgs/pkgs/data/documentation/scheme-manpages/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "scheme-manpages-unstable"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp -r man3/ man7/ $out/share/man/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Unix manual pages for R6RS and R7RS"; homepage = "https://github.com/schemedoc/manpages"; license = licenses.mit; diff --git a/nixpkgs/pkgs/data/documentation/stdman/default.nix b/nixpkgs/pkgs/data/documentation/stdman/default.nix index de50f6128616..9308c538d355 100644 --- a/nixpkgs/pkgs/data/documentation/stdman/default.nix +++ b/nixpkgs/pkgs/data/documentation/stdman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, curl, fetchFromGitHub }: +{ lib, stdenv, curl, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "stdman"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Formatted C++17 stdlib man pages (cppreference)"; longDescription = "stdman is a tool that parses archived HTML files from cppreference and generates groff-formatted manual diff --git a/nixpkgs/pkgs/data/documentation/zeal/default.nix b/nixpkgs/pkgs/data/documentation/zeal/default.nix index 4551dc211792..a6c0b1f49185 100644 --- a/nixpkgs/pkgs/data/documentation/zeal/default.nix +++ b/nixpkgs/pkgs/data/documentation/zeal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, extra-cmake-modules, pkg-config , qtbase, qtimageformats, qtwebengine, qtx11extras, mkDerivation , libarchive, libXdmcp, libpthreadstubs, xcbutilkeysyms }: @@ -22,7 +22,7 @@ mkDerivation rec { -e 's@^project.*@project(Zeal VERSION ${version})@' ''; - nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ]; + nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ]; buildInputs = [ qtbase qtimageformats qtwebengine qtx11extras @@ -30,7 +30,7 @@ mkDerivation rec { libXdmcp libpthreadstubs xcbutilkeysyms ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple offline API documentation browser"; longDescription = '' Zeal is a simple offline API documentation browser inspired by Dash (macOS diff --git a/nixpkgs/pkgs/data/fonts/3270font/default.nix b/nixpkgs/pkgs/data/fonts/3270font/default.nix index a972bd7c3d8b..dacfdfbcceae 100644 --- a/nixpkgs/pkgs/data/fonts/3270font/default.nix +++ b/nixpkgs/pkgs/data/fonts/3270font/default.nix @@ -1,24 +1,25 @@ { lib, fetchzip }: let - version = "2.1.0"; + version = "2.2.1"; in fetchzip { name = "3270font-${version}"; - url = "https://github.com/rbanffy/3270font/releases/download/v.${version}/3270_fonts_fba25eb.zip"; + url = "https://github.com/rbanffy/3270font/releases/download/v${version}/3270_fonts_70de9c7.zip"; - sha256 = "04xqgiznd6d3c1rdbbdmd87rjy9bnhh00lm8xzmal1zidcr2g0n9"; + sha256 = "0spz9abp87r3bncjim6hs47fmhg86qbgips4x6nfpqzg5qh2xd2m"; postFetch = '' mkdir -p $out/share/fonts/ unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.woff -d $out/share/fonts/woff + unzip -j $downloadedFile \*.afm -d $out/share/fonts/type1 ''; meta = with lib; { description = "Monospaced font based on IBM 3270 terminals"; homepage = "https://github.com/rbanffy/3270font"; + changelog = "https://github.com/rbanffy/3270font/blob/v${version}/CHANGELOG.md"; license = [ licenses.bsd3 licenses.ofl ]; maintainers = [ maintainers.marsam ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/data/fonts/alegreya-sans/default.nix b/nixpkgs/pkgs/data/fonts/alegreya-sans/default.nix index 479843341654..cc0cd6cac9b9 100644 --- a/nixpkgs/pkgs/data/fonts/alegreya-sans/default.nix +++ b/nixpkgs/pkgs/data/fonts/alegreya-sans/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "alegreya-sans"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { install -D -m 444 fonts/webfonts/*.woff2 -t $out/share/fonts/woff2 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Humanist sans serif family with a calligraphic feeling"; longDescription = '' Alegreya Sans is a humanist sans serif family with a calligraphic feeling that conveys a dynamic and varied rhythm. This gives a pleasant feeling to readers of long texts. diff --git a/nixpkgs/pkgs/data/fonts/alegreya/default.nix b/nixpkgs/pkgs/data/fonts/alegreya/default.nix index 99a7131dc11a..b2ec1de0cc89 100644 --- a/nixpkgs/pkgs/data/fonts/alegreya/default.nix +++ b/nixpkgs/pkgs/data/fonts/alegreya/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "alegreya"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { install -D -m 444 fonts/webfonts/*.woff2 -t $out/share/fonts/woff2 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An elegant and versatile font family for comfortable reading"; longDescription = '' Alegreya is a typeface originally intended for literature. Among its crowning characteristics, it conveys a dynamic and varied rhythm which facilitates the reading of long texts. Also, it provides freshness to the page while referring to the calligraphic letter, not as a literal interpretation, but rather in a contemporary typographic language. diff --git a/nixpkgs/pkgs/data/fonts/cantarell-fonts/default.nix b/nixpkgs/pkgs/data/fonts/cantarell-fonts/default.nix index 4c3459d0f114..5129cf271886 100644 --- a/nixpkgs/pkgs/data/fonts/cantarell-fonts/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/data/fonts/cherry/default.nix b/nixpkgs/pkgs/data/fonts/cherry/default.nix index a69aa3684ab4..53d9149091e8 100644 --- a/nixpkgs/pkgs/data/fonts/cherry/default.nix +++ b/nixpkgs/pkgs/data/fonts/cherry/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fonttosfnt, mkfontdir }: +{ lib, stdenv, fetchFromGitHub, fonttosfnt, mkfontdir }: stdenv.mkDerivation rec { pname = "cherry"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { mkfontdir $out/share/fonts/misc ''; - meta = with stdenv.lib; { + meta = with lib; { description = "cherry font"; homepage = "https://github.com/turquoise-hexagon/cherry"; license = licenses.mit; diff --git a/nixpkgs/pkgs/data/fonts/clearlyU/default.nix b/nixpkgs/pkgs/data/fonts/clearlyU/default.nix index 84cf3ebc538d..5c97d3b71344 100644 --- a/nixpkgs/pkgs/data/fonts/clearlyU/default.nix +++ b/nixpkgs/pkgs/data/fonts/clearlyU/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fonttosfnt, mkfontscale, libfaketime }: +{ lib, stdenv, fetchurl, fonttosfnt, mkfontscale, libfaketime }: stdenv.mkDerivation rec { pname = "clearlyU"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { mkfontdir "$fontDir" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Unicode font"; license = licenses.mit; maintainers = [ maintainers.raskin ]; diff --git a/nixpkgs/pkgs/data/fonts/comic-neue/default.nix b/nixpkgs/pkgs/data/fonts/comic-neue/default.nix index 13a40b8c0a06..df618aea8110 100644 --- a/nixpkgs/pkgs/data/fonts/comic-neue/default.nix +++ b/nixpkgs/pkgs/data/fonts/comic-neue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: stdenv.mkDerivation rec { pname = "comic-neue"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cp -v ${pname}-${version}/WebFonts/*.woff2 $out/share/fonts/WOFF2 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://comicneue.com/"; description = "A casual type face: Make your lemonade stand look like a fortune 500 company"; longDescription = '' diff --git a/nixpkgs/pkgs/data/fonts/corefonts/default.nix b/nixpkgs/pkgs/data/fonts/corefonts/default.nix index ed28f6b5e6ce..c37d3251a9dc 100644 --- a/nixpkgs/pkgs/data/fonts/corefonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/corefonts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cabextract }: +{ lib, stdenv, fetchurl, cabextract }: let @@ -61,7 +61,7 @@ stdenv.mkDerivation { outputHashMode = "recursive"; outputHash = "089d2m9bvaacj36qdq77pcazji0sbbr796shic3k52cpxkjnzbwh"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://corefonts.sourceforge.net/"; description = "Microsoft's TrueType core fonts for the Web"; platforms = platforms.all; diff --git a/nixpkgs/pkgs/data/fonts/creep/default.nix b/nixpkgs/pkgs/data/fonts/creep/default.nix index 7c7ad4d5aa91..d4748544af55 100644 --- a/nixpkgs/pkgs/data/fonts/creep/default.nix +++ b/nixpkgs/pkgs/data/fonts/creep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libfaketime +{ lib, stdenv, fetchFromGitHub, libfaketime , fonttosfnt, mkfontscale }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { mkfontdir "$out/share/fonts/misc" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A pretty sweet 4px wide pixel font"; homepage = "https://github.com/romeovs/creep"; license = licenses.mit; diff --git a/nixpkgs/pkgs/data/fonts/dejavu-fonts/default.nix b/nixpkgs/pkgs/data/fonts/dejavu-fonts/default.nix index 839cb80a6b99..aed90b103b4e 100644 --- a/nixpkgs/pkgs/data/fonts/dejavu-fonts/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/data/fonts/dina/default.nix b/nixpkgs/pkgs/data/fonts/dina/default.nix index 1a8ac344a531..2a770222ed10 100644 --- a/nixpkgs/pkgs/data/fonts/dina/default.nix +++ b/nixpkgs/pkgs/data/fonts/dina/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip +{ lib, stdenv, fetchurl, unzip , bdftopcf, mkfontscale, fontforge }: @@ -49,7 +49,7 @@ stdenv.mkDerivation { outputs = [ "out" "bdf" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A monospace bitmap font aimed at programmers"; longDescription = '' Dina is a monospace bitmap font, primarily aimed at programmers. It is diff --git a/nixpkgs/pkgs/data/fonts/emojione/default.nix b/nixpkgs/pkgs/data/fonts/emojione/default.nix index d5b9b29dd85d..629e46fe7971 100644 --- a/nixpkgs/pkgs/data/fonts/emojione/default.nix +++ b/nixpkgs/pkgs/data/fonts/emojione/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, inkscape, imagemagick, potrace, svgo, scfbuild }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, inkscape, imagemagick, potrace, svgo, scfbuild }: stdenv.mkDerivation rec { pname = "emojione"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { install -Dm755 build/EmojiOneColor-SVGinOT.ttf $out/share/fonts/truetype/EmojiOneColor-SVGinOT.ttf ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Open source emoji set"; homepage = "http://emojione.com/"; license = licenses.cc-by-40; diff --git a/nixpkgs/pkgs/data/fonts/envypn-font/default.nix b/nixpkgs/pkgs/data/fonts/envypn-font/default.nix index 0d69b812c4cd..dbfb85f881fc 100644 --- a/nixpkgs/pkgs/data/fonts/envypn-font/default.nix +++ b/nixpkgs/pkgs/data/fonts/envypn-font/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libfaketime +{ lib, stdenv, fetchurl, libfaketime , fonttosfnt, mkfontscale }: @@ -29,7 +29,7 @@ stdenv.mkDerivation { mkfontdir "$out/share/fonts/misc" ''; - meta = with stdenv.lib; { + meta = with lib; { description = '' Readable bitmap font inspired by Envy Code R ''; diff --git a/nixpkgs/pkgs/data/fonts/et-book/default.nix b/nixpkgs/pkgs/data/fonts/et-book/default.nix index 58586ba7db65..e7d97b777076 100644 --- a/nixpkgs/pkgs/data/fonts/et-book/default.nix +++ b/nixpkgs/pkgs/data/fonts/et-book/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: fetchFromGitHub rec { rev = "7e8f02dadcc23ba42b491b39e5bdf16e7b383031"; @@ -13,7 +13,7 @@ fetchFromGitHub rec { cp -t $out/share/fonts/truetype et-book-${rev}/source/4-ttf/*.ttf ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The typeface used in Edward Tufte’s books."; license = licenses.mit; platforms = platforms.all; diff --git a/nixpkgs/pkgs/data/fonts/fira-code/default.nix b/nixpkgs/pkgs/data/fonts/fira-code/default.nix index 4f0fb1e81c16..546c7d905a7b 100644 --- a/nixpkgs/pkgs/data/fonts/fira-code/default.nix +++ b/nixpkgs/pkgs/data/fonts/fira-code/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: let version = "5.2"; @@ -7,14 +7,15 @@ in fetchzip { url = "https://github.com/tonsky/FiraCode/releases/download/${version}/Fira_Code_v${version}.zip"; + # only extract the variable font because everything else is a duplicate postFetch = '' mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile '*-VF.ttf' -d $out/share/fonts/truetype ''; - sha256 = "16v62wj872ba4w7qxn4l6zjgqh7lrpwh1xax1bp1x9dpz08mnq06"; + sha256 = "1wbfjgvr9m5azl5w49y0hpqzgcraw6spd1wnxgxlzfx57x6gcw0k"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/tonsky/FiraCode"; description = "Monospace font with programming ligatures"; longDescription = '' diff --git a/nixpkgs/pkgs/data/fonts/fira-code/symbols.nix b/nixpkgs/pkgs/data/fonts/fira-code/symbols.nix index 624616bdd580..2e4cfc8f05b6 100644 --- a/nixpkgs/pkgs/data/fonts/fira-code/symbols.nix +++ b/nixpkgs/pkgs/data/fonts/fira-code/symbols.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: fetchzip { name = "fira-code-symbols-20160811"; @@ -12,7 +12,7 @@ fetchzip { sha256 = "19krsp22rin74ix0i19v4bh1c965g18xkmz1n55h6n6qimisnbkm"; - meta = with stdenv.lib; { + meta = with lib; { description = "FiraCode unicode ligature glyphs in private use area"; longDescription = '' FiraCode uses ligatures, which some editors don’t support. diff --git a/nixpkgs/pkgs/data/fonts/fira-mono/default.nix b/nixpkgs/pkgs/data/fonts/fira-mono/default.nix index d29d6304cee1..37f285b55527 100644 --- a/nixpkgs/pkgs/data/fonts/fira-mono/default.nix +++ b/nixpkgs/pkgs/data/fonts/fira-mono/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: fetchzip { name = "fira-mono-3.206"; @@ -12,7 +12,7 @@ fetchzip { sha256 = "1ci3fxhdwabvfj4nl16pwcgqnh7s2slp8vblribk8zkpx8cbp1dj"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://mozilla.github.io/Fira/"; description = "Monospace font for Firefox OS"; longDescription = '' diff --git a/nixpkgs/pkgs/data/fonts/fixedsys-excelsior/default.nix b/nixpkgs/pkgs/data/fonts/fixedsys-excelsior/default.nix index 4222b802d55c..e55ae0bcf11b 100644 --- a/nixpkgs/pkgs/data/fonts/fixedsys-excelsior/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/data/fonts/go-font/default.nix b/nixpkgs/pkgs/data/fonts/go-font/default.nix index e887f0ffef12..056cd621394f 100644 --- a/nixpkgs/pkgs/data/fonts/go-font/default.nix +++ b/nixpkgs/pkgs/data/fonts/go-font/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit }: +{ lib, stdenv, fetchgit }: let version = "2017-03-30"; @@ -17,12 +17,12 @@ in (fetchgit { sha256 = "1488426ya2nzmwjas947fx9h5wzxrp9wasn8nkjqf0y0mpd4f1xz"; }) // { - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://blog.golang.org/go-fonts"; 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/nixpkgs/pkgs/data/fonts/gohufont/default.nix b/nixpkgs/pkgs/data/fonts/gohufont/default.nix index ac82c82ae3df..f28e3d5ba619 100644 --- a/nixpkgs/pkgs/data/fonts/gohufont/default.nix +++ b/nixpkgs/pkgs/data/fonts/gohufont/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub +{ lib, stdenv, fetchurl, fetchFromGitHub , mkfontscale, bdf2psf, bdftopcf , fonttosfnt, libfaketime }: @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { mkfontdir "$fontDir" ''; - meta = with stdenv.lib; { + meta = with lib; { description = '' A monospace bitmap font well suited for programming and terminal use ''; diff --git a/nixpkgs/pkgs/data/fonts/google-fonts/default.nix b/nixpkgs/pkgs/data/fonts/google-fonts/default.nix index 153f37c88e0a..0fac2a67bb8a 100644 --- a/nixpkgs/pkgs/data/fonts/google-fonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/google-fonts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "google-fonts"; @@ -48,7 +48,7 @@ stdenv.mkDerivation { find . -name '*.ttf' -exec install -m 444 -Dt $dest '{}' + ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://fonts.google.com"; description = "Font files available from Google Fonts"; license = with licenses; [ asl20 ofl ufl ]; diff --git a/nixpkgs/pkgs/data/fonts/gubbi/default.nix b/nixpkgs/pkgs/data/fonts/gubbi/default.nix index 2d1c520e6103..9ae46d089925 100644 --- a/nixpkgs/pkgs/data/fonts/gubbi/default.nix +++ b/nixpkgs/pkgs/data/fonts/gubbi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fontforge }: +{ lib, stdenv, fetchFromGitHub, fontforge }: stdenv.mkDerivation rec { pname = "gubbi-font"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { installPhase = "install -Dm444 -t $out/share/fonts/truetype/ Gubbi.ttf"; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "A Kannada font"; license = licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/data/fonts/inconsolata/default.nix b/nixpkgs/pkgs/data/fonts/inconsolata/default.nix index 10568073e4b2..f064b4f61923 100644 --- a/nixpkgs/pkgs/data/fonts/inconsolata/default.nix +++ b/nixpkgs/pkgs/data/fonts/inconsolata/default.nix @@ -1,4 +1,4 @@ -{ stdenv, google-fonts }: +{ lib, stdenv, google-fonts }: stdenv.mkDerivation { pname = "inconsolata"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { install -m644 --target $out/share/fonts/truetype/inconsolata -D $src/ofl/inconsolata/*.ttf ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.levien.com/type/myfonts/inconsolata.html"; description = "A monospace font for both screen and print"; maintainers = with maintainers; [ mikoim raskin rycee ]; diff --git a/nixpkgs/pkgs/data/fonts/inconsolata/lgc.nix b/nixpkgs/pkgs/data/fonts/inconsolata/lgc.nix index e69e6e02a22f..945fafcfcc52 100644 --- a/nixpkgs/pkgs/data/fonts/inconsolata/lgc.nix +++ b/nixpkgs/pkgs/data/fonts/inconsolata/lgc.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, fontforge}: +{lib, stdenv, fetchFromGitHub, fontforge}: stdenv.mkDerivation rec { pname = "inconsolata-lgc"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { install -m444 -Dt $out/share/doc/${pname}-${version} LICENSE README ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Fork of Inconsolata font, with proper support of Cyrillic and Greek"; longDescription = '' Inconsolata is one of the most suitable font for programmers created by Raph diff --git a/nixpkgs/pkgs/data/fonts/input-fonts/default.nix b/nixpkgs/pkgs/data/fonts/input-fonts/default.nix index 2db7e259a352..9956325e15bc 100644 --- a/nixpkgs/pkgs/data/fonts/input-fonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/input-fonts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, unzip }: +{ lib, stdenv, requireFile, unzip }: stdenv.mkDerivation { pname = "input-fonts"; @@ -27,7 +27,7 @@ stdenv.mkDerivation { outputHashMode = "recursive"; outputHash = "15sdhqqqd4jgk80fw7ncx49avi9cxbdgyrvnrfya0066x4q4r6lv"; - meta = with stdenv.lib; { + meta = with lib; { description = "Fonts for Code, from Font Bureau"; longDescription = '' Input is a font family designed for computer programming, data, diff --git a/nixpkgs/pkgs/data/fonts/iosevka/bin.nix b/nixpkgs/pkgs/data/fonts/iosevka/bin.nix index fbae89bcf013..f3bd8dab013c 100644 --- a/nixpkgs/pkgs/data/fonts/iosevka/bin.nix +++ b/nixpkgs/pkgs/data/fonts/iosevka/bin.nix @@ -10,7 +10,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "4.2.0"; + version = "4.4.0"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/nixpkgs/pkgs/data/fonts/iosevka/default.nix b/nixpkgs/pkgs/data/fonts/iosevka/default.nix index 989c2d39c19e..0d998a4863ab 100644 --- a/nixpkgs/pkgs/data/fonts/iosevka/default.nix +++ b/nixpkgs/pkgs/data/fonts/iosevka/default.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { updateScript = ./update-default.sh; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://be5invis.github.io/Iosevka"; downloadPage = "https://github.com/be5invis/Iosevka/releases"; description = '' diff --git a/nixpkgs/pkgs/data/fonts/iosevka/variants.nix b/nixpkgs/pkgs/data/fonts/iosevka/variants.nix index 5cb0b53114d1..6b6cd00f49ab 100644 --- a/nixpkgs/pkgs/data/fonts/iosevka/variants.nix +++ b/nixpkgs/pkgs/data/fonts/iosevka/variants.nix @@ -1,24 +1,24 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "1s9nyq8gjmmah5rpflffl0wi0klnlsvzmy7b39vnpp2sp6ng9mv3"; - iosevka-aile = "0x2ccjnmi9hqms5jkfnkn30y9gd3adiwjvn9gzq8d6a563h61fik"; - iosevka-curly = "03n0f9nzjywb5q3w59ck5sq500ks5xxlgf9dpncr3c7i2dawss41"; - iosevka-curly-slab = "09qnd2vzl4v59c0d534mj06zxwa3rdwrhkwy191v6p79lfxp482x"; - iosevka-etoile = "0j3ah72dmk7fzcln9755y3xnzn7343lfrg95kb3xmqm2zyg0mbrw"; - iosevka-slab = "0prnm3nh8rgn6jivfj2fw7x12m8qqam8xnl45ip5ck4348piypx3"; - iosevka-sparkle = "1y180rwrxrvwd98hk1d07y0vs8h5rj7ipkhsqlv60h82pigxhl4a"; - iosevka-ss01 = "04q9vby5q9ylvv2myl3h2xfyq3s594wnwj0b956pivwwamhp0g3v"; - iosevka-ss02 = "14d5i88ls8zfbis5s7z95dcrpxqyqr2wzx90c5a4xpcdjd4n7fgg"; - iosevka-ss03 = "1zqqq11rcjmifc4qf5p2xcqhqp5ca2pgvzv8xirr6mq4knrvxrpq"; - iosevka-ss04 = "1xnnqyvyrz820dzfyjj84v3j1q8krykmwxw5xml4v7kk79agc7vk"; - iosevka-ss05 = "07w78jw23hxwzx65ampwzv691p12n0pvk8vnw2mnnspflirpm62r"; - iosevka-ss06 = "11brqklhk3sfhqyavyi5rggsn3286n404gphmh0frz65wj3k8lc6"; - iosevka-ss07 = "037vaxpgdpa6p9nmqcsa1mi7pn94300cd71kbr9lw8mql9wc2y9n"; - iosevka-ss08 = "0ga1bwb2d1rizr0910bcqabcj819dcd0bxp7cwbxnzq6i7ca4hj1"; - iosevka-ss09 = "1khjhn0lfpk8g1yx3558w6kkj0pd5b7kxbf0z97w1nvah3d5v50m"; - iosevka-ss10 = "0zp5173799vacssj0lsj3ck82b03qyk9cyfwa3j7xa2dhplrjfp2"; - iosevka-ss11 = "124a3i7iy9z7adxcb8yw3795gk52cw7ngsim8qjhrhcd2bjr0jvg"; - iosevka-ss12 = "1rd61ry3ihw311c926wjl9sc71bz0ligya07m7km1905dhlhirsv"; - iosevka-ss13 = "0jm3djc4rlzk22jn3syv4mwd0fz82z4lnyk3dkq815yyw6vmqkz0"; - iosevka-ss14 = "1a9a1bvzsbprmxfh19m78s82rfmxng4sambz6m4gd9mm14kjjp5r"; + iosevka = "0qkxqdx3vs53djiibc4ib3qj61fygxvxfcvs7yi08vdhd9qbxhjg"; + iosevka-aile = "053f6b1z0w1089y608k4wmspgljn9lyzyggq168k0110z9vlfjhf"; + iosevka-curly = "04kc7f6gqqxbdkdh1k4z4b28f8pj09npb87fx4zr41wkzkxmavcf"; + iosevka-curly-slab = "1pdm2g3a1nfc8w53r3sdifwypj3diil16jy6sgvgpmk7klf804vf"; + iosevka-etoile = "10vw53cd317qxhvws11zf98756vfn836assw3rbns6zpfrj7a2xg"; + iosevka-slab = "01ynv6b7fqdd98imfr14xcgrhp20yffa3n738iz5qnr75vqpnfdc"; + iosevka-sparkle = "1nw63dd1ccj8cp1x06alfxdvdlw9ibin41llmc0jla0nz7n8vsp3"; + iosevka-ss01 = "0g54rghx6z0a9azckvgh7njq12rsr1zzskgrm3f29rin8fdwvvd9"; + iosevka-ss02 = "0jhl75bwd76vp9hpvqgj7awpvibv4pk5vjab97n53b4bdxdxh1rf"; + iosevka-ss03 = "1ki5q7gafgm2iayjn82wrnwkfb3nbcr2xsrgs2vsw5lm9plawbmd"; + iosevka-ss04 = "03933skk5zqxrkj5m0j90cxrv4fmjfbp7ai5fywmhjzq92xbcr97"; + iosevka-ss05 = "014dglqr17adyj2229vvzhz61jpkgj33ngkav5sh2dj5wcx6b137"; + iosevka-ss06 = "07z87rm0rb9n6d7h0kmp51dnnglmr0wbwmplc5mlv036fcrdibaj"; + iosevka-ss07 = "1672n5ynd5fv8dwnwg8aa50ny74ad9gbx2xlk2ixih7ajv15p19d"; + iosevka-ss08 = "1jqdqg6dzrnq6y0g7ls2ya3dh0j00xj2k41aajvdqw342n08h27k"; + iosevka-ss09 = "1p1v0byb2nh11k362zxjrbvzbbryh2wk76dsd1zwyjrlgqq6qa81"; + iosevka-ss10 = "12c940w8vy1hjhi7cxgqsb23ip60xw1ydzhx5cv4ycxmi5745wqq"; + iosevka-ss11 = "0s6fvh5pw119w872w4rvamiwssryx4a98c7fhr737nzgiqy4iyz5"; + iosevka-ss12 = "14gjqmn807cv3dbvkm2i6dz6if46fbrkr8ls5shwalnl8qj3d06c"; + iosevka-ss13 = "1qd04cani9jzp1hjs8g6b42bmxvjyyxdha122816s0rg9i46mpcc"; + iosevka-ss14 = "0q109ahk7ww66brxgldgmr61m2qzpyhi1q21591wg1br5cn2d52w"; } diff --git a/nixpkgs/pkgs/data/fonts/jost/default.nix b/nixpkgs/pkgs/data/fonts/jost/default.nix index fc06a7e98438..a8df441d9990 100644 --- a/nixpkgs/pkgs/data/fonts/jost/default.nix +++ b/nixpkgs/pkgs/data/fonts/jost/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchzip}: +{lib, stdenv, fetchzip}: let version = "3.5"; @@ -13,7 +13,7 @@ in fetchzip { sha256="0l78vhmbsyfmrva5wc76pskhxqryyg8q5xddpj9g5wqsddy525dq"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/indestructible-type/Jost"; description = "A sans serif font by Indestructible Type"; license = licenses.ofl; diff --git a/nixpkgs/pkgs/data/fonts/joypixels/default.nix b/nixpkgs/pkgs/data/fonts/joypixels/default.nix index c19a55400fcb..d7442b345217 100644 --- a/nixpkgs/pkgs/data/fonts/joypixels/default.nix +++ b/nixpkgs/pkgs/data/fonts/joypixels/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , config , acceptLicense ? config.joypixels.acceptLicense or false @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The finest emoji you can use legally (formerly EmojiOne)"; longDescription = '' New for 2020! JoyPixels 6.0 includes 3,342 originally crafted icon diff --git a/nixpkgs/pkgs/data/fonts/kanji-stroke-order-font/default.nix b/nixpkgs/pkgs/data/fonts/kanji-stroke-order-font/default.nix index 7b8444c3cde7..80c97024ac36 100644 --- a/nixpkgs/pkgs/data/fonts/kanji-stroke-order-font/default.nix +++ b/nixpkgs/pkgs/data/fonts/kanji-stroke-order-font/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let version = "4.003"; @@ -17,7 +17,7 @@ in stdenv.mkDerivation { cp *.txt $out/share/doc/kanji-stroke-order ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Font containing stroke order diagrams for over 6500 kanji, 180 kana and other characters"; homepage = "https://sites.google.com/site/nihilistorguk/"; diff --git a/nixpkgs/pkgs/data/fonts/kochi-substitute/default.nix b/nixpkgs/pkgs/data/fonts/kochi-substitute/default.nix index cf89a8fcb8f1..071db9b13dfb 100644 --- a/nixpkgs/pkgs/data/fonts/kochi-substitute/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/data/fonts/league-of-moveable-type/default.nix b/nixpkgs/pkgs/data/fonts/league-of-moveable-type/default.nix index 9a80b9a43df8..f6855dc99d66 100644 --- a/nixpkgs/pkgs/data/fonts/league-of-moveable-type/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/data/fonts/liberation-fonts/default.nix b/nixpkgs/pkgs/data/fonts/liberation-fonts/default.nix index edc39ff0a40e..04ee3781b6bb 100644 --- a/nixpkgs/pkgs/data/fonts/liberation-fonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/liberation-fonts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fontforge, python3 }: +{ lib, stdenv, fetchFromGitHub, fontforge, python3 }: let inherit (python3.pkgs) fonttools; @@ -27,7 +27,7 @@ let install -m444 -Dt $out/share/doc/${pname}-${version} README || true ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Liberation Fonts, replacements for Times New Roman, Arial, and Courier New"; longDescription = '' The Liberation Fonts are intended to be replacements for the three most diff --git a/nixpkgs/pkgs/data/fonts/liberation-sans-narrow/default.nix b/nixpkgs/pkgs/data/fonts/liberation-sans-narrow/default.nix index 373704f25f53..281bfa4c42b0 100644 --- a/nixpkgs/pkgs/data/fonts/liberation-sans-narrow/default.nix +++ b/nixpkgs/pkgs/data/fonts/liberation-sans-narrow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fontforge, python3Packages, python3 }: +{ lib, stdenv, fetchFromGitHub, fontforge, python3Packages, python3 }: stdenv.mkDerivation rec { pname = "liberation-sans-narrow"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { install -m444 -Dt $out/doc/${pname}-${version} AUTHORS ChangeLog COPYING License.txt README.rst ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Liberation Sans Narrow Font Family is a replacement for Arial Narrow"; longDescription = '' Liberation Sans Narrow is a font originally created by Ascender diff --git a/nixpkgs/pkgs/data/fonts/libertine/default.nix b/nixpkgs/pkgs/data/fonts/libertine/default.nix index bd47998b924f..2120c5965e2f 100644 --- a/nixpkgs/pkgs/data/fonts/libertine/default.nix +++ b/nixpkgs/pkgs/data/fonts/libertine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fontforge }: +{ lib, stdenv, fetchurl, fontforge }: stdenv.mkDerivation { name = "linux-libertine-5.3.0"; @@ -38,7 +38,7 @@ stdenv.mkDerivation { install -m444 -Dt $out/share/texmf/fonts/map *.map ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Linux Libertine Fonts"; homepage = "http://linuxlibertine.sf.net"; maintainers = [ maintainers.volth ]; diff --git a/nixpkgs/pkgs/data/fonts/libre-caslon/default.nix b/nixpkgs/pkgs/data/fonts/libre-caslon/default.nix index 1b5e5b1be690..d89d4c41c0f3 100644 --- a/nixpkgs/pkgs/data/fonts/libre-caslon/default.nix +++ b/nixpkgs/pkgs/data/fonts/libre-caslon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "libre-caslon"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHash = "05aajwny99yqzn1nnq1blx6h7rl54x056y12hyawfbigkzxhscns"; - meta = with stdenv.lib; { + meta = with lib; { description = "Caslon fonts based on hand-lettered American Caslons of 1960s"; homepage = "http://www.impallari.com/librecaslon"; license = licenses.ofl; diff --git a/nixpkgs/pkgs/data/fonts/lobster-two/default.nix b/nixpkgs/pkgs/data/fonts/lobster-two/default.nix index d5a46b43fb49..fb1595fe2fc7 100644 --- a/nixpkgs/pkgs/data/fonts/lobster-two/default.nix +++ b/nixpkgs/pkgs/data/fonts/lobster-two/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: let @@ -69,7 +69,7 @@ in outputHashMode = "recursive"; outputHash = "0if9l8pzwgfnbdjg5yblcy08dwn9yj3wzz29l0fycia46xlzd4ym"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/librefonts/lobstertwo"; description = "Script font with many ligatures"; license = licenses.ofl; diff --git a/nixpkgs/pkgs/data/fonts/meslo-lg/default.nix b/nixpkgs/pkgs/data/fonts/meslo-lg/default.nix index 2837e488389b..7083b9e00313 100644 --- a/nixpkgs/pkgs/data/fonts/meslo-lg/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/data/fonts/meslo-lgs-nf/default.nix b/nixpkgs/pkgs/data/fonts/meslo-lgs-nf/default.nix index 36ce33cd7d2d..305bd69f2dae 100644 --- a/nixpkgs/pkgs/data/fonts/meslo-lgs-nf/default.nix +++ b/nixpkgs/pkgs/data/fonts/meslo-lgs-nf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "meslo-lgs-nf"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp $src/*.ttf $out/share/fonts/truetype ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Meslo Nerd Font patched for Powerlevel10k"; homepage = "https://github.com/romkatv/powerlevel10k-media"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/data/fonts/migmix/default.nix b/nixpkgs/pkgs/data/fonts/migmix/default.nix index 1b3313d4e026..bcc0666f035d 100644 --- a/nixpkgs/pkgs/data/fonts/migmix/default.nix +++ b/nixpkgs/pkgs/data/fonts/migmix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: stdenv.mkDerivation rec { pname = "migmix"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHash = "1fhh8wg6lxwrnsg9rl4ihffl0bsp1wqa5gps9fx60kr6j9wpvmbg"; - meta = with stdenv.lib; { + meta = with lib; { description = "A high-quality Japanese font based on M+ fonts and IPA fonts"; homepage = "http://mix-mplus-ipa.osdn.jp/migmix"; license = licenses.ipa; diff --git a/nixpkgs/pkgs/data/fonts/migu/default.nix b/nixpkgs/pkgs/data/fonts/migu/default.nix index 530fd4f543f2..09992ef5ec8c 100644 --- a/nixpkgs/pkgs/data/fonts/migu/default.nix +++ b/nixpkgs/pkgs/data/fonts/migu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: stdenv.mkDerivation rec { pname = "migu"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHash = "0nbpn21cxdd6gsgr3fadzjsnz84f2swpf81wmscmjgvd56ngndzh"; - meta = with stdenv.lib; { + meta = with lib; { description = "A high-quality Japanese font based on modified M+ fonts and IPA fonts"; homepage = "http://mix-mplus-ipa.osdn.jp/migu/"; license = licenses.ipa; diff --git a/nixpkgs/pkgs/data/fonts/mno16/default.nix b/nixpkgs/pkgs/data/fonts/mno16/default.nix index 1b311d2c25a2..eeb53904fe11 100644 --- a/nixpkgs/pkgs/data/fonts/mno16/default.nix +++ b/nixpkgs/pkgs/data/fonts/mno16/default.nix @@ -15,7 +15,7 @@ in fetchzip rec { meta = with lib; { description = "minimalist monospaced font"; - homepage = "https://sev.dev/fonts/mno16"; + homepage = "https://sev.dev/fonts/mno16"; license = licenses.cc0; }; } diff --git a/nixpkgs/pkgs/data/fonts/monoid/default.nix b/nixpkgs/pkgs/data/fonts/monoid/default.nix index 48dc121af459..77ef87152acf 100644 --- a/nixpkgs/pkgs/data/fonts/monoid/default.nix +++ b/nixpkgs/pkgs/data/fonts/monoid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, python3 }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, python3 }: stdenv.mkDerivation { pname = "monoid"; @@ -39,7 +39,7 @@ stdenv.mkDerivation { install -m444 -Dt $out/share/doc Readme.md ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://larsenwork.com/monoid"; description = "Customisable coding font with alternates, ligatures and contextual positioning"; license = [ licenses.ofl licenses.mit ]; diff --git a/nixpkgs/pkgs/data/fonts/nafees/default.nix b/nixpkgs/pkgs/data/fonts/nafees/default.nix index 11e1ccb56451..e23528aefe80 100644 --- a/nixpkgs/pkgs/data/fonts/nafees/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/data/fonts/navilu/default.nix b/nixpkgs/pkgs/data/fonts/navilu/default.nix index 0433ad22de53..afd9f85741c3 100644 --- a/nixpkgs/pkgs/data/fonts/navilu/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/data/fonts/nerdfonts/default.nix b/nixpkgs/pkgs/data/fonts/nerdfonts/default.nix index bf98effb1508..ceb0cb8b03af 100644 --- a/nixpkgs/pkgs/data/fonts/nerdfonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/nerdfonts/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ''} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Iconic font aggregator, collection, & patcher. 3,600+ icons, 50+ patched fonts"; longDescription = '' Nerd Fonts is a project that attempts to patch as many developer targeted diff --git a/nixpkgs/pkgs/data/fonts/nerdfonts/shas.nix b/nixpkgs/pkgs/data/fonts/nerdfonts/shas.nix index e360dd042b12..4194e57532dc 100644 --- a/nixpkgs/pkgs/data/fonts/nerdfonts/shas.nix +++ b/nixpkgs/pkgs/data/fonts/nerdfonts/shas.nix @@ -1,52 +1,52 @@ { - "3270" = "1k71zsijasn6013c58pgf52xw3h9gkqdjlsa177wlldz8qxb16xk"; - "Agave" = "0jgm31wvmckb71qc9l0nj3sg4zq2vw67piaxr6h8zkakcl2mysha"; - "AnonymousPro" = "0s3n8rrr9kfqd8gxjxksp7p8bc3q7qhcrpyq8090dksvmbcks6xm"; - "Arimo" = "1k7ldfx6dmy9sigzsvi9qwms510nddw634g8xrn0vwnw6d7infk8"; - "AurulentSansMono" = "0q35948dai8qc7gfvas8sfn5s7b64b2y4f9psz6xslrv7nw8lcaz"; - "BigBlueTerminal" = "0ymw2m2xjsx77brm79aws26icwcf2a1d7q3p3ipsd25g4cgqcd2v"; - "BitstreamVeraSansMono" = "1n2298g1fn8jb1fbvw74289n7nnmjddn7zxh88gnl58pwz8ra5dk"; - "CascadiaCode" = "1q4l5a7b7ab6h1bs5pq734r9pp3fw9b59gdk1g4hyn2w61h0kdcj"; - "CodeNewRoman" = "1mgxawj3pblaxy0y9w0hzlfgipiskmc5p028m82zh1wyaplmh2pa"; - "Cousine" = "0jr0gxrsba3dhchp53vd67qq2pgfnvmvcwbv99l1700p539bcvy1"; - "DaddyTimeMono" = "1n6vwykz084fxgylayizxc210f4ms2ijfws5b2hvl2kqmy2q6jk4"; - "DejaVuSansMono" = "03qfrkzmhnn8dwgx4qhiigbz4dxs3957hydlr0j8vxl89j8c9g1z"; - "DroidSansMono" = "187cbcn4a2whrl8dag1ix6j1v3jgv5z2jdfw1w1z9llm1znvpp7z"; - "FantasqueSansMono" = "147h15k3ni0w6chxkrah2fk4klhdhq8y1d3nbx763h9ia3mnggv6"; - "FiraCode" = "1rx7zrkq0584k6hrh6dx30xrnz5nq379xyw73pfd4gxaxnh9mpi1"; - "FiraMono" = "0f2daidakhmbbd5ph6985rghjmr87k7xzmmmf9n851dxvfyndsgl"; - "Go-Mono" = "1bzh3pgyn87j27kw7x5h02rqzhh21pm6d0zhxd5iqi5qq5mj0nvm"; - "Gohu" = "1rlkprjg9nz1s69s4ancmxii6l907qachl116gngbj8gjv3g1x21"; - "Hack" = "052mav170lwxkgzg3hij4zvnmfwyrddn45gn07a33gpzzicjx1bh"; - "Hasklig" = "0vyb0z0m04pn8477d6a711vjwb3nhvpn5fxfwnz37av9jmz3i9vk"; - "HeavyData" = "065rhq7z52dp211inw3vszwc5zrd5s0w1kmgnrh68bxc0js0xqyb"; - "Hermit" = "1ij9pjr517jxk3dlsrzmnqivsfq5i5ai6pd8hznmrkb3360cn7sm"; - "iA-Writer" = "0clksrxw6xcv5c1pbd8rl2rc3r15iak1qv8v6bn0j2mccjcss64z"; - "IBMPlexMono" = "0xkfkpnkkrvjfiv624l7lpmfji107y7645w6ah47ijyg47yxkmsg"; - "Inconsolata" = "14gbwc0k3d1j496w6pv9kry1pglswzd0armsdb0g1mqgzfdf1ci1"; - "InconsolataGo" = "0c6yhx242d82dalyjas42qniy0jagqs47cfsfarwmzar6zg3lj5m"; - "InconsolataLGC" = "1746nl1rz4hscfgbmd8642wq3z1wizvfjb50y3yyjsc1ixc1f0pd"; - "Iosevka" = "1qqd4xh98vxb99rh2a2qv9gjclilhaw84pyqdpbx225qhvw9xlkb"; - "JetBrainsMono" = "1kc8fyk1aczxkmn8dzv1gy6xfi2jywgahd8np576v2dn8kx16844"; - "Lekton" = "0mny5j9bns9104wg2wmabdw0sl80c7i3dzp4j5mxh8jybx929d3i"; - "LiberationMono" = "19bpm893assmmnfvlvhz8df54c9pr2kfv2b6anlr4g64hliy1c1h"; - "Meslo" = "08zm8nqskhrqkw80wl460zbvsrvs5fp2njlcv867phpqna9hyqzh"; - "Monofur" = "0f5khqgdxi4g0qm5n48r1sk4pd2wlk987d8yxwks2mcsqa6fraqj"; - "Monoid" = "0m7i82jfiwqmi9lhv8lmq2n723ihn0isxi5559478qbdy5b104dd"; - "Mononoki" = "074avnvfl260pcrli4h5bc55yqr4mgd54paf80qcnh101qsz325w"; - "MPlus" = "03mrfhzfmmqjfl7fa81v1ih3fdr3q2k439w6pjbd2zvl806l92yq"; - "Noto" = "1jmycnf4fflijs730vbyj258kajkxv0j42655a7hvpapym7z940z"; - "OpenDyslexic" = "0ma62xg6cy8l4chfhqvm64zzhx3mrzdj6gxwnvx8plqy3j4dn3by"; - "Overpass" = "1xs2z3ch7dd32zb5l1axzd78hyskimqglcjcrb7n4ic85qm55xxm"; - "ProFont" = "0ck4rprj0w29pv3qm4n1zg6cdq76m3kaag0ka4q1qqcnhga67zr7"; - "ProggyClean" = "0sk3gk6zj61nbv94xv6z8y67sr5blg9n079d8srv7bbw9dv96i8g"; - "RobotoMono" = "1nhbr9zc0cz81pdj95rrb56bwdkmmbqmk429nf60j35pkcqmvk8x"; - "ShareTechMono" = "1h79myy0my3jyrvqcrgfdsjqrwwm5fdy2nmzp3ynyi769p7z1dwr"; - "SourceCodePro" = "06cnsdmm84kzjlwwcmhwpj7pyfqinqpmww1c13i21l611fg6hwd7"; - "SpaceMono" = "1xmmf2gdsa3ycl3pgpr3zr919qh702wjvc5k4hsdivvs2lzfdgmk"; - "Terminus" = "0g2ybs225fwxmvwfnanc32jc2lfnag3agmliv1vrb5mxyqzm53gj"; - "Tinos" = "077n4k6yh4qbirfkl02zqn3057kymspr10zcbfkf4ldvifa36pjd"; - "Ubuntu" = "1lzdrgb8vk5dwicxhvkgbain5phf88g3zgv5ya2ihh052xsl3qih"; - "UbuntuMono" = "0wa8ri7f3g8vwd194q812qh8nzplnmhl5ak0yhgilmm44s46ad0h"; - "VictorMono" = "18z92kwggfqwrd5m09yda55hcb4b159278lps6f9hr8icwki6v9q"; + "3270" = "1k71zsijasn6013c58pgf52xw3h9gkqdjlsa177wlldz8qxb16xk"; + "Agave" = "0jgm31wvmckb71qc9l0nj3sg4zq2vw67piaxr6h8zkakcl2mysha"; + "AnonymousPro" = "0s3n8rrr9kfqd8gxjxksp7p8bc3q7qhcrpyq8090dksvmbcks6xm"; + "Arimo" = "1k7ldfx6dmy9sigzsvi9qwms510nddw634g8xrn0vwnw6d7infk8"; + "AurulentSansMono" = "0q35948dai8qc7gfvas8sfn5s7b64b2y4f9psz6xslrv7nw8lcaz"; + "BigBlueTerminal" = "0ymw2m2xjsx77brm79aws26icwcf2a1d7q3p3ipsd25g4cgqcd2v"; + "BitstreamVeraSansMono" = "1n2298g1fn8jb1fbvw74289n7nnmjddn7zxh88gnl58pwz8ra5dk"; + "CascadiaCode" = "1q4l5a7b7ab6h1bs5pq734r9pp3fw9b59gdk1g4hyn2w61h0kdcj"; + "CodeNewRoman" = "1mgxawj3pblaxy0y9w0hzlfgipiskmc5p028m82zh1wyaplmh2pa"; + "Cousine" = "0jr0gxrsba3dhchp53vd67qq2pgfnvmvcwbv99l1700p539bcvy1"; + "DaddyTimeMono" = "1n6vwykz084fxgylayizxc210f4ms2ijfws5b2hvl2kqmy2q6jk4"; + "DejaVuSansMono" = "03qfrkzmhnn8dwgx4qhiigbz4dxs3957hydlr0j8vxl89j8c9g1z"; + "DroidSansMono" = "187cbcn4a2whrl8dag1ix6j1v3jgv5z2jdfw1w1z9llm1znvpp7z"; + "FantasqueSansMono" = "147h15k3ni0w6chxkrah2fk4klhdhq8y1d3nbx763h9ia3mnggv6"; + "FiraCode" = "1rx7zrkq0584k6hrh6dx30xrnz5nq379xyw73pfd4gxaxnh9mpi1"; + "FiraMono" = "0f2daidakhmbbd5ph6985rghjmr87k7xzmmmf9n851dxvfyndsgl"; + "Go-Mono" = "1bzh3pgyn87j27kw7x5h02rqzhh21pm6d0zhxd5iqi5qq5mj0nvm"; + "Gohu" = "1rlkprjg9nz1s69s4ancmxii6l907qachl116gngbj8gjv3g1x21"; + "Hack" = "052mav170lwxkgzg3hij4zvnmfwyrddn45gn07a33gpzzicjx1bh"; + "Hasklig" = "0vyb0z0m04pn8477d6a711vjwb3nhvpn5fxfwnz37av9jmz3i9vk"; + "HeavyData" = "065rhq7z52dp211inw3vszwc5zrd5s0w1kmgnrh68bxc0js0xqyb"; + "Hermit" = "1ij9pjr517jxk3dlsrzmnqivsfq5i5ai6pd8hznmrkb3360cn7sm"; + "iA-Writer" = "0clksrxw6xcv5c1pbd8rl2rc3r15iak1qv8v6bn0j2mccjcss64z"; + "IBMPlexMono" = "0xkfkpnkkrvjfiv624l7lpmfji107y7645w6ah47ijyg47yxkmsg"; + "Inconsolata" = "14gbwc0k3d1j496w6pv9kry1pglswzd0armsdb0g1mqgzfdf1ci1"; + "InconsolataGo" = "0c6yhx242d82dalyjas42qniy0jagqs47cfsfarwmzar6zg3lj5m"; + "InconsolataLGC" = "1746nl1rz4hscfgbmd8642wq3z1wizvfjb50y3yyjsc1ixc1f0pd"; + "Iosevka" = "1qqd4xh98vxb99rh2a2qv9gjclilhaw84pyqdpbx225qhvw9xlkb"; + "JetBrainsMono" = "1kc8fyk1aczxkmn8dzv1gy6xfi2jywgahd8np576v2dn8kx16844"; + "Lekton" = "0mny5j9bns9104wg2wmabdw0sl80c7i3dzp4j5mxh8jybx929d3i"; + "LiberationMono" = "19bpm893assmmnfvlvhz8df54c9pr2kfv2b6anlr4g64hliy1c1h"; + "Meslo" = "08zm8nqskhrqkw80wl460zbvsrvs5fp2njlcv867phpqna9hyqzh"; + "Monofur" = "0f5khqgdxi4g0qm5n48r1sk4pd2wlk987d8yxwks2mcsqa6fraqj"; + "Monoid" = "0m7i82jfiwqmi9lhv8lmq2n723ihn0isxi5559478qbdy5b104dd"; + "Mononoki" = "074avnvfl260pcrli4h5bc55yqr4mgd54paf80qcnh101qsz325w"; + "MPlus" = "03mrfhzfmmqjfl7fa81v1ih3fdr3q2k439w6pjbd2zvl806l92yq"; + "Noto" = "1jmycnf4fflijs730vbyj258kajkxv0j42655a7hvpapym7z940z"; + "OpenDyslexic" = "0ma62xg6cy8l4chfhqvm64zzhx3mrzdj6gxwnvx8plqy3j4dn3by"; + "Overpass" = "1xs2z3ch7dd32zb5l1axzd78hyskimqglcjcrb7n4ic85qm55xxm"; + "ProFont" = "0ck4rprj0w29pv3qm4n1zg6cdq76m3kaag0ka4q1qqcnhga67zr7"; + "ProggyClean" = "0sk3gk6zj61nbv94xv6z8y67sr5blg9n079d8srv7bbw9dv96i8g"; + "RobotoMono" = "1nhbr9zc0cz81pdj95rrb56bwdkmmbqmk429nf60j35pkcqmvk8x"; + "ShareTechMono" = "1h79myy0my3jyrvqcrgfdsjqrwwm5fdy2nmzp3ynyi769p7z1dwr"; + "SourceCodePro" = "06cnsdmm84kzjlwwcmhwpj7pyfqinqpmww1c13i21l611fg6hwd7"; + "SpaceMono" = "1xmmf2gdsa3ycl3pgpr3zr919qh702wjvc5k4hsdivvs2lzfdgmk"; + "Terminus" = "0g2ybs225fwxmvwfnanc32jc2lfnag3agmliv1vrb5mxyqzm53gj"; + "Tinos" = "077n4k6yh4qbirfkl02zqn3057kymspr10zcbfkf4ldvifa36pjd"; + "Ubuntu" = "1lzdrgb8vk5dwicxhvkgbain5phf88g3zgv5ya2ihh052xsl3qih"; + "UbuntuMono" = "0wa8ri7f3g8vwd194q812qh8nzplnmhl5ak0yhgilmm44s46ad0h"; + "VictorMono" = "18z92kwggfqwrd5m09yda55hcb4b159278lps6f9hr8icwki6v9q"; } diff --git a/nixpkgs/pkgs/data/fonts/nerdfonts/update.sh b/nixpkgs/pkgs/data/fonts/nerdfonts/update.sh index ccfab174dd8f..b4c4aaa7cf2b 100755 --- a/nixpkgs/pkgs/data/fonts/nerdfonts/update.sh +++ b/nixpkgs/pkgs/data/fonts/nerdfonts/update.sh @@ -15,7 +15,7 @@ while read -r name read -r url do - printf '\t"%s" = "%s";\n' "${name%.*}" "$(nix-prefetch-url "$url")" >>"$dirname/shas.nix" + printf ' "%s" = "%s";\n' "${name%.*}" "$(nix-prefetch-url "$url")" >>"$dirname/shas.nix" done < <(jq -r '.assets[] | .name, .browser_download_url' <<<"$latest_release") printf '}\n' >> "$dirname/shas.nix" diff --git a/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix b/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix index 25836b64cea0..c70e758a8321 100644 --- a/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix @@ -7,7 +7,7 @@ , optipng , cairo , python3 -, pkgconfig +, pkg-config , pngquant , which , imagemagick @@ -132,7 +132,7 @@ in zopfli pngquant which - pkgconfig + pkg-config emojiPythonEnv ]; @@ -180,7 +180,7 @@ in install -D $src $out/share/fonts/blobmoji/Blobmoji.ttf ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Noto Emoji with extended Blob support"; homepage = "https://github.com/C1710/blobmoji"; license = with licenses; [ ofl asl20 ]; diff --git a/nixpkgs/pkgs/data/fonts/orbitron/default.nix b/nixpkgs/pkgs/data/fonts/orbitron/default.nix index 4c00b086e10d..f4a0a9600a15 100644 --- a/nixpkgs/pkgs/data/fonts/orbitron/default.nix +++ b/nixpkgs/pkgs/data/fonts/orbitron/default.nix @@ -20,8 +20,7 @@ in fetchFromGitHub { meta = with lib; { homepage = "https://www.theleagueofmoveabletype.com/orbitron"; downloadPage = "https://www.theleagueofmoveabletype.com/orbitron/download"; - description = '' - Geometric sans-serif for display purposes by Matt McInerney''; + description = "Geometric sans-serif for display purposes by Matt McInerney"; longDescription = '' Orbitron is a geometric sans-serif typeface intended for display purposes. It features four weights (light, medium, bold, and diff --git a/nixpkgs/pkgs/data/fonts/paratype-pt/mono.nix b/nixpkgs/pkgs/data/fonts/paratype-pt/mono.nix index 54dbe3abf4ea..eecab47c0879 100644 --- a/nixpkgs/pkgs/data/fonts/paratype-pt/mono.nix +++ b/nixpkgs/pkgs/data/fonts/paratype-pt/mono.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: fetchzip { name = "paratype-pt-mono"; @@ -16,7 +16,7 @@ fetchzip { sha256 = "07kl82ngby55khvzsvn831ddpc0q8djgz2y6gsjixkyjfdk2xjjm"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.paratype.ru/public/"; description = "An open Paratype font"; diff --git a/nixpkgs/pkgs/data/fonts/paratype-pt/sans.nix b/nixpkgs/pkgs/data/fonts/paratype-pt/sans.nix index afaba6804f8b..826b8887365e 100644 --- a/nixpkgs/pkgs/data/fonts/paratype-pt/sans.nix +++ b/nixpkgs/pkgs/data/fonts/paratype-pt/sans.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: fetchzip { name = "paratype-pt-sans"; @@ -16,7 +16,7 @@ fetchzip { sha256 = "01fkd417gv98jf3a6zyfi9w2dkqsbddy1vacga2672yf0kh1z1r0"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.paratype.ru/public/"; description = "An open Paratype font"; diff --git a/nixpkgs/pkgs/data/fonts/paratype-pt/serif.nix b/nixpkgs/pkgs/data/fonts/paratype-pt/serif.nix index a6f21e425f8d..bbff974e1071 100644 --- a/nixpkgs/pkgs/data/fonts/paratype-pt/serif.nix +++ b/nixpkgs/pkgs/data/fonts/paratype-pt/serif.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: fetchzip { name = "paratype-pt-serif"; @@ -16,7 +16,7 @@ fetchzip { sha256 = "1iw5qi4ag3yp1lwmi91lb18gr768bqwl46xskaqnkhr9i9qp0v6d"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.paratype.ru/public/"; description = "An open Paratype font"; diff --git a/nixpkgs/pkgs/data/fonts/poly/default.nix b/nixpkgs/pkgs/data/fonts/poly/default.nix index 05b411a5ba30..50dfb5020354 100644 --- a/nixpkgs/pkgs/data/fonts/poly/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/data/fonts/powerline-symbols/default.nix b/nixpkgs/pkgs/data/fonts/powerline-symbols/default.nix new file mode 100644 index 000000000000..69e3bb59df69 --- /dev/null +++ b/nixpkgs/pkgs/data/fonts/powerline-symbols/default.nix @@ -0,0 +1,18 @@ +{ lib, runCommandNoCC, powerline }: + +let + inherit (powerline) version; +in runCommandNoCC "powerline-symbols-${version}" { + meta = { + inherit (powerline.meta) license; + priority = (powerline.meta.priority or 0) + 1; + maintainers = with lib.maintainers; [ midchildan ]; + }; +} '' + install -Dm644 \ + ${powerline.src}/font/PowerlineSymbols.otf \ + $out/share/fonts/OTF/PowerlineSymbols.otf + install -Dm644 \ + ${powerline.src}/font/10-powerline-symbols.conf \ + $out/etc/fonts/conf.d/10-powerline-symbols.conf +'' diff --git a/nixpkgs/pkgs/data/fonts/profont/default.nix b/nixpkgs/pkgs/data/fonts/profont/default.nix index 6297a8fbb204..3570bf7bf91a 100644 --- a/nixpkgs/pkgs/data/fonts/profont/default.nix +++ b/nixpkgs/pkgs/data/fonts/profont/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, mkfontscale }: +{ lib, stdenv, fetchzip, mkfontscale }: stdenv.mkDerivation { pname = "profont"; @@ -32,7 +32,7 @@ stdenv.mkDerivation { mkfontdir "$out/share/fonts/misc" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://tobiasjung.name/profont/"; description = "A monospaced font created to be a most readable font for programming"; maintainers = with maintainers; [ myrl ]; diff --git a/nixpkgs/pkgs/data/fonts/proggyfonts/default.nix b/nixpkgs/pkgs/data/fonts/proggyfonts/default.nix index 7ddfd69aeeb4..81ecb7354095 100644 --- a/nixpkgs/pkgs/data/fonts/proggyfonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/proggyfonts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mkfontscale }: +{ lib, stdenv, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "proggyfonts-0.1"; @@ -31,7 +31,7 @@ stdenv.mkDerivation { outputHashMode = "recursive"; outputHash = "1x196rp3wqjd7m57bgp5kfy5jmj97qncxi1vwibs925ji7dqzfgf"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://upperbounds.net"; description = "A set of fixed-width screen fonts that are designed for code listings"; license = licenses.mit; diff --git a/nixpkgs/pkgs/data/fonts/recursive/default.nix b/nixpkgs/pkgs/data/fonts/recursive/default.nix index ff5070b1bd7a..d6929153bf45 100644 --- a/nixpkgs/pkgs/data/fonts/recursive/default.nix +++ b/nixpkgs/pkgs/data/fonts/recursive/default.nix @@ -1,12 +1,12 @@ { lib, fetchzip }: let - version = "1.069"; + version = "1.071"; in fetchzip { name = "recursive-${version}"; - url = "https://github.com/arrowtype/recursive/releases/download/${version}/ArrowType-Recursive-${version}.zip"; + url = "https://github.com/arrowtype/recursive/releases/download/v${version}/ArrowType-Recursive-${version}.zip"; postFetch = '' mkdir -p $out/share/fonts/ @@ -14,7 +14,7 @@ fetchzip { unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype ''; - sha256 = "07l35vkarj8f748vbnca98zrl0yl456ddqf1wpmshs24r97cx96h"; + sha256 = "0db410vcvgawb89f11l2v7w3b7l70wzlwwv8df3vnangl3mdv13z"; meta = with lib; { homepage = "https://recursive.design/"; diff --git a/nixpkgs/pkgs/data/fonts/ricty/default.nix b/nixpkgs/pkgs/data/fonts/ricty/default.nix index 13cb056dc454..435cdb7d163b 100644 --- a/nixpkgs/pkgs/data/fonts/ricty/default.nix +++ b/nixpkgs/pkgs/data/fonts/ricty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, google-fonts, migu, fontforge, which }: +{ lib, stdenv, fetchurl, google-fonts, migu, fontforge, which }: stdenv.mkDerivation rec { pname = "ricty"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { install -m644 --target $out/share/fonts/truetype/ricty -D Ricty-*.ttf ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A high-quality Japanese font based on Inconsolata and Migu 1M"; homepage = "http://www.yusa.lab.uec.ac.jp/~yusa/ricty.html"; license = licenses.unfree; diff --git a/nixpkgs/pkgs/data/fonts/rictydiminished-with-firacode/default.nix b/nixpkgs/pkgs/data/fonts/rictydiminished-with-firacode/default.nix index 0f90c13d11eb..ceed83070040 100644 --- a/nixpkgs/pkgs/data/fonts/rictydiminished-with-firacode/default.nix +++ b/nixpkgs/pkgs/data/fonts/rictydiminished-with-firacode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fontforge, python3 }: +{ lib, stdenv, fetchgit, fontforge, python3 }: stdenv.mkDerivation rec { pname = "rictydiminished-with-firacode"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ])) ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/hakatashi/RictyDiminished-with-FiraCode"; description = "The best Japanese programming font meets the awesome ligatures of Firacode"; license = licenses.ofl; diff --git a/nixpkgs/pkgs/data/fonts/roboto-mono/default.nix b/nixpkgs/pkgs/data/fonts/roboto-mono/default.nix index 9bb655268014..fd3372123c60 100644 --- a/nixpkgs/pkgs/data/fonts/roboto-mono/default.nix +++ b/nixpkgs/pkgs/data/fonts/roboto-mono/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let # Latest commit touching the robotomono tree @@ -67,7 +67,7 @@ stdenv.mkDerivation { outputHashMode = "recursive"; outputHash = "0fkx2z97k29n1392bf76iwdyz44yp86hmqah7ai6bikzlia38qa0"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.google.com/fonts/specimen/Roboto+Mono"; description = "Google Roboto Mono fonts"; longDescription = '' diff --git a/nixpkgs/pkgs/data/fonts/roboto-slab/default.nix b/nixpkgs/pkgs/data/fonts/roboto-slab/default.nix index 1fec03b46fe4..dc37c8258564 100644 --- a/nixpkgs/pkgs/data/fonts/roboto-slab/default.nix +++ b/nixpkgs/pkgs/data/fonts/roboto-slab/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "roboto-slab"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { outputHashMode = "recursive"; outputHash = "0g663npi5lkvwcqafd4cjrm90ph0nv1lig7d19xzfymnj47qpj8x"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.google.com/fonts/specimen/Roboto+Slab"; description = "Roboto Slab Typeface by Google"; longDescription = '' diff --git a/nixpkgs/pkgs/data/fonts/siji/default.nix b/nixpkgs/pkgs/data/fonts/siji/default.nix index fb13f82263dd..ea2d2b687d53 100644 --- a/nixpkgs/pkgs/data/fonts/siji/default.nix +++ b/nixpkgs/pkgs/data/fonts/siji/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, libfaketime, fonttosfnt, mkfontscale }: +{ lib, stdenv, fetchzip, libfaketime, fonttosfnt, mkfontscale }: stdenv.mkDerivation rec { name = "siji-${version}"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "bdf" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/stark/siji"; description = "An iconic bitmap font based on Stlarch with additional glyphs"; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/data/fonts/stix-two/default.nix b/nixpkgs/pkgs/data/fonts/stix-two/default.nix index 1e32ebbf16a9..3d957f249f5b 100644 --- a/nixpkgs/pkgs/data/fonts/stix-two/default.nix +++ b/nixpkgs/pkgs/data/fonts/stix-two/default.nix @@ -1,13 +1,13 @@ { lib, fetchzip }: let - version = "2.10"; + version = "2.11"; in fetchzip { name = "stix-two-${version}"; url = "https://github.com/stipub/stixfonts/raw/v${version}/zipfiles/STIX${builtins.replaceStrings [ "." ] [ "_" ] version}-all.zip"; - sha256 = "1xvh5c5asbasfa333mizimvdp209g0lppbwv2p0cg3ixfpxgq4dl"; + sha256 = "19ndavx5k85vm6wvq9603kynpgbfddbjiihivffvnbrxwf13h34n"; postFetch = '' mkdir -p $out/share/fonts/ diff --git a/nixpkgs/pkgs/data/fonts/tamsyn/default.nix b/nixpkgs/pkgs/data/fonts/tamsyn/default.nix index 4d1e58a6bb34..6f0886e1d971 100644 --- a/nixpkgs/pkgs/data/fonts/tamsyn/default.nix +++ b/nixpkgs/pkgs/data/fonts/tamsyn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fontforge, mkfontscale }: +{ lib, stdenv, fetchurl, fontforge, mkfontscale }: let version = "1.11"; @@ -34,7 +34,7 @@ in stdenv.mkDerivation { mkfontdir "$out/share/fonts/misc" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A monospace bitmap font aimed at programmers"; longDescription = ''Tamsyn is a monospace bitmap font, primarily aimed at programmers. It was derived from Gilles Boccon-Gibod's MonteCarlo. Tamsyn diff --git a/nixpkgs/pkgs/data/fonts/tamzen/default.nix b/nixpkgs/pkgs/data/fonts/tamzen/default.nix index 026ec63d670e..80212a14aebf 100644 --- a/nixpkgs/pkgs/data/fonts/tamzen/default.nix +++ b/nixpkgs/pkgs/data/fonts/tamzen/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, mkfontscale, stdenv }: +{ fetchFromGitHub, mkfontscale, lib, stdenv }: stdenv.mkDerivation rec { pname = "tamzen-font"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { mkfontdir "$out/share/fonts/misc" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Bitmapped programming font based on Tamsyn"; longDescription = '' Tamzen is a monospace bitmap font. It is programatically forked diff --git a/nixpkgs/pkgs/data/fonts/tempora-lgc/default.nix b/nixpkgs/pkgs/data/fonts/tempora-lgc/default.nix index d20acad663c1..6bcceff16d22 100644 --- a/nixpkgs/pkgs/data/fonts/tempora-lgc/default.nix +++ b/nixpkgs/pkgs/data/fonts/tempora-lgc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: let srcs = [ (fetchurl { @@ -35,8 +35,8 @@ stdenv.mkDerivation { outputHash = "1kwj31cjgdirqvh6bxs4fnvvr1ppaz6z8w40kvhkivgs69jglmzw"; meta = { - description = ''Tempora font''; - license = stdenv.lib.licenses.gpl2 ; - maintainers = [stdenv.lib.maintainers.raskin]; + description = "Tempora font"; + license = lib.licenses.gpl2 ; + maintainers = [lib.maintainers.raskin]; }; } diff --git a/nixpkgs/pkgs/data/fonts/terminus-font/default.nix b/nixpkgs/pkgs/data/fonts/terminus-font/default.nix index bbde1dd252c3..fca357706a60 100644 --- a/nixpkgs/pkgs/data/fonts/terminus-font/default.nix +++ b/nixpkgs/pkgs/data/fonts/terminus-font/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3 +{ lib, stdenv, fetchurl, python3 , libfaketime, fonttosfnt , bdftopcf, mkfontscale }: @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { installTargets = [ "install" "fontdir" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A clean fixed width font"; longDescription = '' Terminus Font is designed for long (8 and more hours per day) work diff --git a/nixpkgs/pkgs/data/fonts/tewi/default.nix b/nixpkgs/pkgs/data/fonts/tewi/default.nix index 7821cc660412..1cf31b5affe7 100644 --- a/nixpkgs/pkgs/data/fonts/tewi/default.nix +++ b/nixpkgs/pkgs/data/fonts/tewi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3 +{ lib, stdenv, fetchFromGitHub, python3 , bdftopcf, mkfontscale , libfaketime, fonttosfnt }: @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { mkfontdir "$fontDir" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A nice bitmap font, readable even at small sizes"; longDescription = '' Tewi is a bitmap font, readable even at very small font sizes. This is diff --git a/nixpkgs/pkgs/data/fonts/tex-gyre-math/default.nix b/nixpkgs/pkgs/data/fonts/tex-gyre-math/default.nix index cd3c3ab00b18..95038d3f9cfe 100644 --- a/nixpkgs/pkgs/data/fonts/tex-gyre-math/default.nix +++ b/nixpkgs/pkgs/data/fonts/tex-gyre-math/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: let variants = { @@ -48,7 +48,7 @@ let outputHashMode = "recursive"; inherit outputHash; - meta = with stdenv.lib; { + meta = with lib; { longDescription = '' TeX Gyre ${displayName} Math is a math companion for the TeX Gyre ${displayName} family of fonts (see @@ -64,4 +64,4 @@ let }; }; in - stdenv.lib.mapAttrs mkVariant variants + lib.mapAttrs mkVariant variants diff --git a/nixpkgs/pkgs/data/fonts/tex-gyre/default.nix b/nixpkgs/pkgs/data/fonts/tex-gyre/default.nix index 197d14c3f03e..6ce5bd207862 100644 --- a/nixpkgs/pkgs/data/fonts/tex-gyre/default.nix +++ b/nixpkgs/pkgs/data/fonts/tex-gyre/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: let mkVariant = variant: { version, abbreviation, sha256, outputHash }: stdenv.mkDerivation { @@ -22,7 +22,7 @@ let outputHashMode = "recursive"; inherit outputHash; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.gust.org.pl/projects/e-foundry/tex-gyre"; # "The TeX Gyre fonts are licensed under the GUST Font License (GFL), # which is a free license, legally equivalent to the LaTeX Project Public @@ -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/nixpkgs/pkgs/data/fonts/tlwg/default.nix b/nixpkgs/pkgs/data/fonts/tlwg/default.nix index 2e3a0a95c055..9c03bbb162f5 100644 --- a/nixpkgs/pkgs/data/fonts/tlwg/default.nix +++ b/nixpkgs/pkgs/data/fonts/tlwg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, fontforge }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, fontforge }: stdenv.mkDerivation rec { pname = "tlwg"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { preAutoreconf = "echo ${version} > VERSION"; - meta = with stdenv.lib; { + meta = with lib; { description = "A collection of Thai scalable fonts available under free licenses"; homepage = "https://linux.thai.net/projects/fonts-tlwg"; license = with licenses; [ gpl2 publicDomain lppl13c free ]; diff --git a/nixpkgs/pkgs/data/fonts/ttf-bitstream-vera/default.nix b/nixpkgs/pkgs/data/fonts/ttf-bitstream-vera/default.nix index f485f43b60c6..bcf6cefb8d67 100644 --- a/nixpkgs/pkgs/data/fonts/ttf-bitstream-vera/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/data/fonts/ttf-tw-moe/default.nix b/nixpkgs/pkgs/data/fonts/ttf-tw-moe/default.nix index 1115b48b7095..695792894426 100644 --- a/nixpkgs/pkgs/data/fonts/ttf-tw-moe/default.nix +++ b/nixpkgs/pkgs/data/fonts/ttf-tw-moe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: let version = "2020-11-14"; in @@ -14,7 +14,7 @@ fetchzip { sha256 = "1jd3gjjfa4vadp6d499n0irz5b22z611kd7q5qgqf6s2fwbxfhiz"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.moe.gov.tw/"; description = "Set of KAI and SONG fonts from the Ministry of Education of Taiwan"; version = version; diff --git a/nixpkgs/pkgs/data/fonts/twemoji-color-font/default.nix b/nixpkgs/pkgs/data/fonts/twemoji-color-font/default.nix index 23ae8e76b1d5..5e690e7fd6f2 100644 --- a/nixpkgs/pkgs/data/fonts/twemoji-color-font/default.nix +++ b/nixpkgs/pkgs/data/fonts/twemoji-color-font/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, inkscape, imagemagick, potrace, svgo, scfbuild }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, inkscape, imagemagick, potrace, svgo, scfbuild }: stdenv.mkDerivation rec { pname = "twemoji-color-font"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { install -Dm644 linux/fontconfig/56-twemoji-color.conf $out/etc/fonts/conf.d/56-twemoji-color.conf ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Color emoji SVGinOT font using Twitter Unicode 10 emoji with diversity and country flags"; longDescription = '' A color and B&W emoji SVGinOT font built from the Twitter Emoji for diff --git a/nixpkgs/pkgs/data/fonts/twitter-color-emoji/default.nix b/nixpkgs/pkgs/data/fonts/twitter-color-emoji/default.nix index 8435957fe201..e74e51a95dcb 100644 --- a/nixpkgs/pkgs/data/fonts/twitter-color-emoji/default.nix +++ b/nixpkgs/pkgs/data/fonts/twitter-color-emoji/default.nix @@ -1,7 +1,7 @@ # Based upon https://src.fedoraproject.org/rpms/twitter-twemoji-fonts # The main difference is that we use “Twitter Color Emoji” name (which is recognized by upstream fontconfig) -{ stdenv +{ lib, stdenv , fetchFromGitHub , cairo , imagemagick @@ -55,16 +55,16 @@ stdenv.mkDerivation rec { ]; postPatch = let - templateSubstitutions = stdenv.lib.concatStringsSep "; " [ - ''s#Noto Color Emoji#Twitter Color Emoji#'' - ''s#NotoColorEmoji#TwitterColorEmoji#'' + templateSubstitutions = lib.concatStringsSep "; " [ + "s#Noto Color Emoji#Twitter Color Emoji#" + "s#NotoColorEmoji#TwitterColorEmoji#" ''s#Copyright .* Google Inc\.#Twitter, Inc and other contributors.#'' - ''s# Version .*# ${version}#'' - ''s#.*is a trademark.*##'' + "s# Version .*# ${version}#" + "s#.*is a trademark.*##" ''s#Google, Inc\.#Twitter, Inc and other contributors#'' - ''s#http://www.google.com/get/noto/#https://twemoji.twitter.com/#'' - ''s#.*is licensed under.*# Creative Commons Attribution 4.0 International#'' - ''s#http://scripts.sil.org/OFL#http://creativecommons.org/licenses/by/4.0/#'' + "s#http://www.google.com/get/noto/#https://twemoji.twitter.com/#" + "s#.*is licensed under.*# Creative Commons Attribution 4.0 International#" + "s#http://scripts.sil.org/OFL#http://creativecommons.org/licenses/by/4.0/#" ]; in '' ${noto-fonts-emoji.postPatch} @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { install -Dm644 TwitterColorEmoji.ttf $out/share/fonts/truetype/TwitterColorEmoji.ttf ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Color emoji font with a flat visual style, designed and used by Twitter"; longDescription = '' A bitmap color emoji font built from the Twitter Emoji for diff --git a/nixpkgs/pkgs/data/fonts/ucs-fonts/default.nix b/nixpkgs/pkgs/data/fonts/ucs-fonts/default.nix index 71c42c46b5d4..7bb9930ccfca 100644 --- a/nixpkgs/pkgs/data/fonts/ucs-fonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/ucs-fonts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bdftopcf +{ lib, stdenv, fetchurl, bdftopcf , libfaketime, fonttosfnt, mkfontscale }: @@ -51,7 +51,7 @@ stdenv.mkDerivation { outputs = [ "out" "bdf" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.cl.cam.ac.uk/~mgk25/ucs-fonts.html"; description = "Unicode bitmap fonts"; license = licenses.publicDomain; diff --git a/nixpkgs/pkgs/data/fonts/uni-vga/default.nix b/nixpkgs/pkgs/data/fonts/uni-vga/default.nix index 65db46ca2ca7..56ba36b1eb41 100644 --- a/nixpkgs/pkgs/data/fonts/uni-vga/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/data/fonts/unifont/default.nix b/nixpkgs/pkgs/data/fonts/unifont/default.nix index 3a9f107c4c7e..507faae53e35 100644 --- a/nixpkgs/pkgs/data/fonts/unifont/default.nix +++ b/nixpkgs/pkgs/data/fonts/unifont/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mkfontscale +{ lib, stdenv, fetchurl, mkfontscale , libfaketime, fonttosfnt }: @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { mkfontscale ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Unicode font for Base Multilingual Plane"; homepage = "http://unifoundry.com/unifont.html"; diff --git a/nixpkgs/pkgs/data/fonts/unscii/default.nix b/nixpkgs/pkgs/data/fonts/unscii/default.nix index 724d015a7c31..066a4d4d9221 100644 --- a/nixpkgs/pkgs/data/fonts/unscii/default.nix +++ b/nixpkgs/pkgs/data/fonts/unscii/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, bdftopcf +{ lib, stdenv, fetchurl, perl, bdftopcf , fontforge, SDL, SDL_image, mkfontscale }: @@ -45,11 +45,11 @@ stdenv.mkDerivation rec { meta = { inherit version; - description = ''Bitmapped character-art-friendly Unicode fonts''; + description = "Bitmapped character-art-friendly Unicode fonts"; # 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/nixpkgs/pkgs/data/fonts/uw-ttyp0/default.nix b/nixpkgs/pkgs/data/fonts/uw-ttyp0/default.nix index b0e58faed602..a3c3f7b68aa7 100644 --- a/nixpkgs/pkgs/data/fonts/uw-ttyp0/default.nix +++ b/nixpkgs/pkgs/data/fonts/uw-ttyp0/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl +{ lib, stdenv, fetchurl, perl , bdftopcf, bdf2psf, mkfontdir , fonttosfnt , targetsDat ? null @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { runHook postConfigure ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Monospace bitmap screen fonts for X11"; homepage = "https://people.mpi-inf.mpg.de/~uwe/misc/uw-ttyp0/"; license = with licenses; [ free mit ]; diff --git a/nixpkgs/pkgs/data/fonts/vista-fonts/default.nix b/nixpkgs/pkgs/data/fonts/vista-fonts/default.nix index 3a5ee616a0ef..b71ef7c99ec8 100644 --- a/nixpkgs/pkgs/data/fonts/vista-fonts/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/data/fonts/xits-math/default.nix b/nixpkgs/pkgs/data/fonts/xits-math/default.nix index dfb38973edd9..9e3c013f44de 100644 --- a/nixpkgs/pkgs/data/fonts/xits-math/default.nix +++ b/nixpkgs/pkgs/data/fonts/xits-math/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages}: +{ lib, stdenv, fetchFromGitHub, python3Packages}: stdenv.mkDerivation rec { pname = "xits-math"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { install -m444 -Dt $out/share/fonts/opentype *.otf ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/alif-type/xits"; description = "OpenType implementation of STIX fonts with math support"; license = licenses.ofl; diff --git a/nixpkgs/pkgs/data/icons/arc-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/arc-icon-theme/default.nix index ab80305d5285..6b7de57a4ff1 100644 --- a/nixpkgs/pkgs/data/icons/arc-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/arc-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, gnome3, moka-icon-theme, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, gtk3, gnome3, moka-icon-theme, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "arc-icon-theme"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { postFixup = "gtk-update-icon-cache $out/share/icons/Arc"; - meta = with stdenv.lib; { + meta = with lib; { description = "Arc icon theme"; homepage = "https://github.com/horst3180/arc-icon-theme"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/data/icons/bibata-cursors/default.nix b/nixpkgs/pkgs/data/icons/bibata-cursors/default.nix index 66ed71f1f9ec..04fb6281f253 100644 --- a/nixpkgs/pkgs/data/icons/bibata-cursors/default.nix +++ b/nixpkgs/pkgs/data/icons/bibata-cursors/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen, python3 }: +{ lib, stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen, python3 }: let py = python3.withPackages(ps: [ ps.pillow ]); @@ -41,7 +41,7 @@ in stdenvNoCC.mkDerivation rec { done ''; - meta = with stdenvNoCC.lib; { + meta = with lib; { description = "Material Based Cursor"; homepage = "https://github.com/KaizIqbal/Bibata_Cursor"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/data/icons/bibata-cursors/extra.nix b/nixpkgs/pkgs/data/icons/bibata-cursors/extra.nix index 7977566cb613..f59b12ec76a9 100644 --- a/nixpkgs/pkgs/data/icons/bibata-cursors/extra.nix +++ b/nixpkgs/pkgs/data/icons/bibata-cursors/extra.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen, python3 }: +{ lib, stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen, python3 }: let py = python3.withPackages(ps: [ ps.pillow ]); @@ -41,7 +41,7 @@ in stdenvNoCC.mkDerivation rec { done ''; - meta = with stdenvNoCC.lib; { + meta = with lib; { description = "Cursors Based on Bibata"; homepage = "https://github.com/KaizIqbal/Bibata_Extra_Cursor"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/data/icons/bibata-cursors/translucent.nix b/nixpkgs/pkgs/data/icons/bibata-cursors/translucent.nix index afdd92600fa9..d1e2814a8aa3 100644 --- a/nixpkgs/pkgs/data/icons/bibata-cursors/translucent.nix +++ b/nixpkgs/pkgs/data/icons/bibata-cursors/translucent.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen }: +{ lib, stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen }: stdenvNoCC.mkDerivation rec { pname = "bibata-cursors-translucent"; @@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation rec { cp -pr Bibata_* $out/share/icons/ ''; - meta = with stdenvNoCC.lib; { + meta = with lib; { description = "Translucent Varient of the Material Based Cursor"; homepage = "https://github.com/Silicasandwhich/Bibata_Cursor_Translucent"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/data/icons/capitaine-cursors/default.nix b/nixpkgs/pkgs/data/icons/capitaine-cursors/default.nix index e57482b191b7..075dbc922bd4 100644 --- a/nixpkgs/pkgs/data/icons/capitaine-cursors/default.nix +++ b/nixpkgs/pkgs/data/icons/capitaine-cursors/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, makeFontsConf +{ lib, stdenv, fetchFromGitHub, fetchpatch, makeFontsConf , inkscape, xcursorgen, bc }: stdenv.mkDerivation rec { @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { cp -pr dist/light $out/share/icons/capitaine-cursors-white ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An x-cursor theme inspired by macOS and based on KDE Breeze"; homepage = "https://github.com/keeferrourke/capitaine-cursors"; license = licenses.lgpl3; diff --git a/nixpkgs/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/elementary-xfce-icon-theme/default.nix index 52f9c8c821fe..dfcd2f596797 100644 --- a/nixpkgs/pkgs/data/icons/elementary-xfce-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/elementary-xfce-icon-theme/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gdk-pixbuf, optipng, librsvg, gtk3, pantheon, gnome3, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, pkg-config, gdk-pixbuf, optipng, librsvg, gtk3, pantheon, gnome3, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "elementary-xfce-icon-theme"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "shimmerproject"; repo = "elementary-xfce"; rev = "v${version}"; - sha256 = "1rl15kh9c7qxw4pvwmw44fb4v3vwh6zin4wpx55bnvm5j76y6p3f"; + sha256 = "sha256-E8f6UU/4Y9Nfk7LjDcdyV+TdeVj/zl3oFCyEu3Gz27w="; }; nativeBuildInputs = [ - pkgconfig + pkg-config gdk-pixbuf librsvg optipng @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { make icon-caches ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Elementary icons for Xfce and other GTK desktops like GNOME"; homepage = "https://github.com/shimmerproject/elementary-xfce"; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/data/icons/faba-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/faba-icon-theme/default.nix index 9df47f8faa7c..6ccd4c4622fa 100644 --- a/nixpkgs/pkgs/data/icons/faba-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/faba-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, python3, gtk3, pantheon, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, python3, gtk3, pantheon, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "${package-name}-${version}"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A sexy and modern icon theme with Tango influences"; homepage = "https://snwh.org/moka"; license = with licenses; [ cc-by-sa-40 gpl3 ]; diff --git a/nixpkgs/pkgs/data/icons/faba-mono-icons/default.nix b/nixpkgs/pkgs/data/icons/faba-mono-icons/default.nix index e403ba753ecc..0627c87bfc5e 100644 --- a/nixpkgs/pkgs/data/icons/faba-mono-icons/default.nix +++ b/nixpkgs/pkgs/data/icons/faba-mono-icons/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme, faba-icon-theme, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme, faba-icon-theme, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "faba-mono-icons"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The full set of Faba monochrome panel icons"; homepage = "https://snwh.org/moka"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/data/icons/flat-remix-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/flat-remix-icon-theme/default.nix index aea76738d82f..743bcba54de2 100644 --- a/nixpkgs/pkgs/data/icons/flat-remix-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/flat-remix-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub , gtk3, breeze-icons, pantheon, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub , gtk3, breeze-icons, pantheon, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "flat-remix-icon-theme"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Flat remix is a pretty simple icon theme inspired on material design"; homepage = "https://drasite.com/flat-remix"; license = with licenses; [ gpl3 ]; diff --git a/nixpkgs/pkgs/data/icons/gnome-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/gnome-icon-theme/default.nix index 30dacbae740d..0e6a2fc67c43 100644 --- a/nixpkgs/pkgs/data/icons/gnome-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/gnome-icon-theme/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk2 }: +{ lib, stdenv, fetchurl, pkg-config, intltool, iconnamingutils, gtk2 }: stdenv.mkDerivation rec { pname = "gnome-icon-theme"; 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"; }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool iconnamingutils gtk2 @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { rm -r "$out/share/locale" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Collection of icons for the GNOME 2 desktop"; homepage = "https://download.gnome.org/sources/gnome-icon-theme/"; license = licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/data/icons/hicolor-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/hicolor-icon-theme/default.nix index 5eefce81a129..3a8839844f11 100644 --- a/nixpkgs/pkgs/data/icons/hicolor-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/hicolor-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "hicolor-icon-theme-0.17"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - meta = with stdenv.lib; { + meta = with lib; { description = "Default fallback theme used by implementations of the icon theme specification"; homepage = "https://icon-theme.freedesktop.org/releases/"; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/data/icons/humanity-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/humanity-icon-theme/default.nix index 62085110f513..13ee96d04998 100644 --- a/nixpkgs/pkgs/data/icons/humanity-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/humanity-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk3, gnome3, hicolor-icon-theme }: +{ lib, stdenv, fetchurl, gtk3, gnome3, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "humanity-icon-theme"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Humanity icons from Ubuntu"; homepage = "https://launchpad.net/humanity/"; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/data/icons/iconpack-jade/default.nix b/nixpkgs/pkgs/data/icons/iconpack-jade/default.nix index 4c6b84479a7a..7d13476d73ec 100644 --- a/nixpkgs/pkgs/data/icons/iconpack-jade/default.nix +++ b/nixpkgs/pkgs/data/icons/iconpack-jade/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, gtk3, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "iconpack-jade"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Icon pack based upon Faenza and Mint-X"; homepage = "https://github.com/madmaxms/iconpack-jade"; license = licenses.lgpl3; diff --git a/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix b/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix index 165801f52eb8..ae3bf79d79aa 100644 --- a/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix +++ b/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, gnome-icon-theme, mint-x-icons, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, gtk3, gnome-icon-theme, mint-x-icons, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "iconpack-obsidian"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Gnome icon pack based upon Faenza"; homepage = "https://github.com/madmaxms/iconpack-obsidian"; license = licenses.lgpl3; diff --git a/nixpkgs/pkgs/data/icons/iso-flags/default.nix b/nixpkgs/pkgs/data/icons/iso-flags/default.nix index b329a151c728..4252853b898c 100644 --- a/nixpkgs/pkgs/data/icons/iso-flags/default.nix +++ b/nixpkgs/pkgs/data/icons/iso-flags/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , perl , perlPackages @@ -37,7 +37,7 @@ stdenv.mkDerivation { mv build $out/share/iso-flags ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/joielechong/iso-country-flags-svg-collection"; description = "248 country flag SVG & PNG icons with different icon styles"; license = [ licenses.publicDomain ]; diff --git a/nixpkgs/pkgs/data/icons/kora-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/kora-icon-theme/default.nix new file mode 100644 index 000000000000..9c64ed4b4972 --- /dev/null +++ b/nixpkgs/pkgs/data/icons/kora-icon-theme/default.nix @@ -0,0 +1,42 @@ +{ lib, stdenv, fetchFromGitHub , gtk3, breeze-icons, gnome-icon-theme, hicolor-icon-theme }: + +stdenv.mkDerivation rec { + pname = "kora-icon-theme"; + version = "1.3.4"; + + src = fetchFromGitHub { + owner = "bikass"; + repo = "kora"; + rev = "v${version}"; + sha256 = "01s7zhwwbdqgksjvfvn7kqijxzzc7734f707yk8y7anshq0518x3"; + }; + + nativeBuildInputs = [ + gtk3 + ]; + + propagatedBuildInputs = [ + breeze-icons + gnome-icon-theme + hicolor-icon-theme + ]; + + dontDropIconThemeCache = true; + + installPhase = '' + mkdir -p $out/share/icons + mv kora* $out/share/icons/ + + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + ''; + + meta = with lib; { + description = "An SVG icon theme in four variants"; + homepage = "https://github.com/bikass/kora"; + license = with licenses; [ gpl3Only ]; + platforms = platforms.linux; + maintainers = with maintainers; [ bloomvdomino ]; + }; +} diff --git a/nixpkgs/pkgs/data/icons/luna-icons/default.nix b/nixpkgs/pkgs/data/icons/luna-icons/default.nix index b0de2ac3b132..b3513818df87 100644 --- a/nixpkgs/pkgs/data/icons/luna-icons/default.nix +++ b/nixpkgs/pkgs/data/icons/luna-icons/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , gtk3 , breeze-icons @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "luna-icons"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "0mz5cayjgsc109nv7kdkn3gn1n79bl3hb773lrzrr0k2zblxg353"; + sha256 = "0ajx7yjkgj5ynbjmd6k3cldjn0qr51h6k80hjgr7vqd0ybyylh5p"; }; nativeBuildInputs = [ @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Icon pack based on marwaita and papirus icons"; homepage = "https://github.com/darkomarko42/Luna-Icons"; license = [ licenses.gpl3Only ]; diff --git a/nixpkgs/pkgs/data/icons/maia-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/maia-icon-theme/default.nix index 2a6dbc512acc..75c7cd58007a 100644 --- a/nixpkgs/pkgs/data/icons/maia-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/maia-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , cmake , extra-cmake-modules @@ -41,7 +41,7 @@ stdenv.mkDerivation { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Icons based on Breeze and Super Flat Remix"; homepage = "https://gitlab.manjaro.org/artwork/themes/maia"; license = licenses.lgpl3; diff --git a/nixpkgs/pkgs/data/icons/moka-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/moka-icon-theme/default.nix index d481f2df8d6e..5e67fdc9cc93 100644 --- a/nixpkgs/pkgs/data/icons/moka-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/moka-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, faba-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, faba-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "moka-icon-theme"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An icon theme designed with a minimal flat style using simple geometry and bright colours"; homepage = "https://snwh.org/moka"; license = with licenses; [ cc-by-sa-40 gpl3 ]; diff --git a/nixpkgs/pkgs/data/icons/numix-cursor-theme/default.nix b/nixpkgs/pkgs/data/icons/numix-cursor-theme/default.nix index 7ff3c4ca23c4..377cf05ac179 100644 --- a/nixpkgs/pkgs/data/icons/numix-cursor-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/numix-cursor-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, inkscape, xcursorgen }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, inkscape, xcursorgen }: stdenv.mkDerivation rec { version = "1.1"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cp -dr --no-preserve='ownership' Numix-Cursor{,-Light} $out/share/icons/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Numix cursor theme"; homepage = "https://numixproject.github.io"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix b/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix index ef06c2e2532a..e46c7a4289bb 100644 --- a/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, numix-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, gtk3, numix-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "numix-icon-theme-circle"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Numix icon theme (circle version)"; homepage = "https://numixproject.github.io"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix b/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix index b0b4e20073a4..bc243b95afc8 100644 --- a/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, numix-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, gtk3, numix-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "numix-icon-theme-square"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Numix icon theme (square version)"; homepage = "https://numixproject.github.io"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/data/icons/numix-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/numix-icon-theme/default.nix index 30e212629e86..d8e583b4bbb8 100644 --- a/nixpkgs/pkgs/data/icons/numix-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/numix-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, gtk3, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "numix-icon-theme"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Numix icon theme"; homepage = "https://numixproject.github.io"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/data/icons/paper-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/paper-icon-theme/default.nix index 585190a7b382..c84369a8a4a9 100644 --- a/nixpkgs/pkgs/data/icons/paper-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/paper-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, gnome3, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, gnome3, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "paper-icon-theme"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { gtk-update-icon-cache "$out"/share/icons/Paper-Mono-Dark; ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Modern icon theme designed around bold colours and simple geometric shapes"; homepage = "https://snwh.org/paper"; license = with licenses; [ cc-by-sa-40 lgpl3 ]; diff --git a/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix index 0f4d0d1d90c7..ed5f8e7c4c2a 100644 --- a/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, gtk3, pantheon, breeze-icons, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, gtk3, pantheon, breeze-icons, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20200901"; + version = "20210101"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "00khqbd7jz97q1kd43kkm6yaa40ml36rh04s76sgbm58srs66v3c"; + sha256 = "sha256-RHuT+zJQyhiApeLuh821PMI9dmD20OoRVxezF/uCWoE="; }; nativeBuildInputs = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Papirus icon theme"; homepage = "https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"; license = licenses.lgpl3; diff --git a/nixpkgs/pkgs/data/icons/papirus-maia-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/papirus-maia-icon-theme/default.nix index 4cfe50d7836b..814d9ced017b 100644 --- a/nixpkgs/pkgs/data/icons/papirus-maia-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/papirus-maia-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, gtk3, breeze-icons, gnome-icon-theme, papirus-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, cmake, gtk3, breeze-icons, gnome-icon-theme, papirus-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "papirus-maia-icon-theme"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Manjaro variation of Papirus icon theme"; homepage = "https://github.com/Ste74/papirus-maia-icon-theme"; license = licenses.lgpl3; diff --git a/nixpkgs/pkgs/data/icons/pop-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/pop-icon-theme/default.nix index 76b393dcf791..cb7db20d67ca 100644 --- a/nixpkgs/pkgs/data/icons/pop-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/pop-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , meson , ninja @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { dontDropIconThemeCache = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Icon theme for Pop!_OS with a semi-flat design and raised 3D motifs"; homepage = "https://github.com/pop-os/icon-theme"; license = with licenses; [ cc-by-sa-40 gpl3 ]; diff --git a/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix index 1d677f1457df..e647b02f0109 100644 --- a/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "qogir-icon-theme"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { name= ./install.sh -d $out/share/icons ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Flat colorful design icon theme"; homepage = "https://github.com/vinceliuice/Qogir-icon-theme"; license = with licenses; [ gpl3 ]; diff --git a/nixpkgs/pkgs/data/icons/tango-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/tango-icon-theme/default.nix index f1b59c2f5386..09d0875ca8a3 100644 --- a/nixpkgs/pkgs/data/icons/tango-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/tango-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, iconnamingutils, imagemagick, librsvg +{ lib, stdenv, fetchurl, intltool, pkg-config, iconnamingutils, imagemagick, librsvg , gtk/*any version*/, gnome-icon-theme, hicolor-icon-theme }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ ./rsvg-convert.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ intltool iconnamingutils imagemagick librsvg ]; propagatedBuildInputs = [ gnome-icon-theme hicolor-icon-theme ]; # still missing parent icon themes: cristalsvg @@ -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/nixpkgs/pkgs/data/icons/zafiro-icons/default.nix b/nixpkgs/pkgs/data/icons/zafiro-icons/default.nix index d406ae50e1c3..f6c56aa3c0fc 100644 --- a/nixpkgs/pkgs/data/icons/zafiro-icons/default.nix +++ b/nixpkgs/pkgs/data/icons/zafiro-icons/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, breeze-icons, gnome-icon-theme, numix-icon-theme, numix-icon-theme-circle, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, gtk3, breeze-icons, gnome-icon-theme, numix-icon-theme, numix-icon-theme-circle, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "zafiro-icons"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { gtk-update-icon-cache "$out"/share/icons/Zafiro-icons ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Icon pack flat with light colors"; homepage = "https://github.com/zayronxio/Zafiro-icons"; license = with licenses; [ gpl3 ]; diff --git a/nixpkgs/pkgs/data/machine-learning/mnist/default.nix b/nixpkgs/pkgs/data/machine-learning/mnist/default.nix index 44a70ac5d1ee..f5b450b4f2ad 100644 --- a/nixpkgs/pkgs/data/machine-learning/mnist/default.nix +++ b/nixpkgs/pkgs/data/machine-learning/mnist/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: let srcs = { train-images = fetchurl { @@ -30,7 +30,7 @@ in ln -s "${srcs.test-labels}" "$out/${srcs.test-labels.name}" ''; phases = [ "installPhase" ]; - meta = with stdenvNoCC.lib; { + meta = with lib; { description = "A large database of handwritten digits"; longDescription = '' The MNIST database (Modified National Institute of Standards and diff --git a/nixpkgs/pkgs/data/misc/adapta-backgrounds/default.nix b/nixpkgs/pkgs/data/misc/adapta-backgrounds/default.nix index 1c35d3deef91..6debaa9ebe22 100644 --- a/nixpkgs/pkgs/data/misc/adapta-backgrounds/default.nix +++ b/nixpkgs/pkgs/data/misc/adapta-backgrounds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, glib }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, glib }: stdenv.mkDerivation rec { pname = "adapta-backgrounds"; @@ -11,9 +11,9 @@ stdenv.mkDerivation rec { sha256 = "04hmbmzf97rsii8gpwy3wkljy5xhxmlsl34d63s6hfy05knclydj"; }; - nativeBuildInputs = [ meson ninja pkgconfig glib ]; + nativeBuildInputs = [ meson ninja pkg-config glib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Wallpaper collection for adapta-project"; homepage = "https://github.com/adapta-project/adapta-backgrounds"; license = with licenses; [ gpl2 cc-by-sa-40 ]; diff --git a/nixpkgs/pkgs/data/misc/brise/default.nix b/nixpkgs/pkgs/data/misc/brise/default.nix index 4f5b2e972e13..f4e1a6d2905f 100644 --- a/nixpkgs/pkgs/data/misc/brise/default.nix +++ b/nixpkgs/pkgs/data/misc/brise/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, librime }: +{ lib, stdenv, fetchFromGitHub, librime }: stdenv.mkDerivation { name = "brise-unstable-2017-09-16"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Rime Schema Repository"; longDescription = '' This software is a collection of data packages used by Rime diff --git a/nixpkgs/pkgs/data/misc/cacert/default.nix b/nixpkgs/pkgs/data/misc/cacert/default.nix index ad8c39831736..e50aa81656a9 100644 --- a/nixpkgs/pkgs/data/misc/cacert/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/data/misc/cldr-emoji-annotation/default.nix b/nixpkgs/pkgs/data/misc/cldr-emoji-annotation/default.nix index 8164012b69ae..e51f5639cbc6 100644 --- a/nixpkgs/pkgs/data/misc/cldr-emoji-annotation/default.nix +++ b/nixpkgs/pkgs/data/misc/cldr-emoji-annotation/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Emoji annotation files in CLDR"; homepage = "https://www.unicode.org/"; license = licenses.unicode-dfs-2016; diff --git a/nixpkgs/pkgs/data/misc/combinatorial_designs/default.nix b/nixpkgs/pkgs/data/misc/combinatorial_designs/default.nix index a14e13749589..5457b4e54d4b 100644 --- a/nixpkgs/pkgs/data/misc/combinatorial_designs/default.nix +++ b/nixpkgs/pkgs/data/misc/combinatorial_designs/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { mv * "$out/share/combinatorial_designs" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Data for Combinatorial Designs"; longDescription = '' Current content: diff --git a/nixpkgs/pkgs/data/misc/conway_polynomials/default.nix b/nixpkgs/pkgs/data/misc/conway_polynomials/default.nix index d6413439dede..f7da9381e610 100644 --- a/nixpkgs/pkgs/data/misc/conway_polynomials/default.nix +++ b/nixpkgs/pkgs/data/misc/conway_polynomials/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , python }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ${pythonEnv.interpreter} ${spkg-install} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Contains a small database of Conway polynomials"; license = licenses.gpl2; platforms = platforms.all; diff --git a/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix b/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix index d0d18d473358..38f72b5a2efe 100644 --- a/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix +++ b/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , autoconf , automake , libtool @@ -27,11 +27,11 @@ stdenv.mkDerivation { intltool ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Monitor database for DDCcontrol"; 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/nixpkgs/pkgs/data/misc/elliptic_curves/default.nix b/nixpkgs/pkgs/data/misc/elliptic_curves/default.nix index 9b296487670d..988716f5429e 100644 --- a/nixpkgs/pkgs/data/misc/elliptic_curves/default.nix +++ b/nixpkgs/pkgs/data/misc/elliptic_curves/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , python }: @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ${python.interpreter} ${spkg-install} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Databases of elliptic curves"; longDescription = '' Includes two databases: diff --git a/nixpkgs/pkgs/data/misc/fedora-backgrounds/generic.nix b/nixpkgs/pkgs/data/misc/fedora-backgrounds/generic.nix index e191dd027e8f..3e2e0928c3bc 100644 --- a/nixpkgs/pkgs/data/misc/fedora-backgrounds/generic.nix +++ b/nixpkgs/pkgs/data/misc/fedora-backgrounds/generic.nix @@ -1,4 +1,5 @@ -{ stdenvNoCC +{ lib +, stdenvNoCC , coreutils }: @@ -10,7 +11,7 @@ stdenvNoCC.mkDerivation { inherit patches src version; - pname = "fedora${stdenvNoCC.lib.versions.major version}-backgrounds"; + pname = "fedora${lib.versions.major version}-backgrounds"; dontBuild = true; @@ -32,7 +33,7 @@ stdenvNoCC.mkDerivation { "DESTDIR=$(out)" ]; - meta = with stdenvNoCC.lib; { + meta = with lib; { homepage = "https://github.com/fedoradesign/backgrounds"; description = "A set of default and supplemental wallpapers for Fedora"; license = licenses.cc-by-sa-40; diff --git a/nixpkgs/pkgs/data/misc/freepats/default.nix b/nixpkgs/pkgs/data/misc/freepats/default.nix index a1fa49bae27d..3ba5e1b61de1 100644 --- a/nixpkgs/pkgs/data/misc/freepats/default.nix +++ b/nixpkgs/pkgs/data/misc/freepats/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "freepats-20060219"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { installPhase = ''mkdir "$out"; cp -r . "$out"''; - meta = with stdenv.lib; { + meta = with lib; { description = "Instrument patches, for MIDI synthesizers"; longDescription = '' Freepats is a project to create a free and open set of instrument diff --git a/nixpkgs/pkgs/data/misc/geolite-legacy/default.nix b/nixpkgs/pkgs/data/misc/geolite-legacy/default.nix index 4fcbe8d02832..735a66089492 100644 --- a/nixpkgs/pkgs/data/misc/geolite-legacy/default.nix +++ b/nixpkgs/pkgs/data/misc/geolite-legacy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let fetchDB = src: sha256: fetchurl { @@ -29,7 +29,7 @@ stdenv.mkDerivation { "asnum/GeoIPASNumv6.dat.gz" "1qyq4h8cja62giv6q1qqc502vsq53wzz1kx80mgvwngmycrxa21k"; - meta = with stdenv.lib; { + meta = with lib; { description = "GeoLite Legacy IP geolocation databases"; homepage = "https://geolite.maxmind.com/download/geoip"; license = licenses.cc-by-sa-30; diff --git a/nixpkgs/pkgs/data/misc/graphs/default.nix b/nixpkgs/pkgs/data/misc/graphs/default.nix index bf7f8d4fd0e8..54b6c16613e8 100644 --- a/nixpkgs/pkgs/data/misc/graphs/default.nix +++ b/nixpkgs/pkgs/data/misc/graphs/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp * "$out/share/graphs/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A database of graphs"; license = licenses.gpl2; platforms = platforms.all; diff --git a/nixpkgs/pkgs/data/misc/hackage/default.nix b/nixpkgs/pkgs/data/misc/hackage/default.nix index 351ca123df20..551610c5ad5a 100644 --- a/nixpkgs/pkgs/data/misc/hackage/default.nix +++ b/nixpkgs/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/f20dd1d767313d653d6f0c6dd9a82f92d36ecb4c.tar.gz"; - sha256 = "1prawfbp6390dlgfvd3hxvgdab7rfkr88j35m5cbk3a4hxghkyj3"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/214ceb3bed92d49a0dffc6c2d8d21b1d0bcc7c25.tar.gz"; + sha256 = "1m8rm46w9xc8z8dvjg3i0bqpx9630i6ff681dp445q8wv7ji9y2v"; } diff --git a/nixpkgs/pkgs/data/misc/iana-etc/default.nix b/nixpkgs/pkgs/data/misc/iana-etc/default.nix index 4f9a98dccffb..1936bd6627a7 100644 --- a/nixpkgs/pkgs/data/misc/iana-etc/default.nix +++ b/nixpkgs/pkgs/data/misc/iana-etc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: let version = "20200729"; @@ -12,7 +12,7 @@ in fetchzip { install -D -m0644 -t $out/etc services protocols ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Mic92/iana-etc"; description = "IANA protocol and port number assignments (/etc/protocols and /etc/services)"; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/data/misc/libkkc-data/default.nix b/nixpkgs/pkgs/data/misc/libkkc-data/default.nix index aeb15057abf3..96130b2de5e1 100644 --- a/nixpkgs/pkgs/data/misc/libkkc-data/default.nix +++ b/nixpkgs/pkgs/data/misc/libkkc-data/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, marisa, libkkc }: +{ lib, stdenv, fetchurl, marisa, libkkc }: stdenv.mkDerivation rec { pname = "libkkc-data"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ marisa ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Language model data package for libkkc"; homepage = "https://github.com/ueno/libkkc"; license = licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/data/misc/media-player-info/default.nix b/nixpkgs/pkgs/data/misc/media-player-info/default.nix index 0307bf8d0ed2..56e4ace41f4d 100644 --- a/nixpkgs/pkgs/data/misc/media-player-info/default.nix +++ b/nixpkgs/pkgs/data/misc/media-player-info/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, python3, udev, systemd }: +{ lib, stdenv, fetchurl, pkg-config, python3, udev, systemd }: let name = "media-player-info-24"; @@ -13,7 +13,7 @@ in }; buildInputs = [ udev systemd ]; - nativeBuildInputs = [ pkgconfig python3 ]; + nativeBuildInputs = [ pkg-config python3 ]; postPatch = '' patchShebangs ./tools @@ -21,7 +21,7 @@ in configureFlags = [ "--with-udevdir=${placeholder "out"}/lib/udev" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A repository of data files describing media player capabilities"; homepage = "https://www.freedesktop.org/wiki/Software/media-player-info/"; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/data/misc/mime-types/default.nix b/nixpkgs/pkgs/data/misc/mime-types/default.nix index b18b66a227e6..dc942868250d 100644 --- a/nixpkgs/pkgs/data/misc/mime-types/default.nix +++ b/nixpkgs/pkgs/data/misc/mime-types/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: let version = "9"; @@ -11,7 +11,7 @@ in fetchzip rec { ''; sha256 = "0gyla4wfiaccs0qh0hw7n08kdpnkkssglcg0z2jblb2lsdr4qna0"; - meta = with stdenv.lib; { + meta = with lib; { description = "A database of common mappings of file extensions to MIME types"; homepage = "https://packages.gentoo.org/packages/app-misc/mime-types"; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/data/misc/miscfiles/default.nix b/nixpkgs/pkgs/data/misc/miscfiles/default.nix index 3d1caf9ae517..783dc29ecb2d 100644 --- a/nixpkgs/pkgs/data/misc/miscfiles/default.nix +++ b/nixpkgs/pkgs/data/misc/miscfiles/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "miscfiles-1.5"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "005588vfrwx8ghsdv9p7zczj9lbc9a3r4m5aphcaqv8gif4siaka"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.gnu.org/software/miscfiles/"; license = licenses.gpl2Plus; description = "Collection of files not of crucial importance for sysadmins"; diff --git a/nixpkgs/pkgs/data/misc/mobile-broadband-provider-info/default.nix b/nixpkgs/pkgs/data/misc/mobile-broadband-provider-info/default.nix index c9f24c9e85ef..f487edba9815 100644 --- a/nixpkgs/pkgs/data/misc/mobile-broadband-provider-info/default.nix +++ b/nixpkgs/pkgs/data/misc/mobile-broadband-provider-info/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gnome3 }: +{ lib, stdenv, fetchurl, gnome3 }: stdenv.mkDerivation rec { pname = "mobile-broadband-provider-info"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Mobile broadband service provider database"; homepage = "https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband/ServiceProviders"; license = licenses.publicDomain; diff --git a/nixpkgs/pkgs/data/misc/nixos-artwork/wallpapers.nix b/nixpkgs/pkgs/data/misc/nixos-artwork/wallpapers.nix index 36242db4621f..f8d22637cf3d 100644 --- a/nixpkgs/pkgs/data/misc/nixos-artwork/wallpapers.nix +++ b/nixpkgs/pkgs/data/misc/nixos-artwork/wallpapers.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let mkNixBackground = { name, src, description }: @@ -33,7 +33,7 @@ _EOF kdeFilePath = "${pkg}/share/wallpapers/${name}/contents/images/${src.name}"; }; - meta = with stdenv.lib; { + meta = with lib; { inherit description; homepage = "https://github.com/NixOS/nixos-artwork"; license = licenses.free; diff --git a/nixpkgs/pkgs/data/misc/osinfo-db/default.nix b/nixpkgs/pkgs/data/misc/osinfo-db/default.nix index 9721d0834758..36fc664a83bb 100644 --- a/nixpkgs/pkgs/data/misc/osinfo-db/default.nix +++ b/nixpkgs/pkgs/data/misc/osinfo-db/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, osinfo-db-tools, gettext, libxml2 }: +{ lib, stdenv, fetchurl, osinfo-db-tools, gettext, libxml2 }: stdenv.mkDerivation rec { pname = "osinfo-db"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { osinfo-db-import --dir "$out/share/osinfo" "${src}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Osinfo database of information about operating systems for virtualization provisioning tools"; homepage = "https://gitlab.com/libosinfo/osinfo-db/"; license = licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/data/misc/pari-galdata/default.nix b/nixpkgs/pkgs/data/misc/pari-galdata/default.nix index 644a50a8ddeb..c76734628050 100644 --- a/nixpkgs/pkgs/data/misc/pari-galdata/default.nix +++ b/nixpkgs/pkgs/data/misc/pari-galdata/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl }: @@ -16,7 +16,7 @@ stdenv.mkDerivation { cp -R * "$out/share/pari/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "PARI database needed to compute Galois group in degrees 8 through 11"; homepage = "http://pari.math.u-bordeaux.fr/"; license = licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/data/misc/pari-seadata-small/default.nix b/nixpkgs/pkgs/data/misc/pari-seadata-small/default.nix index a9c9a62839ce..86516fe1ddba 100644 --- a/nixpkgs/pkgs/data/misc/pari-seadata-small/default.nix +++ b/nixpkgs/pkgs/data/misc/pari-seadata-small/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl }: @@ -16,7 +16,7 @@ stdenv.mkDerivation { cp -R * "$out/share/pari/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "PARI database needed by ellap for large primes"; homepage = "http://pari.math.u-bordeaux.fr/"; license = licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/data/misc/polytopes_db/default.nix b/nixpkgs/pkgs/data/misc/polytopes_db/default.nix index 95ca8af82a7b..8e9e7b44a4aa 100644 --- a/nixpkgs/pkgs/data/misc/polytopes_db/default.nix +++ b/nixpkgs/pkgs/data/misc/polytopes_db/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp -R * "$out/share/reflexive_polytopes/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Reflexive polytopes database"; license = licenses.gpl2; platforms = platforms.all; diff --git a/nixpkgs/pkgs/data/misc/poppler-data/default.nix b/nixpkgs/pkgs/data/misc/poppler-data/default.nix index 717c948f7437..5d6e7b8e80dc 100644 --- a/nixpkgs/pkgs/data/misc/poppler-data/default.nix +++ b/nixpkgs/pkgs/data/misc/poppler-data/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, cmake, ninja }: +{ fetchurl, lib, stdenv, cmake, ninja }: stdenv.mkDerivation rec { name = "poppler-data-0.4.10"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://poppler.freedesktop.org/"; description = "Encoding files for Poppler, a PDF rendering library"; platforms = platforms.all; diff --git a/nixpkgs/pkgs/data/misc/scowl/default.nix b/nixpkgs/pkgs/data/misc/scowl/default.nix index 686582b48ce1..a4d91eeb037a 100644 --- a/nixpkgs/pkgs/data/misc/scowl/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/data/misc/shared-desktop-ontologies/default.nix b/nixpkgs/pkgs/data/misc/shared-desktop-ontologies/default.nix index 7e628567b6ea..88f9eec8fcad 100644 --- a/nixpkgs/pkgs/data/misc/shared-desktop-ontologies/default.nix +++ b/nixpkgs/pkgs/data/misc/shared-desktop-ontologies/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, cmake }: +{ lib, stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { name = "shared-desktop-ontologies-0.11.0"; - + src = fetchurl { url = "mirror://sourceforge/oscaf/${name}.tar.bz2"; sha256 = "1m5vnijg7rnwg41vig2ckg632dlczzdab1gsq51g4x7m9k1fdbw2"; }; - - buildInputs = [ cmake ]; - - meta = with stdenv.lib; { + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { homepage = "http://oscaf.sourceforge.net/"; description = "Ontologies necessary for the Nepomuk semantic desktop"; longDescription = '' @@ -23,4 +23,3 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.sander ]; }; } - diff --git a/nixpkgs/pkgs/data/misc/shared-mime-info/default.nix b/nixpkgs/pkgs/data/misc/shared-mime-info/default.nix index 4d286ad0f0a8..c69a9802c0c8 100644 --- a/nixpkgs/pkgs/data/misc/shared-mime-info/default.nix +++ b/nixpkgs/pkgs/data/misc/shared-mime-info/default.nix @@ -1,6 +1,6 @@ -{ stdenv +{ lib, stdenv , fetchurl -, pkgconfig +, pkg-config , gettext , perlPackages , itstool @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext itstool ] ++ (with perlPackages; [ @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { glib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A database of common MIME types"; homepage = "http://freedesktop.org/wiki/Software/shared-mime-info"; license = licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/data/misc/sound-theme-freedesktop/default.nix b/nixpkgs/pkgs/data/misc/sound-theme-freedesktop/default.nix index 908290061948..2b750a7e9e10 100644 --- a/nixpkgs/pkgs/data/misc/sound-theme-freedesktop/default.nix +++ b/nixpkgs/pkgs/data/misc/sound-theme-freedesktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool }: +{ lib, stdenv, fetchurl, intltool }: stdenv.mkDerivation rec { pname = "sound-theme-freedesktop"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Freedesktop reference sound theme"; homepage = "http://freedesktop.org/wiki/Specifications/sound-theme-spec"; # See http://cgit.freedesktop.org/sound-theme-freedesktop/tree/CREDITS: diff --git a/nixpkgs/pkgs/data/misc/tzdata/default.nix b/nixpkgs/pkgs/data/misc/tzdata/default.nix index 5065e3718cb2..98a6b9877d15 100644 --- a/nixpkgs/pkgs/data/misc/tzdata/default.nix +++ b/nixpkgs/pkgs/data/misc/tzdata/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, buildPackages }: +{ lib, stdenv, fetchurl, buildPackages }: stdenv.mkDerivation rec { pname = "tzdata"; - version = "2020c"; + version = "2020f"; srcs = [ (fetchurl { url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz"; - sha256 = "1nab36g5ibs88wg2mzpzygi1wh5gh2al1qjvbk8sb90sbw8ar43q"; + sha256 = "10b8cr55x6ji14n3kqkn3avj1s9b79b8gszh81fxrrisij8k248j"; }) (fetchurl { url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz"; - sha256 = "1r5zrk1k3jhhilkhrx82fd19rvysji8jk05gq5v0rndmyx07zacs"; + sha256 = "1i998crd9fxdfhv4jd241j1arx0ng7j7cvczpmj4y5j5fwmfmvng"; }) ]; @@ -64,9 +64,10 @@ stdenv.mkDerivation rec { setupHook = ./tzdata-setup-hook.sh; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.iana.org/time-zones"; description = "Database of current and historical time zones"; + changelog = "https://github.com/eggert/tz/blob/${version}/NEWS"; platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; }; diff --git a/nixpkgs/pkgs/data/misc/unicode-character-database/default.nix b/nixpkgs/pkgs/data/misc/unicode-character-database/default.nix index e52f21713ed8..0f0a4d5fa15c 100644 --- a/nixpkgs/pkgs/data/misc/unicode-character-database/default.nix +++ b/nixpkgs/pkgs/data/misc/unicode-character-database/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , unzip }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Unicode Character Database"; homepage = "https://www.unicode.org/"; license = licenses.unicode-dfs-2016; diff --git a/nixpkgs/pkgs/data/misc/unicode-emoji/default.nix b/nixpkgs/pkgs/data/misc/unicode-emoji/default.nix index b7705d7ee5b4..60ff492330dc 100644 --- a/nixpkgs/pkgs/data/misc/unicode-emoji/default.nix +++ b/nixpkgs/pkgs/data/misc/unicode-emoji/default.nix @@ -50,7 +50,7 @@ symlinkJoin rec { passthru = srcs; - meta = with stdenv.lib; { + meta = with lib; { description = "Unicode Emoji Data Files"; homepage = "https://home.unicode.org/emoji/"; license = licenses.unicode-dfs-2016; diff --git a/nixpkgs/pkgs/data/misc/unihan-database/default.nix b/nixpkgs/pkgs/data/misc/unihan-database/default.nix index d5d62403cc3d..02632b926448 100644 --- a/nixpkgs/pkgs/data/misc/unihan-database/default.nix +++ b/nixpkgs/pkgs/data/misc/unihan-database/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , unzip }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Unicode Han Database"; homepage = "https://www.unicode.org/"; license = licenses.unicode-dfs-2016; diff --git a/nixpkgs/pkgs/data/misc/wireless-regdb/default.nix b/nixpkgs/pkgs/data/misc/wireless-regdb/default.nix index cc22606c0d69..fc238fbe149b 100644 --- a/nixpkgs/pkgs/data/misc/wireless-regdb/default.nix +++ b/nixpkgs/pkgs/data/misc/wireless-regdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "wireless-regdb"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { "PREFIX=" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Wireless regulatory database for CRDA"; homepage = "http://wireless.kernel.org/en/developers/Regulatory/"; license = licenses.isc; diff --git a/nixpkgs/pkgs/data/misc/xorg-rgb/default.nix b/nixpkgs/pkgs/data/misc/xorg-rgb/default.nix index e976fe1358d2..24689d571da6 100644 --- a/nixpkgs/pkgs/data/misc/xorg-rgb/default.nix +++ b/nixpkgs/pkgs/data/misc/xorg-rgb/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, xorgproto}: +{lib, stdenv, fetchurl, pkg-config, xorgproto}: stdenv.mkDerivation rec { pname = "rgb"; version = "1.0.6"; @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { sha256 = "1c76zcjs39ljil6f6jpx1x17c8fnvwazz7zvl3vbjfcrlmm7rjmv"; }; - nativeBuildInputs = [pkgconfig]; + nativeBuildInputs = [pkg-config]; buildInputs = [xorgproto]; 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/"; }; } diff --git a/nixpkgs/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix b/nixpkgs/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix index 0faad5b594f6..b1db3638682b 100644 --- a/nixpkgs/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix +++ b/nixpkgs/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: let @@ -32,6 +32,6 @@ stdenv.mkDerivation { ''; meta = { - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix b/nixpkgs/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix index 4b0ced9daaea..85d7ab167964 100644 --- a/nixpkgs/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix +++ b/nixpkgs/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: let @@ -32,6 +32,6 @@ stdenv.mkDerivation { ''; meta = { - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix b/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix index a3b7067b2a42..1c6e57b3e7a7 100644 --- a/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix +++ b/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "docbook-xml-ebnf-1.2b1"; @@ -20,6 +20,6 @@ stdenv.mkDerivation { ''; meta = { - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix b/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix index de126da9f909..8a10defa0fb5 100644 --- a/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix +++ b/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip, findXMLCatalogs}: +{lib, stdenv, fetchurl, unzip, findXMLCatalogs}: let @@ -12,7 +12,7 @@ let in import ./generic.nix { - inherit stdenv unzip findXMLCatalogs; + inherit lib stdenv unzip findXMLCatalogs; name = "docbook-xml-4.1.2"; src = fetchurl { url = "http://www.docbook.org/xml/4.1.2/docbkx412.zip"; diff --git a/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix b/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix index f894db24827e..9a9abc0588bd 100644 --- a/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix +++ b/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, unzip, findXMLCatalogs}: +{lib, stdenv, fetchurl, unzip, findXMLCatalogs}: import ./generic.nix { - inherit stdenv unzip findXMLCatalogs; + inherit lib stdenv unzip findXMLCatalogs; name = "docbook-xml-4.2"; src = fetchurl { url = "http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip"; diff --git a/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix b/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix index dc2ec36ccef7..4d821ce2ffb8 100644 --- a/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix +++ b/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, unzip, findXMLCatalogs}: +{lib, stdenv, fetchurl, unzip, findXMLCatalogs}: import ./generic.nix { - inherit stdenv unzip findXMLCatalogs; + inherit lib stdenv unzip findXMLCatalogs; name = "docbook-xml-4.3"; src = fetchurl { url = "http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip"; diff --git a/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix b/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix index 93b03d854572..ca847d3e436e 100644 --- a/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix +++ b/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, unzip, findXMLCatalogs}: +{lib, stdenv, fetchurl, unzip, findXMLCatalogs}: import ./generic.nix { - inherit stdenv unzip findXMLCatalogs; + inherit lib stdenv unzip findXMLCatalogs; name = "docbook-xml-4.4"; src = fetchurl { url = "http://www.docbook.org/xml/4.4/docbook-xml-4.4.zip"; diff --git a/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix b/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix index 5bdb63e69da2..7be810fe3071 100644 --- a/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix +++ b/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, unzip, findXMLCatalogs}: +{lib, stdenv, fetchurl, unzip, findXMLCatalogs}: import ./generic.nix { - inherit stdenv unzip findXMLCatalogs; + inherit lib stdenv unzip findXMLCatalogs; name = "docbook-xml-4.5"; src = fetchurl { url = "http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip"; diff --git a/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix b/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix index 41c4b73d3f62..3d6edd300ec3 100644 --- a/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix +++ b/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, unzip, src, name, postInstall ? "true", meta ? {}, findXMLCatalogs }: +{ lib, stdenv, unzip, src, name, postInstall ? "true", meta ? {}, findXMLCatalogs }: stdenv.mkDerivation { inherit src name postInstall; @@ -18,6 +18,6 @@ stdenv.mkDerivation { ''; meta = meta // { - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix b/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix index 383a8750f1f8..c698098e6c12 100644 --- a/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix +++ b/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2 }: +{ lib, stdenv, fetchurl, libxml2 }: stdenv.mkDerivation { name = "xhtml1-20020801"; @@ -20,13 +20,13 @@ stdenv.mkDerivation { xmlcatalog --noout --create $cat grep PUBLIC DTD/*.soc | while read x; do eval a=($x) - xmlcatalog --noout --add public "''${a[1]}" "''${a[2]}" $cat + xmlcatalog --noout --add public "''${a[1]}" "''${a[2]}" $cat done ''; # */ meta = { homepage = "http://www.w3.org/TR/xhtml1/"; description = "DTDs for XHTML 1.0, the Extensible HyperText Markup Language"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/data/soundfonts/fluid/default.nix b/nixpkgs/pkgs/data/soundfonts/fluid/default.nix index c1c318383a09..1f84a6fd1eef 100644 --- a/nixpkgs/pkgs/data/soundfonts/fluid/default.nix +++ b/nixpkgs/pkgs/data/soundfonts/fluid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "Fluid-3"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { install -Dm644 "FluidR3 GM2-2.SF2" $out/share/soundfonts/FluidR3_GM2-2.sf2 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Frank Wen's pro-quality GM/GS soundfont"; homepage = "http://www.hammersound.net/"; license = licenses.mit; diff --git a/nixpkgs/pkgs/data/themes/adapta-kde/default.nix b/nixpkgs/pkgs/data/themes/adapta-kde/default.nix index fed16da929c2..4feeeaa6c002 100644 --- a/nixpkgs/pkgs/data/themes/adapta-kde/default.nix +++ b/nixpkgs/pkgs/data/themes/adapta-kde/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "adapta-kde-theme"; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { meta = { description = "A port of the Adapta theme for Plasma"; homepage = "https://git.io/adapta-kde"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.tadfisher ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.tadfisher ]; + platforms = lib.platforms.all; }; } diff --git a/nixpkgs/pkgs/data/themes/adapta/default.nix b/nixpkgs/pkgs/data/themes/adapta/default.nix index ca8e908009f9..f67d689a4bfc 100644 --- a/nixpkgs/pkgs/data/themes/adapta/default.nix +++ b/nixpkgs/pkgs/data/themes/adapta/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, parallel, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome3 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, parallel, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome3 }: stdenv.mkDerivation rec { pname = "adapta-gtk-theme"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config parallel sassc inkscape @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { "--disable-unity" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An adaptive GTK theme based on Material Design Guidelines"; homepage = "https://github.com/adapta-project/adapta-gtk-theme"; license = with licenses; [ gpl2 cc-by-sa-30 ]; diff --git a/nixpkgs/pkgs/data/themes/adementary/default.nix b/nixpkgs/pkgs/data/themes/adementary/default.nix index 4c8362b346b3..8b03132bfcb7 100644 --- a/nixpkgs/pkgs/data/themes/adementary/default.nix +++ b/nixpkgs/pkgs/data/themes/adementary/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, sassc }: +{ lib, stdenv, fetchFromGitHub, gtk3, sassc }: stdenv.mkDerivation rec { pname = "adementary-theme"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ./install.sh -d $out/share/themes ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Adwaita-based GTK theme with design influence from elementary OS and Vertex GTK theme"; homepage = "https://github.com/hrdwrrsk/adementary-theme"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/data/themes/albatross/default.nix b/nixpkgs/pkgs/data/themes/albatross/default.nix index 1baa977d101c..b53dd553ca2d 100644 --- a/nixpkgs/pkgs/data/themes/albatross/default.nix +++ b/nixpkgs/pkgs/data/themes/albatross/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "Albatross"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "A desktop Suite for Xfce"; homepage = "https://github.com/shimmerproject/Albatross"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/data/themes/amber/default.nix b/nixpkgs/pkgs/data/themes/amber/default.nix index 84eaee90fdbc..258dcff32665 100644 --- a/nixpkgs/pkgs/data/themes/amber/default.nix +++ b/nixpkgs/pkgs/data/themes/amber/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, sassc, gdk-pixbuf, librsvg, gtk_engines, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, sassc, gdk-pixbuf, librsvg, gtk_engines, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "amber-theme"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - meta = with stdenv.lib; { + meta = with lib; { description = "GTK, gnome-shell and Xfce theme based on Ubuntu Ambiance"; homepage = "https://github.com/lassekongo83/amber-theme"; license = licenses.gpl3Only; diff --git a/nixpkgs/pkgs/data/themes/ant-theme/ant-bloody.nix b/nixpkgs/pkgs/data/themes/ant-theme/ant-bloody.nix index 3c540889c13a..66cd3e247a72 100644 --- a/nixpkgs/pkgs/data/themes/ant-theme/ant-bloody.nix +++ b/nixpkgs/pkgs/data/themes/ant-theme/ant-bloody.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk-engine-murrine }: +{ lib, stdenv, fetchurl, gtk-engine-murrine }: let themeName = "Ant-Bloody"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Bloody variant of the Ant theme"; homepage = "https://github.com/EliverLara/${themeName}"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/data/themes/ant-theme/ant-nebula.nix b/nixpkgs/pkgs/data/themes/ant-theme/ant-nebula.nix index 03ee3b5d2d42..a62791572352 100644 --- a/nixpkgs/pkgs/data/themes/ant-theme/ant-nebula.nix +++ b/nixpkgs/pkgs/data/themes/ant-theme/ant-nebula.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk-engine-murrine }: +{ lib, stdenv, fetchurl, gtk-engine-murrine }: let themeName = "Ant-Nebula"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Nebula variant of the Ant theme"; homepage = "https://github.com/EliverLara/${themeName}"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/data/themes/ant-theme/ant.nix b/nixpkgs/pkgs/data/themes/ant-theme/ant.nix index 736c8a1aa6ac..250b77a66e8f 100644 --- a/nixpkgs/pkgs/data/themes/ant-theme/ant.nix +++ b/nixpkgs/pkgs/data/themes/ant-theme/ant.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk-engine-murrine }: +{ lib, stdenv, fetchurl, gtk-engine-murrine }: let themeName = "Ant"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A flat and light theme with a modern look"; homepage = "https://github.com/EliverLara/${themeName}"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/data/themes/arc-kde/default.nix b/nixpkgs/pkgs/data/themes/arc-kde/default.nix index c0db85105d56..ecf798364ff3 100644 --- a/nixpkgs/pkgs/data/themes/arc-kde/default.nix +++ b/nixpkgs/pkgs/data/themes/arc-kde/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "arc-kde-theme"; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { meta = { description = "A port of the arc theme for Plasma"; homepage = "https://git.io/arc-kde"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.nixy ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.nixy ]; + platforms = lib.platforms.all; }; } diff --git a/nixpkgs/pkgs/data/themes/arc/default.nix b/nixpkgs/pkgs/data/themes/arc/default.nix index bbbfbe7fe5c6..919c04913f03 100644 --- a/nixpkgs/pkgs/data/themes/arc/default.nix +++ b/nixpkgs/pkgs/data/themes/arc/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , sassc , autoreconfHook @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { install -Dm644 -t $out/share/doc/${pname} AUTHORS *.md ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Flat theme with transparent elements for GTK 3, GTK 2 and Gnome Shell"; homepage = "https://github.com/jnsh/arc-theme"; license = licenses.gpl3Only; diff --git a/nixpkgs/pkgs/data/themes/blackbird/default.nix b/nixpkgs/pkgs/data/themes/blackbird/default.nix index f4a2fbb7bbe6..a3f481b6d4ee 100644 --- a/nixpkgs/pkgs/data/themes/blackbird/default.nix +++ b/nixpkgs/pkgs/data/themes/blackbird/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "Blackbird"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "Dark Desktop Suite for Gtk, Xfce and Metacity"; homepage = "https://github.com/shimmerproject/Blackbird"; - license = with stdenv.lib.licenses; [ gpl2Plus cc-by-nc-sa-30 ]; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = with lib.licenses; [ gpl2Plus cc-by-nc-sa-30 ]; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/nixpkgs/pkgs/data/themes/canta/default.nix b/nixpkgs/pkgs/data/themes/canta/default.nix index c6a6678b98c7..cf1223152088 100644 --- a/nixpkgs/pkgs/data/themes/canta/default.nix +++ b/nixpkgs/pkgs/data/themes/canta/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , gdk-pixbuf , librsvg @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { gtk-update-icon-cache $out/share/icons/Canta ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Flat Design theme for GTK based desktop environments"; homepage = "https://github.com/vinceliuice/Canta-theme"; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/data/themes/cdetheme/default.nix b/nixpkgs/pkgs/data/themes/cdetheme/default.nix index ae7386047517..466f7d0daf1e 100644 --- a/nixpkgs/pkgs/data/themes/cdetheme/default.nix +++ b/nixpkgs/pkgs/data/themes/cdetheme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python2Packages }: +{ lib, stdenv, fetchFromGitHub, python2Packages }: stdenv.mkDerivation rec { pname = "cdetheme"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { wrapPythonProgramsIn "$out/share/themes/cdetheme/scripts" "$out $pythonPath" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Gtk2 / Gtk3 theme mimicking CDE / Motif"; homepage = "https://www.gnome-look.org/p/1231025"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/data/themes/clearlooks-phenix/default.nix b/nixpkgs/pkgs/data/themes/clearlooks-phenix/default.nix index 4de923da9cf4..0157914d8fcc 100644 --- a/nixpkgs/pkgs/data/themes/clearlooks-phenix/default.nix +++ b/nixpkgs/pkgs/data/themes/clearlooks-phenix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: stdenv.mkDerivation rec { version = "7.0.1"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { preferLocalBuild = true; - meta = with stdenv.lib; { + meta = with lib; { description = "GTK3 port of the Clearlooks theme"; longDescription = '' The Clearlooks-Phénix project aims at creating a GTK3 port of Clearlooks, diff --git a/nixpkgs/pkgs/data/themes/dracula-theme/default.nix b/nixpkgs/pkgs/data/themes/dracula-theme/default.nix index 87afbedf8fb6..e36f567b5f80 100644 --- a/nixpkgs/pkgs/data/themes/dracula-theme/default.nix +++ b/nixpkgs/pkgs/data/themes/dracula-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitHub, gtk-engine-murrine }: let themeName = "Dracula"; @@ -26,7 +26,7 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Dracula variant of the Ant theme"; homepage = "https://github.com/dracula/gtk"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/data/themes/e17gtk/default.nix b/nixpkgs/pkgs/data/themes/e17gtk/default.nix index c666cc5d0aa1..b6cc44aa0d54 100644 --- a/nixpkgs/pkgs/data/themes/e17gtk/default.nix +++ b/nixpkgs/pkgs/data/themes/e17gtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "e17gtk"; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = { description = "An Enlightenment-like GTK theme with sharp corners"; homepage = "https://github.com/tsujan/E17gtk"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/nixpkgs/pkgs/data/themes/equilux-theme/default.nix b/nixpkgs/pkgs/data/themes/equilux-theme/default.nix index f24524eb6b97..162b87885089 100644 --- a/nixpkgs/pkgs/data/themes/equilux-theme/default.nix +++ b/nixpkgs/pkgs/data/themes/equilux-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gnome3, glib, libxml2, gtk-engine-murrine, gdk-pixbuf, librsvg, bc }: +{ lib, stdenv, fetchFromGitHub, gnome3, glib, libxml2, gtk-engine-murrine, gdk-pixbuf, librsvg, bc }: stdenv.mkDerivation rec { pname = "equilux-theme"; @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { patchShebangs install.sh sed -i install.sh \ -e "s|if .*which gnome-shell.*;|if true;|" \ - -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${stdenv.lib.versions.majorMinor gnome3.gnome-shell.version}|" + -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${lib.versions.majorMinor gnome3.gnome-shell.version}|" mkdir -p $out/share/themes ./install.sh --dest $out/share/themes rm $out/share/themes/*/COPYING ''; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "A Material Design theme for GNOME/GTK based desktop environments"; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/data/themes/gnome-breeze/default.nix b/nixpkgs/pkgs/data/themes/gnome-breeze/default.nix index 25d6d60d6526..09f9ecd197a8 100644 --- a/nixpkgs/pkgs/data/themes/gnome-breeze/default.nix +++ b/nixpkgs/pkgs/data/themes/gnome-breeze/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation { name = "gnome-breeze-20160526"; @@ -17,9 +17,9 @@ stdenv.mkDerivation { meta = { description = "A GTK theme built to match KDE's breeze theme"; homepage = "https://github.com/dirruk1/gnome-breeze"; - license = stdenv.lib.licenses.lgpl2; - maintainers = with stdenv.lib.maintainers; [ bennofs ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.lgpl2; + maintainers = with lib.maintainers; [ bennofs ]; + platforms = lib.platforms.all; hydraPlatforms = []; }; } diff --git a/nixpkgs/pkgs/data/themes/greybird/default.nix b/nixpkgs/pkgs/data/themes/greybird/default.nix index 2f14988e1b25..202424eeb2c4 100644 --- a/nixpkgs/pkgs/data/themes/greybird/default.nix +++ b/nixpkgs/pkgs/data/themes/greybird/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, sassc, gdk-pixbuf, librsvg, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, sassc, gdk-pixbuf, librsvg, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "greybird"; - version = "3.22.13"; + version = "3.22.14"; src = fetchFromGitHub { owner = "shimmerproject"; repo = pname; rev = "v${version}"; - sha256 = "154qawiga792iimkpk3a6q8f4gm4r158wmsagkbqqbhj33kxgxhg"; + sha256 = "0b0axzrvdsv7aa029idz4rs1jm6df4ff3v4j4d5wf4yiypb48js9"; }; nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config sassc ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { gtk-engine-murrine ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Grey and blue theme from the Shimmer Project for GTK-based environments"; homepage = "https://github.com/shimmerproject/Greybird"; license = [ licenses.gpl2Plus ]; # or alternatively: cc-by-nc-sa-30 or later diff --git a/nixpkgs/pkgs/data/themes/jade1/default.nix b/nixpkgs/pkgs/data/themes/jade1/default.nix index 03dd7a49cda8..122d0a4a6568 100644 --- a/nixpkgs/pkgs/data/themes/jade1/default.nix +++ b/nixpkgs/pkgs/data/themes/jade1/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, gtk-engine-murrine }: +{ lib, stdenv, fetchurl, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "theme-jade1"; - version = "1.10"; + version = "1.11"; src = fetchurl { url = "https://github.com/madmaxms/theme-jade-1/releases/download/v${version}/jade-1-theme.tar.xz"; - sha256 = "17s4r8yjhnz9wrnrma6m8qjp02r47xkjk062sdb8s91dxhh7l8q2"; + sha256 = "0jljmychbs2lsf6g1pck83x4acljdqqsllkdjgiwv3nnlwahzlvs"; }; sourceRoot = "."; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Based on Linux Mint theme with dark menus and more intensive green"; homepage = "https://github.com/madmaxms/theme-jade-1"; license = with licenses; [ gpl3Only ]; diff --git a/nixpkgs/pkgs/data/themes/kde2/default.nix b/nixpkgs/pkgs/data/themes/kde2/default.nix index 7e33d371ebeb..04986b7dcc5b 100644 --- a/nixpkgs/pkgs/data/themes/kde2/default.nix +++ b/nixpkgs/pkgs/data/themes/kde2/default.nix @@ -15,7 +15,6 @@ mkDerivation rec { }; outputs = [ "out" "dev" ]; - enableParallelBuilding = true; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/nixpkgs/pkgs/data/themes/lounge/default.nix b/nixpkgs/pkgs/data/themes/lounge/default.nix index a62ff72db6f6..0c51b78333dc 100644 --- a/nixpkgs/pkgs/data/themes/lounge/default.nix +++ b/nixpkgs/pkgs/data/themes/lounge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, sassc, gtk3, gnome3, gdk-pixbuf, librsvg, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, sassc, gtk3, gnome3, gdk-pixbuf, librsvg, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "lounge-gtk-theme"; @@ -18,14 +18,14 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gtk-engine-murrine ]; mesonFlags = [ - "-D gnome_version=${stdenv.lib.versions.majorMinor gnome3.gnome-shell.version}" + "-D gnome_version=${lib.versions.majorMinor gnome3.gnome-shell.version}" ]; postFixup = '' gtk-update-icon-cache "$out"/share/icons/Lounge-aux; ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple and clean GTK theme with vintage scrollbars, inspired by Absolute, based on Adwaita"; homepage = "https://github.com/monday15/lounge-gtk-theme"; license = licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/data/themes/marwaita-manjaro/default.nix b/nixpkgs/pkgs/data/themes/marwaita-manjaro/default.nix index 6750c0119968..4189f0ed48d6 100644 --- a/nixpkgs/pkgs/data/themes/marwaita-manjaro/default.nix +++ b/nixpkgs/pkgs/data/themes/marwaita-manjaro/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , gdk-pixbuf , gtk-engine-murrine @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "marwaita-manjaro"; - version = "1.6"; + version = "1.8"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "133b9ri1yhvwrm9fm648mq0xnbr9mccy6yar7d390n4659j09v3s"; + sha256 = "0zxj20inwdfxhsc7cq6b3ijkxmrhnrwvbmyb1lw4vfjs4p4wrws0"; }; buildInputs = [ @@ -36,10 +36,10 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Manjaro Style (green version) of Marwaita GTK theme"; homepage = "https://www.pling.com/p/1351213/"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/nixpkgs/pkgs/data/themes/marwaita-peppermint/default.nix b/nixpkgs/pkgs/data/themes/marwaita-peppermint/default.nix index c7c4efa777bb..70e7bdef2d4e 100644 --- a/nixpkgs/pkgs/data/themes/marwaita-peppermint/default.nix +++ b/nixpkgs/pkgs/data/themes/marwaita-peppermint/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , gdk-pixbuf , gtk-engine-murrine @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "marwaita-peppermint"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "04j210nw9w4m8n49cd8y3l0qp60rn00i8wdr6kvc7lhkvqwhpnlg"; + sha256 = "0mhkkx2qa66z4b2h5iynhy63flwdf6b2phd21r1j8kp4m08dynms"; }; buildInputs = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Marwaita GTK theme with Peppermint Os Linux style"; homepage = "https://www.pling.com/p/1399569/"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/data/themes/marwaita-pop_os/default.nix b/nixpkgs/pkgs/data/themes/marwaita-pop_os/default.nix index 487b54a53e71..f71997674671 100644 --- a/nixpkgs/pkgs/data/themes/marwaita-pop_os/default.nix +++ b/nixpkgs/pkgs/data/themes/marwaita-pop_os/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , gdk-pixbuf , gtk-engine-murrine @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "marwaita-pop_os"; - version = "0.9"; + version = "1.1"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "1fpzsch9rpq7dmg01ny7jc2vd6dks0fqxxp2rb9jcs0vx5d2fdc6"; + sha256 = "1nwfyy3jnfsdlqgj7ig9gbawazdm76g02b0hrfsll17j5498d59y"; }; buildInputs = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Marwaita GTK theme with Pop_os Linux style"; homepage = "https://www.pling.com/p/1377894/"; license = licenses.gpl3Only; diff --git a/nixpkgs/pkgs/data/themes/marwaita-ubuntu/default.nix b/nixpkgs/pkgs/data/themes/marwaita-ubuntu/default.nix index 0241748bc432..f98e112678ce 100644 --- a/nixpkgs/pkgs/data/themes/marwaita-ubuntu/default.nix +++ b/nixpkgs/pkgs/data/themes/marwaita-ubuntu/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , gdk-pixbuf , gtk-engine-murrine @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "marwaita-ubuntu"; - version = "1.5"; + version = "1.7"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "0mld78s6gl5kfsdaqa7xs5mvfng9600pd2d9sp2b2q5axx7wjay5"; + sha256 = "024b0817jilvi5ilq9sbwg19ql5i2x3jfgc1awk7zzv6sqii639x"; }; buildInputs = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Ubuntu Style of Marwaita GTK theme"; homepage = "https://www.pling.com/p/1352833/"; license = licenses.gpl3Only; diff --git a/nixpkgs/pkgs/data/themes/marwaita/default.nix b/nixpkgs/pkgs/data/themes/marwaita/default.nix index c3ff0bb433a6..bcf6d69a65c4 100644 --- a/nixpkgs/pkgs/data/themes/marwaita/default.nix +++ b/nixpkgs/pkgs/data/themes/marwaita/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , gdk-pixbuf , gtk-engine-murrine @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GTK theme supporting Budgie, Pantheon, Mate, Xfce4 and GNOME desktops"; homepage = "https://www.pling.com/p/1239855/"; license = licenses.cc0; diff --git a/nixpkgs/pkgs/data/themes/matcha/default.nix b/nixpkgs/pkgs/data/themes/matcha/default.nix index 75b9d0f65ed8..f7f139a9ea97 100644 --- a/nixpkgs/pkgs/data/themes/matcha/default.nix +++ b/nixpkgs/pkgs/data/themes/matcha/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, gdk-pixbuf, librsvg, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitHub, gdk-pixbuf, librsvg, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "matcha-gtk-theme"; - version = "2020-12-07"; + version = "2021-01-12"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "0ch05nz1hipi9fz4sx1pah61jkbjw2gz3binsqayhp76jmp344a1"; + sha256 = "1h6y89aajygbp1rc3d5dw2vgb64a3hiajlifb4xnzhycc77vjskr"; }; buildInputs = [ gdk-pixbuf librsvg ]; @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { cp -a src/extra/firefox $out/share/doc/${pname} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A stylish flat Design theme for GTK based desktop environments"; homepage = "https://vinceliuice.github.io/theme-matcha"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/nixpkgs/pkgs/data/themes/materia-theme/default.nix b/nixpkgs/pkgs/data/themes/materia-theme/default.nix index b5c13960be27..d34ece5c94f7 100644 --- a/nixpkgs/pkgs/data/themes/materia-theme/default.nix +++ b/nixpkgs/pkgs/data/themes/materia-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , meson , ninja @@ -39,14 +39,14 @@ stdenv.mkDerivation rec { dontBuild = true; mesonFlags = [ - "-Dgnome_shell_version=${stdenv.lib.versions.majorMinor gnome3.gnome-shell.version}" + "-Dgnome_shell_version=${lib.versions.majorMinor gnome3.gnome-shell.version}" ]; postInstall = '' rm $out/share/themes/*/COPYING ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Material Design theme for GNOME/GTK based desktop environments"; homepage = "https://github.com/nana-4/materia-theme"; license = licenses.gpl2Only; diff --git a/nixpkgs/pkgs/data/themes/mojave/default.nix b/nixpkgs/pkgs/data/themes/mojave/default.nix index 3d14f782c694..7959753f05e0 100644 --- a/nixpkgs/pkgs/data/themes/mojave/default.nix +++ b/nixpkgs/pkgs/data/themes/mojave/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, glib, gtk-engine-murrine, gtk_engines, inkscape, optipng, sassc, which }: +{ lib, stdenv, fetchFromGitHub, fetchurl, glib, gtk-engine-murrine, gtk_engines, inkscape, optipng, sassc, which }: stdenv.mkDerivation rec { pname = "mojave-gtk-theme"; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { install -D -t $out/share/wallpapers ../"macOS Mojave Wallpapers"/* ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Mac OSX Mojave like theme for GTK based desktop environments"; homepage = "https://github.com/vinceliuice/Mojave-gtk-theme"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/data/themes/nordic-polar/default.nix b/nixpkgs/pkgs/data/themes/nordic-polar/default.nix index 9d74ae222500..8af17dd98afe 100644 --- a/nixpkgs/pkgs/data/themes/nordic-polar/default.nix +++ b/nixpkgs/pkgs/data/themes/nordic-polar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk-engine-murrine }: +{ lib, stdenv, fetchurl, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "nordic-polar"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { rm $out/share/themes/*/{LICENSE,README.md} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Gtk theme created using the awesome Nord color pallete"; homepage = "https://github.com/EliverLara/Nordic-Polar"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/data/themes/nordic/default.nix b/nixpkgs/pkgs/data/themes/nordic/default.nix index aca72c2fb489..1d8ceec3d1ba 100644 --- a/nixpkgs/pkgs/data/themes/nordic/default.nix +++ b/nixpkgs/pkgs/data/themes/nordic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk-engine-murrine }: +{ lib, stdenv, fetchurl, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "nordic"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { rm $out/share/themes/*/{LICENSE,README.md} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Dark Gtk theme created using the awesome Nord color pallete"; homepage = "https://github.com/EliverLara/Nordic"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/data/themes/numix-solarized/default.nix b/nixpkgs/pkgs/data/themes/numix-solarized/default.nix index 356f7d33b260..0d965e8030a6 100644 --- a/nixpkgs/pkgs/data/themes/numix-solarized/default.nix +++ b/nixpkgs/pkgs/data/themes/numix-solarized/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3, sassc, glib, gdk-pixbuf, inkscape, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitHub, python3, sassc, glib, gdk-pixbuf, inkscape, gtk-engine-murrine }: stdenv.mkDerivation rec { version = "20200910"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Solarized versions of Numix GTK2 and GTK3 theme"; longDescription = '' This is a fork of the Numix GTK theme that replaces the colors of the theme diff --git a/nixpkgs/pkgs/data/themes/numix-sx/default.nix b/nixpkgs/pkgs/data/themes/numix-sx/default.nix index 7c8cf77dfc40..ee887cbadee1 100644 --- a/nixpkgs/pkgs/data/themes/numix-sx/default.nix +++ b/nixpkgs/pkgs/data/themes/numix-sx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk-engine-murrine }: +{ lib, stdenv, fetchurl, gtk-engine-murrine }: stdenv.mkDerivation { version = "2017-04-24"; @@ -23,8 +23,8 @@ stdenv.mkDerivation { meta = { description = "Gray variation of Numix theme"; homepage = "https://www.gnome-look.org/p/1117412/"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.sauyon ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.sauyon ]; }; } diff --git a/nixpkgs/pkgs/data/themes/numix/default.nix b/nixpkgs/pkgs/data/themes/numix/default.nix index 879a13561533..23f491d4a9ad 100644 --- a/nixpkgs/pkgs/data/themes/numix/default.nix +++ b/nixpkgs/pkgs/data/themes/numix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, sass, glib, libxml2, gdk-pixbuf +{ lib, stdenv, fetchFromGitHub, sass, glib, libxml2, gdk-pixbuf , gtk-engine-murrine }: @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { meta = { description = "Modern flat theme with a combination of light and dark elements (GNOME, Unity, Xfce and Openbox)"; homepage = "https://numixproject.github.io"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/nixpkgs/pkgs/data/themes/obsidian2/default.nix b/nixpkgs/pkgs/data/themes/obsidian2/default.nix index 79c8e221894b..a965af53d421 100644 --- a/nixpkgs/pkgs/data/themes/obsidian2/default.nix +++ b/nixpkgs/pkgs/data/themes/obsidian2/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, gtk-engine-murrine }: +{ lib, stdenv, fetchurl, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "theme-obsidian2"; - version = "2.17"; + version = "2.18"; src = fetchurl { url = "https://github.com/madmaxms/theme-obsidian-2/releases/download/v${version}/obsidian-2-theme.tar.xz"; - sha256 = "1gff34xqypqjhh15lv4cc4ifsg07jx2znlsj9is4wmqf39a8h8n4"; + sha256 = "1w3grlkws4ih7333hys33z4bgm33jbc78bq2pyp8nzw4q9d2hz2r"; }; sourceRoot = "."; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Gnome theme, based upon Adwaita-Maia dark skin"; homepage = "https://github.com/madmaxms/theme-obsidian-2"; license = with licenses; [ gpl3Only ]; diff --git a/nixpkgs/pkgs/data/themes/onestepback/default.nix b/nixpkgs/pkgs/data/themes/onestepback/default.nix index 0385ca90f61e..9547e3543890 100644 --- a/nixpkgs/pkgs/data/themes/onestepback/default.nix +++ b/nixpkgs/pkgs/data/themes/onestepback/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { pname = "onestepback"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { rm $out/share/themes/*/{LICENSE,README*} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Gtk theme inspired by the NextStep look"; homepage = "http://www.vide.memoire.free.fr/perso/OneStepBack"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/data/themes/openzone/default.nix b/nixpkgs/pkgs/data/themes/openzone/default.nix new file mode 100644 index 000000000000..e7748612fef3 --- /dev/null +++ b/nixpkgs/pkgs/data/themes/openzone/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchFromGitHub, icon-slicer, xcursorgen }: +stdenv.mkDerivation rec { + pname = "openzone-cursors"; + version = "1.2.9"; + + src = fetchFromGitHub { + owner = "ducakar"; + repo = pname; + rev = "v${version}"; + sha256 = "02c536mc17ccsrzgma366k3wlm02ivklvr30fafxl981zgghlii4"; + }; + + nativeBuildInputs = [ icon-slicer xcursorgen ]; + + makeFlags = [ "DESTDIR=$(out)" ]; + + meta = with lib; { + description = "Clean and sharp X11/Wayland cursor theme"; + homepage = "https://www.gnome-look.org/p/999999/"; + license = licenses.mit; + maintainers = with maintainers; [ zaninime ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/data/themes/orion/default.nix b/nixpkgs/pkgs/data/themes/orion/default.nix index 740b34889227..93ea3633fb5a 100644 --- a/nixpkgs/pkgs/data/themes/orion/default.nix +++ b/nixpkgs/pkgs/data/themes/orion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitHub, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "orion"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/shimmerproject/Orion"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; }; } diff --git a/nixpkgs/pkgs/data/themes/paper-gtk/default.nix b/nixpkgs/pkgs/data/themes/paper-gtk/default.nix index 6f6c8b7851fb..e7c9179678f0 100644 --- a/nixpkgs/pkgs/data/themes/paper-gtk/default.nix +++ b/nixpkgs/pkgs/data/themes/paper-gtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gtk_engines }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, gtk_engines }: stdenv.mkDerivation { version = "2016-08-16"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { preferLocalBuild = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A modern desktop theme suite featuring a mostly flat with a minimal use of shadows for depth"; homepage = "https://snwh.org/paper"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/data/themes/plano/default.nix b/nixpkgs/pkgs/data/themes/plano/default.nix index 534831e007ee..5728dff6f9a5 100644 --- a/nixpkgs/pkgs/data/themes/plano/default.nix +++ b/nixpkgs/pkgs/data/themes/plano/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , meson , ninja @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { gtk-engine-murrine ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Flat theme for GNOME and Xfce"; homepage = "https://github.com/lassekongo83/plano-theme"; license = licenses.gpl3Only; diff --git a/nixpkgs/pkgs/data/themes/plata/default.nix b/nixpkgs/pkgs/data/themes/plata/default.nix index 6437bb1543d3..69e6f0bb0d2e 100644 --- a/nixpkgs/pkgs/data/themes/plata/default.nix +++ b/nixpkgs/pkgs/data/themes/plata/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, parallel +{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, parallel , sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine , cinnamonSupport ? true , gnomeFlashbackSupport ? true @@ -32,15 +32,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config parallel sassc inkscape libxml2 glib.dev ] - ++ stdenv.lib.optionals mateSupport [ gtk3 marco ] - ++ stdenv.lib.optional telegramSupport zip; + ++ lib.optionals mateSupport [ gtk3 marco ] + ++ lib.optional telegramSupport zip; buildInputs = [ gdk-pixbuf @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { configureFlags = let - inherit (stdenv.lib) enableFeature optional; + inherit (lib) enableFeature optional; withOptional = value: feat: optional (value != null) "--with-${feat}=${value}"; in [ "--enable-parallel" @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A GTK theme based on Material Design Refresh"; homepage = "https://gitlab.com/tista500/plata-theme"; license = with licenses; [ gpl2 cc-by-sa-40 ]; diff --git a/nixpkgs/pkgs/data/themes/pop-gtk/default.nix b/nixpkgs/pkgs/data/themes/pop-gtk/default.nix index 317d0ba86019..ec17be3261d8 100644 --- a/nixpkgs/pkgs/data/themes/pop-gtk/default.nix +++ b/nixpkgs/pkgs/data/themes/pop-gtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , meson , ninja @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "System76 Pop GTK+ Theme"; homepage = "https://github.com/pop-os/gtk-theme"; license = with licenses; [ gpl3 lgpl21 cc-by-sa-40 ]; diff --git a/nixpkgs/pkgs/data/themes/qogir/default.nix b/nixpkgs/pkgs/data/themes/qogir/default.nix index 44bb220d404d..d4ffdca3ae33 100644 --- a/nixpkgs/pkgs/data/themes/qogir/default.nix +++ b/nixpkgs/pkgs/data/themes/qogir/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gdk-pixbuf, librsvg, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitHub, gdk-pixbuf, librsvg, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "qogir-theme"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { rm $out/share/themes/*/{AUTHORS,COPYING} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Flat Design theme for GTK based desktop environments"; homepage = "https://vinceliuice.github.io/Qogir-theme"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/data/themes/qtcurve/default.nix b/nixpkgs/pkgs/data/themes/qtcurve/default.nix index cd5cb4170b8c..45a56f3355ec 100644 --- a/nixpkgs/pkgs/data/themes/qtcurve/default.nix +++ b/nixpkgs/pkgs/data/themes/qtcurve/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig, mkDerivation +{ lib, fetchFromGitHub, cmake, extra-cmake-modules, pkg-config, mkDerivation , gtk2Support ? true, gtk2 , qtbase, qtsvg, qtx11extras # Toolkit dependencies , karchive, kconfig, kconfigwidgets, kio, frameworkintegration @@ -17,8 +17,6 @@ mkDerivation rec { sha256 = "XP9VTeiVIiMm5mkXapCKWxfcvaYCkhY3S5RXZNR3oWo="; }; - enableParallelBuilding = true; - patches = [ # Remove unnecessary constexpr, this is not allowed in C++14 (fetchpatch { @@ -32,7 +30,7 @@ mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ]; + nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ]; buildInputs = [ qtbase qtsvg qtx11extras diff --git a/nixpkgs/pkgs/data/themes/shades-of-gray/default.nix b/nixpkgs/pkgs/data/themes/shades-of-gray/default.nix index 718fb2b5d4ca..e4c4cfb3ba51 100644 --- a/nixpkgs/pkgs/data/themes/shades-of-gray/default.nix +++ b/nixpkgs/pkgs/data/themes/shades-of-gray/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk_engines, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitHub, gtk_engines, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "shades-of-gray-theme"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { cp -a Shades-of-gray* $out/share/themes/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Flat dark GTK theme with ergonomic contrasts"; homepage = "https://github.com/WernerFP/Shades-of-gray-theme"; license = licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/data/themes/sierra/default.nix b/nixpkgs/pkgs/data/themes/sierra/default.nix index 470010eb54a2..d3fbb5fe7885 100644 --- a/nixpkgs/pkgs/data/themes/sierra/default.nix +++ b/nixpkgs/pkgs/data/themes/sierra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libxml2, gdk-pixbuf, librsvg, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitHub, libxml2, gdk-pixbuf, librsvg, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "sierra-gtk-theme"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { name= ./install.sh --dest $out/share/themes ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Mac OSX like theme for GTK based desktop environments"; homepage = "https://github.com/vinceliuice/Sierra-gtk-theme"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/data/themes/skeu/default.nix b/nixpkgs/pkgs/data/themes/skeu/default.nix index 1f2f869364ec..d8b0c1896572 100644 --- a/nixpkgs/pkgs/data/themes/skeu/default.nix +++ b/nixpkgs/pkgs/data/themes/skeu/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , gdk-pixbuf , gtk-engine-murrine @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GTK theme with skeuomorphism design"; homepage = "https://www.pling.com/p/1363834/"; license = licenses.gpl3Only; diff --git a/nixpkgs/pkgs/data/themes/snowblind/default.nix b/nixpkgs/pkgs/data/themes/snowblind/default.nix index 3517f4de2638..d36fe2324421 100644 --- a/nixpkgs/pkgs/data/themes/snowblind/default.nix +++ b/nixpkgs/pkgs/data/themes/snowblind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitLab, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "snowblind"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { rm $out/share/themes/*/{COPYING,CREDITS} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Smooth blue theme based on Materia Design"; homepage = "https://www.opencode.net/ju1464/Snowblind"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/data/themes/solarc/default.nix b/nixpkgs/pkgs/data/themes/solarc/default.nix index b8e937564a55..3f6932e40a0c 100644 --- a/nixpkgs/pkgs/data/themes/solarc/default.nix +++ b/nixpkgs/pkgs/data/themes/solarc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, +{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, gtk-engine-murrine, gtk3 }: @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "005b66whyxba3403yzykpnlkz0q4m154pxpb4jzcny3fggy9r70s"; }; - nativeBuildInputs = [ autoconf automake pkgconfig gtk3 ]; + nativeBuildInputs = [ autoconf automake pkg-config gtk3 ]; propagatedUserEnvPkgs = [ gtk-engine-murrine gtk3 ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation { ./autogen.sh --prefix=$out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Solarized version of the Arc theme"; homepage = "https://github.com/schemar/solarc-theme"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/data/themes/stilo/default.nix b/nixpkgs/pkgs/data/themes/stilo/default.nix index 066d122d4414..54d6f2a6e3c8 100644 --- a/nixpkgs/pkgs/data/themes/stilo/default.nix +++ b/nixpkgs/pkgs/data/themes/stilo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, sassc, gdk-pixbuf, librsvg, gtk_engines, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, sassc, gdk-pixbuf, librsvg, gtk_engines, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "stilo-themes"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Minimalistic GTK, gnome shell and Xfce themes"; homepage = "https://github.com/lassekongo83/stilo-themes"; license = licenses.gpl3Only; diff --git a/nixpkgs/pkgs/data/themes/sweet/default.nix b/nixpkgs/pkgs/data/themes/sweet/default.nix index 6ba7ae40c682..8a62735d2e52 100644 --- a/nixpkgs/pkgs/data/themes/sweet/default.nix +++ b/nixpkgs/pkgs/data/themes/sweet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "sweet"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Light and dark colorful Gtk3.20+ theme"; homepage = "https://github.com/EliverLara/Sweet"; license = licenses.gpl3Only; diff --git a/nixpkgs/pkgs/data/themes/ubuntu-themes/default.nix b/nixpkgs/pkgs/data/themes/ubuntu-themes/default.nix index 14779e8d7a38..732c9a74573b 100644 --- a/nixpkgs/pkgs/data/themes/ubuntu-themes/default.nix +++ b/nixpkgs/pkgs/data/themes/ubuntu-themes/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , gnome-icon-theme @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Ubuntu monochrome and Suru icon themes, Ambiance and Radiance themes, and Ubuntu artwork"; homepage = "https://launchpad.net/ubuntu-themes"; license = with licenses; [ cc-by-sa-40 gpl3 ]; diff --git a/nixpkgs/pkgs/data/themes/venta/default.nix b/nixpkgs/pkgs/data/themes/venta/default.nix index 1086aaeb7095..cd6791521609 100644 --- a/nixpkgs/pkgs/data/themes/venta/default.nix +++ b/nixpkgs/pkgs/data/themes/venta/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , gdk-pixbuf , gtk-engine-murrine @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Gtk theme based on windows 10 style"; homepage = "https://www.pling.com/p/1386774/"; license = licenses.gpl3Only; diff --git a/nixpkgs/pkgs/data/themes/vertex/default.nix b/nixpkgs/pkgs/data/themes/vertex/default.nix index 81c681f53715..d25df29013ba 100644 --- a/nixpkgs/pkgs/data/themes/vertex/default.nix +++ b/nixpkgs/pkgs/data/themes/vertex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "theme-vertex"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0c9mhrs95ahz37djrv176vn41ywvj26ilwmnr1h9171giv6hid98"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { cp AUTHORS README.md $out/share/doc/$pname/ ''; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Theme for GTK 3, GTK 2, Gnome-Shell, and Cinnamon"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/data/themes/vimix/default.nix b/nixpkgs/pkgs/data/themes/vimix/default.nix index 43636b584d3c..5a5612893708 100644 --- a/nixpkgs/pkgs/data/themes/vimix/default.nix +++ b/nixpkgs/pkgs/data/themes/vimix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk_engines, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitHub, gtk_engines, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "vimix-gtk-themes"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { rm $out/share/themes/*/{AUTHORS,LICENSE} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Flat Material Design theme for GTK based desktop environments"; homepage = "https://github.com/vinceliuice/vimix-gtk-themes"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/data/themes/yaru/default.nix b/nixpkgs/pkgs/data/themes/yaru/default.nix index 8e8a56d09da4..7121aed9b1e4 100644 --- a/nixpkgs/pkgs/data/themes/yaru/default.nix +++ b/nixpkgs/pkgs/data/themes/yaru/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, sassc, pkg-config, glib, ninja, +{ lib, stdenv, fetchFromGitHub, meson, sassc, pkg-config, glib, ninja, python3, gtk3, gnome3, gtk-engine-murrine, humanity-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { postPatch = "patchShebangs ."; - meta = with stdenv.lib; { + meta = with lib; { description = "Ubuntu community theme 'yaru' - default Ubuntu theme since 18.10"; homepage = "https://github.com/ubuntu/yaru"; license = with licenses; [ cc-by-sa-40 gpl3 ]; diff --git a/nixpkgs/pkgs/data/themes/zuki/default.nix b/nixpkgs/pkgs/data/themes/zuki/default.nix index 40046c6c5b30..217ca6c59cb6 100644 --- a/nixpkgs/pkgs/data/themes/zuki/default.nix +++ b/nixpkgs/pkgs/data/themes/zuki/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, sassc, gdk-pixbuf, librsvg, gtk_engines, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, sassc, gdk-pixbuf, librsvg, gtk_engines, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "zuki-themes"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Themes for GTK, gnome-shell and Xfce"; homepage = "https://github.com/lassekongo83/zuki-themes"; license = licenses.gpl3Only; |