From fd2987c9fe01cb7d8830a705dfef04f187abc4b5 Mon Sep 17 00:00:00 2001 From: clerie Date: Thu, 16 Jan 2025 22:06:50 +0100 Subject: [PATCH] flake.lock: Update harmonia --- flake.lock | 20 ++++++++++---------- flake.nix | 2 +- flake/overlay.nix | 5 ++--- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index 6efbdbe..0e796b1 100644 --- a/flake.lock +++ b/flake.lock @@ -122,11 +122,11 @@ ] }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -238,16 +238,16 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1727121740, - "narHash": "sha256-72nDVSvUfZsLa2HbyricOpA0Eb8gxs/VST25b6DNBpM=", + "lastModified": 1733771848, + "narHash": "sha256-tqkTzUdwnTfVuCrcFag7YKgGkiR9srR45e4v0XMXVCY=", "owner": "nix-community", "repo": "harmonia", - "rev": "ff44006a30f93ac40d76c786e15149d901946c2b", + "rev": "c26731351ca38f4953a23ef5490358ffba955ab6", "type": "github" }, "original": { "owner": "nix-community", - "ref": "harmonia-v1.0.2", + "ref": "harmonia-v2.0.1", "repo": "harmonia", "type": "github" } @@ -754,11 +754,11 @@ ] }, "locked": { - "lastModified": 1711963903, - "narHash": "sha256-N3QDhoaX+paWXHbEXZapqd1r95mdshxToGowtjtYkGI=", + "lastModified": 1733662930, + "narHash": "sha256-9qOp6jNdezzLMxwwXaXZWPXosHbNqno+f7Ii/xftqZ8=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "49dc4a92b02b8e68798abd99184f228243b6e3ac", + "rev": "357cda84af1d74626afb7fb3bc12d6957167cda9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c9ac9fb..8fe1f74 100644 --- a/flake.nix +++ b/flake.nix @@ -21,7 +21,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; harmonia = { - url = "github:nix-community/harmonia/harmonia-v1.0.2"; + url = "github:nix-community/harmonia/harmonia-v2.0.1"; inputs.nixpkgs.follows = "nixpkgs"; }; hydra = { diff --git a/flake/overlay.nix b/flake/overlay.nix index cb4a2cd..21fe057 100644 --- a/flake/overlay.nix +++ b/flake/overlay.nix @@ -20,9 +20,8 @@ final: prev: { bij; inherit (chaosevents.packages.${final.system}) chaosevents; - harmonia = harmonia.packages.${final.system}.harmonia.override { - nixForHarmonia = final.nixVersions.nix_2_23; - }; + inherit (harmonia.packages.${final.system}) + harmonia; inherit (hydra.packages.${final.system}) hydra; inherit (nurausstieg.packages.${final.system})