From 7df8c23c81758efb1c67cc24691bb99d6b1ee44f Mon Sep 17 00:00:00 2001 From: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com> Date: Mon, 20 Jun 2022 12:34:41 +0100 Subject: [PATCH] nix: update nix for new tls version (#744) --- flake.lock | 11 +++++++---- flake.nix | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index d2deeaa040..7c1fd19982 100644 --- a/flake.lock +++ b/flake.lock @@ -133,11 +133,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1647047557, - "narHash": "sha256-6A7jjz77f53GkvFxqVmeuqqXyDWsU24rUtFtOg68CAg=", + "lastModified": 1655687627, + "narHash": "sha256-E1uyic0vWHC6gtz2FYtnFE3JWhvmmBj1TU93qoJSxdg=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "fc07d4d4f2597334caa96f455cec190bdcc931f4", + "rev": "6634069475ef594a8a2be6c33301ba7e59149980", "type": "github" }, "original": { @@ -155,7 +155,9 @@ "cardano-shell": "cardano-shell", "flake-utils": "flake-utils_2", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", - "hackage": "hackage", + "hackage": [ + "hackage" + ], "hpc-coveralls": "hpc-coveralls", "nix-tools": "nix-tools", "nixpkgs": [ @@ -315,6 +317,7 @@ "root": { "inputs": { "flake-utils": "flake-utils", + "hackage": "hackage", "haskellNix": "haskellNix", "nixpkgs": "nixpkgs" } diff --git a/flake.nix b/flake.nix index 5001484ab8..2474dcbf78 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,7 @@ }; inputs.haskellNix.inputs.hackage.follows = "hackage"; inputs.flake-utils.url = "github:numtide/flake-utils"; - outputs = { self, haskellNix, nixpkgs, flake-utils }: + outputs = { self, haskellNix, nixpkgs, flake-utils, ... }: let systems = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; in flake-utils.lib.eachSystem systems (system: let pkgs = haskellNix.legacyPackages.${system}; in