diff options
| author | jeschli <jeschli@gmail.com> | 2018-07-09 14:31:18 +0200 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2018-07-09 14:31:18 +0200 |
| commit | d1c6baf00e98a0229fc7fd96874623efc8417b05 (patch) | |
| tree | eaba9481ed208af1086690a9c07ca948b047389a /tv | |
| parent | b439342e7533e3f695db8a46576c54d180f56a58 (diff) | |
| parent | d6df7ae483b984b90bdc8d4540301ef394885a98 (diff) | |
Merge remote-tracking branch 'origin/staging/jeschli'
Diffstat (limited to 'tv')
| -rw-r--r-- | tv/2configs/vim.nix | 2 | ||||
| -rw-r--r-- | tv/5pkgs/simple/xmonad-tv/default.nix | 2 | ||||
| -rw-r--r-- | tv/source.nix | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix index 6598393a2..400d179d0 100644 --- a/tv/2configs/vim.nix +++ b/tv/2configs/vim.nix @@ -111,7 +111,7 @@ let { command! -n=0 -bar ShowSyntax :call ShowSyntax() ''; }))) - ((rtp: rtp // { inherit rtp; }) (pkgs.writeOut "vim-tv" { + ((rtp: rtp // { inherit rtp; }) (pkgs.write "vim-tv" { "/syntax/haskell.vim".text = /* vim */ '' syn region String start=+\[[[:alnum:]]*|+ end=+|]+ diff --git a/tv/5pkgs/simple/xmonad-tv/default.nix b/tv/5pkgs/simple/xmonad-tv/default.nix index cb59e8517..1168f10c8 100644 --- a/tv/5pkgs/simple/xmonad-tv/default.nix +++ b/tv/5pkgs/simple/xmonad-tv/default.nix @@ -1,5 +1,5 @@ { pkgs, ... }: -pkgs.writeHaskell "xmonad-tv" { +pkgs.writeHaskellPackage "xmonad-tv" { executables.xmonad = { extra-depends = [ "containers" diff --git a/tv/source.nix b/tv/source.nix index 14527d956..c0df06567 100644 --- a/tv/source.nix +++ b/tv/source.nix @@ -9,6 +9,7 @@ with import <stockholm/lib>; pkgs = import <nixpkgs> { overlays = map import [ <stockholm/krebs/5pkgs> + <stockholm/submodules/nix-writers/pkgs> ]; }; in |