diff --git a/.github/workflows/nix-flake.yml b/.github/workflows/nix-flake.yml index 99a80bc3..3bf5af41 100644 --- a/.github/workflows/nix-flake.yml +++ b/.github/workflows/nix-flake.yml @@ -13,7 +13,7 @@ jobs: matrix: os: - ubuntu-latest - - macos-latest + # - macos-latest name: Nix on ${{ matrix.os }} runs-on: ${{ matrix.os }} steps: diff --git a/flake.lock b/flake.lock index 542de04a..bdb876ce 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ }, "haskell-flake": { "locked": { - "lastModified": 1718653460, - "narHash": "sha256-8ana22BZaLp91gGvQq8YbfteJKFqza4qrqc6++bCnH4=", + "lastModified": 1719249394, + "narHash": "sha256-ytIvs6dq1dD3eicwhmqMyhIDH52DfqhOiCpmJbjBYVI=", "owner": "srid", "repo": "haskell-flake", - "rev": "569e28636c1aaee767a43741511fb36a6d3c284b", + "rev": "dfea80e8a907a7818f11090788f84f1a62985694", "type": "github" }, "original": { @@ -52,11 +52,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1718842396, - "narHash": "sha256-9uvK+h2xF2fclkPRz2tlXtz++VNXot22isEVvWizA7Q=", + "lastModified": 1719706517, + "narHash": "sha256-ynXAAr5AJgTQHQAJW4GH3i8auqnZVzcjCokZMdEKjcs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "49f3b031c4e87e18acc2a68f15fdb56871a170df", + "rev": "01da4c59cc4879540b7a5d73230475b4616a0dc8", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4064f78b..f6ce2fc4 100644 --- a/flake.nix +++ b/flake.nix @@ -42,14 +42,22 @@ }; packages.default = config.packages.hackage-server; haskellProjects.default = { + # basePackages = pkgs.haskell.packages.ghc98; settings = { - hackage-server.check = false; - ap-normalize.check = false; + hackage-server.check = true; # https://community.flake.parts/haskell-flake/dependency#nixpkgs tar = { super, ... }: - { custom = _: super.tar_0_6_2_0; }; - # tasty = { super, ... }: - # { custom = _: super.tasty_1_5; }; + { custom = _: super.tar_0_6_3_0; }; + # tls = { super, ... }: + # { custom = _: super.tls_2_0_2; }; + # tls-session-manager = { super, ... }: + # { custom = _: super.tls-session-manager_0_0_5; }; + tasty = { super, ... }: + { custom = _: super.tasty_1_5_1; }; + logict.jailbreak = true; + integer-logarithms.jailbreak = true; + time-compat.jailbreak = true; + indexed-traversable-instances.jailbreak = true; }; packages = { # https://community.flake.parts/haskell-flake/dependency#path