Merge staging-next into staging
This commit is contained in:
@@ -156,7 +156,7 @@ files_before=$(grep -c 'src = ' "$SRCS")
|
||||
echo "writing output file $SRCS ..."
|
||||
cat >"$SRCS" <<EOF
|
||||
# DO NOT EDIT! This file is generated automatically.
|
||||
# Command: $0 $@
|
||||
# Command: ./maintainers/scripts/fetch-kde-qt.sh $@
|
||||
{ fetchurl, mirror }:
|
||||
|
||||
{
|
||||
|
||||
@@ -72,6 +72,7 @@ OK_MISSING_BY_PACKAGE = {
|
||||
},
|
||||
"kwin": {
|
||||
"display-info", # newer versions identify as libdisplay-info
|
||||
"Libcap", # used to call setcap at build time and nothing else
|
||||
},
|
||||
"libksysguard": {
|
||||
"Libcap", # used to call setcap at build time and nothing else
|
||||
@@ -90,6 +91,7 @@ OK_MISSING_BY_PACKAGE = {
|
||||
},
|
||||
"powerdevil": {
|
||||
"DDCUtil", # cursed, intentionally disabled
|
||||
"Libcap", # used to call setcap at build time and nothing else
|
||||
},
|
||||
"print-manager": {
|
||||
"PackageKitQt6", # used for auto-installing drivers which does not work for obvious reasons
|
||||
|
||||
@@ -23,7 +23,8 @@ mkKdeDerivation {
|
||||
'''.strip())
|
||||
|
||||
ROOT_TEMPLATE = jinja2.Template('''
|
||||
{callPackage}: {
|
||||
{ callPackage }:
|
||||
{
|
||||
{%- for p in packages %}
|
||||
{{ p }} = callPackage ./{{ p }} { };
|
||||
{%- endfor %}
|
||||
|
||||
@@ -561,6 +561,8 @@
|
||||
|
||||
- Compatible string matching for `hardware.deviceTree.overlays` has been changed to a more correct behavior. See [below](#sec-release-24.11-migration-dto-compatible) for details.
|
||||
|
||||
- The `rustic` package was upgrade to `0.9.0`, which contains [breaking changes to the config file format](https://github.com/rustic-rs/rustic/releases/tag/v0.9.0).
|
||||
|
||||
## Other Notable Changes {#sec-release-24.11-notable-changes}
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
@@ -105,13 +105,7 @@ in
|
||||
|
||||
# The linux builder is a lightweight VM for remote building; not evaluation.
|
||||
nix.channel.enable = false;
|
||||
# remote builder uses `nix-daemon` (ssh-ng:) or `nix-store --serve` (ssh:)
|
||||
# --force: do not complain when missing
|
||||
# TODO: install a store-only nix
|
||||
# https://github.com/NixOS/rfcs/blob/master/rfcs/0134-nix-store-layer.md#detailed-design
|
||||
environment.extraSetup = ''
|
||||
rm --force $out/bin/{nix-instantiate,nix-build,nix-shell,nix-prefetch*,nix}
|
||||
'';
|
||||
|
||||
# Deployment is by image.
|
||||
# TODO system.switch.enable = false;?
|
||||
system.disableInstallerTools = true;
|
||||
|
||||
@@ -249,10 +249,11 @@ in {
|
||||
|
||||
xdg.portal.enable = true;
|
||||
xdg.portal.extraPortals = [
|
||||
kdePackages.kwallet
|
||||
kdePackages.xdg-desktop-portal-kde
|
||||
pkgs.xdg-desktop-portal-gtk
|
||||
];
|
||||
xdg.portal.configPackages = mkDefault [kdePackages.xdg-desktop-portal-kde];
|
||||
xdg.portal.configPackages = mkDefault [kdePackages.plasma-workspace];
|
||||
services.pipewire.enable = mkDefault true;
|
||||
|
||||
# Enable screen reader by default
|
||||
|
||||
@@ -2039,8 +2039,8 @@ let
|
||||
mktplcRef = {
|
||||
publisher = "github";
|
||||
name = "copilot";
|
||||
version = "1.234.1133"; # compatible with vscode ^1.93.1
|
||||
hash = "sha256-kRQIB4ozN8f+JPG2U6tA/u0r3/J05kYfMuksaJrumZM=";
|
||||
version = "1.236.0"; # compatible with vscode ^1.94
|
||||
hash = "sha256-ozJwByuSjROWSxfrapcyxDkI7xgcjqf/IKtUfEC+MGk=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
@@ -2056,8 +2056,8 @@ let
|
||||
mktplcRef = {
|
||||
publisher = "github";
|
||||
name = "copilot-chat";
|
||||
version = "0.21.2024090602"; # latest compatible with vscode ^1.93
|
||||
hash = "sha256-9wl/orFbf1OFwGnF1uLfyOOtO2v5k2H1aUMBtngXDfs=";
|
||||
version = "0.22.2024100702"; # latest compatible with vscode ^1.94
|
||||
hash = "sha256-n/ecEnxz3LiTx9MuHO8AMIWBJPNNxQb6vghlG/hPMUY=";
|
||||
};
|
||||
meta = {
|
||||
description = "GitHub Copilot Chat is a companion extension to GitHub Copilot that houses experimental chat features";
|
||||
|
||||
@@ -23,7 +23,7 @@ lib:
|
||||
# run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag
|
||||
criCtlVersion,
|
||||
updateScript ? null,
|
||||
}:
|
||||
}@attrs:
|
||||
|
||||
# builder.nix contains a "builder" expression that, given k3s version and hash
|
||||
# variables, creates a package for that version.
|
||||
@@ -325,6 +325,7 @@ in
|
||||
buildGoModule rec {
|
||||
pname = "k3s";
|
||||
version = k3sVersion;
|
||||
pos = builtins.unsafeGetAttrPos "k3sVersion" attrs;
|
||||
|
||||
tags = [
|
||||
"libsqlite3"
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "git-credential-manager";
|
||||
version = "2.5.1";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "git-ecosystem";
|
||||
repo = "git-credential-manager";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-fD/HToyreYS8PG85CHHLPQOUKV1cDYGukxyVOr+7cKk=";
|
||||
hash = "sha256-8hjMtfPY/7cNH8WdHyG4kT2W+wGWteHbin1HgTBGiNQ=";
|
||||
};
|
||||
|
||||
projectFile = "src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj";
|
||||
|
||||
@@ -2,107 +2,40 @@
|
||||
# Please dont edit it manually, your changes might get overwritten!
|
||||
|
||||
{ fetchNuGet }: [
|
||||
(fetchNuGet { pname = "Avalonia"; version = "11.0.11"; hash = "sha256-vyX1hwqHQBIckXl/IYctR7BtYzM/62iZ6Y3Hsrlgww8="; })
|
||||
(fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; hash = "sha256-TWop9cvak6cMv2vrA/GlpuYBxS8Fuj5UmupGIV7Q5Ks="; })
|
||||
(fetchNuGet { pname = "Avalonia"; version = "11.1.3"; hash = "sha256-kz+k/vkuWoL0XBvRT8SadMOmmRCFk9W/J4k/IM6oYX0="; })
|
||||
(fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.22045.20230930"; hash = "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc="; })
|
||||
(fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; hash = "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY="; })
|
||||
(fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.11"; hash = "sha256-eP8mwZx8kBOOXqy+rBzdhkNiI3g5u5CyYFXoNHWcMFg="; })
|
||||
(fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.11"; hash = "sha256-PPs+D+dJ0OTay8gzDcucjWjfQWiizTHAluquzsFicZ4="; })
|
||||
(fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.11"; hash = "sha256-62JpECNZV60qiS1KCTm9ojnUXOx5yEP4Mjo3/OZszMQ="; })
|
||||
(fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.11"; hash = "sha256-OHh3hyB7EWZE2nPK7U6z+4MEbYPAdbW4G74poWUSDcc="; })
|
||||
(fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.11"; hash = "sha256-fVM+D16obEbRwRu+QF617jpQQWiHpA/Lzx2m0qK7BZ4="; })
|
||||
(fetchNuGet { pname = "Avalonia.Native"; version = "11.0.11"; hash = "sha256-8Co6wR74u5jdAeN0Fx7LJf8vOUt84auomZz3TFSdlWw="; })
|
||||
(fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.11"; hash = "sha256-A4X9fY26YtydAn4TjJ7bYdBi7R+Ncghr4F2DTl/Riaw="; })
|
||||
(fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.11"; hash = "sha256-s5fmFi207DZVRejw5PlvnPsdo9voet/l2VJtgwLDJYs="; })
|
||||
(fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.11"; hash = "sha256-cvLzWHt2P2dmJ690mv0wejk2VCa0n1xX4sYCim+7Gxo="; })
|
||||
(fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.11"; hash = "sha256-y1BlGzCP03Waq9bVzKGVFr2L/1/rdpBeyHuHbB0kTbk="; })
|
||||
(fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.11"; hash = "sha256-NvAN79jLjoqZrp5yWkJoihjO83r49j8N57PAWDY/kwE="; })
|
||||
(fetchNuGet { pname = "Avalonia.X11"; version = "11.0.11"; hash = "sha256-1hsU8zBxQGUp/wAx3qSQfxte+fGsSmH9TN3OHW0rNOk="; })
|
||||
(fetchNuGet { pname = "HarfBuzzSharp"; version = "7.3.0"; hash = "sha256-LlPQO/NYgIMWicvLOtWsQzCp512QpIImYDP9/n2rDOc="; })
|
||||
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "7.3.0"; hash = "sha256-AEHjgqX0o+Fob0SeZ6EikGKoEe6rRxess5fVJ31UL0U="; })
|
||||
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "7.3.0"; hash = "sha256-6oFcdKb17UX5wyAUeCCKXGvzkf0w3MNdZOVMvs54tqw="; })
|
||||
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "7.3.0"; hash = "sha256-9VI0xCavuuIIStuQ7ipBfWu5HrAt+Kk/F2j57C1llTU="; })
|
||||
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "7.3.0"; hash = "sha256-WnB7l73hneU9Kpbm8S9zEYbZHjFre24vWz0vl8+v28M="; })
|
||||
(fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.1.3"; hash = "sha256-W17Wvmi8/47cf5gCF3QRcaKLz0ZpXtZYCCkaERkbyXU="; })
|
||||
(fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.1.3"; hash = "sha256-OOKTovi5kckn0x/8dMcq56cvq57UVMLzA9LRXDxm2Vc="; })
|
||||
(fetchNuGet { pname = "Avalonia.Desktop"; version = "11.1.3"; hash = "sha256-mNFscbtyqLlodzGa3SJ3oVY467JjWwY45LxZiKDAn/w="; })
|
||||
(fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.1.3"; hash = "sha256-PD9ZIeBZJrLaVDjmWBz4GocrdUSNUou11gAERU+xWDo="; })
|
||||
(fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.1.3"; hash = "sha256-nUBhSRE0Bly3dVC14wXwU19vP3g0VbE4bCUohx7DCVI="; })
|
||||
(fetchNuGet { pname = "Avalonia.Native"; version = "11.1.3"; hash = "sha256-byAVGW7XgkyzDj1TnqaCeDU/xTD9z8ACGrSJgwJ+XXs="; })
|
||||
(fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.1.3"; hash = "sha256-CKF+62zCbK1Rd/HiC6MGrags3ylXrVQ1lni3Um0Muqk="; })
|
||||
(fetchNuGet { pname = "Avalonia.Skia"; version = "11.1.3"; hash = "sha256-EtB86g+nz6i8wL6xytMkYl2Ehgt3GFMMNPzQfhbfopM="; })
|
||||
(fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.1.3"; hash = "sha256-qfmRK2gLGSgHx4dNIeVesWxLUjcook9ET2xru/Xyiw8="; })
|
||||
(fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.1.3"; hash = "sha256-Q6jL5J/6aBtOY85I641RVp8RpuqJbPy6C6LxnRkFtMM="; })
|
||||
(fetchNuGet { pname = "Avalonia.Win32"; version = "11.1.3"; hash = "sha256-zcxTpEnpLf50p8Yaiylk5/CS9MNDe7lK1uX1CPaJBUc="; })
|
||||
(fetchNuGet { pname = "Avalonia.X11"; version = "11.1.3"; hash = "sha256-M2+y661/znDxZRdwNRIQi4mS2m6T4kQkBbYeE7KyQAw="; })
|
||||
(fetchNuGet { pname = "HarfBuzzSharp"; version = "7.3.0.2"; hash = "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8="; })
|
||||
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "7.3.0.2"; hash = "sha256-SSfyuyBaduGobJW+reqyioWHhFWsQ+FXa2Gn7TiWxrU="; })
|
||||
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "7.3.0.2"; hash = "sha256-dmEqR9MmpCwK8AuscfC7xUlnKIY7+Nvi06V0u5Jff08="; })
|
||||
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "7.3.0.2"; hash = "sha256-aEZr9uKAlCTeeHoYNR1Rs6L3P54765CemyrgJF8x09c="; })
|
||||
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "7.3.0.2"; hash = "sha256-x4iM3NHs9VyweG57xA74yd4uLuXly147ooe0mvNQ8zo="; })
|
||||
(fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; hash = "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; hash = "sha256-KDbCfsBWSJ5ohEXUKp1s1LX9xA2NPvXE/xVzj68EdC0="; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; hash = "sha256-3G9vSc/gHH7FWgOySLTut1+eEaf3H66qcPOvNPLOx4o="; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.8.0"; hash = "sha256-i/r3V/No/VzqmJlWxpGoirvlbJDbBPa/ONZtzYrxuc4="; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.8.0"; hash = "sha256-fA9Qu+vTyMZ9REzxJ4aMg/SHCDRk4q9k4ZGUdynoHnA="; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; hash = "sha256-866jMHp8kbc1FYpKuUWnd7ViU6kGJTAxPcL/IjXrT0I="; })
|
||||
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; hash = "sha256-a3dAiPaVuky0wpcHmpTVtAQJNGZ2v91/oArA+dpJgj8="; })
|
||||
(fetchNuGet { pname = "Microsoft.Identity.Client"; version = "4.61.3"; hash = "sha256-1cccC8EWlIQlJ3SSOB7CNImOYSaxsJpRHvlCgv2yOtA="; })
|
||||
(fetchNuGet { pname = "Microsoft.Identity.Client.Extensions.Msal"; version = "4.61.3"; hash = "sha256-nFQ2C7S4BQ4nvQmGAc5Ar7/ynKyztvK7fPKrpJXaQFE="; })
|
||||
(fetchNuGet { pname = "Microsoft.Identity.Client"; version = "4.65.0"; hash = "sha256-gkBVLb8acLYexNM4ZzMJ0qfDp2UqjUt0yiu3MfMcWig="; })
|
||||
(fetchNuGet { pname = "Microsoft.Identity.Client.Extensions.Msal"; version = "4.65.0"; hash = "sha256-Xmy/evicLvmbC+6ytxwVE646uVcJB5yMpEK73H5tzD0="; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.35.0"; hash = "sha256-bxyYu6/QgaA4TQYBr5d+bzICL+ktlkdy/tb/1fBu00Q="; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; hash = "sha256-gYQQO7zsqG+OtN4ywYQyfsiggS2zmxw4+cPXlK+FB5Q="; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; })
|
||||
(fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; })
|
||||
(fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; hash = "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="; })
|
||||
(fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="; })
|
||||
(fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="; })
|
||||
(fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="; })
|
||||
(fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="; })
|
||||
(fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="; })
|
||||
(fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="; })
|
||||
(fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="; })
|
||||
(fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="; })
|
||||
(fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="; })
|
||||
(fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="; })
|
||||
(fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; })
|
||||
(fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; })
|
||||
(fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; })
|
||||
(fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; })
|
||||
(fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="; })
|
||||
(fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="; })
|
||||
(fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="; })
|
||||
(fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="; })
|
||||
(fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="; })
|
||||
(fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="; })
|
||||
(fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="; })
|
||||
(fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="; })
|
||||
(fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="; })
|
||||
(fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; })
|
||||
(fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; })
|
||||
(fetchNuGet { pname = "SkiaSharp"; version = "2.88.7"; hash = "sha256-Ip3afwTr4QOqtwOUKqK6g/9Ug4dMSebTci5K29Jc3Dg="; })
|
||||
(fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.7"; hash = "sha256-QdQRN1IBjqohmI8U+6WJRPgOsh8a9soN2UvVObs1H1w="; })
|
||||
(fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.7"; hash = "sha256-WgPldXSqPMm0TrdUWAyjge5rcRhd9G3/Ix/v/2NQvBc="; })
|
||||
(fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.7"; hash = "sha256-oIjFF+Rv+g8AKyNaaVAgnHX3eeP/l8K2sgHs9bRyUMw="; })
|
||||
(fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.7"; hash = "sha256-+7RxCAr+ne9MZWdXKKpV4ZbHW0k6hLD20ZFWWOCiNYU="; })
|
||||
(fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; })
|
||||
(fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; hash = "sha256-GdwSIjLMM0uVfE56VUSLVNgpW0B//oCeSFj8/hSlbM8="; })
|
||||
(fetchNuGet { pname = "SkiaSharp"; version = "2.88.8"; hash = "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A="; })
|
||||
(fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.8"; hash = "sha256-fOmNbbjuTazIasOvPkd2NPmuQHVCWPnow7AxllRGl7Y="; })
|
||||
(fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.8"; hash = "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI="; })
|
||||
(fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.8"; hash = "sha256-GWWsE98f869LiOlqZuXMc9+yuuIhey2LeftGNk3/z3w="; })
|
||||
(fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.8"; hash = "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM="; })
|
||||
(fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta4.22272.1"; hash = "sha256-zSO+CYnMH8deBHDI9DHhCPj79Ce3GOzHCyH1/TiHxcc="; })
|
||||
(fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; hash = "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="; })
|
||||
(fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; })
|
||||
(fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.1"; hash = "sha256-Xi8wrUjVlioz//TPQjFHqcV/QGhTqnTfUcltsNlcCJ4="; })
|
||||
(fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; hash = "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU="; })
|
||||
(fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; })
|
||||
(fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; })
|
||||
(fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.0"; hash = "sha256-xfjF4UqTMJpf8KsBWUyJlJkzPTOO/H5MW023yTYNQSA="; })
|
||||
(fetchNuGet { pname = "System.Linq"; version = "4.3.0"; hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; })
|
||||
(fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; hash = "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="; })
|
||||
(fetchNuGet { pname = "System.Memory"; version = "4.5.4"; hash = "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="; })
|
||||
(fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="; })
|
||||
(fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; hash = "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="; })
|
||||
(fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="; })
|
||||
(fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; })
|
||||
(fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="; })
|
||||
(fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; hash = "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="; })
|
||||
(fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; hash = "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="; })
|
||||
(fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="; })
|
||||
(fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; hash = "sha256-Wo+MiqhcP9dQ6NuFGrQTw6hpbJORFwp+TBNTq2yhGp8="; })
|
||||
(fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; })
|
||||
(fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; hash = "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="; })
|
||||
(fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; })
|
||||
(fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; })
|
||||
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; hash = "sha256-UvyoDV8O0oY3HPG1GbA56YVdvwTGEfjYR5gW1O7IK4U="; })
|
||||
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; hash = "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="; })
|
||||
(fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; })
|
||||
(fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; })
|
||||
(fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; })
|
||||
(fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.5.0"; hash = "sha256-Z+X1Z2lErLL7Ynt2jFszku6/IgrngO3V1bSfZTBiFIc="; })
|
||||
(fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; })
|
||||
(fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; hash = "sha256-PIhkv59IXjyiuefdhKxS9hQfEwO9YWRuNudpo53HQfw="; })
|
||||
(fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; })
|
||||
(fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; })
|
||||
(fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; hash = "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="; })
|
||||
(fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.15.0"; hash = "sha256-4gk2vXDjKFaBh82gTkwg3c/5GRjiH+bvM5elfDSbKTU="; })
|
||||
(fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.16.0"; hash = "sha256-vKYEaa1EszR7alHj48R8G3uYArhI+zh2ZgiBv955E98="; })
|
||||
]
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
{
|
||||
"version": "17.2.5",
|
||||
"repo_hash": "0l3s3k3v306ihn47lkj49b8vlly7v11clciwpf7ly4c5mwvwjlx6",
|
||||
"version": "17.2.8",
|
||||
"repo_hash": "172ba8vlaqphyhi6d5r9j3km7krxcis81dzlr5xch4i0apd0yyag",
|
||||
"yarn_hash": "10y540bxwaz355p9r4q34199aibadrd5p4d9ck2y3n6735k0hm74",
|
||||
"owner": "gitlab-org",
|
||||
"repo": "gitlab",
|
||||
"rev": "v17.2.5-ee",
|
||||
"rev": "v17.2.8-ee",
|
||||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "17.2.5",
|
||||
"GITLAB_PAGES_VERSION": "17.2.5",
|
||||
"GITALY_SERVER_VERSION": "17.2.8",
|
||||
"GITLAB_PAGES_VERSION": "17.2.8",
|
||||
"GITLAB_SHELL_VERSION": "14.37.0",
|
||||
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.2.0",
|
||||
"GITLAB_WORKHORSE_VERSION": "17.2.5"
|
||||
"GITLAB_WORKHORSE_VERSION": "17.2.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "17.2.5";
|
||||
version = "17.2.8";
|
||||
package_version = "v${lib.versions.major version}";
|
||||
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
|
||||
|
||||
@@ -20,7 +20,7 @@ let
|
||||
owner = "gitlab-org";
|
||||
repo = "gitaly";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-R6GmIBU7rzLBsegcXPjc9Dxp9qe3tP6unqOsnyiozgw=";
|
||||
hash = "sha256-3LaBETnwWmiIi7r68NB8LeJ7fo6oP28fS3TbU5JanOE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-FqnGVRldhevJgBBvJcvGXzRaYWqSHzZiXIQmCNzJv+4=";
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-container-registry";
|
||||
version = "4.9.0";
|
||||
version = "4.10.0";
|
||||
rev = "v${version}-gitlab";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
@@ -10,10 +10,10 @@ buildGoModule rec {
|
||||
owner = "gitlab-org";
|
||||
repo = "container-registry";
|
||||
inherit rev;
|
||||
hash = "sha256-kBM5ICESRUwHlM9FeJEFQFTM2E2zIF6axOGOHNmloKo=";
|
||||
hash = "sha256-9OiuA0TqRfnZKfAeLbIcPUw5qH6twWKqt0IP8roaWNg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-nePIExsIWJgBDUrkkVBzc0qsYdfxR7GL1VhdWcVJnLg=";
|
||||
vendorHash = "sha256-Bzhg5coOrs3JO6Qslr9csUIrnCMJiG89Fio8ziJjH9k=";
|
||||
|
||||
postPatch = ''
|
||||
# Disable flaky inmemory storage driver test
|
||||
|
||||
@@ -2,14 +2,14 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-pages";
|
||||
version = "17.2.5";
|
||||
version = "17.2.8";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-pages";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5qksHuY7EzCoCMBxF4souvUz8xFstfzOZT3CF5YsV7M=";
|
||||
hash = "sha256-NaLRCLmgDI4ArJyntkmYICVEpwZtAU6XVTmXAh4kOSc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-yNHeM8MExcLwv2Ga4vtBmPFBt/Rj7Gd4QQYDlnAIo+c=";
|
||||
|
||||
@@ -5,7 +5,7 @@ in
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-workhorse";
|
||||
|
||||
version = "17.2.5";
|
||||
version = "17.2.8";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitLab {
|
||||
|
||||
@@ -76,7 +76,7 @@ gem 'doorkeeper', '~> 5.6', '>= 5.6.6' # rubocop:todo Gemfile/MissingFeatureCate
|
||||
gem 'doorkeeper-openid_connect', '~> 1.8', '>= 1.8.7' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'doorkeeper-device_authorization_grant', '~> 1.0.0', feature_category: :system_access
|
||||
gem 'rexml', '~> 3.2.6' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'ruby-saml', '~> 1.15.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'ruby-saml', '~> 1.17.0', feature_category: :system_access
|
||||
gem 'omniauth', '~> 2.1.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'omniauth-auth0', '~> 3.1' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'omniauth-azure-activedirectory-v2', '~> 2.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
@@ -85,7 +85,7 @@ gem 'omniauth-github', '2.0.1' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'omniauth-google-oauth2', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'omniauth-oauth2-generic', '~> 0.2.2' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'omniauth-saml', '~> 2.1.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'omniauth-saml', '~> 2.2.1', feature_category: :system_access
|
||||
gem 'omniauth-shibboleth-redux', '~> 2.0', require: 'omniauth-shibboleth' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'omniauth_openid_connect', '~> 0.6.1' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
|
||||
@@ -1207,9 +1207,9 @@ GEM
|
||||
omniauth-oauth2-generic (0.2.8)
|
||||
omniauth-oauth2 (~> 1.0)
|
||||
rake
|
||||
omniauth-saml (2.1.0)
|
||||
omniauth (~> 2.0)
|
||||
ruby-saml (~> 1.12)
|
||||
omniauth-saml (2.2.1)
|
||||
omniauth (~> 2.1)
|
||||
ruby-saml (~> 1.17)
|
||||
omniauth-shibboleth-redux (2.0.0)
|
||||
omniauth (>= 2.0.0)
|
||||
omniauth_openid_connect (0.6.1)
|
||||
@@ -1627,7 +1627,7 @@ GEM
|
||||
ruby-openai (3.7.0)
|
||||
httparty (>= 0.18.1)
|
||||
ruby-progressbar (1.11.0)
|
||||
ruby-saml (1.15.0)
|
||||
ruby-saml (1.17.0)
|
||||
nokogiri (>= 1.13.10)
|
||||
rexml
|
||||
ruby-statistics (3.0.0)
|
||||
@@ -2136,7 +2136,7 @@ DEPENDENCIES
|
||||
omniauth-google-oauth2 (~> 1.1)
|
||||
omniauth-oauth2-generic (~> 0.2.2)
|
||||
omniauth-salesforce (~> 1.0.5)!
|
||||
omniauth-saml (~> 2.1.0)
|
||||
omniauth-saml (~> 2.2.1)
|
||||
omniauth-shibboleth-redux (~> 2.0)
|
||||
omniauth_crowd (~> 2.4.0)!
|
||||
omniauth_openid_connect (~> 0.6.1)
|
||||
@@ -2218,7 +2218,7 @@ DEPENDENCIES
|
||||
ruby-magic (~> 0.6)
|
||||
ruby-openai (~> 3.7)
|
||||
ruby-progressbar (~> 1.10)
|
||||
ruby-saml (~> 1.15.0)
|
||||
ruby-saml (~> 1.17.0)
|
||||
rubyzip (~> 2.3.2)
|
||||
rugged (~> 1.6)
|
||||
sanitize (~> 6.0.2)
|
||||
|
||||
@@ -4428,10 +4428,10 @@ src:
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "01k9rkg97npcgm8r4x3ja8y20hsg4zy0dcjpzafx148q4yxbg74n";
|
||||
sha256 = "00nn24s74miy7p65y8lwpjfwgcn7fwld61f9ghngal4asgw6pfwa";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.1.0";
|
||||
version = "2.2.1";
|
||||
};
|
||||
omniauth-shibboleth-redux = {
|
||||
dependencies = ["omniauth"];
|
||||
@@ -6029,10 +6029,10 @@ src:
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "18vnbzin5ypxrgcs9lllg7x311b69dyrdw2w1pwz84438hmxm79s";
|
||||
sha256 = "1adq06m684gnpjp6qyb8shgj8jjy2npcfg7y6mg2ab9ilfdq6684";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.15.0";
|
||||
version = "1.17.0";
|
||||
};
|
||||
ruby-statistics = {
|
||||
groups = ["default" "test"];
|
||||
|
||||
@@ -11,9 +11,9 @@ in
|
||||
} { };
|
||||
|
||||
sublime-merge-dev = common {
|
||||
buildVersion = "2100";
|
||||
buildVersion = "2101";
|
||||
dev = true;
|
||||
aarch64sha256 = "BL0hk/8hf660I1HUQMQwvZxB6TpXpygQxOYtuDGfrYw=";
|
||||
x64sha256 = "NePJt2WttsbqJsduGX6UsOzAce2xW4Mc8Nq9We+ZCSM=";
|
||||
aarch64sha256 = "/56SBJ9ehoBCLTWYo8hGpn6/uqKxsSfcSzcJDd3uUMc=";
|
||||
x64sha256 = "AIH0VtEetiHdip0PIx1U1mcFlFz1gk0VCRDq4C5/wNM=";
|
||||
} { };
|
||||
}
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "direnv";
|
||||
version = "2.34.0";
|
||||
version = "2.35.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "direnv";
|
||||
repo = "direnv";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-EvzqLS/FiWrbIXDkp0L/T8QNKnRGuQkbMWajI3X3BDw=";
|
||||
hash = "sha256-C4FkBS+2MZGGlpWb7ng4Aa9IvqEuY716M5h2W3b8N1E=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-FfKvLPv+jUT5s2qQ7QlzBMArI+acj7nhpE8FGMPpp5E=";
|
||||
vendorHash = "sha256-O2NZgWn00uKLstYPIj9LwyF4kmitJ1FXltazv8RrmZg=";
|
||||
|
||||
# we have no bash at the moment for windows
|
||||
BASH_PATH =
|
||||
|
||||
@@ -12,17 +12,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "just";
|
||||
version = "1.35.0";
|
||||
version = "1.36.0";
|
||||
outputs = [ "out" "man" "doc" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "casey";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-/5UzieioBzltFhzUoPOm6B4QKHFEquXCKo/2SPHkp2M=";
|
||||
hash = "sha256-4p4otR0W/v0DoWwwcNq/UEDa1V8vlZMpdk33B/9A4Bo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-X3noVDRnnrR6xuOBfoH4JPdcPLOBHbGQb6opNvzK/TE=";
|
||||
cargoHash = "sha256-y6wBFjBOeymbXUIeflQ35FxQRMPlDvB0Zeo2bQeZjJ0=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles mdbook ];
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
|
||||
|
||||
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nixos-anywhere";
|
||||
version = "1.4.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "numtide";
|
||||
owner = "nix-community";
|
||||
repo = "nixos-anywhere";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-ssx6Y665uoOO3PX6Mp9NAF8sqoGb7Ezfw+bTY69aGlE=";
|
||||
@@ -43,14 +43,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
install -D -m 0755 src/get-facts.sh $out/bin/get-facts.sh
|
||||
|
||||
# We prefer the system's openssh over our own, since it might come with features not present in ours:
|
||||
# https://github.com/numtide/nixos-anywhere/issues/62
|
||||
# https://github.com/nix-community/nixos-anywhere/issues/62
|
||||
wrapProgram $out/bin/nixos-anywhere \
|
||||
--prefix PATH : ${lib.makeBinPath runtimeDeps} --suffix PATH : ${lib.makeBinPath [ openssh ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Install nixos everywhere via ssh";
|
||||
homepage = "https://github.com/numtide/nixos-anywhere";
|
||||
homepage = "https://github.com/nix-community/nixos-anywhere";
|
||||
mainProgram = "nixos-anywhere";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
name = "regal";
|
||||
version = "0.27.0";
|
||||
version = "0.28.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StyraInc";
|
||||
repo = "regal";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-IGf7iIL2q3w7qIJ0oxDILxcNjexuEr4bsYK+v24Ae+c=";
|
||||
hash = "sha256-bQKVebpDqmwTAbocL10WrvA4HeVjDaGcbX090cX7HPw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Yl8ZFEiAJRAetc3e2ZdrbTdYhx/Ek9nr3mMQ0H7+aGM=";
|
||||
vendorHash = "sha256-EaOMIfkaYPXmsqw/Oi3caKjarR5ijwcoK+EXwGfSUqE=";
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
|
||||
@@ -11,26 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rustic";
|
||||
version = "0.8.1";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rustic-rs";
|
||||
repo = "rustic";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-SOXuQIdebzMHyO/r+0bvhZvdc09pNPiCXgYfzMoZUZo=";
|
||||
hash = "sha256-hkkylXJOhPOC4p+MOuYCzfcmCoHmm+/8afsaPFwD1/s=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-5tXaq/FPC3T+f1p4RtihQGgwAptcO58mOKQhiOpjacc=";
|
||||
|
||||
# At the time of writing, upstream defaults to "self-update", "tui", and "webdav".
|
||||
# "self-update" is a self-updater, which we don't want in nixpkgs.
|
||||
# With each update we should therefore ensure that we mimic the default features
|
||||
# as closely as possible.
|
||||
buildNoDefaultFeatures = true;
|
||||
buildFeatures = [
|
||||
"tui"
|
||||
"webdav"
|
||||
];
|
||||
cargoHash = "sha256-Rh96vPLAxz8KCIk9y9TFB2fP0JngnM9LSsClWfgYUG0=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "setup-envtest";
|
||||
version = "0.18.2";
|
||||
version = "0.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes-sigs";
|
||||
repo = "controller-runtime";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-fQgWwndxzBIi3zsNMYvFDXjetnaQF0NNK+qW8j4Wn/M=";
|
||||
hash = "sha256-9AqZMiA+OIJD+inmeUc/lq57kV7L85jk1I4ywiSKirg=";
|
||||
} + "/tools/setup-envtest";
|
||||
|
||||
vendorHash = "sha256-Xr5b/CRz/DMmoc4bvrEyAZcNufLIZOY5OGQ6yw4/W9k=";
|
||||
vendorHash = "sha256-sn3HiKTpQzjrFTOVOGFJwoNpxU+XWgkWD2EOcPilePY=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "typos";
|
||||
version = "1.25.0";
|
||||
version = "1.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crate-ci";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0JInvnQRINItUyAqnDBT0uRlF7zKRA4S/IyqxqmHnvQ=";
|
||||
hash = "sha256-yfQSGmLWXyOI5slB8AMcVTfQQKUXY3mBaeDPya4KtKo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-44JBZu08PDkyeBMscchNp6N9aF99b5lZWDhp4K42xsY=";
|
||||
cargoHash = "sha256-WuYAE2msctMf+7C1h5pNGyjrEInnT6PxfZ94bZhzB5w=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Source code spell checker";
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ngtcp2";
|
||||
version = "1.7.0";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ngtcp2";
|
||||
repo = "ngtcp2";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7DesCT8swwk9E1ckYrj3mGsdx37HrJxd+svKpJRrhoI=";
|
||||
hash = "sha256-qBDpNyBxcW/OPnrbmL+NmKWIF69p1OoZFqlP6mwPi9U=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@@ -29,7 +29,7 @@ let
|
||||
inherit srcs python3;
|
||||
stdenv =
|
||||
if stdenv.hostPlatform.isDarwin
|
||||
then overrideSDK stdenv { darwinMinVersion = "11.0"; darwinSdkVersion = "11.0"; }
|
||||
then overrideSDK stdenv { darwinMinVersion = "11.0"; darwinSdkVersion = "12.3"; }
|
||||
else stdenv;
|
||||
});
|
||||
in
|
||||
@@ -42,7 +42,7 @@ let
|
||||
qtbase = callPackage ./modules/qtbase.nix {
|
||||
withGtk3 = !stdenv.hostPlatform.isMinGW;
|
||||
inherit (srcs.qtbase) src version;
|
||||
inherit (darwin.apple_sdk_11_0.frameworks)
|
||||
inherit (darwin.apple_sdk_12_3.frameworks)
|
||||
AGL AVFoundation AppKit Contacts CoreBluetooth EventKit GSS MetalKit;
|
||||
patches = [
|
||||
./patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch
|
||||
@@ -62,6 +62,13 @@ let
|
||||
revert = true;
|
||||
hash = "sha256-cjB2sC4cvZn0UEc+sm6ZpjyC78ssqB1Kb5nlZQ15M4A=";
|
||||
})
|
||||
|
||||
# Backport patch for https://bugs.kde.org/show_bug.cgi?id=493116
|
||||
# FIXME: remove for 6.8.1
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/qt/qtbase/commit/2ea3abed0125d81ca4f3bacb9650db7314657332.patch";
|
||||
hash = "sha256-mdTdwhJtebuLUQRo+y1XUrrzgqG9G7GvPQwvrXLycJI=";
|
||||
})
|
||||
];
|
||||
};
|
||||
env = callPackage ./qt-env.nix { };
|
||||
@@ -113,7 +120,7 @@ let
|
||||
qt5compat = callPackage ./modules/qt5compat.nix { };
|
||||
qtcharts = callPackage ./modules/qtcharts.nix { };
|
||||
qtconnectivity = callPackage ./modules/qtconnectivity.nix {
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) IOBluetooth PCSC;
|
||||
inherit (darwin.apple_sdk_12_3.frameworks) IOBluetooth PCSC;
|
||||
};
|
||||
qtdatavis3d = callPackage ./modules/qtdatavis3d.nix { };
|
||||
qtdeclarative = callPackage ./modules/qtdeclarative.nix { };
|
||||
@@ -127,7 +134,7 @@ let
|
||||
qtlottie = callPackage ./modules/qtlottie.nix { };
|
||||
qtmultimedia = callPackage ./modules/qtmultimedia.nix {
|
||||
inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi;
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) VideoToolbox;
|
||||
inherit (darwin.apple_sdk_12_3.frameworks) VideoToolbox;
|
||||
};
|
||||
qtmqtt = callPackage ./modules/qtmqtt.nix { };
|
||||
qtnetworkauth = callPackage ./modules/qtnetworkauth.nix { };
|
||||
@@ -137,7 +144,7 @@ let
|
||||
qtserialport = callPackage ./modules/qtserialport.nix { };
|
||||
qtshadertools = callPackage ./modules/qtshadertools.nix { };
|
||||
qtspeech = callPackage ./modules/qtspeech.nix {
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) Cocoa;
|
||||
inherit (darwin.apple_sdk_12_3.frameworks) Cocoa;
|
||||
};
|
||||
qtquick3d = callPackage ./modules/qtquick3d.nix { };
|
||||
qtquick3dphysics = callPackage ./modules/qtquick3dphysics.nix { };
|
||||
@@ -153,9 +160,9 @@ let
|
||||
qtwebchannel = callPackage ./modules/qtwebchannel.nix { };
|
||||
qtwebengine = callPackage ./modules/qtwebengine.nix {
|
||||
inherit (darwin) autoSignDarwinBinariesHook bootstrap_cmds xnu;
|
||||
inherit (darwin.apple_sdk_11_0) libpm libunwind;
|
||||
inherit (darwin.apple_sdk_11_0.libs) sandbox;
|
||||
inherit (darwin.apple_sdk_11_0.frameworks)
|
||||
inherit (darwin.apple_sdk_12_3) libpm libunwind;
|
||||
inherit (darwin.apple_sdk_12_3.libs) sandbox;
|
||||
inherit (darwin.apple_sdk_12_3.frameworks)
|
||||
AGL AVFoundation Accelerate Cocoa CoreLocation CoreML ForceFeedback
|
||||
GameController ImageCaptureCore LocalAuthentication
|
||||
MediaAccessibility MediaPlayer MetalKit Network OpenDirectory Quartz
|
||||
@@ -174,7 +181,7 @@ let
|
||||
};
|
||||
qtwebsockets = callPackage ./modules/qtwebsockets.nix { };
|
||||
qtwebview = callPackage ./modules/qtwebview.nix {
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) WebKit;
|
||||
inherit (darwin.apple_sdk_12_3.frameworks) WebKit;
|
||||
};
|
||||
|
||||
wrapQtAppsHook = callPackage
|
||||
|
||||
@@ -1 +1 @@
|
||||
WGET_ARGS=( https://download.qt.io/official_releases/qt/6.7/6.7.3/submodules/ -A '*.tar.xz' )
|
||||
WGET_ARGS=( https://download.qt.io/official_releases/qt/6.8/6.8.0/submodules/ -A '*.tar.xz' )
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
, stdenv
|
||||
, lib
|
||||
, pkgsBuildBuild
|
||||
, fetchpatch2
|
||||
}:
|
||||
|
||||
qtModule {
|
||||
@@ -19,6 +20,17 @@ qtModule {
|
||||
../patches/0001-qtdeclarative-disable-qml-disk-cache.patch
|
||||
# add version specific QML import path
|
||||
../patches/0002-qtdeclarative-also-use-versioned-qml-paths.patch
|
||||
|
||||
# Backport patches for https://bugs.kde.org/show_bug.cgi?id=493116
|
||||
# FIXME: remove for 6.8.1
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/qt/qtdeclarative/commit/3330731d0cb221477ab3d856db032126403ae6a0.patch";
|
||||
hash = "sha256-XXXGJ7nVDpEG/6nr16L89J87tvutyc+YnQPQx9cRU+w=";
|
||||
})
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/qt/qtdeclarative/commit/2aefbca84d2f3dca2c2697f13710b6907c0c7e59.patch";
|
||||
hash = "sha256-a/BX0gpW6juJbjDRo8OleMahOC6WWqreURmYZNiGm5c=";
|
||||
})
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
|
||||
qtModule rec {
|
||||
pname = "qtmqtt";
|
||||
version = "6.7.3";
|
||||
version = "6.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qt";
|
||||
repo = "qtmqtt";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QVLt1nhxYIMmmVY1rZ8pnkXNs0N6hp1o8rv33o8ptxM=";
|
||||
hash = "sha256-WvqBEq7Zv1CONMMuDHdj8/nJHoY4y7ysrqliTZHi7x8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ qtbase ];
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
, wayland-scanner
|
||||
, pkg-config
|
||||
, libdrm
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
qtModule {
|
||||
@@ -18,11 +17,9 @@ qtModule {
|
||||
buildInputs = [ wayland libdrm ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
patches = [
|
||||
# Update wayland.xml to version 1.23.0
|
||||
(fetchpatch {
|
||||
url = "https://invent.kde.org/qt/qt/qtwayland/-/commit/c2f61bc47baacf2e6a44c6c3c4e4cbf0abfa4095.diff";
|
||||
sha256 = "sha256-ZcK/LT65oFvTzCukZB8aDYWH5L6RK5MOPs8VtpYQpq0=";
|
||||
})
|
||||
];
|
||||
# Replace vendored wayland.xml with our matching version
|
||||
# FIXME: remove when upstream updates past 1.23
|
||||
postPatch = ''
|
||||
cp ${wayland-scanner}/share/wayland/wayland.xml src/3rdparty/protocol/wayland/wayland.xml
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
, qtwebchannel
|
||||
, qtpositioning
|
||||
, qtwebsockets
|
||||
, fetchpatch2
|
||||
, buildPackages
|
||||
, bison
|
||||
, coreutils
|
||||
@@ -132,14 +131,6 @@ qtModule {
|
||||
|
||||
# Override locales install path so they go to QtWebEngine's $out
|
||||
../patches/qtwebengine-locales-path.patch
|
||||
|
||||
# Support FFmpeg 7
|
||||
(fetchpatch2 {
|
||||
url = "https://gitlab.archlinux.org/archlinux/packaging/packages/qt6-webengine/-/raw/6bee5464ac6340e925e08c7ed023026e727ae9d5/qtwebengine-ffmpeg-7.patch";
|
||||
hash = "sha256-OdCIu1KMW3YcpCnfUP1uD7OJRl6Iwap9X4aJhGpoaNs=";
|
||||
stripLen = 1;
|
||||
extraPrefix = "src/3rdparty/chromium/";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
+23
-39
@@ -1,19 +1,5 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Nick Cao <nickcao@nichi.co>
|
||||
Date: Fri, 14 Apr 2023 21:43:04 +0800
|
||||
Subject: [PATCH] qtbase: qmake: fix mkspecs for darwin
|
||||
|
||||
---
|
||||
mkspecs/common/mac.conf | 2 +-
|
||||
mkspecs/features/mac/default_post.prf | 264 --------------------------
|
||||
mkspecs/features/mac/default_pre.prf | 58 ------
|
||||
mkspecs/features/mac/sdk.mk | 27 ---
|
||||
mkspecs/features/mac/sdk.prf | 61 ------
|
||||
mkspecs/features/mac/toolchain.prf | 5 -
|
||||
6 files changed, 1 insertion(+), 416 deletions(-)
|
||||
|
||||
diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf
|
||||
index 61bea952b22..9909dae7260 100644
|
||||
index 61bea952b2..9909dae726 100644
|
||||
--- a/mkspecs/common/mac.conf
|
||||
+++ b/mkspecs/common/mac.conf
|
||||
@@ -23,7 +23,7 @@ QMAKE_INCDIR_OPENGL = \
|
||||
@@ -26,20 +12,10 @@ index 61bea952b22..9909dae7260 100644
|
||||
|
||||
QMAKE_LFLAGS_REL_RPATH =
|
||||
diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf
|
||||
index 0b64a586b93..3b40328304d 100644
|
||||
index 22c84d6473..4d46762bec 100644
|
||||
--- a/mkspecs/features/mac/default_post.prf
|
||||
+++ b/mkspecs/features/mac/default_post.prf
|
||||
@@ -1,9 +1,5 @@
|
||||
load(default_post)
|
||||
|
||||
-# Recompute SDK version in case the user set it explicitly
|
||||
-sdk_version = $$QMAKE_MAC_SDK_VERSION
|
||||
-QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion)
|
||||
-
|
||||
contains(TEMPLATE, .*app) {
|
||||
!macx-xcode:if(isEmpty(BUILDS)|build_pass) {
|
||||
# Detect changes to the platform SDK
|
||||
@@ -15,270 +11,10 @@ contains(TEMPLATE, .*app) {
|
||||
@@ -15,278 +15,10 @@ contains(TEMPLATE, .*app) {
|
||||
|
||||
QMAKE_EXTRA_INCLUDES += $$shell_quote($$PWD/sdk.mk)
|
||||
}
|
||||
@@ -148,10 +124,12 @@ index 0b64a586b93..3b40328304d 100644
|
||||
-
|
||||
- QMAKE_XCODE_ARCHS =
|
||||
-
|
||||
- arch_device.name = "ARCHS[sdk=$${device.sdk}*]"
|
||||
- arch_device.value = $$QMAKE_APPLE_DEVICE_ARCHS
|
||||
- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_DEVICE_ARCHS
|
||||
- QMAKE_MAC_XCODE_SETTINGS += arch_device
|
||||
- !isEmpty(QMAKE_APPLE_DEVICE_ARCHS) {
|
||||
- arch_device.name = "ARCHS[sdk=$${device.sdk}*]"
|
||||
- arch_device.value = $$QMAKE_APPLE_DEVICE_ARCHS
|
||||
- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_DEVICE_ARCHS
|
||||
- QMAKE_MAC_XCODE_SETTINGS += arch_device
|
||||
- }
|
||||
-
|
||||
- ios:simulator {
|
||||
- arch_simulator.name = "ARCHS[sdk=$${simulator.sdk}*]"
|
||||
@@ -252,10 +230,16 @@ index 0b64a586b93..3b40328304d 100644
|
||||
- platform_identifier = $$device.sdk
|
||||
- sysroot_path = $$xcodeSDKInfo(Path, $$device.sdk)
|
||||
- }
|
||||
- version_min_flag = -m$${version_identifier}-version-min=$$deployment_target
|
||||
- QMAKE_CFLAGS += -isysroot $$sysroot_path $$version_min_flag
|
||||
- QMAKE_CXXFLAGS += -isysroot $$sysroot_path $$version_min_flag
|
||||
- QMAKE_LFLAGS += -isysroot $$sysroot_path $$version_min_flag
|
||||
- QMAKE_CFLAGS += -isysroot $$sysroot_path
|
||||
- QMAKE_CXXFLAGS += -isysroot $$sysroot_path
|
||||
- QMAKE_LFLAGS += -isysroot $$sysroot_path
|
||||
-
|
||||
- !isEmpty(version_identifier):!isEmpty(deployment_target) {
|
||||
- version_min_flag = -m$${version_identifier}-version-min=$$deployment_target
|
||||
- QMAKE_CFLAGS += $$version_min_flag
|
||||
- QMAKE_CXXFLAGS += $$version_min_flag
|
||||
- QMAKE_LFLAGS += $$version_min_flag
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- # Enable precompiled headers for multiple architectures
|
||||
@@ -311,7 +295,7 @@ index 0b64a586b93..3b40328304d 100644
|
||||
generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode \"$(EXPORT__PRO_FILE_)\" $$QMAKE_ARGS
|
||||
generate_xcode_project.target = xcodeproj
|
||||
diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf
|
||||
index e3534561a56..3b01424e67b 100644
|
||||
index e3534561a5..3b01424e67 100644
|
||||
--- a/mkspecs/features/mac/default_pre.prf
|
||||
+++ b/mkspecs/features/mac/default_pre.prf
|
||||
@@ -1,60 +1,2 @@
|
||||
@@ -376,7 +360,7 @@ index e3534561a56..3b01424e67b 100644
|
||||
-xcode_copy_phase_strip_setting.value = NO
|
||||
-QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting
|
||||
diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk
|
||||
index a32ceacb6ce..e69de29bb2d 100644
|
||||
index a32ceacb6c..e69de29bb2 100644
|
||||
--- a/mkspecs/features/mac/sdk.mk
|
||||
+++ b/mkspecs/features/mac/sdk.mk
|
||||
@@ -1,27 +0,0 @@
|
||||
@@ -408,7 +392,7 @@ index a32ceacb6ce..e69de29bb2d 100644
|
||||
- endif
|
||||
-endif
|
||||
diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf
|
||||
index 3a9c2778bbe..e69de29bb2d 100644
|
||||
index 3a9c2778bb..e69de29bb2 100644
|
||||
--- a/mkspecs/features/mac/sdk.prf
|
||||
+++ b/mkspecs/features/mac/sdk.prf
|
||||
@@ -1,61 +0,0 @@
|
||||
@@ -474,7 +458,7 @@ index 3a9c2778bbe..e69de29bb2d 100644
|
||||
- cache($$tool_variable, set stash, $$tool)
|
||||
-}
|
||||
diff --git a/mkspecs/features/mac/toolchain.prf b/mkspecs/features/mac/toolchain.prf
|
||||
index df191eb13c4..e69de29bb2d 100644
|
||||
index df191eb13c..e69de29bb2 100644
|
||||
--- a/mkspecs/features/mac/toolchain.prf
|
||||
+++ b/mkspecs/features/mac/toolchain.prf
|
||||
@@ -1,5 +0,0 @@
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
diff --git a/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp b/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp
|
||||
index affa52d..b71b461 100644
|
||||
index c90dabb53..12557976d 100644
|
||||
--- a/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp
|
||||
+++ b/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp
|
||||
@@ -7,7 +7,7 @@
|
||||
#include <private/qabstractvideobuffer_p.h>
|
||||
#include <private/qmultimediautils_p.h>
|
||||
#include <private/qwindowsmultimediautils_p.h>
|
||||
#include <private/qvideoframe_p.h>
|
||||
-#include <qtgui/qscreen_platform.h>
|
||||
+#include <QtGui/qscreen_platform.h>
|
||||
#include "qvideoframe.h"
|
||||
|
||||
@@ -1,24 +1,12 @@
|
||||
From da66a74e8b8e57b4a60b2cd0d18ef3bebb15509c Mon Sep 17 00:00:00 2001
|
||||
From: Nick Cao <nickcao@nichi.co>
|
||||
Date: Tue, 10 Oct 2023 11:45:24 -0400
|
||||
Subject: [PATCH 1/2] qtwebengine: link pulseaudio
|
||||
|
||||
---
|
||||
src/core/CMakeLists.txt | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
|
||||
index 4153ce180..e89f41798 100644
|
||||
index de5222645..bddb2322a 100644
|
||||
--- a/src/core/CMakeLists.txt
|
||||
+++ b/src/core/CMakeLists.txt
|
||||
@@ -340,6 +340,7 @@ foreach(arch ${archs})
|
||||
use_static_angle=true
|
||||
chrome_root_store_supported=false
|
||||
trial_comparison_cert_verifier_supported=false
|
||||
@@ -366,6 +366,7 @@ foreach(arch ${archs})
|
||||
content_enable_legacy_ipc=true
|
||||
enable_extensions_legacy_ipc=true
|
||||
enable_bound_session_credentials=false
|
||||
+ link_pulseaudio=true
|
||||
)
|
||||
extend_gn_list(gnArgArg
|
||||
ARGS use_v8_context_snapshot v8_use_external_startup_data
|
||||
--
|
||||
2.42.0
|
||||
|
||||
|
||||
@@ -1,318 +1,318 @@
|
||||
# DO NOT EDIT! This file is generated automatically.
|
||||
# Command: /home/k900/gh/NixOS/nixpkgs/./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-6
|
||||
# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-6
|
||||
{ fetchurl, mirror }:
|
||||
|
||||
{
|
||||
qt3d = {
|
||||
version = "6.7.3";
|
||||
version = "6.8.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qt3d-everywhere-src-6.7.3.tar.xz";
|
||||
sha256 = "155nddckcc94klwsn51s9p8ynk1acg7q9dx99blhq7ch98vqrm25";
|
||||
name = "qt3d-everywhere-src-6.7.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qt3d-everywhere-src-6.8.0.tar.xz";
|
||||
sha256 = "0zbv1j0i9bla73b4v15skjballff2l0lxgrdfhdkaz232ng9249s";
|
||||
name = "qt3d-everywhere-src-6.8.0.tar.xz";
|
||||
};
|
||||
};
|
||||
qt5compat = {
|
||||
version = "6.7.3";
|
||||
version = "6.8.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qt5compat-everywhere-src-6.7.3.tar.xz";
|
||||
sha256 = "1w2k7911n20wdgl3lmxwc7h8sbn7jkjwxz6sl089szmavyinhslb";
|
||||
name = "qt5compat-everywhere-src-6.7.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qt5compat-everywhere-src-6.8.0.tar.xz";
|
||||
sha256 = "0c2yhgsn63a5m0pxchmkkqfb7izllpr46srf2pndcsqbszyhb6rw";
|
||||
name = "qt5compat-everywhere-src-6.8.0.tar.xz";
|
||||
};
|
||||
};
|
||||
qtactiveqt = {
|
||||
version = "6.7.3";
|
||||
version = "6.8.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtactiveqt-everywhere-src-6.7.3.tar.xz";
|
||||
sha256 = "03qsszrsv3x2w9v65wnmizyqbs0x13c00zjd7sfgsaxw20p5x11a";
|
||||
name = "qtactiveqt-everywhere-src-6.7.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtactiveqt-everywhere-src-6.8.0.tar.xz";
|
||||
sha256 = "0nycsn0yim01cvinfaljwmx8rllll6xw62cywqhbz61fqlsdy693";
|
||||
name = "qtactiveqt-everywhere-src-6.8.0.tar.xz";
|
||||
};
|
||||
};
|
||||
qtbase = {
|
||||
version = "6.7.3";
|
||||
version = "6.8.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtbase-everywhere-src-6.7.3.tar.xz";
|
||||
sha256 = "15rhv8irwpgxs0pgqsn5dy9ndz6n3vfyv7iccdvaq1aj0nmvkjwc";
|
||||
name = "qtbase-everywhere-src-6.7.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtbase-everywhere-src-6.8.0.tar.xz";
|
||||
sha256 = "0x9wp9fd37ycpw73s03p01zi19l93xjp57vcvrrgh9xa20blib8v";
|
||||
name = "qtbase-everywhere-src-6.8.0.tar.xz";
|
||||
};
|
||||
};
|
||||
qtcharts = {
|
||||
version = "6.7.3";
|
||||
version = "6.8.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtcharts-everywhere-src-6.7.3.tar.xz";
|
||||
sha256 = "0n9n4gj86g86yqkgws12aw2p6d94lmx6y19qki5gmg76a2jn7sh7";
|
||||
name = "qtcharts-everywhere-src-6.7.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtcharts-everywhere-src-6.8.0.tar.xz";
|
||||
sha256 = "0bqkbd31lxyqiw4nbwrach7hixg3q93v26di9hxb0s8s1nndl8qr";
|
||||
name = "qtcharts-everywhere-src-6.8.0.tar.xz";
|
||||
};
|
||||
};
|
||||
qtconnectivity = {
|
||||
version = "6.7.3";
|
||||
version = "6.8.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtconnectivity-everywhere-src-6.7.3.tar.xz";
|
||||
sha256 = "1igwnbjhdwmaw1x4v0gx9wv4h4a5h9f9rv9m9dyi0ybv14prpyc0";
|
||||
name = "qtconnectivity-everywhere-src-6.7.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtconnectivity-everywhere-src-6.8.0.tar.xz";
|
||||
sha256 = "120pq8yvm4v72800cj0mm8069fiyan036arnc74zq1vmq1ngpgmv";
|
||||
name = "qtconnectivity-everywhere-src-6.8.0.tar.xz";
|
||||
};
|
||||
};
|
||||
qtdatavis3d = {
|
||||
version = "6.7.3";
|
||||
version = "6.8.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtdatavis3d-everywhere-src-6.7.3.tar.xz";
|
||||
sha256 = "108x4hafvrc4jpmmx6lcf7mnns7vkgz0004b6qkw5bzq36apdwp1";
|
||||
name = "qtdatavis3d-everywhere-src-6.7.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtdatavis3d-everywhere-src-6.8.0.tar.xz";
|
||||
sha256 = "1zscaf1f4dfc5v8w8bivac5hnbq4j6j70vf78b5dcy5h2dfrdwim";
|
||||
name = "qtdatavis3d-everywhere-src-6.8.0.tar.xz";
|
||||
};
|
||||
};
|
||||
qtdeclarative = {
|
||||
version = "6.7.3";
|
||||
version = "6.8.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtdeclarative-everywhere-src-6.7.3.tar.xz";
|
||||
sha256 = "0xcq1dhws5k1sdf8iwxc2j2s45171rhjckfla17brxdb87j70ywk";
|
||||
name = "qtdeclarative-everywhere-src-6.7.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtdeclarative-everywhere-src-6.8.0.tar.xz";
|
||||
sha256 = "1hj4asdzkm78v0mfwyvh847j010mb43i3xx11nma66g989ms6h9v";
|
||||
name = "qtdeclarative-everywhere-src-6.8.0.tar.xz";
|
||||
};
|
||||
};
|
||||
qtdoc = {
|
||||
version = "6.7.3";
|
||||
version = "6.8.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtdoc-everywhere-src-6.7.3.tar.xz";
|
||||
sha256 = "0113rrsrcaw5l425xv96z081idjpav2iprg1834pxfqk3wk2l3ak";
|
||||
name = "qtdoc-everywhere-src-6.7.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtdoc-everywhere-src-6.8.0.tar.xz";
|
||||
sha256 = "0mqjki77cbm14jxxh750p6h7kixkma1nsimdl97b4lslcrs3mj1x";
|
||||
name = "qtdoc-everywhere-src-6.8.0.tar.xz";
|
||||
};
|
||||
};
|
||||
qtgraphs = {
|
||||
version = "6.7.3";
|
||||
version = "6.8.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtgraphs-everywhere-src-6.7.3.tar.xz";
|
||||
sha256 = "13vcx0fkx9vyvjysnj0n805x13ir1srbzlg1jha8h56ccg6dw2f3";
|
||||
name = "qtgraphs-everywhere-src-6.7.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtgraphs-everywhere-src-6.8.0.tar.xz";
|
||||
sha256 = "0hnb1nb8bdhjkrr3b64dk9wgkdgnrb8bxdafvizy2gsr0rd4m9ab";
|
||||
name = "qtgraphs-everywhere-src-6.8.0.tar.xz";
|
||||
};
|
||||
};
|
||||
qtgrpc = {
|
||||
version = "6.7.3";
|
||||
version = "6.8.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtgrpc-everywhere-src-6.7.3.tar.xz";
|
||||
sha256 = "1py6h4g5zhqpm99bhxk12paw675a4c6dl95s6nwkvg1y2vaavapf";
|
||||
name = "qtgrpc-everywhere-src-6.7.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtgrpc-everywhere-src-6.8.0.tar.xz";
|
||||
sha256 = "0zgli0y52n5ahiahkmr1439c5vmjjv69f1x6vw4jbhc3xkp4lnvx";
|
||||
name = "qtgrpc-everywhere-src-6.8.0.tar.xz";
|
||||
};
|
||||
};
|
||||
qthttpserver = {
|
||||
version = "6.7.3";
|
||||
version = "6.8.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qthttpserver-everywhere-src-6.7.3.tar.xz";
|
||||
sha256 = "1zyyyj9q0yy5gh28yqgc0nwhgdvg0qbwkag9bd566srbwp3if8vz";
|
||||
name = "qthttpserver-everywhere-src-6.7.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qthttpserver-everywhere-src-6.8.0.tar.xz";
|
||||
sha256 = "0zvrmqdch8mgpz3xbql3qy6zivyg8f0h10h86di90p1ssb40ihw1";
|
||||
name = "qthttpserver-everywhere-src-6.8.0.tar.xz";
|
||||
};
|
||||
};
|
||||
qtimageformats = {
|
||||
version = "6.7.3";
|
||||
version = "6.8.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtimageformats-everywhere-src-6.7.3.tar.xz";
|
||||
sha256 = "0ls76bxl3xhy7hyzw53vj8q3h0llsbm9dpb86wvw6m0n11283mcz";
|
||||
name = "qtimageformats-everywhere-src-6.7.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtimageformats-everywhere-src-6.8.0.tar.xz";
|
||||
sha256 = "1m55966458jf5n7hciahzw8fdix3d2cf1w96qzmziqcigdazhnsr";
|
||||
name = "qtimageformats-everywhere-src-6.8.0.tar.xz";
|
||||
};
|
||||
};
|
||||
qtlanguageserver = {
|
||||
version = "6.7.3";
|
||||
version = "6.8.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtlanguageserver-everywhere-src-6.7.3.tar.xz";
|
||||
sha256 = "13yzz6qnpkah9s89xlqiszzkbw1j6c1a2vzwkgjdj0w589r3hvf5";
|
||||
name = "qtlanguageserver-everywhere-src-6.7.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtlanguageserver-everywhere-src-6.8.0.tar.xz";
|
||||
sha256 = "1vsw0q0pb7dbxhpg1df0bandfy7k62l68pi063fxpld4ihn1bxzv";
|
||||
name = "qtlanguageserver-everywhere-src-6.8.0.tar.xz";
|
||||
};
|
||||
};
|
||||
qtlocation = {
|
||||
version = "6.7.3";
|
||||
version = "6.8.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtlocation-everywhere-src-6.7.3.tar.xz";
|
||||
sha256 = "1657scmrkyhm31fgvgpjlqd053gb7bcywra4qvlgg3h4rpfxg7sn";
|
||||
name = "qtlocation-everywhere-src-6.7.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtlocation-everywhere-src-6.8.0.tar.xz";
|
||||
sha256 = "181ijzpx4xav5j282w2ppa9g5wdc4z13q0r7269flrb9ngs8gi50";
|
||||
name = "qtlocation-everywhere-src-6.8.0.tar.xz";
|
||||
};
|
||||
};
|
||||
qtlottie = {
|
||||
version = "6.7.3";
|
||||
version = "6.8.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtlottie-everywhere-src-6.7.3.tar.xz";
|
||||
sha256 = "03c3s6alabqqqhi8cx8rnkr3gx7h8rcf2wn8iy9n7hbsfrvix39r";
|
||||
name = "qtlottie-everywhere-src-6.7.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtlottie-everywhere-src-6.8.0.tar.xz";
|
||||
sha256 = "15kw2cgxqh8mhip0838yalbpfnp4pd000sdalgxvc53bd8wycsfb";
|
||||
name = "qtlottie-everywhere-src-6.8.0.tar.xz";
|
||||
};
|
||||
};
|
||||
qtmultimedia = {
|
||||
version = "6.7.3";
|
||||
version = "6.8.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtmultimedia-everywhere-src-6.7.3.tar.xz";
|
||||
sha256 = "00vkazz4mcz5n2hdh10y9mh0fi2kygai009vi69m4hwjwnw2hk9h";
|
||||
name = "qtmultimedia-everywhere-src-6.7.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtmultimedia-everywhere-src-6.8.0.tar.xz";
|
||||
sha256 = "1kfgfcnihn0rqnjdif4n0hd8j2p9xkbfy3a2m3gsfypscajnlxi8";
|
||||
name = "qtmultimedia-everywhere-src-6.8.0.tar.xz";
|
||||
};
|
||||
};
|
||||
qtnetworkauth = {
|
||||
version = "6.7.3";
|
||||
version = "6.8.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtnetworkauth-everywhere-src-6.7.3.tar.xz";
|
||||
sha256 = "1dqk9983cjf3kiprk053xn3np2c25044dlfdrzs5d742x2jpb6kb";
|
||||
name = "qtnetworkauth-everywhere-src-6.7.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtnetworkauth-everywhere-src-6.8.0.tar.xz";
|
||||
sha256 = "0j6ch2p6c2b6akg0hq7iy96v118rypz77573bf4mvcy68ijmcpdr";
|
||||
name = "qtnetworkauth-everywhere-src-6.8.0.tar.xz";
|
||||
};
|
||||
};
|
||||
qtpositioning = {
|
||||
version = "6.7.3";
|
||||
version = "6.8.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtpositioning-everywhere-src-6.7.3.tar.xz";
|
||||
sha256 = "0736qsf7k3dqdm9gd7xc0l368h45jgzh4nzz72wizj9489sp6w6s";
|
||||
name = "qtpositioning-everywhere-src-6.7.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtpositioning-everywhere-src-6.8.0.tar.xz";
|
||||
sha256 = "0fgbgsg1hnwnm7bbp0j41nlpmz9g65nwj48v2c8mjiq15cz4d0gc";
|
||||
name = "qtpositioning-everywhere-src-6.8.0.tar.xz";
|
||||
};
|
||||
};
|
||||
qtquick3d = {
|
||||
version = "6.7.3";
|
||||
version = "6.8.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtquick3d-everywhere-src-6.7.3.tar.xz";
|
||||
sha256 = "0mwrlz9ji0ivnxz44m9xhhsk7lngxjnmid420s359vs21msik6ni";
|
||||
name = "qtquick3d-everywhere-src-6.7.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtquick3d-everywhere-src-6.8.0.tar.xz";
|
||||
sha256 = "0gr2y030phghpniw7flr90f4kckiksq39y53dwddncysw970959y";
|
||||
name = "qtquick3d-everywhere-src-6.8.0.tar.xz";
|
||||
};
|
||||
};
|
||||
qtquick3dphysics = {
|
||||
version = "6.7.3";
|
||||
version = "6.8.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtquick3dphysics-everywhere-src-6.7.3.tar.xz";
|
||||
sha256 = "1wyqi6z0g2pi0wj288ssjj0awn8jpi9rqa8bi510s9vr625w8pdl";
|
||||
name = "qtquick3dphysics-everywhere-src-6.7.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtquick3dphysics-everywhere-src-6.8.0.tar.xz";
|
||||
sha256 = "07wmy546hwavbpy368pyk0qgj79sqykqkcsnmv802qp7kwi5rcqk";
|
||||
name = "qtquick3dphysics-everywhere-src-6.8.0.tar.xz";
|
||||
};
|
||||
};
|
||||
qtquickeffectmaker = {
|
||||
version = "6.7.3";
|
||||
version = "6.8.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtquickeffectmaker-everywhere-src-6.7.3.tar.xz";
|
||||
sha256 = "15if8ansjc1nkpaf6ldyydb47grgv079pm15ljn0ykf35ldzv2sq";
|
||||
name = "qtquickeffectmaker-everywhere-src-6.7.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtquickeffectmaker-everywhere-src-6.8.0.tar.xz";
|
||||
sha256 = "1x3lijsfd8pv74sgyjc7cj9s0c2q9bf49r44aa2d0zdjs3rxg8ca";
|
||||
name = "qtquickeffectmaker-everywhere-src-6.8.0.tar.xz";
|
||||
};
|
||||
};
|
||||
qtquicktimeline = {
|
||||
version = "6.7.3";
|
||||
version = "6.8.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtquicktimeline-everywhere-src-6.7.3.tar.xz";
|
||||
sha256 = "00n90camzs7c3s61id58466sypc83w0101wrnw0xwlaci1kld45p";
|
||||
name = "qtquicktimeline-everywhere-src-6.7.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtquicktimeline-everywhere-src-6.8.0.tar.xz";
|
||||
sha256 = "020zv4fnx37k8nm0c462bk8r9ma7l6ivr8j7i82h6688v0ds81hi";
|
||||
name = "qtquicktimeline-everywhere-src-6.8.0.tar.xz";
|
||||
};
|
||||
};
|
||||
qtremoteobjects = {
|
||||
version = "6.7.3";
|
||||
version = "6.8.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtremoteobjects-everywhere-src-6.7.3.tar.xz";
|
||||
sha256 = "1lciziv5qvnxich39j0q46v3pkn83yy1jkm2q3d10k5672lqmh4r";
|
||||
name = "qtremoteobjects-everywhere-src-6.7.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtremoteobjects-everywhere-src-6.8.0.tar.xz";
|
||||
sha256 = "123mkiak4xj05yg6sg86z1hixp8vycj0yks1fj1yk5lpdl65gpzi";
|
||||
name = "qtremoteobjects-everywhere-src-6.8.0.tar.xz";
|
||||
};
|
||||
};
|
||||
qtscxml = {
|
||||
version = "6.7.3";
|
||||
version = "6.8.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtscxml-everywhere-src-6.7.3.tar.xz";
|
||||
sha256 = "18zdgq3sapkh6jsnfhl0xm0r8ydbg7kxwr70b7szpdmg1pmyp3v0";
|
||||
name = "qtscxml-everywhere-src-6.7.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtscxml-everywhere-src-6.8.0.tar.xz";
|
||||
sha256 = "0fxl6yc03z43x49nskm2r1wa7vq9zg6dv1hl74nipc21yi7amadv";
|
||||
name = "qtscxml-everywhere-src-6.8.0.tar.xz";
|
||||
};
|
||||
};
|
||||
qtsensors = {
|
||||
version = "6.7.3";
|
||||
version = "6.8.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtsensors-everywhere-src-6.7.3.tar.xz";
|
||||
sha256 = "1z68yfjljv7bi49kna4a7yz6javw9bqdw0jr30zmzvb2ldfqsfn0";
|
||||
name = "qtsensors-everywhere-src-6.7.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtsensors-everywhere-src-6.8.0.tar.xz";
|
||||
sha256 = "0yg6vn1yk4k962bff33pk9pjzyw3rskqcqfnadfvgyh5zb2l8dbj";
|
||||
name = "qtsensors-everywhere-src-6.8.0.tar.xz";
|
||||
};
|
||||
};
|
||||
qtserialbus = {
|
||||
version = "6.7.3";
|
||||
version = "6.8.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtserialbus-everywhere-src-6.7.3.tar.xz";
|
||||
sha256 = "0xk218y1cm9icdzb4dn9nvszr9n22anmf2iz72vhhy42gaf2xn2m";
|
||||
name = "qtserialbus-everywhere-src-6.7.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtserialbus-everywhere-src-6.8.0.tar.xz";
|
||||
sha256 = "1ynsy0xkjdp5d3rii0ch540n8cs07dzwd66cxw59gh9j92839676";
|
||||
name = "qtserialbus-everywhere-src-6.8.0.tar.xz";
|
||||
};
|
||||
};
|
||||
qtserialport = {
|
||||
version = "6.7.3";
|
||||
version = "6.8.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtserialport-everywhere-src-6.7.3.tar.xz";
|
||||
sha256 = "1w26n5nw8fv9cq258xm0p7niisbig5ky83njm3nwjfcvh3p5iynl";
|
||||
name = "qtserialport-everywhere-src-6.7.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtserialport-everywhere-src-6.8.0.tar.xz";
|
||||
sha256 = "1hz7fynpa6z0x206g920xfk45hi74fahpcyha1f09cddrwpdfrvp";
|
||||
name = "qtserialport-everywhere-src-6.8.0.tar.xz";
|
||||
};
|
||||
};
|
||||
qtshadertools = {
|
||||
version = "6.7.3";
|
||||
version = "6.8.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtshadertools-everywhere-src-6.7.3.tar.xz";
|
||||
sha256 = "1589ij1aarr0i6cfbdxg8yxvljs52599g39d98sxmnvxiiwi5rbl";
|
||||
name = "qtshadertools-everywhere-src-6.7.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtshadertools-everywhere-src-6.8.0.tar.xz";
|
||||
sha256 = "1jy4siv6ny9wgs5bcn19z05my9q8za0wi5lyngrlndw26k4jssa4";
|
||||
name = "qtshadertools-everywhere-src-6.8.0.tar.xz";
|
||||
};
|
||||
};
|
||||
qtspeech = {
|
||||
version = "6.7.3";
|
||||
version = "6.8.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtspeech-everywhere-src-6.7.3.tar.xz";
|
||||
sha256 = "04h998pshs2bzm3a0bvmkq2an2yhgfrap22k3lvprx3f3gsgn2gn";
|
||||
name = "qtspeech-everywhere-src-6.7.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtspeech-everywhere-src-6.8.0.tar.xz";
|
||||
sha256 = "0rb52qbwjkxlncz28rcjapi059b8px3i5haq71gm7f1pph90l8vm";
|
||||
name = "qtspeech-everywhere-src-6.8.0.tar.xz";
|
||||
};
|
||||
};
|
||||
qtsvg = {
|
||||
version = "6.7.3";
|
||||
version = "6.8.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtsvg-everywhere-src-6.7.3.tar.xz";
|
||||
sha256 = "0sx0xm6hcjhjhrmswycrgwvdjk6mymkindmw2bb7mq5i3yvjq520";
|
||||
name = "qtsvg-everywhere-src-6.7.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtsvg-everywhere-src-6.8.0.tar.xz";
|
||||
sha256 = "16b1ckqpfhzn9xaqbwz5gy4b0xavbpjxj4064ivq23sjbqymjyng";
|
||||
name = "qtsvg-everywhere-src-6.8.0.tar.xz";
|
||||
};
|
||||
};
|
||||
qttools = {
|
||||
version = "6.7.3";
|
||||
version = "6.8.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qttools-everywhere-src-6.7.3.tar.xz";
|
||||
sha256 = "0gr06dr3dd334mswrjdxp27dhpdbpjvk03hipafsrncwc7gvffzh";
|
||||
name = "qttools-everywhere-src-6.7.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qttools-everywhere-src-6.8.0.tar.xz";
|
||||
sha256 = "1xw1k7rnm2yylbj08p9a0w2ydfcfwa50qca3dv6cc0w54vc1aca0";
|
||||
name = "qttools-everywhere-src-6.8.0.tar.xz";
|
||||
};
|
||||
};
|
||||
qttranslations = {
|
||||
version = "6.7.3";
|
||||
version = "6.8.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qttranslations-everywhere-src-6.7.3.tar.xz";
|
||||
sha256 = "1j3dklf0gvzpnl6zw254fv7wy3iyypbbcsfkwjsrnfq4mjn65iyw";
|
||||
name = "qttranslations-everywhere-src-6.7.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qttranslations-everywhere-src-6.8.0.tar.xz";
|
||||
sha256 = "1dkw8f3hcnmnnv0ia62i5189dcgjkpx7pkcal180rka3q9kjpgw4";
|
||||
name = "qttranslations-everywhere-src-6.8.0.tar.xz";
|
||||
};
|
||||
};
|
||||
qtvirtualkeyboard = {
|
||||
version = "6.7.3";
|
||||
version = "6.8.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtvirtualkeyboard-everywhere-src-6.7.3.tar.xz";
|
||||
sha256 = "1n932jgj97ili5chhfrscqvhdaz0na5yla3xljnlih0jw82231qs";
|
||||
name = "qtvirtualkeyboard-everywhere-src-6.7.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtvirtualkeyboard-everywhere-src-6.8.0.tar.xz";
|
||||
sha256 = "1q0cdmxm4j9w6lhm1k1ayjykknl6kmzr415qc14znr87ykbh4rcg";
|
||||
name = "qtvirtualkeyboard-everywhere-src-6.8.0.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwayland = {
|
||||
version = "6.7.3";
|
||||
version = "6.8.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtwayland-everywhere-src-6.7.3.tar.xz";
|
||||
sha256 = "1ddjf9lrlx8cp0699sq8vc8fx44nvz9daxq5qazh7x98nv7cf9p3";
|
||||
name = "qtwayland-everywhere-src-6.7.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtwayland-everywhere-src-6.8.0.tar.xz";
|
||||
sha256 = "02h6lak0cp87b76474ifsm78vsx0gwfc2smnzg3g3srq2rcmhmqp";
|
||||
name = "qtwayland-everywhere-src-6.8.0.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwebchannel = {
|
||||
version = "6.7.3";
|
||||
version = "6.8.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtwebchannel-everywhere-src-6.7.3.tar.xz";
|
||||
sha256 = "1f3lak91fvlncgs43dcgkgjg25f9449d2pvbsh33m6xhdpg3yqqm";
|
||||
name = "qtwebchannel-everywhere-src-6.7.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtwebchannel-everywhere-src-6.8.0.tar.xz";
|
||||
sha256 = "1h30mzmhkbcjaj4wivway0ldrdidqyg2b79313v2m3capwjhs9fn";
|
||||
name = "qtwebchannel-everywhere-src-6.8.0.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwebengine = {
|
||||
version = "6.7.3";
|
||||
version = "6.8.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtwebengine-everywhere-src-6.7.3.tar.xz";
|
||||
sha256 = "1ns6v24jarjlvd1b3nh4x3sp6y38ag62dsh7x6f5dp40pff1aay2";
|
||||
name = "qtwebengine-everywhere-src-6.7.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtwebengine-everywhere-src-6.8.0.tar.xz";
|
||||
sha256 = "0lklgz5i3ryl6d1ghy11rvmg9isbzvrvx007nwb4qqm89294b114";
|
||||
name = "qtwebengine-everywhere-src-6.8.0.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwebsockets = {
|
||||
version = "6.7.3";
|
||||
version = "6.8.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtwebsockets-everywhere-src-6.7.3.tar.xz";
|
||||
sha256 = "03lrqphvn0bwrma8rjqb8x7giqgk24gdgl9v7syaas7fnxyh00xs";
|
||||
name = "qtwebsockets-everywhere-src-6.7.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtwebsockets-everywhere-src-6.8.0.tar.xz";
|
||||
sha256 = "0vxgbqxahay0gz5cv3fl075qw3flm3hgz1srhs4jl75p8rff0jy1";
|
||||
name = "qtwebsockets-everywhere-src-6.8.0.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwebview = {
|
||||
version = "6.7.3";
|
||||
version = "6.8.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtwebview-everywhere-src-6.7.3.tar.xz";
|
||||
sha256 = "0bdr0m8453difqwd8gvgqsd4df4j8lnlbi44cdazwhx28kzfi2kh";
|
||||
name = "qtwebview-everywhere-src-6.7.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtwebview-everywhere-src-6.8.0.tar.xz";
|
||||
sha256 = "1wvrq7lf688hqvq102kyvx7kqnixxp6w25cb6rvb2xiqb50rvf3w";
|
||||
name = "qtwebview-everywhere-src-6.8.0.tar.xz";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "adafruit-platformdetect";
|
||||
version = "3.74.0";
|
||||
version = "3.75.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "adafruit_platformdetect";
|
||||
inherit version;
|
||||
hash = "sha256-rVmtqpVjQgovAsVCu3+hgglga9LJPGT8zzlhySmpba8=";
|
||||
hash = "sha256-5Awvnzw0tgZhRXVshTOuzerdORJ+5QCH3PDB7pbjCB0=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools-scm ];
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioairzone-cloud";
|
||||
version = "0.6.5";
|
||||
version = "0.6.6";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "Noltari";
|
||||
repo = "aioairzone-cloud";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-+F1kcs3XBBRNSmiuobFIFHsZOHEFjwYq0oxkHViuWXw=";
|
||||
hash = "sha256-a1UsRmDCieCMblH2SpNujDj98GjqDcMN6+TRAWkkV3I=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
pytestCheckHook,
|
||||
@@ -54,10 +55,12 @@ buildPythonPackage rec {
|
||||
"argostranslate.translate"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Open-source offline translation library written in Python";
|
||||
homepage = "https://www.argosopentech.com";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ misuzu ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ misuzu ];
|
||||
# Segfaults at import
|
||||
broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "awkward-cpp";
|
||||
version = "38";
|
||||
version = "39";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "awkward_cpp";
|
||||
inherit version;
|
||||
hash = "sha256-l0SVah14fD0hXqE8WqG2EQnIk/Ad0e/i2mj1jt6K0Vs=";
|
||||
hash = "sha256-YdoAEZnqIJRITijKB0WR0uxmDxF+mperieYNpAUnI4U=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -36,7 +36,6 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "CPU kernels and compiled extensions for Awkward Array";
|
||||
homepage = "https://github.com/scikit-hep/awkward";
|
||||
changelog = "https://github.com/scikit-hep/awkward/releases/tag/v${version}";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ veprbl ];
|
||||
};
|
||||
|
||||
@@ -32,14 +32,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "awkward";
|
||||
version = "2.6.8";
|
||||
version = "2.6.9";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scikit-hep";
|
||||
repo = "awkward";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-2VhG4Elv1neBEfogfhjwlPltQK64wjaLUMhDg7xB/Ow=";
|
||||
hash = "sha256-kYDihmfzMH5LPXSgXpC64qMPqxIX59VzflhP0gWu92Y=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mitogen";
|
||||
version = "0.3.11";
|
||||
version = "0.3.12";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "mitogen-hq";
|
||||
repo = "mitogen";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-zOTuvc25J2Q9swSntFzjmVCkN13CnYFgnsPc5/rkvVI=";
|
||||
hash = "sha256-OlZzE4Nc9VBrv5oCZ4LUFdj1a+9rc7YbHDYSbHwALY8=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
setuptools-scm,
|
||||
pytestCheckHook,
|
||||
fetchPypi,
|
||||
lxml,
|
||||
cssselect,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "prosemirror";
|
||||
version = "0.5.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-AwhPJHPDuuQW7NlUs7KL0SLTAH9F+E8RzRbsRnHraiI=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools-scm ];
|
||||
|
||||
dependencies = [
|
||||
lxml
|
||||
cssselect
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "prosemirror" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Python implementation of core ProseMirror modules for collaborative editing";
|
||||
homepage = "https://pypi.org/project/prosemirror";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ onny ];
|
||||
};
|
||||
}
|
||||
@@ -58,14 +58,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "transformers";
|
||||
version = "4.45.1";
|
||||
version = "4.45.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "huggingface";
|
||||
repo = "transformers";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-5fGEnw4YllQdZV/0vDGXYsCyTw0rtPRD/V7UWoBBZjQ=";
|
||||
hash = "sha256-5Ric+pEbBf6HswsPb8cdVLdqTRgicFjzcrk0oO2PtC0=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
packaging,
|
||||
pillow,
|
||||
platformdirs,
|
||||
propcache,
|
||||
pydantic,
|
||||
pyjwt,
|
||||
rich,
|
||||
@@ -38,7 +39,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "uiprotect";
|
||||
version = "6.1.0";
|
||||
version = "6.3.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@@ -47,7 +48,7 @@ buildPythonPackage rec {
|
||||
owner = "uilibs";
|
||||
repo = "uiprotect";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-SWEWh1c5GcMrjJlcLtXScRNoem2ACGt3nFC4+ARMIIw=";
|
||||
hash = "sha256-42rxRD3mXgMLz3mADF0ksDLpw2di5MyVL7+6iW41nI8=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
@@ -68,6 +69,7 @@ buildPythonPackage rec {
|
||||
packaging
|
||||
pillow
|
||||
platformdirs
|
||||
propcache
|
||||
pydantic
|
||||
pyjwt
|
||||
rich
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
pythonOlder,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
@@ -26,16 +25,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "uproot";
|
||||
version = "5.4.0";
|
||||
version = "5.4.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scikit-hep";
|
||||
repo = "uproot5";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-iCyGG4y7cnJqHEaqpzFc/LjWiLZw3HArU5hDtEyLgFo=";
|
||||
hash = "sha256-MWqkEbw6hdNaXrRLWoxUcppT+X9a+DmEhho9GpG29XM=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -2,18 +2,23 @@
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
|
||||
# dependencies
|
||||
braceexpand,
|
||||
numpy,
|
||||
pyyaml,
|
||||
|
||||
# tests
|
||||
imageio,
|
||||
lmdb,
|
||||
msgpack,
|
||||
numpy,
|
||||
pytestCheckHook,
|
||||
pyyaml,
|
||||
setuptools,
|
||||
torch,
|
||||
torchvision,
|
||||
wheel,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "webdataset";
|
||||
@@ -29,7 +34,6 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
@@ -39,12 +43,12 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
imageio
|
||||
lmdb
|
||||
msgpack
|
||||
pytestCheckHook
|
||||
torch
|
||||
torchvision
|
||||
msgpack
|
||||
lmdb
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "webdataset" ];
|
||||
@@ -86,10 +90,10 @@ buildPythonPackage rec {
|
||||
|
||||
disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# AttributeError: <module 'torch.distributed' from /nix/store/...
|
||||
"tests/test_wids.py"
|
||||
"tests/wids/test_wids.py"
|
||||
|
||||
# Issue with creating a temp file in the sandbox
|
||||
"tests/test_wids_mmtar.py"
|
||||
"tests/wids/test_wids_mmtar.py"
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "flyctl";
|
||||
version = "0.3.10";
|
||||
version = "0.3.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "superfly";
|
||||
repo = "flyctl";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xg26di6ceko6QUVciy1BLNC7hMEf4I1HRHmRCrdd4vc=";
|
||||
hash = "sha256-RM9R3o1NJYrw21SYx5whdR9kbopdOXUj3Uw5dVmo6Kk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-N/evH8AiTHzO2fXJM3j4vIfSvAuiCc2IWpVcuRU7zlY=";
|
||||
vendorHash = "sha256-0KVjg4gt0WOJgVaeugSGzJJE/MvKSPZP6MXCYIw0cxQ=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -254,6 +254,7 @@
|
||||
"GPL-2.0-only",
|
||||
"GPL-2.0-or-later",
|
||||
"GPL-3.0-only",
|
||||
"LGPL-2.0-or-later",
|
||||
"LicenseRef-KDE-Accepted-GPL",
|
||||
"MIT"
|
||||
],
|
||||
@@ -326,6 +327,7 @@
|
||||
"GPL-3.0-only",
|
||||
"LGPL-2.0-or-later",
|
||||
"LGPL-2.1-only",
|
||||
"LGPL-2.1-or-later",
|
||||
"LGPL-3.0-only",
|
||||
"LGPL-3.0-or-later",
|
||||
"LicenseRef-KDE-Accepted-GPL",
|
||||
@@ -2515,6 +2517,19 @@
|
||||
"LicenseRef-KDE-Accepted-LGPL",
|
||||
"MIT"
|
||||
],
|
||||
"plasma-dialer": [
|
||||
"BSD-3-Clause",
|
||||
"CC0-1.0",
|
||||
"GPL-2.0-only",
|
||||
"GPL-2.0-or-later",
|
||||
"GPL-3.0-only",
|
||||
"LGPL-2.0-or-later",
|
||||
"LGPL-2.1-only",
|
||||
"LGPL-2.1-or-later",
|
||||
"LGPL-3.0-only",
|
||||
"LicenseRef-KDE-Accepted-GPL",
|
||||
"LicenseRef-KDE-Accepted-LGPL"
|
||||
],
|
||||
"plasma-disks": [
|
||||
"BSD-3-Clause",
|
||||
"CC0-1.0",
|
||||
@@ -2646,6 +2661,7 @@
|
||||
"GPL-2.0-only",
|
||||
"GPL-2.0-or-later",
|
||||
"GPL-3.0-only",
|
||||
"GPL-3.0-or-later",
|
||||
"LGPL-2.0-only",
|
||||
"LGPL-2.0-or-later",
|
||||
"LGPL-2.1-only",
|
||||
@@ -2662,6 +2678,7 @@
|
||||
"BSD-3-Clause",
|
||||
"CC0-1.0",
|
||||
"GPL-2.0-or-later",
|
||||
"LGPL-2.0-only",
|
||||
"LGPL-2.0-or-later",
|
||||
"LGPL-2.1-or-later"
|
||||
],
|
||||
@@ -2687,18 +2704,21 @@
|
||||
"LGPL-2.0-or-later"
|
||||
],
|
||||
"powerdevil": [
|
||||
"BSD-2-Clause",
|
||||
"BSD-3-Clause",
|
||||
"CC0-1.0",
|
||||
"GPL-2.0-only",
|
||||
"GPL-2.0-or-later",
|
||||
"GPL-3.0-only",
|
||||
"GPL-3.0-or-later",
|
||||
"LGPL-2.0-only",
|
||||
"LGPL-2.0-or-later",
|
||||
"LGPL-2.1-only",
|
||||
"LGPL-2.1-or-later",
|
||||
"LGPL-3.0-only",
|
||||
"LicenseRef-KDE-Accepted-GPL",
|
||||
"LicenseRef-KDE-Accepted-LGPL"
|
||||
"LicenseRef-KDE-Accepted-LGPL",
|
||||
"MIT"
|
||||
],
|
||||
"poxml": [
|
||||
"CC0-1.0"
|
||||
@@ -2808,6 +2828,15 @@
|
||||
"LGPL-2.0-or-later",
|
||||
"LGPL-2.1-or-later"
|
||||
],
|
||||
"spacebar": [
|
||||
"BSD-2-Clause",
|
||||
"CC0-1.0",
|
||||
"GPL-2.0-only",
|
||||
"GPL-2.0-or-later",
|
||||
"GPL-3.0-only",
|
||||
"LGPL-2.0-or-later",
|
||||
"LicenseRef-KDE-Accepted-GPL"
|
||||
],
|
||||
"spectacle": [
|
||||
"BSD-3-Clause",
|
||||
"CC0-1.0",
|
||||
|
||||
@@ -1,322 +1,332 @@
|
||||
{
|
||||
"bluedevil": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/bluedevil-6.1.5.tar.xz",
|
||||
"hash": "sha256-KZWNoIsyQr2kJDiYnuPsuB04bKW+cjMlBuXPDe0LcHc="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/bluedevil-6.2.0.tar.xz",
|
||||
"hash": "sha256-jj5xMBc00iyEof9cEMgfpSpQv0ftK/ST/gWoi/y9Hns="
|
||||
},
|
||||
"breeze": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/breeze-6.1.5.tar.xz",
|
||||
"hash": "sha256-VEkXfJBhP5e0dK53YoXM/G6Gc2kdEgM32VNwyefIPLI="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/breeze-6.2.0.tar.xz",
|
||||
"hash": "sha256-+WWgn+GZhG1VNmxhFOqTNnPKTMfcuB4kDJwK5HkV7lE="
|
||||
},
|
||||
"breeze-grub": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/breeze-grub-6.1.5.tar.xz",
|
||||
"hash": "sha256-ezzwtCaAG9dLvWuPDcSvN7E3UPl7817c006moU0gCQk="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/breeze-grub-6.2.0.tar.xz",
|
||||
"hash": "sha256-O4WW1N6rcnnP6gbif1STLq9ccHBnzCwjHsSmHns3Rbs="
|
||||
},
|
||||
"breeze-gtk": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/breeze-gtk-6.1.5.tar.xz",
|
||||
"hash": "sha256-lgw98EdCPoXh8zvbYLcb3HSGuZQdideFMQ3r5QG9RtE="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/breeze-gtk-6.2.0.tar.xz",
|
||||
"hash": "sha256-phHkRK7KNPFv5uCQEekBT88rtdlCLdZEAR9EDMxTdbg="
|
||||
},
|
||||
"breeze-plymouth": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/breeze-plymouth-6.1.5.tar.xz",
|
||||
"hash": "sha256-Z2H6s/bVdWhjWwfBwjRgqRaBLgSXk3IYAdd6xd+O1gs="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/breeze-plymouth-6.2.0.tar.xz",
|
||||
"hash": "sha256-ggrcuEinbtdhtclGZWk3S20uAQL6ykX5EYxAbM/fV6Y="
|
||||
},
|
||||
"discover": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/discover-6.1.5.tar.xz",
|
||||
"hash": "sha256-biz1n6wst5JCDtbfZT+AMH1uM9bmrpwa8oJ6k7rjy40="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/discover-6.2.0.tar.xz",
|
||||
"hash": "sha256-QP/KtDliA07UyISLqk41T0j/Pdi5TTKdw97sOGBklf8="
|
||||
},
|
||||
"drkonqi": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/drkonqi-6.1.5.tar.xz",
|
||||
"hash": "sha256-Dhsn5OjrUdEcO9SnyfA5my6qP6tr6H3fQNKL4N6ujb8="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/drkonqi-6.2.0.tar.xz",
|
||||
"hash": "sha256-5t2XbT9O2A57wNoaM7j1eKE69VZPDjfcSe1Zo8TWjow="
|
||||
},
|
||||
"flatpak-kcm": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/flatpak-kcm-6.1.5.tar.xz",
|
||||
"hash": "sha256-UI99mL0UEkIUdG8kSAT+3c0kWIyw63xYA5B7IlE9KQo="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/flatpak-kcm-6.2.0.tar.xz",
|
||||
"hash": "sha256-KiA+cpJXHvE3N4XCRJxQO+FUCNvfCnpZ1+mdjp3vGoE="
|
||||
},
|
||||
"kactivitymanagerd": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/kactivitymanagerd-6.1.5.tar.xz",
|
||||
"hash": "sha256-P4r9onN4eALVzUa/dvjxRn7OHyHIO7qmUTQ1d1UjgQ8="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/kactivitymanagerd-6.2.0.tar.xz",
|
||||
"hash": "sha256-65Q2EdhdGKxXk8O8gbl7dQevlwNN8Dhtm9DjmZnm4Gw="
|
||||
},
|
||||
"kde-cli-tools": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/kde-cli-tools-6.1.5.tar.xz",
|
||||
"hash": "sha256-wPM2Bir4AIBFTKOahatgvKHseoVOhMCdSSgwsRB5AxM="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/kde-cli-tools-6.2.0.tar.xz",
|
||||
"hash": "sha256-e+BC+Yr0bMtflzWP+fpYyTA2BsmQnhyS7OViR9nT0rY="
|
||||
},
|
||||
"kdecoration": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/kdecoration-6.1.5.tar.xz",
|
||||
"hash": "sha256-POFs6mWdhj9465PVZ7+VKz9mRAvs1CSwbSBB/wZ53vc="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/kdecoration-6.2.0.tar.xz",
|
||||
"hash": "sha256-BdDTjuVcki2xNf2GTjXEdCmIp7JlFqNBuCTpgElgyRk="
|
||||
},
|
||||
"kde-gtk-config": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/kde-gtk-config-6.1.5.tar.xz",
|
||||
"hash": "sha256-Yx5Z9SYZ3alA0gWU3FUAjC8ZLacF5sXb+m0lF1CHti4="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/kde-gtk-config-6.2.0.tar.xz",
|
||||
"hash": "sha256-m7Yirv6iCqkz+FJCwRxwdYFQqG95Yc83Un0UzW2Y+Wc="
|
||||
},
|
||||
"kdeplasma-addons": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/kdeplasma-addons-6.1.5.tar.xz",
|
||||
"hash": "sha256-Nrb54cA+UupOXQQJoHhhF8gkcWYWny0KIh8g8a6riGM="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/kdeplasma-addons-6.2.0.tar.xz",
|
||||
"hash": "sha256-KOZ46UTPzhgxqXT8SELp/JV3v9zTrxBtG4qFIrVvwg4="
|
||||
},
|
||||
"kgamma": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/kgamma-6.1.5.tar.xz",
|
||||
"hash": "sha256-L0Psa0q6wnJJsQFZTxnyIv5+WUcFT1JSwRqdnsIKtCw="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/kgamma-6.2.0.tar.xz",
|
||||
"hash": "sha256-UkQ4SuKNkrBVXpxn1ZlWRv+bEDces2sH3RS5NHeebPw="
|
||||
},
|
||||
"kglobalacceld": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/kglobalacceld-6.1.5.tar.xz",
|
||||
"hash": "sha256-3A4Kl34Lrhd4jnAwvsONZVrvYMzgG3QOSPVXmkcx06o="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/kglobalacceld-6.2.0.tar.xz",
|
||||
"hash": "sha256-IVdJJXXA2Cn8kWJMBxpNK4EfrJzMZDDxScHdB4ZuTXw="
|
||||
},
|
||||
"kinfocenter": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/kinfocenter-6.1.5.tar.xz",
|
||||
"hash": "sha256-CXauQ3Vrbdv05w51DLF/Qi2r52BMXi+CSrTx4BYa5dA="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/kinfocenter-6.2.0.tar.xz",
|
||||
"hash": "sha256-UIcw97RNyFuk5nyvUmGZUozvzz3WA/YoCRepMOD+Bsw="
|
||||
},
|
||||
"kmenuedit": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/kmenuedit-6.1.5.tar.xz",
|
||||
"hash": "sha256-/LJ6g6VVT7VlRjO+0Iy2CJhlcuMPXkJBYHo1TsidZVY="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/kmenuedit-6.2.0.tar.xz",
|
||||
"hash": "sha256-IWLv11QSj7BnSgZQbziyT+mEWVvbkoqfpwDmoG8ED/c="
|
||||
},
|
||||
"kpipewire": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/kpipewire-6.1.5.tar.xz",
|
||||
"hash": "sha256-JbMs/K/zUvDErNpXRq3/0uOyi1/wZIUhvehijKcUWkk="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/kpipewire-6.2.0.tar.xz",
|
||||
"hash": "sha256-csB+bGYItsXqokYNl1v5BHSJZR+wXeXltUCHZSn0JbA="
|
||||
},
|
||||
"krdp": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/krdp-6.1.5.tar.xz",
|
||||
"hash": "sha256-qR3iyOi2/oUu3u5QtyLyq+vDs4R31++TX55re3znxrc="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/krdp-6.2.0.tar.xz",
|
||||
"hash": "sha256-vln3THuq4hQ79bL/dyKjku1I413ELk/ZtvtqgenfSpo="
|
||||
},
|
||||
"kscreen": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/kscreen-6.1.5.tar.xz",
|
||||
"hash": "sha256-QWap9tWI7v3BntnZqeD4Jlq0mZviSLoRtI7jU+y8UR8="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/kscreen-6.2.0.tar.xz",
|
||||
"hash": "sha256-ClFDHs9PrEhtNWb4npjE0uS8mqjRprAeieXcYP8f5fI="
|
||||
},
|
||||
"kscreenlocker": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/kscreenlocker-6.1.5.tar.xz",
|
||||
"hash": "sha256-oOqDVBIqKOCsxuxgSnZY/uWwDxJcwJ6nWMm5G/PH8Pw="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/kscreenlocker-6.2.0.tar.xz",
|
||||
"hash": "sha256-m/QE/7DX19wZayWIrl9HP9he6t58svVkAOORBsEUfxc="
|
||||
},
|
||||
"ksshaskpass": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/ksshaskpass-6.1.5.tar.xz",
|
||||
"hash": "sha256-NN1y8r94XdS2yYlEvU5ETb60a7Xy10xblbrtghxnGPE="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/ksshaskpass-6.2.0.tar.xz",
|
||||
"hash": "sha256-KimJtRX9HEooG3ujda8H2gdObgYh1nyLrEhvKCBx3Bg="
|
||||
},
|
||||
"ksystemstats": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/ksystemstats-6.1.5.tar.xz",
|
||||
"hash": "sha256-hCW7nwdiNNFn6vaJt09ynioFYcNnRz6KhPq0pMOcaJM="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/ksystemstats-6.2.0.tar.xz",
|
||||
"hash": "sha256-BYFdAazbGZwFL6mUxI9J9pS0NWp/wj7/OLsAYUrkaH4="
|
||||
},
|
||||
"kwallet-pam": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/kwallet-pam-6.1.5.tar.xz",
|
||||
"hash": "sha256-swysTx4mY3dlR5U6YhCTcdX5tDRKjfkgeILx4d3koD8="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/kwallet-pam-6.2.0.tar.xz",
|
||||
"hash": "sha256-WB2stm4jqtsUVo0Dr8fgEq2QkpInexkti2jsHNQnue0="
|
||||
},
|
||||
"kwayland": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/kwayland-6.1.5.tar.xz",
|
||||
"hash": "sha256-Z6PhVzC9o2Bz8wQivcIa7ie/IF++7BorgCDJ0al/jak="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/kwayland-6.2.0.tar.xz",
|
||||
"hash": "sha256-f/4MKx+CMVtiJsUM+3UuZzjldvv3C3KW0XF7PYYiYkQ="
|
||||
},
|
||||
"kwayland-integration": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/kwayland-integration-6.1.5.tar.xz",
|
||||
"hash": "sha256-I8YQID8b+qzMgnGOYK2qMz4x3UKDfU6E3/DPgOYUxog="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/kwayland-integration-6.2.0.tar.xz",
|
||||
"hash": "sha256-aue6XsXwZfNmA8BhI0HdvQ2URbcvxvumtiy+3NT6n/A="
|
||||
},
|
||||
"kwin": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/kwin-6.1.5.tar.xz",
|
||||
"hash": "sha256-ugqs4yMZW1itv94U7HTN1MKMIR14pWfESvcPM23Ks/c="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/kwin-6.2.0.tar.xz",
|
||||
"hash": "sha256-iuiFLkjAQulvmOdqi2f36U8dYBk5M2+6f424tDvy/Lo="
|
||||
},
|
||||
"kwrited": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/kwrited-6.1.5.tar.xz",
|
||||
"hash": "sha256-oFnd8o7Oi0OYml6ofkR/o/Ajea7HmKHefLWaWqoqlhg="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/kwrited-6.2.0.tar.xz",
|
||||
"hash": "sha256-S0iQY3ApuNsF/4DjIl2NjXipW7RIAqpG1SauJ4T1YCk="
|
||||
},
|
||||
"layer-shell-qt": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/layer-shell-qt-6.1.5.tar.xz",
|
||||
"hash": "sha256-0Ry1X3XW64kE5IzQloVwQ6bamQCxw0t6xXFubkbw7TI="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/layer-shell-qt-6.2.0.tar.xz",
|
||||
"hash": "sha256-U5DReOf2UW1pHtqoX86cvM/gYM6lc6vGULtAZoeOsv4="
|
||||
},
|
||||
"libkscreen": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/libkscreen-6.1.5.tar.xz",
|
||||
"hash": "sha256-WPUjqd/gely5dY1g9qfxyfQBICifg1UVpOLY1tbaTGU="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/libkscreen-6.2.0.tar.xz",
|
||||
"hash": "sha256-tgGHOEWwUEaQ0hJIWRwa0qmbvONdvqx0fFdcwyHE1IU="
|
||||
},
|
||||
"libksysguard": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/libksysguard-6.1.5.tar.xz",
|
||||
"hash": "sha256-rQH6LGZPgs4kt9YXvBmUIGN2Nz+b1krjE7Mof9WKArk="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/libksysguard-6.2.0.tar.xz",
|
||||
"hash": "sha256-AoapDQrhqFbv7AXNOjS2lfslIaO1tWry2QDBmVAigng="
|
||||
},
|
||||
"libplasma": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/libplasma-6.1.5.tar.xz",
|
||||
"hash": "sha256-d8K4Ot5pmawOUmmk6HKEQ6fWGUbWjQu0EQarQpKnnMk="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/libplasma-6.2.0.tar.xz",
|
||||
"hash": "sha256-dWocsBUTygSQagecwoAtym9PYQ8xkmGRmz1eJb1P2pg="
|
||||
},
|
||||
"milou": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/milou-6.1.5.tar.xz",
|
||||
"hash": "sha256-QFFIoS7n/siTiPmbxUhVB1SMhRLeIroDAlFURCc1OQo="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/milou-6.2.0.tar.xz",
|
||||
"hash": "sha256-sfG04T+0BHZTGzpj52aiPvd5TeG4YgJCtMUatEX5scU="
|
||||
},
|
||||
"ocean-sound-theme": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/ocean-sound-theme-6.1.5.tar.xz",
|
||||
"hash": "sha256-ro+lnDo8PTekOOOrXtEcwAjqBFAZU3cL2euTJwBRKTU="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/ocean-sound-theme-6.2.0.tar.xz",
|
||||
"hash": "sha256-nfu3FnlbjGBdQJkqCznrKny5w+x9P1KROZEBiHJUM4M="
|
||||
},
|
||||
"oxygen": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/oxygen-6.1.5.tar.xz",
|
||||
"hash": "sha256-B0HWside8AtZPvXjHKJniZ1zvD8W0TLJKkLnZ+wCVzU="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/oxygen-6.2.0.tar.xz",
|
||||
"hash": "sha256-6CrJmGQZ7b/Y6ms+ganF3UajbtPNlCp002RLY2Xsy2A="
|
||||
},
|
||||
"oxygen-sounds": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/oxygen-sounds-6.1.5.tar.xz",
|
||||
"hash": "sha256-ZpCkniLRWmpogrh/clqdo7xJYXe4mjlSsBVVqYu0RqU="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/oxygen-sounds-6.2.0.tar.xz",
|
||||
"hash": "sha256-POFicpHQBgUEaRQVcY8rrpc/N85X3kjoGjcnV84IEqE="
|
||||
},
|
||||
"plasma5support": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/plasma5support-6.1.5.tar.xz",
|
||||
"hash": "sha256-BWNYUiLFMz4iee/agpw2oTl0HJ4M86024+gJaEDAF9E="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/plasma5support-6.2.0.tar.xz",
|
||||
"hash": "sha256-RutPXZQHfEbCS0lLuuLldJtbX3zB227ykjuBEq5q5Y0="
|
||||
},
|
||||
"plasma-activities": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/plasma-activities-6.1.5.tar.xz",
|
||||
"hash": "sha256-s1P7564w9qBO9PgdPgJQZUoPmFmp70MhTInHi5JOKEs="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/plasma-activities-6.2.0.tar.xz",
|
||||
"hash": "sha256-Ks6SrGSy6jGLBQNF1RSgOsD5D6JlhogsHZtBZv4A8tc="
|
||||
},
|
||||
"plasma-activities-stats": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/plasma-activities-stats-6.1.5.tar.xz",
|
||||
"hash": "sha256-JiBQpTiU3gbxND+x1QtuAPeXo+NJMW7d/re1Fs3cDd8="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/plasma-activities-stats-6.2.0.tar.xz",
|
||||
"hash": "sha256-IV13KFN7iQofMZ8TyqYDjALcTj5k2Zz0DOCPyC9GXf0="
|
||||
},
|
||||
"plasma-browser-integration": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/plasma-browser-integration-6.1.5.tar.xz",
|
||||
"hash": "sha256-Q2JcNeo57uvtesyXWazGCHGrwdK4jcnnuQivpMAJiqo="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/plasma-browser-integration-6.2.0.tar.xz",
|
||||
"hash": "sha256-kdWWz9iRtEwQxd14YuLJWs2nUm/pqfAY6UaDbBdFCmg="
|
||||
},
|
||||
"plasma-desktop": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/plasma-desktop-6.1.5.tar.xz",
|
||||
"hash": "sha256-2eI2yamjMti3tO3eRMZdCw7Djqda3Fu/ohpsTH9CYcI="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/plasma-desktop-6.2.0.tar.xz",
|
||||
"hash": "sha256-DqOOILnEFjhX25IOqAyXQKKeVhiGtf658g+ThZhpJwk="
|
||||
},
|
||||
"plasma-dialer": {
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/plasma-dialer-6.2.0.tar.xz",
|
||||
"hash": "sha256-72JH0C2xAyJSHlLnHpyUKR8Hq92vFvCEYTyN0298qs4="
|
||||
},
|
||||
"plasma-disks": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/plasma-disks-6.1.5.tar.xz",
|
||||
"hash": "sha256-XXZpwBnovmaLmF1z1/D9sxWYSpCsewzx45ibgJRubEo="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/plasma-disks-6.2.0.tar.xz",
|
||||
"hash": "sha256-WB+6e5c5eFNELpID4CzF/mAHofbWAgvTODdR16cNK6E="
|
||||
},
|
||||
"plasma-firewall": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/plasma-firewall-6.1.5.tar.xz",
|
||||
"hash": "sha256-TtMb3Y8CEScpR1GM8uvqVHu8RLfPxvbz50fsyRi0r0I="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/plasma-firewall-6.2.0.tar.xz",
|
||||
"hash": "sha256-Wf0FeabJkT+XRm675WKwDCe1kNnDh0wjnIpR/mGQPmU="
|
||||
},
|
||||
"plasma-integration": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/plasma-integration-6.1.5.tar.xz",
|
||||
"hash": "sha256-FatL93CRJOxP54QiggkByO+3+7kiRVdr5XyEdIKl7Js="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/plasma-integration-6.2.0.tar.xz",
|
||||
"hash": "sha256-3NEKDIQYUk5mxup7+6TeTU8gRp20cLQaUK4g41npt2g="
|
||||
},
|
||||
"plasma-mobile": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/plasma-mobile-6.1.5.tar.xz",
|
||||
"hash": "sha256-z1vUSN34Lfw6Zh4I6va0al5wa+yzDuwYfppXTokILa0="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/plasma-mobile-6.2.0.tar.xz",
|
||||
"hash": "sha256-9ZPYZEUL+xB5YFwXI7KC5AFc+3eg6zN2SIx3DwS3nUg="
|
||||
},
|
||||
"plasma-nano": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/plasma-nano-6.1.5.tar.xz",
|
||||
"hash": "sha256-weZFmXGZ/l4kn7JKA4kkhlcL3kgVPVLUkDQ58wlLosY="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/plasma-nano-6.2.0.tar.xz",
|
||||
"hash": "sha256-Kt3NB/z3yoYx+uK5sImgH4t7WcBGLOQNGyvnu57vvTg="
|
||||
},
|
||||
"plasma-nm": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/plasma-nm-6.1.5.tar.xz",
|
||||
"hash": "sha256-ywTdrwDXKOoLS10QizOJ1GLOUHhyb4tlXzjeMw7rIfU="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/plasma-nm-6.2.0.tar.xz",
|
||||
"hash": "sha256-znIAir8XVV0bIPZkgP8hmSp8RLJs8FahM/0tLudCHnU="
|
||||
},
|
||||
"plasma-pa": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/plasma-pa-6.1.5.tar.xz",
|
||||
"hash": "sha256-ckwFkdvr3l+WxBYxbJAOiPSmbXSJBe0cp05hUjV6dZE="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/plasma-pa-6.2.0.tar.xz",
|
||||
"hash": "sha256-imSTF32dgj90f+kXrMO8hZxhxP6dOt15mrfxlDTZmSA="
|
||||
},
|
||||
"plasma-sdk": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/plasma-sdk-6.1.5.tar.xz",
|
||||
"hash": "sha256-jQ1OheR9KCSblR88mX9ghVoQyt7Ze+o0FAc5flUbjEY="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/plasma-sdk-6.2.0.tar.xz",
|
||||
"hash": "sha256-2KGwAi0WA19xOTqjXoFrweLW3DuxrXaUg9RYnot4whY="
|
||||
},
|
||||
"plasma-systemmonitor": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/plasma-systemmonitor-6.1.5.tar.xz",
|
||||
"hash": "sha256-C17szwR1FiWfcgXBQ4FC1KglLq3gC7hhtm1IMbsDpwQ="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/plasma-systemmonitor-6.2.0.tar.xz",
|
||||
"hash": "sha256-lZg9xBp/JffAv+gYUse4CPIX1ti+u10UC9QgWFloWhc="
|
||||
},
|
||||
"plasma-thunderbolt": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/plasma-thunderbolt-6.1.5.tar.xz",
|
||||
"hash": "sha256-lAKt8+6u1MXvynGXVbWfLShk2prV/YHSKzqPX9bjrmA="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/plasma-thunderbolt-6.2.0.tar.xz",
|
||||
"hash": "sha256-HNx2MAPiAReOUm9Iww32UPN6i04BbSWl6YObvOlNzjo="
|
||||
},
|
||||
"plasma-vault": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/plasma-vault-6.1.5.tar.xz",
|
||||
"hash": "sha256-ULE1v9sVmUd0QSJ4hwn4kSp2Ew0pIOqXdc5AL3p9xAQ="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/plasma-vault-6.2.0.tar.xz",
|
||||
"hash": "sha256-wfA9G2uP3zkYeQ9glmToD4ug+KxJ/uThU8uHhebdJ5c="
|
||||
},
|
||||
"plasma-welcome": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/plasma-welcome-6.1.5.tar.xz",
|
||||
"hash": "sha256-Euzp59YcPsaiP+k1dmdBbiaAKrr9xp8kXMPZagXvnZY="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/plasma-welcome-6.2.0.tar.xz",
|
||||
"hash": "sha256-Z4JAbVZDdFlT3oKxsfWKRKb4VMLX4NZ10DfmM3f1UtU="
|
||||
},
|
||||
"plasma-workspace": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/plasma-workspace-6.1.5.tar.xz",
|
||||
"hash": "sha256-wp4Vo+1CRG+Ze34WlYZPhev/CE4uzlgckUoNio4mWuc="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/plasma-workspace-6.2.0.tar.xz",
|
||||
"hash": "sha256-LUJoy651djG+V9adNPwCyNAgR2JRU3DJZ57LKqKv3zM="
|
||||
},
|
||||
"plasma-workspace-wallpapers": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/plasma-workspace-wallpapers-6.1.5.tar.xz",
|
||||
"hash": "sha256-qOpCuZslRm1S0/5Vcsn7w4cJvxNwVEiOk3+HDzNU7gI="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/plasma-workspace-wallpapers-6.2.0.tar.xz",
|
||||
"hash": "sha256-gkGYLJjEMRAafDOVjPIbn3BjsNsR8GZjpyMl9QEPnAE="
|
||||
},
|
||||
"plymouth-kcm": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/plymouth-kcm-6.1.5.tar.xz",
|
||||
"hash": "sha256-Bz4D+KhROOBdiGcqXB4GIjjjSz3t5BGPKRHCAMBVWHU="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/plymouth-kcm-6.2.0.tar.xz",
|
||||
"hash": "sha256-+iOqC1pu73bLS1o0mgJ/LmahOyLi2/Wyv8erqwp48a4="
|
||||
},
|
||||
"polkit-kde-agent-1": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/polkit-kde-agent-1-6.1.5.tar.xz",
|
||||
"hash": "sha256-CWXl/61DKj5u6eNVQO/Le0CDIApIxp2R5SXAmke5IPY="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/polkit-kde-agent-1-6.2.0.tar.xz",
|
||||
"hash": "sha256-xmUMV95OHVnMUUjtsrjX8XpmwgeFYT7DBTUXSnttyxA="
|
||||
},
|
||||
"powerdevil": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/powerdevil-6.1.5.tar.xz",
|
||||
"hash": "sha256-BQ4cb88H2izXv+IqYYqpFQS7KwC9MapoEhuQPN6dhF0="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/powerdevil-6.2.0.tar.xz",
|
||||
"hash": "sha256-g8H9VRF3V6i0xEUqLzBH2PQqzFTzfsBFBloo2SZBecI="
|
||||
},
|
||||
"print-manager": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/print-manager-6.1.5.tar.xz",
|
||||
"hash": "sha256-pJRE4WoHlZUxU2UlF8ZlcamYujjc2IYWa4gjHpbIzhI="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/print-manager-6.2.0.tar.xz",
|
||||
"hash": "sha256-jIJw8gzMzpSxOpWDDSenIwNT5dj49SSfZ7eMg2Ey+M0="
|
||||
},
|
||||
"qqc2-breeze-style": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/qqc2-breeze-style-6.1.5.tar.xz",
|
||||
"hash": "sha256-a0tsDwiy7OO12hyJ3mzhBiHY4mt/q+2/YBA6XyyK+EU="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/qqc2-breeze-style-6.2.0.tar.xz",
|
||||
"hash": "sha256-EZf7M1ZWzIWpkpTpWi8B9DaI7d9UWNqSoUTnthgrVJg="
|
||||
},
|
||||
"sddm-kcm": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/sddm-kcm-6.1.5.tar.xz",
|
||||
"hash": "sha256-AJI1F003IHnuOq31HgvX2ho4LRhSrmWwuWcQsiZpjpw="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/sddm-kcm-6.2.0.tar.xz",
|
||||
"hash": "sha256-1cbMmMGQeJ0biG26gUA5ZYjq1hJTQc9SMa35WmNohR8="
|
||||
},
|
||||
"spacebar": {
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/spacebar-6.2.0.tar.xz",
|
||||
"hash": "sha256-ImSDTUR5JxmDsCQ2xls8GlLJf5jxBkD2g4mue5zqHYc="
|
||||
},
|
||||
"systemsettings": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/systemsettings-6.1.5.tar.xz",
|
||||
"hash": "sha256-B0J66nzuCzSrzD732q8D1ivfcgXKP5ccjT+u3AunT9c="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/systemsettings-6.2.0.tar.xz",
|
||||
"hash": "sha256-a0Z17dRxf3yojRdwBpbDiHP/RrP5Bj7Pp8wgfrBOuuA="
|
||||
},
|
||||
"wacomtablet": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/wacomtablet-6.1.5.tar.xz",
|
||||
"hash": "sha256-IerMb3eC/fnKcYndlP2OyRAzAs9gWY91chY18N8MREo="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/wacomtablet-6.2.0.tar.xz",
|
||||
"hash": "sha256-ml2fa6NyQ5BNTL+RyHSTsgV2vr0linXB9mCTs3YuXeM="
|
||||
},
|
||||
"xdg-desktop-portal-kde": {
|
||||
"version": "6.1.5",
|
||||
"url": "mirror://kde/stable/plasma/6.1.5/xdg-desktop-portal-kde-6.1.5.tar.xz",
|
||||
"hash": "sha256-CdE8DAb93AgySdH1vpB+Jx6jnwH1d9N9JnQ7Ad9aaXg="
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/plasma/6.2.0/xdg-desktop-portal-kde-6.2.0.tar.xz",
|
||||
"hash": "sha256-gAaExbvNvUHbyL/LqO2ponoNufD3IJnRgkb7eUB2T/w="
|
||||
}
|
||||
}
|
||||
@@ -7,11 +7,11 @@
|
||||
}:
|
||||
mkKdeDerivation rec {
|
||||
pname = "pulseaudio-qt";
|
||||
version = "1.5.0";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/pulseaudio-qt/pulseaudio-qt-${version}.tar.xz";
|
||||
hash = "sha256-zY9RyHAAc9D9kNV4QIOs63PnK6mnBOYF4KZ5CUJqhSA=";
|
||||
hash = "sha256-G+y62ss2qdakMaDJPNtCj49n83zy0jdoZ1mDMYwK3oQ=";
|
||||
};
|
||||
|
||||
extraNativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@@ -40,6 +40,7 @@
|
||||
plasma-activities-stats = callPackage ./plasma-activities-stats { };
|
||||
plasma-browser-integration = callPackage ./plasma-browser-integration { };
|
||||
plasma-desktop = callPackage ./plasma-desktop { };
|
||||
plasma-dialer = callPackage ./plasma-dialer { };
|
||||
plasma-disks = callPackage ./plasma-disks { };
|
||||
plasma-firewall = callPackage ./plasma-firewall { };
|
||||
plasma-integration = callPackage ./plasma-integration { };
|
||||
@@ -61,6 +62,7 @@
|
||||
print-manager = callPackage ./print-manager { };
|
||||
qqc2-breeze-style = callPackage ./qqc2-breeze-style { };
|
||||
sddm-kcm = callPackage ./sddm-kcm { };
|
||||
spacebar = callPackage ./spacebar { };
|
||||
systemsettings = callPackage ./systemsettings { };
|
||||
wacomtablet = callPackage ./wacomtablet { };
|
||||
xdg-desktop-portal-kde = callPackage ./xdg-desktop-portal-kde { };
|
||||
|
||||
@@ -9,6 +9,12 @@
|
||||
mkKdeDerivation {
|
||||
pname = "discover";
|
||||
|
||||
patches = [
|
||||
# remove forced QML dependency check
|
||||
# FIXME: fix the check in ECM instead
|
||||
./qml-deps.patch
|
||||
];
|
||||
|
||||
extraNativeBuildInputs = [ pkg-config ];
|
||||
extraBuildInputs = [
|
||||
qtwebview
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 04523c97d..945ba6a41 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -59,7 +59,7 @@ find_package(QCoro6 REQUIRED COMPONENTS Core)
|
||||
|
||||
qcoro_enable_coroutines()
|
||||
|
||||
-ecm_find_qmlmodule(org.kde.kitemmodels 1.0 REQUIRED)
|
||||
+ecm_find_qmlmodule(org.kde.kitemmodels 1.0)
|
||||
|
||||
list(APPEND CMAKE_AUTOMOC_MACRO_NAMES "DISCOVER_BACKEND_PLUGIN")
|
||||
|
||||
@@ -1,28 +1,44 @@
|
||||
diff --git a/src/data/debuggers/internal/gdbrc b/src/data/debuggers/internal/gdbrc
|
||||
index 0d163d43..8e2f85f1 100644
|
||||
--- a/src/data/debuggers/internal/gdbrc
|
||||
+++ b/src/data/debuggers/internal/gdbrc
|
||||
@@ -73,17 +73,18 @@ Name[wa]=gdb
|
||||
Name[x-test]=xxgdbxx
|
||||
Name[zh_CN]=gdb
|
||||
Name[zh_TW]=gdb
|
||||
-TryExec=gdb
|
||||
+TryExec=@gdb@
|
||||
+CodeName=gdb
|
||||
Backends=KCrash|coredump-core
|
||||
diff --git a/src/debugger.cpp b/src/debugger.cpp
|
||||
index 946bdd12..afb69e35 100644
|
||||
--- a/src/debugger.cpp
|
||||
+++ b/src/debugger.cpp
|
||||
@@ -36,15 +36,15 @@ QList<Debugger> Debugger::availableInternalDebuggers(const QString &backend)
|
||||
result.push_back(std::make_shared<Data>(
|
||||
Data{.displayName = i18nc("@label the debugger called GDB", "GDB"),
|
||||
.codeName = u"gdb"_s,
|
||||
- .tryExec = u"gdb"_s,
|
||||
+ .tryExec = u"@gdb@"_s,
|
||||
.backendData =
|
||||
- BackendData{.command = u"gdb -nw -n -batch -x %preamblefile -x %tempfile -p %pid %execpath"_s,
|
||||
+ BackendData{.command = u"@gdb@ -nw -n -batch -x %preamblefile -x %tempfile -p %pid %execpath"_s,
|
||||
.supportsCommandWithSymbolResolution = true,
|
||||
.commandWithSymbolResolution =
|
||||
- u"gdb -nw -n -batch --init-eval-command='set debuginfod enabled on' -x %preamblefile -x %tempfile -p %pid %execpath"_s,
|
||||
+ u"@gdb@ -nw -n -batch --init-eval-command='set debuginfod enabled on' -x %preamblefile -x %tempfile -p %pid %execpath"_s,
|
||||
.backtraceBatchCommands = u"thread\nthread apply all bt"_s,
|
||||
.preambleCommands = expandCommand(
|
||||
- u"gdb"_s,
|
||||
+ u"@gdb@"_s,
|
||||
u"set width 200\nset backtrace limit 128\nsource %drkonqi_datadir/python/gdb_preamble/preamble.py\npy print_preamble()"_s),
|
||||
.execInputFile = {}}}));
|
||||
|
||||
[KCrash]
|
||||
-Exec=gdb -nw -n -batch -x %preamblefile -x %tempfile -p %pid %execpath
|
||||
-ExecWithSymbolResolution=gdb -nw -n -batch --init-eval-command='set debuginfod enabled on' -x %preamblefile -x %tempfile -p %pid %execpath
|
||||
+Exec=@gdb@ -nw -n -batch -x %preamblefile -x %tempfile -p %pid %execpath
|
||||
+ExecWithSymbolResolution=@gdb@ -nw -n -batch --init-eval-command='set debuginfod enabled on' -x %preamblefile -x %tempfile -p %pid %execpath
|
||||
PreambleCommands=set width 200\nset backtrace limit 128\nsource %drkonqi_datadir/python/gdb_preamble/preamble.py\npy print_preamble()
|
||||
BatchCommands=thread\nthread apply all bt
|
||||
|
||||
[coredump-core]
|
||||
-Exec=gdb --nw --nx --batch --command=%preamblefile --command=%tempfile --core=%corefile %execpath
|
||||
-ExecWithSymbolResolution=gdb --nw --nx --batch --init-eval-command='set debuginfod enabled on' --command=%preamblefile --command=%tempfile --core=%corefile %execpath
|
||||
+Exec=@gdb@ --nw --nx --batch --command=%preamblefile --command=%tempfile --core=%corefile %execpath
|
||||
+ExecWithSymbolResolution=@gdb@ --nw --nx --batch --init-eval-command='set debuginfod enabled on' --command=%preamblefile --command=%tempfile --core=%corefile %execpath
|
||||
PreambleCommands=set width 200\nset backtrace limit 128\nsource %drkonqi_datadir/python/gdb_preamble/preamble.py\npy print_preamble()
|
||||
BatchCommands=thread\nthread apply all bt
|
||||
@@ -63,15 +63,15 @@ QList<Debugger> Debugger::availableInternalDebuggers(const QString &backend)
|
||||
Data{
|
||||
.displayName = i18nc("@label the debugger called GDB", "GDB"),
|
||||
.codeName = u"gdb"_s,
|
||||
- .tryExec = u"gdb"_s,
|
||||
+ .tryExec = u"@gdb@"_s,
|
||||
.backendData = BackendData{
|
||||
- .command = u"gdb --nw --nx --batch --command=%preamblefile --command=%tempfile --core=%corefile %execpath"_s,
|
||||
+ .command = u"@gdb@ --nw --nx --batch --command=%preamblefile --command=%tempfile --core=%corefile %execpath"_s,
|
||||
.supportsCommandWithSymbolResolution = true,
|
||||
.commandWithSymbolResolution =
|
||||
- u"gdb --nw --nx --batch --init-eval-command='set debuginfod enabled on' --command=%preamblefile --command=%tempfile --core=%corefile %execpath"_s,
|
||||
+ u"@gdb@ --nw --nx --batch --init-eval-command='set debuginfod enabled on' --command=%preamblefile --command=%tempfile --core=%corefile %execpath"_s,
|
||||
.backtraceBatchCommands = u"thread\nthread apply all bt"_s,
|
||||
.preambleCommands = expandCommand(
|
||||
- u"gdb"_s,
|
||||
+ u"@gdb@"_s,
|
||||
u"set width 200\nset backtrace limit 128\nsource %drkonqi_datadir/python/gdb_preamble/preamble.py\npy print_preamble()"_s),
|
||||
.execInputFile = {}}}));
|
||||
}
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
libinput,
|
||||
xorg,
|
||||
xwayland,
|
||||
libcanberra,
|
||||
libdisplay-info,
|
||||
libei,
|
||||
mesa,
|
||||
lcms2,
|
||||
libcap,
|
||||
pipewire,
|
||||
krunner,
|
||||
python3,
|
||||
@@ -56,7 +56,7 @@ mkKdeDerivation {
|
||||
|
||||
mesa # libgbm
|
||||
lcms2
|
||||
libcap
|
||||
libcanberra
|
||||
libdisplay-info
|
||||
libei
|
||||
libinput
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
{
|
||||
mkKdeDerivation,
|
||||
pkg-config,
|
||||
qtwayland,
|
||||
callaudiod,
|
||||
libphonenumber,
|
||||
protobuf,
|
||||
}:
|
||||
mkKdeDerivation {
|
||||
pname = "plasma-dialer";
|
||||
|
||||
extraNativeBuildInputs = [ pkg-config ];
|
||||
extraBuildInputs = [
|
||||
qtwayland
|
||||
callaudiod
|
||||
libphonenumber
|
||||
protobuf
|
||||
];
|
||||
|
||||
extraCmakeFlags = [
|
||||
"-DQtWaylandScanner_EXECUTABLE=${qtwayland}/libexec/qtwaylandscanner"
|
||||
];
|
||||
}
|
||||
@@ -7,6 +7,7 @@
|
||||
lsof,
|
||||
pkg-config,
|
||||
spirv-tools,
|
||||
qtpositioning,
|
||||
qtsvg,
|
||||
qtwayland,
|
||||
libcanberra,
|
||||
@@ -41,6 +42,7 @@ mkKdeDerivation {
|
||||
spirv-tools
|
||||
];
|
||||
extraBuildInputs = [
|
||||
qtpositioning
|
||||
qtsvg
|
||||
qtwayland
|
||||
|
||||
@@ -61,7 +63,7 @@ mkKdeDerivation {
|
||||
# Hardcoded as QStrings, which are UTF-16 so Nix can't pick these up automatically
|
||||
postFixup = ''
|
||||
mkdir -p $out/nix-support
|
||||
echo "${lsof} ${xorg.xmessage} ${xorg.xsetroot}" > $out/nix-support/depends
|
||||
echo "${lsof} ${xorg.xmessage} ${xorg.xrdb} ${xorg.xsetroot}" > $out/nix-support/depends
|
||||
'';
|
||||
|
||||
passthru.providedSessions = [
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/applets/devicenotifier/plugin/ksolidnotify.cpp b/applets/devicenotifier/plugin/ksolidnotify.cpp
|
||||
index bcbb58a034..be2570ce97 100644
|
||||
--- a/applets/devicenotifier/plugin/ksolidnotify.cpp
|
||||
+++ b/applets/devicenotifier/plugin/ksolidnotify.cpp
|
||||
@@ -169,7 +169,7 @@ void KSolidNotify::queryBlockingApps(const QString &devicePath)
|
||||
diff --git a/applets/devicenotifier/plugin/deviceerrormonitor_p.cpp b/applets/devicenotifier/plugin/deviceerrormonitor_p.cpp
|
||||
index 7e0c48a00e..fdc8b009f4 100644
|
||||
--- a/applets/devicenotifier/plugin/deviceerrormonitor_p.cpp
|
||||
+++ b/applets/devicenotifier/plugin/deviceerrormonitor_p.cpp
|
||||
@@ -155,7 +155,7 @@ void DeviceErrorMonitor::queryBlockingApps(const QString &devicePath)
|
||||
Q_EMIT blockingAppsReady(blockApps);
|
||||
p->deleteLater();
|
||||
});
|
||||
@@ -25,37 +25,37 @@ index e27e21a7bd..abbf7f32e1 100644
|
||||
p.write(input);
|
||||
p.closeWriteChannel();
|
||||
diff --git a/kcms/fonts/fonts.cpp b/kcms/fonts/fonts.cpp
|
||||
index 92d8fadd44..2a973d76ef 100644
|
||||
index a75f313880..a1e649c1f6 100644
|
||||
--- a/kcms/fonts/fonts.cpp
|
||||
+++ b/kcms/fonts/fonts.cpp
|
||||
@@ -135,7 +135,7 @@ void KFonts::save()
|
||||
@@ -137,7 +137,7 @@ void KFonts::save()
|
||||
if (fontsAASettings()->forceFontDPI() == 0 && forceFontDPIChanged && KWindowSystem::isPlatformX11()) {
|
||||
QProcess proc;
|
||||
proc.setProcessChannelMode(QProcess::ForwardedChannels);
|
||||
- proc.start("xrdb",
|
||||
+ proc.start("@xrdb@",
|
||||
QStringList() << "-quiet"
|
||||
<< "-remove"
|
||||
<< "-nocpp");
|
||||
- proc.start(u"xrdb"_s, QStringList{u"-quiet"_s, u"-remove"_s, u"-nocpp"_s});
|
||||
+ proc.start(u"@xrdb@"_s, QStringList{u"-quiet"_s, u"-remove"_s, u"-nocpp"_s});
|
||||
if (proc.waitForStarted()) {
|
||||
proc.write("Xft.dpi\n");
|
||||
proc.closeWriteChannel();
|
||||
diff --git a/kcms/kfontinst/kcmfontinst/FcQuery.cpp b/kcms/kfontinst/kcmfontinst/FcQuery.cpp
|
||||
index 771c790c74..1be64b0527 100644
|
||||
index f5034455c9..8ea57813a1 100644
|
||||
--- a/kcms/kfontinst/kcmfontinst/FcQuery.cpp
|
||||
+++ b/kcms/kfontinst/kcmfontinst/FcQuery.cpp
|
||||
@@ -44,7 +44,7 @@ void CFcQuery::run(const QString &query)
|
||||
@@ -46,7 +46,7 @@ void CFcQuery::run(const QString &query)
|
||||
connect(m_proc, SIGNAL(finished(int, QProcess::ExitStatus)), SLOT(procExited()));
|
||||
connect(m_proc, &QProcess::readyReadStandardOutput, this, &CFcQuery::data);
|
||||
|
||||
- m_proc->start("fc-match", args);
|
||||
+ m_proc->start("@fc-match@", args);
|
||||
- m_proc->start(u"fc-match"_s, args);
|
||||
+ m_proc->start(u"@fc-match@"_s, args);
|
||||
}
|
||||
|
||||
void CFcQuery::procExited()
|
||||
diff --git a/kcms/krdb/krdb.cpp b/kcms/krdb/krdb.cpp
|
||||
index 8fdd99f9ed..1bd7d552a5 100644
|
||||
index eefa0d36a0..76afd0c418 100644
|
||||
--- a/kcms/krdb/krdb.cpp
|
||||
+++ b/kcms/krdb/krdb.cpp
|
||||
@@ -423,7 +423,7 @@ void runRdb(unsigned int flags)
|
||||
contents += "Xft.dpi: " + QString::number(dpi) + '\n';
|
||||
contents += "Xft.dpi: "_L1 + QString::number(dpi) + u'\n';
|
||||
else {
|
||||
KProcess queryProc;
|
||||
- queryProc << QStringLiteral("xrdb") << QStringLiteral("-query");
|
||||
@@ -72,17 +72,15 @@ index 8fdd99f9ed..1bd7d552a5 100644
|
||||
loadProc.start();
|
||||
if (loadProc.waitForStarted()) {
|
||||
loadProc.write(db);
|
||||
@@ -461,16 +461,16 @@ void runRdb(unsigned int flags)
|
||||
@@ -461,14 +461,14 @@ void runRdb(unsigned int flags)
|
||||
|
||||
KProcess proc;
|
||||
#ifndef NDEBUG
|
||||
- proc << QStringLiteral("xrdb") << QStringLiteral("-merge") << tmpFile.fileName();
|
||||
+ proc << QStringLiteral("@xrdb@") << QStringLiteral("-merge") << tmpFile.fileName();
|
||||
#else
|
||||
- proc << "xrdb"
|
||||
+ proc << "@xrdb@"
|
||||
<< "-quiet"
|
||||
<< "-merge" << tmpFile.fileName();
|
||||
- proc << u"xrdb"_s << u"-quiet"_s << u"-merge"_s << tmpFile.fileName();
|
||||
+ proc << u"@xrdb@"_s << u"-quiet"_s << u"-merge"_s << tmpFile.fileName();
|
||||
#endif
|
||||
proc.execute();
|
||||
|
||||
@@ -115,7 +113,7 @@ index 7218628ce9..9126475ea4 100644
|
||||
+ExecStart=@qdbus@ org.kde.kcminit /kcminit org.kde.KCMInit.runPhase1
|
||||
Slice=session.slice
|
||||
diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
|
||||
index 0bd4511189..602b7e9eb0 100644
|
||||
index 4d31c6f408..17418b1ff7 100644
|
||||
--- a/startkde/startplasma.cpp
|
||||
+++ b/startkde/startplasma.cpp
|
||||
@@ -57,7 +57,7 @@ void sigtermHandler(int signalNumber)
|
||||
@@ -127,7 +125,7 @@ index 0bd4511189..602b7e9eb0 100644
|
||||
}
|
||||
|
||||
QStringList allServices(const QLatin1String &prefix)
|
||||
@@ -507,7 +507,7 @@ QProcess *setupKSplash()
|
||||
@@ -512,7 +512,7 @@ QProcess *setupKSplash()
|
||||
if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) {
|
||||
p = new QProcess;
|
||||
p->setProcessChannelMode(QProcess::ForwardedChannels);
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{
|
||||
mkKdeDerivation,
|
||||
pkg-config,
|
||||
libcap,
|
||||
qtwayland,
|
||||
}:
|
||||
mkKdeDerivation {
|
||||
pname = "powerdevil";
|
||||
|
||||
extraNativeBuildInputs = [ pkg-config ];
|
||||
extraBuildInputs = [ libcap ];
|
||||
extraBuildInputs = [ qtwayland ];
|
||||
}
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
{
|
||||
mkKdeDerivation,
|
||||
pkg-config,
|
||||
c-ares,
|
||||
curl,
|
||||
libphonenumber,
|
||||
protobuf,
|
||||
}:
|
||||
mkKdeDerivation {
|
||||
pname = "spacebar";
|
||||
|
||||
extraNativeBuildInputs = [ pkg-config ];
|
||||
extraBuildInputs = [
|
||||
c-ares
|
||||
curl
|
||||
libphonenumber
|
||||
protobuf
|
||||
];
|
||||
}
|
||||
@@ -7,12 +7,12 @@ let
|
||||
# kernel config in the xanmod version commit
|
||||
variants = {
|
||||
lts = {
|
||||
version = "6.6.52";
|
||||
hash = "sha256-bTsxESXY0uhx9/UjUg9cATC1ErfkxF1gH8TXimYVzX4=";
|
||||
version = "6.6.54";
|
||||
hash = "sha256-i6Rm0Qasgxpw9XcK938IJ+qZ+V2z82zpuly2Au2J18Q=";
|
||||
};
|
||||
main = {
|
||||
version = "6.10.11";
|
||||
hash = "sha256-FDWFpiN0VvzdXcS3nZHm1HFgASazNX5+pL/8UJ3hkI8=";
|
||||
version = "6.11.2";
|
||||
hash = "sha256-4BXPZs8lp/O/JGWFIO/J1HyOjByaqWQ9O6/jx76TIDs=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchurl, makeWrapper, unzip, python3, unar, ffmpeg, nixosTests }:
|
||||
{ stdenv, lib, fetchzip, makeWrapper, python3, unar, ffmpeg, nixosTests }:
|
||||
|
||||
let
|
||||
runtimeProgDeps = [
|
||||
@@ -10,14 +10,13 @@ stdenv.mkDerivation rec {
|
||||
pname = "bazarr";
|
||||
version = "1.4.4";
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
src = fetchurl {
|
||||
src = fetchzip {
|
||||
url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip";
|
||||
sha256 = "sha256-YVg9pHk7KB4FjtmsFV4INSIKdLFiHHN8FHxeVDz2SlU=";
|
||||
hash = "sha256-FZKGHC7CLzIzOXH77iHwSb9+Mw1z+kiz+1rLO6XU/94=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
buildInputs = [
|
||||
(python3.withPackages (ps: [
|
||||
|
||||
@@ -5,23 +5,28 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "octosuite";
|
||||
version = "3.1.0";
|
||||
format = "setuptools";
|
||||
version = "3.1.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bellingcat";
|
||||
repo = "octosuite";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-C73txVtyWTcIrJSApBy4uIKDcuUq0HZrGM6dqDVLkKY=";
|
||||
hash = "sha256-bgTAGIJbxOa8q8lMsWa8dHwNZ/jXiWGQOp921sd2Vdo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# pyreadline3 is Windows-only
|
||||
substituteInPlace setup.py \
|
||||
--replace ', "pyreadline3"' ""
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail '"pyreadline3",' ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
build-system = with python3.pkgs; [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
dependencies = with python3.pkgs; [
|
||||
psutil
|
||||
requests
|
||||
rich
|
||||
|
||||
@@ -10114,6 +10114,8 @@ self: super: with self; {
|
||||
|
||||
propka = callPackage ../development/python-modules/propka { };
|
||||
|
||||
prosemirror = callPackage ../development/python-modules/prosemirror { };
|
||||
|
||||
proxsuite = toPythonModule (pkgs.proxsuite.override { pythonSupport = true; python3Packages = self; });
|
||||
|
||||
proxsuite-nlp = toPythonModule (pkgs.proxsuite-nlp.override { pythonSupport = true; python3Packages = self; });
|
||||
|
||||
Reference in New Issue
Block a user