diff --git a/horizon.dhall b/horizon.dhall index 8acb7db7a1bdfa0696df80473d255dc314034c8d..2a257b30459e2301457058d917613f8428a511de 100644 --- a/horizon.dhall +++ b/horizon.dhall @@ -563,6 +563,7 @@ let packages = , monad-loops = H.callHackage "monad-loops" "0.4.3" , monad-primitive = H.callHackage "monad-primitive" "0.1" , monad-time = H.callHackage "monad-time" "0.4.0.0" + , monad-time-effectful = H.callHackage "monad-time-effectful" "1.0.0.0" , monadlist = H.callHackage "monadlist" "0.0.2" , monads-tf = H.callHackage "monads-tf" "0.1.0.3" , monoid-extras = H.callHackage "monoid-extras" "0.6.2" @@ -839,11 +840,6 @@ let packages = , threads = H.callHackage "threads" "0.5.1.7" , tidal = H.callHackage "tidal" "1.9.4" , tidal-link = H.callHackage "tidal-link" "1.0.1" - , time-effectful = - H.callGit - "https://github.com/haskell-effectful/time-effectful" - "e212239b685e1ecf7ee95dd1e944cc563351907f" - (None H.Subdir) , time-locale-compat = H.callHackage "time-locale-compat" "0.1.1.5" , time-units = H.callHackage "time-units" "1.0.0" , timeit = H.callHackage "timeit" "2.0" diff --git a/horizon.lock b/horizon.lock index ccf798ef009540842750fd5408485f1b5b19efb0..1d893b2f99bc8f87f75461a22482dbb342324e10 100644 --- a/horizon.lock +++ b/horizon.lock @@ -1726,6 +1726,10 @@ , mapValue = "3a13f33e03b043747119f51c17318c8b0ec5a08e12464977220fd7c15cddc7ad" } +, { mapKey = "monad-time-effectful" + , mapValue = + "7419516c5bc58e5d6f9ec93a37d195da1e6c9c0f516bcfd7233bd6c834af24fc" + } , { mapKey = "monadlist" , mapValue = "d4878c00c84ce9060ff377c36c5813b39bbf64ce7183c8700e07693a21f0a8b6" @@ -2634,10 +2638,6 @@ , mapValue = "a5dede4b56004213341b593cba02b66a6d2f2edeb3442c88d4f570d92e78302f" } -, { mapKey = "time-effectful" - , mapValue = - "07f9a619d9d495aeaa135cbf02cfb5acfcdc36f4bdea3e9f6268b401c2b82722" - } , { mapKey = "time-locale-compat" , mapValue = "c7389ed8032b00cfddd65449e49379400c0c9c19225c17044dc2f447010302fa" diff --git a/overlay.nix b/overlay.nix index c5cd0a8a178f11e49804c5f08e9a94cc309e42ec..d87f33d1645999db3bfaab5d553171810d406438 100644 --- a/overlay.nix +++ b/overlay.nix @@ -865,6 +865,8 @@ final: prev: with pkgs.haskell.lib; { monad-time = final.callPackage (./pkgs/monad-time.nix) { }; + monad-time-effectful = final.callPackage (./pkgs/monad-time-effectful.nix) { }; + monadlist = final.callPackage (./pkgs/monadlist.nix) { }; monads-tf = final.callPackage (./pkgs/monads-tf.nix) { }; @@ -1319,8 +1321,6 @@ final: prev: with pkgs.haskell.lib; { tidal-link = final.callPackage (./pkgs/tidal-link.nix) { }; - time-effectful = final.callPackage (./pkgs/time-effectful.nix) { }; - time-locale-compat = final.callPackage (./pkgs/time-locale-compat.nix) { }; time-units = final.callPackage (./pkgs/time-units.nix) { }; diff --git a/pkgs/monad-time-effectful.nix b/pkgs/monad-time-effectful.nix new file mode 100644 index 0000000000000000000000000000000000000000..e35df0e3a90e5035d20a525f6a365f72313000ce --- /dev/null +++ b/pkgs/monad-time-effectful.nix @@ -0,0 +1,20 @@ +{ mkDerivation, base, effectful-core, lib, monad-time, time }: +mkDerivation { + pname = "monad-time-effectful"; + version = "1.0.0.0"; + sha256 = "693e4222d6252c8607f6ee3e32a0ca949eb8f01eb1e0c46d66b6ddbc517eb5bf"; + isLibrary = true; + isExecutable = false; + enableSeparateDataOutput = false; + libraryHaskellDepends = [ base effectful-core monad-time time ]; + enableLibraryProfiling = true; + enableExecutableProfiling = true; + doHaddock = false; + jailbreak = true; + doCheck = false; + doBenchmark = false; + hyperlinkSource = false; + description = "Adaptation of the monad-time library for the effectful ecosystem"; + license = lib.licenses.mit; + broken = false; +} \ No newline at end of file diff --git a/pkgs/time-effectful.nix b/pkgs/time-effectful.nix deleted file mode 100644 index 78693b6c5a97ccbd7566ce7257d1acfb685046f6..0000000000000000000000000000000000000000 --- a/pkgs/time-effectful.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ mkDerivation, base, effectful-core, fetchgit, lib, tasty -, tasty-hunit, time -}: -mkDerivation { - pname = "time-effectful"; - version = "0.0.1.0"; - src = fetchgit { - url = "https://github.com/haskell-effectful/time-effectful"; - sha256 = "12sir7ln4nfx9w5xz77g23jlfvhnwvv4gzw20czj6vbpak8zz3i1"; - rev = "e212239b685e1ecf7ee95dd1e944cc563351907f"; - fetchSubmodules = true; - }; - isLibrary = true; - isExecutable = false; - enableSeparateDataOutput = false; - libraryHaskellDepends = [ base effectful-core time ]; - testHaskellDepends = [ - base effectful-core tasty tasty-hunit time - ]; - enableLibraryProfiling = true; - enableExecutableProfiling = true; - doHaddock = false; - jailbreak = true; - doCheck = false; - doBenchmark = false; - hyperlinkSource = false; - homepage = "https://github.com/haskell-effectful/time-effectful#readme"; - license = lib.licenses.mit; - broken = false; -} \ No newline at end of file