Merge pull request #58466 from vaibhavsagar/bump-polyml

polyml: 5.7.1 -> 5.8
This commit is contained in:
Pascal Wittmann 2019-04-09 11:31:31 +02:00 committed by GitHub
commit e80a667a66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 42 additions and 3 deletions

View File

@ -0,0 +1,38 @@
{ stdenv, fetchFromGitHub, autoreconfHook, gmp, libffi }:
stdenv.mkDerivation rec {
name = "polyml-${version}";
version = "5.7.1";
prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace configure.ac --replace stdc++ c++
'';
buildInputs = [ libffi gmp ];
nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook;
configureFlags = [
"--enable-shared"
"--with-system-libffi"
"--with-gmp"
];
src = fetchFromGitHub {
owner = "polyml";
repo = "polyml";
rev = "v${version}";
sha256 = "0j0wv3ijfrjkfngy7dswm4k1dchk3jak9chl5735dl8yrl8mq755";
};
meta = with stdenv.lib; {
description = "Standard ML compiler and interpreter";
longDescription = ''
Poly/ML is a full implementation of Standard ML.
'';
homepage = https://www.polyml.org/;
license = licenses.lgpl21;
platforms = with platforms; (linux ++ darwin);
maintainers = with maintainers; [ z77z yurrriq ];
};
}

View File

@ -2,7 +2,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "polyml-${version}"; name = "polyml-${version}";
version = "5.7.1"; version = "5.8";
prePatch = stdenv.lib.optionalString stdenv.isDarwin '' prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace configure.ac --replace stdc++ c++ substituteInPlace configure.ac --replace stdc++ c++
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
owner = "polyml"; owner = "polyml";
repo = "polyml"; repo = "polyml";
rev = "v${version}"; rev = "v${version}";
sha256 = "0j0wv3ijfrjkfngy7dswm4k1dchk3jak9chl5735dl8yrl8mq755"; sha256 = "1s7q77bivppxa4vd7gxjj5dbh66qnirfxnkzh1ql69rfx1c057n3";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {

View File

@ -8171,6 +8171,7 @@ in
polyml = callPackage ../development/compilers/polyml { }; polyml = callPackage ../development/compilers/polyml { };
polyml56 = callPackage ../development/compilers/polyml/5.6.nix { }; polyml56 = callPackage ../development/compilers/polyml/5.6.nix { };
polyml57 = callPackage ../development/compilers/polyml/5.7.nix { };
pure = callPackage ../development/interpreters/pure { pure = callPackage ../development/interpreters/pure {
llvm = llvm_35; llvm = llvm_35;
@ -22133,7 +22134,7 @@ in
ifstat-legacy = callPackage ../tools/networking/ifstat-legacy { }; ifstat-legacy = callPackage ../tools/networking/ifstat-legacy { };
isabelle = callPackage ../applications/science/logic/isabelle { isabelle = callPackage ../applications/science/logic/isabelle {
polyml = stdenv.lib.overrideDerivation polyml (attrs: { polyml = stdenv.lib.overrideDerivation polyml57 (attrs: {
configureFlags = [ "--enable-intinf-as-int" "--with-gmp" "--disable-shared" ]; configureFlags = [ "--enable-intinf-as-int" "--with-gmp" "--disable-shared" ];
}); });