diff options
Diffstat (limited to 'pkgs/tools/misc')
68 files changed, 200 insertions, 265 deletions
diff --git a/pkgs/tools/misc/0x/default.nix b/pkgs/tools/misc/0x/default.nix index b76c13e662873..2f1493d23452e 100644 --- a/pkgs/tools/misc/0x/default.nix +++ b/pkgs/tools/misc/0x/default.nix @@ -25,6 +25,7 @@ rustPlatform.buildRustPackage { meta = with lib; { homepage = "https://github.com/mcy/0x"; description = "A colorful, configurable xxd"; + mainProgram = "0x"; license = licenses.asl20; maintainers = with maintainers; [ AndersonTorres ]; }; diff --git a/pkgs/tools/misc/3mux/default.nix b/pkgs/tools/misc/3mux/default.nix index 9ec4572328e7e..0a16b853943d9 100644 --- a/pkgs/tools/misc/3mux/default.nix +++ b/pkgs/tools/misc/3mux/default.nix @@ -46,6 +46,7 @@ buildGoModule rec { meta = with lib; { description = "Terminal multiplexer inspired by i3"; + mainProgram = "3mux"; longDescription = '' Terminal multiplexer with out-of-the-box support for search, mouse-controlled scrollback, and i3-like keybindings diff --git a/pkgs/tools/misc/SP800-90B_EntropyAssessment/default.nix b/pkgs/tools/misc/SP800-90B_EntropyAssessment/default.nix index f2ff558168d54..7647d2b9f0b0f 100644 --- a/pkgs/tools/misc/SP800-90B_EntropyAssessment/default.nix +++ b/pkgs/tools/misc/SP800-90B_EntropyAssessment/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { --replace "-march=native" "" ''; - sourceRoot = "source/cpp"; + sourceRoot = "${src.name}/cpp"; makeFlags = [ "CROSS_COMPILE=${stdenv.cc.targetPrefix}" diff --git a/pkgs/tools/misc/aichat/default.nix b/pkgs/tools/misc/aichat/default.nix index 311d0fb8de875..69fc0891eea46 100644 --- a/pkgs/tools/misc/aichat/default.nix +++ b/pkgs/tools/misc/aichat/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "aichat"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "sigoden"; repo = "aichat"; rev = "v${version}"; - hash = "sha256-1m0Sf8qC5kGOfXkxQVri+kL3sZfOFKH3TcpNhuOFPVQ="; + hash = "sha256-0VNFqfl1La6jSUE7IsS/pYIQGaNrAgSgiGUjo65pUR4="; }; - cargoHash = "sha256-/oEyI6m5j3u89NeEwM4+z1exZfu0FMSf14scAiax3CE="; + cargoHash = "sha256-zrX4e9Z8FgZvvNyyiw29Dr/0KO1uL20/+DUASyPjxjE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/misc/antimicrox/default.nix b/pkgs/tools/misc/antimicrox/default.nix index 85e9af7bb67e1..a0bafa726f978 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.3.4"; + version = "3.4.0"; src = fetchFromGitHub { owner = "AntiMicroX"; repo = pname; rev = version; - sha256 = "sha256-WEtKeQKRZcYpZ4mnFdj4ZRApBuD8fByf11Uu6ylbAcY="; + sha256 = "sha256-zBIEuZdmcyA99YdwC6tn0I3Ori8VyBOw50ablb/Lmvs="; }; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config itstool ]; diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix index e1bb2f0841108..977e339d7ef55 100644 --- a/pkgs/tools/misc/autojump/default.nix +++ b/pkgs/tools/misc/autojump/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A `cd' command that learns"; + mainProgram = "autojump"; longDescription = '' One of the most used shell commands is “cd”. A quick survey among my friends revealed that between 10 and 20% of all diff --git a/pkgs/tools/misc/bash_unit/default.nix b/pkgs/tools/misc/bash_unit/default.nix index 19cebbb07e606..ebf7d6916b32d 100644 --- a/pkgs/tools/misc/bash_unit/default.nix +++ b/pkgs/tools/misc/bash_unit/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "bash_unit"; - version = "2.2.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "pgrange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sYs7b6I1VhO2TLLhMFuaV9AtLoavcoKvCRYfVNGAg20="; + sha256 = "sha256-kd5h12yjzvR/RBE/IjVXNSyjcf+rz6B2eoO8w2jiaps="; }; patchPhase = '' diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 751860860436f..4a2470e86ffa7 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.35.0"; + version = "1.36.1"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - hash = "sha256-L9a1fQZkCHSHseZtQYwqIt1CokPGBqLcqY0jccHYqGw="; + hash = "sha256-mwccjsrveqoepBaCeQaija3DsXcuMtCK5PyoghtAJ9w="; }; - cargoHash = "sha256-DRW1gv5lqdXWcRLD2yf7+u6J/xIUWmELmb/l729Sqo4="; + cargoHash = "sha256-GykLzXKFtebFuOWLtZ2Qj5OrZXiSrfEJ98cog5PwCfQ="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 5bac5602c79f9..a7d870a4d5dcf 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -79,11 +79,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3.pkgs.buildPythonApplication rec { pname = "diffoscope"; - version = "259"; + version = "260"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - hash = "sha256-WYgFWM6HKFt3xVcRNytQPWOf3ZpH1cG7Cghhu/AES80="; + hash = "sha256-jZXBX6aIArm3eFmJpr60HxlcSlVNCK/wSL1yeIl/MjQ="; }; outputs = [ diff --git a/pkgs/tools/misc/domine/default.nix b/pkgs/tools/misc/domine/default.nix index 3d193ba2a06f7..a85275acab0e8 100644 --- a/pkgs/tools/misc/domine/default.nix +++ b/pkgs/tools/misc/domine/default.nix @@ -12,4 +12,5 @@ buildDartApplication rec { }; pubspecLock = lib.importJSON ./pubspec.lock.json; + meta.mainProgram = "domine"; } diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index 110862bf13965..22ae9a7a64310 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.28.0"; + version = "2.29.0"; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - hash = "sha256-a5J6G7QvCi2u064fP4V5uxxvBXcbN+a+dIO5MbsVU70="; + hash = "sha256-rO9k1/HOwVJF/QCT2sZy4L0Mv26CiUj9Zafliffj68A="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoHash = "sha256-Up7HvBJMR5h+/rdlJVMeCCuOiOQ8++oReCBI8wt3T2M="; + cargoHash = "sha256-qn1QDiYHcygomOFwFEy00wsMykrQ9/84Ed4nAUTlA1k="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation diff --git a/pkgs/tools/misc/edid-decode/default.nix b/pkgs/tools/misc/edid-decode/default.nix index eb72d0a815702..733f87da6f22b 100644 --- a/pkgs/tools/misc/edid-decode/default.nix +++ b/pkgs/tools/misc/edid-decode/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { pname = "edid-decode"; - version = "unstable-2022-12-14"; + version = "unstable-2024-01-29"; outputs = [ "out" @@ -15,8 +15,8 @@ stdenv.mkDerivation { src = fetchgit { url = "git://linuxtv.org/edid-decode.git"; - rev = "e052f5f9fdf74ca11aa1a8edfa62eff8d0aa3d0d"; - hash = "sha256-qNtb/eM7VpS8nRbC/nNm6J9vEWVUSrg7OwNaW1774QY="; + rev = "7a27b339cf5ee1ab431431a844418a7f7c16d167"; + hash = "sha256-y+g+E4kaQh6j+3GvHdcVEGQu/zOkGyW/HazUHG0DCxM="; }; preBuild = '' diff --git a/pkgs/tools/misc/eludris/default.nix b/pkgs/tools/misc/eludris/default.nix index ac3ecc2e5a6cb..e3fc67fcacb0e 100644 --- a/pkgs/tools/misc/eludris/default.nix +++ b/pkgs/tools/misc/eludris/default.nix @@ -27,6 +27,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A simple CLI to help you with setting up and managing your Eludris instance"; + mainProgram = "eludris"; homepage = "https://github.com/eludris/eludris/tree/main/cli"; license = licenses.mit; maintainers = with maintainers; [ ooliver1 ]; diff --git a/pkgs/tools/misc/etcher/default.nix b/pkgs/tools/misc/etcher/default.nix deleted file mode 100644 index 4b27f35cf53c9..0000000000000 --- a/pkgs/tools/misc/etcher/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ lib -, stdenv -, fetchurl -, bash -, util-linux -, autoPatchelfHook -, dpkg -, makeWrapper -, udev -, electron -}: - -stdenv.mkDerivation rec { - pname = "etcher"; - version = "1.18.12"; - - src = fetchurl { - url = "https://github.com/balena-io/etcher/releases/download/v${version}/balena-etcher_${version}_amd64.deb"; - hash = "sha256-Ucs187xTpbRJ7P32hCl8cHPxO3HCs44ZneAas043FXk="; - }; - - # sudo-prompt has hardcoded binary paths on Linux and we patch them here - # along with some other paths - postPatch = '' - substituteInPlace opt/balenaEtcher/resources/app/generated/gui.js \ - --replace '/usr/bin/pkexec' '/usr/bin/pkexec", "/run/wrappers/bin/pkexec' \ - --replace '/bin/bash' '${bash}/bin/bash' \ - --replace '"lsblk"' '"${util-linux}/bin/lsblk"' - ''; - - nativeBuildInputs = [ - autoPatchelfHook - dpkg - makeWrapper - ]; - - buildInputs = [ - stdenv.cc.cc.lib - udev - ]; - - dontConfigure = true; - - dontBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/share/${pname} - - cp -a usr/share/* $out/share - cp -a opt/balenaEtcher/{locales,resources} $out/share/${pname} - - makeWrapper ${electron}/bin/electron $out/bin/${pname} \ - --add-flags $out/share/${pname}/resources/app - - substituteInPlace $out/share/applications/balena-etcher.desktop \ - --replace /opt/balenaEtcher/balena-etcher ${pname} - - runHook postInstall - ''; - - meta = with lib; { - description = "Flash OS images to SD cards and USB drives, safely and easily"; - homepage = "https://etcher.io/"; - license = licenses.asl20; - mainProgram = "etcher"; - maintainers = with maintainers; [ wegank ]; - platforms = [ "x86_64-linux" ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/tools/misc/fastfetch/default.nix b/pkgs/tools/misc/fastfetch/default.nix index 2e727896905dd..bc3f4340b4768 100644 --- a/pkgs/tools/misc/fastfetch/default.nix +++ b/pkgs/tools/misc/fastfetch/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.8.7"; + version = "2.8.9"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-lJRTw8Z//x6tMpwfwSodTz7aVbnJPt3rac7AudqF+DA="; + hash = "sha256-UvAIIkH9PNlvLzlh0jm1kG+4OfWsWtt2LSFbFPm7Yv4="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/misc/fclones/gui.nix b/pkgs/tools/misc/fclones/gui.nix index 7b2d063d45b73..8dff1eec4928b 100644 --- a/pkgs/tools/misc/fclones/gui.nix +++ b/pkgs/tools/misc/fclones/gui.nix @@ -47,6 +47,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Interactive duplicate file remover"; + mainProgram = "fclones-gui"; homepage = "https://github.com/pkolaczk/fclones-gui"; changelog = "https://github.com/pkolaczk/fclones-gui/releases/tag/${src.rev}"; license = licenses.mit; diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index a64246693ee16..2f5eac6b7396b 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -24,16 +24,16 @@ let in buildGoModule rec { pname = "fzf"; - version = "0.46.1"; + version = "0.47.0"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - hash = "sha256-gMSelLwIIYv/vkbdWi4Cw3FEy4lbC8P/5+T+c/e66+c="; + hash = "sha256-rIRn8g4j/drWEHnvZnJW2sSLq5mrw8Q2pn3LN2sEXDY="; }; - vendorHash = "sha256-8ojmIETUyZ3jDhrqkHYnxptRG8vdj0GADYvEpw0wi6w="; + vendorHash = "sha256-BOPACUQKcllmA2eWQs+sOfofAQLle2Byb/rZgOhmkVY="; CGO_ENABLED = 0; diff --git a/pkgs/tools/misc/gosu/default.nix b/pkgs/tools/misc/gosu/default.nix index bd3ba4c930d7e..8b5a5fb88d333 100644 --- a/pkgs/tools/misc/gosu/default.nix +++ b/pkgs/tools/misc/gosu/default.nix @@ -21,6 +21,7 @@ buildGoModule rec { meta = with lib; { description = "Tool that avoids TTY and signal-forwarding behavior of sudo and su"; + mainProgram = "gosu"; homepage = "https://github.com/tianon/gosu"; license = licenses.asl20; maintainers = with maintainers; [ ]; diff --git a/pkgs/tools/misc/hunt/default.nix b/pkgs/tools/misc/hunt/default.nix index 624f9ec90dc29..2c135e0285138 100644 --- a/pkgs/tools/misc/hunt/default.nix +++ b/pkgs/tools/misc/hunt/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "hunt"; - version = "2.1.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "LyonSyonII"; repo = "hunt-rs"; rev = "v${version}"; - sha256 = "sha256-noqsxgx2FuSp3ekaaopLUPhq4YYBwM8uf4DzML5xLAE="; + sha256 = "sha256-cpqietS/yTI5ONkH4jjIUOVATutd2vj9xmxRbBwmzeI="; }; - cargoHash = "sha256-JErhe2Hu2Qpb5QoEurdy/WSShjkiV/Fai4/lVkisrEQ="; + cargoHash = "sha256-LWZaU+zHbfiogWXW9XGA3iP95u3qqh2LX9LL2lsQPLg="; meta = with lib; { description = "Simplified Find command made with Rust"; diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/tools/misc/i3minator/default.nix index 4db029ef8fa2c..d56ee6eadc7ad 100644 --- a/pkgs/tools/misc/i3minator/default.nix +++ b/pkgs/tools/misc/i3minator/default.nix @@ -20,6 +20,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "i3 project manager similar to tmuxinator"; + mainProgram = "i3minator"; longDescription = '' A simple "workspace manager" for i3. It allows to quickly manage workspaces defining windows and their layout. The diff --git a/pkgs/tools/misc/ili2c/default.nix b/pkgs/tools/misc/ili2c/default.nix index 99c1353631e90..d4ac130463770 100644 --- a/pkgs/tools/misc/ili2c/default.nix +++ b/pkgs/tools/misc/ili2c/default.nix @@ -5,7 +5,7 @@ , jdk8 , jre8 , makeWrapper -, canonicalize-jars-hook +, stripJavaArchivesHook }: let @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { ant jdk makeWrapper - canonicalize-jars-hook + stripJavaArchivesHook ]; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/kcollectd/default.nix b/pkgs/tools/misc/kcollectd/default.nix index a5c1039274a4d..dc45a18fe3dda 100644 --- a/pkgs/tools/misc/kcollectd/default.nix +++ b/pkgs/tools/misc/kcollectd/default.nix @@ -18,12 +18,12 @@ mkDerivation rec { pname = "kcollectd"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitLab { owner = "aerusso"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ihd4Ps4t9+sNB3joO3vTxDR/25t7Ecl6yvHQ15QiUdY="; + sha256 = "sha256-bUVL5eRQ5UkSZo562pnyEcj0fVoSC5WHRq4BfN67jEM="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix index 48c8e9a4f7213..5f56291f26f7b 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Bitcoin command line tool"; + mainProgram = "bx"; homepage = "https://github.com/libbitcoin/libbitcoin-explorer"; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ asymmetric ]; diff --git a/pkgs/tools/misc/linux-logo/default.nix b/pkgs/tools/misc/linux-logo/default.nix index ad7dd7227a900..5b12f75b72973 100644 --- a/pkgs/tools/misc/linux-logo/default.nix +++ b/pkgs/tools/misc/linux-logo/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Prints an ASCII logo and some system info"; + mainProgram = "linux_logo"; homepage = "http://www.deater.net/weave/vmwprod/linux_logo"; changelog = "https://github.com/deater/linux_logo/blob/${src.rev}/CHANGES"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/misc/map/default.nix b/pkgs/tools/misc/map/default.nix index b6049904dc62f..6416e12e9c195 100644 --- a/pkgs/tools/misc/map/default.nix +++ b/pkgs/tools/misc/map/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Map lines from stdin to commands"; + mainProgram = "map"; homepage = "https://github.com/soveran/map"; license = licenses.bsd2; maintainers = with maintainers; [ pogobanane ]; diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix index 7ba0165b0e017..0bdbd91a1dc67 100644 --- a/pkgs/tools/misc/miniserve/default.nix +++ b/pkgs/tools/misc/miniserve/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "miniserve"; - version = "0.26.0"; + version = "0.27.1"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; rev = "v${version}"; - hash = "sha256-f+k7ONX9bDrkyIhFxxaJvZYH2WBxYwCssbfM2fBPtRk="; + hash = "sha256-aqsEJJSb5dL7wEdDXiKEyqwCpg0O2Ld5jT+Hjdptha4="; }; - cargoHash = "sha256-Omxd0ZgvtEiciFnKWkYupyts2QT9LUTXxaTdfu0Jnx8="; + cargoHash = "sha256-pQVvL9pUK9QTIDG4axuKyYQ4NKO8M4M38ajYDSHFxew="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/misc/mise/default.nix b/pkgs/tools/misc/mise/default.nix index db9ec4cc40ba5..f720edd67db6f 100644 --- a/pkgs/tools/misc/mise/default.nix +++ b/pkgs/tools/misc/mise/default.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "mise"; - version = "2024.3.1"; + version = "2024.3.2"; src = fetchFromGitHub { owner = "jdx"; repo = "mise"; rev = "v${version}"; - hash = "sha256-Pcchyc7LuHOyDEfZj5QSb7nVhMjO9iIV2uQEJocfLic="; + hash = "sha256-o8oYfah5Vveup9qdxl+Uzl+j4Sqoj+C6BA3c5kpofXo="; }; - cargoHash = "sha256-aKzl6yrsEi0DF0tsXB1eqTAar33FlJfRyYUKAi76o+c="; + cargoHash = "sha256-c6hN9JuMuUp1jl5wXf4N5S3hzyQeeLKAb56H9cLBAIY="; nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; diff --git a/pkgs/tools/misc/mmctl/0001-module-replace-public.patch b/pkgs/tools/misc/mmctl/0001-module-replace-public.patch deleted file mode 100644 index 2ac563dbbf4b5..0000000000000 --- a/pkgs/tools/misc/mmctl/0001-module-replace-public.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/go.mod -+++ b/go.mod -@@ -218,3 +218,5 @@ exclude ( - github.com/dyatlov/go-opengraph v0.0.0-20210112100619-dae8665a5b09 - github.com/willf/bitset v1.2.0 - ) -+ -+replace github.com/mattermost/mattermost/server/public => ./public diff --git a/pkgs/tools/misc/mmctl/default.nix b/pkgs/tools/misc/mmctl/default.nix index 197d145fc6c7d..a884f24db4702 100644 --- a/pkgs/tools/misc/mmctl/default.nix +++ b/pkgs/tools/misc/mmctl/default.nix @@ -1,43 +1,12 @@ -{ lib -, fetchFromGitHub -, buildGoModule +{ mattermost }: -buildGoModule rec { +mattermost.overrideAttrs (o: { pname = "mmctl"; - version = "9.2.2"; - - src = fetchFromGitHub { - owner = "mattermost"; - repo = "mattermost"; - rev = "v${version}"; - hash = "sha256-53L2F20vaLLxtQS3DP/u0ZxLtnXHmjfcOMbXd4i+A6Y="; - } + "/server"; - - vendorHash = "sha256-v8aKZyb4emrwuIgSBDgla5wzwyt6PVGakbXjB9JVaCk="; - - patches = [ ./0001-module-replace-public.patch ]; - subPackages = [ "cmd/mmctl" ]; - checkPhase = "go test -tags unit -timeout 30m ./cmd/mmctl/..."; - - ldflags = [ - "-s" - "-w" - "-X github.com/mattermost/mattermost/server/public/model.Version=${version}" - "-X github.com/mattermost/mattermost/server/public/model.BuildNumber=${version}-nixpkgs" - "-X github.com/mattermost/mattermost/server/public/model.BuildDate=1970-01-01" - "-X github.com/mattermost/mattermost/server/public/model.BuildHash=v${version}" - "-X github.com/mattermost/mattermost/server/public/model.BuildHashEnterprise=none" - "-X github.com/mattermost/mattermost/server/public/model.BuildEnterpriseReady=false" - ]; - - meta = with lib; { + meta = o.meta // { description = "A remote CLI tool for Mattermost"; - homepage = "https://github.com/mattermost/mmctl"; - license = licenses.asl20; - maintainers = with maintainers; [ ppom mgdelacroix ]; mainProgram = "mmctl"; }; -} +}) diff --git a/pkgs/tools/misc/moar/default.nix b/pkgs/tools/misc/moar/default.nix index 0fa109f4cda87..9d073c5f50afd 100644 --- a/pkgs/tools/misc/moar/default.nix +++ b/pkgs/tools/misc/moar/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "moar"; - version = "1.23.6"; + version = "1.23.8"; src = fetchFromGitHub { owner = "walles"; repo = pname; rev = "v${version}"; - hash = "sha256-WWMFyDLNi5XUEWi33Sav69i41icbp7NTzFy+Y+ImGNU="; + hash = "sha256-AUcnApH8fSCFNEKIJkNOh3Q2I+G2U2QOATHmtI7vPts="; }; vendorHash = "sha256-1u/2OlMX2FuZaxWnpU4n5r/4xKe+rK++GoCJiSq/BdE="; diff --git a/pkgs/tools/misc/mods/default.nix b/pkgs/tools/misc/mods/default.nix index fda8944c330f7..33cc3dd3e133c 100644 --- a/pkgs/tools/misc/mods/default.nix +++ b/pkgs/tools/misc/mods/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "mods"; - version = "1.1.0"; + version = "1.2.2"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "mods"; rev = "v${version}"; - hash = "sha256-ZWH3YuN1cmdw96/HVzsp1u70ziUfupUeBjJiNI5a538="; + hash = "sha256-ecmfWnrd9gwIEGAOIcOeUnfmkKmq9dLxpKqAHJemhvU="; }; - vendorHash = "sha256-PgaxqfgtwBYnzyL2F/OPJP1rdmLOtBCTKEPhMgvC6XA="; + vendorHash = "sha256-pJ31Lsa5VVix3BM4RrllQA3MJ/JeNIKfQ8RClyFfXCI="; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; diff --git a/pkgs/tools/misc/mpremote/default.nix b/pkgs/tools/misc/mpremote/default.nix index 892ee9756dbc3..149e3c9686ac3 100644 --- a/pkgs/tools/misc/mpremote/default.nix +++ b/pkgs/tools/misc/mpremote/default.nix @@ -17,7 +17,7 @@ buildPythonApplication rec { rev = "refs/tags/v${version}"; hash = "sha256-67CAR34VrMOzvNkukDeGRnUfoOLO66R37wsrRHjpp5E="; }; - sourceRoot = "source/tools/mpremote"; + sourceRoot = "${src.name}/tools/mpremote"; format = "pyproject"; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/nbqa/default.nix b/pkgs/tools/misc/nbqa/default.nix index 10115affcca26..634c68894bf24 100644 --- a/pkgs/tools/misc/nbqa/default.nix +++ b/pkgs/tools/misc/nbqa/default.nix @@ -7,14 +7,14 @@ }: python3.pkgs.buildPythonApplication rec { pname = "nbqa"; - version = "1.8.3"; + version = "1.8.4"; pyproject = true; src = fetchFromGitHub { owner = "nbQA-dev"; repo = "nbQA"; rev = "refs/tags/${version}"; - hash = "sha256-RucDwXXEOTInhV/hk6gYXUmxUu660/pSTrBtHLrLkQ8="; + hash = "sha256-clxIe97pWeA9IGt+650tJfxTmU+qbrL/9B2VRVIML+s="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/misc/neo-cowsay/default.nix b/pkgs/tools/misc/neo-cowsay/default.nix index e6b675e4d36f7..2682658ab38d6 100644 --- a/pkgs/tools/misc/neo-cowsay/default.nix +++ b/pkgs/tools/misc/neo-cowsay/default.nix @@ -24,5 +24,6 @@ buildGoModule rec { homepage = "https://github.com/Code-Hex/Neo-cowsay"; license = with licenses; [ artistic1 /* or */ gpl3 ]; maintainers = with maintainers; [ Br1ght0ne ]; + mainProgram = "cowsay"; }; } diff --git a/pkgs/tools/misc/ntfy-sh/default.nix b/pkgs/tools/misc/ntfy-sh/default.nix index 1bfde93c39e50..114038dd01f7b 100644 --- a/pkgs/tools/misc/ntfy-sh/default.nix +++ b/pkgs/tools/misc/ntfy-sh/default.nix @@ -5,21 +5,21 @@ buildGoModule rec { pname = "ntfy-sh"; - version = "2.8.0"; + version = "2.9.0"; src = fetchFromGitHub { owner = "binwiederhier"; repo = "ntfy"; rev = "v${version}"; - hash = "sha256-YO6nf1tY+tEgPlvq7JDgeG0ywE8+HEpZH7ToFzvYfvY="; + hash = "sha256-nCW7D2iQEv9NeIvVn1+REacspchzJ7SJgl0glEWkAoE="; }; - vendorHash = "sha256-Gvk/EI5b6AIYBCKYqSFKva0SfiWI/oNCeq7cTyVRpwY="; + vendorHash = "sha256-nnAw3BIiPMNa/7WSH8vurt8GUFM7Bf80CmtH4WjfC6Q="; ui = buildNpmPackage { inherit src version; pname = "ntfy-sh-ui"; - npmDepsHash = "sha256-G2yEIiKc/gxcUPS+97B68C/HukabGZAX2XY1gstGBvg="; + npmDepsHash = "sha256-+4VL+bY3Nz5LT5ZyW9aJlrl3NsfOGv6CaiwLqpC5ywo="; prePatch = '' cd web/ diff --git a/pkgs/tools/misc/ollama/default.nix b/pkgs/tools/misc/ollama/default.nix index 36546b5869a6f..0facac21e5be2 100644 --- a/pkgs/tools/misc/ollama/default.nix +++ b/pkgs/tools/misc/ollama/default.nix @@ -1,5 +1,5 @@ { lib -, buildGoModule +, buildGo122Module , fetchFromGitHub , fetchpatch , buildEnv @@ -7,6 +7,7 @@ , overrideCC , makeWrapper , stdenv +, nixosTests , pkgs , cmake @@ -20,16 +21,19 @@ # one of `[ null "rocm" "cuda" ]` , acceleration ? null + +, testers +, ollama }: let pname = "ollama"; - version = "0.1.28"; + version = "0.1.29"; src = fetchFromGitHub { owner = "jmorganca"; repo = "ollama"; rev = "v${version}"; - hash = "sha256-8f7veZitorNiqGBPJuf/Y36TcFK8Q75Vw4w6CeTk8qs="; + hash = "sha256-M2G53DJF/22ZVCAb4jGjyErKO6q2argehHSV7AEef6w="; fetchSubmodules = true; }; @@ -78,9 +82,9 @@ let goBuild = if enableCuda then - buildGoModule.override { stdenv = overrideCC stdenv gcc12; } + buildGo122Module.override { stdenv = overrideCC stdenv gcc12; } else - buildGoModule; + buildGo122Module; preparePatch = patch: hash: fetchpatch { url = "file://${src}/llm/patches/${patch}"; inherit hash; @@ -98,7 +102,7 @@ goBuild ((lib.optionalAttrs enableRocm { CUDAToolkit_ROOT = cudaToolkit; }) // { inherit pname version src; - vendorHash = "sha256-DPIhDqE/yXpSQqrx07osMBMafK61yU2dl4cZhxSTvm8="; + vendorHash = "sha256-Lj7CBvS51RqF63c01cOCgY7BCQeCKGu794qzb/S80C0="; nativeBuildInputs = [ cmake @@ -128,8 +132,11 @@ goBuild ((lib.optionalAttrs enableRocm { # ollama's patches of llama.cpp's example server # `ollama/llm/generate/gen_common.sh` -> "apply temporary patches until fix is upstream" - (preparePatch "01-cache.diff" "sha256-MTTln2G0G8dntihUzEjPM1ruTsApb4ZToBczJb8EG68=") - (preparePatch "02-cudaleaks.diff" "sha256-Cu7E9iEcvddPL9mPPI5Z96qmwWigi3f0WgSpPRjGc88=") + (preparePatch "01-cache.diff" "sha256-VDwu/iK6taBCyscpndQiOJ3eGqonnLVwmS2rJNMBVGU=") + (preparePatch "02-cudaleaks.diff" "sha256-nxsWgrePUMsZBWWQAjqVHWMJPzr1owH1zSJvUU7Q5pA=") + (preparePatch "03-load_exception.diff" "sha256-1DfNahFYYxqlx4E4pwMKQpL+XR0bibYnDFGt6dCL4TM=") + (preparePatch "04-locale.diff" "sha256-r5nHiP6yN/rQObRu2FZIPBKpKP9yByyZ6sSI2SKj6Do=") + (preparePatch "05-fix-clip-free.diff" "sha256-EFZ+QTtZCvstVxYgVdFKHsQqdkL98T0eXOEBOqCrlL4=") ]; postPatch = '' # use a patch from the nix store in the `go generate` script @@ -163,13 +170,18 @@ goBuild ((lib.optionalAttrs enableRocm { "-X=github.com/jmorganca/ollama/server.mode=release" ]; - # for now, just test that rocm and cuda build - passthru.tests = lib.optionalAttrs stdenv.isLinux { + passthru.tests = { + service = nixosTests.ollama; rocm = pkgs.ollama.override { acceleration = "rocm"; }; cuda = pkgs.ollama.override { acceleration = "cuda"; }; + version = testers.testVersion { + inherit version; + package = ollama; + }; }; meta = { + changelog = "https://github.com/ollama/ollama/releases/tag/v${version}"; description = "Get up and running with large language models locally"; homepage = "https://github.com/jmorganca/ollama"; license = licenses.mit; diff --git a/pkgs/tools/misc/onefetch/default.nix b/pkgs/tools/misc/onefetch/default.nix index fe509320a7122..84762c8b72747 100644 --- a/pkgs/tools/misc/onefetch/default.nix +++ b/pkgs/tools/misc/onefetch/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "onefetch"; - version = "2.19.0"; + version = "2.20.0"; src = fetchFromGitHub { owner = "o2sh"; repo = pname; rev = version; - hash = "sha256-IaXQyTQMvgfm3CWU6z0T4nTJNgA8/8urG+hhuthB4+U="; + hash = "sha256-aQeKzOxRlSGuVewh3HEx1M12vmaxhy6ImnqMDc5b0DI="; }; - cargoHash = "sha256-8brPYBVqoBg9wO/Y6LdNgVasJgmyZvdNIC0Cclpyk68="; + cargoHash = "sha256-g+fTmZGyPkQLgnJ9Bb4sLTfDMPPBRA+s6f3OxXTKwsM="; cargoPatches = [ # enable pkg-config feature of zstd diff --git a/pkgs/tools/misc/otel-cli/default.nix b/pkgs/tools/misc/otel-cli/default.nix index de35952f184a1..1330188a3ee4b 100644 --- a/pkgs/tools/misc/otel-cli/default.nix +++ b/pkgs/tools/misc/otel-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "otel-cli"; - version = "0.4.1"; + version = "0.4.4"; src = fetchFromGitHub { owner = "equinix-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-kOTReHG7byOqKsaVrXXNq9DAyawTz4hUeR4Q5lJKmiM="; + hash = "sha256-XVhnDtt2FhYgfGWDPFkneZTboeHGaIbiF5YdHoqB8N8="; }; vendorHash = "sha256-HwbEqWtOqiTe5Z/MtMAs63Lzvll/vgmbCpMTREXgtXA="; diff --git a/pkgs/tools/misc/pfetch-rs/default.nix b/pkgs/tools/misc/pfetch-rs/default.nix index 7f90a595f4693..0f1d5b2f1d33a 100644 --- a/pkgs/tools/misc/pfetch-rs/default.nix +++ b/pkgs/tools/misc/pfetch-rs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pfetch-rs"; - version = "2.9.0"; + version = "2.9.1"; src = fetchFromGitHub { owner = "Gobidev"; repo = pname; rev = "v${version}"; - hash = "sha256-7Udop3542L2l9EYQZntk/qW0GUQeYfoDHQQJ8j39krQ="; + hash = "sha256-tpJk31Z7QzZNLmEv/L1008tf6hpJJI6b7E1o/kwbJe0="; }; - cargoHash = "sha256-gT5JjBsrGngfg77od566z+EOiH8KdARGYhTLOnOhWj4="; + cargoHash = "sha256-CQVPEUpblypDyr48MrLY3roGunOxem0eM1OtbcKlnsw="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit diff --git a/pkgs/tools/misc/plantuml/plantuml-c4.nix b/pkgs/tools/misc/plantuml/plantuml-c4.nix index 2829d0a31eabc..77cfa82e894fc 100644 --- a/pkgs/tools/misc/plantuml/plantuml-c4.nix +++ b/pkgs/tools/misc/plantuml/plantuml-c4.nix @@ -65,6 +65,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "PlantUML bundled with C4-Plantuml and plantuml sprites library"; + mainProgram = "plantuml"; homepage = "https://github.com/plantuml-stdlib/C4-PlantUML"; license = licenses.mit; maintainers = with maintainers; [ tfc ]; diff --git a/pkgs/tools/misc/plfit/default.nix b/pkgs/tools/misc/plfit/default.nix index 78e7c3572b6f0..8b1726666bccb 100644 --- a/pkgs/tools/misc/plfit/default.nix +++ b/pkgs/tools/misc/plfit/default.nix @@ -7,17 +7,23 @@ , llvmPackages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "plfit"; - version = "0.9.4"; + version = "0.9.6"; src = fetchFromGitHub { owner = "ntamas"; repo = "plfit"; - rev = version; - hash = "sha256-hnmP/56P2anR0S8zQyQqN1lbge5GgK+P8Lx8bRkwSxA="; + rev = finalAttrs.version; + hash = "sha256-XRl6poEdgPNorFideQmEJHCU+phs4rIhMYa8iAOtL1A="; }; + postPatch = lib.optionalString (python != null) '' + substituteInPlace src/CMakeLists.txt \ + --replace-fail ' ''${Python3_SITEARCH}' ' ${placeholder "out"}/${python.sitePackages}' \ + --replace-fail ' ''${Python3_SITELIB}' ' ${placeholder "out"}/${python.sitePackages}' + ''; + nativeBuildInputs = [ cmake ] ++ lib.optionals (python != null) [ @@ -35,11 +41,13 @@ stdenv.mkDerivation rec { llvmPackages.openmp ]; + doCheck = true; + meta = with lib; { description = "Fitting power-law distributions to empirical data"; homepage = "https://github.com/ntamas/plfit"; - changelog = "https://github.com/ntamas/plfit/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/ntamas/plfit/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = licenses.gpl2Plus; maintainers = with maintainers; [ dotlambda ]; }; -} +}) diff --git a/pkgs/tools/misc/pricehist/default.nix b/pkgs/tools/misc/pricehist/default.nix index 04333a2907318..d195cb42a147c 100644 --- a/pkgs/tools/misc/pricehist/default.nix +++ b/pkgs/tools/misc/pricehist/default.nix @@ -9,6 +9,7 @@ , pytest-mock , responses , pytestCheckHook +, pythonRelaxDepsHook }: buildPythonApplication rec { @@ -31,11 +32,20 @@ buildPythonApplication rec { poetry-core ]; + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + nativeCheckInputs = [ responses pytest-mock pytestCheckHook ]; + + pythonRelaxDeps = [ + # https://gitlab.com/chrisberkhout/pricehist/-/issues/6 + "lxml" + ]; meta = with lib; { description = "A command-line tool for fetching and formatting historical price data, with support for multiple data sources and output formats"; homepage = "https://gitlab.com/chrisberkhout/pricehist"; diff --git a/pkgs/tools/misc/pubs/default.nix b/pkgs/tools/misc/pubs/default.nix index b02aeb8aefb6a..1dcd011f0aced 100644 --- a/pkgs/tools/misc/pubs/default.nix +++ b/pkgs/tools/misc/pubs/default.nix @@ -72,6 +72,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Command-line bibliography manager"; + mainProgram = "pubs"; homepage = "https://github.com/pubs/pubs"; changelog = "https://github.com/pubs/pubs/blob/v${version}/changelog.md"; license = licenses.lgpl3Only; diff --git a/pkgs/tools/misc/qrscan/default.nix b/pkgs/tools/misc/qrscan/default.nix index 6ac80bb7f746d..1ad4c526e7528 100644 --- a/pkgs/tools/misc/qrscan/default.nix +++ b/pkgs/tools/misc/qrscan/default.nix @@ -30,6 +30,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Scan a QR code in the terminal using the system camera or a given image"; + mainProgram = "qrscan"; homepage = "https://github.com/sayanarijit/qrscan"; license = licenses.mit; broken = stdenv.isDarwin; diff --git a/pkgs/tools/misc/r3ctl/default.nix b/pkgs/tools/misc/r3ctl/default.nix index f76f704fc2a78..8af95a4630cf6 100644 --- a/pkgs/tools/misc/r3ctl/default.nix +++ b/pkgs/tools/misc/r3ctl/default.nix @@ -40,6 +40,7 @@ qt5.mkDerivation { meta = with lib; { description = "A cmdline tool to control the r3 hackerspace lights"; + mainProgram = "r3ctl"; homepage = "https://github.com/0xfeedc0de64/r3ctl"; maintainers = with maintainers; [ mkg20001 ]; license = licenses.gpl3Only; diff --git a/pkgs/tools/misc/rauc/default.nix b/pkgs/tools/misc/rauc/default.nix index 8f244839803c1..03c0fb176d790 100644 --- a/pkgs/tools/misc/rauc/default.nix +++ b/pkgs/tools/misc/rauc/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "rauc"; - version = "1.11.2"; + version = "1.11.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-IWfYjn8CCgYK2hna59Awr5tzWnXCtR6c1XpV5fCiSE4="; + sha256 = "sha256-sFOvkr6WbiP99GNAttK9ZmRg+O/hoUQDCnW7vq9s/vo="; }; passthru = { diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index b9becd60ab088..d3ac44b713649 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -15,11 +15,11 @@ let in tcl.mkTclDerivation rec { pname = "remind"; - version = "04.03.02"; + version = "04.03.03"; src = fetchurl { url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz"; - sha256 = "sha256-tL5Ntb/RIoT9mKcdU1ndBo/pGwhtIsRnTV0lL6Sg1Vw="; + sha256 = "sha256-+/vX6Nu0F84mZcEnd9jFlaVKbJIQQOJiPsxspKF+klQ="; }; propagatedBuildInputs = tclLibraries; diff --git a/pkgs/tools/misc/riemann-c-client/default.nix b/pkgs/tools/misc/riemann-c-client/default.nix index 7c744935064f6..9ce23873aa270 100644 --- a/pkgs/tools/misc/riemann-c-client/default.nix +++ b/pkgs/tools/misc/riemann-c-client/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://git.madhouse-project.org/algernon/riemann-c-client"; description = "A C client library for the Riemann monitoring system"; + mainProgram = "riemann-client"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ pradeepchhetri ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/rshim-user-space/default.nix b/pkgs/tools/misc/rshim-user-space/default.nix index a8bdd356a2cc7..67cf3b6895e0f 100644 --- a/pkgs/tools/misc/rshim-user-space/default.nix +++ b/pkgs/tools/misc/rshim-user-space/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rshim-user-space"; - version = "2.0.12"; + version = "2.0.20"; src = fetchFromGitHub { owner = "Mellanox"; repo = pname; rev = "rshim-${version}"; - hash = "sha256-jR9Q1i2p4weKuGPTAylNIVglgcZH0UtvXBVVCEquxu8="; + hash = "sha256-zm1cMTna9o8edl0M7tjUhbnElbUkQZSkh3KOI6tbE6I="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/star-history/default.nix b/pkgs/tools/misc/star-history/default.nix index 9e4bbc830cbb0..65a2d35a33cd2 100644 --- a/pkgs/tools/misc/star-history/default.nix +++ b/pkgs/tools/misc/star-history/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "star-history"; - version = "1.0.18"; + version = "1.0.19"; src = fetchCrate { inherit pname version; - sha256 = "sha256-PKQyGDSLFRf5eEUICdtDAkbzfljdj0HN40c7+V21wHI="; + sha256 = "sha256-sjVxYo5Sx6fmlLflg3y754jnFbnA5x/X5NINM3omPVY="; }; - cargoHash = "sha256-LriRO5XdcTqp+7quV11RwjNQgfzQsc5EV8GNwkuwz8s="; + cargoHash = "sha256-aeRAXUdpv94WW1E/bWvJnwHOxYn9bALXvTb5RVjcozQ="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix index 058c2118db54a..a6497a62f59b6 100644 --- a/pkgs/tools/misc/staruml/default.nix +++ b/pkgs/tools/misc/staruml/default.nix @@ -24,12 +24,12 @@ let ]; in stdenv.mkDerivation (finalAttrs: { - version = "6.0.1"; + version = "6.1.0"; pname = "staruml"; src = fetchurl { url = "https://files.staruml.io/releases-v6/StarUML_${finalAttrs.version}_amd64.deb"; - sha256 = "sha256-LxulOfYjdJrDjRL661S0W9slIXvhLc+kXZN6e3TfXVs="; + sha256 = "sha256-ULdrAQCiQlTN+aRhETj+ASMKkKctFgC2AfvUHGc6stU="; }; nativeBuildInputs = [ wrapGAppsHook dpkg ]; diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/tools/misc/steampipe/default.nix index 31d27ffe8baea..04e4593f1ebde 100644 --- a/pkgs/tools/misc/steampipe/default.nix +++ b/pkgs/tools/misc/steampipe/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "steampipe"; - version = "0.21.8"; + version = "0.22.0"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe"; rev = "v${version}"; - hash = "sha256-PY2CpieY1kTuT3Yd6i5hiRjVEwYNHn1GF+E0g6u8BP0="; + hash = "sha256-Qmb4dBLtztrhnm8fKEkaxX2tJAXsQ+/C8cweQbRc7uk="; }; - vendorHash = "sha256-yS2FiTnK65LAY3tGSlMy0LMg6691tS/9yQ4w7HrW/pw="; + vendorHash = "sha256-2p/D/sycx78BXBe+WHeYP4hLz1aX33cCRQ/AbwKkidM="; proxyVendor = true; patchPhase = '' diff --git a/pkgs/tools/misc/tagref/default.nix b/pkgs/tools/misc/tagref/default.nix index 0b8ebf82730de..b54545f836854 100644 --- a/pkgs/tools/misc/tagref/default.nix +++ b/pkgs/tools/misc/tagref/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tagref"; - version = "1.9.1"; + version = "1.10.0"; src = fetchFromGitHub { owner = "stepchowfun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4F9u1wzeBgYP3L6h08xMvgq62ix/SOaFaLl7uEf1j1c="; + sha256 = "sha256-ANQxW5Qznu2JbiazFElB1sxpX4BwPgk6SVGgYpJ6DUw="; }; - cargoHash = "sha256-AO6BGevCoLCH4vpyrXrgF3FrjUa3lHA7ynXfk4KKigM="; + cargoHash = "sha256-vdmr5n4M+Qe/jzjNdg+sy7q2osTivxmLG+xMTMkEFm4="; meta = with lib; { description = "Manage cross-references in your code"; diff --git a/pkgs/tools/misc/tbls/default.nix b/pkgs/tools/misc/tbls/default.nix index 7d0921abb8d0f..4672adfc97c9d 100644 --- a/pkgs/tools/misc/tbls/default.nix +++ b/pkgs/tools/misc/tbls/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "tbls"; - version = "1.73.2"; + version = "1.73.3"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; rev = "v${version}"; - hash = "sha256-UXvUewArdClOolWFgN4Ta11vzq9C9zBjEzVGTtWSjiA="; + hash = "sha256-mAGEJ+FISPRrIz3dWwuf9EYbTNdaMj7tbHgthSYBiIU="; }; - vendorHash = "sha256-zNQADZkAaohTZReD8qTnNJsfy58NXdQjUdd5j8KcOyY="; + vendorHash = "sha256-oMGAsVRSyndCJ3QXfrI02XrsOXkzljTNro6ygal6mDk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/tgpt/default.nix b/pkgs/tools/misc/tgpt/default.nix deleted file mode 100644 index cf100e5d33fda..0000000000000 --- a/pkgs/tools/misc/tgpt/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "tgpt"; - version = "2.0.4"; - - src = fetchFromGitHub { - owner = "aandrew-me"; - repo = "tgpt"; - rev = "refs/tags/v${version}"; - hash = "sha256-+5hNcemVVuCX1FCL6U9SoJ/Jsef9exQXQFCdPj8qhCk="; - }; - - vendorHash = "sha256-HXpSoihk0s218DVCHe9VCGLBggWY8I25sw2qSaiUz4I="; - - ldflags = [ - "-s" - "-w" - ]; - - meta = with lib; { - description = "ChatGPT in terminal without needing API keys"; - homepage = "https://github.com/aandrew-me/tgpt"; - changelog = "https://github.com/aandrew-me/tgpt/releases/tag/v${version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ fab ]; - mainProgram = "tgpt"; - }; -} diff --git a/pkgs/tools/misc/time-decode/default.nix b/pkgs/tools/misc/time-decode/default.nix index edd0eba43a246..b208fd3e2ba25 100644 --- a/pkgs/tools/misc/time-decode/default.nix +++ b/pkgs/tools/misc/time-decode/default.nix @@ -5,19 +5,24 @@ python3.pkgs.buildPythonApplication rec { pname = "time-decode"; - version = "6.1.0"; - format = "setuptools"; + version = "7.0.2"; + pyproject = true; src = fetchFromGitHub { owner = "digitalsleuth"; repo = "time_decode"; rev = "refs/tags/v${version}"; - hash = "sha256-LbXycu3Yiku9ToW+WS/yUqwicvckj2IkP09TiZkRXnk="; + hash = "sha256-K60xIQ6TWPYlsR6YjIquey5Ioaw4oAId59CPlQNK4yk="; }; + nativeBuildInputs = with python3.pkgs; [ + setuptools + ]; + propagatedBuildInputs = with python3.pkgs; [ colorama python-dateutil + pyqt6 ]; # Project has no tests diff --git a/pkgs/tools/misc/tio/default.nix b/pkgs/tools/misc/tio/default.nix index 88e121368e669..d5dd656e4e41a 100644 --- a/pkgs/tools/misc/tio/default.nix +++ b/pkgs/tools/misc/tio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, inih, bash-completion }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, inih, bash-completion, darwin }: stdenv.mkDerivation rec { pname = "tio"; @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { strictDeps = true; - buildInputs = [ inih ]; + buildInputs = [ inih ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ darwin.apple_sdk.frameworks.IOKit ]; nativeBuildInputs = [ meson ninja pkg-config bash-completion ]; diff --git a/pkgs/tools/misc/tkman/default.nix b/pkgs/tools/misc/tkman/default.nix index 4df680fb6b8cf..c51c3564fef8a 100644 --- a/pkgs/tools/misc/tkman/default.nix +++ b/pkgs/tools/misc/tkman/default.nix @@ -67,6 +67,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Graphical, hypertext manual page and Texinfo browser for UNIX"; + mainProgram = "tkman"; longDescription = '' TkMan is a graphical, hypertext manual page and Texinfo browser for UNIX. TkMan boasts hypertext links, unmatched online text formatting and display diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix index 379430761399f..f5fdbc698f86e 100644 --- a/pkgs/tools/misc/tmuxinator/default.nix +++ b/pkgs/tools/misc/tmuxinator/default.nix @@ -8,8 +8,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "tmuxinator"; - version = "3.0.5"; - source.sha256 = "1ycsx9mvl0jsds4igi6avxclsyl5lndh1mpj2ykvzfz26wdddg6p"; + version = "3.1.2"; + source.sha256 = "t96v3RwBfezB644RVbTmO8i/xh1F23WQC8PBxc/msjg="; erubis = buildRubyGem rec { inherit ruby; @@ -23,8 +23,8 @@ buildRubyGem rec { inherit ruby; name = "ruby${ruby.version}-${gemName}-${version}"; gemName = "thor"; - version = "1.2.1"; - source.sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi"; + version = "1.3.0"; + source.sha256 = "sha256-Gtx/nls2VaaMcTk/7ovQrQiNFO6Og6C3NybyPLs8p8M="; }; xdg = buildRubyGem rec { diff --git a/pkgs/tools/misc/ttfautohint/default.nix b/pkgs/tools/misc/ttfautohint/default.nix index 9d2036b97f783..14572d12a781d 100644 --- a/pkgs/tools/misc/ttfautohint/default.nix +++ b/pkgs/tools/misc/ttfautohint/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An automatic hinter for TrueType fonts"; + mainProgram = "ttfautohint"; longDescription = '' A library and two programs which take a TrueType font as the input, remove its bytecode instructions (if any), and return a diff --git a/pkgs/tools/misc/turbo/default.nix b/pkgs/tools/misc/turbo/default.nix index c891ad5d0da2a..05d2f7d1a0f66 100644 --- a/pkgs/tools/misc/turbo/default.nix +++ b/pkgs/tools/misc/turbo/default.nix @@ -62,6 +62,7 @@ rustPlatform.buildRustPackage rec{ meta = with lib; { description = "High-performance build system for JavaScript and TypeScript codebases"; + mainProgram = "turbo"; homepage = "https://turbo.build/"; maintainers = with maintainers; [ dlip ]; license = licenses.mpl20; diff --git a/pkgs/tools/misc/ugs/default.nix b/pkgs/tools/misc/ugs/default.nix index 99fba8bcfe93b..2a3eea73c07f8 100644 --- a/pkgs/tools/misc/ugs/default.nix +++ b/pkgs/tools/misc/ugs/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { pname = "ugs"; - version = "2.1.5"; + version = "2.1.6"; src = fetchzip { url = "https://github.com/winder/Universal-G-Code-Sender/releases/download/v${version}/UniversalGcodeSender.zip"; - hash = "sha256-StXEtDJ3UjTWgiQQ8HQtPcUENQPosdHis1eo81Jf96M="; + hash = "sha256-6L/4s/QmlTnYnhwLgPf7z8UVkBUYXi3Wb3doa5JCViE="; }; dontUnpack = true; diff --git a/pkgs/tools/misc/upower-notify/default.nix b/pkgs/tools/misc/upower-notify/default.nix index c46ad10a40af0..8033a91ecf51a 100644 --- a/pkgs/tools/misc/upower-notify/default.nix +++ b/pkgs/tools/misc/upower-notify/default.nix @@ -23,6 +23,7 @@ buildGoPackage rec { meta = with lib; { description = "simple tool to give you Desktop Notifications about your battery"; + mainProgram = "upower-notify"; homepage = "https://github.com/omeid/upower-notify"; maintainers = with maintainers; [ kamilchm ]; }; diff --git a/pkgs/tools/misc/vector/Cargo.lock b/pkgs/tools/misc/vector/Cargo.lock index 41193aa9a0145..6bc92235ea6cb 100644 --- a/pkgs/tools/misc/vector/Cargo.lock +++ b/pkgs/tools/misc/vector/Cargo.lock @@ -4925,9 +4925,9 @@ dependencies = [ [[package]] name = "lockfree-object-pool" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee33defb27b106378a6efcfcde4dda6226dfdac8ba7a2904f5bc93363cb88557" +checksum = "3a69c0481fc2424cb55795de7da41add33372ea75a94f9b6588ab6a2826dfebc" [[package]] name = "log" @@ -5234,9 +5234,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.9" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "log", @@ -9816,7 +9816,7 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "vector" -version = "0.36.0" +version = "0.36.1" dependencies = [ "apache-avro", "approx", @@ -9839,6 +9839,7 @@ dependencies = [ "aws-sdk-s3", "aws-sdk-sns", "aws-sdk-sqs", + "aws-sdk-sts", "aws-sigv4", "aws-smithy-async", "aws-smithy-http", @@ -10539,6 +10540,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] +name = "wasite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + +[[package]] name = "wasm-bindgen" version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -10677,11 +10684,12 @@ dependencies = [ [[package]] name = "whoami" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" +checksum = "0fec781d48b41f8163426ed18e8fc2864c12937df9ce54c88ede7bd47270893e" dependencies = [ - "wasm-bindgen", + "redox_syscall 0.4.1", + "wasite", "web-sys", ] diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 0540bcac517bd..2a0b8dbba75f4 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -36,7 +36,7 @@ let pname = "vector"; - version = "0.36.0"; + version = "0.36.1"; in rustPlatform.buildRustPackage { inherit pname version; @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage { owner = "vectordotdev"; repo = pname; rev = "v${version}"; - hash = "sha256-fbBKmhouY021osFVqNhEC+16cO7z3bS+DBhg1ByDeWw="; + hash = "sha256-iY0Bi1FG3kEiZtPTXonoVGYiquZkTPF51PWEZEoxQSw="; }; cargoLock = { diff --git a/pkgs/tools/misc/wacomtablet/default.nix b/pkgs/tools/misc/wacomtablet/default.nix index 5ff2800496a73..f10ccd698cb99 100644 --- a/pkgs/tools/misc/wacomtablet/default.nix +++ b/pkgs/tools/misc/wacomtablet/default.nix @@ -24,6 +24,7 @@ mkDerivation rec { meta = { description = "KDE Configuration Module for Wacom Graphics Tablets"; + mainProgram = "kde_wacom_tabletfinder"; longDescription = '' This module implements a GUI for the Wacom Linux Drivers and extends it with profile support to handle different button / pen layouts per profile. diff --git a/pkgs/tools/misc/wv2/default.nix b/pkgs/tools/misc/wv2/default.nix index d570014494042..14420c1c39081 100644 --- a/pkgs/tools/misc/wv2/default.nix +++ b/pkgs/tools/misc/wv2/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Excellent MS Word filter lib, used in most Office suites"; + mainProgram = "wv2-config"; license = lib.licenses.lgpl2; homepage = "https://wvware.sourceforge.net"; }; diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index eeb05dd4012eb..03998332eda24 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , brotli +, hatchling , certifi , ffmpeg , rtmpdump @@ -9,7 +10,9 @@ , pycryptodomex , websockets , mutagen +, requests , secretstorage +, urllib3 , atomicparsleySupport ? true , ffmpegSupport ? true , rtmpSupport ? true @@ -22,19 +25,27 @@ buildPythonPackage rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2023.12.30"; + version = "2024.3.10"; + pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-oRhi5XchsKDwiD3+taTXm6ITotTEXhiA6f1w+OZXDDg="; + inherit version; + pname = "yt_dlp"; + hash = "sha256-bnTLFKadvrhyyO9OC4u+0u6EbsYzUTzzEkp0wfrtwHs="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ brotli certifi mutagen pycryptodomex + requests secretstorage # "optional", as in not in requirements.txt, needed for `--cookies-from-browser` + urllib3 websockets ]; @@ -48,7 +59,7 @@ buildPythonPackage rec { ++ lib.optional atomicparsleySupport atomicparsley ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional rtmpSupport rtmpdump; - in lib.optionalString (packagesToBinPath != []) + in lib.optionals (packagesToBinPath != []) [ ''--prefix PATH : "${lib.makeBinPath packagesToBinPath}"'' ]; setupPyBuildFlags = [ |