From 84607140e9b0065ecc875861e06527245b7e3c12 Mon Sep 17 00:00:00 2001 From: Daniel Firth <dan.firth@horizon-haskell.net> Date: Sun, 3 Dec 2023 00:00:40 +0000 Subject: [PATCH] souffle-haskell: e441c84f1d64890e31c92fbb278c074ae8bcaff5 --- horizon.dhall | 6 +++++- horizon.lock | 2 +- pkgs/souffle-haskell.nix | 17 +++++++++++------ 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/horizon.dhall b/horizon.dhall index 5badd34a..34c5ef15 100644 --- a/horizon.dhall +++ b/horizon.dhall @@ -557,7 +557,11 @@ let packages = , snap-server = H.callHackage "snap-server" "1.1.2.1" , sort = H.callHackage "sort" "1.0.0.0" , sorted-list = H.callHackage "sorted-list" "0.2.2.0" - , souffle-haskell = H.callHackage "souffle-haskell" "3.5.1" + , souffle-haskell = + H.callGit + "https://github.com/luc-tielen/souffle-haskell" + "e441c84f1d64890e31c92fbb278c074ae8bcaff5" + (None H.Subdir) , sqlite-simple = H.callHackage "sqlite-simple" "0.4.18.2" , statestack = H.callHackage "statestack" "0.3.1.1" , statistics-linreg = H.callHackage "statistics-linreg" "0.3" diff --git a/horizon.lock b/horizon.lock index 6265c47e..e2d09ef5 100644 --- a/horizon.lock +++ b/horizon.lock @@ -1828,7 +1828,7 @@ } , { mapKey = "souffle-haskell" , mapValue = - "ee44e9b748a808329d7460c370ddc0e7dade782cc039b6b2e577dab8e1740328" + "c7a4d4b2d6401d2a21eeb43191ff5b2adfc5b3ee01f537e6f95c1b6d28b426f3" } , { mapKey = "sqlite-simple" , mapValue = diff --git a/pkgs/souffle-haskell.nix b/pkgs/souffle-haskell.nix index 970ba085..b46ffc03 100644 --- a/pkgs/souffle-haskell.nix +++ b/pkgs/souffle-haskell.nix @@ -1,21 +1,26 @@ { mkDerivation, array, base, bytestring, criterion, deepseq -, directory, filepath, hedgehog, hspec, hspec-hedgehog, lib, mtl -, process, profunctors, temporary, text, text-short, vector +, directory, fetchgit, filepath, hedgehog, hspec, hspec-hedgehog +, lib, mtl, process, profunctors, temporary, text, vector }: mkDerivation { pname = "souffle-haskell"; - version = "3.5.1"; - sha256 = "70b9b8fb6e58609675c5b29137557f1cbe599443dd0ab31ca33b1f66815ebc6f"; + version = "4.0.0"; + src = fetchgit { + url = "https://github.com/luc-tielen/souffle-haskell"; + sha256 = "03kn2ap5wkiiqajln48gn70pq5dsypivvb6n3nl3i4gqdh8l2xnm"; + rev = "e441c84f1d64890e31c92fbb278c074ae8bcaff5"; + fetchSubmodules = true; + }; isLibrary = true; isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ array base bytestring deepseq directory filepath mtl process - profunctors temporary text text-short vector + profunctors temporary text vector ]; testHaskellDepends = [ array base directory hedgehog hspec hspec-hedgehog profunctors - temporary text text-short vector + temporary text vector ]; benchmarkHaskellDepends = [ base criterion deepseq text vector ]; enableLibraryProfiling = true; -- GitLab