diff --git a/default.nix b/default.nix --- a/default.nix +++ b/default.nix @@ -9,7 +9,7 @@ # { # # Thoughts on how to configure the dev environment # rc = { -# codeInternalUrl = "https://usr:token@internal-code.rhodecode.com"; +# codeInternalUrl = "https://usr:token@code.rhodecode.com/internal"; # sources = { # rhodecode-vcsserver = "/home/user/work/rhodecode-vcsserver"; # rhodecode-enterprise-ce = "/home/user/work/rhodecode-enterprise-ce"; @@ -24,20 +24,20 @@ args@ , doCheck ? false , ... }: -let pkgs_ = (import {}); in let - # Use nixpkgs from args or import them. We use this indirect approach - # through args to be able to use the name `pkgs` for our customized packages. - # Otherwise we will end up with an infinite recursion. - pkgs = args.pkgs or (import { + pkgs_ = (import {}); +in + +let + pkgs = import { overlays = [ (import ./pkgs/overlays.nix) ]; inherit (pkgs_) system; - }); + }; # Works with the new python-packages, still can fallback to the old # variant. 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 {} -, doCheck ? false +{ doCheck ? false }: let enterprise_ce = import ./default.nix { inherit - doCheck - pkgs; + doCheck; # disable checkPhase for build checkPhase = ''