Skip to content

clojure: Mimic upstream install script#104190

Merged
timokau merged 1 commit intoNixOS:masterfrom
jlesquembre:clj-fix
Nov 19, 2020
Merged

clojure: Mimic upstream install script#104190
timokau merged 1 commit intoNixOS:masterfrom
jlesquembre:clj-fix

Conversation

@jlesquembre
Copy link
Member

@jlesquembre jlesquembre commented Nov 18, 2020

Also installs exec.jar in the expected location

Motivation for this change

Fixes #103972
Closes #103982

I think is better to keep as close as possible to
https://github.com/clojure/brew-install/blob/1.10.1/src/main/resources/clojure/install/linux-install.sh

ping @bennyandresen

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Nov 18, 2020
@bennyandresen bennyandresen mentioned this pull request Nov 19, 2020
Closed
10 tasks
bennyandresen
bennyandresen approved these changes Nov 19, 2020
View reviewed changes
Copy link
Member

@bennyandresen bennyandresen left a comment

Choose a reason for hiding this comment

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

I welcome this improvement!

used nix-review, checked the resulting script and the clj-new usecase from the linked issue works also!

SuperSandro2000
SuperSandro2000 reviewed Nov 19, 2020
View reviewed changes
@SuperSandro2000
Copy link
Member

SuperSandro2000 commented Nov 19, 2020 •
edited
Loading

Result of nixpkgs-review pr 104190 run on x86_64-darwin 1

1 package failed to build:
  • lumo
1 package built:
  • clojure

lumo

/bin/sh: ./gyp-mac-tool: /usr/bin/env: bad interpreter: Operation not permitted

Probably my sandbox broken.

@jlesquembre
clojure: Mimic upstream install script
b364168 
Also installs exec.jar in the expected location
@jlesquembre
Copy link
Member Author

jlesquembre commented Nov 19, 2020

/marvin opt-in
/status needs_merger

@marvin-mk2 marvin-mk2 bot added the marvin label Nov 19, 2020
@marvin-mk2
Copy link

marvin-mk2 bot commented Nov 19, 2020

Hi! I'm an experimental bot. My goal is to guide this PR through its stages, hopefully ending with a merge. You can read up on the usage here.

@marvin-mk2
Copy link

marvin-mk2 bot commented Nov 19, 2020

The PR author cannot set the status to needs_merger. Please wait for an external review.

If you are not the PR author and you are reading this, please review the usage of this bot. You may be able to help. Please make an honest attempt to resolve all outstanding issues before setting to needs_merger.

@bennyandresen
Copy link
Member

bennyandresen commented Nov 19, 2020

/status needs_merger

@marvin-mk2 marvin-mk2 bot requested a review from timokau November 19, 2020 10:58
timokau
timokau approved these changes Nov 19, 2020
View reviewed changes
Copy link
Member

@timokau timokau left a comment

Choose a reason for hiding this comment

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

Thank you for the reviews @bennyandresen @SuperSandro2000. Looks good.

@timokau timokau merged commit 2e8d073 into NixOS:master Nov 19, 2020
@jlesquembre jlesquembre mentioned this pull request Dec 9, 2020
Merged
10 tasks
@jlesquembre jlesquembre deleted the clj-fix branch April 16, 2024 16:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

@timokau timokau timokau approved these changes

+1 more reviewer

@bennyandresen bennyandresen bennyandresen approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Clojure install possibly incorrect placement of exec.jar

4 participants

@jlesquembre @SuperSandro2000 @bennyandresen @timokau