Merge branch 'upgrade-everything' into 'master'

Upgrade everything

See merge request !19

flake.lock

@@ -73,11 +73,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1697287833,
-        "narHash": "sha256-l/kIGxx/qV9RTsRY8ggk4HBlm9ba+MTEFK7nqty+lyc=",
+        "lastModified": 1697623726,
+        "narHash": "sha256-UjpWptx4N0APGGs8r5vyepqUTy2U7e8nEBhOtN+Nq4k=",
         "ref": "refs/heads/master",
-        "rev": "7639840f5a907096de97e6d2b0526bc8e14023e6",
-        "revCount": 1127,
+        "rev": "7f765c192fb6cebe7b14f639fb49776a83428996",
+        "revCount": 1162,
         "type": "git",
         "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-core"
       },
@@ -160,11 +160,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1696983133,
-        "narHash": "sha256-LHfxLyXDy45RQunV23n7RWpUB9HDvXq/VQUNoMBDDHo=",
+        "lastModified": 1697501549,
+        "narHash": "sha256-4tmVqG7+087pOOSUKHGQCWEwC3XJ3tjzGl3Q2vLgoPk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5e07b9a95159541fe53d77cbf69e9ba19b080ca7",
+        "rev": "fe082e6d4bdd896b0e195cbefa15fe77715b044d",
         "type": "github"
       },
       "original": {
@@ -192,11 +192,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1697059129,
-        "narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=",
+        "lastModified": 1697456312,
+        "narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593",
+        "rev": "ca012a02bf8327be9e488546faecae5e05d7d749",
         "type": "github"
       },
       "original": {

horizon.dhall

@@ -5,7 +5,7 @@ let packages =
       { JuicyPixels = H.callHackage "JuicyPixels" "3.3.8"
       , Only = H.callHackage "Only" "0.1"
       , amqp = H.callHackage "amqp" "0.22.2"
-      , attoparsec-iso8601 = H.callHackage "attoparsec-iso8601" "1.1.0.0"
+      , attoparsec-iso8601 = H.callHackage "attoparsec-iso8601" "1.1.0.1"
       , bin = H.callHackage "bin" "0.1.3"
       , binary-orphans = H.callHackage "binary-orphans" "1.0.4.1"
       , brick = H.callHackage "brick" "1.10"
@@ -42,11 +42,7 @@ let packages =
       , file-embed = H.callHackage "file-embed" "0.0.15.0"
       , formatting = H.callHackage "formatting" "7.2.0"
       , generic-monoid = H.callHackage "generic-monoid" "0.1.0.1"
-      , generics-sop =
-          H.callGit
-            "https://github.com/NorfairKing/generics-sop"
-            "b439a96075acf2d4f8db9a52c1a5cb47b1b7e16b"
-            (Some "generics-sop/")
+      , generics-sop = H.callHackage "generics-sop" "0.5.1.4"
       , ghc-tcplugins-extra = H.callHackage "ghc-tcplugins-extra" "0.4.5"
       , haskell-src = H.callHackage "haskell-src" "1.0.4"
       , hedis = H.callHackage "hedis" "0.15.2"

horizon.lock

@@ -12,7 +12,7 @@
   }
 , { mapKey = "attoparsec-iso8601"
   , mapValue =
-      "1c2186c8885c2f14ace74aabc5b07c25c5dcd41f602614d1ea15a8c424685226"
+      "14712b38e8608cc8643a9114a7e436afc1db976df1e4e8de6c5d6d4a489ef58b"
   }
 , { mapKey = "bin"
   , mapValue =
@@ -140,7 +140,7 @@
   }
 , { mapKey = "generics-sop"
   , mapValue =
-      "c37b4482b63a45b4970f3b3477509fd70d85bbc3edc7b065a6f62ccad5035d84"
+      "83943eea5099f58b1e8d02f0533252d8963d8d6e1c5bfb85f0d5cf0959c6d925"
   }
 , { mapKey = "ghc-tcplugins-extra"
   , mapValue =

pkgs/attoparsec-iso8601.nix

-{ mkDerivation, attoparsec, base, base-compat-batteries, lib, text
+{ mkDerivation, attoparsec, base, integer-conversion, lib, text
 , time, time-compat
 }:
 mkDerivation {
   pname = "attoparsec-iso8601";
-  version = "1.1.0.0";
-  sha256 = "1109a817c448a154ec58047a8f01282530cb40d20fbd5690bc58b1443ecb264a";
-  revision = "1";
-  editedCabalFile = "1h84bvjji5kwk54fr8q2gs8qhb39xwsm585s3472vvjh54dllf31";
+  version = "1.1.0.1";
+  sha256 = "73206fb9cb46e8608940b3dd7acbff76d62a76ec4e8d2070a855ecab4649916b";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    attoparsec base base-compat-batteries text time time-compat
+    attoparsec base integer-conversion text time time-compat
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;

pkgs/generics-sop.nix

-{ mkDerivation, base, criterion, deepseq, fetchgit, ghc-prim, lib
-, sop-core, template-haskell, th-abstraction
+{ mkDerivation, base, criterion, deepseq, ghc-prim, lib, sop-core
+, template-haskell, th-abstraction
 }:
 mkDerivation {
   pname = "generics-sop";
-  version = "0.5.1.3";
-  src = fetchgit {
-    url = "https://github.com/NorfairKing/generics-sop";
-    sha256 = "0ii5az9f2ighig6qh14nah17k8l8jm4z7rjrk0myrrfgwpfl0wnc";
-    rev = "b439a96075acf2d4f8db9a52c1a5cb47b1b7e16b";
-    fetchSubmodules = true;
-  };
-  postUnpack = "sourceRoot+=/generics-sop/; echo source root reset to $sourceRoot";
+  version = "0.5.1.4";
+  sha256 = "616a1c2176097469f9514e76d979fffdbc12d569f44fd01deb14377c7888797e";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;