From d5741df89efc9c4828f88864e45719cf140a5452 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Mon, 12 Dec 2022 11:34:56 +0000 Subject: [PATCH] update --- flake.lock | 74 +++++++++++++++--------------------- flake.nix | 1 + nixos/distributed-builds.nix | 2 - 3 files changed, 31 insertions(+), 46 deletions(-) diff --git a/flake.lock b/flake.lock index 85989311..b18a7e10 100644 --- a/flake.lock +++ b/flake.lock @@ -191,11 +191,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1669724862, - "narHash": "sha256-GwLonjmyhnTGQRNfKcUCgMSKYj49ZehjjJulaM/yH18=", + "lastModified": 1670253003, + "narHash": "sha256-/tJIy4+FbsQyslq1ipyicZ2psOEd8dvl4OJ9lfisjd0=", "owner": "nix-community", "repo": "home-manager", - "rev": "e891b060e7d11bb8f7dedb86a41d804891a6f5a9", + "rev": "0e8125916b420e41bf0d23a0aa33fadd0328beb3", "type": "github" }, "original": { @@ -243,11 +243,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1669929738, - "narHash": "sha256-/j33Qvg9ciN8qfrjuEjs1fB61Av0/3HuQxXdLkoAn8E=", + "lastModified": 1670595719, + "narHash": "sha256-9jvA0QdcZtGWImiRZ8KRhXNsy5NxgZBm0TXtNLmFbyM=", "owner": "oxalica", "repo": "nil", - "rev": "ef9bdb801e73ffe95bf7dee69f6c78fcaae34c71", + "rev": "1c122ae707c6365ea731565daf307844df03e95e", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1669650994, - "narHash": "sha256-uwASLUfedIQ5q01TtMwZDEV2HCZr5nVPZjzVgCG+D5I=", + "lastModified": 1670174919, + "narHash": "sha256-XdQr3BUnrvVLRFunLWrZORhwYHDG0+9jUUe0Jv1pths=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7883883d135ce5b7eae5dce4bfa12262b85c1c46", + "rev": "9d87bc030a0bf3f00e953dbf095a7d8e852dab6b", "type": "github" }, "original": { @@ -273,29 +273,13 @@ "type": "github" } }, - "nixpkgs-22_05": { - "locked": { - "lastModified": 1669513802, - "narHash": "sha256-AmTRNi8bHgJlmaNe3r5k+IMFbbXERM/KarqveMAZmsY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6649e08812f579581bfb4cada3ba01e30485c891", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-22.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-master": { "locked": { - "lastModified": 1669985355, - "narHash": "sha256-W0IYvZD7BC+LQaAIL/JLeyEZTCi6LjlK8SRMHaO/65I=", + "lastModified": 1670834338, + "narHash": "sha256-ChIUEe/viHVyujwcITaF2njITCgeFpkv1MkvHJ3ej78=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f241e87c85ccd28ecf22455482f80536c49207c8", + "rev": "1499ad5337c274eb7b15e7cbc67d947507c01d65", "type": "github" }, "original": { @@ -307,11 +291,11 @@ }, "nixpkgs-nixos-unstable": { "locked": { - "lastModified": 1669791787, - "narHash": "sha256-KBfoA2fOI5+wCrm7PR+j7jHqXeTkVRPQ0m5fcKchyuU=", + "lastModified": 1670751203, + "narHash": "sha256-XdoH1v3shKDGlrwjgrNX/EN8s3c+kQV7xY6cLCE8vcI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e76c78d20685a043d23f5f9e0ccd2203997f1fb1", + "rev": "64e0bf055f9d25928c31fb12924e59ff8ce71e60", "type": "github" }, "original": { @@ -323,11 +307,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1669834992, - "narHash": "sha256-YnhZGHgb4C3Q7DSGisO/stc50jFb9F/MzHeKS4giotg=", + "lastModified": 1670772952, + "narHash": "sha256-b7V3cGtMNcQ5c6hwRqqX+eIuNUj+O3orsb64BKPR9yc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "596a8e828c5dfa504f91918d0fa4152db3ab5502", + "rev": "dfef2e61107dc19c211ead99a5a61374ad8317f4", "type": "github" }, "original": { @@ -339,11 +323,11 @@ }, "nur": { "locked": { - "lastModified": 1669805596, - "narHash": "sha256-g1CPQZ+1jGhY4bsjppk+gH5jfzzqmPlqGHg0zSYS3Hw=", + "lastModified": 1670819416, + "narHash": "sha256-ja1livEv48Y3piLmdKo0T+1cUHdSfmaHXOxOxJNbneA=", "owner": "nix-community", "repo": "NUR", - "rev": "c81b1e527f3a220abfa9bf8096153d52784c5007", + "rev": "068395203bcc46e2ed19843f508383982b153271", "type": "github" }, "original": { @@ -403,11 +387,11 @@ ] }, "locked": { - "lastModified": 1669775522, - "narHash": "sha256-6xxGArBqssX38DdHpDoPcPvB/e79uXyQBwpBcaO/BwY=", + "lastModified": 1670552927, + "narHash": "sha256-lCE51eAGrAFS4k9W5aDGFpVtOAwQQ/rFMN80PCDh0vo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "3158e47f6b85a288d12948aeb9a048e0ed4434d6", + "rev": "a0fdafd18c9cf599fde17fbaf07dbb20fa57eecb", "type": "github" }, "original": { @@ -421,14 +405,16 @@ "nixpkgs": [ "nixpkgs-stable" ], - "nixpkgs-22_05": "nixpkgs-22_05" + "nixpkgs-stable": [ + "nixpkgs-stable" + ] }, "locked": { - "lastModified": 1669714206, - "narHash": "sha256-9aiMbzRL8REsyi9U0eZ+lT4s7HaILA1gh9n2apKzLxU=", + "lastModified": 1670149631, + "narHash": "sha256-rwmtlxx45PvOeZNP51wql/cWjY3rqzIR3Oj2Y+V7jM0=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8295b8139ef7baadeb90c5cad7a40c4c9297ebf7", + "rev": "da98a111623101c64474a14983d83dad8f09f93d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0cb87e02..e6e5b53f 100644 --- a/flake.nix +++ b/flake.nix @@ -260,6 +260,7 @@ repo = "sops-nix"; ref = "master"; inputs.nixpkgs.follows = "nixpkgs-stable"; + inputs.nixpkgs-stable.follows = "nixpkgs-stable"; }; flake-compat = { diff --git a/nixos/distributed-builds.nix b/nixos/distributed-builds.nix index cadac6a8..9f8266a7 100644 --- a/nixos/distributed-builds.nix +++ b/nixos/distributed-builds.nix @@ -6,8 +6,6 @@ StrictHostKeyChecking=accept-new ''; - nix.settings.trusted-substituters = [ "nix-builder@bolty" ]; - nix.buildMachines = [{ hostName = "bolty"; sshUser = "nix-builder";