diff options
Diffstat (limited to 'pkgs/tools')
26 files changed, 190 insertions, 174 deletions
diff --git a/pkgs/tools/admin/granted/default.nix b/pkgs/tools/admin/granted/default.nix index 2886a08d84b80..4ffb46c52af85 100644 --- a/pkgs/tools/admin/granted/default.nix +++ b/pkgs/tools/admin/granted/default.nix @@ -12,13 +12,13 @@ buildGoModule rec { pname = "granted"; - version = "0.27.4"; + version = "0.27.5"; src = fetchFromGitHub { owner = "common-fate"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JVeOWAuFxMLDhpFreN4YAXoDytNf/t1yQwNXKRd8ml8="; + sha256 = "sha256-s7tSSYRWSkNY6sh88XqocTSQ9aS5+O0tqYjyH03NIb0="; }; vendorHash = "sha256-/X7kHaBZyDV4IqvKqyR7pAQLgYqIvcvSSh0NdrA5d3I="; diff --git a/pkgs/tools/admin/turbovnc/default.nix b/pkgs/tools/admin/turbovnc/default.nix index aaba4768a9243..dc0ec7d987e6d 100644 --- a/pkgs/tools/admin/turbovnc/default.nix +++ b/pkgs/tools/admin/turbovnc/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "turbovnc"; - version = "3.1"; + version = "3.1.1"; src = fetchFromGitHub { owner = "TurboVNC"; repo = "turbovnc"; rev = finalAttrs.version; - hash = "sha256-nMqH/jhw4GhffGYR+WGcUnF6EOFSS6HDuSKvjoCtGkk="; + hash = "sha256-7dft5Wp9LvRy3FM/cZ5F6qUIesu7mzd/Ww8P3xsSvyI="; }; # TODO: diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix index d7533f0bf90fb..ae9a129c766f6 100644 --- a/pkgs/tools/archivers/unzip/default.nix +++ b/pkgs/tools/archivers/unzip/default.nix @@ -102,6 +102,7 @@ stdenv.mkDerivation rec { description = "Extraction utility for archives compressed in .zip format"; license = lib.licenses.info-zip; platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ RossComputerGuy ]; mainProgram = "unzip"; }; } diff --git a/pkgs/tools/audio/mpd-notification/default.nix b/pkgs/tools/audio/mpd-notification/default.nix index 845056c61414c..bb09b9b183024 100644 --- a/pkgs/tools/audio/mpd-notification/default.nix +++ b/pkgs/tools/audio/mpd-notification/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "mpd-notification"; - version = "0.8.7"; + version = "0.9.0"; src = fetchFromGitHub { owner = "eworm-de"; repo = "mpd-notification"; rev = version; - hash = "sha256-lBvx2eYxFJUAxR1LrjWHZUeAo+WnQKmPYJVAJTeXqHY="; + hash = "sha256-1DG8pemlF5bURbdJwGTZqp3WVfLOwGEpfqq9q1NtwaE="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 25a9ebeb18dc7..46b8122dd5b65 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -10,14 +10,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "2.89"; + version = "2.90"; pname = "asymptote"; outputs = [ "out" "man" "info" "doc" "tex" ]; src = fetchurl { url = "mirror://sourceforge/asymptote/${finalAttrs.version}/asymptote-${finalAttrs.version}.src.tgz"; - hash = "sha256-9k5itO5PhfGnhkDE8eim+Y6R9U7ayrGXJ8fKvpSlf1s="; + hash = "sha256-jGlW+4CL9EqPJJcpW0+muumMQYkrQPPuj8dYqSRwc0A="; }; # override with TeX Live containers to avoid building sty, docs from source diff --git a/pkgs/tools/misc/SP800-90B_EntropyAssessment/default.nix b/pkgs/tools/misc/SP800-90B_EntropyAssessment/default.nix deleted file mode 100644 index 3c18621d712de..0000000000000 --- a/pkgs/tools/misc/SP800-90B_EntropyAssessment/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, bzip2 -, libdivsufsort -, jsoncpp -, openssl -, mpfr -}: - -stdenv.mkDerivation rec { - pname = "SP800-90B_EntropyAssessment"; - version = "1.1.6"; - - src = fetchFromGitHub { - owner = "usnistgov"; - repo = "SP800-90B_EntropyAssessment"; - rev = "v${version}"; - hash = "sha256-KZQ7kC0PbBkjLEQZIqYakQ91OvCxruhdfUwiRHtno3w="; - }; - - buildInputs = [ bzip2 libdivsufsort jsoncpp openssl mpfr ]; - - postPatch = '' - substituteInPlace Makefile \ - --replace "-march=native" "" - ''; - - sourceRoot = "${src.name}/cpp"; - - makeFlags = [ - "CROSS_COMPILE=${stdenv.cc.targetPrefix}" - "ARCH=${stdenv.hostPlatform.linuxArch}" - ]; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - cp ea_* $out/bin - runHook postInstall - ''; - - meta = { - homepage = "https://github.com/usnistgov/SP800-90B_EntropyAssessment"; - description = "Implementation of min-entropy assessment methods included in Special Publication 800-90B"; - platforms = lib.platforms.linux; - license = lib.licenses.nistSoftware; - maintainers = with lib.maintainers; [ orichter thillux ]; - }; -} diff --git a/pkgs/tools/misc/dotter/default.nix b/pkgs/tools/misc/dotter/default.nix index 48d89dd86b339..ec8232ffc0fd6 100644 --- a/pkgs/tools/misc/dotter/default.nix +++ b/pkgs/tools/misc/dotter/default.nix @@ -5,29 +5,38 @@ , rustPlatform , CoreServices , which +, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "dotter"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "SuperCuber"; repo = "dotter"; rev = "v${version}"; - hash = "sha256-Xmdg5ITKWhL5AxTS7z4f9ecigQpBqna+kZclA+mDJhA="; + hash = "sha256-IV3wvmRiRtzu5UhIlL1BnL8hy+fQHQA9Mfiy6dIsjdw="; }; - cargoHash = "sha256-W8khm9E5f/PROVJDAUr57nAiTEXV4a0fepzV00HoT8c="; + cargoHash = "sha256-jNHq1cH3I29b6LIoO2ApLDTYzFGGSua1lACvYCBpbQQ="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; - nativeCheckInputs = [ which ]; + nativeCheckInputs = [ which installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd dotter \ + --bash <($out/bin/dotter gen-completions --shell bash) \ + --fish <($out/bin/dotter gen-completions --shell fish) \ + --zsh <($out/bin/dotter gen-completions --shell zsh) + ''; passthru = { updateScript = nix-update-script { }; }; + meta = with lib; { description = "Dotfile manager and templater written in rust 🦀"; homepage = "https://github.com/SuperCuber/dotter"; diff --git a/pkgs/tools/misc/google-cloud-sql-proxy/default.nix b/pkgs/tools/misc/google-cloud-sql-proxy/default.nix index 3bf76cc5bf3c6..b9a68b60dbd3e 100644 --- a/pkgs/tools/misc/google-cloud-sql-proxy/default.nix +++ b/pkgs/tools/misc/google-cloud-sql-proxy/default.nix @@ -1,22 +1,22 @@ { lib -, buildGo122Module +, buildGoModule , fetchFromGitHub }: -buildGo122Module rec { +buildGoModule rec { pname = "google-cloud-sql-proxy"; - version = "2.9.0"; + version = "2.11.4"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "cloud-sql-proxy"; rev = "v${version}"; - hash = "sha256-V1Q6DFWSIIff2FuOyE5XwtJN8RObGlhpW/nMWFmNoxI="; + hash = "sha256-eM1sS9+L3Z7qCQl+HPcdfoSSdcCKvaz5zwQM4k55hZY="; }; subPackages = [ "." ]; - vendorHash = "sha256-sAVMmDeHXEgQXb/Xi4nXYztXjuykE0TFebkeubMTZ3k="; + vendorHash = "sha256-/cHQ1vElE+QCxQo6s3Isf2USFP0LWJH3YdcbUfGuuVw="; checkFlags = [ "-short" diff --git a/pkgs/tools/misc/grizzly/default.nix b/pkgs/tools/misc/grizzly/default.nix index af80a479ba7f5..469fea27fa648 100644 --- a/pkgs/tools/misc/grizzly/default.nix +++ b/pkgs/tools/misc/grizzly/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "grizzly"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - hash = "sha256-UOUBck1GrG3ijUpE3jPaFcC/KtlObaR38u3St8NToTk="; + hash = "sha256-f60zAE94jdJaGjn+SoO1qs3SgWRpK9pdbirRrsKKBJQ="; }; vendorHash = "sha256-lioFmaFzqaxN1wnYJaoHA54to1xGZjaLGaqAFIfTaTs="; diff --git a/pkgs/tools/misc/gummy/default.nix b/pkgs/tools/misc/gummy/default.nix index 9d5b473c3b9c4..192c1e3261a56 100644 --- a/pkgs/tools/misc/gummy/default.nix +++ b/pkgs/tools/misc/gummy/default.nix @@ -1,6 +1,7 @@ { lib , stdenv -, fetchFromGitHub +, fetchFromGitea +, substituteAll , testers , gummy , cmake @@ -8,18 +9,25 @@ , libXext , sdbus-cpp , udev +, xcbutilimage , coreutils +, cli11 +, ddcutil +, fmt +, nlohmann_json +, spdlog }: stdenv.mkDerivation rec { pname = "gummy"; - version = "0.3"; + version = "0.6.0"; - src = fetchFromGitHub { - owner = "fushko"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "fusco"; repo = "gummy"; rev = version; - sha256 = "sha256-dw2yOXTS61OIe+NOq8MPydhkZvTit13eC7cbL5nFseg="; + hash = "sha256-kATieFf+dEpcYgSEPoETacP7R+u2dOrg7rOhIkNQ1uE="; }; nativeBuildInputs = [ @@ -27,25 +35,32 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + cli11 + ddcutil + fmt libX11 libXext + nlohmann_json sdbus-cpp + spdlog udev + xcbutilimage ]; cmakeFlags = [ "-DUDEV_DIR=${placeholder "out"}/lib/udev" + "-DUDEV_RULES_DIR=${placeholder "out"}/lib/udev/rules.d" ]; # Fixes the "gummy start" command, without this it cannot find the binary. # Setting this through cmake does not seem to work. postPatch = '' - substituteInPlace src/gummy/gummy.cpp \ + substituteInPlace gummyd/gummyd/api.cpp \ --replace "CMAKE_INSTALL_DAEMON_PATH" "\"${placeholder "out"}/libexec/gummyd\"" ''; preFixup = '' - substituteInPlace $out/lib/udev/99-gummy.rules \ + substituteInPlace $out/lib/udev/rules.d/99-gummy.rules \ --replace "/bin/chmod" "${coreutils}/bin/chmod" ln -s $out/libexec/gummyd $out/bin/gummyd @@ -54,13 +69,13 @@ stdenv.mkDerivation rec { passthru.tests.version = testers.testVersion { package = gummy; }; meta = with lib; { - homepage = "https://github.com/Fushko/gummy"; + homepage = "https://codeberg.org/fusco/gummy"; description = "Brightness and temperature manager for X11"; longDescription = '' CLI screen manager for X11 that allows automatic and manual brightness/temperature adjustments, via backlight (currently only for embedded displays) and gamma. Multiple monitors are supported. ''; license = licenses.gpl3Only; - maintainers = [ maintainers.ivar ]; + maintainers = with maintainers; [ ivar ]; }; } diff --git a/pkgs/tools/misc/immich-cli/default.nix b/pkgs/tools/misc/immich-cli/default.nix index 82d8e96ec798a..21d0600d92b13 100644 --- a/pkgs/tools/misc/immich-cli/default.nix +++ b/pkgs/tools/misc/immich-cli/default.nix @@ -1,31 +1,70 @@ { lib , buildNpmPackage , fetchFromGitHub +, testers }: -buildNpmPackage { - pname = "immich-cli"; - version = "2.0.6"; - +let + version = "2.2.4"; src = fetchFromGitHub { owner = "immich-app"; repo = "immich"; # Using a fixed commit until upstream has release tags for cli. - rev = "014adf175ad50a61f92804666940e267ab329064"; - hash = "sha256-MK3Watq5/Zp+rymCIfWxAXSgBPDE13g23uDnW7A5x9g="; + rev = "8c2195c8205156f6e3168cc52fa34db334568ea9"; + hash = "sha256-Tseu6aIrYU4Af/jWDi2wDtP77n/aogp7Qkn9mosMaes="; }; - - npmDepsHash = "sha256-ssxOXKE1t/bSb972w/cBeK61IrqPLmx9ODMn6D+2Ezw="; - - postPatch = '' - cd cli - ''; - - meta = { + meta' = { description = "CLI utilities for Immich to help upload images and videos"; homepage = "https://github.com/immich-app/immich"; license = lib.licenses.mit; - mainProgram = "immich"; maintainers = with lib.maintainers; [ felschr pineapplehunter ]; + mainProgram = "immich"; + }; + + open-api-typescript-sdk = buildNpmPackage { + pname = "immich-cli-openapi-typescript-sdk"; + inherit src version; + + npmDepsHash = "sha256-WhNdFaFBwb6ehEQgbNJGdzPb3FdJk1Nefi8DcJfY9Wc="; + + postPatch = '' + cd open-api/typescript-sdk + ''; + meta = { + # using inherit for `builtin.unsafeGetAttrPos` to work correctly + inherit (meta') + description + homepage + license + maintainers; + }; + }; + + immich-cli = buildNpmPackage { + pname = "immich-cli"; + inherit src version; + + npmDepsHash = "sha256-aSTN+I8B/aLT2ItGoyZTlbdn1VCK0ZmOb1QG7ZQuz+Q="; + + postPatch = '' + ln -sv ${open-api-typescript-sdk}/lib/node_modules/@immich/sdk/{build,node_modules} open-api/typescript-sdk + cd cli + ''; + + passthru = { + inherit open-api-typescript-sdk; + tests.version = testers.testVersion { package = immich-cli; }; + }; + + meta = { + # using inherit for `builtin.unsafeGetAttrPos` to work correctly + inherit (meta') + description + homepage + license + maintainers + mainProgram; + }; }; -} +in +immich-cli diff --git a/pkgs/tools/misc/panoply/default.nix b/pkgs/tools/misc/panoply/default.nix index d2a04e3c38f7e..2aef5a0788a8d 100644 --- a/pkgs/tools/misc/panoply/default.nix +++ b/pkgs/tools/misc/panoply/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "panoply"; - version = "5.4.1"; + version = "5.4.3"; src = fetchurl { url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz"; - sha256 = "sha256-C/9kFWDpv4bzqpsUcGpZn7P+fqU6teU39HibYhhva3o="; + sha256 = "sha256-xey1Og0TEMgCc9Me/np7BGnUNYTz98gMFzLm2IcQHtw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index 467981bb0a294..51448931dcfb3 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , fetchurl , tk , tcllib @@ -6,38 +7,43 @@ , tkremind ? true }: -let - inherit (lib) optionals optionalString; - tclLibraries = optionals tkremind [ tcllib tk ]; - tkremindPatch = optionalString tkremind '' - substituteInPlace scripts/tkremind --replace "exec wish" "exec ${tk}/bin/wish" - ''; -in tcl.mkTclDerivation rec { pname = "remind"; version = "05.00.01"; src = fetchurl { url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz"; - sha256 = "sha256-tj36/lLn67/hkNMrRVGXRLqQ9Sx6oDKZHeajiSYn97c="; + hash = "sha256-tj36/lLn67/hkNMrRVGXRLqQ9Sx6oDKZHeajiSYn97c="; }; - propagatedBuildInputs = tclLibraries; + propagatedBuildInputs = lib.optionals tkremind [ tcllib tk ]; - postPatch = '' - substituteInPlace ./configure \ - --replace "sleep 1" "true" - substituteInPlace ./src/init.c \ - --replace "rkrphgvba(0);" "" \ - --replace "rkrphgvba(1);" "" - ${tkremindPatch} + postPatch = lib.optionalString tkremind '' + # NOTA BENE: The path to rem2pdf is replaced in tkremind for future use + # as rem2pdf is currently not build since it requires the JSON::MaybeXS, + # Pango and Cairo Perl modules. + substituteInPlace scripts/tkremind \ + --replace-fail "exec wish" "exec ${lib.getBin tk}/bin/wish" \ + --replace-fail 'set Remind "remind"' "set Remind \"$out/bin/remind\"" \ + --replace-fail 'set Rem2PS "rem2ps"' "set Rem2PS \"$out/bin/rem2ps\"" \ + --replace-fail 'set Rem2PDF "rem2pdf"' "set Rem2PDF \"$out/bin/rem2pdf\"" ''; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin (toString [ + # Disable clang link time optimization until the following issue is resolved: + # https://github.com/NixOS/nixpkgs/issues/19098 + "-fno-lto" + # On Darwin setenv and unsetenv are defined in stdlib.h from libSystem + "-DHAVE_SETENV" + "-DHAVE_UNSETENV" + ]); + meta = with lib; { homepage = "https://dianne.skoll.ca/projects/remind/"; description = "Sophisticated calendar and alarm program for the console"; license = licenses.gpl2Only; maintainers = with maintainers; [ raskin kovirobi ]; + mainProgram = "remind"; platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/sensible-utils/default.nix b/pkgs/tools/misc/sensible-utils/default.nix index 0335a0756401f..4584de1f8fdda 100644 --- a/pkgs/tools/misc/sensible-utils/default.nix +++ b/pkgs/tools/misc/sensible-utils/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "sensible-utils"; - version = "0.0.18"; + version = "0.0.23"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = "sensible-utils"; rev = "debian/${version}"; - sha256 = "sha256-fZJKPnEkPfo/3luUcHzAmGB2k1nkA4ATEQMSz0aN0YY="; + sha256 = "sha256-EiWrMDVfauCBHmpJOoJFWOdigtDiNc5DzDoeyWhke9k="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index e03b792456816..ec8cefeab7a8e 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -15,7 +15,7 @@ let python pytest nose3 cryptography pyyaml requests mock requests-mock python-dateutil setuptools; - version = "4.83"; + version = "4.89"; in @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "spaam"; repo = "svtplay-dl"; rev = version; - hash = "sha256-CaidnRd21qtPKlFMHfQMmYVz/CfN88uBC1XK3JikHf0="; + hash = "sha256-EuLXDbJembiFFEuIihrc8KkdqxLBgT4Ib3xwkKibVS8="; }; pythonPaths = [ cryptography pyyaml requests ]; diff --git a/pkgs/tools/misc/xcp/default.nix b/pkgs/tools/misc/xcp/default.nix index ecdb455986153..718027b1efd7f 100644 --- a/pkgs/tools/misc/xcp/default.nix +++ b/pkgs/tools/misc/xcp/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "xcp"; - version = "0.20.4"; + version = "0.21.0"; src = fetchFromGitHub { owner = "tarka"; repo = pname; rev = "v${version}"; - hash = "sha256-0ucm8XBxYwXvpVJN8If8BIToQGiBisKLZJYKuvaORto="; + hash = "sha256-RxEEbyM7wXteYteA4GmvXEraHhm+Kkr2UbYR8G0gO8c="; }; # no such file or directory errors doCheck = false; - cargoHash = "sha256-UdQUrIRos3TmebotdESvKH+90WVMJ0oTc43p+AT4xMI="; + cargoHash = "sha256-ruL1KP3a76DRg0RqpNYz0ZL0V2Ce4v3zt9B/tXyXQs0="; meta = with lib; { description = "Extended cp(1)"; diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix index a234ad577d84a..8f22d042b8d8d 100644 --- a/pkgs/tools/networking/burpsuite/default.nix +++ b/pkgs/tools/networking/burpsuite/default.nix @@ -1,15 +1,23 @@ -{ lib, fetchurl, jdk, buildFHSEnv, unzip, makeDesktopItem, proEdition ? false }: +{ lib +, buildFHSEnv +, fetchurl +, jdk +, makeDesktopItem +, proEdition ? false +, unzip +}: + let - version = "2024.1.1.4"; + version = "2024.5.3"; product = if proEdition then { productName = "pro"; productDesktop = "Burp Suite Professional Edition"; - hash = "sha256-jJUTsNF7Jy2VbFBIW7ha/ty9ZwVyVX1cTKNZJgD7zg4="; + hash = "sha256-1+IAlm4irUVqGFHlL+vNZNdDJrq3ZpJdUJYGrUN2cuY="; } else { productName = "community"; productDesktop = "Burp Suite Community Edition"; - hash = "sha256-VkrI1M4lCdCuQypHSd2W5X6LyqLUhnbKZKMVj0w4THE="; + hash = "sha256-+YgRKYF9NPAAfuy97nmAVeI8fCvwjvHn7hHtBUjUoXk="; }; src = fetchurl { @@ -48,6 +56,8 @@ buildFHSEnv { expat glib gtk3 + gtk3-x11 + jython libcanberra-gtk3 libdrm libudev0-shim @@ -56,7 +66,6 @@ buildFHSEnv { nspr nss pango - gtk3-x11 xorg.libX11 xorg.libxcb xorg.libXcomposite diff --git a/pkgs/tools/networking/ligolo-ng/default.nix b/pkgs/tools/networking/ligolo-ng/default.nix index 80f26666f0ffc..b136ee6fd3244 100644 --- a/pkgs/tools/networking/ligolo-ng/default.nix +++ b/pkgs/tools/networking/ligolo-ng/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "ligolo-ng"; - version = "0.5.2"; + version = "0.6"; src = fetchFromGitHub { owner = "tnpitsecurity"; repo = "ligolo-ng"; rev = "refs/tags/v${version}"; - hash = "sha256-pFk/9AFtnMBNi5hdVWDzfxCTFe9wSkFydHciTpMRxQw="; + hash = "sha256-v4E1frvjOML3G6vxxYOigpC6m3sYhVxwDvbw8BwBzDk="; }; - vendorHash = "sha256-QEGF12yJ+CQjIHx6kOwsykVhelp5npnglk7mIbOeIpI="; + vendorHash = "sha256-LqoWkhEnsKTz384dhqNKmZrG38NHxaFx4k7zjHj51Ys="; postConfigure = '' export CGO_ENABLED=0 diff --git a/pkgs/tools/networking/netcat/default.nix b/pkgs/tools/networking/netcat/default.nix index 7d7806f1997e2..8271fe9d27a52 100644 --- a/pkgs/tools/networking/netcat/default.nix +++ b/pkgs/tools/networking/netcat/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { mainProgram = "netcat"; license = licenses.gpl2Plus; platforms = platforms.unix; + maintainers = with lib.maintainers; [ RossComputerGuy ]; }; } diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 677dcf3aa1996..87077b42d96e4 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -147,8 +147,8 @@ in lib.makeExtensible (self: ({ }; nix_2_18 = common { - version = "2.18.2"; - hash = "sha256-8gNJlBlv2bnffRg0CejiBXc6U/S6YeCLAdHrYvTPyoY="; + version = "2.18.3"; + hash = "sha256-430V4oN1Pid0h3J1yucrik6lbDh5D+pHI455bzLPEDY="; self_attribute_name = "nix_2_18"; }; diff --git a/pkgs/tools/security/httpx/default.nix b/pkgs/tools/security/httpx/default.nix index d0d78c3047fae..cfc44441820ce 100644 --- a/pkgs/tools/security/httpx/default.nix +++ b/pkgs/tools/security/httpx/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "httpx"; - version = "1.6.3"; + version = "1.6.4"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; rev = "refs/tags/v${version}"; - hash = "sha256-N2Fym3OwTHjdaJ1fzGWL+BoUYsQ5216d3Ohz5Yrf558="; + hash = "sha256-EvpCJx5OtWOM/TIz45+8lvkphnyGiI7P7hvFeuNmGfM="; }; - vendorHash = "sha256-jD5LQ9HZbWpoXgnyA7RacaDdyBPMbK02PhKQT+1il4Q="; + vendorHash = "sha256-0e8P6pMvtEj28j7BQlNPkW/XpjSVBnKP/Dli+oU+J10="; subPackages = [ "cmd/httpx" ]; diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix index 745b027a057e3..b06e0f3ec64ff 100644 --- a/pkgs/tools/security/john/default.nix +++ b/pkgs/tools/security/john/default.nix @@ -1,32 +1,17 @@ { lib, stdenv, fetchFromGitHub, openssl, nss, nspr, libkrb5, gmp, zlib, libpcap, re2 -, gcc, python3Packages, perl, perlPackages, makeWrapper, fetchpatch -}: +, gcc, python3Packages, perl, perlPackages, makeWrapper, }: stdenv.mkDerivation rec { pname = "john"; - version = "1.9.0-jumbo-1"; + version = "rolling-2404"; src = fetchFromGitHub { owner = "openwall"; - repo = pname; - rev = "1.9.0-Jumbo-1"; - sha256 = "sha256-O1iPh5QTMjZ78sKvGbvSpaHFbBuVc1z49UKTbMa24Rs="; + repo = "john"; + rev = "f9fedd238b0b1d69181c1fef033b85c787e96e57"; + hash = "sha256-zvoN+8Sx6qpVg2JeRLOIH1ehfl3tFTv7r5wQZ44Qsbc="; }; - patches = [ - (fetchpatch { - name = "fix-gcc-11-struct-allignment-incompatibility.patch"; - url = "https://github.com/openwall/john/commit/154ee1156d62dd207aff0052b04c61796a1fde3b.patch"; - sha256 = "sha256-3rfS2tu/TF+KW2MQiR+bh4w/FVECciTooDQNTHNw31A="; - }) - (fetchpatch { - name = "improve-apple-clang-pseudo-intrinsics-portability.patch"; - url = "https://github.com/openwall/john/commit/c9825e688d1fb9fdd8942ceb0a6b4457b0f9f9b4.patch"; - excludes = [ "doc/*" ]; - sha256 = "sha256-hgoiz7IgR4f66fMP7bV1F8knJttY8g2Hxyk3QfkTu+g="; - }) - ]; - postPatch = '' sed -ri -e ' s!^(#define\s+CFG_[A-Z]+_NAME\s+).*/!\1"'"$out"'/etc/john/! @@ -85,7 +70,7 @@ stdenv.mkDerivation rec { description = "John the Ripper password cracker"; license = licenses.gpl2Plus; homepage = "https://github.com/openwall/john/"; - maintainers = with maintainers; [ offline matthewbauer ]; + maintainers = with maintainers; [ offline matthewbauer cherrykitten ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/jwx/default.nix b/pkgs/tools/security/jwx/default.nix index ea8e69fad109b..b1dbc25b0889b 100644 --- a/pkgs/tools/security/jwx/default.nix +++ b/pkgs/tools/security/jwx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "jwx"; - version = "2.0.21"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lestrrat-go"; repo = pname; rev = "v${version}"; - hash = "sha256-Rg3E+7kyyzY8NqfXMH3ENWAuCxx7+3DyyarfGNI9xxE="; + hash = "sha256-In9/RmcqiOFT1QceWls8gzgzgkBoKeUE05j0cHCecTU="; }; - vendorHash = "sha256-HHq4B0MYP2gUtV9ywrXVmWN7OpV6NVb49rVMFblOgPc="; + vendorHash = "sha256-ZS7xliFymXTE8hlc3GEMNonP5sJTZGirw5YQNzPCl3Y="; sourceRoot = "${src.name}/cmd/jwx"; diff --git a/pkgs/tools/security/mitm6/default.nix b/pkgs/tools/security/mitm6/default.nix index 518b61fd8d4b1..980bc703f4abe 100644 --- a/pkgs/tools/security/mitm6/default.nix +++ b/pkgs/tools/security/mitm6/default.nix @@ -1,37 +1,38 @@ -{ lib -, fetchPypi -, python3 +{ + lib, + fetchPypi, + python3, }: python3.pkgs.buildPythonApplication rec { pname = "mitm6"; version = "0.3.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-g+eFcJdgP7CQ6ntN17guJa4LdkGIb91mr/NKRPIukP8="; }; - propagatedBuildInputs = with python3.pkgs; [ - scapy + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ future - twisted netifaces + scapy + twisted ]; # No tests exist for mitm6. doCheck = false; - pythonImportsCheck = [ - "mitm6" - ]; + pythonImportsCheck = [ "mitm6" ]; meta = { description = "DHCPv6 network spoofing application"; - mainProgram = "mitm6"; homepage = "https://github.com/dirkjanm/mitm6"; license = lib.licenses.gpl2Only; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "mitm6"; }; } diff --git a/pkgs/tools/security/vaultwarden/webvault.nix b/pkgs/tools/security/vaultwarden/webvault.nix index 1b07086846da6..bb86f4cb778b3 100644 --- a/pkgs/tools/security/vaultwarden/webvault.nix +++ b/pkgs/tools/security/vaultwarden/webvault.nix @@ -8,13 +8,13 @@ }: let - version = "2024.5.0"; + version = "2024.5.1"; bw_web_builds = fetchFromGitHub { owner = "dani-garcia"; repo = "bw_web_builds"; rev = "v${version}"; - hash = "sha256-di0oOM3ju3rkDVGmKpvS6sCaIXL/QGawr0TUrQjZ8dM="; + hash = "sha256-iNSkvQn3g64pI0uY7M4S7jEiRRDAc0wlPuJevzMJ+dc="; }; in buildNpmPackage rec { @@ -25,10 +25,10 @@ in buildNpmPackage rec { owner = "bitwarden"; repo = "clients"; rev = "web-v${lib.removeSuffix "b" version}"; - hash = "sha256-kQ2tWfkkG5aifA8UGb5X1wQkGZr6dcVlrb+b78RFX/k="; + hash = "sha256-U/lAt2HfoHGMu6mOki/4+ljhU9FwkodvFBr5zcDO8Wk="; }; - npmDepsHash = "sha256-gprJGOE/uSSM3NHpcbelB7sueObEl4o522WRHIRFmwo="; + npmDepsHash = "sha256-ui00afmnu77CTT9gh6asc4uT7AhVIuiD60sq/1f9viA="; postPatch = '' ln -s ${bw_web_builds}/{patches,resources} .. diff --git a/pkgs/tools/text/mawk/default.nix b/pkgs/tools/text/mawk/default.nix index 7af3634051026..700b20c2178c8 100644 --- a/pkgs/tools/text/mawk/default.nix +++ b/pkgs/tools/text/mawk/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "mawk"; - version = "1.3.4-20240123"; + version = "1.3.4-20240622"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/mawk/mawk-${version}.tgz" "https://invisible-mirror.net/archives/mawk/mawk-${version}.tgz" ]; - sha256 = "sha256-qOMZqDdEsfH7aYjfoYnWGIf4ZukUDMmknrADsrBlXog="; + sha256 = "sha256-TpF+h6ep+692mVeEpLC13A3ZVLl30JgwMPePagexp2U="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; |