Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
a3e2b0de90
24 changed files with 255 additions and 97 deletions
|
|
@ -2983,7 +2983,7 @@
|
|||
};
|
||||
cafkafk = {
|
||||
email = "christina@cafkafk.com";
|
||||
matrix = "@cafkafk:nixos.dev";
|
||||
matrix = "@cafkafk:gitter.im";
|
||||
name = "Christina Sørensen";
|
||||
github = "cafkafk";
|
||||
githubId = 89321978;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
Manages /etc/nix.conf.
|
||||
Manages /etc/nix/nix.conf.
|
||||
|
||||
See also
|
||||
- ./nix-channel.nix
|
||||
|
|
|
|||
|
|
@ -8,22 +8,22 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
|||
nodes.machine = { pkgs, ... }: {
|
||||
security.polkit.enable = true;
|
||||
services.power-profiles-daemon.enable = true;
|
||||
environment.systemPackages = [ pkgs.glib ];
|
||||
environment.systemPackages = [ pkgs.glib pkgs.power-profiles-daemon ];
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
def get_profile():
|
||||
return machine.succeed(
|
||||
"""gdbus call --system --dest net.hadess.PowerProfiles --object-path /net/hadess/PowerProfiles \
|
||||
--method org.freedesktop.DBus.Properties.Get 'net.hadess.PowerProfiles' 'ActiveProfile'
|
||||
"""gdbus call --system --dest org.freedesktop.UPower.PowerProfiles --object-path /org/freedesktop/UPower/PowerProfiles \
|
||||
--method org.freedesktop.DBus.Properties.Get 'org.freedesktop.UPower.PowerProfiles' 'ActiveProfile'
|
||||
"""
|
||||
)
|
||||
|
||||
|
||||
def set_profile(profile):
|
||||
return machine.succeed(
|
||||
"""gdbus call --system --dest net.hadess.PowerProfiles --object-path /net/hadess/PowerProfiles \
|
||||
--method org.freedesktop.DBus.Properties.Set 'net.hadess.PowerProfiles' 'ActiveProfile' "<'{profile}'>"
|
||||
"""gdbus call --system --dest org.freedesktop.UPower.PowerProfiles --object-path /org/freedesktop/UPower/PowerProfiles \
|
||||
--method org.freedesktop.DBus.Properties.Set 'org.freedesktop.UPower.PowerProfiles' 'ActiveProfile' "<'{profile}'>"
|
||||
""".format(
|
||||
profile=profile
|
||||
)
|
||||
|
|
@ -42,5 +42,16 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
|||
profile = get_profile()
|
||||
if not "balanced" in profile:
|
||||
raise Exception("Unable to set balanced profile")
|
||||
|
||||
# test powerprofilectl CLI
|
||||
machine.succeed("powerprofilesctl set power-saver")
|
||||
profile = get_profile()
|
||||
if not "power-saver" in profile:
|
||||
raise Exception("Unable to set power-saver profile with powerprofilectl")
|
||||
|
||||
machine.succeed("powerprofilesctl set balanced")
|
||||
profile = get_profile()
|
||||
if not "balanced" in profile:
|
||||
raise Exception("Unable to set balanced profile with powerprofilectl")
|
||||
'';
|
||||
})
|
||||
|
|
|
|||
|
|
@ -307,11 +307,11 @@
|
|||
"src": {
|
||||
"owner": "flyinghead",
|
||||
"repo": "flycast",
|
||||
"rev": "44fa364f36c43bed19b055096600f075c656f78c",
|
||||
"hash": "sha256-UfASq8OXtsfubMUfke7P6HTygM/9fP421IoLQeJvPgY=",
|
||||
"rev": "bc51aefa9c52981621abf1d3545bff7befa4d01b",
|
||||
"hash": "sha256-NSCJxex5Rl7sWe2DkJ2aIyPzfdTcwSRb2iI3xpvYiow=",
|
||||
"fetchSubmodules": true
|
||||
},
|
||||
"version": "unstable-2024-02-09"
|
||||
"version": "unstable-2024-02-23"
|
||||
},
|
||||
"fmsx": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
|
|
@ -348,20 +348,20 @@
|
|||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "gambatte-libretro",
|
||||
"rev": "05c4e10168aa3070b4ea01f7da7ab1c0d4241103",
|
||||
"hash": "sha256-W/s8FWjFOIcclLkbM5s2+2dcvr+X2My5319SvRo5/lU="
|
||||
"rev": "4041d5a6c474d2d01b4cb1e81324b06b51d0147b",
|
||||
"hash": "sha256-TmPOka3oz5xIFDEsmDbvXXmLmP15FtQdoUZ+FErbqrI="
|
||||
},
|
||||
"version": "unstable-2024-02-09"
|
||||
"version": "unstable-2024-02-23"
|
||||
},
|
||||
"genesis-plus-gx": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "Genesis-Plus-GX",
|
||||
"rev": "7aba063778534a78b080a737c0465667ebd66154",
|
||||
"hash": "sha256-Rx5ymDqYmtovr/IJRY4loUwwWTk8GEs+oviP4YOk6ZI="
|
||||
"rev": "b38cdca9036332c1b7b05817432d1fd42d59527b",
|
||||
"hash": "sha256-5yr64Jy8WxamMknIG9nhIV4BLTZg8k7Q8Lnw8sfmWhk="
|
||||
},
|
||||
"version": "unstable-2024-02-16"
|
||||
"version": "unstable-2024-02-23"
|
||||
},
|
||||
"gpsp": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
|
|
@ -438,10 +438,10 @@
|
|||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "mame2003-plus-libretro",
|
||||
"rev": "fc987f1913203a41bca7f6fd16e92c83729dd7fc",
|
||||
"hash": "sha256-Mn0WuzGGxDlUEccC21V0FzRyTAgRoAnLCm5jpz9rkdY="
|
||||
"rev": "1a5b4b75e1e178a338f8f3dee3dfd940c8c9a3f2",
|
||||
"hash": "sha256-6r30iB3LQvtHQh5nv+ZL/hag1j/l/uEpVzkzieLaK80="
|
||||
},
|
||||
"version": "unstable-2024-02-16"
|
||||
"version": "unstable-2024-02-21"
|
||||
},
|
||||
"mame2010": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
|
|
@ -662,11 +662,11 @@
|
|||
"src": {
|
||||
"owner": "hrydgard",
|
||||
"repo": "ppsspp",
|
||||
"rev": "f5450e40eb3f4861451fb98bf9239dacc5aef81e",
|
||||
"hash": "sha256-Kj0bxp2ValsmoKHP4x8LJ60priLnRAvgtjsUemm0do4=",
|
||||
"rev": "d5cfcccbeab6c6b6dc7e851724b9ccd8252b2592",
|
||||
"hash": "sha256-lBzOIQpv0H0/DTCyWpf3tX3d/N9M49djoIwGgDW+S9A=",
|
||||
"fetchSubmodules": true
|
||||
},
|
||||
"version": "unstable-2024-02-16"
|
||||
"version": "unstable-2024-02-23"
|
||||
},
|
||||
"prboom": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
|
|
@ -693,10 +693,10 @@
|
|||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "libretro-uae",
|
||||
"rev": "4e8b54dd574eff239b5f4b4e3bc35c40b3a7cdd4",
|
||||
"hash": "sha256-pBpzzCgZYaA7/+UvwTsKCRseroe98AwRovjIk4Z0fhI="
|
||||
"rev": "5f683ae67b998fcadd69fa8f65f2440fa8ef135f",
|
||||
"hash": "sha256-SvV18vqMf9ZtGzrK3bnE0h2ImYi1QuLi7t+ZO91Lm6Y="
|
||||
},
|
||||
"version": "unstable-2024-02-20"
|
||||
"version": "unstable-2024-02-22"
|
||||
},
|
||||
"quicknes": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "werf";
|
||||
version = "1.2.292";
|
||||
version = "1.2.294";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "werf";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jBGAd7He2ap7+IF5Og7J6iBoIoLG8KqxSLcPKogJwP8=";
|
||||
hash = "sha256-A/Do2UepwV8lmT8qWir7CKR8/YeVKOEoJjvVfj9+wt0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-JaAiQC5QnamzUz1hPSldXtZqhTQIlGFGMYhLJd7t3j4=";
|
||||
vendorHash = "sha256-Fb9drtVITjka83Y8+YSa9fqSBv7O4muMGqV4w3K7+Dg=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ lib, fetchPypi, nixosTests, python3 }:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
version = "0.5.0b3.dev75";
|
||||
version = "0.5.0b3.dev80";
|
||||
pname = "pyload-ng";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-1lPIKkZESonDaVCnac0iUu/gCqXVDBhNZrk5S0eC6F0=";
|
||||
hash = "sha256-1vIkEctoj6udowYxFwY42f/zL9Elw2Nl6ZaL2x30k/M=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -2,20 +2,20 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "git-absorb";
|
||||
version = "0.6.11";
|
||||
version = "0.6.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tummychow";
|
||||
repo = "git-absorb";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-SYBJKnzv2oktWubgm/j6wEeoLSBjGqQVXQf9LOaq+NU=";
|
||||
hash = "sha256-yHCO1v1d0MUakae16fFVvtKG3rVxU/Cii/G6IKzyebA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
cargoHash = "sha256-i2ntM7NTi+hiB7DxEEV+3SXV8sVVWcNanif/wUZ9XvI=";
|
||||
cargoHash = "sha256-Bx7gH7jSLizG95JyBtziPBby9mF1Nj3CQexIg6gaiM0=";
|
||||
|
||||
postInstall = ''
|
||||
installManPage Documentation/git-absorb.1
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "obs-shaderfilter";
|
||||
version = "2.0.0";
|
||||
version = "2.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exeldro";
|
||||
repo = "obs-shaderfilter";
|
||||
rev = version;
|
||||
sha256 = "sha256-CEe/NUIYhVdvs7/ZvrvuwKPRNofWE+WZxN6yN8RACs8=";
|
||||
sha256 = "sha256-cz4Qk56e9CC//a+7pz5rcTxPlMwDwSAKfmgMyBZI4mo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -14,12 +14,12 @@
|
|||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vdr-softhddevice";
|
||||
version = "2.0.9";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ua0lnj";
|
||||
repo = "vdr-plugin-softhddevice";
|
||||
sha256 = "sha256-FyjKMCKPZVtQhb7wBx4Xr6I/kb2QMH/TEE21bw5gcwc=";
|
||||
sha256 = "sha256-d/Cl0sE4laDdjMhd3xTHcY4OT5tWWCFCvLsNF157+zw=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
|
|
|
|||
64
pkgs/by-name/po/powerhub/package.nix
Normal file
64
pkgs/by-name/po/powerhub/package.nix
Normal file
|
|
@ -0,0 +1,64 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "powerhub";
|
||||
version = "2.0.7";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AdrianVollmer";
|
||||
repo = "PowerHub";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ejdG/vMINyvToP8GAhRMdp/Jq8rZNBubDbRcg2i05lM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
cheroot
|
||||
cryptography
|
||||
dnspython
|
||||
flask
|
||||
flask-socketio
|
||||
flask-sqlalchemy
|
||||
importlib-metadata
|
||||
jinja2
|
||||
pyopenssl
|
||||
python-magic
|
||||
python-socketio
|
||||
requests
|
||||
service-identity
|
||||
simple-websocket
|
||||
sqlalchemy
|
||||
twisted
|
||||
watchdog
|
||||
werkzeug
|
||||
wsgidav
|
||||
];
|
||||
|
||||
# Tests uses XDG
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"powerhub"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
cd tests/helpers
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Post exploitation tool based on a web application, focusing on bypassing endpoint protection and application whitelisting";
|
||||
homepage = "https://github.com/AdrianVollmer/PowerHub";
|
||||
changelog = "https://github.com/AdrianVollmer/PowerHub/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "powerhub";
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
From 9c1cb26c1dd3f92d1c1177e548107d2cd3c5e616 Mon Sep 17 00:00:00 2001
|
||||
From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com>
|
||||
Date: Fri, 23 Feb 2024 22:58:58 +0000
|
||||
Subject: [PATCH] darwin 10.12 mbstate_t fix
|
||||
|
||||
https://github.com/llvm/llvm-project/issues/64226
|
||||
|
||||
removes space from
|
||||
https://github.com/macports/macports-ports/raw/acd8acb171f1658596ed1cf25da48d5b932e2d19/lang/llvm-17/files/0042-mbstate_t-not-defined.patch
|
||||
so it applies cleanly
|
||||
---
|
||||
include/__mbstate_t.h | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/include/__mbstate_t.h b/include/__mbstate_t.h
|
||||
index bfa6d61..5f51112 100644
|
||||
--- a/include/__mbstate_t.h
|
||||
+++ b/include/__mbstate_t.h
|
||||
@@ -42,6 +42,9 @@
|
||||
#elif __has_include(<bits/types/mbstate_t.h>)
|
||||
# include <bits/types/mbstate_t.h> // works on most Unixes
|
||||
#elif __has_include(<sys/_types/_mbstate_t.h>)
|
||||
+# if __has_include(<machine/_types.h>)
|
||||
+# include <machine/_types.h>
|
||||
+# endif
|
||||
# include <sys/_types/_mbstate_t.h> // works on Darwin
|
||||
#elif !defined(_LIBCPP_HAS_NO_WIDE_CHARACTERS) && __has_include_next(<wchar.h>)
|
||||
# include_next <wchar.h> // fall back to the C standard provider of mbstate_t
|
||||
--
|
||||
2.43.0
|
||||
|
||||
|
|
@ -45,6 +45,11 @@ stdenv.mkDerivation rec {
|
|||
chmod -R u+w .
|
||||
'';
|
||||
|
||||
patches = lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [
|
||||
# https://github.com/llvm/llvm-project/issues/64226
|
||||
./0001-darwin-10.12-mbstate_t-fix.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
cd ../runtimes
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -126,8 +126,5 @@ stdenv.mkDerivation rec {
|
|||
# the UIUC License (a BSD-like license)":
|
||||
license = with lib.licenses; [ mit ncsa ];
|
||||
maintainers = llvm_meta.maintainers ++ [ lib.maintainers.vlstill ];
|
||||
# Broken until https://github.com/llvm/llvm-project/issues/64226 is resolved
|
||||
# We should check if the version is not 10.13 but that is currently broken.
|
||||
broken = stdenv.isDarwin && stdenv.isx86_64;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fastapi-sso";
|
||||
version = "0.11.0";
|
||||
version = "0.12.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "tomasvotava";
|
||||
repo = "fastapi-sso";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-bz4rr7h90d/QkBBqQN1pLF8ANhOiq2v0Vv2pjBGpeTs=";
|
||||
hash = "sha256-/Mt0pmZYsWp/n9YHCy/bFKUPzmoRFB0cHKCNxEfxMLs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -18,30 +18,32 @@
|
|||
, requests
|
||||
, requests-mock
|
||||
, responses
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyrainbird";
|
||||
version = "4.0.1";
|
||||
format = "setuptools";
|
||||
version = "4.0.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "allenporter";
|
||||
repo = pname;
|
||||
repo = "pyrainbird";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-OcCg6Q+FJnmrYf70uNLWTg/tfWVJpiQlnyKfREcP2YM=";
|
||||
hash = "sha256-4AoxLZv0u8wCG3ihw0JqsqsO5zG5UyP4ebSX99ve8sg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pytest.ini \
|
||||
--replace "--cov=pyrainbird --cov-report=term-missing" ""
|
||||
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "pycryptodome>=3.16.0" "pycryptodome"
|
||||
--replace-fail "--cov=pyrainbird --cov-report=term-missing" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp-retry
|
||||
ical
|
||||
|
|
|
|||
|
|
@ -3,7 +3,8 @@
|
|||
, cryptography
|
||||
, defusedxml
|
||||
, fetchFromGitHub
|
||||
, importlib-resources
|
||||
, fetchPypi
|
||||
, paste
|
||||
, poetry-core
|
||||
, pyasn1
|
||||
, pymongo
|
||||
|
|
@ -11,27 +12,30 @@
|
|||
, pytestCheckHook
|
||||
, python-dateutil
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, pytz
|
||||
, repoze-who
|
||||
, requests
|
||||
, responses
|
||||
, setuptools
|
||||
, substituteAll
|
||||
, xmlschema
|
||||
, xmlsec
|
||||
, zope-interface
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysaml2";
|
||||
version = "7.4.2";
|
||||
version = "7.5.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IdentityPython";
|
||||
repo = pname;
|
||||
repo = "pysaml2";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-f8qd1Mfy32CYH9/PshfMMBviDg7OhOPlwz69bPjlYbg=";
|
||||
hash = "sha256-M/tdKGu6K38TeBZc8/dt376bHhPB0svHB3iis/se0DY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -46,8 +50,13 @@ buildPythonPackage rec {
|
|||
sed -i 's/2999\(-.*T\)/2029\1/g' tests/*.xml
|
||||
'';
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"xmlschema"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -59,10 +68,16 @@ buildPythonPackage rec {
|
|||
requests
|
||||
setuptools
|
||||
xmlschema
|
||||
] ++ lib.optionals (pythonOlder "3.9") [
|
||||
importlib-resources
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
s2repoze = [
|
||||
paste
|
||||
repoze-who
|
||||
zope-interface
|
||||
];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
pyasn1
|
||||
pymongo
|
||||
|
|
|
|||
|
|
@ -0,0 +1,54 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, requests
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tencentcloud-sdk-python";
|
||||
version = "3.0.1094";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TencentCloud";
|
||||
repo = "tencentcloud-sdk-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-h2p9auD8bTDbagAmjsmV06Z75I93LB6h+/ZYyt17ow0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"tencentcloud"
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
# Other tests require credentials
|
||||
"tests/unit/test_deserialize_warning.py"
|
||||
"tests/unit/test_import.py"
|
||||
"tests/unit/test_serialization.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tencent Cloud API 3.0 SDK for Python";
|
||||
homepage = "https://github.com/TencentCloud/tencentcloud-sdk-python";
|
||||
changelog = "https://github.com/TencentCloud/tencentcloud-sdk-python/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -5,7 +5,6 @@
|
|||
, mesonEmulatorHook
|
||||
, ninja
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, libgudev
|
||||
, glib
|
||||
, polkit
|
||||
|
|
@ -21,22 +20,21 @@
|
|||
, umockdev
|
||||
, systemd
|
||||
, python3
|
||||
, wrapGAppsNoGuiHook
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "power-profiles-daemon";
|
||||
version = "0.13";
|
||||
version = "0.20";
|
||||
|
||||
outputs = [ "out" "devdoc" ];
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "hadess";
|
||||
owner = "upower";
|
||||
repo = "power-profiles-daemon";
|
||||
rev = version;
|
||||
sha256 = "sha256-ErHy+shxZQ/aCryGhovmJ6KmAMt9OZeQGDbHIkC0vUE=";
|
||||
sha256 = "sha256-8wSRPR/1ELcsZ9K3LvSNlPcJvxRhb/LRjTIxKtdQlCA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -50,8 +48,6 @@ stdenv.mkDerivation rec {
|
|||
libxml2 # for xmllint for stripping GResources
|
||||
libxslt # for xsltproc for building docs
|
||||
gobject-introspection
|
||||
wrapGAppsNoGuiHook
|
||||
python3.pkgs.wrapPython
|
||||
# checkInput but cheked for during the configuring
|
||||
(python3.pythonOnBuildForHost.withPackages (ps: with ps; [
|
||||
pygobject3
|
||||
|
|
@ -68,16 +64,16 @@ stdenv.mkDerivation rec {
|
|||
upower
|
||||
glib
|
||||
polkit
|
||||
python3 # for cli tool
|
||||
# Duplicate from nativeCheckInputs until https://github.com/NixOS/nixpkgs/issues/161570 is solved
|
||||
umockdev
|
||||
# for cli tool
|
||||
(python3.withPackages (ps: [
|
||||
ps.pygobject3
|
||||
]))
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
# for cli tool
|
||||
pythonPath = [
|
||||
python3.pkgs.pygobject3
|
||||
checkInputs = [
|
||||
umockdev
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
@ -95,26 +91,13 @@ stdenv.mkDerivation rec {
|
|||
|
||||
PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions";
|
||||
|
||||
# Avoid double wrapping
|
||||
dontWrapGApps = true;
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs --build \
|
||||
tests/integration-test.py \
|
||||
tests/unittest_inspector.py
|
||||
'';
|
||||
|
||||
postCheck = ''
|
||||
# Do not contaminate the wrapper with test dependencies.
|
||||
unset GI_TYPELIB_PATH
|
||||
unset XDG_DATA_DIRS
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
# Avoid double wrapping
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
# Make Python libraries available
|
||||
wrapPythonProgramsIn "$out/bin" "$pythonPath"
|
||||
patchShebangs --host \
|
||||
src/powerprofilesctl
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "mushroom";
|
||||
version = "3.4.0";
|
||||
version = "3.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "piitaya";
|
||||
repo = "lovelace-mushroom";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-XVi+VPOVHfYBlIY9xN7x9Qe1bVw/qS9p8bcRZb0ksE0=";
|
||||
hash = "sha256-OUcOCBLEU8V+eadHuyA6F0uT8fJLRe1Xd9/X5ULCZVc=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-XtSeO5+RaBCBLmq6paRX9KipkhcEdJhzrQeEDdysZE0=";
|
||||
npmDepsHash = "sha256-oIee6iJ18EBztje1aw4xzWa1wSIbgau4q0MyVx0T41I=";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
|
|
|||
|
|
@ -10,9 +10,4 @@ generic: {
|
|||
sha256 = "sha256-+C5fI+eMJKsynVnVJIYj27x1iFQwaG9Fnho0BXgENQI=";
|
||||
vendorHash = "sha256-oSZBzIUL1yHXk7PnkSAlhI0i89aGMFrFHmbMN9rDAJ0=";
|
||||
};
|
||||
|
||||
v40 = generic {
|
||||
version = "4.0.48";
|
||||
sha256 = "sha256-WK8Zzkd/s9M7N5Qr2kejtp/f/n1wb5zRSfh0RiI2K+Q=";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildFishPlugin rec {
|
||||
pname = "forgit";
|
||||
version = "24.01.0";
|
||||
version = "24.02.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wfxr";
|
||||
repo = "forgit";
|
||||
rev = version;
|
||||
hash = "sha256-WHhyllOr/PgR+vlrfMQs/3/d3xpmDylT6BlLCu50a2g=";
|
||||
hash = "sha256-DoOtrnEJwSxkCZtsVek+3w9RZH7j7LTvdleBC88xyfI=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -1191,6 +1191,7 @@ mapAliases ({
|
|||
|
||||
### Z ###
|
||||
|
||||
zabbix40 = throw "'zabbix40' has been removed as it has reached end of life"; # Added 2024-01-07
|
||||
zinc = zincsearch; # Added 2023-05-28
|
||||
zkg = throw "'zkg' has been replaced by 'zeek'";
|
||||
zq = zed.overrideAttrs (old: { meta = old.meta // { mainProgram = "zq"; }; }); # Added 2023-02-06
|
||||
|
|
|
|||
|
|
@ -27341,16 +27341,14 @@ with pkgs;
|
|||
server-mysql = (callPackages ../servers/monitoring/zabbix/server.nix { mysqlSupport = true; }).${version};
|
||||
server-pgsql = (callPackages ../servers/monitoring/zabbix/server.nix { postgresqlSupport = true; }).${version};
|
||||
web = (callPackages ../servers/monitoring/zabbix/web.nix {}).${version};
|
||||
agent2 = (callPackages ../servers/monitoring/zabbix/agent2.nix {}).${version};
|
||||
|
||||
# backwards compatibility
|
||||
server = server-pgsql;
|
||||
} // lib.optionalAttrs ( version != "v40" ) { # agent2 is not supported in v4
|
||||
agent2 = (callPackages ../servers/monitoring/zabbix/agent2.nix {}).${version};
|
||||
};
|
||||
|
||||
zabbix60 = recurseIntoAttrs (zabbixFor "v60");
|
||||
zabbix50 = recurseIntoAttrs (zabbixFor "v50");
|
||||
zabbix40 = dontRecurseIntoAttrs (zabbixFor "v40");
|
||||
|
||||
zabbix = zabbix60;
|
||||
|
||||
|
|
|
|||
|
|
@ -14331,6 +14331,8 @@ self: super: with self; {
|
|||
|
||||
tenacity = callPackage ../development/python-modules/tenacity { };
|
||||
|
||||
tencentcloud-sdk-python = callPackage ../development/python-modules/tencentcloud-sdk-python { };
|
||||
|
||||
tensorboard-data-server = callPackage ../development/python-modules/tensorboard-data-server { };
|
||||
|
||||
tensorboard-plugin-profile = callPackage ../development/python-modules/tensorboard-plugin-profile { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue