From 4a12826d6603266a559128c41c37e1bbe4a3afd8 Mon Sep 17 00:00:00 2001 From: reo101 Date: Sat, 11 May 2024 22:46:43 +0300 Subject: [PATCH] fix(nixVersions)!: `latest` -> `stable` Attribute `latest` is gone for some reason --- flake.lock | 94 ++++++++----------- .../aarch64-darwin/limonka/configuration.nix | 24 ++++- .../x86_64-darwin/limontozu/configuration.nix | 2 +- .../aarch64-linux/cheetah/configuration.nix | 2 +- .../x86_64-linux/homix/configuration.nix | 2 +- overlays/default.nix | 8 +- 6 files changed, 71 insertions(+), 61 deletions(-) diff --git a/flake.lock b/flake.lock index 465c19d..c9ac954 100644 --- a/flake.lock +++ b/flake.lock @@ -14,11 +14,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1714136352, - "narHash": "sha256-BtWQ2Th/jamO1SlD+2ASSW5Jaf7JhA/JLpQHk0Goqpg=", + "lastModified": 1715290355, + "narHash": "sha256-2T7CHTqBXJJ3ZC6R/4TXTcKoXWHcvubKNj9SfomURnw=", "owner": "ryantm", "repo": "agenix", - "rev": "24a7ea390564ccd5b39b7884f597cfc8d7f6f44e", + "rev": "8d37c5bdeade12b6479c85acd133063ab53187a0", "type": "github" }, "original": { @@ -153,11 +153,11 @@ ] }, "locked": { - "lastModified": 1714612856, - "narHash": "sha256-W7+rtMzRmdovzndN2NYUv5xzkbMudtQ3jbyFuGk0O1E=", + "lastModified": 1715445235, + "narHash": "sha256-SUu+oIWn+xqQIOlwfwNfS9Sek4i1HKsrLJchsDReXwA=", "owner": "nix-community", "repo": "disko", - "rev": "d57058eb09dd5ec00c746df34fe0a603ea744370", + "rev": "159d87ea5b95bbdea46f0288a33c5e1570272725", "type": "github" }, "original": { @@ -528,11 +528,11 @@ }, "hardware": { "locked": { - "lastModified": 1714746424, - "narHash": "sha256-Jdyw7VcM+jQ0uSXgjFj8UdXZ229yOvPNlYkKyKyHA4s=", + "lastModified": 1715148395, + "narHash": "sha256-lRxjTxY3103LGMjWdVqntKZHhlmMX12QUjeFrQMmGaE=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "3f017311191fe6d501ca2496a835d012f656ee9c", + "rev": "a4e2b7909fc1bdf30c30ef21d388fde0b5cdde4a", "type": "github" }, "original": { @@ -570,11 +570,11 @@ ] }, "locked": { - "lastModified": 1714679908, - "narHash": "sha256-KzcXzDvDJjX34en8f3Zimm396x6idbt+cu4tWDVS2FI=", + "lastModified": 1715380449, + "narHash": "sha256-716+f9Rj3wjSyD1xitCv2FcYbgPz1WIVDj+ZBclH99Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "9036fe9ef8e15a819fa76f47a8b1f287903fb848", + "rev": "d7682620185f213df384c363288093b486b2883f", "type": "github" }, "original": { @@ -606,11 +606,11 @@ ] }, "locked": { - "lastModified": 1714803703, - "narHash": "sha256-4m9wG6mZR0I2d7itErhpY0JqSHomNnUdoKfkjnYp+wI=", + "lastModified": 1715417624, + "narHash": "sha256-Wp3vGZRQYVrEveB9UXXZRDvRFrkw6rXXXLxj/6sbg7M=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "d0799ebebfb37fd2df6409dc8da622738c5930bb", + "rev": "8fef078acb3206be58ae5892a32d6ed75b695647", "type": "github" }, "original": { @@ -675,11 +675,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1714754042, - "narHash": "sha256-UcnoAT91ewoikYFeJb1S3p4rVS0tfV7/juhrDkS6kvU=", + "lastModified": 1715364077, + "narHash": "sha256-nQjGdKXTBmUrD6g+weg/uG1W0ITLKQ8Sqjwq9g2gCtw=", "owner": "neovim", "repo": "neovim", - "rev": "3a8265266e0c0fe31f34b7c0192e8ae7d83ae950", + "rev": "a2c158ad063bef6d43687dcf78956cd4e56717e4", "type": "github" }, "original": { @@ -700,11 +700,11 @@ ] }, "locked": { - "lastModified": 1714780994, - "narHash": "sha256-Qfc+wUSIx2IGTjFiYYk3kq58Cxr88WcBWtly8qN7BGA=", + "lastModified": 1715385991, + "narHash": "sha256-XuK/ezUQnh6bEWpaPI4FQqeDDH6DQ73mcOW4LSgLxEc=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "25d2ee5f16920301f53e22f606b34d4a90e10d65", + "rev": "58e1800c9fe31ebc56a8d2c036ade5abb3892a19", "type": "github" }, "original": { @@ -751,21 +751,6 @@ "type": "github" } }, - "nix-filter": { - "locked": { - "lastModified": 1705332318, - "narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "3449dc925982ad46246cfc36469baf66e1b64f17", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nix-filter", - "type": "github" - } - }, "nix-formatter-pack": { "inputs": { "nixpkgs": [ @@ -813,15 +798,14 @@ }, "nix-monitored": { "inputs": { - "nix-filter": "nix-filter", "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1708169437, - "narHash": "sha256-qR3UF6xf+ts/lCY2UlacKtNzZq/9jxsgsdXxiQ5gcPU=", + "lastModified": 1715016928, + "narHash": "sha256-JZx+enK1RlsMSJGmX/KTpADtxrCPDztQRKpO22LKZZM=", "owner": "ners", "repo": "nix-monitored", - "rev": "382ed0cad468cb0b5426bf0905da573efa96c218", + "rev": "776e497a13b8b403065d59c45a3fdc07b76a0db1", "type": "github" }, "original": { @@ -967,11 +951,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1707956935, - "narHash": "sha256-ZL2TrjVsiFNKOYwYQozpbvQSwvtV/3Me7Zwhmdsfyu4=", + "lastModified": 1714906307, + "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a4d4fe8c5002202493e87ec8dbc91335ff55552c", + "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", "type": "github" }, "original": { @@ -983,11 +967,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1714635257, - "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=", + "lastModified": 1715266358, + "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f", + "rev": "f1010e0469db743d14519a1efd37e23f8513d714", "type": "github" }, "original": { @@ -1101,11 +1085,11 @@ }, "nur": { "locked": { - "lastModified": 1714841099, - "narHash": "sha256-G45aWsyMZSvIB2HhuecIVgs+zpqRMDWoHkUPZPItlbw=", + "lastModified": 1715453178, + "narHash": "sha256-zGfCo5eLwErY81TfyLQVF00hVc/xe4mh/NzGj7hE0bs=", "owner": "nix-community", "repo": "NUR", - "rev": "5235f5f0626a9fd28c0949c0c1e6acfff59a5bb3", + "rev": "acdefc246fb529a7b0275454e39cb40512c60433", "type": "github" }, "original": { @@ -1472,11 +1456,11 @@ ] }, "locked": { - "lastModified": 1714133353, - "narHash": "sha256-oDA4fGiFPxwiLHTJjY2hWn06Dg4yFW+EH/U9FTL8oRY=", + "lastModified": 1715170163, + "narHash": "sha256-EuRzY3HI9sMMqPX7Yb7xkZaBoznP0mtS2O/Kk/r6fYk=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "751dd89e227c60e89c6362fc5cdd5cb814e3f1ba", + "rev": "9c0a853edcab5d60d28784c10b13392d7fabb9d7", "type": "github" }, "original": { @@ -1498,11 +1482,11 @@ ] }, "locked": { - "lastModified": 1714726694, - "narHash": "sha256-EZpShJM2csFe+EBFJyjVWs6/nPvQwiMuuWsmeltEMXg=", + "lastModified": 1715376937, + "narHash": "sha256-fXZmddq7ZrEaX0rT4n+46f+qpwMbOdhoY+fCRj70xts=", "owner": "zigtools", "repo": "zls", - "rev": "f6817ed3ca4d70c2181f96fbbf84cb533cd7205e", + "rev": "bb19beeb38a8c3df9a2408b8e15664415b8347ef", "type": "github" }, "original": { diff --git a/machines/nix-darwin/aarch64-darwin/limonka/configuration.nix b/machines/nix-darwin/aarch64-darwin/limonka/configuration.nix index bd6ec93..a8f4f96 100644 --- a/machines/nix-darwin/aarch64-darwin/limonka/configuration.nix +++ b/machines/nix-darwin/aarch64-darwin/limonka/configuration.nix @@ -10,7 +10,29 @@ nix = { # Ensure we can work with flakes - package = pkgs.nixVersions.latest-monitored; + package = pkgs.nixVersions.stable-monitored; + + # extraOptions = '' + # # Enable flakes and new 'nix' command + # experimental-features = nix-command flakes + # # Allow building multiple derivations in parallel + # max-jobs = auto + # # Deduplicate and optimize nix store + # auto-optimise-store = true + # # Keep outputs and derivations + # keep-outputs = true + # keep-derivations = true + # ''; + + # registry.nixpkgs.flake = inputs.nixpkgs; + # registry = + # lib.mapAttrs' + # (name: value: + # { + # name = name; + # value = { flake = value; }; + # }) + # inputs; settings = { # Enable flakes and new 'nix' command diff --git a/machines/nix-darwin/x86_64-darwin/limontozu/configuration.nix b/machines/nix-darwin/x86_64-darwin/limontozu/configuration.nix index 2f402b1..dca459a 100644 --- a/machines/nix-darwin/x86_64-darwin/limontozu/configuration.nix +++ b/machines/nix-darwin/x86_64-darwin/limontozu/configuration.nix @@ -33,7 +33,7 @@ nix = { # Ensure we can work with flakes - package = pkgs.nixVersions.latest; + package = pkgs.nixVersions.stable; # extraOptions = '' # # Enable flakes and new 'nix' command diff --git a/machines/nix-on-droid/aarch64-linux/cheetah/configuration.nix b/machines/nix-on-droid/aarch64-linux/cheetah/configuration.nix index c908f48..68e6380 100644 --- a/machines/nix-on-droid/aarch64-linux/cheetah/configuration.nix +++ b/machines/nix-on-droid/aarch64-linux/cheetah/configuration.nix @@ -23,7 +23,7 @@ keep-derivations = true ''; - nix.package = pkgs.nixVersions.latest; + nix.package = pkgs.nixVersions.stable; time.timeZone = "Europe/Sofia"; diff --git a/machines/nixos/x86_64-linux/homix/configuration.nix b/machines/nixos/x86_64-linux/homix/configuration.nix index 609cd59..fd0a71a 100644 --- a/machines/nixos/x86_64-linux/homix/configuration.nix +++ b/machines/nixos/x86_64-linux/homix/configuration.nix @@ -61,7 +61,7 @@ # }; nix = { - package = pkgs.nixVersions.latest; + package = pkgs.nixVersions.stable; # Enable flakes, the new `nix` commands and better support for flakes in it extraOptions = '' diff --git a/overlays/default.nix b/overlays/default.nix index fe22bd8..9740fa5 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -36,8 +36,12 @@ }; nixVersions = prev.nixVersions // { - latest-monitored = inputs.nix-monitored.packages.${final.system}.default.override { - nix = prev.nixVersions.latest; + stable-monitored = inputs.nix-monitored.packages.${final.system}.default.override { + nix = prev.nixVersions.stable; + nix-output-monitor = prev.nix-output-monitor; + }; + unstable-monitored = inputs.nix-monitored.packages.${final.system}.default.override { + nix = prev.nixVersions.unstable; nix-output-monitor = prev.nix-output-monitor; }; };