From 58a089bf4a6bf9a3cdfff81092a8d0dd2b34334f Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Fri, 17 Jun 2022 16:42:14 +0900 Subject: [PATCH] haskellPackages.hnix: small refactoring of overrides --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9def0e4aece4..397fbde6cbcb 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -240,10 +240,10 @@ self: super: { # 2020-06-05: HACK: does not pass own build suite - `dontCheck` # 2022-06-17: Use hnix-store 0.5 until hnix 0.17 hnix = generateOptparseApplicativeCompletion "hnix" (dontCheck ( - super.hnix.override { - hnix-store-core = hnix_store_core_0_5_0_0; - hnix-store-remote = hnix_store_remote_0_5_0_0.override { hnix-store-core = hnix_store_core_0_5_0_0; }; - } + super.hnix.overrideScope (hself: hsuper: { + hnix-store-core = hself.hnix-store-core_0_5_0_0; + hnix-store-remote = hself.hnix-store-remote_0_5_0_0; + }) )); # Too strict bounds on algebraic-graphs # https://github.com/haskell-nix/hnix-store/issues/180