From 586b692c5c0c63c7a79f87ef66f2b7a1172fc990 Mon Sep 17 00:00:00 2001 From: Andrea Bedini Date: Wed, 22 Mar 2023 13:23:34 +0800 Subject: [PATCH] Update hackage-nix independently from haskell-nix --- flake.lock | 13 ++++++++----- flake.nix | 5 ++++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index de46b90..7843ef5 100644 --- a/flake.lock +++ b/flake.lock @@ -270,14 +270,14 @@ "type": "github" } }, - "hackage": { + "hackage-nix": { "flake": false, "locked": { - "lastModified": 1677809131, - "narHash": "sha256-MQ+ybbu5VFA6ERvh8mXcYEVlBCTte4BDxRaILSwBdAk=", + "lastModified": 1679444578, + "narHash": "sha256-iAGg8IhYPCaJPCeo3hoacVXIGISCFZm1yTgAAvv5aes=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "4ea4b12737ea42e47eb5c6a7e4a3eafe9da2fc52", + "rev": "f3793d3d9fa159d0f3a652fc4a50b65ed0e86c27", "type": "github" }, "original": { @@ -296,7 +296,9 @@ "flake-compat": "flake-compat", "flake-utils": "flake-utils", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", - "hackage": "hackage", + "hackage": [ + "hackage-nix" + ], "hpc-coveralls": "hpc-coveralls", "hydra": "hydra", "iserv-proxy": "iserv-proxy", @@ -775,6 +777,7 @@ "haskell-nix", "flake-utils" ], + "hackage-nix": "hackage-nix", "haskell-nix": "haskell-nix", "nixpkgs": [ "haskell-nix", diff --git a/flake.nix b/flake.nix index 9a29da5..4c9834d 100644 --- a/flake.nix +++ b/flake.nix @@ -5,10 +5,13 @@ inputs = { nixpkgs.follows = "haskell-nix/nixpkgs-unstable"; haskell-nix.url = "github:input-output-hk/haskell.nix"; + haskell-nix.inputs.hackage.follows = "hackage-nix"; + hackage-nix.url = "github:input-output-hk/hackage.nix"; + hackage-nix.flake = false; flake-utils.follows = "haskell-nix/flake-utils"; }; - outputs = { self, nixpkgs, flake-utils, haskell-nix }: + outputs = { self, nixpkgs, flake-utils, haskell-nix, ... }: flake-utils.lib.eachSystem [ "x86_64-linux" ] (system: let