diff --git a/pkgs/applications/misc/waylock/update.nu b/pkgs/applications/misc/waylock/update.nu deleted file mode 100755 index 514a755db1a3..000000000000 --- a/pkgs/applications/misc/waylock/update.nu +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i nu -p nushell common-updater-scripts - -let latest_tag = list-git-tags --url=https://codeberg.org/ifreund/waylock | lines | sort --natural | str replace v '' | last -update-source-version waylock $latest_tag diff --git a/pkgs/applications/networking/cluster/gatekeeper/default.nix b/pkgs/applications/networking/cluster/gatekeeper/default.nix index 5ddb8409d31f..290e542d0eca 100644 --- a/pkgs/applications/networking/cluster/gatekeeper/default.nix +++ b/pkgs/applications/networking/cluster/gatekeeper/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "gatekeeper"; - version = "3.16.0"; + version = "3.16.2"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "gatekeeper"; rev = "v${version}"; - hash = "sha256-IIqucBPuEHymfg7nLmxXMrq1aaB6SFPrczPj4BH8Zyw="; + hash = "sha256-lpnli05nRKwEdG9k4j+pSAKxNoFBBeOhwd8iYbelwoc="; }; vendorHash = null; diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix index 4321868a0d6d..b816da9e4b5c 100644 --- a/pkgs/applications/networking/syncplay/default.nix +++ b/pkgs/applications/networking/syncplay/default.nix @@ -13,15 +13,15 @@ buildPythonApplication rec { pname = "syncplay"; - version = "1.7.2"; + version = "1.7.3"; format = "other"; src = fetchFromGitHub { owner = "Syncplay"; repo = "syncplay"; - rev = "v${version}"; - sha256 = "sha256-PERPE6141LXmb8fmW17Vu54Unpf9vEK+ahm6q1byRTU="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-ipo027XyN4BpMkxzXznbnaufsaG/YkHxFJYo+XWzbyE="; }; patches = [ diff --git a/pkgs/applications/radio/qlog/default.nix b/pkgs/applications/radio/qlog/default.nix index e89b1014e528..2f14292e6670 100644 --- a/pkgs/applications/radio/qlog/default.nix +++ b/pkgs/applications/radio/qlog/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "qlog"; - version = "0.35.1"; + version = "0.35.2"; src = fetchFromGitHub { owner = "foldynl"; repo = "QLog"; rev = "v${version}"; - hash = "sha256-qmTep8cwNFxgvWO6tOtk+kwjhEltjJTc0Fo4o01GzIo="; + hash = "sha256-3ht3/J4uJ7Nyfp0xpVDYa8GnV/EvHjf09XGSEBLRGZU="; fetchSubmodules = true; }; diff --git a/pkgs/applications/science/logic/cbmc/0001-Do-not-download-sources-in-cmake.patch b/pkgs/applications/science/logic/cbmc/0001-Do-not-download-sources-in-cmake.patch index 181214093ef8..c209ed059e44 100644 --- a/pkgs/applications/science/logic/cbmc/0001-Do-not-download-sources-in-cmake.patch +++ b/pkgs/applications/science/logic/cbmc/0001-Do-not-download-sources-in-cmake.patch @@ -1,4 +1,4 @@ -From 206084d2e08198b0b5b67733c407bd3fb74affb1 Mon Sep 17 00:00:00 2001 +From 714f5ebe9ade721abdccf58edfcddba52465cb8d Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Sun, 2 Jul 2023 22:43:27 +0800 Subject: [PATCH] Do not download sources in cmake @@ -8,7 +8,7 @@ Subject: [PATCH] Do not download sources in cmake 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/solvers/CMakeLists.txt b/src/solvers/CMakeLists.txt -index 8bfcf4d13c..6ba858a461 100644 +index daa0853a57..4bcbbdaa47 100644 --- a/src/solvers/CMakeLists.txt +++ b/src/solvers/CMakeLists.txt @@ -123,16 +123,6 @@ foreach(SOLVER ${sat_impl}) @@ -16,11 +16,11 @@ index 8bfcf4d13c..6ba858a461 100644 message(STATUS "Building solvers with cadical") - download_project(PROJ cadical -- URL https://github.com/arminbiere/cadical/archive/rel-1.5.3.tar.gz -- PATCH_COMMAND patch -p1 -i ${CBMC_SOURCE_DIR}/../scripts/cadical-1.5.3-patch +- URL https://github.com/arminbiere/cadical/archive/rel-1.7.2.tar.gz +- PATCH_COMMAND patch -p1 -i ${CBMC_SOURCE_DIR}/../scripts/cadical-1.7.2-patch - COMMAND cmake -E copy ${CBMC_SOURCE_DIR}/../scripts/cadical_CMakeLists.txt CMakeLists.txt - COMMAND ./configure -- URL_MD5 265b1a715000ed3c5b6de36ddd1278a0 +- URL_MD5 be646831a017f81b300664e58deba1b5 - ) - - add_subdirectory(${cadical_SOURCE_DIR} ${cadical_BINARY_DIR}) @@ -32,10 +32,10 @@ index 8bfcf4d13c..6ba858a461 100644 target_include_directories(solvers PUBLIC ${cadical_SOURCE_DIR}/src -+ ${cadical_INCLUDE_DIR} ++ ${cadical_INCLUDE_DIR} ) target_link_libraries(solvers cadical) -- -2.40.1 +2.42.0 diff --git a/pkgs/applications/science/logic/cbmc/default.nix b/pkgs/applications/science/logic/cbmc/default.nix index 6a878735bb3d..dcf5b5bb37fa 100644 --- a/pkgs/applications/science/logic/cbmc/default.nix +++ b/pkgs/applications/science/logic/cbmc/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "cbmc"; - version = "5.91.0"; + version = "5.95.1"; src = fetchFromGitHub { owner = "diffblue"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-7DzhGEDS9T6WIjGoxOw9Gf/q+tYNFJDPbQUBV3tbn/I="; + sha256 = "sha256-fDLSo5EeHyPTliAqFp+5mfaB0iZXIMXeMyF21fjl5k4="; }; nativeBuildInputs = [ @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { license = licenses.bsdOriginal; maintainers = with maintainers; [ jiegec ]; platforms = platforms.unix; - # https://github.com/diffblue/cbmc/issues/7423 - broken = stdenv.isLinux && stdenv.isAarch64; + # error: no member named 'aligned_alloc' in the global namespace + broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index 6d6fd23717e5..9da8b1fc1747 100644 --- a/pkgs/applications/virtualization/nixpacks/default.nix +++ b/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "1.22.0"; + version = "1.23.0"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-O2A75cjTU72DGrg4PmEogN9aANYKIZWUkXfIJXs7CwA="; + sha256 = "sha256-M4RZwcFiupZdePDkUWRTiTNA58siMsggTGpvHb8j88Y="; }; - cargoHash = "sha256-FS38zqPtmtyV6oSjfxtNMe8n+LMTU1eBN6oX6CGph6k="; + cargoHash = "sha256-hSzDboP2YJoPPzugb0ABiogKU7lauJNML8szThB2zqg="; # skip test due FHS dependency doCheck = false; diff --git a/pkgs/by-name/cs/csvlens/package.nix b/pkgs/by-name/cs/csvlens/package.nix index 7840dba022d2..1731af4bebce 100644 --- a/pkgs/by-name/cs/csvlens/package.nix +++ b/pkgs/by-name/cs/csvlens/package.nix @@ -7,20 +7,20 @@ rustPlatform.buildRustPackage rec { pname = "csvlens"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "YS-L"; repo = "csvlens"; rev = "refs/tags/v${version}"; - hash = "sha256-Qpda9qADnj3eGz+nvD6VgxUOwTXrFI1rMam6+sfK6MQ="; + hash = "sha256-22IU+TpmmJNCsjrobXe0+0YhssbFMt/j9Vusz69lips="; }; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; - cargoHash = "sha256-PDOuAz+ov1S7i7TpRp4YaeoQQJ4paal6FI0VU25d4zU="; + cargoHash = "sha256-jLoVuDoarq6ZIWrNw04eyRo+M4jNcZ2zsMWKmZaDPf0="; meta = with lib; { description = "Command line csv viewer"; diff --git a/pkgs/by-name/dr/dreamchess/package.nix b/pkgs/by-name/dr/dreamchess/package.nix new file mode 100644 index 000000000000..f8829ac9587e --- /dev/null +++ b/pkgs/by-name/dr/dreamchess/package.nix @@ -0,0 +1,71 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, bison +, flex +, gettext +, SDL2 +, SDL2_image +, SDL2_mixer +, expat +, glew +, freetype +, libSM +, libXext +, libGL +, libGLU +, xorg +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dreamchess"; + version = "0.3.0"; + src = fetchFromGitHub { + owner = "dreamchess"; + repo = "dreamchess"; + rev = "${finalAttrs.version}"; + hash = "sha256-qus/RjwdAl9SuDXfLVKTPImqrvPF3xSDVlbXYLM3JNE="; + }; + + buildInputs = [ + SDL2 + SDL2_image + SDL2_mixer + expat + glew + freetype + libSM + libXext + libGL + libGLU + xorg.libxcb + xorg.libX11 + ]; + nativeBuildInputs = [ + cmake + bison + flex + gettext + ]; + cmakeFlags = [ + (lib.cmakeBool "CMAKE_VERBOSE_MAKEFILE" true) + (lib.cmakeFeature "OpenGL_GL_PREFERENCE" "GLVND") + (lib.cmakeFeature "CMAKE_INSTALL_DATAROOTDIR" "${placeholder "out"}/share") + ]; + + doInstallCheck = true; + + postInstallCheck = '' + stat "''${!outputBin}/bin/${finalAttrs.meta.mainProgram}" + ''; + + meta = { + homepage = "https://github.com/dreamchess/dreamchess"; + description = "An OpenGL Chess Game"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ spk ]; + platforms = lib.platforms.linux; + mainProgram = "dreamchess"; + }; +}) diff --git a/pkgs/by-name/fz/fzf-make/package.nix b/pkgs/by-name/fz/fzf-make/package.nix index 864bb8f0c925..24756ffcf880 100644 --- a/pkgs/by-name/fz/fzf-make/package.nix +++ b/pkgs/by-name/fz/fzf-make/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "fzf-make"; - version = "0.30.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "kyu08"; repo = "fzf-make"; rev = "v${version}"; - hash = "sha256-C2CDzcS6iE2ojXtFjQfHDJE2C1b5QNG6rda/MiDW8kk="; + hash = "sha256-JHquE35qe1nJFJ+0gniG72o1DrGLZSZ0do5oPHgYbHU="; }; - cargoHash = "sha256-N5hM5xTMNeryFgdICQcKvPt4lHgh02DCaPD3TTGmFBo="; + cargoHash = "sha256-61I6OiEP0t9DAF0jnIEyGRTpPBU65zz/W6mAo7XelVo="; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/by-name/ia/ianny/package.nix b/pkgs/by-name/ia/ianny/package.nix index 6b7c3ca940e5..0dfb0e3dfdf7 100644 --- a/pkgs/by-name/ia/ianny/package.nix +++ b/pkgs/by-name/ia/ianny/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ianny"; - version = "1.0.0beta.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "zefr0x"; repo = "ianny"; rev = "v${version}"; - hash = "sha256-Bnr+wtusvTM690IISBs0wKj0ChBoIrMHyVZ8wdGgK08="; + hash = "sha256-1QkGs4qCzEA4K3H39QcRV+yINIeZRkjBBkASO69F7ik="; }; - cargoHash = "sha256-/8C+hDq/z+h1uxO9prLbKHgyfMGrMODAs5/yUrutaAM="; + cargoHash = "sha256-gKCmiqHkCB7nP5XIaFi/8Wi/x5WFEHEmHczKiIDDxXE="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus.dev ]; diff --git a/pkgs/by-name/ky/kyverno-chainsaw/package.nix b/pkgs/by-name/ky/kyverno-chainsaw/package.nix index d20c7308b423..082781d02695 100644 --- a/pkgs/by-name/ky/kyverno-chainsaw/package.nix +++ b/pkgs/by-name/ky/kyverno-chainsaw/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kyverno-chainsaw"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "kyverno"; repo = "chainsaw"; rev = "v${version}"; - hash = "sha256-eQA4KiQH1tIbolQBKPId8hKCO0mcUnEyJ77+WSGYDjQ="; + hash = "sha256-jTrASkIcvHQN8TcxyfAeYVN50L2cgZXrKJRI8BN9Muk="; }; vendorHash = "sha256-3x1HAt08Tbs56vaT2tBS//FPRn4JdFOI00XmlXMbs3w="; diff --git a/pkgs/by-name/li/lint-staged/package.nix b/pkgs/by-name/li/lint-staged/package.nix index 8366ff1e6372..9c3eddd9ddae 100644 --- a/pkgs/by-name/li/lint-staged/package.nix +++ b/pkgs/by-name/li/lint-staged/package.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "lint-staged"; - version = "15.2.2"; + version = "15.2.4"; src = fetchFromGitHub { owner = "okonet"; repo = "lint-staged"; rev = "v${version}"; - hash = "sha256-gdL/gOAHcgvKUot6MmC1rUMmcrLgLMf1ISc1oPNWJOQ="; + hash = "sha256-TGJz1jWXTNlTfHe1ed4jjR6SBlXriIAQJXQ4W6b7dQU="; }; - npmDepsHash = "sha256-32E5y0s6Hm8i74zso/yOmCYWZ6y2Sx4rn8ylSb0c8qE="; + npmDepsHash = "sha256-2Lv7k41hWVHF5PGdpYlMoFAj/zDPuRg6ydXaWTpUR/g="; dontNpmBuild = true; diff --git a/pkgs/by-name/ma/marge-bot/package.nix b/pkgs/by-name/ma/marge-bot/package.nix index b564622271d3..8964ce72264b 100644 --- a/pkgs/by-name/ma/marge-bot/package.nix +++ b/pkgs/by-name/ma/marge-bot/package.nix @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { }; postPatch = '' - substituteInPlace setup.cfg --replace "--flake8 --pylint --cov=marge" "" + substituteInPlace setup.cfg --replace-fail "--flake8 --pylint --cov=marge" "" ''; nativeBuildInputs = [ @@ -30,12 +30,17 @@ python3.pkgs.buildPythonApplication rec { requests ]; - nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook pendulum ]; disabledTests = [ # test broken when run under Nix: # "unittest.mock.InvalidSpecError: Cannot spec a Mock object." "test_get_mr_ci_status" ]; + disabledTestPaths = [ + # test errors due to API mismatch in test setup: + # "ImportError: cannot import name 'set_test_now' from 'pendulum.helpers'" + "tests/test_interval.py" + ]; pythonImportsCheck = [ "marge" ]; diff --git a/pkgs/by-name/ne/neovide/package.nix b/pkgs/by-name/ne/neovide/package.nix index ce9b091add82..a4c8791c5aa6 100644 --- a/pkgs/by-name/ne/neovide/package.nix +++ b/pkgs/by-name/ne/neovide/package.nix @@ -26,16 +26,16 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { pname = "neovide"; - version = "0.12.2"; + version = "0.13.0"; src = fetchFromGitHub { owner = "neovide"; repo = "neovide"; rev = version; - sha256 = "sha256-M19LKNjUmC0WkVGm4t7vjxgMMe0FdMTmB1mLcG33OUg="; + sha256 = "sha256-lYahMSaagT6DloFMXT2lLPM1xX/9IEGNIPvbo1MQgSw="; }; - cargoHash = "sha256-2fPprZVT7V+Ot8aCpWj6WTdyFylmzlujFdTJCrtE0rk="; + cargoHash = "sha256-g/Ezyz2gC1YaPMdIy/WdoOvezJUH3aB2FA87viahRzc="; SKIA_SOURCE_DIR = let @@ -43,8 +43,8 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { owner = "rust-skia"; repo = "skia"; # see rust-skia:skia-bindings/Cargo.toml#package.metadata skia - rev = "m119-0.67.3"; - sha256 = "sha256-U75NuJnQa5+SNlOrsBmdlvflGdjo3el63EeIsbnE7ms="; + rev = "m124-0.72.3"; + sha256 = "sha256-zlHUJUXukE4CsXwwmVl3KHf9mnNPT8lC/ETEE15Gb4s="; }; # The externals for skia are taken from skia/DEPS externals = linkFarm "skia-externals" (lib.mapAttrsToList diff --git a/pkgs/by-name/ne/neovide/skia-externals.json b/pkgs/by-name/ne/neovide/skia-externals.json index e57814e2a2d8..9a71fd62899f 100644 --- a/pkgs/by-name/ne/neovide/skia-externals.json +++ b/pkgs/by-name/ne/neovide/skia-externals.json @@ -16,13 +16,13 @@ }, "zlib": { "url": "https://chromium.googlesource.com/chromium/src/third_party/zlib", - "rev": "c876c8f87101c5a75f6014b0f832499afeb65b73", - "sha256": "sha256-mwozVo8ymyrYN4tw+/ZnSI+xogSTZQ6PUBba/jQqRkE=" + "rev": "646b7f569718921d7d4b5b8e22572ff6c76f2596", + "sha256": "sha256-jNj6SuTZ5/a7crtYhxW3Q/TlfRMNMfYIVxDlr7bYdzQ=" }, "harfbuzz": { "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git", - "rev": "4cfc6d8e173e800df086d7be078da2e8c5cfca19", - "sha256": "sha256-rrstyAz7Eb8ZgFJZKUASY8nU4YFZAptd5VS9B2cs2Yg=" + "rev": "c053e8f29257814e11ad61493dbbe29f27656de4", + "sha256": "sha256-D8DNcZH/oiJqWvfWFHvQ8AwQ3OrMwyZdfGmZ5y30Hvg=" }, "wuffs": { "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", @@ -31,7 +31,7 @@ }, "libpng": { "url": "https://skia.googlesource.com/third_party/libpng.git", - "rev": "386707c6d19b974ca2e3db7f5c61873813c6fe44", - "sha256": "sha256-67kf5MBsnBBi0bOfX/RKL52xpaCWm/ampltAI+EeQ+c=" + "rev": "144b348e072a78e8130ed0acc452c9f039a67bf2", + "sha256": "sha256-eTF7q7hR4S1OqV2oPQKmcHujA5Od4rGMc5879kT0SkE=" } } diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix index 0dd8ca8a0877..eaf637c88e64 100644 --- a/pkgs/by-name/ne/neovim-unwrapped/package.nix +++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: in { pname = "neovim-unwrapped"; - version = "0.9.5"; + version = "0.10.0"; __structuredAttrs = true; @@ -74,7 +74,7 @@ in { owner = "neovim"; repo = "neovim"; rev = "v${finalAttrs.version}"; - hash = "sha256-CcaBqA0yFCffNPmXOJTo8c9v1jrEBiqAl8CG5Dj5YxE="; + hash = "sha256-FCOipXHkAbkuFw9JjEpOIJ8BkyMkjkI0Dp+SzZ4yZlw="; }; patches = [ @@ -86,7 +86,11 @@ in { dontFixCmake = true; - inherit lua treesitter-parsers; + inherit lua; + treesitter-parsers = treesitter-parsers // + { markdown = treesitter-parsers.markdown // { location = "tree-sitter-markdown"; }; } // + { markdown-inline = treesitter-parsers.markdown // { language = "markdown_inline"; location = "tree-sitter-markdown-inline"; }; } + ; buildInputs = [ gperf @@ -169,11 +173,13 @@ in { '' + '' mkdir -p $out/lib/nvim/parser '' + lib.concatStrings (lib.mapAttrsToList - (language: src: '' + (language: grammar: '' ln -s \ ${tree-sitter.buildGrammar { - inherit language src; + inherit (grammar) src; version = "neovim-${finalAttrs.version}"; + language = grammar.language or language; + location = grammar.location or null; }}/parser \ $out/lib/nvim/parser/${language}.so '') diff --git a/pkgs/by-name/ne/neovim-unwrapped/treesitter-parsers.nix b/pkgs/by-name/ne/neovim-unwrapped/treesitter-parsers.nix index d36f8bda8542..e4d4dd60e2eb 100644 --- a/pkgs/by-name/ne/neovim-unwrapped/treesitter-parsers.nix +++ b/pkgs/by-name/ne/neovim-unwrapped/treesitter-parsers.nix @@ -1,24 +1,36 @@ { fetchurl }: { - c = fetchurl { - url = "https://github.com/tree-sitter/tree-sitter-c/archive/v0.20.2.tar.gz"; - hash = "sha256:af66fde03feb0df4faf03750102a0d265b007e5d957057b6b293c13116a70af2"; + c.src = fetchurl { + url = "https://github.com/tree-sitter/tree-sitter-c/archive/v0.21.0.tar.gz"; + hash = "sha256:6f0f5d1b71cf8ffd8a37fb638c6022fa1245bd630150b538547d52128ce0ea7e"; }; - lua = fetchurl { - url = "https://github.com/MunifTanjim/tree-sitter-lua/archive/v0.0.14.tar.gz"; - hash = "sha256:930d0370dc15b66389869355c8e14305b9ba7aafd36edbfdb468c8023395016d"; + lua.src = fetchurl { + url = "https://github.com/tree-sitter-grammars/tree-sitter-lua/archive/v0.1.0.tar.gz"; + hash = "sha256:230cfcbfa74ed1f7b8149e9a1f34c2efc4c589a71fe0f5dc8560622f8020d722"; }; - vim = fetchurl { - url = "https://github.com/neovim/tree-sitter-vim/archive/v0.3.0.tar.gz"; - hash = "sha256:403acec3efb7cdb18ff3d68640fc823502a4ffcdfbb71cec3f98aa786c21cbe2"; + vim.src = fetchurl { + url = "https://github.com/neovim/tree-sitter-vim/archive/v0.4.0.tar.gz"; + hash = "sha256:9f856f8b4a10ab43348550fa2d3cb2846ae3d8e60f45887200549c051c66f9d5"; }; - vimdoc = fetchurl { - url = "https://github.com/neovim/tree-sitter-vimdoc/archive/v2.0.0.tar.gz"; - hash = "sha256:1ff8f4afd3a9599dd4c3ce87c155660b078c1229704d1a254433e33794b8f274"; + vimdoc.src = fetchurl { + url = "https://github.com/neovim/tree-sitter-vimdoc/archive/v2.5.1.tar.gz"; + hash = "sha256:063645096504b21603585507c41c6d8718ff3c11b2150c5bfc31e8f3ee9afea3"; }; - query = fetchurl { - url = "https://github.com/nvim-treesitter/tree-sitter-query/archive/v0.1.0.tar.gz"; - hash = "sha256:e2b806f80e8bf1c4f4e5a96248393fe6622fc1fc6189d6896d269658f67f914c"; + query.src = fetchurl { + url = "https://github.com/tree-sitter-grammars/tree-sitter-query/archive/v0.3.0.tar.gz"; + hash = "sha256:f878ff37abcb83250e31a6569e997546f3dbab74dcb26683cb2d613f7568cfc0"; + }; + python.src = fetchurl { + url = "https://github.com/tree-sitter/tree-sitter-python/archive/v0.21.0.tar.gz"; + hash = "sha256:720304a603271fa89e4430a14d6a81a023d6d7d1171b1533e49c0ab44f1e1c13"; + }; + bash.src = fetchurl { + url = "https://github.com/tree-sitter/tree-sitter-bash/archive/v0.21.0.tar.gz"; + hash = "sha256:f0515efda839cfede851adb24ac154227fbc0dfb60c6c11595ecfa9087d43ceb"; + }; + markdown.src = fetchurl { + url = "https://github.com/MDeiml/tree-sitter-markdown/archive/v0.2.3.tar.gz"; + hash = "sha256:4909d6023643f1afc3ab219585d4035b7403f3a17849782ab803c5f73c8a31d5"; }; } diff --git a/pkgs/by-name/ne/neovim-unwrapped/update-treesitter-parsers.py b/pkgs/by-name/ne/neovim-unwrapped/update-treesitter-parsers.py index 27260ca64917..117c7eb48123 100755 --- a/pkgs/by-name/ne/neovim-unwrapped/update-treesitter-parsers.py +++ b/pkgs/by-name/ne/neovim-unwrapped/update-treesitter-parsers.py @@ -7,7 +7,7 @@ from pathlib import Path parsers = {} dir = Path(__file__).parent -regex = re.compile(r"^set\(TREESITTER_([A-Z_]+)_(URL|SHA256)\s+([^ \)]+)\s*\)\s*$") +regex = re.compile(r"^TREESITTER_([A-Z_]+)_(URL|SHA256)\s+(.+)$") src = subprocess.check_output( [ @@ -20,8 +20,8 @@ src = subprocess.check_output( text=True, ).strip() -for line in open(f"{src}/cmake.deps/CMakeLists.txt"): - m = regex.fullmatch(line) +for line in open(f"{src}/cmake.deps/deps.txt"): + m = regex.fullmatch(line.strip()) if m is None: continue @@ -37,7 +37,7 @@ with open(dir / "treesitter-parsers.nix", "w") as f: f.write("{ fetchurl }:\n\n{\n") for lang, src in parsers.items(): f.write( - f""" {lang} = fetchurl {{ + f""" {lang}.src = fetchurl {{ url = "{src["URL"]}"; hash = "sha256:{src["SHA256"]}"; }}; diff --git a/pkgs/by-name/tu/turtle/package.nix b/pkgs/by-name/tu/turtle/package.nix new file mode 100644 index 000000000000..2d80802df53b --- /dev/null +++ b/pkgs/by-name/tu/turtle/package.nix @@ -0,0 +1,78 @@ +{ + lib, + python3Packages, + fetchFromGitLab, + gobject-introspection, + wrapGAppsHook4, + libadwaita, +}: + +python3Packages.buildPythonApplication rec { + pname = "turtle"; + version = "0.8"; + pyproject = true; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "philippun1"; + repo = "turtle"; + rev = version; + hash = "sha256-YacuT5S6WrhSz031XXCQTo++r+DBozrIIXrn9BwmrR0="; + }; + + postPatch = '' + substituteInPlace ./install.py \ + --replace-fail "/usr" "$out" \ + --replace-fail "gtk-update-icon-cache" "gtk4-update-icon-cache" + ''; + + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook4 + ]; + + buildInputs = [ libadwaita ]; + + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ + pygobject3 + pygit2 + ]; + + postInstall = '' + python ./install.py install + ''; + + # Avoid wrapping two times + dontWrapGApps = true; + + # Make sure we patch other scripts after wrapper is generated + # to get $program_PYTHONPATH + dontWrapPythonPrograms = true; + + postFixup = + '' + makeWrapperArgs+=(''${gappsWrapperArgs[@]}) + wrapPythonPrograms + '' + # Dialogs are not imported, but executed. The same does + # nautilus-python plugins. So we need to patch them as well. + + '' + for dialog_scripts in $out/lib/python*/site-packages/turtlevcs/dialogs/*.py; do + patchPythonScript $dialog_scripts + done + for nautilus_extensions in $out/share/nautilus-python/extensions/*.py; do + patchPythonScript $nautilus_extensions + done + ''; + + meta = { + description = "A graphical interface for version control intended to run on gnome and nautilus"; + homepage = "https://gitlab.gnome.org/philippun1/turtle"; + license = lib.licenses.gpl3Plus; + mainProgram = "turtle_cli"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/wa/waylock/build.zig.zon.nix b/pkgs/by-name/wa/waylock/build.zig.zon.nix new file mode 100644 index 000000000000..a0d4d9ac0971 --- /dev/null +++ b/pkgs/by-name/wa/waylock/build.zig.zon.nix @@ -0,0 +1,20 @@ +# generated by zon2nix (https://github.com/nix-community/zon2nix) + +{ linkFarm, fetchzip }: + +linkFarm "zig-packages" [ + { + name = "1220840390382c88caf9b0887f6cebbba3a7d05960b8b2ee6d80567b2950b71e5017"; + path = fetchzip { + url = "https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.1.0.tar.gz"; + hash = "sha256-xilmsDGWlkfpTiGff+/nb76jx87ANdr4zqYy6rKOBMg="; + }; + } + { + name = "1220b0f8f822c1625af7aae4cb3ab2c4ec1a4c0e99ef32867b2a8d88bb070b3e7f6d"; + path = fetchzip { + url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.1.0.tar.gz"; + hash = "sha256-VLEx8nRgmJZWgLNBRqrR7bZEkW0m5HTRv984HKwoIfA="; + }; + } +] diff --git a/pkgs/applications/misc/waylock/default.nix b/pkgs/by-name/wa/waylock/package.nix similarity index 61% rename from pkgs/applications/misc/waylock/default.nix rename to pkgs/by-name/wa/waylock/package.nix index 9ed2cc12131e..a4b8facf555d 100644 --- a/pkgs/applications/misc/waylock/default.nix +++ b/pkgs/by-name/wa/waylock/package.nix @@ -1,18 +1,20 @@ -{ lib -, stdenv -, fetchFromGitea -, libxkbcommon -, pam -, pkg-config -, scdoc -, wayland -, wayland-protocols -, zig_0_11 +{ + lib, + stdenv, + callPackage, + fetchFromGitea, + libxkbcommon, + pam, + pkg-config, + scdoc, + wayland, + wayland-protocols, + zig_0_12, }: stdenv.mkDerivation (finalAttrs: { pname = "waylock"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitea { domain = "codeberg.org"; @@ -20,14 +22,16 @@ stdenv.mkDerivation (finalAttrs: { repo = "waylock"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-Z5YNaR+jocJ4hS7NT8oAlrMnqNfD8KRzOyyqdVGDSl0="; + hash = "sha256-U8xJucLpmeLdmSUc+AVSH/mlv6UOXsxotJPTMK7lnkA="; }; + deps = callPackage ./build.zig.zon.nix { }; + nativeBuildInputs = [ pkg-config scdoc wayland - zig_0_11.hook + zig_0_12.hook ]; buildInputs = [ @@ -36,7 +40,11 @@ stdenv.mkDerivation (finalAttrs: { pam ]; - zigBuildFlags = [ "-Dman-pages" ]; + zigBuildFlags = [ + "-Dman-pages" + "--system" + "${finalAttrs.deps}" + ]; passthru.updateScript = ./update.nu; @@ -45,7 +53,10 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://codeberg.org/ifreund/waylock/releases/tag/v${finalAttrs.version}"; description = "A small screenlocker for Wayland compositors"; license = lib.licenses.isc; - maintainers = with lib.maintainers; [ adamcstephens jordanisaacs ]; + maintainers = with lib.maintainers; [ + adamcstephens + jordanisaacs + ]; mainProgram = "waylock"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/wa/waylock/update.nu b/pkgs/by-name/wa/waylock/update.nu new file mode 100755 index 000000000000..e227fb646517 --- /dev/null +++ b/pkgs/by-name/wa/waylock/update.nu @@ -0,0 +1,8 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i nu -p nushell common-updater-scripts zon2nix + +let latest_tag = list-git-tags --url=https://codeberg.org/ifreund/waylock | lines | sort --natural | str replace v '' | last +update-source-version waylock $latest_tag + +http get $"https://codeberg.org/ifreund/waylock/raw/tag/v($latest_tag)/build.zig.zon" | save build.zig.zon +zon2nix > pkgs/by-name/wa/waylock/build.zig.zon.nix diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 68b648846ea4..b8967d64794f 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kotlin"; - version = "1.9.24"; + version = "2.0.0"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "sha256-63to4BAp+me8jQYO5UwSAY8sYN3EOM8h2xRRcimqaTs="; + sha256 = "sha256-71eHMJdhVP0sWWjXWvjCcDs96Ep43/6RP2cDJuFJ2js="; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/libraries/jose/default.nix b/pkgs/development/libraries/jose/default.nix index 967886ae86c6..39e10e2dbebd 100644 --- a/pkgs/development/libraries/jose/default.nix +++ b/pkgs/development/libraries/jose/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "jose"; - version = "13"; + version = "14"; src = fetchFromGitHub { owner = "latchset"; repo = pname; rev = "v${version}"; - hash = "sha256-XkYvBjPmwhwo2p8/jTXazHRAgSGkI7LTLUlqbxMxlys="; + hash = "sha256-rMNPJaCtVpbwIkMQzBNpmRct6S/NelTwjmsuB0RP6R8="; }; nativeBuildInputs = [ meson pkg-config ninja asciidoc ]; diff --git a/pkgs/development/python-modules/caio/default.nix b/pkgs/development/python-modules/caio/default.nix index f8c3df017a8a..61a2a6ecb4e7 100644 --- a/pkgs/development/python-modules/caio/default.nix +++ b/pkgs/development/python-modules/caio/default.nix @@ -7,22 +7,25 @@ pytest-aiohttp, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "caio"; version = "0.9.13"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "mosquito"; - repo = pname; + repo = "caio"; rev = "refs/tags/${version}"; hash = "sha256-Q87NuL6yZ5uKImQqqdKTMWNyfUOb4NaZDEvNdqZbHDk="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ aiomisc pytest-aiohttp diff --git a/pkgs/development/python-modules/chromadb/default.nix b/pkgs/development/python-modules/chromadb/default.nix index 471b6111a93d..ed4c8d541a14 100644 --- a/pkgs/development/python-modules/chromadb/default.nix +++ b/pkgs/development/python-modules/chromadb/default.nix @@ -150,10 +150,11 @@ buildPythonPackage rec { meta = with lib; { description = "The AI-native open-source embedding database"; - mainProgram = "chroma"; homepage = "https://github.com/chroma-core/chroma"; changelog = "https://github.com/chroma-core/chroma/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; + mainProgram = "chroma"; + broken = stdenv.isLinux && stdenv.isAarch64; }; } diff --git a/pkgs/development/python-modules/circus/default.nix b/pkgs/development/python-modules/circus/default.nix index 7445dd1a6465..2a2d8e3c5d5f 100644 --- a/pkgs/development/python-modules/circus/default.nix +++ b/pkgs/development/python-modules/circus/default.nix @@ -6,6 +6,7 @@ flit-core, psutil, pytestCheckHook, + pythonOlder, pyyaml, pyzmq, tornado, @@ -14,16 +15,18 @@ buildPythonPackage rec { pname = "circus"; version = "0.18.0"; - format = "pyproject"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; hash = "sha256-GTzoIk4GjO1mckz0gxBvtmdLUaV1g6waDn7Xp+6Mcas="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ psutil pyzmq tornado @@ -41,38 +44,39 @@ buildPythonPackage rec { disabledTests = [ # these tests raise circus.tests.support.TimeoutException - "test_reload1" - "test_reload2" + "test_add_start" + "test_add" + "test_command_already_running" + "test_dummy" + "test_exits_within_graceful_timeout" + "test_full_stats" + "test_handler" + "test_handler" + "test_inherited" + "test_kills_after_graceful_timeout" + "test_launch_cli" + "test_max_age" "test_reload_sequential" "test_reload_uppercase" "test_reload_wid_1_worker" "test_reload_wid_4_workers" - "test_add" - "test_add_start" - "test_command_already_running" - "test_launch_cli" - "test_handler" + "test_reload1" + "test_reload2" "test_resource_watcher_max_cpu" - "test_resource_watcher_max_mem" "test_resource_watcher_max_mem_abs" + "test_resource_watcher_max_mem" "test_resource_watcher_min_cpu" - "test_resource_watcher_min_mem" "test_resource_watcher_min_mem_abs" - "test_full_stats" - "test_watchdog_discovery_found" - "test_watchdog_discovery_not_found" - "test_dummy" - "test_handler" + "test_resource_watcher_min_mem" + "test_set_before_launch" + "test_set_by_arbiter" + "test_signal" "test_stdin_socket" "test_stop_and_restart" "test_stream" - "test_inherited" - "test_set_before_launch" - "test_set_by_arbiter" - "test_max_age" - "test_signal" - "test_exits_within_graceful_timeout" - "test_kills_after_graceful_timeout" + "test_venv" + "test_watchdog_discovery_found" + "test_watchdog_discovery_not_found" # this test requires socket communication "test_plugins" ]; @@ -82,6 +86,8 @@ buildPythonPackage rec { meta = with lib; { description = "A process and socket manager"; homepage = "https://github.com/circus-tent/circus"; + changelog = "https://github.com/circus-tent/circus/releases/tag/${version}"; license = licenses.asl20; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/elastic-apm/default.nix b/pkgs/development/python-modules/elastic-apm/default.nix index 25ef39efea06..a9eccc7bbbc6 100644 --- a/pkgs/development/python-modules/elastic-apm/default.nix +++ b/pkgs/development/python-modules/elastic-apm/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "elastic-apm"; - version = "6.22.0"; + version = "6.22.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "elastic"; repo = "apm-agent-python"; rev = "refs/tags/v${version}"; - hash = "sha256-VuVx+QUiV4M/ebyv2uF/YZwfvcaPDJAEi55fXfoIttU="; + hash = "sha256-AHKF+o0iZ+c1JFq3lL5XdHBDAae9qTR1OJvwuUVsaeU="; }; pythonRelaxDeps = [ "wrapt" ]; diff --git a/pkgs/development/python-modules/gmpy2/default.nix b/pkgs/development/python-modules/gmpy2/default.nix index 7bf82ed02b2d..58f4cc08f672 100644 --- a/pkgs/development/python-modules/gmpy2/default.nix +++ b/pkgs/development/python-modules/gmpy2/default.nix @@ -51,11 +51,17 @@ buildPythonPackage rec { mpmath ]; - disabledTests = lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ - # issue with some overflow logic - "test_mpz_to_bytes" - "test_mpz_from_bytes" - ]; + disabledTests = + lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + # issue with some overflow logic + "test_mpz_to_bytes" + "test_mpz_from_bytes" + ] + ++ lib.optionals stdenv.isDarwin [ + # TypeError: mpq() requires numeric or string argument + # not sure why it only fails on Darwin + "test_mpq_from_Decimal" + ]; pythonImportsCheck = [ "gmpy2" ]; diff --git a/pkgs/development/python-modules/ha-philipsjs/default.nix b/pkgs/development/python-modules/ha-philipsjs/default.nix index 939dfdd8afca..805665b2b756 100644 --- a/pkgs/development/python-modules/ha-philipsjs/default.nix +++ b/pkgs/development/python-modules/ha-philipsjs/default.nix @@ -9,23 +9,26 @@ pytestCheckHook, pythonOlder, respx, + setuptools, }: buildPythonPackage rec { pname = "ha-philipsjs"; - version = "3.1.1"; - format = "setuptools"; + version = "3.2.1"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "danielperna84"; - repo = pname; + repo = "ha-philipsjs"; rev = "refs/tags/${version}"; - hash = "sha256-r8uqToxkJg9j89UUZpxsPXutWPefAYDW95zFBKU9Al4="; + hash = "sha256-gN7TPbNGw1vT0oAE6+Kg4V3J5dhYH+Gvv3JwptQ2aMk="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ cryptography httpx ]; @@ -40,7 +43,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "haphilipsjs" ]; meta = with lib; { - description = "Python library to interact with Philips TVs with jointSPACE API"; + description = "Library to interact with Philips TVs with jointSPACE API"; homepage = "https://github.com/danielperna84/ha-philipsjs"; changelog = "https://github.com/danielperna84/ha-philipsjs/releases/tag/${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/ics/default.nix b/pkgs/development/python-modules/ics/default.nix index c347b177587c..2f973a6dc981 100644 --- a/pkgs/development/python-modules/ics/default.nix +++ b/pkgs/development/python-modules/ics/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { version = "0.7.2"; pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ics-py"; @@ -25,9 +25,14 @@ buildPythonPackage rec { hash = "sha256-hdtnET7YfSb85+TGwpwzoxOfxPT7VSj9eKSiV6AXUS8="; }; - nativeBuildInputs = [ setuptools ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace-fail "--pep8" "" + ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ attrs arrow tatsu @@ -38,18 +43,13 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - # 0.8 will move to python-dateutil - substituteInPlace requirements.txt \ - --replace "arrow>=0.11,<0.15" "arrow" - substituteInPlace setup.cfg --replace "--pep8" "" - ''; - disabledTests = [ # Failure seems to be related to arrow > 1.0 "test_event" # Broke with TatSu 5.7: "test_many_lines" + # AssertionError: 'Europe/Berlin' not found in "tzfile('Atlantic/Jan_Mayen')" + "test_timezone_not_dropped" ]; pythonImportsCheck = [ "ics" ]; diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index e5ccec9371ee..f424240f91ea 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -2,16 +2,17 @@ lib, buildPythonPackage, fetchFromGitLab, + setuptools, pkg-config, lxml, libvirt, - nose, + pytestCheckHook, }: buildPythonPackage rec { pname = "libvirt"; version = "10.0.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitLab { owner = "libvirt"; @@ -20,16 +21,17 @@ buildPythonPackage rec { hash = "sha256-zl1Hfm7flRflNjIpLoLAlPDysYlieC05HEd/mzFW8pU="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libvirt lxml ]; - nativeCheckInputs = [ nose ]; - checkPhase = '' - nosetests - ''; + pythonImportsCheck = [ "libvirt" ]; + + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { homepage = "https://libvirt.org/python.html"; diff --git a/pkgs/development/python-modules/life360/default.nix b/pkgs/development/python-modules/life360/default.nix index 89a097d6e565..d8774ff34453 100644 --- a/pkgs/development/python-modules/life360/default.nix +++ b/pkgs/development/python-modules/life360/default.nix @@ -5,31 +5,34 @@ fetchFromGitHub, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "life360"; - version = "6.0.1"; - format = "setuptools"; + version = "7.0.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "pnbruckner"; - repo = pname; + repo = "life360"; rev = "refs/tags/v${version}"; - hash = "sha256-USqSkjOHlH0K/RlRYpn/gz6dHW8/uEVpsc4HeUZ3Emg="; + hash = "sha256-+fvzZ1IsPsXLTcfR7vrE4n1nF7CdvoL4BzDJMsDBZVY="; }; - propagatedBuildInputs = [ aiohttp ]; + build-system = [ setuptools ]; - # Project has no tests + dependencies = [ aiohttp ]; + + # Module has no tests doCheck = false; pythonImportsCheck = [ "life360" ]; meta = with lib; { - description = "Python module to interact with Life360"; + description = "Module to interact with Life360"; homepage = "https://github.com/pnbruckner/life360"; changelog = "https://github.com/pnbruckner/life360/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/losant-rest/default.nix b/pkgs/development/python-modules/losant-rest/default.nix index 21a285711976..81157ed9d23e 100644 --- a/pkgs/development/python-modules/losant-rest/default.nix +++ b/pkgs/development/python-modules/losant-rest/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "losant-rest"; - version = "1.19.6"; + version = "1.19.7"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Losant"; repo = "losant-rest-python"; rev = "refs/tags/v${version}"; - hash = "sha256-sbNR95FhcRhgHh/ulLC8lL6EHal0BBK3wP6i29VElmY="; + hash = "sha256-gn8YTnCAmAcmQxpgtitk2eRy3spveuU0peeHu/iSnCE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix b/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix index a92965db3398..dfe65b63c454 100644 --- a/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "microsoft-kiota-abstractions"; - version = "1.3.2"; + version = "1.3.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "kiota-abstractions-python"; rev = "refs/tags/v${version}"; - hash = "sha256-n9Erm21slKm+zDblhSHA5Cwxkyrcyx0w09ua3bUc5XI="; + hash = "sha256-TgHj5Ga6Aw/sN2Hobn0OocFB/iGRHTKEeOa2j2aqnRY="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/mkdocstrings-python/default.nix b/pkgs/development/python-modules/mkdocstrings-python/default.nix index 5e634d2da0ea..67ad47544107 100644 --- a/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mkdocstrings-python"; - version = "1.10.2"; + version = "1.10.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "python"; rev = "refs/tags/${version}"; - hash = "sha256-Dz74q7bsa8bInxn4RpP9MFXFDEL2yWifDe64K8AOl8k="; + hash = "sha256-OiG/dPsWO2Z4lGUlgPePRcsrotCu+fwesKhhh6YjmnU="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/mutag/default.nix b/pkgs/development/python-modules/mutag/default.nix index c0a173a7da9c..2d42f2008aa6 100644 --- a/pkgs/development/python-modules/mutag/default.nix +++ b/pkgs/development/python-modules/mutag/default.nix @@ -2,30 +2,39 @@ lib, buildPythonPackage, fetchFromGitHub, - isPy3k, pyparsing, + pythonOlder, + setuptools, }: buildPythonPackage { pname = "mutag"; - version = "0.0.2-2ffa0258ca"; - format = "setuptools"; - disabled = !isPy3k; + version = "0.0.2-unstable-2018-08-20"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "aroig"; repo = "mutag"; - rev = "2ffa0258cadaf79313241f43bf2c1caaf197d9c2"; - hash = "sha256-YT3DGvYPyTuB70gg6p/3oXcTahEPcNuSIqe56xu3rSs="; + rev = "9425169eb5d4aa9eb09f2809a09b83855b3acbef"; + hash = "sha256-fEMmFRoFyLkqusAuhdx3XEPaPsu1x86ACAz9Vkl9YfA="; }; - propagatedBuildInputs = [ pyparsing ]; + build-system = [ setuptools ]; + + dependencies = [ pyparsing ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "mutag" ]; meta = with lib; { - homepage = "https://github.com/aroig/mutag"; description = "A script to change email tags in a mu indexed maildir"; - mainProgram = "mutag"; - license = licenses.gpl3; + homepage = "https://github.com/aroig/mutag"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ ]; + mainProgram = "mutag"; }; } diff --git a/pkgs/development/python-modules/notifications-python-client/default.nix b/pkgs/development/python-modules/notifications-python-client/default.nix index 3ec2874c4591..1915ccd3fee9 100644 --- a/pkgs/development/python-modules/notifications-python-client/default.nix +++ b/pkgs/development/python-modules/notifications-python-client/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "notifications-python-client"; - version = "9.0.0"; + version = "9.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "alphagov"; repo = "notifications-python-client"; rev = "refs/tags/${version}"; - hash = "sha256-HDxCVwagHFenx0S2TPxiMIyyq4ovxe0yNi76sX2CC9s="; + hash = "sha256-qjiI+aTJLOz3XSTHKrpZrJ/wg1xP+V7ww0//xX3Kf1E="; }; postPatch = '' diff --git a/pkgs/development/python-modules/oras/default.nix b/pkgs/development/python-modules/oras/default.nix index 16a8a9d9fd6b..987b41dfaa2d 100644 --- a/pkgs/development/python-modules/oras/default.nix +++ b/pkgs/development/python-modules/oras/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "oras"; - version = "0.1.29"; + version = "0.1.30"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "oras-project"; repo = "oras-py"; rev = "refs/tags/${version}"; - hash = "sha256-ZV+J5zqRBRIddWdmLzzjpZi3M5E/HfkG8lWK9xzy5tw="; + hash = "sha256-qdWGqa5W+WI+lQ2TDZUuJF7PSmkc1Kv7UbWL6+Rfyio="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ppscore/default.nix b/pkgs/development/python-modules/ppscore/default.nix index 5593205dba6f..f523ffce1c82 100644 --- a/pkgs/development/python-modules/ppscore/default.nix +++ b/pkgs/development/python-modules/ppscore/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonRelaxDepsHook, setuptools, pandas, pytestCheckHook, @@ -23,7 +24,10 @@ buildPythonPackage rec { hash = "sha256-gJStsL8fN17kvXO8EH/NHGIBelPknJzYw5WEvHsFooU="; }; - nativeBuildInputs = [ setuptools ]; + nativeBuildInputs = [ + pythonRelaxDepsHook + setuptools + ]; propagatedBuildInputs = [ pandas @@ -32,6 +36,8 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + pythonRelaxDeps = [ "pandas" ]; + pythonImportsCheck = [ "ppscore" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pyannote-metrics/default.nix b/pkgs/development/python-modules/pyannote-metrics/default.nix index f5623e28b440..27d825a2859c 100644 --- a/pkgs/development/python-modules/pyannote-metrics/default.nix +++ b/pkgs/development/python-modules/pyannote-metrics/default.nix @@ -1,19 +1,20 @@ { lib, buildPythonPackage, + docopt, fetchFromGitHub, - setuptools, - wheel, + matplotlib, + numpy, + pandas, pyannote-core, pyannote-database, - pandas, - scipy, + pythonOlder, scikit-learn, - docopt, - tabulate, - matplotlib, + scipy, + setuptools, sympy, - numpy, + tabulate, + versioneer, }: buildPythonPackage rec { @@ -21,14 +22,26 @@ buildPythonPackage rec { version = "3.2.1"; pyproject = true; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "pyannote"; repo = "pyannote-metrics"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-V4qyaCaFsoikfFILm2sccf6m7lqJSDTdLxS1sr/LXAY="; }; - propagatedBuildInputs = [ + postPatch = '' + # Remove vendorized versioneer.py + rm versioneer.py + ''; + + build-system = [ + setuptools + versioneer + ]; + + dependencies = [ pyannote-core pyannote-database pandas @@ -41,18 +54,14 @@ buildPythonPackage rec { numpy ]; - nativeBuildInputs = [ - setuptools - wheel - ]; - pythonImportsCheck = [ "pyannote.metrics" ]; meta = with lib; { description = "A toolkit for reproducible evaluation, diagnostic, and error analysis of speaker diarization systems"; - mainProgram = "pyannote-metrics"; homepage = "https://github.com/pyannote/pyannote-metrics"; + changelog = "http://pyannote.github.io/pyannote-metrics/changelog.html"; license = licenses.mit; maintainers = with maintainers; [ ]; + mainProgram = "pyannote-metrics"; }; } diff --git a/pkgs/development/python-modules/pyrympro/default.nix b/pkgs/development/python-modules/pyrympro/default.nix new file mode 100644 index 000000000000..70ed0c42a0e6 --- /dev/null +++ b/pkgs/development/python-modules/pyrympro/default.nix @@ -0,0 +1,39 @@ +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "pyrympro"; + version = "0.0.8"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "OnFreund"; + repo = "pyrympro"; + rev = "refs/tags/v${version}"; + hash = "sha256-mRvKLPgtBgmFDTHqra7GslxsgsJpQ2w/DE0Zgz5jujk="; + }; + + build-system = [ setuptools ]; + + dependencies = [ aiohttp ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "pyrympro" ]; + + meta = with lib; { + description = "Module to interact with Read Your Meter Pro"; + homepage = "https://github.com/OnFreund/pyrympro"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/tabula-py/default.nix b/pkgs/development/python-modules/tabula-py/default.nix index 4556443136b2..0299d511c25a 100644 --- a/pkgs/development/python-modules/tabula-py/default.nix +++ b/pkgs/development/python-modules/tabula-py/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "tabula-py"; - version = "2.9.1"; + version = "2.9.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "chezou"; repo = "tabula-py"; rev = "refs/tags/v${version}"; - hash = "sha256-C06du4mhpnF2qxcEMZxp5O/8xpNaj9Jp8LFaxBkGF/Q="; + hash = "sha256-dEcVIlK3M7zqRMN7W7mnnMPWhM2A4/qvf0aY61ko4yE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 1eee4a02da4f..de66abd7a2c2 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1152"; + version = "3.0.1153"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-pmmZnTvZwpVD/ECjKzA6LQ2c7McYznJMlKabcYwh3LY="; + hash = "sha256-BDBRE7AKT5rKWW62Sx5M5jtF+ANU//Z9AUt1Jh1wFpo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/tools/continuous-integration/buildbot/master.nix b/pkgs/development/tools/continuous-integration/buildbot/master.nix index 7bf5eeab82ec..2a2911cf131f 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/master.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/master.nix @@ -72,14 +72,14 @@ let in buildPythonApplication rec { pname = "buildbot"; - version = "3.11.2"; + version = "3.11.3"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-x7RaApfIe1x7Py1KLQCcotxU6dJRXTOk67W+QOhNJf0="; + hash = "sha256-qcICSsjcgOrLG8zHBx0eSVSiXDAeHPH4roRZI9TZTkk="; }; build-system = [ diff --git a/pkgs/development/tools/continuous-integration/buildbot/pkg.nix b/pkgs/development/tools/continuous-integration/buildbot/pkg.nix index d121ec68cbde..a93cbf28e3b8 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/pkg.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/pkg.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-ZgDHPC2j3vV3m7wBZhUUh/Th/oGKq+8RxnfQ71Cr6oY="; + hash = "sha256-pO2TmTwbY0cnR+882pl7wDiR6JEK+sHHpAltKmTxiIM="; }; postPatch = '' diff --git a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix index ade8f2e243d4..7403498a8c61 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix @@ -8,7 +8,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-xOsz71kprzKKqvvwpsZTACWf4z+Svx9BQ72xGEZXKdw="; + hash = "sha256-EL5iZ257VXnL+29Jr6r3PVeURX1AcugfZ4RLTjClsXo="; }; # Remove unnecessary circular dependency on buildbot @@ -35,7 +35,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-wUiMEAFmqjHXPjnPhsaLWqxvOXyEQIeRBL4W3LB3vkw="; + hash = "sha256-5QLw5nXnU+z11E5Tgvu9bbbpCTRpV2zXndukcZPRjtE="; }; # Remove unnecessary circular dependency on buildbot @@ -62,7 +62,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-KerHS5F4b30TvlGeSf6QLUt49S6Iki7O5nex6KPypJY="; + hash = "sha256-tzqifo9A/KJF9dLpO7jblVaDjx7++v0wLz1Olc79JxI="; }; buildInputs = [ buildbot-pkg ]; @@ -84,7 +84,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-XrywoVM2ErJ4i7WrRKPRaCOwt5JVDJT6xP7L/Dfv+gk="; + hash = "sha256-fzaqYmaO+vWnQpUvOsPCny3W27atcIHsgeGV6dKEJeg="; }; buildInputs = [ buildbot-pkg ]; @@ -106,7 +106,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-mhVbuOhe0BrXHbn8bd41Q7I8Xak7fO8ahIK0r113vGY="; + hash = "sha256-BLIs91k8/A4LYMTDgct7TOWFoLU4qK47Javr8qRzkZQ="; }; buildInputs = [ buildbot-pkg ]; @@ -128,7 +128,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-X89XrjdD0GL7MabLWtkQcdCa4Ain1AGre6mXF/inmck="; + hash = "sha256-dX+tp+WidfLy612+41jz+do/iXQTaIQPcetG8td3jp4="; }; buildInputs = [ buildbot-pkg ]; @@ -150,7 +150,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-YH5SfYuW07Pp00LoBvcDB8MiHB1HzYWg5kQVICrkS5s="; + hash = "sha256-2kLGdvmf2mnF21gkDCf6h+bhnsxveaNNh95qczRY824="; }; buildInputs = [ buildbot-pkg ]; @@ -172,7 +172,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-rmyAsFCTeIYPdrlWDCxlbjw+BCKwcIaTHlK8KJP0T88="; + hash = "sha256-rIAbk9+6Wi1PCjizHp9p6jpCwaBgBT5Ch1Sa4VKDoww="; }; buildInputs = [ buildbot-pkg ]; @@ -194,7 +194,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-Ls3NJka5vVTx1GW9bnr3jlulj7/pNkX9omXrTIWrwtU="; + hash = "sha256-D9mjEKFrh+ytNbpuN/06XbiBnKjFLopXfjDg28j7niw="; }; buildInputs = [ buildbot-pkg ]; @@ -216,7 +216,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-t3LLZJ+kPcowqSyeRcuH3kEjBEiju1MI0z1qhU6KPBs="; + hash = "sha256-q3In0IMAIBUjxSzv4LlH9EJukLYJ3WzoEYkFBZB96W8="; }; buildInputs = [ buildbot-pkg ]; @@ -238,7 +238,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-//MftUqUWE2+RpxRPzDEH7tOCN2D1HD8dETZw1OQe5s="; + hash = "sha256-TK4KYn3CWxymTsKWeqHr2i5rdO9ZDHvJrb9RqfKNJV4="; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/tools/continuous-integration/buildbot/worker.nix b/pkgs/development/tools/continuous-integration/buildbot/worker.nix index 80e255153b77..071559eccf6c 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/worker.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/worker.nix @@ -28,7 +28,7 @@ buildPythonPackage (rec { src = fetchPypi { inherit pname version; - hash = "sha256-7DAo1Yy20FeWXawV4wHzXDGtgyIGDJQuD2joJma96rM="; + hash = "sha256-TFymBnUufOEWZ/IUKd7nebZ+yl58ZChFkGrUxOXn28g="; }; postPatch = '' diff --git a/pkgs/development/tools/database/dblab/default.nix b/pkgs/development/tools/database/dblab/default.nix index 52a0aefdcc93..0c9680c69289 100644 --- a/pkgs/development/tools/database/dblab/default.nix +++ b/pkgs/development/tools/database/dblab/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "dblab"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "danvergara"; repo = "dblab"; rev = "v${version}"; - hash = "sha256-eIkHaNFvXU9GGyYOH8lqzvwQQ6pz8zWeO4xY9jP25dU="; + hash = "sha256-PXIV9MLdBRTvXwvtKraX3530H/EDz+4HA7SeKyeEJB4="; }; vendorHash = "sha256-WzyH3Ja/Znk/9aavIoBQRpJVnGb5o/ded0g92MTa4M4="; diff --git a/pkgs/development/tools/misc/ttags/default.nix b/pkgs/development/tools/misc/ttags/default.nix index c765d0c308d4..b95bc53e2bea 100644 --- a/pkgs/development/tools/misc/ttags/default.nix +++ b/pkgs/development/tools/misc/ttags/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, rustPlatform, testers, ttags }: -let version = "0.3.0"; +let version = "0.4.1"; in rustPlatform.buildRustPackage { pname = "ttags"; inherit version; @@ -8,10 +8,10 @@ in rustPlatform.buildRustPackage { owner = "npezza93"; repo = "ttags"; rev = "${version}"; - hash = "sha256-yqrCcA/+FyGPpX3hhULiwhMfrDWjq+rzT04M+o9ry5s="; + hash = "sha256-yKg0KUA/Wa7B/sU1uxgGQR0Wat/bFv3ascqnUCdWKw0="; }; - cargoHash = "sha256-jW3xIlo2cN5aoEUp3FxN4pwGFvlg50i5RMNgQopGb88="; + cargoHash = "sha256-MZ9QRF5yNw+YtSEu+Qc/J3Ap7+nRDZT7aitunk+x38Y="; passthru.tests.version = testers.testVersion { package = ttags; diff --git a/pkgs/development/tools/rust/cargo-chef/default.nix b/pkgs/development/tools/rust/cargo-chef/default.nix index 27cc6e1042d7..277bc441226b 100644 --- a/pkgs/development/tools/rust/cargo-chef/default.nix +++ b/pkgs/development/tools/rust/cargo-chef/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-chef"; - version = "0.1.66"; + version = "0.1.67"; src = fetchCrate { inherit pname version; - sha256 = "sha256-I4lD3+WFaW0kPmw5lPybDCRkG/at6VQH6l7pmngwoLU="; + sha256 = "sha256-5bvA3lss+F2Wx0SSx5KRCmpERdIXUkUhFP+zRn8aZH0="; }; - cargoHash = "sha256-tSr4m10zS+/JynGmNY0+aoiYDATYwuyfr1VGKmIkHg4="; + cargoHash = "sha256-EIpi1k5GffGCk+fzHSW32T+ZLkRfswnEGZdER95TyBk="; meta = with lib; { description = "A cargo-subcommand to speed up Rust Docker builds using Docker layer caching"; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 9824cc333314..56a8d62cc20e 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -3802,7 +3802,8 @@ zeroconf ]; "rympro" = ps: with ps; [ - ]; # missing inputs: pyrympro + pyrympro + ]; "sabnzbd" = ps: with ps; [ pysabnzbd ]; @@ -5777,6 +5778,7 @@ "ruckus_unleashed" "ruuvi_gateway" "ruuvitag_ble" + "rympro" "sabnzbd" "samsungtv" "sanix" diff --git a/pkgs/servers/jellyfin/web.nix b/pkgs/servers/jellyfin/web.nix index a2437af14ee4..73bae649e834 100644 --- a/pkgs/servers/jellyfin/web.nix +++ b/pkgs/servers/jellyfin/web.nix @@ -26,16 +26,16 @@ let in buildNpmPackage' rec { pname = "jellyfin-web"; - version = "10.9.1"; + version = "10.9.2"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-web"; rev = "v${version}"; - hash = "sha256-KkPZ8OvGN/0gdoSVh9q0qEilae3tccgHRQQvrTsvycA="; + hash = "sha256-0MBVcMajRk+CR0nZ8Dtd3Mg4tKdLiHGs3AhI8BEqZyE="; }; - npmDepsHash = "sha256-LmbygyCYSp0gtjU2pNCV17WEyEoaIzPs7H9UoMFV+PU="; + npmDepsHash = "sha256-aN+EXHRXez26oS4Ad1d9HSBkwVKnvYQMJvJVypDCk+0="; npmBuildScript = [ "build:production" ]; diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix index 440d0e1d81af..00a3b156528e 100644 --- a/pkgs/servers/nats-server/default.nix +++ b/pkgs/servers/nats-server/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nats-server"; - version = "2.10.14"; + version = "2.10.16"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-+DdhdW8CCMprjR2XcOntkTDh5CHtEFHYFz7Htdptw3s="; + hash = "sha256-OyDDAx1jmemFn9D4VJPWrLJJM1YB8tZBC7N3xrUYodA="; }; - vendorHash = "sha256-4kBXVsKf1jD3zvaAy6Rb7zmIK1WPbi31GRvRghdEC/s="; + vendorHash = "sha256-g1BF0Xl3AwHKSJ3k/gfJN5L875SdoDGK0Lk2gUUq4y4="; doCheck = false; diff --git a/pkgs/tools/misc/hunt/default.nix b/pkgs/tools/misc/hunt/default.nix index 6163e8cf3b0d..69b9de8f7e3d 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.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "LyonSyonII"; repo = "hunt-rs"; rev = "v${version}"; - sha256 = "sha256-cpqietS/yTI5ONkH4jjIUOVATutd2vj9xmxRbBwmzeI="; + sha256 = "sha256-NKXZECtepuFg6qTuXF9Gnat/vnrygt3UOZb0YUKPqi8="; }; - cargoHash = "sha256-LWZaU+zHbfiogWXW9XGA3iP95u3qqh2LX9LL2lsQPLg="; + cargoHash = "sha256-ExwcFJVqQF/RTUyv1FvOCnlB+9Z7uhi/5UUjW7WcXTk="; meta = with lib; { description = "Simplified Find command made with Rust"; diff --git a/pkgs/tools/misc/ttyplot/default.nix b/pkgs/tools/misc/ttyplot/default.nix index 64b9b7cddfab..b68e2ba0bc69 100644 --- a/pkgs/tools/misc/ttyplot/default.nix +++ b/pkgs/tools/misc/ttyplot/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ttyplot"; - version = "1.6.4"; + version = "1.6.5"; src = fetchFromGitHub { owner = "tenox7"; repo = "ttyplot"; rev = version; - hash = "sha256-yxAFqi3TgiKiZYgR891ahkwUqZLk/JDsjujOYmBjUtk="; + hash = "sha256-DLFEnEo+EQuq4ziqo9qfyHGD1Zosk9Kb/80QjnI2aXk="; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ac2f98ab11d..c8e12b5370c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31767,8 +31767,6 @@ with pkgs; waycorner = callPackage ../applications/misc/waycorner { }; - waylock = callPackage ../applications/misc/waylock { }; - wayshot = callPackage ../tools/misc/wayshot { }; waylevel = callPackage ../tools/misc/waylevel { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 49635b86b0ab..98147d28fc0d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10016,6 +10016,8 @@ self: super: with self; { pyrogram = callPackage ../development/python-modules/pyrogram { }; + pyrympro = callPackage ../development/python-modules/pyrympro { }; + pysabnzbd = callPackage ../development/python-modules/pysabnzbd { }; pysbd = callPackage ../development/python-modules/pysbd { };