From 4a4fc6c9c91b895f39c0b402426751f2174b43d9 Mon Sep 17 00:00:00 2001 From: Simon Chatterjee Date: Sat, 26 Jun 2021 23:05:58 +0100 Subject: [PATCH] smlnjBootstrap: move dependents over to regular smlnj 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.) --- .../development/compilers/smlnj/bootstrap.nix | 4 ++++ pkgs/top-level/all-packages.nix | 19 ++++--------------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/pkgs/development/compilers/smlnj/bootstrap.nix b/pkgs/development/compilers/smlnj/bootstrap.nix index 91eb9fc8417..aacebd48e9e 100644 --- a/pkgs/development/compilers/smlnj/bootstrap.nix +++ b/pkgs/development/compilers/smlnj/bootstrap.nix @@ -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 }: stdenv.mkDerivation rec { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc045d7d474..0718e299a7b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12055,6 +12055,7 @@ in shmig = callPackage ../development/tools/database/shmig { }; + # smlnjBootstrap should be redundant, now that smlnj works on Darwin natively smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { }; smlnj = callPackage ../development/compilers/smlnj { inherit (darwin) Libsystem; @@ -30058,11 +30059,7 @@ in iprover = callPackage ../applications/science/logic/iprover { }; - jonprl = callPackage ../applications/science/logic/jonprl { - smlnj = if stdenv.isDarwin - then smlnjBootstrap - else smlnj; - }; + jonprl = callPackage ../applications/science/logic/jonprl { }; key = callPackage ../applications/science/logic/key { }; @@ -30121,19 +30118,11 @@ in tptp = callPackage ../applications/science/logic/tptp {}; - celf = callPackage ../applications/science/logic/celf { - smlnj = if stdenv.isDarwin - then smlnjBootstrap - else smlnj; - }; + celf = callPackage ../applications/science/logic/celf { }; fast-downward = callPackage ../applications/science/logic/fast-downward { }; - twelf = callPackage ../applications/science/logic/twelf { - smlnj = if stdenv.isDarwin - then smlnjBootstrap - else smlnj; - }; + twelf = callPackage ../applications/science/logic/twelf { }; verifast = callPackage ../applications/science/logic/verifast {};