From 0059131f54c82e7714d458c0b17335c3364033a4 Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Fri, 28 Apr 2017 21:30:55 -0400 Subject: llvm: Add the LLVM OpenMP components MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Needed to build an executable that uses OpenMP with clang. This includes a header file and a library that clang will link into an executable whose source makes use of ‘omp‘ pragmas. --- pkgs/development/compilers/llvm/4/default.nix | 2 ++ pkgs/development/compilers/llvm/4/openmp.nix | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/compilers/llvm/4/openmp.nix (limited to 'pkgs/development/compilers') diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix index 4be621adb5cf..15918f9c1ebd 100644 --- a/pkgs/development/compilers/llvm/4/default.nix +++ b/pkgs/development/compilers/llvm/4/default.nix @@ -24,6 +24,8 @@ let clang = wrapCC self.clang-unwrapped; + openmp = callPackage ./openmp.nix {}; + libcxxClang = ccWrapperFun { cc = self.clang-unwrapped; isClang = true; diff --git a/pkgs/development/compilers/llvm/4/openmp.nix b/pkgs/development/compilers/llvm/4/openmp.nix new file mode 100644 index 000000000000..c8ba770e2411 --- /dev/null +++ b/pkgs/development/compilers/llvm/4/openmp.nix @@ -0,0 +1,25 @@ +{ stdenv +, fetch +, cmake +, zlib +, llvm +, perl +, version +}: + +stdenv.mkDerivation { + name = "openmp-${version}"; + + src = fetch "openmp" "09kf41zgv551fnv628kqhlwgqkd2bkiwii9gqi6q12djgdddhmfv"; + + buildInputs = [ cmake llvm perl ]; + + enableParallelBuilding = true; + + meta = { + description = "Components required to build an executable OpenMP program"; + homepage = http://openmp.llvm.org/; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.all; + }; +} -- cgit 1.4.1 From 8da31b0e2eb16dd1dbac58545756b075792ac533 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Wed, 10 May 2017 10:33:16 +0200 Subject: fstar: 0.9.2.0 -> 0.9.4.0 --- pkgs/development/compilers/fstar/default.nix | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) (limited to 'pkgs/development/compilers') diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix index 24a4135bde13..00714875ffc2 100644 --- a/pkgs/development/compilers/fstar/default.nix +++ b/pkgs/development/compilers/fstar/default.nix @@ -1,26 +1,37 @@ -{ stdenv, fetchFromGitHub, mono, fsharp, dotnetPackages, z3, ocamlPackages, openssl, makeWrapper }: +{ stdenv, fetchFromGitHub, mono, fsharp, dotnetPackages, z3, ocamlPackages, openssl, makeWrapper, pkgconfig, file }: stdenv.mkDerivation rec { name = "fstar-${version}"; - version = "0.9.2.0"; + version = "0.9.4.0"; src = fetchFromGitHub { owner = "FStarLang"; repo = "FStar"; rev = "v${version}"; - sha256 = "0vrxmxfaslngvbvkzpm1gfl1s34hdsprv8msasxf9sjqc3hlir3l"; + sha256 = "130779p5plsgvz0dkcqycns3vwrvyfl138nq2xdhd3rkdsbyyvb7"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = with ocamlPackages; [ - mono fsharp z3 dotnetPackages.FsLexYacc ocaml findlib ocaml_batteries openssl + mono fsharp z3 dotnetPackages.FsLexYacc ocaml findlib ocaml_batteries + zarith camlp4 yojson pprint openssl pkgconfig file ]; preBuild = '' substituteInPlace src/Makefile --replace "\$(RUNTIME) VS/.nuget/NuGet.exe" "true" + substituteInPlace src/VS/.nuget/NuGet.targets --replace "mono" "true" - source setenv.sh + # Fails with bad interpreter otherwise + patchShebangs src/tools + patchShebangs bin + + export FSharpTargetsPath="$(dirname $(pkg-config FSharp.Core --variable=Libraries))/Microsoft.FSharp.Targets" + # remove hardcoded windows paths + sed -i '/