Merge staging-next into staging

This commit is contained in:
github-actions[bot]
2021-01-20 01:20:12 +00:00
committed by GitHub
178 changed files with 771 additions and 606 deletions
+1 -1
View File
@@ -194,7 +194,7 @@ stdenv.mkDerivation (rec {
strictDeps = true;
# Dont add -liconv to LDFLAGS automatically so that GHC will add it itself.
dontAddExtraLibs = true;
dontAddExtraLibs = true;
nativeBuildInputs = [
perl autoconf automake m4 python3 sphinx
+1 -1
View File
@@ -189,7 +189,7 @@ stdenv.mkDerivation (rec {
strictDeps = true;
# Dont add -liconv to LDFLAGS automatically so that GHC will add it itself.
dontAddExtraLibs = true;
dontAddExtraLibs = true;
nativeBuildInputs = [
perl autoconf automake m4 python3 sphinx
+1 -1
View File
@@ -194,7 +194,7 @@ stdenv.mkDerivation (rec {
strictDeps = true;
# Dont add -liconv to LDFLAGS automatically so that GHC will add it itself.
dontAddExtraLibs = true;
dontAddExtraLibs = true;
nativeBuildInputs = [
perl autoconf automake m4 python3 sphinx
+1 -1
View File
@@ -198,7 +198,7 @@ stdenv.mkDerivation (rec {
strictDeps = true;
# Dont add -liconv to LDFLAGS automatically so that GHC will add it itself.
dontAddExtraLibs = true;
dontAddExtraLibs = true;
nativeBuildInputs = [
perl autoconf automake m4 python3 sphinx
+1 -1
View File
@@ -203,7 +203,7 @@ stdenv.mkDerivation (rec {
strictDeps = true;
# Dont add -liconv to LDFLAGS automatically so that GHC will add it itself.
dontAddExtraLibs = true;
dontAddExtraLibs = true;
nativeBuildInputs = [
perl autoconf autoreconfHook automake m4 python3 sphinx
@@ -5,7 +5,7 @@ let
in stdenv.mkDerivation {
pname = "manticore";
version = "2019.12.03";
src = fetchFromGitHub {
owner = "ManticoreProject";
repo = "manticore";
@@ -14,9 +14,9 @@ in stdenv.mkDerivation {
};
enableParallelBuilding = false;
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ coreutils smlnj ];
autoreconfFlags = "-Iconfig -vfi";
@@ -28,8 +28,8 @@ in stdenv.mkDerivation {
mv source repo_checkout
cd repo_checkout
chmod u+w . -R
'';
'';
postPatch = ''
patchShebangs .
substituteInPlace configure.ac --replace 'MANTICORE_ROOT=`pwd`' 'MANTICORE_ROOT=$out/repo_checkout'
@@ -40,14 +40,14 @@ in stdenv.mkDerivation {
meta = {
description = "A parallel, pure variant of Standard ML";
longDescription = ''
longDescription = ''
Manticore is a high-level parallel programming language aimed at
general-purpose applications running on multi-core
processors. Manticore supports parallelism at multiple levels:
explicit concurrency and coarse-grain parallelism via CML-style
constructs and fine-grain parallelism via various light-weight
notations, such as parallel tuple expressions and NESL/Nepal-style
parallel array comprehensions.
parallel array comprehensions.
'';
homepage = "http://manticore.cs.uchicago.edu/";
+1 -1
View File
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
[ (fetchurl {
name = "0007-Fix-ocamlopt-w.r.t.-binutils-2.21.patch";
url = "http://caml.inria.fr/mantis/file_download.php?file_id=418&type=bug";
sha256 = "612a9ac108bbfce2238aa5634123da162f0315dedb219958be705e0d92dcdd8e";
sha256 = "612a9ac108bbfce2238aa5634123da162f0315dedb219958be705e0d92dcdd8e";
})
];