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.

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

bemenu: Move over to HM's module #206

Merged
merged 4 commits into from
Jan 23, 2024
Merged

Conversation

Noodlez1232
Copy link
Contributor

HM just added a new bemenu module upstream, so this commit changes the stylix bemenu module to use that instead.

@Noodlez1232
Copy link
Contributor Author

A little confused as to why the build is failing.

@danth
Copy link
Owner

danth commented Dec 31, 2023

It's building against an older version of Home Manager. If you run nix flake update and commit the new lock file, it should succeed

@Noodlez1232
Copy link
Contributor Author

Went ahead and updated the flake.lock file, and it should be good now.

@danth danth enabled auto-merge (squash) January 3, 2024 19:38
@Noodlez1232
Copy link
Contributor Author

It looks good to me that new change. Is there anything I need to do on my end?

auto-merge was automatically disabled January 9, 2024 19:07

Head branch was pushed to by a user without write access

@danth
Copy link
Owner

danth commented Jan 18, 2024

This was supposed to automatically merge once the tests finished; I'm not sure why that never happened.

Could you fix the merge conflicts?

Noodlez1232 and others added 3 commits January 22, 2024 14:39
HM just added a new bemenu module upstream, so this commit changes the
stylix bemenu module to use that instead.
Flake lock file updates:

• Updated input 'base16':
    'github:SenchoPens/base16.nix/dddf2e1c04845d43c89a8e9e37d574519649a404' (2023-07-17)
  → 'github:SenchoPens/base16.nix/def69d6edc32792562975aec863dbef757f832cf' (2023-08-12)
• Updated input 'base16-alacritty':
    'github:aarowill/base16-alacritty/63d8ae5dfefe5db825dd4c699d0cdc2fc2c3eaf7' (2023-01-21)
  → 'github:aarowill/base16-alacritty/c95c200b3af739708455a03b5d185d3d2d263c6e' (2023-12-31)
• Updated input 'base16-foot':
    'github:tinted-theming/base16-foot/eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce' (2023-10-08)
  → 'github:tinted-theming/base16-foot/ac91059cde702c38e44e6c93e67edf1b84f9720e' (2023-12-16)
• Updated input 'base16-helix':
    'github:tinted-theming/base16-helix/dbe1480d99fe80f08df7970e471fac24c05f2ddb' (2023-10-08)
  → 'github:tinted-theming/base16-helix/5e92a93df33e10275e1fd6a9661feac94525dae4' (2023-12-16)
• Updated input 'base16-tmux':
    'github:tinted-theming/base16-tmux/c02050bebb60dbb20cb433cd4d8ce668ecc11ba7' (2023-10-08)
  → 'github:tinted-theming/base16-tmux/e120c7a375f09f9b6924111d8712f2808f2fc5a4' (2023-12-16)
• Updated input 'flake-compat':
    'github:edolstra/flake-compat/35bb57c0c8d8b62bbfd284272c928ceb64ddbde9' (2023-01-17)
  → 'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33' (2023-10-04)
• Updated input 'home-manager':
    'github:nix-community/home-manager/8cedd63eede4c22deb192f1721dd67e7460e1ebe' (2023-11-24)
  → 'github:nix-community/home-manager/2e8634c252890cb38c60ab996af04926537cbc27' (2023-12-31)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/0bd59c54ef06bc34eca01e37d689f5e46b3fe2f1' (2023-11-24)
  → 'github:NixOS/nixpkgs/e1fa12d4f6c6fe19ccb59cac54b5b3f25e160870' (2023-12-25)
@Noodlez1232
Copy link
Contributor Author

It should be ready now! Sorry for the late response.

Skips updating other inputs that might cause something unrelated to
break when this is merged.
@danth
Copy link
Owner

danth commented Jan 23, 2024

This was supposed to automatically merge once the tests finished; I'm not sure why that never happened.

I forgot to click approve, so the requirements to merge were never met 😅

@danth danth merged commit 423c819 into danth:master Jan 23, 2024
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants