feat: Replace lib.flatten with concatenation

Signed-off-by: Brian McGee <[email protected]>
tiiuae · Nov 10, 2023 · 818e534 · 818e534
1 parent 1216029
commit 818e534
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/nix/devshell.nix b/nix/devshell.nix
@@ -4,7 +4,6 @@
 {
   perSystem = {
     pkgs,
-    lib,
     inputs',
     ...
   }: {
@@ -14,7 +13,7 @@
       pkgs.mkShell rec {
         name = "sbomnix-dev-shell";
 
-        buildInputs = lib.flatten [
+        buildInputs =
           (with pkgs; [
             coreutils
             curl
@@ -26,7 +25,7 @@
             nix
             reuse
           ])
-          (with pp; [
+          ++ (with pp; [
             beautifulsoup4
             colorlog
             graphviz
@@ -40,9 +39,8 @@
             venvShellHook
             wheel
           ])
+          ++ [inputs'.nix-fast-build.packages.default];
 
-          [inputs'.nix-fast-build.packages.default]
-        ];
         venvDir = "venv";
         postShellHook = ''
           source $PWD/scripts/env.sh

diff --git a/nix/packages.nix b/nix/packages.nix
@@ -61,13 +61,13 @@
 
         src = lib.cleanSource ../.;
 
-        propagatedBuildInputs = lib.flatten [
+        propagatedBuildInputs =
           [
             pyrate-limiter
             requests-ratelimiter
+            pkgs.reuse
           ]
-          [pkgs.reuse]
-          (with pp; [
+          ++ (with pp; [
             beautifulsoup4
             colorlog
             graphviz
@@ -78,8 +78,7 @@
             requests
             requests-cache
             tabulate
-          ])
-        ];
+          ]);
 
         pythonImportsCheck = ["sbomnix"];