diff options
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/filesystems/gcsfuse/default.nix | 23 | ||||
-rw-r--r-- | pkgs/tools/misc/broot/default.nix | 14 | ||||
-rw-r--r-- | pkgs/tools/networking/iwgtk/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/networking/nfdump/default.nix | 43 | ||||
-rw-r--r-- | pkgs/tools/security/mitmproxy2swagger/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/security/trufflehog/default.nix | 60 |
6 files changed, 86 insertions, 66 deletions
diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index 225048f0e3a83..f45d4cd95b690 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -1,21 +1,31 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "gcsfuse"; - version = "0.41.9"; + version = "0.41.10"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; - rev = "v${version}"; - sha256 = "sha256-hfdQa0e1S1cIF4V2XPFBl4jzzTWlIxZIJ99PRxCP55s="; + rev = "refs/tags/${version}"; + hash = "sha256-rtBqXC1CTkbKDP6pzkRQ7GnM5f4xt6eUMW3n9wZu0hc="; }; vendorSha256 = null; - subPackages = [ "." "tools/mount_gcsfuse" ]; + subPackages = [ + "." + "tools/mount_gcsfuse" + ]; - ldflags = [ "-s" "-w" "-X main.gcsfuseVersion=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X main.gcsfuseVersion=${version}" + ]; preCheck = let skippedTests = [ @@ -35,6 +45,7 @@ buildGoModule rec { meta = with lib;{ description = "A user-space file system for interacting with Google Cloud Storage"; homepage = "https://cloud.google.com/storage/docs/gcs-fuse"; + changelog = "https://github.com/GoogleCloudPlatform/gcsfuse/releases/tag/v${version}"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ aaronjheng ]; diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 5bd2f231392fa..c920aebd32168 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , rustPlatform -, fetchCrate +, fetchFromGitHub , installShellFiles , makeWrapper , pkg-config @@ -15,14 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.18.0"; + version = "1.19.0"; - src = fetchCrate { - inherit pname version; - sha256 = "sha256-GR0a5NDJBcRLoNOeG6S+fP3Fr7r5fVB9oEcjANRYJt4="; + src = fetchFromGitHub { + owner = "Canop"; + repo = pname; + rev = "v${version}"; + hash = "sha256-pg+eHmClDd04tWljQUS0IRyMzkHnkpkofuhz/KyQbWo="; }; - cargoHash = "sha256-Hk9bc1mo8GxcPICKXc9zDq18S5TZElDncxJ+w2fC2do="; + cargoHash = "sha256-+RUYC39L7yyh1xYPfZn7tDIf1cmmBuGcqTNibFk7s6M="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/networking/iwgtk/default.nix b/pkgs/tools/networking/iwgtk/default.nix index c2781fbaf7977..0c72c41ce626b 100644 --- a/pkgs/tools/networking/iwgtk/default.nix +++ b/pkgs/tools/networking/iwgtk/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "iwgtk"; - version = "0.8"; + version = "0.9"; src = fetchFromGitHub { owner = "j-lentz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-89rzDxalZtQkwAKS6hKPVY87kOWPySwDeZrPs2rGs/k="; + sha256 = "sha256-/Nxti4PfYVLnIiBgtAuR3KGI8dULszuSdTp+2DzBfbs="; }; # patch systemd service to pass necessary environments and use absolute paths @@ -29,9 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk4 qrencode ]; postInstall = '' - mv $out/share/lib/systemd $out/share - rmdir $out/share/lib - substituteInPlace $out/share/systemd/user/iwgtk.service --subst-var out + substituteInPlace $out/lib/systemd/user/iwgtk.service --subst-var out ''; meta = with lib; { diff --git a/pkgs/tools/networking/nfdump/default.nix b/pkgs/tools/networking/nfdump/default.nix index 3a24794f419b1..713bf400f4b1b 100644 --- a/pkgs/tools/networking/nfdump/default.nix +++ b/pkgs/tools/networking/nfdump/default.nix @@ -1,22 +1,40 @@ -{ lib, stdenv, fetchFromGitHub -, autoconf, automake, libtool, pkg-config -, bzip2, libpcap, flex, bison }: +{ lib +, stdenv +, fetchFromGitHub +, autoconf +, automake +, libtool +, pkg-config +, bzip2 +, libpcap +, flex +, bison +}: -let version = "1.7.0.1"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "nfdump"; - inherit version; + version = "1.7.1"; src = fetchFromGitHub { owner = "phaag"; repo = "nfdump"; - rev = "v${version}"; - sha256 = "sha256-yD/NFGw38ishqQmKhlnHYodXmJuezI09hxNsyObZ1QE="; + rev = "refs/tags/v${version}"; + hash = "sha256-oCaJPx6+C0NQSuUcsP54sycNLt/zaqe5c81dwHNBcnQ="; }; - nativeBuildInputs = [ autoconf automake flex libtool pkg-config bison ]; - buildInputs = [ bzip2 libpcap ]; + nativeBuildInputs = [ + autoconf + automake + flex + libtool + pkg-config + bison + ]; + + buildInputs = [ + bzip2 + libpcap + ]; preConfigure = '' # The script defaults to glibtoolize on darwin, so we pass the correct @@ -37,8 +55,9 @@ stdenv.mkDerivation { nfdump is a set of tools for working with netflow data. ''; homepage = "https://github.com/phaag/nfdump"; + changelog = "https://github.com/phaag/nfdump/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = [ maintainers.takikawa ]; + maintainers = with maintainers; [ takikawa ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/mitmproxy2swagger/default.nix b/pkgs/tools/security/mitmproxy2swagger/default.nix index 560e9a175da0c..3378e0d332c7f 100644 --- a/pkgs/tools/security/mitmproxy2swagger/default.nix +++ b/pkgs/tools/security/mitmproxy2swagger/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "mitmproxy2swagger"; - version = "0.7.1"; + version = "0.7.2"; format = "pyproject"; src = fetchFromGitHub { owner = "alufers"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-morBtuRZZ/d3ye8aB+m2dSwWoaF3JJ92c+CgF71MqH4="; + hash = "sha256-LnH0RDiRYJAGI7ZT6Idu1AqSz0yBRuBJvhIgY72Z4CA="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 27574241576ad..76ccda498b47f 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -1,43 +1,33 @@ { lib -, python3Packages +, fetchFromGitHub +, buildGoModule }: -let - truffleHogRegexes = python3Packages.buildPythonPackage rec { - pname = "truffleHogRegexes"; - version = "0.0.7"; - src = python3Packages.fetchPypi { - inherit pname version; - sha256 = "b81dfc60c86c1e353f436a0e201fd88edb72d5a574615a7858485c59edf32405"; - }; - }; -in - python3Packages.buildPythonApplication rec { - pname = "truffleHog"; - version = "2.2.1"; +buildGoModule rec { + pname = "trufflehog"; + version = "3.21.0"; - src = python3Packages.fetchPypi { - inherit pname version; - hash = "sha256-fw0JyM2iqQrkL4FAXllEozJdkKWELS3eAURx5NZcceQ="; - }; + src = fetchFromGitHub { + owner = "trufflesecurity"; + repo = "trufflehog"; + rev = "refs/tags/v${version}"; + hash = "sha256-rse5uyQ7EUBhs0IyC92B/Z7YCeNIXTlZEqrlcjFekgA="; + }; - # Relax overly restricted version constraint - postPatch = '' - substituteInPlace setup.py --replace "GitPython ==" "GitPython >= " - ''; + vendorHash = "sha256-KyyJ7hUWF29L8oB9GkJ918/BQoLMsz+tStT2T9Azunk="; - propagatedBuildInputs = [ - python3Packages.gitpython - truffleHogRegexes - ]; + # Test cases run git clone and require network access + doCheck = false; - # Test cases run git clone and require network access - doCheck = false; + postInstall = '' + rm $out/bin/{generate,snifftest} + ''; - meta = with lib; { - homepage = "https://github.com/dxa4481/truffleHog"; - description = "Searches through git repositories for high entropy strings and secrets, digging deep into commit history"; - license = with licenses; [ gpl2 ]; - maintainers = with maintainers; [ bhipple ]; - }; - } + meta = with lib; { + description = "Find credentials all over the place"; + homepage = "https://github.com/trufflesecurity/trufflehog"; + changelog = "https://github.com/trufflesecurity/trufflehog/releases/tag/v${version}"; + license = with licenses; [ agpl3 ]; + maintainers = with maintainers; [ ]; + }; +} |