From 32cd05a2b8c32f1bb476f315fac01cd65a33a162 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Mon, 15 Sep 2025 17:56:49 -0700 Subject: [PATCH] [NixOS] Bump flake --- nixos/code.nix | 1 + nixos/flake.lock | 56 ++++++++++++++++----------------- nixos/flake.nix | 42 +++++++++++++++---------- nixos/machines/strixi-minaj.nix | 5 ++- nixos/overlay.nix | 23 +++++++------- 5 files changed, 70 insertions(+), 57 deletions(-) diff --git a/nixos/code.nix b/nixos/code.nix index da8887aa..c4ef486d 100644 --- a/nixos/code.nix +++ b/nixos/code.nix @@ -46,6 +46,7 @@ makeEnable config "myModules.code" true { # Rust rustup + cargo-sweep # Clojure boot diff --git a/nixos/flake.lock b/nixos/flake.lock index 0a15538d..150e6c23 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -1275,11 +1275,11 @@ ] }, "locked": { - "lastModified": 1755914636, - "narHash": "sha256-VJ+Gm6YsHlPfUCpmRQxvdiZW7H3YPSrdVOewQHAhZN8=", + "lastModified": 1757920978, + "narHash": "sha256-Mv16aegXLulgyDunijP6SPFJNm8lSXb2w3Q0X+vZ9TY=", "owner": "nix-community", "repo": "home-manager", - "rev": "8b55a6ac58b678199e5bba701aaff69e2b3281c0", + "rev": "11cc5449c50e0e5b785be3dfcb88245232633eb8", "type": "github" }, "original": { @@ -1446,11 +1446,11 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1755960879, - "narHash": "sha256-JsPWyKKiwVfBI62PcFOTljg66EgM2HTMyoQDplkSTWg=", + "lastModified": 1757961391, + "narHash": "sha256-xSEkYFBi+wW+CNHbRWElvaR1S7IMdmMpaI1gHd/+uXs=", "owner": "NixOS", "repo": "nix", - "rev": "c9211b0b2d52a26ed666780b763b39a5bddd3fb3", + "rev": "0b401e21993320da72a433fc2af5d6cf6d6a045a", "type": "github" }, "original": { @@ -1500,11 +1500,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1755261305, - "narHash": "sha256-EOqCupB5X5WoGVHVcfOZcqy0SbKWNuY3kq+lj1wHdu8=", + "lastModified": 1757937573, + "narHash": "sha256-B+MT526k5th4x22h213/CgzdkKWIaeaa0+Y0uuCkH/I=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "203a7b463f307c60026136dd1191d9001c43457f", + "rev": "134e117c969f42277f1c5e60c8fbcac103c2c454", "type": "github" }, "original": { @@ -1581,11 +1581,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1757745802, + "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "type": "github" }, "original": { @@ -1763,11 +1763,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1755442223, - "narHash": "sha256-VtMQg02B3kt1oejwwrGn50U9Xbjgzfbb5TV5Wtx8dKI=", + "lastModified": 1756178832, + "narHash": "sha256-O2CIn7HjZwEGqBrwu9EU76zlmA5dbmna7jL1XUmAId8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cd32a774ac52caaa03bcfc9e7591ac8c18617ced", + "rev": "d98ce345cdab58477ca61855540999c86577d19d", "type": "github" }, "original": { @@ -1795,11 +1795,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1754725699, - "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", + "lastModified": 1757745802, + "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", + "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "type": "github" }, "original": { @@ -1952,11 +1952,11 @@ "nixpkgs": "nixpkgs_14" }, "locked": { - "lastModified": 1752126388, - "narHash": "sha256-FSSo9sTqD0ddjliqTFemWwqCQmZG9efbx6RsOyV5d0c=", + "lastModified": 1757457586, + "narHash": "sha256-RPiaV+J9rPFNbsryeLpoVcR2JD54nCj8Oiaok8lGf64=", "ref": "refs/heads/master", - "rev": "890085e443e6b2541bf9823f02929fc5e6afafe7", - "revCount": 125, + "rev": "a989a7205790d62ee7c32ad2268d21eb98b637bf", + "revCount": 127, "type": "git", "url": "ssh://gitea@dev.railbird.ai:1123/railbird/secrets-flake.git" }, @@ -2396,11 +2396,11 @@ }, "unstable_4": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1757745802, + "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "type": "github" }, "original": { @@ -2560,11 +2560,11 @@ "unstable": "unstable_4" }, "locked": { - "lastModified": 1749923589, - "narHash": "sha256-fptL6mV90Ap5/gRYsAiU1k/a1uy+eiCpHN/RCPRHS6M=", + "lastModified": 1757314117, + "narHash": "sha256-3PdZZqpBHLBc52uVk23xFrXs2qiJdZI+z9iJmCRYAgM=", "owner": "xmonad", "repo": "xmonad", - "rev": "8113e0fe5566dd8841b7de664c364a26cef385fb", + "rev": "11d919cbdb04b73b7d1f5895a51ba1e1bb8af7f6", "type": "github" }, "original": { diff --git a/nixos/flake.nix b/nixos/flake.nix index 79207c07..71022d52 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -154,22 +154,32 @@ patchedSource = bootstrapPkgs.applyPatches { name = "nixpkgs-patched"; src = nixpkgs; - patches = [ - # Rumno service PR - (bootstrapPkgs.fetchpatch { - url = "https://github.com/NixOS/nixpkgs/pull/433540.patch"; - hash = "sha256-G4eJaX351/HMB0z4QNfgob+bVuqCcTEMGE7IPNcIGbw="; - }) - # git-sync-rs package - (bootstrapPkgs.fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/434160.patch"; - hash = "sha256-1xm75lWEKWbX0qsbeXWX3lRRZIFO3/sdrZZYJxKGD2o="; - }) - (bootstrapPkgs.fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/436061.patch"; - hash = "sha256-HZquaNBB+w5Hm5kdzvaGg7QAOgAf/EPBO7o7pKkIrMY="; - }) - ]; + patches = + map bootstrapPkgs.fetchpatch [ + # Rumno service PR + { + url = "https://github.com/NixOS/nixpkgs/pull/433540.patch"; + hash = "sha256-G4eJaX351/HMB0z4QNfgob+bVuqCcTEMGE7IPNcIGbw="; + } + # git-sync-rs package + { + url = "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/434160.patch"; + hash = "sha256-Tiz2ydzlWbxx7jW32afN0RBvmXnsbt7lUvj/RUkpNbc="; + } + { + url = "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/436061.patch"; + hash = "sha256-HZquaNBB+w5Hm5kdzvaGg7QAOgAf/EPBO7o7pKkIrMY="; + } + # The next two are codex bumps + { + url = "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/442764.patch"; + hash = "sha256-ag5NZrEVbTPtadoPYm4RsaCglHzF5R+iZSxP5R0A3Xo="; + } + { + url = "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/443228.patch"; + hash = "sha256-L//rNkk/2xduHLIhU6lnboLrHXieJTmfENLc8cR3qpg=="; + } + ]; }; # Get eval-config from patched source evalConfig = import "${patchedSource}/nixos/lib/eval-config.nix"; diff --git a/nixos/machines/strixi-minaj.nix b/nixos/machines/strixi-minaj.nix index 535f4a76..faa00ea6 100644 --- a/nixos/machines/strixi-minaj.nix +++ b/nixos/machines/strixi-minaj.nix @@ -22,8 +22,11 @@ myModules.tts.enable = false; hardware.enableRedistributableFirmware = true; + # nixpkgs.config.cudaSupport = true; + boot.loader.systemd-boot.configurationLimit = 5; + environment.systemPackages = with pkgs; [ android-studio ]; @@ -35,7 +38,7 @@ }; services.matter-server = { - enable = true; + enable = false; logLevel = "debug"; extraArgs = ["--bluetooth-adapter=0" "--enable-test-net-dcl"]; }; diff --git a/nixos/overlay.nix b/nixos/overlay.nix index df5ecc15..18610d30 100644 --- a/nixos/overlay.nix +++ b/nixos/overlay.nix @@ -143,19 +143,18 @@ final: prev: openpyxl pip requests - tox ]; in - final.python311.withPackages my-python-packages; + final.python3.withPackages my-python-packages; - claude-code = prev.claude-code.overrideAttrs (oldAttrs: rec { - version = "1.0.86"; - src = prev.fetchzip { - url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz"; - hash = "sha256-mVXS75KgeKgD7EI5t9X6+TkwjBFyBLOo4/m50sS9XdA="; - }; - npmDepsHash = ""; - }); + # claude-code = prev.claude-code.overrideAttrs (oldAttrs: rec { + # version = "1.0.86"; + # src = prev.fetchzip { + # url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz"; + # hash = "sha256-mVXS75KgeKgD7EI5t9X6+TkwjBFyBLOo4/m50sS9XdA="; + # }; + # npmDepsHash = ""; + # }); pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [ ( @@ -174,11 +173,11 @@ final: prev: url = "https://raw.githubusercontent.com/tronikos/chip-wheels/8a5ec21d114010723cf428ffe79e244da7562390/8766-Bypass-attestation-verification.patch"; sha256 = "sha256-RgmlPRSfw1PPMdHBzpoK2Drrb8nEagATY8Y5ngi7x0k="; }; - postPatch = '' + postPatch = (oldAttrs.postPatch or "") + '' pushd connectedhomeip patch -p1 < ${bypassAttestationVerificationPatch} popd - '' + oldAttrs.postPatch; + ''; }); } )