From 3a188316e7ba9248ec9ab2bd7d5e632fb22654f4 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 6 Dec 2021 00:17:36 +0200 Subject: [PATCH] gaia: Remove --- pkgs/development/libraries/gaia/default.nix | 87 --------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - pkgs/top-level/python2-packages.nix | 5 -- 4 files changed, 1 insertion(+), 94 deletions(-) delete mode 100644 pkgs/development/libraries/gaia/default.nix diff --git a/pkgs/development/libraries/gaia/default.nix b/pkgs/development/libraries/gaia/default.nix deleted file mode 100644 index 47926e2ec0bea..0000000000000 --- a/pkgs/development/libraries/gaia/default.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, libyaml -, swig -, eigen -, pkg-config -, python2 -, wafHook -, makeWrapper -, qt4 -, pythonPackages ? null -, pythonSupport ? false -# Default to false since it breaks the build, see https://github.com/MTG/gaia/issues/11 -, stlfacadeSupport ? false -, assertsSupport ? true -, cyclopsSupport ? true -}: - -assert pythonSupport -> pythonPackages != null; - -stdenv.mkDerivation rec { - pname = "gaia"; - version = "2.4.6"; - - src = fetchFromGitHub { - owner = "MTG"; - repo = "gaia"; - rev = "v${version}"; - sha256 = "03vmdq7ca4f7zp2f4sxyqa8sdpdma3mn9fz4z7d93qryl0bhi7z3"; - }; - - # Fix installation error when waf tries to put files in /etc/ - prePatch = "" + lib.optionalString cyclopsSupport '' - substituteInPlace src/wscript \ - --replace "/etc/cyclops" "$out/etc/cyclops" \ - --replace "/etc/init.d" "$out/etc/init.d" - ''; - - nativeBuildInputs = [ - pkg-config - python2 # For wafHook - swig - wafHook - ] - # The gaiafusion binary inside $out/bin needs a shebangs patch, and - # wrapping with the appropriate $PYTHONPATH - ++ lib.optionals (pythonSupport) [ - pythonPackages.wrapPython - ] - ; - - buildInputs = [ - libyaml - eigen - qt4 - ]; - - propagatedBuildInputs = [] - ++ lib.optionals (pythonSupport) [ - # This is not exactly specified in upstream's README but it's needed by the - # resulting $out/bin/gaiafusion script - pythonPackages.pyyaml - ] - ; - - wafConfigureFlags = [] - ++ lib.optionals (pythonSupport) [ "--with-python-bindings" ] - ++ lib.optionals (stlfacadeSupport) [ "--with-stlfacade" ] - ++ lib.optionals (assertsSupport) [ "--with-asserts" ] - ++ lib.optionals (cyclopsSupport) [ "--with-cyclops" ] - ; - - postFixup = "" - + lib.optionalString pythonSupport '' - wrapPythonPrograms - '' - ; - - meta = with lib; { - homepage = "https://github.com/MTG/gaia"; - description = "General library to work with points in a semimetric space"; - maintainers = with maintainers; [ doronbehar ]; - platforms = platforms.x86; # upstream assume SSE2 / fails on ARM - license = licenses.agpl3; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c78e211923912..d8547b2c20b26 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -279,6 +279,7 @@ mapAliases ({ fuseki = apache-jena-fuseki; # added 2018-04-25 fwupdate = throw "fwupdate was merged into fwupd"; # added 2020-05-19 g4py = python3Packages.geant4; # added 2020-06-06 + gaia = throw "gaia has been removed because it seems abandoned upstream and uses no longer supported dependencies"; # added 2020-06-06 gdal_1_11 = throw "gdal_1_11 was removed. Use gdal instead."; # added 2021-04-03 gdb-multitarget = gdb; # added 2017-11-13 gdk_pixbuf = gdk-pixbuf; # added 2019-05-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7674300b4e59b..f6d453eda4d44 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1715,8 +1715,6 @@ with pkgs; genymotion = callPackage ../development/mobile/genymotion { }; - gaia = callPackage ../development/libraries/gaia { }; - galene = callPackage ../servers/web-apps/galene { buildGoModule = buildGo115Module; }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index d96d5a4252f7c..ace11ce495ffe 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -132,11 +132,6 @@ with self; with super; { gdcm = disabled super.gdcm; - gaia = disabledIf (isPyPy || isPy3k) (toPythonModule (pkgs.gaia.override { - pythonPackages = self; - pythonSupport = true; - })); # gaia isn't supported with python3 and it's not available from pypi - geant4 = disabled super.geant4; geopy = callPackage ../development/python-modules/geopy/2.nix { };