From fdf2cdcacfdbe95fa0b53a78f8327c013ade3480 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 26 Nov 2022 21:46:12 +0800 Subject: [PATCH 1/7] i2p: unpin to jdk8 --- pkgs/top-level/all-packages.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ddd3f57f82b8..3020d267028f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7928,10 +7928,7 @@ with pkgs; i2c-tools = callPackage ../os-specific/linux/i2c-tools { }; - i2p = callPackage ../tools/networking/i2p { - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; + i2p = callPackage ../tools/networking/i2p { }; i2pd = callPackage ../tools/networking/i2pd { }; From d937fb7956cb24075eb4f5156e5d0e8236d841bf Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 26 Nov 2022 21:50:30 +0800 Subject: [PATCH 2/7] abcl: unpin to jdk8 --- pkgs/top-level/all-packages.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3020d267028f..5cd5590479e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13413,10 +13413,7 @@ with pkgs; _4th = callPackage ../development/compilers/4th { }; - abcl = callPackage ../development/compilers/abcl { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; + abcl = callPackage ../development/compilers/abcl { }; temurin-bin-17 = javaPackages.compiler.temurin-bin.jdk-17; temurin-jre-bin-17 = javaPackages.compiler.temurin-bin.jre-17; From cc5788c8d06885df9c9efb593448dfece8236d7b Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 26 Nov 2022 21:54:25 +0800 Subject: [PATCH 3/7] mercury: unpin to jdk8 --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5cd5590479e8..3e5e6b10e85b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14762,9 +14762,7 @@ with pkgs; marst = callPackage ../development/compilers/marst { }; - mercury = callPackage ../development/compilers/mercury { - jdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; + mercury = callPackage ../development/compilers/mercury { }; microscheme = callPackage ../development/compilers/microscheme { }; From e38d4814ed49666614e00e765475d4c8c9d3582b Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 26 Nov 2022 21:57:42 +0800 Subject: [PATCH 4/7] antlr*: unpin to jdk8 --- pkgs/top-level/all-packages.nix | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e5e6b10e85b..d61555f969c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16296,23 +16296,13 @@ with pkgs; ansible-lint = with python3.pkgs; toPythonApplication ansible-lint; - antlr2 = callPackage ../development/tools/parsing/antlr/2.7.7.nix { - jdk = jdk8; # todo: remove override https://github.com/nixos/nixpkgs/pull/89731 - }; - - antlr3_4 = callPackage ../development/tools/parsing/antlr/3.4.nix { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; - antlr3_5 = callPackage ../development/tools/parsing/antlr/3.5.nix { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; + antlr2 = callPackage ../development/tools/parsing/antlr/2.7.7.nix { }; + antlr3_4 = callPackage ../development/tools/parsing/antlr/3.4.nix { }; + antlr3_5 = callPackage ../development/tools/parsing/antlr/3.5.nix { }; antlr3 = antlr3_5; - inherit (callPackages ../development/tools/parsing/antlr/4.nix { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }) antlr4_8; - inherit (callPackages ../development/tools/parsing/antlr/4.nix { }) + antlr4_8 antlr4_9 antlr4_10 antlr4_11; From 0c54a45edb3720585fd948df6742466bf372478c Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 26 Nov 2022 22:04:16 +0800 Subject: [PATCH 5/7] virtualbox: unpin to jdk8 --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d61555f969c5..40915f97318c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32773,7 +32773,6 @@ with pkgs; virtualbox = libsForQt5.callPackage ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; inherit (gnome2) libIDL; - jdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; virtualboxHardened = lowPrio (virtualbox.override { From 4b8eb12865d8a3fc4030023671c5b0da255f5106 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 26 Nov 2022 22:08:02 +0800 Subject: [PATCH 6/7] cvc4: unpin to jdk8 --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40915f97318c..d99e5e0fe14a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35807,9 +35807,7 @@ with pkgs; gmp = lib.overrideDerivation gmp (_: { dontDisableStatic = true; }); stdenv = gccStdenv; }; - cvc4 = callPackage ../applications/science/logic/cvc4 { - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; + cvc4 = callPackage ../applications/science/logic/cvc4 { }; cvc5 = callPackage ../applications/science/logic/cvc5 { }; From 3a48b5d0674dbc134da235fff8eeae36b721b944 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 26 Nov 2022 22:08:54 +0800 Subject: [PATCH 7/7] collectd: unpin to jdk8 --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d99e5e0fe14a..253e5a461ac0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5408,7 +5408,6 @@ with pkgs; convertlit = callPackage ../tools/text/convertlit { }; collectd = callPackage ../tools/system/collectd { - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 inherit (darwin.apple_sdk.frameworks) IOKit; };