From 20215bee7461f9d900b433cdb1e53589d641dbfd Mon Sep 17 00:00:00 2001 From: aleksana Date: Wed, 17 Jul 2024 22:13:41 +0800 Subject: [PATCH 1/2] top-level/python-packages.nix: move removal notice to python-aliases.nix --- pkgs/top-level/python-aliases.nix | 8 ++++++++ pkgs/top-level/python-packages.nix | 16 ---------------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 34fa065b9945..7f4eb0e9ab84 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -90,8 +90,16 @@ mapAliases ({ case = throw "case has been removed, since it is an unused leaf package with a dependency on the nose test framework"; # added 2024-07-08 cchardet = faust-cchardet; # added 2023-03-02 cepa = throw "cepa has been removed, as onionshare switched back to stem"; # added 2024-05-07 + chiabip158 = throw "chiabip158 has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26 + chiapos = throw "chiapos has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26 + chiavdf = throw "chiavdf has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26 + chia-rs = throw "chia-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26 class-registry = phx-class-registry; # added 2021-10-05 cld2-cffi = throw "cld2-cffi has been removed, as the last release was in 2016"; # added 2024-05-20 + clvm = throw "clvm has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26 + clvm-rs = throw "clvm-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26 + clvm-tools = throw "clvm-tools has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26 + clvm-tools-rs = throw "clvm-tools-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26 cntk = throw "cntk has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-10-09 codespell = throw "codespell has been promoted to a top-level attribute name: `pkgs.codespell`"; # Added 2022-10-02 ColanderAlchemy = colanderalchemy; # added 2023-02-19 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e6b0da130ca3..5f877823c243 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2151,14 +2151,6 @@ self: super: with self; { chex = callPackage ../development/python-modules/chex { }; - chiabip158 = throw "chiabip158 has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; - - chiapos = throw "chiapos has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; - - chiavdf = throw "chiavdf has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; - - chia-rs = throw "chia-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; - chirpstack-api = callPackage ../development/python-modules/chirpstack-api { }; chispa = callPackage ../development/python-modules/chispa { }; @@ -2333,14 +2325,6 @@ self: super: with self; { clustershell = callPackage ../development/python-modules/clustershell { }; - clvm = throw "clvm has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; - - clvm-rs = throw "clvm-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; - - clvm-tools = throw "clvm-tools has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; - - clvm-tools-rs = throw "clvm-tools-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; - cma = callPackage ../development/python-modules/cma { }; cmaes = callPackage ../development/python-modules/cmaes { }; From beae2027686e2c5eff2a206b2ae0b3c9136f22d1 Mon Sep 17 00:00:00 2001 From: aleksana Date: Wed, 17 Jul 2024 22:14:13 +0800 Subject: [PATCH 2/2] top-level/all-packages.nix: move removal notice to aliases.nix --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f171a84d8f3e..77f851d01ec6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1290,6 +1290,7 @@ mapAliases ({ slmenu = throw "slmenu has been removed (upstream is gone)"; # Added 2023-04-06 slurm-llnl = slurm; # renamed July 2017 smesh = throw "'smesh' has been removed as it's unmaintained and depends on opencascade-oce, which is also unmaintained"; # Added 2023-09-18 + snapTools = throw "snapTools was removed because makeSnap produced broken snaps and it was the only function in snapTools. See https://github.com/NixOS/nixpkgs/issues/100618 for more details."; # 2024-03-04; soldat-unstable = opensoldat; # Added 2022-07-02 solr_8 = throw "'solr' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-03-16 solr = throw "'solr' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-03-16 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e810e7726d56..661cf0304648 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -842,8 +842,6 @@ with pkgs; tarsum = callPackage ../build-support/docker/tarsum.nix { }; - snapTools = throw "snapTools was removed because makeSnap produced broken snaps and it was the only function in snapTools. See https://github.com/NixOS/nixpkgs/issues/100618 for more details."; # 2024-03-04; - nix-prefetch-docker = callPackage ../build-support/docker/nix-prefetch-docker.nix { }; docker-ls = callPackage ../tools/misc/docker-ls { };