diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2022-11-27 09:29:44 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-27 09:29:44 -0500 |
commit | ec21b5b3a908e998ef4cddd24052f4dd63f7691a (patch) | |
tree | 0364f865998627217f16f1fc33daa882a9ef98df | |
parent | f21869964aa1bd2220efe8c50d12b64467267a44 (diff) | |
parent | 3a48b5d0674dbc134da235fff8eeae36b721b944 (diff) |
Merge pull request #203071 from NickCao/jdk8
unpin various packages to jdk8
-rw-r--r-- | pkgs/top-level/all-packages.nix | 38 |
1 files changed, 8 insertions, 30 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74644a01f6518..ae780eba8ea4c 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; }; @@ -7926,10 +7925,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 { }; @@ -13412,10 +13408,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; @@ -14764,9 +14757,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 { }; @@ -16319,23 +16310,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; @@ -32799,7 +32780,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 { @@ -35833,9 +35813,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 { }; |