diff --git a/horizon.dhall b/horizon.dhall
index 0db2cfd2ac70432b386c8f846ce49ef082131c64..7680e2ce97349f0f357c146e9f0a5c9855e6e7a8 100644
--- a/horizon.dhall
+++ b/horizon.dhall
@@ -764,7 +764,11 @@ let packages =
, monad-logger = H.callHackage "monad-logger" "0.3.39"
, monad-logger-extras = H.callHackage "monad-logger-extras" "0.1.1.1"
, monad-loops = H.callHackage "monad-loops" "0.4.3"
- , monad-par = H.callHackage "monad-par" "0.3.5"
+ , monad-par =
+ H.callGit
+ "https://github.com/locallycompact/monad-par"
+ "4f5b44fc85095e08cc159e4fc54a7d78dc41eccf"
+ (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"
@@ -872,11 +876,7 @@ let packages =
, polysemy-kvstore = H.callHackage "polysemy-kvstore" "0.1.3.0"
, polysemy-methodology = H.callHackage "polysemy-methodology" "0.2.2.0"
, polysemy-path = H.callHackage "polysemy-path" "0.2.1.0"
- , polysemy-plugin =
- H.callGit
- "https://github.com/locallycompact/polysemy"
- "bd944ca000c1ca69602d4723e3859af431b9d0c4"
- (Some "polysemy-plugin/")
+ , polysemy-plugin = H.callHackage "polysemy-plugin" "0.4.4.0"
, polysemy-several = H.callHackage "polysemy-several" "0.1.1.0"
, polysemy-test = H.callHackage "polysemy-test" "0.7.0.0"
, polysemy-time = H.callHackage "polysemy-time" "0.6.0.0"
@@ -1079,7 +1079,11 @@ let packages =
, storable-tuple = H.callHackage "storable-tuple" "0.1"
, store = H.callHackage "store" "0.7.16"
, store-core = H.callHackage "store-core" "0.4.4.4"
- , streaming = H.callHackage "streaming" "0.2.3.1"
+ , streaming =
+ H.callGit
+ "https://github.com/haskell-streaming/streaming"
+ "b6ec199103c078a07b3dcd197ab39020b2136426"
+ (None H.Subdir)
, streaming-binary = H.callHackage "streaming-binary" "0.3.0.1"
, streaming-bytestring = H.callHackage "streaming-bytestring" "0.2.4"
, streaming-commons = H.callHackage "streaming-commons" "0.2.2.5"
@@ -1097,7 +1101,11 @@ let packages =
, svg-builder = H.callHackage "svg-builder" "0.1.1"
, swagger2 = H.callHackage "swagger2" "2.8.6"
, syb = H.callHackage "syb" "0.7.2.3"
- , sydtest = H.callHackage "sydtest" "0.13.0.1"
+ , sydtest =
+ H.callGit
+ "https://github.com/locallycompact/sydtest"
+ "01c7d35b822c66a68e4d2ba5594858afbcc1cbf0"
+ (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/pkgs/monad-par.nix b/pkgs/monad-par.nix
index 6655412b518158c64fae80766b89ee2c4b1c5d31..9d7fb61bbc5ad331f3a4bdb26f20a285a6c722b9 100644
--- a/pkgs/monad-par.nix
+++ b/pkgs/monad-par.nix
@@ -1,60 +1,29 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, abstract-deque
-, abstract-par
-, array
-, base
-, containers
-, deepseq
-, lib
-, monad-par-extras
-, mtl
-, mwc-random
-, parallel
-, test-framework
-, test-framework-hunit
-, test-framework-quickcheck2
-, test-framework-th
-, time
+{ mkDerivation, HUnit, QuickCheck, abstract-deque, abstract-par
+, array, base, containers, deepseq, fetchgit, lib, monad-par-extras
+, mtl, mwc-random, parallel, test-framework, test-framework-hunit
+, test-framework-quickcheck2, test-framework-th, time
}:
mkDerivation {
pname = "monad-par";
version = "0.3.5";
- sha256 = "823ad5666cbcaefe2c6e0ff131daa0713dff9b3b534fb809643b869e5e4a15a9";
- revision = "2";
- editedCabalFile = "1q4npp0vrsjpxk7n7rcf3lgqg1sf2qx628ciiw48al9y9xlznsaz";
+ src = fetchgit {
+ url = "https://github.com/locallycompact/monad-par";
+ sha256 = "0907kpzgvmv98pbn8pvbgccwkgx3fv5lypjlr3xlqp6ghy0yprym";
+ rev = "4f5b44fc85095e08cc159e4fc54a7d78dc41eccf";
+ fetchSubmodules = true;
+ };
+ postUnpack = "sourceRoot+=/monad-par/; echo source root reset to $sourceRoot";
isLibrary = true;
isExecutable = false;
enableSeparateDataOutput = false;
libraryHaskellDepends = [
- abstract-deque
- abstract-par
- array
- base
- containers
- deepseq
- monad-par-extras
- mtl
- mwc-random
- parallel
+ abstract-deque abstract-par array base containers deepseq
+ monad-par-extras mtl mwc-random parallel
];
testHaskellDepends = [
- abstract-deque
- abstract-par
- array
- base
- containers
- deepseq
- HUnit
- monad-par-extras
- mtl
- mwc-random
- QuickCheck
- test-framework
- test-framework-hunit
- test-framework-quickcheck2
- test-framework-th
+ abstract-deque abstract-par array base containers deepseq HUnit
+ monad-par-extras mtl mwc-random QuickCheck test-framework
+ test-framework-hunit test-framework-quickcheck2 test-framework-th
time
];
enableLibraryProfiling = true;
@@ -68,4 +37,4 @@ mkDerivation {
description = "A library for parallel programming based on a monad";
license = lib.licenses.bsd3;
broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/polysemy-plugin.nix b/pkgs/polysemy-plugin.nix
index 4d496ce63c2629ae1990ae56f66032ca6eb87e7d..b731bca452d676fe978411dad42173c4567930fc 100644
--- a/pkgs/polysemy-plugin.nix
+++ b/pkgs/polysemy-plugin.nix
@@ -1,55 +1,22 @@
-{ mkDerivation
-, Cabal
-, base
-, cabal-doctest
-, containers
-, doctest
-, fetchgit
-, ghc
-, ghc-tcplugins-extra
-, hspec
-, hspec-discover
-, inspection-testing
-, lib
-, polysemy
-, should-not-typecheck
-, syb
+{ mkDerivation, Cabal, base, cabal-doctest, containers, doctest
+, ghc, ghc-tcplugins-extra, hspec, hspec-discover
+, inspection-testing, lib, polysemy, should-not-typecheck, syb
, transformers
}:
mkDerivation {
pname = "polysemy-plugin";
- version = "0.4.3.1";
- src = fetchgit {
- url = "https://github.com/locallycompact/polysemy";
- sha256 = "1sy2jmwcg9aw4a6rji36djhkxhxnh50pqhaa3jhjfv2dsw652bcz";
- rev = "bd944ca000c1ca69602d4723e3859af431b9d0c4";
- fetchSubmodules = true;
- };
- postUnpack = "sourceRoot+=/polysemy-plugin/; echo source root reset to $sourceRoot";
+ version = "0.4.4.0";
+ sha256 = "6d4826df1d7507f0d7723b3c30e843eb7f5fd618095d412f99b41e002a69e7ce";
isLibrary = true;
isExecutable = false;
enableSeparateDataOutput = false;
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
- base
- containers
- ghc
- ghc-tcplugins-extra
- polysemy
- syb
- transformers
+ base containers ghc ghc-tcplugins-extra polysemy syb transformers
];
testHaskellDepends = [
- base
- containers
- doctest
- ghc
- ghc-tcplugins-extra
- hspec
- inspection-testing
- polysemy
- should-not-typecheck
- syb
+ base containers doctest ghc ghc-tcplugins-extra hspec
+ hspec-discover inspection-testing polysemy should-not-typecheck syb
transformers
];
testToolDepends = [ hspec-discover ];
@@ -64,4 +31,4 @@ mkDerivation {
description = "Disambiguate obvious uses of effects";
license = lib.licenses.bsd3;
broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/streaming.nix b/pkgs/streaming.nix
index 04bf2e7ecd495075c0ce33290008c606d08c4925..ea741ebb5d13bb45873c40a22b9b98f28b7244e1 100644
--- a/pkgs/streaming.nix
+++ b/pkgs/streaming.nix
@@ -1,30 +1,20 @@
-{ mkDerivation
-, QuickCheck
-, base
-, containers
-, ghc-prim
-, hspec
-, lib
-, mmorph
-, mtl
-, transformers
-, transformers-base
+{ mkDerivation, QuickCheck, base, containers, fetchgit, ghc-prim
+, hspec, lib, mmorph, mtl, transformers, transformers-base
}:
mkDerivation {
pname = "streaming";
version = "0.2.3.1";
- sha256 = "fc5efae393750b9729ce5c5e979edcd3b9a5bf41ab927636174b01f999ffea88";
+ src = fetchgit {
+ url = "https://github.com/haskell-streaming/streaming";
+ sha256 = "193qwgzpd6ryzi3sl3x6bc5kk47whqhw0mfr0jqfdwrspj50ccdd";
+ rev = "b6ec199103c078a07b3dcd197ab39020b2136426";
+ fetchSubmodules = true;
+ };
isLibrary = true;
isExecutable = false;
enableSeparateDataOutput = false;
libraryHaskellDepends = [
- base
- containers
- ghc-prim
- mmorph
- mtl
- transformers
- transformers-base
+ base containers ghc-prim mmorph mtl transformers transformers-base
];
testHaskellDepends = [ base hspec QuickCheck ];
enableLibraryProfiling = true;
@@ -38,4 +28,4 @@ mkDerivation {
description = "an elementary streaming prelude and general stream type";
license = lib.licenses.bsd3;
broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/sydtest.nix b/pkgs/sydtest.nix
index 4b9357ff59ee5b3eaac1838c69a27a9199886f2b..d1313e01ab3aa207bd92fdf6fcd1310de5949b25 100644
--- a/pkgs/sydtest.nix
+++ b/pkgs/sydtest.nix
@@ -1,6 +1,6 @@
{ mkDerivation, MonadRandom, QuickCheck, async, autodocodec
, autodocodec-yaml, base, bytestring, containers, dlist, envparse
-, filepath, lib, mtl, optparse-applicative, path, path-io
+, fetchgit, filepath, lib, mtl, optparse-applicative, path, path-io
, pretty-show, quickcheck-io, random, random-shuffle, safe
, safe-coloured-text, safe-coloured-text-terminfo, stm
, sydtest-discover, text, vector
@@ -8,7 +8,13 @@
mkDerivation {
pname = "sydtest";
version = "0.13.0.1";
- sha256 = "6361d2cf7fc678e27754727350d6de338eeb95442a02d4f81fed4527de5ba12a";
+ src = fetchgit {
+ url = "https://github.com/locallycompact/sydtest";
+ sha256 = "0ab1v9lqaq42ajndsddcaqbjv9467iaidp1vwmyb65ic0g0wl4nz";
+ rev = "01c7d35b822c66a68e4d2ba5594858afbcc1cbf0";
+ fetchSubmodules = true;
+ };
+ postUnpack = "sourceRoot+=/sydtest/; echo source root reset to $sourceRoot";
isLibrary = true;
isExecutable = false;
enableSeparateDataOutput = false;