From c4831e3708bee28c678ec4ecb3aa0bc819bb039d Mon Sep 17 00:00:00 2001
From: Daniel Firth <dan.firth@homotopic.tech>
Date: Mon, 15 May 2023 09:48:39 +0000
Subject: [PATCH] servant: 7ae787371333556a7b84778631ed91d1d73e8370
---
horizon.dhall | 12 ++++++------
horizon.lock | 32 ++++++--------------------------
initial-packages.nix | 10 ----------
pkgs/servant-auth-server.nix | 4 ++--
pkgs/servant-client-core.nix | 4 ++--
pkgs/servant-client.nix | 8 ++++----
pkgs/servant-foreign.nix | 4 ++--
pkgs/servant-server.nix | 4 ++--
pkgs/servant.nix | 4 ++--
9 files changed, 26 insertions(+), 56 deletions(-)
diff --git a/horizon.dhall b/horizon.dhall
index 8f80098c..4463bf81 100644
--- a/horizon.dhall
+++ b/horizon.dhall
@@ -989,25 +989,25 @@ let packages =
, servant =
H.callGit
"https://github.com/haskell-servant/servant"
- "0cda2d0ac87dc0dd47744134e44ab0b1647fe09a"
+ "7ae787371333556a7b84778631ed91d1d73e8370"
(Some "servant/")
, servant-auth = H.callHackage "servant-auth" "0.4.1.0"
, servant-auth-client = H.callHackage "servant-auth-client" "0.4.1.0"
, servant-auth-server =
H.callGit
"https://github.com/haskell-servant/servant"
- "0cda2d0ac87dc0dd47744134e44ab0b1647fe09a"
+ "7ae787371333556a7b84778631ed91d1d73e8370"
(Some "servant-auth/servant-auth-server/")
, servant-blaze = H.callHackage "servant-blaze" "0.9.1"
, servant-client =
H.callGit
"https://github.com/haskell-servant/servant"
- "0cda2d0ac87dc0dd47744134e44ab0b1647fe09a"
+ "7ae787371333556a7b84778631ed91d1d73e8370"
(Some "servant-client/")
, servant-client-core =
H.callGit
"https://github.com/haskell-servant/servant"
- "0cda2d0ac87dc0dd47744134e44ab0b1647fe09a"
+ "7ae787371333556a7b84778631ed91d1d73e8370"
(Some "servant-client-core/")
, servant-docs = H.callHackage "servant-docs" "0.12"
, servant-effectful =
@@ -1018,7 +1018,7 @@ let packages =
, servant-foreign =
H.callGit
"https://github.com/haskell-servant/servant"
- "0cda2d0ac87dc0dd47744134e44ab0b1647fe09a"
+ "7ae787371333556a7b84778631ed91d1d73e8370"
(Some "servant-foreign/")
, servant-lucid = H.callHackage "servant-lucid" "0.9.0.6"
, servant-multipart = H.callHackage "servant-multipart" "0.12.1"
@@ -1027,7 +1027,7 @@ let packages =
, servant-server =
H.callGit
"https://github.com/haskell-servant/servant"
- "0cda2d0ac87dc0dd47744134e44ab0b1647fe09a"
+ "7ae787371333556a7b84778631ed91d1d73e8370"
(Some "servant-server/")
, servant-static-th = H.callHackage "servant-static-th" "1.0.0.0"
, servant-websockets = H.callHackage "servant-websockets" "2.0.0"
diff --git a/horizon.lock b/horizon.lock
index 58d64347..e9f3f38d 100644
--- a/horizon.lock
+++ b/horizon.lock
@@ -1126,10 +1126,6 @@
, mapValue =
"d8e9de90539350c483b5c0c877aa74d6617a0a0960fa0ddfc68a515a16f12dcc"
}
-, { mapKey = "file-embed-lzma"
- , mapValue =
- "13d4ee5e0e9bc5f3c21269d3d129b31e0764302fd2708a8dbee01c484077f8ba"
- }
, { mapKey = "filelock"
, mapValue =
"f7bcf57b14747da3b182c2a854706148041cd6ca197b1604da59efb66dd4b689"
@@ -2282,10 +2278,6 @@
, mapValue =
"5ec7e0ed7bcb4e9506f4c09fd55f9b32d556c38bfe8e85a4b73e3e9ef9c99a41"
}
-, { mapKey = "lzma"
- , mapValue =
- "3f7ed56699d3f4730212b6e764d5d8291a0b14c6332f73267f601a845a9e950d"
- }
, { mapKey = "managed"
, mapValue =
"a58a60b854a97809ddecdc2c6472cabb94dbc068412a1c2fbfcca9959728b2bc"
@@ -3228,7 +3220,7 @@
}
, { mapKey = "servant"
, mapValue =
- "0d9b9fd3c7dad87590d8c2a5bee1f2f8b2e1a02815edbd238ce194951dd829a5"
+ "d34dee0d36f6b46c9e77d5b712de51ff7b1fd1ca0fcbf1a3bd660e9ae5caba58"
}
, { mapKey = "servant-auth"
, mapValue =
@@ -3240,7 +3232,7 @@
}
, { mapKey = "servant-auth-server"
, mapValue =
- "12661e3f795b50af9cbf92092b4a15335a8766bfe9ed5629c73aeefd941071a9"
+ "a9c11377b125655574babdaafa803c769a85d492ab743fc0483c144a1b894f4e"
}
, { mapKey = "servant-blaze"
, mapValue =
@@ -3248,11 +3240,11 @@
}
, { mapKey = "servant-client"
, mapValue =
- "cb115c85423a092d4ebecd30ea879f50df1f1e16eee95e47a644a6fc57fd412a"
+ "c929d1a849c60a8f9dc40b0a053502215b1d32cd42e0b1421e40380b309b63fc"
}
, { mapKey = "servant-client-core"
, mapValue =
- "d18463f13f2cb38ad49c576ef20dea98ca952484e825ec7638a5a37b638f8c75"
+ "fdd6563b22e001721f7c047964c1026d10abf5ec7f50d8b16cae4f3f72016309"
}
, { mapKey = "servant-docs"
, mapValue =
@@ -3264,7 +3256,7 @@
}
, { mapKey = "servant-foreign"
, mapValue =
- "adfd9a22e2eda6df507a38820063046d0d8aabfd15774193e2db40f591e2e1ea"
+ "97f2df673440eacab512e8b97ef65de790f781905530367b23e601d8bf95ee78"
}
, { mapKey = "servant-lucid"
, mapValue =
@@ -3284,24 +3276,12 @@
}
, { mapKey = "servant-server"
, mapValue =
- "1286a1b3abfc99fe31ff5aa179c52d396d78c82ccbd6ca2b5151628e024bb7ff"
+ "9a091d4f9107d66de309e5dcadb41860b38d44179e7f3fb7885909990a022331"
}
, { mapKey = "servant-static-th"
, mapValue =
"7efa33dfb317416d7a1b48495addf0056581c7875999b4537197b3c4db833ec0"
}
-, { mapKey = "servant-swagger"
- , mapValue =
- "0e451b7b42609bd095b9d882ef8754b99735e1f11d768efd9f4f88e4ee68eee3"
- }
-, { mapKey = "servant-swagger-ui"
- , mapValue =
- "e56f596211a5fa3208009db19e5a4e2ff9920ff08a00863984e99434129606c6"
- }
-, { mapKey = "servant-swagger-ui-core"
- , mapValue =
- "bcf6acda36b56682f597d49b27f6e1f596f8cd68404ef99edf0f3abf551fe357"
- }
, { mapKey = "servant-websockets"
, mapValue =
"55710614fc223a4b93dd749f59d0e08aa736a5d519afe8b9c2f06c53bb89ad1d"
diff --git a/initial-packages.nix b/initial-packages.nix
index 04f8b096..6674c220 100644
--- a/initial-packages.nix
+++ b/initial-packages.nix
@@ -565,8 +565,6 @@ self: with pkgs.haskell.lib; {
file-embed = self.callPackage (./pkgs/file-embed.nix) { };
- file-embed-lzma = self.callPackage (./pkgs/file-embed-lzma.nix) { };
-
filelock = self.callPackage (./pkgs/filelock.nix) { };
filemanip = self.callPackage (./pkgs/filemanip.nix) { };
@@ -1143,8 +1141,6 @@ self: with pkgs.haskell.lib; {
lvar = self.callPackage (./pkgs/lvar.nix) { };
- lzma = self.callPackage (./pkgs/lzma.nix) { };
-
managed = self.callPackage (./pkgs/managed.nix) { };
markdown = self.callPackage (./pkgs/markdown.nix) { };
@@ -1647,12 +1643,6 @@ self: with pkgs.haskell.lib; {
servant-static-th = self.callPackage (./pkgs/servant-static-th.nix) { };
- servant-swagger = self.callPackage (./pkgs/servant-swagger.nix) { };
-
- servant-swagger-ui = self.callPackage (./pkgs/servant-swagger-ui.nix) { };
-
- servant-swagger-ui-core = self.callPackage (./pkgs/servant-swagger-ui-core.nix) { };
-
servant-websockets = self.callPackage (./pkgs/servant-websockets.nix) { };
setenv = self.callPackage (./pkgs/setenv.nix) { };
diff --git a/pkgs/servant-auth-server.nix b/pkgs/servant-auth-server.nix
index 79117407..a50c50e1 100644
--- a/pkgs/servant-auth-server.nix
+++ b/pkgs/servant-auth-server.nix
@@ -11,8 +11,8 @@ mkDerivation {
version = "0.4.7.0";
src = fetchgit {
url = "https://github.com/haskell-servant/servant";
- sha256 = "0ay4q9jy3xkn5j1k91snfdndi6j91hlri9h79m429j0d8v5vnj7i";
- rev = "0cda2d0ac87dc0dd47744134e44ab0b1647fe09a";
+ sha256 = "0ck3l8nj42nan8abdzvkl4ynb2l9nhnsq2zjl24d7sgca860fi57";
+ rev = "7ae787371333556a7b84778631ed91d1d73e8370";
fetchSubmodules = true;
};
postUnpack = "sourceRoot+=/servant-auth/servant-auth-server/; echo source root reset to $sourceRoot";
diff --git a/pkgs/servant-client-core.nix b/pkgs/servant-client-core.nix
index 96d7ac8a..0fa6af1e 100644
--- a/pkgs/servant-client-core.nix
+++ b/pkgs/servant-client-core.nix
@@ -9,8 +9,8 @@ mkDerivation {
version = "0.19";
src = fetchgit {
url = "https://github.com/haskell-servant/servant";
- sha256 = "0ay4q9jy3xkn5j1k91snfdndi6j91hlri9h79m429j0d8v5vnj7i";
- rev = "0cda2d0ac87dc0dd47744134e44ab0b1647fe09a";
+ sha256 = "0ck3l8nj42nan8abdzvkl4ynb2l9nhnsq2zjl24d7sgca860fi57";
+ rev = "7ae787371333556a7b84778631ed91d1d73e8370";
fetchSubmodules = true;
};
postUnpack = "sourceRoot+=/servant-client-core/; echo source root reset to $sourceRoot";
diff --git a/pkgs/servant-client.nix b/pkgs/servant-client.nix
index 255c2ce3..5c19aef1 100644
--- a/pkgs/servant-client.nix
+++ b/pkgs/servant-client.nix
@@ -3,7 +3,7 @@
, hspec, hspec-discover, http-api-data, http-client, http-media
, http-types, kan-extensions, lib, markdown-unlit, monad-control
, mtl, network, semigroupoids, servant, servant-client-core
-, servant-server, sop-core, stm, tdigest, text, time, transformers
+, servant-server, sop-core, stm, text, time, transformers
, transformers-base, transformers-compat, wai, warp
}:
mkDerivation {
@@ -11,8 +11,8 @@ mkDerivation {
version = "0.19";
src = fetchgit {
url = "https://github.com/haskell-servant/servant";
- sha256 = "0ay4q9jy3xkn5j1k91snfdndi6j91hlri9h79m429j0d8v5vnj7i";
- rev = "0cda2d0ac87dc0dd47744134e44ab0b1647fe09a";
+ sha256 = "0ck3l8nj42nan8abdzvkl4ynb2l9nhnsq2zjl24d7sgca860fi57";
+ rev = "7ae787371333556a7b84778631ed91d1d73e8370";
fetchSubmodules = true;
};
postUnpack = "sourceRoot+=/servant-client/; echo source root reset to $sourceRoot";
@@ -29,7 +29,7 @@ mkDerivation {
aeson base base-compat bytestring entropy hspec http-api-data
http-client http-types HUnit kan-extensions markdown-unlit mtl
network QuickCheck servant servant-client-core servant-server
- sop-core stm tdigest text transformers transformers-compat wai warp
+ sop-core stm text transformers transformers-compat wai warp
];
testToolDepends = [ hspec-discover markdown-unlit ];
enableLibraryProfiling = true;
diff --git a/pkgs/servant-foreign.nix b/pkgs/servant-foreign.nix
index ef10ae66..72379fd2 100644
--- a/pkgs/servant-foreign.nix
+++ b/pkgs/servant-foreign.nix
@@ -6,8 +6,8 @@ mkDerivation {
version = "0.15.4";
src = fetchgit {
url = "https://github.com/haskell-servant/servant";
- sha256 = "0ay4q9jy3xkn5j1k91snfdndi6j91hlri9h79m429j0d8v5vnj7i";
- rev = "0cda2d0ac87dc0dd47744134e44ab0b1647fe09a";
+ sha256 = "0ck3l8nj42nan8abdzvkl4ynb2l9nhnsq2zjl24d7sgca860fi57";
+ rev = "7ae787371333556a7b84778631ed91d1d73e8370";
fetchSubmodules = true;
};
postUnpack = "sourceRoot+=/servant-foreign/; echo source root reset to $sourceRoot";
diff --git a/pkgs/servant-server.nix b/pkgs/servant-server.nix
index 3d6402ab..7a6f140a 100644
--- a/pkgs/servant-server.nix
+++ b/pkgs/servant-server.nix
@@ -12,8 +12,8 @@ mkDerivation {
version = "0.19.2";
src = fetchgit {
url = "https://github.com/haskell-servant/servant";
- sha256 = "0ay4q9jy3xkn5j1k91snfdndi6j91hlri9h79m429j0d8v5vnj7i";
- rev = "0cda2d0ac87dc0dd47744134e44ab0b1647fe09a";
+ sha256 = "0ck3l8nj42nan8abdzvkl4ynb2l9nhnsq2zjl24d7sgca860fi57";
+ rev = "7ae787371333556a7b84778631ed91d1d73e8370";
fetchSubmodules = true;
};
postUnpack = "sourceRoot+=/servant-server/; echo source root reset to $sourceRoot";
diff --git a/pkgs/servant.nix b/pkgs/servant.nix
index 46d19bc7..b3d8fbe1 100644
--- a/pkgs/servant.nix
+++ b/pkgs/servant.nix
@@ -10,8 +10,8 @@ mkDerivation {
version = "0.19.1";
src = fetchgit {
url = "https://github.com/haskell-servant/servant";
- sha256 = "0ay4q9jy3xkn5j1k91snfdndi6j91hlri9h79m429j0d8v5vnj7i";
- rev = "0cda2d0ac87dc0dd47744134e44ab0b1647fe09a";
+ sha256 = "0ck3l8nj42nan8abdzvkl4ynb2l9nhnsq2zjl24d7sgca860fi57";
+ rev = "7ae787371333556a7b84778631ed91d1d73e8370";
fetchSubmodules = true;
};
postUnpack = "sourceRoot+=/servant/; echo source root reset to $sourceRoot";
--
GitLab