From def425ed3258a3e13cf1bfef87dc346dc3f31df0 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 5 Feb 2021 23:10:50 +0100 Subject: [PATCH 1/4] github: setup Actions with cachix --- .github/workflows/cachix.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/cachix.yml diff --git a/.github/workflows/cachix.yml b/.github/workflows/cachix.yml new file mode 100644 index 0000000..f7bcbaa --- /dev/null +++ b/.github/workflows/cachix.yml @@ -0,0 +1,18 @@ +name: "Build everything and push to cachix" +on: + push: + branches: + - main +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: cachix/install-nix-action@v12 + with: + nix_path: nixpkgs=channel:nixos-20.09-small + - uses: cachix/cachix-action@v8 + with: + name: alarsyo + authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' + - run: nix-build -E 'let pkgs = import { overlays = import ./overlays; }; in pkgs.bitwarden_rs-postgresql' From 29c8757ea717d1e2661c80be2d263742ab64c8bd Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 5 Feb 2021 23:57:00 +0100 Subject: [PATCH 2/4] configuration: setup cachix --- configuration.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/configuration.nix b/configuration.nix index 2bab3cf..037103a 100644 --- a/configuration.nix +++ b/configuration.nix @@ -137,5 +137,14 @@ boot.supportedFilesystems = [ "btrfs" ]; nixpkgs.overlays = import ./overlays; + + nix = { + binaryCaches = [ + "https://alarsyo.cachix.org" + ]; + binaryCachePublicKeys = [ + "alarsyo.cachix.org-1:A6BmcaJek5+ZDWWv3fPteHhPm6U8liS9CbDbmegPfmk=" + ]; + }; } From bbdb35db7ef0c0af1f733e1e29470133327a75d9 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 6 Feb 2021 00:20:50 +0100 Subject: [PATCH 3/4] github: run cachix manually and hourly --- .github/workflows/cachix.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/cachix.yml b/.github/workflows/cachix.yml index f7bcbaa..6950dad 100644 --- a/.github/workflows/cachix.yml +++ b/.github/workflows/cachix.yml @@ -1,5 +1,8 @@ name: "Build everything and push to cachix" on: + workflow_dispatch: + schedule: + - cron: '* */1 * * *' push: branches: - main From 16ac9ae6373c46c7b9d11a605d2795af6d61b17c Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 6 Feb 2021 00:35:57 +0100 Subject: [PATCH 4/4] overlays: add bitwarden_rs-vault --- .github/workflows/cachix.yml | 2 +- overlays/bitwarden_rs-vault.nix | 11 +++++++++++ overlays/default.nix | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 overlays/bitwarden_rs-vault.nix diff --git a/.github/workflows/cachix.yml b/.github/workflows/cachix.yml index 6950dad..de35c24 100644 --- a/.github/workflows/cachix.yml +++ b/.github/workflows/cachix.yml @@ -18,4 +18,4 @@ jobs: with: name: alarsyo authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - - run: nix-build -E 'let pkgs = import { overlays = import ./overlays; }; in pkgs.bitwarden_rs-postgresql' + - run: nix-build -E 'let pkgs = import { overlays = import ./overlays; }; in with pkgs; [ bitwarden_rs-postgresql bitwarden_rs-vault ]' diff --git a/overlays/bitwarden_rs-vault.nix b/overlays/bitwarden_rs-vault.nix new file mode 100644 index 0000000..47e2cb4 --- /dev/null +++ b/overlays/bitwarden_rs-vault.nix @@ -0,0 +1,11 @@ +final: prev: +{ + bitwarden_rs-vault = prev.bitwarden_rs-vault.overrideAttrs (drv: rec { + version = "2.17.1"; + + src = prev.fetchurl { + url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"; + sha256 = "1kd21higniszk1na5ag7q4g0l7h6ddl91gpbjbwym28hsbjvxla7"; + }; + }); +} diff --git a/overlays/default.nix b/overlays/default.nix index 73ef5de..8830ee0 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,6 +1,8 @@ let bitwarden_rs = import ./bitwarden_rs.nix; + bitwarden_rs-vault = import ./bitwarden_rs-vault.nix; in [ bitwarden_rs + bitwarden_rs-vault ]