From 6181a98668a74f4ddc88cc5814ba910d40b32b5a Mon Sep 17 00:00:00 2001 From: stuebinm Date: Fri, 3 Feb 2023 01:00:06 +0100 Subject: chaski: update tracktrain & use static gtfs --- chaski/services/gtfs.zip | Bin 0 -> 61958 bytes chaski/services/tracktrain.nix | 3 +-- flake.lock | 8 ++++---- 3 files changed, 5 insertions(+), 6 deletions(-) create mode 100644 chaski/services/gtfs.zip diff --git a/chaski/services/gtfs.zip b/chaski/services/gtfs.zip new file mode 100644 index 0000000..e0b8fc3 Binary files /dev/null and b/chaski/services/gtfs.zip differ diff --git a/chaski/services/tracktrain.nix b/chaski/services/tracktrain.nix index f1a7d13..940ad71 100644 --- a/chaski/services/tracktrain.nix +++ b/chaski/services/tracktrain.nix @@ -14,7 +14,7 @@ let tracktrain-config = '' dbstring: "dbname=tracktrain user=tracktrain" - gtfs: ./gtfs.zip + gtfs: ${pkgs.copyPathToStore ./gtfs.zip} warp: port: 4000 @@ -105,7 +105,6 @@ in script = '' cd /tmp ln -sf ${pkgs.writeText "config.yaml" tracktrain-config} "config.yaml" - wget "https://ilztalbahn.eu/wp-content/uploads/2020/07/gtfs.zip" ${stripLib (((import inputs.tracktrain {nixpkgs = pkgs;})) # have to remove version constraints because some aren't in 22.05 .overrideAttrs (old: { patchPhase = '' diff --git a/flake.lock b/flake.lock index c2008fd..501f35f 100644 --- a/flake.lock +++ b/flake.lock @@ -398,11 +398,11 @@ "tracktrain": { "flake": false, "locked": { - "lastModified": 1674405034, - "narHash": "sha256-zKGuktcZ47kC+Jo0Mc0dvB1rMTZN1HprouZ7uRm9VoU=", + "lastModified": 1674936614, + "narHash": "sha256-BsF4CzI8ukthTsczo9VJIlz+9ILEMXlYMTvh0lIlzDI=", "ref": "main", - "rev": "53e7884ec03e870431064062519d3a94302bc480", - "revCount": 80, + "rev": "1612bb5aec55af06f66012ff2627f533e7a57c67", + "revCount": 82, "type": "git", "url": "https://stuebinm.eu/git/tracktrain" }, -- cgit v1.2.3