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 | 311cb0f96ea6bc60367bff2996c239e41ef2e11e (patch) | |
| tree | 2397a408e23d4c9ac5140782d730082edf39fb79 /tv | |
| parent | d633848269a6ef23bb1ad7120c148070cd2f511d (diff) | |
| parent | d2d88115572b1b6dfb2e430a238fb2480fbb2fcd (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 6598393..400d179 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 cb59e85..1168f10 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 14527d9..c0df065 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 |