Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b37872d42681
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e1bd04a3f4fa
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 18, 2018

  1. Revert "openjdk11: enable ZGC on x86_64-linux" 

    We don't have openjdk11 on 18.09, and this breaks openjdk10:
https://hydra.nixos.org/build/84099818/nixlog/1

This reverts commit 5d0ef3f.
    @gebner
    gebner committed Nov 18, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    b4ldr John Bond
    GPG key ID: 1ADE98E442BAB1C4
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e1bd04a View commit details
Showing with 0 additions and 1 deletion.
  1. +0 −1 pkgs/development/compilers/openjdk/10.nix
1 change: 0 additions & 1 deletion pkgs/development/compilers/openjdk/10.nix
View file
Original file line number Diff line number Diff line change
@@ -69,7 +69,6 @@ let
# See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html
"--with-extra-cflags=-Wno-error=deprecated-declarations -Wno-error=format-contains-nul -Wno-error=unused-result"
''
+ lib.optionalString (architecture == "amd64") "\"--with-jvm-features=zgc\""
+ lib.optionalString minimal "\"--enable-headless-only\""
+ ");"
# https://bugzilla.redhat.com/show_bug.cgi?id=1306558