Update packages in nix.

This commit is contained in:
Tom Alexander 2026-01-15 18:10:05 -05:00
parent 42c433eb00
commit 4fd6e8641e
Signed by: talexander
GPG Key ID: 36C99E8B3C39D85F
9 changed files with 109 additions and 20 deletions

View File

@ -171,6 +171,18 @@
}); });
}) })
); );
disablePythonTests = (
package_name:
(final: prev: {
pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
(python-final: python-prev: {
"${package_name}" = python-prev."${package_name}".overridePythonAttrs (oldAttrs: {
doCheck = false;
});
})
];
})
);
in in
[ [
# (final: prev: { # (final: prev: {
@ -189,6 +201,52 @@
# (final: prev: { # (final: prev: {
# grub2 = (final.callPackage ./package/grub { }); # grub2 = (final.callPackage ./package/grub { });
# }) # })
(disableTests "coreutils")
(disableTests "coreutils-full")
(disableTests "libuv")
(final: prev: {
inherit (final.unoptimized) libtpms libjxl;
})
(final: prev: {
slurp = prev.slurp.overrideAttrs (old: {
version = "1.5.0";
src = final.fetchFromGitHub {
owner = "emersion";
repo = "slurp";
rev = "v1.5.0";
hash = "sha256-2M8f3kN6tihwKlUCp2Qowv5xD6Ufb71AURXqwQShlXI=";
};
});
})
# Works but probably sets python2's scipy to be python3:
#
# (final: prev: {
# pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
# (python-final: python-prev: {
# scipy = final.unoptimized.python3Packages.scipy;
# })
# ];
# })
# Does not work:
#
# (final: prev: {
# python3 = prev.python3.override {
# packageOverrides = python-final: python-prev: {
# scipy = final.unoptimized.python3.pkgs.scipy;
# };
# };
# })
# Maybe works?:
#
(final: prev: {
python3Packages = prev.python3Packages.override {
overrides = python-final: python-prev: {
scipy = final.unoptimized.python3.pkgs.scipy;
};
};
})
]; ];
# 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": 1764110879, "lastModified": 1769524058,
"narHash": "sha256-xanUzIb0tf3kJ+PoOFmXEXV1jM3PjkDT/TQ5DYeNYRc=", "narHash": "sha256-zygdD6X1PcVNR2PsyK4ptzrVEiAdbMqLos7utrMDEWE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "aecba248f9a7d68c5d1ed15de2d1c8a4c994a3c5", "rev": "71a3fc97d80881e91710fe721f1158d3b96ae14d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -94,13 +94,40 @@
"type": "github" "type": "github"
} }
}, },
"impermanence": { "home-manager": {
"inputs": {
"nixpkgs": [
"impermanence",
"nixpkgs"
]
},
"locked": { "locked": {
"lastModified": 1737831083, "lastModified": 1768598210,
"narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=", "narHash": "sha256-kkgA32s/f4jaa4UG+2f8C225Qvclxnqs76mf8zvTVPg=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "c47b2cc64a629f8e075de52e4742de688f930dc6",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"impermanence": {
"inputs": {
"home-manager": "home-manager",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1769548169,
"narHash": "sha256-03+JxvzmfwRu+5JafM0DLbxgHttOQZkUtDWBmeUkN8Y=",
"owner": "nix-community", "owner": "nix-community",
"repo": "impermanence", "repo": "impermanence",
"rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170", "rev": "7b1d382faf603b6d264f58627330f9faa5cba149",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -137,11 +164,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1763966396, "lastModified": 1770197578,
"narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -15,7 +15,10 @@
description = "My system configuration"; description = "My system configuration";
inputs = { inputs = {
impermanence.url = "github:nix-community/impermanence"; impermanence = {
url = "github:nix-community/impermanence";
inputs.nixpkgs.follows = "nixpkgs";
};
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
lanzaboote = { lanzaboote = {
url = "github:nix-community/lanzaboote/v0.4.2"; url = "github:nix-community/lanzaboote/v0.4.2";

View File

@ -37,7 +37,8 @@ in
(modulesPath + "/profiles/all-hardware.nix") (modulesPath + "/profiles/all-hardware.nix")
]; ];
boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_17; # boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_17;
boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux;
boot.zfs.package = pkgs.zfs_unstable; boot.zfs.package = pkgs.zfs_unstable;
boot.kernelParams = [ boot.kernelParams = [
"quiet" "quiet"

View File

@ -57,7 +57,7 @@ in
ipcalc ipcalc
gptfdisk # for cgdisk gptfdisk # for cgdisk
nix-output-monitor # For better view into nixos-rebuild nix-output-monitor # For better view into nixos-rebuild
nix-serve-ng # Serve nix store over http # nix-serve-ng # Serve nix store over http
cleanup_temporary_files cleanup_temporary_files
jq jq
inetutils # For whois inetutils # For whois

View File

@ -125,7 +125,7 @@ in
] ]
)) ))
final.nixd # nix language server final.nixd # nix language server
final.nixfmt-rfc-style # auto-formatting nix files through nixd final.nixfmt # auto-formatting nix files through nixd
final.clang # To compile tree-sitter grammars final.clang # To compile tree-sitter grammars
final.shellcheck final.shellcheck
final.cmake-language-server final.cmake-language-server

View File

@ -37,9 +37,9 @@
services.resolved = { services.resolved = {
enable = true; enable = true;
# dnssec = "true"; # dnssec = "true";
domains = [ "~." ]; settings.Resolve.Domains = [ "~." ];
fallbackDns = [ ]; settings.Resolve.FallbackDNS = [ ];
dnsovertls = "true"; settings.Resolve.DNSOverTLS = "true";
}; };
# Without this, systemd-resolved will send DNS requests for <X>.home.arpa to the per-link DNS server (172.16.0.1) which does not support DNS-over-TLS. This leads to the connection hanging and timing out. This causes firefox startup to take an extra 10+ seconds. # Without this, systemd-resolved will send DNS requests for <X>.home.arpa to the per-link DNS server (172.16.0.1) which does not support DNS-over-TLS. This leads to the connection hanging and timing out. This causes firefox startup to take an extra 10+ seconds.

View File

@ -52,7 +52,8 @@
(lib.mkIf (!config.me.optimizations.enable) ( (lib.mkIf (!config.me.optimizations.enable) (
lib.mkMerge [ lib.mkMerge [
{ {
boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_17; # boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_17;
boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux;
} }
] ]
)) ))
@ -90,7 +91,7 @@
HZ = lib.kernel.freeform "300"; HZ = lib.kernel.freeform "300";
HZ_300 = lib.kernel.yes; HZ_300 = lib.kernel.yes;
HZ_1000 = lib.kernel.no; HZ_1000 = lib.kernel.no;
} prev.linux_6_17; } prev.linux; # or prev.linux_6_17
} }
) )
(final: prev: { (final: prev: {

View File

@ -30,7 +30,6 @@
]; ];
}; };
users.root = { users.root = {
home = "/root";
files = [ files = [
".ssh/known_hosts" ".ssh/known_hosts"
]; ];