From 7c9496cd73fc6f0cba67af2000cd5bc6b20afaf5 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Wed, 15 Feb 2023 07:25:41 -0800 Subject: [PATCH] add nixos/modules/misc --- .github/workflows/update.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 68358d9df..f99ce868a 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -33,6 +33,11 @@ jobs: - name: Procure git-filter-repo from nixpkgs run: "nix-env -i git-filter-repo -f ''" + - name: Filter nixpkgs on ./nixos/modules/misc + run: | + git clone ./nixpkgs nixpkgs-modules + cd ./nixpkgs-modules + git filter-repo --path nixos/modules/misc --force - name: Filter nixpkgs on ./lib run: | @@ -43,10 +48,13 @@ jobs: run: | cd ./nixpkgs-lib git remote add other ../nixpkgs/ + git remote add modules ../nixpkgs-modules/ git fetch other master + git fetch modules master git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" git config --local user.name "github-actions[bot]" git merge -X theirs --allow-unrelated-histories other/master + git merge -X theirs --allow-unrelated-histories modules/master - name: Push changes uses: ad-m/github-push-action@master