From 75d0e4645eb1506d994bd2e316a54c8c7e3f4efd Mon Sep 17 00:00:00 2001 From: Atemu Date: Wed, 16 Jun 2021 12:32:06 +0200 Subject: [PATCH] openjdk: extract common meta Also expands Darwin's openjdk.meta to include most attrs of Linux' --- pkgs/development/compilers/openjdk/11.nix | 9 +-------- pkgs/development/compilers/openjdk/12.nix | 9 +-------- pkgs/development/compilers/openjdk/13.nix | 9 +-------- pkgs/development/compilers/openjdk/14.nix | 9 +-------- pkgs/development/compilers/openjdk/15.nix | 9 +-------- pkgs/development/compilers/openjdk/16.nix | 9 +-------- pkgs/development/compilers/openjdk/darwin/11.nix | 6 +----- pkgs/development/compilers/openjdk/darwin/8.nix | 6 +----- pkgs/development/compilers/openjdk/darwin/default.nix | 6 +----- pkgs/development/compilers/openjdk/darwin/meta.nix | 4 ++++ pkgs/development/compilers/openjdk/meta.nix | 8 ++++++++ 11 files changed, 21 insertions(+), 63 deletions(-) create mode 100644 pkgs/development/compilers/openjdk/darwin/meta.nix create mode 100644 pkgs/development/compilers/openjdk/meta.nix diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index 15238e63ecb..151f6731e0b 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -136,14 +136,7 @@ let disallowedReferences = [ openjdk11-bootstrap ]; - meta = with lib; { - homepage = "http://openjdk.java.net/"; - license = licenses.gpl2; - description = "The open-source Java Development Kit"; - maintainers = with maintainers; [ edwtjo asbachb ]; - platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; - mainProgram = "java"; - }; + meta = import ./meta.nix lib; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/12.nix b/pkgs/development/compilers/openjdk/12.nix index 33169be5302..636db1c899b 100644 --- a/pkgs/development/compilers/openjdk/12.nix +++ b/pkgs/development/compilers/openjdk/12.nix @@ -145,14 +145,7 @@ let disallowedReferences = [ openjdk11 ]; - meta = with lib; { - homepage = "http://openjdk.java.net/"; - license = licenses.gpl2; - description = "The open-source Java Development Kit"; - maintainers = with maintainers; [ edwtjo ]; - platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; - mainProgram = "java"; - }; + meta = import ./meta.nix lib; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/13.nix b/pkgs/development/compilers/openjdk/13.nix index d3db493c5fe..f65f15e1957 100644 --- a/pkgs/development/compilers/openjdk/13.nix +++ b/pkgs/development/compilers/openjdk/13.nix @@ -145,14 +145,7 @@ let disallowedReferences = [ openjdk13-bootstrap ]; - meta = with lib; { - homepage = "http://openjdk.java.net/"; - license = licenses.gpl2; - description = "The open-source Java Development Kit"; - maintainers = with maintainers; [ edwtjo ]; - platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; - mainProgram = "java"; - }; + meta = import ./meta.nix lib; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/14.nix b/pkgs/development/compilers/openjdk/14.nix index 3804999376e..7d5ed43cd21 100644 --- a/pkgs/development/compilers/openjdk/14.nix +++ b/pkgs/development/compilers/openjdk/14.nix @@ -141,14 +141,7 @@ let disallowedReferences = [ openjdk14-bootstrap ]; - meta = with lib; { - homepage = "https://openjdk.java.net/"; - license = licenses.gpl2; - description = "The open-source Java Development Kit"; - maintainers = with maintainers; [ edwtjo ]; - platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; - mainProgram = "java"; - }; + meta = import ./meta.nix lib; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/15.nix b/pkgs/development/compilers/openjdk/15.nix index 6430c970936..31ff0904b77 100644 --- a/pkgs/development/compilers/openjdk/15.nix +++ b/pkgs/development/compilers/openjdk/15.nix @@ -141,14 +141,7 @@ let disallowedReferences = [ openjdk15-bootstrap ]; - meta = with lib; { - homepage = "https://openjdk.java.net/"; - license = licenses.gpl2; - description = "The open-source Java Development Kit"; - maintainers = with maintainers; [ edwtjo ]; - platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; - mainProgram = "java"; - }; + meta = import ./meta.nix lib; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/16.nix b/pkgs/development/compilers/openjdk/16.nix index 9a710ed6fa4..04e6b6beeb9 100644 --- a/pkgs/development/compilers/openjdk/16.nix +++ b/pkgs/development/compilers/openjdk/16.nix @@ -147,14 +147,7 @@ let disallowedReferences = [ openjdk16-bootstrap ]; - meta = with lib; { - homepage = "https://openjdk.java.net/"; - license = licenses.gpl2; - description = "The open-source Java Development Kit"; - maintainers = with maintainers; [ edwtjo ]; - platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; - mainProgram = "java"; - }; + meta = import ./meta.nix lib; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/darwin/11.nix b/pkgs/development/compilers/openjdk/darwin/11.nix index 6bcd79b274b..8157f1ba72a 100644 --- a/pkgs/development/compilers/openjdk/darwin/11.nix +++ b/pkgs/development/compilers/openjdk/darwin/11.nix @@ -53,10 +53,6 @@ let home = jdk; }; - meta = with lib; { - license = licenses.gpl2; - platforms = platforms.darwin; - }; - + meta = import ./meta.nix lib; }; in jdk diff --git a/pkgs/development/compilers/openjdk/darwin/8.nix b/pkgs/development/compilers/openjdk/darwin/8.nix index a5cd15817e9..6d8875d2693 100644 --- a/pkgs/development/compilers/openjdk/darwin/8.nix +++ b/pkgs/development/compilers/openjdk/darwin/8.nix @@ -57,10 +57,6 @@ let home = jdk; }; - meta = with lib; { - license = licenses.gpl2; - platforms = platforms.darwin; - }; - + meta = import ./meta.nix lib; }; in jdk diff --git a/pkgs/development/compilers/openjdk/darwin/default.nix b/pkgs/development/compilers/openjdk/darwin/default.nix index 731ff4d56de..b458974d7f1 100644 --- a/pkgs/development/compilers/openjdk/darwin/default.nix +++ b/pkgs/development/compilers/openjdk/darwin/default.nix @@ -54,10 +54,6 @@ let home = jdk; }; - meta = with lib; { - license = licenses.gpl2; - platforms = platforms.darwin; - }; - + meta = import ./meta.nix lib; }; in jdk diff --git a/pkgs/development/compilers/openjdk/darwin/meta.nix b/pkgs/development/compilers/openjdk/darwin/meta.nix new file mode 100644 index 00000000000..abe469af691 --- /dev/null +++ b/pkgs/development/compilers/openjdk/darwin/meta.nix @@ -0,0 +1,4 @@ +lib: (removeAttrs (import ../meta.nix lib) [ "maintainers" ]) // { + platforms = lib.platforms.darwin; + homepage = "https://www.azul.com/"; +} diff --git a/pkgs/development/compilers/openjdk/meta.nix b/pkgs/development/compilers/openjdk/meta.nix new file mode 100644 index 00000000000..ee4d6e23d79 --- /dev/null +++ b/pkgs/development/compilers/openjdk/meta.nix @@ -0,0 +1,8 @@ +lib: with lib; { + homepage = "http://openjdk.java.net/"; + license = licenses.gpl2; + description = "The open-source Java Development Kit"; + maintainers = with maintainers; [ edwtjo asbachb ]; + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; + mainProgram = "java"; +}