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 333504b1f9b1e61efb41f4c68c9994debdcd521f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 23 Jul 2025 13:15:28 +0000 Subject: [PATCH 2/2] chore(deps): update rust crate bindgen to 0.72.0 --- crates/teepot-tdx-attest-sys/Cargo.lock | 8 ++++---- crates/teepot-tdx-attest-sys/Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crates/teepot-tdx-attest-sys/Cargo.lock b/crates/teepot-tdx-attest-sys/Cargo.lock index 79d6f01..a6e802b 100644 --- a/crates/teepot-tdx-attest-sys/Cargo.lock +++ b/crates/teepot-tdx-attest-sys/Cargo.lock @@ -13,9 +13,9 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.70.1" +version = "0.72.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" +checksum = "4f72209734318d0b619a5e0f5129918b848c416e122a3c4ce054e03cb87b726f" dependencies = [ "bitflags", "cexpr", @@ -187,9 +187,9 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "rustc-hash" -version = "1.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" [[package]] name = "shlex" diff --git a/crates/teepot-tdx-attest-sys/Cargo.toml b/crates/teepot-tdx-attest-sys/Cargo.toml index 7e9db7a..96c3a7e 100644 --- a/crates/teepot-tdx-attest-sys/Cargo.toml +++ b/crates/teepot-tdx-attest-sys/Cargo.toml @@ -14,4 +14,4 @@ description = "Fork of tdx-attest-sys" [dependencies] [build-dependencies] -bindgen = "0.70.1" +bindgen = "0.72.0"