public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cran-packages: sets hydraPlatforms of rpud and CARramps to none since those packages require non-free NVidia drivers

Browse Source
This commit is contained in:
taku0 2014-11-24 14:45:49 +09:00 committed by Peter Simons
parent a28a6999b4
commit ea3c59907f
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/r-modules/cran-packages.nix
View File

@ -12,7 +12,7 @@ let
# #
# some packages, e.g. cncaGUI, require X running while installation, # some packages, e.g. cncaGUI, require X running while installation,
# so that we use xvfb-run if requireX is true. # so that we use xvfb-run if requireX is true.
derive = lib.makeOverridable ({ name, version, sha256, depends ? [], skipTest ? false, requireX ? false }: buildRPackage { derive = lib.makeOverridable ({ name, version, sha256, depends ? [], skipTest ? false, requireX ? false, hydraPlatforms ? R.meta.hydraPlatforms }: buildRPackage {
name = "${name}-${version}"; name = "${name}-${version}";
src = fetchurl { src = fetchurl {
urls = [ urls = [
@ -25,7 +25,7 @@ let
propagatedBuildInputs = depends; propagatedBuildInputs = depends;
nativeBuildInputs = depends; nativeBuildInputs = depends;
meta.homepage = "http://cran.r-project.org/web/packages/${name}/"; meta.homepage = "http://cran.r-project.org/web/packages/${name}/";
meta.hydraPlatforms = R.meta.hydraPlatforms; meta.hydraPlatforms = hydraPlatforms;
}); });
# Overrides package definitions with nativeBuildInputs. # Overrides package definitions with nativeBuildInputs.
@ -38,7 +38,7 @@ let
# results in # results in
# #
# { # {
# foo = overrideDerivation old.foo (attrs: { # foo = old.foo.overrideDerivation (attrs: {
# nativeBuildInputs = attrs.nativeBuildInputs ++ [ pkgs.bar ]; # nativeBuildInputs = attrs.nativeBuildInputs ++ [ pkgs.bar ];
# }); # });
# } # }
@ -48,7 +48,7 @@ let
nameValuePairs = map (name: rec { nameValuePairs = map (name: rec {
inherit name; inherit name;
nativeBuildInputs = builtins.getAttr name overrides; nativeBuildInputs = builtins.getAttr name overrides;
value = overrideDerivation (builtins.getAttr name old) (attrs: { value = (builtins.getAttr name old).overrideDerivation (attrs: {
nativeBuildInputs = attrs.nativeBuildInputs ++ nativeBuildInputs; nativeBuildInputs = attrs.nativeBuildInputs ++ nativeBuildInputs;
}); });
}) attrNames; }) attrNames;
@ -65,7 +65,7 @@ let
# results in # results in
# #
# { # {
# foo = overrideDerivation old.foo (attrs: { # foo = old.foo.overrideDerivation (attrs: {
# buildInputs = attrs.buildInputs ++ [ pkgs.bar ]; # buildInputs = attrs.buildInputs ++ [ pkgs.bar ];
# }); # });
# } # }
@ -75,7 +75,7 @@ let
nameValuePairs = map (name: rec { nameValuePairs = map (name: rec {
inherit name; inherit name;
buildInputs = builtins.getAttr name overrides; buildInputs = builtins.getAttr name overrides;
value = overrideDerivation (builtins.getAttr name old) (attrs: { value = (builtins.getAttr name old).overrideDerivation (attrs: {
buildInputs = attrs.buildInputs ++ buildInputs; buildInputs = attrs.buildInputs ++ buildInputs;
}); });
}) attrNames; }) attrNames;
@ -145,7 +145,7 @@ let
old3 = old2 // (overrideNativeBuildInputs packagesWithNativeBuildInputs old2); old3 = old2 // (overrideNativeBuildInputs packagesWithNativeBuildInputs old2);
old4 = old3 // (overrideBuildInputs packagesWithBuildInputs old3); old4 = old3 // (overrideBuildInputs packagesWithBuildInputs old3);
old = old4; old = old4;
in old // (import ./default-overrides.nix overrideDerivation pkgs old new); in old // (import ./default-overrides.nix stdenv overrideDerivation pkgs old new);
# Recursive override pattern. # Recursive override pattern.

8
pkgs/development/r-modules/default-overrides.nix
View File

@ -1,4 +1,4 @@
overrideDerivation: pkgs: old: new: { stdenv: overrideDerivation: pkgs: old: new: {
RcppArmadillo = overrideDerivation old.RcppArmadillo (attrs: { RcppArmadillo = overrideDerivation old.RcppArmadillo (attrs: {
patchPhase = "patchShebangs configure"; patchPhase = "patchShebangs configure";
}); });
@ -81,7 +81,8 @@ overrideDerivation: pkgs: old: new: {
CUDA_HOME = "${pkgs.cudatoolkit}"; CUDA_HOME = "${pkgs.cudatoolkit}";
}); });
CARramps = overrideDerivation old.CARramps (attrs: { # It seems that we cannot override meta attributes with overrideDerivation.
CARramps = overrideDerivation (old.CARramps.override { hydraPlatforms = stdenv.lib.platforms.none; }) (attrs: {
patches = [ ./patches/CARramps.patch ]; patches = [ ./patches/CARramps.patch ];
configureFlags = [ configureFlags = [
"--with-cuda-home=${pkgs.cudatoolkit}" "--with-cuda-home=${pkgs.cudatoolkit}"
@ -95,7 +96,8 @@ overrideDerivation: pkgs: old: new: {
CUDA_INC_PATH = "${pkgs.cudatoolkit}/usr_include"; CUDA_INC_PATH = "${pkgs.cudatoolkit}/usr_include";
}); });
rpud = overrideDerivation old.rpud (attrs: { # It seems that we cannot override meta attributes with overrideDerivation.
rpud = overrideDerivation (old.rpud.override { hydraPlatforms = stdenv.lib.platforms.none; }) (attrs: {
patches = [ ./patches/rpud.patch ]; patches = [ ./patches/rpud.patch ];
CUDA_HOME = "${pkgs.cudatoolkit}"; CUDA_HOME = "${pkgs.cudatoolkit}";
}); });