From 478e88d13e9f9518694676dcfe5dac9ec41cacfe Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Sat, 17 Jun 2017 19:31:25 -0500 Subject: [PATCH 1/3] polyml: 5.6 -> 5.7 - fetchurl -> fetchFromGitHub - use `with stdenv.lib` in meta - add darwin to platforms - add yurrriq to maintainers --- pkgs/development/compilers/polyml/default.nix | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix index 8b5d14e7f5f..3ad8585edf3 100644 --- a/pkgs/development/compilers/polyml/default.nix +++ b/pkgs/development/compilers/polyml/default.nix @@ -1,11 +1,8 @@ -{stdenv, fetchurl, autoreconfHook}: +{ stdenv, fetchFromGitHub, autoreconfHook }: -let - version = "5.6"; -in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "polyml-${version}"; + version = "5.7"; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace configure.ac --replace stdc++ c++ @@ -13,21 +10,21 @@ stdenv.mkDerivation { buildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook; - src = fetchurl { - url = "mirror://sourceforge/polyml/polyml.${version}.tar.gz"; - sha256 = "05d6l2a5m9jf32a8kahwg2p2ph4x9rjf1nsl83331q3gwn5bkmr0"; + src = fetchFromGitHub { + owner = "polyml"; + repo = "polyml"; + rev = "v${version}"; + sha256 = "10nsljmcl0zjbcc7ifc991ypwfwq5gh4rcp5rg4nnb706c6bs16y"; }; - meta = { + meta = with stdenv.lib; { description = "Standard ML compiler and interpreter"; longDescription = '' Poly/ML is a full implementation of Standard ML. ''; homepage = http://www.polyml.org/; - license = stdenv.lib.licenses.lgpl21; - platforms = with stdenv.lib.platforms; linux; - maintainers = [ #Add your name here! - stdenv.lib.maintainers.z77z - ]; + license = licenses.lgpl21; + platforms = with platforms; (linux ++ darwin); + maintainers = with maintainers; [ z77z yurrriq ]; }; } From 6818848facb2648952e9186120573862ef12e69c Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Sun, 18 Jun 2017 11:32:18 -0500 Subject: [PATCH 2/3] polyml: enable libffi and gmp Thanks, @Mic92. --- pkgs/development/compilers/polyml/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix index 3ad8585edf3..1ffc08e969e 100644 --- a/pkgs/development/compilers/polyml/default.nix +++ b/pkgs/development/compilers/polyml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ stdenv, fetchFromGitHub, autoreconfHook, gmp, libffi }: stdenv.mkDerivation rec { name = "polyml-${version}"; @@ -8,7 +8,14 @@ stdenv.mkDerivation rec { substituteInPlace configure.ac --replace stdc++ c++ ''; - buildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook; + buildInputs = [ libffi gmp ] ++ + stdenv.lib.optional stdenv.isDarwin autoreconfHook; + + configureFlags = [ + "--enable-shared" + "--with-system-libffi" + "--with-gmp" + ]; src = fetchFromGitHub { owner = "polyml"; From 0f51a2a0294d9141edfc6592f98ed500f38e0c61 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Sun, 18 Jun 2017 11:39:01 -0500 Subject: [PATCH 3/3] polyml: autoreconfHook -> nativeBuildInputs Thanks, @peterhoeg. --- pkgs/development/compilers/polyml/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix index 1ffc08e969e..390d37dd245 100644 --- a/pkgs/development/compilers/polyml/default.nix +++ b/pkgs/development/compilers/polyml/default.nix @@ -8,8 +8,9 @@ stdenv.mkDerivation rec { substituteInPlace configure.ac --replace stdc++ c++ ''; - buildInputs = [ libffi gmp ] ++ - stdenv.lib.optional stdenv.isDarwin autoreconfHook; + buildInputs = [ libffi gmp ]; + + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook; configureFlags = [ "--enable-shared"