From 7a59189afb4f1efea610435a111778ca21dfae8e Mon Sep 17 00:00:00 2001 From: Valentin Reis Date: Tue, 11 Jun 2019 11:07:40 -0500 Subject: [PATCH] py3 test --- pkgs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/default.nix b/pkgs/default.nix index f9aeadd..1c5097b 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -63,7 +63,7 @@ let }; numabench = callPackage ./numabench {src=numabench-src; hwloc = hwloc2;}; excit = callPackage ./excit {src=excit-src;}; - nrm = (callPackage ./nrm {src=nrm-src;}).overrideAttrs (o:{ + nrm = (callPackage ./nrm {pythonPackages=pkgs.python34Full.pkgs; src=nrm-src;}).overrideAttrs (o:{ installPhase=o.installPhase+'' mkdir -p $out/share cp -r nrm/schemas $out/lib/python2.7/site-packages/nrm/ @@ -178,7 +178,7 @@ let candlePkgs = import pkgs.path { overlays = [ candleOverlay ] ; }; - candle = callCandlePackage ./candle {src = candle-src; nrm= nrm;}; + candle = callCandlePackage ./candle {src = candle-src; nrm = nrm;}; # data (static, non source overridable via arguments) openmc-data = fetched openmc/data.json; @@ -275,7 +275,7 @@ let }); # fix for nrm - pyzmq = pkgs.pythonPackages.pyzmq.override { zeromq3 = pkgs.zeromq; }; + pyzmq = pkgs.python34Packages.pyzmq.override { zeromq3 = pkgs.zeromq; }; hwloc2 = pkgs.hwloc.overrideAttrs (old:{ name="hwloc-2"; -- 2.26.2