From ad6181663959d7cb0938aecc36dbf40898eb7b35 Mon Sep 17 00:00:00 2001 From: alejandro-angulo Date: Sat, 21 Sep 2024 21:56:21 -0700 Subject: [PATCH] Updated lockfile Stopped using `latestCompatibleLinuxPackages` because it was deprecated. See here: https://github.com/NixOS/nixpkgs/pull/341596 --- flake.lock | 24 ++++++++++++------------ systems/x86_64-linux/carbon/zfs.nix | 7 +------ systems/x86_64-linux/gospel/zfs.nix | 3 +-- 3 files changed, 14 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index ca3eb8d..8570850 100644 --- a/flake.lock +++ b/flake.lock @@ -288,11 +288,11 @@ ] }, "locked": { - "lastModified": 1726611255, - "narHash": "sha256-/bxaYvIK6/d3zqpW26QFS0rqfd0cO4qreSNWvYLTl/w=", + "lastModified": 1726902823, + "narHash": "sha256-Gkc7pwTVLKj4HSvRt8tXNvosl8RS9hrBAEhOjAE0Tt4=", "owner": "nix-community", "repo": "home-manager", - "rev": "d2493de5cd1da06b6a4c3e97f4e7d5dd791df457", + "rev": "14929f7089268481d86b83ed31ffd88713dcd415", "type": "github" }, "original": { @@ -369,11 +369,11 @@ ] }, "locked": { - "lastModified": 1726494069, - "narHash": "sha256-eBmurYEjTDfWbpJOO5jQu9yxoznOxLF/7IwYJyD+ljw=", + "lastModified": 1726817511, + "narHash": "sha256-r3R7zZzGklN0udSO/JhWbU/xyq6i1aXKKwfs33LUVls=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "934dff070150ec3f67aea4f1dbe6ad303870669f", + "rev": "bfa25c9065f4cb5d884a0ad70f6e82f55ae90448", "type": "github" }, "original": { @@ -384,11 +384,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1726489388, - "narHash": "sha256-JBHtN+n1HzKawpnOQAz6jdgvrtYV9c/kyzgoIdguQGo=", + "lastModified": 1726905744, + "narHash": "sha256-xyNtG5C+xvfsnOVEamFe9zCCnuNwk93K/TlFC/4DmCI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "dc8b0296f68f72f3fe77469c549a6f098555c2e9", + "rev": "b493dfd4a8cf9552932179e56ff3b5819a9b8381", "type": "github" }, "original": { @@ -400,11 +400,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726463316, - "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=", + "lastModified": 1726755586, + "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172", + "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e", "type": "github" }, "original": { diff --git a/systems/x86_64-linux/carbon/zfs.nix b/systems/x86_64-linux/carbon/zfs.nix index 045712a..23445ca 100644 --- a/systems/x86_64-linux/carbon/zfs.nix +++ b/systems/x86_64-linux/carbon/zfs.nix @@ -1,12 +1,7 @@ -{ - config, - pkgs, - ... -}: { +{pkgs, ...}: { boot.supportedFilesystems = ["zfs"]; networking.hostId = "b2d25606"; boot.zfs.devNodes = "/dev/disk/by-id"; - boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages; swapDevices = [ { device = "/dev/disk/by-id/nvme-SAMSUNG_MZVLW256HEHP-000L7_S35ENX1K539085-part4"; diff --git a/systems/x86_64-linux/gospel/zfs.nix b/systems/x86_64-linux/gospel/zfs.nix index 66151b0..334971a 100644 --- a/systems/x86_64-linux/gospel/zfs.nix +++ b/systems/x86_64-linux/gospel/zfs.nix @@ -1,7 +1,6 @@ -{config, ...}: { +{...}: { boot.supportedFilesystems = ["zfs"]; networking.hostId = "f8616592"; - boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages; boot.loader.efi.canTouchEfiVariables = false; boot.loader.systemd-boot.enable = true; users.users.root.initialHashedPassword = "$6$3Ps2Vmff.gUBkiCv$FCeCQjDvNTdWynQU81qtCXFHQht86w4unWNalUgkcyq7lkkI2klzRyTK3dZiQUjIrn8qPKtwJcY9SNdyE8v1L/";