From d0534bdc8ba71883385c91be0bfcdc95a9c84717 Mon Sep 17 00:00:00 2001
From: stuebinm
Date: Wed, 17 Apr 2024 21:50:31 +0200
Subject: travelynx 2.4.1 → 2.6.7

quite a bunch of these packages now need manually adjusted build
inputs (most often just adding TestSuite2) to make the tests not fail.
---
 pkgs/travelynx.nix | 114 ++++++++++++++++++++++-------------------------------
 1 file changed, 48 insertions(+), 66 deletions(-)

diff --git a/pkgs/travelynx.nix b/pkgs/travelynx.nix
index 16dc473..384a660 100644
--- a/pkgs/travelynx.nix
+++ b/pkgs/travelynx.nix
@@ -5,11 +5,10 @@ with perl.pkgs;
 let
   ClassMeasure = buildPerlModule {
     pname = "Class-Measure";
-    version = "0.09";
+    version = "0.10";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/B/BL/BLUEFEET/Class-Measure-0.09.tar.gz";
-      sha256 =
-        "ee272ee35d05ab6fe94f2ac170943ff29c1a0f9a7362faa44ad92d2521e88ba5";
+      url = "mirror://cpan/authors/id/B/BL/BLUEFEET/Class-Measure-0.10.tar.gz";
+      hash = "sha256-wLeesJpmzEH7g6rb0kh0NytGWnRAe5bgcimU7vv9JMo=";
     };
     buildInputs = [ ModuleBuildTiny Test2Suite ];
     propagatedBuildInputs = [ SubExporter ];
@@ -35,17 +34,29 @@ let
       license = with lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
+  MojoliciousPluginOAuth2 = buildPerlPackage {
+    pname = "Mojolicious-Plugin-OAuth2";
+    version = "2.02";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-OAuth2-2.02.tar.gz";
+      hash = "sha256-E0kPucaJR+ZbFDrenWsPQnC0EhV+rFdyH3rUl8NHIYE=";
+    };
+    propagatedBuildInputs = [ IOSocketSSL Mojolicious ];
+    meta = {
+      homepage = "https://github.com/marcusramberg/Mojolicious-Plugin-OAuth2";
+      description = "Auth against OAuth2 APIs including OpenID Connect";
+      license = lib.licenses.artistic2;
+    };
+  };
   GISDistance = buildPerlModule {
     pname = "GIS-Distance";
-    version = "0.19";
+    version = "0.20";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/B/BL/BLUEFEET/GIS-Distance-0.19.tar.gz";
-      sha256 =
-        "f855d05d47f2fd2001824f8bccf131ab4ea21f2b945d202ccb163b7ba8587db3";
+      url = "mirror://cpan/authors/id/B/BL/BLUEFEET/GIS-Distance-0.20.tar.gz";
+      hash = "sha256-srL4d0zdq24+SdNJiO+v6P4NUA/21Xth+GYUCVvxQj4=";
     };
     buildInputs = [ ModuleBuildTiny Test2Suite ];
-    propagatedBuildInputs =
-      [ ClassMeasure ConstFast namespaceclean strictures ];
+    propagatedBuildInputs = [ ClassMeasure ConstFast namespaceclean strictures ];
     meta = {
       homepage = "https://github.com/bluefeet/GIS-Distance";
       description = "Calculate geographic distances";
@@ -54,12 +65,10 @@ let
   };
   GISDistanceFast = buildPerlModule {
     pname = "GIS-Distance-Fast";
-    version = "0.15";
+    version = "0.16";
     src = fetchurl {
-      url =
-        "mirror://cpan/authors/id/B/BL/BLUEFEET/GIS-Distance-Fast-0.15.tar.gz";
-      sha256 =
-        "d4d0ebe6fc92812528dd6f9ab86a1e3745dbe99448acd4911cc25a266b8ccd6a";
+      url = "mirror://cpan/authors/id/B/BL/BLUEFEET/GIS-Distance-Fast-0.16.tar.gz";
+      hash = "sha256-xn8/80PKpZOj+wRx3JjsSPK+87S00uALom4zk87sB0E=";
     };
     buildInputs = [ ModuleBuildTiny Test2Suite ];
     propagatedBuildInputs = [ GISDistance namespaceclean strictures ];
@@ -71,23 +80,13 @@ let
   };
   TravelStatusDEDeutscheBahn = buildPerlModule {
     pname = "Travel-Status-DE-DeutscheBahn";
-    version = "4.09";
+    version = "6.03";
     src = fetchurl {
-      url =
-        "mirror://cpan/authors/id/D/DE/DERF/Travel-Status-DE-DeutscheBahn-4.09.tar.gz";
-      sha256 =
-        "7ea92038912ab0e07ad73bc83e0b43be7bbfdc906f831ac06fd206747a49e28c";
+      url = "mirror://cpan/authors/id/D/DE/DERF/Travel-Status-DE-DeutscheBahn-6.03.tar.gz";
+      hash = "sha256-5SEmrdZagl9h0e2F5dpFuwy4KNeh7YsnuuT6WrWpkLE=";
     };
     buildInputs = [ FileSlurp TestCompile TestPod ];
-    propagatedBuildInputs = [
-      ClassAccessor
-      DateTime
-      DateTimeFormatStrptime
-      JSON
-      LWP
-      LWPProtocolhttps
-      ListMoreUtils
-    ];
+    propagatedBuildInputs = [ ClassAccessor DateTime DateTimeFormatStrptime JSON LWP LWPProtocolhttps ListMoreUtils ];
     meta = {
       description = "Interface to the online arrival/departure";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
@@ -95,12 +94,10 @@ let
   };
   TravelStatusDEDBWagenreihung = buildPerlModule {
     pname = "Travel-Status-DE-DBWagenreihung";
-    version = "0.08";
+    version = "0.12";
     src = fetchurl {
-      url =
-        "mirror://cpan/authors/id/D/DE/DERF/Travel-Status-DE-DBWagenreihung-0.08.tar.gz";
-      sha256 =
-        "87f5d7dd01ac8fd46f630aee929ea37b79a65ecdf89fb927575ff7139265d61b";
+      url = "mirror://cpan/authors/id/D/DE/DERF/Travel-Status-DE-DBWagenreihung-0.12.tar.gz";
+      hash = "sha256-vc1cyuL4EjwQG9B34+MbL6AxFUFIyjPKstbPH8rtIk4=";
     };
     buildInputs = [ TestCompile TestPod ];
     propagatedBuildInputs = [ ClassAccessor JSON LWP TravelStatusDEIRIS ];
@@ -111,28 +108,13 @@ let
   };
   TravelStatusDEIRIS = buildPerlModule {
     pname = "Travel-Status-DE-IRIS";
-    version = "1.82";
+    version = "1.96";
     src = fetchurl {
-      url =
-        "mirror://cpan/authors/id/D/DE/DERF/Travel-Status-DE-IRIS-1.82.tar.gz";
-      sha256 =
-        "92875b556cec42ac0e65fab94dbe9299eba09be958ab0d794b2a616f7e937c18";
-    };
-    buildInputs =
-      [ FileSlurp JSON TestCompile TestFatal TestNumberDelta TestPod TextCSV ];
-    propagatedBuildInputs = [
-      ClassAccessor
-      DateTime
-      DateTimeFormatStrptime
-      GISDistance
-      LWP
-      LWPProtocolhttps
-      ListCompare
-      ListMoreUtils
-      ListUtilsBy
-      TextLevenshteinXS
-      XMLLibXML
-    ];
+      url = "mirror://cpan/authors/id/D/DE/DERF/Travel-Status-DE-IRIS-1.96.tar.gz";
+      hash = "sha256-ncXTqCEF7il1pjX8D4gqmAv//AD0o5MrIiev5aViJcc=";
+    };
+    buildInputs = [ FileSlurp JSON TestCompile TestFatal TestNumberDelta TestPod TextCSV ];
+    propagatedBuildInputs = [ ClassAccessor DateTime DateTimeFormatStrptime GISDistance LWP LWPProtocolhttps ListCompare ListMoreUtils ListUtilsBy TextLevenshteinXS XMLLibXML ];
     meta = {
       description = "Interface to IRIS based web departure monitors";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
@@ -146,8 +128,8 @@ let
       sha256 =
         "e1d2d89677981166abc5bb6e5ecc6471f001f13eb56d5be9544d8047dc08a592";
     };
-    doCheck = false;
-    propagatedBuildInputs = [ FileNFSLock Heap IOString TimeDate ];
+    buildInputs = [ Test2Suite ];
+    propagatedBuildInputs = [ FileNFSLock Heap IOString TimeDate DBFile ];
     meta = {
       description = "Provide a generic Cache mechanism";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
@@ -180,7 +162,7 @@ let
 
   perlWithPackages = perl.withPackages (_: [
     Cache
-    CacheCache
+    # CacheCache
     CAMPDF
     CryptEksblowfish
     DateTime
@@ -192,30 +174,30 @@ let
     MIMEtools
     Mojolicious
     MojoliciousPluginAuthentication
+    MojoliciousPluginOAuth2
     MojoPg
-    TravelStatusDEDeutscheBahn
+    TextCSV
+    TextMarkdown
     TravelStatusDEDBWagenreihung
+    TravelStatusDEDeutscheBahn
     TravelStatusDEIRIS
     UUIDTiny
-    TextCSV
     JSON
     JSONXS
-    XMLLibXML
     DBFile
     FileSlurp
-    TextLevenshteinXS
-    TextMarkdown
   ]);
 
   # Note: set location of config via $MOJO_CONFIG when running index.pl
   travelynx = stdenvNoCC.mkDerivation {
     pname = "travelynx";
-    version = "2.4.1";
+    version = "2.6.7";
     src = fetchgit {
       url = "https://github.com/derf/travelynx";
-      rev = "2.4.1";
-      sha256 = "sha256-sLrA61XYBfZFTSmveRLNCHyXKLv1IpzGy5imKrc5rVw=";
+      rev = "2.6.7";
+      sha256 = "sha256-1bmOpoUkCMB8b/dkWlrUkzP2wqkLFg4+OaruC2UDKMo=";
     };
+    buildInputs = [ perlWithPackages ];
     buildPhase = ''
       substituteInPlace index.pl \
         --replace "/usr/bin/env perl" ${perlWithPackages.outPath}/bin/perl
-- 
cgit v1.2.3