diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index bc894410620f..ba8a1e893384 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -345,6 +345,9 @@ Most prominently access to the webinterface and API are now protected by authentication. Retrieve the auto-created admin account from the `frigate.service` journal after upgrading. +- `nodePackages.coc-python` was dropped, as [its upstream is unmaintained](https://github.com/neoclide/coc-python). The associated `vimPlugins.coc-python` was also dropped. + The upstream project recommends using `coc-pyright` or `coc-jedi` as replacements. + - `services.forgejo.mailerPasswordFile` has been deprecated by the drop-in replacement `services.forgejo.secrets.mailer.PASSWD`, which is part of the new free-form `services.forgejo.secrets` option. `services.forgejo.secrets` is a small wrapper over systemd's `LoadCredential=`. It has the same structure (sections/keys) as diff --git a/nixos/modules/services/system/userborn.nix b/nixos/modules/services/system/userborn.nix index 07e8be34266e..bd3f2175b128 100644 --- a/nixos/modules/services/system/userborn.nix +++ b/nixos/modules/services/system/userborn.nix @@ -100,7 +100,7 @@ in lib.nameValuePair (toString opts.home) { d = { mode = opts.homeMode; - user = username; + user = opts.name; inherit (opts) group; }; } diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index 78077512363c..5b83e9968af8 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, appimageTools }: +{ lib, fetchurl, appimageTools, makeWrapper }: let pname = "plexamp"; @@ -23,6 +23,9 @@ appimageTools.wrapType2 { $out/share/icons/hicolor/scalable/apps/plexamp.svg substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' + source "${makeWrapper}/nix-support/setup-hook" + wrapProgram "$out/bin/plexamp" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" ''; passthru.updateScript = ./update-plexamp.sh; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 1d5a0e7cd365..c4ed286b997a 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -2729,7 +2729,6 @@ in "coc-metals" "coc-pairs" "coc-prettier" - "coc-python" "coc-r-lsp" "coc-rls" "coc-rust-analyzer" diff --git a/pkgs/applications/editors/vscode/extensions/pylyzer.pylyzer/default.nix b/pkgs/applications/editors/vscode/extensions/pylyzer.pylyzer/default.nix index c060c2c2982f..32a36e57b4b8 100644 --- a/pkgs/applications/editors/vscode/extensions/pylyzer.pylyzer/default.nix +++ b/pkgs/applications/editors/vscode/extensions/pylyzer.pylyzer/default.nix @@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "pylyzer"; publisher = "pylyzer"; - version = "0.1.8"; - hash = "sha256-GoY4cobxL64bREtgl7q/iR66axSM3tBrle/b9h3ED8Q="; + version = "0.1.10"; + hash = "sha256-dDkX0U/XmHk5Jo+VdvxDkcA/1xu0Ae8kaDuDd/xjdUc="; }; meta = { diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 8798a69f8bc6..6f6246702894 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -63,14 +63,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "telegram-desktop"; - version = "5.6.2"; + version = "5.6.3"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; - rev = "f2e0e481de5d379b9542f6ff9021fab5d409c1d4"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-MmzSxC4tgoCgrG/IQAmpXGHNq+kiU/rSWeKn1f1uEg8="; + hash = "sha256-frz425V5eRulNVxCf457TWQAzU/f9/szD/sx3/LYQ2Y="; }; patches = [ diff --git a/pkgs/applications/networking/qv2ray/default.nix b/pkgs/applications/networking/qv2ray/default.nix index 1105933a9afa..bf3dd2bd23e3 100644 --- a/pkgs/applications/networking/qv2ray/default.nix +++ b/pkgs/applications/networking/qv2ray/default.nix @@ -6,7 +6,7 @@ , qttools , cmake , grpc -, protobuf +, protobuf_21 , openssl , pkg-config , c-ares @@ -57,7 +57,7 @@ mkDerivation rec { libGL zlib grpc - protobuf + protobuf_21 openssl c-ares ]; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix index f7e21b796c54..f3384ed2ab21 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , cmake -, extra-cmake-modules +, pkg-config , ninja , wayland , wayland-scanner @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { "-DBUILD_PLUGIN=OFF" ]; - nativeBuildInputs = [ cmake extra-cmake-modules ninja wayland-scanner ]; + nativeBuildInputs = [ cmake ninja pkg-config wayland-scanner ]; buildInputs = [ libGL libffi diff --git a/pkgs/by-name/co/coroot/package.nix b/pkgs/by-name/co/coroot/package.nix new file mode 100644 index 000000000000..89c986323b1e --- /dev/null +++ b/pkgs/by-name/co/coroot/package.nix @@ -0,0 +1,62 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + fetchNpmDeps, + fetchpatch, + pkg-config, + nodejs, + npmHooks, + lz4, +}: + +buildGoModule rec { + pname = "coroot"; + version = "1.5.8"; + + src = fetchFromGitHub { + owner = "coroot"; + repo = "coroot"; + rev = "v${version}"; + hash = "sha256-c8i+JtmUzq8lsRU8NpR4p1EXtIljYs1uZAq3O5fMqa4="; + }; + # github.com/grafana/pyroscope-go/godeltaprof 0.1.6 is broken on go 1.23 + # use patch from https://github.com/coroot/coroot/pull/357 until it gets fixed + patches = [ + (fetchpatch { + url = "https://github.com/coroot/coroot/commit/9bf6ac0ad4dfaa7f13e6d9b5ce5e331d1478aafc.patch"; + hash = "sha256-5otqdYyQ57sNjF84CRgx0wcztsRdTdsNuhEkvGyw7UE="; + }) + ]; + + vendorHash = "sha256-W0UNw8FEIHDKQDCjBryDSJB/UhNyAtMxC6A/9lr79sg="; + npmDeps = fetchNpmDeps { + src = "${src}/front"; + hash = "sha256-inZV+iv837+7ntBae/oLSNLxpzoqEcJNPNdBE+osJHQ="; + }; + + nativeBuildInputs = [ + pkg-config + nodejs + npmHooks.npmConfigHook + ]; + buildInputs = [ lz4 ]; + + overrideModAttrs = oldAttrs: { + nativeBuildInputs = lib.remove npmHooks.npmConfigHook oldAttrs.nativeBuildInputs; + preBuild = null; + }; + + npmRoot = "front"; + preBuild = '' + npm --prefix="$npmRoot" run build-prod + ''; + + meta = { + description = "Open-source APM & Observability tool"; + homepage = "https://coroot.com"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ errnoh ]; + mainProgram = "coroot"; + }; +} diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index 370ebd6d14e5..c06b8d0f746b 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -166,11 +166,11 @@ let linux = stdenv.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "129.0.6668.100"; + version = "130.0.6723.58"; src = fetchurl { url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-5NITOnDEVd5PeyWT9rPVgFv5W5bP2h+bLM30hjmpgzs="; + hash = "sha256-HWFC+9Op4ja/S3eP56N9hkOkMbCrbF+NHEcxSLb85Hg="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -266,11 +266,11 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "129.0.6668.101"; + version = "130.0.6723.59"; src = fetchurl { - url = "http://dl.google.com/release2/chrome/j4koa2lwvw3lho34hvastakhfi_129.0.6668.101/GoogleChrome-129.0.6668.101.dmg"; - hash = "sha256-rwH7BqOyszmybadZ4gtJHoVxxjcjZLHcOku+YxZH88w="; + url = "http://dl.google.com/release2/chrome/oehlfkedv43jkzlol2mqd6xife_130.0.6723.59/GoogleChrome-130.0.6723.59.dmg"; + hash = "sha256-ioEWtD49XtZTItz+bCiDobV0nW82Dv6S41/oHlUsatU="; }; dontPatch = true; diff --git a/pkgs/by-name/go/google-chrome/update.sh b/pkgs/by-name/go/google-chrome/update.sh index cf5113eac6a8..e7d2988ffe0a 100755 --- a/pkgs/by-name/go/google-chrome/update.sh +++ b/pkgs/by-name/go/google-chrome/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -I nixpkgs=./. -i bash -p curl jq gawk libossp_uuid libxml2 nix +# shellcheck shell=bash set -euo pipefail @@ -10,7 +11,7 @@ get_version_info() { local start_pattern="$2" local end_pattern="$3" - local url="https://versionhistory.googleapis.com/v1/chrome/platforms/${platform}/channels/stable/versions/all/releases?filter=endtime=none,fraction>=0.5&order_by=version%20desc" + local url="https://versionhistory.googleapis.com/v1/chrome/platforms/${platform}/channels/stable/versions/all/releases?filter=endtime=none,fraction%3E=0.5&order_by=version%20desc" local response local version local current_version diff --git a/pkgs/by-name/ho/homebank/package.nix b/pkgs/by-name/ho/homebank/package.nix index ff5a4f5e86fb..74eafcc0ac37 100644 --- a/pkgs/by-name/ho/homebank/package.nix +++ b/pkgs/by-name/ho/homebank/package.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "homebank"; - version = "5.8.3"; + version = "5.8.5"; src = fetchurl { url = "https://www.gethomebank.org/public/sources/homebank-${version}.tar.gz"; - hash = "sha256-5Ag9UjAdxT5R6cYV6VT7ktaVHqd0kzQoLCpfS5q5xMI="; + hash = "sha256-TrRFHleEA5VGjC1qP+TQFq2gun1Hyn8c7AQYwKEznpc="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook3 intltool ]; diff --git a/pkgs/by-name/ja/jam/package.nix b/pkgs/by-name/ja/jam/package.nix index 584617180db6..9fbe6f4c7724 100644 --- a/pkgs/by-name/ja/jam/package.nix +++ b/pkgs/by-name/ja/jam/package.nix @@ -49,21 +49,26 @@ stdenv.mkDerivation (finalAttrs: { export AR="$AR rc" ''; - # When cross-compiling, we need to set the preprocessor macros - # OSMAJOR/OSMINOR/OSPLAT to the values from the target platform, not the host - # platform. This looks a little ridiculous because the vast majority of build - # tools don't embed target-specific information into their binary, but in this - # case we behave more like a compiler than a make(1)-alike. - postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) '' - cat >>jam.h <>jam.h < Jamfile + os=$(jam -d0) + [[ $os != UNKNOWN* ]] && touch $out + ''; + }; }; meta = { diff --git a/pkgs/by-name/ma/marwaita-icons/package.nix b/pkgs/by-name/ma/marwaita-icons/package.nix index 022e56b834e5..73c40ae4b257 100644 --- a/pkgs/by-name/ma/marwaita-icons/package.nix +++ b/pkgs/by-name/ma/marwaita-icons/package.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "marwaita-icons"; - version = "5.0"; + version = "5.1"; src = fetchFromGitHub { owner = "darkomarko42"; repo = "marwaita-icons"; rev = version; - hash = "sha256-6NFCXj80VAoFX+i4By5IpbtJC4qL+sAzlLHUJjTQ/sI="; + hash = "sha256-UehujziT13kA9ltjyCvbSDTEpR8ISxoBpoLj22Zih8k="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sn/snips-sh/package.nix b/pkgs/by-name/sn/snips-sh/package.nix index 9d3ee7d58854..93931e2bc4e7 100644 --- a/pkgs/by-name/sn/snips-sh/package.nix +++ b/pkgs/by-name/sn/snips-sh/package.nix @@ -8,14 +8,14 @@ }: buildGoModule rec { pname = "snips-sh"; - version = "0.4.0"; - vendorHash = "sha256-u2f9aHUrfuM4ZsTWA955sCkgcGBFlNhEU2Qlq2C2Kso="; + version = "0.4.1"; + vendorHash = "sha256-weqlhnhUG2gn9SFS63q1LYmPa7liGYYcJN5qorj6x2E="; src = fetchFromGitHub { owner = "robherley"; repo = "snips.sh"; rev = "v${version}"; - hash = "sha256-gfZFLlTFofYQ72rQjgB8g012vbxFjk8bLYTVJwZNgMs="; + hash = "sha256-FEo2/TPwes8/Iwfp7OIo1HbLWF9xmVS9ZMC9HysyK/k="; }; tags = (lib.optional (!withTensorflow) "noguesser"); diff --git a/pkgs/by-name/so/soju/package.nix b/pkgs/by-name/so/soju/package.nix index 7dcf633ecdf8..313c4d04368a 100644 --- a/pkgs/by-name/so/soju/package.nix +++ b/pkgs/by-name/so/soju/package.nix @@ -9,17 +9,17 @@ buildGoModule rec { pname = "soju"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitea { domain = "codeberg.org"; owner = "emersion"; repo = "soju"; rev = "v${version}"; - hash = "sha256-Zhqmek7dvuyMb35XkAHXUaSiQZaGgGWtM09Dj84DDIM="; + hash = "sha256-zJj9y3llJOijmx7+C5NOzEpIG/SEeg+ZhWtLPQ/iabY="; }; - vendorHash = "sha256-t3jupiEuxWDFMfBiQ07il7lnmqG6zrV68lRNH1Gts4k="; + vendorHash = "sha256-E/9a8GCEb/0Xto6cgH9R4WWdaoo/nwb6kcFdoEeMUps="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/td/tdnf/package.nix b/pkgs/by-name/td/tdnf/package.nix index a0749f2a003d..745f6af0eeee 100644 --- a/pkgs/by-name/td/tdnf/package.nix +++ b/pkgs/by-name/td/tdnf/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tdnf"; - version = "3.5.8"; + version = "3.5.9"; src = fetchFromGitHub { owner = "vmware"; repo = "tdnf"; rev = "v${finalAttrs.version}"; - hash = "sha256-rs6NMIwpJCBsO7Ca+za8pVJXQwpcgFvpd15ayS01mQM="; + hash = "sha256-p9g+b7Fqq8V6QSaikEQMMHWqBf4UtRA9a/VtH+s5JUM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ti/tiny-dfr/package.nix b/pkgs/by-name/ti/tiny-dfr/package.nix index ec737de3e557..b521311f6c07 100644 --- a/pkgs/by-name/ti/tiny-dfr/package.nix +++ b/pkgs/by-name/ti/tiny-dfr/package.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "tiny-dfr"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "WhatAmISupposedToPutHere"; repo = "tiny-dfr"; rev = "v${version}"; - hash = "sha256-0nopB2gCa80hwXoEaVuGhPOncLFA/u5XydCSPiCDUlg="; + hash = "sha256-5u5jyoDEt7aMs8/8QrhrUrUzFJJCNayqbN2WrMhUCV4="; }; - cargoHash = "sha256-w3trbTbRfHNekQ+mKHsq8O29S33QsdTdBawxDm3+Szs="; + cargoHash = "sha256-repPyeIVM2ufG5NhJHGbZUaxOItiTZTxiCZ21Fpt0wM="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ cairo gdk-pixbuf glib libinput libxml2 pango udev ]; diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index 8170852020e2..c579941e4247 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,12 +3,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20240920063125"; + version = "20241013063848"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-NNBC7Pd8mxPuC2LVmedZLtvsnw2LfbD+VEPwtTU5DQE="; + hash = "sha256-YFsz+fT2LPU4TakQ2V1PtETmnXI5r3qAaERAqM9mX5g="; }; vendorHash = "sha256-NLh14rXRci4hgDkBJVJDIDvobndB7KYRKAX7UjyqSsg="; meta = with lib; { diff --git a/pkgs/development/libraries/libcdada/default.nix b/pkgs/development/libraries/libcdada/default.nix index 8b1e4e0c7ab4..bb0593c1bf02 100644 --- a/pkgs/development/libraries/libcdada/default.nix +++ b/pkgs/development/libraries/libcdada/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libcdada"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "msune"; repo = "libcdada"; rev = "v${version}"; - hash = "sha256-fgH4gl8Uq8mY9gxa968suU66VJYnFzpSLj4JGpJcJA4="; + hash = "sha256-x//22FvgxIGL9H2whMAVCTyI9gAjlMWkEmpOAcoeOgE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index a748f3a86c57..0f9cf4466261 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, zlib, zstd, pkg-config, python3, openssl, which }: +{ lib, stdenv, fetchFromGitHub, zlib, zstd, pkg-config, python3, openssl, which, curl }: stdenv.mkDerivation rec { pname = "rdkafka"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config python3 which ]; - buildInputs = [ zlib zstd openssl ]; + buildInputs = [ zlib zstd openssl curl ]; env.NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow"; diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index b81b0d60678a..4e315d23ef5b 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -74,6 +74,7 @@ mapAliases { inherit (pkgs) coc-diagnostic; # added 2024-06-29 coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21 inherit (pkgs) coc-pyright; # added 2024-07-14 + coc-python = throw "coc-python was removed because it was abandoned upstream on 2020-12-24. Upstream now recommends using coc-pyright or coc-jedi instead."; # added 2024-10-15 coinmon = throw "coinmon was removed since it was abandoned upstream"; # added 2024-03-19 coffee-script = pkgs.coffeescript; # added 2023-08-18 inherit (pkgs) concurrently; # added 2024-08-05 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index ba88f38d9fcf..9c50df42a0d2 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -47,7 +47,6 @@ , "coc-metals" , "coc-pairs" , "coc-prettier" -, "coc-python" , "coc-r-lsp" , "coc-rls" , "coc-rust-analyzer" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 5183a1811ca7..ef6e6f2e90e9 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -61238,24 +61238,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-python = nodeEnv.buildNodePackage { - name = "coc-python"; - packageName = "coc-python"; - version = "1.2.13"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-python/-/coc-python-1.2.13.tgz"; - sha512 = "thsXkbwwJMpiGa/1GiPvFnbWtC5K8QcZvcUtoc4lU8Hf38LbywK5qRp6M7tOAabJOq5dYcIYYbPZWzGwhoZEiw=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Python extension for coc.nvim, forked from vscode-python."; - homepage = "https://github.com/neoclide/coc-python#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-r-lsp = nodeEnv.buildNodePackage { name = "coc-r-lsp"; packageName = "coc-r-lsp"; diff --git a/pkgs/development/python-modules/aioftp/default.nix b/pkgs/development/python-modules/aioftp/default.nix index a926f96b8d12..9d3778b864b5 100644 --- a/pkgs/development/python-modules/aioftp/default.nix +++ b/pkgs/development/python-modules/aioftp/default.nix @@ -5,6 +5,7 @@ buildPythonPackage, fetchPypi, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, setuptools, @@ -14,24 +15,17 @@ buildPythonPackage rec { pname = "aioftp"; - version = "0.22.3"; + version = "0.23.1"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-uqKxMYaqAWIuS4LyfC9I9Nr7SORXprGPzamakl4NwnA="; + hash = "sha256-uA6t2MqV0ru8+r594Vy+AawRey50Z3FzdN5Ge62TVws="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov" "" - ''; - - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ siosocks ]; + build-system = [ setuptools ]; optional-dependencies = { socks = [ siosocks ]; @@ -40,6 +34,7 @@ buildPythonPackage rec { nativeCheckInputs = [ async-timeout pytest-asyncio + pytest-cov-stub pytestCheckHook trustme ] ++ lib.flatten (builtins.attrValues optional-dependencies); diff --git a/pkgs/development/python-modules/gcovr/default.nix b/pkgs/development/python-modules/gcovr/default.nix index c6ec91b5946b..0344d56a5dfe 100644 --- a/pkgs/development/python-modules/gcovr/default.nix +++ b/pkgs/development/python-modules/gcovr/default.nix @@ -7,22 +7,25 @@ lxml, pygments, pythonOlder, + setuptools, tomli, }: buildPythonPackage rec { pname = "gcovr"; - version = "7.2"; - format = "setuptools"; + version = "8.2"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-4+lctWyojbvnQctdaaor5JTrL8KgnuT2UWRKZw7lrrM="; + hash = "sha256-mh3d1FhdE+x3VV211rajHugVh+pvxgT/n80jLLB4LfU="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ colorlog jinja2 lxml @@ -41,10 +44,10 @@ buildPythonPackage rec { meta = { description = "Python script for summarizing gcov data"; - mainProgram = "gcovr"; homepage = "https://www.gcovr.com/"; changelog = "https://github.com/gcovr/gcovr/blob/${version}/CHANGELOG.rst"; license = lib.licenses.bsd0; maintainers = with lib.maintainers; [ sigmanificient ]; + mainProgram = "gcovr"; }; } diff --git a/pkgs/development/python-modules/libknot/default.nix b/pkgs/development/python-modules/libknot/default.nix index 7d0ce1a2ed28..abaccdefa96f 100644 --- a/pkgs/development/python-modules/libknot/default.nix +++ b/pkgs/development/python-modules/libknot/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "libknot"; - version = "3.4.0"; + version = "3.4.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-BtESc9BIZeDNNPJYyMLTeMsNHm+xBcLueyJ7/1iXFos="; + hash = "sha256-NJmOm2PIbH4GeDN1XlKKeLePHGatDQlWDPJtn5tUO3s="; }; postPatch = '' diff --git a/pkgs/development/python-modules/nvidia-ml-py/default.nix b/pkgs/development/python-modules/nvidia-ml-py/default.nix index 95604dcb20d7..08beac0daf50 100644 --- a/pkgs/development/python-modules/nvidia-ml-py/default.nix +++ b/pkgs/development/python-modules/nvidia-ml-py/default.nix @@ -40,10 +40,20 @@ buildPythonPackage rec { passthru.tests.tester-nvmlInit = cudaPackages.writeGpuTestPython { libraries = [ nvidia-ml-py ]; } '' - import pynvml - from pynvml.smi import nvidia_smi # noqa: F401 + from pynvml import ( + nvmlInit, + nvmlSystemGetDriverVersion, + nvmlDeviceGetCount, + nvmlDeviceGetHandleByIndex, + nvmlDeviceGetName, + ) - print(f"{pynvml.nvmlInit()=}") + nvmlInit() + print(f"Driver Version: {nvmlSystemGetDriverVersion()}") + + for i in range(nvmlDeviceGetCount()): + handle = nvmlDeviceGetHandleByIndex(i) + print(f"Device {i} : {nvmlDeviceGetName(handle)}") ''; meta = { diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix index f4d91fe0ce62..ce9d31be5aa0 100644 --- a/pkgs/development/python-modules/onnx/default.nix +++ b/pkgs/development/python-modules/onnx/default.nix @@ -1,24 +1,30 @@ { lib, - stdenv, buildPythonPackage, - cmake, fetchFromGitHub, - gtest, - nbval, - numpy, - parameterized, - protobuf_21, + + # build-system + cmake, pybind11, - pytestCheckHook, - pythonOlder, - tabulate, - typing-extensions, - abseil-cpp, - google-re2, - pillow, - protobuf, setuptools, + + # nativeBuildInputs + protobuf-core, + + # buildInputs + abseil-cpp, + protobuf, + gtest, + + # dependencies + numpy, + + google-re2, + nbval, + parameterized, + pillow, + pytestCheckHook, + tabulate, }: let @@ -29,8 +35,6 @@ buildPythonPackage rec { version = "1.17.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "onnx"; repo = "onnx"; @@ -45,12 +49,11 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ - protobuf_21 # for protoc + protobuf-core # `protoc` required ]; buildInputs = [ abseil-cpp - protobuf_21 gtestStatic pybind11 ]; @@ -58,7 +61,6 @@ buildPythonPackage rec { dependencies = [ protobuf numpy - typing-extensions ]; nativeCheckInputs = [ @@ -109,31 +111,6 @@ buildPythonPackage rec { "examples" ]; - disabledTests = - [ - # attempts to fetch data from web - "test_bvlc_alexnet_cpu" - "test_densenet121_cpu" - "test_inception_v1_cpu" - "test_inception_v2_cpu" - "test_resnet50_cpu" - "test_shufflenet_cpu" - "test_squeezenet_cpu" - "test_vgg19_cpu" - "test_zfnet512_cpu" - ] - ++ lib.optionals stdenv.hostPlatform.isAarch64 [ - # AssertionError: Output 0 of test 0 in folder - "test__pytorch_converted_Conv2d_depthwise_padded" - "test__pytorch_converted_Conv2d_dilated" - "test_dft" - "test_dft_axis" - # AssertionError: Mismatch in test 'test_Conv2d_depthwise_padded' - "test_xor_bcast4v4d" - # AssertionError: assert 1 == 0 - "test_ops_tested" - ]; - __darwinAllowLocalNetworking = true; postCheck = '' @@ -143,11 +120,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "onnx" ]; - meta = with lib; { - changelog = "https://github.com/onnx/onnx/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; + meta = { description = "Open Neural Network Exchange"; homepage = "https://onnx.ai"; - license = licenses.asl20; - maintainers = with maintainers; [ acairncross ]; + changelog = "https://github.com/onnx/onnx/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ acairncross ]; }; } diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix index 998eeb79aadd..265adff8273d 100644 --- a/pkgs/development/python-modules/opower/default.nix +++ b/pkgs/development/python-modules/opower/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "opower"; - version = "0.8.3"; + version = "0.8.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "opower"; rev = "refs/tags/v${version}"; - hash = "sha256-W/EsiSNFPSJj81ykcEM3YRnRZDJDKvfOUuV98Sk4Gwo="; + hash = "sha256-UwiEUHLeGK7WsQ8RPmHAjPVXgFf6N5upJIKMp54NSjs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix index 1cd8c6e8a91d..55923513fbfc 100644 --- a/pkgs/development/python-modules/pydeconz/default.nix +++ b/pkgs/development/python-modules/pydeconz/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pydeconz"; - version = "117"; + version = "118"; pyproject = true; disabled = pythonOlder "3.12"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "deconz"; rev = "refs/tags/v${version}"; - hash = "sha256-G04Lb92yrSQBs/Vc3wW60jR74nsWzfjAUfQPzqVhoLk="; + hash = "sha256-CbV/LGj09TfLYvaVGr2+LV76DRkz0kw7qsGbtL5A45g="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index e0efa2fd575f..8b7a742e6971 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -17,16 +17,16 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.14.1"; + version = "1.14.2"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "iMicknl"; repo = "python-overkiz-api"; rev = "refs/tags/v${version}"; - hash = "sha256-mpD8seRGZZ+1Rgg1ADFiFgYZ1JmLRNdscRwfXIK6Pr4="; + hash = "sha256-6ytfmdyVd7AFIWLSKCDpPHEKCy/EsGnOS+1i/bTO0Xs="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/stdlib-list/default.nix b/pkgs/development/python-modules/stdlib-list/default.nix index 6109e6ce2fc7..e4c3fbfa2296 100644 --- a/pkgs/development/python-modules/stdlib-list/default.nix +++ b/pkgs/development/python-modules/stdlib-list/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "stdlib-list"; - version = "0.10.0"; + version = "0.11.0"; format = "pyproject"; src = fetchPypi { pname = "stdlib_list"; inherit version; - hash = "sha256-ZRnFDWRVE+0odle/6FbVJ/J3MxVAaR3er3eyVFmWShQ="; + hash = "sha256-t0p7ZDp3oSY36Qfz9i8KufZzALzkAU9rLTyLTI/WPGY="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 5c2c1aff4b3b..be500fff02e9 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.1249"; + version = "3.0.1251"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-I3/nEiCgZaAX32Kj2w+qWPwL5frxOdpLGF7dzBsptr8="; + hash = "sha256-zLC0jpxRrdsZ9vP8x0ayqMcPE197jwCIL2OrJjS2Wuk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index e7e9a8d0b013..e7955979a7ae 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kustomize"; - version = "5.4.3"; + version = "5.5.0"; ldflags = let t = "sigs.k8s.io/kustomize/api/provenance"; in [ @@ -15,13 +15,13 @@ buildGoModule rec { owner = "kubernetes-sigs"; repo = pname; rev = "kustomize/v${version}"; - hash = "sha256-DrdExiGDWBrlbNIY6R9SXD4cuVyLBOE3ePw1J3hymHA="; + hash = "sha256-7mtnSrQQPQnG0COqnzrT5DXFEbTeoc3+GZ2fFhB/lW8="; }; # avoid finding test and development commands modRoot = "kustomize"; proxyVendor = true; - vendorHash = "sha256-cyTZCa1kmNhomkNNnt2Waww4czOZ5YzDBUDx5gqLHtQ="; + vendorHash = "sha256-ddARfbjuSIn2aNFILL4LA28swGBvH6kOqlg4qkw+NGw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/rust/cargo-deb/default.nix b/pkgs/development/tools/rust/cargo-deb/default.nix index 56b46ff8bc9f..1b3180e33813 100644 --- a/pkgs/development/tools/rust/cargo-deb/default.nix +++ b/pkgs/development/tools/rust/cargo-deb/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deb"; - version = "2.5.1"; + version = "2.7.0"; src = fetchFromGitHub { owner = "kornelski"; repo = pname; rev = "v${version}"; - hash = "sha256-COXYXx7C+IDJiw/y+GLY0oJYxtUjnGsikeWUk3z5B48="; + hash = "sha256-ReXDrbFY2qY/0TUYD+EiP9Qa9KwMGb9iLL+tdfDLSpc="; }; - cargoHash = "sha256-5iU6jk8yZLVUjksB4g39zBtfm6LTeBgXOLsw/M5CZZc="; + cargoHash = "sha256-yBMeiYWsb+D8WzWRDDi9JFZTFvQAQ7QUeGDb6yFelD8="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index e4852faeb409..dd4cafbfc8b6 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "seafile-shared"; - version = "9.0.7"; + version = "9.0.8"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile"; rev = "v${version}"; - sha256 = "sha256-Q2jqwuGhZpASfpLfgfuZKnOrALmctURj845QhxO3o5s="; + sha256 = "sha256-IpRCgPxYy1El4EEvVEfzAlbxP/osQUb7pCP3/BhkecU="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/monitoring/prometheus/knot-exporter.nix b/pkgs/servers/monitoring/prometheus/knot-exporter.nix index 7b8003554438..802db52a3129 100644 --- a/pkgs/servers/monitoring/prometheus/knot-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/knot-exporter.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "knot-exporter"; - version = "3.4.0"; + version = "3.4.1"; pyproject = true; src = fetchPypi { pname = "knot_exporter"; inherit version; - hash = "sha256-YOVLHAJXIgje8Ek7iKGxq4l4PAcWgWnNllRxEJpUcU0="; + hash = "sha256-CkuOO6pOl3/8rLKb5P5a09oNv8rvmy/mURv0b3FRNGA="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/nb/default.nix b/pkgs/tools/misc/nb/default.nix index 4cc68426ce7e..9d0b06910433 100644 --- a/pkgs/tools/misc/nb/default.nix +++ b/pkgs/tools/misc/nb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nb"; - version = "7.12.1"; + version = "7.14.4"; src = fetchFromGitHub { owner = "xwmx"; repo = "nb"; rev = version; - sha256 = "sha256-vy2WrFh4ukc6f0YFVaHvw0k1Wm9mdhh9p2MKLc/566U="; + sha256 = "sha256-YqqZZnin+aybAZ2dqaxdOrVZ7dLWwnjh2iL77orqHtE="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/tbls/default.nix b/pkgs/tools/misc/tbls/default.nix index 418ad24116d6..1a33f5433511 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.77.0"; + version = "1.78.0"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; rev = "v${version}"; - hash = "sha256-knYAwmxqeHv1XBi/zHf7cOkcLXITGnX0tXlT8/Zs2YQ="; + hash = "sha256-vqt4IlVvqlUjDqvcdiRctt/VuEkZ5YzCXYHvHfc87Ew="; }; - vendorHash = "sha256-m5G0knHmPCz1pZ7LZ4i6Tyq+xSEq32mQFbXEdOY+6ec="; + vendorHash = "sha256-cnACY+NIjsVe6BU7AjTO+yLDn0f1HO1gHnw5SgqKuy4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index 436e5ba480ee..8c2e3a9b7949 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -24,13 +24,13 @@ , networkmanager }: stdenv.mkDerivation rec { pname = "tlp"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "linrunner"; repo = "TLP"; rev = version; - hash = "sha256-CxO1KU7F6sT5D8vjKOmntjDxcieoRSHTvuSqXfplcHk="; + hash = "sha256-kjtszDLlnIkBi3yU/AyGSV8q7QBuZbDhsqJ8AvULb0M="; }; # XXX: See patch files for relevant explanations. @@ -100,7 +100,6 @@ $out/share/tlp/tlp-pcilist $out/share/tlp/tlp-readconfs $out/share/tlp/tlp-usblist - $out/share/tlp/tpacpi-bat ) for f in "''${fixup_perl[@]}"; do wrapProgram "$f" --prefix PATH : "${paths}" diff --git a/pkgs/tools/misc/tlp/patches/0001-makefile-correctly-sed-paths.patch b/pkgs/tools/misc/tlp/patches/0001-makefile-correctly-sed-paths.patch index 278cd0b1dde8..46ac58f4099a 100644 --- a/pkgs/tools/misc/tlp/patches/0001-makefile-correctly-sed-paths.patch +++ b/pkgs/tools/misc/tlp/patches/0001-makefile-correctly-sed-paths.patch @@ -1,4 +1,4 @@ -From 5c5d878bf49bae5920c330482217477819ba9bc2 Mon Sep 17 00:00:00 2001 +From 6500d02a70572f94e7b7df4d70b391ac27ac8bcb Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 15 Oct 2021 23:22:50 -0700 Subject: [PATCH 1/2] makefile: correctly sed paths @@ -15,14 +15,14 @@ The reason DESTDIR is used at all, as opposed to the more appropriate PREFIX, is covered in the nix formula, and is (also) due to the Makefile being a bit "different." --- - Makefile | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) + Makefile | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile -index 8042517..1c436ad 100644 +index 41eb38d..df3abb7 100644 --- a/Makefile +++ b/Makefile -@@ -57,20 +57,20 @@ _TPACPIBAT = $(DESTDIR)$(TPACPIBAT) +@@ -57,17 +57,17 @@ _VAR = $(DESTDIR)$(TLP_VAR) SED = sed \ -e "s|@TLPVER@|$(TLPVER)|g" \ @@ -47,12 +47,8 @@ index 8042517..1c436ad 100644 + -e "s|@TLP_CONFDPR@|$(_CONFDPR)|g" \ + -e "s|@TLP_CONF@|$(_CONF)|g" \ -e "s|@TLP_RUN@|$(TLP_RUN)|g" \ - -e "s|@TLP_VAR@|$(TLP_VAR)|g" \ -- -e "s|@TPACPIBAT@|$(TPACPIBAT)|g" -+ -e "s|@TPACPIBAT@|$(_TPACPIBAT)|g" + -e "s|@TLP_VAR@|$(TLP_VAR)|g" - INFILES = \ - tlp \ -- -2.41.0 +2.44.1 diff --git a/pkgs/tools/misc/tlp/patches/0002-reintroduce-tlp-sleep-service.patch b/pkgs/tools/misc/tlp/patches/0002-reintroduce-tlp-sleep-service.patch index dfea1c61636d..cb9330eba06d 100644 --- a/pkgs/tools/misc/tlp/patches/0002-reintroduce-tlp-sleep-service.patch +++ b/pkgs/tools/misc/tlp/patches/0002-reintroduce-tlp-sleep-service.patch @@ -1,4 +1,4 @@ -From a3506c9bc8929645b7b08859e47039b8cc830d22 Mon Sep 17 00:00:00 2001 +From 4ae0e860aa2c8c056379a7b6cc0f7a735de9ab12 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 15 Oct 2021 23:07:40 -0700 Subject: [PATCH 2/2] tlp-sleep.service: reintroduce @@ -18,10 +18,10 @@ systemd itself to not use the hook scripts. As per the manual: create mode 100644 tlp-sleep.service.in diff --git a/Makefile b/Makefile -index 1c436ad..fd5211b 100644 +index df3abb7..5a47001 100644 --- a/Makefile +++ b/Makefile -@@ -84,6 +84,7 @@ INFILES = \ +@@ -83,6 +83,7 @@ INFILES = \ tlp.rules \ tlp-readconfs \ tlp-run-on \ @@ -29,7 +29,7 @@ index 1c436ad..fd5211b 100644 tlp.service \ tlp-stat \ tlp.upstart \ -@@ -115,7 +116,6 @@ SHFILES = \ +@@ -114,7 +115,6 @@ SHFILES = \ tlp-rdw-udev.in \ tlp-rf.in \ tlp-run-on.in \ @@ -37,7 +37,7 @@ index 1c436ad..fd5211b 100644 tlp-sleep.elogind \ tlp-stat.in \ tlp-usb-udev.in \ -@@ -172,7 +172,7 @@ ifneq ($(TLP_NO_INIT),1) +@@ -170,7 +170,7 @@ ifneq ($(TLP_NO_INIT),1) endif ifneq ($(TLP_WITH_SYSTEMD),0) install -D -m 644 tlp.service $(_SYSD)/tlp.service @@ -46,15 +46,15 @@ index 1c436ad..fd5211b 100644 endif ifneq ($(TLP_WITH_ELOGIND),0) install -D -m 755 tlp-sleep.elogind $(_ELOD)/49-tlp-sleep -@@ -240,7 +240,7 @@ uninstall-tlp: +@@ -253,7 +253,7 @@ uninstall-tlp: rm $(_ULIB)/rules.d/85-tlp.rules rm -f $(_SYSV)/tlp rm -f $(_SYSD)/tlp.service - rm -f $(_SDSL)/tlp-sleep + rm -f $(_SYSD)/tlp-sleep.service rm -f $(_ELOD)/49-tlp-sleep + rm -f $(_SHCPL)/tlp rm -f $(_SHCPL)/tlp-stat - rm -f $(_SHCPL)/bluetooth diff --git a/tlp-sleep.service.in b/tlp-sleep.service.in new file mode 100644 index 0000000..79c202c @@ -81,5 +81,5 @@ index 0000000..79c202c +[Install] +WantedBy=sleep.target -- -2.41.0 +2.44.1 diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index c25be7da0f5a..62fccb926ec4 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "11.25.0"; + version = "11.26.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-8rWJWMVN80Mgoeihg1IqfuNpM/DWaGl0HZ4WNPZXmks="; + hash = "sha256-dbcTQuaUiVDcPKkYt10CJYHEleNqji1yEE8jEBBJtpg="; }; proxyVendor = true; - vendorHash = "sha256-e66MFSyfRMKakD3JoJUNghMWxGP/5MBSq7v/RbThgrQ="; + vendorHash = "sha256-lG+PssQh/Cyp6Qgibm/OcJqnVecKERJNVLzKscIFnGo="; subPackages = [ "apps/cnspec" ]; diff --git a/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix b/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix index 81091848a93c..372749941cb4 100644 --- a/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix +++ b/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "sequoia-chameleon-gnupg"; - version = "unstable-2023-11-22"; + version = "0.11.2"; src = fetchFromGitLab { owner = "sequoia-pgp"; repo = pname; - rev = "fd9df5a4e1ec3c3ca986a1a25bacf13f024c934a"; - hash = "sha256-OxWlkOQxuuCFyLMx+ucervyqIduUpyJ9lCGFQlfEUFc="; + rev = "v${version}"; + hash = "sha256-XoZA8X6lwziKFECJDPCSpqcFtJe5TsDGWvM+EgpBU3U="; }; - cargoHash = "sha256-4+PA1kYJgn8yDAYr88DQYg6sdgSN3MWzKAUATW3VO6I="; + cargoHash = "sha256-xDQCAte+olmoMbchspNW/02NRkhwWxcgPkIXWBJsbIg="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3484acb4b6c5..2a2aae48ec74 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2360,7 +2360,7 @@ with pkgs; gitls = callPackage ../applications/version-management/gitls { }; - gitmux = callPackage ../applications/version-management/gitmux { }; + gitmux = callPackage ../applications/version-management/gitmux { buildGoModule = buildGo122Module; }; gitnuro = callPackage ../applications/version-management/gitnuro { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ef7d2f619537..d3b2f7579e55 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9286,7 +9286,9 @@ self: super: with self; { onlykey-solo-python = callPackage ../development/python-modules/onlykey-solo-python { }; - onnx = callPackage ../development/python-modules/onnx { }; + onnx = callPackage ../development/python-modules/onnx { + protobuf-core = pkgs.protobuf; + }; onnxconverter-common = callPackage ../development/python-modules/onnxconverter-common { inherit (pkgs) protobuf;