From 48f9770cbde6b74216eaca97704892ec3e35327b Mon Sep 17 00:00:00 2001 From: Matthieu Coudron <886074+teto@users.noreply.github.com> Date: Mon, 30 Oct 2023 18:52:58 +0100 Subject: [PATCH] various updates --- .nvimrc | 3 - flake.lock | 1011 ++++++++++++------------------------------------ flake.nix | 260 ++----------- overlay-96.nix | 190 +++++++++ 4 files changed, 473 insertions(+), 991 deletions(-) delete mode 100644 .nvimrc create mode 100644 overlay-96.nix diff --git a/.nvimrc b/.nvimrc deleted file mode 100644 index 9378ea2..0000000 --- a/.nvimrc +++ /dev/null @@ -1,3 +0,0 @@ -" let g:loaded_airline=1 -" autocmd FileType hs let b:airline_disable_statusline = 1 -" set statusline=%!StatusLSP() diff --git a/flake.lock b/flake.lock index 9cc8ec9..b626956 100644 --- a/flake.lock +++ b/flake.lock @@ -1,25 +1,13 @@ { "nodes": { - "aeson-1520": { - "flake": false, - "locked": { - "narHash": "sha256-btKp7CTOgC0wT33lROffARW9qr1jx9oKE5EWydaR52c=", - "type": "tarball", - "url": "https://hackage.haskell.org/package/aeson-1.5.2.0/aeson-1.5.2.0.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://hackage.haskell.org/package/aeson-1.5.2.0/aeson-1.5.2.0.tar.gz" - } - }, "all-cabal-hashes-unpacked": { "flake": false, "locked": { - "lastModified": 1662844176, - "narHash": "sha256-hyq4Lc6N9WbHtGAhiU1ZN0kILo5K5PgIzXgc/D7qbws=", + "lastModified": 1698672919, + "narHash": "sha256-KRYSEfhyt1uVUVgZnzOd+mstJyE7xwGEft429c3k32s=", "owner": "commercialhaskell", "repo": "all-cabal-hashes", - "rev": "e4a2dc4a59215c37cdc5574e36516d21831f6023", + "rev": "971b157df9611634e0027b17ad79fa1d69aefe2c", "type": "github" }, "original": { @@ -29,83 +17,14 @@ "type": "github" } }, - "brittany-01312": { - "flake": false, - "locked": { - "narHash": "sha256-4rDE2bu4C8cv1D6lkTtLxMwLRyDfIK70BnptSrygK60=", - "type": "tarball", - "url": "https://hackage.haskell.org/package/brittany-0.13.1.2/brittany-0.13.1.2.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://hackage.haskell.org/package/brittany-0.13.1.2/brittany-0.13.1.2.tar.gz" - } - }, - "bytebuild": { - "flake": false, - "locked": { - "lastModified": 1648682991, - "narHash": "sha256-8dOuczdSnOltqsX5UuzN/Ea6wIESu60HYdz//kph+Q8=", - "owner": "teto", - "repo": "bytebuild", - "rev": "63435c2508cf8ecd55196e7f6e06ccb09f668e00", - "type": "github" - }, - "original": { - "owner": "teto", - "repo": "bytebuild", - "type": "github" - } - }, - "bytesmith": { - "flake": false, - "locked": { - "lastModified": 1656798390, - "narHash": "sha256-yUbfSYNIy6TCJ/LxhuHx1xhNNzFPRXFEJSYkXLYoLSA=", - "owner": "teto", - "repo": "bytesmith", - "rev": "444c5da7882817fa7c898fb3887d5791a03800f6", - "type": "github" - }, - "original": { - "owner": "teto", - "ref": "ghc92", - "repo": "bytesmith", - "type": "github" - } - }, - "constraints-extras": { - "flake": false, - "locked": { - "narHash": "sha256-WGDSpT37RrHwpQtExGkL5eEmBk/s9b0rxtT9DYqSGg4=", - "type": "tarball", - "url": "https://hackage.haskell.org/package/constraints-extras-0.3.2.1/constraints-extras-0.3.2.1.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://hackage.haskell.org/package/constraints-extras-0.3.2.1/constraints-extras-0.3.2.1.tar.gz" - } - }, - "constraints-extras_2": { - "flake": false, - "locked": { - "narHash": "sha256-WGDSpT37RrHwpQtExGkL5eEmBk/s9b0rxtT9DYqSGg4=", - "type": "tarball", - "url": "https://hackage.haskell.org/package/constraints-extras-0.3.2.1/constraints-extras-0.3.2.1.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://hackage.haskell.org/package/constraints-extras-0.3.2.1/constraints-extras-0.3.2.1.tar.gz" - } - }, "flake-compat": { "flake": false, "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -117,11 +36,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1641205782, - "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { @@ -133,43 +52,11 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "lastModified": 1668681692, + "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1627913399, - "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_5": { - "flake": false, - "locked": { - "lastModified": 1627913399, - "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", + "rev": "009399224d5e398d03b22badca40a37ac85412a1", "type": "github" }, "original": { @@ -179,27 +66,15 @@ } }, "flake-utils": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", - "type": "github" + "inputs": { + "systems": "systems" }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_10": { "locked": { - "lastModified": 1631561581, - "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -209,12 +84,15 @@ } }, "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -224,12 +102,15 @@ } }, "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, "locked": { - "lastModified": 1629481132, - "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "owner": "numtide", "repo": "flake-utils", - "rev": "997f7efcb746a9c140ce1f13c72263189225f482", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "type": "github" }, "original": { @@ -240,11 +121,11 @@ }, "flake-utils_4": { "locked": { - "lastModified": 1638122382, - "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -255,11 +136,11 @@ }, "flake-utils_5": { "locked": { - "lastModified": 1656928814, - "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -270,56 +151,11 @@ }, "flake-utils_6": { "locked": { - "lastModified": 1656928814, - "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_7": { - "locked": { - "lastModified": 1631561581, - "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_8": { - "locked": { - "lastModified": 1629481132, - "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "997f7efcb746a9c140ce1f13c72263189225f482", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_9": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -328,54 +164,41 @@ "type": "github" } }, - "fourmolu": { + "fourmolu-011": { "flake": false, "locked": { - "narHash": "sha256-uo5UE2SzrimnZl+JjJ30Hlg/nIw1OXJTPFIgkQopaI0=", + "narHash": "sha256-g/yDZXeLCHq/iXoZTaTYSb8l9CMny3AKsRQgWElagZI=", "type": "tarball", - "url": "https://hackage.haskell.org/package/fourmolu-0.5.0.1/fourmolu-0.5.0.1.tar.gz" + "url": "https://hackage.haskell.org/package/fourmolu-0.11.0.0/fourmolu-0.11.0.0.tar.gz" }, "original": { "type": "tarball", - "url": "https://hackage.haskell.org/package/fourmolu-0.5.0.1/fourmolu-0.5.0.1.tar.gz" + "url": "https://hackage.haskell.org/package/fourmolu-0.11.0.0/fourmolu-0.11.0.0.tar.gz" } }, - "fourmolu-0300": { + "fourmolu-012": { "flake": false, "locked": { - "narHash": "sha256-SFBwhkXfDArITiBSxGSp2qf8gl+yBpWHglBB5aKeaBU=", + "narHash": "sha256-yru8ls67DMM6WSeVU6xDmmwa48I8S9CUv9NBaxSQ29M=", "type": "tarball", - "url": "https://hackage.haskell.org/package/fourmolu-0.3.0.0/fourmolu-0.3.0.0.tar.gz" + "url": "https://hackage.haskell.org/package/fourmolu-0.12.0.0/fourmolu-0.12.0.0.tar.gz" }, "original": { "type": "tarball", - "url": "https://hackage.haskell.org/package/fourmolu-0.3.0.0/fourmolu-0.3.0.0.tar.gz" - } - }, - "fourmolu_2": { - "flake": false, - "locked": { - "narHash": "sha256-uo5UE2SzrimnZl+JjJ30Hlg/nIw1OXJTPFIgkQopaI0=", - "type": "tarball", - "url": "https://hackage.haskell.org/package/fourmolu-0.5.0.1/fourmolu-0.5.0.1.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://hackage.haskell.org/package/fourmolu-0.5.0.1/fourmolu-0.5.0.1.tar.gz" + "url": "https://hackage.haskell.org/package/fourmolu-0.12.0.0/fourmolu-0.12.0.0.tar.gz" } }, "frames": { "inputs": { "flake-utils": "flake-utils_2", - "hls": "hls", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1649453078, - "narHash": "sha256-qCiVC+ZO2Dtb/JkIJmzwafMuge7ama+recyI3jl6j1U=", + "lastModified": 1698013301, + "narHash": "sha256-OFCKTlSwXSeMd/6YfUVmdkX2rR6RX3/tjYv1KtMCOoI=", "owner": "acowley", "repo": "Frames", - "rev": "7257fe9e5164e8109b76575cb4d73a996faab42b", + "rev": "1700500d4e6048207a9e96cf5773ef25feff67fd", "type": "github" }, "original": { @@ -384,50 +207,14 @@ "type": "github" } }, - "ghc-exactprint": { - "flake": false, - "locked": { - "narHash": "sha256-8OWLBQj0WYi1f91EE3d5Pq+lTjY+FQei37NEedDtKeo=", - "type": "tarball", - "url": "https://hackage.haskell.org/package/ghc-exactprint-1.4.1/ghc-exactprint-1.4.1.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://hackage.haskell.org/package/ghc-exactprint-1.4.1/ghc-exactprint-1.4.1.tar.gz" - } - }, - "ghc-exactprint-150": { - "flake": false, - "locked": { - "narHash": "sha256-f+WmS86c7B0dx2SMABIMm66z6sbRVWdqSZ1QBBEpUMw=", - "type": "tarball", - "url": "https://hackage.haskell.org/package/ghc-exactprint-1.5.0/ghc-exactprint-1.5.0.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://hackage.haskell.org/package/ghc-exactprint-1.5.0/ghc-exactprint-1.5.0.tar.gz" - } - }, - "ghc-exactprint_2": { - "flake": false, - "locked": { - "narHash": "sha256-8OWLBQj0WYi1f91EE3d5Pq+lTjY+FQei37NEedDtKeo=", - "type": "tarball", - "url": "https://hackage.haskell.org/package/ghc-exactprint-1.4.1/ghc-exactprint-1.4.1.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://hackage.haskell.org/package/ghc-exactprint-1.4.1/ghc-exactprint-1.4.1.tar.gz" - } - }, "gitignore": { "flake": false, "locked": { - "lastModified": 1611672876, - "narHash": "sha256-qHu3uZ/o9jBHiA3MEKHJ06k7w4heOhA+4HCSIvflRxo=", + "lastModified": 1660459072, + "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "211907489e9f198594c0eb0ca9256a1949c9d412", + "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", "type": "github" }, "original": { @@ -437,29 +224,19 @@ } }, "gitignore_2": { - "flake": false, - "locked": { - "lastModified": 1657706534, - "narHash": "sha256-5jIzNHKtDu06mA325K/5CshUVb5r7sSmnRiula6Gr7o=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "f840a659d57e53fa751a9248b17149fd0cf2a221", - "type": "github" + "inputs": { + "nixpkgs": [ + "replica", + "pre-commit-hooks", + "nixpkgs" + ] }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_3": { - "flake": false, "locked": { - "lastModified": 1611672876, - "narHash": "sha256-qHu3uZ/o9jBHiA3MEKHJ06k7w4heOhA+4HCSIvflRxo=", + "lastModified": 1660459072, + "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "211907489e9f198594c0eb0ca9256a1949c9d412", + "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", "type": "github" }, "original": { @@ -471,11 +248,11 @@ "gtk2hs": { "flake": false, "locked": { - "lastModified": 1648418043, - "narHash": "sha256-prwJvCTWViE1klaRvxYrTiqCxetVGoHfWSdYCZ34S5k=", + "lastModified": 1670177302, + "narHash": "sha256-4wkqtXshzK8RYvmKEyqN2A/umifriofWGX3gws5yRp8=", "owner": "teto", "repo": "gtk2hs", - "rev": "57a418615f0eb119a0d6af5c81e6d8f2c263716f", + "rev": "eba9887639a546d9ab570b1730083ead187bb377", "type": "github" }, "original": { @@ -502,170 +279,88 @@ "type": "github" } }, - "haskell-ip": { + "haskell-hie-bios": { "flake": false, "locked": { - "lastModified": 1659038816, - "narHash": "sha256-vr5rUTI7HYrmq14dy83uksKiqvrDgp7QCiDwXh44a00=", - "owner": "andrewthad", - "repo": "haskell-ip", - "rev": "5e11127b801575a3e8f23d5d2f0d4f407b6a2ddf", + "lastModified": 1686930638, + "narHash": "sha256-gfcxxHtZ2jUsiKNn/O4jEkfWF/2H04aTnaIvPDbtNlQ=", + "owner": "haskell", + "repo": "hie-bios", + "rev": "3d4fadfb0dc44cb287db9897ecfb503899d33513", "type": "github" }, "original": { - "owner": "andrewthad", - "ref": "ghc-9-2-3", - "repo": "haskell-ip", + "owner": "haskell", + "repo": "hie-bios", "type": "github" } }, - "hie-bios": { - "flake": false, - "locked": { - "narHash": "sha256-nd+FfUQVZNxJfKZkAWA3dF0JwRgXntL+1gGvyNHDbKc=", - "type": "tarball", - "url": "https://hackage.haskell.org/package/hie-bios-0.9.0/hie-bios-0.9.0.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://hackage.haskell.org/package/hie-bios-0.9.0/hie-bios-0.9.0.tar.gz" - } - }, - "hie-bios_2": { - "flake": false, - "locked": { - "narHash": "sha256-5RqspT27rb/tMBwrKr4VfSSbq0+c0LMNuaKlTun0Kkk=", - "type": "tarball", - "url": "https://hackage.haskell.org/package/hie-bios-0.9.1/hie-bios-0.9.1.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://hackage.haskell.org/package/hie-bios-0.9.1/hie-bios-0.9.1.tar.gz" - } - }, - "hlint": { + "haskell-implicit-hie-cradle": { "flake": false, "locked": { - "narHash": "sha256-Kz6adx97kY7ojoDlw3y0R6LQ0h/EtXGR5+N07/b6uGk=", - "type": "tarball", - "url": "https://hackage.haskell.org/package/hlint-3.3.6/hlint-3.3.6.tar.gz" + "lastModified": 1686495518, + "narHash": "sha256-OAe+zOkMZuoTfVEMnxnCT1cmPgRF/riAR8nVdomnwxo=", + "owner": "smunix", + "repo": "implicit-hie-cradle", + "rev": "d6aa00355898469af56cfd5e62f7fc8bd9959ded", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://hackage.haskell.org/package/hlint-3.3.6/hlint-3.3.6.tar.gz" + "owner": "smunix", + "ref": "smunix-patch-hls-0.5-1", + "repo": "implicit-hie-cradle", + "type": "github" } }, - "hlint-34": { + "hlint-35": { "flake": false, "locked": { - "narHash": "sha256-mDncRtVkjWnUbZc1fgDMGcGjy8CFNxUF8z2HGuuN7GU=", + "narHash": "sha256-qQNUlQQnahUGEO92Lm0RwjTGBGr2Yaw0KRuFRMoc5No=", "type": "tarball", - "url": "https://hackage.haskell.org/package/hlint-3.4/hlint-3.4.tar.gz" + "url": "https://hackage.haskell.org/package/hlint-3.5/hlint-3.5.tar.gz" }, "original": { "type": "tarball", - "url": "https://hackage.haskell.org/package/hlint-3.4/hlint-3.4.tar.gz" + "url": "https://hackage.haskell.org/package/hlint-3.5/hlint-3.5.tar.gz" } }, - "hlint_2": { + "hlint-36": { "flake": false, "locked": { - "narHash": "sha256-Kz6adx97kY7ojoDlw3y0R6LQ0h/EtXGR5+N07/b6uGk=", + "narHash": "sha256-fH4RYnWeuBqJI5d3Ba+Xs0BxYr0IYFH1OWO3k2iHGlU=", "type": "tarball", - "url": "https://hackage.haskell.org/package/hlint-3.3.6/hlint-3.3.6.tar.gz" + "url": "https://hackage.haskell.org/package/hlint-3.6.1/hlint-3.6.1.tar.gz" }, "original": { "type": "tarball", - "url": "https://hackage.haskell.org/package/hlint-3.3.6/hlint-3.3.6.tar.gz" + "url": "https://hackage.haskell.org/package/hlint-3.6.1/hlint-3.6.1.tar.gz" } }, "hls": { "inputs": { - "constraints-extras": "constraints-extras", "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_3", - "fourmolu": "fourmolu", - "ghc-exactprint": "ghc-exactprint", + "fourmolu-011": "fourmolu-011", + "fourmolu-012": "fourmolu-012", "gitignore": "gitignore", - "hie-bios": "hie-bios", - "hlint": "hlint", - "implicit-hie-cradle": "implicit-hie-cradle", + "haskell-hie-bios": "haskell-hie-bios", + "haskell-implicit-hie-cradle": "haskell-implicit-hie-cradle", + "hlint-35": "hlint-35", + "hlint-36": "hlint-36", "lsp": "lsp", "lsp-test": "lsp-test", "lsp-types": "lsp-types", - "nixpkgs": "nixpkgs", - "pre-commit-hooks": "pre-commit-hooks", - "retrie": "retrie" + "nixpkgs": "nixpkgs_2", + "ormolu-052": "ormolu-052", + "ormolu-07": "ormolu-07", + "stylish-haskell-0145": "stylish-haskell-0145" }, "locked": { - "lastModified": 1646601891, - "narHash": "sha256-JjkrVZsRSNr7UtoRiX3BMAX4hlXo9y7Ji902IqWcw3o=", + "lastModified": 1698509590, + "narHash": "sha256-YoC4lXsT9EPScjV6g4vlyta4T/mLZ9fNJjPXQdfKjOc=", "owner": "haskell", "repo": "haskell-language-server", - "rev": "73fdd91e5a5a6a7cabdafb453f23749693029cc5", - "type": "github" - }, - "original": { - "owner": "haskell", - "repo": "haskell-language-server", - "type": "github" - } - }, - "hls_2": { - "inputs": { - "aeson-1520": "aeson-1520", - "brittany-01312": "brittany-01312", - "constraints-extras": "constraints-extras_2", - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_5", - "fourmolu": "fourmolu_2", - "fourmolu-0300": "fourmolu-0300", - "ghc-exactprint": "ghc-exactprint_2", - "ghc-exactprint-150": "ghc-exactprint-150", - "gitignore": "gitignore_2", - "hie-bios": "hie-bios_2", - "hlint": "hlint_2", - "hlint-34": "hlint-34", - "implicit-hie-cradle": "implicit-hie-cradle_2", - "lsp": "lsp_2", - "lsp-test": "lsp-test_2", - "lsp-types": "lsp-types_2", - "myst-parser": "myst-parser", - "nixpkgs": "nixpkgs_4", - "poetry2nix": "poetry2nix", - "ptr-poker": "ptr-poker", - "retrie": "retrie_2", - "sphinx_rtd_theme": "sphinx_rtd_theme", - "stylish-haskell": "stylish-haskell" - }, - "locked": { - "lastModified": 1662666864, - "narHash": "sha256-1fECkXiIt04RIFBu7hCDrGUOUgNVVn3rEzi/D7UbawI=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "3fb4082f8038d573d7636a2d74aa1be70d317cc2", - "type": "github" - }, - "original": { - "owner": "haskell", - "repo": "haskell-language-server", - "type": "github" - } - }, - "hls_3": { - "inputs": { - "flake-compat": "flake-compat_5", - "flake-utils": "flake-utils_8", - "gitignore": "gitignore_3", - "nixpkgs": "nixpkgs_6", - "pre-commit-hooks": "pre-commit-hooks_2" - }, - "locked": { - "lastModified": 1637213318, - "narHash": "sha256-ZgxPwV7t4DyGYP7aXoetq+JHtd73XlOV2fYSflQmOXw=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "311107eabbf0537e0c192b2c377d282505b4eff1", + "rev": "5bf1b75eeb924a74f87176cc61930971d9312247", "type": "github" }, "original": { @@ -684,15 +379,14 @@ "nixpkgs": [ "replica", "nixpkgs" - ], - "nixpkgs-chez-racket": "nixpkgs-chez-racket" + ] }, "locked": { - "lastModified": 1632512335, - "narHash": "sha256-PfhOjUdPS9frBG2ouHdK5CvbS1jro25/uSVsGvMfcJ0=", + "lastModified": 1673134368, + "narHash": "sha256-77fOU/rNUOMcIKAgLC8G5CruZKwomr8wYJT4ed5ET54=", "owner": "idris-lang", "repo": "Idris2", - "rev": "a9ccf4db4f69677c5287a1278ab167247dac161d", + "rev": "f630675cfb8b553ad3304163af544c2c4719fade", "type": "github" }, "original": { @@ -704,11 +398,11 @@ "idris-emacs-src": { "flake": false, "locked": { - "lastModified": 1613351183, - "narHash": "sha256-ngg48SzrR2LCtjle3WR3BOK86USRB0ZXmgXWu9EzQbo=", + "lastModified": 1666078909, + "narHash": "sha256-oYNHFIpcrFfPb4sXJwEBFKeH+PB4AGCrAFrfBrSTCeo=", "owner": "redfish64", "repo": "idris2-mode", - "rev": "77390611a934f13e03a45e9f8a4e476dd17a9c5b", + "rev": "3bcb52a65c488f31c99d20f235f6050418a84c9d", "type": "github" }, "original": { @@ -717,207 +411,97 @@ "type": "github" } }, - "ihaskell": { - "inputs": { - "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_7", - "hls": "hls_3", - "nixpkgs": "nixpkgs_7" - }, - "locked": { - "lastModified": 1661486016, - "narHash": "sha256-Ch9dQ82fLV0QuyrJ+J1tVxxrSLSA+NIdiikvV0+Hvrs=", - "owner": "gibiansky", - "repo": "IHaskell", - "rev": "53f8e0773822ddf2cd392309ba27c8ff8e30202e", - "type": "github" - }, - "original": { - "owner": "gibiansky", - "repo": "IHaskell", - "type": "github" - } - }, - "implicit-hie-cradle": { - "flake": false, - "locked": { - "narHash": "sha256-2NmucBBI7Qi1UGXWG27XFZRCeqeRiwVFWmJKZnp6R5U=", - "type": "tarball", - "url": "https://hackage.haskell.org/package/implicit-hie-cradle-0.3.0.5/implicit-hie-cradle-0.3.0.5.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://hackage.haskell.org/package/implicit-hie-cradle-0.3.0.5/implicit-hie-cradle-0.3.0.5.tar.gz" - } - }, - "implicit-hie-cradle_2": { - "flake": false, - "locked": { - "narHash": "sha256-2NmucBBI7Qi1UGXWG27XFZRCeqeRiwVFWmJKZnp6R5U=", - "type": "tarball", - "url": "https://hackage.haskell.org/package/implicit-hie-cradle-0.3.0.5/implicit-hie-cradle-0.3.0.5.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://hackage.haskell.org/package/implicit-hie-cradle-0.3.0.5/implicit-hie-cradle-0.3.0.5.tar.gz" - } - }, "lsp": { "flake": false, "locked": { - "narHash": "sha256-OcyNHNRh9j5nbJ8SjaNAWIEKuixAJlA7+vTimFY0c2c=", + "narHash": "sha256-HcEfdYUrCHufEa+10M2wESjnK41xM/msd+t6r6JwQO0=", "type": "tarball", - "url": "https://hackage.haskell.org/package/lsp-1.4.0.0/lsp-1.4.0.0.tar.gz" + "url": "https://hackage.haskell.org/package/lsp-2.2.0.0/lsp-2.2.0.0.tar.gz" }, "original": { "type": "tarball", - "url": "https://hackage.haskell.org/package/lsp-1.4.0.0/lsp-1.4.0.0.tar.gz" + "url": "https://hackage.haskell.org/package/lsp-2.2.0.0/lsp-2.2.0.0.tar.gz" } }, "lsp-test": { "flake": false, "locked": { - "narHash": "sha256-IOmbQH6tKdu9kAyirvLx6xFS2N+/tbs6vZn0mNGm3No=", - "type": "tarball", - "url": "https://hackage.haskell.org/package/lsp-test-0.14.0.2/lsp-test-0.14.0.2.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://hackage.haskell.org/package/lsp-test-0.14.0.2/lsp-test-0.14.0.2.tar.gz" - } - }, - "lsp-test_2": { - "flake": false, - "locked": { - "narHash": "sha256-TXRy/VT94Cn0BPtiL65c7UqahyJZgUtBQQgESZacrdY=", + "narHash": "sha256-E1D3X2+I9ZTZLpHDEDTXexQFYpyG5byOFRIvRTeBsn8=", "type": "tarball", - "url": "https://hackage.haskell.org/package/lsp-test-0.14.0.3/lsp-test-0.14.0.3.tar.gz" + "url": "https://hackage.haskell.org/package/lsp-test-0.16.0.0/lsp-test-0.16.0.0.tar.gz" }, "original": { "type": "tarball", - "url": "https://hackage.haskell.org/package/lsp-test-0.14.0.3/lsp-test-0.14.0.3.tar.gz" + "url": "https://hackage.haskell.org/package/lsp-test-0.16.0.0/lsp-test-0.16.0.0.tar.gz" } }, "lsp-types": { "flake": false, "locked": { - "narHash": "sha256-HGg4upgirM6/px+vflY5S0Y79gAIDpl32Ad9mbbzTdU=", - "type": "tarball", - "url": "https://hackage.haskell.org/package/lsp-types-1.4.0.1/lsp-types-1.4.0.1.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://hackage.haskell.org/package/lsp-types-1.4.0.1/lsp-types-1.4.0.1.tar.gz" - } - }, - "lsp-types_2": { - "flake": false, - "locked": { - "narHash": "sha256-q4XTvIvsLvISjgedpRktJbWsWHSRIQbOx2Z/2u+3s50=", + "narHash": "sha256-Oa5HuKdsdTSQUKtuSt06zVAq19Qxq5IJZObrnPwlB6s=", "type": "tarball", - "url": "https://hackage.haskell.org/package/lsp-types-1.5.0.0/lsp-types-1.5.0.0.tar.gz" + "url": "https://hackage.haskell.org/package/lsp-types-2.0.2.0/lsp-types-2.0.2.0.tar.gz" }, "original": { "type": "tarball", - "url": "https://hackage.haskell.org/package/lsp-types-1.5.0.0/lsp-types-1.5.0.0.tar.gz" - } - }, - "lsp_2": { - "flake": false, - "locked": { - "narHash": "sha256-+rkFYvSAI1hyFxPkgWZReyM2P6irVDpGVUGK8mcfEJE=", - "type": "tarball", - "url": "https://hackage.haskell.org/package/lsp-1.5.0.0/lsp-1.5.0.0.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://hackage.haskell.org/package/lsp-1.5.0.0/lsp-1.5.0.0.tar.gz" - } - }, - "myst-parser": { - "flake": false, - "locked": { - "lastModified": 1650933355, - "narHash": "sha256-Osd3urvH1bn9w/6sAMyLKHO7gxuYePpGJ9y8ReBfp4E=", - "owner": "smunix", - "repo": "MyST-Parser", - "rev": "57d0d78169a0e157406c35df951bdffdf94b4f9b", - "type": "github" - }, - "original": { - "owner": "smunix", - "ref": "fix.hls-docutils", - "repo": "MyST-Parser", - "type": "github" + "url": "https://hackage.haskell.org/package/lsp-types-2.0.2.0/lsp-types-2.0.2.0.tar.gz" } }, "nixpkgs": { "locked": { - "lastModified": 1639357775, - "narHash": "sha256-mJJFCPqZi1ZO3CvgEfN2nFAYv4uAJSRnTKzLFi61+WA=", - "owner": "NixOS", + "lastModified": 1697793076, + "narHash": "sha256-02e7sCuqLtkyRgrZmdOyvAcQTQdcXj+vpyp9bca6cY4=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "c473cc8714710179df205b153f4e9fa007107ff9", + "rev": "038b2922be3fc096e1d456f93f7d0f4090628729", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-chez-racket": { + "nixpkgs-stable": { "locked": { - "lastModified": 1627484694, - "narHash": "sha256-UsEb5G0ZJ8l/2y9u9FNj2akXx2PC5QAan24U3t32cfI=", - "owner": "L-as", + "lastModified": 1671271954, + "narHash": "sha256-cSvu+bnvN08sOlTBWbBrKaBHQZq8mvk8bgpt0ZJ2Snc=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b3c4bee8cee477ac03b0cfd4ebca40954c66106", + "rev": "d513b448cc2a6da2c8803e3c197c9fc7e67b19e3", "type": "github" }, "original": { - "owner": "L-as", - "ref": "chez-racket", + "owner": "NixOS", + "ref": "nixos-22.05", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_10": { + "nixpkgs_2": { "locked": { - "lastModified": 1632600271, - "narHash": "sha256-2WndMSEsdnamVktLmYLd8dZrRsGCH5Bd8mu5L4HuupU=", + "lastModified": 1686874404, + "narHash": "sha256-u2Ss8z+sGaVlKtq7sCovQ8WvXY+OoXJmY1zmyxITiaY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6201954aa117d24cc73e46f355c0ea19b8fcad6f", + "rev": "efc10371d5c5b8d2d58bab6c1100753efacfe550", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1641016545, - "narHash": "sha256-JMNwvnBzG0RjGG3eH27Y5/GlJ9ryeCdGJfqGbqxnmZY=", "owner": "NixOS", + "ref": "haskell-updates", "repo": "nixpkgs", - "rev": "6f05cfdb1e78d36c0337516df674560e4b51c79b", "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" } }, "nixpkgs_3": { "locked": { - "lastModified": 1646254136, - "narHash": "sha256-8nQx02tTzgYO21BP/dy5BCRopE8OwE8Drsw98j+Qoaw=", + "lastModified": 1698318101, + "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3e072546ea98db00c2364b81491b893673267827", + "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c", "type": "github" }, "original": { @@ -929,174 +513,104 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1659782844, - "narHash": "sha256-tM/qhHFE61puBxh9ebP3BIG1fkRAT4rHqD3jCM0HXGY=", + "lastModified": 1673027386, + "narHash": "sha256-Wjt+oDhRLcf3opIjUKHGN+Xrp3w2ZDms6bO4pCLvsco=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c85e56bb060291eac3fb3c75d4e0e64f6836fcfe", + "rev": "b3818a46e686f24561a28eaa9fcf35e18b8d8e89", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "type": "indirect" } }, "nixpkgs_5": { "locked": { - "lastModified": 1657888067, - "narHash": "sha256-GnwJoFBTPfW3+mz7QEeJEEQ9OMHZOiIJ/qDhZxrlKh8=", + "lastModified": 1671271357, + "narHash": "sha256-xRJdLbWK4v2SewmSStYrcLa0YGJpleufl44A19XSW8k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "65fae659e31098ca4ac825a6fef26d890aaf3f4e", + "rev": "40f79f003b6377bd2f4ed4027dde1f8f922995dd", "type": "github" }, "original": { "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_6": { "locked": { - "lastModified": 1630887066, - "narHash": "sha256-0ecIlrLsNIIa+zrNmzXXmbMBLZlmHU/aWFsa4bq99Hk=", + "lastModified": 1672428209, + "narHash": "sha256-eejhqkDz2cb2vc5VeaWphJz8UXNuoNoM8/Op8eWv2tQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e47a07e9f2d7ed999f2c7943b0896f5f7321ca3", + "rev": "293a28df6d7ff3dec1e61e37cc4ee6e6c0fb0847", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1634515797, - "narHash": "sha256-elgCUC2khtBkOSpE4gDymNvthTZAI4hGI2iNu3YEUkA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5f0194220f2402b06f7f79bba6351895facb5acb", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { - "locked": { - "lastModified": 1662732537, - "narHash": "sha256-iqxa+38SRU+SwNsKDyP8rZt79yPFGSgTe+K4Ujbb/uw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "74a1793c659d09d7cf738005308b1f86c90cb59b", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "type": "indirect" } }, - "nixpkgs_9": { + "ormolu-052": { + "flake": false, "locked": { - "lastModified": 1662849294, - "narHash": "sha256-+ELSQjBVSzS2/itxZO2ZVuwESfjdQb9oulQuAhJwpGU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f0f614616f2bd0e6bcf562b0fdf3a9d72ad96830", - "type": "github" + "narHash": "sha256-H7eqId488RBRxcf7flgJefAZmRgFJASJva+Oy7GG4q4=", + "type": "tarball", + "url": "https://hackage.haskell.org/package/ormolu-0.5.2.0/ormolu-0.5.2.0.tar.gz" }, "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://hackage.haskell.org/package/ormolu-0.5.2.0/ormolu-0.5.2.0.tar.gz" } }, - "poetry": { - "inputs": { - "flake-utils": "flake-utils_9", - "nixpkgs": "nixpkgs_9" - }, + "ormolu-07": { + "flake": false, "locked": { - "lastModified": 1662763707, - "narHash": "sha256-Qx0Y9aFFYCMC//eb9DiF8hxBgIja+CkSrqUGVfXNFAA=", - "owner": "nix-community", - "repo": "poetry2nix", - "rev": "ecbc4cbd06be88d1f9884ff6f53bf09fc466855f", - "type": "github" + "narHash": "sha256-5M5gNzSvsiQH1+0oexRByzf5EIET+0BFwR4fLIr2P7g=", + "type": "tarball", + "url": "https://hackage.haskell.org/package/ormolu-0.7.1.0/ormolu-0.7.1.0.tar.gz" }, "original": { - "id": "poetry", - "type": "indirect" + "type": "tarball", + "url": "https://hackage.haskell.org/package/ormolu-0.7.1.0/ormolu-0.7.1.0.tar.gz" } }, - "poetry2nix": { - "inputs": { - "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_5" - }, + "papers": { + "flake": false, "locked": { - "lastModified": 1657626303, - "narHash": "sha256-O/JJ0hSBCmlx0oP8QGAlRrWn0BvlC5cj7/EZ0CCWHTU=", - "owner": "nix-community", - "repo": "poetry2nix", - "rev": "920ba682377d5c0d87945c5eb6141ab8447ca509", + "dir": "libs/papers", + "lastModified": 1673134368, + "narHash": "sha256-77fOU/rNUOMcIKAgLC8G5CruZKwomr8wYJT4ed5ET54=", + "owner": "idris-lang", + "repo": "Idris2", + "rev": "f630675cfb8b553ad3304163af544c2c4719fade", "type": "github" }, "original": { - "owner": "nix-community", - "ref": "master", - "repo": "poetry2nix", + "dir": "libs/papers", + "owner": "idris-lang", + "repo": "Idris2", "type": "github" } }, "pre-commit-hooks": { "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1624971177, - "narHash": "sha256-Amf/nBj1E77RmbSSmV+hg6YOpR+rddCbbVgo5C7BS0I=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "397f0713d007250a2c7a745e555fa16c5dc8cadb", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "pre-commit-hooks_2": { - "inputs": { - "flake-utils": [ - "ihaskell", - "hls", - "flake-utils" - ], - "nixpkgs": [ - "ihaskell", - "hls", - "nixpkgs" - ] + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_5", + "gitignore": "gitignore_2", + "nixpkgs": "nixpkgs_5", + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1624971177, - "narHash": "sha256-Amf/nBj1E77RmbSSmV+hg6YOpR+rddCbbVgo5C7BS0I=", + "lastModified": 1672912243, + "narHash": "sha256-QnQeKUjco2kO9J4rBqIBPp5XcOMblIMnmyhpjeaJBYc=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "397f0713d007250a2c7a745e555fa16c5dc8cadb", + "rev": "a4548c09eac4afb592ab2614f4a150120b29584c", "type": "github" }, "original": { @@ -1105,47 +619,21 @@ "type": "github" } }, - "ptr-poker": { - "flake": false, - "locked": { - "narHash": "sha256-ll3wuUjkhTE8Grcs8LfGpdiuyobrSBmwgjqPOTlrPac=", - "type": "tarball", - "url": "https://hackage.haskell.org/package/ptr-poker-0.1.2.8/ptr-poker-0.1.2.8.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://hackage.haskell.org/package/ptr-poker-0.1.2.8/ptr-poker-0.1.2.8.tar.gz" - } - }, - "readable": { - "flake": false, - "locked": { - "lastModified": 1646524334, - "narHash": "sha256-IpGapFOTFZW2SXigGpo7BO20pnu4HnJpQhqXT7xSRNI=", - "owner": "teto", - "repo": "readable", - "rev": "d235d2590d326d4a3c5736793993096f35d0ac76", - "type": "github" - }, - "original": { - "owner": "teto", - "ref": "ghc921", - "repo": "readable", - "type": "github" - } - }, "replica": { "inputs": { - "flake-utils": "flake-utils_10", + "flake-utils": "flake-utils_4", "idris": "idris", - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_4", + "papers": "papers", + "pre-commit-hooks": "pre-commit-hooks", + "replicadhall": "replicadhall" }, "locked": { - "lastModified": 1634221508, - "narHash": "sha256-CgM816bx1+BSCYIZi5FIrY89YA2PMKazARa5ME2s3xg=", + "lastModified": 1674072606, + "narHash": "sha256-VTKAQ9zbCOQugM5npC06Y1ubJ/jz2d0wH3PUBud0A/8=", "owner": "ReplicaTest", "repo": "REPLica", - "rev": "e500b3c0a271d07ad93cc790cb92f013affc046d", + "rev": "182ad0f86550bd8b9d725d0495a9c9fd20cca310", "type": "github" }, "original": { @@ -1154,93 +642,92 @@ "type": "github" } }, - "retrie": { - "flake": false, - "locked": { - "narHash": "sha256-SrUyFea9Qr2SYeNVDJfWZfCguJV2rHK2mO/FO4xLFaY=", - "type": "tarball", - "url": "https://hackage.haskell.org/package/retrie-1.2.0.1/retrie-1.2.0.1.tar.gz" + "replicadhall": { + "inputs": { + "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_6" }, - "original": { - "type": "tarball", - "url": "https://hackage.haskell.org/package/retrie-1.2.0.1/retrie-1.2.0.1.tar.gz" - } - }, - "retrie_2": { - "flake": false, "locked": { - "narHash": "sha256-SrUyFea9Qr2SYeNVDJfWZfCguJV2rHK2mO/FO4xLFaY=", - "type": "tarball", - "url": "https://hackage.haskell.org/package/retrie-1.2.0.1/retrie-1.2.0.1.tar.gz" + "lastModified": 1672865541, + "narHash": "sha256-yIcvyBCjiGc5qFdLPn7MuQ/7iN6ibHzQ98ciA0ffHBs=", + "owner": "ReplicaTest", + "repo": "replica-dhall", + "rev": "c2bf442fbbb092973c76d78e642fff3fe0abf0c3", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://hackage.haskell.org/package/retrie-1.2.0.1/retrie-1.2.0.1.tar.gz" + "owner": "ReplicaTest", + "repo": "replica-dhall", + "type": "github" } }, "root": { "inputs": { "all-cabal-hashes-unpacked": "all-cabal-hashes-unpacked", - "bytebuild": "bytebuild", - "bytesmith": "bytesmith", "flake-compat": "flake-compat", "flake-utils": "flake-utils", "frames": "frames", "gtk2hs": "gtk2hs", "haskell-chart": "haskell-chart", - "haskell-ip": "haskell-ip", - "hls": "hls_2", - "ihaskell": "ihaskell", - "nixpkgs": "nixpkgs_8", - "poetry": "poetry", - "readable": "readable", - "replica": "replica", - "word-compat": "word-compat" + "hls": "hls", + "nixpkgs": "nixpkgs_3", + "replica": "replica" } }, - "sphinx_rtd_theme": { + "stylish-haskell-0145": { "flake": false, "locked": { - "lastModified": 1628276861, - "narHash": "sha256-fzqi0QfDSiN8YXtAiWXIoOlyHZQI4V32uOKZjPfWeWY=", - "owner": "readthedocs", - "repo": "sphinx_rtd_theme", - "rev": "34f81daaf52466366c80003db293d50075c1b896", + "narHash": "sha256-EE7RFQ6q4Ek8daRgOpNMGepYLa9o8cM4OLjTNUSHQf0=", + "type": "tarball", + "url": "https://hackage.haskell.org/package/stylish-haskell-0.14.5.0/stylish-haskell-0.14.5.0.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://hackage.haskell.org/package/stylish-haskell-0.14.5.0/stylish-haskell-0.14.5.0.tar.gz" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { - "owner": "readthedocs", - "repo": "sphinx_rtd_theme", - "rev": "34f81daaf52466366c80003db293d50075c1b896", + "owner": "nix-systems", + "repo": "default", "type": "github" } }, - "stylish-haskell": { - "flake": false, + "systems_2": { "locked": { - "narHash": "sha256-oZSR5UQ+ieMFRq7MvL0sJqOblMk74awvcepuT+JHYtA=", - "type": "tarball", - "url": "https://hackage.haskell.org/package/stylish-haskell-0.14.2.0/stylish-haskell-0.14.2.0.tar.gz" + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://hackage.haskell.org/package/stylish-haskell-0.14.2.0/stylish-haskell-0.14.2.0.tar.gz" + "owner": "nix-systems", + "repo": "default", + "type": "github" } }, - "word-compat": { - "flake": false, + "systems_3": { "locked": { - "lastModified": 1658367309, - "narHash": "sha256-4uI+nrj+D8YLllUuLoThyAUYMtm1eU7oUYRk/yBYyXY=", - "owner": "fumieval", - "repo": "word-compat", - "rev": "bf20ee95b82414d96eb83863f50212e6c31b8930", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { - "owner": "fumieval", - "repo": "word-compat", - "rev": "bf20ee95b82414d96eb83863f50212e6c31b8930", + "owner": "nix-systems", + "repo": "default", "type": "github" } } diff --git a/flake.nix b/flake.nix index a981eef..8a71e94 100644 --- a/flake.nix +++ b/flake.nix @@ -13,7 +13,8 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; replica.url = "github:ReplicaTest/REPLica"; - ihaskell.url = "github:gibiansky/IHaskell"; + # ihaskell.url = "github:gibiansky/IHaskell"; + # ihaskell.url = "github:teto/IHaskell/ghc2-pr-nova"; flake-utils.url = "github:numtide/flake-utils"; @@ -32,28 +33,23 @@ flake = false; }; - bytebuild = { - url = "github:teto/bytebuild"; - flake = false; - }; - bytesmith = { - url = "github:teto/bytesmith/ghc92"; - flake = false; - }; - haskell-ip = { - url = "github:andrewthad/haskell-ip/ghc-9-2-3"; - flake = false; - }; - word-compat = { - # bf20ee95b82414d96eb83863f50212e6c31b8930 - url = "github:fumieval/word-compat/bf20ee95b82414d96eb83863f50212e6c31b8930"; - flake = false; - }; - readable = { - url = "github:teto/readable/ghc921"; - flake = false; - }; - + # bytebuild = { + # url = "github:teto/bytebuild"; + # flake = false; + # }; + # bytesmith = { + # url = "github:teto/bytesmith/ghc92"; + # flake = false; + # }; + # haskell-ip = { + # url = "github:andrewthad/haskell-ip/ghc-9-2-3"; + # flake = false; + # }; + # word-compat = { + # # bf20ee95b82414d96eb83863f50212e6c31b8930 + # url = "github:fumieval/word-compat/bf20ee95b82414d96eb83863f50212e6c31b8930"; + # flake = false; + # }; # cabal hashes contains all the version for different haskell packages, to update: # nix flake lock --update-input all-cabal-hashes-unpacked @@ -68,10 +64,11 @@ }; }; - outputs = { self, haskell-chart, all-cabal-hashes-unpacked, nixpkgs, flake-utils, poetry, replica, hls, frames, ... }: - flake-utils.lib.eachSystem ["x86_64-linux"] (system: let + # hls, + outputs = { self, all-cabal-hashes-unpacked, nixpkgs, flake-utils, ... }: + flake-utils.lib.eachDefaultSystem (system: let - compilerVersion = "924"; + compilerVersion = "96"; haskellOverlay = hnew: hold: with pkgs.haskell.lib; let @@ -80,201 +77,10 @@ chart-src = self.inputs.haskell-chart; in - (pkgs.frameHaskellOverlay-921 hnew hold) // - { - - # TODO override Frames - ip = let - newIp = (overrideSrc hold.ip { src = self.inputs.haskell-ip; }); - in doJailbreak (dontCheck (addBuildDepend newIp hnew.word-compat) ); - # circuithub:master - # bytebuild = unmarkBroken (dontCheck hold.bytebuild); - bytebuild = overrideSrc hold.bytebuild { src = self.inputs.bytebuild; }; - bytesmith = overrideSrc hold.bytesmith { src = self.inputs.bytesmith; }; - - vinyl = hold.vinyl_0_14_3; - active = doJailbreak hold.active; - - chronos = overrideSrc hold.chronos { - src = pkgs.fetchFromGitHub { - # owner = "byorgey"; - # rev = "fe6bf78a1b97ff7429630d0e8974c9bc40945dcf"; - owner = "andrewthad"; - repo = "chronos"; - rev = "13b46574f2d811f27c693c78d92aed71c82f39d5"; - sha256 = "sha256-YZ4/5yfeUx+8jZp5nuEXjOkUvO4EWsvXrY+uX4e+VnI="; - }; - }; - - # discussed at https://github.com/JonasDuregard/sized-functors/pull/10 - # 0.1.3.0 should be fine - size-based = hold.callHackage "size-based" "0.1.3.0" {}; - - # size-based = overrideSrc (hold.size-based.overrideAttrs (oa: { - # patches = []; - # # })) { - # src = pkgs.fetchFromGitHub { - # # owner = "byorgey"; - # # rev = "fe6bf78a1b97ff7429630d0e8974c9bc40945dcf"; - # owner = "teto"; - # repo = "sized-functors"; - # rev = "98f884032c1830f0b7046fac5e8e5e73ebf5facf"; - # sha256 = "sha256-rQzO67AMP0Q95/aTKk76lalrV44RKqOs9g+W+Xd4W/M="; - # }; - # }; - # https://github.com/byorgey/sized-functors.git - - relude = hold.relude_1_0_0_1; - - # TODO double check - Chart = pkgs.lib.pipe hold.Chart [ - (doJailbreak) - (addBuildDepend hnew.lens) - # (overrideCabal (old: { - # libraryHaskellDepends = old.libraryHaskellDepends ++ [ - # hnew.lens - # ]; - # })) - ]; - Chart-diagrams = doJailbreak hold.Chart-diagrams; - Chart-cairo = let - newCairo = hnew.callCabal2nix "Chart-cairo" "${chart-src}/chart-cairo" {}; - in - # newCairo; - # doJailbreak (newCairo.overrideAttrs(oa: { propagatedBuildInputs = [ hnew.Chart ]; })); - # overrideCabal newCairo (old: { libraryHaskellDepends = old.libraryHaskellDepends ++ [ hnew.Chart ]; }) ; - # newCairo; - pkgs.lib.pipe (newCairo) [ - # (addExtraLibrary hnew.cairo ) - (addSetupDepend hnew.cairo) - ]; - - # Chart-cairo = doJailbreak (hnew.callCabal2nix "Chart-cairo" "${chart-src}/chart-cairo" {}) ; - - wide-word = hold.callCabal2nix "wide-word" (pkgs.fetchzip { - url = "https://github.com/erikd/wide-word/archive/f2e17fc8fd6a9cea327ab0a72ca8b3c0367a2871.tar.gz"; - sha256 = "sha256-k91zTn1okIkvKQwOmZ+GFE3MfI6uSrPLPEhx0oDEONc="; - }) {}; - - htoml = dontCheck (overrideSrc hold.htoml { - # src = builtins.fetchGit { - # # url = https://github.com/ongy/netlink-hs; - # url = https://github.com/teto/netlink-hs; - # }; - # version = "1.1.2.0"; - src = pkgs.fetchFromGitHub { - owner = "mirokuratczyk"; - repo = "htoml"; - rev = "33971287445c5e2531d9605a287486dfc3cbe1da"; - sha256 = "sha256-BcHu+hzwSdf/11HEziCnNZ6lRrf5kEokfOU51XI9Rm0="; - }; - }); - - readable = doJailbreak hold.readable; - # readable = throw "error"; - # readable = overrideSrc hold.readable { - # version = "matt-ghc923"; - # src = self.inputs.readable; - # } ; - - polysemy = dontCheck hnew.polysemy_1_7_1_0; - polysemy-plugin = hnew.polysemy-plugin_0_4_3_1; - # polysemy-conc = hold.polysemy-conc_0_5_1_1; - # co-log-polysemy = doJailbreak (hold.co-log-polysemy); - co-log-polysemy = doJailbreak (overrideSrc hold.co-log-polysemy { - # src = builtins.fetchGit { - # # url = https://github.com/ongy/netlink-hs; - # url = https://github.com/teto/netlink-hs; - # }; - # version = "1.1.2.0"; - src = pkgs.fetchFromGitHub { - # //tree/ghc-9.2 - owner = "alaendle"; - repo = "co-log-polysemy"; - rev = "b4f96240179b486047ff4d80c978e8efcac8ac7e"; - sha256 = "sha256-QFjNzRSr/pb1nw4UBsg8uWBOkO+7ffpuYrUfLUuashM="; - }; - }); - # co-log-core = doJailbreak hold.co-log-core_0_3_0_0; - - colourista = hold.callCabal2nix "colourista" (pkgs.fetchzip { - url = "https://github.com/teto/colourista/archive/bf56469f7c2d9f226879831ed3a280f8f23be842.tar.gz"; - sha256 = "sha256-k91zTn1okIkvKQwOmZ+GFE0MfI6uSrPLPEhx0oDEONc="; - }) {}; - - inherit gtk2hs-buildtools ; - - # TODO see https://github.com/gtk2hs/gtk2hs/pull/310 and his fix at k0001/fix-cabal-3.6.0.0 - # use my fork instead - # cairo = hnew.callCabal2nix "cairo" "${gtk2hs-src}/cairo" {}; - cairo = hnew.callPackage ({ mkDerivation, array, base, bytestring, Cabal, cairo - , gtk2hs-buildtools, lib, mtl, text, utf8-string - }: - mkDerivation { - pname = "cairo"; - version = "0.13.8.2"; - src = "${gtk2hs-src}"; - postUnpack = "sourceRoot+=/cairo; echo source root reset to $sourceRoot"; - enableSeparateDataOutput = true; - setupHaskellDepends = [ pkgs.gcc base Cabal gtk2hs-buildtools ]; - libraryHaskellDepends = [ - array base bytestring Cabal mtl text utf8-string - ]; - libraryPkgconfigDepends = [ cairo ]; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to the Cairo library"; - license = lib.licenses.bsd3; - }) {inherit (pkgs) cairo;}; - - # polysemy-plugin = hnew.polysemy-plugin_0_4_3_0; - # polysemy-conc = hold.polysemy-conc_0_5_1_1; - # polysemy-test = hold.callCabal2nix "polysemy-test" (let src = pkgs.fetchzip { - # url = "https://github.com/tek/polysemy-test/archive/c83eb2a719e457e514d642a9d90651e69781c1d6.tar.gz"; - # sha256 = "sha256-EB5r45FKOejQa9WMXYGePmayBCeRygE0mEGatCot3mM="; - # }; in "${src}/packages/polysemy-test") {}; - - type-errors = dontCheck hold.type-errors; - # type-errors = hold.callCabal2nix "type-errors" (pkgs.fetchzip { - # url = "https://github.com/isovector/type-errors/archive/c73bd09eb7d1a7a6b5c61bd640c983496d0a9f8.tar.gz"; - # sha256 = "sha256-Q5SxA+fazW/e60uPqJ3krBt2optFK37OoAxy00lEbw8="; - # }) {}; - - # chronos = hold.chronos_1_1_3; - # polysemy-test = hold.callHackage "polysemy-test" "0.5.0.0" {}; - - netlink = overrideSrc hold.netlink { - # src = builtins.fetchGit { - # # url = https://github.com/ongy/netlink-hs; - # url = https://github.com/teto/netlink-hs; - # }; - version = "1.1.2.0"; - src = pkgs.fetchFromGitHub { - owner = "teto"; - repo = "netlink-hs"; - rev = "090a48ebdbc35171529c7db1bd420d227c19b76d"; - sha256 = "sha256-qopa1ED4Bqk185b1AXZ32BG2s80SHDSkCODyoZfnft0="; - }; - }; - haskell-src-meta = hold.haskell-src-meta.overrideAttrs (oa: { - patches = []; - }); - - contiguous = hold.callCabal2nix "hashtables" (pkgs.fetchzip { - url = "https://github.com/andrewthad/contiguous/archive/7771fc90e4a587b2c425b7c61a7a838c3b3d5fae.tar.gz"; - sha256 = "sha256-JahJAVxZM3xJUHTndl80mb4E8qMgqplMzSXCuYLKeOc="; - }) {}; - hashtables = hold.callCabal2nix "hashtables" (pkgs.fetchzip { - url = "https://github.com/gregorycollins/hashtables/archive/e07a3d73dee80b5c75d2e3bcc2023927b354ea7c.tar.gz"; - sha256 = "sha256-jjqm+o1viM28iWYf6ZuIu3fvQn/wcwwdbTWE6kP7QZE="; - }) {}; - # we need >= 0.2.7.0 - byteslice = hold.callCabal2nix "byteslice" (pkgs.fetchzip { - url = "https://github.com/byteverse/byteslice/archive/965e70d08c012b335104a6572ada68c6289482de.tar.gz"; - sha256 = "sha256-S3V0jSjXkAQxV0Zppgf6bkewf4mlQa5rkIWFbJ0eTBo="; - }) {}; - - # - word-compat = (doJailbreak (dontCheck (overrideSrc hold.word-compat { src = self.inputs.word-compat; }))); + # (pkgs.frameHaskellOverlay-921 hnew hold) + # // + (pkgs.callPackage ./overlay-96.nix { inherit self; } hnew hold) + // { # this repo software mptcp = self.packages.${system}.mptcp; @@ -285,7 +91,6 @@ pkgs = import nixpkgs { inherit system; overlays = [ - frames.overlay # self.overlay (final: prev: { all-cabal-hashes = prev.runCommand "all-cabal-hashes.tar.gz" @@ -306,7 +111,7 @@ myModifier = drv: pkgs.haskell.lib.addBuildTools drv (with hsPkgs; [ cabal-install - replica.packages.${system}.build + self.inputs.replica.packages.${system}.replica # hls.packages.${system}."haskell-language-server-${compilerVersion}" # ihaskell.packages.${system}."ihaskell-${compilerVersion}" # not available @@ -355,7 +160,10 @@ }; in { + + legacyPackages.mptcpHaskellPkgs = hsPkgs; packages = { + default = self.packages.${system}.mptcpanalyzer; # pkgs.haskell.lib.doJailbreak Chart-cairo = hsPkgs.Chart-cairo; @@ -382,10 +190,10 @@ }); }; - defaultPackage = self.packages.${system}.mptcpanalyzer; - # TODO add a shellFor (for all 3 packages) - devShells = { + devShells = rec { + + default = mptcp; # cabal will provide the libraries # envFunc { withHoogle } mptcp = mkDevShell "mptcp"; diff --git a/overlay-96.nix b/overlay-96.nix new file mode 100644 index 0000000..c6bf284 --- /dev/null +++ b/overlay-96.nix @@ -0,0 +1,190 @@ +{ self, pkgs }: +hnew: hold: with pkgs.haskell.lib; + let + gtk2hs-src = self.inputs.gtk2hs; + gtk2hs-buildtools = hnew.callCabal2nix "gtk2hs-buildtools" "${gtk2hs-src}/tools" {}; + chart-src = self.inputs.haskell-chart; + + in + { + # Frames = hold.callHackage "Frames" "0.1.4.0" {}; + Frames = hold.callCabal2nix "Frames" "${self.inputs.frames}" {}; + + # readable = overrideSrc hold.readable { + # version = "matt-ghc923"; + # src = self.inputs.readable; + # } ; + + # TODO override Frames + # ip = let + # newIp = (overrideSrc hold.ip { src = self.inputs.haskell-ip; }); + # in doJailbreak (dontCheck (addBuildDepend newIp hnew.word-compat) ); + # circuithub:master + # bytebuild = unmarkBroken (dontCheck hold.bytebuild); + # bytebuild = overrideSrc hold.bytebuild { src = self.inputs.bytebuild; }; + # bytesmith = overrideSrc hold.bytesmith { src = self.inputs.bytesmith; }; + + # vinyl = hold.vinyl_0_14_3; + # active = doJailbreak hold.active; + + # chronos = overrideSrc hold.chronos { + # src = pkgs.fetchFromGitHub { + # # owner = "byorgey"; + # # rev = "fe6bf78a1b97ff7429630d0e8974c9bc40945dcf"; + # owner = "andrewthad"; + # repo = "chronos"; + # rev = "13b46574f2d811f27c693c78d92aed71c82f39d5"; + # sha256 = "sha256-YZ4/5yfeUx+8jZp5nuEXjOkUvO4EWsvXrY+uX4e+VnI="; + # }; + # }; + + # discussed at https://github.com/JonasDuregard/sized-functors/pull/10 + # 0.1.3.0 should be fine + # size-based = hold.callHackage "size-based" "0.1.3.0" {}; + + # size-based = overrideSrc (hold.size-based.overrideAttrs (oa: { + # patches = []; + # # })) { + # src = pkgs.fetchFromGitHub { + # # owner = "byorgey"; + # # rev = "fe6bf78a1b97ff7429630d0e8974c9bc40945dcf"; + # owner = "teto"; + # repo = "sized-functors"; + # rev = "98f884032c1830f0b7046fac5e8e5e73ebf5facf"; + # sha256 = "sha256-rQzO67AMP0Q95/aTKk76lalrV44RKqOs9g+W+Xd4W/M="; + # }; + # }; + # https://github.com/byorgey/sized-functors.git + + # relude = hold.relude_1_0_0_1; + + # TODO double check + Chart = pkgs.lib.pipe hold.Chart [ + (doJailbreak) + (addBuildDepend hnew.lens) + # (overrideCabal (old: { + # libraryHaskellDepends = old.libraryHaskellDepends ++ [ + # hnew.lens + # ]; + # })) + ]; + Chart-diagrams = doJailbreak hold.Chart-diagrams; + Chart-cairo = let + newCairo = hnew.callCabal2nix "Chart-cairo" "${chart-src}/chart-cairo" {}; + in + # newCairo; + # doJailbreak (newCairo.overrideAttrs(oa: { propagatedBuildInputs = [ hnew.Chart ]; })); + # overrideCabal newCairo (old: { libraryHaskellDepends = old.libraryHaskellDepends ++ [ hnew.Chart ]; }) ; + # newCairo; + pkgs.lib.pipe (newCairo) [ + # (addExtraLibrary hnew.cairo ) + (addSetupDepend hnew.cairo) + ]; + + # Chart-cairo = doJailbreak (hnew.callCabal2nix "Chart-cairo" "${chart-src}/chart-cairo" {}) ; + + # htoml hasn't been updated since 2016 https://github.com/cies/htoml/pull/22 + # htoml = dontCheck (overrideSrc hold.htoml { + # # src = builtins.fetchGit { + # # # url = https://github.com/ongy/netlink-hs; + # # url = https://github.com/teto/netlink-hs; + # # }; + # # version = "1.1.2.0"; + # src = pkgs.fetchFromGitHub { + # owner = "mirokuratczyk"; + # repo = "htoml"; + # rev = "33971287445c5e2531d9605a287486dfc3cbe1da"; + # sha256 = "sha256-BcHu+hzwSdf/11HEziCnNZ6lRrf5kEokfOU51XI9Rm0="; + # }; + # }); + + readable = doJailbreak hold.readable; + # readable = throw "error"; + # readable = overrideSrc hold.readable { + # version = "matt-ghc923"; + # src = self.inputs.readable; + # } ; + + polysemy = dontCheck hnew.polysemy_1_7_1_0; + polysemy-plugin = hnew.polysemy-plugin_0_4_3_1; + # polysemy-conc = hold.polysemy-conc_0_5_1_1; + # co-log-polysemy = doJailbreak (hold.co-log-polysemy); + co-log-polysemy = doJailbreak (overrideSrc hold.co-log-polysemy { + # src = builtins.fetchGit { + # # url = https://github.com/ongy/netlink-hs; + # url = https://github.com/teto/netlink-hs; + # }; + # version = "1.1.2.0"; + src = pkgs.fetchFromGitHub { + # //tree/ghc-9.2 + owner = "alaendle"; + repo = "co-log-polysemy"; + rev = "b4f96240179b486047ff4d80c978e8efcac8ac7e"; + sha256 = "sha256-QFjNzRSr/pb1nw4UBsg8uWBOkO+7ffpuYrUfLUuashM="; + }; + }); + # co-log-core = doJailbreak hold.co-log-core_0_3_0_0; + + colourista = hold.callCabal2nix "colourista" (pkgs.fetchzip { + url = "https://github.com/teto/colourista/archive/bf56469f7c2d9f226879831ed3a280f8f23be842.tar.gz"; + sha256 = "sha256-k91zTn1okIkvKQwOmZ+GFE0MfI6uSrPLPEhx0oDEONc="; + }) {}; + + inherit gtk2hs-buildtools ; + + # TODO see https://github.com/gtk2hs/gtk2hs/pull/310 and his fix at k0001/fix-cabal-3.6.0.0 + # use my fork instead + # cairo = hnew.callCabal2nix "cairo" "${gtk2hs-src}/cairo" {}; + cairo = hnew.callPackage ({ mkDerivation, array, base, bytestring, Cabal, cairo + , gtk2hs-buildtools, lib, mtl, text, utf8-string + }: + mkDerivation { + pname = "cairo"; + version = "0.13.8.2"; + src = "${gtk2hs-src}"; + postUnpack = "sourceRoot+=/cairo; echo source root reset to $sourceRoot"; + enableSeparateDataOutput = true; + setupHaskellDepends = [ pkgs.gcc base Cabal gtk2hs-buildtools ]; + libraryHaskellDepends = [ + array base bytestring Cabal mtl text utf8-string + ]; + libraryPkgconfigDepends = [ cairo ]; + homepage = "http://projects.haskell.org/gtk2hs/"; + description = "Binding to the Cairo library"; + license = lib.licenses.bsd3; + }) {inherit (pkgs) cairo;}; + + # polysemy-plugin = hnew.polysemy-plugin_0_4_3_0; + # polysemy-conc = hold.polysemy-conc_0_5_1_1; + # polysemy-test = hold.callCabal2nix "polysemy-test" (let src = pkgs.fetchzip { + # url = "https://github.com/tek/polysemy-test/archive/c83eb2a719e457e514d642a9d90651e69781c1d6.tar.gz"; + # sha256 = "sha256-EB5r45FKOejQa9WMXYGePmayBCeRygE0mEGatCot3mM="; + # }; in "${src}/packages/polysemy-test") {}; + + type-errors = dontCheck hold.type-errors; + # type-errors = hold.callCabal2nix "type-errors" (pkgs.fetchzip { + # url = "https://github.com/isovector/type-errors/archive/c73bd09eb7d1a7a6b5c61bd640c983496d0a9f8.tar.gz"; + # sha256 = "sha256-Q5SxA+fazW/e60uPqJ3krBt2optFK37OoAxy00lEbw8="; + # }) {}; + + # chronos = hold.chronos_1_1_3; + # polysemy-test = hold.callHackage "polysemy-test" "0.5.0.0" {}; + + netlink = overrideSrc hold.netlink { + # src = builtins.fetchGit { + # # url = https://github.com/ongy/netlink-hs; + # url = https://github.com/teto/netlink-hs; + # }; + version = "1.1.2.0"; + src = pkgs.fetchFromGitHub { + owner = "teto"; + repo = "netlink-hs"; + rev = "090a48ebdbc35171529c7db1bd420d227c19b76d"; + sha256 = "sha256-qopa1ED4Bqk185b1AXZ32BG2s80SHDSkCODyoZfnft0="; + }; + }; + haskell-src-meta = hold.haskell-src-meta.overrideAttrs (oa: { + patches = []; + }); + + }