mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues Wiki Activity

Merge pull request #75452 from NixOS/staging-next

Browse source 
Staging next
This commit is contained in:
Frederik Rietdijk 2019-12-15 16:28:08 +01:00 committed by GitHub
parent 7eaaf728e4 2abd0a559c
commit 08eaac6be3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
80 changed files with 2019 additions and 1626 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
nixos/doc/manual/release-notes/rl-2003.xml
View file

@ -204,6 +204,14 @@
The <literal>buildRustCrate</literal> infrastructure now produces <literal>lib</literal> outputs in addition to the <literal>out</literal> output.
This has led to drastically reduced closed sizes for some rust crates since development dependencies are now in the <literal>lib</literal> output.
</para>
</listitem>
<listitem>
<para>
Pango was upgraded to 1.44, which no longer uses freetype for font loading. This means that type1
and bitmap fonts are no longer supported in applications relying on Pango for font rendering
(notably, GTK application). See <link xlink:href="https://gitlab.gnome.org/GNOME/pango/issues/386">
upstream issue</link> for more information.
</para>
</listitem>
<listitem>
<para>

13
pkgs/applications/editors/gnome-builder/default.nix
View file

@ -5,6 +5,7 @@
, docbook_xsl
, docbook_xml_dtd_43
, fetchurl
, fetchpatch
, flatpak
, gnome3
, libgit2-glib
@ -45,6 +46,18 @@ stdenv.mkDerivation rec {
sha256 = "19018pq94cxf6fywd7fsmy98x56by5zfmh140pl530gaaw84cvhb";
};
patches = [
# Fix build with Meson 0.52
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-builder/commit/c8b862b491cfbbb4f79b24d7cd90e4fb1f37cb9f.patch";
sha256 = "0n8kg7nnjqmbnyag1ps6dvrlqrxc94djjncqx10d6y7ijwdxf4w8";
})
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-builder/commit/da26dfbf78468f5ed724e022b300a07862a95833.patch";
sha256 = "0psa65bzjpjj7vc5rknv2w2dz3p50jjv10s6j2fd6lpw8j2800k4";
})
];
nativeBuildInputs = [
appstream-glib
desktop-file-utils

4
pkgs/applications/editors/vim/common.nix
View file

@ -1,12 +1,12 @@
{ lib, fetchFromGitHub }:
rec {
version = "8.1.2237";
version = "8.1.2407";
src = fetchFromGitHub {
owner = "vim";
repo = "vim";
rev = "v${version}";
sha256 = "1qwh3cw5zmjmnk07g0nc8nz8k5nlq9ilvvygnfdjy1fqg69q8p0h";
sha256 = "1h23lncm8py0ip8p61y8hivmnd8fzf8xpwpkd73d3a3fpiyd2yx8";
};
enableParallelBuilding = true;

4
pkgs/applications/graphics/digikam/default.nix
View file

@ -9,7 +9,7 @@
, qtwebengine
, akonadi-contacts
, kcalcore
, kcalendarcore
, kconfigwidgets
, kcoreaddons
, kdoctools
@ -89,7 +89,7 @@ mkDerivation rec {
qtwebengine
akonadi-contacts
kcalcore
kcalendarcore
kconfigwidgets
kcoreaddons
kfilemetadata

4
pkgs/applications/kde/akonadi-calendar.nix
View file

@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, akonadi-contacts, kcalcore, kcalutils, kcontacts,
akonadi, akonadi-contacts, kcalendarcore, kcalutils, kcontacts,
kidentitymanagement, kio, kmailtransport,
}:
@ -13,7 +13,7 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
akonadi akonadi-contacts kcalcore kcalutils kcontacts kidentitymanagement
akonadi akonadi-contacts kcalendarcore kcalutils kcontacts kidentitymanagement
kio kmailtransport
];
outputs = [ "out" "dev" ];

4
pkgs/applications/kde/akonadi-search.nix
View file

@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, akonadi-mime, kcalcore, kcmutils, kcontacts, kcoreaddons, kmime,
akonadi, akonadi-mime, kcalendarcore, kcmutils, kcontacts, kcoreaddons, kmime,
krunner, qtbase, xapian
}:
@ -14,7 +14,7 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kcmutils krunner xapian ];
propagatedBuildInputs = [
akonadi akonadi-mime kcalcore kcontacts kcoreaddons kmime qtbase
akonadi akonadi-mime kcalendarcore kcontacts kcoreaddons kmime qtbase
];
outputs = [ "out" "dev" ];
}

4
pkgs/applications/kde/akonadiconsole.nix
View file

@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, akonadi-contacts, calendarsupport, kcalcore, kcompletion,
akonadi, akonadi-contacts, calendarsupport, kcalendarcore, kcompletion,
kconfigwidgets, kcontacts, kdbusaddons, kitemmodels, kpimtextedit, libkdepim,
ktextwidgets, kxmlgui, messagelib, qtbase, akonadi-search, xapian
}:
@ -14,7 +14,7 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi akonadi-contacts calendarsupport kcalcore kcompletion kconfigwidgets
akonadi akonadi-contacts calendarsupport kcalendarcore kcompletion kconfigwidgets
kcontacts kdbusaddons kitemmodels kpimtextedit ktextwidgets kxmlgui
messagelib qtbase libkdepim akonadi-search xapian
];

2
pkgs/applications/kde/fetch.sh
View file

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/applications/19.08.2/ )
WGET_ARGS=( https://download.kde.org/stable/applications/19.08.3/ )

4
pkgs/applications/kde/kalarm.nix
View file

@ -6,7 +6,7 @@
kguiaddons, ki18n, kiconthemes, kjobwidgets, kcmutils, kdelibs4support, kio,
knotifications, kservice, kwidgetsaddons, kwindowsystem, kxmlgui, phonon,
kimap, akonadi, akonadi-contacts, akonadi-mime, kalarmcal, kcalcore, kcalutils,
kimap, akonadi, akonadi-contacts, akonadi-mime, kalarmcal, kcalendarcore, kcalutils,
kholidays, kidentitymanagement, libkdepim, mailcommon, kmailtransport, kmime,
pimcommon, kpimtextedit, kdepim-apps-libs, messagelib,
@ -27,7 +27,7 @@ mkDerivation {
kguiaddons ki18n kiconthemes kjobwidgets kcmutils kdelibs4support kio
knotifications kservice kwidgetsaddons kwindowsystem kxmlgui phonon
kimap akonadi akonadi-contacts akonadi-mime kalarmcal kcalcore kcalutils
kimap akonadi akonadi-contacts akonadi-mime kalarmcal kcalendarcore kcalutils
kholidays kidentitymanagement libkdepim mailcommon kmailtransport kmime
pimcommon kpimtextedit kdepim-apps-libs messagelib

4
pkgs/applications/kde/kalarmcal.nix
View file

@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, kcalcore, kdelibs4support, kholidays, kidentitymanagement,
akonadi, kcalendarcore, kdelibs4support, kholidays, kidentitymanagement,
kpimtextedit, kcalutils
}:
@ -13,7 +13,7 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
akonadi kcalcore kdelibs4support kholidays kidentitymanagement kpimtextedit kcalutils
akonadi kcalendarcore kdelibs4support kholidays kidentitymanagement kpimtextedit kcalutils
];
outputs = [ "out" "dev" ];
}

4
pkgs/applications/kde/kcalutils.nix
View file

@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
grantlee, kcalcore, kconfig, kontactinterface, kcoreaddons, kdelibs4support,
grantlee, kcalendarcore, kconfig, kontactinterface, kcoreaddons, kdelibs4support,
kidentitymanagement, kpimtextedit,
}:
@ -13,7 +13,7 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
grantlee kcalcore kconfig kontactinterface kcoreaddons kdelibs4support
grantlee kcalendarcore kconfig kontactinterface kcoreaddons kdelibs4support
kidentitymanagement kpimtextedit
];
outputs = [ "out" "dev" ];

4
pkgs/applications/kde/kdepim-addons.nix
View file

@ -2,7 +2,7 @@
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, shared-mime-info,
akonadi-import-wizard, akonadi-notes, calendarsupport, eventviews,
incidenceeditor, kcalcore, kcalutils, kconfig, kdbusaddons, kdeclarative,
incidenceeditor, kcalendarcore, kcalutils, kconfig, kdbusaddons, kdeclarative,
kdepim-apps-libs, kholidays, ki18n, kmime, ktexteditor, ktnef, libgravatar,
libksieve, mailcommon, mailimporter, messagelib, poppler, prison, kpkpass,
kitinerary, kontactinterface
@ -17,7 +17,7 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];
buildInputs = [
akonadi-import-wizard akonadi-notes calendarsupport eventviews
incidenceeditor kcalcore kcalutils kconfig kdbusaddons kdeclarative
incidenceeditor kcalendarcore kcalutils kconfig kdbusaddons kdeclarative
kdepim-apps-libs kholidays ki18n kmime ktexteditor ktnef libgravatar
libksieve mailcommon mailimporter messagelib poppler prison kpkpass
kitinerary kontactinterface

4
pkgs/applications/kde/kitinerary.nix
View file

@ -1,7 +1,7 @@
{
mkDerivation, lib, extra-cmake-modules
, qtbase, qtdeclarative, ki18n, kmime, kpkpass
, poppler, kcontacts, kcalcore
, poppler, kcontacts, kcalendarcore
}:
mkDerivation {
@ -13,7 +13,7 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
qtbase qtdeclarative ki18n kmime kpkpass poppler
kcontacts kcalcore
kcontacts kcalendarcore
];
outputs = [ "out" "dev" ];
}

4
pkgs/applications/kde/kmailtransport.nix
View file

@ -3,7 +3,7 @@
extra-cmake-modules, kdoctools,
akonadi, akonadi-mime, cyrus_sasl, kcmutils,
ki18n, kio, kmime, kwallet, ksmtp, libkgapi,
kcalcore, kcontacts
kcalendarcore, kcontacts
}:
mkDerivation {
@ -13,7 +13,7 @@ mkDerivation {
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ akonadi kcmutils ki18n kio ksmtp libkgapi kcalcore kcontacts ];
buildInputs = [ akonadi kcmutils ki18n kio ksmtp libkgapi kcalendarcore kcontacts ];
propagatedBuildInputs = [ akonadi-mime cyrus_sasl kmime kwallet ];
outputs = [ "out" "dev" ];
}

4
pkgs/applications/kde/knotes.nix
View file

@ -9,7 +9,7 @@
grantlee, grantleetheme, qtx11extras,
akonadi, akonadi-notes, akonadi-search, kcalutils,
kontactinterface, libkdepim, kmime, pimcommon, kpimtextedit,
kcalcore
kcalendarcore
}:
mkDerivation {
@ -24,6 +24,6 @@ mkDerivation {
akonadi akonadi-notes kcalutils kontactinterface
libkdepim kmime pimcommon kpimtextedit
akonadi-search
kcalcore
kcalendarcore
];
}

4
pkgs/applications/kde/ktnef.nix
View file

@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
kcalcore, kcalutils, kcontacts, kdelibs4support
kcalendarcore, kcalutils, kcontacts, kdelibs4support
}:
mkDerivation {
@ -12,7 +12,7 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
kcalcore kcalutils kcontacts kdelibs4support
kcalendarcore kcalutils kcontacts kdelibs4support
];
outputs = [ "out" "dev" ];
}

4
pkgs/applications/kde/libkgapi.nix
View file

@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
qtwebengine, kio, kcalcore, kcontacts,
qtwebengine, kio, kcalendarcore, kcontacts,
cyrus_sasl
}:
@ -12,5 +12,5 @@ mkDerivation {
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ qtwebengine kio kcalcore kcontacts cyrus_sasl ];
buildInputs = [ qtwebengine kio kcalendarcore kcontacts cyrus_sasl ];
}

4
pkgs/applications/kde/pim-data-exporter.nix
View file

@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, akonadi-notes, kcalcore, kcmutils, kcrash, kdbusaddons,
akonadi, akonadi-notes, kcalendarcore, kcmutils, kcrash, kdbusaddons,
kidentitymanagement, kldap, kmailtransport, knewstuff, knotifications,
knotifyconfig, kparts, kross, ktexteditor, kwallet, libkdepim, libkleo,
pimcommon, qttools, karchive, mailcommon, messagelib
@ -15,7 +15,7 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi akonadi-notes kcalcore kcmutils kcrash kdbusaddons
akonadi akonadi-notes kcalendarcore kcmutils kcrash kdbusaddons
kidentitymanagement kldap kmailtransport knewstuff knotifications
knotifyconfig kparts kross ktexteditor kwallet libkdepim libkleo pimcommon
qttools karchive mailcommon messagelib

1736
pkgs/applications/kde/srcs.nix
View file

File diff suppressed because it is too large Load diff

72
pkgs/applications/misc/djvulibre/CVE-2019-15142.patch Normal file
View file

@ -0,0 +1,72 @@
commit 970fb11a296b5bbdc5e8425851253d2c5913c45e
Author: Leon Bottou <leon@bottou.org>
Date: Tue Mar 26 20:36:31 2019 -0400
Fix bug#296
diff --git a/libdjvu/DjVmDir.cpp b/libdjvu/DjVmDir.cpp
index a6a39e0..0a0fac6 100644
--- a/libdjvu/DjVmDir.cpp
+++ b/libdjvu/DjVmDir.cpp
@@ -299,42 +299,44 @@ DjVmDir::decode(const GP<ByteStream> &gstr)
memcpy((char*) strings+strings_size, buffer, length);
}
DEBUG_MSG("size of decompressed names block=" << strings.size() << "\n");
- if (strings[strings.size()-1] != 0)
- {
- int strings_size=strings.size();
- strings.resize(strings_size+1);
- strings[strings_size] = 0;
- }
+ int strings_size=strings.size();
+ strings.resize(strings_size+3);
+ memset((char*) strings+strings_size, 0, 4);
- // Copy names into the files
+ // Copy names into the files
const char * ptr=strings;
for(pos=files_list;pos;++pos)
{
GP<File> file=files_list[pos];
-
+ if (ptr >= (const char*)strings + strings_size)
+ G_THROW( "DjVu document is corrupted (DjVmDir)" );
file->id=ptr;
ptr+=file->id.length()+1;
if (file->flags & File::HAS_NAME)
{
- file->name=ptr;
- ptr+=file->name.length()+1;
- } else
+ file->name=ptr;
+ ptr+=file->name.length()+1;
+ }
+ else
{
file->name=file->id;
}
if (file->flags & File::HAS_TITLE)
{
- file->title=ptr;
- ptr+=file->title.length()+1;
- } else
- file->title=file->id;
- /* msr debug: multipage file, file->title is null.
+ file->title=ptr;
+ ptr+=file->title.length()+1;
+ }
+ else
+ {
+ file->title=file->id;
+ }
+ /* msr debug: multipage file, file->title is null.
DEBUG_MSG(file->name << ", " << file->id << ", " << file->title << ", " <<
file->offset << ", " << file->size << ", " <<
file->is_page() << "\n"); */
}
- // Check that there is only one file with SHARED_ANNO flag on
+ // Check that there is only one file with SHARED_ANNO flag on
int shared_anno_cnt=0;
for(pos=files_list;pos;++pos)
{

39
pkgs/applications/misc/djvulibre/CVE-2019-15143.patch Normal file
View file

@ -0,0 +1,39 @@
commit b1f4e1b2187d9e5010cd01ceccf20b4a11ce723f
Author: Leon Bottou <leon@bottou.org>
Date: Tue Mar 26 20:45:46 2019 -0400
fix for bug #297
diff --git a/libdjvu/DjVmDir.cpp b/libdjvu/DjVmDir.cpp
index 0a0fac6..5a49015 100644
--- a/libdjvu/DjVmDir.cpp
+++ b/libdjvu/DjVmDir.cpp
@@ -309,7 +309,7 @@ DjVmDir::decode(const GP<ByteStream> &gstr)
{
GP<File> file=files_list[pos];
if (ptr >= (const char*)strings + strings_size)
- G_THROW( "DjVu document is corrupted (DjVmDir)" );
+ G_THROW( ByteStream::EndOfFile );
file->id=ptr;
ptr+=file->id.length()+1;
if (file->flags & File::HAS_NAME)
diff --git a/libdjvu/GBitmap.cpp b/libdjvu/GBitmap.cpp
index 0e487f0..c2fdbe4 100644
--- a/libdjvu/GBitmap.cpp
+++ b/libdjvu/GBitmap.cpp
@@ -890,11 +890,13 @@ GBitmap::read_rle_raw(ByteStream &bs)
int c = 0;
while (n >= 0)
{
- bs.read(&h, 1);
+ if (bs.read(&h, 1) <= 0)
+ G_THROW( ByteStream::EndOfFile );
int x = h;
if (x >= (int)RUNOVERFLOWVALUE)
{
- bs.read(&h, 1);
+ if (bs.read(&h, 1) <= 0)
+ G_THROW( ByteStream::EndOfFile );
x = h + ((x - (int)RUNOVERFLOWVALUE) << 8);
}
if (c+x > ncolumns)

111
pkgs/applications/misc/djvulibre/CVE-2019-15144.patch Normal file
View file

@ -0,0 +1,111 @@
commit e15d51510048927f172f1bf1f27ede65907d940d
Author: Leon Bottou <leon@bottou.org>
Date: Mon Apr 8 22:25:55 2019 -0400
bug 299 fixed
diff --git a/libdjvu/GContainer.h b/libdjvu/GContainer.h
index 96b067c..0140211 100644
--- a/libdjvu/GContainer.h
+++ b/libdjvu/GContainer.h
@@ -550,52 +550,61 @@ public:
template <class TYPE> void
GArrayTemplate<TYPE>::sort(int lo, int hi)
{
- if (hi <= lo)
- return;
- if (hi > hibound || lo<lobound)
- G_THROW( ERR_MSG("GContainer.illegal_subscript") );
TYPE *data = (TYPE*)(*this);
- // Test for insertion sort
- if (hi <= lo + 50)
+ while(true)
{
- for (int i=lo+1; i<=hi; i++)
+ if (hi <= lo)
+ return;
+ if (hi > hibound || lo<lobound)
+ G_THROW( ERR_MSG("GContainer.illegal_subscript") );
+ // Test for insertion sort
+ if (hi <= lo + 50)
{
- int j = i;
- TYPE tmp = data[i];
- while ((--j>=lo) && !(data[j]<=tmp))
- data[j+1] = data[j];
- data[j+1] = tmp;
+ for (int i=lo+1; i<=hi; i++)
+ {
+ int j = i;
+ TYPE tmp = data[i];
+ while ((--j>=lo) && !(data[j]<=tmp))
+ data[j+1] = data[j];
+ data[j+1] = tmp;
+ }
+ return;
}
- return;
- }
- // -- determine suitable quick-sort pivot
- TYPE tmp = data[lo];
- TYPE pivot = data[(lo+hi)/2];
- if (pivot <= tmp)
- { tmp = pivot; pivot=data[lo]; }
- if (data[hi] <= tmp)
- { pivot = tmp; }
- else if (data[hi] <= pivot)
- { pivot = data[hi]; }
- // -- partition set
- int h = hi;
- int l = lo;
- while (l < h)
- {
- while (! (pivot <= data[l])) l++;
- while (! (data[h] <= pivot)) h--;
- if (l < h)
+ // -- determine median-of-three pivot
+ TYPE tmp = data[lo];
+ TYPE pivot = data[(lo+hi)/2];
+ if (pivot <= tmp)
+ { tmp = pivot; pivot=data[lo]; }
+ if (data[hi] <= tmp)
+ { pivot = tmp; }
+ else if (data[hi] <= pivot)
+ { pivot = data[hi]; }
+ // -- partition set
+ int h = hi;
+ int l = lo;
+ while (l < h)
{
- tmp = data[l];
- data[l] = data[h];
- data[h] = tmp;
- l = l+1;
- h = h-1;
+ while (! (pivot <= data[l])) l++;
+ while (! (data[h] <= pivot)) h--;
+ if (l < h)
+ {
+ tmp = data[l];
+ data[l] = data[h];
+ data[h] = tmp;
+ l = l+1;
+ h = h-1;
+ }
+ }
+ // -- recurse, small partition first
+ // tail-recursion elimination
+ if (h - lo <= hi - l) {
+ sort(lo,h);
+ lo = l; // sort(l,hi)
+ } else {
+ sort(l,hi);
+ hi = h; // sort(lo,h)
}
}
- // -- recursively restart
- sort(lo, h);
- sort(l, hi);
}
template<class TYPE> inline TYPE&

28
pkgs/applications/misc/djvulibre/CVE-2019-15145.patch Normal file
View file

@ -0,0 +1,28 @@
commit 9658b01431cd7ff6344d7787f855179e73fe81a7
Author: Leon Bottou <leon@bottou.org>
Date: Mon Apr 8 22:55:38 2019 -0400
fix bug #298
diff --git a/libdjvu/GBitmap.h b/libdjvu/GBitmap.h
index e8e0c9b..ca89a19 100644
--- a/libdjvu/GBitmap.h
+++ b/libdjvu/GBitmap.h
@@ -566,7 +566,7 @@ GBitmap::operator[](int row)
{
if (!bytes)
uncompress();
- if (row<0 || row>=nrows) {
+ if (row<0 || row>=nrows || !bytes) {
#ifndef NDEBUG
if (zerosize < bytes_per_row + border)
G_THROW( ERR_MSG("GBitmap.zero_small") );
@@ -581,7 +581,7 @@ GBitmap::operator[](int row) const
{
if (!bytes)
((GBitmap*)this)->uncompress();
- if (row<0 || row>=nrows) {
+ if (row<0 || row>=nrows || !bytes) {
#ifndef NDEBUG
if (zerosize < bytes_per_row + border)
G_THROW( ERR_MSG("GBitmap.zero_small") );

32
pkgs/applications/misc/djvulibre/CVE-2019-18804.patch Normal file
View file

@ -0,0 +1,32 @@
commit c8bec6549c10ffaa2f2fbad8bbc629efdf0dd125
Author: Leon Bottou <leon@bottou.org>
Date: Thu Oct 17 22:20:31 2019 -0400
Fixed bug 309
diff --git a/libdjvu/IW44EncodeCodec.cpp b/libdjvu/IW44EncodeCodec.cpp
index 00752a0..f81eaeb 100644
--- a/libdjvu/IW44EncodeCodec.cpp
+++ b/libdjvu/IW44EncodeCodec.cpp
@@ -405,7 +405,7 @@ filter_fv(short *p, int w, int h, int rowsize, int scale)
int y = 0;
int s = scale*rowsize;
int s3 = s+s+s;
- h = ((h-1)/scale)+1;
+ h = (h>0) ? ((h-1)/scale)+1 : 0;
y += 1;
p += s;
while (y-3 < h)
diff --git a/tools/ddjvu.cpp b/tools/ddjvu.cpp
index 6d0df3b..7109952 100644
--- a/tools/ddjvu.cpp
+++ b/tools/ddjvu.cpp
@@ -279,7 +279,7 @@ render(ddjvu_page_t *page, int pageno)
prect.h = (ih * 100) / dpi;
}
/* Process aspect ratio */
- if (flag_aspect <= 0)
+ if (flag_aspect <= 0 && iw>0 && ih>0)
{
double dw = (double)iw / prect.w;
double dh = (double)ih / prect.h;

11
pkgs/applications/misc/djvulibre/default.nix
View file

@ -24,6 +24,17 @@ stdenv.mkDerivation rec {
libiconv
];
patches = [
./CVE-2019-18804.patch
# This one is needed to make the following
# two CVE patches apply cleanly
./fix_hongfuzz_crash.patch
./CVE-2019-15142.patch
./CVE-2019-15143.patch
./CVE-2019-15144.patch
./CVE-2019-15145.patch
];
meta = with stdenv.lib; {
description = "The big set of CLI tools to make/modify/optimize/show/export DJVU files";
homepage = "http://djvu.sourceforge.net";

51
pkgs/applications/misc/djvulibre/fix_hongfuzz_crash.patch Normal file
View file

@ -0,0 +1,51 @@
commit 89d71b01d606e57ecec2c2930c145bb20ba5bbe3
Author: Leon Bottou <leon@bottou.org>
Date: Fri Jul 13 08:46:22 2018 -0400
fix hongfuzz crash.
diff --git a/libdjvu/DjVmDir.cpp b/libdjvu/DjVmDir.cpp
index d322323..a6a39e0 100644
--- a/libdjvu/DjVmDir.cpp
+++ b/libdjvu/DjVmDir.cpp
@@ -299,7 +299,13 @@ DjVmDir::decode(const GP<ByteStream> &gstr)
memcpy((char*) strings+strings_size, buffer, length);
}
DEBUG_MSG("size of decompressed names block=" << strings.size() << "\n");
-
+ if (strings[strings.size()-1] != 0)
+ {
+ int strings_size=strings.size();
+ strings.resize(strings_size+1);
+ strings[strings_size] = 0;
+ }
+
// Copy names into the files
const char * ptr=strings;
for(pos=files_list;pos;++pos)
diff --git a/libdjvu/miniexp.cpp b/libdjvu/miniexp.cpp
index 6a5cd90..828addc 100644
--- a/libdjvu/miniexp.cpp
+++ b/libdjvu/miniexp.cpp
@@ -1065,7 +1065,7 @@ print_c_string(const char *s, char *d, int flags, size_t len)
c = (unsigned char)(*s++);
if (char_quoted(c, flags))
{
- char buffer[10];
+ char buffer[16]; /* 10+1 */
static const char *tr1 = "\"\\tnrbf";
static const char *tr2 = "\"\\\t\n\r\b\f";
buffer[0] = buffer[1] = 0;
diff --git a/tools/csepdjvu.cpp b/tools/csepdjvu.cpp
index 7ed13ad..fab9472 100644
--- a/tools/csepdjvu.cpp
+++ b/tools/csepdjvu.cpp
@@ -1834,7 +1834,7 @@ main(int argc, const char **argv)
ByteStream::create(GURL::Filename::UTF8(arg),"rb");
BufferByteStream ibs(*fbs);
do {
- char pagename[16];
+ char pagename[20];
sprintf(pagename, "p%04d.djvu", ++pageno);
if (opts.verbose > 1)
DjVuPrintErrorUTF8("%s","--------------------\n");

11
pkgs/applications/office/aesop/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, vala, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, python3, gtk3
, desktop-file-utils, json-glib, libsoup, libgee, poppler, wrapGAppsHook }:
, desktop-file-utils, json-glib, libsoup, libgee, poppler, wrapGAppsHook, fetchpatch }:
stdenv.mkDerivation rec {
pname = "aesop";
@ -12,6 +12,15 @@ stdenv.mkDerivation rec {
sha256 = "1hnwhxaz0zx4fswrxjzyv5s77v5fimn87yid9sd1qgfv2g1ck0jc";
};
patches = [
# Fix build
# https://github.com/lainsce/aesop/pull/33
(fetchpatch {
url = "https://github.com/lainsce/aesop/commit/850ec86bbfef5168e537a5af7e0d73d96db56330.patch";
sha256 = "14b251wp11rypqw4fafwjbsqy92mxzr8mmaxlv7n4whvwxrzqirh";
})
];
nativeBuildInputs = [
desktop-file-utils
meson

7
pkgs/applications/version-management/git-and-tools/git/default.nix
View file

@ -293,10 +293,6 @@ stdenv.mkDerivation {
# Tested to fail: 2.18.0 and 2.19.0
disable_test t1700-split-index "null sha1"
# Tested to fail: 2.18.0
disable_test t7005-editor "editor with a space"
disable_test t7005-editor "core.editor with a space"
# Tested to fail: 2.18.0
disable_test t9902-completion "sourcing the completion script clears cached --options"
@ -306,9 +302,6 @@ stdenv.mkDerivation {
# not check for the Perl prerequisite.
disable_test t5150-request-pull
''}
# As of 2.19.0, t5562 refers to #!/usr/bin/perl
patchShebangs t/t5562/invoke-with-content-length.pl
'' + stdenv.lib.optionalString stdenv.isDarwin ''
# XXX: Some tests added in 2.24.0 fail.
# Please try to re-enable on the next release.

101
pkgs/applications/video/aegisub/default.nix
View file

@ -1,16 +1,42 @@
{ config, stdenv, fetchurl
, libX11, wxGTK
, libiconv, fontconfig, freetype
, libGLU, libGL
, libass, fftw, ffms
, ffmpeg, pkgconfig, zlib # Undocumented (?) dependencies
, icu, boost, intltool # New dependencies
, spellcheckSupport ? true, hunspell ? null
, automationSupport ? true, lua ? null
, openalSupport ? false, openal ? null
, alsaSupport ? stdenv.isLinux, alsaLib ? null
, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null
, portaudioSupport ? false, portaudio ? null }:
{ config
, stdenv
, fetchurl
, fetchpatch
, libX11
, wxGTK
, libiconv
, fontconfig
, freetype
, libGLU
, libGL
, libass
, fftw
, ffms
, ffmpeg
, pkg-config
, zlib
, icu
, boost
, intltool
, spellcheckSupport ? true
, hunspell ? null
, automationSupport ? true
, lua ? null
, openalSupport ? false
, openal ? null
, alsaSupport ? stdenv.isLinux
, alsaLib ? null
, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux
, libpulseaudio ? null
, portaudioSupport ? false
, portaudio ? null
}:
assert spellcheckSupport -> (hunspell != null);
assert automationSupport -> (lua != null);
@ -20,7 +46,8 @@ assert pulseaudioSupport -> (libpulseaudio != null);
assert portaudioSupport -> (portaudio != null);
with stdenv.lib;
stdenv.mkDerivation rec {
stdenv.mkDerivation
rec {
pname = "aegisub";
version = "3.2.2";
@ -29,12 +56,40 @@ stdenv.mkDerivation rec {
sha256 = "11b83qazc8h0iidyj1rprnnjdivj1lpphvpa08y53n42bfa36pn5";
};
# Fixup build with icu-59
postPatch = "sed '1i#include <unicode/unistr.h>' -i src/utils.cpp";
patches = [
# Compatibility with ICU 59
(fetchpatch {
url = "https://github.com/Aegisub/Aegisub/commit/dd67db47cb2203e7a14058e52549721f6ff16a49.patch";
sha256 = "07qqlckiyy64lz8zk1as0vflk9kqnjb340420lp9f0xj93ncssj7";
})
buildInputs = with stdenv.lib;
[ pkgconfig intltool libX11 wxGTK fontconfig freetype libGLU libGL
libass fftw ffms ffmpeg zlib icu boost boost.out libiconv
# Compatbility with Boost 1.69
(fetchpatch {
url = "https://github.com/Aegisub/Aegisub/commit/c3c446a8d6abc5127c9432387f50c5ad50012561.patch";
sha256 = "1n8wmjka480j43b1pr30i665z8hdy6n3wdiz1ls81wyv7ai5yygf";
})
];
nativeBuildInputs = [
pkg-config
intltool
];
buildInputs = with stdenv.lib; [
libX11
wxGTK
fontconfig
freetype
libGLU
libGL
libass
fftw
ffms
ffmpeg
zlib
icu
boost
libiconv
]
++ optional spellcheckSupport hunspell
++ optional automationSupport lua
@ -67,11 +122,11 @@ stdenv.mkDerivation rec {
audio, and features many powerful tools for styling them, including a
built-in real-time video preview.
'';
homepage = http://www.aegisub.org/;
homepage = "http://www.aegisub.org/";
# The Aegisub sources are itself BSD/ISC,
# but they are linked against GPL'd softwares
# - so the resulting program will be GPL
license = licenses.bsd3;
# The Aegisub sources are itself BSD/ISC,
# but they are linked against GPL'd softwares
# - so the resulting program will be GPL
maintainers = [ maintainers.AndersonTorres ];
platforms = [ "i686-linux" "x86_64-linux" ];
};

12
pkgs/build-support/cc-wrapper/default.nix
View file

@ -237,7 +237,7 @@ stdenv.mkDerivation {
fi
''
+ optionalString (libc != null) ''
+ optionalString (libc != null) (''
##
## General libc support
##
@ -253,11 +253,17 @@ stdenv.mkDerivation {
# compile, because it uses "#include_next <limits.h>" to find the
# limits.h file in ../includes-fixed. To remedy the problem,
# another -idirafter is necessary to add that directory again.
echo "-B${libc_lib}${libc.libdir or "/lib/"} -idirafter ${libc_dev}${libc.incdir or "/include"} ${optionalString isGNU "-idirafter ${cc}/lib/gcc/*/*/include-fixed"}" > $out/nix-support/libc-cflags
echo "-B${libc_lib}${libc.libdir or "/lib/"}" >> $out/nix-support/libc-cflags
echo "-idirafter ${libc_dev}${libc.incdir or "/include"}" >> $out/nix-support/libc-cflags
'' + optionalString isGNU ''
for dir in "${cc}"/lib/gcc/*/*/include-fixed; do
echo '-idirafter' ''${dir} >> $out/nix-support/libc-cflags
done
'' + ''
echo "${libc_lib}" > $out/nix-support/orig-libc
echo "${libc_dev}" > $out/nix-support/orig-libc-dev
''
'')
+ optionalString (!nativeTools) ''
##

4
pkgs/development/compilers/go/1.13.nix
View file

@ -30,11 +30,11 @@ in
stdenv.mkDerivation rec {
pname = "go";
version = "1.13.4";
version = "1.13.5";
src = fetchurl {
url = "https://dl.google.com/go/go${version}.src.tar.gz";
sha256 = "093n5v0bipaan0qqc02wash18r625y74r4zhmjwlc9zf8asfmnwm";
sha256 = "1zr6lravlmyld57nnymkcr092pys4pr8qy0ans1rj3dkl3i5dlr7";
};
# perl is used for testing go vet

2
pkgs/development/go-packages/generic/default.nix
View file

@ -84,6 +84,8 @@ let
GOHOSTARCH = go.GOHOSTARCH or null;
GOHOSTOS = go.GOHOSTOS or null;
GO111MODULE = "off";
GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]);
configurePhase = args.configurePhase or ''

2
pkgs/development/interpreters/ruby/default.nix
View file

@ -111,7 +111,7 @@ let
cp ${config}/config.sub tool/
'';
configureFlags = ["--enable-shared" "--enable-pthread"]
configureFlags = ["--enable-shared" "--enable-pthread" "--with-soname=ruby_${tag}"]
++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"
++ op (!docSupport) "--disable-install-doc"
++ ops stdenv.isDarwin [

5
pkgs/development/libraries/dconf/default.nix
View file

@ -14,6 +14,11 @@ stdenv.mkDerivation rec {
};
patches = [
# Fix build with Meson 0.52
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/dconf/commit/cc32667c5d7d9ff95e65cc21f59905d8f9218394.patch";
sha256 = "02gfadn34bg818a7vb3crhsiahskiflcvx9l6iqwf1v269q93mr8";
})
];
postPatch = ''

4
pkgs/development/libraries/freeglut/default.nix
View file

@ -1,13 +1,13 @@
{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, libGL, libGLU, xlibsWrapper, cmake }:
let version = "3.0.0";
let version = "3.2.1";
in stdenv.mkDerivation {
pname = "freeglut";
inherit version;
src = fetchurl {
url = "mirror://sourceforge/freeglut/freeglut-${version}.tar.gz";
sha256 = "18knkyczzwbmyg8hr4zh8a1i5ga01np2jzd1rwmsh7mh2n2vwhra";
sha256 = "0s6sk49q8ijgbsrrryb7dzqx2fa744jhx1wck5cz5jia2010w06l";
};
outputs = [ "out" "dev" ];

18
pkgs/development/libraries/glibc/2.27-CVE-2019-19126.patch Normal file
View file

@ -0,0 +1,18 @@
Adapted from https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=patch;h=4d5cfeb510125345cb41431afc9022492994cffa, omitting changes to NEWS
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h b/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h
index 1943691..ac694c0 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h
+++ b/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h
@@ -31,7 +31,8 @@
environment variable, LD_PREFER_MAP_32BIT_EXEC. */
#define EXTRA_LD_ENVVARS \
case 21: \
- if (memcmp (envline, "PREFER_MAP_32BIT_EXEC", 21) == 0) \
+ if (!__libc_enable_secure \
+ && memcmp (envline, "PREFER_MAP_32BIT_EXEC", 21) == 0) \
GLRO(dl_x86_cpu_features).feature[index_arch_Prefer_MAP_32BIT_EXEC] \
|= bit_arch_Prefer_MAP_32BIT_EXEC; \
break;
--
2.9.3

5
pkgs/development/libraries/glibc/common.nix
View file

@ -98,7 +98,10 @@ stdenv.mkDerivation ({
# https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=f51c8367685dc888a02f7304c729ed5277904aff
./CVE-2018-11237.patch
]
++ lib.optional stdenv.isx86_64 ./fix-x64-abi.patch
++ lib.optionals stdenv.isx86_64 [
./fix-x64-abi.patch
./2.27-CVE-2019-19126.patch
]
++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch
++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch

4
pkgs/development/libraries/gnutls/default.nix
View file

@ -8,7 +8,7 @@
assert guileBindings -> guile != null;
let
version = "3.6.10";
version = "3.6.11.1";
# XXX: Gnulib's `test-select' fails on FreeBSD:
# http://hydra.nixos.org/build/2962084/nixlog/1/raw .
@ -24,7 +24,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://gnupg/gnutls/v3.6/gnutls-${version}.tar.xz";
sha256 = "14r2h73yfj66cm14k9mnb3kgzq5a7qjg5b31m53bf19vcxkwmwxi";
sha256 = "1y1wadpsrj5ai603xv5bgssl9v0pb1si2hg14zqdnmcsvgri5fpv";
};
outputs = [ "bin" "dev" "out" "man" "devdoc" ];

17
pkgs/development/libraries/gstreamer/base/default.nix
View file

@ -26,6 +26,7 @@
, libXv
, enableWayland ? stdenv.isLinux
, wayland
, wayland-protocols
, enableAlsa ? stdenv.isLinux
, alsaLib
# Enabling Cocoa seems to currently not work, giving compile
@ -82,10 +83,15 @@ stdenv.mkDerivation rec {
] ++ lib.optionals stdenv.isDarwin [
pango
darwin.apple_sdk.frameworks.OpenGL
] ++ lib.optional enableAlsa alsaLib
++ lib.optionals enableX11 [ libXv pango ]
++ lib.optional enableWayland wayland
++ lib.optional enableCocoa darwin.apple_sdk.frameworks.Cocoa
] ++ lib.optionals enableAlsa [
alsaLib
] ++ lib.optionals enableX11 [
libXv
pango
] ++ lib.optionals enableWayland [
wayland
wayland-protocols
] ++ lib.optional enableCocoa darwin.apple_sdk.frameworks.Cocoa
++ lib.optional enableCdparanoia cdparanoia;
propagatedBuildInputs = [
@ -95,9 +101,8 @@ stdenv.mkDerivation rec {
mesonFlags = [
"-Dexamples=disabled" # requires many dependencies and probably not useful for our users
"-Dgl-graphene=disabled" # not packaged in nixpkgs as of writing
"-Dgl_platform=[${lib.optionalString (enableX11 || enableWayland || enableCocoa) "auto"}]"
# See https://github.com/GStreamer/gst-plugins-base/blob/d64a4b7a69c3462851ff4dcfa97cc6f94cd64aef/meson_options.txt#L15 for a list of choices
"-Dgl_winsys=[${lib.concatStringsSep "," (lib.optional enableX11 "x11" ++ lib.optional enableWayland "wayland" ++ lib.optional enableCocoa "cocoa")}]"
"-Dgl_winsys=${lib.concatStringsSep "," (lib.optional enableX11 "x11" ++ lib.optional enableWayland "wayland" ++ lib.optional enableCocoa "cocoa")}"
# We must currently disable gtk_doc API docs generation,
# because it is not compatible with some features being disabled.
# See for example

1
pkgs/development/libraries/kde-frameworks/default.nix
View file

@ -97,6 +97,7 @@ let
breeze-icons = callPackage ./breeze-icons.nix {};
kapidox = callPackage ./kapidox.nix {};
karchive = callPackage ./karchive.nix {};
kcalendarcore = callPackage ./kcalendarcore.nix {};
kcodecs = callPackage ./kcodecs.nix {};
kconfig = callPackage ./kconfig.nix {};
kcoreaddons = callPackage ./kcoreaddons.nix {};

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

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/frameworks/5.62/ )
WGET_ARGS=( https://download.kde.org/stable/frameworks/5.64/ )

16
pkgs/development/libraries/kde-frameworks/kcalendarcore.nix Normal file
View file

@ -0,0 +1,16 @@
{
mkDerivation,
lib,
extra-cmake-modules,
libical
}:
mkDerivation {
name = "kcalendarcore";
meta = {
maintainers = [ lib.maintainers.nyanloutre ];
};
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ libical ];
outputs = [ "out" "dev" ];
}

16
pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch
View file

@ -1,17 +1,19 @@
diff --git a/src/pluginwrapper.cpp b/src/pluginwrapper.cpp
index 8e6298a..210989a 100644
--- a/src/pluginwrapper.cpp
+++ b/src/pluginwrapper.cpp
@@ -37,14 +37,10 @@ Q_GLOBAL_STATIC(KWindowSystemPluginWrapper, s_pluginWrapper)
Index: kwindowsystem-5.64.0/src/pluginwrapper.cpp
===================================================================
--- kwindowsystem-5.64.0.orig/src/pluginwrapper.cpp
+++ kwindowsystem-5.64.0/src/pluginwrapper.cpp
@@ -37,16 +37,10 @@ Q_GLOBAL_STATIC(KWindowSystemPluginWrapp
static QStringList pluginCandidates()
{
QStringList ret;
- foreach (const QString &path, QCoreApplication::libraryPaths()) {
- const auto paths = QCoreApplication::libraryPaths();
- for (const QString &path : paths) {
- QDir pluginDir(path + QLatin1String("/kf5/org.kde.kwindowsystem.platforms"));
- if (!pluginDir.exists()) {
- continue;
- }
- foreach (const QString &entry, pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot)) {
- const auto entries = pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot);
- for (const QString &entry : entries) {
- ret << pluginDir.absoluteFilePath(entry);
- }
+ QDir pluginDir(QLatin1String(NIXPKGS_QT_PLUGIN_PATH) + QLatin1Literal("/kf5/org.kde.kwindowsystem.platforms"));

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

@ -3,635 +3,651 @@
{
attica = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/attica-5.62.0.tar.xz";
sha256 = "86b5388c93dd3375dbdca23b20d539af5ed9516f6a573e32549baac3200d029f";
name = "attica-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/attica-5.64.0.tar.xz";
sha256 = "c9b060693656a458f92905091e12d800be020abbf47bb68b9f769a191aa368d9";
name = "attica-5.64.0.tar.xz";
};
};
baloo = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/baloo-5.62.0.tar.xz";
sha256 = "454e6808a5fe523785e5e67b7c0453fd1b6c42035aaf8084c39ad30bcbbc8d1a";
name = "baloo-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/baloo-5.64.0.tar.xz";
sha256 = "adaaef1aeec07ccc210210a2e67f4d12c0275226bb05d0220da0281f1a3984c2";
name = "baloo-5.64.0.tar.xz";
};
};
bluez-qt = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/bluez-qt-5.62.0.tar.xz";
sha256 = "545a6c76042a077f04b0a6c2b8dfbe3b5b1a582edaae4454d7a57c06ab033715";
name = "bluez-qt-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/bluez-qt-5.64.0.tar.xz";
sha256 = "7d6c7ba913cea6059327726325b8af4cf2baa7594b8be3143e0649eaa36f8384";
name = "bluez-qt-5.64.0.tar.xz";
};
};
breeze-icons = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/breeze-icons-5.62.0.tar.xz";
sha256 = "5858100f1a87dc865f44cde159aaee025ec46f894f544c75086ea0e8f9555951";
name = "breeze-icons-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/breeze-icons-5.64.0.tar.xz";
sha256 = "08c2f7efc5f1550668dd2e0cff1641b1b6ec8a91f01614ee14c6abc4d975672f";
name = "breeze-icons-5.64.0.tar.xz";
};
};
extra-cmake-modules = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/extra-cmake-modules-5.62.0.tar.xz";
sha256 = "e07acfecef1b4c7a481a253b58b75072a4f887376301108ed2c753b5002adcd4";
name = "extra-cmake-modules-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/extra-cmake-modules-5.64.0.tar.xz";
sha256 = "1865efc6254bed44e0a6918c5af3da62be4008ba7a197a47f35251f298041a69";
name = "extra-cmake-modules-5.64.0.tar.xz";
};
};
frameworkintegration = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/frameworkintegration-5.62.0.tar.xz";
sha256 = "0d43d6cd008359eac4840c8b6e12d2b17eeb53c95111af1f7e8ca6ae8e6aca2c";
name = "frameworkintegration-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/frameworkintegration-5.64.0.tar.xz";
sha256 = "6c1880f8300a014bb835ce29fd68651bfd38400de8044fe5914cb4392df48a26";
name = "frameworkintegration-5.64.0.tar.xz";
};
};
kactivities = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kactivities-5.62.0.tar.xz";
sha256 = "b466b8921adad6d887f93f760634dfa344ae52df83c58dd7ae75174961def85b";
name = "kactivities-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kactivities-5.64.0.tar.xz";
sha256 = "5afbd0785c04127c91f1ad7402c95ce3f994fb94b216baf56cd802a3a230a3f9";
name = "kactivities-5.64.0.tar.xz";
};
};
kactivities-stats = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kactivities-stats-5.62.0.tar.xz";
sha256 = "e6850a59d2e3dd566c77aa2b2fdc684737634b59755dcc7de231b8b496acbc1a";
name = "kactivities-stats-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kactivities-stats-5.64.0.tar.xz";
sha256 = "ca1c07b1250735372a4f6aa6b493536d420a902de0d7a8c9777b437fb6ab0bf9";
name = "kactivities-stats-5.64.0.tar.xz";
};
};
kapidox = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kapidox-5.62.0.tar.xz";
sha256 = "6aa3928b26acc23f5271ba0591d64a55c342e36ae16094e09be1ef038538952f";
name = "kapidox-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kapidox-5.64.0.tar.xz";
sha256 = "f75eedfa1af51f5224b14d8bc4c229c2c2d27f607e00172d24bdcede1c899fb4";
name = "kapidox-5.64.0.tar.xz";
};
};
karchive = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/karchive-5.62.0.tar.xz";
sha256 = "99980ebdc16dd9ac062fcfda0974c0ce894c09a395caf914518646ffdc48e3ca";
name = "karchive-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/karchive-5.64.0.tar.xz";
sha256 = "135fbfb2dfe107e4487723a5f887d1d074e13258a4583d592639366094aafe1a";
name = "karchive-5.64.0.tar.xz";
};
};
kauth = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kauth-5.62.0.tar.xz";
sha256 = "31162621200df4b927719e34ce62004c51e79b9d785f9c3056c6902f80eeefe6";
name = "kauth-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kauth-5.64.0.tar.xz";
sha256 = "ac95525bf1430868c8f54dbdc986478cf7b21192ad3b486381485b429eadddcc";
name = "kauth-5.64.0.tar.xz";
};
};
kbookmarks = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kbookmarks-5.62.0.tar.xz";
sha256 = "69318784fa5feaee3e60bb159fb6c827475a8ce28a74bedf5939ad592c29ea4f";
name = "kbookmarks-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kbookmarks-5.64.0.tar.xz";
sha256 = "51343a57b50032d60ffae123f426cdd67cd290ce306ae494c1956d0b899d4ff2";
name = "kbookmarks-5.64.0.tar.xz";
};
};
kcalendarcore = {
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.64/kcalendarcore-5.64.0.tar.xz";
sha256 = "983f240a7478a780dc403d577827f027856f9f67e8c3bfe8b69d56093e5bb80e";
name = "kcalendarcore-5.64.0.tar.xz";
};
};
kcmutils = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kcmutils-5.62.0.tar.xz";
sha256 = "93fd9b7b97cb4488f2007a4f518159129f0caafc05a004be56c87dd355870b1b";
name = "kcmutils-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kcmutils-5.64.0.tar.xz";
sha256 = "f55938c566669e9fcdd786ebfd89edfc11b0c283532aed04cfe4162b58a8b649";
name = "kcmutils-5.64.0.tar.xz";
};
};
kcodecs = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kcodecs-5.62.0.tar.xz";
sha256 = "1b015be0200444f1ce18ecc5c05dbafde62575a8e094e48698b4b64f43f307b1";
name = "kcodecs-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kcodecs-5.64.0.tar.xz";
sha256 = "24cbffb123179cf4386500ae7bc7c99f65c4422cd7b91f314152f11cd596402a";
name = "kcodecs-5.64.0.tar.xz";
};
};
kcompletion = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kcompletion-5.62.0.tar.xz";
sha256 = "af774190ca1a0e4d335485548d6e5c1e02042a5d0e29a3c0db17c24e3656edec";
name = "kcompletion-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kcompletion-5.64.0.tar.xz";
sha256 = "4fe5b9254e038e654d55167163b2812582f31fe550c977979d692b69424c2508";
name = "kcompletion-5.64.0.tar.xz";
};
};
kconfig = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kconfig-5.62.0.tar.xz";
sha256 = "fffe16924245e34d6267e67a6d425dc7b4fdab405968bffa4fff7bea5779bb51";
name = "kconfig-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kconfig-5.64.0.tar.xz";
sha256 = "112c1db9f038dbacf357d08645c83ca103d8c3e7fb0c880ac16f665fdf7d9157";
name = "kconfig-5.64.0.tar.xz";
};
};
kconfigwidgets = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kconfigwidgets-5.62.0.tar.xz";
sha256 = "6c10810725e0b109c96ddc2246ca1741bcae012296e31caf7b41167a04ae31d6";
name = "kconfigwidgets-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kconfigwidgets-5.64.0.tar.xz";
sha256 = "e84d590c064f2a86d5b9d2fb5d8aa7abc8ac8752125f5d3197cca6dc7e115c56";
name = "kconfigwidgets-5.64.0.tar.xz";
};
};
kcontacts = {
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.64/kcontacts-5.64.0.tar.xz";
sha256 = "0bf0a1ba6ebedd400bed7a490093962cde6a2b26c49627d6770a71524db63058";
name = "kcontacts-5.64.0.tar.xz";
};
};
kcoreaddons = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kcoreaddons-5.62.0.tar.xz";
sha256 = "3819e2792a2e61444e337cd1a4cbdc362c18810918376eefc30b203fbd160b41";
name = "kcoreaddons-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kcoreaddons-5.64.0.tar.xz";
sha256 = "3f0cb3273debf9791dda3f1ad135b6b1a20d88fed1e21890c4b70bac64fdb188";
name = "kcoreaddons-5.64.0.tar.xz";
};
};
kcrash = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kcrash-5.62.0.tar.xz";
sha256 = "9fac9396212148aade4b59665ec1725fa76e229f24c46b601f066e0026eddd2c";
name = "kcrash-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kcrash-5.64.0.tar.xz";
sha256 = "9e9ad5e7a6a3e9a128128a7863204f8c4a555bd8659d8ed4ef4cc6bb2fc48290";
name = "kcrash-5.64.0.tar.xz";
};
};
kdbusaddons = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kdbusaddons-5.62.0.tar.xz";
sha256 = "d32e0b16abcb2b1593a567b0ef12cfb94ec2f08e5b8a3ec56efac19b22ca0152";
name = "kdbusaddons-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kdbusaddons-5.64.0.tar.xz";
sha256 = "74a6eb443a74eb74a859238b555a3b16be1d6367c4db2a7af5b16da528d57f62";
name = "kdbusaddons-5.64.0.tar.xz";
};
};
kdeclarative = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kdeclarative-5.62.0.tar.xz";
sha256 = "804bc6dd1848fe38b9160a680f3d9f9b67d47150ee9683b3d2c5a07b96a12e46";
name = "kdeclarative-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kdeclarative-5.64.0.tar.xz";
sha256 = "1bf199aebabe63880babc364572de44f6b0a94ffbbffd955bc85916c2be7701d";
name = "kdeclarative-5.64.0.tar.xz";
};
};
kded = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kded-5.62.0.tar.xz";
sha256 = "d2d7a979114ca770442cec0f89fe87730ff0c44b98ee64b39c2cada672fc03b1";
name = "kded-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kded-5.64.0.tar.xz";
sha256 = "2e8bda93918ac174254c8f70a71c9d6966a4721e14a631760e1b912d108001be";
name = "kded-5.64.0.tar.xz";
};
};
kdelibs4support = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/portingAids/kdelibs4support-5.62.0.tar.xz";
sha256 = "9cc10b4727b8ee3bae46af796e7da5d6ae620c543278814176a389ea178595ed";
name = "kdelibs4support-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/portingAids/kdelibs4support-5.64.0.tar.xz";
sha256 = "8c9e23e0e22ccec8b46b4c4b160adb8c8765c1dc308bf297f6f72ccc97c7b682";
name = "kdelibs4support-5.64.0.tar.xz";
};
};
kdesignerplugin = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/portingAids/kdesignerplugin-5.62.0.tar.xz";
sha256 = "b5c0769d0b1df99f456c3c6f22a48e8bdf9c15f00be2e0795ae5bc5170596e47";
name = "kdesignerplugin-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/portingAids/kdesignerplugin-5.64.0.tar.xz";
sha256 = "1ca638ec822d9882f4a865d599ce8ad94785fa890ce73bccd5e78210c4a3d95b";
name = "kdesignerplugin-5.64.0.tar.xz";
};
};
kdesu = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kdesu-5.62.0.tar.xz";
sha256 = "9c22ad0a5c1d948a91846a34066155f64758b69ab005eb423bb02ba06301c80e";
name = "kdesu-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kdesu-5.64.0.tar.xz";
sha256 = "f4644b0ee91c55473589909c20a7fa1cfbd3d466f1c72b330d53871a2346d4f0";
name = "kdesu-5.64.0.tar.xz";
};
};
kdewebkit = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/portingAids/kdewebkit-5.62.0.tar.xz";
sha256 = "5e45a7866b28d69e6d28f821011c020e53cc6e5b59bcdb7a5d9cb7bda37175e4";
name = "kdewebkit-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/portingAids/kdewebkit-5.64.0.tar.xz";
sha256 = "882801a1fd944b08918cb7d9341985e4330e7adac00ae4e6dddcea5343393ac1";
name = "kdewebkit-5.64.0.tar.xz";
};
};
kdnssd = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kdnssd-5.62.0.tar.xz";
sha256 = "21554c6faf2f7136fb8f7a2908340c120ed0d5dc1475f5aeb8cafed1e4228009";
name = "kdnssd-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kdnssd-5.64.0.tar.xz";
sha256 = "92d9a4947c45e56ea15e417eaf87121b4b3a4f1f81dfd154d2ee968a9797f46b";
name = "kdnssd-5.64.0.tar.xz";
};
};
kdoctools = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kdoctools-5.62.0.tar.xz";
sha256 = "471ce5106f80af7272d2ea54265bde5a833c8de7716e8bd82f7a5742939c3f48";
name = "kdoctools-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kdoctools-5.64.0.tar.xz";
sha256 = "3e669c9bdf8822c262d834a9fbe9250ffdc91ea49c916b2c16ac8483b62f8fce";
name = "kdoctools-5.64.0.tar.xz";
};
};
kemoticons = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kemoticons-5.62.0.tar.xz";
sha256 = "fab145b2c4106be8a4f0024cb436d02d0fdcbf8666e9a790cc1cd98db1e70313";
name = "kemoticons-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kemoticons-5.64.0.tar.xz";
sha256 = "0b586957bfe26ce0fe44eca305992f99e3c31fbeb19a9d369c4abfdf9cc0400f";
name = "kemoticons-5.64.0.tar.xz";
};
};
kfilemetadata = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kfilemetadata-5.62.0.tar.xz";
sha256 = "2d8488500b19a7d8f90712775e0353e16957857a89162d6c7b947dd5536245b0";
name = "kfilemetadata-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kfilemetadata-5.64.0.tar.xz";
sha256 = "4b581e4d659defe4db595a984ed4c037bc80e0bf7b298ec79e6aa5061fa56e23";
name = "kfilemetadata-5.64.0.tar.xz";
};
};
kglobalaccel = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kglobalaccel-5.62.0.tar.xz";
sha256 = "b087ec1a23a50787d27e8c5d618d4097375a2f7b6188bc9077a5e60d11e2c04d";
name = "kglobalaccel-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kglobalaccel-5.64.0.tar.xz";
sha256 = "6863515428988c129acfcceaa3518f90d72c590aff2c295a958a68d0c4cd02ab";
name = "kglobalaccel-5.64.0.tar.xz";
};
};
kguiaddons = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kguiaddons-5.62.0.tar.xz";
sha256 = "5fc61818ed054901a8b1a6a56a83ccaf5f38d9ea7c5761fa6279cd7316d81e44";
name = "kguiaddons-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kguiaddons-5.64.0.tar.xz";
sha256 = "4caac79b7341c7796f3ca5e1d88cef57ecab2eefcac9ab654fd977706c89bae4";
name = "kguiaddons-5.64.0.tar.xz";
};
};
kholidays = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kholidays-5.62.0.tar.xz";
sha256 = "f9f7cc399b35cef9348b8fbaabb87145b689165a66b874e3250456f6bbdcb329";
name = "kholidays-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kholidays-5.64.0.tar.xz";
sha256 = "65b847ba7a00e1a42c0048fe05a400f584e1d9e746edb5d935331ffcb1f5d4ab";
name = "kholidays-5.64.0.tar.xz";
};
};
khtml = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/portingAids/khtml-5.62.0.tar.xz";
sha256 = "35e3f7e419041f0892ea42c6506b627661137602c25f0f1d6a81537b583682c1";
name = "khtml-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/portingAids/khtml-5.64.0.tar.xz";
sha256 = "00d3a3e8c8b8072f4894d74f91d963cfefbd681e47da0b8e80e1297224c5af85";
name = "khtml-5.64.0.tar.xz";
};
};
ki18n = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/ki18n-5.62.0.tar.xz";
sha256 = "b11a0c94c7149798f3f6592e2c386a682d9c528d1e10a59ed3934a93acbc79cb";
name = "ki18n-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/ki18n-5.64.0.tar.xz";
sha256 = "ccd2c2f8b14251701f902c9e7d046da1582e544d31edae743911f3554022d024";
name = "ki18n-5.64.0.tar.xz";
};
};
kiconthemes = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kiconthemes-5.62.0.tar.xz";
sha256 = "33fb5caf28ee763edeb3def66386a27f6a7b2bac6a6a0f0728dd4b222d11ebfe";
name = "kiconthemes-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kiconthemes-5.64.0.tar.xz";
sha256 = "f89a97e9501d841d4543249776783ebd1fc4d7f69e114f8a56027f59ad32000a";
name = "kiconthemes-5.64.0.tar.xz";
};
};
kidletime = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kidletime-5.62.0.tar.xz";
sha256 = "dd2b6a9f7815c8e84b635e694cbf9ee207996d2cf3adb5a85eadd4a8de37f276";
name = "kidletime-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kidletime-5.64.0.tar.xz";
sha256 = "8287e958a8a2a9538bec1038f5e31ebba338ff522de9c51265ca1d63030581d0";
name = "kidletime-5.64.0.tar.xz";
};
};
kimageformats = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kimageformats-5.62.0.tar.xz";
sha256 = "65c179e15dd9c81a4515eb9189951641cca4aad9e7456067a208658ce205c2c2";
name = "kimageformats-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kimageformats-5.64.0.tar.xz";
sha256 = "48c6a7026854127fc83698ab11e6639a525d387cf384f2558db6c7478bceae4c";
name = "kimageformats-5.64.0.tar.xz";
};
};
kinit = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kinit-5.62.0.tar.xz";
sha256 = "5c4b066362ab6528b5c9ac654c20cc4eeed87e5384b26b3aa1df968c98c1e21a";
name = "kinit-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kinit-5.64.0.tar.xz";
sha256 = "5298b783499cedb681c334b20234a511cb3377e66d140e7df6b7c1899186263d";
name = "kinit-5.64.0.tar.xz";
};
};
kio = {
version = "5.62.1";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kio-5.62.1.tar.xz";
sha256 = "4b149085bcfbcd729d808a34bcbd4b11f5f9526aa919c82eaddabc1e88113df0";
name = "kio-5.62.1.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kio-5.64.0.tar.xz";
sha256 = "e38c8dcf634989f0f7ec95b68bdd936b9e05f7d242e4050b01f79b7021108f59";
name = "kio-5.64.0.tar.xz";
};
};
kirigami2 = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kirigami2-5.62.0.tar.xz";
sha256 = "b3cc36bddb5e52617075961b2cbaecbb94492523bcc6801a3ad29a35c43bd912";
name = "kirigami2-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kirigami2-5.64.0.tar.xz";
sha256 = "c394360e2323c55cf654d09ec762a03c47db0027e6a992646ea32d27ce8b228e";
name = "kirigami2-5.64.0.tar.xz";
};
};
kitemmodels = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kitemmodels-5.62.0.tar.xz";
sha256 = "4ed6c4081cf6493d6f40ab45deb61325346ab8577eadec7ba8af6a36d7a6485e";
name = "kitemmodels-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kitemmodels-5.64.0.tar.xz";
sha256 = "1bae70e4c6a033eea649efc17f0a060aba89144f4c469f235fbf5023dba5abc4";
name = "kitemmodels-5.64.0.tar.xz";
};
};
kitemviews = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kitemviews-5.62.0.tar.xz";
sha256 = "34881a269bdae7e3643ab73290931859437fde72042a066170e7467422408065";
name = "kitemviews-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kitemviews-5.64.0.tar.xz";
sha256 = "0b3f8a0116c042ae187b67f35ffd40872352b91f5f236d19dd26ffad8db83fee";
name = "kitemviews-5.64.0.tar.xz";
};
};
kjobwidgets = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kjobwidgets-5.62.0.tar.xz";
sha256 = "e3607167361fdd6874a165881de523505bd00d8fabb755abf62114c017a39c93";
name = "kjobwidgets-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kjobwidgets-5.64.0.tar.xz";
sha256 = "3b39fc5dfc0f1a9cc9bffed3d05b90ba46c52c63cbbeffa0666f5f09e7093ce0";
name = "kjobwidgets-5.64.0.tar.xz";
};
};
kjs = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/portingAids/kjs-5.62.0.tar.xz";
sha256 = "aaff97d97e3163f890001b7d2e4c0329fdd9d9c53ce4924233246f3ef6cd5962";
name = "kjs-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/portingAids/kjs-5.64.0.tar.xz";
sha256 = "93855cde810feb7208443a93f81c952bdb42f9886154959bc7a6509c9863e503";
name = "kjs-5.64.0.tar.xz";
};
};
kjsembed = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/portingAids/kjsembed-5.62.0.tar.xz";
sha256 = "3763c5f67fa92803b5003a41c5b696524be3d0528018a3d5643abc25b161c23b";
name = "kjsembed-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/portingAids/kjsembed-5.64.0.tar.xz";
sha256 = "939226116cb47fd66dc45a41baa3c0f45b7ab904ec7674088ced3df5c7bae62e";
name = "kjsembed-5.64.0.tar.xz";
};
};
kmediaplayer = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/portingAids/kmediaplayer-5.62.0.tar.xz";
sha256 = "2d7fa77c085ab0a48e3ce41ec5d6ffa16fbf7194f2d6ace43e37967c0ffb7880";
name = "kmediaplayer-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/portingAids/kmediaplayer-5.64.0.tar.xz";
sha256 = "ce4816a14134c4968559ff5030895ab69b63b66e9b541b74595ce05e4fe68d1d";
name = "kmediaplayer-5.64.0.tar.xz";
};
};
knewstuff = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/knewstuff-5.62.0.tar.xz";
sha256 = "5ec7806bf1c5d24a0f393fc48950afefc4bbd1b04b2ad1db59f5f05ecd8f0195";
name = "knewstuff-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/knewstuff-5.64.0.tar.xz";
sha256 = "91334c95a1082ae402ee869da399e5bdbac986c8b30a85d0a899b30de1f3be72";
name = "knewstuff-5.64.0.tar.xz";
};
};
knotifications = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/knotifications-5.62.0.tar.xz";
sha256 = "55ec35bc9ddccd12289d9501b11d453885eabb9caebd4b93199d7c662a147263";
name = "knotifications-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/knotifications-5.64.0.tar.xz";
sha256 = "5f0c3b158ba253e8df81016c8921d689836ecac063a39766c0290352c9f71bc1";
name = "knotifications-5.64.0.tar.xz";
};
};
knotifyconfig = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/knotifyconfig-5.62.0.tar.xz";
sha256 = "bb51d1a3f69f9faf274ee381d6d267bf4a69edbbdfcfd9efcab76270db4f8e4d";
name = "knotifyconfig-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/knotifyconfig-5.64.0.tar.xz";
sha256 = "f496ed0728e688347da360f7aad7f2666cb0310ab669c6006ce9661233218b27";
name = "knotifyconfig-5.64.0.tar.xz";
};
};
kpackage = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kpackage-5.62.0.tar.xz";
sha256 = "588e6f7b0c066993dbd9b6a0fd2535cd2f1c58ea5bd7ebe1dc381049776bbf62";
name = "kpackage-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kpackage-5.64.0.tar.xz";
sha256 = "c39c80317c75206ec347edf6d301cb66c2117489f37725374fcfe3b1459aaed6";
name = "kpackage-5.64.0.tar.xz";
};
};
kparts = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kparts-5.62.0.tar.xz";
sha256 = "2249e70de0b57f13d8ee7a2840106b5a4aed05a6b73da9245101e0cbc9c846ef";
name = "kparts-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kparts-5.64.0.tar.xz";
sha256 = "61338a37015c2df787b8e0fe49f0ef320474a82831b4f110fb5aefd1635b1d9f";
name = "kparts-5.64.0.tar.xz";
};
};
kpeople = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kpeople-5.62.0.tar.xz";
sha256 = "e061991f08e6642e61531a630a81927ea0ccd7402f469806a6cfeecf9b5064a2";
name = "kpeople-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kpeople-5.64.0.tar.xz";
sha256 = "b5bc8d037dab124ea65be1c480b25943e789a403176f8b31599383dcdec20a0e";
name = "kpeople-5.64.0.tar.xz";
};
};
kplotting = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kplotting-5.62.0.tar.xz";
sha256 = "7472943518a4b0e2fe1877ce47b9f667e178822926985a0efc9c20361097b94e";
name = "kplotting-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kplotting-5.64.0.tar.xz";
sha256 = "f38f65c97d199077c88213bce84c6162ba254c443f06ccfaf62088ff0e217f7b";
name = "kplotting-5.64.0.tar.xz";
};
};
kpty = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kpty-5.62.0.tar.xz";
sha256 = "6efd3a3103f15ee825b220ac309bcce3bbce56e9b915e61a4277a2cb096bcb96";
name = "kpty-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kpty-5.64.0.tar.xz";
sha256 = "c2ece8c6b336ee85973e005969f1228bbfac87cbace6853e9d01a7b5c5fe319e";
name = "kpty-5.64.0.tar.xz";
};
};
kross = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/portingAids/kross-5.62.0.tar.xz";
sha256 = "38bf9a57f181d823974a00896d89ae7106488c2ccbd7179e295d297edb338563";
name = "kross-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/portingAids/kross-5.64.0.tar.xz";
sha256 = "d8a7e9fbeba4d16d6288d13d72a5f7581aa8be5894b06f83dbc6068b04551ebd";
name = "kross-5.64.0.tar.xz";
};
};
krunner = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/krunner-5.62.0.tar.xz";
sha256 = "21b9564d07395f0e1c5c09557ffc64eb1929dd8925914fdb581f5daa537b01fc";
name = "krunner-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/krunner-5.64.0.tar.xz";
sha256 = "e056635f347eb4d8b2a1545de993b28ead1af4e8e4acc43f1dd1637b528fe0b2";
name = "krunner-5.64.0.tar.xz";
};
};
kservice = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kservice-5.62.0.tar.xz";
sha256 = "a2e105ae8202fa0d9f443490c56e25083c0b9ee285aa82fa26bb8a14f9999db8";
name = "kservice-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kservice-5.64.0.tar.xz";
sha256 = "60e0c111485158f89211a62403697714dfe141e3539c1c7e1bf04550db74f02f";
name = "kservice-5.64.0.tar.xz";
};
};
ktexteditor = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/ktexteditor-5.62.0.tar.xz";
sha256 = "e02d54035367071d44a1499a7f6c482491116c5676fa8ceb57b1e9f564975092";
name = "ktexteditor-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/ktexteditor-5.64.0.tar.xz";
sha256 = "0fe12c57a7428d78c46d3367bdae47a0b9fbbd762be4f57f0c52dcd76e309ed5";
name = "ktexteditor-5.64.0.tar.xz";
};
};
ktextwidgets = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/ktextwidgets-5.62.0.tar.xz";
sha256 = "ec34931658cbe3a7ad7419a6e588cd9f9981e9b5ab2400e8b6f2b79b29f83774";
name = "ktextwidgets-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/ktextwidgets-5.64.0.tar.xz";
sha256 = "0e94c36c7d836450d4c52bd933c492235ea0071b15702c302aed003e8400bbfd";
name = "ktextwidgets-5.64.0.tar.xz";
};
};
kunitconversion = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kunitconversion-5.62.0.tar.xz";
sha256 = "e96ce3efcb6efe3afc0d5cf093971ea89fe2f20660da16349309cf6748446f41";
name = "kunitconversion-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kunitconversion-5.64.0.tar.xz";
sha256 = "6783d6180b132a80dce2a4cc6c793dae0f5859b0709207c5fc6f4501ef53a822";
name = "kunitconversion-5.64.0.tar.xz";
};
};
kwallet = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kwallet-5.62.0.tar.xz";
sha256 = "911d1f3320e7e3d25243e134ba0e42cd5e3ed2ee6c846dbb13777b1a4b338a5b";
name = "kwallet-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kwallet-5.64.0.tar.xz";
sha256 = "16ff5bb5724105c3d59404f292232c03c6003f6229b483509e395e1171ccabde";
name = "kwallet-5.64.0.tar.xz";
};
};
kwayland = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kwayland-5.62.0.tar.xz";
sha256 = "c9f513008c91e70b09f5acb76dde332491afde0e94948066c2f1e621bc368eb6";
name = "kwayland-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kwayland-5.64.0.tar.xz";
sha256 = "1540d4ff62afd0bff234e08618fc77d2c54b5cd69bf9c478c45a08a6e69349d3";
name = "kwayland-5.64.0.tar.xz";
};
};
kwidgetsaddons = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kwidgetsaddons-5.62.0.tar.xz";
sha256 = "3a8e75d544783a1f567016f2669c3cfdbf2809b0a3d25afd03d38af62a493671";
name = "kwidgetsaddons-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kwidgetsaddons-5.64.0.tar.xz";
sha256 = "a2d4a47489621d095c4979ea25d5d8304cf4004b10a892a2b314d74cd30cb5da";
name = "kwidgetsaddons-5.64.0.tar.xz";
};
};
kwindowsystem = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kwindowsystem-5.62.0.tar.xz";
sha256 = "116d75216ea001b2fc8688a72bcc6105b0b0966a2c5a084497f3aef80d158a67";
name = "kwindowsystem-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kwindowsystem-5.64.0.tar.xz";
sha256 = "77c2e6b0032a79547f80bcd36682aa72c0e901e3b5acc83a58f69d644ce03dab";
name = "kwindowsystem-5.64.0.tar.xz";
};
};
kxmlgui = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kxmlgui-5.62.0.tar.xz";
sha256 = "bc4321b4d44b0af1c2808814b89231a8c9e86de22ca1c0b080a769819ebc5d50";
name = "kxmlgui-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kxmlgui-5.64.0.tar.xz";
sha256 = "faa95b92b3b03130022841a6797d5beb3efb6a0d757afaefe038889af76a1dd1";
name = "kxmlgui-5.64.0.tar.xz";
};
};
kxmlrpcclient = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/kxmlrpcclient-5.62.0.tar.xz";
sha256 = "c284c3e5962d2ed6d0737e5814b85fa4d7926131b7799272cb56c464a12c4530";
name = "kxmlrpcclient-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/kxmlrpcclient-5.64.0.tar.xz";
sha256 = "8c36472cb69a2d5eeb88c437907f7b0b46703ef34d04df7b45a8c90eb95fd6b0";
name = "kxmlrpcclient-5.64.0.tar.xz";
};
};
modemmanager-qt = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/modemmanager-qt-5.62.0.tar.xz";
sha256 = "b2a6517377b53aca895efd657d553dc5b057a673c07ccb10786031240b11adf5";
name = "modemmanager-qt-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/modemmanager-qt-5.64.0.tar.xz";
sha256 = "a9d8554b3720cf46aaaa70da87c79688afc5baa155ffd19ea00e4cae2a1caa21";
name = "modemmanager-qt-5.64.0.tar.xz";
};
};
networkmanager-qt = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/networkmanager-qt-5.62.0.tar.xz";
sha256 = "08f73ced96866b9dfded574a87c9e887dc907fc510d2764a4aa09315511cedf9";
name = "networkmanager-qt-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/networkmanager-qt-5.64.0.tar.xz";
sha256 = "369d0391e199d059dd2faa554324cbd45334f7864ccfc462699b06c89af04bbf";
name = "networkmanager-qt-5.64.0.tar.xz";
};
};
oxygen-icons5 = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/oxygen-icons5-5.62.0.tar.xz";
sha256 = "c066bc96fd45f3553e3c344c7cef34afda3180c95bf67af6cf20e964fd5c1a00";
name = "oxygen-icons5-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/oxygen-icons5-5.64.0.tar.xz";
sha256 = "41d415b4bd9cca0d9abc43b187059d833ce92b3fff3da66eb8ff4004215e91ef";
name = "oxygen-icons5-5.64.0.tar.xz";
};
};
plasma-framework = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/plasma-framework-5.62.0.tar.xz";
sha256 = "324bf14078459954c355bb6f146b927f6cbf915109365cdc58c1d81c8495bdb4";
name = "plasma-framework-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/plasma-framework-5.64.0.tar.xz";
sha256 = "3f1311a48826ab0a76f47d05b02f9a9486f821cc1ad757b895b570e371acfd09";
name = "plasma-framework-5.64.0.tar.xz";
};
};
prison = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/prison-5.62.0.tar.xz";
sha256 = "d7a024881119e2e91fe2ef98ec982f33e87d3f5584c3e4438638e23cf0106fb0";
name = "prison-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/prison-5.64.0.tar.xz";
sha256 = "31e136dd33940f32fdb87699b113c57aab566112bb9649f20a057c4eee20db2e";
name = "prison-5.64.0.tar.xz";
};
};
purpose = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/purpose-5.62.0.tar.xz";
sha256 = "ed0bdc72b1b95fe988fb2ceba5cc1bd36b5bf00d30c098e9de50fdc36d3b3492";
name = "purpose-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/purpose-5.64.0.tar.xz";
sha256 = "004794dfa2d0bcef316d582f37e5691e3980c99240ef570313a98a8d44235b0d";
name = "purpose-5.64.0.tar.xz";
};
};
qqc2-desktop-style = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/qqc2-desktop-style-5.62.0.tar.xz";
sha256 = "97234e956a7fc09bef0665e9a759d6f370419bd3cd2bbbd700849e4cbe549bfa";
name = "qqc2-desktop-style-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/qqc2-desktop-style-5.64.0.tar.xz";
sha256 = "b0e6ad1ccbd01b6974c3222c6098b6c1ae1fe594c26fe0e2817c35dd90b6013a";
name = "qqc2-desktop-style-5.64.0.tar.xz";
};
};
solid = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/solid-5.62.0.tar.xz";
sha256 = "24a01a7e89b2c1e39cb9ebc477f80f5ab966d35fce00f63682b159a15de64cc3";
name = "solid-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/solid-5.64.0.tar.xz";
sha256 = "fcbbfd124759854bde2da74e1768da818361f61f2839877b4efbcd38b825da6b";
name = "solid-5.64.0.tar.xz";
};
};
sonnet = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/sonnet-5.62.0.tar.xz";
sha256 = "a1a2d3500d7fc51d94fd6f9d951c83be86436284aeda8416963fc5213956a69a";
name = "sonnet-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/sonnet-5.64.0.tar.xz";
sha256 = "3af364858f76c0206136ae8f3c03da5442ea5e42d2560877f5e00f33850c84dc";
name = "sonnet-5.64.0.tar.xz";
};
};
syndication = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/syndication-5.62.0.tar.xz";
sha256 = "d315a5a5e691925df44ce30abbd5208b764a72eb42d38dc5b5ca134d71c05462";
name = "syndication-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/syndication-5.64.0.tar.xz";
sha256 = "bffcd673a70646c8cb683ed7b26f6ef251a2ffe439fc78123ccee4332b567b57";
name = "syndication-5.64.0.tar.xz";
};
};
syntax-highlighting = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/syntax-highlighting-5.62.0.tar.xz";
sha256 = "897fac9ec2e5112d629da464d47223129e547c314369e1518a12c5c94ff2a6fd";
name = "syntax-highlighting-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/syntax-highlighting-5.64.0.tar.xz";
sha256 = "9655fa79d99fb7d585ae1a11c03d204c83263fe19391e7610575fb0436052b5f";
name = "syntax-highlighting-5.64.0.tar.xz";
};
};
threadweaver = {
version = "5.62.0";
version = "5.64.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.62/threadweaver-5.62.0.tar.xz";
sha256 = "aa1704c20c6d38fde4f9988e13cb97356e1c69c7a9d0401870b1515a2814294a";
name = "threadweaver-5.62.0.tar.xz";
url = "${mirror}/stable/frameworks/5.64/threadweaver-5.64.0.tar.xz";
sha256 = "4a3ec0b2b45a5997b24d60059d95006fca5fd86f5d619d8fb1fd30d7510f5a02";
name = "threadweaver-5.64.0.tar.xz";
};
};
}

10
pkgs/development/libraries/libffi/3.2.1-cygwin.patch
View file

@ -1,10 +0,0 @@
--- libffi-3.2.1/src/closures.c 2014-11-08 13:47:24.000000000 +0100
+++ libffi-3.2.1/src/closures.c 2015-05-19 10:15:50.059325900 +0200
@@ -212,6 +212,7 @@
#include <sys/mman.h>
/* Cygwin is Linux-like, but not quite that Linux-like. */
+#define is_emutramp_enabled() 0
#define is_selinux_enabled() 0
#endif /* !defined(X86_WIN32) && !defined(X86_WIN64) */

48
pkgs/development/libraries/libffi/default.nix
View file

@ -7,45 +7,17 @@
}:
stdenv.mkDerivation rec {
name = "libffi-3.2.1";
name = "libffi-3.3";
src = fetchurl {
url = "https://sourceware.org/pub/libffi/${name}.tar.gz";
sha256 = "0dya49bnhianl0r65m65xndz6ls2jn1xngyn72gd28ls3n7bnvnh";
sha256 = "0mi0cpf8aa40ljjmzxb7im6dbj45bb0kllcd09xgmp834y9agyvj";
};
patches = stdenv.lib.optional stdenv.isCygwin ./3.2.1-cygwin.patch
++ stdenv.lib.optional stdenv.isAarch64 (fetchpatch {
url = https://src.fedoraproject.org/rpms/libffi/raw/ccffc1700abfadb0969495a6e51b964117fc03f6/f/libffi-aarch64-rhbz1174037.patch;
sha256 = "1vpirrgny43hp0885rswgv3xski8hg7791vskpbg3wdjdpb20wbc";
})
++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch {
name = "gnu-linux-define.patch";
url = "https://git.alpinelinux.org/cgit/aports/plain/main/libffi/gnu-linux-define.patch?id=bb024fd8ec6f27a76d88396c9f7c5c4b5800d580";
sha256 = "11pvy3xkhyvnjfyy293v51f1xjy3x0azrahv1nw9y9mw8bifa2j2";
})
++ stdenv.lib.optional stdenv.hostPlatform.isRiscV (fetchpatch {
name = "riscv-support.patch";
url = https://github.com/sorear/libffi-riscv/commit/e46492e8bb1695a19bc1053ed869e6c2bab02ff2.patch;
sha256 = "1vl1vbvdkigs617kckxvj8j4m2cwg62kxm1clav1w5rnw9afxg0y";
})
++ stdenv.lib.optionals stdenv.isMips [
(fetchpatch {
name = "0001-mips-Use-compiler-internal-define-for-linux.patch";
url = "http://cgit.openembedded.org/openembedded-core/plain/meta/recipes-support/libffi/libffi/0001-mips-Use-compiler-internal-define-for-linux.patch?id=318e33a708378652edcf61ce7d9d7f3a07743000";
sha256 = "1gc53lw90p6hc0cmhj3csrwincfz7va5ss995ksw5gm0yrr9mrvb";
})
(fetchpatch {
name = "0001-mips-fix-MIPS-softfloat-build-issue.patch";
url = "http://cgit.openembedded.org/openembedded-core/plain/meta/recipes-support/libffi/libffi/0001-mips-fix-MIPS-softfloat-build-issue.patch?id=318e33a708378652edcf61ce7d9d7f3a07743000";
sha256 = "0l8xgdciqalg4z9rcwyk87h8fdxpfv4hfqxwsy2agpnpszl5jjdq";
})
];
patches = [];
outputs = [ "out" "dev" "man" "info" ];
nativeBuildInputs = stdenv.lib.optional stdenv.hostPlatform.isRiscV autoreconfHook;
configureFlags = [
"--with-gcc-arch=generic" # no detection of -march= or -mtune=
"--enable-pax_emutramp"
@ -62,15 +34,6 @@ stdenv.mkDerivation rec {
dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; # Don't run the native `strip' when cross-compiling.
# Install headers and libs in the right places.
postFixup = ''
mkdir -p "$dev/"
mv "$out/lib/${name}/include" "$dev/include"
rmdir "$out/lib/${name}"
substituteInPlace "$dev/lib/pkgconfig/libffi.pc" \
--replace 'includedir=''${libdir}/libffi-3.2.1' "includedir=$dev"
'';
meta = with stdenv.lib; {
description = "A foreign function call interface library";
longDescription = ''
@ -88,9 +51,8 @@ stdenv.mkDerivation rec {
conversions for values passed between the two languages.
'';
homepage = http://sourceware.org/libffi/;
# See https://github.com/atgreen/libffi/blob/master/LICENSE .
license = licenses.free;
maintainers = [ ];
license = licenses.mit;
maintainers = with maintainers; [ matthewbauer ];
platforms = platforms.all;
};
}

4
pkgs/development/libraries/libndctl/default.nix
View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "libndctl";
version = "66";
version = "67";
src = fetchFromGitHub {
owner = "pmem";
repo = "ndctl";
rev = "v${version}";
sha256 = "1pq1ss6b1lnyfnvdfhpi0x70jjrnm567fcyvkgvhmp2ndzsn393f";
sha256 = "076jgw1g2aafqgnq705in0wnabysqk46dq5yxdv1qzgjmyhka39n";
};
outputs = [ "out" "lib" "man" "dev" ];

4
pkgs/development/libraries/libnftnl/default.nix
View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, libmnl }:
stdenv.mkDerivation rec {
version = "1.1.4";
version = "1.1.5";
pname = "libnftnl";
src = fetchurl {
url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.bz2";
sha256 = "087dfc2n4saf2k68hyi4byvgz5grwpw5kfjvmkpn3wmd8y1riiy8";
sha256 = "1wqlxf76bkqf3qhka9sw32qhb2ni20q1k6rn3iril2kw482lvpk6";
};
nativeBuildInputs = [ pkgconfig ];

4
pkgs/development/libraries/librsvg/default.nix
View file

@ -4,14 +4,14 @@
let
pname = "librsvg";
version = "2.46.3";
version = "2.46.4";
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1s3a96i7f4pynjwxxvhysp4b6r7kyi8nasdxfyi62hc7gm34d3kn";
sha256 = "0afc82nsxc6kw136xid4vcq9kmq4rmgzzk8bh2pvln2cnvirwnxl";
};
outputs = [ "out" "dev" "installedTests" ];

4
pkgs/development/libraries/libsoup/default.nix
View file

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "libsoup";
version = "2.68.2";
version = "2.68.3";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0crr9qprmacr626fx83cx81ggk85zsgxr4mn577kpzj6m40k1bai";
sha256 = "1yxs0ax4rq3g0lgkbv7mz497rqj16iyyizddyc13gzxh6n7b0jsk";
};
postPatch = ''

4
pkgs/development/libraries/mesa/default.nix
View file

@ -27,7 +27,7 @@
with stdenv.lib;
let
version = "19.2.6";
version = "19.2.7";
branch = versions.major version;
in
@ -42,7 +42,7 @@ stdenv.mkDerivation {
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
"https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
];
sha256 = "15vpj2v1j5j065f8syhcsyr6rkjm58250r0ri13v6bf8c3x28ywx";
sha256 = "17jp8ghipgz62vqqz5llskxypkcmgf8gnlgnj0pyvnbgi6vryyg3";
};
prePatch = "patchShebangs .";

4
pkgs/development/libraries/nspr/default.nix
View file

@ -2,7 +2,7 @@
, CoreServices ? null
, buildPackages }:
let version = "4.23"; in
let version = "4.24"; in
stdenv.mkDerivation {
pname = "nspr";
@ -10,7 +10,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
sha256 = "193p6i2r6wvpb4i04a9pxbqkxcn8rbcmwl81m4yp5xgs6w8857ab";
sha256 = "1l0ksiny032jijgk0g76wf0kiq673i01izj7jrs2h5d1yq6rm9ch";
};
patches = [

23
pkgs/development/libraries/pango/default.nix
View file

@ -9,13 +9,13 @@ with stdenv.lib;
let
pname = "pango";
version = "1.43.0";
version = "1.44.7";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1lnxldmv1a12dq5h0dlq5jyzl4w75k76dp8cn360x2ijlm9w5h6j";
sha256 = "07qvxa2sk90chp1l12han6vxvy098mc37sdqcznyywyv2g6bd9b6";
};
# FIXME: docs fail on darwin
@ -26,31 +26,18 @@ in stdenv.mkDerivation rec {
pkgconfig gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_43
];
buildInputs = [
harfbuzz fribidi
fribidi
] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
ApplicationServices
Carbon
CoreGraphics
CoreText
]);
propagatedBuildInputs = [ cairo glib libintl ] ++
propagatedBuildInputs = [ cairo glib libintl harfbuzz ] ++
optional x11Support libXft;
patches = [
(fetchpatch {
# Add gobject-2 to .pc file
url = "https://gitlab.gnome.org/GNOME/pango/commit/546f4c242d6f4fe312de3b7c918a848e5172e18d.patch";
sha256 = "1cqhy4xbwx3ad7z5d1ks7smf038b9as8c6qy84rml44h0fgiq4m2";
})
(fetchpatch {
# Fixes CVE-2019-1010238
url = "https://gitlab.gnome.org/GNOME/pango/commit/490f8979a260c16b1df055eab386345da18a2d54.diff";
sha256 = "1s0qclbaknkx3dkc3n6mlmx3fnhlr2pkncqjkywprpvahmmypr7k";
})
];
mesonFlags = [
"-Denable_docs=${if stdenv.isDarwin then "false" else "true"}"
"-Dgtk_doc=${if stdenv.isDarwin then "false" else "true"}"
];
enableParallelBuilding = true;

2
pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh
View file

@ -73,7 +73,7 @@ wrapQtAppsHook() {
[ -z "$wrapQtAppsHookHasRun" ] || return 0
wrapQtAppsHookHasRun=1
local targetDirs=( "$prefix/bin" "$prefix/libexec" )
local targetDirs=( "$prefix/bin" "$prefix/sbin" "$prefix/libexec" )
echo "wrapping Qt applications in ${targetDirs[@]}"
for targetDir in "${targetDirs[@]}"

4
pkgs/development/python-modules/lxml/default.nix
View file

@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "lxml";
version = "4.4.1";
version = "4.4.2";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "${pname}-${version}";
sha256 = "1hkl3bhbwiwwfb57nq9lr24rkp782ymfvqrdf9x1wifc79ivlbxw";
sha256 = "0h4axgcghshcvh1nn39l64xxhylglm3b00hh2rbi1ifvly5mx24f";
};
# setuptoolsBuildPhase needs dependencies to be passed through nativeBuildInputs

18
pkgs/development/python-modules/pygtk/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, python, pkgconfig, gtk2, pygobject2, pycairo
{ stdenv, fetchurl, fetchpatch, python, pkgconfig, gtk2, pygobject2, pycairo, pango
, buildPythonPackage, libglade ? null, isPy3k }:
buildPythonPackage rec {
@ -12,8 +12,22 @@ buildPythonPackage rec {
sha256 = "04k942gn8vl95kwf0qskkv6npclfm31d78ljkrkgyqxxcni1w76d";
};
patches = [
# https://bugzilla.gnome.org/show_bug.cgi?id=660216 - fixes some memory leaks
(fetchpatch {
url = "https://gitlab.gnome.org/Archive/pygtk/commit/eca72baa5616fbe4dbebea43c7e5940847dc5ab8.diff";
sha256 = "031px4w5cshcx1sns430sdbr2i007b9zyb2carb3z65nzr77dpdd";
})
(fetchpatch {
url = "https://gitlab.gnome.org/Archive/pygtk/commit/4aaa48eb80c6802aec6d03e5695d2a0ff20e0fc2.patch";
sha256 = "0z8cg7nr3qki8gg8alasdzzyxcihfjlxn518glq5ajglk3q5pzsn";
})
];
nativeBuildInputs = [ pkgconfig ];
buildInputs = stdenv.lib.optional (libglade != null) libglade;
buildInputs = [
pango
] ++ stdenv.lib.optional (libglade != null) libglade;
propagatedBuildInputs = [ gtk2 pygobject2 pycairo ];

3
pkgs/development/tools/analysis/valgrind/default.nix
View file

@ -16,6 +16,9 @@ stdenv.mkDerivation rec {
# Perl is needed for `callgrind_{annotate,control}'.
buildInputs = [ gdb perl ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ bootstrap_cmds xnu ];
# Perl is also a native build input.
nativeBuildInputs = [ perl ];
enableParallelBuilding = true;
separateDebugInfo = stdenv.isLinux;

9
pkgs/development/tools/build-managers/cmake/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, pkgconfig
{ stdenv, lib, fetchurl, fetchpatch, pkgconfig
, bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash
, buildPackages
# darwin attributes
@ -36,6 +36,13 @@ stdenv.mkDerivation rec {
# Derived from https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d
./libuv-application-services.patch
# Fix for harfbuzz with pango versions > 1.43.
# Should be removed with cmake >= 3.16
(fetchpatch {
url = "https://gitlab.kitware.com/cmake/cmake/commit/effafca77eacbb4988006b1f3f4d9154df6c33f8.diff";
sha256 = "0vxam5kka1dffygp1nd0g21ib9qk8kds8iprbfga2gimzyrlfmfr";
})
] ++ lib.optional stdenv.isCygwin ./3.2.2-cygwin.patch;
outputs = [ "out" ];

21
pkgs/development/tools/build-managers/meson/default.nix
View file

@ -19,11 +19,11 @@ let
in
python3Packages.buildPythonApplication rec {
pname = "meson";
version = "0.51.2";
version = "0.52.1";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "0cqhkjbab1mbvxmbjvyfrbjfkm7bh436svqpjapca36c2k9h1vwr";
sha256 = "02fnrk1fjf3yiix0ak0m9vgbpl4h97fafii5pmw7phmvnlv9fyan";
};
postFixup = ''
@ -69,23 +69,6 @@ python3Packages.buildPythonApplication rec {
url = "https://github.com/mesonbuild/meson/commit/972ede1d14fdf17fe5bb8fb99be220f9395c2392.patch";
sha256 = "19bfsylhpy0b2xv3ks8ac9x3q6vvvyj1wjcy971v9d5f1455xhbb";
})
] ++ lib.optionals stdenv.isDarwin [
# We use custom Clang, which makes Meson think *not Apple*, while still
# relying on system linker. When it detects standard Clang, Meson will
# pass it `-Wl,-O1` flag but optimizations are not recognized by
# Mac linker.
# https://github.com/mesonbuild/meson/issues/4784
# Should be fixed in 0.52
./fix-objc-linking.patch
# Fixes error finding some frameworks
# https://github.com/NixOS/nixpkgs/pull/70690#issuecomment-553704175
# https://github.com/mesonbuild/meson/pull/5980
# Should be fixed in 0.52
(fetchpatch {
url = "https://github.com/mesonbuild/meson/commit/8d3fcb3dc4d7204a4646807f8b5191d79fb291e5.patch";
sha256 = "0g95gl662mribnnz5jcyn1jaaw8w7r1vgbg2jbm91dcrr5zji5ng";
})
];
setupHook = ./setup-hook.sh;

22
pkgs/development/tools/build-managers/meson/fix-objc-linking.patch
View file

@ -1,22 +0,0 @@
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index dc8f099b..d8581fcf 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -944,7 +944,7 @@
compiler_type = self.get_gnu_compiler_type(defines)
version = self.get_gnu_version_from_defines(defines)
return GnuObjCCompiler(ccache + compiler, version, compiler_type, for_machine, is_cross, exe_wrap, defines)
- if out.startswith('Apple LLVM') or out.startswith('Apple clang'):
+ if out.startswith('Apple LLVM') or out.startswith('Apple clang') or self.machines.build.is_darwin():
return ClangObjCCompiler(ccache + compiler, version, CompilerType.CLANG_OSX, for_machine, is_cross, exe_wrap)
if 'windows' in out:
return ClangObjCCompiler(ccache + compiler, version, CompilerType.CLANG_MINGW, for_machine, is_cross, exe_wrap)
@@ -974,7 +974,7 @@
compiler_type = self.get_gnu_compiler_type(defines)
version = self.get_gnu_version_from_defines(defines)
return GnuObjCPPCompiler(ccache + compiler, version, compiler_type, for_machine, is_cross, exe_wrap, defines)
- if out.startswith('Apple LLVM') or out.startswith('Apple clang'):
+ if out.startswith('Apple LLVM') or out.startswith('Apple clang') or self.machines.build.is_darwin():
return ClangObjCPPCompiler(ccache + compiler, version, CompilerType.CLANG_OSX, for_machine, is_cross, exe_wrap)
if 'windows' in out:
return ClangObjCPPCompiler(ccache + compiler, version, CompilerType.CLANG_MINGW, for_machine, is_cross, exe_wrap)

47
pkgs/development/tools/build-managers/meson/fix-rpath.patch
View file

@ -1,21 +1,34 @@
--- a/mesonbuild/compilers/compilers.py
+++ b/mesonbuild/compilers/compilers.py
@@ -1202,8 +1202,10 @@
# In order to avoid relinking for RPATH removal, the binary needs to contain just
# enough space in the ELF header to hold the final installation RPATH.
paths = ':'.join(all_paths)
- if len(paths) < len(install_rpath):
- padding = 'X' * (len(install_rpath) - len(paths))
+ store_paths = ':'.join(filter(lambda path: path.startswith('@storeDir@'), all_paths))
+ extra_space_needed = len(install_rpath + (':' if install_rpath and store_paths else '') + store_paths) - len(paths)
+ if extra_space_needed > 0:
+ padding = 'X' * extra_space_needed
if not paths:
paths = padding
else:
--- a/mesonbuild/linkers.py
+++ b/mesonbuild/linkers.py
@@ -527,8 +527,10 @@ class GnuLikeDynamicLinkerMixin:
# In order to avoid relinking for RPATH removal, the binary needs to contain just
# enough space in the ELF header to hold the final installation RPATH.
paths = ':'.join(all_paths)
- if len(paths) < len(install_rpath):
- padding = 'X' * (len(install_rpath) - len(paths))
+ store_paths = ':'.join(filter(lambda path: path.startswith('@storeDir@'), all_paths))
+ extra_space_needed = len(install_rpath + (':' if install_rpath and store_paths else '') + store_paths) - len(paths)
+ if extra_space_needed > 0:
+ padding = 'X' * extra_space_needed
if not paths:
paths = padding
else:
@@ -902,8 +904,10 @@ class SolarisDynamicLinker(PosixDynamicLinkerMixin, DynamicLinker):
# In order to avoid relinking for RPATH removal, the binary needs to contain just
# enough space in the ELF header to hold the final installation RPATH.
paths = ':'.join(all_paths)
- if len(paths) < len(install_rpath):
- padding = 'X' * (len(install_rpath) - len(paths))
+ store_paths = ':'.join(filter(lambda path: path.startswith('@storeDir@'), all_paths))
+ extra_space_needed = len(install_rpath + (':' if install_rpath and store_paths else '') + store_paths) - len(paths)
+ if extra_space_needed > 0:
+ padding = 'X' * extra_space_needed
if not paths:
paths = padding
else:
--- a/mesonbuild/scripts/depfixer.py
+++ b/mesonbuild/scripts/depfixer.py
@@ -303,6 +303,14 @@
@@ -303,6 +303,14 @@ class Elf(DataSizes):
return
self.bf.seek(rp_off)
old_rpath = self.read_str()
@ -30,7 +43,7 @@
if len(old_rpath) < len(new_rpath):
sys.exit("New rpath must not be longer than the old one.")
# The linker does read-only string deduplication. If there is a
@@ -316,6 +324,10 @@
@@ -316,6 +324,10 @@ class Elf(DataSizes):
if not new_rpath:
self.remove_rpath_entry(entrynum)
else:

6
pkgs/development/tools/build-managers/meson/gir-fallback-path.patch
View file

@ -1,8 +1,8 @@
--- a/mesonbuild/modules/gnome.py
+++ b/mesonbuild/modules/gnome.py
@@ -805,6 +805,13 @@
scan_command += self._scan_langs(state, [lc[0] for lc in langs_compilers])
scan_command += list(external_ldflags)
@@ -801,6 +801,13 @@ class GnomeModule(ExtensionModule):
scan_command += ['--sources-top-dirs', os.path.join(state.environment.get_source_dir(), self.interpreter.subproject_dir, state.subproject)]
scan_command += ['--sources-top-dirs', os.path.join(state.environment.get_build_dir(), self.interpreter.subproject_dir, state.subproject)]
+ if len(set([girtarget.get_custom_install_dir()[0] for girtarget in girtargets])) > 1:
+ raise MesonException('generate_gir tries to build multiple libraries with different install_dir at once: {}'.format(','.join([str(girtarget) for girtarget in girtargets])))

4
pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix
View file

@ -76,8 +76,8 @@ stdenv.mkDerivation {
# later.
buildPhase = stdenv.lib.optionalString true ''
for i in {1..512}; do
if ninjaBuildPhase; then
break
if ninja -j $NIX_BUILD_CORES; then
break
fi
echo >&2

61
pkgs/os-specific/linux/bluez/bluez-5.37-obexd_without_systemd-1.patch
View file

@ -1,61 +0,0 @@
Submitted By: Armin K. <krejzi at email dot com>
Date: 2013-04-29
Initial Package Version: 5.17
Upstream Status: unknown
Origin: Arch Linux (Giovanni Campagna)
Description: Allow using obexd without systemd in the user session
Not all sessions run systemd --user (actually, the majority
doesn't), so the dbus daemon must be able to spawn obexd
directly, and to do so it needs the full path of the daemon.
---
Makefile.obexd | 4 ++--
obexd/src/org.bluez.obex.service | 4 ----
obexd/src/org.bluez.obex.service.in | 4 ++++
3 files changed, 6 insertions(+), 6 deletions(-)
delete mode 100644 obexd/src/org.bluez.obex.service
create mode 100644 obexd/src/org.bluez.obex.service.in
diff --git a/Makefile.obexd b/Makefile.obexd
index 3760867..142e7c3 100644
--- a/Makefile.obexd
+++ b/Makefile.obexd
@@ -2,12 +2,12 @@
if SYSTEMD
systemduserunitdir = @SYSTEMD_USERUNITDIR@
systemduserunit_DATA = obexd/src/obex.service
+endif
dbussessionbusdir = @DBUS_SESSIONBUSDIR@
dbussessionbus_DATA = obexd/src/org.bluez.obex.service
-endif
-EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service
+EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in
obex_plugindir = $(libdir)/obex/plugins
diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service
deleted file mode 100644
index a538088..0000000
--- a/obexd/src/org.bluez.obex.service
+++ /dev/null
@@ -1,4 +0,0 @@
-[D-BUS Service]
-Name=org.bluez.obex
-Exec=/bin/false
-SystemdService=dbus-org.bluez.obex.service
diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in
new file mode 100644
index 0000000..9c815f2
--- /dev/null
+++ b/obexd/src/org.bluez.obex.service.in
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.bluez.obex
+Exec=@libexecdir@/obexd
+SystemdService=dbus-org.bluez.obex.service
--
1.8.3.1

76
pkgs/os-specific/linux/bluez/default.nix
View file

@ -1,49 +1,58 @@
{ stdenv, fetchurl, pkgconfig, dbus, glib, alsaLib,
python3, readline, udev, libical, systemd, fetchpatch,
enableWiimote ? false, enableMidi ? false, enableSixaxis ? false }:
{ stdenv
, lib
, fetchurl
, alsaLib
, dbus
, glib
, json_c
, libical
, pkgconfig
, python3
, readline
, systemd
, udev
}:
stdenv.mkDerivation rec {
name = "bluez-5.50";
pname = "bluez";
version = "5.52";
src = fetchurl {
url = "mirror://kernel/linux/bluetooth/${name}.tar.xz";
sha256 = "048r91vx9gs5nwwbah2s0xig04nwk14c5s0vb7qmaqdvighsmz2z";
url = "mirror://kernel/linux/bluetooth/${pname}-${version}.tar.xz";
sha256 = "02jng21lp6fb3c2bh6vf9y7cj4gaxwk29dfc32ncy0lj0gi4q57p";
};
pythonPath = with python3.pkgs; [
dbus-python pygobject2 pygobject3 recursivePthLoader
dbus-python
pygobject3
recursivePthLoader
];
buildInputs = [
dbus glib alsaLib python3 python3.pkgs.wrapPython
readline udev libical
alsaLib
dbus
glib
json_c
libical
python3
readline
udev
];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [
pkgconfig
python3.pkgs.wrapPython
];
outputs = [ "out" "dev" "test" ];
patches = [
./bluez-5.37-obexd_without_systemd-1.patch
(fetchpatch {
url = "https://git.kernel.org/pub/scm/bluetooth/bluez.git/patch/?id=1880b299086659844889cdaf687133aca5eaf102";
name = "CVE-2018-10910-1.patch";
sha256 = "17spsxza27gif8jpxk7360ynvwii1llfdfwg35rwywjjmvww0qj4";
})
(fetchpatch {
url = "https://git.kernel.org/pub/scm/bluetooth/bluez.git/patch/?id=9213ff7642a33aa481e3c61989ad60f7985b9984";
name = "CVE-2018-10910-2.patch";
sha256 = "0j7klbhym64yhn86dbsmybqmwx47bviyyhx931izl1p29z2mg8hn";
})
];
postConfigure = ''
postPatch = ''
substituteInPlace tools/hid2hci.rules \
--replace /sbin/udevadm ${systemd}/bin/udevadm \
--replace "hid2hci " "$out/lib/udev/hid2hci "
'';
configureFlags = (with stdenv.lib; [
configureFlags = [
"--localstatedir=/var"
"--enable-library"
"--enable-cups"
@ -54,14 +63,19 @@ stdenv.mkDerivation rec {
"--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
"--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user"
"--with-udevdir=${placeholder "out"}/lib/udev"
] ++ optional enableWiimote [ "--enable-wiimote" ]
++ optional enableMidi [ "--enable-midi" ]
++ optional enableSixaxis [ "--enable-sixaxis" ]);
"--enable-health"
"--enable-mesh"
"--enable-midi"
"--enable-nfc"
"--enable-sap"
"--enable-sixaxis"
"--enable-wiimote"
];
# Work around `make install' trying to create /var/lib/bluetooth.
installFlags = "statedir=$(TMPDIR)/var/lib/bluetooth";
installFlags = [ "statedir=$(TMPDIR)/var/lib/bluetooth" ];
makeFlags = "rulesdir=${placeholder "out"}/lib/udev/rules.d";
makeFlags = [ "rulesdir=${placeholder "out"}/lib/udev/rules.d" ];
postInstall = ''
mkdir -p $test/{bin,test}

11
pkgs/os-specific/linux/ebtables/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ebtables";
version = "2.0.10-4";
version = "2.0.11";
src = fetchurl {
url = "mirror://sourceforge/ebtables/ebtables-v${version}.tar.gz";
sha256 = "0pa5ljlk970yfyhpf3iqwfpbc30j8mgn90fapw9cfz909x47nvyw";
url = "http://ftp.netfilter.org/pub/${pname}/${pname}-${version}.tar.gz";
sha256 = "0apxgmkhsk3vxn9q3libxn3dgrdljrxyy4mli2gk49m7hi3na7xp";
};
makeFlags =
@ -15,11 +15,6 @@ stdenv.mkDerivation rec {
"LOCALSTATEDIR=/var"
];
preBuild =
''
substituteInPlace Makefile --replace '-o root -g root' ""
'';
NIX_CFLAGS_COMPILE = "-Wno-error";
preInstall = "mkdir -p $out/etc/sysconfig";

4
pkgs/os-specific/linux/iptables/default.nix
View file

@ -6,12 +6,12 @@
with stdenv.lib;
stdenv.mkDerivation rec {
version = "1.8.3";
version = "1.8.4";
pname = "iptables";
src = fetchurl {
url = "https://www.netfilter.org/projects/${pname}/files/${pname}-${version}.tar.bz2";
sha256 = "106xkkg5crsscjlinxvqvprva23fwwqfgrzl8m2nn841841sqg52";
sha256 = "0z0mgs1ghvn3slc868mgbf2g26njgrzcy5ggyb5w4i55j1a3lflr";
};
nativeBuildInputs = [ pkgconfig pruneLibtoolFiles flex bison ];

4
pkgs/os-specific/linux/kernel/generate-config.pl
View file

@ -136,10 +136,12 @@ while (<CONFIG>) {
}
close CONFIG;
my $ret = 0;
foreach my $name (sort (keys %answers)) {
my $f = $requiredAnswers{$name} && $ignoreConfigErrors ne "1"
? sub { die "error: " . $_[0]; } : sub { warn "warning: " . $_[0]; };
? sub { warn "error: " . $_[0]; $ret = -1; } : sub { warn "warning: " . $_[0]; };
&$f("unused option: $name\n") unless defined $config{$name};
&$f("option not set correctly: $name (wanted '$answers{$name}', got '$config{$name}')\n")
if $config{$name} && $config{$name} ne $answers{$name};
}
exit $ret;

4
pkgs/os-specific/linux/nftables/default.nix
View file

@ -10,12 +10,12 @@
with stdenv.lib;
stdenv.mkDerivation rec {
version = "0.9.2";
version = "0.9.3";
pname = "nftables";
src = fetchurl {
url = "https://netfilter.org/projects/nftables/files/${pname}-${version}.tar.bz2";
sha256 = "1x8kalbggjq44j4916i6vyv1rb20dlh1dcsf9xvzqsry2j063djw";
sha256 = "0y6vbqp6x8w165q65h4n9sba1406gaz0d4744gqszbm7w9f92swm";
};
nativeBuildInputs = [

10
pkgs/os-specific/linux/shadow/default.nix
View file

@ -19,13 +19,13 @@ in
stdenv.mkDerivation rec {
pname = "shadow";
version = "4.7";
version = "4.8";
src = fetchFromGitHub {
owner = "shadow-maint";
repo = "shadow";
rev = version;
sha256 = "0a7g9k83igfid8pybqpk6fracmz2q021isn2by3994p4hhh3s327";
sha256 = "05a636dqxip09l5jjrrs30lvwq6xkhjrdgjbbj3bg6b6z7hc67qk";
};
buildInputs = stdenv.lib.optional (pam != null && stdenv.isLinux) pam;
@ -38,12 +38,6 @@ stdenv.mkDerivation rec {
# Obtain XML resources from XML catalog (patch adapted from gtk-doc)
./respect-xml-catalog-files-var.patch
dots_in_usernames
# Allow building with itstool
# https://github.com/shadow-maint/shadow/pull/184
(fetchpatch {
url = https://github.com/shadow-maint/shadow/commit/6c6c8d3a33bba32277e1ed46f55df1e6dbc914b7.patch;
sha256 = "0xfr1mrfv5xsmri6l7ycbpz3qhs4vf3fyci4kwpffi3icsfjn557";
})
];
# The nix daemon often forbids even creating set[ug]id files.

43
pkgs/servers/http/unit/default.nix
View file

@ -1,11 +1,14 @@
{ stdenv, fetchFromGitHub, which
, withPython ? true, python
, withPHP72 ? true, php72
, withPHP73 ? false, php73
, withPerl ? true, perl
, withPython2 ? false, python2
, withPython3 ? true, python3, ncurses
, withPHP72 ? false, php72
, withPHP73 ? true, php73
, withPerl528 ? false, perl528
, withPerl530 ? true, perl530
, withPerldevel ? false, perldevel
, withRuby_2_4 ? false, ruby_2_4
, withRuby ? true, ruby
, withRuby_2_5 ? false, ruby_2_5
, withRuby_2_6 ? true, ruby_2_6
, withSSL ? true, openssl ? null
, withIPv6 ? true
, withDebug ? false
@ -14,26 +17,29 @@
with stdenv.lib;
stdenv.mkDerivation rec {
version = "1.12.0";
version = "1.13.0";
pname = "unit";
src = fetchFromGitHub {
owner = "nginx";
repo = "unit";
rev = version;
sha256 = "1ylzfsajjfaxzn7mycjs69ms4x58r4szpk07kqrmbf03dp2cmxkq";
sha256 = "1b5il05isq5yvnx2qpnihsrmj0jliacvhrm58i87d48anwpv1k8q";
};
nativeBuildInputs = [ which ];
buildInputs = [ ]
++ optional withPython python
++ optional withPython2 python2
++ optionals withPython3 [ python3 ncurses ]
++ optional withPHP72 php72
++ optional withPHP73 php73
++ optional withPerl perl
++ optional withPerl528 perl528
++ optional withPerl530 perl530
++ optional withPerldevel perldevel
++ optional withRuby_2_4 ruby_2_4
++ optional withRuby ruby
++ optional withRuby_2_5 ruby_2_5
++ optional withRuby_2_6 ruby_2_6
++ optional withSSL openssl;
configureFlags = [
@ -46,13 +52,16 @@ stdenv.mkDerivation rec {
++ optional withDebug [ "--debug" ];
postConfigure = ''
${optionalString withPython "./configure python --module=python --config=${python}/bin/python-config --lib-path=${python}/lib"}
${optionalString withPHP72 "./configure php --module=php72 --config=${php72.dev}/bin/php-config --lib-path=${php72}/lib"}
${optionalString withPHP73 "./configure php --module=php73 --config=${php73.dev}/bin/php-config --lib-path=${php73}/lib"}
${optionalString withPerl "./configure perl --module=perl --perl=${perl}/bin/perl"}
${optionalString withPerldevel "./configure perl --module=perl529 --perl=${perldevel}/bin/perl"}
${optionalString withRuby_2_4 "./configure ruby --module=ruby24 --ruby=${ruby_2_4}/bin/ruby"}
${optionalString withRuby "./configure ruby --module=ruby --ruby=${ruby}/bin/ruby"}
${optionalString withPython2 "./configure python --module=python2 --config=${python2}/bin/python2-config --lib-path=${python2}/lib"}
${optionalString withPython3 "./configure python --module=python3 --config=${python3}/bin/python3-config --lib-path=${python3}/lib"}
${optionalString withPHP72 "./configure php --module=php72 --config=${php72.dev}/bin/php-config --lib-path=${php72}/lib"}
${optionalString withPHP73 "./configure php --module=php73 --config=${php73.dev}/bin/php-config --lib-path=${php73}/lib"}
${optionalString withPerl528 "./configure perl --module=perl528 --perl=${perl528}/bin/perl"}
${optionalString withPerl530 "./configure perl --module=perl530 --perl=${perl530}/bin/perl"}
${optionalString withPerldevel "./configure perl --module=perldev --perl=${perldevel}/bin/perl"}
${optionalString withRuby_2_4 "./configure ruby --module=ruby24 --ruby=${ruby_2_4}/bin/ruby"}
${optionalString withRuby_2_5 "./configure ruby --module=ruby25 --ruby=${ruby_2_5}/bin/ruby"}
${optionalString withRuby_2_6 "./configure ruby --module=ruby26 --ruby=${ruby_2_6}/bin/ruby"}
'';
meta = {

4
pkgs/tools/filesystems/btrfs-progs/default.nix
View file

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "btrfs-progs";
version = "5.3.1";
version = "5.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
sha256 = "0f6s1iwiqbncrvxp74k50s88x6zqf85sjxg04kyni82l1vk1m8xz";
sha256 = "1ykhasv0jc3qi3xrm5841mzkmlbkjw6rm70gl4aww90jj6ak55qg";
};
nativeBuildInputs = [

36
pkgs/tools/misc/parted/default.nix
View file

@ -1,28 +1,29 @@
{ stdenv, fetchurl, fetchpatch, lvm2, libuuid, gettext, readline, perl, python2
, utillinux, check, enableStatic ? false }:
{ stdenv
, fetchurl
, fetchpatch
, lvm2
, libuuid
, gettext
, readline
, dosfstools
, e2fsprogs
, perl
, python2
, utillinux
, check
, enableStatic ? false
}:
stdenv.mkDerivation rec {
name = "parted-3.2";
name = "parted-3.3";
src = fetchurl {
url = "mirror://gnu/parted/${name}.tar.xz";
sha256 = "1r3qpg3bhz37mgvp9chsaa3k0csby3vayfvz8ggsqz194af5i2w5";
sha256 = "0i1xp367wpqw75b20c3jnism3dg3yqj4a7a22p2jb1h1hyyv9qjp";
};
outputs = [ "out" "dev" "man" "info" ];
patches = stdenv.lib.optional doCheck ./gpt-unicode-test-fix.patch
++ stdenv.lib.optional stdenv.hostPlatform.isMusl
(fetchpatch {
url = "https://git.alpinelinux.org/cgit/aports/plain/main/parted/fix-includes.patch?id=9c5cd3c329a40ba4559cc1d8c7d17a9bf95c237b";
sha256 = "117ypyiwvzym6pi8xmy16wa5z3sbpx7gh6haabs6kfb1x2894z7q";
})
++ stdenv.lib.optional (lvm2 == null)
(fetchpatch {
url = https://git.savannah.gnu.org/cgit/parted.git/patch/?id=7e87ca3c531228d35e13e802d2622006138b104c;
sha256 = "0i29lfg8cwj342q5s7qwqhncz2bkifj5rjc7cx6jd4zqb6ykkndj";
});
postPatch = ''
patchShebangs tests
'';
@ -42,8 +43,7 @@ stdenv.mkDerivation rec {
# Tests were previously failing due to Hydra running builds as uid 0.
# That should hopefully be fixed now.
doCheck = !stdenv.hostPlatform.isMusl; /* translation test */
checkInputs = [ check perl python2 utillinux ];
checkInputs = [ check dosfstools e2fsprogs perl python2 utillinux ];
meta = {
description = "Create, destroy, resize, check, and copy partitions";

34
pkgs/tools/misc/parted/gpt-unicode-test-fix.patch
View file

@ -1,34 +0,0 @@
From Ludo's suggestion at:
http://debbugs.gnu.org/cgi/bugreport.cgi?msg=8;bug=18258
diff --git a/tests/t0251-gpt-unicode.sh b/tests/t0251-gpt-unicode.sh
index c845950..fa63a72 100755
--- a/tests/t0251-gpt-unicode.sh
+++ b/tests/t0251-gpt-unicode.sh
@@ -22,7 +22,24 @@ dev=loop-file
# create zeroed device
truncate -s 10m $dev || fail=1
-export LC_ALL=C.UTF-8
+found_locale=no
+for locale in en_US de_DE fr_FR es_ES
+do
+ LC_ALL="$locale.UTF-8"
+ export LC_ALL
+
+ # In a UTF-8 locale, the string below prints as 4 characters.
+ if [ `printf 'foo\341\264\244' | wc -m` -eq 4 ]; then
+ found_locale=yes
+ break
+ fi
+done
+
+if [ "$found_locale" != "yes" ]; then
+ echo "no valid UTF-8 locale found; skipping" >&2
+ exit 77
+fi
+
# create gpt label with named partition
part_name=$(printf 'foo\341\264\244')
parted -s $dev mklabel gpt mkpart primary ext2 1MiB 2MiB name 1 $part_name > empty 2>&1 || fail=1

4
pkgs/tools/networking/network-manager/default.nix
View file

@ -10,11 +10,11 @@ let
pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]);
in stdenv.mkDerivation rec {
pname = "network-manager";
version = "1.20.6";
version = "1.20.8";
src = fetchurl {
url = "mirror://gnome/sources/NetworkManager/${stdenv.lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz";
sha256 = "0fa5my2czxxlr0lcrzm4zcbcfmvzflnzg1n0yrf6wssa07qaklp8";
sha256 = "1ijpnx25wy5bcvp4mc49va942q56d0pncpj4jpknpdzwilmf455d";
};
outputs = [ "out" "dev" "devdoc" "man" "doc" ];

4
pkgs/tools/security/gnupg/22.nix
View file

@ -16,11 +16,11 @@ assert guiSupport -> pinentry != null && enableMinimal == false;
stdenv.mkDerivation rec {
pname = "gnupg";
version = "2.2.18";
version = "2.2.19";
src = fetchurl {
url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2";
sha256 = "02pcdmb9p4a8hil88gyd86mnc85jldss3cl02jvbkcjmrbi7rlrh";
sha256 = "1h6yx6sdpz3lf9gdppgxqcf73baynr8gflmh43286fkgw3058994";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];

46
pkgs/tools/text/groff/0001-Fix-cross-compilation-by-looking-for-ar.patch Normal file
View file

@ -0,0 +1,46 @@
From 1454525f70b43a6957b7c9e1870e997368787da3 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Fri, 8 Nov 2019 21:59:21 -0500
Subject: [PATCH] Fix cross-compilation by looking for `ar`.
---
Makefile.am | 2 +-
configure.ac | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index d18c49b8..b1b53338 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -494,7 +494,7 @@ CCC=@CXX@
# INSTALL_INFO
# LN_S
-AR=ar
+AR=@AR@
ETAGS=etags
ETAGSFLAGS=
# Flag that tells etags to assume C++.
diff --git a/configure.ac b/configure.ac
index 28e75f17..2449b9f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,6 +37,7 @@ AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([src/include/config.h:src/include/config.hin])
AC_CONFIG_SRCDIR([src/roff/groff/groff.cpp])
+AC_CONFIG_MACRO_DIR([m4])
AC_USE_SYSTEM_EXTENSIONS
@@ -72,6 +73,7 @@ GROFF_DOC_CHECK
GROFF_MAKEINFO
GROFF_TEXI2DVI
AC_PROG_RANLIB
+AC_CHECK_TOOL([AR], [ar], [ar])
GROFF_INSTALL_SH
GROFF_INSTALL_INFO
AC_PROG_INSTALL
--
2.23.0

4
pkgs/tools/text/groff/default.nix
View file

@ -20,6 +20,10 @@ stdenv.mkDerivation rec {
enableParallelBuilding = false;
patches = [
./0001-Fix-cross-compilation-by-looking-for-ar.patch
];
postPatch = stdenv.lib.optionalString (psutils != null) ''
substituteInPlace src/preproc/html/pre-html.cpp \
--replace "psselect" "${psutils}/bin/psselect"

1
pkgs/top-level/aliases.nix
View file

@ -50,6 +50,7 @@ mapAliases ({
bashCompletion = bash-completion; # Added 2016-09-28
batti = throw "batti has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10
beegfs = throw "beegfs has been removed."; # added 2019-11-24
bluezFull = bluez; # Added 2019-12-03
bridge_utils = bridge-utils; # added 2015-02-20
bro = zeek; # added 2019-09-29
bootchart = throw "bootchart has been removed from nixpkgs, as it is without a maintainer"; # added 2019-12-10

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

@ -7997,8 +7997,7 @@ in
isl = isl_0_17;
}));
# Version 8.x is marked broken on Darwin: https://gist.github.com/GrahamcOfBorg/bef0231b7129681950f03c4ac06781c8.
gfortran = if stdenv.isDarwin then gfortran7 else gfortran8;
gfortran = gfortran8;
gfortran48 = wrapCC (gcc48.cc.override {
name = "gfortran";
@ -13665,7 +13664,7 @@ in
inherit (kdeFrameworks.override { libsForQt5 = self; })
attica baloo bluez-qt kactivities kactivities-stats
karchive kauth kbookmarks kcmutils kcodecs kcompletion kconfig
karchive kauth kbookmarks kcmutils kcalendarcore kcodecs kcompletion kconfig
kconfigwidgets kcoreaddons kcrash kdbusaddons kdeclarative kdelibs4support
kdesignerplugin kdnssd kemoticons kfilemetadata kglobalaccel kguiaddons
khtml ki18n kiconthemes kidletime kimageformats kio kitemmodels kitemviews
@ -15859,12 +15858,6 @@ in
bluez = bluez5;
bluezFull = bluez.override {
enableWiimote = true;
enableMidi = true;
enableSixaxis = true;
};
inherit (python3Packages) bedup;
bolt = callPackage ../os-specific/linux/bolt { };
@ -22617,7 +22610,8 @@ in
digikam = libsForQt5.callPackage ../applications/graphics/digikam {
inherit (plasma5) oxygen;
inherit (kdeApplications) akonadi-contacts kcalcore;
inherit (kdeApplications) akonadi-contacts;
inherit (kdeFrameworks) kcalendarcore;
ffmpeg = ffmpeg_4;
opencv3 = opencv3WithoutCuda;
};
@ -25314,11 +25308,7 @@ in
xteddy = callPackage ../applications/misc/xteddy { };
xwiimote = callPackage ../misc/drivers/xwiimote {
bluez = pkgs.bluez5.override {
enableWiimote = true;
};
};
xwiimote = callPackage ../misc/drivers/xwiimote { };
xzoom = callPackage ../tools/X11/xzoom {};