From 630305f8532a742638b0b0e0aee79f1052c7f073 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Tue, 5 Aug 2025 22:42:27 -0700 Subject: [PATCH 1/2] inspec: remove with lib Signed-off-by: awwpotato --- pkgs/tools/misc/inspec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/inspec/default.nix b/pkgs/tools/misc/inspec/default.nix index e020191a3a79..eb3f3c2530ad 100644 --- a/pkgs/tools/misc/inspec/default.nix +++ b/pkgs/tools/misc/inspec/default.nix @@ -15,11 +15,11 @@ bundlerApp { passthru.updateScript = bundlerUpdateScript "inspec"; - meta = with lib; { + meta = { description = "Inspec is an open-source testing framework for infrastructure with a human- and machine-readable language for specifying compliance, security and policy requirements"; homepage = "https://inspec.io/"; - license = licenses.asl20; - maintainers = with maintainers; [ dylanmtaylor ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dylanmtaylor ]; mainProgram = "inspec"; }; } From 174bac31abd00b2575111387247b2a652a5a4a3c Mon Sep 17 00:00:00 2001 From: awwpotato Date: Tue, 5 Aug 2025 22:43:23 -0700 Subject: [PATCH 2/2] inspec: move to by-name Signed-off-by: awwpotato --- pkgs/{tools/misc => by-name/in}/inspec/Gemfile | 0 pkgs/{tools/misc => by-name/in}/inspec/Gemfile.lock | 0 pkgs/{tools/misc => by-name/in}/inspec/gemset.nix | 0 .../misc/inspec/default.nix => by-name/in/inspec/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 2 deletions(-) rename pkgs/{tools/misc => by-name/in}/inspec/Gemfile (100%) rename pkgs/{tools/misc => by-name/in}/inspec/Gemfile.lock (100%) rename pkgs/{tools/misc => by-name/in}/inspec/gemset.nix (100%) rename pkgs/{tools/misc/inspec/default.nix => by-name/in/inspec/package.nix} (100%) diff --git a/pkgs/tools/misc/inspec/Gemfile b/pkgs/by-name/in/inspec/Gemfile similarity index 100% rename from pkgs/tools/misc/inspec/Gemfile rename to pkgs/by-name/in/inspec/Gemfile diff --git a/pkgs/tools/misc/inspec/Gemfile.lock b/pkgs/by-name/in/inspec/Gemfile.lock similarity index 100% rename from pkgs/tools/misc/inspec/Gemfile.lock rename to pkgs/by-name/in/inspec/Gemfile.lock diff --git a/pkgs/tools/misc/inspec/gemset.nix b/pkgs/by-name/in/inspec/gemset.nix similarity index 100% rename from pkgs/tools/misc/inspec/gemset.nix rename to pkgs/by-name/in/inspec/gemset.nix diff --git a/pkgs/tools/misc/inspec/default.nix b/pkgs/by-name/in/inspec/package.nix similarity index 100% rename from pkgs/tools/misc/inspec/default.nix rename to pkgs/by-name/in/inspec/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7841c216b74f..9d47d9f1e734 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -383,8 +383,6 @@ with pkgs; inherit (gridlock) nyarr; - inspec = callPackage ../tools/misc/inspec { }; - lshw-gui = lshw.override { withGUI = true; }; kdePackages = callPackage ../kde { };