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 /lass/3modules | |
| parent | 522148ec0e642b739b79de16aa7fe51832f90a30 (diff) | |
| parent | 9c2584b3c841dc75b1a3a34c252a5a91495d06a2 (diff) | |
Merge branch 'master' of prism:stockholm
Diffstat (limited to 'lass/3modules')
| -rw-r--r-- | lass/3modules/usershadow.nix | 2 | ||||
| -rw-r--r-- | lass/3modules/xjail.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lass/3modules/usershadow.nix b/lass/3modules/usershadow.nix index fc9e63e31..cb2890969 100644 --- a/lass/3modules/usershadow.nix +++ b/lass/3modules/usershadow.nix @@ -45,7 +45,7 @@ "pwstore-fast" "bytestring" ]; - body = pkgs.writeHaskell "passwords" { + body = pkgs.writeHaskellPackage "passwords" { executables.verify_pam = { extra-depends = deps; text = '' diff --git a/lass/3modules/xjail.nix b/lass/3modules/xjail.nix index 325ebcc99..4c0023a76 100644 --- a/lass/3modules/xjail.nix +++ b/lass/3modules/xjail.nix @@ -44,7 +44,7 @@ with import <stockholm/lib>; wm = mkOption { #TODO find type type = types.string; - default = "${pkgs.writeHaskell "xephyrify-xmonad" { + default = "${pkgs.writeHaskellPackage "xephyrify-xmonad" { executables.xmonad = { extra-depends = [ "containers" |