diff options
| author | makefu <github@syntax-fehler.de> | 2023-09-09 19:42:08 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2023-09-09 19:42:08 +0200 |
| commit | 29d72c898d674d2c18fc0f4a76b5e623de0c3dfe (patch) | |
| tree | fc4b0695c986a1cda6f1fbbbcbe716e203c54fa3 /tv | |
| parent | e157ffa72856e4378aa23b096b2efff233f3cb3d (diff) | |
| parent | 083229d0211096daec08673f743ccc45b1d8a0ac (diff) | |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'tv')
| -rw-r--r-- | tv/1systems/xu/config.nix | 1 | ||||
| -rw-r--r-- | tv/5pkgs/haskell/default.nix | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tv/1systems/xu/config.nix b/tv/1systems/xu/config.nix index 80d16e686..83e17e1bd 100644 --- a/tv/1systems/xu/config.nix +++ b/tv/1systems/xu/config.nix @@ -37,7 +37,6 @@ with import ./lib; gnupg1compat haskellPackages.hledger jq - krebszones mkpasswd netcat netcup diff --git a/tv/5pkgs/haskell/default.nix b/tv/5pkgs/haskell/default.nix index f05223d72..193a2630d 100644 --- a/tv/5pkgs/haskell/default.nix +++ b/tv/5pkgs/haskell/default.nix @@ -4,7 +4,11 @@ let mapNixDir (path: self.callPackage path {}) [ <stockholm/krebs/5pkgs/haskell> ./. - ]; + ] // { + xmonad-tv = self.callPackage ./xmonad-tv { + pager = self.desktop-pager; + }; + }; in self: super: { haskell = super.haskell // { |