diff --git a/flake.lock b/flake.lock index 818c8ac246dc20c85f74005e4877b558183b3469..5b87eae8aef95029ac271d58b2468cbadb032c09 100644 --- a/flake.lock +++ b/flake.lock @@ -51,15 +51,16 @@ "horizon-shell-flake": { "flake": false, "locked": { - "lastModified": 1679341258, - "narHash": "sha256-iVB9GSar0Varbxi0ed98S/1mqXfqcATGpeENOFcjv98=", - "ref": "refs/heads/master", - "rev": "c6b62503082814851d3a78fc64b80c4fd02cb290", - "revCount": 18, + "lastModified": 1679524452, + "narHash": "sha256-xzNxvLVa3o0F/z4CnBDORv2Y6PfxjlGv7b7LybIyCSg=", + "ref": "refs/tags/0.0.8", + "rev": "21b8913803cefeb287bb244c7ee335638233db7f", + "revCount": 21, "type": "git", "url": "https://gitlab.horizon-haskell.net/shells/horizon-shell" }, "original": { + "ref": "refs/tags/0.0.8", "type": "git", "url": "https://gitlab.horizon-haskell.net/shells/horizon-shell" } diff --git a/flake.nix b/flake.nix index cd3cd23bfd0ba4e0e566cdc13e87679f2777328c..3333b90f51ab062a194652c9f4469a574269866d 100644 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,7 @@ get-flake.url = "github:ursi/get-flake"; flake-parts.url = "github:hercules-ci/flake-parts"; horizon-shell-flake = { - url = "git+https://gitlab.horizon-haskell.net/shells/horizon-shell"; + url = "git+https://gitlab.horizon-haskell.net/shells/horizon-shell?ref=refs/tags/0.0.8"; flake = false; }; lint-utils.url = "git+https://gitlab.homotopic.tech/nix/lint-utils"; diff --git a/horizon.dhall b/horizon.dhall index a9e7b162a2b919ba99a540e54df30187a43f20dd..c10eba92d5247df104be9b1555afd5e17d888828 100644 --- a/horizon.dhall +++ b/horizon.dhall @@ -219,11 +219,6 @@ let packages = , cryptonite = H.callHackage "cryptonite" "0.30" , cryptonite-conduit = H.callHackage "cryptonite-conduit" "0.2.2" , css-text = H.callHackage "css-text" "0.1.3.0" - , csv = - H.callGit - "https://gitlab.homotopic.tech/horizon/adopted/csv" - "d02b89bbad79136b52fd1197f087466cf51573dd" - (None H.Subdir) , cubicbezier = H.callHackage "cubicbezier" "0.6.0.6" , cursor = H.callHackage "cursor" "0.3.2.0" , cursor-brick = H.callHackage "cursor-brick" "0.1.0.1" @@ -501,8 +496,6 @@ let packages = , hie-compat = H.callHackage "hie-compat" "0.3.1.0" , hiedb = H.callHackage "hiedb" "0.4.2.0" , hinotify = H.callHackage "hinotify" "0.4.1" - , hledger = H.callHackage "hledger" "1.29.1" - , hledger-lib = H.callHackage "hledger-lib" "1.29.1" , hlint = H.callHackage "hlint" "3.5" , hls-alternate-number-format-plugin = H.callHackage "hls-alternate-number-format-plugin" "1.3.0.0" @@ -1106,15 +1099,10 @@ 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.callGit - "https://github.com/locallycompact/sydtest" - "01c7d35b822c66a68e4d2ba5594858afbcc1cbf0" - (Some "sydtest/") + , sydtest = H.callHackage "sydtest" "0.13.0.2" , 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" - , tabular = H.callHackage "tabular" "0.2.2.8" , tagged = H.callHackage "tagged" "0.8.7" , tagsoup = H.callHackage "tagsoup" "0.14.8" , tar = diff --git a/horizon.lock b/horizon.lock index ec65273b195d3b4ddb5956e5da8d10f5b56f7646..51c2b51bd4dfbd468853d638dce49fbdcd1995e7 100644 --- a/horizon.lock +++ b/horizon.lock @@ -730,10 +730,6 @@ , mapValue = "3ce6e46df7723d23ef3aac1ff1ef10def3c1dda5e14d3f82b4f13ea5ea445a3f" } -, { mapKey = "csv" - , mapValue = - "0079b6751eaad78696c3c10d782cd50ca725f0c1730ece9fabcf7e91e02a3dd2" - } , { mapKey = "cubicbezier" , mapValue = "3e69cfe343c0810a091af55107ac17531c5ab2fed99b07a7f5c03c7abe98357e" @@ -1574,14 +1570,6 @@ , mapValue = "9f3f233ef3a527bebf9971292abb7d4caf3ad61fdf8078a2970c4bc8a3237663" } -, { mapKey = "hledger" - , mapValue = - "ffdf0a681d39c0507f7af82be53f9a7b85263762fe4377521f76a3635c8ce018" - } -, { mapKey = "hledger-lib" - , mapValue = - "c4ad3fbcdaa63a1258f7023a90081296a196a086284aa8899ae7ce2098a4d5cb" - } , { mapKey = "hlint" , mapValue = "5904877fa63ac775140995337e68ead75bd979ee917e0a0c2fddd51b2913c737" @@ -3556,7 +3544,7 @@ } , { mapKey = "sydtest" , mapValue = - "cac13fcc9e2bb3db218a7d09e5f13858edff189757128211161fa93112ff6f02" + "0f721196703fde2e3c28c9a7cfea83a9e8875e0953822eebe5ef8e3b2ea63a6f" } , { mapKey = "sydtest-discover" , mapValue = @@ -3570,10 +3558,6 @@ , mapValue = "56762209e2da8441cbca331d6467c1a1a3cf572b3a2353e3e2be4cf15ae3d536" } -, { mapKey = "tabular" - , mapValue = - "ce27e6ad12e2df14b6c43106c6523db2d87ca7692bd5a9fdacae424e7bd6a0c4" - } , { mapKey = "tagged" , mapValue = "1274ceb7221d0303f7429436161df965b8a84e509d07d6692ee3067ee8fc4e45" diff --git a/initial-packages.nix b/initial-packages.nix index 9955f47cfeddbf3003f86c00ce8794c73b3693c4..1f4d5ac52b65edf9b5748e86fe44e3766d882003 100644 --- a/initial-packages.nix +++ b/initial-packages.nix @@ -367,8 +367,6 @@ self: with pkgs.haskell.lib; { css-text = self.callPackage (./pkgs/css-text.nix) { }; - csv = self.callPackage (./pkgs/csv.nix) { }; - cubicbezier = self.callPackage (./pkgs/cubicbezier.nix) { }; cursor = self.callPackage (./pkgs/cursor.nix) { }; @@ -789,10 +787,6 @@ self: with pkgs.haskell.lib; { hinotify = self.callPackage (./pkgs/hinotify.nix) { }; - hledger = self.callPackage (./pkgs/hledger.nix) { }; - - hledger-lib = self.callPackage (./pkgs/hledger-lib.nix) { }; - hlint = self.callPackage (./pkgs/hlint.nix) { }; hls-alternate-number-format-plugin = self.callPackage (./pkgs/hls-alternate-number-format-plugin.nix) { }; @@ -1787,8 +1781,6 @@ self: with pkgs.haskell.lib; { system-filepath = self.callPackage (./pkgs/system-filepath.nix) { }; - tabular = self.callPackage (./pkgs/tabular.nix) { }; - tagged = self.callPackage (./pkgs/tagged.nix) { }; tagsoup = self.callPackage (./pkgs/tagsoup.nix) { }; diff --git a/pkgs/sydtest.nix b/pkgs/sydtest.nix index d1313e01ab3aa207bd92fdf6fcd1310de5949b25..af8a69abf6b0c33be7406729fa2017f5daa470d8 100644 --- a/pkgs/sydtest.nix +++ b/pkgs/sydtest.nix @@ -1,20 +1,14 @@ { mkDerivation, MonadRandom, QuickCheck, async, autodocodec , autodocodec-yaml, base, bytestring, containers, dlist, envparse -, fetchgit, filepath, lib, mtl, optparse-applicative, path, path-io +, 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 }: mkDerivation { pname = "sydtest"; - version = "0.13.0.1"; - src = fetchgit { - url = "https://github.com/locallycompact/sydtest"; - sha256 = "0ab1v9lqaq42ajndsddcaqbjv9467iaidp1vwmyb65ic0g0wl4nz"; - rev = "01c7d35b822c66a68e4d2ba5594858afbcc1cbf0"; - fetchSubmodules = true; - }; - postUnpack = "sourceRoot+=/sydtest/; echo source root reset to $sourceRoot"; + version = "0.13.0.2"; + sha256 = "34113504c1890a4aa57ea9a594bee6ab1fea48170e638d9b78b9bc52c18e2606"; isLibrary = true; isExecutable = false; enableSeparateDataOutput = false;