# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2018-11-02 13:12:58
# Node ID c2f54fe41a105d13e5da10eac0a9b1e713652927
# Parent  36df69b0335d72805e5eb3dbe850d6a14eb0263c

nix: don't allow overriding the import packages. This causes overlays to fail

diff --git a/default.nix b/default.nix
--- a/default.nix
+++ b/default.nix
@@ -11,18 +11,19 @@ args@
 , ...
 }:
 
-let pkgs_ = (import <nixpkgs> {}); in
+let
+  pkgs_ = (import <nixpkgs> {});
+in
 
 let
-
-  pkgs = args.pkgs or (import <nixpkgs> {
+  pkgs = import <nixpkgs> {
     overlays = [
       (import ./pkgs/overlays.nix)
     ];
     inherit
       (pkgs_)
       system;
-  });
+  };
 
   # Works with the new python-packages, still can fallback to the old
   # variant.
@@ -39,7 +40,7 @@ let
     in
       !builtins.elem (basename path) [
         ".git" ".hg" "__pycache__" ".eggs" ".idea" ".dev"
-        "bower_components" "node_modules"
+        "node_modules" "node_binaries"
         "build" "data" "result" "tmp"] &&
       !builtins.elem ext ["egg-info" "pyc"] &&
       # TODO: johbo: This check is wrong, since "path" contains an absolute path,
diff --git a/release.nix b/release.nix
--- a/release.nix
+++ b/release.nix
@@ -1,14 +1,12 @@
 # This file defines how to "build" for packaging.
 
-{ pkgs ? import <nixpkgs> {}
-, doCheck ? true
+{ doCheck ? true
 }:
 
 let
   vcsserver = import ./default.nix {
     inherit
-      doCheck
-      pkgs;
+      doCheck;
   };
 
 in {