gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2023-07-20 18:01:51 +00:00
committed by GitHub
parent af07eea2cd da1f279ece
commit 6ce03a2dbd
35 changed files with 705 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/lib/systemd-lib.nix
+1 -1
View File
@@ -66,7 +66,7 @@ in rec {
"Systemd ${group} field `${name}' must be a valid MAC address.";
assertNetdevMacAddress = name: group: attr:
optional (attr ? ${name} && (! isMacAddress attr.${name} || attr.${name} != "none"))
optional (attr ? ${name} && (! isMacAddress attr.${name} && attr.${name} != "none"))
"Systemd ${group} field `${name}` must be a valid MAC address or the special value `none`.";
nixos/modules/services/web-apps/freshrss.nix
+43 -18
View File
@@ -7,7 +7,7 @@ let
poolName = "freshrss";
in
{
meta.maintainers = with maintainers; [ etu stunkymonkey ];
meta.maintainers = with maintainers; [ etu stunkymonkey mattchrist ];
options.services.freshrss = {
enable = mkEnableOption (mdDoc "FreshRSS feed reader");
@@ -27,7 +27,8 @@ in
};
passwordFile = mkOption {
type = types.path;
type = types.nullOr types.path;
default = null;
description = mdDoc "Password for the defaultUser for FreshRSS.";
example = "/run/secrets/freshrss";
};
@@ -120,7 +121,13 @@ in
user = mkOption {
type = types.str;
default = "freshrss";
description = lib.mdDoc "User under which Freshrss runs.";
description = lib.mdDoc "User under which FreshRSS runs.";
};
authType = mkOption {
type = types.enum [ "form" "http_auth" "none" ];
default = "form";
description = mdDoc "Authentication type for FreshRSS.";
};
};
@@ -160,6 +167,14 @@ in
};
in
mkIf cfg.enable {
assertions = mkIf (cfg.authType == "form") [
{
assertion = cfg.passwordFile != null;
message = ''
`passwordFile` must be supplied when using "form" authentication!
'';
}
];
# Set up a Nginx virtual host.
services.nginx = mkIf (cfg.virtualHost != null) {
enable = true;
@@ -227,7 +242,7 @@ in
settingsFlags = concatStringsSep " \\\n "
(mapAttrsToList (k: v: "${k} ${toString v}") {
"--default_user" = ''"${cfg.defaultUser}"'';
"--auth_type" = ''"form"'';
"--auth_type" = ''"${cfg.authType}"'';
"--base_url" = ''"${cfg.baseUrl}"'';
"--language" = ''"${cfg.language}"'';
"--db-type" = ''"${cfg.database.type}"'';
@@ -255,20 +270,30 @@ in
FRESHRSS_DATA_PATH = cfg.dataDir;
};
script = ''
# do installation or reconfigure
if test -f ${cfg.dataDir}/config.php; then
# reconfigure with settings
./cli/reconfigure.php ${settingsFlags}
./cli/update-user.php --user ${cfg.defaultUser} --password "$(cat ${cfg.passwordFile})"
else
# check correct folders in data folder
./cli/prepare.php
# install with settings
./cli/do-install.php ${settingsFlags}
./cli/create-user.php --user ${cfg.defaultUser} --password "$(cat ${cfg.passwordFile})"
fi
'';
script =
let
userScriptArgs = ''--user ${cfg.defaultUser} --password "$(cat ${cfg.passwordFile})"'';
updateUserScript = optionalString (cfg.authType == "form") ''
./cli/update-user.php ${userScriptArgs}
'';
createUserScript = optionalString (cfg.authType == "form") ''
./cli/create-user.php ${userScriptArgs}
'';
in
''
# do installation or reconfigure
if test -f ${cfg.dataDir}/config.php; then
# reconfigure with settings
./cli/reconfigure.php ${settingsFlags}
${updateUserScript}
else
# check correct folders in data folder
./cli/prepare.php
# install with settings
./cli/do-install.php ${settingsFlags}
${createUserScript}
fi
'';
};
systemd.services.freshrss-updater = {
nixos/tests/freshrss-http-auth.nix
+20
View File
@@ -0,0 +1,20 @@
import ./make-test-python.nix ({ lib, pkgs, ... }: {
name = "freshrss";
meta.maintainers = with lib.maintainers; [ mattchrist ];
nodes.machine = { pkgs, ... }: {
services.freshrss = {
enable = true;
baseUrl = "http://localhost";
dataDir = "/srv/freshrss";
authType = "http_auth";
};
};
testScript = ''
machine.wait_for_unit("multi-user.target")
machine.wait_for_open_port(80)
response = machine.succeed("curl -vvv -s -H 'Host: freshrss' -H 'Remote-User: testuser' http://127.0.0.1:80/i/")
assert 'Account: testuser' in response, "http_auth method didn't work."
'';
})
pkgs/applications/misc/hugo/default.nix
+2 -2
View File
@@ -10,13 +10,13 @@
buildGoModule rec {
pname = "hugo";
version = "0.115.3";
version = "0.115.4";
src = fetchFromGitHub {
owner = "gohugoio";
repo = pname;
rev = "v${version}";
hash = "sha256-MzGOBR++mnQd4CvBpPCibeimt05gsa3aHNK6FphBFGU=";
hash = "sha256-//WWdU6vKgc+X4R3/GClABbsAp+ZBnG3xsVh4YozPFg=";
};
vendorHash = "sha256-BmMrdPr3sQI0Pw32iIIVmWy2qLlR7SHyKu7+PLplxkE=";
pkgs/applications/networking/cluster/terraform-providers/providers.json
+18 -18
View File
@@ -655,11 +655,11 @@
"vendorHash": "sha256-9AmfvoEf7E6lAblPIWizElng5GQJG/hQ5o6Mo3AN+EA="
},
"launchdarkly": {
"hash": "sha256-d0Gtofv4Ly2D+ensPEjLhSjN+OGnAa6W2tb4+jqNGlc=",
"hash": "sha256-RNLWcABBoTDY541og/euj4CLhK6t58wck9rpdedwRJM=",
"homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly",
"owner": "launchdarkly",
"repo": "terraform-provider-launchdarkly",
"rev": "v2.13.1",
"rev": "v2.13.2",
"spdx": "MPL-2.0",
"vendorHash": "sha256-jggXSnERsraNqkQKFpUtlglSOi02n4eAp4graJ6K+ZA="
},
@@ -673,13 +673,13 @@
"vendorHash": "sha256-4jAJf2FC83NdH4t1l7EA26yQ0pqteWmTIyrZDJdi7fg="
},
"linode": {
"hash": "sha256-dX6sG8htSZgs/OSfH09gfx4ng3Sj0uAdzQFMrVwibPk=",
"hash": "sha256-4lcEiX/Prx1fpD1HOo8B4YSvxo9yo7zWu07DVZ6NTmw=",
"homepage": "https://registry.terraform.io/providers/linode/linode",
"owner": "linode",
"repo": "terraform-provider-linode",
"rev": "v2.5.1",
"rev": "v2.5.2",
"spdx": "MPL-2.0",
"vendorHash": "sha256-n9ZZsTNE4E3T3SjF3+JjElDq5PVaD9o2Q2ATexRS/q0="
"vendorHash": "sha256-ggKPeTPIFrnfoREB4yr5Wr2dwc5y7Gq0fBtUsbnoCL0="
},
"linuxbox": {
"hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=",
@@ -745,13 +745,13 @@
"vendorHash": "sha256-4OVNcAG+/JhVQX4eW5jUkrJeIPPZatq3SvQERdRPtl0="
},
"mongodbatlas": {
"hash": "sha256-vhzidHQzWrLQ2fGZ0A7aGKwvrqWi6GJ3JCdoCX/dZkc=",
"hash": "sha256-lNWGGDGr0dp+4S1mnRnLl0n//5GtOqqSH4mWQxvzXEQ=",
"homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas",
"owner": "mongodb",
"repo": "terraform-provider-mongodbatlas",
"rev": "v1.10.1",
"rev": "v1.10.2",
"spdx": "MPL-2.0",
"vendorHash": "sha256-7wrN2BoFY0I9dV52x9LJ43PgUSOVnhJULm1EY+LEZOI="
"vendorHash": "sha256-o8VrabFScEQyjfk4BLJGxq7LgZMWaQZ2cNAph37Grzo="
},
"namecheap": {
"hash": "sha256-cms8YUL+SjTeYyIOQibksi8ZHEBYq2JlgTEpOO1uMZE=",
@@ -818,11 +818,11 @@
"vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
},
"oci": {
"hash": "sha256-NyNQht7mWG4+IbyhCPSJnLTIFm7KeBpEfua5oR6ovC0=",
"hash": "sha256-kGz6lginz3cZOYcfh21pBe+wAQ1slbsIz02sc1fNJ0E=",
"homepage": "https://registry.terraform.io/providers/oracle/oci",
"owner": "oracle",
"repo": "terraform-provider-oci",
"rev": "v5.4.0",
"rev": "v5.5.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -971,13 +971,13 @@
"vendorHash": null
},
"scaleway": {
"hash": "sha256-AA9ctS5YQ36mvxfXSU77rfOWL5UXynVN+TUjpjBR40I=",
"hash": "sha256-W1s4SCxpPsZH31KOExoGX1h5y8twaJQ6qKPiRXUkTZk=",
"homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
"owner": "scaleway",
"repo": "terraform-provider-scaleway",
"rev": "v2.24.0",
"rev": "v2.25.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-g/hNdUharGRTOIJZMk8lRAwO9PdMAbwJYTNcxTpfaV0="
"vendorHash": "sha256-wwm0edsOwsuCiURFI2Y2Jue0FD+4pAzyDxqSVJYkQYE="
},
"secret": {
"hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=",
@@ -1052,13 +1052,13 @@
"vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8="
},
"spotinst": {
"hash": "sha256-fnWSDapAJXnNG1DHribLcRpMgGHke5EhmuQQjaj6sWE=",
"hash": "sha256-gScCKmDH8uavJass9Fg9pa6u/ZZfkHEhfBHlyyv3svE=",
"homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
"owner": "spotinst",
"repo": "terraform-provider-spotinst",
"rev": "v1.126.0",
"rev": "v1.127.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-2SUCMdZRkAU97HFKEAKe5ryB+NB55aR/5k5K3p/digI="
"vendorHash": "sha256-0rWVOVRndC/Y0gSfJoqd65rvBqUnNQb47S6RiBw7q+4="
},
"stackpath": {
"hash": "sha256-7KQUddq+M35WYyAIAL8sxBjAaXFcsczBRO1R5HURUZg=",
@@ -1106,11 +1106,11 @@
"vendorHash": "sha256-GNSKSlaFBj2P+z40U+0uwPSOuQBy+9vOVFfPe8p0A24="
},
"tencentcloud": {
"hash": "sha256-53s1j5Xw7ZERz35lGzv9pHiAzcUX2dn5A74vFqv94Cg=",
"hash": "sha256-WogC3T8KWOtgCczk7J589OIHN0gPCbll0NgchJ0WQAQ=",
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
"owner": "tencentcloudstack",
"repo": "terraform-provider-tencentcloud",
"rev": "v1.81.14",
"rev": "v1.81.15",
"spdx": "MPL-2.0",
"vendorHash": null
},
pkgs/applications/networking/p2p/jesec-rtorrent/avoid-stack-overflow-for-lockfile-buf.patch
+30
View File
@@ -0,0 +1,30 @@
From dd4a96073d4a60ca8fff55be6ea6b17018de96a8 Mon Sep 17 00:00:00 2001
From: Varun Madiath <git@madiathv.com>
Date: Wed, 19 Jul 2023 15:30:57 -0400
Subject: [PATCH] utils: lockfile: avoid stack overflow for lockfile buffer
Original patch by @cyphar was submitted to rakshasa/rtorrent at
https://github.com/rakshasa/rtorrent/pull/1169.
Observed the segfault on nixos-unstable.
---
src/utils/lockfile.cc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/utils/lockfile.cc b/src/utils/lockfile.cc
index 76e4b8f..441f5c8 100644
--- a/src/utils/lockfile.cc
+++ b/src/utils/lockfile.cc
@@ -75,7 +75,8 @@ Lockfile::try_lock() {
int pos = ::gethostname(buf, 255);
if (pos == 0) {
- ::snprintf(buf + std::strlen(buf), 255, ":+%i\n", ::getpid());
+ ssize_t len = std::strlen(buf);
+ ::snprintf(buf + len, 255 - len, ":+%i\n", ::getpid());
ssize_t __attribute__((unused)) result = ::write(fd, buf, std::strlen(buf));
}
--
2.41.0
pkgs/applications/networking/p2p/jesec-rtorrent/default.nix
+4
View File
@@ -21,6 +21,10 @@ stdenv.mkDerivation rec {
hash = "sha256-i7c1jSawHshj1kaXl8tdpelIKU24okeg9K5/+ht6t2k=";
};
patches = [
./avoid-stack-overflow-for-lockfile-buf.patch
];
passthru = {
inherit libtorrent;
};
pkgs/applications/networking/pyload-ng/default.nix
+54
View File
@@ -0,0 +1,54 @@
{ lib, fetchPypi, python3 }:
python3.pkgs.buildPythonApplication rec {
version = "0.5.0b3.dev72";
pname = "pyload-ng";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-pcbJc23Fylh/JoWRmbZmC8xUzUqh2ej6gT+B2w8DHFQ=";
};
postPatch = ''
# relax version bounds
sed -i 's/\([A-z0-9]*\)~=.*$/\1/' setup.cfg
# not sure what Flask-Session2 is but flask-session works just fine
sed -i '/Flask-Session2/d' setup.cfg
'';
propagatedBuildInputs = with python3.pkgs; [
bitmath
certifi
cheroot
cryptography
filetype
flask
flask-babel
flask-caching
flask-compress
flask-session
flask-themes2
js2py
pycurl
semver
setuptools
];
passthru.optional-dependencies = {
plugins = with python3.pkgs; [
beautifulsoup4 # for some plugins
colorlog # colorful console logging
pillow # for some CAPTCHA plugin
send2trash # send some files to trash instead of deleting them
slixmpp # XMPP plugin
];
};
meta = with lib; {
description = "Free and open-source download manager with support for 1-click-hosting sites";
homepage = "https://github.com/pyload/pyload";
license = licenses.agpl3Plus;
maintainers = with maintainers; [ ruby0b ];
};
}
pkgs/applications/terminal-emulators/blackbox-terminal/default.nix
+4 -2
View File
@@ -27,14 +27,14 @@ let
in
stdenv.mkDerivation rec {
pname = "blackbox";
version = "0.13.2";
version = "0.14.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "raggesilver";
repo = "blackbox";
rev = "v${version}";
hash = "sha256-qz1805HLG/Yexilw0YCkTzed1wqonUtJ+QrbMyhKHh8=";
hash = "sha256-ebwh9WTooJuvYFIygDBn9lYC7+lx9P1HskvKU8EX9jw=";
};
postPatch = ''
@@ -64,6 +64,8 @@ stdenv.mkDerivation rec {
libgee
];
mesonFlags = [ "-Dblackbox_is_flatpak=false" ];
meta = with lib; {
description = "Beautiful GTK 4 terminal";
homepage = "https://gitlab.gnome.org/raggesilver/blackbox";
pkgs/applications/terminal-emulators/blackbox-terminal/marble.nix
+4 -4
View File
@@ -13,15 +13,15 @@
stdenv.mkDerivation {
pname = "marble";
version = "unstable-2022-04-20";
version = "unstable-2023-05-11";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "raggesilver";
repo = "marble";
# Latest commit from the 'wip/gtk4' branch
rev = "6dcc6fefa35f0151b0549c01bd774750fe6bdef8";
sha256 = "sha256-0VJ9nyjWOOdLBm3ufleS/xcAS5YsSedJ2NtBjyM3uaY=";
# the same used on flatpak
rev = "f240b2ec7d5cdacb8fdcc553703420dc5101ffdb";
sha256 = "sha256-obtz7zOyEZPgi/NNjtLr6aFm/1UVTzjTdJpN3JQfpUs=";
};
nativeBuildInputs = [
pkgs/applications/terminal-emulators/cool-retro-term/default.nix
+23 -6
View File
@@ -1,22 +1,39 @@
{ lib, stdenv, fetchFromGitHub, mkDerivation, qtbase, qtquick1, qmltermwidget
, qtquickcontrols, qtgraphicaleffects, qmake, nixosTests }:
{ lib
, stdenv
, fetchFromGitHub
, mkDerivation
, qtbase
, qtquick1
, qmltermwidget
, qtquickcontrols2
, qtgraphicaleffects
, qmake
, nixosTests
}:
mkDerivation rec {
version = "1.1.1";
version = "1.2.0";
pname = "cool-retro-term";
src = fetchFromGitHub {
owner = "Swordfish90";
repo = "cool-retro-term";
rev = version;
sha256 = "0mird4k88ml6y61hky2jynrjmnxl849fvhsr5jfdlnv0i7r5vwi5";
rev = "refs/tags/${version}";
hash = "sha256-PewHLVmo+RTBHIQ/y2FBkgXsIvujYd7u56JdFC10B4c=";
};
patchPhase = ''
sed -i -e '/qmltermwidget/d' cool-retro-term.pro
'';
buildInputs = [ qtbase qtquick1 qmltermwidget qtquickcontrols qtgraphicaleffects ];
buildInputs = [
qtbase
qtquick1
qmltermwidget
qtquickcontrols2
qtgraphicaleffects
];
nativeBuildInputs = [ qmake ];
installFlags = [ "INSTALL_ROOT=$(out)" ];
pkgs/applications/version-management/git-backdate/default.nix
+31
View File
@@ -0,0 +1,31 @@
{ lib, stdenv, fetchFromGitHub, git, python3 }:
stdenv.mkDerivation rec {
pname = "git-backdate";
version = "2023-07-19";
src = fetchFromGitHub {
owner = "rixx";
repo = pname;
rev = "8ba5a0eba04e5559be2e4b1b6e02e62b64ca4dd8";
sha256 = "sha256-91cEGQ0FtoiHEZHQ93jPFHF2vLoeQuBidykePFHtrsY=";
};
buildInputs = [
python3
];
installPhase = ''
runHook preInstall
install -Dm555 git-backdate -t $out/bin
runHook postInstall
'';
meta = with lib; {
description = "Backdate a commit or range of commit to a date or range of dates";
homepage = "https://github.com/rixx/git-backdate";
license = licenses.wtfpl;
maintainers = with maintainers; [ matthiasbeyer ];
};
}
pkgs/applications/virtualization/runc/default.nix
+2 -2
View File
@@ -15,13 +15,13 @@
buildGoModule rec {
pname = "runc";
version = "1.1.7";
version = "1.1.8";
src = fetchFromGitHub {
owner = "opencontainers";
repo = "runc";
rev = "v${version}";
hash = "sha256-reSC9j9ESjRigItBRytef78XBjmMGsqu0o9qcN2AstU=";
hash = "sha256-rDJYEc64KW4Qa3Eg2oUjJqIKrg6THb5hxQFFbvb9Zp4=";
};
vendorHash = null;
pkgs/build-support/fetchsvn/default.nix
+10 -3
View File
@@ -2,7 +2,7 @@
, subversion, glibcLocales, sshSupport ? true, openssh ? null
}:
{ url, rev ? "HEAD", md5 ? "", sha256 ? ""
{ url, rev ? "HEAD", md5 ? "", sha256 ? "", hash ? ""
, ignoreExternals ? false, ignoreKeywords ? false, name ? null
, preferLocalBuild ? true
}:
@@ -34,6 +34,8 @@ in
if md5 != "" then
throw "fetchsvn does not support md5 anymore, please use sha256"
else if hash != "" && sha256 != "" then
throw "Only one of sha256 or hash can be set"
else
stdenvNoCC.mkDerivation {
name = name_;
@@ -43,9 +45,14 @@ stdenvNoCC.mkDerivation {
SVN_SSH = if sshSupport then "${buildPackages.openssh}/bin/ssh" else null;
outputHashAlgo = "sha256";
outputHashAlgo = if hash != "" then null else "sha256";
outputHashMode = "recursive";
outputHash = sha256;
outputHash = if hash != "" then
hash
else if sha256 != "" then
sha256
else
lib.fakeSha256;
inherit url rev ignoreExternals ignoreKeywords;
pkgs/development/libraries/qt-6/fetch.sh
+1 -1
View File
@@ -1 +1 @@
WGET_ARGS=( https://download.qt.io/official_releases/qt/6.5/6.5.1/submodules/ -A '*.tar.xz' )
WGET_ARGS=( https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/ -A '*.tar.xz' )
pkgs/development/libraries/qt-6/srcs.nix
+161 -153
View File
@@ -1,310 +1,318 @@
# DO NOT EDIT! This file is generated automatically.
# Command: ./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.5.1";
version = "6.5.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qt3d-everywhere-src-6.5.1.tar.xz";
sha256 = "16v875hv58f1cnb76c8pd63v44fncfdrv29b008bamxs23lf2m3y";
name = "qt3d-everywhere-src-6.5.1.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qt3d-everywhere-src-6.5.2.tar.xz";
sha256 = "047rwawrlm7n0vifxmsqvs3w3j5c16x8qkpx8xazq6xd47dn9w11";
name = "qt3d-everywhere-src-6.5.2.tar.xz";
};
};
qt5 = {
version = "6.5.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qt5-everywhere-src-6.5.2.tar.xz";
sha256 = "15da8xd213fg2yfna3zvvr5mnhdfdai0i4m1paqfxr10sl81p515";
name = "qt5-everywhere-src-6.5.2.tar.xz";
};
};
qt5compat = {
version = "6.5.1";
version = "6.5.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qt5compat-everywhere-src-6.5.1.tar.xz";
sha256 = "10zvah04mnyg5apkwq015kxs03y467naicxy8ljfzazgbwljp6df";
name = "qt5compat-everywhere-src-6.5.1.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qt5compat-everywhere-src-6.5.2.tar.xz";
sha256 = "1i4izabbmf1dayzlj1miz7hsm4cy0qb7i72pwyl2fp05w8pf9axr";
name = "qt5compat-everywhere-src-6.5.2.tar.xz";
};
};
qtactiveqt = {
version = "6.5.1";
version = "6.5.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtactiveqt-everywhere-src-6.5.1.tar.xz";
sha256 = "0yii7ihvzncwqhrb1635my5arr6lymr2d3wnwpcn42b7l6krsk6d";
name = "qtactiveqt-everywhere-src-6.5.1.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtactiveqt-everywhere-src-6.5.2.tar.xz";
sha256 = "04zhbwhnjlc561bs2f4y82mzlf18byy6g5gh37yq9r3gfz54002x";
name = "qtactiveqt-everywhere-src-6.5.2.tar.xz";
};
};
qtbase = {
version = "6.5.1";
version = "6.5.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtbase-everywhere-src-6.5.1.tar.xz";
sha256 = "1vdzxrcfhn6ym7p8jzr3xxx1r4r435fx461lwfgii8838cgzlmnv";
name = "qtbase-everywhere-src-6.5.1.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtbase-everywhere-src-6.5.2.tar.xz";
sha256 = "0s8jwzdcv97dfy8n3jjm8zzvllv380l73mwdva7rs2nqnhlwgd1x";
name = "qtbase-everywhere-src-6.5.2.tar.xz";
};
};
qtcharts = {
version = "6.5.1";
version = "6.5.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtcharts-everywhere-src-6.5.1.tar.xz";
sha256 = "0xfgj970ip0fn2gxrsilg1gvq4w2849vs6gysn0qhnz7qw7m0nxi";
name = "qtcharts-everywhere-src-6.5.1.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtcharts-everywhere-src-6.5.2.tar.xz";
sha256 = "0bddlrwda5bh5bdwdx86ixdpm3zg5nygzb754y5nkjlw06zgfnkp";
name = "qtcharts-everywhere-src-6.5.2.tar.xz";
};
};
qtconnectivity = {
version = "6.5.1";
version = "6.5.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtconnectivity-everywhere-src-6.5.1.tar.xz";
sha256 = "0yl2i4qdmvdzspnr0jpf031gd2cndkx4hppy5sdjppy4g2dlrmrg";
name = "qtconnectivity-everywhere-src-6.5.1.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtconnectivity-everywhere-src-6.5.2.tar.xz";
sha256 = "16fwbz9pr6pi19119mp6w0crq9nsb35fw8cgpfpkq99d6li4jbnv";
name = "qtconnectivity-everywhere-src-6.5.2.tar.xz";
};
};
qtdatavis3d = {
version = "6.5.1";
version = "6.5.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtdatavis3d-everywhere-src-6.5.1.tar.xz";
sha256 = "0cx3bmbwg0y99495zp1gafs4bfn75dbf6r6dfgy1ii9i66y2lcsj";
name = "qtdatavis3d-everywhere-src-6.5.1.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtdatavis3d-everywhere-src-6.5.2.tar.xz";
sha256 = "1s8wlpc4nibnxaghkxmaxda5dkkn64jw6qgmzw39vi5vvhc3khb8";
name = "qtdatavis3d-everywhere-src-6.5.2.tar.xz";
};
};
qtdeclarative = {
version = "6.5.1";
version = "6.5.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtdeclarative-everywhere-src-6.5.1.tar.xz";
sha256 = "0yff5nbcspl3w3231wvgvac38q0lskxx1l2wm1lx2raac7wlh490";
name = "qtdeclarative-everywhere-src-6.5.1.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtdeclarative-everywhere-src-6.5.2.tar.xz";
sha256 = "06c7xfqn2a5s2m8j1bcvx3pyjqg1rgqkjvp49737gb4z9vjiz8gk";
name = "qtdeclarative-everywhere-src-6.5.2.tar.xz";
};
};
qtdoc = {
version = "6.5.1";
version = "6.5.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtdoc-everywhere-src-6.5.1.tar.xz";
sha256 = "0c9ckm7rcp3vi7qipzqyqpar2f5l426s8vgdz71q1ccx432a0kj1";
name = "qtdoc-everywhere-src-6.5.1.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtdoc-everywhere-src-6.5.2.tar.xz";
sha256 = "0cydg39f4cpv965pr97qn3spm5fzlxvhamifjfdsrzgskc5nm0v3";
name = "qtdoc-everywhere-src-6.5.2.tar.xz";
};
};
qtgrpc = {
version = "6.5.1";
version = "6.5.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtgrpc-everywhere-src-6.5.1.tar.xz";
sha256 = "1r27m7c1ab1gk2hzi4d9mpvk1kc5zypx6d6q9wa7kv26d4d2vgls";
name = "qtgrpc-everywhere-src-6.5.1.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtgrpc-everywhere-src-6.5.2.tar.xz";
sha256 = "016jw2ny7paky54pk4pa499273919s8ag2ksx361ir6d0ydrdcks";
name = "qtgrpc-everywhere-src-6.5.2.tar.xz";
};
};
qthttpserver = {
version = "6.5.1";
version = "6.5.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qthttpserver-everywhere-src-6.5.1.tar.xz";
sha256 = "0z7wrvfln7mr7n1i1pijx36c6wi66dm91mdir5f8gqk15i84zpj7";
name = "qthttpserver-everywhere-src-6.5.1.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qthttpserver-everywhere-src-6.5.2.tar.xz";
sha256 = "1b6w0999n5vw5xb93m0rc896l6ci3jld657y8645rl3q29fjpypq";
name = "qthttpserver-everywhere-src-6.5.2.tar.xz";
};
};
qtimageformats = {
version = "6.5.1";
version = "6.5.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtimageformats-everywhere-src-6.5.1.tar.xz";
sha256 = "1daxijk9mb2gb65pxjdqw4r5vjs3vi20d4lixq6mh0xdk717yzw9";
name = "qtimageformats-everywhere-src-6.5.1.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtimageformats-everywhere-src-6.5.2.tar.xz";
sha256 = "0hv7mkn72126rkhy5gmjmbvzy7v17mkk3q2pkmzy99f64j4w1q5a";
name = "qtimageformats-everywhere-src-6.5.2.tar.xz";
};
};
qtlanguageserver = {
version = "6.5.1";
version = "6.5.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtlanguageserver-everywhere-src-6.5.1.tar.xz";
sha256 = "1j9bhd4k30ana08nppqqll6v5nxr9dzxqxsh12i2cihjr9mcr9lr";
name = "qtlanguageserver-everywhere-src-6.5.1.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtlanguageserver-everywhere-src-6.5.2.tar.xz";
sha256 = "196iicwpqca2ydpca41qs6aqxxq8ycknw6lm2v00h1w3m86frdbk";
name = "qtlanguageserver-everywhere-src-6.5.2.tar.xz";
};
};
qtlocation = {
version = "6.5.1";
version = "6.5.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtlocation-everywhere-src-6.5.1.tar.xz";
sha256 = "1x0j6r0gll469aq75viyyyw1gfl180rcyq0h83z35664jzx1i2mn";
name = "qtlocation-everywhere-src-6.5.1.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtlocation-everywhere-src-6.5.2.tar.xz";
sha256 = "1yvdv1gqj7dij7v4cq9rlnqfb77c0v9b7n56jccvy5v6q9j7s7c9";
name = "qtlocation-everywhere-src-6.5.2.tar.xz";
};
};
qtlottie = {
version = "6.5.1";
version = "6.5.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtlottie-everywhere-src-6.5.1.tar.xz";
sha256 = "10bbq952iv3f2v42nqirld0qy363g03zdq6hlh1lfcbmgc8gif0h";
name = "qtlottie-everywhere-src-6.5.1.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtlottie-everywhere-src-6.5.2.tar.xz";
sha256 = "16z8fhaa40ig0cggb689zf8j3cid6fk6pmh91b8342ymy1fdqfh0";
name = "qtlottie-everywhere-src-6.5.2.tar.xz";
};
};
qtmultimedia = {
version = "6.5.1";
version = "6.5.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtmultimedia-everywhere-src-6.5.1.tar.xz";
sha256 = "1k71chjdh66yv13li38ig507wpsr7cn87nqkvcfxmkf8w5hca7qb";
name = "qtmultimedia-everywhere-src-6.5.1.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtmultimedia-everywhere-src-6.5.2.tar.xz";
sha256 = "0xc9k4mlncscxqbp8q46yjd89k4jb8j0ggbi5ad874lycym013wl";
name = "qtmultimedia-everywhere-src-6.5.2.tar.xz";
};
};
qtnetworkauth = {
version = "6.5.1";
version = "6.5.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtnetworkauth-everywhere-src-6.5.1.tar.xz";
sha256 = "18viv41qazcbix9l21g5vz1r6zp6mxnbl2c2j3ip1yln7rmbac57";
name = "qtnetworkauth-everywhere-src-6.5.1.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtnetworkauth-everywhere-src-6.5.2.tar.xz";
sha256 = "0g18kh3zhcfi9ni8cqbbjdc1l6jf99ijv5shcl42jk6219b4pk2f";
name = "qtnetworkauth-everywhere-src-6.5.2.tar.xz";
};
};
qtpositioning = {
version = "6.5.1";
version = "6.5.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtpositioning-everywhere-src-6.5.1.tar.xz";
sha256 = "08m41rx1yd28dr53pfrdfvgkmnszqyax88jhqczcb048w50gjg05";
name = "qtpositioning-everywhere-src-6.5.1.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtpositioning-everywhere-src-6.5.2.tar.xz";
sha256 = "1yhlfs8izc054qv1krf5qv6zzjlvmz013h74fwamn74dfh1kyjbh";
name = "qtpositioning-everywhere-src-6.5.2.tar.xz";
};
};
qtquick3d = {
version = "6.5.1";
version = "6.5.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtquick3d-everywhere-src-6.5.1.tar.xz";
sha256 = "07ncn3gl3yvdq8ly3rn7693lzq0slghmw9ljq119s4bbsnk2ddji";
name = "qtquick3d-everywhere-src-6.5.1.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtquick3d-everywhere-src-6.5.2.tar.xz";
sha256 = "1nh0vg2m1lf8m40bxbwsam5pwdzjammhal69k2pb5s0rjifs7q3m";
name = "qtquick3d-everywhere-src-6.5.2.tar.xz";
};
};
qtquick3dphysics = {
version = "6.5.1";
version = "6.5.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtquick3dphysics-everywhere-src-6.5.1.tar.xz";
sha256 = "1j0kfqdwx8x7bagw8qjkywsd2fzih2yp36vza2hil56m35s8ibcl";
name = "qtquick3dphysics-everywhere-src-6.5.1.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtquick3dphysics-everywhere-src-6.5.2.tar.xz";
sha256 = "0dri8v0pmvc1h1cdhdchvd4xi5f62c1wrk0jd01lh95i6sc1403m";
name = "qtquick3dphysics-everywhere-src-6.5.2.tar.xz";
};
};
qtquickeffectmaker = {
version = "6.5.1";
version = "6.5.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtquickeffectmaker-everywhere-src-6.5.1.tar.xz";
sha256 = "18lhvf9mlprmg0jba9biciscns12zvwr5jj81kkvv0mv8h3yrg2i";
name = "qtquickeffectmaker-everywhere-src-6.5.1.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtquickeffectmaker-everywhere-src-6.5.2.tar.xz";
sha256 = "1gvcszqj6khqisxkpwi67xad0247hpq5zcz4v2vhbgkxq8kwfiym";
name = "qtquickeffectmaker-everywhere-src-6.5.2.tar.xz";
};
};
qtquicktimeline = {
version = "6.5.1";
version = "6.5.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtquicktimeline-everywhere-src-6.5.1.tar.xz";
sha256 = "0lfm997p5x5nn4zlz2p1djd3757b0m00347xkfy9n6y5fsidny8h";
name = "qtquicktimeline-everywhere-src-6.5.1.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtquicktimeline-everywhere-src-6.5.2.tar.xz";
sha256 = "1fhmy01nqcr9q1193m9fkhbvqd9208kaigprqxkjjm61bn8awif9";
name = "qtquicktimeline-everywhere-src-6.5.2.tar.xz";
};
};
qtremoteobjects = {
version = "6.5.1";
version = "6.5.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtremoteobjects-everywhere-src-6.5.1.tar.xz";
sha256 = "16v2qzn5lf5bxrdff4fr624x5n262qvhinrk0vfmcdvrb2plgkvq";
name = "qtremoteobjects-everywhere-src-6.5.1.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtremoteobjects-everywhere-src-6.5.2.tar.xz";
sha256 = "0k29sk02n54vj1w6vh6xycsjpyfqlijc13fnxh1q7wpgg4gizx60";
name = "qtremoteobjects-everywhere-src-6.5.2.tar.xz";
};
};
qtscxml = {
version = "6.5.1";
version = "6.5.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtscxml-everywhere-src-6.5.1.tar.xz";
sha256 = "0xr4005b640r1h7nbfmgjban9mihxgm4sfqizw30xhsjpg4a6ghw";
name = "qtscxml-everywhere-src-6.5.1.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtscxml-everywhere-src-6.5.2.tar.xz";
sha256 = "1jxx9p7zi40r990ky991xd43mv6i8hdpnj2fhl7sf4q9fpng4c58";
name = "qtscxml-everywhere-src-6.5.2.tar.xz";
};
};
qtsensors = {
version = "6.5.1";
version = "6.5.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtsensors-everywhere-src-6.5.1.tar.xz";
sha256 = "19dbci4487anpkm85n1yly1mm5zx1f5dgx08v5ar5462f61wlnn9";
name = "qtsensors-everywhere-src-6.5.1.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtsensors-everywhere-src-6.5.2.tar.xz";
sha256 = "19iamfl4znqbfflnnpis6qk3cqri7kzbg0nsgf42lc5lzdybs1j0";
name = "qtsensors-everywhere-src-6.5.2.tar.xz";
};
};
qtserialbus = {
version = "6.5.1";
version = "6.5.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtserialbus-everywhere-src-6.5.1.tar.xz";
sha256 = "0zqmbqnaf8ln6kdf5nc9k4q618d7jd4dmc2gsmgcf2mz55w9dzyv";
name = "qtserialbus-everywhere-src-6.5.1.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtserialbus-everywhere-src-6.5.2.tar.xz";
sha256 = "1zndnw1zx5x9daidcm0jq7jcr06ihw0nf6iksrx591f1rl3n6hph";
name = "qtserialbus-everywhere-src-6.5.2.tar.xz";
};
};
qtserialport = {
version = "6.5.1";
version = "6.5.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtserialport-everywhere-src-6.5.1.tar.xz";
sha256 = "19ijnjy5bqv7g74q2ax4pvmggphpccckszxilj0vkqnl8q34smf3";
name = "qtserialport-everywhere-src-6.5.1.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtserialport-everywhere-src-6.5.2.tar.xz";
sha256 = "17nc5kmha6fy3vzkxfr2gxyzdsahs1x66d5lhcqk0szak8b58g06";
name = "qtserialport-everywhere-src-6.5.2.tar.xz";
};
};
qtshadertools = {
version = "6.5.1";
version = "6.5.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtshadertools-everywhere-src-6.5.1.tar.xz";
sha256 = "0ljhysyiwxawws0481hyk1xbycc21jg6gq5fsn8yyi2rhdhng075";
name = "qtshadertools-everywhere-src-6.5.1.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtshadertools-everywhere-src-6.5.2.tar.xz";
sha256 = "0g8aziqhds2fkx11y4p2akmyn2p1qqf2fjxv72f9pibnhpdv0gya";
name = "qtshadertools-everywhere-src-6.5.2.tar.xz";
};
};
qtspeech = {
version = "6.5.1";
version = "6.5.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtspeech-everywhere-src-6.5.1.tar.xz";
sha256 = "1djp6ijjvl94zajbvgz80xnzd2fpkq8fnnpxnq9jg5jny6jhn4k7";
name = "qtspeech-everywhere-src-6.5.1.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtspeech-everywhere-src-6.5.2.tar.xz";
sha256 = "1cnlc9x0wswzl7j2imi4kvs9zavs4z1mhzzfpwr6d9zlfql9rzw8";
name = "qtspeech-everywhere-src-6.5.2.tar.xz";
};
};
qtsvg = {
version = "6.5.1";
version = "6.5.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtsvg-everywhere-src-6.5.1.tar.xz";
sha256 = "1vq8jvz13hp9nj9r77f0nx7nq3pciy4sk1j6d2dzbw243m4jk3fm";
name = "qtsvg-everywhere-src-6.5.1.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtsvg-everywhere-src-6.5.2.tar.xz";
sha256 = "18v337lfk8krg0hff5jx6fi7gn6x3djn03x3psrhlbmgjc8crd28";
name = "qtsvg-everywhere-src-6.5.2.tar.xz";
};
};
qttools = {
version = "6.5.1";
version = "6.5.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qttools-everywhere-src-6.5.1.tar.xz";
sha256 = "0a93xg65z19bldwhc77x87khjwkx3hs01z1gjdznza5jhjgdyi2p";
name = "qttools-everywhere-src-6.5.1.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qttools-everywhere-src-6.5.2.tar.xz";
sha256 = "0ha3v488vnm4pgdpyjgf859sak0z2fwmbgcyivcd93qxflign7sm";
name = "qttools-everywhere-src-6.5.2.tar.xz";
};
};
qttranslations = {
version = "6.5.1";
version = "6.5.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qttranslations-everywhere-src-6.5.1.tar.xz";
sha256 = "16ylh1hf7r4g8s0h6wgkngwy1p75qnq6byz1q14wwzk3q8s2qzjj";
name = "qttranslations-everywhere-src-6.5.1.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qttranslations-everywhere-src-6.5.2.tar.xz";
sha256 = "1sxy2ljn5ajvn4yjb8fx86l56viyvqh5r9hf5x67azkmgrilaz1k";
name = "qttranslations-everywhere-src-6.5.2.tar.xz";
};
};
qtvirtualkeyboard = {
version = "6.5.1";
version = "6.5.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtvirtualkeyboard-everywhere-src-6.5.1.tar.xz";
sha256 = "1h9whvpdy37vazl095qqvsl8d2b298v2i25fsvr04x9ns3b47cl9";
name = "qtvirtualkeyboard-everywhere-src-6.5.1.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtvirtualkeyboard-everywhere-src-6.5.2.tar.xz";
sha256 = "0sb2c901ma30dcbf4yhznw0pad09iz55alvkzyw2d992gqwf0w05";
name = "qtvirtualkeyboard-everywhere-src-6.5.2.tar.xz";
};
};
qtwayland = {
version = "6.5.1";
version = "6.5.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtwayland-everywhere-src-6.5.1.tar.xz";
sha256 = "0kcp1adgszcrwv89f2m3rp2ldbrbnb7prkr8065w5j9ik2hiw7vw";
name = "qtwayland-everywhere-src-6.5.1.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwayland-everywhere-src-6.5.2.tar.xz";
sha256 = "16iwar19sgjvxgmbr6hmd3hsxp6ahdjwl1lra2wapl3zzf3bw81h";
name = "qtwayland-everywhere-src-6.5.2.tar.xz";
};
};
qtwebchannel = {
version = "6.5.1";
version = "6.5.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtwebchannel-everywhere-src-6.5.1.tar.xz";
sha256 = "0jpc231gmgy540x9im8ld1fjmxqjaw1c40r6d2g5gxrpwxkl6drb";
name = "qtwebchannel-everywhere-src-6.5.1.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwebchannel-everywhere-src-6.5.2.tar.xz";
sha256 = "0qwfnwva7v5f2g5is17yy66mnmc9c1yf9aagaw5qanskdvxdk261";
name = "qtwebchannel-everywhere-src-6.5.2.tar.xz";
};
};
qtwebengine = {
version = "6.5.1";
version = "6.5.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtwebengine-everywhere-src-6.5.1.tar.xz";
sha256 = "0clcxkybgn5ny22rbdckxczqsf5gc3f55q7r02l5q7q6biqbs61g";
name = "qtwebengine-everywhere-src-6.5.1.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwebengine-everywhere-src-6.5.2.tar.xz";
sha256 = "17qxf3asyxq6kcqqvml170n7rnzih3nr4srp9r5v80pmas5l7jg7";
name = "qtwebengine-everywhere-src-6.5.2.tar.xz";
};
};
qtwebsockets = {
version = "6.5.1";
version = "6.5.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtwebsockets-everywhere-src-6.5.1.tar.xz";
sha256 = "06fsc42x571af78rlx8ah7i9nqc9qnzqvd1mmrx12xd6a2r6d3vb";
name = "qtwebsockets-everywhere-src-6.5.1.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwebsockets-everywhere-src-6.5.2.tar.xz";
sha256 = "0xjwifxj2ssshys6f6kjr6ri2vq1wfshxky6mcscjm7vvyqdfjr0";
name = "qtwebsockets-everywhere-src-6.5.2.tar.xz";
};
};
qtwebview = {
version = "6.5.1";
version = "6.5.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtwebview-everywhere-src-6.5.1.tar.xz";
sha256 = "0r1six7k9nz1n64c8ff1j24x2dfrr931aiwygpsf36bim27bdbvb";
name = "qtwebview-everywhere-src-6.5.1.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwebview-everywhere-src-6.5.2.tar.xz";
sha256 = "0cgn1px8zk2khmswi9zawi9cnx9p26y4lb3a0kr4kfklm1rf00jr";
name = "qtwebview-everywhere-src-6.5.2.tar.xz";
};
};
}
pkgs/development/ocaml-modules/bisect_ppx/default.nix
+2 -13
View File
@@ -2,27 +2,16 @@
buildDunePackage rec {
pname = "bisect_ppx";
version = "2.8.2";
version = "2.8.3";
src = fetchFromGitHub {
owner = "aantron";
repo = "bisect_ppx";
rev = version;
hash = "sha256-Uc5ZYL6tORcCCvCe9UmOnBF68FqWpQ4bc48fTQwnfis=";
hash = "sha256-3qXobZLPivFDtls/3WNqDuAgWgO+tslJV47kjQPoi6o=";
};
patches = [
# Ppxlib >= 0.28.0 compatibility
# remove when a new version is released
(fetchpatch {
name = "${pname}-${version}-ppxlib-0.28-compatibility.patch";
url = "https://github.com/anmonteiro/bisect_ppx/commit/cc442a08e3a2e0e18deb48f3a696076ac0986728.patch";
sha256 = "sha256-pPHhmtd81eWhQd4X0gfZNPYT75+EkurwivP7acfJbNc=";
})
];
minimalOCamlVersion = "4.11";
duneVersion = "3";
buildInputs = [
cmdliner
pkgs/development/python-modules/flask-themes2/default.nix
+25
View File
@@ -0,0 +1,25 @@
{ lib, fetchPypi, buildPythonPackage, flask, pythonOlder, pytestCheckHook }:
buildPythonPackage rec {
pname = "flask-themes2";
version = "1.0.0";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchPypi {
pname = "Flask-Themes2";
inherit version;
hash = "sha256-0U0cSdBddb9+IG3CU6zUPlxaJhQlxOV6OLgxnNDChy8=";
};
nativeCheckInputs = [ pytestCheckHook ];
propagatedBuildInputs = [ flask ];
meta = with lib; {
description = "Easily theme your Flask app";
homepage = "https://github.com/sysr-q/flask-themes2";
license = licenses.mit;
maintainers = with maintainers; [ ruby0b ];
};
}
pkgs/development/python-modules/islpy/default.nix
+2 -2
View File
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "islpy";
version = "2023.1";
version = "2023.1.2";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-QLkpCBF95OBOzPrBXmlzyhFMfq1bs2+S/8Z5n4oMekg=";
sha256 = "sha256-NsNI1N9ZuNYWr1i3dl7hSaTP3jdsTYsIpoF98vrZG9Y=";
};
postConfigure = ''
pkgs/development/python-modules/jsonable/default.nix
+31
View File
@@ -0,0 +1,31 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, nose
}:
buildPythonPackage rec {
pname = "jsonable";
version = "0.3.1";
src = fetchFromGitHub {
owner = "halfak";
repo = "python-jsonable";
rev = "refs/tags/${version}";
hash = "sha256-3FIzG2djSZOPDdoYeKqs3obQjgHrFtyp0sdBwZakkHA=";
};
nativeCheckInputs = [ pytestCheckHook ];
checkInputs = [ nose ];
pythonImportsCheck = [ "jsonable" ];
meta = with lib; {
description = "Provides an abstract base class and utilities for defining trivially JSONable python objects";
homepage = "https://github.com/halfak/python-jsonable";
license = licenses.mit;
maintainers = with maintainers; [ GaetanLepage ];
};
}
pkgs/development/python-modules/mwcli/default.nix
+41
View File
@@ -0,0 +1,41 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonRelaxDepsHook
, docopt
, para
}:
buildPythonPackage rec {
pname = "mwcli";
version = "0.0.3";
src = fetchPypi {
inherit pname version;
hash = "sha256-ADMb0P8WtXIcnGJ02R4l/TVfRewHc8ig45JurAWHGaA=";
};
# Prevent circular dependency
pythonRemoveDeps = [
"mwxml"
];
nativeBuildInputs = [
pythonRelaxDepsHook
];
propagatedBuildInputs = [
docopt
para
];
# Tests require mwxml which itself depends on this package (circular dependency)
doCheck = false;
meta = with lib; {
description = "A set of helper functions and classes for mediawiki-utilities command-line utilities";
homepage = "https://github.com/mediawiki-utilities/python-mwcli";
license = licenses.mit;
maintainers = with maintainers; [ GaetanLepage ];
};
}
pkgs/development/python-modules/mwtypes/default.nix
+37
View File
@@ -0,0 +1,37 @@
{ lib
, buildPythonPackage
, fetchPypi
, jsonable
, pytestCheckHook
, nose
}:
buildPythonPackage rec {
pname = "mwtypes";
version = "0.3.2";
src = fetchPypi {
inherit pname version;
hash = "sha256-3BF2xZZWKcEj6FmzGa5hUdTjhVMemngWBMDUyjQ045k=";
};
propagatedBuildInputs = [ jsonable ];
nativeCheckInputs = [ pytestCheckHook ];
checkInputs = [ nose ];
disabledTests = [
"test_normalize_path_bad_extension"
"test_open_file"
];
pythonImportsCheck = [ "mwtypes" ];
meta = with lib; {
description = "A set of classes for working with MediaWiki data types.";
homepage = "https://github.com/mediawiki-utilities/python-mwtypes";
license = licenses.mit;
maintainers = with maintainers; [ GaetanLepage ];
};
}
pkgs/development/python-modules/mwxml/default.nix
+42
View File
@@ -0,0 +1,42 @@
{ lib
, buildPythonPackage
, fetchPypi
, jsonschema
, mwcli
, mwtypes
, pytestCheckHook
, nose
}:
buildPythonPackage rec {
pname = "mwxml";
version = "0.3.3";
src = fetchPypi {
inherit pname version;
hash = "sha256-CEjfDPLik3GPVUMRrPRxW9Z59jn05Sy+R9ggZYnbHTE=";
};
propagatedBuildInputs = [
jsonschema
mwcli
mwtypes
];
nativeCheckInputs = [ pytestCheckHook ];
checkInputs = [ nose ];
disabledTests = [
"test_page_with_discussion"
];
pythonImportsCheck = [ "mwxml" ];
meta = with lib; {
description = "A set of utilities for processing MediaWiki XML dump data";
homepage = "https://github.com/mediawiki-utilities/python-mwxml";
license = licenses.mit;
maintainers = with maintainers; [ GaetanLepage ];
};
}
pkgs/development/python-modules/para/default.nix
+29
View File
@@ -0,0 +1,29 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytestCheckHook
, nose
}:
buildPythonPackage rec {
pname = "para";
version = "0.0.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-RsMjKunY6p2IbP0IzdESiSICvthkX0C2JVWXukz+8hc=";
};
nativeCheckInputs = [ pytestCheckHook ];
checkInputs = [ nose ];
pythonImportsCheck = [ "para" ];
meta = with lib; {
description = "A set utilities that ake advantage of python's 'multiprocessing' module to distribute CPU-intensive tasks";
homepage = "https://pypi.org/project/para";
license = licenses.mit;
maintainers = with maintainers; [ GaetanLepage ];
};
}
pkgs/development/python-modules/tensorflow-datasets/default.nix
+7 -2
View File
@@ -1,4 +1,5 @@
{ apache-beam
, array-record
, attrs
, beautifulsoup4
, buildPythonPackage
@@ -19,6 +20,7 @@
, lxml
, matplotlib
, mwparserfromhell
, mwxml
, networkx
, nltk
, numpy
@@ -46,13 +48,13 @@
buildPythonPackage rec {
pname = "tensorflow-datasets";
version = "4.8.2";
version = "4.9.2";
src = fetchFromGitHub {
owner = "tensorflow";
repo = "datasets";
rev = "refs/tags/v${version}";
hash = "sha256-FYFk53WKNQTSrnGGiA6cn9LffbMJkZtjlGuOF52Og7c=";
hash = "sha256-FKquhuk5hVBH9Im2RrIwgmosgqkoJHj0ESR2BmAOlbI=";
};
patches = [
@@ -61,6 +63,7 @@ buildPythonPackage rec {
];
propagatedBuildInputs = [
array-record
attrs
dill
dm-tree
@@ -95,6 +98,7 @@ buildPythonPackage rec {
lxml
matplotlib
mwparserfromhell
mwxml
networkx
nltk
opencv4
@@ -120,6 +124,7 @@ buildPythonPackage rec {
"tensorflow_datasets/core/registered_test.py"
"tensorflow_datasets/core/utils/gcs_utils_test.py"
"tensorflow_datasets/import_without_tf_test.py"
"tensorflow_datasets/proto/build_tf_proto_test.py"
"tensorflow_datasets/scripts/cli/build_test.py"
# Requires `pretty_midi` which is not packaged in `nixpkgs`.
pkgs/os-specific/linux/kernel/common-config.nix
+1
View File
@@ -170,6 +170,7 @@ let
NET = yes;
IP_ADVANCED_ROUTER = yes;
IP_PNP = no;
IP_ROUTE_MULTIPATH = yes;
IP_VS_PROTO_TCP = yes;
IP_VS_PROTO_UDP = yes;
IP_VS_PROTO_ESP = yes;
pkgs/servers/web-apps/freshrss/default.nix
+1 -1
View File
@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation rec {
};
passthru.tests = {
inherit (nixosTests) freshrss-sqlite freshrss-pgsql;
inherit (nixosTests) freshrss-sqlite freshrss-pgsql freshrss-http-auth;
};
buildInputs = [ php ];
pkgs/servers/web-apps/searxng/default.nix
+19 -6
View File
@@ -5,22 +5,35 @@
python3.pkgs.buildPythonApplication rec {
pname = "searxng";
version = "unstable-2023-06-26";
version = "unstable-2023-07-19";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "da7c30291dcf53cc5b3d98f9aada5615cd1593a9";
sha256 = "sha256-kbNw/YgcBZNkmn2nmsnEnc9Y8MJg3zGFdW1x9GIo+dM=";
rev = "a446dea1bb492eac417de9a900fae7cdf94aeec0";
sha256 = "sha256-iZDaKCkDlp3O3IixWdXVykNRIxas+irG0dWAOU4wycI=";
};
postPatch = ''
sed -i 's/==.*$//' requirements.txt
'';
preBuild = ''
export SEARX_DEBUG="true";
'';
preBuild =
let
versionString = lib.concatStringsSep "." (builtins.tail (lib.splitString "-" version));
commitAbbrev = builtins.substring 0 8 src.rev;
in
''
export SEARX_DEBUG="true";
cat > searx/version_frozen.py <<EOF
VERSION_STRING="${versionString}+${commitAbbrev}"
VERSION_TAG="${versionString}+${commitAbbrev}"
DOCKER_TAG="${versionString}-${commitAbbrev}"
GIT_URL="https://github.com/searxng/searxng"
GIT_BRANCH="master"
EOF
'';
propagatedBuildInputs = with python3.pkgs; [
babel
pkgs/tools/misc/ictree/default.nix
+23
View File
@@ -0,0 +1,23 @@
{ stdenv, lib, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "ictree";
version = "1.0.1";
src = fetchFromGitHub {
owner = "NikitaIvanovV";
repo = pname;
rev = "v${version}";
hash = "sha256-77Wo6jN8VUGTXBuGL0a9kvSIixdyEQoxqqNsHq9jcWw=";
fetchSubmodules = true;
};
makeFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
description = "Like tree but interactive";
homepage = "https://github.com/NikitaIvanovV/ictree";
platforms = platforms.unix;
maintainers = with maintainers; [ foo-dogsquared ];
};
}
pkgs/tools/system/netdata/default.nix
+2 -7
View File
@@ -17,14 +17,14 @@
stdenv.mkDerivation rec {
# Don't forget to update go.d.plugin.nix as well
version = "1.40.1";
version = "1.41.0";
pname = "netdata";
src = fetchFromGitHub {
owner = "netdata";
repo = "netdata";
rev = "v${version}";
sha256 = "sha256-4bYCsEeB0kEYtVFVXymFv7ELUo9RXoKbPjOlDKav8Rg=";
sha256 = "sha256-MZQ1ZTghH4bN7kCMqbyQlAGSgE70sYJxjiamTTH/6ds=";
fetchSubmodules = true;
};
@@ -49,11 +49,6 @@ stdenv.mkDerivation rec {
# required to prevent plugins from relying on /etc
# and /var
./no-files-in-etc-and-var.patch
# The current IPC location is unsafe as it writes
# a fixed path in /tmp, which is world-writable.
# Therefore we put it into `/run/netdata`, which is owned
# by netdata only.
./ipc-socket-in-run.patch
# Avoid build-only inputs in closure leaked by configure command:
# https://github.com/NixOS/nixpkgs/issues/175693#issuecomment-1143344162
pkgs/tools/system/netdata/no-files-in-etc-and-var.patch
+7 -9
View File
@@ -1,8 +1,8 @@
diff --git a/collectors/Makefile.am b/collectors/Makefile.am
index 24e4c3f09..b3c354943 100644
index 2aec3dd3e..27385ec28 100644
--- a/collectors/Makefile.am
+++ b/collectors/Makefile.am
@@ -30,7 +30,7 @@ usercustompluginsconfigdir=$(configdir)/custom-plugins.d
@@ -31,7 +31,7 @@ usercustompluginsconfigdir=$(configdir)/custom-plugins.d
usergoconfigdir=$(configdir)/go.d
# Explicitly install directories to avoid permission issues due to umask
@@ -62,7 +62,7 @@ index c8144c137..f8aaa89b6 100644
+no-install-exec-local:
$(INSTALL) -d $(DESTDIR)$(userstatsdconfigdir)
diff --git a/health/Makefile.am b/health/Makefile.am
index ea1b6e961..071fdd564 100644
index 20e000860..add0137b3 100644
--- a/health/Makefile.am
+++ b/health/Makefile.am
@@ -19,7 +19,7 @@ dist_userhealthconfig_DATA = \
@@ -75,10 +75,10 @@ index ea1b6e961..071fdd564 100644
healthconfigdir=$(libconfigdir)/health.d
diff --git a/system/Makefile.am b/system/Makefile.am
index 13466639d..e7cc7acea 100644
index 54e9278c8..e7cc7acea 100644
--- a/system/Makefile.am
+++ b/system/Makefile.am
@@ -21,11 +21,9 @@ include $(top_srcdir)/build/subst.inc
@@ -21,12 +21,9 @@ include $(top_srcdir)/build/subst.inc
SUFFIXES = .in
dist_config_SCRIPTS = \
@@ -87,10 +87,11 @@ index 13466639d..e7cc7acea 100644
dist_config_DATA = \
- .install-type \
- netdata-updater.conf \
$(NULL)
libconfigvnodesdir=$(libconfigdir)/vnodes
@@ -45,7 +43,7 @@ libsysrunitdir=$(libsysdir)/runit
@@ -46,7 +43,7 @@ libsysrunitdir=$(libsysdir)/runit
libsyssystemddir=$(libsysdir)/systemd
# Explicitly install directories to avoid permission issues due to umask
@@ -112,6 +113,3 @@ index be2c545c3..55f373114 100644
$(INSTALL) -d $(DESTDIR)$(usersslconfigdir)
dist_noinst_DATA = \
--
2.40.1
pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch
+9 -9
View File
@@ -1,16 +1,16 @@
Shrink closure size by avoiding paths embedded from configure call.
https://github.com/NixOS/nixpkgs/issues/175693
diff --git a/daemon/buildinfo.c b/daemon/buildinfo.c
index 56cde84fc..011e7579d 100644
--- a/daemon/buildinfo.c
+++ b/daemon/buildinfo.c
@@ -247,7 +247,9 @@ void print_build_info(void) {
char *prebuilt_distro = NULL;
get_install_type(&install_type, &prebuilt_arch, &prebuilt_distro);
@@ -1040,7 +1040,7 @@ static void build_info_set_status(BUILD_INFO_SLOT slot, bool status) {
- printf("Configure options: %s\n", CONFIGURE_COMMAND);
+ // To minimize closure size do not persist configure options
+ // with build-time inputs.
+ printf("Configure options: REMOVED\n");
__attribute__((constructor)) void initialize_build_info(void) {
build_info_set_value(BIB_PACKAGING_NETDATA_VERSION, program_version);
- build_info_set_value(BIB_PACKAGING_CONFIGURE_OPTIONS, CONFIGURE_COMMAND);
+ build_info_set_value(BIB_PACKAGING_CONFIGURE_OPTIONS, "REMOVED FOR CLOSURE SIZE REASONS");
if (install_type == NULL) {
printf("Install type: unknown\n");
#ifdef COMPILED_FOR_LINUX
build_info_set_status(BIB_FEATURE_BUILT_FOR, true);
pkgs/top-level/aliases.nix
+1 -1
View File
@@ -1426,7 +1426,7 @@ mapAliases ({
pybitmessage = throw "pybitmessage was removed from nixpkgs as it is stuck on python2"; # Added 2022-01-01
pyext = throw "pyext was removed because it does not support python 3.11, is upstream unmaintained and was unused"; # Added 2022-11-21
pygmentex = texlive.bin.pygmentex; # Added 2019-12-15
pyload = throw "pyload has been removed from nixpkgs, as it was unmaintained"; # Added 2021-03-21
pyload = throw "pyload has been removed from nixpkgs. Use pyload-ng instead."; # Added 2021-03-21
pynagsystemd = throw "pynagsystemd was removed as it was unmaintained and incompatible with recent systemd versions. Instead use its fork check_systemd"; # Added 2020-10-24
pyo3-pack = maturin;
pypi2nix = throw "pypi2nix has been removed due to being unmaintained";
pkgs/top-level/all-packages.nix
+6
View File
@@ -2069,6 +2069,8 @@ with pkgs;
git-archive-all = python3.pkgs.callPackage ../applications/version-management/git-archive-all { };
git-backdate = callPackage ../applications/version-management/git-backdate { };
git-backup = callPackage ../applications/version-management/git-backup {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -5451,6 +5453,8 @@ with pkgs;
icdiff = callPackage ../tools/text/icdiff { };
ictree = callPackage ../tools/misc/ictree { };
inchi = callPackage ../development/libraries/inchi { };
icon-slicer = callPackage ../tools/X11/icon-slicer { };
@@ -34327,6 +34331,8 @@ with pkgs;
pwdsafety = callPackage ../tools/security/pwdsafety { };
pyload-ng = callPackage ../applications/networking/pyload-ng {};
pyrosimple = callPackage ../applications/networking/p2p/pyrosimple { };
qbittorrent = libsForQt5.callPackage ../applications/networking/p2p/qbittorrent { };
pkgs/top-level/python-packages.nix
+12
View File
@@ -3838,6 +3838,8 @@ self: super: with self; {
flask-testing = callPackage ../development/python-modules/flask-testing { };
flask-themes2 = callPackage ../development/python-modules/flask-themes2 { };
flask-versioned = callPackage ../development/python-modules/flask-versioned { };
flask-wtf = callPackage ../development/python-modules/flask-wtf { };
@@ -5379,6 +5381,8 @@ self: super: with self; {
json-stream-rs-tokenizer = callPackage ../development/python-modules/json-stream-rs-tokenizer { };
jsonable = callPackage ../development/python-modules/jsonable { };
jsonnet = buildPythonPackage { inherit (pkgs.jsonnet) name src; };
jsonpatch = callPackage ../development/python-modules/jsonpatch { };
@@ -6720,6 +6724,8 @@ self: super: with self; {
mujson = callPackage ../development/python-modules/mujson { };
mwcli = callPackage ../development/python-modules/mwcli { };
mwclient = callPackage ../development/python-modules/mwclient { };
mwdblib = callPackage ../development/python-modules/mwdblib { };
@@ -6728,6 +6734,10 @@ self: super: with self; {
mwparserfromhell = callPackage ../development/python-modules/mwparserfromhell { };
mwtypes = callPackage ../development/python-modules/mwtypes { };
mwxml = callPackage ../development/python-modules/mwxml { };
mxnet = callPackage ../development/python-modules/mxnet { };
myfitnesspal = callPackage ../development/python-modules/myfitnesspal { };
@@ -7537,6 +7547,8 @@ self: super: with self; {
papis-python-rofi = callPackage ../development/python-modules/papis-python-rofi { };
para = callPackage ../development/python-modules/para { };
param = callPackage ../development/python-modules/param { };
parameter-expansion-patched = callPackage ../development/python-modules/parameter-expansion-patched { };