diff --git a/pkgs/tools/security/ipscan/default.nix b/pkgs/tools/security/ipscan/default.nix index 7611680c64af..72a44a4ab8a1 100644 --- a/pkgs/tools/security/ipscan/default.nix +++ b/pkgs/tools/security/ipscan/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "ipscan"; - version = "3.9.0"; + version = "3.9.1"; src = fetchurl { - url = "https://github.com/angryip/ipscan/releases/download/${version}/ipscan_${version}_all.deb"; - sha256 = "sha256-HpsEp5XSz118cbV2wT81hzQT4cgDEBnpUbpl45ZVvlg="; + url = "https://github.com/angryip/ipscan/releases/download/${version}/ipscan_${version}_amd64.deb"; + hash = "sha256-UPkUwZV3NIeVfL3yYvqOhm4X5xW+40GOlZGy8WGhYmk="; }; sourceRoot = "."; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/share - cp usr/lib/ipscan/ipscan-any-${version}.jar $out/share/${pname}-${version}.jar + cp usr/lib/ipscan/ipscan-linux64-${version}.jar $out/share/${pname}-${version}.jar makeWrapper ${jre}/bin/java $out/bin/ipscan \ --prefix LD_LIBRARY_PATH : "$out/lib/:${lib.makeLibraryPath [ swt xorg.libXtst ]}" \ @@ -42,12 +42,13 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Fast and friendly network scanner"; + description = "Angry IP Scanner - fast and friendly network scanner"; homepage = "https://angryip.org"; + downloadPage = "https://github.com/angryip/ipscan/releases/tag/${version}"; changelog = "https://github.com/angryip/ipscan/blob/${version}/CHANGELOG"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl2Only; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ kylesferrazza ]; + maintainers = with maintainers; [ kylesferrazza totoroot ]; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 83449b854cba..57cac52f54c7 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -81,6 +81,7 @@ mapAliases ({ amuleGui = throw "amuleGui was renamed to amule-gui"; # Added 2022-02-11 amsn = throw "amsn has been removed due to being unmaintained"; # Added 2020-12-09 angelfish = libsForQt5.kdeGear.angelfish; # Added 2021-10-06 + angryipscanner = ipscan; # Added 2023-08-30 ansible_2_12 = throw "Ansible 2.12 goes end of life in 2023/05 and can't be supported throughout the 23.05 release cycle"; # Added 2023-05-16 ansible_2_11 = throw "Ansible 2.11 goes end of life in 2022/11 and can't be supported throughout the 22.05 release cycle"; # Added 2022-03-30 ansible_2_10 = throw "Ansible 2.10 went end of life in 2022/05 and has subsequently been dropped"; # Added 2022-03-30