cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/master' into staging-next

Browse source 
Conflicts:
- pkgs/development/python-modules/mdutils/default.nix
This commit is contained in:
Martin Weinelt 2023-03-12 15:59:15 +01:00
commit 5abe72f0b2
76 changed files with 706 additions and 631 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/applications/gis/zombietrackergps/default.nix
View file

@ -62,5 +62,6 @@ mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = with maintainers; [ sohalt ];
platforms = platforms.linux;
broken = true; # doesn't build with latest Marble
};
}

25
pkgs/applications/graphics/photoqt/default.nix
View file

@ -1,35 +1,28 @@
{ mkDerivation, lib, fetchurl, cmake, exiv2, graphicsmagick, libraw, fetchpatch
, qtbase, qtdeclarative, qtmultimedia, qtquickcontrols, qttools, qtgraphicaleffects
, extra-cmake-modules, poppler, kimageformats, libarchive}:
{ mkDerivation, lib, fetchurl, cmake, exiv2, graphicsmagick, libraw
, qtbase, qtdeclarative, qtmultimedia, qtquickcontrols2, qttools, qtgraphicaleffects
, extra-cmake-modules, poppler, kimageformats, libarchive, pugixml, wrapQtAppsHook}:
mkDerivation rec {
pname = "photoqt";
version = "1.7.1";
version = "3.1";
src = fetchurl {
url = "https://${pname}.org/pkgs/${pname}-${version}.tar.gz";
sha256 = "1qvxdh3cbjcywqx0da2qp8z092660qyzv5yknqbps2zr12qqb103";
hash = "sha256-hihfqE7XIlSAxPg3Kzld3LrYS97wDH//GGqpBpBwFm0=";
};
patches = [
# Fixes build with exiv2 0.27.1
(fetchpatch {
url = "https://gitlab.com/luspi/photoqt/commit/c6fd41478e818f3a651d40f96cab3d790e1c09a4.patch";
sha256 = "1j2pdr7hm3js7lswhb4qkf9sj9viclhjqz50qxpyd7pqrl1gf2va";
})
];
nativeBuildInputs = [ cmake extra-cmake-modules qttools ];
nativeBuildInputs = [ cmake extra-cmake-modules qttools wrapQtAppsHook ];
buildInputs = [
qtbase qtquickcontrols exiv2 graphicsmagick poppler
qtbase qtquickcontrols2 exiv2 graphicsmagick poppler
qtmultimedia qtdeclarative libraw qtgraphicaleffects
kimageformats libarchive
kimageformats libarchive pugixml
];
cmakeFlags = [
"-DFREEIMAGE=OFF"
"-DDEVIL=OFF"
"-DCHROMECAST=OFF"
];
preConfigure = ''

126
pkgs/applications/science/math/maxima/5.45.nix Normal file
View file

@ -0,0 +1,126 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, texinfo
, perl
, python3
, makeWrapper
, autoreconfHook
, rlwrap ? null
, tk ? null
, gnuplot ? null
, lisp-compiler
}:
let
# Allow to remove some executables from the $PATH of the wrapped binary
searchPath = lib.makeBinPath
(lib.filter (x: x != null) [ lisp-compiler rlwrap tk gnuplot ]);
in
stdenv.mkDerivation rec {
pname = "maxima";
# old version temporarily kept for sage due to
# https://github.com/sagemath/sage/issues/33718
version = "5.45.1";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
sha256 = "sha256-/pAWJ2lwvvIUoaJENIVYZEUU1/36pPyLnQ6Hr8u059w=";
};
nativeBuildInputs = [
autoreconfHook
lisp-compiler
makeWrapper
python3
texinfo
];
strictDeps = true;
nativeCheckInputs = [
gnuplot
];
postPatch = ''
substituteInPlace doc/info/Makefile.am --replace "/usr/bin/env perl" "${perl}/bin/perl"
'';
postInstall = ''
# Make sure that maxima can find its runtime dependencies.
for prog in "$out/bin/"*; do
wrapProgram "$prog" --prefix PATH ":" "$out/bin:${searchPath}"
done
# Move emacs modules and documentation into the right place.
mkdir -p $out/share/emacs $out/share/doc
ln -s ../maxima/${version}/emacs $out/share/emacs/site-lisp
ln -s ../maxima/${version}/doc $out/share/doc/maxima
''
+ (lib.optionalString (lisp-compiler.pname == "ecl") ''
cp src/binary-ecl/maxima.fas* "$out/lib/maxima/${version}/binary-ecl/"
'')
;
patches = [
# fix path to info dir (see https://trac.sagemath.org/ticket/11348)
(fetchpatch {
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/infodir.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
sha256 = "09v64n60f7i6frzryrj0zd056lvdpms3ajky4f9p6kankhbiv21x";
})
# fix https://sourceforge.net/p/maxima/bugs/2596/
(fetchpatch {
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/matrixexp.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
sha256 = "06961hn66rhjijfvyym21h39wk98sfxhp051da6gz0n9byhwc6zg";
})
# undo https://sourceforge.net/p/maxima/code/ci/f5e9b0f7eb122c4e48ea9df144dd57221e5ea0ca
# see https://trac.sagemath.org/ticket/13364#comment:93
(fetchpatch {
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/undoing_true_false_printing_patch.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
sha256 = "0fvi3rcjv6743sqsbgdzazy9jb6r1p1yq63zyj9fx42wd1hgf7yx";
})
] ++ lib.optionals (lisp-compiler.pname == "ecl") [
# build fasl, needed for ECL support
(fetchpatch {
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/maxima.system.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
sha256 = "18zafig8vflhkr80jq2ivk46k92dkszqlyq8cfmj0b2vcfjwwbar";
})
];
# The test suite is disabled since 5.42.2 because of the following issues:
#
# Error(s) found:
# /build/maxima-5.44.0/share/linearalgebra/rtest_matrixexp.mac problems:
# (20 21 22)
# Tests that were expected to fail but passed:
# /build/maxima-5.44.0/share/vector/rtest_vect.mac problem:
# (19)
# 3 tests failed out of 16,184 total tests.
#
# These failures don't look serious. It would be nice to fix them, but I
# don't know how and probably won't have the time to find out.
doCheck = false; # try to re-enable after next version update
enableParallelBuilding = true;
passthru = {
inherit lisp-compiler;
};
meta = with lib; {
description = "Computer algebra system";
homepage = "http://maxima.sourceforge.net";
license = licenses.gpl2Plus;
longDescription = ''
Maxima is a fairly complete computer algebra system written in
lisp with an emphasis on symbolic computation. It is based on
DOE-MACSYMA and licensed under the GPL. Its abilities include
symbolic integration, 3D plotting, and an ODE solver.
'';
maintainers = with maintainers; [ doronbehar ];
platforms = platforms.unix;
};
}

2
pkgs/applications/science/math/sage/default.nix
View file

@ -128,7 +128,7 @@ let
singular = pkgs.singular.override { inherit flint; };
maxima = pkgs.maxima.override {
maxima = pkgs.maxima-ecl-5_45.override {
lisp-compiler = pkgs.ecl.override {
# "echo syntax error | ecl > /dev/full 2>&1" segfaults in
# ECL. We apply a patch to fix it (write_error.patch), but it

88
pkgs/applications/video/kodi/add-KODI_WEBSERVER_EXTRA_WHITELIST.patch
View file

@ -1,88 +0,0 @@
From 620c3eb38f0dbea6e877e37e97508513e87a0732 Mon Sep 17 00:00:00 2001
From: Jeremy Fleischman <jeremyfleischman@gmail.com>
Date: Sun, 27 Mar 2022 00:44:52 -0700
Subject: [PATCH] Add new KODI_WEBSERVER_EXTRA_WHITELIST cmake var to allow
access to more directories
(This is a backport of
https://github.com/xbmc/xbmc/commit/a6dedce7ba1f03bdd83b019941d1e369a06f7888
to Kodi 19.4 Matrix)
This is useful for NixOS, which often ends up creating a `KODI_HOME`
with symlinks to other files (including the chorus2 interface). Kodi's
webserver cautiously refuses to follow these symlinks, and you end up
getting 404s rather than the web page.
See https://forum.kodi.tv/showthread.php?tid=366338&pid=3079493 for a
discussion of this on the Kodi forum.
---
CMakeLists.txt | 1 +
xbmc/CompileInfo.cpp.in | 5 +++++
xbmc/CompileInfo.h | 1 +
xbmc/utils/FileUtils.cpp | 6 +++++-
4 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d5369798df23..d5ef6d9390ef0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -243,6 +243,7 @@ add_custom_command(OUTPUT ${CORE_BUILD_DIR}/xbmc/CompileInfo.cpp
-DAPP_BUILD_DATE=${APP_BUILD_DATE}
-DAPP_SHARED_LIBRARY_SUFFIX="${APP_SHARED_LIBRARY_SUFFIX}"
-Dprefix=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}
+ -DKODI_WEBSERVER_EXTRA_WHITELIST="${KODI_WEBSERVER_EXTRA_WHITELIST}"
-P ${CMAKE_SOURCE_DIR}/cmake/scripts/common/GenerateVersionedFiles.cmake
DEPENDS ${CMAKE_SOURCE_DIR}/version.txt
export-files
diff --git a/xbmc/CompileInfo.cpp.in b/xbmc/CompileInfo.cpp.in
index f81fe77902236..4f19203a89cde 100644
--- a/xbmc/CompileInfo.cpp.in
+++ b/xbmc/CompileInfo.cpp.in
@@ -105,3 +105,8 @@ std::vector<std::string> CCompileInfo::GetAvailableWindowSystems()
{
return StringUtils::Split("@CORE_PLATFORM_NAME_LC@", ' ');
}
+
+const std::vector<std::string> CCompileInfo::GetWebserverExtraWhitelist()
+{
+ return StringUtils::Split("@KODI_WEBSERVER_EXTRA_WHITELIST@", ',');
+}
diff --git a/xbmc/CompileInfo.h b/xbmc/CompileInfo.h
index 553a0194ee77f..e2521324e6576 100644
--- a/xbmc/CompileInfo.h
+++ b/xbmc/CompileInfo.h
@@ -32,4 +32,5 @@ class CCompileInfo
static const char* GetVersionCode();
static std::vector<std::string> GetAvailableWindowSystems();
static std::vector<ADDON::RepoInfo> LoadOfficialRepoInfos();
+ static const std::vector<std::string> GetWebserverExtraWhitelist();
};
diff --git a/xbmc/utils/FileUtils.cpp b/xbmc/utils/FileUtils.cpp
index e51f3d631c256..fc717c9608098 100644
--- a/xbmc/utils/FileUtils.cpp
+++ b/xbmc/utils/FileUtils.cpp
@@ -6,6 +6,7 @@
* See LICENSES/README.md for more information.
*/
+#include "CompileInfo.h"
#include "FileUtils.h"
#include "ServiceBroker.h"
#include "guilib/GUIKeyboardFactory.h"
@@ -261,12 +262,15 @@ bool CFileUtils::CheckFileAccessAllowed(const std::string &filePath)
"/.ssh/",
};
// ALLOW kodi paths
- const std::vector<std::string> whitelist = {
+ std::vector<std::string> whitelist = {
CSpecialProtocol::TranslatePath("special://home"),
CSpecialProtocol::TranslatePath("special://xbmc"),
CSpecialProtocol::TranslatePath("special://musicartistsinfo")
};
+ auto kodiExtraWhitelist = CCompileInfo::GetWebserverExtraWhitelist();
+ whitelist.insert(whitelist.end(), kodiExtraWhitelist.begin(), kodiExtraWhitelist.end());
+
// image urls come in the form of image://... sometimes with a / appended at the end
// and can be embedded in a music or video file image://music@...
// strip this off to get the real file path

2
pkgs/applications/video/kodi/addons/addon-update-script/default.nix
View file

@ -9,7 +9,7 @@
{ attrPath }:
let
url = "http://mirrors.kodi.tv/addons/matrix/addons.xml.gz";
url = "http://mirrors.kodi.tv/addons/nexus/addons.xml.gz";
updateScript = writeShellScript "update.sh" ''
set -ex

4
pkgs/applications/video/kodi/addons/arrow/default.nix
View file

@ -5,8 +5,8 @@ buildKodiAddon rec {
version = "1.0.3.1";
src = fetchzip {
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
sha256 = "0xa16sb2hls59l4gsg1xwb1qbkhcvbykq02l05n5rcm0alg80l3l";
url = "https://mirrors.kodi.tv/addons/nexus/script.module.arrow/script.module.arrow-${version}.zip";
sha256 = "sha256-dFCAHlWgslxsAVQAPP3aDM6Fw+I9PP0ITUVTKJY2QXU=";
};
propagatedBuildInputs = [

2
pkgs/applications/video/kodi/addons/arteplussept/default.nix
View file

@ -6,7 +6,7 @@ buildKodiAddon rec {
version = "1.1.8";
src = fetchzip {
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
hash = "sha256-1f+oEHEhSsDMXH7WssSVjjuDjK3UNyMiNhaw7mh/xjI=";
};

4
pkgs/applications/video/kodi/addons/certifi/default.nix
View file

@ -5,8 +5,8 @@ buildKodiAddon rec {
version = "2022.9.24";
src = fetchzip {
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
sha256 = "kIPGEjmnHlgVb11W2RKBlrMy3/+kUOcQZiLCcnHCcno=";
url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
sha256 = "sha256-kIPGEjmnHlgVb11W2RKBlrMy3/+kUOcQZiLCcnHCcno=";
};
passthru = {

4
pkgs/applications/video/kodi/addons/chardet/default.nix
View file

@ -5,8 +5,8 @@ buildKodiAddon rec {
version = "4.0.0+matrix.1";
src = fetchzip {
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
sha256 = "1jsd165mb1b8jdan2jbjd3y3xa0xam2cxcccmwazkybpa0r6a7dj";
url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
sha256 = "sha256-sh1lMlB3+fkVr4yxzkRVHag+/GhySWFVk2iFVYsJTcs=";
};
passthru = {

4
pkgs/applications/video/kodi/addons/dateutil/default.nix
View file

@ -6,8 +6,8 @@ buildKodiAddon rec {
version = "2.8.2";
src = fetchzip {
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
sha256 = "iQnyS0GjYcPbnBDUxmMrmDxHOA3K8RbTVke/HF4d5u4=";
url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
sha256 = "sha256-iQnyS0GjYcPbnBDUxmMrmDxHOA3K8RbTVke/HF4d5u4=";
};
propagatedBuildInputs = [

4
pkgs/applications/video/kodi/addons/defusedxml/default.nix
View file

@ -6,8 +6,8 @@ buildKodiAddon rec {
version = "0.6.0+matrix.1";
src = fetchzip {
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
sha256 = "026i5rx9rmxcc18ixp6qhbryqdl4pn7cbwqicrishivan6apnacd";
url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
sha256 = "sha256-jSl7lbFqR6hjZhHzxY69hDbs84LY3B5RYKzXnHou0Qg=";
};
passthru = {

2
pkgs/applications/video/kodi/addons/future/default.nix
View file

@ -6,7 +6,7 @@ buildKodiAddon rec {
version = "0.18.2+matrix.1";
src = fetchzip {
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
sha256 = "sha256-QBG7V70Dwmfq8ISILxGNvtmQT9fJp2e5gs2C9skRwIw=";
};

4
pkgs/applications/video/kodi/addons/idna/default.nix
View file

@ -5,8 +5,8 @@ buildKodiAddon rec {
version = "3.4.0";
src = fetchzip {
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
sha256 = "wS1d1L18v4+RGwxDh7OpKRHB2A4qYwiq6b5mAz7l8Pk=";
url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
sha256 = "sha256-wS1d1L18v4+RGwxDh7OpKRHB2A4qYwiq6b5mAz7l8Pk=";
};
passthru = {

17
pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix
View file

@ -1,16 +1,29 @@
{ stdenv, lib, rel, addonDir, buildKodiBinaryAddon, fetchFromGitHub, expat, glib, nspr, nss, gtest }:
let
bento4 = fetchFromGitHub {
owner = "xbmc";
repo = "Bento4";
rev = "1.6.0-639-5-${rel}";
sha256 = "sha256-jjeBy3LmnN7hPjnbBSPcdtPD+MdbG+0kU8mekM2/ZFw=";
};
in
buildKodiBinaryAddon rec {
pname = "inputstream-adaptive";
namespace = "inputstream.adaptive";
version = "19.0.7";
version = "20.3.2";
src = fetchFromGitHub {
owner = "xbmc";
repo = "inputstream.adaptive";
rev = "${version}-${rel}";
sha256 = "sha256-2bQVTSMznh7soeL1VJJpXrlZd4ONmP9wq9pYLnwPnZE=";
sha256 = "sha256-QG0qBRbUJJgsRLS2cQIDeTDYLjqVD0dRaZ7pCxpxNcs=";
};
extraCMakeFlags = [
"-DENABLE_INTERNAL_BENTO4=ON"
"-DBENTO4_URL=${bento4}"
];
extraNativeBuildInputs = [ gtest ];
extraBuildInputs = [ expat ];

4
pkgs/applications/video/kodi/addons/inputstream-ffmpegdirect/default.nix
View file

@ -3,13 +3,13 @@
buildKodiBinaryAddon rec {
pname = "inputstream-ffmpegdirect";
namespace = "inputstream.ffmpegdirect";
version = "19.0.3";
version = "20.5.0";
src = fetchFromGitHub {
owner = "xbmc";
repo = "inputstream.ffmpegdirect";
rev = "${version}-${rel}";
sha256 = "sha256-G1+WhF0iEOhgQPXPv0LjpLSvDk3JpkryaGJYuG+5P40=";
sha256 = "sha256-2Xa5q+o/AYDwG+JYeXTUfMTJk/kln16J8KRcXILNE6c=";
};
extraBuildInputs = [ bzip2 zlib kodi.ffmpeg ];

4
pkgs/applications/video/kodi/addons/inputstream-rtmp/default.nix
View file

@ -3,13 +3,13 @@
buildKodiBinaryAddon rec {
pname = "inputstream-rtmp";
namespace = "inputstream.rtmp";
version = "19.0.1";
version = "20.3.0";
src = fetchFromGitHub {
owner = "xbmc";
repo = "inputstream.rtmp";
rev = "${version}-${rel}";
sha256 = "sha256-BNc9HJ4Yq1WTxTr7AUHBB9yDz8oefy2EtFRwVYVGcaY=";
sha256 = "sha256-VF2DpQXXU+rj76e/de5YB1T7dzeOjmO0dpsPVqEnMy4=";
};
extraBuildInputs = [ openssl rtmpdump zlib ];

4
pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix
View file

@ -5,8 +5,8 @@ buildKodiAddon rec {
version = "0.5.10+matrix.1";
src = fetchzip {
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
sha256 = "FcOktwtOT7kDM+3y9qPDk3xU1qVeCduyAdUzebtJzv4=";
url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
sha256 = "sha256-FcOktwtOT7kDM+3y9qPDk3xU1qVeCduyAdUzebtJzv4=";
};
passthru = {

4
pkgs/applications/video/kodi/addons/joystick/default.nix
View file

@ -2,13 +2,13 @@
buildKodiBinaryAddon rec {
pname = namespace;
namespace = "peripheral.joystick";
version = "19.0.1";
version = "20.1.0";
src = fetchFromGitHub {
owner = "xbmc";
repo = namespace;
rev = "${version}-${rel}";
sha256 = "sha256-jSz0AgxhbCIbbZJxm4oq22y/hqew949UsqEAPoqEnHA=";
sha256 = "sha256-LdagiN0bVanmGkAy9APbP1TW68KES7BIy5PXgUzksJQ=";
};
extraBuildInputs = [ tinyxml udev ];

4
pkgs/applications/video/kodi/addons/keymap/default.nix
View file

@ -6,8 +6,8 @@ buildKodiAddon rec {
version = "1.1.4";
src = fetchzip {
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
sha256 = "eWzMqsE8H0wUvPyd3wvjiaXEg4+sgkQ3CQYjE0VS+9g=";
url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
sha256 = "sha256-eWzMqsE8H0wUvPyd3wvjiaXEg4+sgkQ3CQYjE0VS+9g=";
};
propagatedBuildInputs = [

4
pkgs/applications/video/kodi/addons/kodi-six/default.nix
View file

@ -6,8 +6,8 @@ buildKodiAddon rec {
version = "0.1.3.1";
src = fetchzip {
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
sha256 = "14m232p9hx925pbk8knsg994m1nbpa5278zmcrnfblh4z84gjv4x";
url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
sha256 = "sha256-nWz5CPoE0uVsZvWjI4q6y4ZKUnraTjTXLSJ1mK4YopI=";
};
passthru = {

4
pkgs/applications/video/kodi/addons/libretro-genplus/default.nix
View file

@ -1,4 +1,4 @@
{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, libretro, genesis-plus-gx }:
{ lib, buildKodiBinaryAddon, fetchFromGitHub, libretro, genesis-plus-gx }:
buildKodiBinaryAddon rec {
pname = "kodi-libretro-genplus";
@ -8,7 +8,7 @@ buildKodiBinaryAddon rec {
src = fetchFromGitHub {
owner = "kodi-game";
repo = "game.libretro.genplus";
rev = "${version}-${rel}";
rev = "${version}-Matrix";
sha256 = "sha256-F3bt129lBZKlDtp7X0S0q10T9k9C2zNeHG+yIP3818Q=";
};

4
pkgs/applications/video/kodi/addons/libretro-mgba/default.nix
View file

@ -1,4 +1,4 @@
{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, libretro, mgba }:
{ lib, buildKodiBinaryAddon, fetchFromGitHub, libretro, mgba }:
buildKodiBinaryAddon rec {
pname = "kodi-libretro-mgba";
@ -8,7 +8,7 @@ buildKodiBinaryAddon rec {
src = fetchFromGitHub {
owner = "kodi-game";
repo = "game.libretro.mgba";
rev = "${version}-${rel}";
rev = "${version}-Matrix";
sha256 = "sha256-lxpj6Y34apYcE22q4W3Anhigp79r4RgiJ36DbES1kzU=";
};

4
pkgs/applications/video/kodi/addons/libretro-snes9x/default.nix
View file

@ -1,4 +1,4 @@
{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, libretro, snes9x }:
{ lib, buildKodiBinaryAddon, fetchFromGitHub, libretro, snes9x }:
buildKodiBinaryAddon rec {
pname = "kodi-libretro-snes9x";
@ -8,7 +8,7 @@ buildKodiBinaryAddon rec {
src = fetchFromGitHub {
owner = "kodi-game";
repo = "game.libretro.snes9x";
rev = "${version}-${rel}";
rev = "${version}-Matrix";
sha256 = "sha256-LniZf8Gae4+4Rgc9OGhMCkOI3IA7CPjVrN/gbz9te38=";
};

4
pkgs/applications/video/kodi/addons/libretro/default.nix
View file

@ -3,13 +3,13 @@
buildKodiBinaryAddon rec {
pname = "libretro";
namespace = "game.libretro";
version = "19.0.0";
version = "20.1.0";
src = fetchFromGitHub {
owner = "kodi-game";
repo = "game.libretro";
rev = "${version}-${rel}";
sha256 = "1831wbbc4a545lr4mg1fm4sbx75k5lkrfqaa5fh308aar0nm974d";
sha256 = "sha256-RwaLGAJt13PLKy45HU64TvQFyY532WWq2YX34Eyu+6o=";
};
extraBuildInputs = [ tinyxml ];

4
pkgs/applications/video/kodi/addons/myconnpy/default.nix
View file

@ -5,8 +5,8 @@ buildKodiAddon rec {
version = "8.0.18+matrix.1";
src = fetchzip {
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
sha256 = "1cx3qdzw9lkkmbyvyrmc2i193is20fihn2sfl7kmv43f708vam0k";
url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
sha256 = "sha256-E1S1EThukF3noU4LC6MDQseRQhSsZr/9qnPSxH/Do7M=";
};
passthru = {

4
pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix
View file

@ -2,13 +2,13 @@
buildKodiBinaryAddon rec {
pname = "pvr-hdhomerun";
namespace = "pvr.hdhomerun";
version = "19.1.0";
version = "20.4.0";
src = fetchFromGitHub {
owner = "kodi-pvr";
repo = "pvr.hdhomerun";
rev = "${version}-${rel}";
sha256 = "sha256-sYVb4nhUz2j19yv3/cyLyUAC+1K0c05+iAMEfpPifjs=";
sha256 = "sha256-FKxoPD8t5JbouhvQtMVMFjk3O5zB9kVgrn0eC2RPDvQ=";
};
extraBuildInputs = [ jsoncpp libhdhomerun ];

4
pkgs/applications/video/kodi/addons/pvr-hts/default.nix
View file

@ -2,13 +2,13 @@
buildKodiBinaryAddon rec {
pname = "pvr-hts";
namespace = "pvr.hts";
version = "19.0.6";
version = "20.6.0";
src = fetchFromGitHub {
owner = "kodi-pvr";
repo = "pvr.hts";
rev = "${version}-${rel}";
sha256 = "sha256-Lc3B1TdQ4oQIEIyKuQju+5cpInF5i2u4WFe3okFhe+I=";
sha256 = "sha256-D6t61/KUEQBMw5WrCfiWyFHnGbnpHWVKzzdgiRpviig=";
};
meta = with lib; {

4
pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix
View file

@ -6,13 +6,13 @@
buildKodiBinaryAddon rec {
pname = "pvr-iptvsimple";
namespace = "pvr.iptvsimple";
version = "19.2.2";
version = "20.6.1";
src = fetchFromGitHub {
owner = "kodi-pvr";
repo = "pvr.iptvsimple";
rev = "${version}-${rel}";
sha256 = "sha256-snW6sgbdyGqdZtd7HU5FTf4Kx5/Zjk2fLLi0MS+9tTU=";
sha256 = "sha256-fJDMxNDXDijPL0sg86LB6nYQwjTdInf3dyOr8Lkydmg=";
};
extraBuildInputs = [

4
pkgs/applications/video/kodi/addons/requests-cache/default.nix
View file

@ -5,8 +5,8 @@ buildKodiAddon rec {
version = "0.5.2+matrix.2";
src = fetchzip {
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
sha256 = "0fgl4jayq6hbhqxg16nfy9qizwf54c8nvg0icv93knaj13zfzkz8";
url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
sha256 = "sha256-6M/v/ghS2TnSZhG8bREjxfEfcfLOmvA6hgsa7JUk9Dk=";
};
propagatedBuildInputs = [

4
pkgs/applications/video/kodi/addons/requests/default.nix
View file

@ -5,8 +5,8 @@ buildKodiAddon rec {
version = "2.27.1+matrix.1";
src = fetchzip {
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
sha256 = "QxxVT6XaEYQtAFkZde8EaTXzGO7cjG2pApQZcA32xA0=";
url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
sha256 = "sha256-QxxVT6XaEYQtAFkZde8EaTXzGO7cjG2pApQZcA32xA0=";
};
propagatedBuildInputs = [

4
pkgs/applications/video/kodi/addons/routing/default.nix
View file

@ -5,8 +5,8 @@ buildKodiAddon rec {
version = "0.2.3+matrix.1";
src = fetchzip {
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
sha256 = "1qhp40xd8mbcvzwlamqw1j5l224ry086593948g24drpqiiyc8x6";
url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
sha256 = "sha256-piPmY8Q3NyIeImmkYhDwmQhBiwwcV0X532xV1DogF+I=";
};
passthru = {

4
pkgs/applications/video/kodi/addons/signals/default.nix
View file

@ -5,8 +5,8 @@ buildKodiAddon rec {
version = "0.0.6+matrix.1";
src = fetchzip {
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
sha256 = "1qcjbakch8hvx02wc01zv014nmzgn6ahc4n2bj5mzr114ppd3hjs";
url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
sha256 = "sha256-WsLR7iUh5F+LXMISBpWx71dLAtg/AMYF6BsiyKZakuE=";
};
passthru= {

2
pkgs/applications/video/kodi/addons/simplejson/default.nix
View file

@ -6,7 +6,7 @@ buildKodiAddon rec {
version = "3.17.0+matrix.2";
src = fetchzip {
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
sha256 = "sha256-XLE4x0qr3CFwWqh1BfSg9q+w6pWgFBXG7TyVJWeGQIs=";
};

4
pkgs/applications/video/kodi/addons/six/default.nix
View file

@ -6,8 +6,8 @@ buildKodiAddon rec {
version = "1.15.0+matrix.1";
src = fetchzip {
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
sha256 = "0c8vb0c4vhknkqqgvzj8l2ddgcm4iah0ca686slxbxbp800cydnf";
url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
sha256 = "sha256-zjbPAEB39dWpNsgoBqCKpLLXmqBI/v0wnnbCTRhYGzE=";
};
passthru.updateScript = addonUpdateScript {

6
pkgs/applications/video/kodi/addons/steam-controller/default.nix
View file

@ -2,13 +2,13 @@
buildKodiBinaryAddon rec {
pname = namespace;
namespace = "peripheral.steamcontroller";
version = "0.11.0";
version = "20.0.2";
src = fetchFromGitHub {
owner = "kodi-game";
repo = namespace;
rev = "f68140ca44f163a03d3a625d1f2005a6edef96cb";
sha256 = "09lm8i119xlsxxk0c64rnp8iw0crr90v7m8iwi9r31qdmxrdxpmg";
rev = "b3174673c6feb34325975b6c007581c39bf3e4a5";
sha256 = "sha256-Q+eJfbD4NpAPANm9Mx9/pD29L5tdS4gxhQqNufufYdw=";
};
extraBuildInputs = [ libusb1 ];

4
pkgs/applications/video/kodi/addons/trakt-module/default.nix
View file

@ -5,8 +5,8 @@ buildKodiAddon rec {
version = "4.4.0+matrix.1";
src = fetchzip {
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
sha256 = "19kjhrykx92sy67cajxjckzdwgq47ipwml0bx9vmdr9d191h14p8";
url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
sha256 = "sha256-6JIAQwot5VZ36gvQym88BD/e/mSyS8WO8VqkPn2GcqY=";
};
propagatedBuildInputs = [

4
pkgs/applications/video/kodi/addons/trakt/default.nix
View file

@ -5,8 +5,8 @@ buildKodiAddon rec {
version = "3.5.0";
src = fetchzip {
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
sha256 = "07fb0wjcr8ggidswrjs1r1hzi6grykiyi855bgm7pjzzk95kl99v";
url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
sha256 = "sha256-OyU6S5r/y3vqW6Wg6OP0+Zn4YchBy8x1i++hzCQHyx0=";
};
propagatedBuildInputs = [

4
pkgs/applications/video/kodi/addons/typing_extensions/default.nix
View file

@ -5,8 +5,8 @@ buildKodiAddon rec {
version = "3.7.4.3";
src = fetchzip {
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
sha256 = "0p28hchj05hmccs6b2836kh4vqdqnl169409f2845d0nw9y4wkqq";
url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
sha256 = "sha256-GE9OfOIWtEKQcAmQZAK1uOFN4DQDiWU0YxUWICGDSFw=";
};
passthru = {

4
pkgs/applications/video/kodi/addons/urllib3/default.nix
View file

@ -6,8 +6,8 @@ buildKodiAddon rec {
version = "1.26.13+matrix.1";
src = fetchzip {
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
sha256 = "pymhHS1TqRv9o/3zBtmP8QSLMXSgFYno0VaR+YqhJqY=";
url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
sha256 = "sha256-pymhHS1TqRv9o/3zBtmP8QSLMXSgFYno0VaR+YqhJqY=";
};
passthru = {

4
pkgs/applications/video/kodi/addons/vfs-libarchive/default.nix
View file

@ -2,13 +2,13 @@
buildKodiBinaryAddon rec {
pname = namespace;
namespace = "vfs.libarchive";
version = "19.0.1";
version = "20.1.0";
src = fetchFromGitHub {
owner = "xbmc";
repo = namespace;
rev = "${version}-${rel}";
sha256 = "sha256-4sERFC/XBEE46n+iq6YJg/5Wz0+223tq4+O5cIf6X6E=";
sha256 = "sha256-D0eLH+G+qF5xLBBX/FdJC+gKNQpqSb7LjRmi/99rPNg=";
};
extraBuildInputs = [ libarchive xz bzip2 zlib lz4 lzo openssl ];

4
pkgs/applications/video/kodi/addons/vfs-sftp/default.nix
View file

@ -2,13 +2,13 @@
buildKodiBinaryAddon rec {
pname = namespace;
namespace = "vfs.sftp";
version = "19.0.1";
version = "20.1.0";
src = fetchFromGitHub {
owner = "xbmc";
repo = namespace;
rev = "${version}-${rel}";
sha256 = "sha256-UXycPqPEn3W5X3SQs1fxgkdV5PSkzs3pjYyuhAVngt8=";
sha256 = "sha256-Dv/C8PHaSx13JoGp77rQPtp5G5EH5tqKqzjwZZA7+80=";
};
extraBuildInputs = [ openssl libssh zlib ];

4
pkgs/applications/video/kodi/addons/visualization-waveform/default.nix
View file

@ -3,13 +3,13 @@
buildKodiBinaryAddon rec {
pname = "visualization-waveform";
namespace = "visualization.waveform";
version = "19.0.3";
version = "20.2.1";
src = fetchFromGitHub {
owner = "xbmc";
repo = namespace;
rev = "${version}-${rel}";
hash = "sha256-3mTfL1UjPLDKardJy4IDNyzvHnkF//4nmWInOxP/XhQ=";
hash = "sha256-e1SIpMmfnS92X4f114MKch4o9Ke80aIzw6OQPrEb8d0=";
};
extraBuildInputs = [ pkg-config libGL ];

4
pkgs/applications/video/kodi/addons/websocket/default.nix
View file

@ -6,8 +6,8 @@ buildKodiAddon rec {
version = "0.58.0+matrix.2";
src = fetchzip {
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
sha256 = "0j2fcrn3hc6207g0k0gx5ypj4j3ww9pd7rnlzq1fgdig00laa8y7";
url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
sha256 = "sha256-xyOlKAAvtucC/tTm027ifEgiry/9gQneAcIwOGxmTkg=";
};
propagatedBuildInputs = [

4
pkgs/applications/video/kodi/addons/youtube/default.nix
View file

@ -6,8 +6,8 @@ buildKodiAddon rec {
version = "6.8.24+matrix.1";
src = fetchzip {
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
sha256 = "/yQML2iK5jcIhN6RJC+WJ8EnH640qFJFdaaVeGPEg9U=";
url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
sha256 = "sha256-/yQML2iK5jcIhN6RJC+WJ8EnH640qFJFdaaVeGPEg9U=";
};
propagatedBuildInputs = [

47
pkgs/applications/video/kodi/unwrapped.nix
View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, makeWrapper
{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, makeWrapper
, pkg-config, cmake, yasm, python3Packages
, libxcrypt, libgcrypt, libgpg-error, libunistring
, boost, avahi, lame
@ -38,25 +38,27 @@ assert usbSupport -> !udevSupport; # libusb-compat-0_1 won't be used if udev is
assert gbmSupport || waylandSupport || x11Support;
let
kodiReleaseDate = "20221204";
kodiVersion = "19.5";
rel = "Matrix";
kodiReleaseDate = "20230115";
kodiVersion = "20.0";
rel = "Nexus";
kodi_src = fetchFromGitHub {
owner = "xbmc";
repo = "xbmc";
rev = "${kodiVersion}-${rel}";
sha256 = "sha256-vprhEPxYpY3/AsUgvPNnhBlh0Dl73ekALAblHaUKzd0=";
sha256 = "sha256-0BkbA1iovouwjQVtiKFw3+64i7sMWZNiCUfOQ0EsslY=";
};
# see https://github.com/xbmc/xbmc/blob/${kodiVersion}-${rel}/tools/depends/target/ to get suggested versions for all dependencies
ffmpeg = stdenv.mkDerivation rec {
pname = "kodi-ffmpeg";
version = "4.3.2"; # see https://github.com/xbmc/xbmc/blob/${kodiVersion}-${rel}/tools/depends/target/ffmpeg/FFMPEG-VERSION
version = "4.4.1";
src = fetchFromGitHub {
owner = "xbmc";
repo = "FFmpeg";
rev = "${version}-${rel}-19.2";
sha256 = "14s215sgc93ds1mrdbkgb7fvy94lpgv2ldricyxzis0gbzqfgs4f";
rev = "${version}-${rel}-Alpha1";
sha256 = "sha256-EQHmmWnDw+/udKYq7Nrf00nL7I5XWUtmzdauDryfTII=";
};
preConfigure = ''
cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} .
@ -79,22 +81,22 @@ let
libdvdcss = fetchFromGitHub {
owner = "xbmc";
repo = "libdvdcss";
rev = "1.4.2-Leia-Beta-5";
sha256 = "0j41ydzx0imaix069s3z07xqw9q95k7llh06fc27dcn6f7b8ydyl";
rev = "1.4.3-Next-Nexus-Alpha2-2";
sha256 = "sha256-CJMGH50mNAkovccNcol5ArF3zUnZKfbVB9EXyQgu5k4=";
};
libdvdnav = fetchFromGitHub {
owner = "xbmc";
repo = "libdvdnav";
rev = "6.0.0-Leia-Alpha-3";
sha256 = "0qwlf4lgahxqxk1r2pzl866mi03pbp7l1fc0rk522sc0ak2s9jhb";
rev = "6.1.1-Next-Nexus-Alpha2-2";
sha256 = "sha256-m8SCjOokVbwJ7eVfYKHap1pQjVbI+BXaoxhGZQIg0+k=";
};
libdvdread = fetchFromGitHub {
owner = "xbmc";
repo = "libdvdread";
rev = "6.0.0-Leia-Alpha-3";
sha256 = "1xxn01mhkdnp10cqdr357wx77vyzfb5glqpqyg8m0skyi75aii59";
rev = "6.1.3-Next-Nexus-Alpha2-2";
sha256 = "sha256-AphBQhXud+a6wm52zjzC5biz53NnqWdgpL2QDt2ZuXc=";
};
kodi_platforms = lib.optional gbmSupport "gbm"
@ -107,22 +109,6 @@ in stdenv.mkDerivation {
src = kodi_src;
patches = [
# This is a backport of
# https://github.com/xbmc/xbmc/commit/a6dedce7ba1f03bdd83b019941d1e369a06f7888
# to Kodi 19.4 Matrix.
# This can be removed once a new major release of Kodi comes out and we upgrade
# to it.
./add-KODI_WEBSERVER_EXTRA_WHITELIST.patch
# A patch to fix build until the next major release of Kodi comes out and we upgrade
# https://github.com/xbmc/xbmc/pull/22291
(fetchpatch {
url = "https://github.com/xbmc/xbmc/commit/5449652abf0bb9dddd0d796de4120e60f19f89a5.patch";
sha256 = "sha256-vqX08dTSPhIur4aVu2BzXEpAxMOjaadwRNI43GSV9Og=";
})
];
buildInputs = [
gnutls libidn libtasn1 nasm p11-kit
libxml2 python3Packages.python
@ -196,6 +182,7 @@ in stdenv.mkDerivation {
"-DGIT_VERSION=${kodiReleaseDate}"
"-DENABLE_EVENTCLIENTS=ON"
"-DENABLE_INTERNAL_CROSSGUID=OFF"
"-DENABLE_INTERNAL_RapidJSON=OFF"
"-DENABLE_OPTICAL=ON"
"-DLIRC_DEVICE=/run/lirc/lircd"
"-DSWIG_EXECUTABLE=${buildPackages.swig}/bin/swig"

2
pkgs/development/libraries/kde-frameworks/fetch.sh
View file

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/frameworks/5.103/ -A '*.tar.xz' )
WGET_ARGS=( https://download.kde.org/stable/frameworks/5.104/ -A '*.tar.xz' )

664
pkgs/development/libraries/kde-frameworks/srcs.nix
View file

@ -4,667 +4,667 @@
{
attica = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/attica-5.103.0.tar.xz";
sha256 = "17b0kshlgi110v42zmvbsmcjjc48rn617l4dmviwd0ycd2kgqd1s";
name = "attica-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/attica-5.104.0.tar.xz";
sha256 = "0vxlh4qaws64qns13jpf026fxknpscj312vr3vpw8vwq8201qjf3";
name = "attica-5.104.0.tar.xz";
};
};
baloo = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/baloo-5.103.0.tar.xz";
sha256 = "1055wv29dd4i7az79q2qdk65wk5xqyslwxnwhxr30xzyp60i9smk";
name = "baloo-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/baloo-5.104.0.tar.xz";
sha256 = "0akklz0r4pc7dyk7jxf1hh8qz1i6hfvnbi3s0smsznm5f5x1ywls";
name = "baloo-5.104.0.tar.xz";
};
};
bluez-qt = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/bluez-qt-5.103.0.tar.xz";
sha256 = "1w6q3cna46ifv1gvnxp45n0z8civ2cab9sjbvsc3apks6w2iahzz";
name = "bluez-qt-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/bluez-qt-5.104.0.tar.xz";
sha256 = "1xg9i1f1jb53a937m7gky1jvglivqp1jf41krs781d5mb9kpw6vh";
name = "bluez-qt-5.104.0.tar.xz";
};
};
breeze-icons = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/breeze-icons-5.103.0.tar.xz";
sha256 = "1gas85qliib44j5cfpq47hfzni38afqyf9lxkgv1d0q7y87df9br";
name = "breeze-icons-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/breeze-icons-5.104.0.tar.xz";
sha256 = "0smfx8r4pmfj2qbk5cfsngyw8psv5sgk4f466z6pl73gzg1sqbgz";
name = "breeze-icons-5.104.0.tar.xz";
};
};
extra-cmake-modules = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/extra-cmake-modules-5.103.0.tar.xz";
sha256 = "0ij3kjggmil995kcjbfirwy1fis60wgj6m7jxaynz59qrdajxjlj";
name = "extra-cmake-modules-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/extra-cmake-modules-5.104.0.tar.xz";
sha256 = "1nc5ynfz903jc87xawnww3pf1y73x9jvmxnbrj24nqv6vcgv57p4";
name = "extra-cmake-modules-5.104.0.tar.xz";
};
};
frameworkintegration = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/frameworkintegration-5.103.0.tar.xz";
sha256 = "1gljch9nrnw28ix2q2hs29rk0bfzzr4pv0m1msdr0nm1lmyr7w93";
name = "frameworkintegration-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/frameworkintegration-5.104.0.tar.xz";
sha256 = "1s5r72ghs0xkk397693j6vvdi8vk5hkni78rrk0h63fw2x2hgj2i";
name = "frameworkintegration-5.104.0.tar.xz";
};
};
kactivities = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kactivities-5.103.0.tar.xz";
sha256 = "0dc89yx89kjjvmb6jycqmyb55pml46vy7xw24myin6xfisb8nckd";
name = "kactivities-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kactivities-5.104.0.tar.xz";
sha256 = "0lvrj7q88vgivl0jg2c8kayj9r0zjnpi5l7y87sdwi1sfqjibhr9";
name = "kactivities-5.104.0.tar.xz";
};
};
kactivities-stats = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kactivities-stats-5.103.0.tar.xz";
sha256 = "0ga51n9c64c4mhmbw1fisbxgcmy77qzi6bhvj3lgs1f829hi1r7r";
name = "kactivities-stats-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kactivities-stats-5.104.0.tar.xz";
sha256 = "0hxskcsbplj4s1cdkwhvwpxrinqhyqkmg8kf9dghsybfs6gkb7jf";
name = "kactivities-stats-5.104.0.tar.xz";
};
};
kapidox = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kapidox-5.103.0.tar.xz";
sha256 = "0j1di36qxgl5p1ljp2jlgp60psgq2724q0ysfsxapl3p4h9swdy5";
name = "kapidox-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kapidox-5.104.0.tar.xz";
sha256 = "0khrk65l1vl8ycghircjln76i2bdlv2xq7yq2pgqqfiaqmgd02c8";
name = "kapidox-5.104.0.tar.xz";
};
};
karchive = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/karchive-5.103.0.tar.xz";
sha256 = "0lqkvp42dc7rd6s00dlfxv4zm81zqyr8ijn6nmiychyw3mlxyarp";
name = "karchive-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/karchive-5.104.0.tar.xz";
sha256 = "0bpx6iankpgssfqiyz8vaz3vrkq2zipxd4h5gn8x46k9d3z3sbxn";
name = "karchive-5.104.0.tar.xz";
};
};
kauth = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kauth-5.103.0.tar.xz";
sha256 = "0m1x0b9ysl2rvm607q9qra6kwaalrgm8i8z4q7j8197a9njawffd";
name = "kauth-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kauth-5.104.0.tar.xz";
sha256 = "07jqgndkvrxdjwya0qlghq79wl28hlsnyad6wlvg3hb6ircqch31";
name = "kauth-5.104.0.tar.xz";
};
};
kbookmarks = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kbookmarks-5.103.0.tar.xz";
sha256 = "1b5dn6g54ix60dkvw6dmbxqjgimq6qy50qhrn2fj7r1rm6059pqs";
name = "kbookmarks-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kbookmarks-5.104.0.tar.xz";
sha256 = "0m33jd30kd214wf4v78rfjfffqbr69y72n9likfcdkrk09cnbrc5";
name = "kbookmarks-5.104.0.tar.xz";
};
};
kcalendarcore = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kcalendarcore-5.103.0.tar.xz";
sha256 = "1pafc7iwin7lbh6n7b5qr1h7x3n6wdviqazcjl2z7ikysnqkphbp";
name = "kcalendarcore-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kcalendarcore-5.104.0.tar.xz";
sha256 = "0chlr9kazgkiasx18gxckiys1dapvjs0bkyh7yirjmzkgazkf44f";
name = "kcalendarcore-5.104.0.tar.xz";
};
};
kcmutils = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kcmutils-5.103.0.tar.xz";
sha256 = "1xgrjv7r6zrlvjjqv07bqfb63f0vbhjj0sshi7qmf68k33g3c5fw";
name = "kcmutils-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kcmutils-5.104.0.tar.xz";
sha256 = "12hns58m4h768nfgspsac6ch0h95si6gf2j2dgr24ia4s241ajvm";
name = "kcmutils-5.104.0.tar.xz";
};
};
kcodecs = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kcodecs-5.103.0.tar.xz";
sha256 = "0fbgw84wf435ws0d9lldbgrmbscv6wz8pcws8dvfr7hkxkiwl52y";
name = "kcodecs-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kcodecs-5.104.0.tar.xz";
sha256 = "0swxj2kr37pnwdxsipfii8q02g58lvm9lsh4kflqgfjyhvv0kjby";
name = "kcodecs-5.104.0.tar.xz";
};
};
kcompletion = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kcompletion-5.103.0.tar.xz";
sha256 = "0kvnrg3p7washajvll9qqsk81bw289s75vrqm5safgdvlb5p88yh";
name = "kcompletion-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kcompletion-5.104.0.tar.xz";
sha256 = "045m5q1mh2c65zj5lb999p5i2ag346rg439gqq2dz0qjhx305vdh";
name = "kcompletion-5.104.0.tar.xz";
};
};
kconfig = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kconfig-5.103.0.tar.xz";
sha256 = "065r7ggdh3yxnqas7x20kqhyv070d7xryvc8apj0xsz1cvsychaz";
name = "kconfig-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kconfig-5.104.0.tar.xz";
sha256 = "0f19xj1a3ra3j93i1zzypqqw55dxjgc6baam2yq3x3p7n2vsdrxq";
name = "kconfig-5.104.0.tar.xz";
};
};
kconfigwidgets = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kconfigwidgets-5.103.0.tar.xz";
sha256 = "0wx3dbqp3xhx3334qaxjv8hpixg25791lsnkbainhq2frhwfy77r";
name = "kconfigwidgets-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kconfigwidgets-5.104.0.tar.xz";
sha256 = "08j5svm9ggrl8akq0w13wlw17cv4d4lvw4ggg26a3j512fw1947b";
name = "kconfigwidgets-5.104.0.tar.xz";
};
};
kcontacts = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kcontacts-5.103.0.tar.xz";
sha256 = "136ql3ycc1dw7njifxmqqsqkq2ig393206s0d0l6j7jlympng8sk";
name = "kcontacts-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kcontacts-5.104.0.tar.xz";
sha256 = "1jaj73jpdnvcia8q0kzrixpradcv3j9r2hln5mq9r0rssbj66h6m";
name = "kcontacts-5.104.0.tar.xz";
};
};
kcoreaddons = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kcoreaddons-5.103.0.tar.xz";
sha256 = "0sigfyznlnqba66i3qg22w1jl8lkhd1rjwd8da7gvgy2fh19vfdy";
name = "kcoreaddons-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kcoreaddons-5.104.0.tar.xz";
sha256 = "0h2fg77gg4z3my06111whnlmrb2939igwg6c1m406v7dgx50sxpd";
name = "kcoreaddons-5.104.0.tar.xz";
};
};
kcrash = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kcrash-5.103.0.tar.xz";
sha256 = "1rzbszkqirrgiiqjr468pw253c7a1d96bmhf0awhj9qnz5qs361m";
name = "kcrash-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kcrash-5.104.0.tar.xz";
sha256 = "15palx95pkbxf83nn7qalh80whfp7msn4i049zbsjl9fkr7h1mhj";
name = "kcrash-5.104.0.tar.xz";
};
};
kdav = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kdav-5.103.0.tar.xz";
sha256 = "0rm1nsbi6n6f6zvpja8cznz2lj4ca6jvzqjmvrd76pw2f2fii8il";
name = "kdav-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kdav-5.104.0.tar.xz";
sha256 = "0waw2saxlwsf22q3zlwz10vh6wcwabd3i5cbwnhlli2z86l7p2bg";
name = "kdav-5.104.0.tar.xz";
};
};
kdbusaddons = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kdbusaddons-5.103.0.tar.xz";
sha256 = "1qx4xcl6cakazpq7mpsnv2dl202y5agdypw0vvvw8j9bmc3bfxf6";
name = "kdbusaddons-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kdbusaddons-5.104.0.tar.xz";
sha256 = "1d2nzlw069m3m9i2x1rkqd4agssgckl2g7kjd0vvq1y4h42dssjc";
name = "kdbusaddons-5.104.0.tar.xz";
};
};
kdeclarative = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kdeclarative-5.103.0.tar.xz";
sha256 = "0lmjzxjm4hs4cb1m6704n6gqwpqvn8pib138mw8fvl8c03xmrjmn";
name = "kdeclarative-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kdeclarative-5.104.0.tar.xz";
sha256 = "1h76xn6f8wyw3bryxxvj90vah25z3kp2n0rx41gv0j11gsyr99w2";
name = "kdeclarative-5.104.0.tar.xz";
};
};
kded = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kded-5.103.0.tar.xz";
sha256 = "13clr3d1rls3w4syr0bsiiqlvpv54lhvw9jwy0p7hpz1rsz619q0";
name = "kded-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kded-5.104.0.tar.xz";
sha256 = "1by4gakr17cxpl0frcly73szpq95k5d6lgv4qmr5skn468h9g197";
name = "kded-5.104.0.tar.xz";
};
};
kdelibs4support = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/portingAids/kdelibs4support-5.103.0.tar.xz";
sha256 = "0lzq25a4q857j91496lxyhs4jf2l3p8s38xxnh0099f5la0akhpv";
name = "kdelibs4support-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/portingAids/kdelibs4support-5.104.0.tar.xz";
sha256 = "1wim766adlxkig7wmpb9jvv6d2navf3n24h9gj8hbkk4721bgalv";
name = "kdelibs4support-5.104.0.tar.xz";
};
};
kdesignerplugin = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/portingAids/kdesignerplugin-5.103.0.tar.xz";
sha256 = "1jismdz12lnq6dkv3c44jicjjpl25hxm7ghl7yw4nh73c76xflhw";
name = "kdesignerplugin-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/portingAids/kdesignerplugin-5.104.0.tar.xz";
sha256 = "10w1jvr47579azrg1h6bxxy7b6rshpzj5mkxkqynhf3ryd2056xw";
name = "kdesignerplugin-5.104.0.tar.xz";
};
};
kdesu = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kdesu-5.103.0.tar.xz";
sha256 = "19mbmnd1bl76dq8v0rm62lgkyl9b93a85g2zb1d9zkcqa5xcx2hi";
name = "kdesu-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kdesu-5.104.0.tar.xz";
sha256 = "1ckfic4zvmn0mab1aklg28f77w23rinpqm8yyx5g10b8dcgyp7i1";
name = "kdesu-5.104.0.tar.xz";
};
};
kdewebkit = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/portingAids/kdewebkit-5.103.0.tar.xz";
sha256 = "1kkmy641c4814aq8nfb56yq4ch724cwyv487wljpfly75migwcnz";
name = "kdewebkit-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/portingAids/kdewebkit-5.104.0.tar.xz";
sha256 = "1dl62bf0kxcnwzghbrrrh7p1awjyck41bqg907y49i76hflimqj0";
name = "kdewebkit-5.104.0.tar.xz";
};
};
kdnssd = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kdnssd-5.103.0.tar.xz";
sha256 = "1va56vqviic7y4b21g0kz6kdwf56bgylwv2wwrlbxcnz3dnsnyi6";
name = "kdnssd-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kdnssd-5.104.0.tar.xz";
sha256 = "1zk0rxrm63xdjjspa63smw4x9rsc5sakcxpaiysf265605yma89v";
name = "kdnssd-5.104.0.tar.xz";
};
};
kdoctools = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kdoctools-5.103.0.tar.xz";
sha256 = "1a74mkbfpxiyzs0p3q7hhndp1ricmc5mdbl96nd2c1i62pg84mxs";
name = "kdoctools-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kdoctools-5.104.0.tar.xz";
sha256 = "1p243fzm135vbqgdrpj9rah3ywaipsdamgz3add3an4cpk94wnqi";
name = "kdoctools-5.104.0.tar.xz";
};
};
kemoticons = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kemoticons-5.103.0.tar.xz";
sha256 = "10psbw1myvvnj5d2ri5f4la4dqa3sj124qd7iyijw0k870hw5h8k";
name = "kemoticons-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kemoticons-5.104.0.tar.xz";
sha256 = "1q62jjpyf7sfd45ksb01mpls3vp4bfh58sdp4bk0chnq0nlz6qff";
name = "kemoticons-5.104.0.tar.xz";
};
};
kfilemetadata = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kfilemetadata-5.103.0.tar.xz";
sha256 = "1h10jvdljlpasrkiidbdzfk8xs1gm5hm1j8m8nvz4mglhby9r329";
name = "kfilemetadata-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kfilemetadata-5.104.0.tar.xz";
sha256 = "016mdmnykcbgpms6xwxfavkq2cs289626bhpffhsgipf3sg1jkqy";
name = "kfilemetadata-5.104.0.tar.xz";
};
};
kglobalaccel = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kglobalaccel-5.103.0.tar.xz";
sha256 = "14jgs7nz4qw3d183s3rxkbz1mmbjamr57qdw7zi2xfpnma56ggls";
name = "kglobalaccel-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kglobalaccel-5.104.0.tar.xz";
sha256 = "1bkyp9x7cf9qp1mn67s7hzxzz7mvafgvdbqrmywrklxl82azilnr";
name = "kglobalaccel-5.104.0.tar.xz";
};
};
kguiaddons = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kguiaddons-5.103.0.tar.xz";
sha256 = "0cmjsp19q0c3cq433yq0id9habmrq0q8x3kvzi12pn64xzyq0cp6";
name = "kguiaddons-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kguiaddons-5.104.0.tar.xz";
sha256 = "03c4jcz8q0bn4r9d55f9d94330m1chk934z8x7wzcjk8bgi8v3gv";
name = "kguiaddons-5.104.0.tar.xz";
};
};
kholidays = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kholidays-5.103.0.tar.xz";
sha256 = "1kahvipcxkcz3qql6rf3qlafpmqs51jj478icnb4hhfp8q2m9xda";
name = "kholidays-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kholidays-5.104.0.tar.xz";
sha256 = "0b98z4psq6b1jl63r821sr327cxgps77l2ngg3d2fp5ns4ly8ks8";
name = "kholidays-5.104.0.tar.xz";
};
};
khtml = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/portingAids/khtml-5.103.0.tar.xz";
sha256 = "0d26ni10rdy6b368ij20j6bgf03hzdc7b7602fxnvwg0i0h54r4s";
name = "khtml-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/portingAids/khtml-5.104.0.tar.xz";
sha256 = "0iy4yq83xflbj8l91ki63wk2y08lgw1dxbc1m5nxjr7krrsah6z1";
name = "khtml-5.104.0.tar.xz";
};
};
ki18n = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/ki18n-5.103.0.tar.xz";
sha256 = "1rj0g12xjwm42qyrxb55mcpaz52s78b7i8ms9svrlza2gxi93siq";
name = "ki18n-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/ki18n-5.104.0.tar.xz";
sha256 = "1qafw55ply9k6jhk95s035gr3a1lg56nxdbs5i3zm06652g5p0gy";
name = "ki18n-5.104.0.tar.xz";
};
};
kiconthemes = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kiconthemes-5.103.0.tar.xz";
sha256 = "0khjzcy8b7rbf2pvpkin941a1cp1lsb2vr7n1ff3gdp33ra98828";
name = "kiconthemes-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kiconthemes-5.104.0.tar.xz";
sha256 = "1pycdidcgixshlhjfxzivh6fgxygs5p24f4qaf5s5nmca3wxkx3h";
name = "kiconthemes-5.104.0.tar.xz";
};
};
kidletime = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kidletime-5.103.0.tar.xz";
sha256 = "0hlq6jmkpdjmzcqzjdbhz3xw0b198cvd98zwyabirb8lf4v51wdh";
name = "kidletime-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kidletime-5.104.0.tar.xz";
sha256 = "0qc032mwd538s0lk6p0zks44jwdh1wdqicgpcw8jlk3rn9xslm4a";
name = "kidletime-5.104.0.tar.xz";
};
};
kimageformats = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kimageformats-5.103.0.tar.xz";
sha256 = "0zhyf9fh7i4jig8iryh2cp1m340ja2bzskayfisgx7fcm8bw8zfx";
name = "kimageformats-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kimageformats-5.104.0.tar.xz";
sha256 = "0pdl9gap5r5i6hcfx9443iw8f763nn7c9n4b0s9mnxzzmfs2px3r";
name = "kimageformats-5.104.0.tar.xz";
};
};
kinit = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kinit-5.103.0.tar.xz";
sha256 = "0y2xashdz2zv8gddaxr5w16l8yf1afi29b3a2rzh94ms9l0sln75";
name = "kinit-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kinit-5.104.0.tar.xz";
sha256 = "0d3jpmqylmgcxi7p21ij2nkvgmclkigjcfyypnhfqnzpja8nhy3i";
name = "kinit-5.104.0.tar.xz";
};
};
kio = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kio-5.103.0.tar.xz";
sha256 = "0izljyzjzcbsf6hg4302b2vjjxvxkvs23nxs0x0cr2d4b8v3fj0b";
name = "kio-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kio-5.104.0.tar.xz";
sha256 = "0473vlk0wpbz4nz2cyv19qkdblg6bdqs96kvrk26yh3jvsjr72ss";
name = "kio-5.104.0.tar.xz";
};
};
kirigami2 = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kirigami2-5.103.0.tar.xz";
sha256 = "0i1pr1w1082i00zzxx5x9zhr3ijsyl3l9i5nzx4znxvp3qi7yrm6";
name = "kirigami2-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kirigami2-5.104.0.tar.xz";
sha256 = "1cfs1fmwxk3sjv75kz42a8w19kdcl3yvqbjncwzwa8qkgdfy8dx0";
name = "kirigami2-5.104.0.tar.xz";
};
};
kitemmodels = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kitemmodels-5.103.0.tar.xz";
sha256 = "1jvhlcc0v3ww883rxb0nn4bh4pn91hmkdrr96vcwmwh8m1plsv1m";
name = "kitemmodels-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kitemmodels-5.104.0.tar.xz";
sha256 = "1mqqgddz9ci97zzs5xpj8vihklsxxmf6a4996gil6x30zki2zb0b";
name = "kitemmodels-5.104.0.tar.xz";
};
};
kitemviews = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kitemviews-5.103.0.tar.xz";
sha256 = "0klwci9dsa11f43q6nhcay506m800sk5gc03fkv0992y8mnh8sc0";
name = "kitemviews-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kitemviews-5.104.0.tar.xz";
sha256 = "1g28bb3qpha2lfmxcjzwjy6fzjmykr71jkn6g7x1jwqqik30v4ll";
name = "kitemviews-5.104.0.tar.xz";
};
};
kjobwidgets = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kjobwidgets-5.103.0.tar.xz";
sha256 = "11j8zx4lj04hw5g7jg7jyw6p34fd6qq9p813v2hlszfbjz3hldgs";
name = "kjobwidgets-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kjobwidgets-5.104.0.tar.xz";
sha256 = "18gyp1p2bldyn5l97x0lvqmdl983k7wgw427a5m6c85zscj4299v";
name = "kjobwidgets-5.104.0.tar.xz";
};
};
kjs = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/portingAids/kjs-5.103.0.tar.xz";
sha256 = "01wlv1lalmdspq2rgisv6csd4yxl0mxi476bcpr3i1zvvx9y2ijs";
name = "kjs-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/portingAids/kjs-5.104.0.tar.xz";
sha256 = "0dgb8impa7r8pp9q0d7kswy95lpn47b81wwwfz7a6hzsjpqb7mmx";
name = "kjs-5.104.0.tar.xz";
};
};
kjsembed = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/portingAids/kjsembed-5.103.0.tar.xz";
sha256 = "0b44pxk01pk30rgqx2lxmwfq5x3nlj5yqcbc3qgfpj0hpfgkfl99";
name = "kjsembed-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/portingAids/kjsembed-5.104.0.tar.xz";
sha256 = "02xisllcg89lnywpnhnhbgk6dfsr1lgh2d58a8yczcn5vm9zh4dh";
name = "kjsembed-5.104.0.tar.xz";
};
};
kmediaplayer = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/portingAids/kmediaplayer-5.103.0.tar.xz";
sha256 = "1bwgy1l9qlx3cq2sjqva1g9d8j1di2mxs3cj9v6gjgn67cywm2sw";
name = "kmediaplayer-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/portingAids/kmediaplayer-5.104.0.tar.xz";
sha256 = "120avg4a36yzpj8ni5zbrwdwc1p9nzbaw2hbz88w636llv10ymg7";
name = "kmediaplayer-5.104.0.tar.xz";
};
};
knewstuff = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/knewstuff-5.103.0.tar.xz";
sha256 = "13mpx8frr9ypxx7p3567gi5w4g1ja40asp4cjs2qa9gs05y7kfj6";
name = "knewstuff-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/knewstuff-5.104.0.tar.xz";
sha256 = "0p2a6pqgi25mh9q6v6scxwm73mbqvpvsvlm02vfad1vgflwwz6zq";
name = "knewstuff-5.104.0.tar.xz";
};
};
knotifications = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/knotifications-5.103.0.tar.xz";
sha256 = "0dnrm3idaz8nnwr2va88xcf9pgxx5jrcxng5n7n8yh030dmcsg4g";
name = "knotifications-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/knotifications-5.104.0.tar.xz";
sha256 = "060dqk7jarc8sx133n6chs04igv5f3ag7xxiqxr3xrvzx69h4vf7";
name = "knotifications-5.104.0.tar.xz";
};
};
knotifyconfig = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/knotifyconfig-5.103.0.tar.xz";
sha256 = "0z99s5ds619905dykw4ny8vsv2rkng6mw97kxma5padq2nspbfjs";
name = "knotifyconfig-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/knotifyconfig-5.104.0.tar.xz";
sha256 = "0a5f5n904c7gn739fs56qbyz8rw50rdd9ijwvsiamdvqcg3z58jd";
name = "knotifyconfig-5.104.0.tar.xz";
};
};
kpackage = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kpackage-5.103.0.tar.xz";
sha256 = "15cvd5hc8dzmvas803canqxq5b0azdi2mb2qa7yj7881bjz08nvb";
name = "kpackage-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kpackage-5.104.0.tar.xz";
sha256 = "1945l5fcxv3k791zgvp00d2bxwh2805vjjmrcngyzlvyprb8la77";
name = "kpackage-5.104.0.tar.xz";
};
};
kparts = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kparts-5.103.0.tar.xz";
sha256 = "0wdmjg7vmqb3z8sq0g7krf3c5kwp1kfaklfrp5spc8nbh722y3az";
name = "kparts-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kparts-5.104.0.tar.xz";
sha256 = "1k80wx8jk19add3v1bmp1065nczc0cwd6qycj6cnd428ri30d936";
name = "kparts-5.104.0.tar.xz";
};
};
kpeople = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kpeople-5.103.0.tar.xz";
sha256 = "0b1qg0cklwdalgal4vamlis3mn3vxv54spl9fv3nm36pz3ddxm8m";
name = "kpeople-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kpeople-5.104.0.tar.xz";
sha256 = "15kc5q54gq01wpyc94r59vxdrv02fngwapshq57adw7aqw8ya2w2";
name = "kpeople-5.104.0.tar.xz";
};
};
kplotting = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kplotting-5.103.0.tar.xz";
sha256 = "14kb103jrzy8x5w0k62p2wi8pwdvivvi3chhrh71rsq3h4k56ddv";
name = "kplotting-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kplotting-5.104.0.tar.xz";
sha256 = "029z4k76adhzyf7mbwhpilkrzpjj9cj7rz32fvpvl4h5m9q4ryax";
name = "kplotting-5.104.0.tar.xz";
};
};
kpty = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kpty-5.103.0.tar.xz";
sha256 = "0jgah1sn4rfdrwldlp0xdzxwhnwdhk68lfcxyigyq5zig29zirls";
name = "kpty-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kpty-5.104.0.tar.xz";
sha256 = "01jmxa80s4dv0a46f8hkfm4sdz59zq0fanq8bj9hpn45jcj2w9dz";
name = "kpty-5.104.0.tar.xz";
};
};
kquickcharts = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kquickcharts-5.103.0.tar.xz";
sha256 = "198xnsdf6iaiqqvz38q1fh72yc8cjycfndwngvwnzy8cplgqxbd8";
name = "kquickcharts-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kquickcharts-5.104.0.tar.xz";
sha256 = "09g3hjfmzpqflkc1winlavwrjy41zq3rbcndiy210g688n2i5l6r";
name = "kquickcharts-5.104.0.tar.xz";
};
};
kross = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/portingAids/kross-5.103.0.tar.xz";
sha256 = "03gw42lfjr6fl159vnlsppax4pklkxccrxmfjajr8xa3vwm8fqyq";
name = "kross-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/portingAids/kross-5.104.0.tar.xz";
sha256 = "04pyw1gy6swr86papghgi9l9gxc9qw5bwirrcxmw7ic6cga1ap3v";
name = "kross-5.104.0.tar.xz";
};
};
krunner = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/krunner-5.103.0.tar.xz";
sha256 = "0wna2p6flqg2xmky7j19ifwysrihnc738gzignygijlnz6jrxs05";
name = "krunner-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/krunner-5.104.0.tar.xz";
sha256 = "193q5hrcffxh99ms06qfrkmxc4h56qacgqfzimdq1smnwplnjwjs";
name = "krunner-5.104.0.tar.xz";
};
};
kservice = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kservice-5.103.0.tar.xz";
sha256 = "0f8axm47qk6x6l75mjvj879sfcndpyazx7wf16a6af1vklqkp86q";
name = "kservice-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kservice-5.104.0.tar.xz";
sha256 = "18yqi975nd5g6kfys23p28kchn6sp74x7fsagkwi0npa72bi0nr1";
name = "kservice-5.104.0.tar.xz";
};
};
ktexteditor = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/ktexteditor-5.103.0.tar.xz";
sha256 = "03z5xsxrk48whm976ci8w44s23fxr98bx86m2in9amfymcfnab32";
name = "ktexteditor-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/ktexteditor-5.104.0.tar.xz";
sha256 = "1rjizg18d3c2qs5jr9zr35c335sb8p6c8czqwyrrv4zhzdvivq9c";
name = "ktexteditor-5.104.0.tar.xz";
};
};
ktextwidgets = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/ktextwidgets-5.103.0.tar.xz";
sha256 = "1rxmd7chc2ld767bdkm1qmigbasxcjbif90vksf6d00vmsm2kq4m";
name = "ktextwidgets-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/ktextwidgets-5.104.0.tar.xz";
sha256 = "1skxw7i2wdjz5r5v93cqlj4ngr1l8lzjql6fl0ki4jx5x35jizj8";
name = "ktextwidgets-5.104.0.tar.xz";
};
};
kunitconversion = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kunitconversion-5.103.0.tar.xz";
sha256 = "0xxhzi4nq77941bcpx4833sk7p6fpigc21jzszy4400kzkjr3rzd";
name = "kunitconversion-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kunitconversion-5.104.0.tar.xz";
sha256 = "1a6p3rmyywjjpiap4k7bvqh1f2h3pgbccq5jz21s4swk06k8762h";
name = "kunitconversion-5.104.0.tar.xz";
};
};
kwallet = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kwallet-5.103.0.tar.xz";
sha256 = "0gzjzqpqpngk3syx802s8y8z0gmbzd09qmkrwrwfb0ssf9dyk5ra";
name = "kwallet-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kwallet-5.104.0.tar.xz";
sha256 = "1d9v786g6729j0nbaqi6hwkd16vcyxi5ggi7m6yp7rfayh5l4n30";
name = "kwallet-5.104.0.tar.xz";
};
};
kwayland = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kwayland-5.103.0.tar.xz";
sha256 = "1ad2697vymr0kw1zm9risy84izc402gma0ji1mhqcmrhfgn28807";
name = "kwayland-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kwayland-5.104.0.tar.xz";
sha256 = "0xp0py9z3jqh1lg03rqcrz919a5l3cxkp3fg9bpvmkc5iql61sq5";
name = "kwayland-5.104.0.tar.xz";
};
};
kwidgetsaddons = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kwidgetsaddons-5.103.0.tar.xz";
sha256 = "0hb4ikk7i4b0nl2cmi2p8iw3n5v69i9lpd0452zzpl98idzcq22c";
name = "kwidgetsaddons-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kwidgetsaddons-5.104.0.tar.xz";
sha256 = "081i2awi4xx9wi576n123ivwkqhjf75811qd0z91mra3rm9bbfsa";
name = "kwidgetsaddons-5.104.0.tar.xz";
};
};
kwindowsystem = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kwindowsystem-5.103.0.tar.xz";
sha256 = "198kpz69zy7qzl4z69pxk06j2yf6z2zmg85i544i979rskpzhspc";
name = "kwindowsystem-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kwindowsystem-5.104.0.tar.xz";
sha256 = "06pqda7f6ccyhiakw8y8d60iz09hkn9784xadgyjszdv9qsyw43b";
name = "kwindowsystem-5.104.0.tar.xz";
};
};
kxmlgui = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/kxmlgui-5.103.0.tar.xz";
sha256 = "0134n806z7d2qy2wijg8mzwl6xv0dwjkz0yym58vafgh6l085pv0";
name = "kxmlgui-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/kxmlgui-5.104.0.tar.xz";
sha256 = "1rlkghydps36223clfp0xqd3apnqqwkhqwp4q6bh3jmk25a5lpgl";
name = "kxmlgui-5.104.0.tar.xz";
};
};
kxmlrpcclient = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/portingAids/kxmlrpcclient-5.103.0.tar.xz";
sha256 = "14vnhm1kllcgpgrcjbf14hmzw4bi63k93fixkskfbb6gkh0ikxz7";
name = "kxmlrpcclient-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/portingAids/kxmlrpcclient-5.104.0.tar.xz";
sha256 = "1df3pr2ai1xqc9b5byy19gxy6sav08sykazks5mdcyy5v1zsraci";
name = "kxmlrpcclient-5.104.0.tar.xz";
};
};
modemmanager-qt = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/modemmanager-qt-5.103.0.tar.xz";
sha256 = "0p744iw9b8x4lkcmkncm7mfs2yvg9j95n3as6bmvqhfwyx4p3c88";
name = "modemmanager-qt-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/modemmanager-qt-5.104.0.tar.xz";
sha256 = "0v9bk5p6j47nps0walsbh1f71nm8vm3j7p7hf9klfdjxjbc8rzkv";
name = "modemmanager-qt-5.104.0.tar.xz";
};
};
networkmanager-qt = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/networkmanager-qt-5.103.0.tar.xz";
sha256 = "1ki1n0qm54fzdy8qc4mvb850h9jf1hpfx02zw8qwxx4a15by7jhx";
name = "networkmanager-qt-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/networkmanager-qt-5.104.0.tar.xz";
sha256 = "1263l7i2yh2nsmmcfn7qgmhj1zpwvmykxj2zhrqcwx7mxg7xfaqa";
name = "networkmanager-qt-5.104.0.tar.xz";
};
};
oxygen-icons5 = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/oxygen-icons5-5.103.0.tar.xz";
sha256 = "134nhzackrqalb4dwlf9h75xx1zxmdfa08m91fp7msqis62bwzrq";
name = "oxygen-icons5-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/oxygen-icons5-5.104.0.tar.xz";
sha256 = "1s66m4vd7r2b4wf1zw7w84za7v56hilfcww7mxwkzcc8nf4iwpq5";
name = "oxygen-icons5-5.104.0.tar.xz";
};
};
plasma-framework = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/plasma-framework-5.103.0.tar.xz";
sha256 = "1qca3r1sg0xximb5z6sdr6fxvyrfdcsjy3gv9ynj5fzqwk6cxcx0";
name = "plasma-framework-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/plasma-framework-5.104.0.tar.xz";
sha256 = "0ny5h2jirwdvvfvwr9ak8ri0fq4482wbi9sfkffhfh603lgdafzs";
name = "plasma-framework-5.104.0.tar.xz";
};
};
prison = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/prison-5.103.0.tar.xz";
sha256 = "127jn03kc78p3r0y0h0ga0fm7csq3dmg59msnapfchf0z81gkia4";
name = "prison-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/prison-5.104.0.tar.xz";
sha256 = "1f7nh433p1ww1vx9pbr9v9w2hg4hkbhah215afnslfxazcxsr09c";
name = "prison-5.104.0.tar.xz";
};
};
purpose = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/purpose-5.103.0.tar.xz";
sha256 = "0ah0vfpk96snpavjsazv2h2cym2i0pp0hnkfydl1840h6kybs27k";
name = "purpose-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/purpose-5.104.0.tar.xz";
sha256 = "1h9f7znx0azhwc6ajnj2x7gqxkd0qcz5kcfwwx80yx6if07rlvh8";
name = "purpose-5.104.0.tar.xz";
};
};
qqc2-desktop-style = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/qqc2-desktop-style-5.103.0.tar.xz";
sha256 = "1998nwbkv9pqxkpdrmnl2a0ljg1490nfw23i7h9y5xg6m46bm3pi";
name = "qqc2-desktop-style-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/qqc2-desktop-style-5.104.0.tar.xz";
sha256 = "1g7yqjg1dxgygb3nryb61648frlyd1h75yrmq78dvdc51agywwls";
name = "qqc2-desktop-style-5.104.0.tar.xz";
};
};
solid = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/solid-5.103.0.tar.xz";
sha256 = "0i6kwd2gsmikqnnl4wlhpbvws3z23s836yyzpz98vlf9rxxhhrz0";
name = "solid-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/solid-5.104.0.tar.xz";
sha256 = "1ks3q4wfrnw7ppsja75qwjsfwdm7h5vbv4lnbg1zxjmlf6y376ia";
name = "solid-5.104.0.tar.xz";
};
};
sonnet = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/sonnet-5.103.0.tar.xz";
sha256 = "0kryq5icfqhyvavyxbbiv237gckk6cqay0iyh29snr20d0h2yf4k";
name = "sonnet-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/sonnet-5.104.0.tar.xz";
sha256 = "0lxrq3jjs1wl7j1gpj1zxs8jygqlscsv2vbr8n3jzb7ly18nw9qp";
name = "sonnet-5.104.0.tar.xz";
};
};
syndication = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/syndication-5.103.0.tar.xz";
sha256 = "107nfbh4kcwgnw46sfyb6vrr9gvpgi44rgh9s9vpmwrcvh388nng";
name = "syndication-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/syndication-5.104.0.tar.xz";
sha256 = "0ldz4ln4ibia09zjvvkwl9jijyd8hsf8wj65yh5iypa9qc7ddccb";
name = "syndication-5.104.0.tar.xz";
};
};
syntax-highlighting = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/syntax-highlighting-5.103.0.tar.xz";
sha256 = "081nkc00ii78bj5hy88bd46w1ma4ckgg25w8xh3q6gqq4nnqy6a9";
name = "syntax-highlighting-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/syntax-highlighting-5.104.0.tar.xz";
sha256 = "0ifdjmirp5qw6ggw7xwygz8ayl0c5vkiy4qa0gc93nq4ky20i382";
name = "syntax-highlighting-5.104.0.tar.xz";
};
};
threadweaver = {
version = "5.103.0";
version = "5.104.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.103/threadweaver-5.103.0.tar.xz";
sha256 = "10pc8wx53yrizbh5nzqd5s7ly2qpiha5l1dbz5m8nxbli6hm7g19";
name = "threadweaver-5.103.0.tar.xz";
url = "${mirror}/stable/frameworks/5.104/threadweaver-5.104.0.tar.xz";
sha256 = "0ix616k2527y5wmzykdf2v6h16jk2frgspjqxc308y6gy3yyqgcn";
name = "threadweaver-5.104.0.tar.xz";
};
};
}

6
pkgs/development/python-modules/mdutils/default.nix
View file

@ -6,17 +6,19 @@
buildPythonPackage rec {
pname = "mdutils";
version = "1.5.0";
version = "1.5.1";
src = fetchFromGitHub {
owner = "didix21";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-bWPzOSvBV0jYJnj98vxuqj55LqX+Ifi6IQDMx9w+i9o=";
hash = "sha256-/J5c0ndpm+Zy8QV6MqlMGkoh6fX5gBgfc0NvYowsdEo=";
};
nativeCheckInputs = [ unittestCheckHook ];
pythonImportsCheck = [ "mdutils" ];
meta = with lib; {
description = "Set of basic tools that can help to create Markdown files";
longDescription = ''

6
pkgs/development/python-modules/pygls/default.nix
View file

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "pygls";
version = "1.0.0";
version = "1.0.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -21,8 +21,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "openlawlibrary";
repo = "pygls";
rev = "v${version}";
hash = "sha256-31J4+giK1RDBS52Q/Ia3Y/Zak7fp7gRVTQ7US/eFjtM=";
rev = "refs/tags/v${version}";
hash = "sha256-ovm897Vu6HRziGee3NioM1BA65mLe3F5Z2k0E+A35Gs=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

4
pkgs/development/tools/build-managers/gradle/default.nix
View file

@ -127,9 +127,9 @@ rec {
# https://docs.gradle.org/current/userguide/compatibility.html
gradle_7 = gen {
version = "7.6";
version = "7.6.1";
nativeVersion = "0.22-milestone-24";
sha256 = "0jwycvzv8a5v2bhg5d8zccr2csr3sf9y5mrr9d2ap44p09a8r9kv";
sha256 = "11qz1xjfihnlvsblqqnd49kmvjq86pzqcylj6k1zdvxl4dd60iv1";
defaultJava = jdk17;
};

15
pkgs/development/tools/misc/pahole/default.nix
View file

@ -1,15 +1,12 @@
{ lib, stdenv, fetchgit, pkg-config, libbpf, cmake, elfutils, zlib, argp-standalone, musl-obstack }:
{ lib, stdenv, fetchzip, pkg-config, libbpf, cmake, elfutils, zlib, argp-standalone, musl-obstack }:
stdenv.mkDerivation rec {
pname = "pahole";
# Need a revision that supports DW_TAG_unspecified_type(0x3b).
# Was added after 1.24 release in a series of changes.
# Can switch back to release tags once 1.25 is cut.
version = "1.24-unstable-2022-11-24";
src = fetchgit {
url = "https://git.kernel.org/pub/scm/devel/pahole/pahole.git";
rev = "02d67c51765dfbd5893087da63744c864c7cc9e0";
hash = "sha256-hKc8UKxPtEM2zlYmolSt1pXJKNRt4wC/Uf+dP/Sb7+s=";
# Can switch back to release tags if they can build linux_testing.
version = "1.24-unstable-2023-03-02";
src = fetchzip {
url = "https://git.kernel.org/pub/scm/devel/pahole/pahole.git/snapshot/pahole-a9498899109d3be14f17abbc322a8f55a1067bee.tar.gz";
sha256 = "xEKA6Fz6NaxNqSggvgswCU+7LlezGSNrK7cmt2JYv1Y=";
};
nativeBuildInputs = [ cmake pkg-config ];

2
pkgs/os-specific/linux/kernel/common-config.nix
View file

@ -285,7 +285,7 @@ let
video = {
DRM_LEGACY = no;
NOUVEAU_LEGACY_CTX_SUPPORT = whenAtLeast "5.2" no;
NOUVEAU_LEGACY_CTX_SUPPORT = whenBetween "5.2" "6.3" no;
# Allow specifying custom EDID on the kernel command line
DRM_LOAD_EDID_FIRMWARE = yes;

4
pkgs/os-specific/linux/kernel/linux-4.14.nix
View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "4.14.307";
version = "4.14.308";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "00dp0vj9572ig4zsnmhl2a2v5vx40hnjibyifw24x1q6qdaia72f";
sha256 = "19lkw0izj0i63grzycvz6pdxvih0q7lml0h30zsxzb4vb7yj0v7i";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.19.nix
View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "4.19.275";
version = "4.19.276";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "02l6f5y1cbjc9997lmcak5j8dllkzr8q47nqscqsyvz2c2hnzsdg";
sha256 = "1f8lcd47pba4jfycbbrd8vsqpf038x19rf80g3grzpvsgyaq1k1f";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-5.10.nix
View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.10.172";
version = "5.10.173";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1c9757gma0dksd1ch8pljbsmf586bq66gxqpsv53676z8kivl3gj";
sha256 = "099w115m2b1l99r4pn7ifjg6aqb8rsn888102qj8iv97qxsb901l";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-5.15.nix
View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.15.99";
version = "5.15.101";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0ih3pqxv8kwc8awkd7f5cib9zdnmz6hczqfcz62s7bppjchbicwr";
sha256 = "0bf0s3qw1k0p13f5cnircajfyr3j22yp9jx4l62iarxbn1k20fdr";
};
} // (args.argsOverride or { }))

4
pkgs/os-specific/linux/kernel/linux-5.4.nix
View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.4.234";
version = "5.4.235";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1489jnp4vb8p879hq1nx3xgyzjdwj1zalk3x4vcbnc9f7yrrrixc";
sha256 = "1yqlvfw15mvmn6fh7gpck799pw4a2sip52ar9ammi0qdp96x1gxq";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-6.1.nix
View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "6.1.16";
version = "6.1.18";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
sha256 = "1id3dn0p724yp3n4wqk6bhs21yjhqihiilkagfh1am8bb1arr156";
sha256 = "07hlmv00wqi7497c3y6w7494qsxgd97kzy7xa30v0vqfzxgc2al4";
};
} // (args.argsOverride or { }))

4
pkgs/os-specific/linux/kernel/linux-6.2.nix
View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "6.2.3";
version = "6.2.5";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
sha256 = "091r0rjj5ba50kiq96099w79ayzcdy6qyzgkmw10hxqkzia0nvdk";
sha256 = "1fg5rq40fi7xkx3pw54538gydygbizg492aqfnh0hn3fry903av5";
};
} // (args.argsOverride or { }))

4
pkgs/os-specific/linux/kernel/linux-libre.nix
View file

@ -1,8 +1,8 @@
{ stdenv, lib, fetchsvn, linux
, scripts ? fetchsvn {
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
rev = "19049";
sha256 = "0873qyk69p8hr91qjaq5rd9z2i6isd3yq3slh1my5y33gc7d3bj2";
rev = "19102";
sha256 = "1w9zl7grws1nzq4zp4mj1v5a6akqwkzy9lf0wwdar68jbxav3fvf";
}
, ...
}:

4
pkgs/os-specific/linux/kernel/linux-testing.nix
View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "6.2-rc6";
version = "6.3-rc1";
extraMeta.branch = lib.versions.majorMinor version;
# modDirVersion needs to be x.y.z, will always add .0
@ -11,7 +11,7 @@ buildLinux (args // rec {
src = fetchurl {
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
hash = "sha256-rEpJYw5O6OHSwNY8LxlCsw0p9+u9BUjTQ8FsB6+fLbc=";
hash = "sha256-oZhG9dYlRthT4TbRNuJ+/Kw/mRuGTIu2E9Dw5ge+xCo=";
};
# Should the testing kernels ever be built on Hydra?

9
pkgs/os-specific/linux/kernel/patches.nix
View file

@ -62,4 +62,13 @@
name = "fix-em-ice-bonding";
patch = ./fix-em-ice-bonding.patch;
};
# https://lore.kernel.org/linux-wireless/ZAx0TWRBlGfv7pNl@kroah.com/T/#m11e6e0915ab8fa19ce8bc9695ab288c0fe018edf
fix-brcmfmac = {
name = "fix-brcmfmac";
patch = fetchpatch {
url = "https://lore.kernel.org/linux-wireless/20230311141914.24444-1-marcan@marcan.st/raw";
sha256 = "sha256-Fjap48Lef8Mi1i0t13/rT2SoYcbO8HJuXhJMn7HK3Ds=";
};
};
}

10
pkgs/servers/nosql/redis/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, lua, pkg-config, nixosTests
{ lib, stdenv, fetchurl, fetchpatch, lua, pkg-config, nixosTests
, tcl, which, ps, getconf
, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd
# dependency ordering is broken at the moment when building with openssl
@ -14,6 +14,14 @@ stdenv.mkDerivation rec {
hash = "sha256-93E1wqR8kVHUAov+o7NEcKtNMk0UhPeahMbzKjz7n2U=";
};
patches = [
# Fix flaky test tests/unit/memefficiency.tcl
(fetchpatch {
url = "https://github.com/redis/redis/commit/bfe50a30edff6837897964ac3374c082b0d9e5da.patch";
sha256 = "sha256-0GMiygbO7LbL1rnuOByOJYE2BKUSI+yy6YH781E2zBw=";
})
];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ lua ]

14
pkgs/servers/web-apps/nifi/default.nix
View file

@ -1,16 +1,16 @@
{ lib, stdenv, fetchurl, makeWrapper, jre8, nixosTests }:
{ lib, stdenv, fetchzip, makeWrapper, jdk11, nixosTests }:
stdenv.mkDerivation rec {
pname = "nifi";
version = "1.16.3";
version = "1.20.0";
src = fetchurl {
url = "https://archive.apache.org/dist/nifi/${version}/nifi-${version}-bin.tar.gz";
sha256 = "sha256-57ZtgK1Z8G/nX2rtf7osmymvE4RukGi7CIvCvRQNKuE=";
src = fetchzip {
url = "mirror://apache/nifi/${version}/nifi-${version}-bin.zip";
sha256 = "sha256-xeBu20AeG035nB/jUsOsAvqDtwklM+9ZsZlJoAZ4iu4=";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jre8 ];
buildInputs = [ jdk11 ];
installPhase = ''
mv ../$sourceRoot $out
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
substituteInPlace $out/bin/nifi.sh \
--replace "/bin/sh" "${stdenv.shell}"
substituteInPlace $out/bin/nifi-env.sh \
--replace "#export JAVA_HOME=/usr/java/jdk1.8.0/" "export JAVA_HOME=${jre8}"
--replace "#export JAVA_HOME=/usr/java/jdk1.8.0/" "export JAVA_HOME=${jdk11}"
'';
passthru = {

42
pkgs/tools/audio/yabridge/default.nix
View file

@ -3,7 +3,6 @@
, fetchFromGitHub
, substituteAll
, pkgsi686Linux
, fetchpatch
, dbus
, meson
, ninja
@ -18,7 +17,7 @@ let
asio = fetchFromGitHub {
owner = "chriskohlhoff";
repo = "asio";
rev = "asio-1-22-1";
rev = "refs/tags/asio-1-22-1";
sha256 = "sha256-UDLhx2yI6Txg0wP5H4oNIhgKIB2eMxUGCyT2x/7GgVg=";
};
@ -26,7 +25,7 @@ let
bitsery = fetchFromGitHub {
owner = "fraillt";
repo = "bitsery";
rev = "v5.2.2";
rev = "refs/tags/v5.2.2";
sha256 = "sha256-VwzVtxt+E/SVcxqIJw8BKPO2q7bu/hkhY+nB7FHrZpY=";
};
@ -34,15 +33,15 @@ let
clap = fetchFromGitHub {
owner = "free-audio";
repo = "clap";
rev = "1.1.4";
sha256 = "sha256-3zDvzC3Hs4OmT2qvaDa69rmBkHoQ8qY9TZlsPxsJA40=";
rev = "refs/tags/1.1.7";
sha256 = "sha256-WcMTxE+QCzlp4lhFdghZI8UI/5mdVeRvrl24Xynd0qk=";
};
# Derived from subprojects/function2.wrap
function2 = fetchFromGitHub {
owner = "Naios";
repo = "function2";
rev = "4.2.0";
rev = "refs/tags/4.2.0";
sha256 = "sha256-wrt+fCcM6YD4ZRZYvqqB+fNakCNmltdPZKlNkPLtgMs=";
};
@ -50,7 +49,7 @@ let
ghc_filesystem = fetchFromGitHub {
owner = "gulrak";
repo = "filesystem";
rev = "v1.5.12";
rev = "refs/tags/v1.5.12";
sha256 = "sha256-j4RE5Ach7C7Kef4+H9AHSXa2L8OVyJljDwBduKcC4eE=";
};
@ -58,28 +57,29 @@ let
tomlplusplus = fetchFromGitHub {
owner = "marzer";
repo = "tomlplusplus";
rev = "v3.0.1";
sha256 = "sha256-l8ckbCqjz3GUfwStcl3H2C+un5dZfT2uLtayvdu93D4=";
rev = "refs/tags/v3.3.0";
sha256 = "sha256-INX8TOEumz4B5coSxhiV7opc3rYJuQXT2k1BJ3Aje1M=";
};
# Derived from vst3.wrap
vst3 = fetchFromGitHub {
owner = "robbert-vdh";
repo = "vst3sdk";
rev = "v3.7.7_build_19-patched";
rev = "refs/tags/v3.7.7_build_19-patched";
fetchSubmodules = true;
sha256 = "sha256-LsPHPoAL21XOKmF1Wl/tvLJGzjaCLjaDAcUtDvXdXSU=";
};
in multiStdenv.mkDerivation rec {
in
multiStdenv.mkDerivation (finalAttrs: {
pname = "yabridge";
version = "5.0.3";
version = "5.0.4";
# NOTE: Also update yabridgectl's cargoHash when this is updated
src = fetchFromGitHub {
owner = "robbert-vdh";
repo = pname;
rev = version;
sha256 = "sha256-T3BU77BbVr6vlVoijUQy86eF0lCgM4S4d5VSnLE4pas=";
repo = "yabridge";
rev = "refs/tags/${finalAttrs.version}";
sha256 = "sha256-15WTCXMvghoU5TkE8yuQJrxj9cwVjczDKGKWjoUS6SI=";
};
# Unpack subproject sources
@ -104,14 +104,6 @@ in multiStdenv.mkDerivation rec {
# Patch the chainloader to search for libyabridge through NIX_PROFILES
./libyabridge-from-nix-profiles.patch
# Remove with next yabridge update
(fetchpatch {
name = "fix-for-wine-8.0.patch";
url = "https://github.com/robbert-vdh/yabridge/commit/29acd40a9add635e2cb40ecc54c88d65604a7a2a.patch";
sha256 = "sha256-hVxa/FqH7d938Z/VjHdhmYLCLPZoa9C4xKSKRKiVPSU=";
includes = [ "meson.build" ];
})
];
postPatch = ''
@ -166,9 +158,9 @@ in multiStdenv.mkDerivation rec {
meta = with lib; {
description = "A modern and transparent way to use Windows VST2 and VST3 plugins on Linux";
homepage = src.meta.homepage;
homepage = "https://github.com/robbert-vdh/yabridge";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ kira-bruneau ];
platforms = [ "x86_64-linux" ];
};
}
})

6
pkgs/tools/audio/yabridge/hardcode-dependencies.patch
View file

@ -1,8 +1,8 @@
diff --git a/meson.build b/meson.build
index bfab6361..9085db0f 100644
index f76f5acf..045e9d40 100644
--- a/meson.build
+++ b/meson.build
@@ -187,7 +187,7 @@ if is_64bit_system
@@ -221,7 +221,7 @@ if is_64bit_system
xcb_64bit_dep = dependency('xcb')
endif
if with_32bit_libraries or with_bitbridge
@ -12,7 +12,7 @@ index bfab6361..9085db0f 100644
# These are all headers-only libraries, and thus won't require separate 32-bit
diff --git a/src/plugin/utils.cpp b/src/plugin/utils.cpp
index acd431bc..8566281c 100644
index 8d6236ad..ea5c1396 100644
--- a/src/plugin/utils.cpp
+++ b/src/plugin/utils.cpp
@@ -93,7 +93,7 @@ std::string PluginInfo::wine_version() const {

2
pkgs/tools/audio/yabridge/libyabridge-from-nix-profiles.patch
View file

@ -1,5 +1,5 @@
diff --git a/src/chainloader/utils.cpp b/src/chainloader/utils.cpp
index ccd65d33..c7136b37 100644
index c43e5693..b8352adf 100644
--- a/src/chainloader/utils.cpp
+++ b/src/chainloader/utils.cpp
@@ -29,8 +29,10 @@

4
pkgs/tools/audio/yabridgectl/chainloader-from-nix-profiles.patch
View file

@ -1,5 +1,5 @@
diff --git a/tools/yabridgectl/src/config.rs b/tools/yabridgectl/src/config.rs
index 76075938..4f69642f 100644
index 53200bd5..ef8a781d 100644
--- a/tools/yabridgectl/src/config.rs
+++ b/tools/yabridgectl/src/config.rs
@@ -22,6 +22,7 @@ use serde_derive::{Deserialize, Serialize};
@ -58,7 +58,7 @@ index 76075938..4f69642f 100644
));
}
diff --git a/tools/yabridgectl/src/main.rs b/tools/yabridgectl/src/main.rs
index e5618575..72b730f1 100644
index 8dcd7dc8..bddca534 100644
--- a/tools/yabridgectl/src/main.rs
+++ b/tools/yabridgectl/src/main.rs
@@ -135,7 +135,7 @@ fn main() -> Result<()> {

6
pkgs/tools/audio/yabridgectl/default.nix
View file

@ -5,13 +5,13 @@
, wine
}:
rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage {
pname = "yabridgectl";
version = yabridge.version;
src = yabridge.src;
sourceRoot = "source/tools/yabridgectl";
cargoSha256 = "sha256-X7YcIjKLzuts7d9VD6hLFCiEBrY4opi8nInjPs9jAh0=";
cargoSha256 = "sha256-qr6obmabcO3n+DxMxkj3mbpzR/Wn6eOg2J99/FarMVs=";
patches = [
# Patch yabridgectl to search for the chainloader through NIX_PROFILES
@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "A small, optional utility to help set up and update yabridge for several directories at once";
homepage = "${src.meta.homepage}/tree/${version}/tools/yabridgectl";
homepage = "${yabridge.src.meta.homepage}/tree/${yabridge.version}/tools/yabridgectl";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ kira-bruneau ];
platforms = yabridge.meta.platforms;

2
pkgs/tools/audio/yabridgectl/remove-dependency-verification.patch
View file

@ -1,5 +1,5 @@
diff --git a/tools/yabridgectl/src/actions.rs b/tools/yabridgectl/src/actions.rs
index 03617c4d..19ade93e 100644
index 25857753..59590e38 100644
--- a/tools/yabridgectl/src/actions.rs
+++ b/tools/yabridgectl/src/actions.rs
@@ -835,14 +835,6 @@ pub fn do_sync(config: &mut Config, options: &SyncOptions) -> Result<()> {

22
pkgs/tools/package-management/appimage-run/default.nix
View file

@ -1,13 +1,29 @@
{ appimageTools, buildFHSUserEnv, extraPkgs ? pkgs: [], appimage-run-tests ? null }:
{ appimageTools, buildFHSUserEnv, makeDesktopItem, extraPkgs ? pkgs: [], appimage-run-tests ? null }:
let
fhsArgs = appimageTools.defaultFhsEnvArgs;
in buildFHSUserEnv (fhsArgs // {
name = "appimage-run";
fhsArgs = appimageTools.defaultFhsEnvArgs;
desktopItem = makeDesktopItem {
inherit name;
exec = name;
desktopName = name;
genericName = "AppImage runner";
noDisplay = true;
mimeTypes = ["application/vnd.appimage" "application/x-iso9660-appimage"];
categories = ["PackageManager" "Utility"];
};
in buildFHSUserEnv (fhsArgs // {
inherit name;
targetPkgs = pkgs: [ appimageTools.appimage-exec ]
++ fhsArgs.targetPkgs pkgs ++ extraPkgs pkgs;
runScript = "appimage-exec.sh";
extraInstallCommands = ''
cp --recursive "${desktopItem}/share" "$out/"
'';
passthru.tests.appimage-run = appimage-run-tests;
})

12
pkgs/tools/package-management/appimage-run/test.nix
View file

@ -1,4 +1,4 @@
{ runCommand, fetchurl, appimage-run, glibcLocales, file }:
{ runCommand, fetchurl, appimage-run, glibcLocales, file, xdg-utils }:
let
# any AppImage usable on cli, really
sample-appImage = fetchurl {
@ -11,21 +11,27 @@ let
};
in
runCommand "appimage-run-tests" {
buildInputs = [ appimage-run glibcLocales file ];
buildInputs = [ appimage-run glibcLocales file xdg-utils ];
meta.platforms = [ "x86_64-linux" ];
}
''
export HOME=$(mktemp -d)
set -x
# regression test for #101137, must come first
LANG=fr_FR appimage-run ${sample-appImage} --list ${sample-appImage}
# regression test for #108426
cp ${sample-appImage} foo.appImage
LANG=fr_FR appimage-run ${sample-appImage} --list foo.appImage
cp ${owdtest} owdtest.AppImage.gz
gunzip owdtest.AppImage.gz
appimage-run owdtest.AppImage
# Verify desktop entry
XDG_DATA_DIRS="${appimage-run}/share"
[[ "$(xdg-mime query default application/vnd.appimage)" == '${appimage-run.name}.desktop' ]]
set +x
touch $out
''

4
pkgs/top-level/all-packages.nix
View file

@ -37468,6 +37468,10 @@ with pkgs;
maxima-ecl = maxima.override {
lisp-compiler = ecl;
};
# old version temporarily kept for sage
maxima-ecl-5_45 = callPackage ../applications/science/math/maxima/5.45.nix {
lisp-compiler = ecl;
};
mxnet = callPackage ../applications/science/math/mxnet {
inherit (linuxPackages) nvidia_x11;

2
pkgs/top-level/kodi-packages.nix
View file

@ -9,7 +9,7 @@ in
let self = rec {
addonDir = "/share/kodi/addons";
rel = "Matrix";
rel = "Nexus";
callPackage = newScope self;

11
pkgs/top-level/linux-kernels.nix
View file

@ -34,6 +34,8 @@ let
major = lib.versions.major version;
sha256 = kernelPatches.hardened.${kernel.meta.branch}.sha256;
modDirVersion' = builtins.replaceStrings [ kernel.version ] [ version ] kernel.modDirVersion;
# FIXME remove as soon as the revert happened upstream!
basePatches = lib.filter ({ name, ... }: name != "fix-brcmfmac") kernel.kernelPatches;
in kernel.override {
structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix {
inherit stdenv lib version;
@ -49,7 +51,7 @@ let
broken = kernel.meta.broken || (stdenv.isx86_64 && lib.versions.majorMinor version == "5.4");
};
};
kernelPatches = kernel.kernelPatches ++ [
kernelPatches = basePatches ++ [
kernelPatches.hardened.${kernel.meta.branch}
];
isHardened = true;
@ -104,6 +106,7 @@ in {
# when adding a new linux version
kernelPatches.cpu-cgroup-v2."4.11"
kernelPatches.modinst_arg_list_too_long
kernelPatches.fix-brcmfmac
];
};
@ -112,6 +115,7 @@ in {
[ kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.modinst_arg_list_too_long
kernelPatches.fix-brcmfmac
];
};
@ -120,6 +124,7 @@ in {
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.rtl8761b_support
kernelPatches.fix-brcmfmac
];
};
@ -134,6 +139,7 @@ in {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.fix-brcmfmac
];
};
@ -150,6 +156,7 @@ in {
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.fix-em-ice-bonding
kernelPatches.fix-brcmfmac
];
};
@ -166,6 +173,7 @@ in {
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.fix-em-ice-bonding
kernelPatches.fix-brcmfmac
];
};
@ -174,6 +182,7 @@ in {
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.fix-em-ice-bonding
kernelPatches.fix-brcmfmac
];
};