Raito Bezarius
fbd6a014ec
We upgrade to 25.05 release, which contains the curl commit
https://github.com/curl/curl/commit/5fbd78eb2dc4afbd8884e8eed27147fc3d4318f6
done in
https://github.com/NixOS/nixpkgs/pull/396200#issuecomment-2795944006.
This fixes HTTP transfers generating arbitrary errors and possibly
failing unusually.
Users who are already depending on 25.05-small or a recent unstable
already had the fix.
Special mention to the Linux kernel who gave me the opportunity to get
on a 24 hours bisection side quest to fix the local release engineering
test.
Special thanks to everyone who had to endure me ranting.
Change-Id: I866caf65d5ea103f1fa5eccd57df8031c9eacda0
Co-authored-by: eldritch horrors <pennae@lix.systems>
Co-authored-by: helle <helle@h3l.li>
Signed-off-by: Raito Bezarius <raito@lix.systems>
(cherry picked from commit 1e34c37477)
85 lines
2.7 KiB
Nix
85 lines
2.7 KiB
Nix
# Test ‘nix-copy-closure’.
|
||
|
||
{ lib, config, nixpkgs, hostPkgs, ... }:
|
||
|
||
let
|
||
pkgs = config.nodes.client.nixpkgs.pkgs;
|
||
|
||
pkgA = pkgs.cowsay;
|
||
pkgB = pkgs.wget;
|
||
pkgC = pkgs.hello;
|
||
pkgD = pkgs.tmux;
|
||
|
||
in {
|
||
name = "nix-copy-closure";
|
||
|
||
nodes =
|
||
{ client =
|
||
{ config, lib, pkgs, ... }:
|
||
{ virtualisation.writableStore = true;
|
||
virtualisation.additionalPaths = [ pkgA pkgD.drvPath ];
|
||
nix.settings.substituters = lib.mkForce [ ];
|
||
};
|
||
|
||
server =
|
||
{ config, pkgs, ... }:
|
||
{ services.openssh.enable = true;
|
||
virtualisation.writableStore = true;
|
||
virtualisation.additionalPaths = [ pkgB pkgC ];
|
||
};
|
||
};
|
||
|
||
testScript = { nodes }: ''
|
||
# fmt: off
|
||
import subprocess
|
||
|
||
start_all()
|
||
|
||
# Create an SSH key on the client.
|
||
subprocess.run([
|
||
"${pkgs.openssh}/bin/ssh-keygen", "-t", "ed25519", "-f", "key", "-N", ""
|
||
], capture_output=True, check=True)
|
||
|
||
server.succeed("systemctl start network-online.target")
|
||
client.succeed("systemctl start network-online.target")
|
||
server.wait_for_unit("network-online.target")
|
||
client.wait_for_unit("network-online.target")
|
||
|
||
client.succeed("mkdir -m 700 /root/.ssh || [[ -d /root/.ssh ]]")
|
||
client.copy_from_host("key", "/root/.ssh/id_ed25519")
|
||
client.succeed("chmod 600 /root/.ssh/id_ed25519")
|
||
|
||
# Install the SSH key on the server.
|
||
server.succeed("mkdir -m 700 /root/.ssh || [[ -d /root/.ssh ]]")
|
||
server.copy_from_host("key.pub", "/root/.ssh/authorized_keys")
|
||
server.wait_for_unit("sshd.service")
|
||
client.succeed(f"ssh -o StrictHostKeyChecking=no {server.name} 'echo hello world' >&2")
|
||
|
||
# Copy the closure of package A from the client to the server.
|
||
server.fail("nix-store --check-validity ${pkgA}")
|
||
client.succeed("nix-copy-closure --to server --gzip ${pkgA} >&2")
|
||
server.succeed("nix-store --check-validity ${pkgA}")
|
||
|
||
# Copy the closure of package B from the server to the client.
|
||
client.fail("nix-store --check-validity ${pkgB}")
|
||
client.succeed("nix-copy-closure --from server --gzip ${pkgB} >&2")
|
||
client.succeed("nix-store --check-validity ${pkgB}")
|
||
|
||
# Copy the closure of package C via the SSH substituter.
|
||
client.fail("nix-store -r ${pkgC}")
|
||
|
||
# Copy the derivation of package D's derivation from the client to the server.
|
||
server.fail("nix-store --check-validity ${pkgD.drvPath}")
|
||
client.succeed("nix-copy-closure --to server --gzip ${pkgD.drvPath} >&2")
|
||
server.succeed("nix-store --check-validity ${pkgD.drvPath}")
|
||
|
||
# FIXME
|
||
# client.succeed(
|
||
# "nix-store --option use-ssh-substituter true"
|
||
# " --option ssh-substituter-hosts root\@server"
|
||
# " -r ${pkgC} >&2"
|
||
# )
|
||
# client.succeed("nix-store --check-validity ${pkgC}")
|
||
'';
|
||
}
|