Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add nixos/modules/misc #3

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add nixos/modules/misc #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .github/workflows/update.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ jobs:
- name: Procure git-filter-repo from nixpkgs
run: "nix-env -i git-filter-repo -f '<nixpkgs>'"

- 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: |
Expand All @@ -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
Expand Down