treewide: with stdenv.lib; in meta -> with lib;

Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
This commit is contained in:
Profpatsch
2021-01-11 10:38:22 +01:00
parent e87aef06e0
commit 4a7f99d55d
6869 changed files with 13585 additions and 13580 deletions
+2 -2
View File
@@ -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;
@@ -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;
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, gdk-pixbuf, optipng, librsvg, gtk3, pantheon, gnome3, gnome-icon-theme, hicolor-icon-theme }:
{ lib, stdenv, fetchFromGitHub, pkgconfig, gdk-pixbuf, optipng, librsvg, gtk3, pantheon, gnome3, gnome-icon-theme, hicolor-icon-theme }:
stdenv.mkDerivation rec {
pname = "elementary-xfce-icon-theme";
@@ -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;
+2 -2
View File
@@ -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 ];
+2 -2
View File
@@ -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;
@@ -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 ];
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk2 }:
{ lib, stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk2 }:
stdenv.mkDerivation rec {
pname = "gnome-icon-theme";
@@ -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;
@@ -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;
@@ -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;
+2 -2
View File
@@ -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;
@@ -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;
+2 -2
View File
@@ -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 ];
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub , gtk3, breeze-icons, gnome-icon-theme, hicolor-icon-theme }:
{ lib, stdenv, fetchFromGitHub , gtk3, breeze-icons, gnome-icon-theme, hicolor-icon-theme }:
stdenv.mkDerivation rec {
pname = "kora-icon-theme";
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
done
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "An SVG icon theme in four variants";
homepage = "https://github.com/bikass/kora";
license = with licenses; [ gpl3Only ];
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv
{ lib, stdenv
, fetchFromGitHub
, gtk3
, breeze-icons
@@ -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 ];
+2 -2
View File
@@ -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;
+2 -2
View File
@@ -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 ];
@@ -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;
@@ -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;
@@ -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;
+2 -2
View File
@@ -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;
+2 -2
View File
@@ -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 ];
@@ -1,4 +1,4 @@
{ 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";
@@ -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;
@@ -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;
+2 -2
View File
@@ -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 ];
+2 -2
View File
@@ -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 ];
+2 -2
View File
@@ -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 ];