From a110bc3739cf79dd740398b185bafbab4581f2d1 Mon Sep 17 00:00:00 2001 From: stuebinm Date: Tue, 27 May 2025 23:35:50 +0200 Subject: default.nix: update for nixpkgs 25.05 --- default.nix | 9 ++++----- tracktrain.cabal | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/default.nix b/default.nix index b3fcdef..37248e7 100644 --- a/default.nix +++ b/default.nix @@ -12,15 +12,14 @@ let mkDerivation { pname = "conftrack"; version = "0.0.1"; - src = nixpkgs.fetchgit { - url = "https://stuebinm.eu/git/conftrack"; - rev = "3e71d0ab05c7f5fd71a75b86eeac6f8a1edc3a44"; - hash = "sha256-gBkzbvKFNhut2XbruqisXLSHFwJPIsf8e5bjrSUgHsI="; - }; + sha256 = "51bdd96aff8537b4871498d67b936df8ab360b886aabec21a1dcb187a73aa2ec"; + revision = "1"; + editedCabalFile = "0wx03gla2x51llwng995snp9lyg1msnyf0337hd1ph9874zcadxr"; libraryHaskellDepends = [ aeson base bytestring containers directory file-io filepath mtl scientific template-haskell text transformers yaml ]; + jailbreak = true; testHaskellDepends = [ aeson base containers QuickCheck quickcheck-instances text ]; diff --git a/tracktrain.cabal b/tracktrain.cabal index c14dc4b..8f81229 100644 --- a/tracktrain.cabal +++ b/tracktrain.cabal @@ -16,7 +16,7 @@ executable tracktrain main-is: Main.hs ghc-options: -threaded -rtsopts build-depends: base - , bytestring ^>= 0.11 + , bytestring ^>= 0.12 , fmt >= 0.6.3.0 , time , aeson @@ -43,7 +43,7 @@ library , gtfs-realtime , zip-archive , cassava >= 0.5.2.0 - , bytestring ^>= 0.11 + , bytestring ^>= 0.12 , uri-bytestring , vector >= 0.12.3.1 , regex-tdfa -- cgit v1.2.3