diff --git a/default.nix b/default.nix index b028c4a..faa823b 100644 --- a/default.nix +++ b/default.nix @@ -14,15 +14,6 @@ let ((baseNameOf name) != "elm-stuff" && (baseNameOf name) != "dist"); elmCleanSource = src: pkgs.lib.cleanSourceWith { filter = elmCleanSourceFilter; inherit src; }; - scrapeNodeDeps = nodePkg: - let - nodeDeps = (builtins.filter (x: builtins.hasAttr "nodejs" x) nodePkg.buildInputs); - in - pkgs.lib.unique (nodeDeps ++ builtins.concatLists (map scrapeNodeDeps nodeDeps)); - - findNodeDep = nodePkg: name: - (builtins.elemAt 0 (builtins.filter (x: x.pname == name) (scrapeNodeDeps nodePkg))); - builderPkg = pnpm2nix.mkPnpmPackage { name = "builder-node-packages"; packageJSON = ./package.json; @@ -84,7 +75,7 @@ let themeColor ? "#000000", backgroundColor ? "#000000", src, - nodePackages ? null, + nodePackages ? [], routes ? [ "/" ], }: let @@ -92,7 +83,7 @@ let name = "${name}-node-sources"; paths = [ builderPkg.lib - ] ++ (if nodePackages != null then [ nodePackages ] else [ ]); + ] ++ nodePackages; }; baseWebpackConfig = builtins.readFile ./webpack.config.js; @@ -184,7 +175,8 @@ let buildPhase = elmPackages.fetchElmDeps { elmPackages = import (src + "/elm-srcs.nix"); - versionsDat = src + "/versions.dat"; + registryDat = src + "/registry.dat"; + elmVersion = "0.19.1"; }; installPhase = '' diff --git a/webpack.config.js b/webpack.config.js index 77aee93..a385c0c 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -132,7 +132,7 @@ module.exports = { } }), new FaviconsWebpackPlugin({ - logo: path.join(__dirname, 'data', 'images', 'logo.png'), + logo: path.join(__dirname, 'data', 'images', 'icon.png'), inject: false, // manually in our template for now cos its fuckd mode: 'webapp', prefix: 'appdata',