From c369fb7c8392fca9d3d3633fec7c603143a47a9e Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 21 Jul 2025 12:30:02 +0200 Subject: [PATCH 1/2] fix: update extra substituter URL in nixConfig - Replaced outdated substituter URL with a new static IP-based URL. - Ensures proper configuration and access to the required substituter. --- .github/workflows/nix-non-x86.yml | 4 ++-- .github/workflows/nix.yml | 12 ++++++------ flake.nix | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/nix-non-x86.yml b/.github/workflows/nix-non-x86.yml index b80cf6a..279e6c3 100644 --- a/.github/workflows/nix-non-x86.yml +++ b/.github/workflows/nix-non-x86.yml @@ -21,12 +21,12 @@ jobs: extra_nix_config: | access-tokens = github.com=${{ github.token }} trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= tee-pot:SS6HcrpG87S1M6HZGPsfo7d1xJccCGev7/tXc5+I4jg= - substituters = https://cache.nixos.org/ https://attic.teepot.org/tee-pot + substituters = https://cache.nixos.org/ https://static.188.92.12.49.clients.your-server.de/tee-pot sandbox = true - name: Setup Attic cache uses: ryanccn/attic-action@v0 with: - endpoint: https://attic.teepot.org/ + endpoint: https://static.188.92.12.49.clients.your-server.de/ cache: tee-pot token: ${{ secrets.ATTIC_TOKEN }} diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 3d850ea..8981a37 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -22,12 +22,12 @@ jobs: extra_nix_config: | access-tokens = github.com=${{ github.token }} trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= tee-pot:SS6HcrpG87S1M6HZGPsfo7d1xJccCGev7/tXc5+I4jg= - substituters = https://cache.nixos.org/ https://attic.teepot.org/tee-pot + substituters = https://cache.nixos.org/ https://static.188.92.12.49.clients.your-server.de/tee-pot sandbox = true - name: Setup Attic cache uses: ryanccn/attic-action@v0 with: - endpoint: https://attic.teepot.org/ + endpoint: https://static.188.92.12.49.clients.your-server.de/ cache: tee-pot token: ${{ secrets.ATTIC_TOKEN }} @@ -44,12 +44,12 @@ jobs: extra_nix_config: | access-tokens = github.com=${{ github.token }} trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= tee-pot:SS6HcrpG87S1M6HZGPsfo7d1xJccCGev7/tXc5+I4jg= - substituters = https://cache.nixos.org/ https://attic.teepot.org/tee-pot + substituters = https://cache.nixos.org/ https://static.188.92.12.49.clients.your-server.de/tee-pot sandbox = true - name: Setup Attic cache uses: ryanccn/attic-action@v0 with: - endpoint: https://attic.teepot.org/ + endpoint: https://static.188.92.12.49.clients.your-server.de/ cache: tee-pot token: ${{ secrets.ATTIC_TOKEN }} @@ -84,12 +84,12 @@ jobs: extra_nix_config: | access-tokens = github.com=${{ github.token }} trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= tee-pot:SS6HcrpG87S1M6HZGPsfo7d1xJccCGev7/tXc5+I4jg= - substituters = https://cache.nixos.org/ https://attic.teepot.org/tee-pot + substituters = https://cache.nixos.org/ https://static.188.92.12.49.clients.your-server.de/tee-pot sandbox = true - name: Setup Attic cache uses: ryanccn/attic-action@v0 with: - endpoint: https://attic.teepot.org/ + endpoint: https://static.188.92.12.49.clients.your-server.de/ cache: tee-pot token: ${{ secrets.ATTIC_TOKEN }} diff --git a/flake.nix b/flake.nix index f3ec3fe..587718e 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "teepot"; nixConfig = { - extra-substituters = [ "https://attic.teepot.org/tee-pot" ]; + extra-substituters = [ "https://static.188.92.12.49.clients.your-server.de/tee-pot" ]; extra-trusted-public-keys = [ "tee-pot:SS6HcrpG87S1M6HZGPsfo7d1xJccCGev7/tXc5+I4jg=" ]; }; From 139ef45afd8ebb9481120d0527d618ebd268052e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 23 Jul 2025 13:15:41 +0000 Subject: [PATCH 2/2] chore(deps): update rust crate dcap-qvl to 0.3.0 --- Cargo.lock | 17 +++++++++++++++-- Cargo.toml | 2 +- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index df7f24f..48a2508 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1224,9 +1224,9 @@ dependencies = [ [[package]] name = "dcap-qvl" -version = "0.2.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c8049b28b1fe35e94bd52f4c20edf7b80b6eeb378faccdd685d5cd82cbc192e" +checksum = "32ef42eade99e79b9fb9d31532041a0a380a7e849d3486950a40b1afd5bf417c" dependencies = [ "anyhow", "asn1_der", @@ -1234,6 +1234,7 @@ dependencies = [ "byteorder", "chrono", "const-oid", + "dcap-qvl-webpki", "der", "futures", "hex", @@ -1249,9 +1250,21 @@ dependencies = [ "serde_json", "tracing", "urlencoding", + "wasm-bindgen-futures", "x509-cert", ] +[[package]] +name = "dcap-qvl-webpki" +version = "0.103.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ebdcd097c369fe3422cf3978540e0406148435ec0f4d8ecbbf201c746f19c9" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + [[package]] name = "der" version = "0.7.10" diff --git a/Cargo.toml b/Cargo.toml index a49e38b..00976ca 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,7 +36,7 @@ chrono = "0.4.40" clap = { version = "4.5", features = ["std", "derive", "env", "error-context", "help", "usage", "wrap_help"], default-features = false } config = { version = "0.15.8", default-features = false, features = ["yaml", "json", "toml", "async"] } const-oid = { version = "0.9.6", default-features = false } -dcap-qvl = "0.2.3" +dcap-qvl = "0.3.0" enumset = { version = "1.1", features = ["serde"] } futures = "0.3.31" futures-core = { version = "0.3.30", default-features = false }