update sources; bahnhof.name now uses rustlsHEADmain

haskellPackages.rustls & dependents appear to be slightly messed up
upstream ...

1 files changed, 48 insertions, 2 deletions

diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix
index a3a58a7..e02fdef 100644
--- a/pkgs/overlay.nix
+++ b/pkgs/overlay.nix
@@ -165,10 +165,56 @@ in
         overrides = self': super': with self.haskell.lib; {
           fuzzyfind = unmarkBroken (doJailbreak super'.fuzzyfind);
           fuzzyset = unmarkBroken (doJailbreak super'.fuzzyset);
+          rustls = self.haskellPackages.callPackage
+            ({ mkDerivation, async, base, bytestring, containers
+             , derive-storable, directory, filepath, hedgehog, lib, mtl, network
+             , process, resourcet, stm, tasty, tasty-hedgehog
+             , tasty-hunit, temporary, text, transformers
+             }:
+               mkDerivation {
+                 pname = "rustls";
+                 version = "0.2.2.0";
+                 sha256 = "3c610437b4fb8b6ae86e6d3bebca8c15631b0d793d925ab5eeebb88b8ac77371";
+                 libraryHaskellDepends = [
+                   base bytestring containers derive-storable mtl network resourcet
+                   text transformers
+                 ];
+                 libraryPkgconfigDepends = [ self.rustls-ffi ];
+                 testHaskellDepends = [
+                   async base bytestring containers directory filepath hedgehog
+                   process resourcet stm tasty tasty-hedgehog tasty-hunit temporary
+                   text transformers
+                 ];
+                 homepage = "https://github.com/amesgen/hs-rustls/tree/main/rustls";
+                 description = "TLS bindings for Rustls";
+                 license = lib.licenses.cc0;
+                 doCheck = false;
+               }) {};
+          http-client-rustls = self'.callPackage
+            ({ mkDerivation, base, bytestring, directory, filepath, http-client
+             , http-types, lib, network, port-utils, process, resourcet, rustls
+             , tasty, tasty-hunit, temporary, text
+             }:
+               mkDerivation {
+                 pname = "http-client-rustls";
+                 version = "0.0.2.0";
+                 sha256 = "05505bf77e3d967b01187ffb55ea6c3f658ba446aeffeccdac16cbb6960d940d";
+                 libraryHaskellDepends = [
+                   base bytestring http-client network resourcet rustls text
+                 ];
+                 testHaskellDepends = [
+                   base bytestring directory filepath http-client http-types network
+                   port-utils process rustls tasty tasty-hunit temporary
+                 ];
+                 homepage = "https://github.com/amesgen/hs-rustls/tree/main/http-client-rustls";
+                 description = "http-client TLS backend using Rustls";
+                 license = lib.licenses.cc0;
+                 doCheck = false;
+               }) {};
         };
       });
       pkg = { mkDerivation, base, bytestring, cassava, containers
-            , fuzzyfind, fuzzyset, http-client, http-client-openssl, http-types
+            , fuzzyfind, fuzzyset, http-client, http-client-rustls, http-types
             , lib, stm, text, time, vector, wai, wai-extra, warp
             }:
               mkDerivation {
@@ -179,7 +225,7 @@ in
                 isExecutable = true;
                 executableHaskellDepends = [
                   base bytestring cassava containers fuzzyfind fuzzyset http-client
-                  http-client-openssl http-types stm text time vector wai wai-extra
+                  http-client-rustls http-types stm text time vector wai wai-extra
                   warp
                 ];
                 jailbreak = true;