diff options
Diffstat (limited to 'users/wpcarro/website/habit-screens')
-rw-r--r-- | users/wpcarro/website/habit-screens/default.nix | 9 | ||||
-rw-r--r-- | users/wpcarro/website/habit-screens/shell.nix | 7 |
2 files changed, 7 insertions, 9 deletions
diff --git a/users/wpcarro/website/habit-screens/default.nix b/users/wpcarro/website/habit-screens/default.nix index c042dc8c8021..345e6f010d48 100644 --- a/users/wpcarro/website/habit-screens/default.nix +++ b/users/wpcarro/website/habit-screens/default.nix @@ -1,4 +1,4 @@ -{ pkgs ? <nixpkgs> , ... }: +{ pkgs, ... }: with pkgs; @@ -16,9 +16,9 @@ let inherit name src; buildInputs = [ elmPackages.elm ] - ++ lib.optional outputJavaScript nodePackages_10_x.uglify-js; + ++ lib.optional outputJavaScript nodePackages.uglify-js; - buildPhase = pkgs.elmPackages.fetchElmDeps { + buildPhase = elmPackages.fetchElmDeps { elmPackages = import srcs; elmVersion = "0.19.1"; inherit registryDat; @@ -35,7 +35,7 @@ let ${lib.optionalString outputJavaScript '' echo "minifying ${elmfile module}" uglifyjs $out/${module}.${extension} --compress 'pure_funcs="F2,F3,F4,F5,F6,F7,F8,F9,A2,A3,A4,A5,A6,A7,A8,A9",pure_getters,keep_fargs=false,unsafe_comps,unsafe' \ - | uglifyjs --mangle --output=$out/${module}.min.${extension} + | uglifyjs --mangle --output $out/${module}.min.${extension} ''} '') targets)} ''; @@ -58,4 +58,3 @@ in stdenv.mkDerivation { ''; dontInstall = true; } - diff --git a/users/wpcarro/website/habit-screens/shell.nix b/users/wpcarro/website/habit-screens/shell.nix index 00bb4b0b3edc..afcc0f4d3645 100644 --- a/users/wpcarro/website/habit-screens/shell.nix +++ b/users/wpcarro/website/habit-screens/shell.nix @@ -1,7 +1,6 @@ -let - briefcase = import <briefcase> {}; - pkgs = briefcase.third_party.pkgs; -in pkgs.mkShell { +{ pkgs, ... }: + +pkgs.mkShell { buildInputs = with pkgs.elmPackages; [ elm elm-format |