From 7107e397dd6fa19250b4bdcba9b8d461dfe984b8 Mon Sep 17 00:00:00 2001
From: Antonio Nuno Monteiro <anmonteiro@gmail.com>
Date: Sun, 8 Mar 2020 10:44:48 -0700
Subject: bs-platform: 7.0.1 -> 7.2.0

---
 .../compilers/bs-platform/build-bs-platform.nix    | 23 +++++++++++++++-------
 pkgs/development/compilers/bs-platform/default.nix |  8 ++++----
 2 files changed, 20 insertions(+), 11 deletions(-)

(limited to 'pkgs/development/compilers')

diff --git a/pkgs/development/compilers/bs-platform/build-bs-platform.nix b/pkgs/development/compilers/bs-platform/build-bs-platform.nix
index 528fa5e4f420..e4e7b7e8619a 100644
--- a/pkgs/development/compilers/bs-platform/build-bs-platform.nix
+++ b/pkgs/development/compilers/bs-platform/build-bs-platform.nix
@@ -16,18 +16,24 @@
     patches = [];
   }))
 }:
-stdenv.mkDerivation {
+
+let
+  bin_folder = if stdenv.isDarwin then "darwin" else "linux";
+in
+
+stdenv.mkDerivation rec {
   inherit src version;
   pname = "bs-platform";
+
   BS_RELEASE_BUILD = "true";
+  BS_TRAVIS_CI = "1";
+
   buildInputs = [ nodejs python3 custom-ninja ];
 
   patchPhase = ''
     sed -i 's:./configure.py --bootstrap:python3 ./configure.py --bootstrap:' ./scripts/install.js
     mkdir -p ./native/${ocaml-version}/bin
     ln -sf ${ocaml}/bin/*  ./native/${ocaml-version}/bin
-    rm -f vendor/ninja/snapshot/ninja.linux
-    cp ${custom-ninja}/bin/ninja vendor/ninja/snapshot/ninja.linux
   '';
 
   # avoid building the development version, will break aarch64 build
@@ -41,10 +47,13 @@ stdenv.mkDerivation {
 
   installPhase = ''
     mkdir -p $out/bin
-    cp -rf jscomp lib vendor odoc_gen native $out
+    cp -rf jscomp lib ${bin_folder} vendor odoc_gen native bsb bsc $out
+    mkdir $out/lib/ocaml
+    cp jscomp/runtime/js.* jscomp/runtime/*.cm* $out/lib/ocaml
+    cp jscomp/others/*.ml jscomp/others/*.mli jscomp/others/*.cm* $out/lib/ocaml
+    cp jscomp/stdlib-406/*.ml jscomp/stdlib-406/*.mli jscomp/stdlib-406/*.cm* $out/lib/ocaml
     cp bsconfig.json package.json $out
-    ln -s $out/lib/bsb $out/bin/bsb
-    ln -s $out/lib/bsc $out/bin/bsc
-    ln -s $out/lib/bsrefmt $out/bin/bsrefmt
+    ln -s $out/bsb $out/bin/bsb
+    ln -s $out/bsc $out/bin/bsc
   '';
 }
diff --git a/pkgs/development/compilers/bs-platform/default.nix b/pkgs/development/compilers/bs-platform/default.nix
index 763a4e3ba67a..6912cc6e9ff5 100644
--- a/pkgs/development/compilers/bs-platform/default.nix
+++ b/pkgs/development/compilers/bs-platform/default.nix
@@ -2,16 +2,16 @@
 let
   build-bs-platform = import ./build-bs-platform.nix;
 in
-(build-bs-platform {
+(build-bs-platform rec {
   inherit stdenv runCommand fetchFromGitHub ninja nodejs python3;
-  version = "7.0.1";
+  version = "7.2.0";
   ocaml-version = "4.06.1";
 
   src = fetchFromGitHub {
     owner = "BuckleScript";
     repo = "bucklescript";
-    rev = "52770839e293ade2bcf187f2639000ca0a9a1d46";
-    sha256 = "0s7g2zfhshsilv9zyp0246bypg34d294z27alpwz03ws9608yr7k";
+    rev = version;
+    sha256 = "1fsx7gvcp6rbqd0qf5fix02mbbmk9rgm09zbwjrx0lp5cjv3n2s4";
     fetchSubmodules = true;
   };
 }).overrideAttrs (attrs: {
-- 
cgit 1.4.1


From c09411b89ec544df274bd6b993b63c5c27f0e567 Mon Sep 17 00:00:00 2001
From: Antonio Nuno Monteiro <anmonteiro@gmail.com>
Date: Mon, 9 Mar 2020 10:20:10 -0700
Subject: Fix refmt

---
 pkgs/development/compilers/bs-platform/build-bs-platform.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'pkgs/development/compilers')

diff --git a/pkgs/development/compilers/bs-platform/build-bs-platform.nix b/pkgs/development/compilers/bs-platform/build-bs-platform.nix
index e4e7b7e8619a..ed4e5ebba2f3 100644
--- a/pkgs/development/compilers/bs-platform/build-bs-platform.nix
+++ b/pkgs/development/compilers/bs-platform/build-bs-platform.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/bin
-    cp -rf jscomp lib ${bin_folder} vendor odoc_gen native bsb bsc $out
+    cp -rf jscomp lib ${bin_folder} vendor odoc_gen native bsb bsc bsrefmt $out
     mkdir $out/lib/ocaml
     cp jscomp/runtime/js.* jscomp/runtime/*.cm* $out/lib/ocaml
     cp jscomp/others/*.ml jscomp/others/*.mli jscomp/others/*.cm* $out/lib/ocaml
@@ -55,5 +55,6 @@ stdenv.mkDerivation rec {
     cp bsconfig.json package.json $out
     ln -s $out/bsb $out/bin/bsb
     ln -s $out/bsc $out/bin/bsc
+    ln -s $out/bsrefmt $out/bin/bsrefmt
   '';
 }
-- 
cgit 1.4.1


From 0f0cb0b8575247d3220cc9e352b12a98ac6447db Mon Sep 17 00:00:00 2001
From: Antonio Nuno Monteiro <anmonteiro@gmail.com>
Date: Mon, 9 Mar 2020 10:21:43 -0700
Subject: Note about BuckleScript's build process and why `BS_TRAVIS_CI=1` is
 needed

---
 pkgs/development/compilers/bs-platform/build-bs-platform.nix | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'pkgs/development/compilers')

diff --git a/pkgs/development/compilers/bs-platform/build-bs-platform.nix b/pkgs/development/compilers/bs-platform/build-bs-platform.nix
index ed4e5ebba2f3..d7d0fe0b12be 100644
--- a/pkgs/development/compilers/bs-platform/build-bs-platform.nix
+++ b/pkgs/development/compilers/bs-platform/build-bs-platform.nix
@@ -26,6 +26,10 @@ stdenv.mkDerivation rec {
   pname = "bs-platform";
 
   BS_RELEASE_BUILD = "true";
+
+  # BuckleScript's idiosyncratic build process only builds artifacts required
+  # for editor-tooling to work when this environment variable is set:
+  # https://github.com/BuckleScript/bucklescript/blob/7.2.0/scripts/install.js#L225-L227
   BS_TRAVIS_CI = "1";
 
   buildInputs = [ nodejs python3 custom-ninja ];
-- 
cgit 1.4.1