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

openjdk22: remove redundant let binding #318742

Merged
merged 1 commit into from
Jun 17, 2024

Conversation

jlesquembre
Copy link
Member

With the new mkDerivation (finalAttrs: {}) pattern, the

let
... 
openjdk = mkDerivation ... ; in
openjdk

is no longer necessary.

It can be simplified to just

let ... in
mkDerivation ...

Continuation of #306616

Notice that while the diff seems quite large, it's mostly whitespace. The derivation remains the same; in fact, openjdk22 isn't rebuilt after this change.

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

With the new `mkDerivation (finalAttrs: {})` pattern, the
```
let openjdk = ... ; in
openjdk
```
is no longer necessary
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Jun 10, 2024
@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jun 10, 2024
@jlesquembre jlesquembre requested a review from doronbehar June 17, 2024 13:20
Copy link
Contributor

@doronbehar doronbehar left a comment

Choose a reason for hiding this comment

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

Verified locally that:

$ git show --ignore-space-change
commit 28d29422b25062e8fd558b00b602f5581918cdb4
Author: José Luis Lafuente <[email protected]>
Date:   Mon Jun 10 11:14:47 2024 +0200

    openjdk22: remove redundant let binding
    
    With the new `mkDerivation (finalAttrs: {})` pattern, the
    ```
    let openjdk = ... ; in
    openjdk
    ```
    is no longer necessary

diff --git a/pkgs/development/compilers/openjdk/22.nix b/pkgs/development/compilers/openjdk/22.nix
index 9cdec758544c..97d1a3b3b44d 100644
--- a/pkgs/development/compilers/openjdk/22.nix
+++ b/pkgs/development/compilers/openjdk/22.nix
@@ -59,8 +59,9 @@ let
 
   # when building a headless jdk, also bootstrap it with a headless jdk
   openjdk-bootstrap = openjdk22-bootstrap.override { gtkSupport = !headless; };
+in
 
-  openjdk = stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "openjdk" + lib.optionalString headless "-headless";
   inherit version;
 
@@ -272,6 +273,4 @@ let
 
     inherit gtk3;
   };
-  });
-in
-openjdk
+})

Also Ofborg says there is no difference in the final evaluation.

@doronbehar doronbehar merged commit be3e244 into NixOS:master Jun 17, 2024
26 checks passed
@jlesquembre jlesquembre deleted the jl/jdk-remove-let branch June 19, 2024 15:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants