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

Add texmacsDarwin #31875

Merged
merged 2 commits into from Mar 22, 2018
Merged

Add texmacsDarwin #31875

merged 2 commits into from Mar 22, 2018

Conversation

jbaum98
Copy link
Contributor

@jbaum98 jbaum98 commented Nov 20, 2017

Motivation for this change

texmacs currently won't build on darwin. Because it requires a lot of different dependencies and steps, I thought it would be better to split it up this way into two packages. I tried to modify the original texmacs package only by pulling out common things, so hopefully it isn't affected at all.

I also want to note here that I used version 1.99.4 and not the latest 1.99.5 because 1.99.5 contains a bug that causes lots of segfaults on darwin.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

@@ -4661,6 +4661,12 @@ with pkgs;
extraFonts = true;
};

texmacsDarwin = callPackage ../applications/editors/texmacs/darwin.nix {
Copy link
Member

Choose a reason for hiding this comment

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

How about doing an if else block with texmacs above. I think we do it somewhere else. Something like:

texmacs = if stdenv.isDarwin then callPackage ...
          else callPackage ...;

@LnL7
Copy link
Member

LnL7 commented Nov 22, 2017

@GrahamcOfBorg build texmacs

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: x86_64-darwin

/nix/store/4hd0sjy6hcrvf2qr95i5svlv4vrs96w6-TeXmacs-1.99.4/Applications/TeXmacs-1.99.4.app/Contents/Resources/share/TeXmacs/plugins/matlab/bin/tm_matlab: interpreter directive changed from "/bin/sh" to "/nix/store/hh833qm6lgb6cgr7z9vxkb72wikr4wwz-bash-4.4-p12/bin/sh"
/nix/store/4hd0sjy6hcrvf2qr95i5svlv4vrs96w6-TeXmacs-1.99.4/Applications/TeXmacs-1.99.4.app/Contents/Resources/share/TeXmacs/plugins/maxima/bin/maxima_detect: interpreter directive changed from "/bin/sh" to "/nix/store/hh833qm6lgb6cgr7z9vxkb72wikr4wwz-bash-4.4-p12/bin/sh"
/nix/store/4hd0sjy6hcrvf2qr95i5svlv4vrs96w6-TeXmacs-1.99.4/Applications/TeXmacs-1.99.4.app/Contents/Resources/share/TeXmacs/plugins/maxima/bin/tm_maxima: interpreter directive changed from "/bin/sh" to "/nix/store/hh833qm6lgb6cgr7z9vxkb72wikr4wwz-bash-4.4-p12/bin/sh"
/nix/store/4hd0sjy6hcrvf2qr95i5svlv4vrs96w6-TeXmacs-1.99.4/Applications/TeXmacs-1.99.4.app/Contents/Resources/share/TeXmacs/plugins/mupad/bin/tm_mupad_help: interpreter directive changed from "/bin/bash -f" to "/nix/store/hh833qm6lgb6cgr7z9vxkb72wikr4wwz-bash-4.4-p12/bin/bash -f"
/nix/store/4hd0sjy6hcrvf2qr95i5svlv4vrs96w6-TeXmacs-1.99.4/Applications/TeXmacs-1.99.4.app/Contents/Resources/share/TeXmacs/plugins/octave/bin/tm_octave: interpreter directive changed from "/bin/sh" to "/nix/store/hh833qm6lgb6cgr7z9vxkb72wikr4wwz-bash-4.4-p12/bin/sh"
/nix/store/4hd0sjy6hcrvf2qr95i5svlv4vrs96w6-TeXmacs-1.99.4/Applications/TeXmacs-1.99.4.app/Contents/Resources/share/TeXmacs/plugins/r/bin/r_install: interpreter directive changed from "/bin/sh" to "/nix/store/hh833qm6lgb6cgr7z9vxkb72wikr4wwz-bash-4.4-p12/bin/sh"
/nix/store/4hd0sjy6hcrvf2qr95i5svlv4vrs96w6-TeXmacs-1.99.4/Applications/TeXmacs-1.99.4.app/Contents/Resources/share/TeXmacs/plugins/reduce/bin/tm_reduce: interpreter directive changed from "/bin/sh -f" to "/nix/store/hh833qm6lgb6cgr7z9vxkb72wikr4wwz-bash-4.4-p12/bin/sh -f"
/nix/store/4hd0sjy6hcrvf2qr95i5svlv4vrs96w6-TeXmacs-1.99.4/Applications/TeXmacs-1.99.4.app/Contents/Resources/share/TeXmacs/plugins/texgraph/bin/tm_texgraph: interpreter directive changed from "/bin/bash" to "/nix/store/hh833qm6lgb6cgr7z9vxkb72wikr4wwz-bash-4.4-p12/bin/bash"
/nix/store/4hd0sjy6hcrvf2qr95i5svlv4vrs96w6-TeXmacs-1.99.4/Applications/TeXmacs-1.99.4.app/Contents/Resources/share/TeXmacs/plugins/xypic/bin/tm_xypic: interpreter directive changed from "/bin/bash" to "/nix/store/hh833qm6lgb6cgr7z9vxkb72wikr4wwz-bash-4.4-p12/bin/bash"
/nix/store/4hd0sjy6hcrvf2qr95i5svlv4vrs96w6-TeXmacs-1.99.4

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: x86_64-linux

/nix/store/z8mm6ipvr1xyljmypnf25lm2q5lv9npq-TeXmacs-1.99.2/libexec/TeXmacs/bin/tm_asy: interpreter directive changed from "/bin/bash" to "/nix/store/4ada72n7785wwazv42fhsnxjvilaa3aj-bash-4.4-p12/bin/bash"
/nix/store/z8mm6ipvr1xyljmypnf25lm2q5lv9npq-TeXmacs-1.99.2/libexec/TeXmacs/bin/tm_dratex: interpreter directive changed from "/bin/bash" to "/nix/store/4ada72n7785wwazv42fhsnxjvilaa3aj-bash-4.4-p12/bin/bash"
/nix/store/z8mm6ipvr1xyljmypnf25lm2q5lv9npq-TeXmacs-1.99.2/libexec/TeXmacs/bin/tm_xypic: interpreter directive changed from "/bin/bash" to "/nix/store/4ada72n7785wwazv42fhsnxjvilaa3aj-bash-4.4-p12/bin/bash"
/nix/store/z8mm6ipvr1xyljmypnf25lm2q5lv9npq-TeXmacs-1.99.2/libexec/TeXmacs/bin/r_install: interpreter directive changed from "/bin/sh" to "/nix/store/4ada72n7785wwazv42fhsnxjvilaa3aj-bash-4.4-p12/bin/sh"
/nix/store/z8mm6ipvr1xyljmypnf25lm2q5lv9npq-TeXmacs-1.99.2/libexec/TeXmacs/bin/tm_gs: interpreter directive changed from "/bin/sh" to "/nix/store/4ada72n7785wwazv42fhsnxjvilaa3aj-bash-4.4-p12/bin/sh"
/nix/store/z8mm6ipvr1xyljmypnf25lm2q5lv9npq-TeXmacs-1.99.2/libexec/TeXmacs/bin/tm_octave: interpreter directive changed from "/bin/sh" to "/nix/store/4ada72n7785wwazv42fhsnxjvilaa3aj-bash-4.4-p12/bin/sh"
/nix/store/z8mm6ipvr1xyljmypnf25lm2q5lv9npq-TeXmacs-1.99.2/libexec/TeXmacs/bin/tm_mupad_help: interpreter directive changed from "/bin/bash -f" to "/nix/store/4ada72n7785wwazv42fhsnxjvilaa3aj-bash-4.4-p12/bin/bash -f"
/nix/store/z8mm6ipvr1xyljmypnf25lm2q5lv9npq-TeXmacs-1.99.2/libexec/TeXmacs/bin/tm_eukleides: interpreter directive changed from "/bin/bash" to "/nix/store/4ada72n7785wwazv42fhsnxjvilaa3aj-bash-4.4-p12/bin/bash"
checking for references to /tmp/nix-build-TeXmacs-1.99.2.drv-0 in /nix/store/z8mm6ipvr1xyljmypnf25lm2q5lv9npq-TeXmacs-1.99.2...
/nix/store/z8mm6ipvr1xyljmypnf25lm2q5lv9npq-TeXmacs-1.99.2

@LnL7
Copy link
Member

LnL7 commented Feb 6, 2018

@GrahamcOfBorg build texmacs

@LnL7 LnL7 added the 6.topic: darwin Running or building packages on Darwin label Feb 6, 2018
@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Partial log (click to expand)

Merge failed

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Partial log (click to expand)

Merge failed

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Partial log (click to expand)

Merge failed

@matthewbauer matthewbauer merged commit 8889942 into NixOS:master Mar 22, 2018
@jbaum98 jbaum98 deleted the texmacsDarwin branch March 22, 2018 18:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants