wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 14:51:16 +02:00
Code Activity

Merge pull request #12862 from NixOS/mergify/bp/2.28-maintenance/pr-12853

Browse source 
flake: nixpkgs: 24.11 -> nixos-unstable (backport #12853)
This commit is contained in:
mergify[bot] 2025-04-01 17:46:16 +00:00 • committed by GitHub
commit aff0058b82
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 33 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

8
flake.lock generated
View file

@ -63,16 +63,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1734359947, "lastModified": 1743315132,
"narHash": "sha256-1Noao/H+N8nFB4Beoy8fgwrcOQLVm9o4zKW1ODaqK9E=", "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "48d12d5e70ee91fe8481378e540433a7303dbf6a", "rev": "52faf482a3889b7619003c0daec593a1912fddc1",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "release-24.11", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

2
flake.nix
View file

@ -1,7 +1,7 @@
{ {
description = "The purely functional package manager"; description = "The purely functional package manager";
inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-24.11"; inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
inputs.nixpkgs-regression.url = "github:NixOS/nixpkgs/215d4d0fd80ca5163643b03a33fde804a29cc1e2"; inputs.nixpkgs-regression.url = "github:NixOS/nixpkgs/215d4d0fd80ca5163643b03a33fde804a29cc1e2";
inputs.nixpkgs-23-11.url = "github:NixOS/nixpkgs/a62e6edd6d5e1fa0329b8653c801147986f8d446"; inputs.nixpkgs-23-11.url = "github:NixOS/nixpkgs/a62e6edd6d5e1fa0329b8653c801147986f8d446";

3
src/libfetchers/git-lfs-fetch.cc
View file

@ -44,7 +44,8 @@ static void downloadToSink(
static std::string getLfsApiToken(const ParsedURL & url) static std::string getLfsApiToken(const ParsedURL & url)
{ {
auto [status, output] = runProgram(RunOptions{ auto [status, output] = runProgram(
RunOptions{
.program = "ssh", .program = "ssh",
.args = {*url.authority, "git-lfs-authenticate", url.path, "download"}, .args = {*url.authority, "git-lfs-authenticate", url.path, "download"},
}); });

3
src/libstore-test-support/outputs-spec.cc
View file

@ -14,7 +14,8 @@ Gen<OutputsSpec> Arbitrary<OutputsSpec>::arbitrary()
return gen::just((OutputsSpec) OutputsSpec::All{}); return gen::just((OutputsSpec) OutputsSpec::All{});
case 1: case 1:
return gen::map( return gen::map(
gen::nonEmpty(gen::container<StringSet>( gen::nonEmpty(
gen::container<StringSet>(
gen::map(gen::arbitrary<StorePathName>(), [](StorePathName n) { return n.name; }))), gen::map(gen::arbitrary<StorePathName>(), [](StorePathName n) { return n.name; }))),
[](StringSet names) { return (OutputsSpec) OutputsSpec::Names{names}; }); [](StringSet names) { return (OutputsSpec) OutputsSpec::Names{names}; });
default: default:

6
tests/nixos/git-submodules.nix
View file

@ -45,14 +45,14 @@
client.succeed("chmod 600 /root/.ssh/id_ed25519") client.succeed("chmod 600 /root/.ssh/id_ed25519")
# Install the SSH key on the builders. # Install the SSH key on the builders.
client.wait_for_unit("network-online.target") client.wait_for_unit("network-addresses-eth1.service")
remote.succeed("mkdir -p -m 700 /root/.ssh") remote.succeed("mkdir -p -m 700 /root/.ssh")
remote.copy_from_host("key.pub", "/root/.ssh/authorized_keys") remote.copy_from_host("key.pub", "/root/.ssh/authorized_keys")
remote.wait_for_unit("sshd") remote.wait_for_unit("sshd")
remote.wait_for_unit("multi-user.target") remote.wait_for_unit("multi-user.target")
remote.wait_for_unit("network-online.target") remote.wait_for_unit("network-addresses-eth1.service")
client.wait_for_unit("network-online.target") client.wait_for_unit("network-addresses-eth1.service")
client.succeed(f"ssh -o StrictHostKeyChecking=no {remote.name} 'echo hello world'") client.succeed(f"ssh -o StrictHostKeyChecking=no {remote.name} 'echo hello world'")
remote.succeed(""" remote.succeed("""

4
tests/nixos/github-flakes.nix
View file

@ -187,9 +187,9 @@ in
github.succeed("cat /var/log/httpd/*.log >&2") github.succeed("cat /var/log/httpd/*.log >&2")
github.wait_for_unit("httpd.service") github.wait_for_unit("httpd.service")
github.wait_for_unit("network-online.target") github.wait_for_unit("network-addresses-eth1.service")
client.wait_for_unit("network-online.target") client.wait_for_unit("network-addresses-eth1.service")
client.succeed("curl -v https://github.com/ >&2") client.succeed("curl -v https://github.com/ >&2")
out = client.succeed("nix registry list") out = client.succeed("nix registry list")
print(out) print(out)

4
tests/nixos/nix-copy-closure.nix
View file

@ -70,9 +70,9 @@ in
server.copy_from_host("key.pub", "/root/.ssh/authorized_keys") server.copy_from_host("key.pub", "/root/.ssh/authorized_keys")
server.wait_for_unit("sshd") server.wait_for_unit("sshd")
server.wait_for_unit("multi-user.target") server.wait_for_unit("multi-user.target")
server.wait_for_unit("network-online.target") server.wait_for_unit("network-addresses-eth1.service")
client.wait_for_unit("network-online.target") client.wait_for_unit("network-addresses-eth1.service")
client.succeed(f"ssh -o StrictHostKeyChecking=no {server.name} 'echo hello world'") client.succeed(f"ssh -o StrictHostKeyChecking=no {server.name} 'echo hello world'")
# Copy the closure of package A from the client to the server. # Copy the closure of package A from the client to the server.

4
tests/nixos/nix-copy.nix
View file

@ -79,9 +79,9 @@ in
server.wait_for_unit("sshd") server.wait_for_unit("sshd")
server.wait_for_unit("multi-user.target") server.wait_for_unit("multi-user.target")
server.wait_for_unit("network-online.target") server.wait_for_unit("network-addresses-eth1.service")
client.wait_for_unit("network-online.target") client.wait_for_unit("network-addresses-eth1.service")
client.wait_for_unit("getty@tty1.service") client.wait_for_unit("getty@tty1.service")
# Either the prompt: ]# # Either the prompt: ]#
# or an OCR misreading of it: 1# # or an OCR misreading of it: 1#

2
tests/nixos/nix-docker.nix
View file

@ -61,7 +61,7 @@ in
{ nodes }: { nodes }:
'' ''
cache.wait_for_unit("harmonia.service") cache.wait_for_unit("harmonia.service")
cache.wait_for_unit("network-online.target") cache.wait_for_unit("network-addresses-eth1.service")
machine.succeed("mkdir -p /etc/containers") machine.succeed("mkdir -p /etc/containers")
machine.succeed("""echo '{"default":[{"type":"insecureAcceptAnything"}]}' > /etc/containers/policy.json""") machine.succeed("""echo '{"default":[{"type":"insecureAcceptAnything"}]}' > /etc/containers/policy.json""")

4
tests/nixos/nss-preload.nix
View file

@ -145,7 +145,7 @@ in
testScript = testScript =
{ nodes, ... }: { nodes, ... }:
'' ''
http_dns.wait_for_unit("network-online.target") http_dns.wait_for_unit("network-addresses-eth1.service")
http_dns.wait_for_unit("nginx") http_dns.wait_for_unit("nginx")
http_dns.wait_for_open_port(80) http_dns.wait_for_open_port(80)
http_dns.wait_for_unit("unbound") http_dns.wait_for_unit("unbound")
@ -153,7 +153,7 @@ in
client.start() client.start()
client.wait_for_unit('multi-user.target') client.wait_for_unit('multi-user.target')
client.wait_for_unit('network-online.target') client.wait_for_unit('network-addresses-eth1.service')
with subtest("can fetch data from a remote server outside sandbox"): with subtest("can fetch data from a remote server outside sandbox"):
client.succeed("nix --version >&2") client.succeed("nix --version >&2")

4
tests/nixos/remote-builds-ssh-ng.nix
View file

@ -102,12 +102,12 @@ in
client.succeed("chmod 600 /root/.ssh/id_ed25519") client.succeed("chmod 600 /root/.ssh/id_ed25519")
# Install the SSH key on the builder. # Install the SSH key on the builder.
client.wait_for_unit("network-online.target") client.wait_for_unit("network-addresses-eth1.service")
builder.succeed("mkdir -p -m 700 /root/.ssh") builder.succeed("mkdir -p -m 700 /root/.ssh")
builder.copy_from_host("key.pub", "/root/.ssh/authorized_keys") builder.copy_from_host("key.pub", "/root/.ssh/authorized_keys")
builder.wait_for_unit("sshd") builder.wait_for_unit("sshd")
builder.wait_for_unit("multi-user.target") builder.wait_for_unit("multi-user.target")
builder.wait_for_unit("network-online.target") builder.wait_for_unit("network-addresses-eth1.service")
client.succeed(f"ssh -o StrictHostKeyChecking=no {builder.name} 'echo hello world'") client.succeed(f"ssh -o StrictHostKeyChecking=no {builder.name} 'echo hello world'")

4
tests/nixos/remote-builds.nix
View file

@ -123,12 +123,12 @@ in
client.succeed("chmod 600 /root/.ssh/id_ed25519") client.succeed("chmod 600 /root/.ssh/id_ed25519")
# Install the SSH key on the builders. # Install the SSH key on the builders.
client.wait_for_unit("network-online.target") client.wait_for_unit("network-addresses-eth1.service")
for builder in [builder1, builder2]: for builder in [builder1, builder2]:
builder.succeed("mkdir -p -m 700 /root/.ssh") builder.succeed("mkdir -p -m 700 /root/.ssh")
builder.copy_from_host("key.pub", "/root/.ssh/authorized_keys") builder.copy_from_host("key.pub", "/root/.ssh/authorized_keys")
builder.wait_for_unit("sshd") builder.wait_for_unit("sshd")
builder.wait_for_unit("network-online.target") builder.wait_for_unit("network-addresses-eth1.service")
# Make sure the builder can handle our login correctly # Make sure the builder can handle our login correctly
builder.wait_for_unit("multi-user.target") builder.wait_for_unit("multi-user.target")
# Make sure there's no funny business on the client either # Make sure there's no funny business on the client either

4
tests/nixos/s3-binary-cache-store.nix
View file

@ -67,14 +67,14 @@ in
# Create a binary cache. # Create a binary cache.
server.wait_for_unit("minio") server.wait_for_unit("minio")
server.wait_for_unit("network-online.target") server.wait_for_unit("network-addresses-eth1.service")
server.succeed("mc config host add minio http://localhost:9000 ${accessKey} ${secretKey} --api s3v4") server.succeed("mc config host add minio http://localhost:9000 ${accessKey} ${secretKey} --api s3v4")
server.succeed("mc mb minio/my-cache") server.succeed("mc mb minio/my-cache")
server.succeed("${env} nix copy --to '${storeUrl}' ${pkgA}") server.succeed("${env} nix copy --to '${storeUrl}' ${pkgA}")
client.wait_for_unit("network-online.target") client.wait_for_unit("network-addresses-eth1.service")
# Test fetchurl on s3:// URLs while we're at it. # Test fetchurl on s3:// URLs while we're at it.
client.succeed("${env} nix eval --impure --expr 'builtins.fetchurl { name = \"foo\"; url = \"s3://my-cache/nix-cache-info?endpoint=http://server:9000&region=eu-west-1\"; }'") client.succeed("${env} nix eval --impure --expr 'builtins.fetchurl { name = \"foo\"; url = \"s3://my-cache/nix-cache-info?endpoint=http://server:9000&region=eu-west-1\"; }'")

4
tests/nixos/sourcehut-flakes.nix
View file

@ -139,8 +139,8 @@ in
start_all() start_all()
sourcehut.wait_for_unit("httpd.service") sourcehut.wait_for_unit("httpd.service")
sourcehut.wait_for_unit("network-online.target") sourcehut.wait_for_unit("network-addresses-eth1.service")
client.wait_for_unit("network-online.target") client.wait_for_unit("network-addresses-eth1.service")
client.succeed("curl -v https://git.sr.ht/ >&2") client.succeed("curl -v https://git.sr.ht/ >&2")
client.succeed("nix registry list | grep nixpkgs") client.succeed("nix registry list | grep nixpkgs")