Flake update

- Flake update - Fix issues with duplicate dependencies to sbomnix Signed-off-by: Henri Rosten <henri.rosten@unikie.com>
tiiuae · Sep 7, 2023 · 9ded9da · 9ded9da
1 parent 7cd2584
commit 9ded9da
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 14 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/scripts/nixupdate/nixupdate.nix b/scripts/nixupdate/nixupdate.nix
@@ -12,18 +12,25 @@ pythonPackages.buildPythonPackage rec {
   format = "setuptools";
 
   src = ../../.;
-  sbomnix = import ../../default.nix { pkgs=pkgs; };
   repology_cli = import ../repology/repology_cli.nix { pkgs=pkgs; };
   nix_visualize = import ./nix-visualize.nix { pkgs=pkgs; };
   makeWrapperArgs = [
-    "--prefix PATH : ${pkgs.lib.makeBinPath [ sbomnix repology_cli nix_visualize ]}"
+    "--prefix PATH : ${pkgs.lib.makeBinPath [ repology_cli nix_visualize ]}"
   ];
 
   requests-ratelimiter = import ../repology/requests-ratelimiter.nix { pkgs=pkgs; };
 
   propagatedBuildInputs = [ 
+    pkgs.reuse
     requests-ratelimiter
-    sbomnix
+    pythonPackages.beautifulsoup4
+    pythonPackages.colorlog
+    pythonPackages.graphviz
+    pythonPackages.numpy
+    pythonPackages.packageurl-python
+    pythonPackages.packaging
+    pythonPackages.pandas
+    pythonPackages.tabulate
     pythonPackages.requests
     pythonPackages.requests-cache
   ];

diff --git a/scripts/repology/repology_cli.nix b/scripts/repology/repology_cli.nix
@@ -12,20 +12,22 @@ pythonPackages.buildPythonPackage rec {
   format = "setuptools";
 
   src = ../../.;
-  sbomnix = import ../../default.nix { pkgs=pkgs; };
-  makeWrapperArgs = [
-    "--prefix PATH : ${pkgs.lib.makeBinPath [ sbomnix ]}"
-  ];
-
+
   requests-ratelimiter = import ./requests-ratelimiter.nix { pkgs=pkgs; };
 
   propagatedBuildInputs = [ 
-    sbomnix
+    pkgs.reuse
     requests-ratelimiter
     pythonPackages.beautifulsoup4
+    pythonPackages.colorlog
+    pythonPackages.graphviz
+    pythonPackages.numpy
+    pythonPackages.packageurl-python
+    pythonPackages.packaging
+    pythonPackages.pandas
+    pythonPackages.tabulate
     pythonPackages.requests
     pythonPackages.requests-cache
-    pythonPackages.packaging
   ];
 
   postInstall = ''

diff --git a/scripts/vulnxscan/vulnxscan.nix b/scripts/vulnxscan/vulnxscan.nix
@@ -22,8 +22,16 @@ pythonPackages.buildPythonPackage rec {
   requests-ratelimiter = import ../repology/requests-ratelimiter.nix { pkgs=pkgs; };
 
   propagatedBuildInputs = [ 
+    pkgs.reuse
     requests-ratelimiter
-    sbomnix
+    pythonPackages.beautifulsoup4
+    pythonPackages.colorlog
+    pythonPackages.graphviz
+    pythonPackages.numpy
+    pythonPackages.packageurl-python
+    pythonPackages.packaging
+    pythonPackages.pandas
+    pythonPackages.tabulate
     pythonPackages.requests
     pythonPackages.requests-cache
   ];