Merge remote-tracking branch 'origin/master' into gcc-9
This commit is contained in:
@@ -6,6 +6,7 @@
|
||||
, profiledCompiler ? false
|
||||
, staticCompiler ? false
|
||||
, enableShared ? true
|
||||
, enableLTO ? true
|
||||
, texinfo ? null
|
||||
, perl ? null # optional, for texi2pod (then pod2man)
|
||||
, gmp, mpfr, libmpc, gettext, which
|
||||
@@ -257,7 +258,7 @@ stdenv.mkDerivation ({
|
||||
|
||||
# Basic configuration
|
||||
[
|
||||
"--enable-lto"
|
||||
(if enableLTO then "--enable-lto" else "--disable-lto")
|
||||
"--disable-libstdcxx-pch"
|
||||
"--without-included-gettext"
|
||||
"--with-system-zlib"
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
, profiledCompiler ? false
|
||||
, staticCompiler ? false
|
||||
, enableShared ? true
|
||||
, enableLTO ? true
|
||||
, texinfo ? null
|
||||
, perl ? null # optional, for texi2pod (then pod2man)
|
||||
, gmp, mpfr, libmpc, gettext, which
|
||||
@@ -247,7 +248,7 @@ stdenv.mkDerivation ({
|
||||
|
||||
# Basic configuration
|
||||
[
|
||||
"--enable-lto"
|
||||
(if enableLTO then "--enable-lto" else "--disable-lto")
|
||||
"--disable-libstdcxx-pch"
|
||||
"--without-included-gettext"
|
||||
"--with-system-zlib"
|
||||
|
||||
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
# there are missing dependencies in the Makefile, causing sporadic build failures
|
||||
enableParallelBuilding = false;
|
||||
|
||||
doCheck = true;
|
||||
doCheck = stdenv.isLinux;
|
||||
|
||||
buildInputs = with llvmPackages; [
|
||||
which
|
||||
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = https://ispc.github.io/ ;
|
||||
description = "Intel 'Single Program, Multiple Data' Compiler, a vectorised language";
|
||||
license = licenses.bsd3;
|
||||
platforms = ["x86_64-linux"]; # TODO: buildable on more platforms?
|
||||
platforms = ["x86_64-linux" "x86_64-darwin"]; # TODO: buildable on more platforms?
|
||||
maintainers = [ maintainers.aristid ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "curry-base";
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
src = ./.;
|
||||
libraryHaskellDepends = [
|
||||
base containers directory extra filepath mtl parsec pretty time
|
||||
|
||||
@@ -1,21 +1,23 @@
|
||||
{ mkDerivation, base, Cabal, containers, curry-base, directory
|
||||
, extra, filepath, mtl, network-uri, pretty, process, set-extra
|
||||
, stdenv, transformers
|
||||
{ mkDerivation, base, bytestring, Cabal, containers, curry-base
|
||||
, directory, extra, file-embed, filepath, mtl, network-uri, pretty
|
||||
, process, set-extra, stdenv, template-haskell, transformers
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "curry-frontend";
|
||||
version = "1.0.2";
|
||||
version = "1.0.4";
|
||||
src = ./.;
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
enableSeparateDataOutput = true;
|
||||
libraryHaskellDepends = [
|
||||
base containers curry-base directory extra filepath mtl network-uri
|
||||
pretty process set-extra transformers
|
||||
base bytestring containers curry-base directory extra file-embed
|
||||
filepath mtl network-uri pretty process set-extra template-haskell
|
||||
transformers
|
||||
];
|
||||
executableHaskellDepends = [
|
||||
base containers curry-base directory extra filepath mtl network-uri
|
||||
pretty process set-extra transformers
|
||||
base bytestring containers curry-base directory extra file-embed
|
||||
filepath mtl network-uri pretty process set-extra template-haskell
|
||||
transformers
|
||||
];
|
||||
testHaskellDepends = [ base Cabal curry-base filepath ];
|
||||
homepage = "http://curry-language.org";
|
||||
|
||||
@@ -4,13 +4,13 @@
|
||||
, curl, git, unzip, gnutar, coreutils, sqlite }:
|
||||
|
||||
let
|
||||
name = "pakcs-2.1.2";
|
||||
name = "pakcs-2.2.0";
|
||||
|
||||
# Don't switch to development release without a reason, because its
|
||||
# source updates without version bump. Prefer current release instead.
|
||||
src = fetchurl {
|
||||
url = "https://www.informatik.uni-kiel.de/~pakcs/download/${name}-src.tar.gz";
|
||||
sha256 = "0i0nprli3knc7zlp5qkqkpiq3ny36v52hnvgph376l3ajjds7wf6";
|
||||
sha256 = "0c0a6cp9lwha5i90kv9ya2zi1ggnvkf4gwjfzbffgwwa77s2wz2l";
|
||||
};
|
||||
|
||||
curry-frontend = (haskellPackages.override {
|
||||
|
||||
Reference in New Issue
Block a user