diff --git a/horizon.dhall b/horizon.dhall index 85945f5b202e3164dba925b0dbd207b6a66038f9..c3060a4bdf3744abebe97be7a3a79aee8ac2320b 100644 --- a/horizon.dhall +++ b/horizon.dhall @@ -56,26 +56,10 @@ let packages = , base64 = H.callHackage "base64" "0.4.2.4" , base64-bytestring = H.callHackage "base64-bytestring" "1.2.1.0" , base64-bytestring-type = H.callHackage "base64-bytestring-type" "1.0.1" - , beam-core = - H.callGit - "https://github.com/haskell-beam/beam" - "96e35be86dfffe4aa0b8190f7b8656e30cb36301" - (Some "beam-core/") - , beam-migrate = - H.callGit - "https://github.com/haskell-beam/beam" - "96e35be86dfffe4aa0b8190f7b8656e30cb36301" - (Some "beam-migrate/") - , beam-postgres = - H.callGit - "https://github.com/haskell-beam/beam" - "96e35be86dfffe4aa0b8190f7b8656e30cb36301" - (Some "beam-postgres/") - , beam-sqlite = - H.callGit - "https://github.com/haskell-beam/beam" - "96e35be86dfffe4aa0b8190f7b8656e30cb36301" - (Some "beam-sqlite/") + , beam-core = H.callHackage "beam-core" "0.10.1.0" + , beam-migrate = H.callHackage "beam-migrate" "0.5.2.1" + , beam-postgres = H.callHackage "beam-postgres" "0.5.3.1" + , beam-sqlite = H.callHackage "beam-sqlite" "0.5.3.0" , bech32 = H.callHackage "bech32" "1.1.4" , bech32-th = H.callHackage "bech32-th" "1.1.1" , bin = H.callHackage "bin" "0.1.3" diff --git a/horizon.lock b/horizon.lock index 0a68f3af8928a2c0e5893e543face8b6135457e3..2b25b74224fb7926d69821fed7e40a06b5769c2e 100644 --- a/horizon.lock +++ b/horizon.lock @@ -212,19 +212,19 @@ } , { mapKey = "beam-core" , mapValue = - "18f9feef7f22ee326974bbdf35f161d8241cb2cc7af62bfa6491dc2a76142a68" + "6916383f0659f6530004a5a382b7a902bf3d6fc70ab6a09fb9ec1c04bef31bc4" } , { mapKey = "beam-migrate" , mapValue = - "1f81869896d9ab2287bf25d66b5f5269bd2d3c20ed5600d1cc81ff02631e511a" + "7c5e89662ba072cd51acbf66dfdc15d5c3183419b075158293b342527d98f4dd" } , { mapKey = "beam-postgres" , mapValue = - "9e3707c147ac07e4d8db15c997bd21e3dae7417c2f3d1fe6dc6c3da496c3b9fd" + "766a1bc04c29fdec3539e08396f11b697abc718e8b5ac4a33fdbd112c9e5c3e4" } , { mapKey = "beam-sqlite" , mapValue = - "d0c50528c1e216654f103b366556b776c17ca10d9707ac1e1ebf4f4aa136cd7d" + "85a6ad18634ec507d5f4d21a9f1f8bf5cd2c65ee6f556dae2c6576658376e964" } , { mapKey = "bech32" , mapValue = diff --git a/pkgs/beam-core.nix b/pkgs/beam-core.nix index a58120c65bddd266ca7d2a46b1eaca577a0720af..a018508ac4526b0073fff580a7e8f428af6f8788 100644 --- a/pkgs/beam-core.nix +++ b/pkgs/beam-core.nix @@ -1,18 +1,11 @@ -{ mkDerivation, aeson, base, bytestring, containers, dlist -, fetchgit, free, ghc-prim, hashable, lib, microlens, mtl -, network-uri, scientific, tagged, tasty, tasty-hunit, text, time -, vector, vector-sized +{ mkDerivation, aeson, base, bytestring, containers, dlist, free +, ghc-prim, hashable, lib, microlens, mtl, network-uri, scientific +, tagged, tasty, tasty-hunit, text, time, vector, vector-sized }: mkDerivation { pname = "beam-core"; version = "0.10.1.0"; - src = fetchgit { - url = "https://github.com/haskell-beam/beam"; - sha256 = "0mzik3yy8hsj7qkw43j7nsn1gxd2lpdn5s5826zi9vhpvs7gdyn4"; - rev = "96e35be86dfffe4aa0b8190f7b8656e30cb36301"; - fetchSubmodules = true; - }; - postUnpack = "sourceRoot+=/beam-core/; echo source root reset to $sourceRoot"; + sha256 = "303477810d9fa366610a1063fc3316d5441b1a5291c8eb6fa900343e8ac93340"; isLibrary = true; isExecutable = false; enableSeparateDataOutput = false; diff --git a/pkgs/beam-migrate.nix b/pkgs/beam-migrate.nix index 183e310dbe1aef65bce4cdc461661b285c3ce5e9..390cc889a2935e6aab69b3e73bb10b00b03e54d8 100644 --- a/pkgs/beam-migrate.nix +++ b/pkgs/beam-migrate.nix @@ -1,19 +1,12 @@ { mkDerivation, aeson, base, beam-core, bytestring, containers -, deepseq, dependent-map, dependent-sum, fetchgit, free, ghc-prim -, hashable, haskell-src-exts, lib, microlens, mtl, parallel, pqueue -, pretty, scientific, text, time, unordered-containers, uuid-types -, vector +, deepseq, dependent-map, dependent-sum, free, ghc-prim, hashable +, haskell-src-exts, lib, microlens, mtl, parallel, pqueue, pretty +, scientific, text, time, unordered-containers, uuid-types, vector }: mkDerivation { pname = "beam-migrate"; - version = "0.5.2.0"; - src = fetchgit { - url = "https://github.com/haskell-beam/beam"; - sha256 = "0mzik3yy8hsj7qkw43j7nsn1gxd2lpdn5s5826zi9vhpvs7gdyn4"; - rev = "96e35be86dfffe4aa0b8190f7b8656e30cb36301"; - fetchSubmodules = true; - }; - postUnpack = "sourceRoot+=/beam-migrate/; echo source root reset to $sourceRoot"; + version = "0.5.2.1"; + sha256 = "ccbb4685eee3e0067ae0de3b8a2204641a6b8041010612055afb1d79591af499"; isLibrary = true; isExecutable = false; enableSeparateDataOutput = false; diff --git a/pkgs/beam-postgres.nix b/pkgs/beam-postgres.nix index 7c359007521eb31ad46233df6687f3489968f46c..7ded31381ecb3f1660586b97adfb8953abd41844 100644 --- a/pkgs/beam-postgres.nix +++ b/pkgs/beam-postgres.nix @@ -1,5 +1,5 @@ { mkDerivation, aeson, attoparsec, base, beam-core, beam-migrate -, bytestring, case-insensitive, conduit, fetchgit, free, hashable +, bytestring, case-insensitive, conduit, free, hashable , haskell-src-exts, hedgehog, lib, lifted-base, monad-control, mtl , network-uri, postgresql-libpq, postgresql-simple, scientific , tagged, tasty, tasty-hunit, text, time, tmp-postgres @@ -7,14 +7,8 @@ }: mkDerivation { pname = "beam-postgres"; - version = "0.5.3.0"; - src = fetchgit { - url = "https://github.com/haskell-beam/beam"; - sha256 = "0mzik3yy8hsj7qkw43j7nsn1gxd2lpdn5s5826zi9vhpvs7gdyn4"; - rev = "96e35be86dfffe4aa0b8190f7b8656e30cb36301"; - fetchSubmodules = true; - }; - postUnpack = "sourceRoot+=/beam-postgres/; echo source root reset to $sourceRoot"; + version = "0.5.3.1"; + sha256 = "36905a02af208dc7755b496ee4afd409d1a769b46c52c5501ade7191137feaa5"; isLibrary = true; isExecutable = false; enableSeparateDataOutput = false; diff --git a/pkgs/beam-sqlite.nix b/pkgs/beam-sqlite.nix index cf504af576c20f7cc7691030e5a85217acb60a94..ab0177a24376096e01ca54112f3e086584719c35 100644 --- a/pkgs/beam-sqlite.nix +++ b/pkgs/beam-sqlite.nix @@ -1,19 +1,13 @@ { mkDerivation, aeson, attoparsec, base, beam-core, beam-migrate -, bytestring, dlist, fetchgit, free, hashable, lib, monad-control -, mtl, network-uri, scientific, sqlite-simple, tasty +, bytestring, dlist, free, hashable, lib, monad-control, mtl +, network-uri, scientific, sqlite-simple, tasty , tasty-expected-failure, tasty-hunit, text, time , transformers-base, unix }: mkDerivation { pname = "beam-sqlite"; - version = "0.5.2.0"; - src = fetchgit { - url = "https://github.com/haskell-beam/beam"; - sha256 = "0mzik3yy8hsj7qkw43j7nsn1gxd2lpdn5s5826zi9vhpvs7gdyn4"; - rev = "96e35be86dfffe4aa0b8190f7b8656e30cb36301"; - fetchSubmodules = true; - }; - postUnpack = "sourceRoot+=/beam-sqlite/; echo source root reset to $sourceRoot"; + version = "0.5.3.0"; + sha256 = "a49a443524b202576da6a81297e05ae3dd69d5d4bfc494084bd28464bac41614"; isLibrary = true; isExecutable = false; enableSeparateDataOutput = false;