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
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, glib }:
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, glib }:
stdenv.mkDerivation rec {
pname = "adapta-backgrounds";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkgconfig 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 ];
+2 -2
View File
@@ -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
@@ -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;
@@ -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:
@@ -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;
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv
{ lib, stdenv
, autoconf
, automake
, libtool
@@ -27,7 +27,7 @@ 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;
+2 -2
View File
@@ -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:
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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;
+2 -2
View File
@@ -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;
+2 -2
View File
@@ -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;
+2 -2
View File
@@ -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;
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, python3, udev, systemd }:
{ lib, stdenv, fetchurl, pkgconfig, python3, udev, systemd }:
let
name = "media-player-info-24";
@@ -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;
+2 -2
View File
@@ -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;
+2 -2
View File
@@ -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";
@@ -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;
+2 -2
View File
@@ -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;
+2 -2
View File
@@ -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;
+2 -2
View File
@@ -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;
@@ -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;
+2 -2
View File
@@ -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;
+2 -2
View File
@@ -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;
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake }:
{ lib, stdenv, fetchurl, cmake }:
stdenv.mkDerivation rec {
name = "shared-desktop-ontologies-0.11.0";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
meta = with stdenv.lib; {
meta = with lib; {
homepage = "http://oscaf.sourceforge.net/";
description = "Ontologies necessary for the Nepomuk semantic desktop";
longDescription = ''
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv
{ lib, stdenv
, fetchurl
, pkgconfig
, gettext
@@ -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;
@@ -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:
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, buildPackages }:
{ lib, stdenv, fetchurl, buildPackages }:
stdenv.mkDerivation rec {
pname = "tzdata";
@@ -64,7 +64,7 @@ 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";
@@ -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;
+1 -1
View File
@@ -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;
+2 -2
View File
@@ -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;
+2 -2
View File
@@ -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;