diff --git a/horizon.dhall b/horizon.dhall
index c937addd9a2f415b1718a9b068663e067cc7466b..0db2cfd2ac70432b386c8f846ce49ef082131c64 100644
--- a/horizon.dhall
+++ b/horizon.dhall
@@ -987,8 +987,8 @@ let packages =
, serialise = H.callHackage "serialise" "0.2.6.0"
, servant =
H.callGit
- "https://github.com/TeofilC/servant"
- "76fc90a51f915230bbe1e0d1dbe9727fcdc7a0fc"
+ "https://github.com/haskell-servant/servant"
+ "0cda2d0ac87dc0dd47744134e44ab0b1647fe09a"
(Some "servant/")
, servant-auth = H.callHackage "servant-auth" "0.4.1.0"
, servant-auth-client = H.callHackage "servant-auth-client" "0.4.1.0"
@@ -996,13 +996,13 @@ let packages =
, servant-blaze = H.callHackage "servant-blaze" "0.9.1"
, servant-client =
H.callGit
- "https://github.com/TeofilC/servant"
- "76fc90a51f915230bbe1e0d1dbe9727fcdc7a0fc"
+ "https://github.com/haskell-servant/servant"
+ "0cda2d0ac87dc0dd47744134e44ab0b1647fe09a"
(Some "servant-client/")
, servant-client-core =
H.callGit
- "https://github.com/TeofilC/servant"
- "76fc90a51f915230bbe1e0d1dbe9727fcdc7a0fc"
+ "https://github.com/haskell-servant/servant"
+ "0cda2d0ac87dc0dd47744134e44ab0b1647fe09a"
(Some "servant-client-core/")
, servant-docs = H.callHackage "servant-docs" "0.12"
, servant-effectful =
@@ -1012,8 +1012,8 @@ let packages =
(None H.Subdir)
, servant-foreign =
H.callGit
- "https://github.com/TeofilC/servant"
- "76fc90a51f915230bbe1e0d1dbe9727fcdc7a0fc"
+ "https://github.com/haskell-servant/servant"
+ "0cda2d0ac87dc0dd47744134e44ab0b1647fe09a"
(Some "servant-foreign/")
, servant-lucid = H.callHackage "servant-lucid" "0.9.0.6"
, servant-multipart = H.callHackage "servant-multipart" "0.12.1"
@@ -1021,8 +1021,8 @@ let packages =
, servant-openapi3 = H.callHackage "servant-openapi3" "2.0.1.6"
, servant-server =
H.callGit
- "https://github.com/TeofilC/servant"
- "76fc90a51f915230bbe1e0d1dbe9727fcdc7a0fc"
+ "https://github.com/haskell-servant/servant"
+ "0cda2d0ac87dc0dd47744134e44ab0b1647fe09a"
(Some "servant-server/")
, servant-static-th = H.callHackage "servant-static-th" "1.0.0.0"
, servant-swagger = H.callHackage "servant-swagger" "1.1.11"
diff --git a/pkgs/fast-logger.nix b/pkgs/fast-logger.nix
index e06eaa558627fc57a08599ca374f4c849323a1b1..85edb418d9bee6d34a021bbdf3ddddbb65e5e26c 100644
--- a/pkgs/fast-logger.nix
+++ b/pkgs/fast-logger.nix
@@ -1,38 +1,19 @@
-{ mkDerivation
-, array
-, auto-update
-, base
-, bytestring
-, directory
-, easy-file
-, filepath
-, hspec
-, hspec-discover
-, lib
-, text
-, unix-compat
-, unix-time
+{ mkDerivation, array, async, auto-update, base, bytestring
+, directory, easy-file, filepath, hspec, hspec-discover, lib, stm
+, text, unix-compat, unix-time
}:
mkDerivation {
pname = "fast-logger";
- version = "3.1.1";
- sha256 = "435f6e7e0771b9b525550c292a941ab5726b233e7d91fdeca707e3cdb531a8e7";
+ version = "3.2.1";
+ sha256 = "89d070b2886ece24f521516d8bffea587226ae2192e36a150a276c4d424f5ee3";
isLibrary = true;
isExecutable = false;
enableSeparateDataOutput = false;
libraryHaskellDepends = [
- array
- auto-update
- base
- bytestring
- directory
- easy-file
- filepath
- text
- unix-compat
- unix-time
+ array auto-update base bytestring directory easy-file filepath stm
+ text unix-compat unix-time
];
- testHaskellDepends = [ base bytestring directory hspec ];
+ testHaskellDepends = [ async base bytestring directory hspec ];
testToolDepends = [ hspec-discover ];
enableLibraryProfiling = true;
enableExecutableProfiling = true;
@@ -45,4 +26,4 @@ mkDerivation {
description = "A fast logging system";
license = lib.licenses.bsd3;
broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/servant-client-core.nix b/pkgs/servant-client-core.nix
index d384049c2896131896022229bad3d06431572258..96d7ac8a7877d2c02e04498e33de55a5b6e193e9 100644
--- a/pkgs/servant-client-core.nix
+++ b/pkgs/servant-client-core.nix
@@ -8,9 +8,9 @@ mkDerivation {
pname = "servant-client-core";
version = "0.19";
src = fetchgit {
- url = "https://github.com/TeofilC/servant";
- sha256 = "0f6vkm44p93ln63plk4vfavadcgxjiqr8xncxrjqzp2mcql6qdmh";
- rev = "76fc90a51f915230bbe1e0d1dbe9727fcdc7a0fc";
+ url = "https://github.com/haskell-servant/servant";
+ sha256 = "0ay4q9jy3xkn5j1k91snfdndi6j91hlri9h79m429j0d8v5vnj7i";
+ rev = "0cda2d0ac87dc0dd47744134e44ab0b1647fe09a";
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 a09f1cd589dd81d1a796fd537a456f08cb20a6ae..255c2ce30ccabf03e3419ab5680b77ff7e6c7cee 100644
--- a/pkgs/servant-client.nix
+++ b/pkgs/servant-client.nix
@@ -10,9 +10,9 @@ mkDerivation {
pname = "servant-client";
version = "0.19";
src = fetchgit {
- url = "https://github.com/TeofilC/servant";
- sha256 = "0f6vkm44p93ln63plk4vfavadcgxjiqr8xncxrjqzp2mcql6qdmh";
- rev = "76fc90a51f915230bbe1e0d1dbe9727fcdc7a0fc";
+ url = "https://github.com/haskell-servant/servant";
+ sha256 = "0ay4q9jy3xkn5j1k91snfdndi6j91hlri9h79m429j0d8v5vnj7i";
+ rev = "0cda2d0ac87dc0dd47744134e44ab0b1647fe09a";
fetchSubmodules = true;
};
postUnpack = "sourceRoot+=/servant-client/; echo source root reset to $sourceRoot";
diff --git a/pkgs/servant-foreign.nix b/pkgs/servant-foreign.nix
index 3fbb7c57732e12bd67b1c05d1ec6da436a1cef3b..ef10ae6627c8a0b2a0a5943ff9e570dae3a3bf61 100644
--- a/pkgs/servant-foreign.nix
+++ b/pkgs/servant-foreign.nix
@@ -5,9 +5,9 @@ mkDerivation {
pname = "servant-foreign";
version = "0.15.4";
src = fetchgit {
- url = "https://github.com/TeofilC/servant";
- sha256 = "0f6vkm44p93ln63plk4vfavadcgxjiqr8xncxrjqzp2mcql6qdmh";
- rev = "76fc90a51f915230bbe1e0d1dbe9727fcdc7a0fc";
+ url = "https://github.com/haskell-servant/servant";
+ sha256 = "0ay4q9jy3xkn5j1k91snfdndi6j91hlri9h79m429j0d8v5vnj7i";
+ rev = "0cda2d0ac87dc0dd47744134e44ab0b1647fe09a";
fetchSubmodules = true;
};
postUnpack = "sourceRoot+=/servant-foreign/; echo source root reset to $sourceRoot";
diff --git a/pkgs/servant-polysemy.nix b/pkgs/servant-polysemy.nix
deleted file mode 100644
index ab0cbdb6bbfac50e140c0d881d660ee0fd7a2bf8..0000000000000000000000000000000000000000
--- a/pkgs/servant-polysemy.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ mkDerivation, base, deepseq, http-client, http-client-tls, lens
-, lib, mtl, polysemy, polysemy-plugin, polysemy-zoo, servant
-, servant-client, servant-server, servant-swagger
-, servant-swagger-ui, swagger2, text, wai, warp
-}:
-mkDerivation {
- pname = "servant-polysemy";
- version = "0.1.4";
- sha256 = "c21a40664812c05ae087c5ec5252ad4811086c3ca75b4b41d3e96e19fd50351f";
- isLibrary = true;
- isExecutable = true;
- enableSeparateDataOutput = false;
- libraryHaskellDepends = [
- base deepseq http-client http-client-tls mtl polysemy
- polysemy-plugin polysemy-zoo servant-client servant-server wai warp
- ];
- executableHaskellDepends = [
- base deepseq http-client http-client-tls lens mtl polysemy
- polysemy-plugin polysemy-zoo servant servant-client servant-server
- servant-swagger servant-swagger-ui swagger2 text wai warp
- ];
- enableLibraryProfiling = true;
- enableExecutableProfiling = true;
- doHaddock = false;
- jailbreak = true;
- doCheck = false;
- doBenchmark = false;
- hyperlinkSource = false;
- homepage = "https://github.com/AJChapman/servant-polysemy#readme";
- description = "Utilities for using servant in a polysemy stack";
- license = lib.licenses.bsd3;
- broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/servant-server.nix b/pkgs/servant-server.nix
index f95d7df280d4140b62a50ac1bf3d0822b1cae6a8..3d6402ab9566918e36ff0d0b2bb39a27391bcef5 100644
--- a/pkgs/servant-server.nix
+++ b/pkgs/servant-server.nix
@@ -9,11 +9,11 @@
}:
mkDerivation {
pname = "servant-server";
- version = "0.19.1";
+ version = "0.19.2";
src = fetchgit {
- url = "https://github.com/TeofilC/servant";
- sha256 = "0f6vkm44p93ln63plk4vfavadcgxjiqr8xncxrjqzp2mcql6qdmh";
- rev = "76fc90a51f915230bbe1e0d1dbe9727fcdc7a0fc";
+ url = "https://github.com/haskell-servant/servant";
+ sha256 = "0ay4q9jy3xkn5j1k91snfdndi6j91hlri9h79m429j0d8v5vnj7i";
+ rev = "0cda2d0ac87dc0dd47744134e44ab0b1647fe09a";
fetchSubmodules = true;
};
postUnpack = "sourceRoot+=/servant-server/; echo source root reset to $sourceRoot";
diff --git a/pkgs/servant.nix b/pkgs/servant.nix
index 7d2146bcfc37929e2ebb85178eb155edf6c3e56a..46d19bc72c9066f38542160a3acddf152777e049 100644
--- a/pkgs/servant.nix
+++ b/pkgs/servant.nix
@@ -7,11 +7,11 @@
}:
mkDerivation {
pname = "servant";
- version = "0.19";
+ version = "0.19.1";
src = fetchgit {
- url = "https://github.com/TeofilC/servant";
- sha256 = "0f6vkm44p93ln63plk4vfavadcgxjiqr8xncxrjqzp2mcql6qdmh";
- rev = "76fc90a51f915230bbe1e0d1dbe9727fcdc7a0fc";
+ url = "https://github.com/haskell-servant/servant";
+ sha256 = "0ay4q9jy3xkn5j1k91snfdndi6j91hlri9h79m429j0d8v5vnj7i";
+ rev = "0cda2d0ac87dc0dd47744134e44ab0b1647fe09a";
fetchSubmodules = true;
};
postUnpack = "sourceRoot+=/servant/; echo source root reset to $sourceRoot";