From d5253df3d72a163d8870327b003669d1a3aef12d Mon Sep 17 00:00:00 2001 From: Ben Simms Date: Mon, 14 Oct 2024 23:08:10 +0100 Subject: [PATCH] Bumps --- calamity/ChangeLog.md | 6 ++++++ calamity/calamity.cabal | 2 +- flake.lock | 38 +++++++++++++++++++------------------- flake.nix | 5 +++++ 4 files changed, 31 insertions(+), 20 deletions(-) diff --git a/calamity/ChangeLog.md b/calamity/ChangeLog.md index 4840da1..8f70c29 100644 --- a/calamity/ChangeLog.md +++ b/calamity/ChangeLog.md @@ -1,5 +1,11 @@ # Changelog for Calamity +## 0.12.1.0 + ++ Fixed build with Aeson 2.2+ @L0neGamer ++ Fix ToJSON ChannelType instances @MorrowM ++ Bumped crypton-connection bounds from <0.4 to <0.5 + ## 0.12.0.0 + Field names in `Calamity.HTTP.Webhook` were mistakenly `username` instead of diff --git a/calamity/calamity.cabal b/calamity/calamity.cabal index 41a56ee..04c4933 100644 --- a/calamity/calamity.cabal +++ b/calamity/calamity.cabal @@ -14,7 +14,7 @@ copyright: 2020 Ben Simms license: MIT license-file: LICENSE build-type: Simple -tested-with: GHC ==9.6.5 +tested-with: GHC ==9.6.6 extra-source-files: ChangeLog.md README.md diff --git a/flake.lock b/flake.lock index c5c2975..a160577 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -35,11 +35,11 @@ }, "flake-root": { "locked": { - "lastModified": 1713493429, - "narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=", + "lastModified": 1723604017, + "narHash": "sha256-rBtQ8gg+Dn4Sx/s+pvjdq3CB2wQNzx9XGFq/JVGCB6k=", "owner": "srid", "repo": "flake-root", - "rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd", + "rev": "b759a56851e10cb13f6b8e5698af7b59c44be26e", "type": "github" }, "original": { @@ -70,11 +70,11 @@ }, "haskell-flake": { "locked": { - "lastModified": 1717944201, - "narHash": "sha256-h9cBnB1hfF73g/K7FJtsOdcE0mbi00qBGCJ+CFH7jRQ=", + "lastModified": 1728845985, + "narHash": "sha256-0KkAWCRBNpno3f+E1rvV9TOr0iuweqncWGn1KtbrGmo=", "owner": "srid", "repo": "haskell-flake", - "rev": "8bffb2266b38fe7983d14fc4858aea2e64ad2175", + "rev": "2393b55948866f39afcfa7d8a53893a096bcd284", "type": "github" }, "original": { @@ -85,11 +85,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1718276985, - "narHash": "sha256-u1fA0DYQYdeG+5kDm1bOoGcHtX0rtC7qs2YA2N1X++I=", + "lastModified": 1728538411, + "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3f84a279f1a6290ce154c5531378acc827836fbb", + "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221", "type": "github" }, "original": { @@ -101,14 +101,14 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1717284937, - "narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=", + "lastModified": 1727825735, + "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" } }, "root": { @@ -129,11 +129,11 @@ ] }, "locked": { - "lastModified": 1718271476, - "narHash": "sha256-35hUMmFesmchb+u7heKHLG5B6c8fBOcSYo0jj0CHLes=", + "lastModified": 1727984844, + "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "e75ba0a6bb562d2ce275db28f6a36a2e4fd81391", + "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0dd46e3..7eb21ed 100644 --- a/flake.nix +++ b/flake.nix @@ -36,6 +36,10 @@ #basePackages = pkgs.haskell.packages.ghc981; packages = { + hashable.source = "1.4.6.0"; + aeson.source = "2.2.3.0"; + websockets.source = "0.13.0.0"; + # type-errors.source = "0.2.0.2"; # websockets.source = "0.13.0.0"; # crypton-connection.source = "0.3.1"; @@ -47,6 +51,7 @@ }; settings = { + hashable.check = false; aeson-optics.jailbreak = true; type-errors.check = false; ListLike.check = false;