Skip to content

Commit

Permalink
Don't filter the source
Browse files Browse the repository at this point in the history
Source filtering isn't possible right now, due to npmlock2nix reading
the lock file. Follow up on how NixOS/nix#5163
will be resolved.
  • Loading branch information
ilkecan committed Sep 26, 2021
1 parent ed23977 commit 99c60ae
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 20 deletions.
16 changes: 0 additions & 16 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
inputs = {
nixpkgs.url = "nixpkgs/nixos-21.05";
flake-utils.url = "github:numtide/flake-utils";
nix-filter.url = "github:numtide/nix-filter";
# Filtering doesn't work right now, due to npmlock2nix trying to read the
# lock file. Follow up on how https://github.com/NixOS/nix/pull/5163 will
# be resolved.
# nix-filter.url = "github:numtide/nix-filter";
npmlock2nix = {
url = "github:ilkecan/npmlock2nix/";
flake = false;
Expand All @@ -25,7 +28,7 @@
defaultSystems
eachSystem
;
nix-filter = inputs.nix-filter.lib;
# nix-filter = inputs.nix-filter.lib;
nix-utils = inputs.nix-utils.lib;
inherit (nix-utils)
createOverlays
Expand Down Expand Up @@ -56,7 +59,7 @@
{
overlays = createOverlays derivations {
inherit
nix-filter
# nix-filter
nix-utils
;
};
Expand Down
1 change: 0 additions & 1 deletion nix/eez-studio.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
{ lib
, electron
, makeWrapper
, nix-filter
, nix-utils
, nodejs
, npmlock2nix
Expand Down

0 comments on commit 99c60ae

Please sign in to comment.