Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ba1330b12e65
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bdb731a57ad6
Choose a head ref
  • 4 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 18, 2017

  1. polyml: 5.6 -> 5.7 

    - fetchurl -> fetchFromGitHub
- use `with stdenv.lib` in meta
- add darwin to platforms
- add yurrriq to maintainers
    @yurrriq
    yurrriq committed Jun 18, 2017
    Copy the full SHA
    478e88d View commit details

  2. polyml: enable libffi and gmp 

    Thanks, @Mic92.
    @yurrriq
    yurrriq committed Jun 18, 2017
    Copy the full SHA
    6818848 View commit details

  3. polyml: autoreconfHook -> nativeBuildInputs 

    Thanks, @peterhoeg.
    @yurrriq
    yurrriq committed Jun 18, 2017
    Copy the full SHA
    0f51a2a View commit details

  4. Merge pull request #26683 from yurrriq/update-polyml 

    polyml: 5.6 -> 5.7
    @Mic92
    Mic92 authored Jun 18, 2017
    Copy the full SHA
    bdb731a View commit details
Showing with 21 additions and 16 deletions.
  1. +21 −16 pkgs/development/compilers/polyml/default.nix
37 changes: 21 additions & 16 deletions pkgs/development/compilers/polyml/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,38 @@
{stdenv, fetchurl, autoreconfHook}:
{ stdenv, fetchFromGitHub, autoreconfHook, gmp, libffi }:

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++
'';

buildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook;
buildInputs = [ libffi gmp ];

nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook;

configureFlags = [
"--enable-shared"
"--with-system-libffi"
"--with-gmp"
];

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 ];
};
}