diff --git a/flake.lock b/flake.lock index 9a14428b..3ed5afef 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1753121425, - "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=", + "lastModified": 1760813311, + "narHash": "sha256-lbHQ7FXGzt6/IygWvJ1lCq+Txcut3xYYd6VIpF1ojkg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e", + "rev": "4e627ac2e1b8f1de7f5090064242de9a259dbbc8", "type": "github" }, "original": { @@ -37,11 +37,11 @@ }, "haskell-flake": { "locked": { - "lastModified": 1753034137, - "narHash": "sha256-StyB4UPW3lDXSlzwbMGl4Sd3n+Gc+kkAKfzniF0JGaU=", + "lastModified": 1760905572, + "narHash": "sha256-WhLrE4Rlr1+SAhcJIK2vxoWzPbBDKYcXQsiwPvGQhn0=", "owner": "srid", "repo": "haskell-flake", - "rev": "72a74b6ac9cda796e43d39643e818be94f35047f", + "rev": "2d828c4ddf2e74f7b628b6020e187ad13eca5c36", "type": "github" }, "original": { @@ -52,16 +52,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1753489316, - "narHash": "sha256-nlnPqKhWGbqOjcLDJvRgtLZYvCM3D7Dwk6CkPvM/6MY=", + "lastModified": 1760940340, + "narHash": "sha256-I262Iw+Ei0TLRMUk1QGyKtOh+9fpluNQEiwrSRImWGc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1c3ce1e240626bf84775aa62fa8eaf5e75e0997b", + "rev": "55614160bd5b30ea12d0a10f22cd398e0c62ac47", "type": "github" }, "original": { "owner": "nixos", - "ref": "haskell-updates", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 32707985..323f0afe 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs/haskell-updates"; + nixpkgs.url = "github:nixos/nixpkgs"; flake-parts.url = "github:hercules-ci/flake-parts"; haskell-flake.url = "github:srid/haskell-flake"; flake-root.url = "github:srid/flake-root"; @@ -46,55 +46,18 @@ settings = { hackage-server.check = false; - cabal-add.jailbreak = true; - cabal-install-parsers.jailbreak = true; - # https://community.flake.parts/haskell-flake/dependency#nixpkgs Cabal-syntax = { super, ... }: - { custom = _: super.Cabal-syntax_3_14_2_0; }; + { custom = _: super.Cabal-syntax_3_16_0_0; }; Cabal = { super, ... }: - { custom = _: super.Cabal_3_14_2_0; }; - fourmolu.check = false; - doctest.check = false; - system-filepath.check = false; - hls-plugin-api.jailbreak = true; - ghcide.jailbreak = true; - # stylish-haskell.jailbreak = true; - haskell-language-server.jailbreak = true; + { custom = _: super.Cabal_3_16_0_0; }; - Diff = { super, ... }: - { custom = _: super.Diff_1_0_2; }; + sandwich.check = false; - threads.check = false; unicode-data.check = false; - tree-diff.check = false; - - ormolu = { super, ... }: - { custom = _: super.ormolu_0_8_0_0; - check = false; - }; - extensions = { super, ... }: - { custom = _: super.extensions_0_1_0_3; - jailbreak = true; - }; - - brick = { super, ... }: - { custom = _: super.brick_2_9; }; - - hlint = { super, ... }: - { custom = _: super.hlint_3_10; }; - ghc-lib-parser-ex = { super, ... }: - { custom = _: super.ghc-lib-parser-ex_9_12_0_0; }; - ghc-lib-parser = { super, ... }: - { - custom = _: super.ghc-lib-parser_9_12_2_20250421; - # custom = _: super.ghc-lib-parser_9_12_2_20250320; - }; }; packages = { # https://community.flake.parts/haskell-flake/dependency#path # tls.source = "1.9.0"; - fourmolu.source = "0.18.0.0"; - stylish-haskell.source = "0.15.1.0"; }; devShell = { tools = hp: {