Merged
Conversation
Contributor
|
@danth it's having haskell issues |
Member
|
AFAICT Haskell wasn't the issue, we just had a maintainer that was added to the upstream list and a change of behavior in the JSON formatter |
0xda157
force-pushed
the
update_flake_lock_action_master
branch
from
c2dfc5c to
0945ca1
Compare
stylix-automation
bot
added
status: merge conflict
Flake lock file updates:
• Updated input 'flake-parts':
'github:hercules-ci/flake-parts/c621e8422220273271f52058f618c94e405bb0f5?narHash=sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY%3D' (2025-04-01)
→ 'github:hercules-ci/flake-parts/9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569?narHash=sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98%3D' (2025-06-08)
• Updated input 'git-hooks':
'github:cachix/git-hooks.nix/80479b6ec16fefd9c1db3ea13aeb038c60530f46?narHash=sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo%2BbnXU9D9k%3D' (2025-05-16)
→ 'github:cachix/git-hooks.nix/16ec914f6fb6f599ce988427d9d94efddf25fe6d?narHash=sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg%3D' (2025-06-24)
• Updated input 'home-manager':
'github:nix-community/home-manager/5675a9686851d9626560052a032c4e14e533c1fa?narHash=sha256-5kvBbLYdp%2Bn7Ftanjcs6Nv%2BUO6sBhelp6MIGJ9nWmjQ%3D' (2025-06-01)
→ 'github:nix-community/home-manager/78fc50f1cf8e57a974ff4bfe654563fce43d6289?narHash=sha256-zmb01yyOXttyhJD3kRtW6Pkt1lsPbJvN3P92/GnI0tk%3D' (2025-06-30)
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/96ec055edbe5ee227f28cdbc3f1ddf1df5965102?narHash=sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg%3D' (2025-05-28)
→ 'github:NixOS/nixpkgs/30e2e2857ba47844aa71991daa6ed1fc678bcbb7?narHash=sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM%3D' (2025-06-27)
• Updated input 'nur':
'github:nix-community/NUR/2c0bc52fe14681e9ef60e3553888c4f086e46ecb?narHash=sha256-5LKmRYKdPuhm8j5GFe3AfrJL8dd8o57BQ34AGjJl1R0%3D' (2025-05-31)
→ 'github:nix-community/NUR/cbde1735782f9c2bb2c63d5e05fba171a14a4670?narHash=sha256-3m6RMw0FbbaUUa01PNaMLoO7D99aBClmY5ed9V3vz%2B0%3D' (2025-06-30)
• Updated input 'tinted-schemes':
'github:tinted-theming/schemes/87d652edd26f5c0c99deda5ae13dfb8ece2ffe31?narHash=sha256-7n0XiZiEHl2zRhDwZd/g%2Bp38xwEoWtT0/aESwTMXWG4%3D' (2025-05-25)
→ 'github:tinted-theming/schemes/5a775c6ffd6e6125947b393872cde95867d85a2a?narHash=sha256-LI%2BBnRoFNRa2ffbe3dcuIRYAUcGklBx0%2BEcFxlHj0SY%3D' (2025-06-24)
• Updated input 'tinted-tmux':
'github:tinted-theming/tinted-tmux/57d5f9683ff9a3b590643beeaf0364da819aedda?narHash=sha256-OEM12bg7F4N5WjZOcV7FHJbqRI6jtCqL6u8FtPrlZz4%3D' (2025-06-01)
→ 'github:tinted-theming/tinted-tmux/bded5e24407cec9d01bd47a317d15b9223a1546c?narHash=sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE%3D' (2025-06-29)
• Updated input 'tinted-zed':
'github:tinted-theming/base16-zed/122c9e5c0e6f27211361a04fae92df97940eccf9?narHash=sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4%3D' (2024-09-08)
→ 'github:tinted-theming/base16-zed/86a470d94204f7652b906ab0d378e4231a5b3384?narHash=sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR%2BC98jX8%3D' (2025-06-29)
They're now in the main Nixpkgs list.
0xda157
force-pushed
the
update_flake_lock_action_master
branch
from
129215a to
8892984
Compare
Contributor
|
weird the narHash of nixpkgs is different despite me updating both nixpkgs at the same time |
Member
I manually fixed this in commit 7668556 ("flake: match nixpkgs and dev-nixpkgs input versions"). |
0xda157
approved these changes
Jul 8, 2025
LunaCOLON3
pushed a commit
to LunaCOLON3/stylix
that referenced
this pull request
Jul 14, 2025
Link: nix-community#1563 Reviewed-by: Daniel Thwaites <danth@danth.me> Co-authored-by: Daniel Thwaites <danth@danth.me> Co-authored-by: awwpotato <awwpotato@voidq.com> Co-authored-by: NAHO <90870942+trueNAHO@users.noreply.github.com> Reviewed-by: NAHO <90870942+trueNAHO@users.noreply.github.com> Reviewed-by: awwpotato <awwpotato@voidq.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Automated changes by the update-flake-lock GitHub Action.