Compare commits

...

4 commits

Author SHA1 Message Date
c4b1e6b61b
flake.lock: Update
Some checks failed
nix flake check / check (aarch64-linux) (push) Has been cancelled
nix flake check / check (x86_64-linux) (push) Has been cancelled
Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/a46e702093a5c46e192243edbd977d5749e7f294' (2024-11-19)
  → 'github:nix-community/home-manager/4d8d8c385e78f5f744e2e2f81f5c56fade6ca4eb' (2024-11-24)
• Updated input 'linux-hardened':
    'git+https://woof.rip/mikael/linux-hardened.git?ref=refs/heads/main&rev=ab8f4d6ffa5bb1dd155d163375045af2c11a9af3' (2024-11-20)
  → 'git+https://woof.rip/mikael/linux-hardened.git?ref=refs/heads/main&rev=4272c3384ff36ad13779995b28ef41476428d7af' (2024-11-24)
• Updated input 'linux-hardened/neoidiosyn':
    'git+https://woof.rip/mikael/neoidiosyn.git?ref=refs/heads/main&rev=6cd36a603e2360ac7a6389040eaf4ed3a34fbaaa' (2024-11-20)
  → 'git+https://woof.rip/mikael/neoidiosyn.git?ref=refs/heads/main&rev=6a952dd5ce1715ab1516fac5efa36417051276c9' (2024-11-24)
• Updated input 'linux-hardened/neoidiosyn/lix':
    'b0d7a81613.tar.gz?narHash=sha256-3ubtSu0D%2BBUV5FKmBU7kTEXlI/okp/j1xC/ODC7LgTA%3D&rev=b0d7a816135de1cd551b8a54f5497148bf59d81d' (2024-11-19)
  → '66f6dbda32.tar.gz?narHash=sha256-H7GN4%2B%2Ba4vE49SUNojZx%2BFSk4mmpb2ifJUtJMJHProI%3D&rev=66f6dbda32959dd5cf3a9aaba15af72d037ab7ff' (2024-11-20)
• Updated input 'linux-hardened/neoidiosyn/nixpkgs':
    'github:NixOS/nixpkgs/5083ec887760adfe12af64830a66807423a859a7' (2024-11-18)
  → 'github:NixOS/nixpkgs/8edf06bea5bcbee082df1b7369ff973b91618b8d' (2024-11-22)
• Updated input 'niri':
    'github:sodiboo/niri-flake/ee1ac4ecbe5195ac2d3322089c4581ba848940bb' (2024-11-20)
  → 'github:sodiboo/niri-flake/3131d857c946c75557f5b6fb99a113b6949ea04d' (2024-11-23)
• Updated input 'niri/niri-stable':
    'github:YaLTeR/niri/9d8f640503819ff1905c9040d3c7910a50400bbd' (2024-11-09)
  → 'github:YaLTeR/niri/75c79116a7e40cbc0e110ce0cdd500e896458679' (2024-11-13)
• Updated input 'niri/niri-unstable':
    'github:YaLTeR/niri/7de752ec565c5b3e4e25fcba1f051cfd639338a2' (2024-11-20)
  → 'github:YaLTeR/niri/9c7e8d04d27d2f914ad3e9a54c64b64c34aea4d4' (2024-11-23)
• Updated input 'niri/xwayland-satellite-unstable':
    'github:Supreeeme/xwayland-satellite/3e6f892d20d918479e67d1e6c90c4be824a9d4ab' (2024-11-09)
  → 'github:Supreeeme/xwayland-satellite/02f30546264ff8407cbb39528b3a3cc3045e53c1' (2024-11-22)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/5083ec887760adfe12af64830a66807423a859a7' (2024-11-18)
  → 'github:NixOS/nixpkgs/8edf06bea5bcbee082df1b7369ff973b91618b8d' (2024-11-22)
• Updated input 'nur':
    'github:nix-community/NUR/a1d4c79a93b4a56127c152f4eec71eee63f8f5e6' (2024-11-20)
  → 'github:nix-community/NUR/47c654b6d4c461da43e1bdab4072af74da82529e' (2024-11-24)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/8509a51241c407d583b1963d5079585a992506e8' (2024-11-20)
  → 'github:oxalica/rust-overlay/ed8aa5b64f7d36d9338eb1d0a3bb60cf52069a72' (2024-11-23)
2024-11-24 21:52:49 +01:00
47b2ab5ae0
numactl: Remove upstreamed patch
Some checks are pending
nix flake check / check (aarch64-linux) (push) Waiting to run
nix flake check / check (x86_64-linux) (push) Waiting to run
2024-11-24 21:51:52 +01:00
648baf250e
nixos/muon: Configure additional builders 2024-11-24 21:51:50 +01:00
782dd376c4
flake.lock: Update
Some checks are pending
nix flake check / check (aarch64-linux) (push) Waiting to run
nix flake check / check (x86_64-linux) (push) Waiting to run
Flake lock file updates:

• Updated input 'colmena':
    'github:zhaofengli/colmena/a2193487bcf70bbb998ad1a25a4ff02b8d55db7a' (2024-11-10)
  → 'github:zhaofengli/colmena/e3ad42138015fcdf2524518dd564a13145c72ea1' (2024-11-13)
• Updated input 'home-manager':
    'github:nix-community/home-manager/60bb110917844d354f3c18e05450606a435d2d10' (2024-11-10)
  → 'github:nix-community/home-manager/a46e702093a5c46e192243edbd977d5749e7f294' (2024-11-19)
• Updated input 'lanzaboote':
    'github:nix-community/lanzaboote/cef39a78679c266300874e7a7000b4da066228d4' (2024-11-04)
  → 'github:nix-community/lanzaboote/2f48272f34174fd2a5ab3df4d8a46919247be879' (2024-11-18)
• Updated input 'linux-hardened':
    'git+https://woof.rip/mikael/linux-hardened.git?ref=refs/heads/main&rev=f5fdee0638f03336c3fe32ddcb692ba1dbe601fa' (2024-11-13)
  → 'git+https://woof.rip/mikael/linux-hardened.git?ref=refs/heads/main&rev=ab8f4d6ffa5bb1dd155d163375045af2c11a9af3' (2024-11-20)
• Added input 'linux-hardened/neoidiosyn':
    'git+https://woof.rip/mikael/neoidiosyn.git?ref=refs/heads/main&rev=6cd36a603e2360ac7a6389040eaf4ed3a34fbaaa' (2024-11-20)
• Added input 'linux-hardened/neoidiosyn/lix':
    'b0d7a81613.tar.gz?narHash=sha256-3ubtSu0D%2BBUV5FKmBU7kTEXlI/okp/j1xC/ODC7LgTA%3D&rev=b0d7a816135de1cd551b8a54f5497148bf59d81d' (2024-11-19)
• Added input 'linux-hardened/neoidiosyn/lix-module':
    'aa2846680f.tar.gz?narHash=sha256-n6dPGRlMGdL8X5gviA6ZuRfUdbdD5KiNN/BpABA5YT0%3D&rev=aa2846680fa9a2032939d720487942567fd9eb63' (2024-11-18)
• Added input 'linux-hardened/neoidiosyn/lix-module/flake-utils':
    'github:numtide/flake-utils/11707dc2f618dd54ca8739b309ec4fc024de578b' (2024-11-13)
• Added input 'linux-hardened/neoidiosyn/lix-module/flake-utils/systems':
    'github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e' (2023-04-09)
• Added input 'linux-hardened/neoidiosyn/lix-module/flakey-profile':
    'github:lf-/flakey-profile/243c903fd8eadc0f63d205665a92d4df91d42d9d' (2024-04-12)
• Added input 'linux-hardened/neoidiosyn/lix-module/lix':
    follows 'linux-hardened/neoidiosyn/lix'
• Added input 'linux-hardened/neoidiosyn/lix-module/nixpkgs':
    follows 'linux-hardened/neoidiosyn/nixpkgs'
• Added input 'linux-hardened/neoidiosyn/nixpkgs':
    'github:NixOS/nixpkgs/5083ec887760adfe12af64830a66807423a859a7' (2024-11-18)
• Removed input 'linux-hardened/nixpkgs'
• Updated input 'lix':
    '8a9094303b.tar.gz?narHash=sha256-GoddkPg0/UDv06KcQJiOYP/2IzruYorbI03QRCjN3K8%3D&rev=8a9094303bc7873c979e54ea20b9f50464ee3965' (2024-11-11)
  → '66f6dbda32.tar.gz?narHash=sha256-H7GN4%2B%2Ba4vE49SUNojZx%2BFSk4mmpb2ifJUtJMJHProI%3D&rev=66f6dbda32959dd5cf3a9aaba15af72d037ab7ff' (2024-11-20)
• Updated input 'lix-module':
    '691193879d.tar.gz?narHash=sha256-RNaIu43b9PoXEhW4OqXUNZKY/jezQyCYWwdv1M0VjsA%3D&rev=691193879d96bdfd1e6ab5ebcca2fadc7604cf34' (2024-11-09)
  → 'aa2846680f.tar.gz?narHash=sha256-n6dPGRlMGdL8X5gviA6ZuRfUdbdD5KiNN/BpABA5YT0%3D&rev=aa2846680fa9a2032939d720487942567fd9eb63' (2024-11-18)
• Updated input 'lix-module/flake-utils':
    'github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a' (2024-09-17)
  → 'github:numtide/flake-utils/11707dc2f618dd54ca8739b309ec4fc024de578b' (2024-11-13)
• Updated input 'niri':
    'github:sodiboo/niri-flake/91097eb0301feecf3079af35dee05653129f98b7' (2024-11-13)
  → 'github:sodiboo/niri-flake/ee1ac4ecbe5195ac2d3322089c4581ba848940bb' (2024-11-20)
• Updated input 'niri/niri-unstable':
    'github:YaLTeR/niri/0e5e764c78421dc61c82ca6df630f33e8221005a' (2024-11-12)
  → 'github:YaLTeR/niri/7de752ec565c5b3e4e25fcba1f051cfd639338a2' (2024-11-20)
• Updated input 'niri/nixpkgs-stable':
    'github:NixOS/nixpkgs/9256f7c71a195ebe7a218043d9f93390d49e6884' (2024-11-10)
  → 'github:NixOS/nixpkgs/e8c38b73aeb218e27163376a2d617e61a2ad9b59' (2024-11-16)
• Updated input 'nix-index-database':
    'github:illdefined/nix-index-database/95e85dcb96a4622be23ffc71be51b35ba30f7481' (2024-11-11)
  → 'github:illdefined/nix-index-database/daa4b9753419986151c11290f96ef67cc789d189' (2024-11-18)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/f6581f1c3b137086e42a08a906bdada63045f991' (2024-11-12)
  → 'github:NixOS/nixos-hardware/672ac2ac86f7dff2f6f3406405bddecf960e0db6' (2024-11-16)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/aebe249544837ce42588aa4b2e7972222ba12e8f' (2024-11-10)
  → 'github:NixOS/nixpkgs/5083ec887760adfe12af64830a66807423a859a7' (2024-11-18)
• Updated input 'nur':
    'github:nix-community/NUR/4ae1080fdf68e0c54c05860030861a852439223a' (2024-11-13)
  → 'github:nix-community/NUR/a1d4c79a93b4a56127c152f4eec71eee63f8f5e6' (2024-11-20)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/2c19bad6e881b5a154cafb7f9106879b5b356d1f' (2024-11-13)
  → 'github:oxalica/rust-overlay/8509a51241c407d583b1963d5079585a992506e8' (2024-11-20)
2024-11-21 00:58:29 +01:00
3 changed files with 181 additions and 77 deletions

View file

@ -58,11 +58,11 @@
"stable": "stable" "stable": "stable"
}, },
"locked": { "locked": {
"lastModified": 1731249827, "lastModified": 1731527002,
"narHash": "sha256-04iOZoJ0D+y3xhZtaCgSBOz8T4hED7oMVkuAOzXT8vU=", "narHash": "sha256-dI9I6suECoIAmbS4xcrqF8r2pbmed8WWm5LIF1yWPw8=",
"owner": "zhaofengli", "owner": "zhaofengli",
"repo": "colmena", "repo": "colmena",
"rev": "a2193487bcf70bbb998ad1a25a4ff02b8d55db7a", "rev": "e3ad42138015fcdf2524518dd564a13145c72ea1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -190,11 +190,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1726560853, "lastModified": 1731533236,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -207,6 +207,24 @@
"inputs": { "inputs": {
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_4": {
"inputs": {
"systems": "systems_3"
},
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
@ -236,6 +254,21 @@
"type": "github" "type": "github"
} }
}, },
"flakey-profile_2": {
"locked": {
"lastModified": 1712898590,
"narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
"owner": "lf-",
"repo": "flakey-profile",
"rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
"type": "github"
},
"original": {
"owner": "lf-",
"repo": "flakey-profile",
"type": "github"
}
},
"gitignore": { "gitignore": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -287,11 +320,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731235328, "lastModified": 1732479357,
"narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=", "narHash": "sha256-i+nqC4QCMVmwA+yyMmr6psI6f9u3Nd4FXik+ttWWiRc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "60bb110917844d354f3c18e05450606a435d2d10", "rev": "4d8d8c385e78f5f744e2e2f81f5c56fade6ca4eb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -314,11 +347,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730739295, "lastModified": 1731941836,
"narHash": "sha256-aYeJ/P/9AuK6Kee63ZdsmDjEwhnksF+gIv/OyGtlBJE=", "narHash": "sha256-zpmAzrvK8KdssBSwiIwwRxaUJ77oWORbW0XFvgCFpTE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lanzaboote", "repo": "lanzaboote",
"rev": "cef39a78679c266300874e7a7000b4da066228d4", "rev": "2f48272f34174fd2a5ab3df4d8a46919247be879",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -329,14 +362,14 @@
}, },
"linux-hardened": { "linux-hardened": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs" "neoidiosyn": "neoidiosyn"
}, },
"locked": { "locked": {
"lastModified": 1731517078, "lastModified": 1732480388,
"narHash": "sha256-stbSazpb7K7EOtpkYBnXEMWSJFwkQhcsgTdBA4J4Xbs=", "narHash": "sha256-H+4fD5zY/klYbKlfYjDcqegz0rjiElvhk44HxRi8pMw=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "f5fdee0638f03336c3fe32ddcb692ba1dbe601fa", "rev": "4272c3384ff36ad13779995b28ef41476428d7af",
"revCount": 14, "revCount": 20,
"type": "git", "type": "git",
"url": "https://woof.rip/mikael/linux-hardened.git" "url": "https://woof.rip/mikael/linux-hardened.git"
}, },
@ -348,11 +381,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1731334117, "lastModified": 1732112222,
"narHash": "sha256-GoddkPg0/UDv06KcQJiOYP/2IzruYorbI03QRCjN3K8=", "narHash": "sha256-H7GN4++a4vE49SUNojZx+FSk4mmpb2ifJUtJMJHProI=",
"rev": "8a9094303bc7873c979e54ea20b9f50464ee3965", "rev": "66f6dbda32959dd5cf3a9aaba15af72d037ab7ff",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/8a9094303bc7873c979e54ea20b9f50464ee3965.tar.gz?rev=8a9094303bc7873c979e54ea20b9f50464ee3965" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/66f6dbda32959dd5cf3a9aaba15af72d037ab7ff.tar.gz?rev=66f6dbda32959dd5cf3a9aaba15af72d037ab7ff"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -363,6 +396,33 @@
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"flakey-profile": "flakey-profile", "flakey-profile": "flakey-profile",
"lix": [
"linux-hardened",
"neoidiosyn",
"lix"
],
"nixpkgs": [
"linux-hardened",
"neoidiosyn",
"nixpkgs"
]
},
"locked": {
"lastModified": 1731967274,
"narHash": "sha256-n6dPGRlMGdL8X5gviA6ZuRfUdbdD5KiNN/BpABA5YT0=",
"rev": "aa2846680fa9a2032939d720487942567fd9eb63",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/aa2846680fa9a2032939d720487942567fd9eb63.tar.gz?rev=aa2846680fa9a2032939d720487942567fd9eb63"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"
}
},
"lix-module_2": {
"inputs": {
"flake-utils": "flake-utils_3",
"flakey-profile": "flakey-profile_2",
"lix": [ "lix": [
"lix" "lix"
], ],
@ -371,17 +431,51 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731185731, "lastModified": 1731967274,
"narHash": "sha256-RNaIu43b9PoXEhW4OqXUNZKY/jezQyCYWwdv1M0VjsA=", "narHash": "sha256-n6dPGRlMGdL8X5gviA6ZuRfUdbdD5KiNN/BpABA5YT0=",
"rev": "691193879d96bdfd1e6ab5ebcca2fadc7604cf34", "rev": "aa2846680fa9a2032939d720487942567fd9eb63",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/691193879d96bdfd1e6ab5ebcca2fadc7604cf34.tar.gz?rev=691193879d96bdfd1e6ab5ebcca2fadc7604cf34" "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/aa2846680fa9a2032939d720487942567fd9eb63.tar.gz?rev=aa2846680fa9a2032939d720487942567fd9eb63"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz" "url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"
} }
}, },
"lix_2": {
"flake": false,
"locked": {
"lastModified": 1732112222,
"narHash": "sha256-H7GN4++a4vE49SUNojZx+FSk4mmpb2ifJUtJMJHProI=",
"rev": "66f6dbda32959dd5cf3a9aaba15af72d037ab7ff",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/66f6dbda32959dd5cf3a9aaba15af72d037ab7ff.tar.gz?rev=66f6dbda32959dd5cf3a9aaba15af72d037ab7ff"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"
}
},
"neoidiosyn": {
"inputs": {
"lix": "lix",
"lix-module": "lix-module",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1732480362,
"narHash": "sha256-qdsljfbJlKK3CKigb5irz57fkzf5e7j29DEYnUq5r1U=",
"ref": "refs/heads/main",
"rev": "6a952dd5ce1715ab1516fac5efa36417051276c9",
"revCount": 1,
"type": "git",
"url": "https://woof.rip/mikael/neoidiosyn.git"
},
"original": {
"type": "git",
"url": "https://woof.rip/mikael/neoidiosyn.git"
}
},
"niri": { "niri": {
"inputs": { "inputs": {
"niri-stable": "niri-stable", "niri-stable": "niri-stable",
@ -394,11 +488,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1731493674, "lastModified": 1732366896,
"narHash": "sha256-J01wasU1Bkyh5u7gD5Uo+H3EK56NY5PxNsXsbgYBpM0=", "narHash": "sha256-dQrHznGma8aWeBESRUCc1onWYoGrM35GDl/uwEB7eG8=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "91097eb0301feecf3079af35dee05653129f98b7", "rev": "3131d857c946c75557f5b6fb99a113b6949ea04d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -410,16 +504,16 @@
"niri-stable": { "niri-stable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1731164272, "lastModified": 1731483594,
"narHash": "sha256-ea15x8+AAm90aeU1zNWXzX7ZfenzQRUgORyjOdn4Uoc=", "narHash": "sha256-Qjf7alRbPPERfiZsM9EMKX+HwjESky1tieh5PJIkLwE=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "9d8f640503819ff1905c9040d3c7910a50400bbd", "rev": "75c79116a7e40cbc0e110ce0cdd500e896458679",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "YaLTeR", "owner": "YaLTeR",
"ref": "v0.1.10", "ref": "v0.1.10.1",
"repo": "niri", "repo": "niri",
"type": "github" "type": "github"
} }
@ -427,11 +521,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1731437040, "lastModified": 1732363756,
"narHash": "sha256-9CnE02lvO5p5JryrxEgin1mZhv6LbnJSg6Or7dNezRI=", "narHash": "sha256-/E2aRhcvlH2PkkpC2n79UCMZyIkQKWfG4m//UHkeNgU=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "0e5e764c78421dc61c82ca6df630f33e8221005a", "rev": "9c7e8d04d27d2f914ad3e9a54c64b64c34aea4d4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -468,11 +562,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731291988, "lastModified": 1731897021,
"narHash": "sha256-2Gh76VlUV6FKFBGcCw4GjW+xUXfB9fHmQ8dlqQVwwIE=", "narHash": "sha256-M3kLX32uTn27kfm/X1RTtTq5Zks6VDGPYCLqMEzjUtA=",
"owner": "illdefined", "owner": "illdefined",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "95e85dcb96a4622be23ffc71be51b35ba30f7481", "rev": "daa4b9753419986151c11290f96ef67cc789d189",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -483,11 +577,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1731403644, "lastModified": 1731797098,
"narHash": "sha256-T9V7CTucjRZ4Qc6pUEV/kpgNGzQbHWfGcfK6JJLfUeI=", "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "f6581f1c3b137086e42a08a906bdada63045f991", "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -498,11 +592,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1731245184, "lastModified": 1732238832,
"narHash": "sha256-vmLS8+x+gHRv1yzj3n+GTAEObwmhxmkkukB2DwtJRdU=", "narHash": "sha256-sQxuJm8rHY20xq6Ah+GwIUkF95tWjGRd1X8xF+Pkk38=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "aebe249544837ce42588aa4b2e7972222ba12e8f", "rev": "8edf06bea5bcbee082df1b7369ff973b91618b8d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -530,11 +624,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1731239293, "lastModified": 1731797254,
"narHash": "sha256-q2yjIWFFcTzp5REWQUOU9L6kHdCDmFDpqeix86SOvDc=", "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9256f7c71a195ebe7a218043d9f93390d49e6884", "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -562,11 +656,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1731245184, "lastModified": 1732238832,
"narHash": "sha256-vmLS8+x+gHRv1yzj3n+GTAEObwmhxmkkukB2DwtJRdU=", "narHash": "sha256-sQxuJm8rHY20xq6Ah+GwIUkF95tWjGRd1X8xF+Pkk38=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "aebe249544837ce42588aa4b2e7972222ba12e8f", "rev": "8edf06bea5bcbee082df1b7369ff973b91618b8d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -578,11 +672,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1731515340, "lastModified": 1732480006,
"narHash": "sha256-GE/kuwXQhmUynUPdRbWp3ccuqfFshF6oLMg7TGXgl+8=", "narHash": "sha256-QscOabzgJq4vJm2joaJrmYneyvt1GWh+4JB+EEErm9Q=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "4ae1080fdf68e0c54c05860030861a852439223a", "rev": "47c654b6d4c461da43e1bdab4072af74da82529e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -646,7 +740,7 @@
"inputs": { "inputs": {
"advisory-db": "advisory-db", "advisory-db": "advisory-db",
"crane": "crane_2", "crane": "crane_2",
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_4",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
@ -677,8 +771,8 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"lanzaboote": "lanzaboote", "lanzaboote": "lanzaboote",
"linux-hardened": "linux-hardened", "linux-hardened": "linux-hardened",
"lix": "lix", "lix": "lix_2",
"lix-module": "lix-module", "lix-module": "lix-module_2",
"niri": "niri", "niri": "niri",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
@ -695,11 +789,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731464916, "lastModified": 1732328983,
"narHash": "sha256-WZ5rpjr/wCt7yBOUsvDE2i22hYz9g8W921jlwVktRQ4=", "narHash": "sha256-RHt12f/slrzDpSL7SSkydh8wUE4Nr4r23HlpWywed9E=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "2c19bad6e881b5a154cafb7f9106879b5b356d1f", "rev": "ed8aa5b64f7d36d9338eb1d0a3bb60cf52069a72",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -754,6 +848,21 @@
"type": "github" "type": "github"
} }
}, },
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"xwayland-satellite-stable": { "xwayland-satellite-stable": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -774,11 +883,11 @@
"xwayland-satellite-unstable": { "xwayland-satellite-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1731123454, "lastModified": 1732233710,
"narHash": "sha256-W1UUok7DPi4IXCYtc273FbVH1ifuCIcl+oO6CDqt8Dk=", "narHash": "sha256-gWf9dX6DVx0ssK2G3yrFG9yMT9UU0mDwyD51z/Q6FTA=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "3e6f892d20d918479e67d1e6c90c4be824a9d4ab", "rev": "02f30546264ff8407cbb39528b3a3cc3045e53c1",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -174,8 +174,8 @@ imports = [
supportedFeatures = base ++ [ "gccarch-rv64imac" "gccarch-rv64imacfd" ]; supportedFeatures = base ++ [ "gccarch-rv64imac" "gccarch-rv64imacfd" ];
sshKey = "/etc/keys/nix-ssh"; sshKey = "/etc/keys/nix-ssh";
} }
] ++ (lib.range 1 8 |> map (num: { ] ++ (lib.range 1 11 |> map (num: {
hostName = "build-worker-0${toString num}"; hostName = "build-worker-${lib.fixedWidthNumber 2 num}";
protocol = "ssh-ng"; protocol = "ssh-ng";
sshUser = "root"; sshUser = "root";
maxJobs = 4; maxJobs = 4;
@ -190,6 +190,7 @@ imports = [
programs.ssh = { programs.ssh = {
knownHosts = { knownHosts = {
"[build-worker-kyoumanet.fly.dev]:2200".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJUGzlilikAUfUGKXVCoTeDvPRoWUgDDkNU5WaRUBzls";
"[build-worker-kyoumanet.fly.dev]:2201".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDL2M97UBHg9aUfjDUxzmzg1r0ga0m3/stummBVwuEAB"; "[build-worker-kyoumanet.fly.dev]:2201".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDL2M97UBHg9aUfjDUxzmzg1r0ga0m3/stummBVwuEAB";
"[build-worker-kyoumanet.fly.dev]:2202".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOTwVKL0P0chPM2Gz23rbT94844+w1CGJdCaZdzfjThz"; "[build-worker-kyoumanet.fly.dev]:2202".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOTwVKL0P0chPM2Gz23rbT94844+w1CGJdCaZdzfjThz";
"[build-worker-kyoumanet.fly.dev]:2203".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAjy2eZGJQeAYy0+fLgW9jiS0jVY2LInY0NDMnzCvvKp"; "[build-worker-kyoumanet.fly.dev]:2203".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAjy2eZGJQeAYy0+fLgW9jiS0jVY2LInY0NDMnzCvvKp";
@ -198,15 +199,18 @@ imports = [
"[build-worker-kyoumanet.fly.dev]:2206".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGf0kxGgwOG9KhUhvxxTSiQC5YikrzZXKDgSpBw33qN4"; "[build-worker-kyoumanet.fly.dev]:2206".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGf0kxGgwOG9KhUhvxxTSiQC5YikrzZXKDgSpBw33qN4";
"[build-worker-kyoumanet.fly.dev]:2207".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL9z95a6Fn/dB+iNigEYpuJdBnBwCkIZYaKHcFbGP+RY"; "[build-worker-kyoumanet.fly.dev]:2207".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL9z95a6Fn/dB+iNigEYpuJdBnBwCkIZYaKHcFbGP+RY";
"[build-worker-kyoumanet.fly.dev]:2208".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAk+FNMhTfAVqk3MfLp4QiG/i5ti53DlpnC0q+sOvU9O"; "[build-worker-kyoumanet.fly.dev]:2208".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAk+FNMhTfAVqk3MfLp4QiG/i5ti53DlpnC0q+sOvU9O";
"[build-worker-kyoumanet-cdg.fly.dev]:2209".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJGlQD/3fLn/Kyb7v0RIycHRcArGi75jURj803EMpW0S";
"[build-worker-kyoumanet-cdg.fly.dev]:2210".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMQm1FSGBGdCR5f8MvBvdKM0M4yIQVnH1po7hHO5T1qz";
"[build-worker-kyoumanet-cdg.fly.dev]:2211".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINlH+v2ZlcDQY3itw4b7aRbwRTqDsTE0R5Ua3vF0VaGr";
"integra.kyouma.net".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIBwEQiSfaDrUAwgul4mktusBPcIVxI4pLNDh9DPopVU"; "integra.kyouma.net".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIBwEQiSfaDrUAwgul4mktusBPcIVxI4pLNDh9DPopVU";
"schrodinger.kyouma.net".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKo7vZ6lS1wx76YsbAdhOsGcc20YMAW52ep8SZ/FCHDp"; "schrodinger.kyouma.net".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKo7vZ6lS1wx76YsbAdhOsGcc20YMAW52ep8SZ/FCHDp";
"zh1830.rsync.net".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJtclizeBy1Uo3D86HpgD3LONGVH0CJ0NT+YfZlldAJd"; "zh1830.rsync.net".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJtclizeBy1Uo3D86HpgD3LONGVH0CJ0NT+YfZlldAJd";
}; };
extraConfig = lib.range 1 8 |> map (num: '' extraConfig = lib.range 0 11 |> map (num: ''
Host build-worker-0${toString num} Host build-worker-${lib.fixedWidthNumber 2 num}
Hostname build-worker-kyoumanet.fly.dev Hostname build-worker-kyoumanet${lib.optionalString (num > 8) "-cdg"}.fly.dev
Port 220${toString num} Port ${toString (2200 + num)}
'') |> lib.concatStrings; '') |> lib.concatStrings;
}; };

View file

@ -4,15 +4,6 @@ let
inherit (lib) toList; inherit (lib) toList;
inherit (prev.stdenv) hostPlatform; inherit (prev.stdenv) hostPlatform;
in { in {
numactl = prev.numactl.overrideAttrs (prevAttrs: {
patches = prevAttrs.patches or [ ] ++ [
(final.fetchpatch {
url = "https://github.com/numactl/numactl/commit/f9deba0c8404529772468d6dd01389f7dbfa5ba9.patch";
hash = "sha256-TmWfD99YaSIHA5PSsWHE91GSsdsVgVU+qIow7LOwOGw=";
})
];
});
redis = prev.redis.overrideAttrs { redis = prev.redis.overrideAttrs {
doCheck = false; doCheck = false;
}; };