Merge staging-next into staging
This commit is contained in:
github-actions[bot]
+2
-2
@@ -5,7 +5,7 @@
|
||||
|
||||
let
|
||||
inherit (builtins) head length;
|
||||
inherit (lib.trivial) isInOldestRelease mergeAttrs warn warnIf;
|
||||
inherit (lib.trivial) oldestSupportedReleaseIsAtLeast mergeAttrs warn warnIf;
|
||||
inherit (lib.strings) concatStringsSep concatMapStringsSep escapeNixIdentifier sanitizeDerivationName;
|
||||
inherit (lib.lists) foldr foldl' concatMap elemAt all partition groupBy take foldl;
|
||||
in
|
||||
@@ -2137,6 +2137,6 @@ rec {
|
||||
"lib.zip is a deprecated alias of lib.zipAttrsWith." zipAttrsWith;
|
||||
|
||||
# DEPRECATED
|
||||
cartesianProductOfSets = warnIf (isInOldestRelease 2405)
|
||||
cartesianProductOfSets = warnIf (oldestSupportedReleaseIsAtLeast 2405)
|
||||
"lib.cartesianProductOfSets is a deprecated alias of lib.cartesianProduct." cartesianProduct;
|
||||
}
|
||||
|
||||
+1
-1
@@ -73,7 +73,7 @@ let
|
||||
inherit (self.trivial) id const pipe concat or and xor bitAnd bitOr bitXor
|
||||
bitNot boolToString mergeAttrs flip mapNullable inNixShell isFloat min max
|
||||
importJSON importTOML warn warnIf warnIfNot throwIf throwIfNot checkListOfEnum
|
||||
info showWarnings nixpkgsVersion version isInOldestRelease
|
||||
info showWarnings nixpkgsVersion version isInOldestRelease oldestSupportedReleaseIsAtLeast
|
||||
mod compare splitByAndCompare seq deepSeq lessThan add sub
|
||||
functionArgs setFunctionArgs isFunction toFunction mirrorFunctionArgs
|
||||
fromHexString toHexString toBaseDigits inPureEvalMode isBool isInt pathExists
|
||||
|
||||
+4
-4
@@ -23,7 +23,7 @@ let
|
||||
isAttrs
|
||||
isBool
|
||||
isFunction
|
||||
isInOldestRelease
|
||||
oldestSupportedReleaseIsAtLeast
|
||||
isList
|
||||
isString
|
||||
length
|
||||
@@ -1030,7 +1030,7 @@ let
|
||||
mkForce = mkOverride 50;
|
||||
mkVMOverride = mkOverride 10; # used by ‘nixos-rebuild build-vm’
|
||||
|
||||
defaultPriority = warnIf (isInOldestRelease 2305) "lib.modules.defaultPriority is deprecated, please use lib.modules.defaultOverridePriority instead." defaultOverridePriority;
|
||||
defaultPriority = warnIf (oldestSupportedReleaseIsAtLeast 2305) "lib.modules.defaultPriority is deprecated, please use lib.modules.defaultOverridePriority instead." defaultOverridePriority;
|
||||
|
||||
mkFixStrictness = warn "lib.mkFixStrictness has no effect and will be removed. It returns its argument unmodified, so you can just remove any calls." id;
|
||||
|
||||
@@ -1146,8 +1146,8 @@ let
|
||||
}: doRename {
|
||||
inherit from to;
|
||||
visible = false;
|
||||
warn = isInOldestRelease sinceRelease;
|
||||
use = warnIf (isInOldestRelease sinceRelease)
|
||||
warn = oldestSupportedReleaseIsAtLeast sinceRelease;
|
||||
use = warnIf (oldestSupportedReleaseIsAtLeast sinceRelease)
|
||||
"Obsolete option `${showOption from}' is used. It was renamed to `${showOption to}'.";
|
||||
};
|
||||
|
||||
|
||||
+3
-3
@@ -256,15 +256,15 @@ let
|
||||
|
||||
in {
|
||||
|
||||
pathType = lib.warnIf (lib.isInOldestRelease 2305)
|
||||
pathType = lib.warnIf (lib.oldestSupportedReleaseIsAtLeast 2305)
|
||||
"lib.sources.pathType has been moved to lib.filesystem.pathType."
|
||||
lib.filesystem.pathType;
|
||||
|
||||
pathIsDirectory = lib.warnIf (lib.isInOldestRelease 2305)
|
||||
pathIsDirectory = lib.warnIf (lib.oldestSupportedReleaseIsAtLeast 2305)
|
||||
"lib.sources.pathIsDirectory has been moved to lib.filesystem.pathIsDirectory."
|
||||
lib.filesystem.pathIsDirectory;
|
||||
|
||||
pathIsRegularFile = lib.warnIf (lib.isInOldestRelease 2305)
|
||||
pathIsRegularFile = lib.warnIf (lib.oldestSupportedReleaseIsAtLeast 2305)
|
||||
"lib.sources.pathIsRegularFile has been moved to lib.filesystem.pathIsRegularFile."
|
||||
lib.filesystem.pathIsRegularFile;
|
||||
|
||||
|
||||
+1
-1
@@ -2272,7 +2272,7 @@ rec {
|
||||
isCoercibleToString :: a -> bool
|
||||
```
|
||||
*/
|
||||
isCoercibleToString = lib.warnIf (lib.isInOldestRelease 2305)
|
||||
isCoercibleToString = lib.warnIf (lib.oldestSupportedReleaseIsAtLeast 2305)
|
||||
"lib.strings.isCoercibleToString is deprecated in favor of either isStringLike or isConvertibleWithToString. Only use the latter if it needs to return true for null, numbers, booleans and list of similarly coercibles."
|
||||
isConvertibleWithToString;
|
||||
|
||||
|
||||
@@ -397,6 +397,15 @@ in {
|
||||
Set it to the upcoming release, matching the nixpkgs/.version file.
|
||||
*/
|
||||
isInOldestRelease =
|
||||
lib.warnIf (lib.oldestSupportedReleaseIsAtLeast 2411)
|
||||
"lib.isInOldestRelease is deprecated. Use lib.oldestSupportedReleaseIsAtLeast instead."
|
||||
lib.oldestSupportedReleaseIsAtLeast;
|
||||
|
||||
/**
|
||||
Alias for `isInOldestRelease` introduced in 24.11.
|
||||
Use `isInOldestRelease` in expressions outside of Nixpkgs for greater compatibility.
|
||||
*/
|
||||
oldestSupportedReleaseIsAtLeast =
|
||||
release:
|
||||
release <= lib.trivial.oldestSupportedRelease;
|
||||
|
||||
|
||||
@@ -905,6 +905,18 @@
|
||||
githubId = 217050;
|
||||
name = "Albert Chae";
|
||||
};
|
||||
albertodvp = {
|
||||
email = "alberto.fanton@protonmail.com";
|
||||
github = "albertodvp";
|
||||
githubId = 16022854;
|
||||
matrix = "@albertodvp:matrix.org";
|
||||
name = "Alberto Fanton";
|
||||
keys = [
|
||||
{
|
||||
fingerprint = "63FD 3A4F 4832 946C B808 8E3C C852 4052 69E7 A087";
|
||||
}
|
||||
];
|
||||
};
|
||||
aldoborrero = {
|
||||
email = "aldoborrero+nixos@pm.me";
|
||||
github = "aldoborrero";
|
||||
|
||||
@@ -151,7 +151,7 @@ in
|
||||
nodesCompat =
|
||||
mapAttrs
|
||||
(name: config: config // {
|
||||
config = lib.warnIf (lib.isInOldestRelease 2211)
|
||||
config = lib.warnIf (lib.oldestSupportedReleaseIsAtLeast 2211)
|
||||
"Module argument `nodes.${name}.config` is deprecated. Use `nodes.${name}` instead."
|
||||
config;
|
||||
})
|
||||
|
||||
@@ -24,7 +24,7 @@ let
|
||||
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "vivaldi";
|
||||
version = "6.9.3447.48";
|
||||
version = "6.9.3447.51";
|
||||
|
||||
suffix = {
|
||||
aarch64-linux = "arm64";
|
||||
@@ -34,8 +34,8 @@ in stdenv.mkDerivation rec {
|
||||
src = fetchurl {
|
||||
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb";
|
||||
hash = {
|
||||
aarch64-linux = "sha256-pl6vZwIPqfYi/nO/PDEwUyi4CdVP9ciTAbVg0d+DX1w=";
|
||||
x86_64-linux = "sha256-mhJCCYXP9eyA8YquSZsnm5o04VmY5NRwVM5vKqbdkZs=";
|
||||
aarch64-linux = "sha256-p+MihnvnVBVcsYE/7vp9b6T2bxp7cAiCq9ME+NHqi38=";
|
||||
x86_64-linux = "sha256-/izigAT9eqhgxgYosMoDoPIA0rOCeYOotEjaigBTazk=";
|
||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "amazon-ecs-agent";
|
||||
version = "1.86.3";
|
||||
version = "1.87.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "aws";
|
||||
repo = pname;
|
||||
hash = "sha256-YygvAYoqbWVmtBgHNrP0Xp1zSgCv2PsnWARWyo3K8rM=";
|
||||
hash = "sha256-JFEpwzeg+mcMBUYBenyWhYGE2J6iARz8oICZFlH1Azw=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -39,7 +39,7 @@ let
|
||||
optionalDeprecationWarning =
|
||||
# substitutions is only available starting 24.05.
|
||||
# TODO: Remove support for replacements sometime after the next release
|
||||
lib.warnIf (args ? replacements && lib.isInOldestRelease 2405) ''
|
||||
lib.warnIf (args ? replacements && lib.oldestSupportedReleaseIsAtLeast 2405) ''
|
||||
pkgs.substitute: For "${name}", `replacements` is used, which is deprecated since it doesn't support arguments with spaces. Use `substitutions` instead:
|
||||
substitutions = [ ${deprecationReplacement} ];'';
|
||||
in
|
||||
|
||||
@@ -92,7 +92,7 @@ buildGoModule rec {
|
||||
description = "Feature-packed Bitwarden compatible desktop integration";
|
||||
homepage = "https://github.com/quexten/goldwarden";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ arthsmn ];
|
||||
maintainers = with maintainers; [ arthsmn justanotherariel ];
|
||||
mainProgram = "goldwarden";
|
||||
platforms = platforms.linux; # Support for other platforms is not yet ready, see https://github.com/quexten/goldwarden/issues/4
|
||||
};
|
||||
|
||||
@@ -6,15 +6,15 @@
|
||||
}:
|
||||
|
||||
let
|
||||
timestamp = "202408291433";
|
||||
timestamp = "202409261450";
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "jdt-language-server";
|
||||
version = "1.39.0";
|
||||
version = "1.40.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.eclipse.org/jdtls/milestones/${finalAttrs.version}/jdt-language-server-${finalAttrs.version}-${timestamp}.tar.gz";
|
||||
hash = "sha256-8EbY8Il05udz8u1HQmbqsJiJxkWfJmNXn4t9SXvTRyk=";
|
||||
hash = "sha256-dBb8Yr76RQ4y8G7CtQPy7sXyLwscwS97juURK/ZxzxE=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "loksh";
|
||||
version = "7.5";
|
||||
version = "7.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dimkr";
|
||||
repo = "loksh";
|
||||
rev = finalAttrs.version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-4cBO1FXUnN/swwEeM2lq5RJJGmLKInMLZkz942EKy6k=";
|
||||
hash = "sha256-R9yLrXzXeu7gUoV+CDOAu89p2YmPP0ImAWq2fod722c=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" "man" ];
|
||||
|
||||
@@ -23,13 +23,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "emilua-qt6";
|
||||
version = "1.0.3";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "emilua";
|
||||
repo = "qt6";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-azMnM17HQMzC0ExgWurQzbR3fX9EwBRSu4kVTm3U2Ic=";
|
||||
hash = "sha256-tSVJTEPLQ5z1OPtyNiu71AZcVmgzD7oWhDI8ccctGOQ=";
|
||||
};
|
||||
|
||||
buildInputs = with qt6Packages; [
|
||||
|
||||
@@ -466,7 +466,7 @@ rec {
|
||||
which is cross aware instead.
|
||||
*/
|
||||
generateOptparseApplicativeCompletions = commands: pkg:
|
||||
lib.warnIf (lib.isInOldestRelease 2211) "haskellLib.generateOptparseApplicativeCompletions is deprecated in favor of haskellPackages.generateOptparseApplicativeCompletions. Please change ${pkg.name} to use the latter and make sure it uses its matching haskell.packages set!"
|
||||
lib.warnIf (lib.oldestSupportedReleaseIsAtLeast 2211) "haskellLib.generateOptparseApplicativeCompletions is deprecated in favor of haskellPackages.generateOptparseApplicativeCompletions. Please change ${pkg.name} to use the latter and make sure it uses its matching haskell.packages set!"
|
||||
(pkgs.lib.foldr __generateOptparseApplicativeCompletion pkg commands);
|
||||
|
||||
/*
|
||||
@@ -475,7 +475,7 @@ rec {
|
||||
which is cross aware instead.
|
||||
*/
|
||||
generateOptparseApplicativeCompletion = command: pkg:
|
||||
lib.warnIf (lib.isInOldestRelease 2211) "haskellLib.generateOptparseApplicativeCompletion is deprecated in favor of haskellPackages.generateOptparseApplicativeCompletions (plural!). Please change ${pkg.name} to use the latter and make sure it uses its matching haskell.packages set!"
|
||||
lib.warnIf (lib.oldestSupportedReleaseIsAtLeast 2211) "haskellLib.generateOptparseApplicativeCompletion is deprecated in favor of haskellPackages.generateOptparseApplicativeCompletions (plural!). Please change ${pkg.name} to use the latter and make sure it uses its matching haskell.packages set!"
|
||||
(__generateOptparseApplicativeCompletion command pkg);
|
||||
|
||||
# Don't fail at configure time if there are multiple versions of the
|
||||
|
||||
@@ -93,7 +93,7 @@ in rec {
|
||||
inherit hasDistutilsCxxPatch;
|
||||
# Remove after 24.11 is released.
|
||||
pythonForBuild =
|
||||
lib.warnIf (lib.isInOldestRelease 2311) "`pythonForBuild` (from `python*`) has been renamed to `pythonOnBuildForHost`"
|
||||
lib.warnIf (lib.oldestSupportedReleaseIsAtLeast 2311) "`pythonForBuild` (from `python*`) has been renamed to `pythonOnBuildForHost`"
|
||||
pythonOnBuildForHost_overridden;
|
||||
pythonOnBuildForHost = pythonOnBuildForHost_overridden;
|
||||
|
||||
|
||||
@@ -25,13 +25,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opencolorio";
|
||||
version = "2.3.2";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AcademySoftwareFoundation";
|
||||
repo = "OpenColorIO";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-CSD3AZ36tmC/cYSdPsdDYx894+jd9GkGkhYJ767QY8A=";
|
||||
hash = "sha256-7Uj1YBpunj9/32U5hpCokxfcVoRB9Oi2G9Cso+gAu5Q=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
markdown,
|
||||
paho-mqtt,
|
||||
pytest-mock,
|
||||
pytest-xdist,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
pyyaml,
|
||||
@@ -53,33 +52,9 @@ buildPythonPackage rec {
|
||||
gntp
|
||||
paho-mqtt
|
||||
pytest-mock
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"test_apprise_cli_nux_env"
|
||||
# Nondeterministic. Fails with `assert 0 == 1`
|
||||
"test_notify_emoji_general"
|
||||
"test_plugin_mqtt_general"
|
||||
# Nondeterministic. Fails with `assert 3 == 2`
|
||||
"test_plugin_matrix_transaction_ids_api_v3"
|
||||
# Nondeterministic. Fails with `IndexError`
|
||||
# https://github.com/NixOS/nixpkgs/issues/346894
|
||||
"test_plugin_wxpusher_result_set"
|
||||
# Nondeterministic. Fails with `AssertionError`
|
||||
"test_plugin_xbmc_kodi_urls"
|
||||
# Nondeterministic. Fails with `AssertionError`
|
||||
"test_plugin_zulip_urls"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# AttributeError: module 'apprise.plugins' has no attribute 'NotifyBulkSMS'
|
||||
"test/test_plugin_bulksms.py"
|
||||
# Nondeterministic. Multiple tests will fail with `AssertionError`
|
||||
"test/test_plugin_workflows.py"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
installManPage packaging/man/apprise.1
|
||||
'';
|
||||
|
||||
@@ -11,14 +11,15 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-batch";
|
||||
version = "17.3.0";
|
||||
version = "18.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-/JSIGmrNuKlTPzcbb3stPq6heJ65VQFLJKkI1t/nWZE=";
|
||||
pname = "azure_mgmt_batch";
|
||||
inherit version;
|
||||
hash = "sha256-MF61H7P3OyCSfvR7O2+T6eMtyTmHbARflwvThsB7p5w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
@@ -1,32 +1,35 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
msrest,
|
||||
msrestazure,
|
||||
azure-common,
|
||||
azure-mgmt-core,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
isodate,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
typing-extensions,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-eventhub";
|
||||
version = "11.0.0";
|
||||
format = "setuptools";
|
||||
version = "11.1.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
hash = "sha256-FxB9ToXd6PZ1eUrMWDAtbOmKclTuA/QdP72WsG7za5Y=";
|
||||
pname = "azure_mgmt_eventhub";
|
||||
inherit version;
|
||||
hash = "sha256-47j+CauuZ8XaiE57bw3kTi+CfFuACaZSuVH7LSD8s5I=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
msrest
|
||||
msrestazure
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
azure-common
|
||||
azure-mgmt-core
|
||||
isodate
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
# has no tests
|
||||
@@ -34,7 +37,8 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "This is the Microsoft Azure EventHub Management Client Library";
|
||||
homepage = "https://github.com/Azure/azure-sdk-for-python";
|
||||
homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/eventhub/azure-mgmt-eventhub";
|
||||
changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-eventhub_${version}/sdk/eventhub/azure-mgmt-eventhub/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ maxwilson ];
|
||||
};
|
||||
|
||||
@@ -11,19 +11,20 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-network";
|
||||
version = "26.0.0";
|
||||
version = "27.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-TeZ2GEGVBT/bEGpuoQQqiU5wxzGm08imM9UvUin07hs=";
|
||||
pname = "azure_mgmt_network";
|
||||
inherit version;
|
||||
hash = "sha256-XBxh2LsTrUD3iKJv11acHZ1g6y5MsZwqG12cAq6GIxY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
azure-common
|
||||
azure-mgmt-core
|
||||
isodate
|
||||
|
||||
@@ -2,21 +2,25 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
inflection,
|
||||
ruamel-yaml,
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
six,
|
||||
coreapi,
|
||||
django,
|
||||
djangorestframework,
|
||||
pytestCheckHook,
|
||||
pytest-django,
|
||||
inflection,
|
||||
packaging,
|
||||
pytz,
|
||||
pyyaml,
|
||||
uritemplate,
|
||||
datadiff,
|
||||
dj-database-url,
|
||||
pytest-django,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "drf-yasg";
|
||||
version = "1.21.7";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
@@ -28,23 +32,35 @@ buildPythonPackage rec {
|
||||
sed -i "/packaging/d" requirements/base.txt
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
six
|
||||
inflection
|
||||
ruamel-yaml
|
||||
coreapi
|
||||
dependencies = [
|
||||
django
|
||||
djangorestframework
|
||||
inflection
|
||||
packaging
|
||||
pytz
|
||||
pyyaml
|
||||
uritemplate
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-django
|
||||
datadiff
|
||||
dj-database-url
|
||||
];
|
||||
|
||||
# ImportError: No module named 'testproj.settings'
|
||||
env.DJANGO_SETTINGS_MODULE = "testproj.settings.local";
|
||||
|
||||
preCheck = ''
|
||||
cd testproj
|
||||
'';
|
||||
|
||||
# a lot of libraries are missing
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "drf_yasg" ];
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "imgw-pib";
|
||||
version = "1.0.5";
|
||||
version = "1.0.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bieniu";
|
||||
repo = "imgw-pib";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-2t1dzumDVUr+Lma1lnri8l2x6fUx1LKEQne7Qzh7pwc=";
|
||||
hash = "sha256-0ttGUsu00y/uuTXzPYkgh1QLMYOwPI/m8Qwk5Ty0Y3A=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
pythonOlder,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
@@ -30,16 +29,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "minari";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Farama-Foundation";
|
||||
repo = "Minari";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-SVt93d0GbCxeZXhh5vMPvnsBAeJAfGWNceFi0W9RgeM=";
|
||||
hash = "sha256-LriUPl9lrIDz5tzZIOxhj8C2q0LZr6AgJGRw/cWp4Fs=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
{
|
||||
buildPythonPackage,
|
||||
requests,
|
||||
hatchling,
|
||||
opentelemetry-api,
|
||||
opentelemetry-instrumentation,
|
||||
opentelemetry-semantic-conventions,
|
||||
opentelemetry-util-http,
|
||||
httpretty,
|
||||
opentelemetry-test-utils,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
inherit (opentelemetry-instrumentation) version src;
|
||||
pname = "opentelemetry-instrumentation-requests";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-requests";
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
dependencies = [
|
||||
opentelemetry-api
|
||||
opentelemetry-instrumentation
|
||||
opentelemetry-semantic-conventions
|
||||
opentelemetry-util-http
|
||||
requests
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
httpretty
|
||||
opentelemetry-test-utils
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "opentelemetry.instrumentation.requests" ];
|
||||
|
||||
meta = opentelemetry-instrumentation.meta // {
|
||||
homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-requests";
|
||||
description = "Requests instrumentation for OpenTelemetry";
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
{
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
parver,
|
||||
pulumi,
|
||||
pythonOlder,
|
||||
semver,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pulumi-hcloud";
|
||||
version = "1.20.4";
|
||||
|
||||
pyproject = true;
|
||||
build-system = [ setuptools ];
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pulumi";
|
||||
repo = "pulumi-hcloud";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-m9MRXDTSC0K1raoH9gKPuxdwvUEnZ/ulp32xlY1Hsdo=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/sdk/python";
|
||||
|
||||
# The upstream repository does not contain tests
|
||||
doCheck = false;
|
||||
|
||||
dependencies = [
|
||||
parver
|
||||
pulumi
|
||||
semver
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pulumi_hcloud" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Pulumi python hetzner web services provider";
|
||||
homepage = "https://github.com/pulumi/pulumi-hcloud";
|
||||
changelog = "https://github.com/pulumi/pulumi-hcloud/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ albertodvp ];
|
||||
};
|
||||
}
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyte";
|
||||
version = "0.8.1";
|
||||
version = "0.8.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "selectel";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-gLvsW4ou6bGq9CxT6XdX+r2ViMk7z+aejemrdLwJb3M=";
|
||||
hash = "sha256-u24ltX/LEteiZ2a/ioKqxV2AZgrFmKOHXmySmw21sLE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -1,34 +1,31 @@
|
||||
{
|
||||
lib,
|
||||
appdirs,
|
||||
buildPythonPackage,
|
||||
configargparse,
|
||||
decorator,
|
||||
dict2xml,
|
||||
fetchFromGitHub,
|
||||
google-i18n-address,
|
||||
html5lib,
|
||||
intervaltree,
|
||||
jinja2,
|
||||
lxml,
|
||||
markupsafe,
|
||||
platformdirs,
|
||||
pycairo,
|
||||
pycountry,
|
||||
pyflakes,
|
||||
pypdf2,
|
||||
pypdf,
|
||||
pytestCheckHook,
|
||||
python-fontconfig,
|
||||
pythonOlder,
|
||||
pyyaml,
|
||||
requests,
|
||||
setuptools,
|
||||
wcwidth,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "xml2rfc";
|
||||
version = "3.23.1";
|
||||
format = "setuptools";
|
||||
version = "3.23.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
@@ -36,7 +33,7 @@ buildPythonPackage rec {
|
||||
owner = "ietf-tools";
|
||||
repo = "xml2rfc";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-8AtQxLOOgEKhkbza9YwXrZVh/++UeJq8n8a7VwIzHSc=";
|
||||
hash = "sha256-KL3kIntydUAOS7qGq6ZDrShEcyME1Qwf2VjM/9mw96Q=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -45,20 +42,20 @@ buildPythonPackage rec {
|
||||
--replace-fail "test flaketest" "test"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
appdirs
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [ "lxml" ];
|
||||
|
||||
dependencies = [
|
||||
configargparse
|
||||
dict2xml
|
||||
google-i18n-address
|
||||
html5lib
|
||||
intervaltree
|
||||
jinja2
|
||||
lxml
|
||||
markupsafe
|
||||
platformdirs
|
||||
pycountry
|
||||
pyflakes
|
||||
pypdf2
|
||||
pypdf
|
||||
pyyaml
|
||||
requests
|
||||
wcwidth
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ytmusicapi";
|
||||
version = "1.8.1";
|
||||
version = "1.8.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "sigma67";
|
||||
repo = "ytmusicapi";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-zjJ/Kkym4zHYYIlITgTas+q41vv9ow/f6AqfTd64iB8=";
|
||||
hash = "sha256-SZ5YsQNrE91ycSXy/NjtjXp0E6msVKlV0f+Td0AwYpQ=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools-scm ];
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "k6";
|
||||
version = "0.53.0";
|
||||
version = "0.54.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-mh7Y7AGNvXRD2MJN8UOCSDNWJZlnu9hBdeDePfce9g8=";
|
||||
hash = "sha256-jD91JZMoxk7FmhG3F1CKbvUliNLyvlECnZQnZUA751w=";
|
||||
};
|
||||
|
||||
subPackages = [ "./" ];
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "malt";
|
||||
version = "1.2.2";
|
||||
version = "1.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "memtt";
|
||||
repo = "malt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6GGIdBaw/JSc2Qexy+P1NON27EBBRltthyQpMPZwi+8=";
|
||||
sha256 = "sha256-eeiThHorLxL2qHIXd9vzc2jRYd7BN3/OHCqM9BmXi0U=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
, gawk
|
||||
, git
|
||||
, lib
|
||||
, makeWrapper
|
||||
, procps
|
||||
, stdenvNoCC
|
||||
, unixtools
|
||||
@@ -12,6 +11,7 @@
|
||||
, xdotool
|
||||
, xorg
|
||||
, yad
|
||||
, writeShellApplication
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
@@ -25,31 +25,71 @@ stdenvNoCC.mkDerivation {
|
||||
hash = "sha256-CGtSGAm+52t2zFsPJEsm76w+FEHhbOd9NYuerGa31tc=";
|
||||
};
|
||||
|
||||
# hardcode PROGCMD because #150841
|
||||
postPatch = ''
|
||||
substituteInPlace steamtinkerlaunch --replace 'PROGCMD="''${0##*/}"' 'PROGCMD="steamtinkerlaunch"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
outputs = [ "out" "steamcompattool" ];
|
||||
|
||||
installFlags = [ "PREFIX=\${out}" ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/steamtinkerlaunch --prefix PATH : ${lib.makeBinPath [
|
||||
bash
|
||||
gawk
|
||||
git
|
||||
procps
|
||||
unixtools.xxd
|
||||
unzip
|
||||
wget
|
||||
xdotool
|
||||
xorg.xprop
|
||||
xorg.xrandr
|
||||
xorg.xwininfo
|
||||
yad
|
||||
]}
|
||||
'';
|
||||
nativeBuildInputs = let
|
||||
# We need a `steam` command in order to install the compat tool
|
||||
fakeSteam = writeShellApplication {
|
||||
name = "steam";
|
||||
text = "exit 0";
|
||||
};
|
||||
in [
|
||||
fakeSteam
|
||||
];
|
||||
|
||||
postInstall =
|
||||
let
|
||||
# We (ab)use writeShellApplication to produce a header for a shell script
|
||||
# here in order to add the runtimePath to the original script. We cannot
|
||||
# wrap here as that always corrupts $0 in bash scripts which STL uses to
|
||||
# install its compat tool.
|
||||
header = writeShellApplication {
|
||||
runtimeInputs = [
|
||||
bash
|
||||
gawk
|
||||
git
|
||||
procps
|
||||
unixtools.xxd
|
||||
unzip
|
||||
wget
|
||||
xdotool
|
||||
xorg.xprop
|
||||
xorg.xrandr
|
||||
xorg.xwininfo
|
||||
yad
|
||||
];
|
||||
name = "stl-head";
|
||||
text = "";
|
||||
bashOptions = [ ];
|
||||
};
|
||||
fakeYad = writeShellApplication {
|
||||
name = "yad";
|
||||
text = "echo ${yad.version} FAKE";
|
||||
};
|
||||
in
|
||||
''
|
||||
cp $out/bin/steamtinkerlaunch $TMPDIR/steamtinkerlaunch
|
||||
install ${lib.getExe header} -T $out/bin/steamtinkerlaunch
|
||||
tail -n +2 $TMPDIR/steamtinkerlaunch >> $out/bin/steamtinkerlaunch
|
||||
|
||||
# Create a fake steam dir, it checks this and reads a few values
|
||||
steamdir=$TMPDIR/.local/share/Steam/
|
||||
mkdir -p $steamdir/config/
|
||||
echo \"path\" \"$steamdir\" > $steamdir/config/config.vdf
|
||||
mkdir $TMPDIR/.steam/
|
||||
ln -s $steamdir $TMPDIR/.steam/steam
|
||||
|
||||
cp -a $out/bin/steamtinkerlaunch $TMPDIR/steamtinkerlaunch
|
||||
# yad cannot print its version without a graphical session https://github.com/v1cont/yad/issues/277
|
||||
substituteInPlace $TMPDIR/steamtinkerlaunch --replace ${yad} ${fakeYad}
|
||||
HOME=$TMPDIR $TMPDIR/steamtinkerlaunch compat add
|
||||
|
||||
cp -a $steamdir/compatibilitytools.d/SteamTinkerLaunch $steamcompattool
|
||||
# It creates this symlink but it points to $TMPDIR
|
||||
ln -sfn $out/bin/steamtinkerlaunch $steamcompattool/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Linux wrapper tool for use with the Steam client for custom launch options and 3rd party programs";
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "haveged";
|
||||
version = "1.9.18";
|
||||
version = "1.9.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jirka-h";
|
||||
repo = "haveged";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-fyL/J2A13ap582j4gdC8u63Ah67Old+BaO/CLyEeN/g=";
|
||||
hash = "sha256-tq4OXLlyC6exJEZ80H1gQQRBgYGbu+3kGz99RxsyauI=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "web-eid-app";
|
||||
version = "2.5.0";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "web-eid";
|
||||
repo = "web-eid-app";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-CaMf7cRhZ8K6YAUG38B+ijNOKaOmaACqNabNfHZGT68=";
|
||||
hash = "sha256-UqHT85zuoT/ISFP2qgG2J1518eGEvm5L96ntZ/lx9BE=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fio";
|
||||
version = "3.37";
|
||||
version = "3.38";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "axboe";
|
||||
repo = "fio";
|
||||
rev = "fio-${version}";
|
||||
sha256 = "sha256-dKHTxVglH10aV44RuSeIFATn83DVdmCYtuaiS3b0+zo=";
|
||||
sha256 = "sha256-hjU6be1+x4YsY9hztqSD5zIxojs6qRZH7GwEkxPwdus=";
|
||||
};
|
||||
|
||||
buildInputs = [ python3 zlib ]
|
||||
|
||||
@@ -2059,7 +2059,7 @@ in let inherit (pkgs) callPackage; in rec
|
||||
|
||||
ocamlPackages_latest = ocamlPackages_5_2;
|
||||
|
||||
ocamlPackages = ocamlPackages_5_1;
|
||||
ocamlPackages = ocamlPackages_5_2;
|
||||
|
||||
# We still have packages that rely on unsafe-string, which is deprecated in OCaml 4.06.0.
|
||||
# Below are aliases for porting them to the latest versions of the OCaml 4 series.
|
||||
|
||||
@@ -1412,6 +1412,8 @@ self: super: with self; {
|
||||
|
||||
pulumi-command = pkgs.pulumiPackages.pulumi-command.sdks.python;
|
||||
|
||||
pulumi-hcloud = callPackage ../development/python-modules/pulumi-hcloud { };
|
||||
|
||||
pulumi-random = pkgs.pulumiPackages.pulumi-random.sdks.python;
|
||||
|
||||
backcall = callPackage ../development/python-modules/backcall { };
|
||||
@@ -9397,6 +9399,8 @@ self: super: with self; {
|
||||
|
||||
opentelemetry-instrumentation-psycopg2 = callPackage ../development/python-modules/opentelemetry-instrumentation-psycopg2 { };
|
||||
|
||||
opentelemetry-instrumentation-requests = callPackage ../development/python-modules/opentelemetry-instrumentation-requests { };
|
||||
|
||||
opentelemetry-instrumentation-wsgi = callPackage ../development/python-modules/opentelemetry-instrumentation-wsgi { };
|
||||
|
||||
opentelemetry-proto = callPackage ../development/python-modules/opentelemetry-proto { };
|
||||
|
||||
Reference in New Issue
Block a user