Skip to content

default.nix: Remove packaging code #887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mergify merged 2 commits into from
Nov 19, 2019
Merged

default.nix: Remove packaging code #887

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa35399
default.nix: Remove packaging code
nomeata Nov 19, 2019
1facf9e
Merge branch 'master' into joachim/nix/no-tar
nomeata Nov 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 4 additions & 34 deletions default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,16 +204,6 @@ rec {
'';
};

moc-tar = nixpkgs.symlinkJoin {
name = "moc-tar";
paths = [ moc-bin rts didc ];
postBuild = ''
tar -chf $out/moc.tar -C $out bin/moc rts/mo-rts.wasm bin/didc
mkdir -p $out/nix-support
echo "file bin $out/moc.tar" >> $out/nix-support/hydra-build-products
'';
};

# “our” Haskell packages
inherit (haskellPackages) lsp-int qc-motoko ic-stub;

Expand Down Expand Up @@ -391,27 +381,8 @@ rec {
'';
installPhase = ''
mkdir -p $out
tar -rf $out/stdlib.tar -C $src *.mo
mkdir -p $out/nix-support
echo "report stdlib $out/stdlib.tar" >> $out/nix-support/hydra-build-products
'';
forceShare = ["man"];
};

stdlib-doc-live = stdenv.mkDerivation {
Copy link

@hansl hansl Nov 19, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The documentation might still be useful. Don’t you publish Motoko doc from this repo?

Copy link
Contributor Author

@nomeata nomeata Nov 19, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, stdlib-doc. Essentially stdlib-doc-live becomes stdlib-doc (as it was some months ago)

name = "stdlib-doc-live";
src = subpath ./stdlib;
buildInputs = with nixpkgs;
[ pandoc bash python ];
buildPhase = ''
patchShebangs .
make alldoc
'';
installPhase = ''
mkdir -p $out
mv doc $out/
mkdir -p $out/nix-support
echo "report docs $out/doc README.html" >> $out/nix-support/hydra-build-products
cp ./*.mo $out
rm $out/*Test.mo
'';
forceShare = ["man"];
};
Expand All @@ -427,9 +398,9 @@ rec {
'';
installPhase = ''
mkdir -p $out
tar -rf $out/stdlib-doc.tar -C doc .
mv doc $out/
mkdir -p $out/nix-support
echo "report stdlib-doc $out/stdlib-doc.tar" >> $out/nix-support/hydra-build-products
echo "report docs $out/doc README.html" >> $out/nix-support/hydra-build-products
'';
forceShare = ["man"];
};
Expand Down Expand Up @@ -468,7 +439,6 @@ rec {
rts
stdlib
stdlib-doc
stdlib-doc-live
produce-exchange
users-guide
ic-stub
Expand Down