# HG changeset patch # User Martin Bornhold # Date 2016-06-17 06:34:51 # Node ID c0fc5cc3aae807cfe77285a0f8fc368c5ee43f93 # Parent 57b11684917298bf8964853a6d7f9721963aee55 nix: Use path to rc_testdata from pkgs.config.rc.sources if present. diff --git a/default.nix b/default.nix --- a/default.nix +++ b/default.nix @@ -46,6 +46,7 @@ let !elem ext ["egg-info" "pyc"] && !startsWith "result" path; + sources = pkgs.config.rc.sources or {}; rhodecode-enterprise-ce-src = builtins.filterSource src-filter ./.; # Load the generated node packages @@ -199,15 +200,18 @@ let rc_testdata = self.buildPythonPackage rec { name = "rc_testdata-0.7.0"; - src = pkgs.fetchhg { - url = "https://code.rhodecode.com/upstream/rc_testdata"; - rev = "v0.7.0"; - sha256 = "0w3z0zn8lagr707v67lgys23sl6pbi4xg7pfvdbw58h3q384h6rx"; - }; + src = rhodecode-testdata-src; }; }; + rhodecode-testdata-src = sources.rhodecode-testdata or ( + pkgs.fetchhg { + url = "https://code.rhodecode.com/upstream/rc_testdata"; + rev = "v0.7.0"; + sha256 = "0w3z0zn8lagr707v67lgys23sl6pbi4xg7pfvdbw58h3q384h6rx"; + }); + # Apply all overrides and fix the final package set myPythonPackagesUnfix = (extends pythonExternalOverrides