diff options
| author | tv <tv@krebsco.de> | 2022-12-09 01:31:56 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2022-12-09 01:34:31 +0100 |
| commit | 6d64096cd99db27357bf2d038bdfdfc2d3a3aeae (patch) | |
| tree | e1361555d8e32ec72ea2170852be432d347b381e /tv/5pkgs/simple | |
| parent | e56f5d7e61e46852ebe1b4904d6f4085091bd469 (diff) | |
tv: normalize lib imports
Diffstat (limited to 'tv/5pkgs/simple')
| -rw-r--r-- | tv/5pkgs/simple/bash-fzf-history.nix | 2 | ||||
| -rw-r--r-- | tv/5pkgs/simple/default.nix | 2 | ||||
| l--------- | tv/5pkgs/simple/lib | 1 | ||||
| -rw-r--r-- | tv/5pkgs/simple/pinentry-urxvt/default.nix | 3 | ||||
| l--------- | tv/5pkgs/simple/pinentry-urxvt/lib | 1 | ||||
| -rw-r--r-- | tv/5pkgs/simple/q/default.nix | 4 | ||||
| l--------- | tv/5pkgs/simple/q/lib | 1 |
7 files changed, 8 insertions, 6 deletions
diff --git a/tv/5pkgs/simple/bash-fzf-history.nix b/tv/5pkgs/simple/bash-fzf-history.nix index 88a8e9e4..1166ec7f 100644 --- a/tv/5pkgs/simple/bash-fzf-history.nix +++ b/tv/5pkgs/simple/bash-fzf-history.nix @@ -1,4 +1,4 @@ -with import <stockholm/lib>; +with import ./lib; { pkgs , edit-key ? "ctrl-e" diff --git a/tv/5pkgs/simple/default.nix b/tv/5pkgs/simple/default.nix index 9fb45dd1..82a19a9b 100644 --- a/tv/5pkgs/simple/default.nix +++ b/tv/5pkgs/simple/default.nix @@ -1,4 +1,4 @@ -with import ../../../lib; +with import ./lib; self: super: diff --git a/tv/5pkgs/simple/lib b/tv/5pkgs/simple/lib new file mode 120000 index 00000000..dc598c56 --- /dev/null +++ b/tv/5pkgs/simple/lib @@ -0,0 +1 @@ +../lib
\ No newline at end of file diff --git a/tv/5pkgs/simple/pinentry-urxvt/default.nix b/tv/5pkgs/simple/pinentry-urxvt/default.nix index 6e4f6b00..c768a9f5 100644 --- a/tv/5pkgs/simple/pinentry-urxvt/default.nix +++ b/tv/5pkgs/simple/pinentry-urxvt/default.nix @@ -1,8 +1,7 @@ +with import ./lib; { pkgs, ... }@args: let - lib = import <stockholm/lib>; - # config cannot be declared in the input attribute set because that would # cause callPackage to inject the wrong config. Instead, get it from ... # via args. diff --git a/tv/5pkgs/simple/pinentry-urxvt/lib b/tv/5pkgs/simple/pinentry-urxvt/lib new file mode 120000 index 00000000..dc598c56 --- /dev/null +++ b/tv/5pkgs/simple/pinentry-urxvt/lib @@ -0,0 +1 @@ +../lib
\ No newline at end of file diff --git a/tv/5pkgs/simple/q/default.nix b/tv/5pkgs/simple/q/default.nix index e17282e1..2ae71db5 100644 --- a/tv/5pkgs/simple/q/default.nix +++ b/tv/5pkgs/simple/q/default.nix @@ -1,5 +1,5 @@ -{ pkgs, ... }: -with import <stockholm/lib>; +with import ./lib; +{ pkgs }: let q-cal = let diff --git a/tv/5pkgs/simple/q/lib b/tv/5pkgs/simple/q/lib new file mode 120000 index 00000000..dc598c56 --- /dev/null +++ b/tv/5pkgs/simple/q/lib @@ -0,0 +1 @@ +../lib
\ No newline at end of file |