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

clojure 1.10.1.492 -> 1.10.1.507 plus bugfix #79868

Merged
merged 2 commits into from Feb 12, 2020

Conversation

hlolli
Copy link
Member

@hlolli hlolli commented Feb 11, 2020

Motivation for this change

I've been tagged few times in last couple of days due to clojurescript/lumo build failing. I tracked the bug down to bootstrapping problems in clojure, or cache invalidation. After discussion about the problem on clojurian slack, it was identified as a bug https://clojure.atlassian.net/browse/TDEPS-150 in our case, this causes clojure to start to recalculate the classpath cache, despite a classpath being directly provided for.

Things done
  1. I bumped the version
  2. I added a bugfix via substituteInPlace which I intend to remove after it's fixed upstream
  3. I added installCheckPhase for sanity, this installCheckPhase will fail without this fix, since it tries to connect with maven repositories.

@Mic92

  • [ x ] Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • [ x ] 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"
  • [ x ] 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.

# hotfixes https://clojure.atlassian.net/browse/TDEPS-150
substituteInPlace clojure --replace \
'if [[ "$stale" = true && "$describe" = false ]];' \
'if [[ "$stale" = true && "$describe" = false && -z "$force_cp" ]];'
Copy link
Member

@Mic92 Mic92 Feb 12, 2020

Choose a reason for hiding this comment

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

Could you make this a patch file? This way we don't silently break the patch, when clojure is updated.

Copy link
Member Author

Choose a reason for hiding this comment

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

good point, it's pushed

@Mic92 Mic92 merged commit 91801c0 into NixOS:master Feb 12, 2020
Mic92 pushed a commit that referenced this pull request Feb 12, 2020
@hlolli hlolli deleted the clojure-tools-fix branch February 12, 2020 12:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants