Merge master into staging-next

This commit is contained in:
github-actions[bot] 2024-10-16 16:35:34 +00:00 committed by GitHub
commit d64350d170
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
47 changed files with 246 additions and 200 deletions

View File

@ -345,6 +345,9 @@
Most prominently access to the webinterface and API are now protected by authentication. Retrieve the auto-created 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. 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`, - `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. 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 `services.forgejo.secrets` is a small wrapper over systemd's `LoadCredential=`. It has the same structure (sections/keys) as

View File

@ -100,7 +100,7 @@ in
lib.nameValuePair (toString opts.home) { lib.nameValuePair (toString opts.home) {
d = { d = {
mode = opts.homeMode; mode = opts.homeMode;
user = username; user = opts.name;
inherit (opts) group; inherit (opts) group;
}; };
} }

View File

@ -1,4 +1,4 @@
{ lib, fetchurl, appimageTools }: { lib, fetchurl, appimageTools, makeWrapper }:
let let
pname = "plexamp"; pname = "plexamp";
@ -23,6 +23,9 @@ appimageTools.wrapType2 {
$out/share/icons/hicolor/scalable/apps/plexamp.svg $out/share/icons/hicolor/scalable/apps/plexamp.svg
substituteInPlace $out/share/applications/${pname}.desktop \ substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}' --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; passthru.updateScript = ./update-plexamp.sh;

View File

@ -2729,7 +2729,6 @@ in
"coc-metals" "coc-metals"
"coc-pairs" "coc-pairs"
"coc-prettier" "coc-prettier"
"coc-python"
"coc-r-lsp" "coc-r-lsp"
"coc-rls" "coc-rls"
"coc-rust-analyzer" "coc-rust-analyzer"

View File

@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = { mktplcRef = {
name = "pylyzer"; name = "pylyzer";
publisher = "pylyzer"; publisher = "pylyzer";
version = "0.1.8"; version = "0.1.10";
hash = "sha256-GoY4cobxL64bREtgl7q/iR66axSM3tBrle/b9h3ED8Q="; hash = "sha256-dDkX0U/XmHk5Jo+VdvxDkcA/1xu0Ae8kaDuDd/xjdUc=";
}; };
meta = { meta = {

View File

@ -63,14 +63,14 @@ let
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "telegram-desktop"; pname = "telegram-desktop";
version = "5.6.2"; version = "5.6.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "telegramdesktop"; owner = "telegramdesktop";
repo = "tdesktop"; repo = "tdesktop";
rev = "f2e0e481de5d379b9542f6ff9021fab5d409c1d4"; rev = "v${finalAttrs.version}";
fetchSubmodules = true; fetchSubmodules = true;
hash = "sha256-MmzSxC4tgoCgrG/IQAmpXGHNq+kiU/rSWeKn1f1uEg8="; hash = "sha256-frz425V5eRulNVxCf457TWQAzU/f9/szD/sx3/LYQ2Y=";
}; };
patches = [ patches = [

View File

@ -6,7 +6,7 @@
, qttools , qttools
, cmake , cmake
, grpc , grpc
, protobuf , protobuf_21
, openssl , openssl
, pkg-config , pkg-config
, c-ares , c-ares
@ -57,7 +57,7 @@ mkDerivation rec {
libGL libGL
zlib zlib
grpc grpc
protobuf protobuf_21
openssl openssl
c-ares c-ares
]; ];

View File

@ -2,7 +2,7 @@
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, cmake , cmake
, extra-cmake-modules , pkg-config
, ninja , ninja
, wayland , wayland
, wayland-scanner , wayland-scanner
@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
"-DBUILD_PLUGIN=OFF" "-DBUILD_PLUGIN=OFF"
]; ];
nativeBuildInputs = [ cmake extra-cmake-modules ninja wayland-scanner ]; nativeBuildInputs = [ cmake ninja pkg-config wayland-scanner ];
buildInputs = [ buildInputs = [
libGL libGL
libffi libffi

View File

@ -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";
};
}

View File

@ -166,11 +166,11 @@ let
linux = stdenv.mkDerivation (finalAttrs: { linux = stdenv.mkDerivation (finalAttrs: {
inherit pname meta passthru; inherit pname meta passthru;
version = "129.0.6668.100"; version = "130.0.6723.58";
src = fetchurl { src = fetchurl {
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; 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 # With strictDeps on, some shebangs were not being patched correctly
@ -266,11 +266,11 @@ let
darwin = stdenvNoCC.mkDerivation (finalAttrs: { darwin = stdenvNoCC.mkDerivation (finalAttrs: {
inherit pname meta passthru; inherit pname meta passthru;
version = "129.0.6668.101"; version = "130.0.6723.59";
src = fetchurl { src = fetchurl {
url = "http://dl.google.com/release2/chrome/j4koa2lwvw3lho34hvastakhfi_129.0.6668.101/GoogleChrome-129.0.6668.101.dmg"; url = "http://dl.google.com/release2/chrome/oehlfkedv43jkzlol2mqd6xife_130.0.6723.59/GoogleChrome-130.0.6723.59.dmg";
hash = "sha256-rwH7BqOyszmybadZ4gtJHoVxxjcjZLHcOku+YxZH88w="; hash = "sha256-ioEWtD49XtZTItz+bCiDobV0nW82Dv6S41/oHlUsatU=";
}; };
dontPatch = true; dontPatch = true;

View File

@ -1,5 +1,6 @@
#!/usr/bin/env nix-shell #!/usr/bin/env nix-shell
#!nix-shell -I nixpkgs=./. -i bash -p curl jq gawk libossp_uuid libxml2 nix #!nix-shell -I nixpkgs=./. -i bash -p curl jq gawk libossp_uuid libxml2 nix
# shellcheck shell=bash
set -euo pipefail set -euo pipefail
@ -10,7 +11,7 @@ get_version_info() {
local start_pattern="$2" local start_pattern="$2"
local end_pattern="$3" 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 response
local version local version
local current_version local current_version

View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "homebank"; pname = "homebank";
version = "5.8.3"; version = "5.8.5";
src = fetchurl { src = fetchurl {
url = url =
"https://www.gethomebank.org/public/sources/homebank-${version}.tar.gz"; "https://www.gethomebank.org/public/sources/homebank-${version}.tar.gz";
hash = "sha256-5Ag9UjAdxT5R6cYV6VT7ktaVHqd0kzQoLCpfS5q5xMI="; hash = "sha256-TrRFHleEA5VGjC1qP+TQFq2gun1Hyn8c7AQYwKEznpc=";
}; };
nativeBuildInputs = [ pkg-config wrapGAppsHook3 intltool ]; nativeBuildInputs = [ pkg-config wrapGAppsHook3 intltool ];

View File

@ -49,21 +49,26 @@ stdenv.mkDerivation (finalAttrs: {
export AR="$AR rc" export AR="$AR rc"
''; '';
# When cross-compiling, we need to set the preprocessor macros postPatch =
# 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 substituteInPlace jam.h --replace-fail 'ifdef linux' 'ifdef __linux__'
# 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) '' # When cross-compiling, we need to set the preprocessor macros
cat >>jam.h <<EOF # OSMAJOR/OSMINOR/OSPLAT to the values from the target platform, not the host
#undef OSMAJOR # platform. This looks a little ridiculous because the vast majority of build
#undef OSMINOR # tools don't embed target-specific information into their binary, but in this
#undef OSPLAT # case we behave more like a compiler than a make(1)-alike.
$( lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) ''
${pkgsBuildTarget.targetPackages.stdenv.cc}/bin/${pkgsBuildTarget.targetPackages.stdenv.cc.targetPrefix}cc -E -dM jam.h | grep -E '^#define (OSMAJOR|OSMINOR|OSPLAT) ' cat >>jam.h <<EOF
) #undef OSMAJOR
EOF #undef OSMINOR
''; #undef OSPLAT
$(
${pkgsBuildTarget.targetPackages.stdenv.cc}/bin/${pkgsBuildTarget.targetPackages.stdenv.cc.targetPrefix}cc -E -dM jam.h | grep -E '^#define (OSMAJOR|OSMINOR|OSPLAT) '
)
EOF
'';
buildPhase = '' buildPhase = ''
runHook preBuild runHook preBuild
@ -87,6 +92,15 @@ stdenv.mkDerivation (finalAttrs: {
package = finalAttrs.finalPackage; package = finalAttrs.finalPackage;
command = "jam -v"; command = "jam -v";
}; };
tests.os = testers.runCommand {
name = "${finalAttrs.finalPackage.name}-os";
nativeBuildInputs = [ finalAttrs.finalPackage ];
script = ''
echo 'echo $(OS) ;' > Jamfile
os=$(jam -d0)
[[ $os != UNKNOWN* ]] && touch $out
'';
};
}; };
meta = { meta = {

View File

@ -9,13 +9,13 @@
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "marwaita-icons"; pname = "marwaita-icons";
version = "5.0"; version = "5.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "darkomarko42"; owner = "darkomarko42";
repo = "marwaita-icons"; repo = "marwaita-icons";
rev = version; rev = version;
hash = "sha256-6NFCXj80VAoFX+i4By5IpbtJC4qL+sAzlLHUJjTQ/sI="; hash = "sha256-UehujziT13kA9ltjyCvbSDTEpR8ISxoBpoLj22Zih8k=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -8,14 +8,14 @@
}: }:
buildGoModule rec { buildGoModule rec {
pname = "snips-sh"; pname = "snips-sh";
version = "0.4.0"; version = "0.4.1";
vendorHash = "sha256-u2f9aHUrfuM4ZsTWA955sCkgcGBFlNhEU2Qlq2C2Kso="; vendorHash = "sha256-weqlhnhUG2gn9SFS63q1LYmPa7liGYYcJN5qorj6x2E=";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "robherley"; owner = "robherley";
repo = "snips.sh"; repo = "snips.sh";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-gfZFLlTFofYQ72rQjgB8g012vbxFjk8bLYTVJwZNgMs="; hash = "sha256-FEo2/TPwes8/Iwfp7OIo1HbLWF9xmVS9ZMC9HysyK/k=";
}; };
tags = (lib.optional (!withTensorflow) "noguesser"); tags = (lib.optional (!withTensorflow) "noguesser");

View File

@ -9,17 +9,17 @@
buildGoModule rec { buildGoModule rec {
pname = "soju"; pname = "soju";
version = "0.8.1"; version = "0.8.2";
src = fetchFromGitea { src = fetchFromGitea {
domain = "codeberg.org"; domain = "codeberg.org";
owner = "emersion"; owner = "emersion";
repo = "soju"; repo = "soju";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-Zhqmek7dvuyMb35XkAHXUaSiQZaGgGWtM09Dj84DDIM="; hash = "sha256-zJj9y3llJOijmx7+C5NOzEpIG/SEeg+ZhWtLPQ/iabY=";
}; };
vendorHash = "sha256-t3jupiEuxWDFMfBiQ07il7lnmqG6zrV68lRNH1Gts4k="; vendorHash = "sha256-E/9a8GCEb/0Xto6cgH9R4WWdaoo/nwb6kcFdoEeMUps=";
nativeBuildInputs = [ nativeBuildInputs = [
installShellFiles installShellFiles

View File

@ -14,13 +14,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "tdnf"; pname = "tdnf";
version = "3.5.8"; version = "3.5.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vmware"; owner = "vmware";
repo = "tdnf"; repo = "tdnf";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-rs6NMIwpJCBsO7Ca+za8pVJXQwpcgFvpd15ayS01mQM="; hash = "sha256-p9g+b7Fqq8V6QSaikEQMMHWqBf4UtRA9a/VtH+s5JUM=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -4,16 +4,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "tiny-dfr"; pname = "tiny-dfr";
version = "0.3.1"; version = "0.3.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "WhatAmISupposedToPutHere"; owner = "WhatAmISupposedToPutHere";
repo = "tiny-dfr"; repo = "tiny-dfr";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-0nopB2gCa80hwXoEaVuGhPOncLFA/u5XydCSPiCDUlg="; hash = "sha256-5u5jyoDEt7aMs8/8QrhrUrUzFJJCNayqbN2WrMhUCV4=";
}; };
cargoHash = "sha256-w3trbTbRfHNekQ+mKHsq8O29S33QsdTdBawxDm3+Szs="; cargoHash = "sha256-repPyeIVM2ufG5NhJHGbZUaxOItiTZTxiCZ21Fpt0wM=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ cairo gdk-pixbuf glib libinput libxml2 pango udev ]; buildInputs = [ cairo gdk-pixbuf glib libinput libxml2 pango udev ];

View File

@ -3,12 +3,12 @@
let let
generator = pkgsBuildBuild.buildGoModule rec { generator = pkgsBuildBuild.buildGoModule rec {
pname = "v2ray-domain-list-community"; pname = "v2ray-domain-list-community";
version = "20240920063125"; version = "20241013063848";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "v2fly"; owner = "v2fly";
repo = "domain-list-community"; repo = "domain-list-community";
rev = version; rev = version;
hash = "sha256-NNBC7Pd8mxPuC2LVmedZLtvsnw2LfbD+VEPwtTU5DQE="; hash = "sha256-YFsz+fT2LPU4TakQ2V1PtETmnXI5r3qAaERAqM9mX5g=";
}; };
vendorHash = "sha256-NLh14rXRci4hgDkBJVJDIDvobndB7KYRKAX7UjyqSsg="; vendorHash = "sha256-NLh14rXRci4hgDkBJVJDIDvobndB7KYRKAX7UjyqSsg=";
meta = with lib; { meta = with lib; {

View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libcdada"; pname = "libcdada";
version = "0.6.0"; version = "0.6.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "msune"; owner = "msune";
repo = "libcdada"; repo = "libcdada";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-fgH4gl8Uq8mY9gxa968suU66VJYnFzpSLj4JGpJcJA4="; hash = "sha256-x//22FvgxIGL9H2whMAVCTyI9gAjlMWkEmpOAcoeOgE=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -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 { stdenv.mkDerivation rec {
pname = "rdkafka"; pname = "rdkafka";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config python3 which ]; nativeBuildInputs = [ pkg-config python3 which ];
buildInputs = [ zlib zstd openssl ]; buildInputs = [ zlib zstd openssl curl ];
env.NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow"; env.NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow";

View File

@ -74,6 +74,7 @@ mapAliases {
inherit (pkgs) coc-diagnostic; # added 2024-06-29 inherit (pkgs) coc-diagnostic; # added 2024-06-29
coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21 coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21
inherit (pkgs) coc-pyright; # added 2024-07-14 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 coinmon = throw "coinmon was removed since it was abandoned upstream"; # added 2024-03-19
coffee-script = pkgs.coffeescript; # added 2023-08-18 coffee-script = pkgs.coffeescript; # added 2023-08-18
inherit (pkgs) concurrently; # added 2024-08-05 inherit (pkgs) concurrently; # added 2024-08-05

View File

@ -47,7 +47,6 @@
, "coc-metals" , "coc-metals"
, "coc-pairs" , "coc-pairs"
, "coc-prettier" , "coc-prettier"
, "coc-python"
, "coc-r-lsp" , "coc-r-lsp"
, "coc-rls" , "coc-rls"
, "coc-rust-analyzer" , "coc-rust-analyzer"

View File

@ -61238,24 +61238,6 @@ in
bypassCache = true; bypassCache = true;
reconstructLock = 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 { coc-r-lsp = nodeEnv.buildNodePackage {
name = "coc-r-lsp"; name = "coc-r-lsp";
packageName = "coc-r-lsp"; packageName = "coc-r-lsp";

View File

@ -5,6 +5,7 @@
buildPythonPackage, buildPythonPackage,
fetchPypi, fetchPypi,
pytest-asyncio, pytest-asyncio,
pytest-cov-stub,
pytestCheckHook, pytestCheckHook,
pythonOlder, pythonOlder,
setuptools, setuptools,
@ -14,24 +15,17 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aioftp"; pname = "aioftp";
version = "0.22.3"; version = "0.23.1";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.11"; disabled = pythonOlder "3.11";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-uqKxMYaqAWIuS4LyfC9I9Nr7SORXprGPzamakl4NwnA="; hash = "sha256-uA6t2MqV0ru8+r594Vy+AawRey50Z3FzdN5Ge62TVws=";
}; };
postPatch = '' build-system = [ setuptools ];
substituteInPlace pyproject.toml \
--replace " --cov" ""
'';
nativeBuildInputs = [ setuptools ];
propagatedBuildInputs = [ siosocks ];
optional-dependencies = { optional-dependencies = {
socks = [ siosocks ]; socks = [ siosocks ];
@ -40,6 +34,7 @@ buildPythonPackage rec {
nativeCheckInputs = [ nativeCheckInputs = [
async-timeout async-timeout
pytest-asyncio pytest-asyncio
pytest-cov-stub
pytestCheckHook pytestCheckHook
trustme trustme
] ++ lib.flatten (builtins.attrValues optional-dependencies); ] ++ lib.flatten (builtins.attrValues optional-dependencies);

View File

@ -7,22 +7,25 @@
lxml, lxml,
pygments, pygments,
pythonOlder, pythonOlder,
setuptools,
tomli, tomli,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "gcovr"; pname = "gcovr";
version = "7.2"; version = "8.2";
format = "setuptools"; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.9";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-4+lctWyojbvnQctdaaor5JTrL8KgnuT2UWRKZw7lrrM="; hash = "sha256-mh3d1FhdE+x3VV211rajHugVh+pvxgT/n80jLLB4LfU=";
}; };
propagatedBuildInputs = [ build-system = [ setuptools ];
dependencies = [
colorlog colorlog
jinja2 jinja2
lxml lxml
@ -41,10 +44,10 @@ buildPythonPackage rec {
meta = { meta = {
description = "Python script for summarizing gcov data"; description = "Python script for summarizing gcov data";
mainProgram = "gcovr";
homepage = "https://www.gcovr.com/"; homepage = "https://www.gcovr.com/";
changelog = "https://github.com/gcovr/gcovr/blob/${version}/CHANGELOG.rst"; changelog = "https://github.com/gcovr/gcovr/blob/${version}/CHANGELOG.rst";
license = lib.licenses.bsd0; license = lib.licenses.bsd0;
maintainers = with lib.maintainers; [ sigmanificient ]; maintainers = with lib.maintainers; [ sigmanificient ];
mainProgram = "gcovr";
}; };
} }

View File

@ -12,12 +12,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "libknot"; pname = "libknot";
version = "3.4.0"; version = "3.4.1";
pyproject = true; pyproject = true;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-BtESc9BIZeDNNPJYyMLTeMsNHm+xBcLueyJ7/1iXFos="; hash = "sha256-NJmOm2PIbH4GeDN1XlKKeLePHGatDQlWDPJtn5tUO3s=";
}; };
postPatch = '' postPatch = ''

View File

@ -40,10 +40,20 @@ buildPythonPackage rec {
passthru.tests.tester-nvmlInit = passthru.tests.tester-nvmlInit =
cudaPackages.writeGpuTestPython { libraries = [ nvidia-ml-py ]; } cudaPackages.writeGpuTestPython { libraries = [ nvidia-ml-py ]; }
'' ''
import pynvml from pynvml import (
from pynvml.smi import nvidia_smi # noqa: F401 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 = { meta = {

View File

@ -1,24 +1,30 @@
{ {
lib, lib,
stdenv,
buildPythonPackage, buildPythonPackage,
cmake,
fetchFromGitHub, fetchFromGitHub,
gtest,
nbval, # build-system
numpy, cmake,
parameterized,
protobuf_21,
pybind11, pybind11,
pytestCheckHook,
pythonOlder,
tabulate,
typing-extensions,
abseil-cpp,
google-re2,
pillow,
protobuf,
setuptools, setuptools,
# nativeBuildInputs
protobuf-core,
# buildInputs
abseil-cpp,
protobuf,
gtest,
# dependencies
numpy,
google-re2,
nbval,
parameterized,
pillow,
pytestCheckHook,
tabulate,
}: }:
let let
@ -29,8 +35,6 @@ buildPythonPackage rec {
version = "1.17.0"; version = "1.17.0";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "onnx"; owner = "onnx";
repo = "onnx"; repo = "onnx";
@ -45,12 +49,11 @@ buildPythonPackage rec {
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
protobuf_21 # for protoc protobuf-core # `protoc` required
]; ];
buildInputs = [ buildInputs = [
abseil-cpp abseil-cpp
protobuf_21
gtestStatic gtestStatic
pybind11 pybind11
]; ];
@ -58,7 +61,6 @@ buildPythonPackage rec {
dependencies = [ dependencies = [
protobuf protobuf
numpy numpy
typing-extensions
]; ];
nativeCheckInputs = [ nativeCheckInputs = [
@ -109,31 +111,6 @@ buildPythonPackage rec {
"examples" "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; __darwinAllowLocalNetworking = true;
postCheck = '' postCheck = ''
@ -143,11 +120,11 @@ buildPythonPackage rec {
pythonImportsCheck = [ "onnx" ]; pythonImportsCheck = [ "onnx" ];
meta = with lib; { meta = {
changelog = "https://github.com/onnx/onnx/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
description = "Open Neural Network Exchange"; description = "Open Neural Network Exchange";
homepage = "https://onnx.ai"; homepage = "https://onnx.ai";
license = licenses.asl20; changelog = "https://github.com/onnx/onnx/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
maintainers = with maintainers; [ acairncross ]; license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ acairncross ];
}; };
} }

View File

@ -15,7 +15,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "opower"; pname = "opower";
version = "0.8.3"; version = "0.8.4";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "tronikos"; owner = "tronikos";
repo = "opower"; repo = "opower";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-W/EsiSNFPSJj81ykcEM3YRnRZDJDKvfOUuV98Sk4Gwo="; hash = "sha256-UwiEUHLeGK7WsQ8RPmHAjPVXgFf6N5upJIKMp54NSjs=";
}; };
build-system = [ setuptools ]; build-system = [ setuptools ];

View File

@ -13,7 +13,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pydeconz"; pname = "pydeconz";
version = "117"; version = "118";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.12"; disabled = pythonOlder "3.12";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "Kane610"; owner = "Kane610";
repo = "deconz"; repo = "deconz";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-G04Lb92yrSQBs/Vc3wW60jR74nsWzfjAUfQPzqVhoLk="; hash = "sha256-CbV/LGj09TfLYvaVGr2+LV76DRkz0kw7qsGbtL5A45g=";
}; };
postPatch = '' postPatch = ''

View File

@ -17,16 +17,16 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyoverkiz"; pname = "pyoverkiz";
version = "1.14.1"; version = "1.14.2";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "iMicknl"; owner = "iMicknl";
repo = "python-overkiz-api"; repo = "python-overkiz-api";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-mpD8seRGZZ+1Rgg1ADFiFgYZ1JmLRNdscRwfXIK6Pr4="; hash = "sha256-6ytfmdyVd7AFIWLSKCDpPHEKCy/EsGnOS+1i/bTO0Xs=";
}; };
build-system = [ poetry-core ]; build-system = [ poetry-core ];

View File

@ -9,13 +9,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "stdlib-list"; pname = "stdlib-list";
version = "0.10.0"; version = "0.11.0";
format = "pyproject"; format = "pyproject";
src = fetchPypi { src = fetchPypi {
pname = "stdlib_list"; pname = "stdlib_list";
inherit version; inherit version;
hash = "sha256-ZRnFDWRVE+0odle/6FbVJ/J3MxVAaR3er3eyVFmWShQ="; hash = "sha256-t0p7ZDp3oSY36Qfz9i8KufZzALzkAU9rLTyLTI/WPGY=";
}; };
nativeBuildInputs = [ flit-core ]; nativeBuildInputs = [ flit-core ];

View File

@ -10,7 +10,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "tencentcloud-sdk-python"; pname = "tencentcloud-sdk-python";
version = "3.0.1249"; version = "3.0.1251";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "TencentCloud"; owner = "TencentCloud";
repo = "tencentcloud-sdk-python"; repo = "tencentcloud-sdk-python";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-I3/nEiCgZaAX32Kj2w+qWPwL5frxOdpLGF7dzBsptr8="; hash = "sha256-zLC0jpxRrdsZ9vP8x0ayqMcPE197jwCIL2OrJjS2Wuk=";
}; };
build-system = [ setuptools ]; build-system = [ setuptools ];

View File

@ -2,7 +2,7 @@
buildGoModule rec { buildGoModule rec {
pname = "kustomize"; pname = "kustomize";
version = "5.4.3"; version = "5.5.0";
ldflags = let t = "sigs.k8s.io/kustomize/api/provenance"; in ldflags = let t = "sigs.k8s.io/kustomize/api/provenance"; in
[ [
@ -15,13 +15,13 @@ buildGoModule rec {
owner = "kubernetes-sigs"; owner = "kubernetes-sigs";
repo = pname; repo = pname;
rev = "kustomize/v${version}"; rev = "kustomize/v${version}";
hash = "sha256-DrdExiGDWBrlbNIY6R9SXD4cuVyLBOE3ePw1J3hymHA="; hash = "sha256-7mtnSrQQPQnG0COqnzrT5DXFEbTeoc3+GZ2fFhB/lW8=";
}; };
# avoid finding test and development commands # avoid finding test and development commands
modRoot = "kustomize"; modRoot = "kustomize";
proxyVendor = true; proxyVendor = true;
vendorHash = "sha256-cyTZCa1kmNhomkNNnt2Waww4czOZ5YzDBUDx5gqLHtQ="; vendorHash = "sha256-ddARfbjuSIn2aNFILL4LA28swGBvH6kOqlg4qkw+NGw=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

View File

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cargo-deb"; pname = "cargo-deb";
version = "2.5.1"; version = "2.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kornelski"; owner = "kornelski";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-COXYXx7C+IDJiw/y+GLY0oJYxtUjnGsikeWUk3z5B48="; hash = "sha256-ReXDrbFY2qY/0TUYD+EiP9Qa9KwMGb9iLL+tdfDLSpc=";
}; };
cargoHash = "sha256-5iU6jk8yZLVUjksB4g39zBtfm6LTeBgXOLsw/M5CZZc="; cargoHash = "sha256-yBMeiYWsb+D8WzWRDDi9JFZTFvQAQ7QUeGDb6yFelD8=";
nativeBuildInputs = [ nativeBuildInputs = [
makeWrapper makeWrapper

View File

@ -14,13 +14,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "seafile-shared"; pname = "seafile-shared";
version = "9.0.7"; version = "9.0.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "haiwen"; owner = "haiwen";
repo = "seafile"; repo = "seafile";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-Q2jqwuGhZpASfpLfgfuZKnOrALmctURj845QhxO3o5s="; sha256 = "sha256-IpRCgPxYy1El4EEvVEfzAlbxP/osQUb7pCP3/BhkecU=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -6,13 +6,13 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "knot-exporter"; pname = "knot-exporter";
version = "3.4.0"; version = "3.4.1";
pyproject = true; pyproject = true;
src = fetchPypi { src = fetchPypi {
pname = "knot_exporter"; pname = "knot_exporter";
inherit version; inherit version;
hash = "sha256-YOVLHAJXIgje8Ek7iKGxq4l4PAcWgWnNllRxEJpUcU0="; hash = "sha256-CkuOO6pOl3/8rLKb5P5a09oNv8rvmy/mURv0b3FRNGA=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nb"; pname = "nb";
version = "7.12.1"; version = "7.14.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "xwmx"; owner = "xwmx";
repo = "nb"; repo = "nb";
rev = version; rev = version;
sha256 = "sha256-vy2WrFh4ukc6f0YFVaHvw0k1Wm9mdhh9p2MKLc/566U="; sha256 = "sha256-YqqZZnin+aybAZ2dqaxdOrVZ7dLWwnjh2iL77orqHtE=";
}; };
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

View File

@ -9,16 +9,16 @@
buildGoModule rec { buildGoModule rec {
pname = "tbls"; pname = "tbls";
version = "1.77.0"; version = "1.78.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "k1LoW"; owner = "k1LoW";
repo = "tbls"; repo = "tbls";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-knYAwmxqeHv1XBi/zHf7cOkcLXITGnX0tXlT8/Zs2YQ="; hash = "sha256-vqt4IlVvqlUjDqvcdiRctt/VuEkZ5YzCXYHvHfc87Ew=";
}; };
vendorHash = "sha256-m5G0knHmPCz1pZ7LZ4i6Tyq+xSEq32mQFbXEdOY+6ec="; vendorHash = "sha256-cnACY+NIjsVe6BU7AjTO+yLDn0f1HO1gHnw5SgqKuy4=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

View File

@ -24,13 +24,13 @@
, networkmanager , networkmanager
}: stdenv.mkDerivation rec { }: stdenv.mkDerivation rec {
pname = "tlp"; pname = "tlp";
version = "1.6.1"; version = "1.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linrunner"; owner = "linrunner";
repo = "TLP"; repo = "TLP";
rev = version; rev = version;
hash = "sha256-CxO1KU7F6sT5D8vjKOmntjDxcieoRSHTvuSqXfplcHk="; hash = "sha256-kjtszDLlnIkBi3yU/AyGSV8q7QBuZbDhsqJ8AvULb0M=";
}; };
# XXX: See patch files for relevant explanations. # XXX: See patch files for relevant explanations.
@ -100,7 +100,6 @@
$out/share/tlp/tlp-pcilist $out/share/tlp/tlp-pcilist
$out/share/tlp/tlp-readconfs $out/share/tlp/tlp-readconfs
$out/share/tlp/tlp-usblist $out/share/tlp/tlp-usblist
$out/share/tlp/tpacpi-bat
) )
for f in "''${fixup_perl[@]}"; do for f in "''${fixup_perl[@]}"; do
wrapProgram "$f" --prefix PATH : "${paths}" wrapProgram "$f" --prefix PATH : "${paths}"

View File

@ -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 <bernardo@meurer.org> From: Bernardo Meurer <bernardo@meurer.org>
Date: Fri, 15 Oct 2021 23:22:50 -0700 Date: Fri, 15 Oct 2021 23:22:50 -0700
Subject: [PATCH 1/2] makefile: correctly sed paths 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 PREFIX, is covered in the nix formula, and is (also) due to the Makefile
being a bit "different." being a bit "different."
--- ---
Makefile | 20 ++++++++++---------- Makefile | 18 +++++++++---------
1 file changed, 10 insertions(+), 10 deletions(-) 1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index 8042517..1c436ad 100644 index 41eb38d..df3abb7 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -57,20 +57,20 @@ _TPACPIBAT = $(DESTDIR)$(TPACPIBAT) @@ -57,17 +57,17 @@ _VAR = $(DESTDIR)$(TLP_VAR)
SED = sed \ SED = sed \
-e "s|@TLPVER@|$(TLPVER)|g" \ -e "s|@TLPVER@|$(TLPVER)|g" \
@ -47,12 +47,8 @@ index 8042517..1c436ad 100644
+ -e "s|@TLP_CONFDPR@|$(_CONFDPR)|g" \ + -e "s|@TLP_CONFDPR@|$(_CONFDPR)|g" \
+ -e "s|@TLP_CONF@|$(_CONF)|g" \ + -e "s|@TLP_CONF@|$(_CONF)|g" \
-e "s|@TLP_RUN@|$(TLP_RUN)|g" \ -e "s|@TLP_RUN@|$(TLP_RUN)|g" \
-e "s|@TLP_VAR@|$(TLP_VAR)|g" \ -e "s|@TLP_VAR@|$(TLP_VAR)|g"
- -e "s|@TPACPIBAT@|$(TPACPIBAT)|g"
+ -e "s|@TPACPIBAT@|$(_TPACPIBAT)|g"
INFILES = \
tlp \
-- --
2.41.0 2.44.1

View File

@ -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 <bernardo@meurer.org> From: Bernardo Meurer <bernardo@meurer.org>
Date: Fri, 15 Oct 2021 23:07:40 -0700 Date: Fri, 15 Oct 2021 23:07:40 -0700
Subject: [PATCH 2/2] tlp-sleep.service: reintroduce 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 create mode 100644 tlp-sleep.service.in
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index 1c436ad..fd5211b 100644 index df3abb7..5a47001 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -84,6 +84,7 @@ INFILES = \ @@ -83,6 +83,7 @@ INFILES = \
tlp.rules \ tlp.rules \
tlp-readconfs \ tlp-readconfs \
tlp-run-on \ tlp-run-on \
@ -29,7 +29,7 @@ index 1c436ad..fd5211b 100644
tlp.service \ tlp.service \
tlp-stat \ tlp-stat \
tlp.upstart \ tlp.upstart \
@@ -115,7 +116,6 @@ SHFILES = \ @@ -114,7 +115,6 @@ SHFILES = \
tlp-rdw-udev.in \ tlp-rdw-udev.in \
tlp-rf.in \ tlp-rf.in \
tlp-run-on.in \ tlp-run-on.in \
@ -37,7 +37,7 @@ index 1c436ad..fd5211b 100644
tlp-sleep.elogind \ tlp-sleep.elogind \
tlp-stat.in \ tlp-stat.in \
tlp-usb-udev.in \ tlp-usb-udev.in \
@@ -172,7 +172,7 @@ ifneq ($(TLP_NO_INIT),1) @@ -170,7 +170,7 @@ ifneq ($(TLP_NO_INIT),1)
endif endif
ifneq ($(TLP_WITH_SYSTEMD),0) ifneq ($(TLP_WITH_SYSTEMD),0)
install -D -m 644 tlp.service $(_SYSD)/tlp.service install -D -m 644 tlp.service $(_SYSD)/tlp.service
@ -46,15 +46,15 @@ index 1c436ad..fd5211b 100644
endif endif
ifneq ($(TLP_WITH_ELOGIND),0) ifneq ($(TLP_WITH_ELOGIND),0)
install -D -m 755 tlp-sleep.elogind $(_ELOD)/49-tlp-sleep 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 $(_ULIB)/rules.d/85-tlp.rules
rm -f $(_SYSV)/tlp rm -f $(_SYSV)/tlp
rm -f $(_SYSD)/tlp.service rm -f $(_SYSD)/tlp.service
- rm -f $(_SDSL)/tlp-sleep - rm -f $(_SDSL)/tlp-sleep
+ rm -f $(_SYSD)/tlp-sleep.service + rm -f $(_SYSD)/tlp-sleep.service
rm -f $(_ELOD)/49-tlp-sleep rm -f $(_ELOD)/49-tlp-sleep
rm -f $(_SHCPL)/tlp
rm -f $(_SHCPL)/tlp-stat rm -f $(_SHCPL)/tlp-stat
rm -f $(_SHCPL)/bluetooth
diff --git a/tlp-sleep.service.in b/tlp-sleep.service.in diff --git a/tlp-sleep.service.in b/tlp-sleep.service.in
new file mode 100644 new file mode 100644
index 0000000..79c202c index 0000000..79c202c
@ -81,5 +81,5 @@ index 0000000..79c202c
+[Install] +[Install]
+WantedBy=sleep.target +WantedBy=sleep.target
-- --
2.41.0 2.44.1

View File

@ -6,18 +6,18 @@
buildGoModule rec { buildGoModule rec {
pname = "cnspec"; pname = "cnspec";
version = "11.25.0"; version = "11.26.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mondoohq"; owner = "mondoohq";
repo = "cnspec"; repo = "cnspec";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-8rWJWMVN80Mgoeihg1IqfuNpM/DWaGl0HZ4WNPZXmks="; hash = "sha256-dbcTQuaUiVDcPKkYt10CJYHEleNqji1yEE8jEBBJtpg=";
}; };
proxyVendor = true; proxyVendor = true;
vendorHash = "sha256-e66MFSyfRMKakD3JoJUNghMWxGP/5MBSq7v/RbThgrQ="; vendorHash = "sha256-lG+PssQh/Cyp6Qgibm/OcJqnVecKERJNVLzKscIFnGo=";
subPackages = [ "apps/cnspec" ]; subPackages = [ "apps/cnspec" ];

View File

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "sequoia-chameleon-gnupg"; pname = "sequoia-chameleon-gnupg";
version = "unstable-2023-11-22"; version = "0.11.2";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "sequoia-pgp"; owner = "sequoia-pgp";
repo = pname; repo = pname;
rev = "fd9df5a4e1ec3c3ca986a1a25bacf13f024c934a"; rev = "v${version}";
hash = "sha256-OxWlkOQxuuCFyLMx+ucervyqIduUpyJ9lCGFQlfEUFc="; hash = "sha256-XoZA8X6lwziKFECJDPCSpqcFtJe5TsDGWvM+EgpBU3U=";
}; };
cargoHash = "sha256-4+PA1kYJgn8yDAYr88DQYg6sdgSN3MWzKAUATW3VO6I="; cargoHash = "sha256-xDQCAte+olmoMbchspNW/02NRkhwWxcgPkIXWBJsbIg=";
nativeBuildInputs = [ nativeBuildInputs = [
rustPlatform.bindgenHook rustPlatform.bindgenHook

View File

@ -2360,7 +2360,7 @@ with pkgs;
gitls = callPackage ../applications/version-management/gitls { }; 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 { }; gitnuro = callPackage ../applications/version-management/gitnuro { };

View File

@ -9286,7 +9286,9 @@ self: super: with self; {
onlykey-solo-python = callPackage ../development/python-modules/onlykey-solo-python { }; 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 { onnxconverter-common = callPackage ../development/python-modules/onnxconverter-common {
inherit (pkgs) protobuf; inherit (pkgs) protobuf;