diff --git a/nix/overlays/haskell-packages.nix b/nix/overlays/haskell-packages.nix index b46d6c451..7e2a48de1 100644 --- a/nix/overlays/haskell-packages.nix +++ b/nix/overlays/haskell-packages.nix @@ -88,13 +88,12 @@ let warp = lib.dontCheck - (prev.callCabal2nixWithOptions "warp" - (super.fetchFromGitHub { - owner = "yesodweb"; - repo = "wai"; - rev = "ad041216b643f69a2a9c87cbf4c2988aa4633dd5"; - sha256 = "sha256-Dl3wLrGl1HvkF9MqGdY4dzx4z6SlCSiFZgCgprd7Cjg="; - }) "--subpath=warp" + (prev.callHackageDirect + { + pkg = "warp"; + ver = "3.4.14"; + sha256 = "sha256-RnoOUlC6dOP0sK/tYAJCX1oLzVFG1GILUY+yVbmvW8Y="; + } { }); }; in diff --git a/postgrest.cabal b/postgrest.cabal index cc8dbbc73..2974e1b84 100644 --- a/postgrest.cabal +++ b/postgrest.cabal @@ -160,7 +160,7 @@ library -- for unix sockets; this is tested in test/io/test_io.py. See -- https://github.com/kazu-yamamoto/logger/commit/3a71ca70afdbb93d4ecf0083eeba1fbbbcab3fc3 , wai-logger >= 2.4.0 - , warp >= 3.4.13 && < 3.5 + , warp >= 3.4.14 && < 3.5 , stm >= 2.5 && < 3 , stm-hamt >= 1.2 && < 2 , focus >= 1.0 && < 2 diff --git a/stack.yaml b/stack.yaml index 3b9a8a49a..d903ebb8d 100644 --- a/stack.yaml +++ b/stack.yaml @@ -15,10 +15,7 @@ extra-deps: - hasql-notifications-0.2.4.0 - http-semantics-0.4.0 - http2-5.4.0 - - git: https://github.com/yesodweb/wai.git - commit: ad041216b643f69a2a9c87cbf4c2988aa4633dd5 - subdirs: - - warp + - warp-3.4.14 allow-newer: true allow-newer-deps: diff --git a/stack.yaml.lock b/stack.yaml.lock index 77dd61517..aa4553abc 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -1,7 +1,7 @@ # This file was autogenerated by Stack. # You should not edit this file by hand. # For more information, please see the documentation at: -# https://docs.haskellstack.org/en/stable/lock_files +# https://docs.haskellstack.org/en/stable/topics/lock_files packages: - completed: @@ -47,18 +47,12 @@ packages: original: hackage: http2-5.4.0 - completed: - commit: ad041216b643f69a2a9c87cbf4c2988aa4633dd5 - git: https://github.com/yesodweb/wai.git - name: warp + hackage: warp-3.4.14@sha256:66b82af637f79ae4d39f7373b39491067f6d059b2581cb4caf18760f1d82e686,10066 pantry-tree: - sha256: 02665f2d175a7fd683470e608b23e0d661f4e55dd13e073ed203e4b9a5801f8f - size: 4975 - subdir: warp - version: 3.4.13.1 + sha256: 6db2e6d37acebd24d4e73d506481a4a2e0c53b35099756131a3852c8c8b84b45 + size: 4175 original: - commit: ad041216b643f69a2a9c87cbf4c2988aa4633dd5 - git: https://github.com/yesodweb/wai.git - subdir: warp + hackage: warp-3.4.14 snapshots: - completed: sha256: 3286bb954fe0e7e0291ca61fac01a689b7165da9d7e8ba3c3a045be989c860fd