From 1773184e540adc53f3ff190aafcf1dfc23fb9be8 Mon Sep 17 00:00:00 2001 From: chn Date: Sun, 21 Sep 2025 09:31:34 +0800 Subject: [PATCH 01/30] switch to unstable --- flake.lock | 186 +++++++++++------------ flake.nix | 10 +- flake/lib/buildNixpkgsConfig/default.nix | 136 ++++++++--------- flake/lib/buildNixpkgsConfig/root.patch | 22 --- modules/default.nix | 2 - modules/services/gitea.nix | 1 - modules/system/gui.nix | 20 ++- packages/default.nix | 3 +- 8 files changed, 176 insertions(+), 204 deletions(-) delete mode 100644 flake/lib/buildNixpkgsConfig/root.patch diff --git a/flake.lock b/flake.lock index 168e23ef..9cc4d960 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1757804696, - "narHash": "sha256-jaxMO693lQQzZOpwSAYazGRIX+sgffvtmwIenN9zNWw=", + "lastModified": 1758386048, + "narHash": "sha256-xgzC5C+ZXTxGLJFe4sAx2bUjQNNHcDUO0ES3eDy0qHk=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "fc6a7063d4e4b9d05f05e9fda3cd980264b5b88b", + "rev": "8387778adde8625dcb8f2d4da87e7dcf16f53b4f", "type": "github" }, "original": { @@ -48,11 +48,11 @@ ] }, "locked": { - "lastModified": 1748433430, - "narHash": "sha256-rTmarmlP4SplEBAD+RM0kD5cB1F5g93H8ooSodxl8XE=", + "lastModified": 1758416785, + "narHash": "sha256-lW13btV9uMhK4l3F1WmcU2XR6iCqXE3Wy9VXSmTKhpw=", "owner": "CHN-beta", "repo": "bscpkgs", - "rev": "bd7d5b02b59c4807e551a43f43489f79206e326a", + "rev": "8c7e06735023e7eaf0f48d40ab21a1272a3e8406", "type": "github" }, "original": { @@ -88,11 +88,11 @@ ] }, "locked": { - "lastModified": 1757929733, - "narHash": "sha256-dzKGtCdGbW7v95MS6pxb97u025JP24QsqCLE5bHAumI=", + "lastModified": 1758270360, + "narHash": "sha256-yqh6EEhlpVWRoKl85o1s+QZ72UHWTvornnc3C0Ls484=", "owner": "catppuccin", "repo": "nix", - "rev": "039cd59357bc6fdd8d9848717069fbc9ee609a73", + "rev": "2e0aacdd6abbecd1b1c0511a2fcd1460a6bc6645", "type": "github" }, "original": { @@ -109,16 +109,16 @@ ], "jovian": "jovian", "nixpkgs": [ - "nixpkgs-unstable" + "nixpkgs" ], "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1757979374, - "narHash": "sha256-1ppp2L9mZsCe8H1GzV9Ni4PnXnYz1GDQPYurbPU/pZI=", + "lastModified": 1758066113, + "narHash": "sha256-dfoSTG24e8rT18QEFa4IoPd1JaHSaWmBDobja4pT4Mo=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "ed13c5539660d20490d07e3898977c2f39317920", + "rev": "3dca6a170fc07d0fb265bc7268397cb55a05bc9b", "type": "github" }, "original": { @@ -463,16 +463,16 @@ ] }, "locked": { - "lastModified": 1747563471, - "narHash": "sha256-NfsMVrftxBAHbqBns9Z5pInfwmwzBXgVS720qiRt4pw=", + "lastModified": 1730837930, + "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", "owner": "CHN-beta", "repo": "home-manager", - "rev": "501ca0e2eaf28fefae5bb41110a38f7e7d138be3", + "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", "type": "github" }, "original": { "owner": "CHN-beta", - "ref": "release-25.05", + "ref": "master", "repo": "home-manager", "type": "github" } @@ -517,11 +517,11 @@ "lepton": { "flake": false, "locked": { - "lastModified": 1754834936, - "narHash": "sha256-2AIUzfWp7RhhW5Ku1qYTxr0y+1qpfCIHPVv3wdI2VyU=", + "lastModified": 1757689200, + "narHash": "sha256-HaSTbF6JmAI2tvHJ8YItDpptmV2C8v2gf+fs8zuzbTw=", "owner": "black7375", "repo": "Firefox-UI-Fix", - "rev": "b0b977e658c3fbb24d14f44f720fb6272f7760ce", + "rev": "4645a41e7edd5c5ad895549dc9a1342b492d8323", "type": "github" }, "original": { @@ -583,16 +583,16 @@ "mumax": { "flake": false, "locked": { - "lastModified": 1746921784, - "narHash": "sha256-eJJeQn0lmLUWk63c6mZ9356Jtn7VQDvq4HHPgL/QD1U=", - "owner": "CHN-beta", - "repo": "mumax", - "rev": "89ab74064981ff5bf52886a40f96c355a9d0ea3e", + "lastModified": 1754383812, + "narHash": "sha256-Gu1Dfgjb2W3ljfvBdrAmlENdHjx6+sYfaxO4m/t1gRo=", + "owner": "mumax", + "repo": "3", + "rev": "c4ff426e871495105606b3bc8e15606dae65212f", "type": "github" }, "original": { - "owner": "CHN-beta", - "repo": "mumax", + "owner": "mumax", + "repo": "3", "type": "github" } }, @@ -615,11 +615,11 @@ "nc4nix": { "flake": false, "locked": { - "lastModified": 1757956114, - "narHash": "sha256-+fGr6UJv3vHHFGLLfblTrScJwW5VErLyAkBeJeQ1PDA=", + "lastModified": 1758387834, + "narHash": "sha256-or5aeO4lu/BI3WjN/mF7ur3xtKaQtEbgqJNimQSKAbA=", "owner": "helsinki-systems", "repo": "nc4nix", - "rev": "ed45d094a8b60253b1f78067dd3b551f8576b373", + "rev": "b7fc4e2464f4077a2f24277abb114074715bdfba", "type": "github" }, "original": { @@ -638,11 +638,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1758006511, - "narHash": "sha256-YmZX6Wydog4Q9p7dRZDFOFkUfCtQfoXRobmJdg3F1dg=", + "lastModified": 1758375815, + "narHash": "sha256-IAr+n58c+nfxGXmX4NRjfVfV8i5baHnB8LCWlB7XYHo=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "0be585b11314ac02804b4fe03196116c4f747d6d", + "rev": "a6b5a4263b1d6b5d1e07babd59bc66e91f492190", "type": "github" }, "original": { @@ -671,11 +671,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1758000903, - "narHash": "sha256-FyfB40rl2mbRGIvF2/6Iwv9xHDxOmhaE1MhlV6Efsg4=", + "lastModified": 1758370089, + "narHash": "sha256-0C7695SLx4hU9m3VW4fCrZdvyIY+3kFQTWELHA4hxRQ=", "owner": "YaLTeR", "repo": "niri", - "rev": "c30e5c91851d77d48ff2120f0e710501b19d61b4", + "rev": "a1dccedbb72da372d2a8a84022f37ccaa4d4a6e6", "type": "github" }, "original": { @@ -771,11 +771,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1757987447, - "narHash": "sha256-VbCSJEbiNtt8VTGkhCbSLwIs45013DHCXw2s8O27Xxs=", + "lastModified": 1758332902, + "narHash": "sha256-BNfeIARqtUb28MkqmOeoKZ6yDMVrcVGKENK42j1P+nc=", "owner": "nix-community", "repo": "nix4vscode", - "rev": "ac15473ac105ddb22395639470ad338e3c4fc7c9", + "rev": "9d7a3c416c7ad8cce7aa511f5ec25afc847cb955", "type": "github" }, "original": { @@ -898,6 +898,22 @@ "type": "github" } }, + "nixpkgs-2505": { + "locked": { + "lastModified": 1758415798, + "narHash": "sha256-Y6sSsTf2gjT1jLBlK/0fd8pzbK143AqOIPoawOVOrqE=", + "owner": "CHN-beta", + "repo": "nixpkgs", + "rev": "e6859abf26a6a4a113becf9c58dc5b18ed9a0de4", + "type": "github" + }, + "original": { + "owner": "CHN-beta", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-lib": { "locked": { "lastModified": 1754788789, @@ -915,11 +931,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1757810152, - "narHash": "sha256-Vp9K5ol6h0J90jG7Rm4RWZsCB3x7v5VPx588TQ1dkfs=", + "lastModified": 1758216857, + "narHash": "sha256-h1BW2y7CY4LI9w61R02wPaOYfmYo82FyRqHIwukQ6SY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9a094440e02a699be5c57453a092a8baf569bdad", + "rev": "d2ed99647a4b195f0bcc440f76edfa10aeb3b743", "type": "github" }, "original": { @@ -929,29 +945,13 @@ "type": "github" } }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1757823305, - "narHash": "sha256-goy+ZVzBAe/cN/Udsiqg7RdNA19jyJqO8x6KXnZ8Mfs=", - "owner": "CHN-beta", - "repo": "nixpkgs", - "rev": "db545f2ed84e23a80610792162a7a8adc888dcae", - "type": "github" - }, - "original": { - "owner": "CHN-beta", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { - "lastModified": 1757745802, - "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", + "lastModified": 1758277210, + "narHash": "sha256-iCGWf/LTy+aY0zFu8q12lK8KuZp7yvdhStehhyX1v8w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", + "rev": "8eaee110344796db060382e15d3af0a9fc396e0e", "type": "github" }, "original": { @@ -963,16 +963,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1758193033, - "narHash": "sha256-k23s7UQHOrGoX5zmeGU4jnkK7L6h6O3TJLYXmh2XnxA=", + "lastModified": 1758416163, + "narHash": "sha256-IycvqFyIqyG9mhqwm/4I0mi8u0vY847sBJ/Tt0yY9CY=", "owner": "CHN-beta", "repo": "nixpkgs", - "rev": "bc071500f57dc0acd13b85ba2629819bc3d63e0d", + "rev": "ad10336d56fcc811dc4bc5af2f8f2d0b71a407d0", "type": "github" }, "original": { "owner": "CHN-beta", - "ref": "nixos-25.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -984,11 +984,11 @@ ] }, "locked": { - "lastModified": 1748095155, - "narHash": "sha256-GjxejdecX9d7eExfDhUU4lMBOKDvad85Lgv0ppIp5a4=", + "lastModified": 1758416819, + "narHash": "sha256-ouVcRdXQsf7YcJeLnwlqUJPiaQ7lBSu0/UZF+9KQmCo=", "owner": "CHN-beta", "repo": "NixVirt", - "rev": "8bcc23e27a62297254d0e9c87281e650ff777132", + "rev": "df403740a490a9699bcbe3feb9a09b355ba1ab40", "type": "github" }, "original": { @@ -1000,11 +1000,11 @@ "nu-scripts": { "flake": false, "locked": { - "lastModified": 1757504985, - "narHash": "sha256-6yG4X5aMtNJMNW5e0cLJRWFmFdmhR12aBP/+It+paj4=", + "lastModified": 1758340610, + "narHash": "sha256-Bof9bsQZnjtc9MLcuTIjdtsX/lbWGKc1u9HgGZp8uD8=", "owner": "nushell", "repo": "nu_scripts", - "rev": "64a9e01f4e5bdaa536d6f33730c4c8f5103b1aa0", + "rev": "7ea6780a4137bef1d683fb16989c19a945891b54", "type": "github" }, "original": { @@ -1027,11 +1027,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1757961532, - "narHash": "sha256-jOr+7DN7gzI//X3Fcz7KaJrVVymDSf8v3hUT47PI/J0=", + "lastModified": 1758385983, + "narHash": "sha256-5jD5KKnOwySdzMrNFxJhcQx2qvTtAnxF88+Q8DMW3vA=", "owner": "linyinfeng", "repo": "nur-packages", - "rev": "0a987dd9224268924fd4e896aa319515be1e9146", + "rev": "11a5e4e59f6226329d9108bbe588fe55d7e3c35e", "type": "github" }, "original": { @@ -1054,11 +1054,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1758017498, - "narHash": "sha256-t2615sBDehQLPuFM4BvbFDfUw4ZcTz5YuF0JuRJQP28=", + "lastModified": 1758266791, + "narHash": "sha256-pkcLfIFyTGxEEzkySsKFj61n4+8I9K3Q385rakjnfrE=", "owner": "xddxdd", "repo": "nur-packages", - "rev": "79b113aaa2fa65c908f33f394b148e6ea57bb8fd", + "rev": "56da5271155907d90367506783e2e97d3106cec2", "type": "github" }, "original": { @@ -1083,11 +1083,11 @@ ] }, "locked": { - "lastModified": 1732501185, - "narHash": "sha256-Z0BpHelaGQsE5VD9hBsBHsvMU9h+Xt0kfkDJyFivZOU=", + "lastModified": 1758352462, + "narHash": "sha256-WsQb7grsm5IlPPGftzlaM41QtGRo/8NU53n9OwJMxdo=", "owner": "berberman", "repo": "nvfetcher", - "rev": "bdb14eab6fe9cefc29efe01e60c3a3f616d6b62a", + "rev": "c0b235b4476c968c3683485610e1ea7f024cef9e", "type": "github" }, "original": { @@ -1163,11 +1163,11 @@ ] }, "locked": { - "lastModified": 1756632588, - "narHash": "sha256-ydam6eggXf3ZwRutyCABwSbMAlX+5lW6w1SVZQ+kfSo=", + "lastModified": 1758185783, + "narHash": "sha256-6fX2CG8PzdBNwJGBISnf/nVHUVMZdCsekT1mP672Uh8=", "owner": "pjones", "repo": "plasma-manager", - "rev": "d47428e5390d6a5a8f764808a4db15929347cd77", + "rev": "6a7d78cebd9a0f84a508bec9bc47ac504c5f51f4", "type": "github" }, "original": { @@ -1263,7 +1263,7 @@ "nixpkgs-2305": "nixpkgs-2305", "nixpkgs-2311": "nixpkgs-2311", "nixpkgs-2411": "nixpkgs-2411", - "nixpkgs-unstable": "nixpkgs-unstable", + "nixpkgs-2505": "nixpkgs-2505", "nixvirt": "nixvirt", "nu-scripts": "nu-scripts", "nur-linyinfeng": "nur-linyinfeng", @@ -1291,11 +1291,11 @@ "rsshub": { "flake": false, "locked": { - "lastModified": 1758020674, - "narHash": "sha256-yqPO/dr3vYVUGB5Wfg9y2kbgWJNE7GTkqrj4+ofJvvs=", + "lastModified": 1758329173, + "narHash": "sha256-/xvlpCOL55MjBYsw5wOEdNAelRVLuVBksrd5sw7CXCI=", "owner": "DIYgod", "repo": "RSSHub", - "rev": "bd63108c12c22ba93af60adbb986987af0394e2c", + "rev": "eedb725e46ed2df8071f53fa36544b96230b39a4", "type": "github" }, "original": { @@ -1346,11 +1346,11 @@ "rycee": { "flake": false, "locked": { - "lastModified": 1757995413, - "narHash": "sha256-vaU/7/PXoym6vnspGxhR29V9klGe9iy9zmp6x7w38f8=", + "lastModified": 1758295658, + "narHash": "sha256-PsQSN226ZZ4KnweNspxKTzF8ztdPOAT6+gpGkxnygpg=", "owner": "rycee", "repo": "nur-expressions", - "rev": "4ae8996b3e139926c784acd22824cde46cd28833", + "rev": "7c0e1d343108cbaaf448353fadb62190246251a8", "type": "gitlab" }, "original": { @@ -1530,11 +1530,11 @@ ] }, "locked": { - "lastModified": 1756662192, - "narHash": "sha256-F1oFfV51AE259I85av+MAia221XwMHCOtZCMcZLK2Jk=", + "lastModified": 1758206697, + "narHash": "sha256-/DbPkh6PZOgfueCbs3uzlk4ASU2nPPsiVWhpMCNkAd0=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "1aabc6c05ccbcbf4a635fb7a90400e44282f61c4", + "rev": "128222dc911b8e2e18939537bed1762b7f3a04aa", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e16b17f6..8ef4c997 100644 --- a/flake.nix +++ b/flake.nix @@ -3,12 +3,12 @@ inputs = { - nixpkgs.url = "github:CHN-beta/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:CHN-beta/nixpkgs/nixos-unstable"; + nixpkgs-2505.url = "github:CHN-beta/nixpkgs/nixos-25.05"; nixpkgs-2411.url = "github:CHN-beta/nixpkgs/nixos-24.11"; nixpkgs-2311.url = "github:CHN-beta/nixpkgs/nixos-23.11"; nixpkgs-2305.url = "github:CHN-beta/nixpkgs/nixos-23.05"; - nixpkgs-unstable.url = "github:CHN-beta/nixpkgs/nixos-unstable"; - home-manager = { url = "github:CHN-beta/home-manager/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; + home-manager = { url = "github:CHN-beta/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; }; sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; nix-index-database = { url = "github:Mic92/nix-index-database"; inputs.nixpkgs.follows = "nixpkgs"; }; nur-xddxdd = { url = "github:xddxdd/nur-packages"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -23,7 +23,7 @@ chaotic = { url = "github:chaotic-cx/nyx"; - inputs = { nixpkgs.follows = "nixpkgs-unstable"; home-manager.follows = "home-manager"; }; + inputs = { nixpkgs.follows = "nixpkgs"; home-manager.follows = "home-manager"; }; }; catppuccin = { url = "github:catppuccin/nix"; inputs.nixpkgs.follows = "nixpkgs"; }; bscpkgs = { url = "github:CHN-beta/bscpkgs"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -46,7 +46,7 @@ v-sim = { url = "gitlab:l_sim/v_sim/master"; flake = false; }; rycee = { url = "gitlab:rycee/nur-expressions"; flake = false; }; lepton = { url = "github:black7375/Firefox-UI-Fix"; flake = false; }; - mumax = { url = "github:CHN-beta/mumax"; flake = false; }; + mumax = { url = "github:mumax/3"; flake = false; }; openxlsx = { url = "github:troldal/OpenXLSX?rev=f85f7f1bd632094b5d78d4d1f575955fc3801886"; flake = false; }; sqlite-orm = { url = "github:fnc12/sqlite_orm"; flake = false; }; nc4nix = { url = "github:helsinki-systems/nc4nix"; flake = false; }; diff --git a/flake/lib/buildNixpkgsConfig/default.nix b/flake/lib/buildNixpkgsConfig/default.nix index 9342199a..d69e58c2 100644 --- a/flake/lib/buildNixpkgsConfig/default.nix +++ b/flake/lib/buildNixpkgsConfig/default.nix @@ -64,14 +64,8 @@ in platformConfig // libvirt = (prev.libvirt.override { iptables = final.nftables; }).overrideAttrs (prev: { patches = prev.patches or [] ++ [ ./libvirt.patch ]; }); podman = prev.podman.override { iptables = final.nftables; }; - root = (prev.root.override { stdenv = final.gcc13Stdenv; }).overrideAttrs (prev: - { - patches = prev.patches or [] ++ [ ./root.patch ]; - cmakeFlags = prev.cmakeFlags ++ [ "-DCMAKE_CXX_STANDARD=23" ]; - }); + root = prev.root.overrideAttrs (prev: { cmakeFlags = prev.cmakeFlags ++ [ "-DCMAKE_CXX_STANDARD=23" ]; }); boost188 = prev.boost188.overrideAttrs (prev: { patches = prev.patches or [] ++ [ ./boost188.patch ]; }); - inherit (final.pkgs-2411) iio-sensor-proxy; - inherit (final.pkgs-unstable) bees; } // ( let @@ -83,19 +77,19 @@ in platformConfig // pkgs-2305 = "nixpkgs-2305"; pkgs-2311 = "nixpkgs-2311"; pkgs-2411 = { source = "nixpkgs-2411"; overlays = [ inputs.topInputs.bscpkgs.overlays.default ]; }; - pkgs-unstable = - { - source = "nixpkgs-unstable"; - overlays = - [ - inputs.topInputs.self.overlays.default - (_: _: - { - genericPackages = import inputs.topInputs.nixpkgs-unstable - { inherit system; config = { allowUnfree = true; inherit allowInsecurePredicate; }; }; - }) - ]; - }; + # pkgs-unstable = + # { + # source = "nixpkgs-unstable"; + # overlays = + # [ + # inputs.topInputs.self.overlays.default + # (_: _: + # { + # genericPackages = import inputs.topInputs.nixpkgs-unstable + # { inherit system; config = { allowUnfree = true; inherit allowInsecurePredicate; }; }; + # }) + # ]; + # }; }; packages = name: let flakeSource = inputs.topInputs.${source.${name}.source or source.${name}}; @@ -112,56 +106,56 @@ in platformConfig // in builtins.listToAttrs (builtins.map (name: { inherit name; value = packages name; }) (builtins.attrNames source)) ) - // (inputs.lib.optionalAttrs (prev.stdenv.hostPlatform.avx512Support) - { gsl = prev.gsl.overrideAttrs { doCheck = false; }; }) - // (inputs.lib.optionalAttrs (nixpkgs.march != null && !prev.stdenv.hostPlatform.avx512Support) - { libhwy = prev.libhwy.override { stdenv = final.genericPackages.stdenv; }; }) - // (inputs.lib.optionalAttrs (nixpkgs.march != null) - { - libinsane = prev.libinsane.overrideAttrs (prev: - { nativeCheckInputs = builtins.filter (p: p.pname != "valgrind") prev.nativeCheckInputs; }); - lib2geom = prev.lib2geom.overrideAttrs (prev: { doCheck = false; }); - libreoffice-qt6-fresh = prev.libreoffice-qt6-fresh.override (prev: - { unwrapped = prev.unwrapped.overrideAttrs (prev: { postPatch = prev.postPatch or "" + - '' - sed -i '/CPPUNIT_TEST.testDubiousArrayFormulasFODS/d' sc/qa/unit/functions_array.cxx - '';});}); - libreoffice-still = prev.libreoffice-still.override (prev: - { unwrapped = prev.unwrapped.overrideAttrs (prev: { postPatch = prev.postPatch or "" + - '' - sed -i '/CPPUNIT_TEST.testDubiousArrayFormulasFODS/d' sc/qa/unit/functions_array.cxx - '';});}); - opencolorio = prev.opencolorio.overrideAttrs (prev: { doCheck = false; }); - openvswitch = prev.openvswitch.overrideAttrs (prev: { doCheck = false; }); - rapidjson = prev.rapidjson.overrideAttrs { doCheck = false; }; - valkey = prev.valkey.overrideAttrs { doCheck = false; }; - # -march=xxx cause embree build failed - # https://github.com/embree/embree/issues/115 - embree = prev.embree.override { stdenv = final.genericPackages.stdenv; }; - simde = prev.simde.override { stdenv = final.genericPackages.stdenv; }; - ctranslate2 = prev.ctranslate2.overrideAttrs (prev: - { cmakeFlags = prev.cmakeFlags or [] ++ [ "-DENABLE_CPU_DISPATCH=OFF" ]; }); - pythonPackagesExtensions = prev.pythonPackagesExtensions or [] ++ [(final: prev: - ( - { - scipy = prev.scipy.overridePythonAttrs (prev: - { disabledTests = prev.disabledTests or [] ++ [ "test_hyp2f1" ]; }); - rich = prev.rich.overridePythonAttrs (prev: - { disabledTests = prev.disabledTests or [] ++ [ "test_brokenpipeerror" ]; }); - } - // (inputs.lib.optionalAttrs (nixpkgs.march != null && !prev.stdenv.hostPlatform.avx2Support) - { - numcodecs = prev.numcodecs.overridePythonAttrs (prev: - { - disabledTests = prev.disabledTests or [] - ++ [ "test_encode_decode" "test_partial_decode" "test_blosc" ]; - }); - }) - ))]; - inherit (final.pkgs-2411) intelPackages_2023; - }) - // (inputs.lib.optionalAttrs (nixpkgs.march == "silvermont") - { c-blosc = prev.c-blosc.overrideAttrs { doCheck = false; }; }) - // (inputs.lib.optionalAttrs (nixpkgs.arch or null == "aarch64") { nix = final.nixVersions.nix_2_29; }) + # // (inputs.lib.optionalAttrs (prev.stdenv.hostPlatform.avx512Support) + # { gsl = prev.gsl.overrideAttrs { doCheck = false; }; }) + # // (inputs.lib.optionalAttrs (nixpkgs.march != null && !prev.stdenv.hostPlatform.avx512Support) + # { libhwy = prev.libhwy.override { stdenv = final.genericPackages.stdenv; }; }) + # // (inputs.lib.optionalAttrs (nixpkgs.march != null) + # { + # libinsane = prev.libinsane.overrideAttrs (prev: + # { nativeCheckInputs = builtins.filter (p: p.pname != "valgrind") prev.nativeCheckInputs; }); + # lib2geom = prev.lib2geom.overrideAttrs (prev: { doCheck = false; }); + # libreoffice-qt6-fresh = prev.libreoffice-qt6-fresh.override (prev: + # { unwrapped = prev.unwrapped.overrideAttrs (prev: { postPatch = prev.postPatch or "" + + # '' + # sed -i '/CPPUNIT_TEST.testDubiousArrayFormulasFODS/d' sc/qa/unit/functions_array.cxx + # '';});}); + # libreoffice-still = prev.libreoffice-still.override (prev: + # { unwrapped = prev.unwrapped.overrideAttrs (prev: { postPatch = prev.postPatch or "" + + # '' + # sed -i '/CPPUNIT_TEST.testDubiousArrayFormulasFODS/d' sc/qa/unit/functions_array.cxx + # '';});}); + # opencolorio = prev.opencolorio.overrideAttrs (prev: { doCheck = false; }); + # openvswitch = prev.openvswitch.overrideAttrs (prev: { doCheck = false; }); + # rapidjson = prev.rapidjson.overrideAttrs { doCheck = false; }; + # valkey = prev.valkey.overrideAttrs { doCheck = false; }; + # # -march=xxx cause embree build failed + # # https://github.com/embree/embree/issues/115 + # embree = prev.embree.override { stdenv = final.genericPackages.stdenv; }; + # simde = prev.simde.override { stdenv = final.genericPackages.stdenv; }; + # ctranslate2 = prev.ctranslate2.overrideAttrs (prev: + # { cmakeFlags = prev.cmakeFlags or [] ++ [ "-DENABLE_CPU_DISPATCH=OFF" ]; }); + # pythonPackagesExtensions = prev.pythonPackagesExtensions or [] ++ [(final: prev: + # ( + # { + # scipy = prev.scipy.overridePythonAttrs (prev: + # { disabledTests = prev.disabledTests or [] ++ [ "test_hyp2f1" ]; }); + # rich = prev.rich.overridePythonAttrs (prev: + # { disabledTests = prev.disabledTests or [] ++ [ "test_brokenpipeerror" ]; }); + # } + # // (inputs.lib.optionalAttrs (nixpkgs.march != null && !prev.stdenv.hostPlatform.avx2Support) + # { + # numcodecs = prev.numcodecs.overridePythonAttrs (prev: + # { + # disabledTests = prev.disabledTests or [] + # ++ [ "test_encode_decode" "test_partial_decode" "test_blosc" ]; + # }); + # }) + # ))]; + # inherit (final.pkgs-2411) intelPackages_2023; + # }) + # // (inputs.lib.optionalAttrs (nixpkgs.march == "silvermont") + # { c-blosc = prev.c-blosc.overrideAttrs { doCheck = false; }; }) + # // (inputs.lib.optionalAttrs (nixpkgs.arch or null == "aarch64") { nix = final.nixVersions.nix_2_29; }) )]; } diff --git a/flake/lib/buildNixpkgsConfig/root.patch b/flake/lib/buildNixpkgsConfig/root.patch deleted file mode 100644 index 493e1676..00000000 --- a/flake/lib/buildNixpkgsConfig/root.patch +++ /dev/null @@ -1,22 +0,0 @@ -From ab80270dd50f4ae08e452daa3fd0eccc7f9f96ee Mon Sep 17 00:00:00 2001 -From: Danilo Piparo -Date: Sat, 14 Dec 2024 07:45:22 +0100 -Subject: [PATCH 1/2] [CMake] Allow to process cxx23 option - ---- - cmake/modules/CheckCompiler.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/modules/CheckCompiler.cmake b/cmake/modules/CheckCompiler.cmake -index 883bf0e2daed1..c2ac5df869797 100644 ---- a/cmake/modules/CheckCompiler.cmake -+++ b/cmake/modules/CheckCompiler.cmake -@@ -161,7 +161,7 @@ set(CMAKE_CXX_STANDARD ${CXX_STANDARD_STRING} CACHE STRING "") - set(CMAKE_CXX_STANDARD_REQUIRED TRUE) - set(CMAKE_CXX_EXTENSIONS FALSE CACHE BOOL "") - --if(NOT CMAKE_CXX_STANDARD MATCHES "17|20") -+if(NOT CMAKE_CXX_STANDARD MATCHES "17|20|23") - message(FATAL_ERROR "Unsupported C++ standard: ${CMAKE_CXX_STANDARD}. Supported standards are: 17, 20.") - endif() - diff --git a/modules/default.nix b/modules/default.nix index 68a7165b..3f5b3670 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -14,8 +14,6 @@ inputs: let inherit (inputs) topInputs; in topInputs.nixvirt.nixosModules.default topInputs.niri.nixosModules.niri { config.niri-flake.cache.enable = false; } - # TODO: Remove after next release - "${topInputs.nixpkgs-unstable}/nixos/modules/services/hardware/lact.nix" (inputs: { config = diff --git a/modules/services/gitea.nix b/modules/services/gitea.nix index 49f8309f..86a712d8 100644 --- a/modules/services/gitea.nix +++ b/modules/services/gitea.nix @@ -56,7 +56,6 @@ inputs: "cron.git_gc_repos" = { ENABLED = true; SCHEDULE = "@monthly"; TIMEOUT = "2h"; }; "cron.gc_lfs" = { ENABLED = true; SCHEDULE = "@monthly"; NUMBER_TO_CHECK_PER_REPO = 0; }; }; - package = inputs.pkgs.pkgs-unstable.gitea; }; anubis.instances.gitea.settings = { diff --git a/modules/system/gui.nix b/modules/system/gui.nix index 79638868..d2974e30 100644 --- a/modules/system/gui.nix +++ b/modules/system/gui.nix @@ -43,17 +43,21 @@ inputs: programs.dconf.enable = true; nixos.user.sharedModules = [(hmInputs: { - config.gtk = + config = { - enable = true; - theme.name = "Breeze"; - gtk2 = + gtk = { - extraConfig = ''gtk-im-module="fcitx"''; - configLocation = "${hmInputs.config.xdg.configHome}/gtk-2.0/gtkrc"; + enable = true; + theme.name = "Breeze"; + gtk2 = + { + extraConfig = ''gtk-im-module="fcitx"''; + configLocation = "${hmInputs.config.xdg.configHome}/gtk-2.0/gtkrc"; + }; + gtk3.extraConfig.gtk-im-module = "fcitx"; + gtk4.extraConfig.gtk-im-module = "fcitx"; }; - gtk3.extraConfig.gtk-im-module = "fcitx"; - gtk4.extraConfig.gtk-im-module = "fcitx"; + home.file."${hmInputs.config.xdg.configHome}/gtk-2.0/gtkrc".force = true; }; })]; }) diff --git a/packages/default.nix b/packages/default.nix index 7c10765e..dc6d4dde 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -145,8 +145,7 @@ inputs: rec speedtest = inputs.pkgs.callPackage ./speedtest.nix { src = inputs.topInputs.speedtest; }; atat = inputs.pkgs.callPackage ./atat.nix { src = inputs.topInputs.self.src.atat; }; atomkit = inputs.pkgs.callPackage ./atomkit.nix { src = inputs.topInputs.self.src.atomkit; }; - xinli = inputs.pkgs.callPackage ./xinli - { inherit biu; stdenv = inputs.pkgs.clang18Stdenv; inherit (inputs.pkgs.pkgs-unstable) httplib; }; + xinli = inputs.pkgs.callPackage ./xinli { inherit biu; stdenv = inputs.pkgs.clang18Stdenv; }; fromYaml = content: builtins.fromJSON (builtins.readFile (inputs.pkgs.runCommand "toJSON" {} From ddcd209b5114775563cc62ff96c0e589626c1703 Mon Sep 17 00:00:00 2001 From: chn Date: Sun, 21 Sep 2025 21:23:14 +0800 Subject: [PATCH 02/30] module.system.gui: fix infinite recursion --- flake.lock | 10 +++++----- flake.nix | 2 +- modules/system/gui.nix | 3 ++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 9cc4d960..72e026cb 100644 --- a/flake.lock +++ b/flake.lock @@ -463,15 +463,15 @@ ] }, "locked": { - "lastModified": 1730837930, - "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", - "owner": "CHN-beta", + "lastModified": 1758375677, + "narHash": "sha256-BLtD+6qWz7fQjPk2wpwyXQLGI0E30Ikgf2ppn2nVadI=", + "owner": "nix-community", "repo": "home-manager", - "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", + "rev": "edc7468e12be92e926847cb02418e649b02b59dd", "type": "github" }, "original": { - "owner": "CHN-beta", + "owner": "nix-community", "ref": "master", "repo": "home-manager", "type": "github" diff --git a/flake.nix b/flake.nix index 8ef4c997..6eba2fd3 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,7 @@ nixpkgs-2411.url = "github:CHN-beta/nixpkgs/nixos-24.11"; nixpkgs-2311.url = "github:CHN-beta/nixpkgs/nixos-23.11"; nixpkgs-2305.url = "github:CHN-beta/nixpkgs/nixos-23.05"; - home-manager = { url = "github:CHN-beta/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; }; + home-manager = { url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; }; sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; nix-index-database = { url = "github:Mic92/nix-index-database"; inputs.nixpkgs.follows = "nixpkgs"; }; nur-xddxdd = { url = "github:xddxdd/nur-packages"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/modules/system/gui.nix b/modules/system/gui.nix index d2974e30..f55c6a4c 100644 --- a/modules/system/gui.nix +++ b/modules/system/gui.nix @@ -57,7 +57,8 @@ inputs: gtk3.extraConfig.gtk-im-module = "fcitx"; gtk4.extraConfig.gtk-im-module = "fcitx"; }; - home.file."${hmInputs.config.xdg.configHome}/gtk-2.0/gtkrc".force = true; + # TODO: infinite recursion + # home.file."${hmInputs.config.gtk.gtk2.configLocation}".force = true; }; })]; }) From e5043baff0b9d3cd953428b7713b5f7e23ec4f3b Mon Sep 17 00:00:00 2001 From: chn Date: Sun, 21 Sep 2025 22:23:32 +0800 Subject: [PATCH 03/30] fix build --- modules/services/nginx/default.nix | 1 - modules/system/systemd.nix | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/services/nginx/default.nix b/modules/services/nginx/default.nix index 961d0b21..5f6a3a20 100644 --- a/modules/services/nginx/default.nix +++ b/modules/services/nginx/default.nix @@ -55,7 +55,6 @@ inputs: client_body_timeout 1h; ''; proxyTimeout = "1d"; - recommendedZstdSettings = true; recommendedTlsSettings = true; # do not set Host header recommendedProxySettings = false; diff --git a/modules/system/systemd.nix b/modules/system/systemd.nix index 45782f26..0c07afed 100644 --- a/modules/system/systemd.nix +++ b/modules/system/systemd.nix @@ -6,11 +6,11 @@ inputs: services.journald.extraConfig = "MaxRetentionSec=7d"; systemd = { - extraConfig = - '' - DefaultTimeoutStopSec=10s - DefaultLimitNOFILE=1048576:1048576 - ''; + settings.Manager = + { + DefaultTimeoutStopSec = "10s"; + DefaultLimitNOFILE = "1048576:1048576"; + }; user.extraConfig = "DefaultTimeoutStopSec=10s"; services = { From 705d4ad2e9f5296a843aa327240de094d4614774 Mon Sep 17 00:00:00 2001 From: chn Date: Mon, 22 Sep 2025 09:07:21 +0800 Subject: [PATCH 04/30] lib.buildNixpkgsConfig: fix assimp build --- flake/lib/buildNixpkgsConfig/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/flake/lib/buildNixpkgsConfig/default.nix b/flake/lib/buildNixpkgsConfig/default.nix index d69e58c2..ea2f3438 100644 --- a/flake/lib/buildNixpkgsConfig/default.nix +++ b/flake/lib/buildNixpkgsConfig/default.nix @@ -110,8 +110,9 @@ in platformConfig // # { gsl = prev.gsl.overrideAttrs { doCheck = false; }; }) # // (inputs.lib.optionalAttrs (nixpkgs.march != null && !prev.stdenv.hostPlatform.avx512Support) # { libhwy = prev.libhwy.override { stdenv = final.genericPackages.stdenv; }; }) - # // (inputs.lib.optionalAttrs (nixpkgs.march != null) - # { + // (inputs.lib.optionalAttrs (nixpkgs.march != null) + { + assimp = prev.assimp.override { stdenv = final.genericPackages.stdenv; }; # libinsane = prev.libinsane.overrideAttrs (prev: # { nativeCheckInputs = builtins.filter (p: p.pname != "valgrind") prev.nativeCheckInputs; }); # lib2geom = prev.lib2geom.overrideAttrs (prev: { doCheck = false; }); @@ -153,7 +154,7 @@ in platformConfig // # }) # ))]; # inherit (final.pkgs-2411) intelPackages_2023; - # }) + }) # // (inputs.lib.optionalAttrs (nixpkgs.march == "silvermont") # { c-blosc = prev.c-blosc.overrideAttrs { doCheck = false; }; }) # // (inputs.lib.optionalAttrs (nixpkgs.arch or null == "aarch64") { nix = final.nixVersions.nix_2_29; }) From e8ebac3697e2bedfebbb9f8b55ee408c575a7271 Mon Sep 17 00:00:00 2001 From: chn Date: Mon, 22 Sep 2025 09:53:10 +0800 Subject: [PATCH 05/30] fix podman build --- flake/lib/buildNixpkgsConfig/default.nix | 1 - modules/services/podman.nix | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/flake/lib/buildNixpkgsConfig/default.nix b/flake/lib/buildNixpkgsConfig/default.nix index ea2f3438..01e5f4dc 100644 --- a/flake/lib/buildNixpkgsConfig/default.nix +++ b/flake/lib/buildNixpkgsConfig/default.nix @@ -63,7 +63,6 @@ in platformConfig // }; libvirt = (prev.libvirt.override { iptables = final.nftables; }).overrideAttrs (prev: { patches = prev.patches or [] ++ [ ./libvirt.patch ]; }); - podman = prev.podman.override { iptables = final.nftables; }; root = prev.root.overrideAttrs (prev: { cmakeFlags = prev.cmakeFlags ++ [ "-DCMAKE_CXX_STANDARD=23" ]; }); boost188 = prev.boost188.overrideAttrs (prev: { patches = prev.patches or [] ++ [ ./boost188.patch ]; }); } diff --git a/modules/services/podman.nix b/modules/services/podman.nix index fe7d528d..bed39c9b 100644 --- a/modules/services/podman.nix +++ b/modules/services/podman.nix @@ -18,6 +18,7 @@ inputs: dockerCompat = true; # Required for containers under podman-compose to be able to talk to each other. defaultNetwork.settings.dns_enabled = true; + extraPackages = [ inputs.pkgs.nftables ]; }; }; hardware.nvidia-container-toolkit.enable = inputs.lib.mkIf (inputs.config.nixos.system.nixpkgs.cuda != null) true; From aacb42d6925a1de8eab76074d26fa73275c69b84 Mon Sep 17 00:00:00 2001 From: chn Date: Mon, 22 Sep 2025 09:56:13 +0800 Subject: [PATCH 06/30] packages.stickerpicker: fix build --- packages/stickerpicker.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/stickerpicker.nix b/packages/stickerpicker.nix index 156479ce..644ec86f 100644 --- a/packages/stickerpicker.nix +++ b/packages/stickerpicker.nix @@ -1,6 +1,9 @@ -{ src, buildPythonApplication, aiohttp, yarl, pillow, telethon, cryptg, python-magic }: buildPythonApplication +{ src, buildPythonApplication, aiohttp, yarl, pillow, telethon, cryptg, python-magic, setuptools }: +buildPythonApplication { name = "stickerpicker"; inherit src; propagatedBuildInputs = [ aiohttp yarl pillow telethon cryptg python-magic ]; + pyproject = true; + build-system = [ setuptools ]; } From 89fe80e6273f0781a325470ea403db5d90affd88 Mon Sep 17 00:00:00 2001 From: chn Date: Mon, 22 Sep 2025 10:03:22 +0800 Subject: [PATCH 07/30] packages.vesta: fix build --- packages/vesta.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/vesta.nix b/packages/vesta.nix index d82f690e..03020963 100644 --- a/packages/vesta.nix +++ b/packages/vesta.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, autoPatchelfHook, wrapGAppsHook, makeWrapper, src, - glib, gtk2, xorg, libGLU, gtk3, writeShellScript, gsettings-desktop-schemas, xdg-utils, webkitgtk, jdk + glib, gtk2, xorg, libGLU, gtk3, writeShellScript, gsettings-desktop-schemas, xdg-utils, jdk }: stdenv.mkDerivation { pname = "vesta"; inherit (src) src version; nativeBuildInputs = - [ autoPatchelfHook wrapGAppsHook makeWrapper glib gtk2 xorg.libXxf86vm libGLU gtk3 xorg.libXtst webkitgtk jdk ]; + [ autoPatchelfHook wrapGAppsHook makeWrapper glib gtk2 xorg.libXxf86vm libGLU gtk3 xorg.libXtst jdk ]; unpackPhase = "tar -xf $src"; installPhase = '' From 88e06d944124013b54f818ff83ae28864a895519 Mon Sep 17 00:00:00 2001 From: chn Date: Mon, 22 Sep 2025 10:05:26 +0800 Subject: [PATCH 08/30] packages.ufo: fix build --- packages/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/default.nix b/packages/default.nix index dc6d4dde..024a8720 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -89,7 +89,7 @@ inputs: rec ufo = inputs.pkgs.callPackage inputs.topInputs.ufo { inherit biu matplotplusplus; - tbb = inputs.pkgs.tbb_2021_11; + tbb = inputs.pkgs.tbb_2022; stdenv = inputs.pkgs.clang18Stdenv; }; chn-bsub = inputs.pkgs.callPackage ./chn-bsub { inherit biu; }; From 3c611744b8d7c776e38adb7d8761229f2cd29f6e Mon Sep 17 00:00:00 2001 From: chn Date: Mon, 22 Sep 2025 10:07:15 +0800 Subject: [PATCH 09/30] lib.buildNixpkgsConfig: fix bscpkgs overlay inclusion --- flake/lib/buildNixpkgsConfig/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/flake/lib/buildNixpkgsConfig/default.nix b/flake/lib/buildNixpkgsConfig/default.nix index 01e5f4dc..ae3e14d7 100644 --- a/flake/lib/buildNixpkgsConfig/default.nix +++ b/flake/lib/buildNixpkgsConfig/default.nix @@ -42,6 +42,7 @@ in platformConfig // inputs.topInputs.nur-xddxdd.overlays.inSubTree inputs.topInputs.buildproxy.overlays.default inputs.topInputs.nix4vscode.overlays.default + inputs.topInputs.bscpkgs.overlays.default (final: prev: { nur-linyinfeng = (inputs.topInputs.nur-linyinfeng.overlays.default final prev).linyinfeng; @@ -75,7 +76,7 @@ in platformConfig // { pkgs-2305 = "nixpkgs-2305"; pkgs-2311 = "nixpkgs-2311"; - pkgs-2411 = { source = "nixpkgs-2411"; overlays = [ inputs.topInputs.bscpkgs.overlays.default ]; }; + pkgs-2411 = "nixpkgs-2411"; # pkgs-unstable = # { # source = "nixpkgs-unstable"; From f98789267b6ff40e28fd089f6e7d155e4de0d639 Mon Sep 17 00:00:00 2001 From: chn Date: Mon, 22 Sep 2025 10:11:26 +0800 Subject: [PATCH 10/30] modules.packages.desktop: remove tensorflow --- modules/packages/desktop.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/modules/packages/desktop.nix b/modules/packages/desktop.nix index 7f5e6ab0..43c16acd 100644 --- a/modules/packages/desktop.nix +++ b/modules/packages/desktop.nix @@ -78,10 +78,7 @@ inputs: ++ (builtins.filter (p: !((p.meta.broken or false) || (builtins.elem p.pname or null [ "falkon" "kalzium" ]))) (builtins.filter inputs.lib.isDerivation (builtins.attrValues kdePackages.kdeGear))); _pythonPackages = [(pythonPackages: with pythonPackages; - [ - phonopy scipy scikit-learn jupyterlab autograd inputs.pkgs.localPackages.phono3py - tensorflow keras numpy - ])]; + [ phonopy scipy scikit-learn jupyterlab autograd inputs.pkgs.localPackages.phono3py numpy ])]; }; user.sharedModules = [{ From 7c6ba7979db7a0af679a0de8810e84b76b9fd78b Mon Sep 17 00:00:00 2001 From: chn Date: Mon, 22 Sep 2025 10:13:44 +0800 Subject: [PATCH 11/30] modules.packages.zsh: remove empty .zlogin --- modules/packages/zsh/default.nix | 2 -- modules/system/fileSystems/cluster.nix | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/packages/zsh/default.nix b/modules/packages/zsh/default.nix index d4c6ef72..4c91b1c9 100644 --- a/modules/packages/zsh/default.nix +++ b/modules/packages/zsh/default.nix @@ -28,8 +28,6 @@ inputs: plugins = [ "git" "colored-man-pages" "extract" "history-substring-search" "autojump" ]; theme = inputs.lib.mkDefault "clean"; }; - # ensure ~/.zlogin exists - loginExtra = " "; }; home.shell.enableZshIntegration = true; } diff --git a/modules/system/fileSystems/cluster.nix b/modules/system/fileSystems/cluster.nix index 2b04506f..60bdf47d 100644 --- a/modules/system/fileSystems/cluster.nix +++ b/modules/system/fileSystems/cluster.nix @@ -11,7 +11,7 @@ inputs: config = inputs.lib.mkMerge [ # 将一部分由 home-manager 生成软链接的文件改为直接挂载，以兼容集群的设置 - (let files = [ ".zshrc" ".zshenv" ".profile" ".bashrc" ".bash_profile" ".zlogin" ]; in + (let files = [ ".zshrc" ".zshenv" ".profile" ".bashrc" ".bash_profile" ]; in { home-manager.users = builtins.listToAttrs (builtins.map (user: From 512c2da6065b14811ec6798deeaccdbab86908a3 Mon Sep 17 00:00:00 2001 From: chn Date: Mon, 22 Sep 2025 10:21:52 +0800 Subject: [PATCH 12/30] mounts.system.fileSystems.cluster: fix home-manager fail --- modules/system/fileSystems/cluster.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/system/fileSystems/cluster.nix b/modules/system/fileSystems/cluster.nix index 60bdf47d..c7694c6f 100644 --- a/modules/system/fileSystems/cluster.nix +++ b/modules/system/fileSystems/cluster.nix @@ -11,14 +11,13 @@ inputs: config = inputs.lib.mkMerge [ # 将一部分由 home-manager 生成软链接的文件改为直接挂载，以兼容集群的设置 - (let files = [ ".zshrc" ".zshenv" ".profile" ".bashrc" ".bash_profile" ]; in + (let files = [ ".zshrc" ".profile" ".bashrc" ".bash_profile" ]; in { home-manager.users = builtins.listToAttrs (builtins.map - (user: + (user: inputs.lib.nameValuePair user { - name = user; - value.config.home.file = - builtins.listToAttrs (builtins.map (file: { name = file; value.enable = false; }) files); + config.home.file = builtins.listToAttrs (builtins.map + (file: inputs.lib.nameValuePair "/home/${user}/${file}" { enable = false; }) files); }) inputs.config.nixos.user.users); systemd.mounts = builtins.concatLists (builtins.map From 0d00c2279d9fa7c396aac34151d559924f9a2b38 Mon Sep 17 00:00:00 2001 From: chn Date: Mon, 22 Sep 2025 10:22:42 +0800 Subject: [PATCH 13/30] Merge branch 'production' into native-rog --- modules/packages/zsh/default.nix | 2 ++ modules/system/fileSystems/cluster.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/packages/zsh/default.nix b/modules/packages/zsh/default.nix index 4c91b1c9..d4c6ef72 100644 --- a/modules/packages/zsh/default.nix +++ b/modules/packages/zsh/default.nix @@ -28,6 +28,8 @@ inputs: plugins = [ "git" "colored-man-pages" "extract" "history-substring-search" "autojump" ]; theme = inputs.lib.mkDefault "clean"; }; + # ensure ~/.zlogin exists + loginExtra = " "; }; home.shell.enableZshIntegration = true; } diff --git a/modules/system/fileSystems/cluster.nix b/modules/system/fileSystems/cluster.nix index c7694c6f..f0415af5 100644 --- a/modules/system/fileSystems/cluster.nix +++ b/modules/system/fileSystems/cluster.nix @@ -11,7 +11,7 @@ inputs: config = inputs.lib.mkMerge [ # 将一部分由 home-manager 生成软链接的文件改为直接挂载，以兼容集群的设置 - (let files = [ ".zshrc" ".profile" ".bashrc" ".bash_profile" ]; in + (let files = [ ".zshrc" ".zshenv" ".profile" ".bashrc" ".bash_profile" ".zlogin" ]; in { home-manager.users = builtins.listToAttrs (builtins.map (user: inputs.lib.nameValuePair user From a7228dc6b0502d52e9da3fd43298534f10c9cf1f Mon Sep 17 00:00:00 2001 From: chn Date: Mon, 22 Sep 2025 10:24:04 +0800 Subject: [PATCH 14/30] modules.system.fileSystems: fix home-manager bind mounts --- modules/system/fileSystems/cluster.nix | 47 +++++++++++++++----------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/modules/system/fileSystems/cluster.nix b/modules/system/fileSystems/cluster.nix index f0415af5..e7e84d9f 100644 --- a/modules/system/fileSystems/cluster.nix +++ b/modules/system/fileSystems/cluster.nix @@ -11,28 +11,35 @@ inputs: config = inputs.lib.mkMerge [ # 将一部分由 home-manager 生成软链接的文件改为直接挂载，以兼容集群的设置 - (let files = [ ".zshrc" ".zshenv" ".profile" ".bashrc" ".bash_profile" ".zlogin" ]; in - { - home-manager.users = builtins.listToAttrs (builtins.map - (user: inputs.lib.nameValuePair user - { - config.home.file = builtins.listToAttrs (builtins.map - (file: inputs.lib.nameValuePair "/home/${user}/${file}" { enable = false; }) files); - }) - inputs.config.nixos.user.users); - systemd.mounts = builtins.concatLists (builtins.map - (user: builtins.map - (file: + ( + let files = user: + [ + "/home/${user}/.zshrc" "/home/${user}/.zshenv" "/home/${user}/.zlogin" + ".profile" ".bashrc" ".bash_profile" + ]; + in + { + home-manager.users = builtins.listToAttrs (builtins.map + (user: inputs.lib.nameValuePair user { - what = "${inputs.config.home-manager.users.${user}.home.file.${file}.source}"; - where = "/home/${user}/${file}"; - options = "bind"; - wantedBy = [ "local-fs.target" ]; + config.home.file = builtins.listToAttrs (builtins.map + (file: inputs.lib.nameValuePair "${file}" { enable = false; }) (files user)); }) - files - ) - inputs.config.nixos.user.users); - }) + inputs.config.nixos.user.users); + systemd.mounts = builtins.concatLists (builtins.map + (user: builtins.map + (file: + { + what = "${inputs.config.home-manager.users.${user}.home.file.${file}.source}"; + where = "/home/${user}/${file}"; + options = "bind"; + wantedBy = [ "local-fs.target" ]; + }) + (files user) + ) + inputs.config.nixos.user.users); + } + ) ( let fsCluster = inputs.config.nixos.system.fileSystems.cluster; From 9c755b1fd344f961d0ba4d6e76f2bf7ce4e37b7f Mon Sep 17 00:00:00 2001 From: chn Date: Tue, 23 Sep 2025 07:41:39 +0800 Subject: [PATCH 15/30] lib.buildNixpkgsConfig: fix gsl build --- flake/lib/buildNixpkgsConfig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flake/lib/buildNixpkgsConfig/default.nix b/flake/lib/buildNixpkgsConfig/default.nix index ae3e14d7..c5240fe5 100644 --- a/flake/lib/buildNixpkgsConfig/default.nix +++ b/flake/lib/buildNixpkgsConfig/default.nix @@ -106,8 +106,8 @@ in platformConfig // in builtins.listToAttrs (builtins.map (name: { inherit name; value = packages name; }) (builtins.attrNames source)) ) - # // (inputs.lib.optionalAttrs (prev.stdenv.hostPlatform.avx512Support) - # { gsl = prev.gsl.overrideAttrs { doCheck = false; }; }) + // (inputs.lib.optionalAttrs (prev.stdenv.hostPlatform.avx512Support) + { gsl = prev.gsl.overrideAttrs { doCheck = false; }; }) # // (inputs.lib.optionalAttrs (nixpkgs.march != null && !prev.stdenv.hostPlatform.avx512Support) # { libhwy = prev.libhwy.override { stdenv = final.genericPackages.stdenv; }; }) // (inputs.lib.optionalAttrs (nixpkgs.march != null) From bdf91e6454b7901d1fc9f2017eeabdd3bd1b71d5 Mon Sep 17 00:00:00 2001 From: chn Date: Tue, 23 Sep 2025 07:53:11 +0800 Subject: [PATCH 16/30] lib.buildNixpkgsConfig: fix lib2geom build --- flake/lib/buildNixpkgsConfig/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake/lib/buildNixpkgsConfig/default.nix b/flake/lib/buildNixpkgsConfig/default.nix index c5240fe5..61a81fa1 100644 --- a/flake/lib/buildNixpkgsConfig/default.nix +++ b/flake/lib/buildNixpkgsConfig/default.nix @@ -115,7 +115,7 @@ in platformConfig // assimp = prev.assimp.override { stdenv = final.genericPackages.stdenv; }; # libinsane = prev.libinsane.overrideAttrs (prev: # { nativeCheckInputs = builtins.filter (p: p.pname != "valgrind") prev.nativeCheckInputs; }); - # lib2geom = prev.lib2geom.overrideAttrs (prev: { doCheck = false; }); + lib2geom = prev.lib2geom.overrideAttrs (prev: { doCheck = false; }); # libreoffice-qt6-fresh = prev.libreoffice-qt6-fresh.override (prev: # { unwrapped = prev.unwrapped.overrideAttrs (prev: { postPatch = prev.postPatch or "" + # '' From 04ad036ee25d4cd5cbfbaefc42302348c2a1c1ee Mon Sep 17 00:00:00 2001 From: chn Date: Tue, 23 Sep 2025 10:45:18 +0800 Subject: [PATCH 17/30] lib.buildNixpkgsConfig: fix plog --- flake/lib/buildNixpkgsConfig/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake/lib/buildNixpkgsConfig/default.nix b/flake/lib/buildNixpkgsConfig/default.nix index 61a81fa1..eb04ccf8 100644 --- a/flake/lib/buildNixpkgsConfig/default.nix +++ b/flake/lib/buildNixpkgsConfig/default.nix @@ -113,6 +113,7 @@ in platformConfig // // (inputs.lib.optionalAttrs (nixpkgs.march != null) { assimp = prev.assimp.override { stdenv = final.genericPackages.stdenv; }; + plog = final.genericPackages.plog; # libinsane = prev.libinsane.overrideAttrs (prev: # { nativeCheckInputs = builtins.filter (p: p.pname != "valgrind") prev.nativeCheckInputs; }); lib2geom = prev.lib2geom.overrideAttrs (prev: { doCheck = false; }); From 5975bbbfaa66602bf568e6244d554d581a73b365 Mon Sep 17 00:00:00 2001 From: chn Date: Tue, 23 Sep 2025 12:29:06 +0800 Subject: [PATCH 18/30] lib.buildNixpkgsConfig: fix picosvg build --- flake/lib/buildNixpkgsConfig/default.nix | 35 ++++++++++++------------ 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/flake/lib/buildNixpkgsConfig/default.nix b/flake/lib/buildNixpkgsConfig/default.nix index eb04ccf8..1c82ff43 100644 --- a/flake/lib/buildNixpkgsConfig/default.nix +++ b/flake/lib/buildNixpkgsConfig/default.nix @@ -137,23 +137,24 @@ in platformConfig // # simde = prev.simde.override { stdenv = final.genericPackages.stdenv; }; # ctranslate2 = prev.ctranslate2.overrideAttrs (prev: # { cmakeFlags = prev.cmakeFlags or [] ++ [ "-DENABLE_CPU_DISPATCH=OFF" ]; }); - # pythonPackagesExtensions = prev.pythonPackagesExtensions or [] ++ [(final: prev: - # ( - # { - # scipy = prev.scipy.overridePythonAttrs (prev: - # { disabledTests = prev.disabledTests or [] ++ [ "test_hyp2f1" ]; }); - # rich = prev.rich.overridePythonAttrs (prev: - # { disabledTests = prev.disabledTests or [] ++ [ "test_brokenpipeerror" ]; }); - # } - # // (inputs.lib.optionalAttrs (nixpkgs.march != null && !prev.stdenv.hostPlatform.avx2Support) - # { - # numcodecs = prev.numcodecs.overridePythonAttrs (prev: - # { - # disabledTests = prev.disabledTests or [] - # ++ [ "test_encode_decode" "test_partial_decode" "test_blosc" ]; - # }); - # }) - # ))]; + pythonPackagesExtensions = prev.pythonPackagesExtensions or [] ++ [(final: prev: + ( + { picosvg = prev.picosvg.overridePythonAttrs { doCheck = false; }; } + # { + # scipy = prev.scipy.overridePythonAttrs (prev: + # { disabledTests = prev.disabledTests or [] ++ [ "test_hyp2f1" ]; }); + # rich = prev.rich.overridePythonAttrs (prev: + # { disabledTests = prev.disabledTests or [] ++ [ "test_brokenpipeerror" ]; }); + # } + # // (inputs.lib.optionalAttrs (nixpkgs.march != null && !prev.stdenv.hostPlatform.avx2Support) + # { + # numcodecs = prev.numcodecs.overridePythonAttrs (prev: + # { + # disabledTests = prev.disabledTests or [] + # ++ [ "test_encode_decode" "test_partial_decode" "test_blosc" ]; + # }); + # }) + ))]; # inherit (final.pkgs-2411) intelPackages_2023; }) # // (inputs.lib.optionalAttrs (nixpkgs.march == "silvermont") From f18fc0a1a0e83b19e01bc8e2f6ead703fd1c4976 Mon Sep 17 00:00:00 2001 From: chn Date: Tue, 23 Sep 2025 13:47:12 +0800 Subject: [PATCH 19/30] lib.buildNixpkgsConfig: fix rapidjson build --- flake/lib/buildNixpkgsConfig/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake/lib/buildNixpkgsConfig/default.nix b/flake/lib/buildNixpkgsConfig/default.nix index 1c82ff43..bb2f5321 100644 --- a/flake/lib/buildNixpkgsConfig/default.nix +++ b/flake/lib/buildNixpkgsConfig/default.nix @@ -129,7 +129,7 @@ in platformConfig // # '';});}); # opencolorio = prev.opencolorio.overrideAttrs (prev: { doCheck = false; }); # openvswitch = prev.openvswitch.overrideAttrs (prev: { doCheck = false; }); - # rapidjson = prev.rapidjson.overrideAttrs { doCheck = false; }; + rapidjson = prev.rapidjson.overrideAttrs { doCheck = false; }; # valkey = prev.valkey.overrideAttrs { doCheck = false; }; # # -march=xxx cause embree build failed # # https://github.com/embree/embree/issues/115 From c85180c5dd81092c0f1428956ea25ba477768b10 Mon Sep 17 00:00:00 2001 From: chn Date: Tue, 23 Sep 2025 16:00:08 +0800 Subject: [PATCH 20/30] lib.buildNixpkgsConfig: fix simde build --- flake/lib/buildNixpkgsConfig/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake/lib/buildNixpkgsConfig/default.nix b/flake/lib/buildNixpkgsConfig/default.nix index bb2f5321..cd4e2e32 100644 --- a/flake/lib/buildNixpkgsConfig/default.nix +++ b/flake/lib/buildNixpkgsConfig/default.nix @@ -134,7 +134,7 @@ in platformConfig // # # -march=xxx cause embree build failed # # https://github.com/embree/embree/issues/115 # embree = prev.embree.override { stdenv = final.genericPackages.stdenv; }; - # simde = prev.simde.override { stdenv = final.genericPackages.stdenv; }; + simde = prev.simde.override { stdenv = final.genericPackages.stdenv; }; # ctranslate2 = prev.ctranslate2.overrideAttrs (prev: # { cmakeFlags = prev.cmakeFlags or [] ++ [ "-DENABLE_CPU_DISPATCH=OFF" ]; }); pythonPackagesExtensions = prev.pythonPackagesExtensions or [] ++ [(final: prev: From 79e5db1596f8ae2da361bf076235ad6ef500d01e Mon Sep 17 00:00:00 2001 From: chn Date: Wed, 24 Sep 2025 04:49:32 +0800 Subject: [PATCH 21/30] Revert "lib.buildNixpkgsConfig: fix plog" This reverts commit 04ad036ee25d4cd5cbfbaefc42302348c2a1c1ee. --- flake/lib/buildNixpkgsConfig/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/flake/lib/buildNixpkgsConfig/default.nix b/flake/lib/buildNixpkgsConfig/default.nix index cd4e2e32..5004d600 100644 --- a/flake/lib/buildNixpkgsConfig/default.nix +++ b/flake/lib/buildNixpkgsConfig/default.nix @@ -113,7 +113,6 @@ in platformConfig // // (inputs.lib.optionalAttrs (nixpkgs.march != null) { assimp = prev.assimp.override { stdenv = final.genericPackages.stdenv; }; - plog = final.genericPackages.plog; # libinsane = prev.libinsane.overrideAttrs (prev: # { nativeCheckInputs = builtins.filter (p: p.pname != "valgrind") prev.nativeCheckInputs; }); lib2geom = prev.lib2geom.overrideAttrs (prev: { doCheck = false; }); From a9d5f8e8a50f7c4eb006fc4d260fdfa7a4a73e5d Mon Sep 17 00:00:00 2001 From: chn Date: Wed, 24 Sep 2025 19:41:14 +0800 Subject: [PATCH 22/30] lib.buildNixpkgsConfig: fix redis build --- flake/lib/buildNixpkgsConfig/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake/lib/buildNixpkgsConfig/default.nix b/flake/lib/buildNixpkgsConfig/default.nix index 5004d600..221e68a6 100644 --- a/flake/lib/buildNixpkgsConfig/default.nix +++ b/flake/lib/buildNixpkgsConfig/default.nix @@ -113,6 +113,7 @@ in platformConfig // // (inputs.lib.optionalAttrs (nixpkgs.march != null) { assimp = prev.assimp.override { stdenv = final.genericPackages.stdenv; }; + redis = prev.redis.overrideAttrs (prev: { doCheck = false; }); # libinsane = prev.libinsane.overrideAttrs (prev: # { nativeCheckInputs = builtins.filter (p: p.pname != "valgrind") prev.nativeCheckInputs; }); lib2geom = prev.lib2geom.overrideAttrs (prev: { doCheck = false; }); From 60ad069b435df281b96088933c7c65a26ff6a010 Mon Sep 17 00:00:00 2001 From: chn Date: Wed, 24 Sep 2025 19:42:44 +0800 Subject: [PATCH 23/30] lib.buildNixpkgsConfig: fix wannier90 build --- flake/lib/buildNixpkgsConfig/default.nix | 1 + modules/packages/desktop.nix | 7 +------ packages/default.nix | 7 +------ 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/flake/lib/buildNixpkgsConfig/default.nix b/flake/lib/buildNixpkgsConfig/default.nix index 221e68a6..3d0d08be 100644 --- a/flake/lib/buildNixpkgsConfig/default.nix +++ b/flake/lib/buildNixpkgsConfig/default.nix @@ -114,6 +114,7 @@ in platformConfig // { assimp = prev.assimp.override { stdenv = final.genericPackages.stdenv; }; redis = prev.redis.overrideAttrs (prev: { doCheck = false; }); + wannier90 = prev.wannier90.overrideAttrs { buildFlags = [ "dynlib" ]; }; # libinsane = prev.libinsane.overrideAttrs (prev: # { nativeCheckInputs = builtins.filter (p: p.pname != "valgrind") prev.nativeCheckInputs; }); lib2geom = prev.lib2geom.overrideAttrs (prev: { doCheck = false; }); diff --git a/modules/packages/desktop.nix b/modules/packages/desktop.nix index 43c16acd..fac65148 100644 --- a/modules/packages/desktop.nix +++ b/modules/packages/desktop.nix @@ -59,12 +59,7 @@ inputs: pkgs-2311.gnuplot # math, physics and chemistry octaveFull ovito localPackages.vesta localPackages.v-sim jmol mpi geogebra6 localPackages.ufo - (quantum-espresso.override - { - stdenv = gcc14Stdenv; - gfortran = gfortran14; - wannier90 = wannier90.overrideAttrs { buildFlags = [ "dynlib" ]; }; - }) + (quantum-espresso.override { stdenv = gcc14Stdenv; gfortran = gfortran14; }) pkgs-2311.hdfview numbat qalculate-qt # virtualization virt-viewer bottles wineWowPackages.stagingFull genymotion playonlinux diff --git a/packages/default.nix b/packages/default.nix index 024a8720..080038a9 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -43,11 +43,7 @@ inputs: rec hdf5 = inputs.pkgs.hdf5.override { mpiSupport = true; fortranSupport = true; cppSupport = false; }; }; nvidia = inputs.pkgs.callPackage ./vasp/nvidia - { - inherit (nvhpcPackages) stdenv hdf5 mpi; - src = inputs.topInputs.self.src.vasp; - wannier90 = inputs.pkgs.wannier90.overrideAttrs { buildFlags = [ "dynlib" ]; }; - }; + { inherit (nvhpcPackages) stdenv hdf5 mpi; src = inputs.topInputs.self.src.vasp; }; intel = inputs.pkgs.callPackage ./vasp/intel { src = inputs.topInputs.self.src.vasp; @@ -65,7 +61,6 @@ inputs: rec enableShared = false; enableStatic = true; }; - wannier90 = inputs.pkgs.wannier90.overrideAttrs { buildFlags = [ "dynlib" ]; }; }; vtst = inputs.pkgs.callPackage ./vasp/vtst.nix { src = inputs.topInputs.self.src.vasp.vtst.script; }; }; From 6ef6d01185c423643a23d6b02acbac104f0795fd Mon Sep 17 00:00:00 2001 From: chn Date: Thu, 25 Sep 2025 08:30:18 +0800 Subject: [PATCH 24/30] lib.buildNixpkgsConfig: fix xen build --- flake/lib/buildNixpkgsConfig/default.nix | 1 + flake/lib/buildNixpkgsConfig/xen.patch | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 flake/lib/buildNixpkgsConfig/xen.patch diff --git a/flake/lib/buildNixpkgsConfig/default.nix b/flake/lib/buildNixpkgsConfig/default.nix index 3d0d08be..9594bbaf 100644 --- a/flake/lib/buildNixpkgsConfig/default.nix +++ b/flake/lib/buildNixpkgsConfig/default.nix @@ -115,6 +115,7 @@ in platformConfig // assimp = prev.assimp.override { stdenv = final.genericPackages.stdenv; }; redis = prev.redis.overrideAttrs (prev: { doCheck = false; }); wannier90 = prev.wannier90.overrideAttrs { buildFlags = [ "dynlib" ]; }; + xen = prev.xen.overrideAttrs (prev: { patches = prev.patches or [] ++ [ ./xen.patch ]; }); # libinsane = prev.libinsane.overrideAttrs (prev: # { nativeCheckInputs = builtins.filter (p: p.pname != "valgrind") prev.nativeCheckInputs; }); lib2geom = prev.lib2geom.overrideAttrs (prev: { doCheck = false; }); diff --git a/flake/lib/buildNixpkgsConfig/xen.patch b/flake/lib/buildNixpkgsConfig/xen.patch new file mode 100644 index 00000000..0b1a3aa3 --- /dev/null +++ b/flake/lib/buildNixpkgsConfig/xen.patch @@ -0,0 +1,15 @@ +diff --git a/xen/arch/x86/boot/Makefile b/xen/arch/x86/boot/Makefile +index d45787665907..80c32163fbbd 100644 +--- a/xen/arch/x86/boot/Makefile ++++ b/xen/arch/x86/boot/Makefile +@@ -40,8 +40,8 @@ LD32 := $(LD) $(subst x86_64,i386,$(LDFLAGS_DIRECT)) + # are affected by both text_diff and text_gap. Ensure the sum of gap and diff + # is greater than 2^16 so that any 16bit relocations if present in the object + # file turns into a build-time error. +-text_gap := 0x010200 +-text_diff := 0x408020 ++text_gap := 0x010240 ++text_diff := 0x608040 + + $(obj)/build32.base.lds: AFLAGS-y += -DGAP=$(text_gap) -DTEXT_DIFF=$(text_diff) + $(obj)/build32.offset.lds: AFLAGS-y += -DGAP=$(text_gap) -DTEXT_DIFF=$(text_diff) -DAPPLY_OFFSET From 2307a326e3d5d42dd77841459f97c6233b9124b3 Mon Sep 17 00:00:00 2001 From: chn Date: Thu, 25 Sep 2025 08:55:24 +0800 Subject: [PATCH 25/30] packages.lumerical: fix --- packages/lumerical/lumerical.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/lumerical/lumerical.nix b/packages/lumerical/lumerical.nix index dc334962..d0a9b7ab 100644 --- a/packages/lumerical/lumerical.nix +++ b/packages/lumerical/lumerical.nix @@ -1,8 +1,8 @@ { stdenv, src, buildFHSEnv, writeScript, autoPatchelfHook, writeShellScriptBin, - libxml2, libz, freeglut, libGLU, xorg, alsa-lib, freetype, wayland, fontconfig, libxkbcommon, systemd, numactl, nss, + libz, freeglut, libGLU, xorg, alsa-lib, freetype, wayland, fontconfig, libxkbcommon, systemd, numactl, nss, at-spi2-atk, libxcrypt-legacy, glibtool, tbb, libxslt, glib, gtk3, libedit, gdbm, ncurses5, mesa, libdrm, xmlsec, - libsForQt5, mpi, libGL, xz, libgbm + libsForQt5, mpi, libGL, xz, libgbm, libxml2_13 }: let unwrapped = stdenv.mkDerivation @@ -31,7 +31,7 @@ let inherit src; buildInputs = [ - stdenv.cc.cc libz libGLU libGL mpi libxml2 xmlsec freeglut fontconfig libxkbcommon systemd tbb xz glib + stdenv.cc.cc libz libGLU libGL mpi libxml2_13 xmlsec freeglut fontconfig libxkbcommon systemd tbb xz glib libxcrypt-legacy at-spi2-atk gtk3 libdrm alsa-lib ncurses5 libgbm libedit gdbm ] ++ (with xorg; From a3859ea5d5dcc35c66d1a99435d6811c822f0638 Mon Sep 17 00:00:00 2001 From: chn Date: Thu, 25 Sep 2025 09:44:49 +0800 Subject: [PATCH 26/30] lib.buildNixpkgsConfig: fix libreoffice build --- flake/lib/buildNixpkgsConfig/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/flake/lib/buildNixpkgsConfig/default.nix b/flake/lib/buildNixpkgsConfig/default.nix index 9594bbaf..0da17a48 100644 --- a/flake/lib/buildNixpkgsConfig/default.nix +++ b/flake/lib/buildNixpkgsConfig/default.nix @@ -119,11 +119,11 @@ in platformConfig // # libinsane = prev.libinsane.overrideAttrs (prev: # { nativeCheckInputs = builtins.filter (p: p.pname != "valgrind") prev.nativeCheckInputs; }); lib2geom = prev.lib2geom.overrideAttrs (prev: { doCheck = false; }); - # libreoffice-qt6-fresh = prev.libreoffice-qt6-fresh.override (prev: - # { unwrapped = prev.unwrapped.overrideAttrs (prev: { postPatch = prev.postPatch or "" + - # '' - # sed -i '/CPPUNIT_TEST.testDubiousArrayFormulasFODS/d' sc/qa/unit/functions_array.cxx - # '';});}); + libreoffice-qt6-fresh-unwrapped = prev.libreoffice-qt6-fresh-unwrapped.overrideAttrs + (prev: { postPatch = prev.postPatch or "" + + '' + sed -i '/CPPUNIT_TEST.testDubiousArrayFormulasFODS/d' sc/qa/unit/functions_array.cxx + '';}); # libreoffice-still = prev.libreoffice-still.override (prev: # { unwrapped = prev.unwrapped.overrideAttrs (prev: { postPatch = prev.postPatch or "" + # '' From d793ffa5838b3c20fd8ba2ed9cf78b80bbfe4d49 Mon Sep 17 00:00:00 2001 From: chn Date: Thu, 25 Sep 2025 09:46:39 +0800 Subject: [PATCH 27/30] modules.packages.root: fix logo path --- modules/packages/root.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/packages/root.nix b/modules/packages/root.nix index 8ce3c669..691983f6 100644 --- a/modules/packages/root.nix +++ b/modules/packages/root.nix @@ -12,7 +12,7 @@ inputs: displayName = "ROOT"; language = "c++"; argv = [ "/run/current-system/sw/bin/python3" "-m" "JupyROOT.kernel.rootkernel" "-f" "{connection_file}" ]; - logo64 = "${root}/etc/root/notebook/kernels/root/logo-64x64.png"; + logo64 = "${root}/etc/notebook/kernels/root/logo-64x64.png"; logo32 = inputs.pkgs.runCommand "logo-32x32.png" {} "${inputs.pkgs.imagemagick}/bin/convert ${logo64} -resize 32x32 $out"; };}; From 2f6d5e543eb52c7563923c21476b3518d88de7f9 Mon Sep 17 00:00:00 2001 From: chn Date: Thu, 25 Sep 2025 09:48:44 +0800 Subject: [PATCH 28/30] lib.buildNixpkgsConfig: fix opencolorio build --- flake/lib/buildNixpkgsConfig/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake/lib/buildNixpkgsConfig/default.nix b/flake/lib/buildNixpkgsConfig/default.nix index 0da17a48..c6d47159 100644 --- a/flake/lib/buildNixpkgsConfig/default.nix +++ b/flake/lib/buildNixpkgsConfig/default.nix @@ -129,7 +129,7 @@ in platformConfig // # '' # sed -i '/CPPUNIT_TEST.testDubiousArrayFormulasFODS/d' sc/qa/unit/functions_array.cxx # '';});}); - # opencolorio = prev.opencolorio.overrideAttrs (prev: { doCheck = false; }); + opencolorio = prev.opencolorio.overrideAttrs (prev: { doCheck = false; }); # openvswitch = prev.openvswitch.overrideAttrs (prev: { doCheck = false; }); rapidjson = prev.rapidjson.overrideAttrs { doCheck = false; }; # valkey = prev.valkey.overrideAttrs { doCheck = false; }; From 69e9bb5fbcbb135f651c966a82900a9f8be34d9b Mon Sep 17 00:00:00 2001 From: chn Date: Thu, 25 Sep 2025 11:55:29 +0800 Subject: [PATCH 29/30] lib.buildNixpkgsConfig: fix libreoffice build --- flake/lib/buildNixpkgsConfig/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/flake/lib/buildNixpkgsConfig/default.nix b/flake/lib/buildNixpkgsConfig/default.nix index c6d47159..2f8e212e 100644 --- a/flake/lib/buildNixpkgsConfig/default.nix +++ b/flake/lib/buildNixpkgsConfig/default.nix @@ -119,16 +119,11 @@ in platformConfig // # libinsane = prev.libinsane.overrideAttrs (prev: # { nativeCheckInputs = builtins.filter (p: p.pname != "valgrind") prev.nativeCheckInputs; }); lib2geom = prev.lib2geom.overrideAttrs (prev: { doCheck = false; }); - libreoffice-qt6-fresh-unwrapped = prev.libreoffice-qt6-fresh-unwrapped.overrideAttrs - (prev: { postPatch = prev.postPatch or "" + + libreoffice-qt6-fresh = prev.libreoffice-qt6-fresh.override (prev: + { unwrapped = prev.unwrapped.overrideAttrs (prev: { postPatch = prev.postPatch or "" + '' sed -i '/CPPUNIT_TEST.testDubiousArrayFormulasFODS/d' sc/qa/unit/functions_array.cxx - '';}); - # libreoffice-still = prev.libreoffice-still.override (prev: - # { unwrapped = prev.unwrapped.overrideAttrs (prev: { postPatch = prev.postPatch or "" + - # '' - # sed -i '/CPPUNIT_TEST.testDubiousArrayFormulasFODS/d' sc/qa/unit/functions_array.cxx - # '';});}); + '';});}); opencolorio = prev.opencolorio.overrideAttrs (prev: { doCheck = false; }); # openvswitch = prev.openvswitch.overrideAttrs (prev: { doCheck = false; }); rapidjson = prev.rapidjson.overrideAttrs { doCheck = false; }; From 3143b2f3a42688fd96387c2ea9ee3838c7dc4087 Mon Sep 17 00:00:00 2001 From: chn Date: Thu, 25 Sep 2025 12:03:35 +0800 Subject: [PATCH 30/30] lib.buildNixpkgsConfig: fix embree build --- flake/lib/buildNixpkgsConfig/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/flake/lib/buildNixpkgsConfig/default.nix b/flake/lib/buildNixpkgsConfig/default.nix index 2f8e212e..1a998984 100644 --- a/flake/lib/buildNixpkgsConfig/default.nix +++ b/flake/lib/buildNixpkgsConfig/default.nix @@ -128,9 +128,7 @@ in platformConfig // # openvswitch = prev.openvswitch.overrideAttrs (prev: { doCheck = false; }); rapidjson = prev.rapidjson.overrideAttrs { doCheck = false; }; # valkey = prev.valkey.overrideAttrs { doCheck = false; }; - # # -march=xxx cause embree build failed - # # https://github.com/embree/embree/issues/115 - # embree = prev.embree.override { stdenv = final.genericPackages.stdenv; }; + embree = prev.embree.override { stdenv = final.genericPackages.stdenv; }; simde = prev.simde.override { stdenv = final.genericPackages.stdenv; }; # ctranslate2 = prev.ctranslate2.overrideAttrs (prev: # { cmakeFlags = prev.cmakeFlags or [] ++ [ "-DENABLE_CPU_DISPATCH=OFF" ]; });