diff --git a/config/default.nix b/config/default.nix index 1b89c187..2a3e4632 100644 --- a/config/default.nix +++ b/config/default.nix @@ -2,6 +2,7 @@ config, pkgs, system, + nixpkgs-staging-next, ... }: { imports = [ @@ -79,4 +80,12 @@ enable = true; }; i18n.defaultLocale = "nl_NL.UTF-8"; + + # TODO: workaround for https://github.com/NixOS/nixpkgs/pull/300028 + system.replaceRuntimeDependencies = [ + { + original = pkgs.xz; + replacement = nixpkgs-staging-next.legacyPackages.${system}.xz; + } + ]; } diff --git a/config/nix.nix b/config/nix.nix index b6a9d142..b3b04c75 100644 --- a/config/nix.nix +++ b/config/nix.nix @@ -163,7 +163,7 @@ script = lib.mkDefault '' #!${pkgs.bash}/bin/bash set -ex - builds=$(${pkgs.curl}/bin/curl -H 'accept: application/json' https://hydra.int.chir.rs/jobset/flakes/nixos-config/evals | ${pkgs.jq}/bin/jq -r '.evals[0].builds[]') + builds=$(${pkgs.curl}/bin/curl -H 'accept: application/json' https://hydra.int.chir.rs/jobset/nixos-config/nixos-config/evals | ${pkgs.jq}/bin/jq -r '.evals[0].builds[]') for build in $builds; do doc=$(${pkgs.curl}/bin/curl -H 'accept: application/json' https://hydra.int.chir.rs/build/$build) jobname=$(echo $doc | ${pkgs.jq}/bin/jq -r '.job') diff --git a/flake.lock b/flake.lock index 7469ea05..772e0568 100644 --- a/flake.lock +++ b/flake.lock @@ -678,6 +678,22 @@ "type": "github" } }, + "nixpkgs-staging-next": { + "locked": { + "lastModified": 1711778457, + "narHash": "sha256-L6uaSIPJyqOyaSY8VGdbhMyiaCKSdGDvmpQtVCMoYTo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "459f861224e8517134b4c5a104cf44aa0bd14c22", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "staging-next", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1711200738, @@ -733,6 +749,7 @@ "nixos-hardware": "nixos-hardware", "nixos-vscode-server": "nixos-vscode-server", "nixpkgs": "nixpkgs_3", + "nixpkgs-staging-next": "nixpkgs-staging-next", "rust-overlay": "rust-overlay", "sops-nix": "sops-nix", "systems": "systems_2" diff --git a/flake.nix b/flake.nix index 433cd72c..027cf492 100644 --- a/flake.nix +++ b/flake.nix @@ -111,6 +111,7 @@ rec { inputs.nixpkgs.follows = "nixpkgs"; }; nixpkgs.url = "github:NixOS/nixpkgs"; + nixpkgs-staging-next.url = "github:NixOS/nixpkgs/staging-next"; rust-overlay = { url = "github:oxalica/rust-overlay"; inputs.flake-utils.follows = "flake-utils";