diff options
author | Profpatsch <mail@profpatsch.de> | 2021-01-11 08:54:33 +0100 |
---|---|---|
committer | Profpatsch <mail@profpatsch.de> | 2021-01-11 10:38:22 +0100 |
commit | 4a7f99d55d299453a9c2397f90b33d1120669775 (patch) | |
tree | 9fca8e9c9970d0a00ce56dfe11b63ae76b00cf01 /pkgs/build-support | |
parent | e87aef06e00c42b26789321454d7bd609548cc12 (diff) |
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
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/build-fhs-userenv/chrootenv/default.nix | 4 | ||||
-rw-r--r-- | pkgs/build-support/templaterpm/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix b/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix index 70a7a43bd398..6ab697c3696f 100644 --- a/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix +++ b/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, meson, ninja, pkgconfig, glib }: +{ lib, stdenv, meson, ninja, pkgconfig, glib }: stdenv.mkDerivation { name = "chrootenv"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ meson ninja pkgconfig ]; buildInputs = [ glib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Setup mount/user namespace for FHS emulation"; license = licenses.mit; maintainers = with maintainers; [ yegortimoshenko ]; diff --git a/pkgs/build-support/templaterpm/default.nix b/pkgs/build-support/templaterpm/default.nix index 30465c740e53..0f7acc13277b 100644 --- a/pkgs/build-support/templaterpm/default.nix +++ b/pkgs/build-support/templaterpm/default.nix @@ -1,4 +1,4 @@ -{stdenv, makeWrapper, python, toposort, rpm}: +{lib, stdenv, makeWrapper, python, toposort, rpm}: stdenv.mkDerivation { pname = "nix-template-rpm"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { --set PYTHONPATH "${rpm}/lib/${python.libPrefix}/site-packages":"${toposort}/lib/${python.libPrefix}/site-packages" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Create templates of nix expressions from RPM .spec files"; maintainers = with maintainers; [ tstrobel ]; platforms = with stdenv.lib.platforms; unix; |