From ab58159651578c3353f816fb77b65956d9e37d7f Mon Sep 17 00:00:00 2001 From: Sorki Date: Sun, 24 Dec 2023 20:14:51 +0100 Subject: [PATCH] dhall-nix: allow hnix-0.17 (#2559) * dhall-nix: allow hnix-0.17 Closes #2556 * dhall-nixpkgs: allow hnix 0.17 * cabal.project: drop hnix override --- cabal.project | 5 ----- dhall-nix/dhall-nix.cabal | 2 +- dhall-nixpkgs/dhall-nixpkgs.cabal | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/cabal.project b/cabal.project index b70ea8492..906bdf46d 100644 --- a/cabal.project +++ b/cabal.project @@ -10,8 +10,3 @@ packages: ./dhall-openapi ./dhall-toml ./dhall-yaml - -source-repository-package - type: git - location: https://github.com/haskell-nix/hnix.git - tag: 2adbc502e62e755ca0372c913e6278ebe564d7d2 diff --git a/dhall-nix/dhall-nix.cabal b/dhall-nix/dhall-nix.cabal index 8147cdeee..6dca313db 100644 --- a/dhall-nix/dhall-nix.cabal +++ b/dhall-nix/dhall-nix.cabal @@ -30,7 +30,7 @@ Library containers < 0.7 , data-fix < 0.4 , dhall >= 1.42 && < 1.43, - hnix >= 0.16 && < 0.17, + hnix >= 0.16 && < 0.18, lens-family-core >= 1.0.0 && < 2.2 , neat-interpolation < 0.6 , text >= 0.8.0.0 && < 2.1 diff --git a/dhall-nixpkgs/dhall-nixpkgs.cabal b/dhall-nixpkgs/dhall-nixpkgs.cabal index 2b03c20e2..9075f40e5 100644 --- a/dhall-nixpkgs/dhall-nixpkgs.cabal +++ b/dhall-nixpkgs/dhall-nixpkgs.cabal @@ -24,7 +24,7 @@ Executable dhall-to-nixpkgs , data-fix , dhall >= 1.42.0 && < 1.43 , foldl < 1.5 - , hnix >= 0.10.1 && < 0.17 + , hnix >= 0.10.1 && < 0.18 , lens-family-core >= 1.0.0 && < 2.2 -- megaparsec follows SemVer: https://github.com/mrkkrp/megaparsec/issues/469#issuecomment-927918469 , megaparsec >= 7.0.0 && < 10