feat: Replace nix-visualize with upstream

The changes from Henri's fork were merged upstream. Signed-off-by: Brian McGee <brian@bmcgee.ie>
tiiuae · Nov 9, 2023 · 325d359 · 325d359
1 parent 37192ac
commit 325d359
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 18 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -25,6 +25,10 @@
         treefmt-nix.follows = "treefmt-nix";
       };
     };
+    nix-visualize = {
+        url = "github:craigmbooth/nix-visualize";
+        flake = false;
+    };
   };
 
   outputs = inputs @ {flake-parts, ...}:

diff --git a/nix/checks.nix b/nix/checks.nix
@@ -9,6 +9,8 @@
   }: {
     checks =
       {
+        # checks that copyright headers are compliant
+        # todo this could be moved into a shared flake
         reuse =
           pkgs.runCommandLocal "reuse-lint" {
             buildInputs = [pkgs.reuse];

diff --git a/nix/treefmt.nix b/nix/treefmt.nix
@@ -19,10 +19,11 @@
         alejandra.enable = true; # nix formatter https://github.com/kamadorueda/alejandra
         deadnix.enable = true; # removes dead nix code https://github.com/astro/deadnix
         statix.enable = true; # prevents use of nix anti-patterns https://github.com/nerdypepper/statix
-        shellcheck.enable = true;
+        shellcheck.enable = true; # lints shell scripts https://github.com/koalaman/shellcheck
       };
     };
 
+    # configures treefmt as the program to use when invoke `nix fmt`
     formatter = config.treefmt.build.wrapper;
   };
 }
diff --git a/scripts/nixupdate/default.nix b/scripts/nixupdate/default.nix
@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
 #
 # SPDX-License-Identifier: Apache-2.0
-{
+{ inputs, ... }: {
   perSystem = {
     pkgs,
     self',
@@ -10,23 +10,8 @@
     pythonPackages = pkgs.python3Packages;
   in {
     packages = {
-      nix_visualize = pythonPackages.buildPythonPackage rec {
-        version = "1.0.5";
-        pname = "nix-visualize";
 
-        src = pkgs.fetchFromGitHub {
-          owner = "henrirosten";
-          repo = pname;
-          rev = "7fedf92eacffd5c42c50f7fec72f61a377c9ccf3";
-          hash = "sha256-Z1r8XHszoUnQinl63yXvQG6Czp5HnYNG37AY+EEiT4w=";
-        };
-        propagatedBuildInputs = with pythonPackages; [
-          matplotlib
-          networkx
-          pygraphviz
-          pandas
-        ];
-      };
+      nix_visualize = (import "${inputs.nix-visualize}/default.nix") { inherit pkgs; };
 
       nixupdate = let
         inherit