Replace nixpkgs with stable and update inputs
Some checks failed
CI / build (push) Failing after 1m25s
CI / deploy (docs-ops.qo.is) (push) Has been skipped
CI / deploy (system-physical) (push) Has been skipped
CI / deploy (system-vm) (push) Has been skipped

This commit is contained in:
Fabian Hauser 2025-06-25 23:53:10 +03:00
parent 3295f6f128
commit e76a4f04cc
3 changed files with 17 additions and 34 deletions

40
flake.lock generated
View file

@ -23,15 +23,15 @@
"disko": { "disko": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs-nixos-stable" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1750040002, "lastModified": 1750680230,
"narHash": "sha256-KrC9iOVYIn6ukpVlHbqSA4hYCZ6oDyJKrcLqv4c5v84=", "narHash": "sha256-kD88T/NqmcgfOBFAwphN30ccaUdj6K6+LG0XdM2w2LA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "7f1857b31522062a6a00f88cbccf86b43acceed1", "rev": "8fd2d6c75009ac75f9a6fb18c33a239806778d01",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -81,11 +81,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749636823, "lastModified": 1750779888,
"narHash": "sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4=", "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "623c56286de5a3193aa38891a6991b28f9bab056", "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -131,13 +131,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-nixos-stable": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1750330365, "lastModified": 1750646418,
"narHash": "sha256-hJ7XMNVsTnnbV2NPmStCC07gvv5l2x7+Skb7hyUzazg=", "narHash": "sha256-4UAN+W0Lp4xnUiHYXUXAPX18t+bn6c4Btry2RqM9JHY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d883b6213afa179b58ba8bace834f1419707d0ad", "rev": "1f426f65ac4e6bf808923eb6f8b8c2bfba3d18c5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -147,22 +147,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1750365781,
"narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"private": { "private": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -172,6 +156,7 @@
"locked": { "locked": {
"lastModified": 1749920008, "lastModified": 1749920008,
"narHash": "sha256-wn3U2q/+OQYErVyoY9kwZP/fXcDG4ewhJkHX7qHzq8g=", "narHash": "sha256-wn3U2q/+OQYErVyoY9kwZP/fXcDG4ewhJkHX7qHzq8g=",
"ref": "refs/heads/main",
"rev": "5f8ba2025848dd30539c42ef1f7e6c6f917e70d9", "rev": "5f8ba2025848dd30539c42ef1f7e6c6f917e70d9",
"revCount": 19, "revCount": 19,
"type": "git", "type": "git",
@ -188,7 +173,6 @@
"disko": "disko", "disko": "disko",
"git-hooks-nix": "git-hooks-nix", "git-hooks-nix": "git-hooks-nix",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-nixos-stable": "nixpkgs-nixos-stable",
"private": "private", "private": "private",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"

View file

@ -5,8 +5,7 @@
extra-trusted-public-keys = "qois-infrastructure:lh35ymN7Aoxm5Hz0S6JusxE+cYzMU+x9OMKjDVIpfuE="; extra-trusted-public-keys = "qois-infrastructure:lh35ymN7Aoxm5Hz0S6JusxE+cYzMU+x9OMKjDVIpfuE=";
}; };
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
nixpkgs-nixos-stable.url = "github:NixOS/nixpkgs/nixos-24.11";
treefmt-nix = { treefmt-nix = {
url = "github:numtide/treefmt-nix"; url = "github:numtide/treefmt-nix";
@ -24,7 +23,7 @@
deploy-rs.url = "github:serokell/deploy-rs"; deploy-rs.url = "github:serokell/deploy-rs";
disko = { disko = {
url = "github:nix-community/disko"; url = "github:nix-community/disko";
inputs.nixpkgs.follows = "nixpkgs-nixos-stable"; inputs.nixpkgs.follows = "nixpkgs";
}; };
private.url = "git+file:./private"; private.url = "git+file:./private";
private.inputs.nixpkgs.follows = "nixpkgs"; private.inputs.nixpkgs.follows = "nixpkgs";
@ -59,7 +58,7 @@
inherit (inputs) inherit (inputs)
deploy-rs deploy-rs
disko disko
nixpkgs-nixos-stable nixpkgs
sops-nix sops-nix
private private
git-hooks-nix git-hooks-nix

View file

@ -1,12 +1,12 @@
{ {
self, self,
pkgs, pkgs,
nixpkgs-nixos-stable, nixpkgs,
... ...
}@inputs: }@inputs:
let let
inherit (pkgs.lib) genAttrs; inherit (pkgs.lib) genAttrs;
inherit (nixpkgs-nixos-stable.lib) nixosSystem; inherit (nixpkgs.lib) nixosSystem;
configs = self.lib.foldersWithNix ./.; configs = self.lib.foldersWithNix ./.;
in in
genAttrs configs ( genAttrs configs (