diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c947ab6ff2372c5b49d397f512a084c542a74854..509870f2b66d2776412bcd40296aee7d9c6dd36e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,6 @@ build: - aarch64-darwin - x86_64-linux PACKAGE: - - Agda - JuicyPixels - VulkanMemoryAllocator - brick diff --git a/README.md b/README.md index 47f0ad29645e04dc2af31ffe637ce58e3b1a84ab..07ee1c5b16b420d9b20deed6f9043d2c55149de4 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,6 @@ template-haskell or type-checker plugins. The following things are always expected to be here: -* Agda * JuicyPixels * VulkanMemoryAllocator * brick diff --git a/configuration.nix b/configuration.nix index ac767626f4ab7d5399978c3f2aaaef7fee3ab980..c7cde8f0761345b422d31ebffbd0259a3b5e0c90 100644 --- a/configuration.nix +++ b/configuration.nix @@ -4,6 +4,12 @@ with pkgs.haskell.lib; final: prev: { + Agda = null; + + HsOpenSSL = appendConfigureFlags prev.HsOpenSSL [ + "--ghc-option=-optc=-Wno-error=incompatible-pointer-types" + ]; + digest = addPkgconfigDepend prev.digest pkgs.zlib; chell-quickcheck = null; @@ -41,16 +47,16 @@ final: prev: { { __onlyPropagateKnownPkgConfigModules = true; } ) (if pkgs.stdenv.isLinux then - [ pkgs.pkg-config pkgs.SDL2 pkgs.libsndfile pkgs.libpulseaudio pkgs.alsa-lib pkgs.jack2 pkgs.glib pkgs.pcre2 ] + [ pkgs.pkg-config pkgs.SDL2 pkgs.libsysprof-capture pkgs.libsndfile pkgs.libpulseaudio pkgs.alsa-lib pkgs.jack2 pkgs.glib pkgs.pcre2 ] else - [ pkgs.pkg-config pkgs.SDL2 pkgs.libsndfile pkgs.glib pkgs.pcre2 pkgs.jack2 ]); + [ pkgs.pkg-config pkgs.SDL2 pkgs.libsndfile pkgs.glib pkgs.pcre2 pkgs.jack2 pkgs.libsysprof-capture ]); sdl2-ttf = addSetupDepends (overrideCabal prev.sdl2-ttf { __onlyPropagateKnownPkgConfigModules = true; } ) - [ pkgs.pkg-config pkgs.SDL2 pkgs.SDL2_ttf pkgs.harfbuzz pkgs.freetype pkgs.glib pkgs.pcre2 ]; + [ pkgs.pkg-config pkgs.SDL2 pkgs.SDL2_ttf pkgs.harfbuzz pkgs.freetype pkgs.glib pkgs.pcre2 pkgs.libsysprof-capture ]; stringsearch = prev.stringsearch.overrideAttrs (old : old // { patchFlags = ["--binary"]; }); @@ -58,6 +64,5 @@ final: prev: { vulkan = prev.callPackage ./pkgs/vulkan.nix { vulkan = pkgs.vulkan-loader; }; - zlib = prev.callPackage ./pkgs/zlib.nix { inherit (pkgs) zlib; }; } diff --git a/configuration/patches.nix b/configuration/patches.nix index c1de18daf444cc0f035d09703bf2c6623b1bed88..16eb9ac8941d0622c2538bc3c71673c73403f931 100644 --- a/configuration/patches.nix +++ b/configuration/patches.nix @@ -4,6 +4,15 @@ with haskellLib; final: prev: { + recursion-schemes = overrideCabal + (_: + { + patches = [ + ./patches/recursion-schemes/01.patch + ]; + }) + prev.recursion-schemes; + sdl2 = overrideCabal (_: { diff --git a/configuration/patches/recursion-schemes/01.patch b/configuration/patches/recursion-schemes/01.patch new file mode 100644 index 0000000000000000000000000000000000000000..9c9529dd2d4936cfc6d108fb6c7e21b2df4c75cd --- /dev/null +++ b/configuration/patches/recursion-schemes/01.patch @@ -0,0 +1,19 @@ +commit 23259c5f1f071f6eac4f14f5f660423c9c02d881 +Author: Erik de Castro Lopo <erikd@mega-nerd.com> +Date: Fri Dec 6 11:15:40 2024 +1100 + + Support ghc 9.12 + +diff --git a/recursion-schemes.cabal b/recursion-schemes.cabal +index c00fa84..9740bdd 100644 +--- a/recursion-schemes.cabal ++++ b/recursion-schemes.cabal +@@ -61,7 +61,7 @@ library + + if flag(template-haskell) + build-depends: +- template-haskell >= 2.11.0.0 && < 2.23, ++ template-haskell >= 2.11.0.0 && < 2.24, + th-abstraction >= 0.4 && < 0.8 + exposed-modules: + Data.Functor.Foldable.TH diff --git a/flake.lock b/flake.lock index bb471c76ea1cc372ff963002dad01a2ef9c76512..4b329ad80a815e265e729c58974c349503a38495 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -23,11 +23,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -48,11 +48,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1727953000, - "narHash": "sha256-X87uDIiVm8ele4o53FaKKm9PvI4fdfqpQyea6LWxexI=", + "lastModified": 1735047989, + "narHash": "sha256-UJkrR77yD7oL4evWCBYrzCFrBWP4CAPNz4zrB1o3sb4=", "ref": "refs/heads/master", - "rev": "dfc1cfe14f6f3e156b800c55dced4c211aa328f4", - "revCount": 104, + "rev": "c71cc8e57c74f3f9e08b48d4c91521a7a9aed977", + "revCount": 110, "type": "git", "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-build-packages" }, @@ -69,11 +69,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1729111300, - "narHash": "sha256-crbowiJMHwZlHZFUQwuo8vqVuj4kwuXeISWVDUY90q4=", + "lastModified": 1738241401, + "narHash": "sha256-OPhepzocsn0GMP8MpSE3zDEXQS+jf5a42IlZQtwzBYQ=", "ref": "refs/heads/master", - "rev": "1ef0c63679552db368c7607244a8fc9a226e943c", - "revCount": 1391, + "rev": "5a6d6625d6890ce8eeff1027334dfee653e25030", + "revCount": 1395, "type": "git", "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-core" }, @@ -88,11 +88,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1727952319, - "narHash": "sha256-oh2st42snuv44c7/Pga/obgVG87alRoWywKZ60Bf0V8=", + "lastModified": 1735047879, + "narHash": "sha256-G/nmASvcCj7opXoHp1yzx+sA/oERGpbWIX4fdwRxwm4=", "ref": "refs/heads/master", - "rev": "f99ab296e55a80fbcfa50e2a7832b001ae1b0ba5", - "revCount": 115, + "rev": "3908b4d0c96003fceda7960cc6c4b57a7be97057", + "revCount": 119, "type": "git", "url": "https://gitlab.horizon-haskell.net/ghc/horizon-ghc" }, @@ -133,11 +133,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726877710, - "narHash": "sha256-53Q5rKVWBYc62qS2TNOtoa6hG8820Teq0/x7olr0KUs=", + "lastModified": 1735040618, + "narHash": "sha256-ZAj+8wZsr7wBS8TgMlR8nrUXfEROkZ8lu98bIH2DpGY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "93d142112e81929c5bfd20b13bc287da8922dc97", + "rev": "e4307e63cd66655cdee85c6ec2c9f1133d47c281", "type": "github" }, "original": { @@ -149,35 +149,35 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1727825735, - "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", + "lastModified": 1733096140, + "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" } }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1725233747, - "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", + "lastModified": 1733096140, + "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" } }, "nixpkgs_2": { "locked": { - "lastModified": 1727914564, - "narHash": "sha256-S0KZLpF6yfX6c6ehfz2svB3VzYNJ8YxfQJH6NgyHNk8=", + "lastModified": 1735040618, + "narHash": "sha256-ZAj+8wZsr7wBS8TgMlR8nrUXfEROkZ8lu98bIH2DpGY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9d0ab8b5db9ba62989e648db86c66c0fb620b6e9", + "rev": "e4307e63cd66655cdee85c6ec2c9f1133d47c281", "type": "github" }, "original": { @@ -189,11 +189,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1729037774, - "narHash": "sha256-BmdllvnhVXFwOoh4y1lHydWp1J57gAK2qizzcxlgdeU=", + "lastModified": 1735040618, + "narHash": "sha256-ZAj+8wZsr7wBS8TgMlR8nrUXfEROkZ8lu98bIH2DpGY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fe21c441dbc7103502d680cad61016cd7134835b", + "rev": "e4307e63cd66655cdee85c6ec2c9f1133d47c281", "type": "github" }, "original": { @@ -205,11 +205,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1729037774, - "narHash": "sha256-BmdllvnhVXFwOoh4y1lHydWp1J57gAK2qizzcxlgdeU=", + "lastModified": 1738239377, + "narHash": "sha256-QU57hYNedueycbO5hjN6BaGmCjWUCBib7NqjEeftv4U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fe21c441dbc7103502d680cad61016cd7134835b", + "rev": "f66f34f0d1dc39f2cb8bdf8053a26afeefc5cbfd", "type": "github" }, "original": { diff --git a/horizon.dhall b/horizon.dhall index d74533f6dd8d5b8465f5f9ce98f374adb85d3a85..0459142e83c49679090e3df2c50c63a064905135 100644 --- a/horizon.dhall +++ b/horizon.dhall @@ -3,19 +3,19 @@ let H = let packages = { Agda = H.callHackage "Agda" "2.7.0.1" - , HsOpenSSL = H.callHackage "HsOpenSSL" "0.11.7.8" + , HsOpenSSL = H.callHackage "HsOpenSSL" "0.11.7.9" , JuicyPixels = H.callHackage "JuicyPixels" "3.3.9" , Only = H.callHackage "Only" "0.1" , RSA = H.callHackage "RSA" "2.4.1" , STMonadTrans = H.callHackage "STMonadTrans" "0.4.8" , VulkanMemoryAllocator = H.callHackage "VulkanMemoryAllocator" "0.11.0.1" - , aeson-typescript = H.callHackage "aeson-typescript" "0.6.3.0" + , aeson-typescript = H.callHackage "aeson-typescript" "0.6.4.0" , authenticate-oauth = H.callHackage "authenticate-oauth" "1.7" , base64 = H.callHackage "base64" "1.0" , bin = H.callHackage "bin" "0.1.4" , binary-orphans = H.callHackage "binary-orphans" "1.0.5" , boxes = H.callHackage "boxes" "0.1.5" - , bytes = H.callHackage "bytes" "0.17.3" + , bytes = H.callHackage "bytes" "0.17.4" , bytestring-lexing = H.callHackage "bytestring-lexing" "0.5.0.14" , cassava = H.callHackage "cassava" "0.5.3.2" , chell = H.callHackage "chell" "0.5.0.2" @@ -28,7 +28,7 @@ let packages = (None H.Subdir) , concise = H.callHackage "concise" "0.1.0.1" , concurrent-extra = H.callHackage "concurrent-extra" "0.7.0.12" - , criterion = H.callHackage "criterion" "1.6.3.0" + , criterion = H.callHackage "criterion" "1.6.4.0" , crypto-pubkey-types = H.callHackage "crypto-pubkey-types" "0.4.3" , cryptohash-md5 = H.callHackage "cryptohash-md5" "0.11.101.0" , css-text = H.callHackage "css-text" "0.1.3.0" @@ -39,7 +39,7 @@ let packages = , dependent-map = H.callHackage "dependent-map" "0.4.0.0" , digest = H.callHackage "digest" "0.0.2.1" , directory-tree = H.callHackage "directory-tree" "0.12.1" - , doctest = H.callHackage "doctest" "0.22.10" + , doctest = H.callHackage "doctest" "0.23.0" , equivalence = H.callHackage "equivalence" "0.4.1" , errors = H.callHackage "errors" "2.3.0" , extensible-effects = H.callHackage "extensible-effects" "5.0.0.1" @@ -50,7 +50,7 @@ let packages = "https://github.com/locallycompact/ghc-tcplugins-extra" "6246d5728ff81a7634a7c35a1e3c8bc4c80a7ef5" (None H.Subdir) - , hashtables = H.callHackage "hashtables" "1.3.1" + , hashtables = H.callHackage "hashtables" "1.4.2" , haskell-src = H.callHackage "haskell-src" "1.0.4.1" , hedis = H.callHackage "hedis" "0.15.2" , hint = H.callHackage "hint" "0.9.0.8" @@ -80,7 +80,7 @@ let packages = , monad-time = H.callHackage "monad-time" "0.4.0.0" , monads-tf = H.callHackage "monads-tf" "0.3.0.1" , monoidal-containers = H.callHackage "monoidal-containers" "0.6.5.0" - , murmur-hash = H.callHackage "murmur-hash" "0.1.0.10" + , murmur-hash = H.callHackage "murmur-hash" "0.1.0.11" , network-info = H.callHackage "network-info" "0.2.1" , newtype = H.callHackage "newtype" "0.2.2.0" , openapi3 = H.callHackage "openapi3" "3.2.4" @@ -154,12 +154,12 @@ let packages = , snap-core = H.callHackage "snap-core" "1.0.5.1" , snap-server = H.callHackage "snap-server" "1.1.2.1" , sop-core = H.callHackage "sop-core" "0.5.0.2" - , statistics = H.callHackage "statistics" "0.16.2.1" + , statistics = H.callHackage "statistics" "0.16.3.0" , string-conversions = H.callHackage "string-conversions" "0.4.0.1" , stringsearch = H.callHackage "stringsearch" "0.3.6.6" , swagger2 = H.callHackage "swagger2" "2.8.9" - , system-fileio = H.callHackage "system-fileio" "0.3.16.4" - , system-filepath = H.callHackage "system-filepath" "0.4.14" + , system-fileio = H.callHackage "system-fileio" "0.3.16.6" + , system-filepath = H.callHackage "system-filepath" "0.4.14.1" , tagsoup = H.callHackage "tagsoup" "0.14.8" , tasty-wai = H.callHackage "tasty-wai" "0.1.2.0" , th-extras = H.callHackage "th-extras" "0.0.0.8" @@ -168,27 +168,26 @@ let packages = , timeout = H.callHackage "timeout" "0.1.1" , type-errors = H.callHackage "type-errors" "0.2.0.2" , unagi-chan = H.callHackage "unagi-chan" "0.4.1.4" - , uri-bytestring = H.callHackage "uri-bytestring" "0.3.3.1" + , uri-bytestring = H.callHackage "uri-bytestring" "0.4.0.0" , uuid = H.callHackage "uuid" "1.3.16" , vector-hashtables = H.callHackage "vector-hashtables" "0.1.2.0" , vinyl = H.callHackage "vinyl" "0.14.3" , vulkan = H.callHackage "vulkan" "3.26.2" , vulkan-utils = H.callHackage "vulkan-utils" "0.5.10.6" , wai-app-static = H.callHackage "wai-app-static" "3.1.9" - , wai-extra = H.callHackage "wai-extra" "3.1.15" - , webdriver = H.callHackage "webdriver" "0.12.0.0" + , wai-extra = H.callHackage "wai-extra" "3.1.16" + , webdriver = H.callHackage "webdriver" "0.12.0.1" , wreq = H.callHackage "wreq" "0.5.4.3" - , xml-conduit = H.callHackage "xml-conduit" "1.9.1.3" + , xml-conduit = H.callHackage "xml-conduit" "1.10.0.0" , xml-types = H.callHackage "xml-types" "0.3.8" , xmlgen = H.callHackage "xmlgen" "0.6.2.2" , xss-sanitize = H.callHackage "xss-sanitize" "0.3.7.2" , yesod = H.callHackage "yesod" "1.6.2.1" , yesod-core = H.callHackage "yesod-core" "1.6.26.0" - , yesod-form = H.callHackage "yesod-form" "1.7.6" + , yesod-form = H.callHackage "yesod-form" "1.7.9" , yesod-persistent = H.callHackage "yesod-persistent" "1.6.0.8" - , yesod-test = H.callHackage "yesod-test" "1.6.16" + , yesod-test = H.callHackage "yesod-test" "1.6.19" , zip-archive = H.callHackage "zip-archive" "0.4.3.2" - , zlib = H.callHackage "zlib" "0.7.1.0" , zlib-bindings = H.callHackage "zlib-bindings" "0.1.1.5" } diff --git a/horizon.lock b/horizon.lock index aeb1e350c12cca5247d8010275dcdae13f47d978..bc98e1a69efaf127ae6691d573e823b6ea152cbb 100644 --- a/horizon.lock +++ b/horizon.lock @@ -4,7 +4,7 @@ } , { mapKey = "HsOpenSSL" , mapValue = - "eda05cddeba54347632afb62598607c2546957187fd69d7c67e3f6cbe89a2d30" + "437bc966ce47667cf3baa5f4c34b5c6c80074ffc6ccbb426a8ecfad82caefce8" } , { mapKey = "JuicyPixels" , mapValue = @@ -28,7 +28,7 @@ } , { mapKey = "aeson-typescript" , mapValue = - "8318137885b308ff64dc033ab2da68570e947a247407838b62e874343a9e18e8" + "55c3bb23494b4437fa7dcd020da416ceff0f60b2e96368f52f82f9f28a97888d" } , { mapKey = "authenticate-oauth" , mapValue = @@ -52,7 +52,7 @@ } , { mapKey = "bytes" , mapValue = - "bd96db727fb8fc5b97c19a97148cc337c4d8f74b2b4eea4e9c7e5aaf8834f18f" + "40612687e1436e73e36aa5294c2b1188bd8a26d8ab76ff28b12d45c437a1b985" } , { mapKey = "bytestring-lexing" , mapValue = @@ -88,7 +88,7 @@ } , { mapKey = "criterion" , mapValue = - "94c78cd77c546b266aae60f5f27f787123321a449e8cfe19c1f21a58232f01b6" + "f09dd25e93e6242f002cca0648146ae9c21667f8f2dfdaa06a566279c21bfc85" } , { mapKey = "crypto-pubkey-types" , mapValue = @@ -132,7 +132,7 @@ } , { mapKey = "doctest" , mapValue = - "0a50041af8f4a657f7c0790791e2d4a0b65790aeb4f30ac69a34d43edbcfac91" + "d1a016145c8c0147bba0a8e32bdbfae19efc29a2d5f43a43bbb397acedffe8b8" } , { mapKey = "equivalence" , mapValue = @@ -160,7 +160,7 @@ } , { mapKey = "hashtables" , mapValue = - "d27a76a9a263773b0cd3f369793e543d0eef40dfffcc4e596da8e77975767392" + "9659bb14a9f7a53e668481e144b37eba938491af5c534598ab228d82bb1b6da5" } , { mapKey = "haskell-src" , mapValue = @@ -272,7 +272,7 @@ } , { mapKey = "murmur-hash" , mapValue = - "734bb0122bec909ede2777968d52d7cc773ae4a87a42f0dc5607c21bec2439b4" + "d5a4066fa7b4d2aacf62603e05e1e51f158fe5926bea472b7797c2a069f43bad" } , { mapKey = "network-info" , mapValue = @@ -516,7 +516,7 @@ } , { mapKey = "statistics" , mapValue = - "658ee5c75d2faeb134057ffc7c3584f64519cc1288fb5f77a18489e4bb3020bd" + "5e8abc145e1c13216004a858418bca61498f3ce95ee5be98d0c35885d2a6d909" } , { mapKey = "string-conversions" , mapValue = @@ -532,11 +532,11 @@ } , { mapKey = "system-fileio" , mapValue = - "3c787d3f27779ad83ae2d5d06e0dfdc9d213d34b651b3c6ea27a72a8b3530ecb" + "81488f489c504f25cd93de964e49d4f2bb1f7b24bf5eeaf41ca55296e0ba8462" } , { mapKey = "system-filepath" , mapValue = - "3eaaa61f7b4e01f611610f8eadf631ba38eeeb22e2bd05f5183444fd4f8d75a3" + "1ded0849693869de2808ff04e5edca108bcf8cb53a96f9dedff81b5030da22f5" } , { mapKey = "tagsoup" , mapValue = @@ -572,7 +572,7 @@ } , { mapKey = "uri-bytestring" , mapValue = - "805f7b26b7ee14a64a006fb260329d3e994d1f8228049a0225beb389f1b4efc7" + "bdbd8fb0af6b5e63e30e3ee192f58a7805e277464128b3ea3b958315a3ae9b76" } , { mapKey = "uuid" , mapValue = @@ -600,11 +600,11 @@ } , { mapKey = "wai-extra" , mapValue = - "78f3b00f4e64b85befbb71a36b2d6ea311107589ac13e2b722d15d53d857e501" + "c1cd3f999e3b33d45e89f6f4f61044091840bb621f612e8389bfdbdad56345a7" } , { mapKey = "webdriver" , mapValue = - "93b16b24b019ba6999795eb68178e33841b65bf4cc1a4b6f3fba5de5e83441ba" + "7fd35b2d4ef30e1a8fec1db9762a931b4162da5bddd2316ba61c09f6621321bb" } , { mapKey = "wreq" , mapValue = @@ -612,7 +612,7 @@ } , { mapKey = "xml-conduit" , mapValue = - "3ced8d47f0957c105d2e5d937930c63867d3917980e5a924aa284886fc9d88bf" + "0ff45d13937084fc4d8d64229906f8bb59a8af5e9da7abfeae5ce15bc36d9a8f" } , { mapKey = "xml-types" , mapValue = @@ -636,7 +636,7 @@ } , { mapKey = "yesod-form" , mapValue = - "8e0740f840be1974eb3b40cceba5219f1db17fbcd7c67dfd7a9c0f01a124240b" + "eea41685709ab3bbcf306118d4b064ace36227994c2793b00b659451b7d40508" } , { mapKey = "yesod-persistent" , mapValue = @@ -644,16 +644,12 @@ } , { mapKey = "yesod-test" , mapValue = - "d370a6ee6ed61c510506b578c549b15300269e40908d171723ba68b4be652537" + "b9d7609a793640a8ce609c89ea6a5526a0864b4b03007c116975d8889a458c48" } , { mapKey = "zip-archive" , mapValue = "6847f7c4d3a9060780c05a09be2231d2c3b96ed5448af4f3baaf27d7beb25a56" } -, { mapKey = "zlib" - , mapValue = - "771cd657ad86da0741b5f50fbf28432cceee8532303194b1c4e759da3a36a265" - } , { mapKey = "zlib-bindings" , mapValue = "99e4bb94c19fa79244c6d33283e4f297c1f7612a1f88ef9ce3bacb86d5f5ff14" diff --git a/overlay.nix b/overlay.nix index e155010f321261c89cae64d4b57aaa8199b1c334..1eba677eda985d76f5e76f5ace876e623d2cd38d 100644 --- a/overlay.nix +++ b/overlay.nix @@ -328,8 +328,6 @@ final: prev: with pkgs.haskell.lib; { zip-archive = f final prev "zip-archive" (final.callPackage (./pkgs/zip-archive.nix) { }); - zlib = f final prev "zlib" (final.callPackage (./pkgs/zlib.nix) { }); - zlib-bindings = f final prev "zlib-bindings" (final.callPackage (./pkgs/zlib-bindings.nix) { }); } diff --git a/pkgs/HsOpenSSL.nix b/pkgs/HsOpenSSL.nix index a5d46036bd419bebf27621866ddf6abc1269a949..3f2522e9072013f5c7df0e27e2f13cd4d764ba02 100644 --- a/pkgs/HsOpenSSL.nix +++ b/pkgs/HsOpenSSL.nix @@ -1,14 +1,11 @@ -{ mkDerivation, Cabal, base, bytestring, lib, network, openssl -, time -}: +{ mkDerivation, base, bytestring, lib, network, openssl, time }: mkDerivation { pname = "HsOpenSSL"; - version = "0.11.7.8"; - sha256 = "bc17a525386e109ea569ade30e022fd0eecc97f2eb91a3ad682585e8dbf38678"; + version = "0.11.7.9"; + sha256 = "4a2f667a09d54e5210d1df0eb4e5c5990ee9ed5f463f902cb384e3c728f6767c"; isLibrary = true; isExecutable = false; enableSeparateDataOutput = false; - setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring network time ]; librarySystemDepends = [ openssl ]; testHaskellDepends = [ base bytestring ]; diff --git a/pkgs/aeson-typescript.nix b/pkgs/aeson-typescript.nix index 56b44ee40aeb0ca717d87e6e4d8ee27d646ab024..b6556534d4df138fe871b0c5d2a3fb2c81c8f74d 100644 --- a/pkgs/aeson-typescript.nix +++ b/pkgs/aeson-typescript.nix @@ -5,8 +5,8 @@ }: mkDerivation { pname = "aeson-typescript"; - version = "0.6.3.0"; - sha256 = "e977a9011f4197b80dd4b7c8ea1a5f0d6b3cb2bcf83c27e801ba36050295b0ae"; + version = "0.6.4.0"; + sha256 = "fd1bc35a744a5b61635360665adee1439a501400e205fca2e2b7abf05a171076"; isLibrary = true; isExecutable = false; enableSeparateDataOutput = false; diff --git a/pkgs/bytes.nix b/pkgs/bytes.nix index 3908cd1020a399afb625dfe9c95ec6b7c8b8cb12..ef93b91c2ad1ed5348f04d2d4cb4867512b7aa7d 100644 --- a/pkgs/bytes.nix +++ b/pkgs/bytes.nix @@ -4,10 +4,10 @@ }: mkDerivation { pname = "bytes"; - version = "0.17.3"; - sha256 = "d10acf05802d4df9646d7aed1b4ebcee13fb38f243f1525caaef1f2e1fd929c7"; - revision = "2"; - editedCabalFile = "1l9cc914rrkfw10s6n00azr6f546vr56xmmsd3nplm0pq0q52y2c"; + version = "0.17.4"; + sha256 = "8ca99a2449ae1233440930c8393eda065108a8725025bf079c61c6f3a4e5a393"; + revision = "1"; + editedCabalFile = "0jhzp9ihka03fsgnjhhj3864p3zq500xqm2whjyvin3580wigc97"; isLibrary = true; isExecutable = false; enableSeparateDataOutput = false; diff --git a/pkgs/criterion.nix b/pkgs/criterion.nix index cda0b121ec675787bab450379ccdd47181388290..5c101f28e07527aed2b1046436f44f9c8c344327 100644 --- a/pkgs/criterion.nix +++ b/pkgs/criterion.nix @@ -9,10 +9,8 @@ }: mkDerivation { pname = "criterion"; - version = "1.6.3.0"; - sha256 = "c31711e2596adf0c46b2451a151357d28633b1bc1a430070758ef3d49ede9ba2"; - revision = "1"; - editedCabalFile = "1576v10909fxizrjzszfj6h8r0j3vlsxpnm5ldarihv8xmnikyb2"; + version = "1.6.4.0"; + sha256 = "062bf47a43278dfe8725391b5e550905f185801c79ea772a9cdaa672b2ea2f51"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; diff --git a/pkgs/doctest.nix b/pkgs/doctest.nix index 112a59befa6daf312a71aec0da7307be99c9eba5..e3832d33894863bde49e90793c92c87190f105f9 100644 --- a/pkgs/doctest.nix +++ b/pkgs/doctest.nix @@ -5,8 +5,10 @@ }: mkDerivation { pname = "doctest"; - version = "0.22.10"; - sha256 = "86d44402b2f74fd5c9c629f58c43bebe00aa3cdaae7a3f54117bba5fd19b8c7a"; + version = "0.23.0"; + sha256 = "206907274bac83eaac35e0a477220ab189dad2cb764ba3168954af6ce44503ca"; + revision = "1"; + editedCabalFile = "1n9y3j4z15jf8xfi8v8pjd33b1z2csswzslqqpaa1cwazgv6f342"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = false; diff --git a/pkgs/hashtables.nix b/pkgs/hashtables.nix index ef0706672f1c680107af401cdfb4ae62d8886d8c..c3deb54a7c1e8a28e945b9144ebe12a9f992b69b 100644 --- a/pkgs/hashtables.nix +++ b/pkgs/hashtables.nix @@ -1,11 +1,11 @@ -{ mkDerivation, HUnit, QuickCheck, base, ghc-prim, hashable, lib -, mwc-random, primitive, test-framework, test-framework-hunit -, test-framework-quickcheck2, vector +{ mkDerivation, QuickCheck, base, ghc-prim, hashable, lib +, mwc-random, primitive, tasty, tasty-hunit, tasty-quickcheck +, vector }: mkDerivation { pname = "hashtables"; - version = "1.3.1"; - sha256 = "6f3d40eb22ab87279b9a0bf51c22307706b240c90a664c82bfae2392268c59c3"; + version = "1.4.2"; + sha256 = "ca0e299fee6c0c918f45ce0907afbff1c3891998bb792d1717e4d5f12350ef0d"; isLibrary = true; isExecutable = false; enableSeparateDataOutput = false; @@ -13,9 +13,8 @@ mkDerivation { base ghc-prim hashable primitive vector ]; testHaskellDepends = [ - base ghc-prim hashable HUnit mwc-random primitive QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 - vector + base ghc-prim hashable mwc-random primitive QuickCheck tasty + tasty-hunit tasty-quickcheck vector ]; enableLibraryProfiling = true; enableExecutableProfiling = true; diff --git a/pkgs/murmur-hash.nix b/pkgs/murmur-hash.nix index 2ded816e5e2cc1cb22ac1ef27ae711909e13c39d..fc137f3f55531c7d6b81c6984fb39fedf926dc58 100644 --- a/pkgs/murmur-hash.nix +++ b/pkgs/murmur-hash.nix @@ -1,10 +1,8 @@ { mkDerivation, base, bytestring, lib }: mkDerivation { pname = "murmur-hash"; - version = "0.1.0.10"; - sha256 = "e92fad6000823aa2dabaa55096d2bc4fe21ad347f10614fc684da23e7f48bf90"; - revision = "1"; - editedCabalFile = "18wlx3hsba3kvpa1z95dz0xglr97lf62irlr6wg6i0613br58sh3"; + version = "0.1.0.11"; + sha256 = "71aa17132bff71814d653caed8f9da55c27e3c3425eb4db404fa65b3ca296dfe"; isLibrary = true; isExecutable = false; enableSeparateDataOutput = false; @@ -16,7 +14,7 @@ mkDerivation { doCheck = false; doBenchmark = false; hyperlinkSource = false; - homepage = "http://github.com/nominolo/murmur-hash"; + homepage = "https://github.com/nominolo/murmur-hash"; description = "MurmurHash2 implementation for Haskell"; license = lib.licenses.bsd3; broken = false; diff --git a/pkgs/statistics.nix b/pkgs/statistics.nix index a8c17e41942c3cd79dc944e7e29abcfb56ae9886..d6f6a55110b44f727a9a88a7d1f37d590943bb10 100644 --- a/pkgs/statistics.nix +++ b/pkgs/statistics.nix @@ -1,14 +1,14 @@ { mkDerivation, QuickCheck, aeson, async, base, binary -, data-default-class, deepseq, dense-linear-algebra, erf, ieee754 -, lib, math-functions, mwc-random, parallel, primitive, random -, tasty, tasty-expected-failure, tasty-hunit, tasty-quickcheck -, vector, vector-algorithms, vector-binary-instances -, vector-th-unbox +, data-default-class, deepseq, dense-linear-algebra, doctest, erf +, ieee754, lib, math-functions, mwc-random, parallel, primitive +, random, tasty, tasty-bench, tasty-expected-failure, tasty-hunit +, tasty-quickcheck, vector, vector-algorithms +, vector-binary-instances, vector-th-unbox }: mkDerivation { pname = "statistics"; - version = "0.16.2.1"; - sha256 = "a7c0c068a0d1f784d865163748a40fbbdda48febe3b905063a22ce7a32e05ce4"; + version = "0.16.3.0"; + sha256 = "03ec46e6641227cf7318b7a1f87acf005d38c8cfc4e13f40ff9014a9266ba1e7"; isLibrary = true; isExecutable = false; enableSeparateDataOutput = false; @@ -19,9 +19,12 @@ mkDerivation { vector-th-unbox ]; testHaskellDepends = [ - aeson base binary dense-linear-algebra erf ieee754 math-functions - primitive QuickCheck tasty tasty-expected-failure tasty-hunit - tasty-quickcheck vector vector-algorithms + aeson base binary dense-linear-algebra doctest erf ieee754 + math-functions primitive QuickCheck tasty tasty-expected-failure + tasty-hunit tasty-quickcheck vector vector-algorithms + ]; + benchmarkHaskellDepends = [ + base mwc-random tasty tasty-bench vector ]; enableLibraryProfiling = true; enableExecutableProfiling = true; diff --git a/pkgs/system-fileio.nix b/pkgs/system-fileio.nix index d0d90250b9dd2d7e1577aaee3683b4b796abdbb4..3c3dc200a4faa85833c12fabcc03ec06e3c5bb53 100644 --- a/pkgs/system-fileio.nix +++ b/pkgs/system-fileio.nix @@ -3,8 +3,8 @@ }: mkDerivation { pname = "system-fileio"; - version = "0.3.16.4"; - sha256 = "34e58b88a19a69ff1a559e211af6edb596e33ee1b1d5f44490febf325c78c6c7"; + version = "0.3.16.6"; + sha256 = "2a1c317b19b8f32f8e7e97f1f8661427a0df8e3be301889940debc2b8bdeba62"; isLibrary = true; isExecutable = false; enableSeparateDataOutput = false; diff --git a/pkgs/system-filepath.nix b/pkgs/system-filepath.nix index 90b709efc55b009fab72ae70e7114377e32ce238..c5f05c5594bb50f065029b317e2b446d175fd70a 100644 --- a/pkgs/system-filepath.nix +++ b/pkgs/system-filepath.nix @@ -1,16 +1,13 @@ -{ mkDerivation, Cabal, QuickCheck, base, bytestring, chell +{ mkDerivation, QuickCheck, base, bytestring, chell , chell-quickcheck, deepseq, lib, text }: mkDerivation { pname = "system-filepath"; - version = "0.4.14"; - sha256 = "1656ce3c0d585650784ceb3f794748286e19fb635f557e7b29b0897f8956d993"; - revision = "2"; - editedCabalFile = "0731bm8msw4gdaxy0dmya55w91yh9nk952ysf82n32c0nib1hdr4"; + version = "0.4.14.1"; + sha256 = "2f222942e185d1cd160c3bd2c9bd1afe5954fe678e4cd53c58931d70c343daa5"; isLibrary = true; isExecutable = false; enableSeparateDataOutput = false; - setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring deepseq text ]; testHaskellDepends = [ base bytestring chell chell-quickcheck QuickCheck text diff --git a/pkgs/uri-bytestring.nix b/pkgs/uri-bytestring.nix index ad1f545be9123f7053848cdbc12153ab13505763..babd33b417960458b6776a5c8f91bbe3efbf7da2 100644 --- a/pkgs/uri-bytestring.nix +++ b/pkgs/uri-bytestring.nix @@ -5,8 +5,8 @@ }: mkDerivation { pname = "uri-bytestring"; - version = "0.3.3.1"; - sha256 = "f3e7a0ac26111c426727fed11624efe9ce36ee2e74ca79570ec0985eb6111368"; + version = "0.4.0.0"; + sha256 = "7ffcca0db90f8443c2badbed323e4927cb386b893615007ad7b69c0525e5bc27"; isLibrary = true; isExecutable = false; enableSeparateDataOutput = false; diff --git a/pkgs/wai-extra.nix b/pkgs/wai-extra.nix index 8e45a3474430f2e20993e7761d70be6d45ee156e..e24926a0d61ccaecd9a51f3982c56728ddd7151e 100644 --- a/pkgs/wai-extra.nix +++ b/pkgs/wai-extra.nix @@ -1,20 +1,20 @@ { mkDerivation, HUnit, aeson, ansi-terminal, base , base64-bytestring, bytestring, call-stack, case-insensitive -, containers, cookie, data-default-class, directory, fast-logger -, hspec, hspec-discover, http-types, iproute, lib, network -, resourcet, streaming-commons, temporary, text, time, transformers -, unix, vault, wai, wai-logger, warp, word8, zlib +, containers, cookie, data-default, directory, fast-logger, hspec +, hspec-discover, http-types, iproute, lib, network, resourcet +, streaming-commons, temporary, text, time, transformers, unix +, vault, wai, wai-logger, warp, word8, zlib }: mkDerivation { pname = "wai-extra"; - version = "3.1.15"; - sha256 = "bd1afbedd63b77ff24949555f926ff0d2679887faef270874e338ec90634e858"; + version = "3.1.16"; + sha256 = "122aab746c447e1f4e2fbda628f89b7016cc89244bb7539d8bf51346f03cf6bc"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = false; libraryHaskellDepends = [ aeson ansi-terminal base base64-bytestring bytestring call-stack - case-insensitive containers cookie data-default-class directory + case-insensitive containers cookie data-default directory fast-logger http-types HUnit iproute network resourcet streaming-commons text time transformers unix vault wai wai-logger warp word8 diff --git a/pkgs/webdriver.nix b/pkgs/webdriver.nix index f57e35612e141441b0734dfb92c5a786ddc62926..ccb642cb95526d0acde38676cd31698d9dc76448 100644 --- a/pkgs/webdriver.nix +++ b/pkgs/webdriver.nix @@ -1,5 +1,5 @@ { mkDerivation, aeson, attoparsec, attoparsec-aeson, base -, base64-bytestring, bytestring, call-stack, data-default-class +, base64-bytestring, bytestring, call-stack, data-default , directory, directory-tree, exceptions, filepath, http-client , http-types, lib, lifted-base, monad-control, network, network-uri , scientific, temporary, text, time, transformers @@ -7,14 +7,14 @@ }: mkDerivation { pname = "webdriver"; - version = "0.12.0.0"; - sha256 = "a488a2754901d0fa05b3c9743f79d53a1db1b01c6b21ef1f77395bd69a88a4fc"; + version = "0.12.0.1"; + sha256 = "8112ce9719d2b097d6e987b03c623ac6c441e315e9b12abac5174b1a5c6da49e"; isLibrary = true; isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ aeson attoparsec attoparsec-aeson base base64-bytestring bytestring - call-stack data-default-class directory directory-tree exceptions + call-stack data-default directory directory-tree exceptions filepath http-client http-types lifted-base monad-control network network-uri scientific temporary text time transformers transformers-base unordered-containers vector zip-archive diff --git a/pkgs/xml-conduit.nix b/pkgs/xml-conduit.nix index a90ee9ec2168fc1a342c66ff297d41abd955c870..801075b706eb3ac476e2465234bc9c8ad4274075 100644 --- a/pkgs/xml-conduit.nix +++ b/pkgs/xml-conduit.nix @@ -1,19 +1,19 @@ { mkDerivation, Cabal, HUnit, attoparsec, base, blaze-html , blaze-markup, bytestring, cabal-doctest, conduit, conduit-extra -, containers, data-default-class, deepseq, doctest, hspec, lib -, resourcet, text, transformers, xml-types +, containers, data-default, deepseq, doctest, hspec, lib, resourcet +, text, transformers, xml-types }: mkDerivation { pname = "xml-conduit"; - version = "1.9.1.3"; - sha256 = "d8e9169562c71c9e6bc616f15832f521a68c362aa4fc03682748a809755f1bf4"; + version = "1.10.0.0"; + sha256 = "3f9bd0cc3e80e49f2ac2a65b975ef503ea633f495172f9c05bdf1b46b5e1de92"; isLibrary = true; isExecutable = false; enableSeparateDataOutput = false; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ attoparsec base blaze-html blaze-markup bytestring conduit - conduit-extra containers data-default-class deepseq resourcet text + conduit-extra containers data-default deepseq resourcet text transformers xml-types ]; testHaskellDepends = [ diff --git a/pkgs/yesod-form.nix b/pkgs/yesod-form.nix index d1d1fa625b007585b7f5c4ff0995f5758dd62250..21a52e2467fc17841a96f7c603ce023110c3bba8 100644 --- a/pkgs/yesod-form.nix +++ b/pkgs/yesod-form.nix @@ -6,8 +6,8 @@ }: mkDerivation { pname = "yesod-form"; - version = "1.7.6"; - sha256 = "a8e1dd6581f612ca3292949fc80ba6f2e305a76bb9d11cb148c1dad0c4af53af"; + version = "1.7.9"; + sha256 = "a23488b971c573569b31fb0d96220a1eac04d5fa8eed3848accd1cc7d868a9e8"; isLibrary = true; isExecutable = false; enableSeparateDataOutput = false; diff --git a/pkgs/yesod-test.nix b/pkgs/yesod-test.nix index 1102f6cc096903a078cf4b3b50be00cbafd14b3b..f14c6828592084a6f8202576468aae8da5348b1a 100644 --- a/pkgs/yesod-test.nix +++ b/pkgs/yesod-test.nix @@ -7,8 +7,8 @@ }: mkDerivation { pname = "yesod-test"; - version = "1.6.16"; - sha256 = "41efe37a356f839ea257bce6a8600dfa76e8344e3c8ac1e651d4e980fec97b8a"; + version = "1.6.19"; + sha256 = "6ae2d915faea930a55764d7e13620510e029f6da1ad6c05c9f14097dbd01d86a"; isLibrary = true; isExecutable = false; enableSeparateDataOutput = false; diff --git a/pkgs/zlib.nix b/pkgs/zlib.nix deleted file mode 100644 index caf774dd3a7969697acc2cb90517eb03b4191dbe..0000000000000000000000000000000000000000 --- a/pkgs/zlib.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ mkDerivation, QuickCheck, base, bytestring, lib, tasty -, tasty-quickcheck, zlib -}: -mkDerivation { - pname = "zlib"; - version = "0.7.1.0"; - sha256 = "6edd38b6b81df8d274952aa85affa6968ae86b2231e1d429ce8bc9083e6a55bc"; - revision = "1"; - editedCabalFile = "03r5ib477af94l3i6mdhgkil6gzg9zh92vr4cgkwar9d16kcbqds"; - isLibrary = true; - isExecutable = false; - enableSeparateDataOutput = false; - libraryHaskellDepends = [ base bytestring ]; - libraryPkgconfigDepends = [ zlib ]; - testHaskellDepends = [ - base bytestring QuickCheck tasty tasty-quickcheck - ]; - enableLibraryProfiling = true; - enableExecutableProfiling = true; - doHaddock = true; - jailbreak = true; - doCheck = false; - doBenchmark = false; - hyperlinkSource = false; - description = "Compression and decompression in the gzip and zlib formats"; - license = lib.licenses.bsd3; - broken = false; -} \ No newline at end of file