Commit 83a66105 authored by Valentin Reis's avatar Valentin Reis

Fixing the package file so that hydra does not try to find "compiler_path".

parent 7dc4aa5f
No preview for this file type
...@@ -45,14 +45,14 @@ in ...@@ -45,14 +45,14 @@ in
nrBuildUsers = 30; nrBuildUsers = 30;
distributedBuilds = true; distributedBuilds = true;
buildMachines = [ buildMachines = [
{ hostName = "129.114.111.114"; #{ hostName = "129.114.111.114";
maxJobs = 10; #maxJobs = 10;
speedFactor = 1; #speedFactor = 1;
sshKey = "/run/secrets/id_buildfarm"; #sshKey = "/run/secrets/id_buildfarm";
sshUser = "root"; #sshUser = "root";
systems = ["builtin" "x86_64-linux" "i686-linux"]; #systems = ["builtin" "x86_64-linux" "i686-linux"];
supportedFeatures = [ "nixos-test" "benchmark" ]; #supportedFeatures = [ "nixos-test" "benchmark" ];
} #}
{ hostName = "localhost:2210"; { hostName = "localhost:2210";
maxJobs = 10; maxJobs = 10;
speedFactor = 1; speedFactor = 1;
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
packagepins ? import ./pins.nix {inherit (pkgs) stdenv fetchgit fetchgitPrivate;} packagepins ? import ./pins.nix {inherit (pkgs) stdenv fetchgit fetchgitPrivate;}
}: }:
let let
compiler_path = "/opt/intel/compilers_and_libraries_2017.1.132/linux/";
callPackage = pkgs.lib.callPackageWith pkgs; callPackage = pkgs.lib.callPackageWith pkgs;
pythonPackages = pkgs.python27Packages; pythonPackages = pkgs.python27Packages;
utils = with pkgs.lib; rec{ utils = with pkgs.lib; rec{
...@@ -45,7 +46,6 @@ in rec { ...@@ -45,7 +46,6 @@ in rec {
#Intel compilers #Intel compilers
intel = with pkgs; rec { intel = with pkgs; rec {
inherit utils; inherit utils;
compiler_path = "/opt/intel/compilers_and_libraries_2017.1.132/linux/";
icc = callPackage intel/icc { inherit compiler_path; }; icc = callPackage intel/icc { inherit compiler_path; };
mkl = callPackage intel/mkl { inherit compiler_path; }; mkl = callPackage intel/mkl { inherit compiler_path; };
WrappedICC = (import ../patches/cc-wrapper { WrappedICC = (import ../patches/cc-wrapper {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment