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

gradle: 5.6.4 -> 6.5.1 #92103

Merged
merged 1 commit into from Jul 4, 2020
Merged

gradle: 5.6.4 -> 6.5.1 #92103

merged 1 commit into from Jul 4, 2020

Conversation

@ludovicc
Copy link

ludovicc commented Jul 2, 2020

Motivation for this change

Upgrade Gradle to latest version 6.5.1
Add gradle_6 to the top level packages.

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.
@jonringer
Copy link
Contributor

jonringer commented Jul 2, 2020

@ludovicc thanks for opening your first pr to nixpkgs :)

nativeVersion = "0.22";

src = fetchurl {
url = "http://services.gradle.org/distributions/${name}-bin.zip";

This comment has been minimized.

@jonringer

jonringer Jul 2, 2020 Contributor

I get a 403:

builder for '/nix/store/v34wfmafk54chdkascgsycwmsdnw1ypc-gradle-6.5.1-bin.zip.drv' failed with exit code 1; last 7 log lines:

  trying http://services.gradle.org/distributions/gradle-6.5.1-bin.zip
    % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                   Dload  Upload   Total   Spent    Left  Speed
    0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
  curl: (22) The requested URL returned error: 403 Forbidden
  error: cannot download gradle-6.5.1-bin.zip from any mirror
@ludovicc
Copy link
Author

ludovicc commented Jul 3, 2020

@jonringer Thanks for the welcome and the review. It looks like you had some kind of transient error while downloading the zip, http://services.gradle.org/distributions/gradle-6.5.1-bin.zip works both from browser and using nix-review on this pr.

@ludovicc
Copy link
Author

ludovicc commented Jul 3, 2020

I use https for all urls as suggested.

Copy link
Contributor

jonringer left a comment

regression in jd-gui package.

also, please squash fixup commits to adhere to CONTRIBUTING.md

https://github.com/NixOS/nixpkgs/pull/92103
1 package failed to build:
jd-gui

4 packages built:
frostwire gradle jadx mxisd
Ludovic Claude
Co-authored-by: Daniël de Kok <me@github.danieldk.eu>
Use https for all urls
fix version for native library
pin gradle for jd-gui
@ludovicc ludovicc force-pushed the ludovicc:master branch from 87d4f54 to c1a3a55 Jul 4, 2020
@ludovicc
Copy link
Author

ludovicc commented Jul 4, 2020

jd-gui should work better, I pinned gradle to version 5 as used by this package.
squashed the commits.

@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, jre, jdk, gradle, makeDesktopItem, perl, writeText, runtimeShell }:
{ stdenv, fetchFromGitHub, jre, jdk, gradle_5, makeDesktopItem, perl, writeText, runtimeShell }:

This comment has been minimized.

@jonringer

jonringer Jul 4, 2020 Contributor

the gradle_5 pinning should probably be done in another commit

This comment has been minimized.

@jonringer

jonringer Jul 4, 2020 Contributor

jd-gui: pin gradle to 5.X
gradle: 5.6.4 -> 6.5.1 
@ludovicc ludovicc mentioned this pull request Jul 4, 2020
3 of 10 tasks complete
@ludovicc
Copy link
Author

ludovicc commented Jul 4, 2020

@jonringer I have moved the gradle_5 pinning to #92292, this pr is now dependant on #92292

Copy link
Contributor

jonringer left a comment

https://github.com/NixOS/nixpkgs/pull/92103
4 packages built:
frostwire gradle jadx mxisd
@jonringer jonringer merged commit 6eeb612 into NixOS:master Jul 4, 2020
16 checks passed
16 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
gradle, gradle.passthru.tests on aarch64-linux Success
Details
gradle, gradle.passthru.tests on x86_64-linux Success
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="c1a3a55"; rev="c1a3a55fe6ef2e1eaf1ed5ab3dda9f4635699511"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="c1a3a55"; rev="c1a3a55fe6ef2e1eaf1ed5ab3dda9f4635699511"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="c1a3a55"; rev="c1a3a55fe6ef2e1eaf1ed5ab3dda9f4635699511"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="c1a3a55"; rev="c1a3a55fe6ef2e1eaf1ed5ab3dda9f4635699511"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="c1a3a55"; rev="c1a3a55fe6ef2e1eaf1ed5ab3dda9f4635699511"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="c1a3a55"; rev="c1a3a55fe6ef2e1eaf1ed5ab3dda9f4635699511"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="c1a3a55"; rev="c1a3a55fe6ef2e1eaf1ed5ab3dda9f4635699511"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.