diff options
Diffstat (limited to 'pkgs/tools/misc')
73 files changed, 228 insertions, 182 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 7647d2b9f0b0f..3c18621d712de 100644 --- a/pkgs/tools/misc/SP800-90B_EntropyAssessment/default.nix +++ b/pkgs/tools/misc/SP800-90B_EntropyAssessment/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { 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.free; #this software uses the NIST software license + license = lib.licenses.nistSoftware; maintainers = with lib.maintainers; [ orichter thillux ]; }; } diff --git a/pkgs/tools/misc/altserver-linux/default.nix b/pkgs/tools/misc/altserver-linux/default.nix index 701fe0d5afb99..30d5282949014 100644 --- a/pkgs/tools/misc/altserver-linux/default.nix +++ b/pkgs/tools/misc/altserver-linux/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://github.com/NyaMisty/AltServer-Linux"; description = "AltServer for AltStore, but on-device. Requires root privileges as well as running a custom anisette server currently"; - license = licenses.agpl3; + license = licenses.agpl3Only; mainProgram = "alt-server"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = platforms.linux; 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/bepasty/default.nix b/pkgs/tools/misc/bepasty/default.nix index 9bf8c8e3ae16f..c38963ade2f3d 100644 --- a/pkgs/tools/misc/bepasty/default.nix +++ b/pkgs/tools/misc/bepasty/default.nix @@ -23,7 +23,7 @@ let #https://github.com/NixOS/nixpkgs/pull/38300 in with bepastyPython.pkgs; buildPythonPackage rec { pname = "bepasty"; - version = "1.2.0"; + version = "1.2.1"; format = "pyproject"; propagatedBuildInputs = [ @@ -46,7 +46,7 @@ in with bepastyPython.pkgs; buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-R3bvrl/tOP0S9m6X+MwYK6fMQ51cI6W5AoxyYZ8aZ/w="; + sha256 = "sha256-08cyr2AruGAfHAwHHS8WMfJh7DBKymaYyz4AxI/ubkE="; }; nativeCheckInputs = [ diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 5e71e81d7d0fd..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.36.0"; + version = "1.36.1"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - hash = "sha256-nHEGvd9v0SuA3JsTOA2LTB+IDwbo5sBM1+j+K/ktDAc="; + hash = "sha256-mwccjsrveqoepBaCeQaija3DsXcuMtCK5PyoghtAJ9w="; }; - cargoHash = "sha256-LKBxN4SPkm2atOqQlZJfkt1ak4fMXQX1xR85q+8Ch8I="; + cargoHash = "sha256-GykLzXKFtebFuOWLtZ2Qj5OrZXiSrfEJ98cog5PwCfQ="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 24f94f6a7445e..0533a0a4e81c4 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.47.1"; + version = "2.47.2"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - hash = "sha256-sCDRHbizWhxaGBKdBhLViOfv+mwJiVvw7cjXSuDnOAo="; + hash = "sha256-XjPeOTVoWcAWq8wb3RJCsIVMN4zF5ovAni+fWrR1P+I="; }; - vendorHash = "sha256-gTgzuNsNzw8RmYaeOTBxkOc0Pt+WGLWTA6/oAL/1RRg="; + vendorHash = "sha256-ZtxX8BTX+7SfRxdxNWAy3wNTl8H7yoBNJr99dzCA+uk="; doCheck = false; diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix index 26170d148943a..cad2c45063746 100644 --- a/pkgs/tools/misc/clipster/default.nix +++ b/pkgs/tools/misc/clipster/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { - Option to ignore clipboard updates form certain applications. (filter_classes) - Ability to delete items in clipboard history. ''; - license = licenses.agpl3; + license = licenses.agpl3Only; homepage = "https://github.com/mrichar1/clipster"; platforms = platforms.linux; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 5bac5602c79f9..171cbc2dfe720 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 = "261"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - hash = "sha256-WYgFWM6HKFt3xVcRNytQPWOf3ZpH1cG7Cghhu/AES80="; + hash = "sha256-BbxY5w2Up5IaDJyZgwnUDm683G8VIGaVnhUvaMRZHqU="; }; 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/dooit/default.nix b/pkgs/tools/misc/dooit/default.nix index 1621ea8e5249e..1a76a304277c4 100644 --- a/pkgs/tools/misc/dooit/default.nix +++ b/pkgs/tools/misc/dooit/default.nix @@ -23,6 +23,7 @@ python3.pkgs.buildPythonApplication rec { ]; pythonRelaxDeps = [ + "textual" "tzlocal" ]; 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/esphome/dashboard.nix b/pkgs/tools/misc/esphome/dashboard.nix index f5bd9910569f3..6d72dc40ca0da 100644 --- a/pkgs/tools/misc/esphome/dashboard.nix +++ b/pkgs/tools/misc/esphome/dashboard.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "esphome-dashboard"; - version = "20231107.0"; + version = "20240319.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-84iM987nxNidMObnbY3lt78xRbN9USNtqQzfOzkd17k="; + hash = "sha256-jiEXZWw8A4RcsRbypFpWkt8O3Ib1cNcOQO1zHt96aQU="; }; # no tests diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index ec8b1beeb15c4..102c97b464f79 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -19,14 +19,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2024.2.2"; + version = "2024.3.0"; pyproject = true; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-SIp4hrllPgWNnrflUStSIcUB00eGU5pHoYveBPg7CVw="; + hash = "sha256-ha15MLTScFmgYjIRwCQ46DD+Zm64r+KReJTS8jfZX0o="; }; nativeBuildInputs = with python.pkgs; [ @@ -71,6 +71,7 @@ python.pkgs.buildPythonApplication rec { python-magic pyyaml requests + ruamel-yaml tornado tzdata tzlocal @@ -99,13 +100,6 @@ python.pkgs.buildPythonApplication rec { pytestCheckHook ]; - disabledTestPaths = [ - # requires hypothesis 5.49, we have 6.x - # ImportError: cannot import name 'ip_addresses' from 'hypothesis.provisional' - "tests/unit_tests/test_core.py" - "tests/unit_tests/test_helpers.py" - ]; - postCheck = '' $out/bin/esphome --help > /dev/null ''; diff --git a/pkgs/tools/misc/fastfetch/default.nix b/pkgs/tools/misc/fastfetch/default.nix index ce28107d9f4a8..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.8"; + version = "2.8.9"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-IvAUlCDtrtBiaKZbhAiXqQXbpKiqIaKwMVC3NxaAqtw="; + hash = "sha256-UvAIIkH9PNlvLzlh0jm1kG+4OfWsWtt2LSFbFPm7Yv4="; }; outputs = [ "out" "man" ]; @@ -151,7 +151,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Like neofetch, but much faster because written in C"; homepage = "https://github.com/fastfetch-cli/fastfetch"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ gerg-l khaneliman ]; + maintainers = with lib.maintainers; [ gerg-l khaneliman federicoschonborn ]; platforms = lib.platforms.all; mainProgram = "fastfetch"; }; 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/fedifetcher/default.nix b/pkgs/tools/misc/fedifetcher/default.nix index dbf8c3bce2816..36885e953262d 100644 --- a/pkgs/tools/misc/fedifetcher/default.nix +++ b/pkgs/tools/misc/fedifetcher/default.nix @@ -2,14 +2,14 @@ python3.pkgs.buildPythonApplication rec { pname = "fedifetcher"; - version = "7.0.3"; + version = "7.0.4"; format = "other"; src = fetchFromGitHub { owner = "nanos"; repo = "FediFetcher"; - rev = "v${version}"; - hash = "sha256-ADf6ZVqO9v6GQbNWi3NDX5bNmFDX5LMJfM6ePEWwbrQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-19ZpOpvDj2/qMufH2qPPAj8hRPlViSuC64WqJp6+xSk="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/misc/flameshot/default.nix b/pkgs/tools/misc/flameshot/default.nix index 937e23fe596c0..7b7b58381e9c1 100644 --- a/pkgs/tools/misc/flameshot/default.nix +++ b/pkgs/tools/misc/flameshot/default.nix @@ -7,6 +7,7 @@ , qtsvg , nix-update-script , fetchpatch +, kguiaddons }: mkDerivation rec { @@ -33,8 +34,12 @@ mkDerivation rec { updateScript = nix-update-script { }; }; + cmakeFlags = [ + (lib.cmakeBool "USE_WAYLAND_CLIPBOARD" true) + ]; + nativeBuildInputs = [ cmake qttools qtsvg ]; - buildInputs = [ qtbase ]; + buildInputs = [ qtbase kguiaddons ]; meta = with lib; { description = "Powerful yet simple to use screenshot software"; diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index b5b24e3faee34..37e9a146238fd 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fluent-bit"; - version = "2.2.2"; + version = "3.0.0"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${finalAttrs.version}"; - hash = "sha256-+AkIoGIAwz5dqQGtTJQjz+a9jgtxU1zwDuivj862Rw0="; + hash = "sha256-wyRzMIAbv4aDUUiI3UxZDIsL6DpoxbWXNmsADRL425A="; }; nativeBuildInputs = [ cmake flex bison ]; diff --git a/pkgs/tools/misc/github-backup/default.nix b/pkgs/tools/misc/github-backup/default.nix index 4f57b084ba604..4ff25301c8c8c 100644 --- a/pkgs/tools/misc/github-backup/default.nix +++ b/pkgs/tools/misc/github-backup/default.nix @@ -7,12 +7,12 @@ python3.pkgs.buildPythonApplication rec { pname = "github-backup"; - version = "0.45.0"; + version = "0.45.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-bT5eqhpSK9u6Q4hO8FTgbpjjv0x2am1m2fOw5OqxixQ="; + hash = "sha256-+dQVewMHSF0SnOKmgwc9pmqXAJGLjSqwS9YQHdvEmKo="; }; nativeBuildInputs = with python3.pkgs; [ 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/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index ba00746c08f9d..c6855a47f8e63 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -3,7 +3,7 @@ , fetchurl , cmake , removeReferencesTo -, cppSupport ? false +, cppSupport ? true , fortranSupport ? false , fortran , zlibSupport ? true @@ -13,6 +13,7 @@ , mpiSupport ? false , mpi , enableShared ? !stdenv.hostPlatform.isStatic +, enableStatic ? stdenv.hostPlatform.isStatic , javaSupport ? false , jdk , usev110Api ? false @@ -58,7 +59,7 @@ stdenv.mkDerivation rec { ; }; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "bin" ]; nativeBuildInputs = [ removeReferencesTo cmake ] ++ optional fortranSupport fortran; @@ -72,6 +73,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DHDF5_INSTALL_CMAKE_DIR=${placeholder "dev"}/lib/cmake" + "-DBUILD_STATIC_LIBS=${lib.boolToString enableStatic}" ] ++ lib.optional stdenv.isDarwin "-DHDF5_BUILD_WITH_INSTALL_NAME=ON" ++ lib.optional cppSupport "-DHDF5_BUILD_CPP_LIB=ON" ++ lib.optional fortranSupport "-DHDF5_BUILD_FORTRAN=ON" @@ -85,10 +87,22 @@ stdenv.mkDerivation rec { postInstall = '' find "$out" -type f -exec remove-references-to -t ${stdenv.cc} '{}' + + moveToOutput 'bin/' "''${!outputBin}" moveToOutput 'bin/h5cc' "''${!outputDev}" moveToOutput 'bin/h5c++' "''${!outputDev}" moveToOutput 'bin/h5fc' "''${!outputDev}" moveToOutput 'bin/h5pcc' "''${!outputDev}" + moveToOutput 'bin/h5hlcc' "''${!outputDev}" + moveToOutput 'bin/h5hlc++' "''${!outputDev}" + '' + lib.optionalString enableShared + # The shared build creates binaries with -shared suffixes, + # so we remove these suffixes. + '' + pushd ''${!outputBin}/bin + for file in *-shared; do + mv "$file" "''${file%%-shared}" + done + popd ''; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/hunt/default.nix b/pkgs/tools/misc/hunt/default.nix index c76bdb376b2fe..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.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "LyonSyonII"; repo = "hunt-rs"; rev = "v${version}"; - sha256 = "sha256-cQA7LB3gDvANCuUDyXjvSE5pEljJRE/YwajR8deAP2E="; + sha256 = "sha256-cpqietS/yTI5ONkH4jjIUOVATutd2vj9xmxRbBwmzeI="; }; - cargoHash = "sha256-WCECfyQLHDlXWqi0dNRJSTkg8srZf3FCqV2EgV3X0Uc="; + 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/kalker/default.nix b/pkgs/tools/misc/kalker/default.nix index 2df69dd8f252e..6b90866493c32 100644 --- a/pkgs/tools/misc/kalker/default.nix +++ b/pkgs/tools/misc/kalker/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "kalker"; - version = "2.0.4"; + version = "2.1.0"; src = fetchFromGitHub { owner = "PaddiM8"; repo = pname; rev = "v${version}"; - hash = "sha256-8tJi4PRGhNCndiMRdZUvCSdx/+p9OhJyJ3AbD+PucSo="; + hash = "sha256-oBdo/FQZsJnUwhGrBuRWKZIvw2lZab9N/rv/muofs04="; }; - cargoHash = "sha256-rGy4tkjjPiV2lpdOtfqjsXgBgi/x+45K4KeUDhyfQoA="; + cargoHash = "sha256-v4biE3J1a3qxiqJrSTFxyZhOJpoCnh2lZFBjy4O3XiE="; buildInputs = [ gmp mpfr libmpc ]; 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-client.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix index 266ef9accca6b..4e997c65565a8 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ]; # AGPL with a lesser clause - license = licenses.agpl3; + license = licenses.agpl3Plus; }; } diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix index 48c8e9a4f7213..f14c19e0e4746 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix @@ -26,11 +26,12 @@ 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 ]; # AGPL with a lesser clause - license = licenses.agpl3; + license = licenses.agpl3Plus; }; } diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix index ee9cb1da687f0..bc4186c9b8e77 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ asymmetric ]; # AGPL with a lesser clause - license = licenses.agpl3; + license = licenses.agpl3Plus; }; } diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix index 57e55400aa273..6014c6c5c779b 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ asymmetric ]; # AGPL with a lesser clause - license = licenses.agpl3; + license = licenses.agpl3Plus; }; } diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin.nix b/pkgs/tools/misc/libbitcoin/libbitcoin.nix index 70a0f9bff6ef6..cebd5090bfe50 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ ]; # AGPL with a lesser clause - license = licenses.agpl3; + license = licenses.agpl3Plus; }; } 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/lsd/default.nix b/pkgs/tools/misc/lsd/default.nix index 99dee32424fa9..10c5a0371d543 100644 --- a/pkgs/tools/misc/lsd/default.nix +++ b/pkgs/tools/misc/lsd/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "lsd"; - version = "1.0.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "lsd-rs"; repo = "lsd"; rev = "v${version}"; - hash = "sha256-syT+1LNdigUWkfJ/wkbY/kny2uW6qfpl7KmW1FjZKR8="; + hash = "sha256-pPCcKEmB1/BS6Q2j1fytwpZa/5KXIJu0ip0Zq97m6uw="; }; - cargoHash = "sha256-viLr76Bq9OkPMp+BoprQusMDgx59nbevVi4uxjZ+eZg="; + cargoHash = "sha256-E0ui9cmuSqUMTkKvNNuEPOVd/gs4O2oW0aPxlyI9qoA="; nativeBuildInputs = [ installShellFiles pandoc ]; 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..c08de9afd8f1f 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.7"; src = fetchFromGitHub { owner = "jdx"; repo = "mise"; rev = "v${version}"; - hash = "sha256-Pcchyc7LuHOyDEfZj5QSb7nVhMjO9iIV2uQEJocfLic="; + hash = "sha256-vwbg/OY7w9+5KvLp+BN2Ive9khVTUnWgnWD1T09iVR8="; }; - cargoHash = "sha256-aKzl6yrsEi0DF0tsXB1eqTAar33FlJfRyYUKAi76o+c="; + cargoHash = "sha256-su8kyq+H42cYcQcoDYaTKAhLSykYOTXdkDQeCgScnp0="; nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; diff --git a/pkgs/tools/misc/moar/default.nix b/pkgs/tools/misc/moar/default.nix index 9f57849d81c65..85eefe9f36eb1 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.7"; + version = "1.23.9"; src = fetchFromGitHub { owner = "walles"; repo = pname; rev = "v${version}"; - hash = "sha256-QQiqi3rt1EQTUWSXAxAb5MHGCFyXZV6LZ6ZAS5P3mO4="; + hash = "sha256-qpbsNHIWiYTa5kt0GTybnWiSnUdPYIeFYsWXinYjtQA="; }; vendorHash = "sha256-1u/2OlMX2FuZaxWnpU4n5r/4xKe+rK++GoCJiSq/BdE="; 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/ollama/default.nix b/pkgs/tools/misc/ollama/default.nix index 1f14dadfba69e..fc3320d9e0a5b 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 @@ -21,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; }; @@ -48,6 +51,11 @@ let rocmPath = buildEnv { name = "rocm-path"; paths = [ + rocmPackages.clr + rocmPackages.hipblas + rocmPackages.rocblas + rocmPackages.rocsolver + rocmPackages.rocsparse rocmPackages.rocm-device-libs rocmClang ]; @@ -60,6 +68,10 @@ let cudaPackages.cudatoolkit cudaPackages.cuda_cudart ]; + postBuild = '' + rm "$out/lib64" + ln -s "lib" "$out/lib64" + ''; }; runtimeLibs = lib.optionals enableRocm [ @@ -79,9 +91,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; @@ -99,7 +111,7 @@ goBuild ((lib.optionalAttrs enableRocm { CUDAToolkit_ROOT = cudaToolkit; }) // { inherit pname version src; - vendorHash = "sha256-DPIhDqE/yXpSQqrx07osMBMafK61yU2dl4cZhxSTvm8="; + vendorHash = "sha256-Lj7CBvS51RqF63c01cOCgY7BCQeCKGu794qzb/S80C0="; nativeBuildInputs = [ cmake @@ -129,8 +141,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 @@ -154,7 +169,8 @@ goBuild ((lib.optionalAttrs enableRocm { # expose runtime libraries necessary to use the gpu mv "$out/bin/ollama" "$out/bin/.ollama-unwrapped" makeWrapper "$out/bin/.ollama-unwrapped" "$out/bin/ollama" \ - --suffix LD_LIBRARY_PATH : '/run/opengl-driver/lib:${lib.makeLibraryPath runtimeLibs}' + --suffix LD_LIBRARY_PATH : '/run/opengl-driver/lib:${lib.makeLibraryPath runtimeLibs}' '' + lib.optionalString enableRocm ''\ + --set-default HIP_PATH ${rocmPath} ''; ldflags = [ @@ -168,9 +184,14 @@ goBuild ((lib.optionalAttrs enableRocm { 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/opentelemetry-collector/contrib.nix b/pkgs/tools/misc/opentelemetry-collector/contrib.nix index e928544d240a5..bad1051fcc643 100644 --- a/pkgs/tools/misc/opentelemetry-collector/contrib.nix +++ b/pkgs/tools/misc/opentelemetry-collector/contrib.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "opentelemetry-collector-contrib"; - version = "0.87.0"; + version = "0.96.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector-contrib"; rev = "v${version}"; - sha256 = "sha256-b1TCj3aKupqUMQ74O58O5WJfQM9tj1G0ny5YeeilFAM="; + sha256 = "sha256-eQau6PcslY/Bzghmndv1lq5fb+Q+x9guouKzLw5sJTg="; }; # proxy vendor to avoid hash missmatches between linux and macOS proxyVendor = true; - vendorHash = "sha256-o/51Z2Zmdza3pNZa0u3j4uG46orE9S7pUsZOXjHKrnI="; + vendorHash = "sha256-aMxOu6eCskTlphMjM/CBs0lN6UkLDgSidS9qwlSUUiU="; # there is a nested go.mod sourceRoot = "${src.name}/cmd/otelcontribcol"; @@ -39,11 +39,7 @@ buildGoModule rec { # it instead of trusting the global $PATH. propagatedBuildInputs = lib.optionals withSystemd [ systemdMinimal ]; - preCheck = "export CGO_ENABLED=1"; - - # This test fails on darwin for mysterious reasons. - checkFlags = lib.optionals stdenv.isDarwin - [ "-skip" "TestDefaultExtensions/memory_ballast" ]; + doCheck = false; ldflags = [ "-s" diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix index 45f89ffe079fd..fb718c567c627 100644 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -8,17 +8,17 @@ buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.95.0"; + version = "0.96.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "v${version}"; - hash = "sha256-uKGkglDCOYUcCWzsvZcYpzhDCkJ+2LnrD2/HP2zA+Ms="; + hash = "sha256-/QGRxQRkVXuP3H6AWSqc1U7sA1n0jTNYLa+gQA25Q5M="; }; # there is a nested go.mod sourceRoot = "${src.name}/cmd/otelcorecol"; - vendorHash = "sha256-iAY19S+s+g13kobRO8sGdu27klH4DOSFfLlGbKPelzs="; + vendorHash = "sha256-n548376djwz4Qd9vlid0V9Dr9trLb09gKOP4J+9Znp4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/pb/default.nix b/pkgs/tools/misc/pb/default.nix index 1cbe8eded5cbe..061ca691af753 100644 --- a/pkgs/tools/misc/pb/default.nix +++ b/pkgs/tools/misc/pb/default.nix @@ -30,7 +30,7 @@ buildGoModule rec { homepage = "https://github.com/parseablehq/pb"; changelog = "https://github.com/parseablehq/pb/releases/tag/v${version}"; description = "CLI client for Parseable server"; - license = licenses.agpl3; + license = licenses.agpl3Plus; maintainers = with maintainers; [ aaronjheng ]; mainProgram = "pb"; }; diff --git a/pkgs/tools/misc/pgbadger/default.nix b/pkgs/tools/misc/pgbadger/default.nix index 4054e6b20e94d..b1024d68a91c5 100644 --- a/pkgs/tools/misc/pgbadger/default.nix +++ b/pkgs/tools/misc/pgbadger/default.nix @@ -1,13 +1,28 @@ -{ buildPerlPackage, shortenPerlShebang, stdenv, lib, fetchFromGitHub, which, bzip2, PodMarkdown, JSONXS -, TextCSV_XS }: +{ + buildPerlPackage, + bzip2, + fetchFromGitHub, + JSONXS, + lib, + nix-update-script, + pgbadger, + PodMarkdown, + shortenPerlShebang, + stdenv, + testers, + TextCSV_XS, + which, +}: + buildPerlPackage rec { pname = "pgbadger"; - version = "12.2"; + version = "12.4"; + src = fetchFromGitHub { owner = "darold"; repo = "pgbadger"; - rev = "v${version}"; - hash = "sha256-IzfpDqzS5VcehkPsFxyn3kJsvXs8nLgJ3WT8ZCmIDxI="; + rev = "refs/tags/v${version}"; + hash = "sha256-an/BOkQsMkTXS0HywV1JWerS16HRbO1MHVleYhVqmBM="; }; postPatch = '' @@ -25,10 +40,27 @@ buildPerlPackage rec { PERL_MM_OPT = "INSTALL_BASE=${placeholder "out"}"; - buildInputs = [ PodMarkdown JSONXS TextCSV_XS ]; + buildInputs = [ + JSONXS + PodMarkdown + TextCSV_XS + ]; + nativeBuildInputs = lib.optionals stdenv.isDarwin [ shortenPerlShebang ]; - nativeCheckInputs = [ which bzip2 ]; + nativeCheckInputs = [ + bzip2 + which + ]; + + passthru = { + tests.version = testers.testVersion { + inherit version; + command = "${lib.getExe pgbadger} --version"; + package = pgbadger; + }; + updateScript = nix-update-script { }; + }; meta = { homepage = "https://github.com/darold/pgbadger"; 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/pokeget-rs/default.nix b/pkgs/tools/misc/pokeget-rs/default.nix index 55995e8b0bce3..2505fd2f96785 100644 --- a/pkgs/tools/misc/pokeget-rs/default.nix +++ b/pkgs/tools/misc/pokeget-rs/default.nix @@ -5,17 +5,17 @@ rustPlatform.buildRustPackage rec { pname = "pokeget-rs"; - version = "1.4.2"; + version = "1.4.2-2"; src = fetchFromGitHub { owner = "talwat"; repo = "pokeget-rs"; rev = version; - hash = "sha256-++MD7XYWJ4Oim/VSYSisu/DwazOEfQ4CJNLfR5sjP3M="; + hash = "sha256-RPdtwHJsXdjIAeJP/LPdJ7GjwdIngM3eZO/A8InTpXQ="; fetchSubmodules = true; }; - cargoHash = "sha256-lWImtmtoo3ujbHvaeijuVjt0NQhdp+mxuu8oxNutr2E="; + cargoHash = "sha256-JeRSBG1HswttHOGyiNseFf2KiWkumrzEIw76A80nQHM="; meta = with lib; { description = "A better rust version of pokeget"; 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/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index 2449fd30171d8..47fb6fbbd8dd6 100644 --- a/pkgs/tools/misc/pspg/default.nix +++ b/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pspg"; - version = "5.8.1"; + version = "5.8.2"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = version; - sha256 = "sha256-nsGBBGw66LCwOuNdBjlz6u9RT+BX6iZmZeDY9yJoc+c="; + sha256 = "sha256-1mL/UlN7wD0GBYwg0C2eYCB3MtFO2ILd4+A7br+/ovs="; }; nativeBuildInputs = [ pkg-config installShellFiles ]; 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/scdl/default.nix b/pkgs/tools/misc/scdl/default.nix index 611326d554030..d2e28865e33c6 100644 --- a/pkgs/tools/misc/scdl/default.nix +++ b/pkgs/tools/misc/scdl/default.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonApplication rec { pname = "scdl"; - version = "2.7.3"; + version = "2.7.5"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "60284b7b058040d4847f2e4b0ab906b10e959d51f976a0188641e8e10685474f"; + sha256 = "sha256-YoQaIbOfwLtkSZJGZd9CL7TZGgqjfohJfrnQ3t5uLU0="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/misc/star-history/default.nix b/pkgs/tools/misc/star-history/default.nix index 65a2d35a33cd2..5c98e8a94419e 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.19"; + version = "1.0.20"; src = fetchCrate { inherit pname version; - sha256 = "sha256-sjVxYo5Sx6fmlLflg3y754jnFbnA5x/X5NINM3omPVY="; + sha256 = "sha256-1mAEDcg25v47zKSYbL0w6KX56ZIti6NcpnQKUyrtybg="; }; - cargoHash = "sha256-aeRAXUdpv94WW1E/bWvJnwHOxYn9bALXvTb5RVjcozQ="; + cargoHash = "sha256-qkIHNFCGLtQ1uO0Y3vKR3zBtKj8Cq0ptgQcqeGvG5qs="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 605867e285c25..c970e19a6b896 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "1.17.1"; + version = "1.18.0"; src = fetchFromGitHub { owner = "starship"; - repo = pname; + repo = "starship"; rev = "v${version}"; - hash = "sha256-e+vhisUzSYKUUoYfSaQwpfMz2OzNcZbeHgbvyPon18g="; + hash = "sha256-f9alFoTH461y1EYnhxnnPN98ujLTnlVBJa8lEp8t44Y="; }; nativeBuildInputs = [ installShellFiles cmake ]; @@ -41,10 +41,10 @@ rustPlatform.buildRustPackage rec { presetdir=$out/share/starship/presets/ mkdir -p $presetdir - cp docs/.vuepress/public/presets/toml/*.toml $presetdir + cp docs/public/presets/toml/*.toml $presetdir ''; - cargoHash = "sha256-xLlZyLvS9AcXQHxjyL4Dden1rEwCLB8/comfRyqXXCI="; + cargoHash = "sha256-7k7qb5jLz2mk27ayYYE5uFXYgQkjbIIwdppJxM8YgtY="; nativeCheckInputs = [ git ]; diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/tools/misc/steampipe/default.nix index 31d27ffe8baea..ef2b17828d807 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 = '' @@ -41,7 +41,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://steampipe.io/"; description = "select * from cloud;"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ hardselius ]; changelog = "https://github.com/turbot/steampipe/blob/v${version}/CHANGELOG.md"; }; 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/thefuck/default.nix b/pkgs/tools/misc/thefuck/default.nix index d7a90fa8891f2..150913c31d131 100644 --- a/pkgs/tools/misc/thefuck/default.nix +++ b/pkgs/tools/misc/thefuck/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, buildPythonApplication , colorama, decorator, psutil, pyte, six -, go, mock, pytestCheckHook, pytest-mock +, go, mock, pytestCheckHook, pytest-mock, pytest_7 }: buildPythonApplication rec { @@ -16,7 +16,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ colorama decorator psutil pyte six ]; - nativeCheckInputs = [ go mock pytestCheckHook pytest-mock ]; + nativeCheckInputs = [ go mock (pytestCheckHook.override { pytest = pytest_7; }) pytest-mock ]; disabledTests = lib.optionals stdenv.isDarwin [ "test_settings_defaults" @@ -39,6 +39,6 @@ buildPythonApplication rec { homepage = "https://github.com/nvbn/thefuck"; description = "Magnificent app which corrects your previous console command"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ marcusramberg ]; }; } 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/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index b61f0bddaa261..37faf47f02a97 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonApplication rec { pname = "tmuxp"; - version = "1.39.0"; + version = "1.43.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-E8Q1uCV3kl4rYg/bzwjk3CNQU/uP9lEZzSqcOFkLrY0="; + hash = "sha256-SbMZpMrcOGNzEqa/2x0OtgC2/fhKp8Prs8Hspy3I3tA="; }; nativeBuildInputs = [ 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/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/url-parser/default.nix b/pkgs/tools/misc/url-parser/default.nix index d55639b8be800..39ae506c25245 100644 --- a/pkgs/tools/misc/url-parser/default.nix +++ b/pkgs/tools/misc/url-parser/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "url-parser"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "thegeeklab"; repo = "url-parser"; rev = "refs/tags/v${version}"; - hash = "sha256-1KNe2sYr2DtRJGdgqs7JAA788Qa3+Z7iTntCkiJd29I="; + hash = "sha256-pu6U6YIA7+K1ZSt97Nn0IDaQFVIwMq3m7d8JidK1vJk="; }; - vendorHash = "sha256-DAwPYihfOorC61/UhRNNOsOaAjbu8mDBaikGJIOzk6Y="; + vendorHash = "sha256-QqhjS0uL2Fm2OeFkuAB8VeS7HpoS9dOhgHk/J4j9++M="; ldflags = [ "-s" 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/yutto/default.nix b/pkgs/tools/misc/yutto/default.nix deleted file mode 100644 index e6bf61f8beec3..0000000000000 --- a/pkgs/tools/misc/yutto/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib -, python3 -, fetchPypi -, ffmpeg -, nix-update-script -}: - -with python3.pkgs; - -buildPythonApplication rec { - pname = "yutto"; - version = "2.0.0b35"; - format = "pyproject"; - - disabled = pythonOlder "3.9"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-r4Lc5PMkhwLMC6nKArvpf9M4N+eoV6OmZK2uhY6xZxA="; - }; - - nativeBuildInputs = [ - poetry-core - ]; - - propagatedBuildInputs = [ - httpx - aiofiles - biliass - dict2xml - colorama - typing-extensions - ] ++ (with httpx.optional-dependencies; http2 ++ socks); - - preFixup = '' - makeWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}) - ''; - - pythonImportsCheck = [ "yutto" ]; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - description = "A Bilibili downloader"; - homepage = "https://github.com/yutto-dev/yutto"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ linsui ]; - mainProgram = "yutto"; - }; -} diff --git a/pkgs/tools/misc/z-lua/default.nix b/pkgs/tools/misc/z-lua/default.nix index dca8c865a8120..2d8dcc30f33ac 100644 --- a/pkgs/tools/misc/z-lua/default.nix +++ b/pkgs/tools/misc/z-lua/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "z-lua"; - version = "1.8.17"; + version = "1.8.18"; src = fetchFromGitHub { owner = "skywind3000"; repo = "z.lua"; rev = version; - sha256 = "sha256-zhhrRTteKv6VvTbM7ao2Z3nWRN181nqLLcOA+qi88fc="; + sha256 = "sha256-QSwZhdBXO+x4vcwRnZjdYdIdWW0Nfu0oImftUgm4wyo="; }; dontBuild = true; |