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/tools/security/gnupg | |
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/tools/security/gnupg')
-rw-r--r-- | pkgs/tools/security/gnupg/1.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/security/gnupg/22.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/security/gnupg/1.nix b/pkgs/tools/security/gnupg/1.nix index 20ecd7c92fb22..66b05384c6bed 100644 --- a/pkgs/tools/security/gnupg/1.nix +++ b/pkgs/tools/security/gnupg/1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, readline, bzip2 }: +{ lib, stdenv, fetchurl, readline, bzip2 }: stdenv.mkDerivation rec { name = "gnupg-1.4.23"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gnupg.org"; description = "Classic (1.4) release of the GNU Privacy Guard, a GPL OpenPGP implementation"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index c2861574c2b88..94e62c03ad3b0 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv, pkgconfig, libgcrypt, libassuan, libksba +{ fetchurl, fetchpatch, lib, stdenv, pkgconfig, libgcrypt, libassuan, libksba , libgpgerror, libiconv, npth, gettext, texinfo, buildPackages # Each of the dependencies below are optional. @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { ln -s -t $out/bin $out/libexec/* ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gnupg.org"; description = "Modern (2.1) release of the GNU Privacy Guard, a GPL OpenPGP implementation"; license = licenses.gpl3Plus; |