diff --git a/pkgs/tools/security/feroxbuster/default.nix b/pkgs/by-name/fe/feroxbuster/package.nix similarity index 53% rename from pkgs/tools/security/feroxbuster/default.nix rename to pkgs/by-name/fe/feroxbuster/package.nix index 525aa942ddec..383b0e6884e4 100644 --- a/pkgs/tools/security/feroxbuster/default.nix +++ b/pkgs/by-name/fe/feroxbuster/package.nix @@ -5,52 +5,48 @@ openssl, pkg-config, rustPlatform, - Security, - SystemConfiguration, + nix-update-script, + versionCheckHook, }: rustPlatform.buildRustPackage rec { pname = "feroxbuster"; - version = "2.10.3"; + version = "2.11.0"; src = fetchFromGitHub { owner = "epi052"; - repo = pname; + repo = "feroxbuster"; tag = "v${version}"; - hash = "sha256-3cznGVpZISLD2TbsHYyYYUTD55NmgBdNJ44V4XfZ40k="; + hash = "sha256-/NgGlXYMxGxpX93SJ6gWgZW21cSSZsgo/WMvRuLw+Bw="; }; - # disable linker overrides on aarch64-linux - postPatch = '' - rm .cargo/config - ''; - useFetchCargoVendor = true; - cargoHash = "sha256-DjmMoATagWGK2DHMc6YB0u2X5x5hnqgCwIGe3+Wmdic="; + + cargoHash = "sha256-L5s+P9eerv+O2vBUczGmn0rUMbHQtnF8hVa22wOrTGo="; OPENSSL_NO_VENDOR = true; nativeBuildInputs = [ pkg-config + versionCheckHook ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - SystemConfiguration - ]; + buildInputs = [ openssl ]; # Tests require network access doCheck = false; + doInstallCheck = true; + + versionCheckProgramArg = [ "--version" ]; + + passthru.updateScript = nix-update-script { }; + meta = with lib; { - description = "Fast, simple, recursive content discovery tool"; + description = "Recursive content discovery tool"; homepage = "https://github.com/epi052/feroxbuster"; - changelog = "https://github.com/epi052/feroxbuster/releases/tag/v${version}"; - license = with licenses; [ mit ]; + changelog = "https://github.com/epi052/feroxbuster/releases/tag/v${src.tag}"; + license = licenses.mit; maintainers = with maintainers; [ fab ]; platforms = platforms.unix; mainProgram = "feroxbuster"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4092c8774107..ada659865b10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3120,10 +3120,6 @@ with pkgs; featherpad = qt5.callPackage ../applications/editors/featherpad { }; - feroxbuster = callPackage ../tools/security/feroxbuster { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - }; - ffsend = callPackage ../tools/misc/ffsend { inherit (darwin.apple_sdk.frameworks) Security AppKit; };