From fb6736a984779eb06491513fed13a8ebc293e9db Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Fri, 3 Jan 2025 18:29:28 +0100 Subject: [PATCH] scala: drop scala 2.10 and 2.11 While technically still in maintenance mode, I don't think these old versions have a place in nixpkgs. https://www.scala-lang.org/download/all.html --- pkgs/development/compilers/scala/2.x.nix | 12 ------------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 14 deletions(-) diff --git a/pkgs/development/compilers/scala/2.x.nix b/pkgs/development/compilers/scala/2.x.nix index 793535c27d39..7eaecc253a96 100644 --- a/pkgs/development/compilers/scala/2.x.nix +++ b/pkgs/development/compilers/scala/2.x.nix @@ -19,18 +19,6 @@ let repo = "git@github.com:scala/scala.git"; versionMap = { - "2.10" = { - version = "2.10.7"; - hash = "sha256-koMRmRb2u3cU4HaihAzPItWIGbNVIo7RWRrm92kp8RE="; - pname = "scala_2_10"; - }; - - "2.11" = { - version = "2.11.12"; - hash = "sha256-sR19M2mcpPYLw7K2hY/ZU+PeK4UiyUP0zaS2dDFhlqg="; - pname = "scala_2_11"; - }; - "2.12" = { version = "2.12.18"; hash = "sha256-naIJCET+YPrbXln39F9aU3DBdnjcn7PYMmhDxETOA5g="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0be8e747eaed..0f833426350f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6825,8 +6825,6 @@ with pkgs; rustup-toolchain-install-master = callPackage ../development/tools/rust/rustup-toolchain-install-master { inherit (darwin.apple_sdk.frameworks) Security; }; - scala_2_10 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.10"; jre = jdk8; }; - scala_2_11 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.11"; jre = jdk8; }; scala_2_12 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.12"; }; scala_2_13 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.13"; }; scala_3 = callPackage ../development/compilers/scala { };