darkkirb/gomod2nix
1
0
Fork 0
forked from mirrors/gomod2nix
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix regex expression on macos

Browse source
This commit is contained in:
yihuang 2021-04-02 10:59:32 +08:00
parent c78d7b9f15
commit af2ff6eb58
No known key found for this signature in database
GPG key ID: F42F615DA2FCF2B9
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
builder/parser.nix
View file

@ -12,14 +12,14 @@ let
(lines: map (lines: map
(l: (l:
let let
m = match "(.*)( |)//.*" l; m = match "(.*)( )?//.*" l;
hasComment = m != null; hasComment = m != null;
in in
stripStr (if hasComment then elemAt m 0 else l)) stripStr (if hasComment then elemAt m 0 else l))
lines) lines)
# Strip leading tabs characters # Strip leading tabs characters
(lines: map (l: elemAt (match "(\t|)(.*)" l) 1) lines) (lines: map (l: elemAt (match "(\t)?(.*)" l) 1) lines)
# Filter empty lines # Filter empty lines
(filter (l: l != "")) (filter (l: l != ""))
@ -102,7 +102,7 @@ let
mapAttrs mapAttrs
(n: v: (n: v:
let let
m = match "=> (.+?) (.+)" v; m = match "=> ([^ ]+) (.+)" v;
m2 = match "=> (.*+)" v; m2 = match "=> (.*+)" v;
in in
if m != null then { if m != null then {