JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bs-platform: 7.0.1 -> 7.2.0

Browse Source
This commit is contained in:
Antonio Nuno Monteiro 2020-03-08 10:44:48 -07:00
parent d008a348ac
commit 7107e397dd
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/development/compilers/bs-platform/build-bs-platform.nix
View File

@ -16,18 +16,24 @@
patches = []; patches = [];
})) }))
}: }:
stdenv.mkDerivation {
let
bin_folder = if stdenv.isDarwin then "darwin" else "linux";
in
stdenv.mkDerivation rec {
inherit src version; inherit src version;
pname = "bs-platform"; pname = "bs-platform";
BS_RELEASE_BUILD = "true"; BS_RELEASE_BUILD = "true";
BS_TRAVIS_CI = "1";
buildInputs = [ nodejs python3 custom-ninja ]; buildInputs = [ nodejs python3 custom-ninja ];
patchPhase = '' patchPhase = ''
sed -i 's:./configure.py --bootstrap:python3 ./configure.py --bootstrap:' ./scripts/install.js sed -i 's:./configure.py --bootstrap:python3 ./configure.py --bootstrap:' ./scripts/install.js
mkdir -p ./native/${ocaml-version}/bin mkdir -p ./native/${ocaml-version}/bin
ln -sf ${ocaml}/bin/* ./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 # avoid building the development version, will break aarch64 build
@ -41,10 +47,13 @@ stdenv.mkDerivation {
installPhase = '' installPhase = ''
mkdir -p $out/bin 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 cp bsconfig.json package.json $out
ln -s $out/lib/bsb $out/bin/bsb ln -s $out/bsb $out/bin/bsb
ln -s $out/lib/bsc $out/bin/bsc ln -s $out/bsc $out/bin/bsc
ln -s $out/lib/bsrefmt $out/bin/bsrefmt
''; '';
} }

8
pkgs/development/compilers/bs-platform/default.nix
View File

@ -2,16 +2,16 @@
let let
build-bs-platform = import ./build-bs-platform.nix; build-bs-platform = import ./build-bs-platform.nix;
in in
(build-bs-platform { (build-bs-platform rec {
inherit stdenv runCommand fetchFromGitHub ninja nodejs python3; inherit stdenv runCommand fetchFromGitHub ninja nodejs python3;
version = "7.0.1"; version = "7.2.0";
ocaml-version = "4.06.1"; ocaml-version = "4.06.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "BuckleScript"; owner = "BuckleScript";
repo = "bucklescript"; repo = "bucklescript";
rev = "52770839e293ade2bcf187f2639000ca0a9a1d46"; rev = version;
sha256 = "0s7g2zfhshsilv9zyp0246bypg34d294z27alpwz03ws9608yr7k"; sha256 = "1fsx7gvcp6rbqd0qf5fix02mbbmk9rgm09zbwjrx0lp5cjv3n2s4";
fetchSubmodules = true; fetchSubmodules = true;
}; };
}).overrideAttrs (attrs: { }).overrideAttrs (attrs: {