From 6b4b2056df6bfa2b808903e7fa67008c0c262e86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 18 Oct 2020 10:29:04 +0200 Subject: [PATCH] Merge #93333: julia: Remove version 0.7 and 1.1 (cherry picked from commit 04821fbe463b0ef487cf45ffb1fdb2b7b7b407d2) --- pkgs/development/compilers/julia/0.7.nix | 9 --------- pkgs/development/compilers/julia/1.1.nix | 9 --------- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 10 ---------- 4 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 pkgs/development/compilers/julia/0.7.nix delete mode 100644 pkgs/development/compilers/julia/1.1.nix diff --git a/pkgs/development/compilers/julia/0.7.nix b/pkgs/development/compilers/julia/0.7.nix deleted file mode 100644 index e0992d800033..000000000000 --- a/pkgs/development/compilers/julia/0.7.nix +++ /dev/null @@ -1,9 +0,0 @@ -import ./shared.nix { - majorVersion = "0"; - minorVersion = "7"; - maintenanceVersion = "0"; - src_sha256 = "1j57569qm2ii8ddzsp08hds2navpk7acdz83kh27dvk44axhwj6f"; - - libuvVersion = "ed3700c849289ed01fe04273a7bf865340b2bd7e"; - libuvSha256 = "137w666zsjw1p0ma3lf94d75hr1q45sgkfmbizkyji2qm57cnxjs"; -} diff --git a/pkgs/development/compilers/julia/1.1.nix b/pkgs/development/compilers/julia/1.1.nix deleted file mode 100644 index 5be34b4c4b4c..000000000000 --- a/pkgs/development/compilers/julia/1.1.nix +++ /dev/null @@ -1,9 +0,0 @@ -import ./shared.nix { - majorVersion = "1"; - minorVersion = "1"; - maintenanceVersion = "1"; - src_sha256 = "1yqjd0n42xf9hzxpvc9vysyjj98p42by216jkdqakdy7dkjcmnhq"; - - libuvVersion = "2348256acf5759a544e5ca7935f638d2bc091d60"; - libuvSha256 = "1363f4vqayfcv5zqg07qmzjff56yhad74k16c22ian45lram8mv8"; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9d463447e25a..c594a6798e56 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -217,6 +217,8 @@ mapAliases ({ joseki = apache-jena-fuseki; # added 2016-02-28 json_glib = json-glib; # added 2018-02-25 kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # 2020-06-16 + julia_07 = throw "deprecated in favor of julia_10 LTS"; # added 2020-09-15 + julia_11 = throw "deprecated in favor of latest Julia version"; # added 2020-09-15 kdiff3-qt5 = kdiff3; # added 2017-02-18 keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02 keepassx-community = keepassxc; # added 2017-11 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cb48286a8a58..2fa3e2ce7d33 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9259,21 +9259,11 @@ in javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { }; - julia_07 = callPackage ../development/compilers/julia/0.7.nix { - gmp = gmp6; - inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; - }; - julia_10 = callPackage ../development/compilers/julia/1.0.nix { gmp = gmp6; inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; }; - julia_11 = callPackage ../development/compilers/julia/1.1.nix { - gmp = gmp6; - inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; - }; - julia_13 = callPackage ../development/compilers/julia/1.3.nix { gmp = gmp6; inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;