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.

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

[20.03] openjdk: 11.06 -> 11.08 #94603

Merged
merged 2 commits into from Aug 10, 2020
Merged

[20.03] openjdk: 11.06 -> 11.08 #94603

merged 2 commits into from Aug 10, 2020

Conversation

asbachb
Copy link
Contributor

@asbachb asbachb commented Aug 3, 2020

Motivation for this change

Backporting latest java release.

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"
 asbachb@nixos  ~/dev/src/nix/nixpkgs   backport/openjdk11  nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
these paths will be fetched (38.95 MiB download, 169.16 MiB unpacked):
  /nix/store/91qp2v2h0fd9d6b6hchzf13zki091grv-nixpkgs-review-2.3.1
  /nix/store/b3zsk4ihlpiimv3vff86bb5bxghgdzb9-gcc-9.2.0
  /nix/store/d43v6bx7r6fcaq3fbbfd5mwh1f5s7rmg-bash-interactive-4.4-p23-dev
  /nix/store/hrkc2sf2883l16d5yq3zg0y339kfw4xv-binutils-2.31.1
  /nix/store/m6h7zh8w6s52clnyskffj5lbkakqgywn-gcc-wrapper-9.2.0
  /nix/store/n48b8n251dwwb04q7f3fwxdmirsakllz-binutils-wrapper-2.31.1
  /nix/store/sm7kk5n84vaisqvhk1yfsjqls50j8s0m-stdenv-linux
  /nix/store/y7bnk8yvamaqfh19vvfapp2412qniipl-expand-response-params
copying path '/nix/store/91qp2v2h0fd9d6b6hchzf13zki091grv-nixpkgs-review-2.3.1' from 'https://cache.nixos.org'...
copying path '/nix/store/y7bnk8yvamaqfh19vvfapp2412qniipl-expand-response-params' from 'https://cache.nixos.org'...
copying path '/nix/store/b3zsk4ihlpiimv3vff86bb5bxghgdzb9-gcc-9.2.0' from 'https://cache.nixos.org'...
copying path '/nix/store/d43v6bx7r6fcaq3fbbfd5mwh1f5s7rmg-bash-interactive-4.4-p23-dev' from 'https://cache.nixos.org'...
copying path '/nix/store/hrkc2sf2883l16d5yq3zg0y339kfw4xv-binutils-2.31.1' from 'https://cache.nixos.org'...
copying path '/nix/store/n48b8n251dwwb04q7f3fwxdmirsakllz-binutils-wrapper-2.31.1' from 'https://cache.nixos.org'...
copying path '/nix/store/m6h7zh8w6s52clnyskffj5lbkakqgywn-gcc-wrapper-9.2.0' from 'https://cache.nixos.org'...
copying path '/nix/store/sm7kk5n84vaisqvhk1yfsjqls50j8s0m-stdenv-linux' from 'https://cache.nixos.org'...
$ git -c fetch.prune=false fetch --force https://github.com/NixOS/nixpkgs master:refs/nixpkgs-review/0
From https://github.com/NixOS/nixpkgs
   f9b0bc3f297..588940d405d  master     -> refs/nixpkgs-review/0
$ git worktree add /home/asbachb/.cache/nixpkgs-review/rev-c4bb2630f5add9ca417910bb1f285e21d6a8949f-dirty/nixpkgs 588940d405de503d60751bfe965fe772cbb91bde
Preparing worktree (detached HEAD 588940d405d)
Updating files: 100% (22285/22285), done.
HEAD is now at 588940d405d Merge pull request #94570 from r-ryantm/auto-update/python2.7-autopep8
$ nix-env -f /home/asbachb/.cache/nixpkgs-review/rev-c4bb2630f5add9ca417910bb1f285e21d6a8949f-dirty/nixpkgs -qaP --xml --out-path --show-trace
No diff detected, stopping review...
$ git worktree prune
  • 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.

@asbachb
openjdk: 11.0.6 -> 11.0.7
5cf6604 
(cherry picked from commit 890485a)
@asbachb
openjdk: 11.0.7 -> 11.0.8
c4bb263 
Also added `minor` variable to reflect naming scheme introduced in java 9: https://bugs.openjdk.java.net/browse/JDK-8061493

(cherry picked from commit 56cff95)
@ofborg ofborg bot requested a review from edwtjo August 3, 2020 11:19
@asbachb asbachb changed the title backport: openjdk: 11.06 -> 11.08 [20.03] openjdk: 11.06 -> 11.08 Aug 7, 2020
@asbachb asbachb mentioned this pull request Aug 7, 2020
Merged
10 tasks
@NeQuissimus NeQuissimus merged commit c64b791 into NixOS:release-20.03 Aug 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@NeQuissimus NeQuissimus NeQuissimus approved these changes

@edwtjo edwtjo Awaiting requested review from edwtjo

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@asbachb @NeQuissimus