movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-20 00:19:25 +03:00
Code Activity

Revert "Merge pull request #333952 from r-vdp/specialisation-name-regex"

Browse source 
This reverts commit fc35704bc8, reversing
changes made to c67d90d517.
This commit is contained in:
Will Fancher 2024-08-13 21:33:15 -04:00
parent 11555c7701
commit b78bd2f912
3 changed files with 2 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
View file

@ -65,7 +65,7 @@ class Entry:
# Matching nixos*-generation-$number*.conf
rex_generation = re.compile(r"^nixos.*-generation-([0-9]+).*\.conf$")
# Matching nixos*-generation-$number-specialisation-$specialisation_name*.conf
rex_specialisation = re.compile(r"^nixos.*-generation-([0-9]+)-specialisation-([a-zA-Z0-9_]+).*\.conf$")
rex_specialisation = re.compile(r"^nixos.*-generation-([0-9]+)-specialisation-([a-zA-Z0-9]+).*\.conf$")
profile = rex_profile.sub(r"\1", filename) if rex_profile.match(filename) else None
specialisation = rex_specialisation.sub(r"\2", filename) if rex_specialisation.match(filename) else None
try: