From cf9a9e804b4824439cb529316091d3b28203d8e5 Mon Sep 17 00:00:00 2001 From: u_quark Date: Tue, 24 Oct 2023 18:52:50 +0100 Subject: [PATCH] Move to ghc963 and patched static-haskell-nix --- flake.lock | 17 +++++++++-------- flake.nix | 2 +- nix/default.nix | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 556840d..70ffdfb 100644 --- a/flake.lock +++ b/flake.lock @@ -68,11 +68,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1698096171, - "narHash": "sha256-kg1L47Nw447Z1yUky0MqopEmfm2kz7U8FvSsfS7c0Os=", + "lastModified": 1698165151, + "narHash": "sha256-YozCkD/Z2kS5BpE7R3bT48fOzaDU3B6wsi38TV1rKYU=", "owner": "u-quark", "repo": "nixpkgs", - "rev": "1d249b79f66f2a2f07508c154f708a5a7e4c1a8f", + "rev": "5425b6a643a9c17f3f7ed535ef3c4dc5e2b80179", "type": "github" }, "original": { @@ -96,15 +96,16 @@ "static-haskell": { "flake": false, "locked": { - "lastModified": 1689279840, - "narHash": "sha256-0xZIgywfj+XRKXPISxVz/HS+cwtiJmql/LKrlMEhwcE=", - "owner": "nh2", + "lastModified": 1698167192, + "narHash": "sha256-kXqKZFwjsORoHzffaX4ES5ZsI7xhYDJB70RUMUkQuvs=", + "owner": "u-quark", "repo": "static-haskell-nix", - "rev": "88f1e2d57e3f4cd6d980eb3d8f99d5e60040ad54", + "rev": "f0e821d443a7df1ee99ef23a0a000306aa053738", "type": "github" }, "original": { - "owner": "nh2", + "owner": "u-quark", + "ref": "gg", "repo": "static-haskell-nix", "type": "github" } diff --git a/flake.nix b/flake.nix index e1eb49c..458ade0 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ inputs = { nixpkgs.url = "github:u-quark/nixpkgs?ref=gg"; static-haskell = { - url = "github:nh2/static-haskell-nix"; + url = "github:u-quark/static-haskell-nix?ref=gg"; flake = false; }; libgit2 = { diff --git a/nix/default.nix b/nix/default.nix index b6be369..424305a 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -1,7 +1,7 @@ { inputs }: let - ghc = "ghc962"; + ghc = "ghc963"; pkgs = import inputs.nixpkgs { system = "x86_64-linux"; }; static-pkgs-overlay = import ./static-pkgs-overlay.nix { inherit inputs;