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: 3265417378b5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a824b76b791f
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Sep 9, 2020

  1. mlton: fix build 

    (cherry picked from commit a7f9d33)
    @gebner
    gebner committed Sep 9, 2020
    Copy the full SHA
    3a8c2b7 View commit details

  2. mlton: use callPackage 

    (cherry picked from commit ad0d43e)
    @gebner
    gebner committed Sep 9, 2020
    Copy the full SHA
    a824b76 View commit details
Showing with 9 additions and 11 deletions.
  1. +6 −11 pkgs/development/compilers/mlton/default.nix
  2. +3 −0 pkgs/development/compilers/mlton/from-git-source.nix
17 changes: 6 additions & 11 deletions pkgs/development/compilers/mlton/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,21 @@
{ stdenv, fetchurl, fetchgit, patchelf, gmp }:
{ callPackage }:

rec {
mlton20130715 = import ./20130715.nix {
inherit stdenv fetchurl patchelf gmp;
};
mlton20130715 = callPackage ./20130715.nix {};

mlton20180207Binary = import ./20180207-binary.nix {
inherit stdenv fetchurl patchelf gmp;
};
mlton20180207Binary = callPackage ./20180207-binary.nix {};

mlton20180207 = import ./from-git-source.nix {
mlton20180207 = callPackage ./from-git-source.nix {
mltonBootstrap = mlton20180207Binary;
version = "20180207";
rev = "on-20180207-release";
sha256 = "00rdd2di5x1dzac64il9z05m3fdzicjd3226wwjyynv631jj3q2a";
inherit stdenv fetchgit gmp;
};

mltonHEAD = import ./from-git-source.nix {
mltonHEAD = callPackage ./from-git-source.nix {
mltonBootstrap = mlton20180207Binary;
version = "HEAD";
rev = "e149c9917cfbfe6aba5c986a958ed76d5cc6cfde";
sha256 = "0a0j1i0f0fxw2my1309srq5j3vz0kawrrln01gxms2m5hy5dl50d";
inherit stdenv fetchgit gmp;
};
}
3 changes: 3 additions & 0 deletions pkgs/development/compilers/mlton/from-git-source.nix
View file
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@
, sha256
, stdenv
, version
, which
}:

stdenv.mkDerivation {
@@ -16,6 +17,8 @@ stdenv.mkDerivation {
inherit url rev sha256;
};

nativeBuildInputs = [ which ];

buildInputs = [mltonBootstrap gmp];

preBuild = ''