From e0e6fb2574d2f99dcd793b5359832c22bb2e9e48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikodem=20Rabuli=C5=84ski?= Date: Mon, 6 May 2024 22:17:38 +0200 Subject: [PATCH] attic changes --- .github/workflows/build.yaml | 12 ++++++------ flake.nix | 7 +++++-- hosts/kazuki/attic.nix | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 2395793..fa35e6f 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -37,8 +37,8 @@ jobs: run: nix build .#${{ matrix.output }} -L - name: Push output run: | - nix run .#attic -- login nrab-attic 'https://attic.nrab.lol' ${{ secrets.ATTIC_TOKEN }} - nix run .#attic -- push nrab-attic:public result + nix run .#attic.client -- login nrab-attic 'https://attic.nrab.lol' ${{ secrets.ATTIC_TOKEN }} + nix run .#attic.client -- push nrab-attic:public result build-aarch64-darwin: runs-on: macos-14 @@ -55,8 +55,8 @@ jobs: run: nix build .#${{ matrix.output }} -L - name: Push output run: | - nix run .#attic -- login nrab-attic 'https://attic.nrab.lol' ${{ secrets.ATTIC_TOKEN }} - nix run .#attic -- push nrab-attic:public result + nix run .#attic.client -- login nrab-attic 'https://attic.nrab.lol' ${{ secrets.ATTIC_TOKEN }} + nix run .#attic.client -- push nrab-attic:public result build-aarch64-linux: runs-on: [Linux, ARM64, nix] @@ -72,8 +72,8 @@ jobs: run: nix build .#${{ matrix.output }} -L - name: Push output run: | - nix run .#attic -- login nrab-attic 'https://attic.nrab.lol' ${{ secrets.ATTIC_TOKEN }} - nix run .#attic -- push nrab-attic:public result + nix run .#attic.client -- login nrab-attic 'https://attic.nrab.lol' ${{ secrets.ATTIC_TOKEN }} + nix run .#attic.client -- push nrab-attic:public result all-built: runs-on: ubuntu-latest diff --git a/flake.nix b/flake.nix index e4da91c..5d0d1e7 100644 --- a/flake.nix +++ b/flake.nix @@ -31,7 +31,7 @@ devShells.default = pkgs.mkShellNoCC { packages = [ inputs'.agenix.packages.agenix - self'.packages.attic + self'.packages.attic.client # TODO: Contribute darwin support to nh pkgs.nh ]; @@ -47,7 +47,10 @@ }; # Re-export it for convenience and for caching packages.attic = inputs'.attic.packages.attic.overrideAttrs (prev: { - env = builtins.removeAttrs prev.env or { } [ "NIX_LDFLAGS" ]; + passthru = prev.passthru or {} // { + client = inputs'.attic.packages.attic-client; + server = inputs'.attic.packages.attic-server; + }; }); formatter = pkgs.nixfmt-rfc-style; diff --git a/hosts/kazuki/attic.nix b/hosts/kazuki/attic.nix index 9ee44b7..557013c 100644 --- a/hosts/kazuki/attic.nix +++ b/hosts/kazuki/attic.nix @@ -75,7 +75,7 @@ in proxyPass = "http://attic"; }; extraConfig = '' - client_max_body_size 8G; + client_max_body_size 24G; ''; }; virtualHosts."cache.nrab.lol" = {