diff --git a/horizon.dhall b/horizon.dhall index bb04b69403650b843aac73b90fd2568b77d7c568..7233eb067d526fb4cc9a4f3053333f95953320d4 100644 --- a/horizon.dhall +++ b/horizon.dhall @@ -96,6 +96,8 @@ let packages = , concurrent-extra = H.callHackage "concurrent-extra" "0.7.0.12" , conduit-combinators = H.callHackage "conduit-combinators" "1.3.0" , conduit-parse = H.callHackage "conduit-parse" "0.2.1.1" + , conformance = H.callHackage "conformance" "0.1.0.0" + , conformance-gen = H.callHackage "conformance-gen" "0.0.0.0" , contravariant-extras = H.callHackage "contravariant-extras" "0.3.5.4" , control-monad-free = H.callHackage "control-monad-free" "0.6.2" , cpphs = H.callHackage "cpphs" "1.20.9.1" @@ -231,6 +233,8 @@ let packages = H.callHackage "genvalidity-hspec-aeson" "1.0.0.0" , genvalidity-hspec-optics = H.callHackage "genvalidity-hspec-optics" "1.0.0.0" + , genvalidity-network-uri = + H.callHackage "genvalidity-network-uri" "0.0.0.0" , genvalidity-path = H.callHackage "genvalidity-path" "1.0.0.1" , genvalidity-persistent = H.callHackage "genvalidity-persistent" "1.0.0.2" @@ -317,6 +321,31 @@ let packages = , hw-hedgehog = H.callHackage "hw-hedgehog" "0.1.1.1" , hw-hspec-hedgehog = H.callHackage "hw-hspec-hedgehog" "0.1.1.1" , hw-prim = H.callHackage "hw-prim" "0.6.3.2" + , ical = + H.callGit + "https://github.com/NorfairKing/ical" + "601ff6dd9e48e87fec524056e2e7e2234aabe147" + (Some "ical/") + , ical-gen = + H.callGit + "https://github.com/NorfairKing/ical" + "601ff6dd9e48e87fec524056e2e7e2234aabe147" + (Some "ical-gen/") + , ical-interop-test = + H.callGit + "https://github.com/NorfairKing/ical" + "601ff6dd9e48e87fec524056e2e7e2234aabe147" + (Some "ical-interop-test/") + , ical-recurrence = + H.callGit + "https://github.com/NorfairKing/ical" + "601ff6dd9e48e87fec524056e2e7e2234aabe147" + (Some "ical-recurrence/") + , ical-recurrence-gen = + H.callGit + "https://github.com/NorfairKing/ical" + "601ff6dd9e48e87fec524056e2e7e2234aabe147" + (Some "ical-recurrence-gen/") , incipit-base = H.callHackage "incipit-base" "0.5.1.0" , incipit-core = H.callHackage "incipit-core" "0.5.1.0" , indexed-list-literals = H.callHackage "indexed-list-literals" "0.2.1.3" @@ -653,6 +682,7 @@ let packages = , validation-selective = H.callHackage "validation-selective" "0.2.0.0" , validity-case-insensitive = H.callHackage "validity-case-insensitive" "0.0.0.0" + , validity-network-uri = H.callHackage "validity-network-uri" "0.0.0.1" , validity-path = H.callHackage "validity-path" "0.4.0.1" , validity-persistent = H.callHackage "validity-persistent" "0.0.0.0" , validity-primitive = H.callHackage "validity-primitive" "0.0.0.1" diff --git a/horizon.lock b/horizon.lock index 78f28b48f15c4edaf39fc5147e5a7a320494d37e..507635cf516e0e6a7b06aefbe3e4f0d0cce3995d 100644 --- a/horizon.lock +++ b/horizon.lock @@ -342,6 +342,14 @@ , mapValue = "6742b84c24043c6c23af8570ab00fe79c612ad02ebe508a3b6dd5b370870db7e" } +, { mapKey = "conformance" + , mapValue = + "c002880e06d7b84a5c6f18098a73c5fd7acfc4f3a292615aecab27d6bc505e56" + } +, { mapKey = "conformance-gen" + , mapValue = + "6d0dfd39e96d2c35096755b09965e530e6be25624ea3e908f9798b31a0792600" + } , { mapKey = "contravariant-extras" , mapValue = "0a527d0b7e0e20651cd21910243399d6fb7e8a5301290424249512d1867d0f53" @@ -734,6 +742,10 @@ , mapValue = "bd83d9c26b9f5e61fb2158916cb128a81d1d4231242f9e6d1cd1e88845b8bd39" } +, { mapKey = "genvalidity-network-uri" + , mapValue = + "40ae2ef161b0a12642019cc94ca14f104641be74393d7634b94091ccd9a3751f" + } , { mapKey = "genvalidity-path" , mapValue = "452be5279b9abf5fc798e44346b7cadb323df8fe41829c95a5a54c0fd82324f3" @@ -1026,6 +1038,26 @@ , mapValue = "c45402de191df72544b6a52c3368e40e949b0e02340431ef252c8cb94cab3170" } +, { mapKey = "ical" + , mapValue = + "5ae94cb045e3b6d2b951ec76293929af19ea61d867b8d7f9acebd7875d259d23" + } +, { mapKey = "ical-gen" + , mapValue = + "f84be4fe692b25e4d8fdb512bc6bec5ed67f041cdd4268acaf156cc97c3796dc" + } +, { mapKey = "ical-interop-test" + , mapValue = + "add3a924ce32907af8f8027e4884fd9556d4c1217f6bcdfce9c78d9fb3105dc1" + } +, { mapKey = "ical-recurrence" + , mapValue = + "910f5f820546fd86a22f24cddc5c46bdf799a01ab7ed30a0c4defb2e9c51aa92" + } +, { mapKey = "ical-recurrence-gen" + , mapValue = + "f320def391ea0e6fb029c6330cb16f1e29e31e8b43a003ab732d522b2ee6fc56" + } , { mapKey = "incipit-base" , mapValue = "a4b0dc3fca9ff8f4eb65b7f19ce38b26932b50d5327d41f762ff9aa5be9ed0c9" @@ -2122,6 +2154,10 @@ , mapValue = "7e1603c371b0cb96c981ada575ec0a2dd5d656bb54abeee2b0db7e25481f5541" } +, { mapKey = "validity-network-uri" + , mapValue = + "0bb1d4ef06b7af16598099ef8c3953f1de635cfd251b9f66d598ce7f7e6a8859" + } , { mapKey = "validity-path" , mapValue = "3eec7974a47b5dbc1e10027cb2270a33995fd71064104f048b50a115fd0f4eff" diff --git a/overlay.nix b/overlay.nix index 52442b36552bd8f3517ab1cf7a983815c40013e6..594e9a8ab50fd25f2ba783bde63de02b1269c6dd 100644 --- a/overlay.nix +++ b/overlay.nix @@ -173,6 +173,10 @@ final: prev: with pkgs.haskell.lib; { conduit-parse = final.callPackage (./pkgs/conduit-parse.nix) { }; + conformance = final.callPackage (./pkgs/conformance.nix) { }; + + conformance-gen = final.callPackage (./pkgs/conformance-gen.nix) { }; + contravariant-extras = final.callPackage (./pkgs/contravariant-extras.nix) { }; control-monad-free = final.callPackage (./pkgs/control-monad-free.nix) { }; @@ -369,6 +373,8 @@ final: prev: with pkgs.haskell.lib; { genvalidity-hspec-optics = final.callPackage (./pkgs/genvalidity-hspec-optics.nix) { }; + genvalidity-network-uri = final.callPackage (./pkgs/genvalidity-network-uri.nix) { }; + genvalidity-path = final.callPackage (./pkgs/genvalidity-path.nix) { }; genvalidity-persistent = final.callPackage (./pkgs/genvalidity-persistent.nix) { }; @@ -515,6 +521,16 @@ final: prev: with pkgs.haskell.lib; { hw-prim = final.callPackage (./pkgs/hw-prim.nix) { }; + ical = final.callPackage (./pkgs/ical.nix) { }; + + ical-gen = final.callPackage (./pkgs/ical-gen.nix) { }; + + ical-interop-test = final.callPackage (./pkgs/ical-interop-test.nix) { }; + + ical-recurrence = final.callPackage (./pkgs/ical-recurrence.nix) { }; + + ical-recurrence-gen = final.callPackage (./pkgs/ical-recurrence-gen.nix) { }; + incipit-base = final.callPackage (./pkgs/incipit-base.nix) { }; incipit-core = final.callPackage (./pkgs/incipit-core.nix) { }; @@ -1063,6 +1079,8 @@ final: prev: with pkgs.haskell.lib; { validity-case-insensitive = final.callPackage (./pkgs/validity-case-insensitive.nix) { }; + validity-network-uri = final.callPackage (./pkgs/validity-network-uri.nix) { }; + validity-path = final.callPackage (./pkgs/validity-path.nix) { }; validity-persistent = final.callPackage (./pkgs/validity-persistent.nix) { }; diff --git a/pkgs/conformance-gen.nix b/pkgs/conformance-gen.nix new file mode 100644 index 0000000000000000000000000000000000000000..68d33fb103b35554a99798a5c8d247bd38a45616 --- /dev/null +++ b/pkgs/conformance-gen.nix @@ -0,0 +1,25 @@ +{ mkDerivation, base, conformance, genvalidity-sydtest, lib +, sydtest, sydtest-discover +}: +mkDerivation { + pname = "conformance-gen"; + version = "0.0.0.0"; + sha256 = "b29eee7700bf473c0eb720af9a8e48f5d85700a4dcfece46bb22b7d48575445a"; + isLibrary = true; + isExecutable = false; + enableSeparateDataOutput = false; + libraryHaskellDepends = [ base conformance sydtest ]; + testHaskellDepends = [ + base conformance genvalidity-sydtest sydtest + ]; + testToolDepends = [ sydtest-discover ]; + enableLibraryProfiling = true; + enableExecutableProfiling = true; + doHaddock = true; + jailbreak = true; + doCheck = false; + doBenchmark = false; + hyperlinkSource = false; + license = lib.licenses.mit; + broken = false; +} \ No newline at end of file diff --git a/pkgs/conformance.nix b/pkgs/conformance.nix new file mode 100644 index 0000000000000000000000000000000000000000..bfb810e1c2ee98fd49b1e7fb07367dec1d09cb8f --- /dev/null +++ b/pkgs/conformance.nix @@ -0,0 +1,19 @@ +{ mkDerivation, base, lib, mtl }: +mkDerivation { + pname = "conformance"; + version = "0.1.0.0"; + sha256 = "4c52ff58125ee402add6ecbb1d0020ae6c12136ab0c043d133b05e989590bfa1"; + isLibrary = true; + isExecutable = false; + enableSeparateDataOutput = false; + libraryHaskellDepends = [ base mtl ]; + enableLibraryProfiling = true; + enableExecutableProfiling = true; + doHaddock = true; + jailbreak = true; + doCheck = false; + doBenchmark = false; + hyperlinkSource = false; + license = lib.licenses.mit; + broken = false; +} \ No newline at end of file diff --git a/pkgs/genvalidity-network-uri.nix b/pkgs/genvalidity-network-uri.nix new file mode 100644 index 0000000000000000000000000000000000000000..f8b114a682c43566558b365bbe50753193b183fd --- /dev/null +++ b/pkgs/genvalidity-network-uri.nix @@ -0,0 +1,37 @@ +{ mkDerivation, QuickCheck, base, criterion, genvalidity +, genvalidity-criterion, genvalidity-sydtest, iproute, lib +, network-uri, sydtest, sydtest-discover, validity +, validity-network-uri +}: +mkDerivation { + pname = "genvalidity-network-uri"; + version = "0.0.0.0"; + sha256 = "7a56112360b6f2887c2b87e640e175fa150b22582d807b8c377b1a8626c5055b"; + isLibrary = true; + isExecutable = false; + enableSeparateDataOutput = false; + libraryHaskellDepends = [ + base genvalidity iproute network-uri QuickCheck validity + validity-network-uri + ]; + testHaskellDepends = [ + base genvalidity genvalidity-sydtest network-uri QuickCheck sydtest + validity-network-uri + ]; + testToolDepends = [ sydtest-discover ]; + benchmarkHaskellDepends = [ + base criterion genvalidity genvalidity-criterion network-uri + QuickCheck + ]; + enableLibraryProfiling = true; + enableExecutableProfiling = true; + doHaddock = true; + jailbreak = true; + doCheck = false; + doBenchmark = false; + hyperlinkSource = false; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "GenValidity support for URI"; + license = lib.licenses.mit; + broken = false; +} \ No newline at end of file diff --git a/pkgs/ical-gen.nix b/pkgs/ical-gen.nix new file mode 100644 index 0000000000000000000000000000000000000000..fcd5c84e85a84d733d4a28a78d42a165ea05e312 --- /dev/null +++ b/pkgs/ical-gen.nix @@ -0,0 +1,56 @@ +{ mkDerivation, QuickCheck, base, bytestring, case-insensitive +, conformance, conformance-gen, containers, criterion, deepseq +, dlist, fetchgit, genvalidity, genvalidity-bytestring +, genvalidity-case-insensitive, genvalidity-containers +, genvalidity-criterion, genvalidity-network-uri +, genvalidity-sydtest, genvalidity-text, genvalidity-time +, genvalidity-vector, ical, lib, megaparsec, network-uri, path +, path-io, pretty-show, safe-coloured-text +, safe-coloured-text-terminfo, sydtest, sydtest-discover, text +, time, validity-network-uri, vector +}: +mkDerivation { + pname = "ical-gen"; + version = "0.0.0.0"; + src = fetchgit { + url = "https://github.com/NorfairKing/ical"; + sha256 = "1as4g4pg25v70mwwz3hjirk6pvfnnnlps1ymy8n31xl8darkvk5l"; + rev = "601ff6dd9e48e87fec524056e2e7e2234aabe147"; + fetchSubmodules = true; + }; + postUnpack = "sourceRoot+=/ical-gen/; echo source root reset to $sourceRoot"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = false; + libraryHaskellDepends = [ + base bytestring case-insensitive conformance conformance-gen + containers dlist genvalidity genvalidity-bytestring + genvalidity-case-insensitive genvalidity-containers + genvalidity-network-uri genvalidity-sydtest genvalidity-text + genvalidity-time ical QuickCheck sydtest text time + ]; + executableHaskellDepends = [ + base containers path path-io safe-coloured-text + safe-coloured-text-terminfo text vector + ]; + testHaskellDepends = [ + base bytestring conformance conformance-gen containers dlist + genvalidity genvalidity-sydtest genvalidity-text ical megaparsec + network-uri path path-io pretty-show QuickCheck sydtest text time + validity-network-uri + ]; + testToolDepends = [ sydtest-discover ]; + benchmarkHaskellDepends = [ + base criterion deepseq genvalidity genvalidity-criterion + genvalidity-vector ical QuickCheck vector + ]; + enableLibraryProfiling = true; + enableExecutableProfiling = true; + doHaddock = true; + jailbreak = true; + doCheck = false; + doBenchmark = false; + hyperlinkSource = false; + license = "unknown"; + broken = false; +} \ No newline at end of file diff --git a/pkgs/ical-interop-test.nix b/pkgs/ical-interop-test.nix new file mode 100644 index 0000000000000000000000000000000000000000..a6d79f87f5af71992c5a0757bbe00bdc7f02e3d3 --- /dev/null +++ b/pkgs/ical-interop-test.nix @@ -0,0 +1,43 @@ +{ mkDerivation, QuickCheck, base, bytestring, case-insensitive +, containers, dlist, fetchgit, genvalidity, genvalidity-bytestring +, genvalidity-case-insensitive, genvalidity-containers +, genvalidity-network-uri, genvalidity-sydtest, genvalidity-text +, genvalidity-time, ical, ical-gen, lib, megaparsec, network-uri +, path, path-io, process, sydtest, sydtest-discover, text, time +, timeout +}: +mkDerivation { + pname = "ical-interop-test"; + version = "0.0.0.0"; + src = fetchgit { + url = "https://github.com/NorfairKing/ical"; + sha256 = "1as4g4pg25v70mwwz3hjirk6pvfnnnlps1ymy8n31xl8darkvk5l"; + rev = "601ff6dd9e48e87fec524056e2e7e2234aabe147"; + fetchSubmodules = true; + }; + postUnpack = "sourceRoot+=/ical-interop-test/; echo source root reset to $sourceRoot"; + isLibrary = true; + isExecutable = false; + enableSeparateDataOutput = false; + libraryHaskellDepends = [ + base bytestring case-insensitive containers dlist genvalidity + genvalidity-bytestring genvalidity-case-insensitive + genvalidity-containers genvalidity-network-uri genvalidity-sydtest + genvalidity-text genvalidity-time ical megaparsec network-uri + QuickCheck sydtest text time + ]; + testHaskellDepends = [ + base bytestring genvalidity-sydtest ical ical-gen path path-io + process sydtest text timeout + ]; + testToolDepends = [ sydtest-discover ]; + enableLibraryProfiling = true; + enableExecutableProfiling = true; + doHaddock = false; + jailbreak = true; + doCheck = false; + doBenchmark = false; + hyperlinkSource = false; + license = "unknown"; + broken = false; +} \ No newline at end of file diff --git a/pkgs/ical-recurrence-gen.nix b/pkgs/ical-recurrence-gen.nix new file mode 100644 index 0000000000000000000000000000000000000000..b4301594bb4293f5e0b89e3df30cdf15af6471af --- /dev/null +++ b/pkgs/ical-recurrence-gen.nix @@ -0,0 +1,39 @@ +{ mkDerivation, QuickCheck, base, bytestring, conformance +, conformance-gen, containers, fetchgit, genvalidity +, genvalidity-containers, genvalidity-sydtest, genvalidity-time +, ical, ical-gen, ical-recurrence, lib, path, path-io, sydtest +, sydtest-discover, text, time +}: +mkDerivation { + pname = "ical-recurrence-gen"; + version = "0.0.0.0"; + src = fetchgit { + url = "https://github.com/NorfairKing/ical"; + sha256 = "1as4g4pg25v70mwwz3hjirk6pvfnnnlps1ymy8n31xl8darkvk5l"; + rev = "601ff6dd9e48e87fec524056e2e7e2234aabe147"; + fetchSubmodules = true; + }; + postUnpack = "sourceRoot+=/ical-recurrence-gen/; echo source root reset to $sourceRoot"; + isLibrary = true; + isExecutable = false; + enableSeparateDataOutput = false; + libraryHaskellDepends = [ + base conformance conformance-gen containers genvalidity + genvalidity-containers ical-gen ical-recurrence + ]; + testHaskellDepends = [ + base bytestring conformance conformance-gen containers + genvalidity-sydtest genvalidity-time ical ical-gen ical-recurrence + path path-io QuickCheck sydtest text time + ]; + testToolDepends = [ sydtest-discover ]; + enableLibraryProfiling = true; + enableExecutableProfiling = true; + doHaddock = true; + jailbreak = true; + doCheck = false; + doBenchmark = false; + hyperlinkSource = false; + license = "unknown"; + broken = false; +} \ No newline at end of file diff --git a/pkgs/ical-recurrence.nix b/pkgs/ical-recurrence.nix new file mode 100644 index 0000000000000000000000000000000000000000..2b4c1c5d745eacaf284efc239e29addbc249a3da --- /dev/null +++ b/pkgs/ical-recurrence.nix @@ -0,0 +1,29 @@ +{ mkDerivation, base, conformance, containers, fetchgit, ical, lib +, mtl, time, validity +}: +mkDerivation { + pname = "ical-recurrence"; + version = "0.0.0.0"; + src = fetchgit { + url = "https://github.com/NorfairKing/ical"; + sha256 = "1as4g4pg25v70mwwz3hjirk6pvfnnnlps1ymy8n31xl8darkvk5l"; + rev = "601ff6dd9e48e87fec524056e2e7e2234aabe147"; + fetchSubmodules = true; + }; + postUnpack = "sourceRoot+=/ical-recurrence/; echo source root reset to $sourceRoot"; + isLibrary = true; + isExecutable = false; + enableSeparateDataOutput = false; + libraryHaskellDepends = [ + base conformance containers ical mtl time validity + ]; + enableLibraryProfiling = true; + enableExecutableProfiling = true; + doHaddock = true; + jailbreak = true; + doCheck = false; + doBenchmark = false; + hyperlinkSource = false; + license = "unknown"; + broken = false; +} \ No newline at end of file diff --git a/pkgs/ical.nix b/pkgs/ical.nix new file mode 100644 index 0000000000000000000000000000000000000000..59f512110bd03e9f8988d6f8cb4f5e6841f2aaa2 --- /dev/null +++ b/pkgs/ical.nix @@ -0,0 +1,37 @@ +{ mkDerivation, base, base64, bytestring, case-insensitive +, conformance, containers, deepseq, dlist, fetchgit, lib +, megaparsec, mtl, network-uri, text, time, time-compat, validity +, validity-bytestring, validity-case-insensitive +, validity-containers, validity-network-uri, validity-text +, validity-time +}: +mkDerivation { + pname = "ical"; + version = "0.0.0.0"; + src = fetchgit { + url = "https://github.com/NorfairKing/ical"; + sha256 = "1as4g4pg25v70mwwz3hjirk6pvfnnnlps1ymy8n31xl8darkvk5l"; + rev = "601ff6dd9e48e87fec524056e2e7e2234aabe147"; + fetchSubmodules = true; + }; + postUnpack = "sourceRoot+=/ical/; echo source root reset to $sourceRoot"; + isLibrary = true; + isExecutable = false; + enableSeparateDataOutput = false; + libraryHaskellDepends = [ + base base64 bytestring case-insensitive conformance containers + deepseq dlist megaparsec mtl network-uri text time time-compat + validity validity-bytestring validity-case-insensitive + validity-containers validity-network-uri validity-text + validity-time + ]; + enableLibraryProfiling = true; + enableExecutableProfiling = true; + doHaddock = true; + jailbreak = true; + doCheck = false; + doBenchmark = false; + hyperlinkSource = false; + license = "unknown"; + broken = false; +} \ No newline at end of file diff --git a/pkgs/validity-network-uri.nix b/pkgs/validity-network-uri.nix new file mode 100644 index 0000000000000000000000000000000000000000..27b61724544a86cf82f32bce0ab67521dfd36b6e --- /dev/null +++ b/pkgs/validity-network-uri.nix @@ -0,0 +1,21 @@ +{ mkDerivation, base, lib, network-uri, validity }: +mkDerivation { + pname = "validity-network-uri"; + version = "0.0.0.1"; + sha256 = "99befa2be5adfd67563857517e369d7916fca5a09fc5f6dbd8cdd1378d5ec397"; + isLibrary = true; + isExecutable = false; + enableSeparateDataOutput = false; + libraryHaskellDepends = [ base network-uri validity ]; + enableLibraryProfiling = true; + enableExecutableProfiling = true; + doHaddock = true; + jailbreak = true; + doCheck = false; + doBenchmark = false; + hyperlinkSource = false; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity instances for URI"; + license = lib.licenses.mit; + broken = false; +} \ No newline at end of file