diff options
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/antimicrox/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/infracost/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/nomino/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/odyssey/default.nix | 12 | ||||
-rw-r--r-- | pkgs/tools/misc/smug/default.nix | 7 | ||||
-rw-r--r-- | pkgs/tools/misc/tmuxp/default.nix | 25 | ||||
-rw-r--r-- | pkgs/tools/networking/htpdate/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/minio-client/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/security/cirrusgo/default.nix | 26 | ||||
-rw-r--r-- | pkgs/tools/system/hwinfo/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/system/localtime/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/text/colordiff/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/text/ugrep/default.nix | 4 |
14 files changed, 88 insertions, 30 deletions
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix index f8d8b4d5af4c..d71fca87ab24 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-gtk"; - version = "5.0.16"; + version = "5.0.17"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-gdYtQyCczJOGkCjl7fVCjcKkhEW3wDO5HDYNfMhnb1g="; + sha256 = "sha256-sAPbbMoZ4NGiE7lbtcdzQQsPib6i52JwWsLe+bmTshU="; }; cmakeFlags = [ diff --git a/pkgs/tools/misc/antimicrox/default.nix b/pkgs/tools/misc/antimicrox/default.nix index 73e430e54e34..508e39da9d82 100644 --- a/pkgs/tools/misc/antimicrox/default.nix +++ b/pkgs/tools/misc/antimicrox/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "antimicrox"; - version = "3.2.4"; + version = "3.2.5"; src = fetchFromGitHub { owner = "AntiMicroX"; repo = pname; rev = version; - sha256 = "sha256-catgal3bpWJUcTo0x0V0X3VV87AHO2Dp58IpQ/ILsZ8="; + sha256 = "sha256-Lc23VvIZguE6nRHeGDW3pL4exKtJtF8XmFkN2SxUL0g="; }; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config itstool ]; diff --git a/pkgs/tools/misc/infracost/default.nix b/pkgs/tools/misc/infracost/default.nix index aa77f6b4a305..8cf91fe4808c 100644 --- a/pkgs/tools/misc/infracost/default.nix +++ b/pkgs/tools/misc/infracost/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "infracost"; - version = "0.10.9"; + version = "0.10.10"; src = fetchFromGitHub { owner = "infracost"; rev = "v${version}"; repo = "infracost"; - sha256 = "sha256-qDMGeuNY/Y7A6ZGd6giztQrx4psUAjOamUbC0Z4H80k="; + sha256 = "sha256-7SaT2jwrM0pD0BqX18d3nutU52RMCnQb2FuDtoJZMQM="; }; vendorSha256 = "sha256-ccoFTg5OYpaagyzb2lJLr6WlTO/L4YevXK09gZOELOw="; diff --git a/pkgs/tools/misc/nomino/default.nix b/pkgs/tools/misc/nomino/default.nix index c8dcfd313031..01c6b43069e2 100644 --- a/pkgs/tools/misc/nomino/default.nix +++ b/pkgs/tools/misc/nomino/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nomino"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "yaa110"; repo = pname; rev = version; - sha256 = "sha256-+bnEuSro3/t9aXu2WpwsaqHqB+poSXsVbna01a7pnKo="; + sha256 = "sha256-Zczj2HQkm6/hXH24pOXYT5r7RS/SI/39s5XtNnc7f9o="; }; - cargoSha256 = "sha256-IKsA8btCmKnZfRIwS4QdxJMi1As6SNbTI7ibOL7M+5U="; + cargoSha256 = "sha256-mjekXjHhi8gxjD47DmTs3TGtnXp3FbxiIq7Uo+rOvKc="; meta = with lib; { description = "Batch rename utility for developers"; diff --git a/pkgs/tools/misc/odyssey/default.nix b/pkgs/tools/misc/odyssey/default.nix index f0a59e1d0aae..086c1eea58a8 100644 --- a/pkgs/tools/misc/odyssey/default.nix +++ b/pkgs/tools/misc/odyssey/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, openssl, postgresql, zstd }: +{ lib, stdenv, fetchFromGitHub, cmake, openssl, postgresql, zstd, fetchpatch }: stdenv.mkDerivation rec { pname = "odyssey"; @@ -11,9 +11,17 @@ stdenv.mkDerivation rec { sha256 = "sha256-1ALTKRjpKmmFcAuhmgpcbJBkNuUlTyau8xWDRHh7gf0="; }; + patches = [ + # Fix compression build. Remove with the next release. https://github.com/yandex/odyssey/pull/441 + (fetchpatch { + url = "https://github.com/yandex/odyssey/commit/01ca5b345c4483add7425785c9c33dfa2c135d63.patch"; + sha256 = "sha256-8UPkZkiI08ZZL6GShhug/5/kOVrmdqYlsD1bcqfxg/w="; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ openssl postgresql zstd ]; - cmakeFlags = [ "-DPQ_LIBRARY=${postgresql.lib}/lib" ]; + cmakeFlags = [ "-DPQ_LIBRARY=${postgresql.lib}/lib" "-DBUILD_COMPRESSION=ON" ]; installPhase = '' install -Dm755 -t $out/bin sources/odyssey diff --git a/pkgs/tools/misc/smug/default.nix b/pkgs/tools/misc/smug/default.nix index cf78662620ce..1f8263cdc745 100644 --- a/pkgs/tools/misc/smug/default.nix +++ b/pkgs/tools/misc/smug/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "smug"; - version = "0.2.7"; + version = "0.3.2"; subPackages = [ "." ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "ivaaaan"; repo = "smug"; rev = "v${version}"; - sha256 = "178125835dhnaq9k42yv4pfxpyhgb5179wrxkimb59fy0nk8jzx8"; + sha256 = "sha256-JZV4UfrmvcM7d8Ld4m/jC3GvzJCUgXqsGBSSnz81fXk="; }; - vendorSha256 = "1rba5rpvlr8dyhj145b5i57pm4skfpj3vm7vydkn79k6ak6x985x"; + vendorSha256 = "sha256-vaDUzVRmpmNn8/vUPeR1U5N6T4llFRIk9A1lum8uauU="; nativeBuildInputs = [ installShellFiles ]; @@ -21,6 +21,7 @@ buildGoModule rec { postInstall = '' installManPage ./man/man1/smug.1 + installShellCompletion completion/smug.{bash,fish} ''; meta = with lib; { diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index b24c3ead956d..768e4d33e3de 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages }: +{ lib, python3Packages, installShellFiles }: let pypkgs = python3Packages; @@ -6,16 +6,23 @@ let in pypkgs.buildPythonApplication rec { pname = "tmuxp"; - version = "1.11.0"; + version = "1.12.1"; src = pypkgs.fetchPypi { inherit pname version; - sha256 = "sha256-N5kZ+e17ZgLOCvV/lcT/hdG1VNqLxh98QOQyM0BmZCA="; + sha256 = "078624c5ac7aa4142735f856fadb9281fcebb10e6b98d1be2b2f2bbd106613b9"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "libtmux>=0.12.0,<0.13.0" "libtmux" + ''; + # No tests in archive doCheck = false; + nativeBuildInputs = [ installShellFiles ]; + propagatedBuildInputs = with pypkgs; [ click colorama @@ -23,10 +30,18 @@ pypkgs.buildPythonApplication rec { libtmux ]; + postInstall = '' + installShellCompletion --cmd tmuxp \ + --bash <(_TMUXP_COMPLETE=bash_source $out/bin/tmuxp) \ + --fish <(_TMUXP_COMPLETE=fish_source $out/bin/tmuxp) \ + --zsh <(_TMUXP_COMPLETE=zsh_source $out/bin/tmuxp) + ''; + meta = with lib; { - description = "Manage tmux workspaces from JSON and YAML"; + description = "tmux session manager"; homepage = "https://tmuxp.git-pull.com/"; - license = licenses.bsd3; + changelog = "https://github.com/tmux-python/tmuxp/raw/v${version}/CHANGES"; + license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; } diff --git a/pkgs/tools/networking/htpdate/default.nix b/pkgs/tools/networking/htpdate/default.nix index 9e4cf7846bdb..e821163f2298 100644 --- a/pkgs/tools/networking/htpdate/default.nix +++ b/pkgs/tools/networking/htpdate/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "1.3.5"; + version = "1.3.6"; pname = "htpdate"; src = fetchFromGitHub { owner = "twekkel"; repo = pname; rev = "v${version}"; - sha256 = "sha256-L3CKBgGk9R8qJFWOS98Tm1j/s/5t6+/Vt2EcZ+or0Ng="; + sha256 = "sha256-0NLlBNYTJ+hmQLH/UYwIOIbq3G1sDo/A03xFHsXdzig="; }; makeFlags = [ diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index e01cddab88b7..a4d1e7365b89 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2022-08-05T08-01-28Z"; + version = "2022-08-11T00-30-48Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-XtRpRp5KtqM+VwaouzbcjoiwuUDo4NtgaQ/bsCmwP58="; + sha256 = "sha256-wv/Y4MIJFISf+fvV3BYbA5kQqETsYe4vt2lp36DfFrE="; }; - vendorSha256 = "sha256-0WljjAgL//PqooHwAusMQwJpLRYzjpDUNcrmCHUGyNs="; + vendorSha256 = "sha256-5kpE0jtE3ljnUsXQY2cWvABVpegrTSYZCIYy0pz4iz8="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/cirrusgo/default.nix b/pkgs/tools/security/cirrusgo/default.nix new file mode 100644 index 000000000000..56fb7c71b1ec --- /dev/null +++ b/pkgs/tools/security/cirrusgo/default.nix @@ -0,0 +1,26 @@ +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "cirrusgo"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "Ph33rr"; + repo = pname; + rev = "v${version}"; + hash = "sha256-FYI/Ldu91YB/4wCiVADeYxYQOeBGro1msY5VXsnixw4="; + }; + + vendorSha256 = "sha256-KCf2KQ8u+nX/+zMGZ6unWb/Vz6zPNkKtMioFo1FlnVI="; + + meta = with lib; { + description = "Tool to scan SAAS and PAAS applications"; + homepage = "https://github.com/Ph33rr/cirrusgo"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix index fcdf35345819..b990ce1c2ed9 100644 --- a/pkgs/tools/system/hwinfo/default.nix +++ b/pkgs/tools/system/hwinfo/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "hwinfo"; - version = "22.0"; + version = "22.1"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = version; - sha256 = "sha256-hjKF/fyV7/uQF6iJNOsRpX4Iw7aDURkdb7hbwfIDBPo="; + sha256 = "sha256-nGWpUqBkpiiNuH5kEHWR1/+0aYIeLf9k3AmzQR85Swk="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/system/localtime/default.nix b/pkgs/tools/system/localtime/default.nix index b8f2b4605289..ee2a25bdf79d 100644 --- a/pkgs/tools/system/localtime/default.nix +++ b/pkgs/tools/system/localtime/default.nix @@ -19,6 +19,14 @@ buildGoModule { nativeBuildInputs = [ m4 ]; + buildPhase = '' + runHook preBuild + make PREFIX="$out" + runHook postBuild + ''; + + doCheck = false; # no tests + installPhase = '' runHook preInstall make PREFIX="$out" install diff --git a/pkgs/tools/text/colordiff/default.nix b/pkgs/tools/text/colordiff/default.nix index a7e8293851b9..df5b35dd9be0 100644 --- a/pkgs/tools/text/colordiff/default.nix +++ b/pkgs/tools/text/colordiff/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, docbook_xml_dtd_412, docbook_xsl, perl, w3m, xmlto, diffutils }: +{ lib, stdenv, fetchFromGitHub, docbook_xml_dtd_412, docbook_xsl, perl, w3m-batch, xmlto, diffutils }: stdenv.mkDerivation rec { pname = "colordiff"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-+TtVnUX88LMd8zmhLsKTyR9JlgR7IkUB18PF3LRgPB0="; }; - nativeBuildInputs = [ docbook_xml_dtd_412 docbook_xsl perl w3m xmlto ]; + nativeBuildInputs = [ docbook_xml_dtd_412 docbook_xsl perl w3m-batch xmlto ]; buildInputs = [ perl ]; diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index 51e2f9778c4b..cad0f96998cf 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ugrep"; - version = "3.8.3"; + version = "3.9.0"; src = fetchFromGitHub { owner = "Genivia"; repo = pname; rev = "v${version}"; - sha256 = "sha256-p2x3WQIzM1FJBn9mvqfisjTLgjtkZouV/fr/waCiYw0="; + sha256 = "sha256-9tHSdO9VlsbLqFFA/CKhbPvstU3+26jBaBw/tX5qJnw="; }; buildInputs = [ |