Merge staging-next into staging
This commit is contained in:
github-actions[bot]
@@ -17,8 +17,8 @@ let
|
||||
sha256Hash = "sha256-Kb/1+g9rIuU/pAO1ue5h0+BU7OCE09QqV9XFoiJxBL4=";
|
||||
};
|
||||
latestVersion = {
|
||||
version = "2024.2.2.5"; # "Android Studio Ladybug Feature Drop | 2024.2.2 Canary 5"
|
||||
sha256Hash = "sha256-LlGjk0dSHVI5u/b942S5iu4RHv1D4KWg2Ge1TL47pvg=";
|
||||
version = "2024.3.1.2"; # "Android Studio Meerkat | 2024.3.1 Canary 2"
|
||||
sha256Hash = "sha256-Oy+BrRvySCAhlYAfaFdGMr//bfPJCfXJix7dp5ryTgg=";
|
||||
};
|
||||
in {
|
||||
# Attributes are named by their corresponding release channels
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
pkg-config,
|
||||
makeWrapper,
|
||||
@@ -18,22 +17,17 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "soapysdr";
|
||||
version = "0.8.1";
|
||||
version = "0.8.2-pre";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pothosware";
|
||||
repo = "SoapySDR";
|
||||
rev = "soapy-sdr-${finalAttrs.version}";
|
||||
sha256 = "19f2x0pkxvf9figa0pl6xqlcz8fblvqb19mcnj632p0l8vk6qdv2";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix for https://github.com/pothosware/SoapySDR/issues/352
|
||||
(fetchpatch {
|
||||
url = "https://github.com/pothosware/SoapySDR/commit/10c05b3e52caaa421147d6b4623eccd3fc3be3f4.patch";
|
||||
hash = "sha256-D7so6NSZiU6SXbzns04Q4RjSZW0FJ+MYobvvVpVMjws=";
|
||||
})
|
||||
];
|
||||
# Instead of applying several patches for Python 3.12 compat, just take the latest, from:
|
||||
# use old get python lib for v2 (#437)
|
||||
rev = "8c6cb7c5223fad995e355486527589c63aa3b21e";
|
||||
hash = "sha256-CKasL1mlpeuxXyPe6VDdAvb1l5a1cwWgyP7XX1aM73I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
@@ -79,7 +73,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/pothosware/SoapySDR";
|
||||
description = "Vendor and platform neutral SDR support library";
|
||||
license = licenses.boost;
|
||||
maintainers = with maintainers; [ markuskowa ];
|
||||
maintainers = with maintainers; [
|
||||
markuskowa
|
||||
numinit
|
||||
];
|
||||
mainProgram = "SoapySDRUtil";
|
||||
pkgConfigModules = [ "SoapySDR" ];
|
||||
platforms = platforms.unix;
|
||||
|
||||
@@ -129,6 +129,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
''
|
||||
];
|
||||
|
||||
# Ensure we reference 'lib' (not 'out') of Swift.
|
||||
# TODO: Remove this once the Swift wrapper doesn’t include these.
|
||||
preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
export SWIFT_LIB_DYNAMIC="${lib.getLib swift.swift}/lib/swift/macosx"
|
||||
'';
|
||||
|
||||
mesonFlags = [
|
||||
(lib.mesonOption "default_library" "shared")
|
||||
(lib.mesonBool "libmpv" true)
|
||||
|
||||
@@ -57,7 +57,7 @@ stdenvNoCC.mkDerivation {
|
||||
chmod +x $out/bin/limactl
|
||||
wrapProgram $out/bin/limactl \
|
||||
--prefix PATH : ${lib.makeBinPath [ qemu ]}
|
||||
|
||||
'' + lib.optionalString (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) ''
|
||||
# the shell completion only works with a patched $out/bin/limactl and so
|
||||
# needs to run after the autoPatchelfHook is executed in postFixup.
|
||||
doShellCompletion() {
|
||||
@@ -67,7 +67,7 @@ stdenvNoCC.mkDerivation {
|
||||
--zsh <($out/bin/limactl completion zsh)
|
||||
}
|
||||
postFixupHooks+=(doShellCompletion)
|
||||
|
||||
'' + ''
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
||||
@@ -54,10 +54,12 @@ buildGoModule rec {
|
||||
cp -r _output/* $out
|
||||
wrapProgram $out/bin/limactl \
|
||||
--prefix PATH : ${lib.makeBinPath [ qemu ]}
|
||||
'' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd limactl \
|
||||
--bash <($out/bin/limactl completion bash) \
|
||||
--fish <($out/bin/limactl completion fish) \
|
||||
--zsh <($out/bin/limactl completion zsh)
|
||||
'' + ''
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
rustPlatform,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
libsoup,
|
||||
pkg-config,
|
||||
webkitgtk_4_0,
|
||||
openssl,
|
||||
@@ -12,17 +11,19 @@
|
||||
gtk3,
|
||||
wrapGAppsHook3,
|
||||
cargo-tauri_1,
|
||||
librsvg,
|
||||
libappindicator-gtk3,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "alexandria";
|
||||
version = "0.12";
|
||||
version = "0.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "btpf";
|
||||
repo = "Alexandria";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-NX89Sg639dSwUcUGrpgmdcO4tXl2iszctiRDcBVLbUA=";
|
||||
hash = "sha256-18i3/HLTfhBSa9/c55dCOfFal+V40wcHcLoYt1dU+d0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -33,10 +34,10 @@ rustPlatform.buildRustPackage rec {
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit src;
|
||||
sourceRoot = "${src.name}";
|
||||
hash = "sha256-/RGaZMCJftjzvFLp8J/d9+MsxQwe7P0WfISz0JE3fn4=";
|
||||
hash = "sha256-6r9bEY7e1Eef/0/CJ26ITpFJcCVUEKLrFx+TNEomLPE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-W8HCpGuDkq8XfdrSvYfAHyX+oh30/bX29qdclN4P5yo=";
|
||||
cargoHash = "sha256-AsR2BJuz4RdPX1lmORwn6nK+8cm2Xmm1EOsxYkWx3hc=";
|
||||
|
||||
env = {
|
||||
OPENSSL_NO_VENDOR = 1;
|
||||
@@ -55,7 +56,8 @@ rustPlatform.buildRustPackage rec {
|
||||
openssl
|
||||
webkitgtk_4_0
|
||||
gtk3
|
||||
libsoup
|
||||
librsvg
|
||||
libappindicator-gtk3
|
||||
];
|
||||
|
||||
npmRoot = "..";
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
{ fetchurl, lib, stdenv, coreutils, makeWrapper }:
|
||||
{ fetchurl, lib, stdenv, coreutils, makeWrapper, gitUpdater }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ant";
|
||||
version = "1.10.11";
|
||||
version = "1.10.15";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2";
|
||||
sha256 = "19m8xb7h6xm4jykzb79kakbx1pa4awaglw6z31pbfg8m5pmwkipz";
|
||||
hash = "sha256-h/SNGLoRwRVojDfvl1g+xv+J6mAz+J2BimckjaRxDEs=";
|
||||
};
|
||||
|
||||
contrib = fetchurl {
|
||||
@@ -78,6 +78,13 @@ stdenv.mkDerivation rec {
|
||||
chmod +x $out/bin/ant
|
||||
''; # */
|
||||
|
||||
passthru = {
|
||||
updateScript = gitUpdater {
|
||||
rev-prefix = "rel/";
|
||||
url = "https://gitbox.apache.org/repos/asf/ant";
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://ant.apache.org/";
|
||||
description = "Java-based build tool";
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "arti";
|
||||
version = "1.2.8";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.torproject.org";
|
||||
@@ -19,10 +19,10 @@ rustPlatform.buildRustPackage rec {
|
||||
owner = "core";
|
||||
repo = "arti";
|
||||
rev = "arti-v${version}";
|
||||
hash = "sha256-vw/hebZ23Pk+hQx3YN9iXsKWq20fqpwp91E2tul8zmA=";
|
||||
hash = "sha256-zGaNA6LdW2jZ6NyySklFCsLm2b5xk44E8ecJDV393c4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-4F+0KEVoeppNQ26QQ+a2CSIbrklE8NY3+OK11I5JstA=";
|
||||
cargoHash = "sha256-9BvIQdhY/7i0X8w6XJZZeWzxEfqJlquO/qOWvvhCWaA=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
|
||||
|
||||
|
||||
@@ -50,9 +50,9 @@
|
||||
},
|
||||
"aks-preview": {
|
||||
"pname": "aks-preview",
|
||||
"version": "9.0.0b8",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-9.0.0b8-py2.py3-none-any.whl",
|
||||
"hash": "sha256-CYRK4Cug1Y+TaK43OPPUMR9cpyHtzBz3CIb8+KgMv7g=",
|
||||
"version": "13.0.0b1",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-13.0.0b1-py2.py3-none-any.whl",
|
||||
"hash": "sha256-V9Ll880ec95QKoV6E5P6TQAVpsrJVaKZFkZ749+5Uss=",
|
||||
"description": "Provides a preview for upcoming AKS features"
|
||||
},
|
||||
"akshybrid": {
|
||||
@@ -78,9 +78,9 @@
|
||||
},
|
||||
"amg": {
|
||||
"pname": "amg",
|
||||
"version": "2.5.0",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/amg-2.5.0-py3-none-any.whl",
|
||||
"hash": "sha256-yQAtjGU/VqixCGvzPpGPO6bzJ8yEAGvnWUB4QhiH9B0=",
|
||||
"version": "2.5.2",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/amg-2.5.2-py3-none-any.whl",
|
||||
"hash": "sha256-T/8/ziRGiD+1MDdpUzBiHz+q4Q7/i2AG+x/6M64SxU4=",
|
||||
"description": "Microsoft Azure Command-Line Tools Azure Managed Grafana Extension"
|
||||
},
|
||||
"amlfs": {
|
||||
@@ -141,9 +141,9 @@
|
||||
},
|
||||
"azure-firewall": {
|
||||
"pname": "azure-firewall",
|
||||
"version": "1.2.0",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/azure_firewall-1.2.0-py2.py3-none-any.whl",
|
||||
"hash": "sha256-VGjMCbjqeRgXa16Vqjwkx62bfRtoxH0Wv1IqBT/YEeg=",
|
||||
"version": "1.2.1",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/azure_firewall-1.2.1-py2.py3-none-any.whl",
|
||||
"hash": "sha256-xvttNUPeleAxiLuGuqCNI6eI+xIxpW7aJ92yVYsl13c=",
|
||||
"description": "Manage Azure Firewall resources"
|
||||
},
|
||||
"azurelargeinstance": {
|
||||
@@ -202,13 +202,6 @@
|
||||
"hash": "sha256-nqYWLTf8M5C+Tc5kywXFxYgHAQTz6SpwGrR1RzVlqKk=",
|
||||
"description": "Translate ARM template to executable Azure CLI scripts"
|
||||
},
|
||||
"compute-diagnostic-rp": {
|
||||
"pname": "compute-diagnostic-rp",
|
||||
"version": "1.0.0b1",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/compute_diagnostic_rp-1.0.0b1-py3-none-any.whl",
|
||||
"hash": "sha256-gQ6TzgDH0D322poPr1e5ZvttpYIxH5yudLK34ePEFCM=",
|
||||
"description": "Microsoft Azure Command-Line Tools ComputeDiagnosticRp Extension"
|
||||
},
|
||||
"confidentialledger": {
|
||||
"pname": "confidentialledger",
|
||||
"version": "1.0.0",
|
||||
@@ -309,9 +302,9 @@
|
||||
},
|
||||
"dataprotection": {
|
||||
"pname": "dataprotection",
|
||||
"version": "1.5.4",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/dataprotection-1.5.4-py3-none-any.whl",
|
||||
"hash": "sha256-vAyVrv0dte1KioEwriEF8oNqrEwN3WSKDC/hyTudQtg=",
|
||||
"version": "1.5.5",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/dataprotection-1.5.5-py3-none-any.whl",
|
||||
"hash": "sha256-DsYp2y2HQd+PVNJVuyJepEHgBuGGc8Cg5GEwZWJVcPk=",
|
||||
"description": "Microsoft Azure Command-Line Tools DataProtectionClient Extension"
|
||||
},
|
||||
"datashare": {
|
||||
@@ -547,9 +540,9 @@
|
||||
},
|
||||
"image-copy-extension": {
|
||||
"pname": "image-copy-extension",
|
||||
"version": "0.2.13",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/image_copy_extension-0.2.13-py2.py3-none-any.whl",
|
||||
"hash": "sha256-sNEr88dFAHkNWNmabDJWJUhxLLhyt5QuitSB4nBSGxk=",
|
||||
"version": "1.0.0",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/image_copy_extension-1.0.0-py2.py3-none-any.whl",
|
||||
"hash": "sha256-4RO7FHmyQdJd0GY0OqdF9wxYFq5U4sAXYczPFgOUX9g=",
|
||||
"description": "Support for copying managed vm images between regions"
|
||||
},
|
||||
"image-gallery": {
|
||||
@@ -722,9 +715,9 @@
|
||||
},
|
||||
"multicloud-connector": {
|
||||
"pname": "multicloud-connector",
|
||||
"version": "1.0.0",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/multicloud_connector-1.0.0-py3-none-any.whl",
|
||||
"hash": "sha256-8Gb946+K7DwMm5s5GROUciYRkvYvxgB7rB5Y3MRn5t8=",
|
||||
"version": "1.0.1",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/multicloud_connector-1.0.1-py3-none-any.whl",
|
||||
"hash": "sha256-q5tuqnN94FS1opr9oLx2LHFYuFX6PTDaBmuvrByXTsI=",
|
||||
"description": "Microsoft Azure Command-Line Tools MulticloudConnector Extension"
|
||||
},
|
||||
"neon": {
|
||||
@@ -743,9 +736,9 @@
|
||||
},
|
||||
"networkcloud": {
|
||||
"pname": "networkcloud",
|
||||
"version": "2.0.0b5",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/networkcloud-2.0.0b5-py3-none-any.whl",
|
||||
"hash": "sha256-rHLPxU7TWDTKbNXHJ6D91x5JQ7zWbmXND/YH6K5JXHo=",
|
||||
"version": "2.0.0b6",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/networkcloud-2.0.0b6-py3-none-any.whl",
|
||||
"hash": "sha256-1T+IepVTU7DLHQ7CfcEltQG+/lryktzUFB7RY9O9hzM=",
|
||||
"description": "Support for Azure Operator Nexus network cloud commands based on 2024-07-01 API version"
|
||||
},
|
||||
"new-relic": {
|
||||
@@ -1065,16 +1058,16 @@
|
||||
},
|
||||
"virtual-network-manager": {
|
||||
"pname": "virtual-network-manager",
|
||||
"version": "1.3.0",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/virtual_network_manager-1.3.0-py3-none-any.whl",
|
||||
"hash": "sha256-8W+ZL5j9A8AdzvikD5uE3iNn/56IULSGY6m7HLVbe9Q=",
|
||||
"version": "1.3.1",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/virtual_network_manager-1.3.1-py3-none-any.whl",
|
||||
"hash": "sha256-y5VTXAV6YZk4S8nlwwqZQtvFic8M6tsqYtJqp/cNTh0=",
|
||||
"description": "Microsoft Azure Command-Line Tools NetworkManagementClient Extension"
|
||||
},
|
||||
"virtual-network-tap": {
|
||||
"pname": "virtual-network-tap",
|
||||
"version": "1.0.0b1",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/virtual_network_tap-1.0.0b1-py2.py3-none-any.whl",
|
||||
"hash": "sha256-7l9tz8CfwJ4MO704a007xswfij3ejtVQgE9D7Uw8t7o=",
|
||||
"version": "1.0.0b2",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/virtual_network_tap-1.0.0b2-py2.py3-none-any.whl",
|
||||
"hash": "sha256-h5yPHrfrkt4+ZzlH/gvGJuK23y7oF1yW/zYmxDW4Gx4=",
|
||||
"description": "Manage virtual network taps (VTAP)"
|
||||
},
|
||||
"virtual-wan": {
|
||||
|
||||
@@ -148,5 +148,6 @@
|
||||
# Removed extensions
|
||||
adp = throw "The 'adp' extension for azure-cli was deprecated upstream"; # Added 2024-11-02, https://github.com/Azure/azure-cli-extensions/pull/8038
|
||||
blockchain = throw "The 'blockchain' extension for azure-cli was deprecated upstream"; # Added 2024-04-26, https://github.com/Azure/azure-cli-extensions/pull/7370
|
||||
compute-diagnostic-rp = throw "The 'compute-diagnostic-rp' extension for azure-cli was deprecated upstream"; # Added 2024-11-12, https://github.com/Azure/azure-cli-extensions/pull/8240
|
||||
connection-monitor-preview = throw "The 'connection-monitor-preview' extension for azure-cli was deprecated upstream"; # Added 2024-11-02, https://github.com/Azure/azure-cli-extensions/pull/8194
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
runCommand,
|
||||
installShellFiles,
|
||||
python3,
|
||||
writeScriptBin,
|
||||
writeShellScriptBin,
|
||||
|
||||
black,
|
||||
isort,
|
||||
@@ -26,14 +26,14 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.65.0";
|
||||
version = "2.66.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "azure-cli-${version}-src";
|
||||
owner = "Azure";
|
||||
repo = "azure-cli";
|
||||
rev = "azure-cli-${version}";
|
||||
hash = "sha256-IeiAB0AI6KNpXwx2Iv55LBARcwemakbblFlbfLheuGE=";
|
||||
hash = "sha256-iWDKvtEvH6ZwK+5Zp9P2fgXP+4f4kXH+xXfBkYmsPl0=";
|
||||
};
|
||||
|
||||
# put packages that needs to be overridden in the py package scope
|
||||
@@ -169,8 +169,10 @@ py.pkgs.toPythonApplication (
|
||||
azure-mgmt-media
|
||||
azure-mgmt-monitor
|
||||
azure-mgmt-msi
|
||||
azure-mgmt-mysqlflexibleservers
|
||||
azure-mgmt-netapp
|
||||
azure-mgmt-policyinsights
|
||||
azure-mgmt-postgresqlflexibleservers
|
||||
azure-mgmt-privatedns
|
||||
azure-mgmt-rdbms
|
||||
azure-mgmt-recoveryservicesbackup
|
||||
@@ -385,7 +387,7 @@ py.pkgs.toPythonApplication (
|
||||
inherit (azure-cli) extensions-tool;
|
||||
};
|
||||
|
||||
generate-extensions = writeScriptBin "${pname}-update-extensions" ''
|
||||
generate-extensions = writeShellScriptBin "${pname}-update-extensions" ''
|
||||
${lib.getExe azure-cli.extensions-tool} --cli-version ${azure-cli.version} --commit
|
||||
'';
|
||||
|
||||
|
||||
@@ -82,6 +82,7 @@ let
|
||||
--ignore=azure/cli/core/tests/test_generic_update.py \
|
||||
--ignore=azure/cli/core/tests/test_cloud.py \
|
||||
--ignore=azure/cli/core/tests/test_extension.py \
|
||||
--ignore=azure/cli/core/tests/test_util.py \
|
||||
-k 'not metadata_url and not test_send_raw_requests and not test_format_styled_text_legacy_powershell'
|
||||
'';
|
||||
|
||||
@@ -136,11 +137,6 @@ let
|
||||
overrideAzureMgmtPackage super.azure-mgmt-cdn "12.0.0" "zip"
|
||||
"sha256-t8PuIYkjS0r1Gs4pJJJ8X9cz8950imQtbVBABnyMnd0=";
|
||||
|
||||
# ImportError: cannot import name 'SqlDedicatedGatewayServiceResourceCreateUpdateProperties' from 'azure.mgmt.cosmosdb.models'
|
||||
azure-mgmt-cosmosdb =
|
||||
overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "9.5.1" "tar.gz"
|
||||
"sha256-TlXTlz8RzwLPeoBVruhmFSM9fL47siegfBdrrIvH7wI=";
|
||||
|
||||
# ValueError: The operation 'azure.mgmt.devtestlabs.operations#VirtualMachinesOperations.delete' is invalid.
|
||||
azure-mgmt-devtestlabs =
|
||||
overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip"
|
||||
@@ -175,18 +171,13 @@ let
|
||||
|
||||
# AttributeError: module 'azure.mgmt.rdbms.postgresql_flexibleservers.operations' has no attribute 'BackupsOperations'
|
||||
azure-mgmt-rdbms =
|
||||
overrideAzureMgmtPackage super.azure-mgmt-rdbms "10.2.0b16" "tar.gz"
|
||||
"sha256-HDktzv8MOs5VRQArbS3waMhjbwVgZMmvch7PXen5DjE=";
|
||||
overrideAzureMgmtPackage super.azure-mgmt-rdbms "10.2.0b17" "tar.gz"
|
||||
"sha256-1nnRkyr4Im79B7DDqGz/FOrPAToFaGhE+a7r5bZMuOQ=";
|
||||
|
||||
# ModuleNotFoundError: No module named 'azure.mgmt.resource.deploymentstacks'
|
||||
azure-mgmt-resource =
|
||||
overrideAzureMgmtPackage super.azure-mgmt-resource "23.1.1" "tar.gz"
|
||||
"sha256-ILawBrVE/bGWB/P2o4EQViXgu2D78wNvOYhcRkbTND4=";
|
||||
|
||||
# ImportError: cannot import name 'Replica' from 'azure.mgmt.signalr.models'
|
||||
# ImportError: cannot import name 'IPRule' from 'azure.mgmt.signalr.models'
|
||||
azure-mgmt-signalr =
|
||||
overrideAzureMgmtPackage super.azure-mgmt-signalr "2.0.0b1" "tar.gz"
|
||||
"sha256-oK2ceBEoQ7gAeG6mye+x8HPzQU9bUNRPVJtRW2GL4xg=";
|
||||
overrideAzureMgmtPackage super.azure-mgmt-signalr "2.0.0b2" "tar.gz"
|
||||
"sha256-05PUV8ouAKq/xhGxVEWIzDop0a7WDTV5mGVSC4sv9P4=";
|
||||
|
||||
# ImportError: cannot import name 'AdvancedThreatProtectionName' from 'azure.mgmt.sql.models'
|
||||
azure-mgmt-sql =
|
||||
|
||||
@@ -1,25 +1,31 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildGoModule {
|
||||
buildGoModule rec {
|
||||
pname = "c-for-go";
|
||||
version = "unstable-2023-09-06";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xlab";
|
||||
repo = "c-for-go";
|
||||
# c-for-go is not versioned upstream, so we pin it to a commit hash.
|
||||
rev = "a1822f0a09c1c6c89fc12aeb691a27b3221c73f3";
|
||||
hash = "sha256-P7lrAVyZ6fV63gVvLvsKt14pi32Pr2eVLT2mTdHHdrQ=";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-XU+gmQBhQjoiKINfgPQ6bVvslPEFOvF3ZbRaWZE/ZzA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-u/GWniw5UQBOtnj3ErdxL80j2Cv6cbMwvP1im3dZ2cM=";
|
||||
vendorHash = "sha256-4Uw0RYKzZOSVmtdChv/LQQCYU+oVqb1KZbewEW10omw=";
|
||||
|
||||
meta = with lib; {
|
||||
# Almost all tests fail on the release branch, but package still compiles and works fine.
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/xlab/c-for-go";
|
||||
changelog = "https://github.com/xlab/c-for-go/releases/";
|
||||
description = "Automatic C-Go Bindings Generator for the Go Programming Language";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ msanft ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.msanft ];
|
||||
mainProgram = "c-for-go";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cdk-go";
|
||||
version = "1.5.3";
|
||||
version = "1.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cdk-team";
|
||||
repo = "CDK";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-0cg2o98BcE4H6EW/yAkJOJtIJXEq2cFG6pNaRPtQofo=";
|
||||
hash = "sha256-Lpn+VuCzODOzxcgfD1l36eHmssAUz7+HgtN8vZwDNwE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-aJN/d/BxmleRXKw6++k6e0Vb0Gs5zg1QfakviABYTog=";
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ghostunnel";
|
||||
version = "1.8.1";
|
||||
version = "1.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ghostunnel";
|
||||
repo = "ghostunnel";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-35E8Qhy3U3ZJJL6EOJ2D98vvr0Vv5qMs9pLuQSMFoAs=";
|
||||
hash = "sha256-OWjYa8LOWClAWhZERJ24e6tIaOJZUuOzaYXN04rvv8s=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -1,15 +1,22 @@
|
||||
{ lib, python3Packages, fetchFromGitHub, xvfb-run, xdotool, dmenu }:
|
||||
{ dmenu
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, python3Packages
|
||||
, xdotool
|
||||
, xsel
|
||||
, xvfb-run
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "keepmenu";
|
||||
version = "1.4.0";
|
||||
version = "1.4.2";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firecat53";
|
||||
repo = "keepmenu";
|
||||
rev = version;
|
||||
hash = "sha256-3vFg+9Nw+NhuPJbrmBahXwa13wXlBg5IMYwJ+unn88k=";
|
||||
hash = "sha256-Kzt2RqyYvOWnbkflwTHzlnpUaruVQvdGys57DDpH9o8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
@@ -22,7 +29,7 @@ python3Packages.buildPythonApplication rec {
|
||||
pynput
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ xvfb-run xdotool dmenu ];
|
||||
nativeCheckInputs = [ dmenu xdotool xsel xvfb-run ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace tests/keepmenu-config.ini tests/tests.py \
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
|
||||
python3.pkgs.buildPythonPackage rec {
|
||||
pname = "ledfx";
|
||||
version = "2.0.104";
|
||||
version = "2.0.105";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Hs21Okf0gt8eHTuGMW8L2ioW+hv7QDFOP4oJDQfRba0=";
|
||||
hash = "sha256-S/ZlEFgcFiLr0V7g0X0bjWU0YNVzA0JctFaJTK/QkpI=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "noto-fonts${suffix}";
|
||||
version = "24.3.1";
|
||||
version = "2024.11.01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "notofonts";
|
||||
repo = "notofonts.github.io";
|
||||
rev = "noto-monthly-release-${version}";
|
||||
hash = "sha256-bopBRpIGXtRyAjBuMhJCjwFUlK8WDurxIFbZbRzEE40=";
|
||||
hash = "sha256-d6xqG+unmFATdwXnRniTtm/ER+NzKi0jPxkgxr+bnhk=";
|
||||
};
|
||||
|
||||
_variants = map (variant: builtins.replaceStrings [ " " ] [ "" ] variant) variants;
|
||||
|
||||
@@ -31,18 +31,18 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sile";
|
||||
version = "0.15.5";
|
||||
version = "0.15.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/sile-typesetter/sile/releases/download/v${finalAttrs.version}/sile-${finalAttrs.version}.tar.zst";
|
||||
sha256 = "sha256-0gE3sC0WMC0odnD9KFrSisO406+RZGCqa8jL/5Mhufk=";
|
||||
sha256 = "sha256-CtPvxbpq2/qwuANPp9XDJQHlxIbFiaNZJvYZeUx/wyE=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit (finalAttrs) src;
|
||||
nativeBuildInputs = [ zstd ];
|
||||
dontConfigure = true;
|
||||
hash = "sha256-hmgDG29C5JfQX2acMr8c3lmswa1u5XHauRWFd4QGmOo=";
|
||||
hash = "sha256-5SheeabI4SqJZ3edAvX2rUEGTdCXHoBTa+rnX7lv9Cg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,15 +7,15 @@
|
||||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
pname = "supermodel";
|
||||
version = "0-unstable-2024-04-05";
|
||||
version = "0-unstable-2024-11-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trzy";
|
||||
repo = "supermodel";
|
||||
rev = "250f84e78eba381adf8cd731ce20b1b9be43c8c8";
|
||||
hash = "sha256-3sDtNMW5R5Eq9GXJzKs0mQdiLUIWl6+4+rzKg8xpqEY=";
|
||||
rev = "4e7356ab2c077aa3bc3d75fb6e164a1c943fe4c1";
|
||||
hash = "sha256-ajRbgs6oMFF+dYHPsKM7FU16vuZcSovaNk2thdsUWtk=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -102,7 +102,7 @@ lib.warnIf (useHardenedMalloc != null)
|
||||
++ lib.optionals mediaSupport [ ffmpeg ]
|
||||
);
|
||||
|
||||
version = "14.0.1";
|
||||
version = "14.0.2";
|
||||
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
@@ -112,7 +112,7 @@ lib.warnIf (useHardenedMalloc != null)
|
||||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
|
||||
];
|
||||
hash = "sha256-DQbKMaXgEXNKHPonQF7RZ1TtEqCRnvD81ahyVUkknY8=";
|
||||
hash = "sha256-dHyCHIM5obNH4evDP2yekFfhJ8J0OGSnCEOlV3ldC5o=";
|
||||
};
|
||||
|
||||
i686-linux = fetchurl {
|
||||
@@ -122,7 +122,7 @@ lib.warnIf (useHardenedMalloc != null)
|
||||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
|
||||
];
|
||||
hash = "sha256-khY/B4c0DjqRd0s9PblEhL0jJONVU5mQCAqZ60M+CjE=";
|
||||
hash = "sha256-iXrQniSu+eJ5Uyb85qeO7gqa+Qg2cM2Dj1ur8YIBzCc=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -5,12 +5,12 @@
|
||||
|
||||
let
|
||||
pname = "wtfis";
|
||||
version = "0.10.0";
|
||||
version = "0.10.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pirxthepilot";
|
||||
repo = "wtfis";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-5mvbwIKnCk8mbjVJAmUwV1zKzGk8HVVZLiUVQXRvczA=";
|
||||
hash = "sha256-+BJmAFjmj3z/sKJ/L/y6hTClesulpQTpDL9cUNRi6e8=";
|
||||
};
|
||||
in python3.pkgs.buildPythonApplication {
|
||||
inherit pname version src;
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deepin-terminal";
|
||||
version = "6.0.14";
|
||||
version = "6.0.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-qSInmsGsMTZS9f2vDtWh8amQ7QaUyu0mifolUGdrs4Q=";
|
||||
hash = "sha256-Xcvdv58gJNhrdznQ09Nz/nMkM4IFIgQnapuhIdYHG0g=";
|
||||
};
|
||||
|
||||
cmakeFlags = [ "-DVERSION=${version}" ];
|
||||
|
||||
@@ -7,6 +7,8 @@
|
||||
pdm-backend,
|
||||
pytest-asyncio,
|
||||
pytestCheckHook,
|
||||
starlette,
|
||||
baize,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -28,10 +30,15 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
dependencies = [
|
||||
starlette
|
||||
baize
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Convert WSGI app to ASGI app or ASGI app to WSGI app";
|
||||
homepage = "https://github.com/abersheeran/a2wsgi";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
wheel,
|
||||
azure-common,
|
||||
azure-mgmt-core,
|
||||
isodate,
|
||||
typing-extensions,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-mysqlflexibleservers";
|
||||
version = "1.0.0b2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "azure_mgmt_mysqlflexibleservers";
|
||||
inherit version;
|
||||
hash = "sha256-pL3z3s/H7OYaPiGNGdUIzo3ppp6sR/G+6iDB219Mp9A=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
azure-common
|
||||
azure-mgmt-core
|
||||
isodate
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"azure.mgmt.mysqlflexibleservers"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Microsoft Azure Mysqlflexibleservers Management Client Library for Python";
|
||||
homepage = "https://pypi.org/project/azure-mgmt-mysqlflexibleservers/";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,46 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
wheel,
|
||||
azure-common,
|
||||
azure-mgmt-core,
|
||||
isodate,
|
||||
typing-extensions,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-postgresqlflexibleservers";
|
||||
version = "1.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "azure_mgmt_postgresqlflexibleservers";
|
||||
inherit version;
|
||||
hash = "sha256-5aSpnUCTol+L1w7XZp6d2QRN+LxGOpUUztiMQqkD55E=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
azure-common
|
||||
azure-mgmt-core
|
||||
isodate
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"azure.mgmt.postgresqlflexibleservers"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Microsoft Azure Postgresqlflexibleservers Management Client Library for Python";
|
||||
homepage = "https://pypi.org/project/azure-mgmt-postgresqlflexibleservers/";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,60 @@
|
||||
{
|
||||
buildPythonPackage,
|
||||
lib,
|
||||
fetchPypi,
|
||||
pytestCheckHook,
|
||||
pdm-pep517,
|
||||
pytest-httpx,
|
||||
setuptools,
|
||||
starlette,
|
||||
anyio,
|
||||
pytest-asyncio,
|
||||
pytest-tornasync,
|
||||
pytest-trio,
|
||||
pytest-twisted,
|
||||
twisted,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "baize";
|
||||
version = "0.22.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-J+l8NsSTpCh7Uws+Zp45LXkLEBBurqOsOr8Iik/9smY=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
pdm-pep517
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
starlette
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-httpx
|
||||
anyio
|
||||
pytest-asyncio
|
||||
pytest-tornasync
|
||||
pytest-trio
|
||||
pytest-twisted
|
||||
twisted
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# https://github.com/abersheeran/baize/issues/67
|
||||
"test_files"
|
||||
"test_request_response"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Powerful and exquisite WSGI/ASGI framework/toolkit";
|
||||
maintainers = with lib.maintainers; [ bot-wxt1221 ];
|
||||
homepage = "https://baize.aber.sh/";
|
||||
license = lib.licenses.asl20;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
From 10c3d787cc9c7fb31c6cc7074e9ce00dfeb6bb85 Mon Sep 17 00:00:00 2001
|
||||
From: wxt <3264117476@qq.com>
|
||||
Date: Thu, 14 Nov 2024 16:16:17 +0800
|
||||
Subject: [PATCH] Part of 1992
|
||||
|
||||
---
|
||||
tests/decorators/test_validation.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/decorators/test_validation.py b/tests/decorators/test_validation.py
|
||||
index bece403..d7e0984 100644
|
||||
--- a/tests/decorators/test_validation.py
|
||||
+++ b/tests/decorators/test_validation.py
|
||||
@@ -78,7 +78,7 @@ def test_invalid_type(monkeypatch):
|
||||
logger = MagicMock()
|
||||
monkeypatch.setattr("connexion.validators.parameter.logger", logger)
|
||||
result = ParameterValidator.validate_parameter(
|
||||
- "formdata", 20, {"type": "string", "name": "foo"}
|
||||
+ "formdata", 20, {"name": "foo", "type": "string"}
|
||||
)
|
||||
expected_result = """20 is not of type 'string'
|
||||
|
||||
--
|
||||
2.47.0
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
buildPythonPackage,
|
||||
pythonOlder,
|
||||
@@ -46,6 +47,11 @@ buildPythonPackage rec {
|
||||
hash = "sha256-rngQDU9kXw/Z+Al0SCVnWN8xnphueTtZ0+xPBR5MbEM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# A really small Part of https://github.com/spec-first/connexion/pull/1992 Will fix check on newest dependencies
|
||||
./0001-Part-of-1992.patch
|
||||
];
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
dependencies = [
|
||||
@@ -79,26 +85,31 @@ buildPythonPackage rec {
|
||||
|
||||
pythonImportsCheck = [ "connexion" ];
|
||||
|
||||
disabledTests = [
|
||||
"test_build_example"
|
||||
"test_mock_resolver_no_example"
|
||||
# Tests require network access
|
||||
"test_remote_api"
|
||||
# AssertionError
|
||||
"test_headers"
|
||||
# waiter.acquire() deadlock
|
||||
"test_cors_server_error"
|
||||
"test_get_bad_default_response"
|
||||
"test_schema_response"
|
||||
"test_writeonly"
|
||||
];
|
||||
disabledTests =
|
||||
[
|
||||
"test_build_example"
|
||||
"test_mock_resolver_no_example"
|
||||
# Tests require network access
|
||||
"test_remote_api"
|
||||
# AssertionError
|
||||
"test_headers"
|
||||
# waiter.acquire() deadlock
|
||||
"test_cors_server_error"
|
||||
"test_get_bad_default_response"
|
||||
"test_schema_response"
|
||||
"test_writeonly"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# ImportError: Error while finding loader for '/private/tmp/nix-build-python3.12-connexion-3.1.0.drv-0/source' (<class 'ModuleNotFoundError'>: No module named '/private/tmp/nix-build-python3')
|
||||
"test_lifespan"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Swagger/OpenAPI First framework on top of Flask";
|
||||
homepage = "https://github.com/spec-first/connexion";
|
||||
changelog = "https://github.com/spec-first/connexion/releases/tag/${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ ];
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ bot-wxt1221 ];
|
||||
mainProgram = "connexion";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "homematicip";
|
||||
version = "1.1.2";
|
||||
version = "1.1.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@@ -29,7 +29,7 @@ buildPythonPackage rec {
|
||||
owner = "hahn-th";
|
||||
repo = "homematicip-rest-api";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-f1KjBYwLqQbA6TbQ3ZZ8TgvGe1USbYYNjsni2vsnTP8=";
|
||||
hash = "sha256-LRljuGOuGwAuZEVYFci5tAb8c15ePR6QYwlTM0hXMgU=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyexploitdb";
|
||||
version = "0.2.54";
|
||||
version = "0.2.55";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "pyExploitDb";
|
||||
inherit version;
|
||||
hash = "sha256-TJ2cjYadXqaX31UXY99/pCeH0T2nFj83AiLdX0SMC3U=";
|
||||
hash = "sha256-tFJogmMM0T/nZawDqDeaM3XP4FCTdKnNAZdpxUakvL8=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pygccxml";
|
||||
version = "2.5.0";
|
||||
version = "2.6.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "gccxml";
|
||||
repo = "pygccxml";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-wHZy2BG3h+OMTvIAPtLlq1vsW5V/TqZdnzBJ9VipMiQ=";
|
||||
hash = "sha256-HTDbkhSbjFl41+i91M9cBwNs8nbcz+0H439Li0WFemg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pygithub";
|
||||
version = "2.4.0";
|
||||
version = "2.5.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "PyGithub";
|
||||
repo = "PyGithub";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-VM3xxLa4MlR3vTpeOunsq4/bxZhuKXNKFZbFVul1cMw=";
|
||||
hash = "sha256-rKa441hiO4M/sC6wxU9yeCu6IQJMZroyi7bad/j6brw=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
mkTclDerivation rec {
|
||||
pname = "tcllib";
|
||||
version = "1.21";
|
||||
version = "2.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "mirror://sourceforge/tcllib/tcllib-${version}.tar.gz";
|
||||
hash = "sha256-p8thpRpC+9k/LvbBFaSOIpDXuhMlEWhs0qbrjtKcTzQ=";
|
||||
hash = "sha256-LoY6y7p9n1dXk4eSa/HuyA4bIXa0rN7F2OGESk2tROI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = lib.optional withCritcl critcl;
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
mkTclDerivation rec {
|
||||
pname = "critcl";
|
||||
version = "3.2";
|
||||
version = "3.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "andreas-kupries";
|
||||
repo = "critcl";
|
||||
rev = version;
|
||||
hash = "sha256-IxScn9ZTlqD9mG9VJLG+TtplLFhhahOiFhQCjxp22Uk=";
|
||||
hash = "sha256-LBTAuwTrvwj42vo/TXVSUK8euxHgvSLai23e1jmhMso=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -3,13 +3,13 @@
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
# NOTE: this should be updated with linux_rpi
|
||||
pname = "raspberrypi-firmware";
|
||||
version = "1.20240926";
|
||||
version = "1.20241008";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raspberrypi";
|
||||
repo = "firmware";
|
||||
rev = version;
|
||||
hash = "sha256-MCutxzdSFoZ4hn2Fxk2AHHgWCt/Jgc+reqJZHUuSKOc=";
|
||||
hash = "sha256-4gnK0KbqFnjBmWia9Jt2gveVWftmHrprpwBqYVqE/k0=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
let
|
||||
# NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this
|
||||
modDirVersion = "6.6.31";
|
||||
tag = "stable_20240529";
|
||||
modDirVersion = "6.6.51";
|
||||
tag = "stable_20241008";
|
||||
in
|
||||
lib.overrideDerivation (buildLinux (args // {
|
||||
version = "${modDirVersion}-${tag}";
|
||||
@@ -14,7 +14,7 @@ lib.overrideDerivation (buildLinux (args // {
|
||||
owner = "raspberrypi";
|
||||
repo = "linux";
|
||||
rev = tag;
|
||||
hash = "sha256-UWUTeCpEN7dlFSQjog6S3HyEWCCnaqiUqV5KxCjYink=";
|
||||
hash = "sha256-phCxkuO+jUGZkfzSrBq6yErQeO2Td+inIGHxctXbD5U=";
|
||||
};
|
||||
|
||||
defconfig = {
|
||||
@@ -24,37 +24,10 @@ lib.overrideDerivation (buildLinux (args // {
|
||||
"4" = "bcm2711_defconfig";
|
||||
}.${toString rpiVersion};
|
||||
|
||||
structuredExtraConfig = (args.structuredExtraConfig or {}) // (with lib.kernel; {
|
||||
# Workaround https://github.com/raspberrypi/linux/issues/6198
|
||||
# Needed because NixOS 24.05+ sets DRM_SIMPLEDRM=y which pulls in
|
||||
# DRM_KMS_HELPER=y.
|
||||
BACKLIGHT_CLASS_DEVICE = yes;
|
||||
});
|
||||
|
||||
features = {
|
||||
efiBootStub = false;
|
||||
} // (args.features or {});
|
||||
|
||||
kernelPatches = (args.kernelPatches or []) ++ [
|
||||
# Fix compilation errors due to incomplete patch backport.
|
||||
# https://github.com/raspberrypi/linux/pull/6223
|
||||
{
|
||||
name = "gpio-pwm_-_pwm_apply_might_sleep.patch";
|
||||
patch = fetchpatch {
|
||||
url = "https://github.com/peat-psuwit/rpi-linux/commit/879f34b88c60dd59765caa30576cb5bfb8e73c56.patch";
|
||||
hash = "sha256-HlOkM9EFmlzOebCGoj7lNV5hc0wMjhaBFFZvaRCI0lI=";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "ir-rx51_-_pwm_apply_might_sleep.patch";
|
||||
patch = fetchpatch {
|
||||
url = "https://github.com/peat-psuwit/rpi-linux/commit/23431052d2dce8084b72e399fce82b05d86b847f.patch";
|
||||
hash = "sha256-UDX/BJCJG0WVndP/6PbPK+AZsfU3vVxDCrpn1kb1kqE=";
|
||||
};
|
||||
}
|
||||
];
|
||||
|
||||
extraMeta = if (rpiVersion < 3) then {
|
||||
platforms = with lib.platforms; arm;
|
||||
hydraPlatforms = [];
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
buildHomeAssistantComponent rec {
|
||||
owner = "hultenvp";
|
||||
domain = "solis";
|
||||
version = "3.7.0";
|
||||
version = "3.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hultenvp";
|
||||
repo = "solis-sensor";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bKe8c+gQj9jvZKlqcbLiD6NhPDJVy/2mxRM8jjlOPnI=";
|
||||
hash = "sha256-oJXbDuHT5temcei3ea1cUsqVB70am6WZjHbIehnZs6k=";
|
||||
};
|
||||
|
||||
dependencies = [ aiofiles ];
|
||||
|
||||
@@ -10,8 +10,8 @@ let
|
||||
in
|
||||
buildMongoDB {
|
||||
inherit avxSupport;
|
||||
version = "6.0.17";
|
||||
sha256 = "sha256-rGGAu2B0gAAE/n0NSdVm7Me2YeChZhDGWehvzcBJTi8=";
|
||||
version = "6.0.18";
|
||||
sha256 = "sha256-Nq3xwR/z11HsZs8cC9Yr0Xkjg0l1MLb0YRFHsAeQKTM=";
|
||||
patches = [
|
||||
# Patches a bug that it couldn't build MongoDB 6.0 on gcc 13 because a include in ctype.h was missing
|
||||
./fix-gcc-13-ctype-6_0.patch
|
||||
|
||||
@@ -1279,6 +1279,8 @@ self: super: with self; {
|
||||
|
||||
azure-mgmt-msi = callPackage ../development/python-modules/azure-mgmt-msi { };
|
||||
|
||||
azure-mgmt-mysqlflexibleservers = callPackage ../development/python-modules/azure-mgmt-mysqlflexibleservers { };
|
||||
|
||||
azure-mgmt-netapp = callPackage ../development/python-modules/azure-mgmt-netapp { };
|
||||
|
||||
azure-mgmt-network = callPackage ../development/python-modules/azure-mgmt-network { };
|
||||
@@ -1289,6 +1291,8 @@ self: super: with self; {
|
||||
|
||||
azure-mgmt-policyinsights = callPackage ../development/python-modules/azure-mgmt-policyinsights { };
|
||||
|
||||
azure-mgmt-postgresqlflexibleservers = callPackage ../development/python-modules/azure-mgmt-postgresqlflexibleservers { };
|
||||
|
||||
azure-mgmt-powerbiembedded = callPackage ../development/python-modules/azure-mgmt-powerbiembedded { };
|
||||
|
||||
azure-mgmt-privatedns = callPackage ../development/python-modules/azure-mgmt-privatedns { };
|
||||
@@ -1452,6 +1456,8 @@ self: super: with self; {
|
||||
|
||||
bagit = callPackage ../development/python-modules/bagit { };
|
||||
|
||||
baize = callPackage ../development/python-modules/baize { };
|
||||
|
||||
banal = callPackage ../development/python-modules/banal { };
|
||||
|
||||
bandcamp-api = callPackage ../development/python-modules/bandcamp-api { };
|
||||
|
||||
Reference in New Issue
Block a user