Skip to content
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.

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

Jump to bottom

dune: 1.4.0 -> 1.5.0 #49848

Merged
merged 2 commits into from Nov 9, 2018
Merged

dune: 1.4.0 -> 1.5.0 #49848

merged 2 commits into from Nov 9, 2018

Conversation

marsam
Copy link
Contributor

@marsam marsam commented Nov 7, 2018

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@vbgl
Copy link
Contributor

vbgl commented Nov 7, 2018

Can you please enhance the installPhase to include the standard runHooks? See discussion in #49684.

@marsam
Copy link
Contributor Author

marsam commented Nov 7, 2018

@vbgl done

@vbgl
Copy link
Contributor

vbgl commented Nov 7, 2018

@GrahamcOfBorg build reason

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: reason

Partial log (click to expand)

        bash src/reason-parser/reason_parser.messages
Read 2397 sample input sentences and 2397 error messages.
      menhir src/reason-parser/reason_parser_message.ml
Read 2397 sample input sentences and 2397 error messages.
installing
Processing file reason.install as reason.
Processing file rtop.install as rtop.
/nix/store/d9xpfvcvhjkvjcy42667hn4cvwnc2p8q-stdenv-linux/setup: line 1302: reason.install: command not found
builder for '/nix/store/d4g039kmmwg6fw5rfkn55b37zsfbdzl0-ocaml4.06.1-reason-3.3.7.drv' failed with exit code 127
error: build of '/nix/store/d4g039kmmwg6fw5rfkn55b37zsfbdzl0-ocaml4.06.1-reason-3.3.7.drv' failed

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Attempted: reason

Partial log (click to expand)

        bash src/reason-parser/reason_parser.messages
Read 2397 sample input sentences and 2397 error messages.
      menhir src/reason-parser/reason_parser_message.ml
Read 2397 sample input sentences and 2397 error messages.
installing
Processing file rtop.install as rtop.
Processing file reason.install as reason.
/nix/store/9pifap75pkb9ifmdqh0irn8wgc3q38s6-stdenv-linux/setup: line 1302: reason.install: command not found
builder for '/nix/store/03dh455dq13bzcshm7c15y41klv8v5ym-ocaml4.06.1-reason-3.3.7.drv' failed with exit code 127
error: build of '/nix/store/03dh455dq13bzcshm7c15y41klv8v5ym-ocaml4.06.1-reason-3.3.7.drv' failed

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: reason

Partial log (click to expand)

        bash src/reason-parser/reason_parser.messages
Read 2397 sample input sentences and 2397 error messages.
      menhir src/reason-parser/reason_parser_message.ml
Read 2397 sample input sentences and 2397 error messages.
installing
Processing file reason.install as reason.
Processing file rtop.install as rtop.
/nix/store/8qai18dv0nqyw6s61g9p91n8684rnlg8-stdenv-darwin/setup: line 1308: reason.install: command not found
builder for '/nix/store/2w1n9dqgqpmy3vhp5a9xjng682cga19q-ocaml4.06.1-reason-3.3.7.drv' failed with exit code 127
error: build of '/nix/store/2w1n9dqgqpmy3vhp5a9xjng682cga19q-ocaml4.06.1-reason-3.3.7.drv' failed

@marsam
Copy link
Contributor Author

marsam commented Nov 7, 2018

I've reverted the runhook {preInstall,postInstall} because it breaks reason

@vbgl
Copy link
Contributor

vbgl commented Nov 8, 2018

Instead, you can fix it like this:

diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix
index 0832d14992d..1b84b934852 100644
--- a/pkgs/development/compilers/reason/default.nix
+++ b/pkgs/development/compilers/reason/default.nix
@@ -21,12 +21,9 @@ stdenv.mkDerivation rec {
 
   buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed
 
-  installPhase = ''
-    for p in reason rtop
-    do
-      ${dune.installPhase} $p.install
-    done
+  inherit (dune) installPhase;
 
+  postInstall = ''
     wrapProgram $out/bin/rtop \
       --prefix PATH : "${utop}/bin" \
       --set OCAMLPATH $out/lib/ocaml/${ocaml.version}/site-lib:$OCAMLPATH
(END)

@vbgl
Copy link
Contributor

vbgl commented Nov 8, 2018

By the way, 1.5.1 is out (incl. two fixes).

@marsam
Copy link
Contributor Author

marsam commented Nov 9, 2018

@vbgl thanks, fixed

@vbgl vbgl merged commit 2e89de6 into NixOS:master Nov 9, 2018
@marsam marsam deleted the feature/update-dune branch November 10, 2018 22:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@marsam @vbgl @GrahamcOfBorg