Skip to content

[20.09] cherrypick working graalvm-ce, clj-kondo + babashka from master #103505

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

Jump to bottom
Closed
wants to merge 4 commits into from
Closed

[20.09] cherrypick working graalvm-ce, clj-kondo + babashka from master #103505

wants to merge 4 commits into from
+183 −12

Conversation

bennyandresen
Copy link
Member

@bennyandresen bennyandresen commented Nov 11, 2020 •
edited
Loading

Motivation for this change

clj-kondo and babashka is currently broken on 20.09 and this fixed it

cherry-picked from, PR and message
76807ac #103096 clj-kondo: 2020.04.05 -> 2020.11.07
43ae904 #102867 babashka: 0.0.97 -> 0.2.3
bb885bc #102693 babashka,clj-kondo: Depend on graalvm-ce
569c825 #99631 graalvm{8,11}-ce: init at 20.2.0

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.

/marvin opt-in
/status needs_merger

Sorry, something went wrong.

bennyandresen and others added 4 commits November 11, 2020 22:50
@bennyandresen
graalvm{8,11}-ce: init at 20.2.0
569c825
@glittershark @bennyandresen
babashka,clj-kondo: Depend on graalvm-ce
bb885bc 
Now that we have community builds of graalvm landed in NixOS#99631, both
clj-kondo and babashka can depend on those versions of graalvm rather
than the one that requires building from source - this can be built in
hydra, and generally is much easier to build and test.
@bennyandresen
babashka: 0.0.97 -> 0.2.3
43ae904 
with NixOS#99631 and NixOS#102693 merged, it's possible to bump the babashka
version again.

However recent versions of babashka depend on java11 features and I
spoke in Slack with the project lead and this java11 dependency will
exist going forward.
@bennyandresen
clj-kondo: 2020.04.05 -> 2020.11.07
76807ac
@marvin-mk2 marvin-mk2 bot added the marvin This PR was reviewed by Marvin, a discontinued bot: https://github.com/timokau/marvin-mk2 label Nov 11, 2020
@marvin-mk2
Copy link

marvin-mk2 bot commented Nov 11, 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 11, 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 Author

/status needs_reviewer

@marvin-mk2 marvin-mk2 bot added the needs_reviewer (old Marvin label, do not use) label Nov 11, 2020
@ofborg ofborg bot added 8.has: clean-up 8.has: package (new) This PR adds a new package labels Nov 11, 2020
@ofborg ofborg bot requested review from hlolli and volth November 11, 2020 22:15
@marvin-mk2 marvin-mk2 bot added awaiting_reviewer (old Marvin label, do not use) and removed needs_reviewer (old Marvin label, do not use) labels Nov 11, 2020
@ofborg ofborg bot requested a review from jlesquembre November 11, 2020 22:15
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Nov 11, 2020
jonringer
jonringer reviewed Nov 11, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

When backporting changes, please follow https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#backporting-changes.

Namely, you should be doing git cherry-pick -x <rev> from a commit that has already landed in master. If the branches have diverged, you may alter the commit or add another commit to ensure that the package is able to still evaluate and build

@bennyandresen bennyandresen changed the title release-20.09: cherrypicked graalvm-ce, clj-kondo + babashka from master [20.09] cherrypick working graalvm-ce, clj-kondo + babashka from master Nov 12, 2020
@bennyandresen bennyandresen deleted the cherrypick__graalvm_babashka_clj-kondo branch November 12, 2020 08:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer

@hlolli hlolli

@jlesquembre jlesquembre

Assignees
No one assigned
Labels
8.has: clean-up 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 awaiting_reviewer (old Marvin label, do not use) marvin This PR was reviewed by Marvin, a discontinued bot: https://github.com/timokau/marvin-mk2
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@bennyandresen @jonringer @glittershark