mirror of
https://github.com/tweag/gomod2nix.git
synced 2024-11-05 01:59:08 +00:00
Merge pull request #9 from yihuang/fix-regex
fix regex expression on macos
This commit is contained in:
commit
67f22dd738
1 changed files with 3 additions and 3 deletions
|
@ -12,14 +12,14 @@ let
|
|||
(lines: map
|
||||
(l:
|
||||
let
|
||||
m = match "(.*)( |)//.*" l;
|
||||
m = match "(.*)( )?//.*" l;
|
||||
hasComment = m != null;
|
||||
in
|
||||
stripStr (if hasComment then elemAt m 0 else l))
|
||||
lines)
|
||||
|
||||
# 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 (l: l != ""))
|
||||
|
@ -102,7 +102,7 @@ let
|
|||
mapAttrs
|
||||
(n: v:
|
||||
let
|
||||
m = match "=> (.+?) (.+)" v;
|
||||
m = match "=> ([^ ]+) (.+)" v;
|
||||
m2 = match "=> (.*+)" v;
|
||||
in
|
||||
if m != null then {
|
||||
|
|
Loading…
Reference in a new issue