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/pass | |
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/pass')
-rw-r--r-- | pkgs/tools/security/pass/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/security/pass/extensions/audit/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/security/pass/extensions/checkup.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/security/pass/extensions/genphrase.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/security/pass/extensions/import.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/security/pass/extensions/otp.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/security/pass/extensions/tomb.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/security/pass/extensions/update.nix | 4 |
8 files changed, 15 insertions, 15 deletions
diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 354437a9bd56b..e2b163445ce25 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -149,7 +149,7 @@ stdenv.mkDerivation rec { withExtensions = env; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Stores, retrieves, generates, and synchronizes passwords securely"; homepage = "https://www.passwordstore.org/"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/security/pass/extensions/audit/default.nix b/pkgs/tools/security/pass/extensions/audit/default.nix index ec0f23ddc3834..415a4b9e79d17 100644 --- a/pkgs/tools/security/pass/extensions/audit/default.nix +++ b/pkgs/tools/security/pass/extensions/audit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pass, fetchFromGitHub, pythonPackages, makeWrapper, gnupg }: +{ lib, stdenv, pass, fetchFromGitHub, pythonPackages, makeWrapper, gnupg }: let pythonEnv = pythonPackages.python.withPackages (p: [ p.requests p.setuptools p.zxcvbn ]); @@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { --prefix PYTHONPATH : "$out/lib/${pythonEnv.libPrefix}/site-packages" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Pass extension for auditing your password repository."; homepage = "https://github.com/roddhjav/pass-audit"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/security/pass/extensions/checkup.nix b/pkgs/tools/security/pass/extensions/checkup.nix index 83a1d7a8872d9..bafaabba843bc 100644 --- a/pkgs/tools/security/pass/extensions/checkup.nix +++ b/pkgs/tools/security/pass/extensions/checkup.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , curl, findutils, gnugrep, gnused }: stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { install -D -m755 checkup.bash $out/lib/password-store/extensions/checkup.bash ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A pass extension to check against the Have I been pwned API to see if your passwords are publicly leaked or not"; homepage = "https://github.com/etu/pass-checkup"; license = licenses.gpl3; diff --git a/pkgs/tools/security/pass/extensions/genphrase.nix b/pkgs/tools/security/pass/extensions/genphrase.nix index d45e35d9bbc0a..dff64d7f18551 100644 --- a/pkgs/tools/security/pass/extensions/genphrase.nix +++ b/pkgs/tools/security/pass/extensions/genphrase.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "pass-genphrase"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { --replace '$EXTENSIONS' "$out/lib/password-store/extensions/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Pass extension that generates memorable passwords"; homepage = "https://github.com/congma/pass-genphrase"; license = licenses.gpl3; diff --git a/pkgs/tools/security/pass/extensions/import.nix b/pkgs/tools/security/pass/extensions/import.nix index 885dd05110f32..0fd14901d0db9 100644 --- a/pkgs/tools/security/pass/extensions/import.nix +++ b/pkgs/tools/security/pass/extensions/import.nix @@ -1,4 +1,4 @@ -{ stdenv, pass, fetchFromGitHub, pythonPackages, makeWrapper, fetchpatch }: +{ lib, stdenv, pass, fetchFromGitHub, pythonPackages, makeWrapper, fetchpatch }: let pythonEnv = pythonPackages.python.withPackages (p: [ @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { --prefix PYTHONPATH : "$out/${pythonPackages.python.sitePackages}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Pass extension for importing data from existing password managers"; homepage = "https://github.com/roddhjav/pass-import"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/security/pass/extensions/otp.nix b/pkgs/tools/security/pass/extensions/otp.nix index 835e693c2c5c2..8d9b350543dc6 100644 --- a/pkgs/tools/security/pass/extensions/otp.nix +++ b/pkgs/tools/security/pass/extensions/otp.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, oathToolkit }: +{ lib, stdenv, fetchFromGitHub, oathToolkit }: stdenv.mkDerivation rec { pname = "pass-otp"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { "BASHCOMPDIR=$(out)/share/bash-completion/completions" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A pass extension for managing one-time-password (OTP) tokens"; homepage = "https://github.com/tadfisher/pass-otp"; license = licenses.gpl3; diff --git a/pkgs/tools/security/pass/extensions/tomb.nix b/pkgs/tools/security/pass/extensions/tomb.nix index 43c74a9029b3a..74f8694f224c5 100644 --- a/pkgs/tools/security/pass/extensions/tomb.nix +++ b/pkgs/tools/security/pass/extensions/tomb.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, tomb }: +{ lib, stdenv, fetchFromGitHub, tomb }: stdenv.mkDerivation rec { pname = "pass-tomb"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { --replace 'TOMB="''${PASSWORD_STORE_TOMB:-tomb}"' 'TOMB="''${PASSWORD_STORE_TOMB:-${tomb}/bin/tomb}"' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Pass extension that keeps the password store encrypted inside a tomb"; homepage = "https://github.com/roddhjav/pass-tomb"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/security/pass/extensions/update.nix b/pkgs/tools/security/pass/extensions/update.nix index c364c341bda5b..50a4c49b90d15 100644 --- a/pkgs/tools/security/pass/extensions/update.nix +++ b/pkgs/tools/security/pass/extensions/update.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "pass-update"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Pass extension that provides an easy flow for updating passwords"; homepage = "https://github.com/roddhjav/pass-update"; license = licenses.gpl3Plus; |