From d71cae427553f11922fbc7e11eecc2006566d3cc Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 15 Aug 2020 16:16:40 +0200 Subject: nixosTests.mathics: remove The mathics package is unmaintained and doesn't build. Remove the test using it. --- nixos/tests/all-tests.nix | 1 - nixos/tests/mathics.nix | 20 -------------------- 2 files changed, 21 deletions(-) delete mode 100644 nixos/tests/mathics.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 10432e1cb52..bfdbfde786b 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -195,7 +195,6 @@ in mailcatcher = handleTest ./mailcatcher.nix {}; mariadb-galera-mariabackup = handleTest ./mysql/mariadb-galera-mariabackup.nix {}; mariadb-galera-rsync = handleTest ./mysql/mariadb-galera-rsync.nix {}; - mathics = handleTest ./mathics.nix {}; matomo = handleTest ./matomo.nix {}; matrix-synapse = handleTest ./matrix-synapse.nix {}; mediawiki = handleTest ./mediawiki.nix {}; diff --git a/nixos/tests/mathics.nix b/nixos/tests/mathics.nix deleted file mode 100644 index fcbeeb18a72..00000000000 --- a/nixos/tests/mathics.nix +++ /dev/null @@ -1,20 +0,0 @@ -import ./make-test.nix ({ pkgs, ... }: { - name = "mathics"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ benley ]; - }; - - nodes = { - machine = { ... }: { - services.mathics.enable = true; - services.mathics.port = 8888; - }; - }; - - testScript = '' - startAll; - $machine->waitForUnit("mathics.service"); - $machine->waitForOpenPort(8888); - $machine->succeed("curl http://localhost:8888/"); - ''; -}) -- cgit 1.4.1 From 01684d6e9b0cd12c6758aba59fa9527c76f282ab Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 15 Aug 2020 16:19:17 +0200 Subject: nixos/mathics: remove module --- nixos/modules/misc/ids.nix | 2 +- nixos/modules/module-list.nix | 1 - nixos/modules/rename.nix | 1 + nixos/modules/services/misc/mathics.nix | 54 --------------------------------- 4 files changed, 2 insertions(+), 56 deletions(-) delete mode 100644 nixos/modules/services/misc/mathics.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 4692ea32656..870e1d70f14 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -247,7 +247,7 @@ in bepasty = 215; # pumpio = 216; # unused, removed 2018-02-24 nm-openvpn = 217; - mathics = 218; + # mathics = 218; # unused, removed 2020-08-15 ejabberd = 219; postsrsd = 220; opendkim = 221; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 2cc36078223..c193fcf6913 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -466,7 +466,6 @@ ./services/misc/leaps.nix ./services/misc/lidarr.nix ./services/misc/mame.nix - ./services/misc/mathics.nix ./services/misc/matrix-appservice-discord.nix ./services/misc/matrix-synapse.nix ./services/misc/mautrix-telegram.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index cfe216d512b..3be4a523ba0 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -28,6 +28,7 @@ with lib; (mkRemovedOptionModule [ "services" "osquery" ] "The osquery module has been removed") (mkRemovedOptionModule [ "services" "fourStore" ] "The fourStore module has been removed") (mkRemovedOptionModule [ "services" "fourStoreEndpoint" ] "The fourStoreEndpoint module has been removed") + (mkRemovedOptionModule [ "services" "mathics" ] "The Mathics module has been removed") (mkRemovedOptionModule [ "programs" "way-cooler" ] ("way-cooler is abandoned by its author: " + "https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html")) (mkRemovedOptionModule [ "services" "xserver" "multitouch" ] '' diff --git a/nixos/modules/services/misc/mathics.nix b/nixos/modules/services/misc/mathics.nix deleted file mode 100644 index c588a30d76c..00000000000 --- a/nixos/modules/services/misc/mathics.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ pkgs, lib, config, ... }: - -with lib; - -let - cfg = config.services.mathics; - -in { - options = { - services.mathics = { - enable = mkEnableOption "Mathics notebook service"; - - external = mkOption { - type = types.bool; - default = false; - description = "Listen on all interfaces, rather than just localhost?"; - }; - - port = mkOption { - type = types.int; - default = 8000; - description = "TCP port to listen on."; - }; - }; - }; - - config = mkIf cfg.enable { - - users.users.mathics = { - group = config.users.groups.mathics.name; - description = "Mathics user"; - home = "/var/lib/mathics"; - createHome = true; - uid = config.ids.uids.mathics; - }; - - users.groups.mathics.gid = config.ids.gids.mathics; - - systemd.services.mathics = { - description = "Mathics notebook server"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - serviceConfig = { - User = config.users.users.mathics.name; - Group = config.users.groups.mathics.name; - ExecStart = concatStringsSep " " [ - "${pkgs.mathics}/bin/mathicsserver" - "--port" (toString cfg.port) - (if cfg.external then "--external" else "") - ]; - }; - }; - }; -} -- cgit 1.4.1 From 9489dcb7ba1792b9a49bf072a16f4fdc32dd2fad Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 15 Aug 2020 16:19:28 +0200 Subject: mathics: remove package definiton --- .../development/python-modules/mathics/default.nix | 50 ---------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - pkgs/top-level/python-packages.nix | 2 - 4 files changed, 1 insertion(+), 54 deletions(-) delete mode 100644 pkgs/development/python-modules/mathics/default.nix diff --git a/pkgs/development/python-modules/mathics/default.nix b/pkgs/development/python-modules/mathics/default.nix deleted file mode 100644 index 0bd81f00848..00000000000 --- a/pkgs/development/python-modules/mathics/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchFromGitHub -, django -, python -, cython -, sympy -, ply -, mpmath -, dateutil -, colorama -, six -, pexpect -}: - -if (stdenv.lib.versionOlder django.version "1.8") || - (stdenv.lib.versionAtLeast django.version "1.9") - then throw "mathics only supports django-1.8.x" - else buildPythonPackage rec { - pname = "mathics"; - version = "0.9"; - - src = fetchFromGitHub { - owner = "mathics"; - repo = "Mathics"; - rev = "v${version}"; - sha256 = "0xzz7j8xskj5y6as178mjmm0i2xbhd4q4mwmdnvghpd2aqq3qx1c"; - }; - - buildInputs = [ pexpect ]; - - prePatch = '' - substituteInPlace setup.py --replace "sympy==0.7.6" "sympy" - ''; - - postFixup = '' - wrapPythonProgramsIn $out/bin $out - patchPythonScript $out/${python.sitePackages}/mathics/manage.py - ''; - - propagatedBuildInputs = [ cython sympy django ply mpmath dateutil colorama six ]; - - meta = with stdenv.lib; { - description = "A general-purpose computer algebra system"; - homepage = "http://www.mathics.org"; - license = licenses.gpl3; - maintainers = [ maintainers.benley ]; - }; - -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 19d1218e3db..75f940ce210 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -283,6 +283,7 @@ mapAliases ({ manpages = man-pages; # added 2015-12-06 mariadb-client = hiPrio mariadb.client; #added 2019.07.28 matcha = throw "matcha was renamed to matcha-gtk-theme"; # added 2020-05-09 + mathics = throw "mathics has been removed from nixpkgs, as it's unmaintained"; # added 2020-08-15 matrique = spectral; # added 2020-01-27 mbedtls_1_3 = throw "mbedtls_1_3 is end of life, see https://tls.mbed.org/kb/how-to/upgrade-2.0"; # added 2019-12-08 mess = mame; # added 2019-10-30 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95dd5561c6f..5628b16533b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2112,8 +2112,6 @@ in marlin-calc = callPackage ../tools/misc/marlin-calc {}; - mathics = with python2Packages; toPythonApplication mathics; - masscan = callPackage ../tools/security/masscan { stdenv = gccStdenv; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4ac616e62eb..5affc624e9f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4742,8 +4742,6 @@ in { markdown-macros = callPackage ../development/python-modules/markdown-macros { }; - mathics = callPackage ../development/python-modules/mathics { }; - matplotlib = let path = if isPy3k then ../development/python-modules/matplotlib/default.nix else ../development/python-modules/matplotlib/2.nix; -- cgit 1.4.1