diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d641cf7..d0ade04 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - ghc: [ghc927, ghc944, ghc961] + ghc: [ghc928, ghc945, ghc962] name: Build and test on ${{ matrix.ghc }} runs-on: ubuntu-latest steps: diff --git a/expected-failures/Agda.txt b/expected-failures/Agda.txt index 2c80b4e..a1fac2a 100644 --- a/expected-failures/Agda.txt +++ b/expected-failures/Agda.txt @@ -1,5 +1,5 @@ src/full/Agda/Syntax/Internal.hs -@@ -624,32 +671,28 @@ +@@ -628,32 +676,28 @@ _ -> Nothing ----------------------------------------------------------------------------- @@ -34,15 +34,15 @@ src/full/Agda/Syntax/Internal.hs -- Γ ⊢ u :# ρ : Δ, A -- @ - -- | Strengthen Impossible (Substitution' a) +- | Strengthen Impossible !Int (Substitution' a) - -- ^ Strengthening substitution. First argument is @__IMPOSSIBLE__@. + a :# Substitution' a + | -- | Strengthening substitution. First argument is @__IMPOSSIBLE__@. - -- Apply this to a term which does not contain variable 0 - -- to lower all de Bruijn indices by one. - -- @ + -- In @'Strengthen err n ρ@ the number @n@ must be non-negative. + -- This substitution should only be applied to values @t@ for + -- which none of the variables @0@ up to @n - 1@ are free in AST of input and AST of formatted code differ. - at src/full/Agda/Syntax/Internal.hs:643:5 + at src/full/Agda/Syntax/Internal.hs:647:5 Please, consider reporting the bug. To format anyway, use --unsafe. diff --git a/expected-failures/default.nix b/expected-failures/default.nix index 949a766..201ec91 100644 --- a/expected-failures/default.nix +++ b/expected-failures/default.nix @@ -77,7 +77,7 @@ in "servant-server" "stack" "tensorflow" - "text_2_0_1" + "text_2_0_2" "tls" "unpacked-containers" "yesod-core" diff --git a/expected-failures/esqueleto.txt b/expected-failures/esqueleto.txt index a0e703e..a549c52 100644 --- a/expected-failures/esqueleto.txt +++ b/expected-failures/esqueleto.txt @@ -1,3 +1,3 @@ -src/Database/Esqueleto/Internal/Internal.hs:410:1 +src/Database/Esqueleto/Internal/Internal.hs:434:1 The GHC parser (in Haddock mode) failed: [GHC-21231] lexical error in string/character literal at character 's' diff --git a/extract-hackage-info/extract-hackage-info.cabal b/extract-hackage-info/extract-hackage-info.cabal index aa9f19b..d2f2f36 100644 --- a/extract-hackage-info/extract-hackage-info.cabal +++ b/extract-hackage-info/extract-hackage-info.cabal @@ -14,14 +14,14 @@ executable extract-hackage-info Cabal-syntax >=3.10 && <3.11, base >=4.12 && <5.0, binary >=0.8 && <0.9, - bytestring >=0.10 && <0.12, + bytestring >=0.10 && <0.13, containers >=0.6 && <0.7, directory >=1.0 && <2.0, filepath >=1.2 && <1.5, optparse-applicative >=0.14 && <0.19, ormolu, text >=2.0 && <3.0, - formatting >=7.1 && <7.2, + formatting >=7.1 && <7.3, megaparsec >=9.0 if !impl(ghc >=9.2 && <9.3) diff --git a/flake.lock b/flake.lock index eb10940..bd507c7 100644 --- a/flake.lock +++ b/flake.lock @@ -16,21 +16,6 @@ "type": "github" } }, - "blank": { - "locked": { - "lastModified": 1625557891, - "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", - "owner": "divnix", - "repo": "blank", - "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "blank", - "type": "github" - } - }, "cabal-32": { "flake": false, "locked": { @@ -102,8 +87,8 @@ "inputs": { "fenix": "fenix", "naersk": "naersk", - "nixpkgs": "nixpkgs_8", - "utils": "utils_2" + "nixpkgs": "nixpkgs_5", + "utils": "utils" }, "locked": { "lastModified": 1656370114, @@ -119,64 +104,6 @@ "type": "github" } }, - "devshell": { - "inputs": { - "flake-utils": [ - "haskellNix", - "tullia", - "std", - "flake-utils" - ], - "nixpkgs": [ - "haskellNix", - "tullia", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1663445644, - "narHash": "sha256-+xVlcK60x7VY1vRJbNUEAHi17ZuoQxAIH4S4iUFUGBA=", - "owner": "numtide", - "repo": "devshell", - "rev": "e3dc3e21594fe07bdb24bdf1c8657acaa4cb8f66", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "dmerge": { - "inputs": { - "nixlib": [ - "haskellNix", - "tullia", - "std", - "nixpkgs" - ], - "yants": [ - "haskellNix", - "tullia", - "std", - "yants" - ] - }, - "locked": { - "lastModified": 1659548052, - "narHash": "sha256-fzI2gp1skGA8mQo/FBFrUAtY0GQkAIAaV/V127TJPyY=", - "owner": "divnix", - "repo": "data-merge", - "rev": "d160d18ce7b1a45b88344aa3f13ed1163954b497", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "data-merge", - "type": "github" - } - }, "docs-search": { "flake": false, "locked": { @@ -195,7 +122,7 @@ }, "fenix": { "inputs": { - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_3", "rust-analyzer-src": "rust-analyzer-src" }, "locked": { @@ -230,22 +157,6 @@ } }, "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { "flake": false, "locked": { "lastModified": 1673956053, @@ -281,50 +192,21 @@ }, "flake-utils_2": { "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", + "lastModified": 1679360468, + "narHash": "sha256-LGnza3cfXF10Biw3ZTg0u9o9t7s680Ww200t5KkHTh8=", + "owner": "hamishmack", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "e1ea268ff47ad475443dbabcd54744b4e5b9d4f5", "type": "github" }, "original": { - "owner": "numtide", + "owner": "hamishmack", + "ref": "hkm/nested-hydraJobs", "repo": "flake-utils", "type": "github" } }, "flake-utils_3": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_5": { "locked": { "lastModified": 1618217525, "narHash": "sha256-WGrhVczjXTiswQaoxQ+0PTfbLNeOQM6M36zvLn78AYg=", @@ -339,7 +221,7 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_4": { "locked": { "lastModified": 1618217525, "narHash": "sha256-WGrhVczjXTiswQaoxQ+0PTfbLNeOQM6M36zvLn78AYg=", @@ -429,33 +311,14 @@ "type": "github" } }, - "gomod2nix": { - "inputs": { - "nixpkgs": "nixpkgs_3", - "utils": "utils" - }, - "locked": { - "lastModified": 1655245309, - "narHash": "sha256-d/YPoQ/vFn1+GTmSdvbSBSTOai61FONxB4+Lt6w/IVI=", - "owner": "tweag", - "repo": "gomod2nix", - "rev": "40d32f82fc60d66402eb0972e6e368aeab3faf58", - "type": "github" - }, - "original": { - "owner": "tweag", - "repo": "gomod2nix", - "type": "github" - } - }, "hackage": { "flake": false, "locked": { - "lastModified": 1678926579, - "narHash": "sha256-5t1QRBTsEM2wREtDf3xrHp9Kphs+AdQZKAEltaylIJQ=", + "lastModified": 1692231735, + "narHash": "sha256-75jxGw+Mzt/2OzTz9gRb5LPwysq76JyNMBjDzMTAdXE=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "fb58b0ba5773c5f0211f284b0fae061426cf8267", + "rev": "7624c4239624ba595c41b81e05aa147c86cd8235", "type": "github" }, "original": { @@ -475,6 +338,8 @@ "flake-utils": "flake-utils_2", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", "hackage": "hackage", + "hls-1.10": "hls-1.10", + "hls-2.0": "hls-2.0", "hpc-coveralls": "hpc-coveralls", "hydra": "hydra", "iserv-proxy": "iserv-proxy", @@ -487,17 +352,17 @@ "nixpkgs-2111": "nixpkgs-2111", "nixpkgs-2205": "nixpkgs-2205", "nixpkgs-2211": "nixpkgs-2211", + "nixpkgs-2305": "nixpkgs-2305", "nixpkgs-unstable": "nixpkgs-unstable", "old-ghc-nix": "old-ghc-nix", - "stackage": "stackage", - "tullia": "tullia" + "stackage": "stackage" }, "locked": { - "lastModified": 1678950661, - "narHash": "sha256-lvL54W90BTvwLVnFjPYmFVmgHyaGcFrt5FBy1F0rro8=", + "lastModified": 1692254824, + "narHash": "sha256-U18N6WYvVidlKBZjt61QsIK/PLccmM2Gv6BSJgr3uqE=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "fce554bc6a41d12f7a18a0e8290bf43f925d7a29", + "rev": "0ad4dcb7286ec71fbf3b90626758bf67772a408c", "type": "github" }, "original": { @@ -506,6 +371,40 @@ "type": "github" } }, + "hls-1.10": { + "flake": false, + "locked": { + "lastModified": 1680000865, + "narHash": "sha256-rc7iiUAcrHxwRM/s0ErEsSPxOR3u8t7DvFeWlMycWgo=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "b08691db779f7a35ff322b71e72a12f6e3376fd9", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "1.10.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.0": { + "flake": false, + "locked": { + "lastModified": 1687698105, + "narHash": "sha256-OHXlgRzs/kuJH8q7Sxh507H+0Rb8b7VOiPAjcY9sM1k=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "783905f211ac63edf982dd1889c671653327e441", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.0.0.1", + "repo": "haskell-language-server", + "type": "github" + } + }, "hpc-coveralls": { "flake": false, "locked": { @@ -545,37 +444,14 @@ "type": "indirect" } }, - "incl": { - "inputs": { - "nixlib": [ - "haskellNix", - "tullia", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1669263024, - "narHash": "sha256-E/+23NKtxAqYG/0ydYgxlgarKnxmDbg6rCMWnOBqn9Q=", - "owner": "divnix", - "repo": "incl", - "rev": "ce7bebaee048e4cd7ebdb4cee7885e00c4e2abca", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "incl", - "type": "github" - } - }, "iserv-proxy": { "flake": false, "locked": { - "lastModified": 1670983692, - "narHash": "sha256-avLo34JnI9HNyOuauK5R69usJm+GfW3MlyGlYxZhTgY=", + "lastModified": 1688517130, + "narHash": "sha256-hUqfxSlo+ffqVdkSZ1EDoB7/ILCL25eYkcCXW9/P3Wc=", "ref": "hkm/remote-iserv", - "rev": "50d0abb3317ac439a4e7495b185a64af9b7b9300", - "revCount": 10, + "rev": "9151db2a9a61d7f5fe52ff8836f18bbd0fd8933c", + "revCount": 13, "type": "git", "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" }, @@ -633,38 +509,9 @@ "type": "github" } }, - "n2c": { - "inputs": { - "flake-utils": [ - "haskellNix", - "tullia", - "std", - "flake-utils" - ], - "nixpkgs": [ - "haskellNix", - "tullia", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1665039323, - "narHash": "sha256-SAh3ZjFGsaCI8FRzXQyp56qcGdAqgKEfJWPCQ0Sr7tQ=", - "owner": "nlewo", - "repo": "nix2container", - "rev": "b008fe329ffb59b67bf9e7b08ede6ee792f2741a", - "type": "github" - }, - "original": { - "owner": "nlewo", - "repo": "nix2container", - "type": "github" - } - }, "naersk": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1655042882, @@ -701,95 +548,6 @@ "type": "github" } }, - "nix-nomad": { - "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": [ - "haskellNix", - "tullia", - "nix2container", - "flake-utils" - ], - "gomod2nix": "gomod2nix", - "nixpkgs": [ - "haskellNix", - "tullia", - "nixpkgs" - ], - "nixpkgs-lib": [ - "haskellNix", - "tullia", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1658277770, - "narHash": "sha256-T/PgG3wUn8Z2rnzfxf2VqlR1CBjInPE0l1yVzXxPnt0=", - "owner": "tristanpemble", - "repo": "nix-nomad", - "rev": "054adcbdd0a836ae1c20951b67ed549131fd2d70", - "type": "github" - }, - "original": { - "owner": "tristanpemble", - "repo": "nix-nomad", - "type": "github" - } - }, - "nix2container": { - "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_4" - }, - "locked": { - "lastModified": 1658567952, - "narHash": "sha256-XZ4ETYAMU7XcpEeAFP3NOl9yDXNuZAen/aIJ84G+VgA=", - "owner": "nlewo", - "repo": "nix2container", - "rev": "60bb43d405991c1378baf15a40b5811a53e32ffa", - "type": "github" - }, - "original": { - "owner": "nlewo", - "repo": "nix2container", - "type": "github" - } - }, - "nixago": { - "inputs": { - "flake-utils": [ - "haskellNix", - "tullia", - "std", - "flake-utils" - ], - "nixago-exts": [ - "haskellNix", - "tullia", - "std", - "blank" - ], - "nixpkgs": [ - "haskellNix", - "tullia", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1661824785, - "narHash": "sha256-/PnwdWoO/JugJZHtDUioQp3uRiWeXHUdgvoyNbXesz8=", - "owner": "nix-community", - "repo": "nixago", - "rev": "8c1f9e5f1578d4b2ea989f618588d62a335083c3", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixago", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1687518131, @@ -856,11 +614,11 @@ }, "nixpkgs-2205": { "locked": { - "lastModified": 1672580127, - "narHash": "sha256-3lW3xZslREhJogoOkjeZtlBtvFMyxHku7I/9IVehhT8=", + "lastModified": 1685573264, + "narHash": "sha256-Zffu01pONhs/pqH07cjlF10NnMDLok8ix5Uk4rhOnZQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0874168639713f547c05947c76124f78441ea46c", + "rev": "380be19fbd2d9079f677978361792cb25e8a3635", "type": "github" }, "original": { @@ -872,11 +630,11 @@ }, "nixpkgs-2211": { "locked": { - "lastModified": 1675730325, - "narHash": "sha256-uNvD7fzO5hNlltNQUAFBPlcEjNG5Gkbhl/ROiX+GZU4=", + "lastModified": 1688392541, + "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b7ce17b1ebf600a72178f6302c77b6382d09323f", + "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", "type": "github" }, "original": { @@ -886,6 +644,22 @@ "type": "github" } }, + "nixpkgs-2305": { + "locked": { + "lastModified": 1690680713, + "narHash": "sha256-NXCWA8N+GfSQyoN7ZNiOgq/nDJKOp5/BHEpiZP8sUZw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b81af66deb21f73a70c67e5ea189568af53b1e8c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-23.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-regression": { "locked": { "lastModified": 1643052045, @@ -920,11 +694,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1675758091, - "narHash": "sha256-7gFSQbSVAFUHtGCNHPF7mPc5CcqDk9M2+inlVPZSneg=", + "lastModified": 1690720142, + "narHash": "sha256-GywuiZjBKfFkntQwpNQfL+Ksa2iGjPprBGL0/psgRZM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "747927516efcb5e31ba03b7ff32f61f6d47e7d87", + "rev": "3acb5c4264c490e7714d503c7166a3fde0c51324", "type": "github" }, "original": { @@ -951,53 +725,6 @@ } }, "nixpkgs_3": { - "locked": { - "lastModified": 1653581809, - "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "83658b28fe638a170a19b8933aa008b30640fbd1", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1654807842, - "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1665087388, - "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "95fda953f6db2e9496d2682c4fc7b82f959878f7", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { "locked": { "lastModified": 1655400192, "narHash": "sha256-49OBVVRgb9H/PSmNT9W61+NRdDbuSJVuDDflwXlaUKU=", @@ -1013,7 +740,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_4": { "locked": { "lastModified": 1655481042, "narHash": "sha256-XHbcywq2vIQ5CeH1OK3TN793jkiNAAZsSctS1PFgseo=", @@ -1027,7 +754,7 @@ "type": "indirect" } }, - "nixpkgs_8": { + "nixpkgs_5": { "locked": { "lastModified": 1655481042, "narHash": "sha256-XHbcywq2vIQ5CeH1OK3TN793jkiNAAZsSctS1PFgseo=", @@ -1041,7 +768,7 @@ "type": "indirect" } }, - "nixpkgs_9": { + "nixpkgs_6": { "locked": { "lastModified": 1656549732, "narHash": "sha256-eILutFZGjfk2bEzfim8S/qyYc//0S1KsCeO+OWbtoR0=", @@ -1057,21 +784,6 @@ "type": "github" } }, - "nosys": { - "locked": { - "lastModified": 1667881534, - "narHash": "sha256-FhwJ15uPLRsvaxtt/bNuqE/ykMpNAPF0upozFKhTtXM=", - "owner": "divnix", - "repo": "nosys", - "rev": "2d0d5207f6a230e9d0f660903f8db9807b54814f", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "nosys", - "type": "github" - } - }, "npmlock2nix": { "flake": false, "locked": { @@ -1122,7 +834,7 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "flake-utils": [ "flake-utils" ], @@ -1150,8 +862,8 @@ "inputs": { "deadnix": "deadnix", "make-shell": "make-shell_2", - "nixpkgs": "nixpkgs_9", - "utils": "utils_3" + "nixpkgs": "nixpkgs_6", + "utils": "utils_2" }, "locked": { "lastModified": 1675987041, @@ -1177,7 +889,7 @@ ], "parsec": "parsec", "ps-tools": "ps-tools", - "utils": "utils_4" + "utils": "utils_3" }, "locked": { "lastModified": 1677820987, @@ -1235,11 +947,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1678925630, - "narHash": "sha256-rl8qnpAUJl4tRZpaZ5DpgSueNfreArW09t4zTnOaoYA=", + "lastModified": 1692230916, + "narHash": "sha256-Mm1nPNVgZl8Rdcs/A1cliBQTlzqx1Wv1tMjr9zEwlCE=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "bf29b23fb77017e78c6e7b199b2c7bfb5079c4cd", + "rev": "cfbafab66ac72fd00d69122d95491fdb78c57b78", "type": "github" }, "original": { @@ -1248,51 +960,6 @@ "type": "github" } }, - "std": { - "inputs": { - "arion": [ - "haskellNix", - "tullia", - "std", - "blank" - ], - "blank": "blank", - "devshell": "devshell", - "dmerge": "dmerge", - "flake-utils": "flake-utils_4", - "incl": "incl", - "makes": [ - "haskellNix", - "tullia", - "std", - "blank" - ], - "microvm": [ - "haskellNix", - "tullia", - "std", - "blank" - ], - "n2c": "n2c", - "nixago": "nixago", - "nixpkgs": "nixpkgs_5", - "nosys": "nosys", - "yants": "yants" - }, - "locked": { - "lastModified": 1674526466, - "narHash": "sha256-tMTaS0bqLx6VJ+K+ZT6xqsXNpzvSXJTmogkraBGzymg=", - "owner": "divnix", - "repo": "std", - "rev": "516387e3d8d059b50e742a2ff1909ed3c8f82826", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "std", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -1308,30 +975,6 @@ "type": "github" } }, - "tullia": { - "inputs": { - "nix-nomad": "nix-nomad", - "nix2container": "nix2container", - "nixpkgs": [ - "haskellNix", - "nixpkgs" - ], - "std": "std" - }, - "locked": { - "lastModified": 1675695930, - "narHash": "sha256-B7rEZ/DBUMlK1AcJ9ajnAPPxqXY6zW2SBX+51bZV0Ac=", - "owner": "input-output-hk", - "repo": "tullia", - "rev": "621365f2c725608f381b3ad5b57afef389fd4c31", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "tullia", - "type": "github" - } - }, "utils": { "locked": { "lastModified": 1653893745, @@ -1348,23 +991,27 @@ } }, "utils_2": { + "inputs": { + "flake-utils": "flake-utils_3" + }, "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", + "lastModified": 1656044990, + "narHash": "sha256-f01BB7CaOyntOab9XnpH9HD63rGcnu2iyL4M2ubs5F8=", + "owner": "ursi", "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "rev": "f53b674a2c90f6202a2f4cd491aba121775490b5", "type": "github" }, "original": { - "owner": "numtide", + "owner": "ursi", + "ref": "8", "repo": "flake-utils", "type": "github" } }, "utils_3": { "inputs": { - "flake-utils": "flake-utils_5" + "flake-utils": "flake-utils_4" }, "locked": { "lastModified": 1656044990, @@ -1380,48 +1027,6 @@ "repo": "flake-utils", "type": "github" } - }, - "utils_4": { - "inputs": { - "flake-utils": "flake-utils_6" - }, - "locked": { - "lastModified": 1656044990, - "narHash": "sha256-f01BB7CaOyntOab9XnpH9HD63rGcnu2iyL4M2ubs5F8=", - "owner": "ursi", - "repo": "flake-utils", - "rev": "f53b674a2c90f6202a2f4cd491aba121775490b5", - "type": "github" - }, - "original": { - "owner": "ursi", - "ref": "8", - "repo": "flake-utils", - "type": "github" - } - }, - "yants": { - "inputs": { - "nixpkgs": [ - "haskellNix", - "tullia", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1667096281, - "narHash": "sha256-wRRec6ze0gJHmGn6m57/zhz/Kdvp9HS4Nl5fkQ+uIuA=", - "owner": "divnix", - "repo": "yants", - "rev": "d18f356ec25cb94dc9c275870c3a7927a10f8c3c", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "yants", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index dbc8096..7d482ba 100644 --- a/flake.nix +++ b/flake.nix @@ -32,7 +32,7 @@ inherit (pkgs) lib haskell-nix; inherit (haskell-nix) haskellLib; - ghcVersions = [ "ghc927" "ghc944" "ghc961" ]; + ghcVersions = [ "ghc928" "ghc945" "ghc962" ]; defaultGHCVersion = builtins.head ghcVersions; perGHC = lib.genAttrs ghcVersions (ghcVersion: let @@ -153,7 +153,10 @@ default = defaultGHC.dev.hsPkgs.shellFor { tools = { cabal = "latest"; - haskell-language-server = "latest"; + haskell-language-server = { + src = inputs.haskellNix.inputs."hls-2.0"; + configureArgs = "--disable-benchmarks --disable-tests"; + }; }; withHoogle = false; exactDeps = false; diff --git a/ormolu-live/default.nix b/ormolu-live/default.nix index 62e667b..1061ee7 100644 --- a/ormolu-live/default.nix +++ b/ormolu-live/default.nix @@ -9,14 +9,17 @@ let dependencies = [ "halogen" "ace" "profunctor-lenses" ]; dir = ./.; }; - es-opt = npmlock2nix.build { + common-npmlock2nix = { src = ./.; + inherit (pkgs) nodejs; + }; + es-opt = npmlock2nix.build (common-npmlock2nix // { installPhase = "cp -r output-es $out"; buildCommands = lib.singleton '' purs-backend-es build --int-tags \ --corefn-dir ${ps.output { codegen = "corefn"; }} ''; - }; + }); metadata = builtins.toJSON { inherit (inputs.self.packages.${system}.default) version; inherit (inputs.self) rev; @@ -26,8 +29,7 @@ let ghcWasmDeps = [ inputs.ghc-wasm-meta.packages.${system}.default ]; in { - package = npmlock2nix.build { - src = ./.; + package = npmlock2nix.build (common-npmlock2nix // { installPhase = "cp -r dist $out"; buildCommands = lib.optional (inputs.self ? rev) '' echo ${lib.escapeShellArg metadata} > src/meta.json @@ -36,9 +38,8 @@ in date > src/ormolu.wasm parcel build --no-source-maps www/index.html ''; - }; - shell = npmlock2nix.shell { - src = ./.; + }); + shell = npmlock2nix.shell (common-npmlock2nix // { buildInputs = [ pkgs.nodejs pkgs.watchexec @@ -46,7 +47,7 @@ in ps-tools.purs-tidy ps-tools.purescript ] ++ ghcWasmDeps; - }; + }); ghcWasmShell = pkgs.mkShell { packages = [ ghcWasmDeps ]; }; inherit (ps-tools) purs-tidy; } diff --git a/ormolu.cabal b/ormolu.cabal index 5731f61..08f3c01 100644 --- a/ormolu.cabal +++ b/ormolu.cabal @@ -4,7 +4,7 @@ version: 0.7.1.0 license: BSD-3-Clause license-file: LICENSE.md maintainer: Mark Karpov -tested-with: ghc ==9.2.7 ghc ==9.4.4 ghc ==9.6.1 +tested-with: ghc ==9.2.8 ghc ==9.4.5 ghc ==9.6.2 homepage: https://github.com/tweag/ormolu bug-reports: https://github.com/tweag/ormolu/issues synopsis: A formatter for Haskell source code @@ -104,9 +104,9 @@ library array >=0.5 && <0.6, base >=4.14 && <5.0, binary >=0.8 && <0.9, - bytestring >=0.2 && <0.12, + bytestring >=0.2 && <0.13, containers >=0.5 && <0.7, - deepseq >=1.4 && <1.5, + deepseq >=1.4 && <1.6, directory ^>=1.3, file-embed >=0.0.15 && <0.1, filepath >=1.2 && <1.5,