: 1 openjdk: Expand descriptions with headless flag 11 files changed, 22 insertions(+), 12 deletions(-)
Copy & paste the following snippet into your terminal to import this patchset into git:
curl -s https://lists.sr.ht/~andir/nixpkgs-dev/patches/40203/mbox | git am -3Learn more about email & git
The "_headless" packages used to have the same desciption as the normal packages. Without reading the package source, it was not possible to know what exactly "headless" meant. --- pkgs/development/compilers/openjdk/11.nix | 2 +- pkgs/development/compilers/openjdk/12.nix | 2 +- pkgs/development/compilers/openjdk/13.nix | 2 +- pkgs/development/compilers/openjdk/14.nix | 2 +- pkgs/development/compilers/openjdk/15.nix | 2 +- pkgs/development/compilers/openjdk/16.nix | 2 +- pkgs/development/compilers/openjdk/17.nix | 2 +- pkgs/development/compilers/openjdk/18.nix | 2 +- pkgs/development/compilers/openjdk/19.nix | 2 +- pkgs/development/compilers/openjdk/8.nix | 5 ++++- pkgs/development/compilers/openjdk/meta.nix | 11 +++++++++-- 11 files changed, 22 insertions(+), 12 deletions(-) diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index 808b0ef2e12..5323de9f9b3 100644 --- a/pkgs/development/compilers/openjdk/11.nix @@ -157,7 +157,7 @@ let disallowedReferences = [ openjdk11-bootstrap ]; - meta = import ./meta.nix lib version; + meta = import ./meta.nix { inherit lib version headless; }; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/12.nix b/pkgs/development/compilers/openjdk/12.nix index 7f8ea2330b2..d9a1c8df8f6 100644 --- a/pkgs/development/compilers/openjdk/12.nix @@ -153,7 +153,7 @@ let disallowedReferences = [ openjdk11 ]; - meta = import ./meta.nix lib version; + meta = import ./meta.nix { inherit lib version headless; }; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/13.nix b/pkgs/development/compilers/openjdk/13.nix index a6c65ce710f..1c670491270 100644 --- a/pkgs/development/compilers/openjdk/13.nix @@ -153,7 +153,7 @@ let disallowedReferences = [ openjdk13-bootstrap ]; - meta = import ./meta.nix lib version; + meta = import ./meta.nix { inherit lib version headless; }; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/14.nix b/pkgs/development/compilers/openjdk/14.nix index 07bded3676a..3c260d2c070 100644 --- a/pkgs/development/compilers/openjdk/14.nix @@ -149,7 +149,7 @@ let disallowedReferences = [ openjdk14-bootstrap ]; - meta = import ./meta.nix lib version; + meta = import ./meta.nix { inherit lib version headless; }; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/15.nix b/pkgs/development/compilers/openjdk/15.nix index b0401b03fac..d1fcae33046 100644 --- a/pkgs/development/compilers/openjdk/15.nix @@ -150,7 +150,7 @@ let disallowedReferences = [ openjdk15-bootstrap ]; pos = builtins.unsafeGetAttrPos "feature" version; - meta = import ./meta.nix lib version; + meta = import ./meta.nix { inherit lib version headless; }; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/16.nix b/pkgs/development/compilers/openjdk/16.nix index d0007937622..618c3e07a2e 100644 --- a/pkgs/development/compilers/openjdk/16.nix @@ -157,7 +157,7 @@ let disallowedReferences = [ openjdk16-bootstrap ]; pos = builtins.unsafeGetAttrPos "feature" version; - meta = import ./meta.nix lib version.feature; + meta = import ./meta.nix { inherit lib version headless; }.feature; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/17.nix b/pkgs/development/compilers/openjdk/17.nix index b13dacc2558..fe4fc098b18 100644 --- a/pkgs/development/compilers/openjdk/17.nix @@ -176,7 +176,7 @@ let disallowedReferences = [ openjdk17-bootstrap ]; pos = builtins.unsafeGetAttrPos "feature" version; - meta = import ./meta.nix lib version.feature; + meta = import ./meta.nix { inherit lib version headless; }.feature; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/18.nix b/pkgs/development/compilers/openjdk/18.nix index 0f15e4edede..026b5f7d6b0 100644 --- a/pkgs/development/compilers/openjdk/18.nix @@ -166,7 +166,7 @@ let disallowedReferences = [ openjdk18-bootstrap ]; pos = builtins.unsafeGetAttrPos "feature" version; - meta = import ./meta.nix lib version.feature; + meta = import ./meta.nix { inherit lib version headless; }.feature; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/19.nix b/pkgs/development/compilers/openjdk/19.nix index bdcdba83a1c..0775dc92a11 100644 --- a/pkgs/development/compilers/openjdk/19.nix @@ -176,7 +176,7 @@ let disallowedReferences = [ openjdk19-bootstrap ]; pos = builtins.unsafeGetAttrPos "feature" version; - meta = import ./meta.nix lib version.feature; + meta = import ./meta.nix { inherit lib version headless; }.feature; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 4e1d1ba6635..0f72a27018f 100644 --- a/pkgs/development/compilers/openjdk/8.nix @@ -208,7 +208,10 @@ let meta = with lib; { homepage = "http://openjdk.java.net/"; license = licenses.gpl2; - description = "The open-source Java Development Kit"; + description = "The open-source Java Development Kit" + ( lib.optionalString + headless + " without graphical libraries and using the --disable-headful compliation flag" + ); maintainers = with maintainers; [ edwtjo ]; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; mainProgram = "java"; diff --git a/pkgs/development/compilers/openjdk/meta.nix b/pkgs/development/compilers/openjdk/meta.nix index 74383ddef78..6315548904b 100644 --- a/pkgs/development/compilers/openjdk/meta.nix @@ -1,7 +1,14 @@ -lib: version: with lib; { +{ + lib, + version, + headless, +}: with lib; { homepage = "https://openjdk.java.net/"; license = licenses.gpl2Only; - description = "The open-source Java Development Kit"; + description = "The open-source Java Development Kit" + (lib.optionalString + headless + " without graphical libraries and using the --enable-headless-only compliation flag" + ); maintainers = with maintainers; [ edwtjo ]; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" "powerpc64le-linux" ]; mainProgram = "java"; -- 2.38.4