diff --git a/horizon.dhall b/horizon.dhall
index 6be95ed74b3437150746afdd8231eee2dfaf3280..e3917028c2d818359ae2d92a149da89afb08bee8 100644
--- a/horizon.dhall
+++ b/horizon.dhall
@@ -441,6 +441,7 @@ let packages =
, haskell-src-exts = H.callHackage "haskell-src-exts" "1.23.1"
, haskell-src-meta = H.callHackage "haskell-src-meta" "0.8.11"
, heaps = H.callHackage "heaps" "0.4"
+ , hedgehog-extras = H.callHackage "hedgehog-extras" "0.3.0.3"
, hedgehog-fn = H.callHackage "hedgehog-fn" "1.0"
, hedgehog-golden =
H.callGit
@@ -523,6 +524,7 @@ let packages =
, infer-license = H.callHackage "infer-license" "0.2.0"
, ini = H.callHackage "ini" "0.4.2"
, inline-c = H.callHackage "inline-c" "0.9.1.6"
+ , inline-r = H.callHackage "inline-r" "1.0.0"
, insert-ordered-containers =
H.callHackage "insert-ordered-containers" "0.2.5.1"
, inspection-testing = H.callHackage "inspection-testing" "0.5"
@@ -1016,11 +1018,7 @@ let packages =
, type-errors-pretty = H.callHackage "type-errors-pretty" "0.0.1.2"
, type-errors = H.callHackage "type-errors" "0.2.0.0"
, type-equality = H.callHackage "type-equality" "1"
- , typerep-map =
- H.callGit
- "https://github.com/parsonsmatt/typerep-map"
- "75b7cd5d45986be07420a6821d352ad2adc0b697"
- (None Text)
+ , typerep-map = H.callHackage "typerep-map" "0.6.0.0"
, uglymemo = H.callHackage "uglymemo" "0.1.0.1"
, unagi-chan = H.callHackage "unagi-chan" "0.4.1.4"
, unbounded-delays = H.callHackage "unbounded-delays" "0.1.1.1"
diff --git a/initial-packages.nix b/initial-packages.nix
index fd0008b760c2d579e08e4a02f46daee0ea922bd8..5ff1a5137e5f24ff8f7dad09d309e06131d7bd12 100644
--- a/initial-packages.nix
+++ b/initial-packages.nix
@@ -679,6 +679,8 @@ self: with pkgs.haskell.lib; {
hedgehog = self.callPackage (./pkgs/hedgehog.nix) { };
+ hedgehog-extras = self.callPackage (./pkgs/hedgehog-extras.nix) { };
+
hedgehog-fn = self.callPackage (./pkgs/hedgehog-fn.nix) { };
hedgehog-golden = self.callPackage (./pkgs/hedgehog-golden.nix) { };
@@ -827,6 +829,8 @@ self: with pkgs.haskell.lib; {
inline-c = self.callPackage (./pkgs/inline-c.nix) { };
+ inline-r = self.callPackage (./pkgs/inline-r.nix) { };
+
insert-ordered-containers = self.callPackage (./pkgs/insert-ordered-containers.nix) { };
inspection-testing = self.callPackage (./pkgs/inspection-testing.nix) { };
diff --git a/pkgs/hedgehog-extras.nix b/pkgs/hedgehog-extras.nix
new file mode 100644
index 0000000000000000000000000000000000000000..05dfab49aa8315c2bf19a9c940c313ace53408b2
--- /dev/null
+++ b/pkgs/hedgehog-extras.nix
@@ -0,0 +1,71 @@
+{ mkDerivation
+, aeson
+, aeson-pretty
+, async
+, base
+, bytestring
+, deepseq
+, directory
+, exceptions
+, filepath
+, hedgehog
+, hw-aeson
+, lib
+, mmorph
+, mtl
+, network
+, process
+, resourcet
+, stm
+, temporary
+, text
+, time
+, transformers
+, unliftio
+, unordered-containers
+, yaml
+}:
+mkDerivation {
+ pname = "hedgehog-extras";
+ version = "0.3.0.3";
+ sha256 = "ce307da4bc24f3d7a5ffe0a507f03f4c0b449a524149f8347d169285a68c3fcb";
+ isLibrary = true;
+ isExecutable = false;
+ enableSeparateDataOutput = false;
+ libraryHaskellDepends = [
+ aeson
+ aeson-pretty
+ async
+ base
+ bytestring
+ deepseq
+ directory
+ exceptions
+ filepath
+ hedgehog
+ hw-aeson
+ mmorph
+ mtl
+ network
+ process
+ resourcet
+ stm
+ temporary
+ text
+ time
+ transformers
+ unliftio
+ unordered-containers
+ yaml
+ ];
+ enableLibraryProfiling = true;
+ enableExecutableProfiling = true;
+ doHaddock = false;
+ jailbreak = true;
+ doCheck = false;
+ doBenchmark = false;
+ hyperlinkSource = false;
+ description = "Supplemental library for hedgehog";
+ license = lib.licenses.asl20;
+ broken = false;
+}
diff --git a/pkgs/inline-r.nix b/pkgs/inline-r.nix
new file mode 100644
index 0000000000000000000000000000000000000000..04f9cffc899e63af722a5910a73eaa86d3398ee2
--- /dev/null
+++ b/pkgs/inline-r.nix
@@ -0,0 +1,122 @@
+{ mkDerivation
+, R
+, aeson
+, base
+, bytestring
+, containers
+, criterion
+, data-default-class
+, deepseq
+, directory
+, exceptions
+, filepath
+, heredoc
+, ieee754
+, inline-c
+, lib
+, mtl
+, pretty
+, primitive
+, process
+, quickcheck-assertions
+, reflection
+, setenv
+, silently
+, singletons
+, singletons-th
+, strict
+, tasty
+, tasty-expected-failure
+, tasty-golden
+, tasty-hunit
+, tasty-quickcheck
+, template-haskell
+, temporary
+, text
+, th-lift
+, th-orphans
+, transformers
+, unix
+, vector
+}:
+mkDerivation {
+ pname = "inline-r";
+ version = "1.0.0";
+ sha256 = "6ac962e2322049392428af712bc46b7319419a3b00b2749892352d489fd3fd2c";
+ isLibrary = true;
+ isExecutable = false;
+ enableSeparateDataOutput = false;
+ libraryHaskellDepends = [
+ aeson
+ base
+ bytestring
+ containers
+ data-default-class
+ deepseq
+ exceptions
+ heredoc
+ inline-c
+ mtl
+ pretty
+ primitive
+ process
+ reflection
+ setenv
+ singletons
+ singletons-th
+ template-haskell
+ temporary
+ text
+ th-lift
+ th-orphans
+ transformers
+ unix
+ vector
+ ];
+ libraryPkgconfigDepends = [ R ];
+ testHaskellDepends = [
+ base
+ bytestring
+ directory
+ filepath
+ heredoc
+ ieee754
+ mtl
+ process
+ quickcheck-assertions
+ silently
+ singletons
+ strict
+ tasty
+ tasty-expected-failure
+ tasty-golden
+ tasty-hunit
+ tasty-quickcheck
+ template-haskell
+ temporary
+ text
+ unix
+ vector
+ ];
+ benchmarkHaskellDepends = [
+ base
+ criterion
+ filepath
+ primitive
+ process
+ singletons
+ template-haskell
+ vector
+ ];
+ enableLibraryProfiling = true;
+ enableExecutableProfiling = true;
+ doHaddock = false;
+ jailbreak = true;
+ doCheck = false;
+ doBenchmark = false;
+ hyperlinkSource = false;
+ homepage = "https://tweag.github.io/HaskellR";
+ description = "Seamlessly call R from Haskell and vice versa. No FFI required.";
+ license = lib.licenses.bsd3;
+ broken = false;
+}
diff --git a/pkgs/typerep-map.nix b/pkgs/typerep-map.nix
index 646845e0557b1d6bb2729dffb3b9c013077938a6..51d5f0a358b8fe3302d6b70d59f0f21389f4257c 100644
--- a/pkgs/typerep-map.nix
+++ b/pkgs/typerep-map.nix
@@ -5,7 +5,6 @@
, deepseq
, dependent-map
, dependent-sum
-, fetchgit
, ghc-prim
, ghc-typelits-knownnat
, hedgehog
@@ -17,13 +16,8 @@
}:
mkDerivation {
pname = "typerep-map";
- version = "0.5.0.0";
- src = fetchgit {
- url = "https://github.com/parsonsmatt/typerep-map";
- sha256 = "023f2rrak7kmpfxxpfcdv5bb1llksk2cxmdgvs08qx3l821d016w";
- rev = "75b7cd5d45986be07420a6821d352ad2adc0b697";
- fetchSubmodules = true;
- };
+ version = "0.6.0.0";
+ sha256 = "e36fab025872dec241e02e2d7408633fd167dfea78be8a0c97a784c4ea823c04";
isLibrary = true;
isExecutable = false;
enableSeparateDataOutput = false;