File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -9,8 +9,6 @@ buildNimPackage (finalAttrs: {
99 pname = "mosdepth" ;
1010 version = "0.3.12" ;
1111
12- requiredNimVersion = 1 ;
13-
1412 src = fetchFromGitHub {
1513 owner = "brentp" ;
1614 repo = "mosdepth" ;
Original file line number Diff line number Diff line change 1+ diff --git a/src/nim_lk.nim b/src/nim_lk.nim
2+ index 09ced9d..45c5ddc 100644
3+ --- a/src/nim_lk.nim
4+ +++ b/src/nim_lk.nim
5+ @@ -573,7 +573,7 @@ proc update(bom: JsonNode; bomRef: string; byName: bool): bool =
6+ let comp = bom.getComponent(bomRef, byName)
7+ assert not comp.isNil
8+ var bomRef = comp{"bom-ref"}.getStr
9+ - assert not bomRef.isNil
10+ + assert bomRef != ""
11+ var suitableRefFound = false
12+ let extRefs = comp{"externalReferences"}
13+ for extRef in extRefs.elems:
Original file line number Diff line number Diff line change @@ -23,6 +23,10 @@ buildNimSbom (finalAttrs: {
2323 buildInputs = [ openssl ] ;
2424 nativeBuildInputs = [ makeWrapper ] ;
2525
26+ patches = [
27+ ./nil.patch
28+ ] ;
29+
2630 postFixup = ''
2731 wrapProgram $out/bin/nim_lk \
2832 --suffix PATH : ${
Original file line number Diff line number Diff line change 33 buildNimPackage ,
44 fetchFromGitHub ,
55 srcOnly ,
6- nim-2_0 ,
7- nim-unwrapped-2_0 ,
6+ nim-unwrapped ,
87} :
9-
10- let
11- buildNimPackage' = buildNimPackage . override {
12- # Do not build with Nim-2.2.x.
13- nim2 = nim-2_0 ;
14- } ;
15- in
16- buildNimPackage' ( finalAttrs : {
8+ buildNimPackage ( finalAttrs : {
179 pname = "nimlsp" ;
1810 version = "0.4.6" ;
1911
@@ -40,7 +32,7 @@ buildNimPackage' (finalAttrs: {
4032
4133 nimFlags = [
4234 "--threads:on"
43- "-d:explicitSourcePath=${ srcOnly nim-unwrapped-2_0 } "
35+ "-d:explicitSourcePath=${ srcOnly nim-unwrapped } "
4436 "-d:tempDir=/tmp"
4537 ] ;
4638
You can’t perform that action at this time.
0 commit comments