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

Merge remote-tracking branch 'upstream/master' into staging

Browse Source
This commit is contained in:
John Ericson
2018-06-14 15:56:00 -04:00
parent cebda2ffd0 4ad049fba0
commit bdf750499e
40 changed files with 310 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/ghcjs-ng/default.nix
View File

@@ -48,7 +48,7 @@ let
stage1Packages = [];
mkStage2 = _: {};
haskellCompilerName = "ghcjs";
haskellCompilerName = "ghcjs-${bootGhcjs.version}";
};
bootGhcjs = haskellLib.justStaticExecutables passthru.bootPkgs.ghcjs;

2
pkgs/development/compilers/ghcjs/base.nix
View File

@@ -174,7 +174,7 @@ in mkDerivation (rec {
isGhcjs = true;
inherit nodejs ghcjsBoot;
socket-io = pkgs.nodePackages."socket.io";
haskellCompilerName = "ghcjs";
haskellCompilerName = "ghcjs-${version}";
# let us assume ghcjs is never actually cross compiled
targetPrefix = "";

8
pkgs/development/compilers/llvm/3.7/default.nix
View File

@@ -16,7 +16,7 @@ let
compiler-rt_src = fetch "compiler-rt" "10c1mz2q4bdq9bqfgr3dirc6hz1h3sq8573srd5q5lr7m7j6jiwx";
clang-tools-extra_src = fetch "clang-tools-extra" "0sxw2l3q5msbrwxv1ck72arggdw6n5ysi929gi69ikniranfv4aa";
tools = let
tools = stdenv.lib.makeExtensible (tools: let
callPackage = newScope (tools // { inherit stdenv isl version fetch; });
in {
llvm = callPackage ./llvm.nix {
@@ -41,9 +41,9 @@ let
};
lldb = callPackage ./lldb.nix {};
};
});
libraries = let
libraries = stdenv.lib.makeExtensible (libraries: let
callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv isl version fetch; });
in {
@@ -54,6 +54,6 @@ let
libcxx = callPackage ./libc++ {};
libcxxabi = callPackage ./libc++abi.nix {};
};
});
in { inherit tools libraries; } // libraries // tools

8
pkgs/development/compilers/llvm/3.8/default.nix
View File

@@ -15,7 +15,7 @@ let
compiler-rt_src = fetch "compiler-rt" "0p0y85c7izndbpg2l816z7z7558axq11d5pwkm4h11sdw7d13w0d";
clang-tools-extra_src = fetch "clang-tools-extra" "15n39r4ssphpaq4a0wzyjm7ilwxb0bch6nrapy8c5s8d49h5qjk6";
tools = let
tools = stdenv.lib.makeExtensible (tools: let
callPackage = newScope (tools // { inherit stdenv isl version fetch; });
in {
llvm = callPackage ./llvm.nix {
@@ -41,9 +41,9 @@ let
};
lldb = callPackage ./lldb.nix {};
};
});
libraries = let
libraries = stdenv.lib.makeExtensible (libraries: let
callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv isl version fetch; });
in {
@@ -54,6 +54,6 @@ let
libcxx = callPackage ./libc++ {};
libcxxabi = callPackage ./libc++abi.nix {};
};
});
in { inherit tools libraries; } // libraries // tools

8
pkgs/development/compilers/llvm/3.9/default.nix
View File

@@ -15,7 +15,7 @@ let
compiler-rt_src = fetch "compiler-rt" "16gc2gdmp5c800qvydrdhsp0bzb97s8wrakl6i8a4lgslnqnf2fk";
clang-tools-extra_src = fetch "clang-tools-extra" "0d9nh7j7brbh9avigcn69dlaihsl9p3cf9s45mw6fxzzvrdvd999";
tools = let
tools = stdenv.lib.makeExtensible (tools: let
callPackage = newScope (tools // { inherit stdenv isl version fetch; });
in {
llvm = callPackage ./llvm.nix {
@@ -41,9 +41,9 @@ let
};
lldb = callPackage ./lldb.nix {};
};
});
libraries = let
libraries = stdenv.lib.makeExtensible (libraries: let
callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv isl version fetch; });
in {
@@ -54,6 +54,6 @@ let
libcxx = callPackage ./libc++ {};
libcxxabi = callPackage ./libc++abi.nix {};
};
});
in { inherit tools libraries; } // libraries // tools

8
pkgs/development/compilers/llvm/4/default.nix
View File

@@ -22,7 +22,7 @@ let
let drv-manpages = drv.override { enableManpages = true; }; in
drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ };
tools = let
tools = stdenv.lib.makeExtensible (tools: let
callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
in {
@@ -52,9 +52,9 @@ let
lld = callPackage ./lld.nix {};
lldb = callPackage ./lldb.nix {};
};
});
libraries = let
libraries = stdenv.lib.makeExtensible (libraries: let
callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
in {
@@ -67,6 +67,6 @@ let
libcxxabi = callPackage ./libc++abi.nix {};
openmp = callPackage ./openmp.nix {};
};
});
in { inherit tools libraries; } // libraries // tools

8
pkgs/development/compilers/llvm/5/default.nix
View File

@@ -22,7 +22,7 @@ let
let drv-manpages = drv.override { enableManpages = true; }; in
drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ };
tools = let
tools = stdenv.lib.makeExtensible (tools: let
callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
in {
@@ -53,9 +53,9 @@ let
lld = callPackage ./lld.nix {};
lldb = callPackage ./lldb.nix {};
};
});
libraries = let
libraries = stdenv.lib.makeExtensible (libraries: let
callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
in {
@@ -68,6 +68,6 @@ let
libcxxabi = callPackage ./libc++abi.nix {};
openmp = callPackage ./openmp.nix {};
};
});
in { inherit tools libraries; } // libraries // tools

8
pkgs/development/compilers/llvm/6/default.nix
View File

@@ -21,7 +21,7 @@ let
let drv-manpages = drv.override { enableManpages = true; }; in
drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ };
tools = let
tools = stdenv.lib.makeExtensible (tools: let
callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
in {
@@ -71,9 +71,9 @@ let
lld = callPackage ./lld.nix {};
lldb = callPackage ./lldb.nix {};
};
});
libraries = let
libraries = stdenv.lib.makeExtensible (libraries: let
callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
in {
@@ -88,6 +88,6 @@ let
libcxxabi = callPackage ./libc++abi.nix {};
openmp = callPackage ./openmp.nix {};
};
});
in { inherit tools libraries; } // libraries // tools

4
pkgs/development/compilers/ponyc/pony-stable.nix
View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "pony-stable-${version}";
version = "0.1.2";
version = "0.1.3";
src = fetchFromGitHub {
owner = "ponylang";
repo = "pony-stable";
rev = version;
sha256 = "1g0508r66qjx857cb1cycq98b0gw7s1zn1l7bplyj1psk8mqh7kz";
sha256 = "0dnj9d35fa0iaka2lsc7cvn9d2qbasknn1c3gbxdyc9drf9vv6kf";
};
buildInputs = [ ponyc ];