From 303d3ebe41fd3cd46ab3de72ef49ca4e0c6e4c02 Mon Sep 17 00:00:00 2001
From: Daniel Firth <dan.firth@homotopic.tech>
Date: Wed, 22 Mar 2023 13:21:13 +0000
Subject: [PATCH] servant-auth-server: 0cda2d0ac87dc0dd47744134e44ab0b1647fe09a
---
horizon.dhall | 10 +++++++---
horizon.lock | 2 +-
pkgs/servant-auth-server.nix | 23 ++++++++++++++---------
3 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/horizon.dhall b/horizon.dhall
index a962be11..a9e7b162 100644
--- a/horizon.dhall
+++ b/horizon.dhall
@@ -769,7 +769,7 @@ let packages =
H.callGit
"https://github.com/locallycompact/monad-par"
"4f5b44fc85095e08cc159e4fc54a7d78dc41eccf"
- (Some "monad-par")
+ (Some "monad-par/")
, monad-par-extras = H.callHackage "monad-par-extras" "0.3.3"
, monad-parallel = H.callHackage "monad-parallel" "0.8"
, monad-peel = H.callHackage "monad-peel" "0.2.1.2"
@@ -993,7 +993,11 @@ let packages =
(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.callHackage "servant-auth-server" "0.4.7.0"
+ , servant-auth-server =
+ H.callGit
+ "https://github.com/haskell-servant/servant"
+ "0cda2d0ac87dc0dd47744134e44ab0b1647fe09a"
+ (Some "servant-auth/servant-auth-server/")
, servant-blaze = H.callHackage "servant-blaze" "0.9.1"
, servant-client =
H.callGit
@@ -1106,7 +1110,7 @@ let packages =
H.callGit
"https://github.com/locallycompact/sydtest"
"01c7d35b822c66a68e4d2ba5594858afbcc1cbf0"
- (Some "sydtest")
+ (Some "sydtest/")
, sydtest-discover = H.callHackage "sydtest-discover" "0.0.0.2"
, system-fileio = H.callHackage "system-fileio" "0.3.16.4"
, system-filepath = H.callHackage "system-filepath" "0.4.14"
diff --git a/horizon.lock b/horizon.lock
index d87888c3..ec65273b 100644
--- a/horizon.lock
+++ b/horizon.lock
@@ -3232,7 +3232,7 @@
}
, { mapKey = "servant-auth-server"
, mapValue =
- "2302e6933924608a2b5f6f216ac58f6439fbc2ec52b4eec1453533279c9521dd"
+ "12661e3f795b50af9cbf92092b4a15335a8766bfe9ed5629c73aeefd941071a9"
}
, { mapKey = "servant-blaze"
, mapValue =
diff --git a/pkgs/servant-auth-server.nix b/pkgs/servant-auth-server.nix
index 4724215c..79117407 100644
--- a/pkgs/servant-auth-server.nix
+++ b/pkgs/servant-auth-server.nix
@@ -1,16 +1,21 @@
{ mkDerivation, QuickCheck, aeson, base, base64-bytestring
, blaze-builder, bytestring, case-insensitive, cookie
-, data-default-class, entropy, hspec, hspec-discover, http-client
-, http-types, jose, lens, lens-aeson, lib, markdown-unlit, memory
-, monad-time, mtl, servant, servant-auth, servant-server, tagged
-, text, time, transformers, unordered-containers, wai, warp, wreq
+, data-default-class, entropy, fetchgit, hspec, hspec-discover
+, http-client, http-types, jose, lens, lens-aeson, lib
+, markdown-unlit, memory, monad-time, mtl, servant, servant-auth
+, servant-server, tagged, text, time, transformers
+, unordered-containers, wai, warp, wreq
}:
mkDerivation {
pname = "servant-auth-server";
version = "0.4.7.0";
- sha256 = "42da496b14f250495131d92280e007634dbed580cea7bc423cbe87877b2f24d4";
- revision = "4";
- editedCabalFile = "1qcgm2pqi5qjqk27632h69j8ishls6cby8gghvww73wi63fqii9n";
+ src = fetchgit {
+ url = "https://github.com/haskell-servant/servant";
+ sha256 = "0ay4q9jy3xkn5j1k91snfdndi6j91hlri9h79m429j0d8v5vnj7i";
+ rev = "0cda2d0ac87dc0dd47744134e44ab0b1647fe09a";
+ fetchSubmodules = true;
+ };
+ postUnpack = "sourceRoot+=/servant-auth/servant-auth-server/; echo source root reset to $sourceRoot";
isLibrary = true;
isExecutable = false;
enableSeparateDataOutput = false;
@@ -23,7 +28,7 @@ mkDerivation {
testHaskellDepends = [
aeson base bytestring case-insensitive hspec http-client http-types
jose lens lens-aeson mtl QuickCheck servant servant-auth
- servant-server time transformers wai warp wreq
+ servant-server text time transformers wai warp wreq
];
testToolDepends = [ hspec-discover markdown-unlit ];
enableLibraryProfiling = true;
@@ -33,7 +38,7 @@ mkDerivation {
doCheck = false;
doBenchmark = false;
hyperlinkSource = false;
- homepage = "http://github.com/haskell-servant/servant/servant-auth#readme";
+ homepage = "https://github.com/haskell-servant/servant/tree/master/servant-auth#readme";
description = "servant-server/servant-auth compatibility";
license = lib.licenses.bsd3;
broken = false;
--
GitLab