From fc7f2e7770e3e45b4042f0ad01c50ed7d4b5c727 Mon Sep 17 00:00:00 2001 From: Martin Bornhold Date: Fri, 17 Jun 2016 08:34:51 +0200 Subject: [PATCH] nix: Use path to rc_testdata from pkgs.config.rc.sources if present. --- default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/default.nix b/default.nix index fb0a38a1..bb2b8313 100644 --- 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