From 0d0734d2239c6f2f61ae7ddd859f491f46d6848a Mon Sep 17 00:00:00 2001 From: stuebinm Date: Tue, 14 Jun 2022 17:38:25 +0200 Subject: update sources, move to NixOS 22.05 --- chaski/configuration.nix | 4 +--- chaski/services/tracktrain.nix | 9 ++++++++- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'chaski') diff --git a/chaski/configuration.nix b/chaski/configuration.nix index 88d617b..6e14e95 100644 --- a/chaski/configuration.nix +++ b/chaski/configuration.nix @@ -8,9 +8,7 @@ imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix - # note: dns records deleted - # ./services/jitsi.nix - ./services/uplcg.nix + # ./services/uplcg.nix ./services/woitb.nix ./services/geolocation.nix ./services/tracktrain.nix diff --git a/chaski/services/tracktrain.nix b/chaski/services/tracktrain.nix index 6f9acb9..3841a42 100644 --- a/chaski/services/tracktrain.nix +++ b/chaski/services/tracktrain.nix @@ -23,7 +23,14 @@ script = '' cd /tmp wget "https://ilztalbahn.eu/wp-content/uploads/2020/07/gtfs.zip" - ${import inputs.tracktrain {nixpkgs = pkgs;}}/bin/haskell-gtfs + ${((import inputs.tracktrain {nixpkgs = pkgs;})) + # have to remove version constraints because some aren't in 22.05 + .overrideAttrs (old: { patchPhase = '' + sed -i "s/base.*/base/g" *.cabal + sed -i "s/^>=.*//g" *.cabal + sed -i "s/>=.*//g" *.cabal + ''; }) + }/bin/haskell-gtfs ''; startAt = "daily"; }; -- cgit v1.2.3