Merge remote-tracking branch 'origin/staging/jeschli'

8 files changed, 13 insertions, 4 deletions

diff --git a/jeschli/5pkgs/simple/xmonad-jeschli/default.nix b/jeschli/5pkgs/simple/xmonad-jeschli/default.nix
index fa03fd4..5aa3c2f 100644
--- a/jeschli/5pkgs/simple/xmonad-jeschli/default.nix
+++ b/jeschli/5pkgs/simple/xmonad-jeschli/default.nix
@@ -1,5 +1,5 @@
 { pkgs, ... }:
-pkgs.writeHaskell "xmonad-jeschli" {
+pkgs.writeHaskellPackage "xmonad-jeschli" {
   executables.xmonad = {
     extra-depends = [
       "containers"
diff --git a/jeschli/source.nix b/jeschli/source.nix
index 29cf9d8..fc1413e 100644
--- a/jeschli/source.nix
+++ b/jeschli/source.nix
@@ -7,6 +7,7 @@ host@{ name, secure ? false, override ? {} }: let
   pkgs = import <nixpkgs> {
     overlays = map import [
       <stockholm/krebs/5pkgs>
+      <stockholm/submodules/nix-writers/pkgs>
     ];
   };
 in
diff --git a/mv/source.nix b/mv/source.nix
index 1a7b839..29dfe97 100644
--- a/mv/source.nix
+++ b/mv/source.nix
@@ -7,6 +7,7 @@ host@{ name, override ? {} }: let
   pkgs = import <nixpkgs> {
     overlays = map import [
       <stockholm/krebs/5pkgs>
+      <stockholm/submodules/nix-writers/pkgs>
     ];
   };
 in
diff --git a/nin/source.nix b/nin/source.nix
index ae13c55..a4bf0a9 100644
--- a/nin/source.nix
+++ b/nin/source.nix
@@ -7,6 +7,7 @@ host@{ name, secure ? false }: let
   pkgs = import <nixpkgs> {
     overlays = map import [
       <stockholm/krebs/5pkgs>
+      <stockholm/submodules/nix-writers/pkgs>
     ];
   };
 in
diff --git a/shell.nix b/shell.nix
index bfdf1b3..3695ed3 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,6 +1,11 @@
 let
   lib = import ./lib;
-  pkgs = import <nixpkgs> { overlays = [(import ./krebs/5pkgs)]; };
+  pkgs = import <nixpkgs> {
+    overlays = [
+      (import ./krebs/5pkgs)
+      (import ./submodules/nix-writers/pkgs)
+    ];
+  };
 
 in pkgs.stdenv.mkDerivation {
   name = "stockholm";
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