Merge branch 'master' into staging
This commit is contained in:
Vladimír Čunát
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
|
||||
description = "SDL multi-channel audio mixer library";
|
||||
homepage = http://www.libsdl.org/projects/SDL_mixer/;
|
||||
maintainers = with maintainers; [ lovek323 ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
13
pkgs/development/libraries/fox/clang.patch
Normal file
13
pkgs/development/libraries/fox/clang.patch
Normal file
@@ -0,0 +1,13 @@
|
||||
diff --git a/src/FXReactor.cpp b/src/FXReactor.cpp
|
||||
index 1ecdb45..9058a30 100644
|
||||
--- a/src/FXReactor.cpp
|
||||
+++ b/src/FXReactor.cpp
|
||||
@@ -452,7 +452,7 @@ FXint FXReactor::processActiveHandles(FXTime block,FXuint flags){
|
||||
}
|
||||
|
||||
// Normal case
|
||||
- if(0<=hand){
|
||||
+ if(0==hand){
|
||||
|
||||
// Any handles active?
|
||||
if(0<nhand){
|
||||
@@ -1,20 +1,19 @@
|
||||
{ stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft
|
||||
, CoreServices ? null }:
|
||||
|
||||
let
|
||||
version = "1.7.9";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "fox-${version}";
|
||||
version = "1.7.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.fox-toolkit.org/pub/${name}.tar.gz";
|
||||
sha256 = "1jb9368xsin3ppdf6979n5s7in3s9klbxqbwcp0z8misjixl7nzg";
|
||||
};
|
||||
|
||||
patches = [ ./clang.patch ];
|
||||
|
||||
buildInputs = [ libpng xlibsWrapper libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ]
|
||||
++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
|
||||
++ stdenv.lib.optional stdenv.isDarwin CoreServices;
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@@ -22,17 +21,17 @@ stdenv.mkDerivation rec {
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "C++ based class library for building Graphical User Interfaces";
|
||||
longDescription = ''
|
||||
FOX stands for Free Objects for X.
|
||||
It is a C++ based class library for building Graphical User Interfaces.
|
||||
Initially, it was developed for LINUX, but the scope of this project has in the course of time become somewhat more ambitious.
|
||||
Current aims are to make FOX completely platform independent, and thus programs written against the FOX library will be only a compile away from running on a variety of platforms.
|
||||
'';
|
||||
FOX stands for Free Objects for X.
|
||||
It is a C++ based class library for building Graphical User Interfaces.
|
||||
Initially, it was developed for LINUX, but the scope of this project has in the course of time become somewhat more ambitious.
|
||||
Current aims are to make FOX completely platform independent, and thus programs written against the FOX library will be only a compile away from running on a variety of platforms.
|
||||
'';
|
||||
homepage = "http://fox-toolkit.org";
|
||||
license = stdenv.lib.licenses.lgpl3;
|
||||
maintainers = [ stdenv.lib.maintainers.bbenoist ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
license = licenses.lgpl3;
|
||||
maintainers = [];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
homepage = "http://fox-toolkit.org";
|
||||
license = stdenv.lib.licenses.lgpl3;
|
||||
maintainers = [ stdenv.lib.maintainers.bbenoist ];
|
||||
maintainers = [];
|
||||
platforms = stdenv.lib.platforms.mesaPlatforms;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1 +1 @@
|
||||
WGET_ARGS=( http://download.kde.org/stable/frameworks/5.31/ -A '*.tar.xz' )
|
||||
WGET_ARGS=( http://download.kde.org/stable/frameworks/5.32/ -A '*.tar.xz' )
|
||||
|
||||
@@ -17,12 +17,5 @@ kdeFramework {
|
||||
ktextwidgets kwallet kwidgetsaddons kwindowsystem kxmlgui solid qtscript
|
||||
qtx11extras
|
||||
];
|
||||
patches = (copyPathsToStore (lib.readPathsFromFile ./. ./series))
|
||||
++ [
|
||||
(fetchpatch {
|
||||
name = "SanitizeURLsBeforePassingThemToFindProxyForURL.patch";
|
||||
url = "https://cgit.kde.org/kio.git/patch/?id=f9d0cb47cf94e209f6171ac0e8d774e68156a6e4";
|
||||
sha256 = "1s6rcp8rrlhc6rgy3b303y0qq0s8371n12r5lk9zbkw14wjvbix0";
|
||||
})
|
||||
];
|
||||
patches = (copyPathsToStore (lib.readPathsFromFile ./. ./series));
|
||||
}
|
||||
|
||||
@@ -3,595 +3,595 @@
|
||||
|
||||
{
|
||||
attica = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/attica-5.31.0.tar.xz";
|
||||
sha256 = "0gfqxaqvw05rdgjqs2cn5bgnmijcsl16myf919fdc75xkdpg1h56";
|
||||
name = "attica-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/attica-5.32.0.tar.xz";
|
||||
sha256 = "16vl3gpwqcvfms82grv1bvqlxj085bqssv5ixjx007826pd8qhp5";
|
||||
name = "attica-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
baloo = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/baloo-5.31.0.tar.xz";
|
||||
sha256 = "0n3cwq7g9zik3xjp895vl1j62b538rg6zcsm2x4h2nnq3njrnfbz";
|
||||
name = "baloo-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/baloo-5.32.0.tar.xz";
|
||||
sha256 = "0a4qwinkp4gmcbx4j0qxbj5qb40h7594s39za7sc7bymadicasy1";
|
||||
name = "baloo-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
bluez-qt = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/bluez-qt-5.31.0.tar.xz";
|
||||
sha256 = "12g9jc6b8f03dka5sbjf19g536y8d1xvzkrwp2m0w98zcd0q33jl";
|
||||
name = "bluez-qt-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/bluez-qt-5.32.0.tar.xz";
|
||||
sha256 = "0pl6cp0rgjkh7d06ik35rw7qd96j5sh2flgjx4vi21zl5vf3vgyh";
|
||||
name = "bluez-qt-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
breeze-icons = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/breeze-icons-5.31.0.tar.xz";
|
||||
sha256 = "1ylask25jrwyk53c81jy73k9i8cylnab3a42yyrf3f25qbvhr845";
|
||||
name = "breeze-icons-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/breeze-icons-5.32.0.tar.xz";
|
||||
sha256 = "1n51kahzk09v52yhi7k4kqgavqlz3ghqv5cx2ssz2djpyavs18r3";
|
||||
name = "breeze-icons-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
extra-cmake-modules = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/extra-cmake-modules-5.31.0.tar.xz";
|
||||
sha256 = "1srdvjgn72687r48f0x32vn7q5czvk9k1w1393bcws2l0icil9w4";
|
||||
name = "extra-cmake-modules-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/extra-cmake-modules-5.32.0.tar.xz";
|
||||
sha256 = "1iqakxzr6bcs9wgyi8if1smpq6px0bvlcyddyk0hxhindzl7pn5i";
|
||||
name = "extra-cmake-modules-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
frameworkintegration = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/frameworkintegration-5.31.0.tar.xz";
|
||||
sha256 = "1wfiny11fm0k6w1ly7ca7xj3f7a1mn3b1gpvlcpaqbrib6b3dgcj";
|
||||
name = "frameworkintegration-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/frameworkintegration-5.32.0.tar.xz";
|
||||
sha256 = "022scc4pgl68973wq29l1kc9j9lspvlmpr3bc6zlyg57m8agapwa";
|
||||
name = "frameworkintegration-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kactivities = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kactivities-5.31.0.tar.xz";
|
||||
sha256 = "1v33pkjwjjp6lrqhch7l66xyyvln1pgbs0wbgi8q9c024s92jqqz";
|
||||
name = "kactivities-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kactivities-5.32.0.tar.xz";
|
||||
sha256 = "0xin4shaj0zsfsww84mwk5n4ldaqy730jhc369px2j2nq57sg9g7";
|
||||
name = "kactivities-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kactivities-stats = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kactivities-stats-5.31.0.tar.xz";
|
||||
sha256 = "1ngydmby0dzf802bjszhn3qsc0vgrhc0ya511x7jc9h49mgbp2jy";
|
||||
name = "kactivities-stats-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kactivities-stats-5.32.0.tar.xz";
|
||||
sha256 = "1b3z7bcap3vjc0155y0a9xkbd477fklmpj8dr3rs0ccyc6qxxbvw";
|
||||
name = "kactivities-stats-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kapidox = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kapidox-5.31.0.tar.xz";
|
||||
sha256 = "1lnqcgmxdy8l0qzn2jb9kww2lg1a33izw0hy78fkm7drg67g26za";
|
||||
name = "kapidox-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kapidox-5.32.0.tar.xz";
|
||||
sha256 = "1z6hdsppwrmqkcanrppxhqcrjvblg9i02rh3bz5m3pn66wwz0sdw";
|
||||
name = "kapidox-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
karchive = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/karchive-5.31.0.tar.xz";
|
||||
sha256 = "1yafkgd5q9j1y3shivh5jayc4pss1skzyf3f1rmzl4psn2r6rsay";
|
||||
name = "karchive-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/karchive-5.32.0.tar.xz";
|
||||
sha256 = "1dzvphqnc09mmaydqggpxg6zwwyr56p6l4jdf1rf6ns90fzxy0m4";
|
||||
name = "karchive-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kauth = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kauth-5.31.0.tar.xz";
|
||||
sha256 = "0y4gc3n8d36wrpdmgq2jif82lkqr3xhb7v8lgg6kgaxb1d7fi2r8";
|
||||
name = "kauth-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kauth-5.32.0.tar.xz";
|
||||
sha256 = "00kdq16n9w6nf1bpwzl5lp5c2xq74g8nn6081kvnjcd4ld66ncmq";
|
||||
name = "kauth-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kbookmarks = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kbookmarks-5.31.0.tar.xz";
|
||||
sha256 = "0xdrx3gr291gkrfj360pw3aax0mz0zhhvjw7c4fcp35m0sqg1kvp";
|
||||
name = "kbookmarks-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kbookmarks-5.32.0.tar.xz";
|
||||
sha256 = "03a024phcjv46afbp5lbmj2p8hb6srfzyaslc6ln6ms473bf5k4w";
|
||||
name = "kbookmarks-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kcmutils = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kcmutils-5.31.0.tar.xz";
|
||||
sha256 = "00ngh556sxswrfhhy5vkfi8sk5jbb0srvx4np49xwpmh5xb6qzk9";
|
||||
name = "kcmutils-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kcmutils-5.32.0.tar.xz";
|
||||
sha256 = "1mr9h7wc22bfrbm92ajsjfcs16c5xpkrxbxzcma3a0s7jhy6qrm9";
|
||||
name = "kcmutils-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kcodecs = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kcodecs-5.31.0.tar.xz";
|
||||
sha256 = "1nyn4b61ymbxv1xnbq3z79dbvapsy6jg51w52l0gnqkiy2zlbz13";
|
||||
name = "kcodecs-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kcodecs-5.32.0.tar.xz";
|
||||
sha256 = "0yybkp52i8nm4qjady6jqswn6v70cqbvjqwgrghjnc88b2cly253";
|
||||
name = "kcodecs-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kcompletion = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kcompletion-5.31.0.tar.xz";
|
||||
sha256 = "0jx1lsz1fh8h20a5ixdv9q5yx6r5r7jr8hi68v7b66anmpnh2m3g";
|
||||
name = "kcompletion-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kcompletion-5.32.0.tar.xz";
|
||||
sha256 = "0fn8imr3m219r38a0rafbnylcpjq4rqhz1w66mx80sc7l10mhcni";
|
||||
name = "kcompletion-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kconfig = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kconfig-5.31.0.tar.xz";
|
||||
sha256 = "1z9jf5rizdj7c7x918zmdv4v01glpl3z44mrx7yfp2cqnjniwhxi";
|
||||
name = "kconfig-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kconfig-5.32.0.tar.xz";
|
||||
sha256 = "1pajh1l08b995shp6l75ri9z4vr6wjapvrkmrmv8hksnxvfi97dp";
|
||||
name = "kconfig-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kconfigwidgets = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kconfigwidgets-5.31.0.tar.xz";
|
||||
sha256 = "19y3s5qcb3mzw8xiyp57zb2sjclcmxzj3xp0iwzs41r4lqmlwajs";
|
||||
name = "kconfigwidgets-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kconfigwidgets-5.32.0.tar.xz";
|
||||
sha256 = "1cq0a3k6pvl9f098ssqqk2rddxh0xn1kk4p5kfyd7w0m3c604zw3";
|
||||
name = "kconfigwidgets-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kcoreaddons = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kcoreaddons-5.31.0.tar.xz";
|
||||
sha256 = "0175vgii8l5yx1bbbjljblkkq03nqfhb3v7in2657glag6imcb7m";
|
||||
name = "kcoreaddons-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kcoreaddons-5.32.0.tar.xz";
|
||||
sha256 = "1n1xzvwwji9pwyxrvwp4rmpc7qzp9nlis26xmn81k607jn587ksx";
|
||||
name = "kcoreaddons-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kcrash = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kcrash-5.31.0.tar.xz";
|
||||
sha256 = "0mj6dahalwks39d881nvmrd3rqm2aid06iq6s8p2grhnncf6cd4j";
|
||||
name = "kcrash-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kcrash-5.32.0.tar.xz";
|
||||
sha256 = "1zrkjrpj88ymdy5vbn9db73vxppswvmbn2gkn4gpx773dsmflhz3";
|
||||
name = "kcrash-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdbusaddons = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kdbusaddons-5.31.0.tar.xz";
|
||||
sha256 = "1dv9yzicd2d1k0qjgjbryks0f6s0v76hr0csdb7j22nwn9pb4cfk";
|
||||
name = "kdbusaddons-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kdbusaddons-5.32.0.tar.xz";
|
||||
sha256 = "1a15jjsrkza0ll2viyk834pgdxsdgdacm0982xxwl5z937f75609";
|
||||
name = "kdbusaddons-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdeclarative = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kdeclarative-5.31.0.tar.xz";
|
||||
sha256 = "0hw3rkmlw6j056b3wvhpaj778xfxajcqidpf5x3nyfjmqjvxsgw1";
|
||||
name = "kdeclarative-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kdeclarative-5.32.0.tar.xz";
|
||||
sha256 = "1y5g3yi1l0g1mkqhhakg265r25zm23qc2fqg55rq0g7l9ss7w7g9";
|
||||
name = "kdeclarative-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kded = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kded-5.31.0.tar.xz";
|
||||
sha256 = "0zsikbzi8i8bmlpa4kgdpcpsifkwwclsfdgafd7yf5svc4hyyl51";
|
||||
name = "kded-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kded-5.32.0.tar.xz";
|
||||
sha256 = "0pmmsvqwkw86yvxxf9i6lg13vg80m0kmhjjs88lbm60cgvr5jhq6";
|
||||
name = "kded-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdelibs4support = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/portingAids/kdelibs4support-5.31.0.tar.xz";
|
||||
sha256 = "1yh4lr56mnwsbc0gysj1c58w1r62dlxxds16xnp5j0lyir7wx0pl";
|
||||
name = "kdelibs4support-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/portingAids/kdelibs4support-5.32.0.tar.xz";
|
||||
sha256 = "1wan5ad5rhhrwvwjjjd87n790r6d8r118gs2kw49s91pdj3iv9pb";
|
||||
name = "kdelibs4support-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdesignerplugin = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kdesignerplugin-5.31.0.tar.xz";
|
||||
sha256 = "1g510f8dfvaddcq5hrvsaiwayp2hzkdryzn62zff29ipd7qpcd2x";
|
||||
name = "kdesignerplugin-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kdesignerplugin-5.32.0.tar.xz";
|
||||
sha256 = "1hapj8x8nky3m6lx2ianmxwprf00jqyjsknjz3pi4vk3i714vhnf";
|
||||
name = "kdesignerplugin-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdesu = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kdesu-5.31.0.tar.xz";
|
||||
sha256 = "0mzvvr3zz28pgp42i3f54g5k3wplvjdg41d8jb9k6m5qcj8aryax";
|
||||
name = "kdesu-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kdesu-5.32.0.tar.xz";
|
||||
sha256 = "0zsy1hivy5bbczrpkpgj72mlx0km2nm53kpgrj2hfdy3ss0vn3hl";
|
||||
name = "kdesu-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdewebkit = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kdewebkit-5.31.0.tar.xz";
|
||||
sha256 = "0x9v8i37apbik2krxr9n2pgq5xmcgjlhzflbrwwqaq30c2l8aid0";
|
||||
name = "kdewebkit-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kdewebkit-5.32.0.tar.xz";
|
||||
sha256 = "0y7262pqzdx0hxkyqrbawgx99rn6q85m1slr4nbn914kn350xpy0";
|
||||
name = "kdewebkit-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdnssd = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kdnssd-5.31.0.tar.xz";
|
||||
sha256 = "1bbk9qsvx49zbjvdg0xi9s2x51f331n8wnyd320j3ay0mp4yq2kk";
|
||||
name = "kdnssd-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kdnssd-5.32.0.tar.xz";
|
||||
sha256 = "1xakbs2wm627zn01ni8fyrz64xl5jw4by0pdrb70aad7w37dijrw";
|
||||
name = "kdnssd-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdoctools = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kdoctools-5.31.0.tar.xz";
|
||||
sha256 = "1m7l4bk5h75mcrgislp4rc7fj1szv1ij30y5yizncg2c3aq2czxk";
|
||||
name = "kdoctools-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kdoctools-5.32.0.tar.xz";
|
||||
sha256 = "0i7zgg7iw6w0sdr6cv3yf4blcr61i8zczgmyqa964ka6p3ywwjs9";
|
||||
name = "kdoctools-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kemoticons = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kemoticons-5.31.0.tar.xz";
|
||||
sha256 = "0zvps3jrx02dzy82mwf5l7dirpnj616081yhkp2m0xw3qa3i16xk";
|
||||
name = "kemoticons-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kemoticons-5.32.0.tar.xz";
|
||||
sha256 = "1ncjs9iy6z6rhk83ff7fj1b68rkylnry0h698rh4jvs98gpw8sgj";
|
||||
name = "kemoticons-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kfilemetadata = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kfilemetadata-5.31.0.tar.xz";
|
||||
sha256 = "123cin3fhai85zzz5hfr6h87cjrqvsyl9i809j7q0fshjx8c9wpd";
|
||||
name = "kfilemetadata-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kfilemetadata-5.32.0.tar.xz";
|
||||
sha256 = "01d91gmrxlax0g13ib841vc4qwmv6r4qdr10wfs77rrxsvw7z08f";
|
||||
name = "kfilemetadata-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kglobalaccel = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kglobalaccel-5.31.0.tar.xz";
|
||||
sha256 = "1l7phfk17z9rrdlcjz97zyyqlj9pps0gdpphrfqrz1fyx5ifybmc";
|
||||
name = "kglobalaccel-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kglobalaccel-5.32.0.tar.xz";
|
||||
sha256 = "0dxwjznnqlgnvn15pl34rxlzk3i21cvzn8xbgqmxakny8qiib9ry";
|
||||
name = "kglobalaccel-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kguiaddons = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kguiaddons-5.31.0.tar.xz";
|
||||
sha256 = "0bvjnbsskps2pfh0y72klxfanm54c0iflll5awaps750flb3bbp3";
|
||||
name = "kguiaddons-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kguiaddons-5.32.0.tar.xz";
|
||||
sha256 = "0rbfd0rykmwl9hs1q22pqg2by8vi9y1pgs2ishgnan4sc4w87wjb";
|
||||
name = "kguiaddons-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
khtml = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/portingAids/khtml-5.31.0.tar.xz";
|
||||
sha256 = "19pf3ir3r8igrx3h90sn383kxmyjdxgmwaw66p6vjb83243dy57h";
|
||||
name = "khtml-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/portingAids/khtml-5.32.0.tar.xz";
|
||||
sha256 = "1bkxfldw55khycbpcqpwi86rpv6qyqsndvjncfd5a5knnsynwdyf";
|
||||
name = "khtml-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
ki18n = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/ki18n-5.31.0.tar.xz";
|
||||
sha256 = "1q496i4a3kq2bfxpfnz6bfxk2shfdshrxcf253ab58l76l3jcy9g";
|
||||
name = "ki18n-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/ki18n-5.32.0.tar.xz";
|
||||
sha256 = "068xvw2hy4hlpj85wgjjdj0nc37fygpd8wb1dnpqcvzzy8rc1rsf";
|
||||
name = "ki18n-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kiconthemes = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kiconthemes-5.31.0.tar.xz";
|
||||
sha256 = "0kangszmlhzbwvvplnxk2i938xl8j8jpd8kpf2n9skxkqfd19qr5";
|
||||
name = "kiconthemes-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kiconthemes-5.32.0.tar.xz";
|
||||
sha256 = "00azbyk5y3jgdqv03a2nd0627kdkhq1bkghvw7w62kcnih9k8lq5";
|
||||
name = "kiconthemes-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kidletime = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kidletime-5.31.0.tar.xz";
|
||||
sha256 = "03ajdhxv2jdggqhy02s6xgbaf4pa2chj0f6d5kgz9r0wx6kxmh25";
|
||||
name = "kidletime-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kidletime-5.32.0.tar.xz";
|
||||
sha256 = "0rkxx3bnspjwm4vcy4rdfahk6vcfpkh8fldww0zfdn7s7pigqwch";
|
||||
name = "kidletime-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kimageformats = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kimageformats-5.31.0.tar.xz";
|
||||
sha256 = "17cz2xmmm5g55kndq983vy6cg7adpbiw7ahn0lpvviinnsf53s12";
|
||||
name = "kimageformats-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kimageformats-5.32.0.tar.xz";
|
||||
sha256 = "05hn8n4sc3rj5c30ki068f76k1gfgvq19zcw5jlqpnn1l5db5fvz";
|
||||
name = "kimageformats-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kinit = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kinit-5.31.0.tar.xz";
|
||||
sha256 = "082kq25163x40bq12x84ccrk3zrzmn5xpb5m4zgi06zcvzb8rl9l";
|
||||
name = "kinit-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kinit-5.32.0.tar.xz";
|
||||
sha256 = "0103lflppdw55l9xiqs68lzaq9897m5qnkmy6fp7dm9wfh9aplqn";
|
||||
name = "kinit-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kio = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kio-5.31.0.tar.xz";
|
||||
sha256 = "1rry7v9g2430hkz44b4xjcbs3lr64srs8822a52vx1w69jpkn5s9";
|
||||
name = "kio-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kio-5.32.0.tar.xz";
|
||||
sha256 = "19da02l0aj0l07x9bbklhvx9slci3v1d8q80jvam4vyzs4qdyjin";
|
||||
name = "kio-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kitemmodels = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kitemmodels-5.31.0.tar.xz";
|
||||
sha256 = "0zb9cm5v3ylqhg8l5sp3jskghm5izzihha5ik09y7fabl52cd6v5";
|
||||
name = "kitemmodels-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kitemmodels-5.32.0.tar.xz";
|
||||
sha256 = "0lxld7jdixpq23sycv8n4ckzmdr34aycrsf2zffziw6r59f0mzki";
|
||||
name = "kitemmodels-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kitemviews = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kitemviews-5.31.0.tar.xz";
|
||||
sha256 = "04r4pd5rkdgbszyg7l050r53f38skhh2p2mi3xkz4ckci132srlv";
|
||||
name = "kitemviews-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kitemviews-5.32.0.tar.xz";
|
||||
sha256 = "1h1zgawdi4vbgymdl5215lx7hpcx9jqxy7vjf5hwgs6b2cls1sws";
|
||||
name = "kitemviews-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kjobwidgets = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kjobwidgets-5.31.0.tar.xz";
|
||||
sha256 = "16grnlccmqcs84gpz62s1iz5amdwsprr76gd0q845bd49crgacfa";
|
||||
name = "kjobwidgets-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kjobwidgets-5.32.0.tar.xz";
|
||||
sha256 = "0lhv3mg2liija0g8x14jpv1mdhb0zjh868p1cs24bs9xrw1l8984";
|
||||
name = "kjobwidgets-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kjs = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/portingAids/kjs-5.31.0.tar.xz";
|
||||
sha256 = "027n2ivh5kfmrm06xgcryxm14hbxyf83cx6rbc34093kk905ghg1";
|
||||
name = "kjs-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/portingAids/kjs-5.32.0.tar.xz";
|
||||
sha256 = "022n2hl1s5kap3pqaz4y28wn5z5qh6jcypz5kini2ic94xf7ydrg";
|
||||
name = "kjs-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kjsembed = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/portingAids/kjsembed-5.31.0.tar.xz";
|
||||
sha256 = "1mss7lahczvwhmybxnbcynqwa56gjrxiyq79fcicybp7h7rvqw14";
|
||||
name = "kjsembed-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/portingAids/kjsembed-5.32.0.tar.xz";
|
||||
sha256 = "0h0p4mcvmdgvjv2xd8s4x2i554nh08mc258gxhb41bs6vm3yhiz4";
|
||||
name = "kjsembed-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kmediaplayer = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/portingAids/kmediaplayer-5.31.0.tar.xz";
|
||||
sha256 = "0vxzw5grw53bxp0nvwmiqyw9sbpglhrnfg4d1ldlg4a1gibfijx4";
|
||||
name = "kmediaplayer-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/portingAids/kmediaplayer-5.32.0.tar.xz";
|
||||
sha256 = "1s86dfzrqxrmbqmxq4yyyy1p507d9ns6d7sy6z67dhykgahacqf4";
|
||||
name = "kmediaplayer-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
knewstuff = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/knewstuff-5.31.0.tar.xz";
|
||||
sha256 = "06qrgzfxrpmckyjq21ajvw08n5f5bdyqqgrnrbr1cjsfcx7xwdfl";
|
||||
name = "knewstuff-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/knewstuff-5.32.0.tar.xz";
|
||||
sha256 = "1i3ldy9wwnjhpgdd2d0bg4304k88riin89zqzdl52lpqa6hjl3fp";
|
||||
name = "knewstuff-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
knotifications = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/knotifications-5.31.0.tar.xz";
|
||||
sha256 = "0nz5dkzgkv4mzcsg2mn9zzcqh484cyh5n1y8sx1831r808jd2wly";
|
||||
name = "knotifications-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/knotifications-5.32.0.tar.xz";
|
||||
sha256 = "06ap7m8c2py49pqrnhadbyl69y3nsyamzahbpwipqgh9k62sy34y";
|
||||
name = "knotifications-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
knotifyconfig = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/knotifyconfig-5.31.0.tar.xz";
|
||||
sha256 = "1zdzfqqd32ykd5ibrkssl3p47v704jxs16br1rhrr32ymv4qcbpi";
|
||||
name = "knotifyconfig-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/knotifyconfig-5.32.0.tar.xz";
|
||||
sha256 = "14qc6wj4j5i45vzqsvl2wlc07c6x30hb2680gwfqsvwgiaszkzv4";
|
||||
name = "knotifyconfig-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kpackage = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kpackage-5.31.0.tar.xz";
|
||||
sha256 = "1hg8f2i10wcs31xhvw40dwgbgfrwx93w5bi5wlbrw55jcs040dfr";
|
||||
name = "kpackage-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kpackage-5.32.0.tar.xz";
|
||||
sha256 = "070zasl5c58n01fk18mjgccfizymc9griwicxizqjgzzbgvkns3r";
|
||||
name = "kpackage-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kparts = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kparts-5.31.0.tar.xz";
|
||||
sha256 = "093g5zsdqqyx9z69afsmgyszd807pv3wpzwn37x1glg399dsv7fa";
|
||||
name = "kparts-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kparts-5.32.0.tar.xz";
|
||||
sha256 = "0hrx0mdvw301nbdyw5fkvgkw60ya6kmfw6hfzmj48bws8mi33rs5";
|
||||
name = "kparts-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kpeople = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kpeople-5.31.0.tar.xz";
|
||||
sha256 = "1f71c2q8a9m463ghpq50gbhkvf5szkvvfwbamlrwwygpb89fzfjy";
|
||||
name = "kpeople-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kpeople-5.32.0.tar.xz";
|
||||
sha256 = "1xqi8zr76hajgyv016iaqlmnr5b84s71fbx412q153g92jglp4mk";
|
||||
name = "kpeople-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kplotting = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kplotting-5.31.0.tar.xz";
|
||||
sha256 = "15yv1rh1vlxhv77j50inq9kkwalhs2r1mjba82fnxy8z569i66cm";
|
||||
name = "kplotting-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kplotting-5.32.0.tar.xz";
|
||||
sha256 = "0a0pfmdlx84526lb2jvx94i2pf85km57fm2ygis4z5mjgbzsmb6v";
|
||||
name = "kplotting-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kpty = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kpty-5.31.0.tar.xz";
|
||||
sha256 = "0hfs1gdi1fqaaki5aa9b93j4pl33g4s82yxpbyc0h9k2891aq196";
|
||||
name = "kpty-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kpty-5.32.0.tar.xz";
|
||||
sha256 = "0h4318rc9902cvqj69capb8lh7s84y44jd59d11fyhq21jhy152s";
|
||||
name = "kpty-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kross = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/portingAids/kross-5.31.0.tar.xz";
|
||||
sha256 = "0lc9ijn60bw0y9nrlva2fd0hf0b4x6488jjmymrnrc8zzjnigyqp";
|
||||
name = "kross-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/portingAids/kross-5.32.0.tar.xz";
|
||||
sha256 = "0mgicb2rfhzp0hr1zckp1qzqzbdx0zy82mcjibrlsp7spmvynw5a";
|
||||
name = "kross-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
krunner = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/krunner-5.31.0.tar.xz";
|
||||
sha256 = "0xqayhd179387m02arxdcl1lgk8f2h0fxlzyigy6ja6wylbwphrw";
|
||||
name = "krunner-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/krunner-5.32.0.tar.xz";
|
||||
sha256 = "1k4rg9vqr6h5aj7v51fx3i5z9kxlfpacahs81hkwksi6if8ik4kr";
|
||||
name = "krunner-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kservice = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kservice-5.31.0.tar.xz";
|
||||
sha256 = "0hjlcnypg96np88hgfvqd8g5z4cxgi4a0j5mnlfx65jrzpv5hsjg";
|
||||
name = "kservice-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kservice-5.32.0.tar.xz";
|
||||
sha256 = "02xk3ajspprmx964zhwh2l3axm4gns9h0m0pvcb1v5j8pfh9v70q";
|
||||
name = "kservice-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
ktexteditor = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/ktexteditor-5.31.0.tar.xz";
|
||||
sha256 = "099axcwl8z4npvcrirycc82zg7sf9ac3yxrwpsp0f337gdl1qvln";
|
||||
name = "ktexteditor-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/ktexteditor-5.32.0.tar.xz";
|
||||
sha256 = "1sybw8k3f36mcs5qh3b51v7ynbqn4pbiiabkyxfmyi82i09m2jgw";
|
||||
name = "ktexteditor-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
ktextwidgets = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/ktextwidgets-5.31.0.tar.xz";
|
||||
sha256 = "0n0v42b4bq1f6f120bjhr69qwgnvwlhnnqsh75nl9jvv8g3lyspy";
|
||||
name = "ktextwidgets-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/ktextwidgets-5.32.0.tar.xz";
|
||||
sha256 = "1s2fd4n4hfkzscxv0cdfjynjzi1f57pfi9a3fp6rrm5c5645zk7r";
|
||||
name = "ktextwidgets-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kunitconversion = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kunitconversion-5.31.0.tar.xz";
|
||||
sha256 = "190d2v3bv7ccg2wqjmd6p46d4zz59r1mf86l2wkqw212rr59pafx";
|
||||
name = "kunitconversion-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kunitconversion-5.32.0.tar.xz";
|
||||
sha256 = "0crc8riwafcx6fwhgrc8vfbwmdygd6vlz1fbbgni09gamm8mbcin";
|
||||
name = "kunitconversion-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kwallet = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kwallet-5.31.0.tar.xz";
|
||||
sha256 = "0r7n49ii8y1ygc7ncysjif4mrmsd9jq4yfm251m7lrp82drza26n";
|
||||
name = "kwallet-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kwallet-5.32.0.tar.xz";
|
||||
sha256 = "0psc4n6lck9gbx2nn7mgv33x4z2r0xp1mx1xcsgy8smvalrfv5xa";
|
||||
name = "kwallet-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kwayland = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kwayland-5.31.0.tar.xz";
|
||||
sha256 = "0f134spj1vz3f43bdrb93kr54s50x4a9xvkfhl3inlxmglbk3h8b";
|
||||
name = "kwayland-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kwayland-5.32.0.tar.xz";
|
||||
sha256 = "1kzvq7qx102rfdv975x5sd37lsl6wn0mzm2m1f9fnnn2rvii3h5d";
|
||||
name = "kwayland-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kwidgetsaddons = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kwidgetsaddons-5.31.0.tar.xz";
|
||||
sha256 = "0yrhss1x8q4nanpq2gbzqjds9s7hjl3zzkwnd8hahh9fyg8w9815";
|
||||
name = "kwidgetsaddons-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kwidgetsaddons-5.32.0.tar.xz";
|
||||
sha256 = "1aksy326ppdfcx20zl9hxsd8j0br32j6dlx4i1xxbd976csys9b2";
|
||||
name = "kwidgetsaddons-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kwindowsystem = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kwindowsystem-5.31.0.tar.xz";
|
||||
sha256 = "0jzhsdfzzhxfgjqd4pl98ckbbqfwkv6qy5szh82078gxc2rf1wna";
|
||||
name = "kwindowsystem-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kwindowsystem-5.32.0.tar.xz";
|
||||
sha256 = "1c3kd23c4wwzdhfcyhv41czw3y2kk1492xn6ah9n3r98akrhgar1";
|
||||
name = "kwindowsystem-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kxmlgui = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kxmlgui-5.31.0.tar.xz";
|
||||
sha256 = "1rnznapp1vflg66k0jk8n8v9zci20bs0v88hci3rf0qfd5cmgnzr";
|
||||
name = "kxmlgui-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kxmlgui-5.32.0.tar.xz";
|
||||
sha256 = "1pxi4z7z3bzwcnfwq0pvjsmds401fkisyr353lyxf4rvcpwj3a65";
|
||||
name = "kxmlgui-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kxmlrpcclient = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/kxmlrpcclient-5.31.0.tar.xz";
|
||||
sha256 = "1lrv1qxbfm1ss2hb171p9s3f3iwn8zfrsipin0gvfwnjrldi4fkb";
|
||||
name = "kxmlrpcclient-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/kxmlrpcclient-5.32.0.tar.xz";
|
||||
sha256 = "1kaczibdfdph5mpg1dldsmqb1six57w7ch3v0v7av5h6j6sx0xaq";
|
||||
name = "kxmlrpcclient-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
modemmanager-qt = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/modemmanager-qt-5.31.0.tar.xz";
|
||||
sha256 = "0s2dfz9zvn6f9xpzs412iniipaai5zs9m06lpxss0w1nq5ig856r";
|
||||
name = "modemmanager-qt-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/modemmanager-qt-5.32.0.tar.xz";
|
||||
sha256 = "0ywyiq1kj4ya5knn0r12j9m1ig9mlyfypnrzihlvipddjrqs7jyd";
|
||||
name = "modemmanager-qt-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
networkmanager-qt = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/networkmanager-qt-5.31.0.tar.xz";
|
||||
sha256 = "18wbmd4nsgwzqlp254k1ahy8iyydx59fshb3wci5sgxnsn435np4";
|
||||
name = "networkmanager-qt-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/networkmanager-qt-5.32.0.tar.xz";
|
||||
sha256 = "0bcy7nzfvx2xah3kxklmrjn08qbjddiny7wf7nkxsbc3kkhrxqyd";
|
||||
name = "networkmanager-qt-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
oxygen-icons5 = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/oxygen-icons5-5.31.0.tar.xz";
|
||||
sha256 = "0ka4zll8v8wahqg50vpm9mrxlyh9244y0yrprbwxzl9xpx113ppi";
|
||||
name = "oxygen-icons5-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/oxygen-icons5-5.32.0.tar.xz";
|
||||
sha256 = "05v3blgs4qbjl8s6470baahy9a98cfi3mplzp462axcgkqdj1nwf";
|
||||
name = "oxygen-icons5-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-framework = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/plasma-framework-5.31.0.tar.xz";
|
||||
sha256 = "0hq3d96d9xhx6wqrrhnyygwajg69vfxbjc8dlpf5nwc3kqv2wim2";
|
||||
name = "plasma-framework-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/plasma-framework-5.32.0.tar.xz";
|
||||
sha256 = "1hrnmilc30d1kh20cky329i5ji3qyy7m4f8jzax5cgl7nrjca31h";
|
||||
name = "plasma-framework-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
prison = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/prison-5.31.0.tar.xz";
|
||||
sha256 = "0qaqj5gazby4fdq9yii67cmr04i007blhl27h9c5p169khh9ck2s";
|
||||
name = "prison-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/prison-5.32.0.tar.xz";
|
||||
sha256 = "0q5cs60293bdm3mynhx39rjsh87mfxngxsqa2fqm2gsqjvlciyvr";
|
||||
name = "prison-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
solid = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/solid-5.31.0.tar.xz";
|
||||
sha256 = "05rgzdzwbnmnvzkf4gz3z5i1ggwyd21y0yli7shas4i8l29kjd7m";
|
||||
name = "solid-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/solid-5.32.0.tar.xz";
|
||||
sha256 = "1jhymivravgix0sa0szkax50j09l5fl55xi3fbyjxlb4cil114v5";
|
||||
name = "solid-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
sonnet = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/sonnet-5.31.0.tar.xz";
|
||||
sha256 = "16vzdhppb2w5vyfr332bcvw4dyw9cz4apxain28d43p0ir03xxz3";
|
||||
name = "sonnet-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/sonnet-5.32.0.tar.xz";
|
||||
sha256 = "17sjv48b3z5fgplsy16ilcw6p7mlqjs61ib6jqd1mqzv4xrr27yi";
|
||||
name = "sonnet-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
syntax-highlighting = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/syntax-highlighting-5.31.0.tar.xz";
|
||||
sha256 = "0igd6jpbck94gl8gs5a5dgj2cxbv370prnk22037clqry6y38v1a";
|
||||
name = "syntax-highlighting-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/syntax-highlighting-5.32.0.tar.xz";
|
||||
sha256 = "1d9m7x53mwggwmhhba1c7b8v4f8qjql889y674ldpzs2nrk5y7x3";
|
||||
name = "syntax-highlighting-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
threadweaver = {
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.31/threadweaver-5.31.0.tar.xz";
|
||||
sha256 = "0wsdv135mxpka0rfg9zwhnzp0svfkvd4idyj38rgipxbada0hb7f";
|
||||
name = "threadweaver-5.31.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.32/threadweaver-5.32.0.tar.xz";
|
||||
sha256 = "1qpy2rzqyd4ap5fibkfk87z66ijh2h79cd7f0h506jh2dbx20g0h";
|
||||
name = "threadweaver-5.32.0.tar.xz";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace " icule iculx" "" \
|
||||
--replace "tidy/tidy.h" "tidy.h" \
|
||||
--replace "/usr/include/tidy" "${libtidy}/include" \
|
||||
--replace "/usr/include/libxml2" "${libxml2.dev}/include/libxml2"
|
||||
|
||||
@@ -16,7 +16,9 @@ in stdenv.mkDerivation rec {
|
||||
sha256 = "1wrx2ig6yvgywjs25hzy4szgml21hwhd7ds0ghyfybhkiq7lyg6x";
|
||||
};
|
||||
|
||||
buildInputs = [ nspr perl zlib sqlite ];
|
||||
buildInputs = [ perl zlib sqlite ];
|
||||
|
||||
propagatedBuildInputs = [ nspr ];
|
||||
|
||||
prePatch = ''
|
||||
xz -d < ${nssPEM} | patch -p1
|
||||
|
||||
@@ -286,7 +286,7 @@ stdenv.mkDerivation {
|
||||
homepage = http://www.qt.io;
|
||||
description = "A cross-platform application framework for C++";
|
||||
license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
|
||||
maintainers = with maintainers; [ bbenoist qknight ttuegel ];
|
||||
maintainers = with maintainers; [ qknight ttuegel ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
|
||||
@@ -307,7 +307,7 @@ stdenv.mkDerivation {
|
||||
homepage = http://www.qt.io;
|
||||
description = "A cross-platform application framework for C++";
|
||||
license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
|
||||
maintainers = with maintainers; [ bbenoist qknight ttuegel ];
|
||||
maintainers = with maintainers; [ qknight ttuegel ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -306,7 +306,7 @@ stdenv.mkDerivation {
|
||||
homepage = http://www.qt.io;
|
||||
description = "A cross-platform application framework for C++";
|
||||
license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
|
||||
maintainers = with maintainers; [ bbenoist qknight ttuegel ];
|
||||
maintainers = with maintainers; [ qknight ttuegel ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
|
||||
@@ -2,16 +2,19 @@
|
||||
|
||||
, xlibs, libXcursor, libXScrnSaver, libXrandr, libXtst
|
||||
, fontconfig, freetype, harfbuzz, icu, dbus
|
||||
, zlib, libjpeg, libpng, libtiff
|
||||
, zlib, minizip, libjpeg, libpng, libtiff, libwebp, libopus
|
||||
, jsoncpp, protobuf, libvpx, srtp, snappy, nss, libevent
|
||||
, alsaLib
|
||||
, libcap
|
||||
, pciutils
|
||||
, systemd
|
||||
|
||||
, bison, flex, git, which, gperf
|
||||
, coreutils
|
||||
, pkgconfig, python2
|
||||
, enableProprietaryCodecs ? true
|
||||
|
||||
, stdenv # lib.optional, needsPax
|
||||
, lib, stdenv # lib.optional, needsPax
|
||||
}:
|
||||
|
||||
qtSubmodule {
|
||||
@@ -32,9 +35,6 @@ qtSubmodule {
|
||||
substituteInPlace ./src/3rdparty/chromium/v8/build/standalone.gypi \
|
||||
--replace /bin/echo ${coreutils}/bin/echo
|
||||
|
||||
# fix default SSL bundle location
|
||||
sed -i -e 's,/cert.pem,/certs/ca-bundle.crt,' src/3rdparty/chromium/third_party/boringssl/src/crypto/x509/x509_def.c
|
||||
|
||||
# Fix library paths
|
||||
sed -i \
|
||||
-e "s,QLibraryInfo::location(QLibraryInfo::DataPath),QLatin1String(\"$out\"),g" \
|
||||
@@ -42,17 +42,26 @@ qtSubmodule {
|
||||
-e "s,QLibraryInfo::location(QLibraryInfo::LibraryExecutablesPath),QLatin1String(\"$out/libexec\"),g" \
|
||||
src/core/web_engine_library_info.cpp
|
||||
|
||||
configureFlags+="\
|
||||
-plugindir $out/lib/qt5/plugins \
|
||||
-importdir $out/lib/qt5/imports \
|
||||
-qmldir $out/lib/qt5/qml \
|
||||
-docdir $out/share/doc/qt5"
|
||||
sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \
|
||||
src/3rdparty/chromium/device/udev_linux/udev?_loader.cc
|
||||
|
||||
sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
|
||||
src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc
|
||||
'';
|
||||
|
||||
qmakeFlags = lib.optional enableProprietaryCodecs "WEBENGINE_CONFIG+=use_proprietary_codecs";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dbus zlib alsaLib
|
||||
dbus zlib minizip alsaLib snappy nss protobuf jsoncpp libevent
|
||||
|
||||
# Image formats
|
||||
libjpeg libpng libtiff
|
||||
libjpeg libpng libtiff libwebp
|
||||
|
||||
# Video formats
|
||||
srtp libvpx
|
||||
|
||||
# Audio formats
|
||||
alsaLib libopus
|
||||
|
||||
# Text rendering
|
||||
fontconfig freetype harfbuzz icu
|
||||
@@ -64,7 +73,7 @@ qtSubmodule {
|
||||
libcap
|
||||
pciutils
|
||||
];
|
||||
patches = stdenv.lib.optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch;
|
||||
patches = lib.optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch;
|
||||
postInstall = ''
|
||||
cat > $out/libexec/qt.conf <<EOF
|
||||
[Paths]
|
||||
|
||||
@@ -265,7 +265,7 @@ stdenv.mkDerivation {
|
||||
homepage = http://www.qt.io;
|
||||
description = "A cross-platform application framework for C++";
|
||||
license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
|
||||
maintainers = with maintainers; [ bbenoist qknight ttuegel ];
|
||||
maintainers = with maintainers; [ qknight ttuegel ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
|
||||
@@ -2,16 +2,19 @@
|
||||
|
||||
, xlibs, libXcursor, libXScrnSaver, libXrandr, libXtst
|
||||
, fontconfig, freetype, harfbuzz, icu, dbus
|
||||
, zlib, libjpeg, libpng, libtiff
|
||||
, zlib, minizip, libjpeg, libpng, libtiff, libwebp, libopus
|
||||
, jsoncpp, protobuf, libvpx, srtp, snappy, nss, libevent
|
||||
, alsaLib
|
||||
, libcap
|
||||
, pciutils
|
||||
, systemd
|
||||
|
||||
, bison, flex, git, which, gperf
|
||||
, coreutils
|
||||
, pkgconfig, python2
|
||||
, enableProprietaryCodecs ? true
|
||||
|
||||
, stdenv # lib.optional, needsPax
|
||||
, lib, stdenv # lib.optional, needsPax
|
||||
}:
|
||||
|
||||
qtSubmodule {
|
||||
@@ -32,20 +35,33 @@ qtSubmodule {
|
||||
substituteInPlace ./src/3rdparty/chromium/v8/gypfiles/standalone.gypi \
|
||||
--replace /bin/echo ${coreutils}/bin/echo
|
||||
|
||||
# fix default SSL bundle location
|
||||
sed -i -e 's,/cert.pem,/certs/ca-bundle.crt,' src/3rdparty/chromium/third_party/boringssl/src/crypto/x509/x509_def.c
|
||||
# Fix library paths
|
||||
sed -i \
|
||||
-e "s,QLibraryInfo::location(QLibraryInfo::DataPath),QLatin1String(\"$out\"),g" \
|
||||
-e "s,QLibraryInfo::location(QLibraryInfo::TranslationsPath),QLatin1String(\"$out/translations\"),g" \
|
||||
-e "s,QLibraryInfo::location(QLibraryInfo::LibraryExecutablesPath),QLatin1String(\"$out/libexec\"),g" \
|
||||
src/core/web_engine_library_info.cpp
|
||||
|
||||
configureFlags+="\
|
||||
-plugindir $out/lib/qt5/plugins \
|
||||
-importdir $out/lib/qt5/imports \
|
||||
-qmldir $out/lib/qt5/qml \
|
||||
-docdir $out/share/doc/qt5"
|
||||
sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \
|
||||
src/3rdparty/chromium/device/udev_linux/udev?_loader.cc
|
||||
|
||||
sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
|
||||
src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc
|
||||
'';
|
||||
|
||||
qmakeFlags = lib.optional enableProprietaryCodecs "WEBENGINE_CONFIG+=use_proprietary_codecs";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dbus zlib alsaLib
|
||||
dbus zlib minizip alsaLib snappy nss protobuf jsoncpp libevent
|
||||
|
||||
# Image formats
|
||||
libjpeg libpng libtiff
|
||||
libjpeg libpng libtiff libwebp
|
||||
|
||||
# Video formats
|
||||
srtp libvpx
|
||||
|
||||
# Audio formats
|
||||
alsaLib libopus
|
||||
|
||||
# Text rendering
|
||||
fontconfig freetype harfbuzz icu
|
||||
@@ -57,7 +73,7 @@ qtSubmodule {
|
||||
libcap
|
||||
pciutils
|
||||
];
|
||||
patches = stdenv.lib.optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch;
|
||||
patches = lib.optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch;
|
||||
postInstall = ''
|
||||
cat > $out/libexec/qt.conf <<EOF
|
||||
[Paths]
|
||||
|
||||
@@ -31,8 +31,8 @@ _makeQtWrapperSetup() {
|
||||
export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}${!outputLib}/lib/qt5/plugins"
|
||||
export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}${!outputLib}/lib/qt5/imports"
|
||||
export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}${!outputLib}/lib/qt5/qml"
|
||||
export RUNTIME_XDG_DATA_DIRS="$XDG_DATA_DIRS${XDG_DATA_DIRS:+:}${!outputBin}/share"
|
||||
export RUNTIME_XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS${XDG_CONFIG_DIRS:+:}${!outputBin}/etc/xdg"
|
||||
export RUNTIME_XDG_DATA_DIRS="$RUNTIME_XDG_DATA_DIRS${RUNTIME_XDG_DATA_DIRS:+:}${!outputBin}/share"
|
||||
export RUNTIME_XDG_CONFIG_DIRS="$RUNTIME_XDG_CONFIG_DIRS${RUNTIME_XDG_CONFIG_DIRS:+:}${!outputBin}/etc/xdg"
|
||||
}
|
||||
|
||||
prePhases+=(_makeQtWrapperSetup)
|
||||
|
||||
@@ -29,8 +29,8 @@ _makeQtWrapperSetup() {
|
||||
export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}${!outputLib}/lib/qt5/plugins"
|
||||
export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}${!outputLib}/lib/qt5/imports"
|
||||
export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}${!outputLib}/lib/qt5/qml"
|
||||
export RUNTIME_XDG_DATA_DIRS="$XDG_DATA_DIRS${XDG_DATA_DIRS:+:}${!outputBin}/share"
|
||||
export RUNTIME_XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS${XDG_CONFIG_DIRS:+:}${!outputBin}/etc/xdg"
|
||||
export RUNTIME_XDG_DATA_DIRS="$RUNTIME_XDG_DATA_DIRS${RUNTIME_XDG_DATA_DIRS:+:}${!outputBin}/share"
|
||||
export RUNTIME_XDG_CONFIG_DIRS="$RUNTIME_XDG_CONFIG_DIRS${RUNTIME_XDG_CONFIG_DIRS:+:}${!outputBin}/etc/xdg"
|
||||
}
|
||||
|
||||
prePhases+=(_makeQtWrapperSetup)
|
||||
|
||||
@@ -1,56 +0,0 @@
|
||||
From 75e8685740199537bfefcbd9996ec3ff9f6342e6 Mon Sep 17 00:00:00 2001
|
||||
From: Graham Christensen <graham@grahamc.com>
|
||||
Date: Wed, 8 Feb 2017 21:58:43 -0500
|
||||
Subject: [PATCH] Adapting the following patch, from
|
||||
http://pkgs.fedoraproject.org/cgit/rpms/spice.git/plain/0003-main-channel-Prevent-overflow-reading-messages-from-.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d
|
||||
|
||||
> From: Frediano Ziglio <fziglio@redhat.com>
|
||||
> Date: Tue, 29 Nov 2016 16:46:56 +0000
|
||||
> Subject: [spice-server 3/3] main-channel: Prevent overflow reading messages
|
||||
> from client
|
||||
>
|
||||
> Caller is supposed the function return a buffer able to store
|
||||
> size bytes.
|
||||
>
|
||||
> Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
|
||||
> Acked-by: Christophe Fergeau <cfergeau@redhat.com>
|
||||
> ---
|
||||
> server/main-channel.c | 3 +++
|
||||
> 1 file changed, 3 insertions(+)
|
||||
>
|
||||
> diff --git a/server/main-channel.c b/server/main-channel.c
|
||||
> index 24dd448..1124506 100644
|
||||
> --- a/server/main-channel.c
|
||||
> +++ b/server/main-channel.c
|
||||
> @@ -258,6 +258,9 @@ static uint8_t *main_channel_alloc_msg_rcv_buf(RedChannelClient *rcc,
|
||||
>
|
||||
> if (type == SPICE_MSGC_MAIN_AGENT_DATA) {
|
||||
> return reds_get_agent_data_buffer(red_channel_get_server(channel), mcc, size);
|
||||
> + } else if (size > sizeof(main_chan->recv_buf)) {
|
||||
> + /* message too large, caller will log a message and close the connection */
|
||||
> + return NULL;
|
||||
> } else {
|
||||
> return main_chan->recv_buf;
|
||||
> }
|
||||
> --
|
||||
> 2.9.3
|
||||
> ---
|
||||
server/main_channel.c | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/server/main_channel.c b/server/main_channel.c
|
||||
index 0ecc9df..1fc3915 100644
|
||||
--- a/server/main_channel.c
|
||||
+++ b/server/main_channel.c
|
||||
@@ -1026,6 +1026,9 @@ static uint8_t *main_channel_alloc_msg_rcv_buf(RedChannelClient *rcc,
|
||||
|
||||
if (type == SPICE_MSGC_MAIN_AGENT_DATA) {
|
||||
return reds_get_agent_data_buffer(mcc, size);
|
||||
+ } else if (size > sizeof(main_chan->recv_buf)) {
|
||||
+ /* message too large, caller will log a message and close the connection */
|
||||
+ return NULL;
|
||||
} else {
|
||||
return main_chan->recv_buf;
|
||||
}
|
||||
--
|
||||
2.10.0
|
||||
@@ -6,14 +6,15 @@
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "spice-0.12.8";
|
||||
name = "spice-0.13.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.spice-space.org/download/releases/${name}.tar.bz2";
|
||||
sha256 = "0za03i77j8i3g5l2np2j7vy8cqsdbkm9wbv4hjnaqq9xhz2sa0gr";
|
||||
sha256 = "17mqgwamdhj8sx8vhahrjl5937x693kjnw6cp6v0akjrwz011xrh";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# the following three patches fix CVE-2016-9577 and CVE-2016-9578
|
||||
(fetchpatch {
|
||||
name = "0001-Prevent-possible-DoS-attempts-during-protocol-handsh.patch";
|
||||
url = "http://pkgs.fedoraproject.org/cgit/rpms/spice.git/plain/0001-Prevent-possible-DoS-attempts-during-protocol-handsh.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d";
|
||||
@@ -24,9 +25,11 @@ stdenv.mkDerivation rec {
|
||||
url = "http://pkgs.fedoraproject.org/cgit/rpms/spice.git/plain/0002-Prevent-integer-overflows-in-capability-checks.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d";
|
||||
sha256 = "1r1bhq98w93cvvrlrz6jwdfsy261xl3xqs0ppchaa2igyxvxv5z5";
|
||||
})
|
||||
# Originally from http://pkgs.fedoraproject.org/cgit/rpms/spice.git/plain/0003-main-channel-Prevent-overflow-reading-messages-from-.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d
|
||||
# but main-channel.c was renamed to main_channel.c
|
||||
./0001-Adapting-the-following-patch-from-http-pkgs.fedorapr.patch
|
||||
(fetchpatch {
|
||||
name = "0003-main-channel-Prevent-overflow-reading-messages-from.patch";
|
||||
url = "https://cgit.freedesktop.org/spice/spice/patch/?id=1d3e26c0ee75712fa4bbbcfa09d8d5866b66c8af";
|
||||
sha256 = "030mm551aipck99rqiz39vsvk071pn8715zynr5j6chwzgpflwm3";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ pixman celt alsaLib openssl libjpeg zlib
|
||||
|
||||
@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
|
||||
"--disable-debug"
|
||||
] ++ optional (openssl != null) "--enable-openssl";
|
||||
|
||||
buildFlags = [ "shared_library" ];
|
||||
|
||||
postInstall = ''
|
||||
rm -rf $out/bin
|
||||
'';
|
||||
|
||||
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Open source libraries for 3D computer graphics, image processing and visualization";
|
||||
homepage = http://www.vtk.org/;
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
maintainers = with stdenv.lib.maintainers; [ viric bbenoist ];
|
||||
maintainers = with stdenv.lib.maintainers; [ viric ];
|
||||
platforms = with stdenv.lib.platforms; unix;
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user