From db8ed60ddb30a4abebc945ee1e73278be8eaa29d Mon Sep 17 00:00:00 2001
From: Marc Scholten <marc@digitallyinduced.com>
Date: Sat, 4 May 2024 17:40:58 -0700
Subject: [PATCH] Adjusted bounds

---
 NixSupport/make-nixpkgs-from-options.nix |  4 ++--
 flake.lock                               | 28 ++++++++----------------
 flake.nix                                |  1 +
 ihp-hsx/ihp-hsx.cabal                    | 12 +++++-----
 4 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/NixSupport/make-nixpkgs-from-options.nix b/NixSupport/make-nixpkgs-from-options.nix
index cccb1952a..d189c17cf 100644
--- a/NixSupport/make-nixpkgs-from-options.nix
+++ b/NixSupport/make-nixpkgs-from-options.nix
@@ -6,8 +6,8 @@
 , dontCheckPackages ? []
 , doJailbreakPackages ? []
 , dontHaddockPackages ? []
-, nixPkgsRev ? "10c80b993425f377c86c2bb36da9f10b79de6fe2"
-, nixPkgsSha256 ? "sha256-yWxZq0v5Hj4bxtYsy/Pzh9g6N8nuSHCCwHpu6QNOX9E"
+, nixPkgsRev ? "54b4bb956f9891b872904abdb632cea85a033ff2"
+, nixPkgsSha256 ? "sha256-Wx3Y6arRJD1pd3c8SnD7dfW7KWuCr/r248P/5XLaMdM"
 , compiler ? "ghc98"
 , manualOverrides ? haskellPackagesNew: haskellPackagesOld: { } # More exotic overrides go here
 , additionalNixpkgsOptions ? {}
diff --git a/flake.lock b/flake.lock
index c732c6e6d..6c93863b9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -204,7 +204,9 @@
     },
     "flake-parts": {
       "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib"
+        "nixpkgs-lib": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1714641030,
@@ -222,7 +224,7 @@
     },
     "flake-parts_2": {
       "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib_2"
+        "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
         "lastModified": 1693611461,
@@ -240,7 +242,7 @@
     },
     "flake-parts_3": {
       "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib_3"
+        "nixpkgs-lib": "nixpkgs-lib_2"
       },
       "locked": {
         "lastModified": 1685662779,
@@ -755,18 +757,6 @@
       }
     },
     "nixpkgs-lib": {
-      "locked": {
-        "lastModified": 1714640452,
-        "narHash": "sha256-QBx10+k6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94=",
-        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz"
-      }
-    },
-    "nixpkgs-lib_2": {
       "locked": {
         "dir": "lib",
         "lastModified": 1693471703,
@@ -784,7 +774,7 @@
         "type": "github"
       }
     },
-    "nixpkgs-lib_3": {
+    "nixpkgs-lib_2": {
       "locked": {
         "dir": "lib",
         "lastModified": 1685564631,
@@ -948,11 +938,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1714860182,
-        "narHash": "sha256-2GCuMsaxMzVzI60UKghqpKCwAZjKnLQ+zvr9BodUW7k=",
+        "lastModified": 1714864423,
+        "narHash": "sha256-Wx3Y6arRJD1pd3c8SnD7dfW7KWuCr/r248P/5XLaMdM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "dd1e778bf69f2741a5cd41f60f6150834f8b0a1b",
+        "rev": "54b4bb956f9891b872904abdb632cea85a033ff2",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 497b82c38..1e11a5e23 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,6 +9,7 @@
 
         # a module framework for flakes
         flake-parts.url = "github:hercules-ci/flake-parts";
+        flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
 
         # used for setting up development environments
         devenv.url = "github:cachix/devenv?ref=refs/tags/v1.0.5";
diff --git a/ihp-hsx/ihp-hsx.cabal b/ihp-hsx/ihp-hsx.cabal
index fc901b460..fa10dd73d 100644
--- a/ihp-hsx/ihp-hsx.cabal
+++ b/ihp-hsx/ihp-hsx.cabal
@@ -19,15 +19,15 @@ source-repository head
 library
     default-language: Haskell2010
     build-depends:
-          base >= 4.17.0 && < 4.18
+          base >= 4.17.0 && < 4.20
         , blaze-html >= 0.9.1 && < 0.10
-        , bytestring >= 0.11.3 && < 0.12
-        , template-haskell >= 2.19.0 && < 2.20
-        , text >= 2.0.1 && < 2.1
+        , bytestring >= 0.11.3 && < 0.13
+        , template-haskell >= 2.19.0 && < 2.22
+        , text >= 2.0.1 && < 2.2
         , containers >= 0.6.6 && < 0.7
         , blaze-markup >= 0.8.2 && < 0.9
-        , ghc >= 9.4.4 && < 9.5
-        , megaparsec >= 9.2.2 && < 9.3
+        , ghc >= 9.4.4 && < 9.9
+        , megaparsec >= 9.2.2 && < 9.7
         , string-conversions >= 0.4.0 && < 0.5
     default-extensions:
         OverloadedStrings