From ed0d28443c762f4791836a7dc1ed172d17b76e61 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Sun, 13 Aug 2023 21:00:30 -0700 Subject: [PATCH] Update tinyboot --- flake.lock | 66 ++++++++++++++++---------------- nixos-configurations/default.nix | 7 +--- 2 files changed, 35 insertions(+), 38 deletions(-) diff --git a/flake.lock b/flake.lock index 6c7c5b54..bdeacb89 100644 --- a/flake.lock +++ b/flake.lock @@ -135,11 +135,11 @@ ] }, "locked": { - "lastModified": 1691743546, - "narHash": "sha256-nS2uWOeEmMgUBEMDCvwLlXBBCLkW7agDcMtOXuf9PDc=", + "lastModified": 1691999995, + "narHash": "sha256-8DyiH3zEdouwNhW68BkHrfoDYX9Cf1So6u8mCWN0iIo=", "owner": "nix-community", "repo": "disko", - "rev": "241c878d4b542fea7c61ed4421e9224af054ff56", + "rev": "6388d2859c91adab847b4922b726f61920074494", "type": "github" }, "original": { @@ -782,11 +782,11 @@ ] }, "locked": { - "lastModified": 1691856649, - "narHash": "sha256-1/KYCwNyOPpUoyno9Yj3zMHITQaW+wPzVlJFPOPPCo4=", + "lastModified": 1692081771, + "narHash": "sha256-LWhyDz3gi1RzTcW6e6iwfs4VuDWFajOexBKygNIqvQM=", "owner": "nix-community", "repo": "home-manager", - "rev": "406d34d919e9e8b831b531782cf5ef6995188566", + "rev": "18791781ea86cbec6bce8bcb847444b9c73b8b3b", "type": "github" }, "original": { @@ -849,11 +849,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1691323683, - "narHash": "sha256-G7kMLDbYN03VNO+QYymFIp0o9jv+gflUpde8V4iYri8=", + "lastModified": 1691928466, + "narHash": "sha256-1vmI7U9f/qOi4r/UjIbshVA1eSdOg4+XXD1hpt2flH0=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "99d95d9ca592022832e9f1b4d2a8327b8d50eb60", + "rev": "b4e1c090e8c81accee0998c467c9a8e4d416644c", "type": "github" }, "original": { @@ -890,11 +890,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1691634838, - "narHash": "sha256-mfNqnlv+DEusbFquyd3QOY08RZ9geaxqQ7gy0vByCoQ=", + "lastModified": 1691977839, + "narHash": "sha256-CyP+b/CapG8U2dyleyy4/vsDFQY4VQ0GyMU0shslTWk=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "d20f2a3c0d962e7e5ef868759d36d4ebbd0a707c", + "rev": "9c42d241950e9e24b8dec1b04e36d2a9e61e9078", "type": "github" }, "original": { @@ -973,11 +973,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1691282883, - "narHash": "sha256-YLu1Fs+J+hw0BebUhWIeFzSqhlsnf0K88RqhVJebF9E=", + "lastModified": 1691887428, + "narHash": "sha256-IB1C4SnEDLkvligfbmez88q3L4nWqHGSfG/Z6+3sJok=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "b1d35b759161787e1cda815c460050142bda9adb", + "rev": "586b1f1e3dad8d02c8428fff9126b2048dfab5bf", "type": "github" }, "original": { @@ -1125,11 +1125,11 @@ "nixpkgs_sirula": "nixpkgs_sirula" }, "locked": { - "lastModified": 1691849567, - "narHash": "sha256-KDRD8g6DV5TRmm6AwEYVjeq0tHOEdYlWbalTVdarUyE=", + "lastModified": 1692105445, + "narHash": "sha256-TaEtGRC0lZxPf7+5k+KA/hEru7TMWNyPeugMCW0vCsk=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "52c65bbb91aff75bcb053d21a1f0f0e1632dcdef", + "rev": "5da445dac4e1415d9a6051df2bfeb87cc6c5297e", "type": "github" }, "original": { @@ -1140,11 +1140,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1691654369, - "narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=", + "lastModified": 1691990649, + "narHash": "sha256-gMbKOiX1HwClRP9lADaaV/lnZr93NEaOFe4ApDx/zd8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e", + "rev": "6e287913f7b1ef537c97aa301b67c34ea46b640f", "type": "github" }, "original": { @@ -1156,11 +1156,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1691629382, - "narHash": "sha256-6bil2OX12qy2CD6dLDxSTKRu6aUKRZfT/Qw3pg1050Q=", + "lastModified": 1691974608, + "narHash": "sha256-S268S0UKxY/24m2peKN8v/HUO1Hi6CB4cfxZDUZf5do=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cd165f66c1551c602e6473b094708920f6d26fbd", + "rev": "a1fa57b4ba546ef8869237ae1341f393cb9b5806", "type": "github" }, "original": { @@ -1529,11 +1529,11 @@ "nixpkgs-stable": "nixpkgs-stable_7" }, "locked": { - "lastModified": 1691895982, - "narHash": "sha256-wScqSv0ZKlt11ST9t5/KUhnCr2S1sg9KcRte7MZUVa8=", + "lastModified": 1691915920, + "narHash": "sha256-4pitrahUZc1ftIw38CelScd+JYGUVZ4mQTMe3VAz44c=", "owner": "Mic92", "repo": "sops-nix", - "rev": "9d812be0a8ad4f22a6467c7dbc403d1af7c4655a", + "rev": "32603de0dc988d60a7b80774dd7aed1083cd9629", "type": "github" }, "original": { @@ -1767,11 +1767,11 @@ ] }, "locked": { - "lastModified": 1691637357, - "narHash": "sha256-jb6pqS7NmG4d+II2L6ltlLUv9VJMNG6YtvQNcugzYRY=", + "lastModified": 1692119955, + "narHash": "sha256-hKDWHy+sptyc35yInFRvdpHJ5nfutVq1EIkXt8Iq2LY=", "owner": "jmbaur", "repo": "tinyboot", - "rev": "a6914d74f55dc5626cc9fec3bfb7fa181c34086e", + "rev": "e9d7e288f5d3653a5b452a457485310d681281ca", "type": "github" }, "original": { @@ -1789,11 +1789,11 @@ ] }, "locked": { - "lastModified": 1691522377, - "narHash": "sha256-1LafgFJaSk53ccsTlI2gWSmIyxRJfFVyoaGJg0c3LjM=", + "lastModified": 1691833704, + "narHash": "sha256-ASGhgGduEgcD3gQZhGr8xtmZ3PlVY+m2HuPnIZDbu78=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "7b380d3cce8271b37394790b521ec2f7a6b248ad", + "rev": "19dee4bf6001849006a63f3435247316b0488e99", "type": "github" }, "original": { diff --git a/nixos-configurations/default.nix b/nixos-configurations/default.nix index 73ab5fea..c327a753 100644 --- a/nixos-configurations/default.nix +++ b/nixos-configurations/default.nix @@ -167,11 +167,8 @@ in bpi-r3-installer = mkInstaller { modules = [ - # ../nixos-modules/sd-image.nix - ({ lib, modulesPath, ... }: { - imports = [ "${modulesPath}/installer/sd-card/sd-image-aarch64.nix" ]; - boot.initrd.systemd.enable = true; - sdImage.populateFirmwareCommands = lib.mkForce ""; + ../nixos-modules/sd-image.nix + ({ ... }: { nixpkgs.hostPlatform = "aarch64-linux"; hardware.bpi-r3.enable = true; custom.server.enable = true; # limits packages needed for cross-compilation