From a859ef91f0fef2139742c11eda43ea3d747cbb9e Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Fri, 31 Dec 2021 08:54:16 +0000 Subject: trac, nixos/trac: remove They have been broken for multiple releases. --- nixos/modules/module-list.nix | 1 - nixos/modules/services/web-apps/trac.nix | 79 -------------------------------- nixos/tests/all-tests.nix | 1 - nixos/tests/trac.nix | 19 -------- pkgs/tools/misc/trac/default.nix | 56 ---------------------- pkgs/top-level/all-packages.nix | 2 - 6 files changed, 158 deletions(-) delete mode 100644 nixos/modules/services/web-apps/trac.nix delete mode 100644 nixos/tests/trac.nix delete mode 100644 pkgs/tools/misc/trac/default.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index dfdac4251a493..c4aae9553c889 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1034,7 +1034,6 @@ ./services/web-apps/sogo.nix ./services/web-apps/rss-bridge.nix ./services/web-apps/tt-rss.nix - ./services/web-apps/trac.nix ./services/web-apps/trilium.nix ./services/web-apps/selfoss.nix ./services/web-apps/shiori.nix diff --git a/nixos/modules/services/web-apps/trac.nix b/nixos/modules/services/web-apps/trac.nix deleted file mode 100644 index 207fb857438a4..0000000000000 --- a/nixos/modules/services/web-apps/trac.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ config, lib, pkgs, ... }: - -let - cfg = config.services.trac; - - inherit (lib) mkEnableOption mkIf mkOption types; - -in { - - options = { - - services.trac = { - enable = mkEnableOption "Trac service"; - - listen = { - ip = mkOption { - type = types.str; - default = "0.0.0.0"; - description = '' - IP address that Trac should listen on. - ''; - }; - - port = mkOption { - type = types.port; - default = 8000; - description = '' - Listen port for Trac. - ''; - }; - }; - - dataDir = mkOption { - default = "/var/lib/trac"; - type = types.path; - description = '' - The directory for storing the Trac data. - ''; - }; - - openFirewall = mkOption { - type = types.bool; - default = false; - description = '' - Open ports in the firewall for Trac. - ''; - }; - }; - - }; - - config = mkIf cfg.enable { - - systemd.services.trac = { - description = "Trac server"; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - DynamicUser = true; - StateDirectory = baseNameOf cfg.dataDir; - ExecStart = '' - ${pkgs.trac}/bin/tracd -s \ - -b ${toString cfg.listen.ip} \ - -p ${toString cfg.listen.port} \ - ${cfg.dataDir} - ''; - }; - preStart = '' - if [ ! -e ${cfg.dataDir}/VERSION ]; then - ${pkgs.trac}/bin/trac-admin ${cfg.dataDir} initenv Trac "sqlite:db/trac.db" - fi - ''; - }; - - networking.firewall = mkIf cfg.openFirewall { - allowedTCPPorts = [ cfg.listen.port ]; - }; - - }; -} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index db526df392b33..e252acc721d6a 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -475,7 +475,6 @@ in tinc = handleTest ./tinc {}; tinydns = handleTest ./tinydns.nix {}; tor = handleTest ./tor.nix {}; - trac = handleTest ./trac.nix {}; # traefik test relies on docker-containers traefik = handleTestOn ["x86_64-linux"] ./traefik.nix {}; trafficserver = handleTest ./trafficserver.nix {}; diff --git a/nixos/tests/trac.nix b/nixos/tests/trac.nix deleted file mode 100644 index d6914c1008175..0000000000000 --- a/nixos/tests/trac.nix +++ /dev/null @@ -1,19 +0,0 @@ -import ./make-test-python.nix ({ pkgs, ... }: { - name = "trac"; - meta = with pkgs.lib.maintainers; { - maintainers = [ mmahut ]; - }; - - nodes = { - machine = { ... }: { - services.trac.enable = true; - }; - }; - - testScript = '' - start_all() - machine.wait_for_unit("trac.service") - machine.wait_for_open_port(8000) - machine.wait_until_succeeds("curl -fL http://localhost:8000/ | grep 'Trac Powered'") - ''; -}) diff --git a/pkgs/tools/misc/trac/default.nix b/pkgs/tools/misc/trac/default.nix deleted file mode 100644 index 1d0f9a5d8288f..0000000000000 --- a/pkgs/tools/misc/trac/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib -, buildPythonApplication -, fetchPypi -, Babel -, docutils -, pygments -, pytz -, jinja2 -, pysqlite -, psycopg2 -, pymysql -, git -, setuptools -}: - - -buildPythonApplication rec { - pname = "trac"; - version = "1.4.1"; - - src = fetchPypi { - inherit version; - pname = "Trac"; - sha256 = "0d61ypn0j9wb8119bj3pj7s8swfjykdl0sz398p92k9bvxh4dayz"; - }; - - prePatch = '' - # Removing the date format tests as they are outdated - substituteInPlace trac/util/tests/__init__.py \ - --replace "suite.addTest(datefmt.test_suite())" "" - # Removing Pygments tests as per https://trac.edgewall.org/ticket/13229 - substituteInPlace trac/mimeview/tests/__init__.py \ - --replace "suite.addTest(pygments.test_suite())" "" - ''; - - propagatedBuildInputs = [ - Babel - docutils - pygments - pytz - jinja2 - pysqlite - psycopg2 - pymysql - git - setuptools - ]; - - meta = with lib; { - description = "Integrated SCM, wiki, issue tracker and project environment"; - homepage = "https://trac.edgewall.org/"; - license = licenses.bsd3; - maintainers = with maintainers; [ mmahut ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 37787ba8a3bc3..fd2de876e04a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4946,8 +4946,6 @@ with pkgs; tsm-client = callPackage ../tools/backup/tsm-client { jdk8 = null; }; tsm-client-withGui = callPackage ../tools/backup/tsm-client { }; - trac = pythonPackages.callPackage ../tools/misc/trac { }; - tracker = callPackage ../development/libraries/tracker { }; tracker-miners = callPackage ../development/libraries/tracker-miners { }; -- cgit 1.4.1