From 21feab0889d6bcd1a9493d034883ee076d54bb74 Mon Sep 17 00:00:00 2001 From: Jordan Holt Date: Mon, 5 Aug 2024 17:56:44 +0100 Subject: [PATCH 1/3] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'disko': 'github:nix-community/disko/7e1b215a0a96efb306ad6440bf706d2b307dc267' (2024-08-01) → 'github:nix-community/disko/0257e44f4ad472b54f19a6dd1615aee7fa48ed49' (2024-08-05) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/05405724efa137a0b899cce5ab4dde463b4fd30b' (2024-08-01) → 'github:NixOS/nixpkgs/8b5b6723aca5a51edf075936439d9cd3947b7b2c' (2024-08-04) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/9f918d616c5321ad374ae6cb5ea89c9e04bf3e58' (2024-07-31) → 'github:NixOS/nixpkgs/d04953086551086b44b6f3c6b7eeb26294f207da' (2024-08-02) • Updated input 'nixvim': 'github:nix-community/nixvim/76f309d00fb5a6eeb59c13e9b36b4cf86a209d7f' (2024-08-01) → 'github:nix-community/nixvim/4e6974c619bd280789ef3697a73fcf7c20f70819' (2024-08-03) • Updated input 'nixvim/flake-parts': 'github:hercules-ci/flake-parts/9227223f6d922fee3c7b190b2cc238a99527bbb7' (2024-07-03) → 'github:hercules-ci/flake-parts/8471fe90ad337a8074e957b69ca4d0089218391d' (2024-08-01) • Updated input 'nixvim/nix-darwin': 'github:lnl7/nix-darwin/b47af8628624856ad6853168298f1f96364d92d6' (2024-08-01) → 'github:lnl7/nix-darwin/f7142b8024d6b70c66fd646e1d099d3aa5bfec49' (2024-08-02) • Updated input 'plasma-manager': 'github:nix-community/plasma-manager/b17a2666bcf400cf245528d143597d1480e298f8' (2024-08-03) → 'github:nix-community/plasma-manager/61d9342fb471cd3c45a047406428fba7b6fb49ad' (2024-08-04) --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index dda589b..d3e6941 100644 --- a/flake.lock +++ b/flake.lock @@ -107,11 +107,11 @@ ] }, "locked": { - "lastModified": 1722476845, - "narHash": "sha256-7gZ8uf3qOox8Vrwd+p9EhUHHLhhK8lis/5KcXGmIaow=", + "lastModified": 1722821805, + "narHash": "sha256-FGrUPUD+LMDwJsYyNSxNIzFMldtCm8wXiQuyL2PHSrM=", "owner": "nix-community", "repo": "disko", - "rev": "7e1b215a0a96efb306ad6440bf706d2b307dc267", + "rev": "0257e44f4ad472b54f19a6dd1615aee7fa48ed49", "type": "github" }, "original": { @@ -206,11 +206,11 @@ ] }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "type": "github" }, "original": { @@ -373,11 +373,11 @@ ] }, "locked": { - "lastModified": 1722500642, - "narHash": "sha256-Vls0TQRdplex1JslnBxEk3M26Q1vR+OSg+sk5rBG4DA=", + "lastModified": 1722609272, + "narHash": "sha256-Kkb+ULEHVmk07AX+OhwyofFxBDpw+2WvsXguUS2m6e4=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "b47af8628624856ad6853168298f1f96364d92d6", + "rev": "f7142b8024d6b70c66fd646e1d099d3aa5bfec49", "type": "github" }, "original": { @@ -459,11 +459,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1722421184, - "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=", + "lastModified": 1722630782, + "narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58", + "rev": "d04953086551086b44b6f3c6b7eeb26294f207da", "type": "github" }, "original": { @@ -490,11 +490,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1722519197, - "narHash": "sha256-VEdJmVU2eLFtLqCjTYJd1J7+Go8idAcZoT11IewFiRg=", + "lastModified": 1722791413, + "narHash": "sha256-rCTrlCWvHzMCNcKxPE3Z/mMK2gDZ+BvvpEVyRM4tKmU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "05405724efa137a0b899cce5ab4dde463b4fd30b", + "rev": "8b5b6723aca5a51edf075936439d9cd3947b7b2c", "type": "github" }, "original": { @@ -517,11 +517,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1722542912, - "narHash": "sha256-88fmVMPFs3ZN+W7Nqd3PYukUOfY4jwc5uvMJXnFhJ20=", + "lastModified": 1722688115, + "narHash": "sha256-Ubk5KzAp2Z4Dzmi81aGgabvy41QXjZMwNikDYm7+jS0=", "owner": "nix-community", "repo": "nixvim", - "rev": "76f309d00fb5a6eeb59c13e9b36b4cf86a209d7f", + "rev": "4e6974c619bd280789ef3697a73fcf7c20f70819", "type": "github" }, "original": { @@ -541,11 +541,11 @@ ] }, "locked": { - "lastModified": 1722693897, - "narHash": "sha256-Gpa3Gf60AqshNJKUP5mAmVImFFQ6BsWG+zbqx0JGFD4=", + "lastModified": 1722804745, + "narHash": "sha256-l6N3QaiDqN2QmHDAxjczQPLPCTv+Kp7PsrtJBltmhTo=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "b17a2666bcf400cf245528d143597d1480e298f8", + "rev": "61d9342fb471cd3c45a047406428fba7b6fb49ad", "type": "github" }, "original": { From e74656a17580fc879fd186a2575c216c9670df8b Mon Sep 17 00:00:00 2001 From: Jordan Holt Date: Mon, 5 Aug 2024 17:57:21 +0100 Subject: [PATCH 2/3] Add legacyPackages output --- flake.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/flake.nix b/flake.nix index fe7a2da..bb0b4f2 100644 --- a/flake.nix +++ b/flake.nix @@ -105,6 +105,12 @@ }; in { + legacyPackages = forEachSystem (system: + lib.packagesFromDirectoryRecursive { + callPackage = nixpkgs.legacyPackages.${system}.callPackage; + directory = ./pkgs; + }); + nixosConfigurations = { atlas = mkNixosSystem { system = "x86_64-linux"; name = "atlas"; }; eos = mkNixosSystem { system = "x86_64-linux"; name = "eos"; }; From c6222c90f40384378580d2d9de850aa44c9a6580 Mon Sep 17 00:00:00 2001 From: Jordan Holt Date: Mon, 5 Aug 2024 17:57:32 +0100 Subject: [PATCH 3/3] Add aarch64-linux build machine --- hosts/common.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/hosts/common.nix b/hosts/common.nix index 6fe3fe9..816a65c 100644 --- a/hosts/common.nix +++ b/hosts/common.nix @@ -42,6 +42,16 @@ extraOptions = '' experimental-features = nix-command flakes ''; + buildMachines = [ + { + hostName = "10.0.1.79"; + sshUser = "builder"; + system = "aarch64-linux"; + maxJobs = 6; + speedFactor = 1; + } + ]; + distributedBuilds = true; settings = { connect-timeout = 5; log-lines = 25;