From 14c19b80ef8321bc985e67ce080cdcbe0eb86356 Mon Sep 17 00:00:00 2001 From: Zuckerberg Date: Mon, 5 Feb 2024 11:19:15 -0700 Subject: [PATCH] Stop auto upgrade --- flake.lock | 81 ++++++++++++++++++++++++++------------ flake.nix | 5 +++ machines/ponyo/default.nix | 2 +- 3 files changed, 61 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 721cf11..6aa5007 100644 --- a/flake.lock +++ b/flake.lock @@ -6,14 +6,15 @@ "home-manager": "home-manager", "nixpkgs": [ "nixpkgs" - ] + ], + "systems": "systems" }, "locked": { - "lastModified": 1690228878, - "narHash": "sha256-9Xe7JV0krp4RJC9W9W9WutZVlw6BlHTFMiUP/k48LQY=", + "lastModified": 1703433843, + "narHash": "sha256-nmtA4KqFboWxxoOAA6Y1okHbZh+HsXaMPFkYHsoDRDw=", "owner": "ryantm", "repo": "agenix", - "rev": "d8c973fd228949736dedf61b7f8cc1ece3236792", + "rev": "417caa847f9383e111d1397039c9d4337d024bf0", "type": "github" }, "original": { @@ -69,11 +70,11 @@ ] }, "locked": { - "lastModified": 1673295039, - "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", + "lastModified": 1700795494, + "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "87b9d090ad39b25b2400029c64825fc2a8868943", + "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", "type": "github" }, "original": { @@ -95,11 +96,11 @@ ] }, "locked": { - "lastModified": 1686747123, - "narHash": "sha256-XUQK9kwHpTeilHoad7L4LjMCCyY13Oq383CoFADecRE=", + "lastModified": 1704875591, + "narHash": "sha256-eWRLbqRcrILgztU/m/k7CYLzETKNbv0OsT2GjkaNm8A=", "owner": "serokell", "repo": "deploy-rs", - "rev": "724463b5a94daa810abfc64a4f87faef4e00f984", + "rev": "1776009f1f3fb2b5d236b84d9815f2edee463a9b", "type": "github" }, "original": { @@ -108,14 +109,26 @@ "type": "github" } }, + "fix-nvidia-x11-latest": { + "flake": false, + "locked": { + "narHash": "sha256-fLopADeWElHn3zRLJxyRZf2pjXsPQL4K1NaZ9Dmaj3E=", + "type": "file", + "url": "https://github.com/NixOS/nixpkgs/pull/286084.diff" + }, + "original": { + "type": "file", + "url": "https://github.com/NixOS/nixpkgs/pull/286084.diff" + } + }, "flake-compat": { "flake": false, "locked": { - "lastModified": 1668681692, - "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -126,14 +139,14 @@ }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -150,11 +163,11 @@ ] }, "locked": { - "lastModified": 1682203081, - "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=", + "lastModified": 1703113217, + "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", "owner": "nix-community", "repo": "home-manager", - "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1", + "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", "type": "github" }, "original": { @@ -170,11 +183,11 @@ ] }, "locked": { - "lastModified": 1691292840, - "narHash": "sha256-NA+o/NoOOQhzAQwB2JpeKoG+iYQ6yn/XXVxaGd5HSQI=", + "lastModified": 1707016097, + "narHash": "sha256-V4lHr6hFQ3rK650dh64Xffxsf4kse9vUYWsM+ldjkco=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "6c626d54d0414d34c771c0f6f9d771bc8aaaa3c4", + "rev": "3e3dad2808379c522138e2e8b0eb73500721a237", "type": "github" }, "original": { @@ -185,11 +198,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1706515015, - "narHash": "sha256-eFfY5A7wlYy3jD/75lx6IJRueg4noE+jowl0a8lIlVo=", + "lastModified": 1706826059, + "narHash": "sha256-N69Oab+cbt3flLvYv8fYnEHlBsWwdKciNZHUbynVEOA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f4a8d6d5324c327dcc2d863eb7f3cc06ad630df4", + "rev": "25e3d4c0d3591c99929b1ec07883177f6ea70c9d", "type": "github" }, "original": { @@ -260,6 +273,7 @@ "agenix": "agenix", "dailybuild_modules": "dailybuild_modules", "deploy-rs": "deploy-rs", + "fix-nvidia-x11-latest": "fix-nvidia-x11-latest", "flake-utils": "flake-utils", "nix-index-database": "nix-index-database", "nixpkgs": "nixpkgs", @@ -307,6 +321,21 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1605370193, diff --git a/flake.nix b/flake.nix index 2143f8f..5bfcb4b 100644 --- a/flake.nix +++ b/flake.nix @@ -32,6 +32,10 @@ # prebuilt nix-index database nix-index-database.url = "github:Mic92/nix-index-database"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; + + # https://github.com/NixOS/nixpkgs/issues/286313 + fix-nvidia-x11-latest.url = "https://github.com/NixOS/nixpkgs/pull/286084.diff"; + fix-nvidia-x11-latest.flake = false; }; outputs = { self, nixpkgs, ... }@inputs: @@ -79,6 +83,7 @@ src = nixpkgs; patches = [ ./patches/gamepadui.patch + inputs.fix-nvidia-x11-latest ]; }; patchedNixpkgs = nixpkgs.lib.fix (self: (import "${patchedNixpkgsSrc}/flake.nix").outputs { self = nixpkgs; }); diff --git a/machines/ponyo/default.nix b/machines/ponyo/default.nix index f8bd537..4478083 100644 --- a/machines/ponyo/default.nix +++ b/machines/ponyo/default.nix @@ -5,7 +5,7 @@ ./hardware-configuration.nix ]; - system.autoUpgrade.enable = true; + # system.autoUpgrade.enable = true; # p2p mesh network services.tailscale.exitNode = true;