From 8aee5cb32db5d9cbc3c5f4dd25a5ecf6da0dd02e Mon Sep 17 00:00:00 2001 From: Ollie Charles Date: Mon, 18 Mar 2024 10:49:11 +0000 Subject: [PATCH] Support Hedgehog 1.5 --- .direnv/bin/nix-direnv-reload | 8 ++++ flake.lock | 72 +++++++++++++++++------------------ flake.nix | 2 +- rel8.cabal | 2 +- 4 files changed, 46 insertions(+), 38 deletions(-) create mode 100755 .direnv/bin/nix-direnv-reload diff --git a/.direnv/bin/nix-direnv-reload b/.direnv/bin/nix-direnv-reload new file mode 100755 index 00000000..186ac961 --- /dev/null +++ b/.direnv/bin/nix-direnv-reload @@ -0,0 +1,8 @@ +#!/usr/bin/env bash +dir="$(realpath $(dirname ${BASH_SOURCE[0]})/../..)" +_nix_direnv_force_reload=1 direnv exec "$dir" true +direnv reload +# direnv reload updates the mtime of .envrc. Also update the timestamp of the +# profile_rc file to keep track that we actually are up to date. +touch $dir/.direnv/{nix,flake}-profile-*.rc + diff --git a/flake.lock b/flake.lock index 1d98ffee..941a67b4 100644 --- a/flake.lock +++ b/flake.lock @@ -105,11 +105,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -135,33 +135,33 @@ "type": "github" } }, - "ghc98X": { + "ghc910X": { "flake": false, "locked": { - "lastModified": 1696643148, - "narHash": "sha256-E02DfgISH7EvvNAu0BHiPvl1E5FGMDi0pWdNZtIBC9I=", - "ref": "ghc-9.8", - "rev": "443e870d977b1ab6fc05f47a9a17bc49296adbd6", - "revCount": 61642, + "lastModified": 1709693152, + "narHash": "sha256-j7K/oZLy1ZZIpOsjq101IF7cz/i/UxY1ofIeNUfuuXc=", + "ref": "ghc-9.10", + "rev": "21e3f3250e88640087a1a60bee2cc113bf04509f", + "revCount": 62524, "submodules": true, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc" }, "original": { - "ref": "ghc-9.8", + "ref": "ghc-9.10", "submodules": true, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc" } }, - "ghc99": { + "ghc911": { "flake": false, "locked": { - "lastModified": 1701580282, - "narHash": "sha256-drA01r3JrXnkKyzI+owMZGxX0JameMzjK0W5jJE/+V4=", + "lastModified": 1710286031, + "narHash": "sha256-fz71zsU/ZukFMUsRNk2Ro3xTNMKsNrpvQtRtPqRI60c=", "ref": "refs/heads/master", - "rev": "f5eb0f2982e9cf27515e892c4bdf634bcfb28459", - "revCount": 62197, + "rev": "e6bfb85c842edca36754bb8914e725fbaa1a83a6", + "revCount": 62586, "submodules": true, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc" @@ -175,11 +175,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1708474932, - "narHash": "sha256-kjsvLdd+lwrEhc39SlC4fxJcbVOv5l4Eqzi5t5uoqAI=", + "lastModified": 1710721411, + "narHash": "sha256-0B1YATLPUKKOexhhfSFkTQlZH6o4yWJ/0WJeyZMxBKg=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "d6af4586a7a243d21ad2795349059db3609d5da5", + "rev": "99719945242bc0c965560ed708868aa088748524", "type": "github" }, "original": { @@ -197,8 +197,8 @@ "cardano-shell": "cardano-shell", "flake-compat": "flake-compat", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", - "ghc98X": "ghc98X", - "ghc99": "ghc99", + "ghc910X": "ghc910X", + "ghc911": "ghc911", "hackage": "hackage", "hls-1.10": "hls-1.10", "hls-2.0": "hls-2.0", @@ -227,11 +227,11 @@ "stackage": "stackage" }, "locked": { - "lastModified": 1708476603, - "narHash": "sha256-88+gzq160p036DjXkh/7izTjsJMwDCXBS60VlQIRnCY=", + "lastModified": 1710723015, + "narHash": "sha256-2qi4uMWfBWjVfVJgyUpcIy3RQZI4yHu2WzSEZZ4tGRc=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "c689f01730e5b6c6c16d3947a15689569844c38c", + "rev": "4e75d25fc02dccb3ee350b2401fba529942eb77b", "type": "github" }, "original": { @@ -401,18 +401,18 @@ "iserv-proxy": { "flake": false, "locked": { - "lastModified": 1691634696, - "narHash": "sha256-MZH2NznKC/gbgBu8NgIibtSUZeJ00HTLJ0PlWKCBHb0=", - "ref": "hkm/remote-iserv", - "rev": "43a979272d9addc29fbffc2e8542c5d96e993d73", - "revCount": 14, - "type": "git", - "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" + "lastModified": 1708894040, + "narHash": "sha256-Rv+PajrnuJ6AeyhtqzMN+bcR8z9+aEnrUass+N951CQ=", + "owner": "stable-haskell", + "repo": "iserv-proxy", + "rev": "2f2a318fd8837f8063a0d91f329aeae29055fba9", + "type": "github" }, "original": { - "ref": "hkm/remote-iserv", - "type": "git", - "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" + "owner": "stable-haskell", + "ref": "iserv-syms", + "repo": "iserv-proxy", + "type": "github" } }, "lowdown-src": { @@ -659,11 +659,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1708474155, - "narHash": "sha256-s0V+w3RulITBqvdYeOnhgijVru9EV5VpN6+f6RkzmnI=", + "lastModified": 1710461339, + "narHash": "sha256-l2/ekwA4Z4NjiaCZytZrBTag2VaAOBUvsNttsH6kH4E=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "1d0bba9280974be0f036203bd5ff5ff0ef204fa4", + "rev": "724970b7dc837bf0d813b91f821948c3c5cc719f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0da55058..082ea83b 100644 --- a/flake.nix +++ b/flake.nix @@ -28,7 +28,7 @@ }; rel8 = pkgs.haskell-nix.project { - compiler-nix-name = "ghc981"; + compiler-nix-name = "ghc982"; cabalProjectLocal = builtins.readFile ./cabal.project.haskell-nix; diff --git a/rel8.cabal b/rel8.cabal index 988ed479..c170dd8f 100644 --- a/rel8.cabal +++ b/rel8.cabal @@ -244,7 +244,7 @@ test-suite tests , data-dword , hasql , hasql-transaction - , hedgehog ^>= 1.0 || ^>= 1.1 || ^>= 1.2 || ^>= 1.3 || ^>= 1.4 + , hedgehog ^>= 1.0 || ^>= 1.1 || ^>= 1.2 || ^>= 1.3 || ^>= 1.4 || ^>= 1.5 , mmorph , network-ip , rel8