diff options
| author | makefu <github@syntax-fehler.de> | 2018-06-24 23:43:26 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2018-06-24 23:43:26 +0200 |
| commit | 1b37e5d649f124c6d85fa59d22116e330fe7d032 (patch) | |
| tree | 541efd446c4dc9c5227feb04d432ccc3c4f1e92c /tv | |
| parent | 522148ec0e642b739b79de16aa7fe51832f90a30 (diff) | |
| parent | 9c2584b3c841dc75b1a3a34c252a5a91495d06a2 (diff) | |
Merge branch 'master' of prism:stockholm
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 |