nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-06 20:23:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

smlnjBootstrap: move dependents over to regular smlnj

Browse Source 
smlnjBootstrap seems to exist as a workaround for a failing x86_64-darwin build
of regular smlnj. Now this is fixed, the workaround can be removed.
(aarch64-darwin is being actively worked on by the smlnj project, and currently
is supported by neither derivation.)
This commit is contained in:
Simon Chatterjee 2021-06-26 23:05:58 +01:00
parent 9fdc5e10ee
commit 4a4fc6c9c9
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/smlnj/bootstrap.nix
View File

@ -1,3 +1,7 @@
# This derivation should be redundant, now that regular smlnj works on Darwin,
# and is preserved only for pre-existing direct usage. New use cases should
# just use the regular smlnj derivation.
{ lib, stdenv, fetchurl, cpio, rsync, xar, makeWrapper }: { lib, stdenv, fetchurl, cpio, rsync, xar, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

19
pkgs/top-level/all-packages.nix
View File

@ -12055,6 +12055,7 @@ in
shmig = callPackage ../development/tools/database/shmig { }; shmig = callPackage ../development/tools/database/shmig { };
# smlnjBootstrap should be redundant, now that smlnj works on Darwin natively
smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { }; smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { };
smlnj = callPackage ../development/compilers/smlnj { smlnj = callPackage ../development/compilers/smlnj {
inherit (darwin) Libsystem; inherit (darwin) Libsystem;
@ -30058,11 +30059,7 @@ in
iprover = callPackage ../applications/science/logic/iprover { }; iprover = callPackage ../applications/science/logic/iprover { };
jonprl = callPackage ../applications/science/logic/jonprl { jonprl = callPackage ../applications/science/logic/jonprl { };
smlnj = if stdenv.isDarwin
then smlnjBootstrap
else smlnj;
};
key = callPackage ../applications/science/logic/key { }; key = callPackage ../applications/science/logic/key { };
@ -30121,19 +30118,11 @@ in
tptp = callPackage ../applications/science/logic/tptp {}; tptp = callPackage ../applications/science/logic/tptp {};
celf = callPackage ../applications/science/logic/celf { celf = callPackage ../applications/science/logic/celf { };
smlnj = if stdenv.isDarwin
then smlnjBootstrap
else smlnj;
};
fast-downward = callPackage ../applications/science/logic/fast-downward { }; fast-downward = callPackage ../applications/science/logic/fast-downward { };
twelf = callPackage ../applications/science/logic/twelf { twelf = callPackage ../applications/science/logic/twelf { };
smlnj = if stdenv.isDarwin
then smlnjBootstrap
else smlnj;
};
verifast = callPackage ../applications/science/logic/verifast {}; verifast = callPackage ../applications/science/logic/verifast {};