Merge branch 'staging'

This commit is contained in:
Thomas Tuegel
2016-10-06 09:51:02 -05:00
95 changed files with 1365 additions and 1895 deletions

View File

@@ -1,6 +1,17 @@
--- a/src/dbinc/atomic.h 2013-03-12 14:07:22.000000000 -0400
+++ b/src/dbinc/atomic.h.change 2013-03-12 14:06:35.000000000 -0400
@@ -144,7 +144,7 @@
diff --git a/src/dbinc/atomic.h b/src/dbinc/atomic.h
index 6a858f7..9f338dc 100644
--- a/src/dbinc/atomic.h
+++ b/src/dbinc/atomic.h
@@ -70,7 +70,7 @@ typedef struct {
* These have no memory barriers; the caller must include them when necessary.
*/
#define atomic_read(p) ((p)->value)
-#define atomic_init(p, val) ((p)->value = (val))
+#define atomic_init_db(p, val) ((p)->value = (val))
#ifdef HAVE_ATOMIC_SUPPORT
@@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val;
#define atomic_inc(env, p) __atomic_inc(p)
#define atomic_dec(env, p) __atomic_dec(p)
#define atomic_compare_exchange(env, p, o, n) \
@@ -9,7 +20,7 @@
static inline int __atomic_inc(db_atomic_t *p)
{
int temp;
@@ -176,7 +176,7 @@
@@ -176,7 +176,7 @@ static inline int __atomic_dec(db_atomic_t *p)
* http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html
* which configure could be changed to use.
*/
@@ -18,3 +29,126 @@
db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval)
{
atomic_value_t was;
@@ -206,7 +206,7 @@ static inline int __atomic_compare_exchange(
#define atomic_dec(env, p) (--(p)->value)
#define atomic_compare_exchange(env, p, oldval, newval) \
(DB_ASSERT(env, atomic_read(p) == (oldval)), \
- atomic_init(p, (newval)), 1)
+ atomic_init_db(p, (newval)), 1)
#else
#define atomic_inc(env, p) __atomic_inc(env, p)
#define atomic_dec(env, p) __atomic_dec(env, p)
diff --git a/src/dbinc/db.in b/src/dbinc/db.in
index 92ac822..f80428e 100644
--- a/src/dbinc/db.in
+++ b/src/dbinc/db.in
@@ -2782,7 +2782,7 @@ typedef struct {
#define fetch(a) __db_dbm_fetch@DB_VERSION_UNIQUE_NAME@(a)
#define firstkey __db_dbm_firstkey@DB_VERSION_UNIQUE_NAME@
#define nextkey(a) __db_dbm_nextkey@DB_VERSION_UNIQUE_NAME@(a)
-#define store(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b)
+#define store_db(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b)
/*******************************************************
* Hsearch historic interface.
diff --git a/src/mp/mp_fget.c b/src/mp/mp_fget.c
index 16de695..d0dcc29 100644
--- a/src/mp/mp_fget.c
+++ b/src/mp/mp_fget.c
@@ -649,7 +649,7 @@ alloc: /* Allocate a new buffer header and data space. */
/* Initialize enough so we can call __memp_bhfree. */
alloc_bhp->flags = 0;
- atomic_init(&alloc_bhp->ref, 1);
+ atomic_init_db(&alloc_bhp->ref, 1);
#ifdef DIAGNOSTIC
if ((uintptr_t)alloc_bhp->buf & (sizeof(size_t) - 1)) {
__db_errx(env, DB_STR("3025",
@@ -955,7 +955,7 @@ alloc: /* Allocate a new buffer header and data space. */
MVCC_MPROTECT(bhp->buf, mfp->pagesize,
PROT_READ);
- atomic_init(&alloc_bhp->ref, 1);
+ atomic_init_db(&alloc_bhp->ref, 1);
MUTEX_LOCK(env, alloc_bhp->mtx_buf);
alloc_bhp->priority = bhp->priority;
alloc_bhp->pgno = bhp->pgno;
diff --git a/src/mp/mp_mvcc.c b/src/mp/mp_mvcc.c
index 770bad8..e28cce0 100644
--- a/src/mp/mp_mvcc.c
+++ b/src/mp/mp_mvcc.c
@@ -276,7 +276,7 @@ __memp_bh_freeze(dbmp, infop, hp, bhp, need_frozenp)
#else
memcpy(frozen_bhp, bhp, SSZA(BH, buf));
#endif
- atomic_init(&frozen_bhp->ref, 0);
+ atomic_init_db(&frozen_bhp->ref, 0);
if (mutex != MUTEX_INVALID)
frozen_bhp->mtx_buf = mutex;
else if ((ret = __mutex_alloc(env, MTX_MPOOL_BH,
@@ -428,7 +428,7 @@ __memp_bh_thaw(dbmp, infop, hp, frozen_bhp, alloc_bhp)
#endif
alloc_bhp->mtx_buf = mutex;
MUTEX_LOCK(env, alloc_bhp->mtx_buf);
- atomic_init(&alloc_bhp->ref, 1);
+ atomic_init_db(&alloc_bhp->ref, 1);
F_CLR(alloc_bhp, BH_FROZEN);
}
diff --git a/src/mp/mp_region.c b/src/mp/mp_region.c
index 4952030..47645f8 100644
--- a/src/mp/mp_region.c
+++ b/src/mp/mp_region.c
@@ -245,7 +245,7 @@ __memp_init(env, dbmp, reginfo_off, htab_buckets, max_nreg)
MTX_MPOOL_FILE_BUCKET, 0, &htab[i].mtx_hash)) != 0)
return (ret);
SH_TAILQ_INIT(&htab[i].hash_bucket);
- atomic_init(&htab[i].hash_page_dirty, 0);
+ atomic_init_db(&htab[i].hash_page_dirty, 0);
}
/*
@@ -302,7 +302,7 @@ no_prealloc:
} else
hp->mtx_hash = mtx_base + (i % dbenv->mp_mtxcount);
SH_TAILQ_INIT(&hp->hash_bucket);
- atomic_init(&hp->hash_page_dirty, 0);
+ atomic_init_db(&hp->hash_page_dirty, 0);
#ifdef HAVE_STATISTICS
hp->hash_io_wait = 0;
hp->hash_frozen = hp->hash_thawed = hp->hash_frozen_freed = 0;
diff --git a/src/mutex/mut_method.c b/src/mutex/mut_method.c
index 09353b0..177353c 100644
--- a/src/mutex/mut_method.c
+++ b/src/mutex/mut_method.c
@@ -474,7 +474,7 @@ atomic_compare_exchange(env, v, oldval, newval)
MUTEX_LOCK(env, mtx);
ret = atomic_read(v) == oldval;
if (ret)
- atomic_init(v, newval);
+ atomic_init_db(v, newval);
MUTEX_UNLOCK(env, mtx);
return (ret);
diff --git a/src/mutex/mut_tas.c b/src/mutex/mut_tas.c
index 106b161..fc4de9d 100644
--- a/src/mutex/mut_tas.c
+++ b/src/mutex/mut_tas.c
@@ -47,7 +47,7 @@ __db_tas_mutex_init(env, mutex, flags)
#ifdef HAVE_SHARED_LATCHES
if (F_ISSET(mutexp, DB_MUTEX_SHARED))
- atomic_init(&mutexp->sharecount, 0);
+ atomic_init_db(&mutexp->sharecount, 0);
else
#endif
if (MUTEX_INIT(&mutexp->tas)) {
@@ -536,7 +536,7 @@ __db_tas_mutex_unlock(env, mutex)
F_CLR(mutexp, DB_MUTEX_LOCKED);
/* Flush flag update before zeroing count */
MEMBAR_EXIT();
- atomic_init(&mutexp->sharecount, 0);
+ atomic_init_db(&mutexp->sharecount, 0);
} else {
DB_ASSERT(env, sharecount > 0);
MEMBAR_EXIT();

View File

@@ -3,6 +3,9 @@
import ./generic.nix (args // rec {
version = "5.3.28";
sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0";
extraPatches = [ ./clang-5.3.patch ];
branch = "5.3";
# https://community.oracle.com/thread/3952592
# this patch renames some sybols that conflict with libc++-3.8
# symbols: atomic_compare_exchange, atomic_init, store
extraPatches = [ ./clang-5.3.patch ];
})

View File

@@ -2,15 +2,15 @@
, gsettings_desktop_schemas }:
let
ver_maj = "2.46";
ver_min = "1";
ver_maj = "2.50";
ver_min = "0";
in
stdenv.mkDerivation rec {
name = "glib-networking-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://gnome/sources/glib-networking/${ver_maj}/${name}.tar.xz";
sha256 = "1cchmi08jpjypgmm9i7xzh5qfg2q5k61kry9ns8mhw3z44a440ym";
sha256 = "3f1a442f3c2a734946983532ce59ed49120319fdb10c938447c373d5e5286bee";
};
outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs

View File

@@ -1,5 +1,7 @@
{ stdenv, fetchurl, pkgconfig, gettext, perl, python
, libiconv, libintlOrEmpty, zlib, libffi, pcre, libelf
# use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib)
, utillinuxMinimal ? null
# this is just for tests (not in closure of any regular package)
, coreutils, dbus_daemon, libxml2, tzdata, desktop_file_utils, shared_mime_info, doCheck ? false
@@ -8,6 +10,7 @@
with stdenv.lib;
assert stdenv.isFreeBSD || stdenv.isDarwin || stdenv.cc.isGNU;
assert stdenv.isLinux -> utillinuxMinimal != null;
# TODO:
# * Add gio-module-fam
@@ -39,8 +42,8 @@ let
ln -sr -t "''${!outputInclude}/include/" "''${!outputInclude}"/lib/*/include/* 2>/dev/null || true
'';
ver_maj = "2.48";
ver_min = "2";
ver_maj = "2.50";
ver_min = "0";
in
stdenv.mkDerivation rec {
@@ -48,7 +51,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz";
sha256 = "f25e751589cb1a58826eac24fbd4186cda4518af772806b666a3f91f66e6d3f4";
sha256 = "830b551fa626bda06e12729205b3c5bb0d82b924a8cf64d948945878f01b7d70";
};
patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch;
@@ -59,6 +62,7 @@ stdenv.mkDerivation rec {
setupHook = ./setup-hook.sh;
buildInputs = [ libelf setupHook pcre ]
++ optionals stdenv.isLinux [ utillinuxMinimal ] # for libmount
++ optionals doCheck [ tzdata libxml2 desktop_file_utils shared_mime_info ];
nativeBuildInputs = [ pkgconfig gettext perl python ];

View File

@@ -82,7 +82,7 @@ stdenv.mkDerivation ({
"--enable-add-ons"
"--enable-obsolete-rpc"
"--sysconfdir=/etc"
"libc_cv_ssp=no"
"--enable-stackguard-randomization"
(if linuxHeaders != null
then "--with-headers=${linuxHeaders}/include"
else "--without-headers")

View File

@@ -33,6 +33,9 @@ in
makeFlagsArray+=("bindir=$bin/bin" "sbindir=$bin/sbin" "rootsbindir=$bin/sbin")
'';
# The stackprotector and fortify hardening flags are autodetected by glibc
# and enabled by default if supported. Setting it for every gcc invocation
# does not work.
hardeningDisable = [ "stackprotector" "fortify" ];
# When building glibc from bootstrap-tools, we need libgcc_s at RPATH for

View File

@@ -1,15 +1,15 @@
{ stdenv, fetchurl, pkgconfig, gnum4, glib, libsigcxx }:
let
ver_maj = "2.48";
ver_min = "1";
ver_maj = "2.50";
ver_min = "0";
in
stdenv.mkDerivation rec {
name = "glibmm-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://gnome/sources/glibmm/${ver_maj}/${name}.tar.xz";
sha256 = "1pvw2mrm03p51p03179rb6fk9p42iykkwj1jcdv7jr265xymy8nw";
sha256 = "df726e3c6ef42b7621474b03b644a2e40ec4eef94a1c5a932c1e740a78f95e94";
};
outputs = [ "out" "dev" ];

View File

@@ -7,7 +7,7 @@
# In that case its about 6MB which could be separated
let
ver_maj = "1.48";
ver_maj = "1.50";
ver_min = "0";
in
with stdenv.lib;
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/gobject-introspection/${ver_maj}/${name}.tar.xz";
sha256 = "0xsqwxhfqzr79av89mg766kxpb2i41bd0vwspk01xjdzrnn5l9zs";
sha256 = "1c6597c666f543c70ef3d7c893ab052968afae620efdc080c36657f4226337c5";
};
outputs = [ "out" "dev" ];

View File

@@ -44,6 +44,8 @@ stdenv.mkDerivation rec {
postInstall = ''
moveToOutput share/gtk-2.0/demo "$devdoc"
# The updater is needed for nixos env and it's tiny.
moveToOutput bin/gtk-update-icon-cache "$out"
'';
passthru = {

View File

@@ -12,8 +12,8 @@ assert cupsSupport -> cups != null;
with stdenv.lib;
let
ver_maj = "3.20";
ver_min = "9";
ver_maj = "3.22";
ver_min = "1";
version = "${ver_maj}.${ver_min}";
in
stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
sha256 = "05xcwvy68p7f4hdhi4bgdm3aycvqqr4pr5kkkr8ba91l5yx0k9l3";
sha256 = "127c8c5cfc32681f9ab3cb542eb0d5c16c1c02faba68bf8fcac9a3cf278ef471";
};
outputs = [ "out" "dev" ];

View File

@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1vpmjqv0aqb1ds0xi6nigxnhlr0c74090xzi15b92amlzkrjyfj4";
};
patches = [ ./gtkmm-2.24.4-missing-operator.patch ];
nativeBuildInputs = [pkgconfig];
propagatedBuildInputs = [ glibmm gtk2 atkmm cairomm pangomm ];

View File

@@ -0,0 +1,11 @@
--- gtkmm-2.24.4/gtk/gtkmm/menushell.cc.orig 2016-08-26 21:55:08.858311055 +0000
+++ gtkmm-2.24.4/gtk/gtkmm/menushell.cc 2016-08-26 21:55:33.206310578 +0000
@@ -130,7 +130,7 @@ MenuList::iterator MenuList::insert(Menu
{
const Glib::RefPtr<Gtk::MenuItem> item = element.get_child();
- g_return_val_if_fail(item != 0, position);
+ g_return_val_if_fail(!!item, position);
g_return_val_if_fail(gparent() != 0, position);
int pos = -1;

View File

@@ -40,6 +40,7 @@ let
let
inherit (args) name;
inherit (srcs."${name}") src version;
qtVersion = (builtins.parseDrvName self.qtbase.name).version;
in kdeDerivation (args // {
name = "${name}-${version}";
inherit src;
@@ -50,6 +51,7 @@ let
];
platforms = lib.platforms.linux;
homepage = "http://www.kde.org";
broken = builtins.compareVersions qtVersion "5.6.0" < 0;
} // (args.meta or {});
});

View File

@@ -1 +1 @@
WGET_ARGS=( http://download.kde.org/stable/frameworks/5.24/ -A '*.tar.xz' )
WGET_ARGS=( http://download.kde.org/stable/frameworks/5.26/ -A '*.tar.xz' )

View File

@@ -1,11 +1,7 @@
{ kdeFramework, lib
, ecm
, kconfig
, kcoreaddons
, kcrash
, kdbusaddons
, kwindowsystem
, qtx11extras
{
kdeFramework, lib, ecm,
kconfig, kcoreaddons, kcrash, kdbusaddons, kservice, kwindowsystem,
qtx11extras
}:
kdeFramework {
@@ -13,6 +9,6 @@ kdeFramework {
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ ecm ];
propagatedBuildInputs = [
kconfig kcoreaddons kcrash kdbusaddons kwindowsystem qtx11extras
kconfig kcoreaddons kcrash kdbusaddons kservice kwindowsystem qtx11extras
];
}

View File

@@ -1,12 +1,13 @@
{
kdeFramework, lib, copyPathsToStore, ecm,
kdeFramework, lib, copyPathsToStore,
bison, ecm, flex,
kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem
}:
kdeFramework {
name = "kservice";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
propagatedNativeBuildInputs = [ ecm ];
propagatedNativeBuildInputs = [ bison ecm flex ];
nativeBuildInputs = [ kdoctools ];
propagatedBuildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ki18n kwindowsystem ];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);

View File

@@ -1,11 +1,12 @@
{ kdeFramework, lib
, ecm
, qtdeclarative
{
kdeFramework, lib,
bison, ecm, flex,
qtdeclarative
}:
kdeFramework {
name = "solid";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ ecm ];
nativeBuildInputs = [ bison ecm flex ];
propagatedBuildInputs = [ qtdeclarative ];
}

View File

@@ -1,581 +1,581 @@
# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh
{ fetchurl, mirror }:
{
attica = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/attica-5.24.0.tar.xz";
sha256 = "0d368gmds7m7k5pnn625wqsij38cvxk1gkm4zv24phnk9f67v7cw";
name = "attica-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/attica-5.26.0.tar.xz";
sha256 = "1z7718vzknp25lzx4kh0k7xw7jgx5q8afwhfcdqhfrbydbch5ilc";
name = "attica-5.26.0.tar.xz";
};
};
baloo = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/baloo-5.24.0.tar.xz";
sha256 = "1ayfdg6j9lvas17ryjdv4a0kaj6vw3bxfy2x9nadl0gkc9pak4nh";
name = "baloo-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/baloo-5.26.0.tar.xz";
sha256 = "0cgk2fmm1hivzjajih3f09x901cncl2rxxp4qq7wz6g7d2s59pfy";
name = "baloo-5.26.0.tar.xz";
};
};
bluez-qt = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/bluez-qt-5.24.0.tar.xz";
sha256 = "0gy0m7lcwwklf021l5i3v7j0cl7qz7cgvzrwpj87ix3kyw5xs80z";
name = "bluez-qt-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/bluez-qt-5.26.0.tar.xz";
sha256 = "0n235jsx6vw4v13y3hkbiz5fh4453avgvrwd1zzs4yc5mkz5w837";
name = "bluez-qt-5.26.0.tar.xz";
};
};
breeze-icons = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/breeze-icons-5.24.0.tar.xz";
sha256 = "1dh7bijx99sdb3vn6394wmm5cq0fvvmz8h17sx4hakmbga849cx2";
name = "breeze-icons-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/breeze-icons-5.26.0.tar.xz";
sha256 = "1kbbiid89inb7dpn0z612gb7v4p2msbvp9g5varb7wvyld1dgh59";
name = "breeze-icons-5.26.0.tar.xz";
};
};
extra-cmake-modules = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/extra-cmake-modules-5.24.0.tar.xz";
sha256 = "01m12ml529pwr2sal951r5z6yb1rwbpid1y4k14nlk3xqgmdakwa";
name = "extra-cmake-modules-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/extra-cmake-modules-5.26.0.tar.xz";
sha256 = "1v3riz49r7pwvnj1ls6wnw0c4g69iky9yck2m4hgr9641k0rqlnd";
name = "extra-cmake-modules-5.26.0.tar.xz";
};
};
frameworkintegration = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/frameworkintegration-5.24.0.tar.xz";
sha256 = "0brqgq05m06d98qqvyh30727f5z7hlzxgqysfhfvqzcf3x7f6yzj";
name = "frameworkintegration-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/frameworkintegration-5.26.0.tar.xz";
sha256 = "0lqnwgsd6ads17qzdbd75azpk1h5ky3924ygzhbam1llnvcvfk9p";
name = "frameworkintegration-5.26.0.tar.xz";
};
};
kactivities = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kactivities-5.24.0.tar.xz";
sha256 = "0s8g43zk6h35bq1am1nnhj0qvmhd6kz42gs8l7ybga0367jghzhf";
name = "kactivities-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kactivities-5.26.0.tar.xz";
sha256 = "0cnciipmflnn1dxz69iqc2xy6g27sw4yr17yq3hp0r6kkycmpf71";
name = "kactivities-5.26.0.tar.xz";
};
};
kactivities-stats = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kactivities-stats-5.24.0.tar.xz";
sha256 = "1z3xvpifxbd05b2xaxxyiypcpid7jgjb1qpwiyjj1gnfp4rjmzpc";
name = "kactivities-stats-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kactivities-stats-5.26.0.tar.xz";
sha256 = "0vpbsg6jswaw3ax4ypp6ak823iymh9jqdf7ssn9kqljynnjhnfv8";
name = "kactivities-stats-5.26.0.tar.xz";
};
};
kapidox = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kapidox-5.24.0.tar.xz";
sha256 = "19a7alvn71nxflsyi7y3hghx1iw04qqc77qy54mcxcpkiyvpsggf";
name = "kapidox-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kapidox-5.26.0.tar.xz";
sha256 = "1snz4szrgbdzy03jc0sax9r7b1jynj2npil1ngpr40xchs70vnb8";
name = "kapidox-5.26.0.tar.xz";
};
};
karchive = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/karchive-5.24.0.tar.xz";
sha256 = "1n5nfhrfvqnrdjgjjy7arqik4fya5bp3dvxa16mlhqr19azkavzq";
name = "karchive-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/karchive-5.26.0.tar.xz";
sha256 = "1sysk9zznnahrdjfxxp3aaw6qy9c5l7agh1nbhnk0j5xm31js25g";
name = "karchive-5.26.0.tar.xz";
};
};
kauth = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kauth-5.24.0.tar.xz";
sha256 = "14sjjfgl3arqyqcr77w9qhpnd8mrnh53r5rfss6bvlk26bmihs49";
name = "kauth-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kauth-5.26.0.tar.xz";
sha256 = "08k1x943z7a044ihv79lm1c0vas5x9wc9wr4qirhllkrxd87nsc1";
name = "kauth-5.26.0.tar.xz";
};
};
kbookmarks = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kbookmarks-5.24.0.tar.xz";
sha256 = "10d8dnhvbrwp0dbmz93cqfdff6ir8iy3yiwaf9ihj6ma124qlyjn";
name = "kbookmarks-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kbookmarks-5.26.0.tar.xz";
sha256 = "0phhf5xv11iyf5vi8x6xwx7rqlxc27451bwmm2sr0c65bnnkj57j";
name = "kbookmarks-5.26.0.tar.xz";
};
};
kcmutils = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kcmutils-5.24.0.tar.xz";
sha256 = "0aws1c76s6wbp0xpr6qv6cfwq8dw82v00pkf9gy84sbxknwjnizk";
name = "kcmutils-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kcmutils-5.26.0.tar.xz";
sha256 = "1pymbf50idnrz8vyy9lm9535h6s7ssd3p70fdg8dicx7lx6s5grd";
name = "kcmutils-5.26.0.tar.xz";
};
};
kcodecs = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kcodecs-5.24.0.tar.xz";
sha256 = "1qpzjh3qc2zz80j2bmlinipbispms14k9bmqw8v61zhi6in9z14c";
name = "kcodecs-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kcodecs-5.26.0.tar.xz";
sha256 = "18xzxi5y47rn3wlxz3m98ix7sd20vmxnqsm3lksgakk08qcv47wk";
name = "kcodecs-5.26.0.tar.xz";
};
};
kcompletion = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kcompletion-5.24.0.tar.xz";
sha256 = "1qln0v31gn86kzwhnkijr1ydf129n32jmiybbckrp4w6hyx6xfxv";
name = "kcompletion-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kcompletion-5.26.0.tar.xz";
sha256 = "1f3h6qrpqsdds5zf99qkzxan2lh1y83d67pdswqvbfvwhr3bnl7s";
name = "kcompletion-5.26.0.tar.xz";
};
};
kconfig = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kconfig-5.24.0.tar.xz";
sha256 = "1dc2i6icyigw1j6qxgdza6j2g8afh390qmxsa2a54mwl84fkfmxv";
name = "kconfig-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kconfig-5.26.0.tar.xz";
sha256 = "0rsym5196agxzxzfxzywvsqlgvarnvw91zx04xvlsy70fnj70c4d";
name = "kconfig-5.26.0.tar.xz";
};
};
kconfigwidgets = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kconfigwidgets-5.24.0.tar.xz";
sha256 = "0v25r50gh5i984lzlv0rradghglcfqf0gsfmnkn23h87b86fm9l2";
name = "kconfigwidgets-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kconfigwidgets-5.26.0.tar.xz";
sha256 = "08jr6rhh8fi85827bqxh8v4pavq63i2kzwbvqcfpvrrncj5aj4ci";
name = "kconfigwidgets-5.26.0.tar.xz";
};
};
kcoreaddons = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kcoreaddons-5.24.0.tar.xz";
sha256 = "06sx7by3nvaridnavj5p0bxv4nh47n708jlacfw8ydaikmd9i03h";
name = "kcoreaddons-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kcoreaddons-5.26.0.tar.xz";
sha256 = "10krqzrmbzzkj0xg5rxgs6i4ngg57ydqn3fkmpyz0x6g4yl3raqz";
name = "kcoreaddons-5.26.0.tar.xz";
};
};
kcrash = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kcrash-5.24.0.tar.xz";
sha256 = "1lahgfwlp9b5rsl244kzp7rsl4ybv1q4qlvpv0xxz5ygssk48l0w";
name = "kcrash-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kcrash-5.26.0.tar.xz";
sha256 = "0x60rw2zy37s38fpa8agggl9mm4kgvdabbcgr673p7b6k6vj46j8";
name = "kcrash-5.26.0.tar.xz";
};
};
kdbusaddons = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kdbusaddons-5.24.0.tar.xz";
sha256 = "183nxqrhz4qk4qfp1w4an0scp2dvfqcaqbpg4cgbgk0z590q0pkk";
name = "kdbusaddons-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kdbusaddons-5.26.0.tar.xz";
sha256 = "0wl5lpqqcckn003kqfz1wapi40wkn4xjk878zwykg3lplxfdlsqw";
name = "kdbusaddons-5.26.0.tar.xz";
};
};
kdeclarative = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kdeclarative-5.24.0.tar.xz";
sha256 = "00ik9q1r6y6g5rkdq96yczgrxmcg85x00lipyljvc3x6xw6bixbz";
name = "kdeclarative-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kdeclarative-5.26.0.tar.xz";
sha256 = "0hmj0aj559i9flsw72zzwb2s95ajnzqh11rrs6wmcraywd4xywk8";
name = "kdeclarative-5.26.0.tar.xz";
};
};
kded = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kded-5.24.0.tar.xz";
sha256 = "0ngpxdxb596myn5r4kjxahx195bwklq33yvgjvcbxi2clg2wccaj";
name = "kded-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kded-5.26.0.tar.xz";
sha256 = "0rk8jh0bg6wqfpjcg0g1i2frmhprc8pmnj6bwdifx119kh894n0l";
name = "kded-5.26.0.tar.xz";
};
};
kdelibs4support = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/portingAids/kdelibs4support-5.24.0.tar.xz";
sha256 = "12sis63mq6i372bhx64x8y0pw6czrv64hdhjscx27cx65a4ir451";
name = "kdelibs4support-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/portingAids/kdelibs4support-5.26.0.tar.xz";
sha256 = "0jc05qzpcn72rvfyink7x56hvc7g21dcmgkfdx9w84brvqjnscz8";
name = "kdelibs4support-5.26.0.tar.xz";
};
};
kdesignerplugin = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kdesignerplugin-5.24.0.tar.xz";
sha256 = "0i0s8pwwhwh5hyyvkv0cnj0yyv0g5bnm5xw18knv2yagiy4bvb2j";
name = "kdesignerplugin-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kdesignerplugin-5.26.0.tar.xz";
sha256 = "10c8d83zl8qlg785rxn4d5ps18p0zplf5l00jnq8ikpa4ijnyn2j";
name = "kdesignerplugin-5.26.0.tar.xz";
};
};
kdesu = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kdesu-5.24.0.tar.xz";
sha256 = "1ivcnhgvq75xvl0w9g7m45qzallz42ijaq0n1ap09lpdfmjbnrxk";
name = "kdesu-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kdesu-5.26.0.tar.xz";
sha256 = "0kxqrzbhjahp0cx3n828q2gh1bdxsp7gmhahbhfzasknkvp1nqqs";
name = "kdesu-5.26.0.tar.xz";
};
};
kdewebkit = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kdewebkit-5.24.0.tar.xz";
sha256 = "1xq36zv7vnllhqbisl6kcna8z6qzlvy29a47g0hbzgl8rc93qskf";
name = "kdewebkit-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kdewebkit-5.26.0.tar.xz";
sha256 = "1z66jm8zpmksbdk7yzvcps712wd8d85r0dxw8zj3vw0z5yd68cmm";
name = "kdewebkit-5.26.0.tar.xz";
};
};
kdnssd = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kdnssd-5.24.0.tar.xz";
sha256 = "01b650g031apxc3vd2m91g2fxqk9l8ap67z6rafniphfwy8i0d5m";
name = "kdnssd-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kdnssd-5.26.0.tar.xz";
sha256 = "0jamzv7wxp50awjzk1vwhmj8pldnm6hjxx5zvsjfif26va30w0q3";
name = "kdnssd-5.26.0.tar.xz";
};
};
kdoctools = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kdoctools-5.24.0.tar.xz";
sha256 = "1r129kpq0d11b9l87cqbal6fm5ycwhsps1g3r1a7jsxz70scz4ri";
name = "kdoctools-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kdoctools-5.26.0.tar.xz";
sha256 = "1306ag1waw0cxkvwbb0n9gb9yc9nw6zzjssjrn19z366yp1z9ja8";
name = "kdoctools-5.26.0.tar.xz";
};
};
kemoticons = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kemoticons-5.24.0.tar.xz";
sha256 = "0gmc52k5jb553jvzxwsq79v5y87kgav8i5qqv4bqc9yl7p866zhn";
name = "kemoticons-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kemoticons-5.26.0.tar.xz";
sha256 = "09qpw3vr4l80hp4j6v73nsncmsrsxww2hab9c24i3167ygsvca5s";
name = "kemoticons-5.26.0.tar.xz";
};
};
kfilemetadata = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kfilemetadata-5.24.0.tar.xz";
sha256 = "02n9qhpr0jlwdgdbid0k34abhs3bzhlsa56ybl5dq1aib6izk1sy";
name = "kfilemetadata-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kfilemetadata-5.26.0.tar.xz";
sha256 = "1y80llazn66f7vndyzspz7w0n1g2xhi8g13qwakws278wsi04p1l";
name = "kfilemetadata-5.26.0.tar.xz";
};
};
kglobalaccel = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kglobalaccel-5.24.0.tar.xz";
sha256 = "123v0ld1q88hbm3d0mqgq6lcivfkqh7pbz4hb4n76ab5v43qc15c";
name = "kglobalaccel-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kglobalaccel-5.26.0.tar.xz";
sha256 = "0a1q9pif4n8fmp9kw8sbiaia2znc657fm1mi9gyvp5amphjjkzdd";
name = "kglobalaccel-5.26.0.tar.xz";
};
};
kguiaddons = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kguiaddons-5.24.0.tar.xz";
sha256 = "0ig96ah20ybg5rwpswj9va2klvkh2q4amwxmgy3z4niwfsm2g3ic";
name = "kguiaddons-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kguiaddons-5.26.0.tar.xz";
sha256 = "0gaaxkzjpdqk8534dpbn6dxb83nckh1g7w62nssv4a2jwfkyrmgp";
name = "kguiaddons-5.26.0.tar.xz";
};
};
khtml = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/portingAids/khtml-5.24.0.tar.xz";
sha256 = "0f19m8ycaa41p61i0j43gafn364abral8dbiqhr0qcj33nsa4134";
name = "khtml-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/portingAids/khtml-5.26.0.tar.xz";
sha256 = "1h1dacbwix1j9r0hgnpxhgjfbffh545852n2yn8kl25bf2ppx3m8";
name = "khtml-5.26.0.tar.xz";
};
};
ki18n = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/ki18n-5.24.0.tar.xz";
sha256 = "0cw24spmwsqa3ppkw03cm6yjd3sfll0dbbk2ya76fd4nw9hb00dv";
name = "ki18n-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/ki18n-5.26.0.tar.xz";
sha256 = "1f5xr2zskmi9x0xp6drg4mx41hs3ssyskpkd5x01b6s51av0i247";
name = "ki18n-5.26.0.tar.xz";
};
};
kiconthemes = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kiconthemes-5.24.0.tar.xz";
sha256 = "1k5zig2n6wzfyv6pc8dpas2862mxjyxxza00m31myrfw5i1a1h6m";
name = "kiconthemes-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kiconthemes-5.26.0.tar.xz";
sha256 = "0zccfdwy12zssbca4szwypykzvz3yiqwi69sz1ndpiwsvvp575b7";
name = "kiconthemes-5.26.0.tar.xz";
};
};
kidletime = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kidletime-5.24.0.tar.xz";
sha256 = "09jsj0pj27h93nr8v46savs6b93h8frydinfr7wlijkvpsl02jb4";
name = "kidletime-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kidletime-5.26.0.tar.xz";
sha256 = "13wpfkr3jsj3p16c67jfiy60pi0j1b85wrkc9bqx91wl8a22xy02";
name = "kidletime-5.26.0.tar.xz";
};
};
kimageformats = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kimageformats-5.24.0.tar.xz";
sha256 = "12mhgckmhnvcnm8k7mk15mipxrnm7i9ip7ykbjh8nxjiwyk1pmwc";
name = "kimageformats-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kimageformats-5.26.0.tar.xz";
sha256 = "13ibvrfjxm799sis1cilyaqc6cnb9wr464z605skn7qd2gqz7xfx";
name = "kimageformats-5.26.0.tar.xz";
};
};
kinit = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kinit-5.24.0.tar.xz";
sha256 = "1i7l6gid5hrrfglw1c461gpjg51dwz7cl4lx7ll8vz2ha8mz4d3n";
name = "kinit-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kinit-5.26.0.tar.xz";
sha256 = "031wjnniqmvix70da4x019r21zcv99xa4njzk0nccfihpn6i2nx9";
name = "kinit-5.26.0.tar.xz";
};
};
kio = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kio-5.24.0.tar.xz";
sha256 = "0zncj9yf8zaylazlwvirylpk9vki3j889b1x2s0aav54vvj7vdi5";
name = "kio-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kio-5.26.0.tar.xz";
sha256 = "1kvn570gcpzvm4fc8jygvf3w5jbgsjm4sr2bysbvw4zk983ldma0";
name = "kio-5.26.0.tar.xz";
};
};
kitemmodels = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kitemmodels-5.24.0.tar.xz";
sha256 = "1s1p4nw1pqdzbdwvjnka17p9avf00wadr437p4f96md1lvh3sh69";
name = "kitemmodels-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kitemmodels-5.26.0.tar.xz";
sha256 = "1qizknavlgnhc5dqrq5ins6k4s43s815v7inzwhs4qrgv175qcjv";
name = "kitemmodels-5.26.0.tar.xz";
};
};
kitemviews = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kitemviews-5.24.0.tar.xz";
sha256 = "0y3fx9hk1x27arrmwfzq783a44cs7p8dpmhxrwzh0di4mwa8jafw";
name = "kitemviews-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kitemviews-5.26.0.tar.xz";
sha256 = "1z4j1h0bykb3544iy48halb9mrjmkrd40x2c09qsm2r1kc7n3312";
name = "kitemviews-5.26.0.tar.xz";
};
};
kjobwidgets = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kjobwidgets-5.24.0.tar.xz";
sha256 = "1mcvrz66xcqjgbp08zpqsf943cm462wbqm5gh719p9s25hx8hwrc";
name = "kjobwidgets-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kjobwidgets-5.26.0.tar.xz";
sha256 = "0l2h7ghnrs3w8md5yajnbfl6na5ldg17sh9ifvhcwg6n9s57mibb";
name = "kjobwidgets-5.26.0.tar.xz";
};
};
kjs = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/portingAids/kjs-5.24.0.tar.xz";
sha256 = "1qd5sdfrdg7id0g5mwf3ijwlfvh3g36kwnckw6kwns1nf4q6gwlz";
name = "kjs-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/portingAids/kjs-5.26.0.tar.xz";
sha256 = "1f8mhhzq5k3ifpa1b0yspy886j9b82isz0vw16zl611fr564jln2";
name = "kjs-5.26.0.tar.xz";
};
};
kjsembed = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/portingAids/kjsembed-5.24.0.tar.xz";
sha256 = "1nx8ch8mzd1jyx8pd46364ij0bsbsclbipbgr6jm9aak3n13b0nw";
name = "kjsembed-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/portingAids/kjsembed-5.26.0.tar.xz";
sha256 = "030wrrxsdfkyalydi39s85hm0rgfx7647c4a4c1cck2v67k8iq3d";
name = "kjsembed-5.26.0.tar.xz";
};
};
kmediaplayer = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/portingAids/kmediaplayer-5.24.0.tar.xz";
sha256 = "147xrffkvkyv3h8ighc1vlwksysfrqc0g55k8zrd72l6r0kjjh0p";
name = "kmediaplayer-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/portingAids/kmediaplayer-5.26.0.tar.xz";
sha256 = "0zq9xx6g0lfdyxrkrjqyrq6hnygpd7n0grrm6a75hdmyh3lklrvv";
name = "kmediaplayer-5.26.0.tar.xz";
};
};
knewstuff = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/knewstuff-5.24.0.tar.xz";
sha256 = "0xdv3wh3100vzsx8p2zihy1dvh0wzfmrjkjq71v8igwz5d291zsj";
name = "knewstuff-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/knewstuff-5.26.0.tar.xz";
sha256 = "0jd80wmdz241ddk4wdqwrb655r5lzxbxbp0mjyljgi1mwlrhkry4";
name = "knewstuff-5.26.0.tar.xz";
};
};
knotifications = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/knotifications-5.24.0.tar.xz";
sha256 = "0qryp41phnpx4r9wa6rfhmnzy7nxl0ijnyrafadf2n2xb53ipkpa";
name = "knotifications-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/knotifications-5.26.0.tar.xz";
sha256 = "01fvbi4dlqhia5iqj0iddbvkzjafw698pmh2ii9ynb071sqyb2pq";
name = "knotifications-5.26.0.tar.xz";
};
};
knotifyconfig = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/knotifyconfig-5.24.0.tar.xz";
sha256 = "1dij841fnqia4p44x2wnpdvl8cn3nkj833y0fah50fmipjc8r70b";
name = "knotifyconfig-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/knotifyconfig-5.26.0.tar.xz";
sha256 = "14ri2zkzc1b3wqvfb3v6rv0ri5srm7zjk06v9j5bwz778vdh436z";
name = "knotifyconfig-5.26.0.tar.xz";
};
};
kpackage = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kpackage-5.24.0.tar.xz";
sha256 = "03aqzkpqz3c1v4qgwfbs3ncdbapiyg7psrkhxqv3z48rklavk1ri";
name = "kpackage-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kpackage-5.26.0.tar.xz";
sha256 = "1laq92gi67gn6gjz9nw51idq0wwyfwy6syfch0mssw3nbv7araqg";
name = "kpackage-5.26.0.tar.xz";
};
};
kparts = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kparts-5.24.0.tar.xz";
sha256 = "0z7qr93aq02i7g7cxgypx2rzlnsvbsx9cjblb0ijmad1nb8w3mix";
name = "kparts-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kparts-5.26.0.tar.xz";
sha256 = "1ni17k02152axvkx666lx77zwpbsfahknrhgy8y8sy2dbn47jvya";
name = "kparts-5.26.0.tar.xz";
};
};
kpeople = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kpeople-5.24.0.tar.xz";
sha256 = "0iknzkj23y927xh24kw5sjxyirhy6pkmfcmmgwzd78rba8a54qp2";
name = "kpeople-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kpeople-5.26.0.tar.xz";
sha256 = "1zx9mvy1j2ynbj7gg4hnvxrjr5akmrh0l82xh73l4b12l0b775ap";
name = "kpeople-5.26.0.tar.xz";
};
};
kplotting = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kplotting-5.24.0.tar.xz";
sha256 = "0gpypq9kh4b5s6dc7py3m117k3nbxczsfkxgxd9zxvr35kig7ya2";
name = "kplotting-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kplotting-5.26.0.tar.xz";
sha256 = "1f695bb5n46mn362wwvwf636xjy87s63w5ac97lm1c9ndiins394";
name = "kplotting-5.26.0.tar.xz";
};
};
kpty = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kpty-5.24.0.tar.xz";
sha256 = "1ybvdzqpa53kkki9p5da0ff9x3c63rmksk7865wqwlgy8apzi2fs";
name = "kpty-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kpty-5.26.0.tar.xz";
sha256 = "1f1z4z73l4xb5vymg5hsqxcgv7jm81jnjgwn0v85alfcx94dax3m";
name = "kpty-5.26.0.tar.xz";
};
};
kross = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/portingAids/kross-5.24.0.tar.xz";
sha256 = "0f29dpmfcj173vqnmrbpvdmfmzzbfsds1lbl546qfx9a5acdpf2p";
name = "kross-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/portingAids/kross-5.26.0.tar.xz";
sha256 = "05ilcgq74l5m3jjr047zwz7ij60yw5xxp5cpd12892mi054ijb31";
name = "kross-5.26.0.tar.xz";
};
};
krunner = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/krunner-5.24.0.tar.xz";
sha256 = "0ff87ijjd47jxf6zw2ggqgngnbyx1rj59wdfgy5wbi3acws6bafl";
name = "krunner-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/krunner-5.26.0.tar.xz";
sha256 = "050qq146g9wj51615m22l9jjxmgh3gsah3v7iflbdda5nrnzhz3v";
name = "krunner-5.26.0.tar.xz";
};
};
kservice = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kservice-5.24.0.tar.xz";
sha256 = "0w0nsg64d6xhgijr2vh0j5p544qi0q55jpqa9v9mv956zrrdssdk";
name = "kservice-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kservice-5.26.0.tar.xz";
sha256 = "103hjnwh4zwpf8vz3si27jb34j6dm0ff445nc9xafnl1nkwisvgr";
name = "kservice-5.26.0.tar.xz";
};
};
ktexteditor = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/ktexteditor-5.24.0.tar.xz";
sha256 = "1ykj1kvm7k1vxb1w235d5hp2swwdqjyp2y4c3pxbvkn999h9x5q5";
name = "ktexteditor-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/ktexteditor-5.26.0.tar.xz";
sha256 = "0q84vbdkhg1sjhyrcv9y8cdv5qx09f1pz5wiw7dzdw06q9xgi3v4";
name = "ktexteditor-5.26.0.tar.xz";
};
};
ktextwidgets = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/ktextwidgets-5.24.0.tar.xz";
sha256 = "1q10xav2gkii6s3m31c9xvxf1988l7k2lpib6pyhgsidflmwjm02";
name = "ktextwidgets-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/ktextwidgets-5.26.0.tar.xz";
sha256 = "0qafnlzkdqbp1par1s6mish46arbqwbl4xclvql168dlwxgd6b42";
name = "ktextwidgets-5.26.0.tar.xz";
};
};
kunitconversion = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kunitconversion-5.24.0.tar.xz";
sha256 = "03dfjn4lm6sl2zcdrvw0b9irzvkyc2w2j5xixag5j8nw373742h8";
name = "kunitconversion-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kunitconversion-5.26.0.tar.xz";
sha256 = "08nd2i76l4mvgav69qcsq0rwc0r9rkmqy0d4d3b4bc9957yfhk4i";
name = "kunitconversion-5.26.0.tar.xz";
};
};
kwallet = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kwallet-5.24.0.tar.xz";
sha256 = "0zad5h4vsvcl2xv3vxsjwh42b71xbp6x6rj8cvmw8szr2rzz9gsx";
name = "kwallet-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kwallet-5.26.0.tar.xz";
sha256 = "0a3l079zry8bmwkd2lx0cvmkj8p3pvrvpffikca6z4qdw4mnnxjs";
name = "kwallet-5.26.0.tar.xz";
};
};
kwayland = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kwayland-5.24.0.tar.xz";
sha256 = "1h5anbqrxcl1s8kx1l53vcsfr8ifamcjqd47dk8a7lwr1ga6myq2";
name = "kwayland-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kwayland-5.26.0.tar.xz";
sha256 = "1ca2f0k1qsra3c014c3lrn2qxsdq1whk5lqrxqc9dqbpvpyjy939";
name = "kwayland-5.26.0.tar.xz";
};
};
kwidgetsaddons = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kwidgetsaddons-5.24.0.tar.xz";
sha256 = "1kppx0ppfhnb6q6sijs2dffyar86wkkx8miqavsjsgw1l2wiymcx";
name = "kwidgetsaddons-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kwidgetsaddons-5.26.0.tar.xz";
sha256 = "1jam478939cibyhnwg6n3fwyqg8lx1njjbqmlqq4cmp9j62100cn";
name = "kwidgetsaddons-5.26.0.tar.xz";
};
};
kwindowsystem = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kwindowsystem-5.24.0.tar.xz";
sha256 = "0w5ym8msl80v3q65253pdpj9f1fmb658rnndlbkrgpmm1rv1n6dz";
name = "kwindowsystem-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kwindowsystem-5.26.0.tar.xz";
sha256 = "1jmacixr2il5wpw7wzaqswslvmxam3qf7mih271qzbx6k6ngdyk3";
name = "kwindowsystem-5.26.0.tar.xz";
};
};
kxmlgui = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kxmlgui-5.24.0.tar.xz";
sha256 = "1qhixldhhcbklmrpjh67440h1rrzqy70h57hw6ialjdsr3pl6ihp";
name = "kxmlgui-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kxmlgui-5.26.0.tar.xz";
sha256 = "18w41iyfg2iphav2g7qikg4ccv2cr0wl5a6r9h460f45vq9aph4z";
name = "kxmlgui-5.26.0.tar.xz";
};
};
kxmlrpcclient = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/kxmlrpcclient-5.24.0.tar.xz";
sha256 = "06ap6ipzqimz1rfrcr7z8zc7idy7sg4a97dws7h52i34ms7jqnc8";
name = "kxmlrpcclient-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/kxmlrpcclient-5.26.0.tar.xz";
sha256 = "001rvsmxi1mnbrs1kplsb8vx1wfpjp9g4kwm7714w3yh6vmr9j7p";
name = "kxmlrpcclient-5.26.0.tar.xz";
};
};
modemmanager-qt = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/modemmanager-qt-5.24.0.tar.xz";
sha256 = "0khz5bf84xxa8aqpzwb6x839xx6dbiadwqhyj7cvgha65fh2xinh";
name = "modemmanager-qt-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/modemmanager-qt-5.26.0.tar.xz";
sha256 = "1x4h334fcyqnclc9sxff73b79fsgg7a0r98c9palr787qvaafjv2";
name = "modemmanager-qt-5.26.0.tar.xz";
};
};
networkmanager-qt = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/networkmanager-qt-5.24.0.tar.xz";
sha256 = "11wy0ds0hqbba900ggkcxjfqc9n65xlzc3h1zv9433nn5d75v6fy";
name = "networkmanager-qt-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/networkmanager-qt-5.26.0.tar.xz";
sha256 = "0yqhchkava6jsyl0gpa62x4856qszdiglwjxsba9dgl5lasfyrg0";
name = "networkmanager-qt-5.26.0.tar.xz";
};
};
oxygen-icons5 = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/oxygen-icons5-5.24.0.tar.xz";
sha256 = "1c7spjbzk04725vv0ly7vmyvwa96mfa5ki2pm146ld4888a896wm";
name = "oxygen-icons5-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/oxygen-icons5-5.26.0.tar.xz";
sha256 = "0lwwl26xiya7fr5ga5kf45zvj40lm10jpd7p523v2dm0xmqbkf8n";
name = "oxygen-icons5-5.26.0.tar.xz";
};
};
plasma-framework = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/plasma-framework-5.24.0.tar.xz";
sha256 = "0981vm00541dzihlr1fsax05biwp2ddpwjrmvnfysx5jagdc65cb";
name = "plasma-framework-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/plasma-framework-5.26.0.tar.xz";
sha256 = "0mjmzca0n51vwy9gxxanxfi2dvvzzdpwfjw0zdwmjm69znc870ja";
name = "plasma-framework-5.26.0.tar.xz";
};
};
solid = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/solid-5.24.0.tar.xz";
sha256 = "00wvsxcnvhdx7ijzpcz5wny2ypkxr1drdpr4yvawgpwa678l1107";
name = "solid-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/solid-5.26.0.tar.xz";
sha256 = "1dlln9dqyf7md32s6a7pd23dbs6jrvv59ylldxcxgkyjyyb2g0j3";
name = "solid-5.26.0.tar.xz";
};
};
sonnet = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/sonnet-5.24.0.tar.xz";
sha256 = "152xz7fb1iwhb5w1n4xqvc648iaxi0inrl4kavxcsir61das1xyl";
name = "sonnet-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/sonnet-5.26.0.tar.xz";
sha256 = "0akvlrbbk0nbyh12rmcjch122xqa3926gz3l31bvhqgm50b683z2";
name = "sonnet-5.26.0.tar.xz";
};
};
threadweaver = {
version = "5.24.0";
version = "5.26.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.24/threadweaver-5.24.0.tar.xz";
sha256 = "02g60zr9cc4bg1p90giich4n0qvqaiakz0y94qrnyj9f7fg0yksl";
name = "threadweaver-5.24.0.tar.xz";
url = "${mirror}/stable/frameworks/5.26/threadweaver-5.26.0.tar.xz";
sha256 = "1bzlw3m1f207967pjmzlx1k0v38fwjvga9jg88iqh43zb60ks03a";
name = "threadweaver-5.26.0.tar.xz";
};
};
}

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, ncurses, zlib }:
{ stdenv, fetchurl, ncurses, zlib, imlib2, pkgconfig, libX11 }:
stdenv.mkDerivation rec {
name = "libcaca-0.99.beta19";
@@ -13,9 +13,7 @@ stdenv.mkDerivation rec {
outputs = [ "bin" "dev" "out" "man" ];
configureFlags = "--disable-x11 --disable-imlib2 --disable-doc";
propagatedBuildInputs = [ ncurses zlib ];
propagatedBuildInputs = [ ncurses zlib imlib2 pkgconfig libX11 ];
postInstall = ''
mkdir -p $dev/bin

View File

@@ -1,36 +1,34 @@
{ stdenv, fetchurl, autoreconfHook, openssl, python, findutils }:
{ stdenv, fetchurl, autoreconfHook, openssl, findutils }:
let version = "2.0.22"; in
stdenv.mkDerivation {
name = "libevent-${version}";
src = fetchurl {
url = "mirror://sourceforge/levent/libevent-${version}-stable.tar.gz";
url = "https://github.com/libevent/libevent/releases/download/release-${version}-stable/libevent-${version}-stable.tar.gz";
sha256 = "18qz9qfwrkakmazdlwxvjmw8p76g70n3faikwvdwznns1agw9hki";
};
postPatch = "patchShebangs event_rpcgen.py";
outputs = [ "out" "dev" ];
outputBin = "dev";
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ openssl python ] ++ stdenv.lib.optional stdenv.isCygwin findutils;
buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isCygwin findutils;
meta = with stdenv.lib; {
description = "Event notification library";
longDescription = ''
The libevent API provides a mechanism to execute a callback function
when a specific event occurs on a file descriptor or after a timeout
has been reached. Furthermore, libevent also support callbacks due
to signals or regular timeouts.
longDescription =
'' The libevent API provides a mechanism to execute a callback function
when a specific event occurs on a file descriptor or after a timeout
has been reached. Furthermore, libevent also support callbacks due
to signals or regular timeouts.
libevent is meant to replace the event loop found in event driven
network servers. An application just needs to call event_dispatch()
and then add or remove events dynamically without having to change
the event loop.
'';
libevent is meant to replace the event loop found in event driven
network servers. An application just needs to call event_dispatch()
and then add or remove events dynamically without having to change
the event loop.
'';
homepage = http://libevent.org/;
license = licenses.bsd3;
platforms = platforms.all;
maintainers = with maintainers; [ wkennington ];

View File

@@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, gnum4 }:
let
ver_maj = "2.8"; # odd major numbers are unstable
ver_maj = "2.10"; # odd major numbers are unstable
ver_min = "0";
in
stdenv.mkDerivation rec {
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/libsigc++/${ver_maj}/${name}.tar.xz";
sha256 = "0lcnzzdq6718znfshs1hflpwqq6awbzwdyp4kv5lfaf54z880jbp";
sha256 = "f843d6346260bfcb4426259e314512b99e296e8ca241d771d21ac64f28298d81";
};
patches = [(fetchpatch {
url = "https://anonscm.debian.org/cgit/collab-maint/libsigc++-2.0.git/plain"

View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, systemd ? null, libobjc, IOKit }:
stdenv.mkDerivation rec {
name = "libusb-1.0.19";
name = "libusb-1.0.20";
src = fetchurl {
url = "mirror://sourceforge/libusb/${name}.tar.bz2";
sha256 = "0h38p9rxfpg9vkrbyb120i1diq57qcln82h5fr7hvy82c20jql3c";
sha256 = "1zzp6hc7r7m3gl6zjbmzn92zkih4664cckaf49l1g5hapa8721fb";
};
outputs = [ "out" "dev" ]; # get rid of propagating systemd closure

View File

@@ -1,27 +1,14 @@
{ stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs }:
stdenv.mkDerivation rec {
name = "libxslt-1.1.28";
name = "libxslt-1.1.29";
src = fetchurl {
url = "http://xmlsoft.org/sources/${name}.tar.gz";
sha256 = "13029baw9kkyjgr7q3jccw2mz38amq7mmpr5p3bh775qawd1bisz";
sha256 = "1klh81xbm9ppzgqk339097i39b7fnpmlj8lzn8bpczl3aww6x5xm";
};
patches = stdenv.lib.optional stdenv.isSunOS ./patch-ah.patch
++ stdenv.lib.optional (stdenv.cross.libc or null == "msvcrt")
(fetchpatch {
name = "mingw.patch";
url = "http://git.gnome.org/browse/libxslt/patch/?id=ab5810bf27cd63";
sha256 = "0kkqq3fv2k3q86al38vp6zwxazpvp5kslcjnmrq4ax5cm2zvsjk3";
})
++ [
(fetchpatch {
name = "CVE-2015-7995.patch";
url = "http://git.gnome.org/browse/libxslt/patch/?id=7ca19df892ca22";
sha256 = "1xzg0q94dzbih9nvqp7g9ihz0a3qb0w23l1158m360z9smbi8zbd";
})
];
patches = stdenv.lib.optional stdenv.isSunOS ./patch-ah.patch;
outputs = [ "bin" "dev" "out" "doc" ];

View File

@@ -26,7 +26,7 @@ if ! lists.elem stdenv.system platforms.mesaPlatforms then
else
let
version = "12.0.2";
version = "12.0.3";
branch = head (splitString "." version);
driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";
in
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
"https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
];
sha256 = "d957a5cc371dcd7ff2aa0d87492f263aece46f79352f4520039b58b1f32552cb";
sha256 = "1dc86dd9b51272eee1fad3df65e18cda2e556ef1bc0b6e07cd750b9757f493b1";
};
prePatch = "patchShebangs .";

View File

@@ -1,10 +1,10 @@
{ callPackage, fetchurl, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "3.1.1";
version = "3.2";
src = fetchurl {
url = "mirror://gnu/nettle/nettle-${version}.tar.gz";
sha256 = "0k1x57zviysvi91lkk66cg8v819vywm5g5yqs22wppfqcifx5m2z";
sha256 = "15wxhk52yc62rx0pddmry66hqm6z5brrrkx4npd3wh9nybg86hpa";
};
})

View File

@@ -7,12 +7,12 @@
stdenv.mkDerivation rec {
name = "nghttp2-${version}";
version = "1.10.0";
version = "1.14.1";
# Don't use fetchFromGitHub since this needs a bootstrap curl
src = fetchurl {
url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2";
sha256 = "1m95j3lhxp6k16aa2m03rsky13nmj8ky1kk96cwl88vbsrliz4mh";
sha256 = "0d7sk3pfkajhkmcqa7zx4rjg1pkwqraxxs7bxbwbm67r8wwqw87j";
};
# Configure script searches for a symbol which does not exist in jemalloc on Darwin

View File

@@ -1,18 +0,0 @@
Index: pcre_compile.c
===================================================================
--- a/pcre_compile.c (revision 1635)
+++ b/pcre_compile.c (revision 1636)
@@ -7311,7 +7311,12 @@
so far in order to get the number. If the name is not found, leave
the value of recno as 0 for a forward reference. */
- else
+ /* This patch (removing "else") fixes a problem when a reference is
+ to multiple identically named nested groups from within the nest.
+ Once again, it is not the "proper" fix, and it results in an
+ over-allocation of memory. */
+
+ /* else */
{
ng = cd->named_groups;
for (i = 0; i < cd->names_found; i++, ng++)

View File

@@ -7,7 +7,7 @@ with stdenv.lib;
assert elem variant [ null "cpp" "pcre16" "pcre32" ];
let
version = "8.38";
version = "8.39";
pname = if (variant == null) then "pcre"
else if (variant == "cpp") then "pcre-cpp"
else variant;
@@ -17,13 +17,9 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${version}.tar.bz2";
sha256 = "1pvra19ljkr5ky35y2iywjnsckrs9ch2anrf5b0dc91hw8v2vq5r";
sha256 = "12wyajlqx2v7dsh39ra9v9m5hibjkrl129q90bp32c28haghjn5q";
};
patches = [
./CVE-2016-1283.patch
];
outputs = [ "bin" "dev" "out" "doc" "man" ];
configureFlags = [

View File

@@ -7,7 +7,7 @@
, openssl, dbus, glib, udev, libxml2, libxslt, pcre16
, zlib, libjpeg, libpng, libtiff, sqlite, icu
, coreutils, bison, flex, gdb, gperf, lndir, ruby
, coreutils, bison, flex, gdb, gperf, lndir
, patchelf, perl, pkgconfig, python
# optional dependencies
@@ -205,7 +205,7 @@ stdenv.mkDerivation {
++ lib.optional mesaSupported mesa;
buildInputs =
[ bison flex gperf ruby ]
[ bison flex gperf ]
++ lib.optional developerBuild gdb
++ lib.optional (cups != null) cups
++ lib.optional (mysql != null) mysql.lib
@@ -256,7 +256,7 @@ stdenv.mkDerivation {
postFixup =
''
# Don't retain build-time dependencies like gdb and ruby.
# Don't retain build-time dependencies like gdb.
sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri
# Move libtool archives and qmake projects

View File

@@ -7,7 +7,7 @@
, openssl, dbus, glib, udev, libxml2, libxslt, pcre16
, zlib, libjpeg, libpng, libtiff, sqlite, icu
, coreutils, bison, flex, gdb, gperf, lndir, ruby
, coreutils, bison, flex, gdb, gperf, lndir
, patchelf, perl, pkgconfig, python
# optional dependencies
@@ -180,7 +180,7 @@ stdenv.mkDerivation {
++ lib.optional mesaSupported mesa;
buildInputs =
[ bison flex gperf ruby ]
[ bison flex gperf ]
++ lib.optional developerBuild gdb
++ lib.optional (cups != null) cups
++ lib.optional (mysql != null) mysql.lib
@@ -213,7 +213,7 @@ stdenv.mkDerivation {
postFixup =
''
# Don't retain build-time dependencies like gdb and ruby.
# Don't retain build-time dependencies like gdb.
sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri
# Move libtool archives and qmake projects

View File

@@ -189,7 +189,7 @@ stdenv.mkDerivation {
++ lib.optional (postgresql != null) postgresql;
nativeBuildInputs =
[ bison flex gperf lndir patchelf perl pkgconfig python ruby ];
[ bison flex gperf lndir patchelf perl pkgconfig python ];
# freetype-2.5.4 changed signedness of some struct fields
NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare";
@@ -216,7 +216,7 @@ stdenv.mkDerivation {
postFixup =
''
# Don't retain build-time dependencies like gdb and ruby.
# Don't retain build-time dependencies like gdb.
sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri
# Move libtool archives and qmake projects

View File

@@ -0,0 +1,66 @@
{ fetchurl, stdenv, ncurses }:
stdenv.mkDerivation rec {
name = "readline-${version}";
version = "7.0p0";
src = fetchurl {
url = "mirror://gnu/readline/readline-${meta.branch}.tar.gz";
sha256 = "0d13sg9ksf982rrrmv5mb6a2p4ys9rvg9r71d6il0vr8hmql63bm";
};
outputs = [ "out" "dev" "doc" ];
propagatedBuildInputs = [ncurses];
patchFlags = "-p0";
patches =
[ ./link-against-ncurses.patch
./no-arch_only-6.3.patch
]
;
/*
++
(let
patch = nr: sha256:
fetchurl {
url = "mirror://gnu/readline/readline-${meta.branch}-patches/readline70-${nr}";
inherit sha256;
};
in
import ./readline-7.0-patches.nix patch);
*/
# Don't run the native `strip' when cross-compiling.
dontStrip = stdenv ? cross;
bash_cv_func_sigsetjmp = if stdenv.isCygwin then "missing" else null;
meta = with stdenv.lib; {
description = "Library for interactive line editing";
longDescription = ''
The GNU Readline library provides a set of functions for use by
applications that allow users to edit command lines as they are
typed in. Both Emacs and vi editing modes are available. The
Readline library includes additional functions to maintain a
list of previously-entered command lines, to recall and perhaps
reedit those lines, and perform csh-like history expansion on
previous commands.
The history facilities are also placed into a separate library,
the History library, as part of the build process. The History
library may be used without Readline in applications which
desire its capabilities.
'';
homepage = http://savannah.gnu.org/projects/readline/;
license = licenses.gpl3Plus;
maintainers = [ ];
platforms = platforms.unix;
branch = "7.0";
};
}

View File

@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
'';
# keep man3
outputDocdev = "out";
outputDevdoc = "out";
meta = with stdenv.lib; {
homepage = http://www.corpit.ru/mjt/udns.html;