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 260d8dc47c83361a9c007710e06c16e75830d3d4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 23 Jul 2025 13:15:53 +0000 Subject: [PATCH 2/2] chore(deps): update rust crate tokio to v1.46.1 --- Cargo.lock | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index df7f24f..192acd9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -900,7 +900,7 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.48.0", ] [[package]] @@ -2509,6 +2509,17 @@ dependencies = [ "bindgen 0.65.1", ] +[[package]] +name = "io-uring" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93587f37623a1a17d94ef2bc9ada592f5465fe7732084ab7beefabe5c77c0c4" +dependencies = [ + "bitflags 2.9.1", + "cfg-if", + "libc", +] + [[package]] name = "ipconfig" version = "0.3.2" @@ -5240,17 +5251,19 @@ dependencies = [ [[package]] name = "tokio" -version = "1.45.1" +version = "1.46.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75ef51a33ef1da925cea3e4eb122833cb377c61439ca401b770f54902b806779" +checksum = "0cc3a2344dafbe23a245241fe8b09735b521110d30fcefbbd5feb1797ca35d17" dependencies = [ "backtrace", "bytes", + "io-uring", "libc", "mio", "parking_lot", "pin-project-lite", "signal-hook-registry", + "slab", "socket2", "tokio-macros", "windows-sys 0.52.0", @@ -5968,7 +5981,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.48.0", ] [[package]]