From f1ca7eecbb1346bb67741850b359ea0778fcddab Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 13 Jun 2022 02:39:32 +0200 Subject: [PATCH] avogadro: remove --- .../science/chemistry/avogadro/default.nix | 30 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 5 ---- 3 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 pkgs/applications/science/chemistry/avogadro/default.nix diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/pkgs/applications/science/chemistry/avogadro/default.nix deleted file mode 100644 index 547123b67957..000000000000 --- a/pkgs/applications/science/chemistry/avogadro/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkg-config, libGLU, libGL, libX11, doxygen }: - -stdenv.mkDerivation rec { - pname = "avogadro"; - version = "1.1.1"; - - src = fetchurl { - url = "mirror://sourceforge/avogadro/avogadro-${version}.tar.bz2"; - sha256 = "050ag9p4vg7jg8hj1wqfv7lsm6ar2isxjw2vw85s49vsl7g7nvzy"; - }; - - buildInputs = [ qt4 eigen zlib openbabel libGL libGLU libX11 ]; - - nativeBuildInputs = [ cmake pkg-config doxygen ]; - - env.NIX_CFLAGS_COMPILE = "-include ${libGLU.dev}/include/GL/glu.h"; - - patches = [ - (fetchurl { - url = "https://data.gpo.zugaina.org/fusion809/sci-chemistry/avogadro/files/avogadro-1.1.0-xlibs.patch"; - sha256 = "1p113v19z3zwr9gxj2k599f8p97a8rwm93pa4amqvd0snn31mw0k"; - }) - ]; - - meta = with lib; { - description = "Molecule editor and visualizer"; - maintainers = with maintainers; [ danielbarter ]; - platforms = platforms.mesaPlatforms; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ecbfa2b241c1..2357cd0fe3fa 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -114,6 +114,7 @@ mapAliases ({ audacity-gtk3 = throw "'audacity-gtk3' has been removed to/replaced by 'audacity'"; # Added 2022-10-09 automoc4 = throw "automoc4 has been removed from nixpkgs"; # Added 2022-05-30 avldrums-lv2 = x42-avldrums; # Added 2020-03-29 + avogadro = throw "avogadro has been removed, because it depended on qt4"; # Added 2022-06-12 avxsynth = throw "avxsynth was removed because it was broken"; # Added 2021-05-18 awesome-4-0 = awesome; # Added 2022-05-05 aws = throw "aws has been removed: abandoned by upstream. For the AWS CLI maintained by Amazon, see 'awscli' or 'awscli2'"; # Added 2022-09-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bec66519ae1d..622cded6a878 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38926,11 +38926,6 @@ with pkgs; apbs = callPackage ../applications/science/chemistry/apbs { }; - avogadro = callPackage ../applications/science/chemistry/avogadro { - openbabel = openbabel2; - eigen = eigen2; - }; - avogadrolibs = libsForQt5.callPackage ../development/libraries/science/chemistry/avogadrolibs { }; molequeue = libsForQt5.callPackage ../development/libraries/science/chemistry/molequeue { };