From 78e492190940ba2a98cda7cfdcf03439b0981449 Mon Sep 17 00:00:00 2001 From: notgne2 Date: Mon, 17 Aug 2020 22:42:03 -0700 Subject: [PATCH 1/3] Update 'default.nix' --- default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/default.nix b/default.nix index 866a700..3d83fe7 100644 --- a/default.nix +++ b/default.nix @@ -17,8 +17,8 @@ let pnpm2nix = pkgs.callPackage ( builtins.fetchGit { - url = "https://github.com/notgne2/pnpm2nix.git"; - rev = "909accd35d23664254b43109ee58cd0c3d83a6d9"; + url = "https://github.com/nix-community/pnpm2nix.git"; + rev = "f67be0925a91b92f54d99dbdead7a06920b979ac"; } ) {}; From 45b3a2fdaa1e9a9ee9d961ac2a3a79d3963d72ec Mon Sep 17 00:00:00 2001 From: notgne2 Date: Mon, 17 Aug 2020 22:48:31 -0700 Subject: [PATCH 2/3] Update 'default.nix' --- default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/default.nix b/default.nix index 3d83fe7..de9a7d7 100644 --- a/default.nix +++ b/default.nix @@ -10,11 +10,6 @@ , ... }: let - workingElmPackages = if elmPackages.elmVersion == "0.19.1" then - elmPackages - else - (import {}).elmPackages; - pnpm2nix = pkgs.callPackage ( builtins.fetchGit { url = "https://github.com/nix-community/pnpm2nix.git"; @@ -222,7 +217,7 @@ let src = elmCleanSource src; - buildInputs = with workingElmPackages; [ elm nodeSource ]; + buildInputs = with elmPackages; [ elm nodeSource ]; patchPhase = '' ln -sf ${nodeSource}/node_modules . @@ -248,7 +243,7 @@ let export NODE_PATH=$PWD/node_modules ''; - buildPhase = workingElmPackages.fetchElmDeps { + buildPhase = elmPackages.fetchElmDeps { elmPackages = import (src + "/elm-srcs.nix"); registryDat = src + "/registry.dat"; elmVersion = "0.19.1"; From 98176397b5623d11af3e1fe2591ecc8da3ac0407 Mon Sep 17 00:00:00 2001 From: notgne2 Date: Mon, 17 Aug 2020 22:50:03 -0700 Subject: [PATCH 3/3] Update 'default.nix' --- default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/default.nix b/default.nix index de9a7d7..0697f7b 100644 --- a/default.nix +++ b/default.nix @@ -7,16 +7,17 @@ , optipng , pngquant , libwebp -, ... -}: -let - pnpm2nix = pkgs.callPackage ( + +, pnpm2nix ? pkgs.callPackage ( builtins.fetchGit { url = "https://github.com/nix-community/pnpm2nix.git"; rev = "f67be0925a91b92f54d99dbdead7a06920b979ac"; } - ) {}; + ) {} +, ... +}: +let nodeCleanSourceFilter = name: type: pkgs.lib.cleanSourceFilter name type && ((baseNameOf name) != "node_modules");