Merge pull request #381 from DarkKirb/replace-xz
downgrade xz and switch to impure evaluation
This commit is contained in:
commit
dbed0f8f3b
4 changed files with 28 additions and 1 deletions
|
@ -2,6 +2,7 @@
|
||||||
config,
|
config,
|
||||||
pkgs,
|
pkgs,
|
||||||
system,
|
system,
|
||||||
|
nixpkgs-staging-next,
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
imports = [
|
imports = [
|
||||||
|
@ -79,4 +80,12 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
i18n.defaultLocale = "nl_NL.UTF-8";
|
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;
|
||||||
|
}
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -163,7 +163,7 @@
|
||||||
script = lib.mkDefault ''
|
script = lib.mkDefault ''
|
||||||
#!${pkgs.bash}/bin/bash
|
#!${pkgs.bash}/bin/bash
|
||||||
set -ex
|
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
|
for build in $builds; do
|
||||||
doc=$(${pkgs.curl}/bin/curl -H 'accept: application/json' https://hydra.int.chir.rs/build/$build)
|
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')
|
jobname=$(echo $doc | ${pkgs.jq}/bin/jq -r '.job')
|
||||||
|
|
17
flake.lock
17
flake.lock
|
@ -678,6 +678,22 @@
|
||||||
"type": "github"
|
"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": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1711200738,
|
"lastModified": 1711200738,
|
||||||
|
@ -733,6 +749,7 @@
|
||||||
"nixos-hardware": "nixos-hardware",
|
"nixos-hardware": "nixos-hardware",
|
||||||
"nixos-vscode-server": "nixos-vscode-server",
|
"nixos-vscode-server": "nixos-vscode-server",
|
||||||
"nixpkgs": "nixpkgs_3",
|
"nixpkgs": "nixpkgs_3",
|
||||||
|
"nixpkgs-staging-next": "nixpkgs-staging-next",
|
||||||
"rust-overlay": "rust-overlay",
|
"rust-overlay": "rust-overlay",
|
||||||
"sops-nix": "sops-nix",
|
"sops-nix": "sops-nix",
|
||||||
"systems": "systems_2"
|
"systems": "systems_2"
|
||||||
|
|
|
@ -111,6 +111,7 @@ rec {
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs";
|
nixpkgs.url = "github:NixOS/nixpkgs";
|
||||||
|
nixpkgs-staging-next.url = "github:NixOS/nixpkgs/staging-next";
|
||||||
rust-overlay = {
|
rust-overlay = {
|
||||||
url = "github:oxalica/rust-overlay";
|
url = "github:oxalica/rust-overlay";
|
||||||
inputs.flake-utils.follows = "flake-utils";
|
inputs.flake-utils.follows = "flake-utils";
|
||||||
|
|
Loading…
Reference in a new issue