diff options
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r-- | pkgs/development/compilers/ghc/8.10.2-binary.nix | 6 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/9.0.1.nix | 247 | ||||
-rw-r--r-- | pkgs/development/compilers/openjdk/11.nix | 1 | ||||
-rw-r--r-- | pkgs/development/compilers/openjdk/default.nix | 1 | ||||
-rw-r--r-- | pkgs/development/compilers/picat/default.nix | 7 | ||||
-rw-r--r-- | pkgs/development/compilers/ponyc/default.nix | 98 | ||||
-rw-r--r-- | pkgs/development/compilers/ponyc/make-safe-for-sandbox.patch | 93 | ||||
-rw-r--r-- | pkgs/development/compilers/ponyc/pony-corral.nix | 25 |
8 files changed, 437 insertions, 41 deletions
diff --git a/pkgs/development/compilers/ghc/8.10.2-binary.nix b/pkgs/development/compilers/ghc/8.10.2-binary.nix index 87d341a10f1f..baa1d879b53e 100644 --- a/pkgs/development/compilers/ghc/8.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/8.10.2-binary.nix @@ -1,8 +1,7 @@ { stdenv , fetchurl, perl, gcc -, ncurses6, gmp, glibc, libiconv +, ncurses6, gmp, glibc, libiconv, numactl , llvmPackages -, ... }: # Prebuilt only does native @@ -13,7 +12,8 @@ let libPath = stdenv.lib.makeLibraryPath ([ ncurses6 gmp - ] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv); + ] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv + ++ stdenv.lib.optional (stdenv.hostPlatform.isAarch64) numactl); libEnvVar = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "DY" + "LD_LIBRARY_PATH"; diff --git a/pkgs/development/compilers/ghc/9.0.1.nix b/pkgs/development/compilers/ghc/9.0.1.nix new file mode 100644 index 000000000000..23daee56a75f --- /dev/null +++ b/pkgs/development/compilers/ghc/9.0.1.nix @@ -0,0 +1,247 @@ +{ stdenv, pkgsBuildTarget, targetPackages + +# build-tools +, bootPkgs +, autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx +, bash + +, libiconv ? null, ncurses + +, # GHC can be built with system libffi or a bundled one. + libffi ? null + +, useLLVM ? !stdenv.targetPlatform.isx86 +, # LLVM is conceptually a run-time-only depedendency, but for + # non-x86, we need LLVM to bootstrap later stages, so it becomes a + # build-time dependency too. + buildLlvmPackages, llvmPackages + +, # If enabled, GHC will be built with the GPL-free but slower integer-simple + # library instead of the faster but GPLed integer-gmp library. + enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp + +, # If enabled, use -fPIC when compiling static libs. + enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform + + # aarch64 outputs otherwise exceed 2GB limit +, enableProfiledLibs ? !stdenv.targetPlatform.isAarch64 + +, # Whether to build dynamic libs for the standard library (on the target + # platform). Static libs are always built. + enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt + +, # Whether to build terminfo. + enableTerminfo ? !stdenv.targetPlatform.isWindows + +, # What flavour to build. An empty string indicates no + # specific flavour and falls back to ghc default values. + ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) + (if useLLVM then "perf-cross" else "perf-cross-ncg") + +, # Whether to disable the large address space allocator + # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ + disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64 +}: + +assert !enableIntegerSimple -> gmp != null; + +let + inherit (stdenv) buildPlatform hostPlatform targetPlatform; + + inherit (bootPkgs) ghc; + + # TODO(@Ericson2314) Make unconditional + targetPrefix = stdenv.lib.optionalString + (targetPlatform != hostPlatform) + "${targetPlatform.config}-"; + + buildMK = '' + BuildFlavour = ${ghcFlavour} + ifneq \"\$(BuildFlavour)\" \"\" + include mk/flavours/\$(BuildFlavour).mk + endif + DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} + INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} + '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + CrossCompilePrefix = ${targetPrefix} + HADDOCK_DOCS = NO + BUILD_SPHINX_HTML = NO + BUILD_SPHINX_PDF = NO + '' + stdenv.lib.optionalString (!enableProfiledLibs) '' + GhcLibWays = "v dyn" + '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' + GhcLibHcOpts += -fPIC + GhcRtsHcOpts += -fPIC + '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + EXTRA_CC_OPTS += -std=gnu99 + ''; + + # Splicer will pull out correct variations + libDeps = platform: stdenv.lib.optional enableTerminfo ncurses + ++ [libffi] + ++ stdenv.lib.optional (!enableIntegerSimple) gmp + ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; + + toolsForTarget = [ + pkgsBuildTarget.targetPackages.stdenv.cc + ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; + + targetCC = builtins.head toolsForTarget; + + # ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 + # see #84670 and #49071 for more background. + useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl; + +in +stdenv.mkDerivation (rec { + version = "9.0.0.20200925"; + name = "${targetPrefix}ghc-${version}"; + + src = fetchurl { + url = "https://downloads.haskell.org/ghc/9.0.1-alpha1/ghc-${version}-src.tar.xz"; + sha256 = "1c6vgic0bx0c4c6gszq7znvc5gxf0lgh630283mivbs1lyiqj88l"; + }; + + enableParallelBuilding = true; + + outputs = [ "out" "doc" ]; + + postPatch = "patchShebangs ."; + + # GHC is a bit confused on its cross terminology. + preConfigure = '' + for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do + export "''${env#TARGET_}=''${!env}" + done + # GHC is a bit confused on its cross terminology, as these would normally be + # the *host* tools. + export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" + export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" + # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString useLdGold ".gold"}" + export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" + export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" + export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" + export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" + export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" + export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" + + echo -n "${buildMK}" > mk/build.mk + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets + '' + stdenv.lib.optionalString targetPlatform.isMusl '' + echo "patching llvm-targets for musl targets..." + echo "Cloning these existing '*-linux-gnu*' targets:" + grep linux-gnu llvm-targets | sed 's/^/ /' + echo "(go go gadget sed)" + sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets + echo "llvm-targets now contains these '*-linux-musl*' targets:" + grep linux-musl llvm-targets | sed 's/^/ /' + + echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" + # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) + for x in configure aclocal.m4; do + substituteInPlace $x \ + --replace '*-android*|*-gnueabi*)' \ + '*-android*|*-gnueabi*|*-musleabi*)' + done + ''; + + # TODO(@Ericson2314): Always pass "--target" and always prefix. + configurePlatforms = [ "build" "host" ] + ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + + # `--with` flags for libraries needed for RTS linker + configureFlags = [ + "--datadir=$doc/share/doc/ghc" + "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + ] ++ stdenv.lib.optionals (libffi != null) [ + "--with-system-libffi" + "--with-ffi-includes=${targetPackages.libffi.dev}/include" + "--with-ffi-libraries=${targetPackages.libffi.out}/lib" + ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ + "--with-gmp-includes=${targetPackages.gmp.dev}/include" + "--with-gmp-libraries=${targetPackages.gmp.out}/lib" + ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ + "--with-iconv-includes=${libiconv}/include" + "--with-iconv-libraries=${libiconv}/lib" + ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ + "--enable-bootstrap-with-devel-snapshot" + ] ++ stdenv.lib.optionals useLdGold [ + "CFLAGS=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" + ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [ + "--disable-large-address-space" + ]; + + # Make sure we never relax`$PATH` and hooks support for compatibility. + strictDeps = true; + + # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. + dontAddExtraLibs = true; + + nativeBuildInputs = [ + perl autoconf automake m4 python3 sphinx + ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + ]; + + # For building runtime libs + depsBuildTarget = toolsForTarget; + + buildInputs = [ perl bash ] ++ (libDeps hostPlatform); + + propagatedBuildInputs = [ targetPackages.stdenv.cc ] + ++ stdenv.lib.optional useLLVM llvmPackages.llvm; + + depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform); + depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform); + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + + checkTarget = "test"; + + hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; + + postInstall = '' + # Install the bash completion file. + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc + + # Patch scripts to include "readelf" and "cat" in $PATH. + for i in "$out/bin/"*; do + test ! -h $i || continue + egrep --quiet '^#!' <(head -n 1 $i) || continue + sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i + done + ''; + + passthru = { + inherit bootPkgs targetPrefix; + + inherit llvmPackages; + inherit enableShared; + + # Our Cabal compiler name + haskellCompilerName = "ghc-${version}"; + }; + + meta = { + homepage = "http://haskell.org/ghc"; + description = "The Glasgow Haskell Compiler"; + maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + inherit (ghc.meta) license platforms; + }; + +} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt { + dontStrip = true; + dontPatchELF = true; + noAuditTmpdir = true; +}) diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index 5011fd39e2f0..30b56ecba11c 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -85,6 +85,7 @@ let mkdir -p $out/share ln -s $out/lib/openjdk/include $out/include ln -s $out/lib/openjdk/man $out/share/man + ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip # jni.h expects jni_md.h to be in the header search path. ln -s $out/include/linux/*_md.h $out/include/ diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index e51e55402675..3dd74f73a7ec 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -91,6 +91,7 @@ let mkdir -p $out/share ln -s $out/lib/openjdk/include $out/include ln -s $out/lib/openjdk/man $out/share/man + ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip # jni.h expects jni_md.h to be in the header search path. ln -s $out/include/linux/*_md.h $out/include/ diff --git a/pkgs/development/compilers/picat/default.nix b/pkgs/development/compilers/picat/default.nix index 91e29a740c2f..eba45ed8bbf3 100644 --- a/pkgs/development/compilers/picat/default.nix +++ b/pkgs/development/compilers/picat/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { pname = "picat"; - version = "2.8-2"; + version = "3.0"; src = fetchurl { - url = "http://picat-lang.org/download/picat28_src.tar.gz"; - sha256 = "10hf2fxxbpq28gi39icr8c9wafdiy9ddfkk6l4rx7kkqyrdi7n85"; + url = "http://picat-lang.org/download/picat30_src.tar.gz"; + sha256 = "0ivqp4ifknc019rb975vx5j3rmr69x2f3ig7ybb38wm5zx5mljgg"; }; buildInputs = [ zlib ]; @@ -16,6 +16,7 @@ stdenv.mkDerivation { else throw "Unsupported system"; hardeningDisable = [ "format" ]; + enableParallelBuilding = true; buildPhase = '' cd emu diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index e48e454a0a40..566fd7be311c 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -1,64 +1,92 @@ -{ stdenv, fetchFromGitHub, llvm, makeWrapper, pcre2, coreutils, which, libressl, libxml2, +{ stdenv, fetchFromGitHub, fetchurl, makeWrapper, pcre2, coreutils, which, libressl, libxml2, cmake, z3, substituteAll, cc ? stdenv.cc, lto ? !stdenv.isDarwin }: -stdenv.mkDerivation ( rec { +stdenv.mkDerivation (rec { pname = "ponyc"; - version = "0.33.2"; + version = "0.38.1"; src = fetchFromGitHub { owner = "ponylang"; repo = pname; rev = version; - sha256 = "0jcdr1r3g8sm3q9fcc87d6x98fg581n6hb90hz7r08mzn4bwvysw"; + sha256 = "1hk810k9h3bl641pgw91y4x2qw67rvbapx6p2pk9qz5p7nfcn7qh"; + +# Due to a bug in LLVM 9.x, ponyc has to include its own vendored patched +# LLVM. (The submodule is a specific tag in the LLVM source tree). +# +# The pony developers are currently working to get off 9.x as quickly +# as possible so hopefully in a few revisions this package build will +# become a lot simpler. +# +# https://reviews.llvm.org/rG9f4f237e29e7150dfcf04ae78fa287d2dc8d48e2 + + fetchSubmodules = true; }; - buildInputs = [ llvm makeWrapper which libxml2 ]; + ponygbenchmark = fetchurl { + url = https://github.com/google/benchmark/archive/v1.5.0.tar.gz; + sha256 = "06i2cr4rj126m1zfz0x1rbxv1mw1l7a11mzal5kqk56cdrdicsiw"; + name = "v1.5.0.tar.gz"; + }; + + buildInputs = [ makeWrapper which libxml2 cmake z3 ]; propagatedBuildInputs = [ cc ]; - # Disable problematic networking tests - patches = [ ./disable-tests.patch ]; + # Sandbox disallows network access, so disabling problematic networking tests + patches = [ + ./disable-tests.patch + (substituteAll { + src = ./make-safe-for-sandbox.patch; + googletest = fetchurl { + url = https://github.com/google/googletest/archive/release-1.8.1.tar.gz; + sha256 = "17147961i01fl099ygxjx4asvjanwdd446nwbq9v8156h98zxwcv"; + name = "release-1.8.1.tar.gz"; + }; + }) + ]; + + postUnpack = '' + mkdir -p source/build/build_libs/gbenchmark-prefix/src + tar -C source/build/build_libs/gbenchmark-prefix/src -zxvf "$ponygbenchmark" + mv source/build/build_libs/gbenchmark-prefix/src/benchmark-1.5.0 \ + source/build/build_libs/gbenchmark-prefix/src/benchmark + ''; - preBuild = '' - # Fix tests - substituteInPlace packages/process/_test.pony \ - --replace '"/bin/' '"${coreutils}/bin/' - substituteInPlace packages/process/_test.pony \ - --replace '=/bin' "${coreutils}/bin" + dontConfigure = true; - # Disabling the stdlib tests - substituteInPlace Makefile-ponyc \ - --replace 'test-ci: all check-version test-core test-stdlib-debug test-stdlib' 'test-ci: all check-version test-core' + postPatch = '' + # Patching Vendor LLVM + patchShebangs --host build/build_libs/gbenchmark-prefix/src/benchmark/tools/*.py + patch -d lib/llvm/src/ -p1 < lib/llvm/patches/2020-09-01-is-trivially-copyable.diff + patch -d lib/llvm/src/ -p1 < lib/llvm/patches/2020-01-07-01-c-exports.diff + patch -d lib/llvm/src/ -p1 < lib/llvm/patches/2019-12-23-01-jit-eh-frames.diff - # Remove impure system refs + substituteInPlace packages/process/_test.pony \ + --replace '"/bin/' '"${coreutils}/bin/' \ + --replace '=/bin' "${coreutils}/bin" substituteInPlace src/libponyc/pkg/package.c \ --replace "/usr/local/lib" "" \ --replace "/opt/local/lib" "" + ''; - for file in `grep -irl '/usr/local/opt/libressl/lib' ./*`; do - substituteInPlace $file --replace '/usr/local/opt/libressl/lib' "${stdenv.lib.getLib libressl}/lib" - done - export LLVM_CONFIG=${llvm}/bin/llvm-config - '' + stdenv.lib.optionalString ((!stdenv.isDarwin) && (!cc.isClang) && lto) '' - export LTO_PLUGIN=`find ${cc.cc}/ -name liblto_plugin.so` - '' + stdenv.lib.optionalString ((!stdenv.isDarwin) && (cc.isClang) && lto) '' - export LTO_PLUGIN=`find ${cc.cc}/ -name LLVMgold.so` + preBuild = '' + make libs build_flags=-j$NIX_BUILD_CORES + make configure build_flags=-j$NIX_BUILD_CORES ''; - makeFlags = [ "config=release" ] ++ stdenv.lib.optionals stdenv.isDarwin [ "bits=64" ] - ++ stdenv.lib.optionals (stdenv.isDarwin && (!lto)) [ "lto=no" ]; + makeFlags = [ + "PONYC_VERSION=${version}" + "prefix=${placeholder "out"}" + ] + ++ stdenv.lib.optionals stdenv.isDarwin [ "bits=64" ] + ++ stdenv.lib.optionals (stdenv.isDarwin && (!lto)) [ "lto=no" ]; enableParallelBuilding = true; doCheck = true; - checkTarget = "test-ci"; - - NIX_CFLAGS_COMPILE = [ "-Wno-error=redundant-move" ]; - - preCheck = '' - export PONYPATH="$out/lib:${stdenv.lib.makeLibraryPath [ pcre2 libressl ]}" - ''; + NIX_CFLAGS_COMPILE = [ "-Wno-error=redundant-move" "-Wno-error=implicit-fallthrough" ]; installPhase = '' make config=release prefix=$out '' @@ -79,7 +107,7 @@ stdenv.mkDerivation ( rec { description = "Pony is an Object-oriented, actor-model, capabilities-secure, high performance programming language"; homepage = "https://www.ponylang.org"; license = licenses.bsd2; - maintainers = with maintainers; [ doublec kamilchm patternspandemic ]; + maintainers = with maintainers; [ doublec kamilchm patternspandemic redvers ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; }) diff --git a/pkgs/development/compilers/ponyc/make-safe-for-sandbox.patch b/pkgs/development/compilers/ponyc/make-safe-for-sandbox.patch new file mode 100644 index 000000000000..b07763a475d2 --- /dev/null +++ b/pkgs/development/compilers/ponyc/make-safe-for-sandbox.patch @@ -0,0 +1,93 @@ +--- a/lib/CMakeLists.txt 2020-09-27 02:39:12.862940179 +0000 ++++ b/lib/CMakeLists.txt 2020-09-27 02:39:16.451957865 +0000 +@@ -10,12 +10,12 @@ + endif() + + ExternalProject_Add(gbenchmark +- URL https://github.com/google/benchmark/archive/v1.5.0.tar.gz ++ SOURCE_DIR gbenchmark-prefix/src/benchmark + CMAKE_ARGS -DCMAKE_BUILD_TYPE=${PONYC_LIBS_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DBENCHMARK_ENABLE_GTEST_TESTS=OFF -DCMAKE_CXX_FLAGS=-fpic --no-warn-unused-cli + ) + + ExternalProject_Add(googletest +- URL https://github.com/google/googletest/archive/release-1.8.1.tar.gz ++ URL @googletest@ + CMAKE_ARGS -DCMAKE_BUILD_TYPE=${PONYC_LIBS_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_CXX_FLAGS=-fpic -Dgtest_force_shared_crt=ON --no-warn-unused-cli + ) + +@@ -28,75 +28,6 @@ + COMPONENT library + ) + +-find_package(Git) +- +-set(LLVM_DESIRED_HASH "c1a0a213378a458fbea1a5c77b315c7dce08fd05") +-set(PATCHES_DESIRED_HASH "9063f83d727bf042a1232420e168c1ea192bf6a2960d35e57123245b630eb923") +- +-if(GIT_FOUND) +- if(EXISTS "${PROJECT_SOURCE_DIR}/../.git") +- # Update submodules as needed +- option(GIT_SUBMODULE "Check submodules during build" ON) +- if(GIT_SUBMODULE) +- message(STATUS "Updating submodules...") +- execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- RESULT_VARIABLE git_submod_result) +- #message("git_submod_result ${git_submod_result}") +- if(NOT git_submod_result EQUAL "0") +- message(FATAL_ERROR "git submodule update --init --recursive failed with ${git_submod_result}, please checkout submodules") +- endif() +- +- # we check to make sure the submodule hash matches +- # the reason the submodule hash is in this file is to be able to use this file as a key for caching the libs in CI +- execute_process(COMMAND ${GIT_EXECUTABLE} submodule status +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- OUTPUT_VARIABLE git_submod_output) +- #message("git_submod_output ${git_submod_output}") +- string(FIND "${git_submod_output}" "${LLVM_DESIRED_HASH}" LLVM_SUBMOD_POS) +- if(LLVM_SUBMOD_POS EQUAL "-1") +- message(FATAL_ERROR "Expecting the lib/llvm/src submodule to be at hash '${LLVM_DESIRED_HASH}'; found '${git_submod_output}'; update the LLVM_DESIRED_HASH variable in lib/CMakeLists.txt if you've updated the submodule.") +- endif() +- endif() +- endif() +- +- # Apply patches +- message("Applying patches...") +- file(GLOB PONY_LLVM_PATCHES "${PROJECT_SOURCE_DIR}/llvm/patches/*.diff") +- +- # check to see if the patch hashes match +- set(PATCHES_ACTUAL_HASH "") +- foreach (PATCH ${PONY_LLVM_PATCHES}) +- file(SHA256 ${PATCH} patch_file_hash) +- string(CONCAT PATCHES_ACTUAL_HASH patch_file_hash) +- endforeach() +- string(SHA256 PATCHES_ACTUAL_HASH ${PATCHES_ACTUAL_HASH}) +- if(NOT PATCHES_ACTUAL_HASH EQUAL "${PATCHES_DESIRED_HASH}") +- message(FATAL_ERROR "Patch hash actual ${PATCHES_ACTUAL_HASH} does not match desired ${PATCHES_DESIRED_HASH}") +- endif() +- +- foreach (PATCH ${PONY_LLVM_PATCHES}) +- message(" Checking ${PATCH}") +- execute_process(COMMAND ${GIT_EXECUTABLE} apply --check -p 1 --ignore-whitespace --whitespace=nowarn ${PATCH} +- WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/llvm/src" +- ERROR_VARIABLE _err_out +- RESULT_VARIABLE git_apply_check_result) +- if(git_apply_check_result EQUAL "0") +- message(" Applying ${PATCH}") +- execute_process(COMMAND ${GIT_EXECUTABLE} apply -p 1 --ignore-whitespace --whitespace=nowarn ${PATCH} +- WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/llvm/src" +- RESULT_VARIABLE git_apply_result) +- if(NOT git_apply_result EQUAL "0") +- message(FATAL_ERROR "Unable to apply ${PATCH}") +- endif() +- else() +- message(" Already applied ${PATCH}") +- endif() +- endforeach() +-else() +- message(FATAL_ERROR "Git not found!") +-endif() +- + if (NOT DEFINED LLVM_TARGETS_TO_BUILD) + set(LLVM_TARGETS_TO_BUILD X86) + endif() diff --git a/pkgs/development/compilers/ponyc/pony-corral.nix b/pkgs/development/compilers/ponyc/pony-corral.nix new file mode 100644 index 000000000000..7cf3000e9db1 --- /dev/null +++ b/pkgs/development/compilers/ponyc/pony-corral.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, ponyc }: + +stdenv.mkDerivation ( rec { + pname = "corral"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "ponylang"; + repo = pname; + rev = version; + sha256 = "0kydx4psl6k4n46as9xc5xwbwapibm6g7haxds7y9d392807qfqk"; + }; + + buildInputs = [ ponyc ]; + + installFlags = [ "prefix=${placeholder "out"}" "install" ]; + + meta = with stdenv.lib; { + description = "Corral is a dependency management tool for ponylang (ponyc)"; + homepage = "https://www.ponylang.io"; + license = licenses.bsd2; + maintainers = with maintainers; [ redvers ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + }; +}) |