diff options
| author | Profpatsch <mail@profpatsch.de> | 2021-02-05 11:44:45 +0100 |
|---|---|---|
| committer | Profpatsch <mail@profpatsch.de> | 2021-02-05 12:27:24 +0100 |
| commit | d2793017cad11d290dad64f5122b2d2668e2d467 (patch) | |
| tree | a694f2a70c590fab56221301bbfae69c36d21455 /pkgs/profpatsch | |
| parent | f0b9d862a5e54fa7f9159636ce5a90ef3360231f (diff) | |
treewide: stdenv.lib -> pkgs.lib
Upstream is deprecating `stdenv.lib`, so let’s do the same.
Diffstat (limited to 'pkgs/profpatsch')
| -rw-r--r-- | pkgs/profpatsch/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/profpatsch/execline/el-semicolon.nix | 0 | ||||
| -rw-r--r-- | pkgs/profpatsch/sfttime/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/profpatsch/testing/default.nix | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/profpatsch/default.nix b/pkgs/profpatsch/default.nix index ed1bc427..0528471b 100644 --- a/pkgs/profpatsch/default.nix +++ b/pkgs/profpatsch/default.nix @@ -45,7 +45,7 @@ let in import src { nixpkgs = pkgs; }; testing = import ./testing { - inherit stdenv lib; + inherit lib; inherit (runExeclineFns) runExecline; inherit (pkgs) runCommandLocal; bin = getBins pkgs.s6PortableUtils [ "s6-touch" "s6-echo" ]; diff --git a/pkgs/profpatsch/execline/el-semicolon.nix b/pkgs/profpatsch/execline/el-semicolon.nix deleted file mode 100644 index e69de29b..00000000 --- a/pkgs/profpatsch/execline/el-semicolon.nix +++ /dev/null diff --git a/pkgs/profpatsch/sfttime/default.nix b/pkgs/profpatsch/sfttime/default.nix index 29d9170b..fca52a61 100644 --- a/pkgs/profpatsch/sfttime/default.nix +++ b/pkgs/profpatsch/sfttime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, bc }: +{ stdenv, lib, makeWrapper, bc }: stdenv.mkDerivation { name = "sfttime"; @@ -9,6 +9,6 @@ stdenv.mkDerivation { installPhase = '' install -D ${./sfttime.sh} $out/bin/sfttime wrapProgram $out/bin/sfttime \ - --prefix PATH : ${stdenv.lib.makeBinPath [ bc ]} + --prefix PATH : ${lib.makeBinPath [ bc ]} ''; } diff --git a/pkgs/profpatsch/testing/default.nix b/pkgs/profpatsch/testing/default.nix index 76d43ecc..b2ae6239 100644 --- a/pkgs/profpatsch/testing/default.nix +++ b/pkgs/profpatsch/testing/default.nix @@ -1,4 +1,4 @@ -{ stdenv, runCommandLocal, lib +{ runCommandLocal, lib , runExecline, bin }: let |