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/shells/bash | |
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/shells/bash')
-rw-r--r-- | pkgs/shells/bash/4.4.nix | 4 | ||||
-rw-r--r-- | pkgs/shells/bash/5.1.nix | 4 | ||||
-rw-r--r-- | pkgs/shells/bash/bash-completion/default.nix | 4 | ||||
-rw-r--r-- | pkgs/shells/bash/nix-bash-completions/default.nix | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix index d06157fa77cc..afdfb816c955 100644 --- a/pkgs/shells/bash/4.4.nix +++ b/pkgs/shells/bash/4.4.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages +{ lib, stdenv, buildPackages , fetchurl, binutils ? null, bison, autoconf, util-linux # patch for cygwin requires readline support @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { rm -rf "$out/share" "$out/bin/bashbug" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.gnu.org/software/bash/"; description = "GNU Bourne-Again Shell, the de facto standard shell on Linux" + diff --git a/pkgs/shells/bash/5.1.nix b/pkgs/shells/bash/5.1.nix index 8950e5f5b1cf..fd8c0c32cd61 100644 --- a/pkgs/shells/bash/5.1.nix +++ b/pkgs/shells/bash/5.1.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPackages , fetchurl , binutils ? null @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { rm -rf "$out/share" "$out/bin/bashbug" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.gnu.org/software/bash/"; description = "GNU Bourne-Again Shell, the de facto standard shell on Linux" + diff --git a/pkgs/shells/bash/bash-completion/default.nix b/pkgs/shells/bash/bash-completion/default.nix index 4599b0a22838..22a7ead545dd 100644 --- a/pkgs/shells/bash/bash-completion/default.nix +++ b/pkgs/shells/bash/bash-completion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , fetchpatch , autoreconfHook , perl @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { sed -i -e 's/readlink -f/readlink/g' bash_completion completions/* ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/scop/bash-completion"; description = "Programmable completion for the bash shell"; license = licenses.gpl2Plus; diff --git a/pkgs/shells/bash/nix-bash-completions/default.nix b/pkgs/shells/bash/nix-bash-completions/default.nix index 5dfd673a6298..2034eed1f5da 100644 --- a/pkgs/shells/bash/nix-bash-completions/default.nix +++ b/pkgs/shells/bash/nix-bash-completions/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { version = "0.6.8"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/hedning/nix-bash-completions"; description = "Bash completions for Nix, NixOS, and NixOps"; license = licenses.bsd3; |