nim_lk: 20240527 -> 20241025

Migrate from buildNimPackage to buildNimSbom.

pkgs/by-name/ni/nim_lk/lock.json

@@ -1,39 +0,0 @@
-{
-  "depends": [
-    {
-      "method": "fetchzip",
-      "packages": [
-        "nimble"
-      ],
-      "path": "/nix/store/iz0s3zshxhsxkjkv73d7ynmajlmbph7m-source",
-      "rev": "f8bd7b5fa6ea7a583b411b5959b06e6b5eb23667",
-      "sha256": "1p6k00rsncyczbj5m06xx9zc2jrbdylavj3jnl7ybh7sq2wxl439",
-      "srcDir": "src",
-      "url": "https://github.com/nim-lang/nimble/archive/f8bd7b5fa6ea7a583b411b5959b06e6b5eb23667.tar.gz"
-    },
-    {
-      "method": "fetchzip",
-      "packages": [
-        "sat"
-      ],
-      "path": "/nix/store/wc1m76bsnnd5965jqzqzq3b3r8xx5ky7-source",
-      "ref": "pr_init",
-      "rev": "d6d992bc2717054cbb99e31df57ab071a4772d35",
-      "sha256": "07sr6zbf7a68qc32561pf98ir60078cakjcg5vd4xr6sdz7gv8j7",
-      "srcDir": "src",
-      "url": "https://github.com/nim-lang/sat/archive/d6d992bc2717054cbb99e31df57ab071a4772d35.tar.gz"
-    },
-    {
-      "method": "fetchzip",
-      "packages": [
-        "checksums"
-      ],
-      "path": "/nix/store/z6799507gzbw46lzbi1i8mwm0nbvrvnx-source",
-      "ref": "v0.1.0",
-      "rev": "7ff0b762332d2591bbeb65df9bb86d52ea44ec01",
-      "sha256": "11612prr2wwbx414ip0zjh1fv638dgfvzxfd6v2f432n0wfwhjhj",
-      "srcDir": "src",
-      "url": "https://github.com/nim-lang/checksums/archive/7ff0b762332d2591bbeb65df9bb86d52ea44ec01.tar.gz"
-    }
-  ]
-}

pkgs/by-name/ni/nim_lk/package.nix

@@ -1,6 +1,6 @@
 {
   lib,
-  buildNimPackage,
+  buildNimSbom,
   fetchFromSourcehut,
   nim,
   nix-prefetch,
@@ -10,31 +10,24 @@
 }:
 
 let
-  nim' = nim.passthru.nim;
+  nimUnwrapped = nim.passthru.nim;
 in
-buildNimPackage (finalAttrs: {
-  pname = "nim_lk";
-  version = "20240527";
-
+buildNimSbom (finalAttrs: {
   src = fetchFromSourcehut {
     owner = "~ehmry";
     repo = "nim_lk";
     rev = finalAttrs.version;
-    hash = "sha256-r8K9HRGEgqlFZJPdDeOYienmfzfNOeCdqMhshjr72Ok=";
+    hash = "sha256-1WD1UVi6N7tftE69LAhx86Qxc97oMHKARFsCVGqtEm4=";
   };
 
-  lockFile = ./lock.json;
-
   buildInputs = [ openssl ];
   nativeBuildInputs = [ makeWrapper ];
 
-  nimFlags = [ "--path:${nim'}/nim" ];
-
   postFixup = ''
     wrapProgram $out/bin/nim_lk \
       --suffix PATH : ${
         lib.makeBinPath [
-          nim'
+          nimUnwrapped
           nix-prefetch
           nix-prefetch-git
         ]
@@ -49,4 +42,4 @@ buildNimPackage (finalAttrs: {
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ ehmry ];
   };
-})
+}) ./sbom.json

pkgs/by-name/ni/nim_lk/sbom.json

@@ -0,0 +1,211 @@
+{
+  "bomFormat": "CycloneDX",
+  "specVersion": "1.6",
+  "metadata": {
+    "component": {
+      "type": "application",
+      "bom-ref": "pkg:nim/nim_lk",
+      "name": "nim_lk",
+      "description": "Tool for generating Nim lockfiles",
+      "version": "20241025",
+      "authors": [
+        {
+          "name": "Emery Hemingway"
+        }
+      ],
+      "licenses": [
+        {
+          "license": {
+            "id": "BSD-3-Clause"
+          }
+        },
+        {
+          "license": {
+            "id": "Unlicense"
+          }
+        }
+      ],
+      "properties": [
+        {
+          "name": "nim:skipExt",
+          "value": "nim"
+        },
+        {
+          "name": "nim:bin:nim_lk",
+          "value": "nim_lk"
+        },
+        {
+          "name": "nim:srcDir",
+          "value": "src"
+        },
+        {
+          "name": "nim:backend",
+          "value": "c"
+        }
+      ]
+    }
+  },
+  "components": [
+    {
+      "type": "library",
+      "bom-ref": "pkg:nim/nimble",
+      "name": "nimble",
+      "version": "master",
+      "externalReferences": [
+        {
+          "url": "https://github.com/nim-lang/nimble/archive/ed0b6eea0c8c8db590e8e3491732cd63dec82a25.tar.gz",
+          "type": "source-distribution"
+        },
+        {
+          "url": "https://github.com/nim-lang/nimble.git",
+          "type": "vcs"
+        }
+      ],
+      "properties": [
+        {
+          "name": "nix:fod:method",
+          "value": "fetchzip"
+        },
+        {
+          "name": "nix:fod:path",
+          "value": "/nix/store/273al4cg9hi27qy1qga3i5y2281g8ry0-source"
+        },
+        {
+          "name": "nix:fod:rev",
+          "value": "ed0b6eea0c8c8db590e8e3491732cd63dec82a25"
+        },
+        {
+          "name": "nix:fod:sha256",
+          "value": "0z9ink4xx058dsr780jfa2n4gq5fq60bfdx3y1iazgy6sxljjmql"
+        },
+        {
+          "name": "nix:fod:url",
+          "value": "https://github.com/nim-lang/nimble/archive/ed0b6eea0c8c8db590e8e3491732cd63dec82a25.tar.gz"
+        },
+        {
+          "name": "nix:fod:srcDir",
+          "value": "src"
+        },
+        {
+          "name": "nix:fod:ref",
+          "value": "master"
+        }
+      ]
+    },
+    {
+      "type": "library",
+      "bom-ref": "pkg:nim/sat",
+      "name": "sat",
+      "version": "pr_init",
+      "externalReferences": [
+        {
+          "url": "https://github.com/nim-lang/sat/archive/d6d992bc2717054cbb99e31df57ab071a4772d35.tar.gz",
+          "type": "source-distribution"
+        },
+        {
+          "url": "https://github.com/nim-lang/sat.git",
+          "type": "vcs"
+        }
+      ],
+      "properties": [
+        {
+          "name": "nix:fod:method",
+          "value": "fetchzip"
+        },
+        {
+          "name": "nix:fod:path",
+          "value": "/nix/store/wc1m76bsnnd5965jqzqzq3b3r8xx5ky7-source"
+        },
+        {
+          "name": "nix:fod:rev",
+          "value": "d6d992bc2717054cbb99e31df57ab071a4772d35"
+        },
+        {
+          "name": "nix:fod:sha256",
+          "value": "07sr6zbf7a68qc32561pf98ir60078cakjcg5vd4xr6sdz7gv8j7"
+        },
+        {
+          "name": "nix:fod:url",
+          "value": "https://github.com/nim-lang/sat/archive/d6d992bc2717054cbb99e31df57ab071a4772d35.tar.gz"
+        },
+        {
+          "name": "nix:fod:ref",
+          "value": "pr_init"
+        },
+        {
+          "name": "nix:fod:srcDir",
+          "value": "src"
+        }
+      ]
+    },
+    {
+      "type": "library",
+      "bom-ref": "pkg:nim/checksums",
+      "name": "checksums",
+      "version": "v0.1.0",
+      "externalReferences": [
+        {
+          "url": "https://github.com/nim-lang/checksums/archive/7ff0b762332d2591bbeb65df9bb86d52ea44ec01.tar.gz",
+          "type": "source-distribution"
+        },
+        {
+          "url": "https://github.com/nim-lang/checksums.git",
+          "type": "vcs"
+        }
+      ],
+      "properties": [
+        {
+          "name": "nix:fod:method",
+          "value": "fetchzip"
+        },
+        {
+          "name": "nix:fod:path",
+          "value": "/nix/store/z6799507gzbw46lzbi1i8mwm0nbvrvnx-source"
+        },
+        {
+          "name": "nix:fod:rev",
+          "value": "7ff0b762332d2591bbeb65df9bb86d52ea44ec01"
+        },
+        {
+          "name": "nix:fod:sha256",
+          "value": "11612prr2wwbx414ip0zjh1fv638dgfvzxfd6v2f432n0wfwhjhj"
+        },
+        {
+          "name": "nix:fod:url",
+          "value": "https://github.com/nim-lang/checksums/archive/7ff0b762332d2591bbeb65df9bb86d52ea44ec01.tar.gz"
+        },
+        {
+          "name": "nix:fod:ref",
+          "value": "v0.1.0"
+        },
+        {
+          "name": "nix:fod:srcDir",
+          "value": "src"
+        }
+      ]
+    }
+  ],
+  "dependencies": [
+    {
+      "ref": "pkg:nim/nim_lk",
+      "dependsOn": [
+        "pkg:nim/nimble"
+      ]
+    },
+    {
+      "ref": "pkg:nim/nimble",
+      "dependsOn": [
+        "pkg:nim/sat",
+        "pkg:nim/checksums"
+      ]
+    },
+    {
+      "ref": "pkg:nim/sat",
+      "dependsOn": []
+    },
+    {
+      "ref": "pkg:nim/checksums",
+      "dependsOn": []
+    }
+  ]
+}