Update flake lock

Signed-off-by: Henri Rosten <[email protected]>
tiiuae · Dec 1, 2023 · f9c5d7c · f9c5d7c
1 parent 53f666e
commit f9c5d7c
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 45 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -31,9 +31,15 @@
         treefmt-nix.follows = "treefmt-nix";
       };
     };
-    ci-public = {
-      url = "github:tiiuae/ci-public";
-      flake = false;
+    csvdiff = {
+      url = "github:tiiuae/ci-public?dir=csvdiff";
+      inputs = {
+        # reduce duplicate inputs
+        nixpkgs.follows = "nixpkgs";
+        flake-root.follows = "flake-root";
+        flake-parts.follows = "flake-parts";
+        treefmt-nix.follows = "treefmt-nix";
+      };
     };
     sbomnix = {
       url = "github:tiiuae/sbomnix";
@@ -43,7 +49,6 @@
         flake-root.follows = "flake-root";
         flake-parts.follows = "flake-parts";
         treefmt-nix.follows = "treefmt-nix";
-        nix-fast-build.follows = "nix-fast-build";
       };
     };
   };

diff --git a/nix/devshell.nix b/nix/devshell.nix
@@ -5,7 +5,6 @@
   perSystem = {
     pkgs,
     inputs',
-    self',
     ...
   }: {
     devShells.default = pkgs.mkShell {
@@ -34,9 +33,10 @@
           )
         ])
         ++ [
-          self'.packages.csvdiff
           # bring in vulnxscan from sbomnix
           inputs'.sbomnix.packages.default
+          # csvdiff
+          inputs'.csvdiff.packages.default
         ]
         ++ [
           inputs'.nix-fast-build.packages.default

diff --git a/nix/packages.nix b/nix/packages.nix
@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
 #
 # SPDX-License-Identifier: Apache-2.0
-{inputs, ...}: {
+_: {
   perSystem = {
     inputs',
     pkgs,
@@ -13,8 +13,6 @@
     packages = rec {
       default = ghafscan;
 
-      csvdiff = (import "${inputs.ci-public}/csvdiff") {inherit pkgs;};
-
       ghafscan = pp.buildPythonPackage {
         pname = "ghafscan";
         version = pkgs.lib.removeSuffix "\n" (builtins.readFile ../VERSION);
@@ -24,19 +22,17 @@
 
         pythonImportsCheck = ["ghafscan"];
 
-        propagatedBuildInputs =
-          [
-            pkgs.reuse
-            csvdiff
-            # we need vulnxscan from sbombnix
-            inputs'.sbomnix.packages.default
-          ]
-          ++ (with pp; [
-            colorlog
-            gitpython
-            pandas
-            tabulate
-          ]);
+        propagatedBuildInputs = with pp; [
+          colorlog
+          gitpython
+          pandas
+          tabulate
+        ];
+
+        postInstall = ''
+          wrapProgram $out/bin/ghafscan \
+              --prefix PATH : ${lib.makeBinPath [inputs'.sbomnix.packages.default inputs'.csvdiff.packages.default]}
+        '';
       };
     };
   };