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

llvmPackages*: refactor to use callPackage, etc.

Browse Source 
Also use recurseIntoAttrs only on the default version (instead of only on 3.4).

The "self" variants (stil) don't build and they're inconsistent
versions. /cc @shlevy (fea2266290).
This commit is contained in:
Vladimír Čunát 2015-07-25 09:13:52 +02:00
parent 99457b40ac
commit 389c90aa86
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/llvm/3.6/default.nix
View File

@ -1,4 +1,4 @@
{ pkgs, newScope, stdenv, isl, fetchurl, overrideCC, wrapCC }:
{ newScope, stdenv, isl, fetchurl, overrideCC, wrapCC }:
let
callPackage = newScope (self // { inherit stdenv isl version fetch; });

25
pkgs/top-level/all-packages.nix
View File

@ -4143,24 +4143,21 @@ let
llvm_36 = llvmPackages_36.llvm;
llvm_35 = llvmPackages_35.llvm;
llvm_34 = llvmPackages_34.llvm;
llvm_33 = llvm_v ../development/compilers/llvm/3.3/llvm.nix;
llvm_33 = callPackage ../development/compilers/llvm/3.3/llvm.nix { };
llvm_v = path: callPackage path { };
llvmPackages = recurseIntoAttrs llvmPackages_36;
llvmPackages = llvmPackages_36;
llvmPackages_34 = recurseIntoAttrs (import ../development/compilers/llvm/3.4 {
inherit stdenv newScope fetchurl;
isl = isl_0_12;
});
llvmPackagesSelf = import ../development/compilers/llvm/3.4 { inherit newScope fetchurl; isl = isl_0_12; stdenv = libcxxStdenv; };
llvmPackages_35 = import ../development/compilers/llvm/3.5 {
inherit pkgs stdenv newScope fetchurl isl;
llvmPackagesSelf = llvmPackages_34.override {
stdenv = libcxxStdenv;
};
llvmPackages_36 = import ../development/compilers/llvm/3.6 {
inherit pkgs stdenv newScope fetchurl isl wrapCC;
llvmPackages_34 = callPackage ../development/compilers/llvm/3.4 {
isl = isl_0_12;
};
llvmPackages_35 = callPackage ../development/compilers/llvm/3.5 { };
llvmPackages_36 = callPackage ../development/compilers/llvm/3.6 {
inherit (stdenvAdapters) overrideCC;
};