Update packages.

This commit is contained in:
Tom Alexander
2026-10-21 13:25:53 -04:00
parent bb62d01ab7
commit b0dbf88de3
9 changed files with 21 additions and 23 deletions

View File

@@ -283,6 +283,7 @@ in
(disableOptimizations "zopfli") (disableOptimizations "zopfli")
(disableOptimizations "nototools") # Needs to use the same version of python as the zopfli package (disableOptimizations "nototools") # Needs to use the same version of python as the zopfli package
(disableOptimizations "lib2geom") # Tests failing: ellipse-test, elliptical-arc-test, line-test, polynomial-test (disableOptimizations "lib2geom") # Tests failing: ellipse-test, elliptical-arc-test, line-test, polynomial-test
(disableOptimizations "libjpeg_turbo") # Test failing: djpeg12-shared-3x2-float-prog-cmp
(final: prev: { (final: prev: {
instawow = prev.instawow.overrideAttrs ( instawow = prev.instawow.overrideAttrs (
finalAttrs: prevAttrs: finalAttrs: prevAttrs:

View File

@@ -22,11 +22,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1789770686, "lastModified": 1792526520,
"narHash": "sha256-uZkBR7yHdIKUFB5SZdfgh1qkGfI3XmYmI/lTiquxbck=", "narHash": "sha256-3hSJlv8mUVnZPMWK2+CM7a9O+nR6Z4mCh27NfLCmTPc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "725ea35e410ad83be4931d1bff7e090eacaf3563", "rev": "cedd626e11b635470fa6f9fdb8ad79b0075dd7f9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -123,11 +123,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1769548169, "lastModified": 1792739756,
"narHash": "sha256-03+JxvzmfwRu+5JafM0DLbxgHttOQZkUtDWBmeUkN8Y=", "narHash": "sha256-s0TeXWG5Ci75Y/Hzon0Z7NrN/fG773Rc54/z6oPFszQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "impermanence", "repo": "impermanence",
"rev": "7b1d382faf603b6d264f58627330f9faa5cba149", "rev": "fa627f4c8b8e92f58f58a73d99ee4e1304e64eb2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -185,11 +185,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1791260994, "lastModified": 1793110635,
"narHash": "sha256-Miqqk/ammqnTUxaoCyvtwoPeLbI1ksFyLxi/CazZpWY=", "narHash": "sha256-dhoW6VgFWlaodSY5jrBn+CF2FLmaUvDVgM7+C7T2+NM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "151fa4e8ddfdd8dd25d945ad94ed54a13de9f6e4", "rev": "31ecbaca1bdefa45dffc409f0250bd8039ea0010",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -45,7 +45,6 @@ in
"systemd.unit=getty.target" "systemd.unit=getty.target"
]; ];
boot.supportedFilesystems.zfs = true; boot.supportedFilesystems.zfs = true;
boot.initrd.systemd.enable = true;
networking.hostId = "04581ecf"; networking.hostId = "04581ecf";

View File

@@ -71,7 +71,6 @@
boot.loader.systemd-boot.memtest86.enable = true; boot.loader.systemd-boot.memtest86.enable = true;
# Check what will be lost with `zfs diff zroot/linux/root@blank` # Check what will be lost with `zfs diff zroot/linux/root@blank`
boot.initrd.systemd.enable = lib.mkDefault true;
boot.initrd.systemd.services.zfs-rollback = lib.mkIf config.me.rollback.enable { boot.initrd.systemd.services.zfs-rollback = lib.mkIf config.me.rollback.enable {
description = "Rollback ZFS root dataset to blank snapshot"; description = "Rollback ZFS root dataset to blank snapshot";
wantedBy = [ wantedBy = [

View File

@@ -123,7 +123,7 @@ in
kernel.version = lib.mkOption { kernel.version = lib.mkOption {
type = lib.types.str; type = lib.types.str;
# default = "linux"; # LTS # default = "linux"; # LTS
default = "linux_7_2"; # LTS default = "linux_7_2";
example = "linux_6_18"; example = "linux_6_18";
description = "What version of the kernl should we use."; description = "What version of the kernl should we use.";
}; };

View File

@@ -149,6 +149,7 @@
}) })
(disableOptimizationsPython3 "zopfli") (disableOptimizationsPython3 "zopfli")
(disableOptimizations "zopfli") (disableOptimizations "zopfli")
(disableOptimizations "libjpeg_turbo")
]; ];
# This option defines the first version of NixOS you have installed on this particular machine, # This option defines the first version of NixOS you have installed on this particular machine,

View File

@@ -22,11 +22,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1789770686, "lastModified": 1792526520,
"narHash": "sha256-uZkBR7yHdIKUFB5SZdfgh1qkGfI3XmYmI/lTiquxbck=", "narHash": "sha256-3hSJlv8mUVnZPMWK2+CM7a9O+nR6Z4mCh27NfLCmTPc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "725ea35e410ad83be4931d1bff7e090eacaf3563", "rev": "cedd626e11b635470fa6f9fdb8ad79b0075dd7f9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -123,11 +123,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1769548169, "lastModified": 1792739756,
"narHash": "sha256-03+JxvzmfwRu+5JafM0DLbxgHttOQZkUtDWBmeUkN8Y=", "narHash": "sha256-s0TeXWG5Ci75Y/Hzon0Z7NrN/fG773Rc54/z6oPFszQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "impermanence", "repo": "impermanence",
"rev": "7b1d382faf603b6d264f58627330f9faa5cba149", "rev": "fa627f4c8b8e92f58f58a73d99ee4e1304e64eb2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -164,11 +164,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1791260994, "lastModified": 1793110635,
"narHash": "sha256-Miqqk/ammqnTUxaoCyvtwoPeLbI1ksFyLxi/CazZpWY=", "narHash": "sha256-dhoW6VgFWlaodSY5jrBn+CF2FLmaUvDVgM7+C7T2+NM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "151fa4e8ddfdd8dd25d945ad94ed54a13de9f6e4", "rev": "31ecbaca1bdefa45dffc409f0250bd8039ea0010",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -45,7 +45,6 @@ in
"systemd.unit=getty.target" "systemd.unit=getty.target"
]; ];
boot.supportedFilesystems.zfs = true; boot.supportedFilesystems.zfs = true;
boot.initrd.systemd.enable = true;
networking.hostId = "04581ecf"; networking.hostId = "04581ecf";

View File

@@ -71,7 +71,6 @@
boot.loader.systemd-boot.memtest86.enable = true; boot.loader.systemd-boot.memtest86.enable = true;
# Check what will be lost with `zfs diff zroot/linux/root@blank` # Check what will be lost with `zfs diff zroot/linux/root@blank`
boot.initrd.systemd.enable = lib.mkDefault true;
boot.initrd.systemd.services.zfs-rollback = lib.mkIf config.me.rollback.enable { boot.initrd.systemd.services.zfs-rollback = lib.mkIf config.me.rollback.enable {
description = "Rollback ZFS root dataset to blank snapshot"; description = "Rollback ZFS root dataset to blank snapshot";
wantedBy = [ wantedBy = [