Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

gpg-agent: fix usage of splitString

Browse source 
`splitString "" "some string"` would throw exception `error: invalid
regular expression` on Darwin (or accurately, on Nix built against
libc++). Refer to https://github.com/NixOS/nix/issues/7208 for
details.

Before Nix handles that issue correctly, we should refrain from using
`splitString ""`, and luckliy `lib.stringAsChars` can do the same thing.
This commit is contained in:
Sharzy 2024-05-29 05:15:11 +08:00 committed by GitHub
parent 373ead2060
commit a9b36cbe92
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
modules/services/gpg-agent.nix
View file

@ -48,9 +48,8 @@ let
hexStringToBase32 = let hexStringToBase32 = let
mod = a: b: a - a / b * b; mod = a: b: a - a / b * b;
pow2 = elemAt [ 1 2 4 8 16 32 64 128 256 ]; pow2 = elemAt [ 1 2 4 8 16 32 64 128 256 ];
splitChars = s: init (tail (splitString "" s));
base32Alphabet = splitChars "ybndrfg8ejkmcpqxot1uwisza345h769"; base32Alphabet = stringToCharacters "ybndrfg8ejkmcpqxot1uwisza345h769";
hexToIntTable = listToAttrs (genList (x: { hexToIntTable = listToAttrs (genList (x: {
name = toLower (toHexString x); name = toLower (toHexString x);
value = x; value = x;
@ -76,7 +75,7 @@ let
buf = buf'; buf = buf';
bufBits = bufBits'; bufBits = bufBits';
}; };
in hexString: (foldl' go initState (splitChars hexString)).ret; in hexString: (foldl' go initState (stringToCharacters hexString)).ret;
in { in {
meta.maintainers = [ maintainers.rycee ]; meta.maintainers = [ maintainers.rycee ];