Merge branch 'staging'
A security update of libxml2 is within.
This commit is contained in:
Vladimír Čunát
commit
432dba859e
@ -1,5 +0,0 @@
|
||||
<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
|
||||
"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
|
||||
<busconfig>
|
||||
@extra@
|
||||
</busconfig>
|
||||
@ -1,6 +0,0 @@
|
||||
<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
|
||||
"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
|
||||
<busconfig>
|
||||
<servicehelper>@servicehelper@</servicehelper>
|
||||
@extra@
|
||||
</busconfig>
|
||||
@ -10,32 +10,10 @@ let
|
||||
|
||||
homeDir = "/run/dbus";
|
||||
|
||||
systemExtraxml = concatStrings (flip concatMap cfg.packages (d: [
|
||||
"<servicedir>${d}/share/dbus-1/system-services</servicedir>"
|
||||
"<includedir>${d}/etc/dbus-1/system.d</includedir>"
|
||||
]));
|
||||
|
||||
sessionExtraxml = concatStrings (flip concatMap cfg.packages (d: [
|
||||
"<servicedir>${d}/share/dbus-1/services</servicedir>"
|
||||
"<includedir>${d}/etc/dbus-1/session.d</includedir>"
|
||||
]));
|
||||
|
||||
configDir = pkgs.runCommand "dbus-conf"
|
||||
{ preferLocalBuild = true;
|
||||
allowSubstitutes = false;
|
||||
}
|
||||
''
|
||||
mkdir -p $out
|
||||
|
||||
sed '${./dbus-system-local.conf.in}' \
|
||||
-e 's,@servicehelper@,${config.security.wrapperDir}/dbus-daemon-launch-helper,g' \
|
||||
-e 's,@extra@,${systemExtraxml},' \
|
||||
> "$out/system-local.conf"
|
||||
|
||||
sed '${./dbus-session-local.conf.in}' \
|
||||
-e 's,@extra@,${sessionExtraxml},' \
|
||||
> "$out/session-local.conf"
|
||||
'';
|
||||
configDir = pkgs.makeDBusConf {
|
||||
suidHelper = "${config.security.wrapperDir}/dbus-daemon-launch-helper";
|
||||
serviceDirectories = cfg.packages;
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
|
||||
@ -192,6 +192,7 @@ runCommand "${pName}" {
|
||||
homepage = http://www.digikam.org;
|
||||
maintainers = with stdenv.lib.maintainers; [ /*jraygauthier*/ ];
|
||||
inherit (kdelibs.meta) platforms;
|
||||
broken = true;
|
||||
};
|
||||
|
||||
} ''
|
||||
|
||||
@ -86,7 +86,7 @@ in stdenv.mkDerivation rec {
|
||||
];
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
enableParallelBuilding = false; # subsurfacewebservices.h dependency on ui_webservices.h
|
||||
|
||||
cmakeFlags = [
|
||||
"-DMARBLE_LIBRARIES=${libmarble}/lib/libssrfmarblewidget.so"
|
||||
|
||||
@ -1,86 +0,0 @@
|
||||
{ stdenv, fetchurl, libyaml, alsaLib, openssl, libuuid, pkgconfig, libpulseaudio, libsamplerate
|
||||
, commoncpp2, ccrtp, libzrtpcpp, dbus, dbus_cplusplus, expat, pcre, gsm, speex, ilbc, libopus
|
||||
, autoconf, automake, libtool, gettext, perl
|
||||
, cmake, qt4
|
||||
, gtk, glib, dbus_glib, libnotify, intltool, makeWrapper }:
|
||||
|
||||
let
|
||||
name = "sflphone-1.2.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://projects.savoirfairelinux.com/attachments/download/6423/${name}.tar.gz";
|
||||
sha256 = "0aiwlky7mp5l51a7kkhkmaz7ivapypar291kdxzdxl1s3qy0x6fd";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = http://sflphone.org/;
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
description = "Free software enterprise-class softphone for GNU/Linux";
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
};
|
||||
|
||||
in
|
||||
rec {
|
||||
daemon = stdenv.mkDerivation {
|
||||
name = name + "-daemon";
|
||||
|
||||
inherit src;
|
||||
|
||||
patches = [ ./libzrtpcpp-cflags.patch ];
|
||||
|
||||
preConfigure = ''
|
||||
cd daemon
|
||||
|
||||
# Post patch, required
|
||||
autoreconf -vfi
|
||||
|
||||
cd libs
|
||||
bash ./compile_pjsip.sh
|
||||
cd ..
|
||||
'';
|
||||
|
||||
configureFlags = "--with-expat --with-expat-inc=${expat.dev}/include " +
|
||||
"--with-expat-lib=-lexpat --with-opus ";
|
||||
|
||||
buildInputs = [ libyaml alsaLib openssl libuuid pkgconfig libpulseaudio libsamplerate
|
||||
commoncpp2 ccrtp libzrtpcpp dbus dbus_cplusplus expat pcre gsm speex ilbc libopus
|
||||
autoconf automake libtool gettext perl ];
|
||||
};
|
||||
|
||||
# This fails still.
|
||||
# I don't know the best way to make this a KDE program (with switchable kde
|
||||
# libs, like digikam for example)
|
||||
/*
|
||||
kde = stdenv.mkDerivation {
|
||||
name = name + "-kde";
|
||||
|
||||
inherit src;
|
||||
|
||||
preConfigure = ''
|
||||
cd kde
|
||||
'';
|
||||
|
||||
buildInputs = [ daemon cmake qt4 pkgconfig ];
|
||||
};
|
||||
*/
|
||||
|
||||
gnome = stdenv.mkDerivation {
|
||||
name = name + "-gnome";
|
||||
|
||||
inherit src;
|
||||
|
||||
preConfigure = ''
|
||||
cd gnome
|
||||
'';
|
||||
|
||||
# gtk3 programs have the runtime dependency on XDG_DATA_DIRS
|
||||
preFixup = ''
|
||||
for f in "$out/bin/sflphone" "$out/bin/sflphone-client-gnome"; do
|
||||
wrapProgram $f --prefix XDG_DATA_DIRS ":" "${gtk.out}/share:$GSETTINGS_SCHEMAS_PATH"
|
||||
done
|
||||
'';
|
||||
|
||||
buildInputs = [ daemon pkgconfig gtk glib dbus_glib libnotify intltool makeWrapper ];
|
||||
};
|
||||
}
|
||||
@ -1,15 +0,0 @@
|
||||
diff --git a/daemon/src/audio/audiortp/Makefile.am b/daemon/src/audio/audiortp/Makefile.am
|
||||
index c27eedd..fe64077 100644
|
||||
--- a/daemon/src/audio/audiortp/Makefile.am
|
||||
+++ b/daemon/src/audio/audiortp/Makefile.am
|
||||
@@ -4,6 +4,10 @@ noinst_LTLIBRARIES = libaudiortp.la
|
||||
|
||||
if BUILD_ZRTP
|
||||
SFL_ZRTP_SRC=audio_zrtp_session.h audio_zrtp_session.cpp zrtp_session_callback.cpp zrtp_session_callback.h
|
||||
+libaudiortp_la_CXXFLAGS = \
|
||||
+ @CCGNU2_CFLAGS@ \
|
||||
+ @ZRTPCPP_CFLAGS@ \
|
||||
+ @CCRTP_CFLAGS@
|
||||
endif
|
||||
|
||||
libaudiortp_la_SOURCES = \
|
||||
@ -1,17 +0,0 @@
|
||||
Index: twinkle-1.4.2/configure.in
|
||||
===================================================================
|
||||
--- twinkle-1.4.2.orig/configure.in 2013-07-25 11:07:54.160534950 -0400
|
||||
+++ twinkle-1.4.2/configure.in 2013-07-25 11:07:59.000000000 -0400
|
||||
@@ -294,7 +294,11 @@
|
||||
AC_CHECK_LIB(boost_regex-gcc, main, [
|
||||
LIBS="-lboost_regex-gcc $LIBS"
|
||||
echo "LIBS += -lboost_regex-gcc" >> $QT_INCL_PRO],
|
||||
- [AC_MSG_ERROR([libboost_regex library is missing (boost package).])])])
|
||||
+ [
|
||||
+ AC_CHECK_LIB(boost_regex, main, [
|
||||
+ LIBS="-lboost_regex $LIBS"
|
||||
+ echo "LIBS += -lboost_regex" >> $QT_INCL_PRO],
|
||||
+ [AC_MSG_ERROR([libboost_regex library is missing (boost package).])])])])
|
||||
|
||||
ms_CHECK_LRELEASE()
|
||||
|
||||
@ -1,40 +0,0 @@
|
||||
{ stdenv, fetchurl, pkgconfig, autoreconfHook, commoncpp2, ccrtp, openssl, boost
|
||||
, libsndfile, libxml2, libjpeg, readline, qt3, perl, file
|
||||
, alsaLib, speex, libzrtpcpp, xorg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "twinkle-1.4.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.xs4all.nl/~mfnboer/twinkle/download/${name}.tar.gz";
|
||||
sha256 = "19c9gqam78srsgv0463g7lfnv4mn5lvbxx3zl87bnm0vmk3qcxl0";
|
||||
};
|
||||
|
||||
patches = [ # all from Debian
|
||||
./newer-libccrtp.diff
|
||||
./libgsm.patch
|
||||
./localetime_r_conflict.diff
|
||||
./boost_regex.patch # modified not to use "-mt" suffix
|
||||
];
|
||||
|
||||
configureFlags = "--with-extra-includes=${libjpeg.dev}/include";
|
||||
|
||||
buildInputs =
|
||||
[ pkgconfig autoreconfHook commoncpp2 openssl boost libsndfile
|
||||
libxml2 libjpeg readline qt3 perl file ccrtp
|
||||
# optional ? :
|
||||
alsaLib speex
|
||||
libzrtpcpp xorg.libX11 xorg.libXaw xorg.libICE xorg.libXext
|
||||
];
|
||||
|
||||
NIX_CFLAGS_LINK = "-Wl,--as-needed -lboost_regex -lasound -lzrtpcpp -lspeex -lspeexdsp";
|
||||
|
||||
#enableParallelBuilding = true; # fatal error: messageform.h: No such file or directory
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://www.twinklephone.com/;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = [ maintainers.marcweber ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -1,70 +0,0 @@
|
||||
Index: twinkle-1.4.2/configure.in
|
||||
===================================================================
|
||||
--- twinkle-1.4.2.orig/configure.in 2013-07-25 11:07:54.264533206 -0400
|
||||
+++ twinkle-1.4.2/configure.in 2013-07-25 11:07:54.256533340 -0400
|
||||
@@ -195,22 +195,33 @@
|
||||
|
||||
# This check does not work on all platforms
|
||||
# Check if libgsm is available
|
||||
-# AC_CHECK_LIB(gsm, sf_open, [
|
||||
-# AC_CHECK_HEADER(gsm.h, [],
|
||||
-# [AC_MSG_ERROR([gsm header files missing (gsm.h)])])
|
||||
-# AC_DEFINE(HAVE_GSM, 1, [Define to 1 if you have the <libgsm> library.])
|
||||
-# GSM_LIBS="-lgsm"
|
||||
-# echo "LIBS += -lgsm" >> $QT_INCL_PRO
|
||||
-# have_gsm="yes" ], [
|
||||
-# have_gsm="no"
|
||||
-# GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a"
|
||||
-# echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO ])
|
||||
-have_gsm="no"
|
||||
-GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a"
|
||||
-echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO
|
||||
+AC_CHECK_LIB(gsm, sf_open, [
|
||||
+ AC_CHECK_HEADER(gsm.h, [],
|
||||
+ [AC_MSG_ERROR([gsm header files missing (gsm.h)])])
|
||||
+ AC_DEFINE(HAVE_GSM, 1, [Define to 1 if you have the <libgsm> library.])
|
||||
+ GSM_LIBS="-lgsm"
|
||||
+ echo "LIBS += -lgsm" >> $QT_INCL_PRO
|
||||
+ have_gsm="yes" ], [
|
||||
+ have_gsm="no"
|
||||
+ GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a"
|
||||
+ echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO ])
|
||||
+#have_gsm="no"
|
||||
+#GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a"
|
||||
+#echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO
|
||||
|
||||
AC_SUBST(GSM_LIBS)
|
||||
|
||||
+# Check if libgsm is available
|
||||
+AC_CHECK_LIB(gsm, sf_open, [
|
||||
+ AC_CHECK_HEADER(gsm.h, [],
|
||||
+ [AC_MSG_ERROR([gsm header files missing (gsm.h)])])
|
||||
+ AC_DEFINE(HAVE_GSM, 1, [Define to 1 if you have the <libgsm> library.])
|
||||
+ LIBS="-lgsm $LIBS"
|
||||
+ echo "LIBS += -lgsm" >> $QT_INCL_PRO
|
||||
+ have_gsm="yes" ], [
|
||||
+ have_gsm="no"
|
||||
+ echo "$(top_builddir)/src/audio/gsm/libgsm.a" >> $QT_INCL_PRO ])
|
||||
+
|
||||
# Check if ALSA is available
|
||||
AC_CHECK_LIB(asound, main, [
|
||||
AC_CHECK_HEADER(alsa/asoundlib.h, [],
|
||||
@@ -348,3 +359,4 @@
|
||||
AC_MSG_RESULT([Speex: $have_speex])
|
||||
AC_MSG_RESULT([iLBC: $have_ilbc])
|
||||
AC_MSG_RESULT([ZRTP: $have_zrtp])
|
||||
+AC_MSG_RESULT([Libgsm dynamic link: $have_gsm])
|
||||
Index: twinkle-1.4.2/src/twinkle_config.h.in
|
||||
===================================================================
|
||||
--- twinkle-1.4.2.orig/src/twinkle_config.h.in 2013-07-25 11:07:54.264533206 -0400
|
||||
+++ twinkle-1.4.2/src/twinkle_config.h.in 2013-07-25 11:07:54.256533340 -0400
|
||||
@@ -19,6 +19,9 @@
|
||||
/* Define to 1 if you have the <history.h> header file. */
|
||||
#undef HAVE_HISTORY_H
|
||||
|
||||
+/* Define to 1 if you have the <libgsm> library. */
|
||||
+#undef HAVE_GSM
|
||||
+
|
||||
/* Define to 1 if you have the <ilbc> library. */
|
||||
#undef HAVE_ILBC
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
Index: twinkle-1.4.2/src/log.cpp
|
||||
===================================================================
|
||||
--- twinkle-1.4.2.orig/src/log.cpp 2009-01-18 09:35:28.000000000 -0500
|
||||
+++ twinkle-1.4.2/src/log.cpp 2013-07-25 11:43:08.901209713 -0400
|
||||
@@ -161,7 +161,7 @@
|
||||
|
||||
gettimeofday(&t, NULL);
|
||||
date = t.tv_sec;
|
||||
- localtime_r(&date, &tm);
|
||||
+ ost::localtime_r(&date, &tm);
|
||||
|
||||
*log_stream << "+++ ";
|
||||
*log_stream << tm.tm_mday;
|
||||
@ -1,22 +0,0 @@
|
||||
Index: twinkle-1.4.2/configure.in
|
||||
===================================================================
|
||||
--- twinkle-1.4.2.orig/configure.in 2013-07-25 11:09:16.000000000 -0400
|
||||
+++ twinkle-1.4.2/configure.in 2013-07-25 11:11:59.512418187 -0400
|
||||
@@ -66,7 +66,7 @@
|
||||
|
||||
export PKG_CONFIG_PATH
|
||||
|
||||
-PKG_CHECK_MODULES(CCRTP, libccrtp1 >= 1.6.0)
|
||||
+PKG_CHECK_MODULES(CCRTP, libccrtp >= 1.6.0)
|
||||
|
||||
PKG_CHECK_MODULES(XML2, libxml-2.0)
|
||||
# AC_CHECK_HEADER(libxml/tree.h, [],
|
||||
@@ -136,7 +136,7 @@
|
||||
#echo "INCLUDEPATH += `$CCGNU2_CONFIG --includes`" | sed -e s/-I//g > $QT_INCL_PRO
|
||||
# libccrtp1(ccrtp) depend from libccgnu2(commoncpp2) and
|
||||
# should include above flags !
|
||||
-echo "INCLUDEPATH += `$PKG_CONFIG --cflags-only-I libccrtp1`" | sed -e s/-I//g >> $QT_INCL_PRO
|
||||
+echo "INCLUDEPATH += `$PKG_CONFIG --cflags-only-I libccrtp`" | sed -e s/-I//g >> $QT_INCL_PRO
|
||||
echo "INCLUDEPATH += `$PKG_CONFIG --cflags-only-I libxml-2.0`" | sed -e s/-I//g >> $QT_INCL_PRO
|
||||
|
||||
# get libraries specified on command line
|
||||
@ -1,11 +1,14 @@
|
||||
{ stdenv, fetchurl, openssl, lua, pcre }:
|
||||
{ stdenv, fetchFromGitHub, openssl, lua, pcre }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "imapfilter-2.6.3";
|
||||
name = "imapfilter-${version}";
|
||||
version = "2.6.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lefcha/imapfilter/archive/v2.6.3.tar.gz";
|
||||
sha256 = "0i6j9ilzh43b9gyqs3y3rv0d9yvbbg12gcbqbar9i92wdlnqcx0i";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lefcha";
|
||||
repo = "imapfilter";
|
||||
rev = "v${version}";
|
||||
sha256 = "1011pbgbaz43kmxcc5alv06jly9wqmqgr0b64cm5i1md727v3rzc";
|
||||
};
|
||||
|
||||
makeFlagsArray = "PREFIX=$(out)";
|
||||
|
||||
@ -11,7 +11,7 @@ in stdenv.mkDerivation {
|
||||
inherit name;
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://kde-apps.org/CONTENT/content-files/114385-${name}.tar.gz";
|
||||
url = "https://dl.opendesktop.org/api/files/download/id/1466631747/114385-${name}.tar.gz";
|
||||
sha256 = "10a9asjv6ja1xdjli2399dyka2rbia3qdm5bdpmcng6xdsbhx3ap";
|
||||
};
|
||||
|
||||
@ -34,5 +34,6 @@ in stdenv.mkDerivation {
|
||||
|
||||
meta = {
|
||||
description = "Binary news reader of KDE";
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,15 +2,15 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "umurmur-${version}";
|
||||
version = "0.2.16";
|
||||
|
||||
version = "0.2.16a";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fatbob313";
|
||||
repo = "umurmur";
|
||||
rev = version;
|
||||
sha256 = "0njvdqvjda13v1a2yyjn47mb0l0cdfb2bfvb5s13wpgwy2xxk0px";
|
||||
sha256 = "1xv1knrivy2i0ggwrczw60y0ayww9df9k6sif7klgzq556xk47d1";
|
||||
};
|
||||
|
||||
|
||||
buildInputs = [ autoreconfHook openssl protobufc libconfig ];
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@ -24,6 +24,7 @@ stdenv.mkDerivation {
|
||||
description = "MPlayer front-end for KDE";
|
||||
license = "GPL";
|
||||
homepage = http://kmplayer.kde.org;
|
||||
broken = true; # Also unavailable on this mirror
|
||||
maintainers = [ stdenv.lib.maintainers.sander ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
for desktopFile in $(grep -rl "Exec=gnome-session" $out/share)
|
||||
do
|
||||
echo "Patching gnome-session path in: $desktopFile"
|
||||
sed -i "s,^Exec=gnome-session,Exec=$out/bin/gnome-session --debug," $desktopFile
|
||||
sed -i "s,^Exec=gnome-session,Exec=$out/bin/gnome-session," $desktopFile
|
||||
done
|
||||
wrapProgram "$out/bin/gnome-session" \
|
||||
--prefix PATH : "${glib.dev}/bin" \
|
||||
|
||||
@ -1 +1 @@
|
||||
WGET_ARGS=( http://download.kde.org/stable/applications/16.12.1/ -A '*.tar.xz' )
|
||||
WGET_ARGS=( http://download.kde.org/stable/applications/16.12.2/ -A '*.tar.xz' )
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,11 +1,20 @@
|
||||
{ plasmaPackage, ecm, kdoctools, kcmutils
|
||||
, kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kio, kxmlgui
|
||||
, plasma-framework, plasma-workspace, qtx11extras
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
plasmaPackage {
|
||||
name = "khotkeys";
|
||||
nativeBuildInputs = [ ecm kdoctools ];
|
||||
|
||||
patches = [
|
||||
# Patch is in 5.9 and up.
|
||||
(fetchpatch {
|
||||
url = "https://cgit.kde.org/khotkeys.git/patch/?id=f8f7eaaf41e2b95ebfa4b2e35c6ee252524a471b";
|
||||
sha256 = "1wxx3qv16jd623jh728xcda8i4y1daq25skwilhv4cfvqxyzk7nn";
|
||||
})
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
kdelibs4support kglobalaccel ki18n kio plasma-framework plasma-workspace
|
||||
qtx11extras kcmutils kdbusaddons kxmlgui
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ fetchurl, stdenv, guile, ncurses, libffi }:
|
||||
{ fetchurl, stdenv, pkgconfig, guile, ncurses, libffi }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "guile-ncurses-1.7";
|
||||
@ -8,6 +8,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "153vv75gb7l62sp3666rc97i63rnaqbx2rjar7d9b5w81fhwv4r5";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ guile ncurses libffi ];
|
||||
|
||||
preConfigure =
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, guile, buildEnv
|
||||
{ stdenv, fetchurl, pkgconfig, guile, buildEnv
|
||||
, SDL, SDL_image, SDL_ttf, SDL_mixer
|
||||
}:
|
||||
|
||||
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "126n4rd0ydh6i2s11ari5k85iivradlf12zq13b34shf9k1wn5am";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ guile ];
|
||||
nativeBuildInputs = [ pkgconfig guile ];
|
||||
|
||||
buildInputs = [
|
||||
SDL.dev SDL_image SDL_ttf SDL_mixer
|
||||
|
||||
@ -32,6 +32,7 @@
|
||||
, jailbreak ? false
|
||||
, license
|
||||
, maintainers ? []
|
||||
, doCoverage ? false
|
||||
# TODO Do we care about haddock when cross-compiling?
|
||||
, doHaddock ? !isCross && (!stdenv.isDarwin || stdenv.lib.versionAtLeast ghc.version "7.8")
|
||||
, passthru ? {}
|
||||
@ -59,7 +60,7 @@ assert enableSplitObjs == null;
|
||||
|
||||
let
|
||||
|
||||
inherit (stdenv.lib) optional optionals optionalString versionOlder
|
||||
inherit (stdenv.lib) optional optionals optionalString versionOlder versionAtLeast
|
||||
concatStringsSep enableFeature optionalAttrs toUpper;
|
||||
|
||||
isGhcjs = ghc.isGhcjs or false;
|
||||
@ -111,10 +112,11 @@ let
|
||||
(optionalString (enableSharedExecutables && stdenv.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names")
|
||||
(optionalString enableParallelBuilding "--ghc-option=-j$NIX_BUILD_CORES")
|
||||
(optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp")
|
||||
(enableFeature (enableDeadCodeElimination && (stdenv.lib.versionAtLeast "8.0.1" ghc.version)) "split-objs")
|
||||
(enableFeature (enableDeadCodeElimination && (versionAtLeast "8.0.1" ghc.version)) "split-objs")
|
||||
(enableFeature enableLibraryProfiling "library-profiling")
|
||||
(enableFeature enableExecutableProfiling (if versionOlder ghc.version "8" then "executable-profiling" else "profiling"))
|
||||
(enableFeature enableSharedLibraries "shared")
|
||||
(optionalString (versionAtLeast ghc.version "7.10") (enableFeature doCoverage "coverage"))
|
||||
(optionalString (isGhcjs || versionOlder "7" ghc.version) (enableFeature enableStaticLibraries "library-vanilla"))
|
||||
(optionalString (isGhcjs || versionOlder "7.4" ghc.version) (enableFeature enableSharedExecutables "executable-dynamic"))
|
||||
(optionalString (isGhcjs || versionOlder "7" ghc.version) (enableFeature doCheck "tests"))
|
||||
@ -286,7 +288,7 @@ stdenv.mkDerivation ({
|
||||
local pkgId=$( ${gnused}/bin/sed -n -e 's|^id: ||p' $packageConfFile )
|
||||
mv $packageConfFile $packageConfDir/$pkgId.conf
|
||||
''}
|
||||
|
||||
${optionalString doCoverage "mkdir -p $out/share && cp -r dist/hpc $out/share"}
|
||||
${optionalString (enableSharedExecutables && isExecutable && !isGhcjs && stdenv.isDarwin && stdenv.lib.versionOlder ghc.version "7.10") ''
|
||||
for exe in "$out/bin/"* ; do
|
||||
install_name_tool -add_rpath "$out/lib/ghc-${ghc.version}/${pname}-${version}" "$exe"
|
||||
|
||||
@ -8,6 +8,9 @@ rec {
|
||||
overrideScope = scope: overrideCabal (drv.overrideScope scope) f;
|
||||
};
|
||||
|
||||
doCoverage = drv: overrideCabal drv (drv: { doCoverage = true; });
|
||||
dontCoverage = drv: overrideCabal drv (drv: { doCoverage = false; });
|
||||
|
||||
doHaddock = drv: overrideCabal drv (drv: { doHaddock = true; });
|
||||
dontHaddock = drv: overrideCabal drv (drv: { doHaddock = false; });
|
||||
|
||||
|
||||
@ -11,6 +11,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
patches = [ ./cpp-4.5.patch ];
|
||||
|
||||
outputs = [ "out" "dev" "info" ];
|
||||
setOutputFlags = false; # $dev gets into the library otherwise
|
||||
|
||||
# GCC 4.6 raises a number of set-but-unused warnings.
|
||||
configureFlags = [ "--disable-error-on-warning" ];
|
||||
|
||||
|
||||
@ -14,6 +14,9 @@
|
||||
sha256 = "12yqkr974y91ylgw6jnmci2v90i90s7h9vxa4zk0sai8vjnz4i1p";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "info" ];
|
||||
setOutputFlags = false; # $dev gets into the library otherwise
|
||||
|
||||
nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
|
||||
buildInputs = [ readline libtool libunistring libffi ];
|
||||
propagatedBuildInputs = [ gmp boehmgc ]
|
||||
@ -46,7 +49,21 @@
|
||||
# don't have "libgcc_s.so.1" on darwin
|
||||
LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
|
||||
|
||||
configureFlags = [ "--with-libreadline-prefix" ];
|
||||
configureFlags = [ "--with-libreadline-prefix" ]
|
||||
++ stdenv.lib.optionals stdenv.isSunOS [
|
||||
# Make sure the right <gmp.h> is found, and not the incompatible
|
||||
# /usr/include/mp.h from OpenSolaris. See
|
||||
# <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html>
|
||||
# for details.
|
||||
"--with-libgmp-prefix=${gmp.dev}"
|
||||
|
||||
# Same for these (?).
|
||||
"--with-libreadline-prefix=${readline.dev}"
|
||||
"--with-libunistring-prefix=${libunistring}"
|
||||
|
||||
# See below.
|
||||
"--without-threads"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"
|
||||
@ -55,9 +72,11 @@
|
||||
# why `--with-libunistring-prefix' and similar options coming from
|
||||
# `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64.
|
||||
sed -i "$out/lib/pkgconfig/guile-2.0.pc" \
|
||||
-e 's|-lunistring|-L${libunistring}/lib -lunistring|g ;
|
||||
-e "s|-lunistring|-L${libunistring}/lib -lunistring|g ;
|
||||
s|^Cflags:\(.*\)$|Cflags: -I${libunistring}/include \1|g ;
|
||||
s|-lltdl|-L${libtool.lib}/lib -lltdl|g'
|
||||
s|-lltdl|-L${libtool.lib}/lib -lltdl|g ;
|
||||
s|includedir=$out|includedir=$dev|g
|
||||
"
|
||||
'';
|
||||
|
||||
# make check doesn't work on darwin
|
||||
@ -92,27 +111,6 @@
|
||||
processing.
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
||||
//
|
||||
|
||||
(stdenv.lib.optionalAttrs stdenv.isSunOS {
|
||||
# TODO: Move me above.
|
||||
configureFlags =
|
||||
[
|
||||
# Make sure the right <gmp.h> is found, and not the incompatible
|
||||
# /usr/include/mp.h from OpenSolaris. See
|
||||
# <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html>
|
||||
# for details.
|
||||
"--with-libgmp-prefix=${gmp.dev}"
|
||||
|
||||
# Same for these (?).
|
||||
"--with-libreadline-prefix=${readline.dev}"
|
||||
"--with-libunistring-prefix=${libunistring}"
|
||||
|
||||
# See below.
|
||||
"--without-threads"
|
||||
];
|
||||
})
|
||||
|
||||
//
|
||||
@ -121,4 +119,4 @@
|
||||
# Work around <http://bugs.gnu.org/14201>.
|
||||
SHELL = "/bin/sh";
|
||||
CONFIG_SHELL = "/bin/sh";
|
||||
}))
|
||||
})
|
||||
|
||||
@ -15,11 +15,9 @@ let
|
||||
version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
|
||||
libPrefix = "pypy${majorVersion}";
|
||||
|
||||
pypy = stdenv.mkDerivation rec {
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "pypy-${version}";
|
||||
pythonVersion = "2.7";
|
||||
|
||||
inherit majorVersion version;
|
||||
inherit majorVersion version pythonVersion;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://bitbucket.org/pypy/pypy/get/release-pypy${pythonVersion}-v${version}.tar.bz2";
|
||||
@ -146,6 +144,4 @@ let
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ domenkozar ];
|
||||
};
|
||||
};
|
||||
|
||||
in pypy
|
||||
}
|
||||
|
||||
@ -1,29 +1,20 @@
|
||||
{ stdenv, fetchgit, zlib, curl, expat, fuse, openssl
|
||||
, autoconf, automake, libtool, python
|
||||
{ stdenv, fetchFromGitHub, zlib, curl, expat, fuse, openssl
|
||||
, autoreconfHook, python
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.7.6";
|
||||
version = "3.7.15";
|
||||
name = "afflib-${version}";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/sshock/AFFLIBv3/";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "08www22njllqz1j3jkmgn1p36sifxrjd6qlsa7ch4kqy4jaaka1k";
|
||||
name = "afflib-${version}-checkout";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sshock";
|
||||
repo = "AFFLIBv3";
|
||||
rev = "v${version}";
|
||||
sha256 = "0ckg49m15lz5cxg0k12z2ys6v4smjr6l8bbazrvsqlm649gwd2bw";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib curl expat fuse openssl
|
||||
libtool autoconf automake python
|
||||
];
|
||||
buildInputs = [ zlib curl expat fuse openssl autoreconfHook python ];
|
||||
|
||||
preConfigure = ''
|
||||
libtoolize -f
|
||||
autoheader -f
|
||||
aclocal
|
||||
automake --add-missing -c
|
||||
autoconf -f
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://afflib.sourceforge.net/;
|
||||
|
||||
@ -50,7 +50,8 @@ self = stdenv.mkDerivation {
|
||||
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
|
||||
"--with-systemduserunitdir=$(out)/etc/systemd/user"
|
||||
"--enable-user-session"
|
||||
"--libexecdir=$(out)/libexec" # we don't need dbus-daemon-launch-helper
|
||||
"--datadir=/etc"
|
||||
"--libexecdir=$(out)/libexec"
|
||||
] ++ lib.optional (!x11Support) "--without-x";
|
||||
|
||||
# Enable X11 autolaunch support in libdbus. This doesn't actually depend on X11
|
||||
@ -63,7 +64,12 @@ self = stdenv.mkDerivation {
|
||||
|
||||
doCheck = true;
|
||||
|
||||
installFlags = [ "sysconfdir=$(out)/etc" ];
|
||||
installFlags = [ "sysconfdir=$(out)/etc" "datadir=$(out)/share" ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $doc/share/xml/dbus
|
||||
cp doc/*.dtd $doc/share/xml/dbus
|
||||
'';
|
||||
|
||||
# it's executed from $lib by absolute path
|
||||
postFixup = ''
|
||||
|
||||
27
pkgs/development/libraries/dbus/make-dbus-conf.nix
Normal file
27
pkgs/development/libraries/dbus/make-dbus-conf.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ runCommand, libxslt, dbus, serviceDirectories ? [], suidHelper ? "/var/setuid-wrappers/dbus-daemon-launch-helper" }:
|
||||
|
||||
/* DBus has two configuration parsers -- normal and "trivial", which is used
|
||||
* for suid helper. Unfortunately the latter doesn't support <include>
|
||||
* directive. That means that we can't just place our configuration to
|
||||
* *-local.conf -- it needs to be in the main configuration file.
|
||||
*/
|
||||
runCommand "dbus-1"
|
||||
{
|
||||
buildInputs = [ libxslt ];
|
||||
inherit serviceDirectories suidHelper;
|
||||
}
|
||||
''
|
||||
mkdir -p $out
|
||||
|
||||
xsltproc \
|
||||
--stringparam serviceDirectories "$serviceDirectories" \
|
||||
--stringparam suidHelper "$suidHelper" \
|
||||
--path ${dbus.doc}/share/xml/dbus \
|
||||
${./make-system-conf.xsl} ${dbus}/share/dbus-1/system.conf \
|
||||
> $out/system.conf
|
||||
xsltproc \
|
||||
--stringparam serviceDirectories "$serviceDirectories" \
|
||||
--path ${dbus.doc}/share/xml/dbus \
|
||||
${./make-session-conf.xsl} ${dbus}/share/dbus-1/session.conf \
|
||||
> $out/session.conf
|
||||
''
|
||||
30
pkgs/development/libraries/dbus/make-session-conf.xsl
Normal file
30
pkgs/development/libraries/dbus/make-session-conf.xsl
Normal file
@ -0,0 +1,30 @@
|
||||
<?xml version="1.0"?>
|
||||
|
||||
<!--
|
||||
This script copies the original system.conf from the dbus
|
||||
distribution, but sets paths from $serviceDirectories parameter
|
||||
and suid helper from $suidHelper parameter.
|
||||
-->
|
||||
|
||||
<xsl:stylesheet version="1.0"
|
||||
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
|
||||
xmlns:str="http://exslt.org/strings"
|
||||
extension-element-prefixes="str"
|
||||
>
|
||||
|
||||
<xsl:output method='xml' encoding="UTF-8" doctype-system="busconfig.dtd" />
|
||||
|
||||
<xsl:param name="serviceDirectories" />
|
||||
|
||||
<xsl:template match="/busconfig">
|
||||
<busconfig>
|
||||
<xsl:copy-of select="child::node()[name() != 'include' and name() != 'standard_session_servicedirs' and name() != 'servicedir' and name() != 'includedir']" />
|
||||
|
||||
<xsl:for-each select="str:tokenize($serviceDirectories)">
|
||||
<servicedir><xsl:value-of select="." />/share/dbus-1/services</servicedir>
|
||||
<includedir><xsl:value-of select="." />/etc/dbus-1/session.d</includedir>
|
||||
</xsl:for-each>
|
||||
</busconfig>
|
||||
</xsl:template>
|
||||
|
||||
</xsl:stylesheet>
|
||||
34
pkgs/development/libraries/dbus/make-system-conf.xsl
Normal file
34
pkgs/development/libraries/dbus/make-system-conf.xsl
Normal file
@ -0,0 +1,34 @@
|
||||
<?xml version="1.0"?>
|
||||
|
||||
<!--
|
||||
This script copies the original system.conf from the dbus
|
||||
distribution, but sets paths from $serviceDirectories parameter
|
||||
and suid helper from $suidHelper parameter.
|
||||
-->
|
||||
|
||||
<xsl:stylesheet version="1.0"
|
||||
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
|
||||
xmlns:str="http://exslt.org/strings"
|
||||
extension-element-prefixes="str"
|
||||
>
|
||||
|
||||
<xsl:output method='xml' encoding="UTF-8" doctype-system="busconfig.dtd" />
|
||||
|
||||
<xsl:param name="serviceDirectories" />
|
||||
<xsl:param name="suidHelper" />
|
||||
|
||||
<xsl:template match="/busconfig">
|
||||
<busconfig>
|
||||
<xsl:copy-of select="child::node()[name() != 'include' and name() != 'standard_system_servicedirs' and name() != 'servicehelper' and name() != 'servicedir' and name() != 'includedir']" />
|
||||
|
||||
<!-- set suid helper -->
|
||||
<servicehelper><xsl:value-of select="$suidHelper" /></servicehelper>
|
||||
|
||||
<xsl:for-each select="str:tokenize($serviceDirectories)">
|
||||
<servicedir><xsl:value-of select="." />/share/dbus-1/system-services</servicedir>
|
||||
<includedir><xsl:value-of select="." />/etc/dbus-1/system.d</includedir>
|
||||
</xsl:for-each>
|
||||
</busconfig>
|
||||
</xsl:template>
|
||||
|
||||
</xsl:stylesheet>
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gsoap-${version}";
|
||||
version = "2.8.37";
|
||||
version = "2.8.42";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/gsoap2/gsoap-2.8/gsoap_${version}.zip";
|
||||
sha256 = "1nvf5hgwff1agqdzbn3qc5569jzm14qkwqws0673z6hv2l3lijx3";
|
||||
sha256 = "0fav4lhdibwggkf495pggmqna632jxkh6q2mi32b9hsn883pg5m7";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip m4 bison flex openssl zlib ];
|
||||
|
||||
@ -1 +1 @@
|
||||
WGET_ARGS=( http://download.kde.org/stable/frameworks/5.30/ -A '*.tar.xz' )
|
||||
WGET_ARGS=( http://download.kde.org/stable/frameworks/5.31/ -A '*.tar.xz' )
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
Index: kpackage-5.30.0/src/kpackage/package.cpp
|
||||
===================================================================
|
||||
--- kpackage-5.30.0.orig/src/kpackage/package.cpp
|
||||
+++ kpackage-5.30.0/src/kpackage/package.cpp
|
||||
diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp
|
||||
index 5aec9fd..b15c933 100644
|
||||
--- a/src/kpackage/package.cpp
|
||||
+++ b/src/kpackage/package.cpp
|
||||
@@ -820,7 +820,7 @@ PackagePrivate::PackagePrivate()
|
||||
: QSharedData(),
|
||||
fallbackPackage(0),
|
||||
metadata(0),
|
||||
fallbackPackage(nullptr),
|
||||
metadata(nullptr),
|
||||
- externalPaths(false),
|
||||
+ externalPaths(true),
|
||||
valid(false),
|
||||
|
||||
@ -3,595 +3,595 @@
|
||||
|
||||
{
|
||||
attica = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/attica-5.30.0.tar.xz";
|
||||
sha256 = "1v8y6dx5qcqrs1dlybmc3lx05qsra0111qf7kzlq8azljdy20i2v";
|
||||
name = "attica-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/attica-5.31.0.tar.xz";
|
||||
sha256 = "0gfqxaqvw05rdgjqs2cn5bgnmijcsl16myf919fdc75xkdpg1h56";
|
||||
name = "attica-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
baloo = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/baloo-5.30.0.tar.xz";
|
||||
sha256 = "022frn2f5mw71496r2i70q3z9diq6d5386nh8aymvii0l84c0mm9";
|
||||
name = "baloo-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/baloo-5.31.0.tar.xz";
|
||||
sha256 = "0n3cwq7g9zik3xjp895vl1j62b538rg6zcsm2x4h2nnq3njrnfbz";
|
||||
name = "baloo-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
bluez-qt = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/bluez-qt-5.30.0.tar.xz";
|
||||
sha256 = "1asf2hcljzhca9pmh42fz25nnp05xxf4yab4r13wwwdzk4ms0x6f";
|
||||
name = "bluez-qt-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/bluez-qt-5.31.0.tar.xz";
|
||||
sha256 = "12g9jc6b8f03dka5sbjf19g536y8d1xvzkrwp2m0w98zcd0q33jl";
|
||||
name = "bluez-qt-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
breeze-icons = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/breeze-icons-5.30.0.tar.xz";
|
||||
sha256 = "0n8705sly52sp4lsikr8xs671ch23ykk8xg3ksb9na700v837rak";
|
||||
name = "breeze-icons-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/breeze-icons-5.31.0.tar.xz";
|
||||
sha256 = "1ylask25jrwyk53c81jy73k9i8cylnab3a42yyrf3f25qbvhr845";
|
||||
name = "breeze-icons-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
extra-cmake-modules = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/extra-cmake-modules-5.30.0.tar.xz";
|
||||
sha256 = "0v59f76ghqckg857559sb4vla1d6pza4hj5bai8dnd712isn9abx";
|
||||
name = "extra-cmake-modules-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/extra-cmake-modules-5.31.0.tar.xz";
|
||||
sha256 = "1srdvjgn72687r48f0x32vn7q5czvk9k1w1393bcws2l0icil9w4";
|
||||
name = "extra-cmake-modules-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
frameworkintegration = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/frameworkintegration-5.30.0.tar.xz";
|
||||
sha256 = "1a9zqd96jn9p8niqz0jwclfl1np1ryszdz8q02s9cwy35zia1dfk";
|
||||
name = "frameworkintegration-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/frameworkintegration-5.31.0.tar.xz";
|
||||
sha256 = "1wfiny11fm0k6w1ly7ca7xj3f7a1mn3b1gpvlcpaqbrib6b3dgcj";
|
||||
name = "frameworkintegration-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kactivities = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kactivities-5.30.0.tar.xz";
|
||||
sha256 = "0njq8jc9vqag3h6ryjiraib44sgrd66fswnldl0w0n2kvgf948qv";
|
||||
name = "kactivities-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kactivities-5.31.0.tar.xz";
|
||||
sha256 = "1v33pkjwjjp6lrqhch7l66xyyvln1pgbs0wbgi8q9c024s92jqqz";
|
||||
name = "kactivities-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kactivities-stats = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kactivities-stats-5.30.0.tar.xz";
|
||||
sha256 = "116mcnadlqidx90hllpwkxrmhwapnvmak5rzmqngnzkdvrpicl6r";
|
||||
name = "kactivities-stats-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kactivities-stats-5.31.0.tar.xz";
|
||||
sha256 = "1ngydmby0dzf802bjszhn3qsc0vgrhc0ya511x7jc9h49mgbp2jy";
|
||||
name = "kactivities-stats-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kapidox = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kapidox-5.30.0.tar.xz";
|
||||
sha256 = "08qpbmgw8cb4ygs4m3y9529dwsyn7nrln5rkfmbfkvfjlfry7njf";
|
||||
name = "kapidox-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kapidox-5.31.0.tar.xz";
|
||||
sha256 = "1lnqcgmxdy8l0qzn2jb9kww2lg1a33izw0hy78fkm7drg67g26za";
|
||||
name = "kapidox-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
karchive = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/karchive-5.30.0.tar.xz";
|
||||
sha256 = "0f0zax2hihiq504nr3m5vap0ssmx5hvnc3rxk006zgvwgr1mvcqq";
|
||||
name = "karchive-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/karchive-5.31.0.tar.xz";
|
||||
sha256 = "1yafkgd5q9j1y3shivh5jayc4pss1skzyf3f1rmzl4psn2r6rsay";
|
||||
name = "karchive-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kauth = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kauth-5.30.0.tar.xz";
|
||||
sha256 = "0qf0wkkiaykcl79q0rsfmg7h7v342ycz9s6xr841qqs9w17dns3c";
|
||||
name = "kauth-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kauth-5.31.0.tar.xz";
|
||||
sha256 = "0y4gc3n8d36wrpdmgq2jif82lkqr3xhb7v8lgg6kgaxb1d7fi2r8";
|
||||
name = "kauth-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kbookmarks = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kbookmarks-5.30.0.tar.xz";
|
||||
sha256 = "0cibgw032n9n92fp78w04qw851lp3bfkd1rnyqvz7biypx4cz82z";
|
||||
name = "kbookmarks-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kbookmarks-5.31.0.tar.xz";
|
||||
sha256 = "0xdrx3gr291gkrfj360pw3aax0mz0zhhvjw7c4fcp35m0sqg1kvp";
|
||||
name = "kbookmarks-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kcmutils = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kcmutils-5.30.0.tar.xz";
|
||||
sha256 = "12x32jwf8gb77l5brj169ahrgdlsmn0zrzmjfp7f4dfykfnbfws9";
|
||||
name = "kcmutils-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kcmutils-5.31.0.tar.xz";
|
||||
sha256 = "00ngh556sxswrfhhy5vkfi8sk5jbb0srvx4np49xwpmh5xb6qzk9";
|
||||
name = "kcmutils-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kcodecs = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kcodecs-5.30.0.tar.xz";
|
||||
sha256 = "1via1xv4qswlyasyppi3q3a76bl5hk5ji34k63bp06p029ar7dkf";
|
||||
name = "kcodecs-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kcodecs-5.31.0.tar.xz";
|
||||
sha256 = "1nyn4b61ymbxv1xnbq3z79dbvapsy6jg51w52l0gnqkiy2zlbz13";
|
||||
name = "kcodecs-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kcompletion = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kcompletion-5.30.0.tar.xz";
|
||||
sha256 = "1205xq2r550lb4v39h3g1sr8cgsysfkkxkk5scp4d92vawlbsrx6";
|
||||
name = "kcompletion-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kcompletion-5.31.0.tar.xz";
|
||||
sha256 = "0jx1lsz1fh8h20a5ixdv9q5yx6r5r7jr8hi68v7b66anmpnh2m3g";
|
||||
name = "kcompletion-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kconfig = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kconfig-5.30.0.tar.xz";
|
||||
sha256 = "1p23q7ykkrsj847m244v1wjcg7b85rh7shc8lkn290cydk5kr6m2";
|
||||
name = "kconfig-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kconfig-5.31.0.tar.xz";
|
||||
sha256 = "1z9jf5rizdj7c7x918zmdv4v01glpl3z44mrx7yfp2cqnjniwhxi";
|
||||
name = "kconfig-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kconfigwidgets = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kconfigwidgets-5.30.0.tar.xz";
|
||||
sha256 = "15ir4qr4hzr8ia9g8c13fnn2szhs07wys54nialbj0dggx9qa782";
|
||||
name = "kconfigwidgets-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kconfigwidgets-5.31.0.tar.xz";
|
||||
sha256 = "19y3s5qcb3mzw8xiyp57zb2sjclcmxzj3xp0iwzs41r4lqmlwajs";
|
||||
name = "kconfigwidgets-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kcoreaddons = {
|
||||
version = "5.30.1";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kcoreaddons-5.30.1.tar.xz";
|
||||
sha256 = "0w1yqcvd97jhm3w2x7mmayrifb1swda8lmzzmlz41crsq909ilnd";
|
||||
name = "kcoreaddons-5.30.1.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kcoreaddons-5.31.0.tar.xz";
|
||||
sha256 = "0175vgii8l5yx1bbbjljblkkq03nqfhb3v7in2657glag6imcb7m";
|
||||
name = "kcoreaddons-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kcrash = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kcrash-5.30.0.tar.xz";
|
||||
sha256 = "0hmcg81iahd2bvcm57yk7mdy6lnrsrzl7z6cv8lxpj9xw0ajd8h4";
|
||||
name = "kcrash-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kcrash-5.31.0.tar.xz";
|
||||
sha256 = "0mj6dahalwks39d881nvmrd3rqm2aid06iq6s8p2grhnncf6cd4j";
|
||||
name = "kcrash-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdbusaddons = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kdbusaddons-5.30.0.tar.xz";
|
||||
sha256 = "1ql5xjxfq8y0bmagq2zw44rilyrm1cmkjsfcfrjy0d2adhl23w7p";
|
||||
name = "kdbusaddons-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kdbusaddons-5.31.0.tar.xz";
|
||||
sha256 = "1dv9yzicd2d1k0qjgjbryks0f6s0v76hr0csdb7j22nwn9pb4cfk";
|
||||
name = "kdbusaddons-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdeclarative = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kdeclarative-5.30.0.tar.xz";
|
||||
sha256 = "0898mxh7izxn9d4iyv8gsxrjl2wms4m6mr69qd4bfygd8z8hqp46";
|
||||
name = "kdeclarative-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kdeclarative-5.31.0.tar.xz";
|
||||
sha256 = "0hw3rkmlw6j056b3wvhpaj778xfxajcqidpf5x3nyfjmqjvxsgw1";
|
||||
name = "kdeclarative-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kded = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kded-5.30.0.tar.xz";
|
||||
sha256 = "1sqmnxii0i3m65cacjxasm99pq2cvfymbalak8r0mip8g8fdarrd";
|
||||
name = "kded-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kded-5.31.0.tar.xz";
|
||||
sha256 = "0zsikbzi8i8bmlpa4kgdpcpsifkwwclsfdgafd7yf5svc4hyyl51";
|
||||
name = "kded-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdelibs4support = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/portingAids/kdelibs4support-5.30.0.tar.xz";
|
||||
sha256 = "0fkg5bk1p91iq1na67h02wdqnq71ln8g22r6sc7rva54w5ilnwxm";
|
||||
name = "kdelibs4support-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/portingAids/kdelibs4support-5.31.0.tar.xz";
|
||||
sha256 = "1yh4lr56mnwsbc0gysj1c58w1r62dlxxds16xnp5j0lyir7wx0pl";
|
||||
name = "kdelibs4support-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdesignerplugin = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kdesignerplugin-5.30.0.tar.xz";
|
||||
sha256 = "0hf7209zd398v4m3aa99yva1bbphzlyn0x9i5ydalwvwykmvjvdz";
|
||||
name = "kdesignerplugin-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kdesignerplugin-5.31.0.tar.xz";
|
||||
sha256 = "1g510f8dfvaddcq5hrvsaiwayp2hzkdryzn62zff29ipd7qpcd2x";
|
||||
name = "kdesignerplugin-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdesu = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kdesu-5.30.0.tar.xz";
|
||||
sha256 = "1cnl6pap4399s7l9ggi23f5b6mscfddsgwra4d2qy1093y0nb8mk";
|
||||
name = "kdesu-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kdesu-5.31.0.tar.xz";
|
||||
sha256 = "0mzvvr3zz28pgp42i3f54g5k3wplvjdg41d8jb9k6m5qcj8aryax";
|
||||
name = "kdesu-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdewebkit = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kdewebkit-5.30.0.tar.xz";
|
||||
sha256 = "1rq3ypsw2svvzfxjd6gj231phhnw19fwyr5qkcsik4076h6ycwvk";
|
||||
name = "kdewebkit-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kdewebkit-5.31.0.tar.xz";
|
||||
sha256 = "0x9v8i37apbik2krxr9n2pgq5xmcgjlhzflbrwwqaq30c2l8aid0";
|
||||
name = "kdewebkit-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdnssd = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kdnssd-5.30.0.tar.xz";
|
||||
sha256 = "1if1gaykgad5vg32p0impx4vwjaxd77r34gajg1kiywan6jpq6d8";
|
||||
name = "kdnssd-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kdnssd-5.31.0.tar.xz";
|
||||
sha256 = "1bbk9qsvx49zbjvdg0xi9s2x51f331n8wnyd320j3ay0mp4yq2kk";
|
||||
name = "kdnssd-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdoctools = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kdoctools-5.30.0.tar.xz";
|
||||
sha256 = "14i7ffmlwqhbq7gp5k8wajvg7x65nwxr5p1qqgxhmpmranyickvy";
|
||||
name = "kdoctools-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kdoctools-5.31.0.tar.xz";
|
||||
sha256 = "1m7l4bk5h75mcrgislp4rc7fj1szv1ij30y5yizncg2c3aq2czxk";
|
||||
name = "kdoctools-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kemoticons = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kemoticons-5.30.0.tar.xz";
|
||||
sha256 = "0h3a9xs110l1d2wyp8dfkaf3fnpc0wvfdacpgbnihk1xvccmq4nl";
|
||||
name = "kemoticons-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kemoticons-5.31.0.tar.xz";
|
||||
sha256 = "0zvps3jrx02dzy82mwf5l7dirpnj616081yhkp2m0xw3qa3i16xk";
|
||||
name = "kemoticons-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kfilemetadata = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kfilemetadata-5.30.0.tar.xz";
|
||||
sha256 = "1m07hj5nnb81wraylhh36f2k82zqxz5g766wwcn12pd8v0r99ilh";
|
||||
name = "kfilemetadata-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kfilemetadata-5.31.0.tar.xz";
|
||||
sha256 = "123cin3fhai85zzz5hfr6h87cjrqvsyl9i809j7q0fshjx8c9wpd";
|
||||
name = "kfilemetadata-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kglobalaccel = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kglobalaccel-5.30.0.tar.xz";
|
||||
sha256 = "123c7sqwj4davrwrgwy16qag8ss205pk9af4jc9sky74h531fdm1";
|
||||
name = "kglobalaccel-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kglobalaccel-5.31.0.tar.xz";
|
||||
sha256 = "1l7phfk17z9rrdlcjz97zyyqlj9pps0gdpphrfqrz1fyx5ifybmc";
|
||||
name = "kglobalaccel-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kguiaddons = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kguiaddons-5.30.0.tar.xz";
|
||||
sha256 = "0kn0ia6ciafng227lrrdslmxhh30426wywarxvihlcqfzrgmnpzm";
|
||||
name = "kguiaddons-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kguiaddons-5.31.0.tar.xz";
|
||||
sha256 = "0bvjnbsskps2pfh0y72klxfanm54c0iflll5awaps750flb3bbp3";
|
||||
name = "kguiaddons-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
khtml = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/portingAids/khtml-5.30.0.tar.xz";
|
||||
sha256 = "1z4pj3cr8bzbl80bi1z87lsg1adr9hbm60wf3811wdma2d4w4bbh";
|
||||
name = "khtml-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/portingAids/khtml-5.31.0.tar.xz";
|
||||
sha256 = "19pf3ir3r8igrx3h90sn383kxmyjdxgmwaw66p6vjb83243dy57h";
|
||||
name = "khtml-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
ki18n = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/ki18n-5.30.0.tar.xz";
|
||||
sha256 = "1wvjrmpsypfhivk3hfpb9lm09d0w2c9lc4mxvbyfkibhan1x1lid";
|
||||
name = "ki18n-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/ki18n-5.31.0.tar.xz";
|
||||
sha256 = "1q496i4a3kq2bfxpfnz6bfxk2shfdshrxcf253ab58l76l3jcy9g";
|
||||
name = "ki18n-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kiconthemes = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kiconthemes-5.30.0.tar.xz";
|
||||
sha256 = "0sixqg2fvm9m14xbn3dmsk564i9ig3zn6zf5ww10hnqd1wcd4sg9";
|
||||
name = "kiconthemes-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kiconthemes-5.31.0.tar.xz";
|
||||
sha256 = "0kangszmlhzbwvvplnxk2i938xl8j8jpd8kpf2n9skxkqfd19qr5";
|
||||
name = "kiconthemes-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kidletime = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kidletime-5.30.0.tar.xz";
|
||||
sha256 = "1vbjvwy5ihz5id2484d2hn5a81p85vz3mvwpcjbypkd3y5mqcrq6";
|
||||
name = "kidletime-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kidletime-5.31.0.tar.xz";
|
||||
sha256 = "03ajdhxv2jdggqhy02s6xgbaf4pa2chj0f6d5kgz9r0wx6kxmh25";
|
||||
name = "kidletime-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kimageformats = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kimageformats-5.30.0.tar.xz";
|
||||
sha256 = "057a9gallq1j3a51ijyp47x82hmn8vssxb74jchlf90jjnyq4g2i";
|
||||
name = "kimageformats-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kimageformats-5.31.0.tar.xz";
|
||||
sha256 = "17cz2xmmm5g55kndq983vy6cg7adpbiw7ahn0lpvviinnsf53s12";
|
||||
name = "kimageformats-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kinit = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kinit-5.30.0.tar.xz";
|
||||
sha256 = "047vxnq4ypl70vspq800k00cj2cjqd6hx46yp11m33np03106rj2";
|
||||
name = "kinit-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kinit-5.31.0.tar.xz";
|
||||
sha256 = "082kq25163x40bq12x84ccrk3zrzmn5xpb5m4zgi06zcvzb8rl9l";
|
||||
name = "kinit-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kio = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kio-5.30.0.tar.xz";
|
||||
sha256 = "0finbv7kcaz81bsj6yv6pxwxcjrwkj5mmkxhg0pa5j77jn1nhnm1";
|
||||
name = "kio-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kio-5.31.0.tar.xz";
|
||||
sha256 = "1rry7v9g2430hkz44b4xjcbs3lr64srs8822a52vx1w69jpkn5s9";
|
||||
name = "kio-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kitemmodels = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kitemmodels-5.30.0.tar.xz";
|
||||
sha256 = "1yf2bfzxqgw75p5bi7byg9rbbiclhqayybiyd8cq3d8b8ws4bfdf";
|
||||
name = "kitemmodels-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kitemmodels-5.31.0.tar.xz";
|
||||
sha256 = "0zb9cm5v3ylqhg8l5sp3jskghm5izzihha5ik09y7fabl52cd6v5";
|
||||
name = "kitemmodels-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kitemviews = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kitemviews-5.30.0.tar.xz";
|
||||
sha256 = "0fx4sdrflp2h0y6ixdnbaxd8l5cham4lx0f36y7dfz6jlk56d12y";
|
||||
name = "kitemviews-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kitemviews-5.31.0.tar.xz";
|
||||
sha256 = "04r4pd5rkdgbszyg7l050r53f38skhh2p2mi3xkz4ckci132srlv";
|
||||
name = "kitemviews-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kjobwidgets = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kjobwidgets-5.30.0.tar.xz";
|
||||
sha256 = "0ilzl1sm9fx7cx03nh5y2y656jfssp7b46xiawgnasvc94ysl9hf";
|
||||
name = "kjobwidgets-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kjobwidgets-5.31.0.tar.xz";
|
||||
sha256 = "16grnlccmqcs84gpz62s1iz5amdwsprr76gd0q845bd49crgacfa";
|
||||
name = "kjobwidgets-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kjs = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/portingAids/kjs-5.30.0.tar.xz";
|
||||
sha256 = "0yh7n0q1vbx8nd6j25jys6hd24m3knn44n6xc09pwnr3mn0shvih";
|
||||
name = "kjs-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/portingAids/kjs-5.31.0.tar.xz";
|
||||
sha256 = "027n2ivh5kfmrm06xgcryxm14hbxyf83cx6rbc34093kk905ghg1";
|
||||
name = "kjs-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kjsembed = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/portingAids/kjsembed-5.30.0.tar.xz";
|
||||
sha256 = "0ixd56krz66psxk9h8dzd5jr693kh9xx4303zicws85014ba33q5";
|
||||
name = "kjsembed-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/portingAids/kjsembed-5.31.0.tar.xz";
|
||||
sha256 = "1mss7lahczvwhmybxnbcynqwa56gjrxiyq79fcicybp7h7rvqw14";
|
||||
name = "kjsembed-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kmediaplayer = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/portingAids/kmediaplayer-5.30.0.tar.xz";
|
||||
sha256 = "0bir4g7bfhjdrs2skhr7jclc3f7frmfm6p8n2q10ag9in8h5hwd8";
|
||||
name = "kmediaplayer-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/portingAids/kmediaplayer-5.31.0.tar.xz";
|
||||
sha256 = "0vxzw5grw53bxp0nvwmiqyw9sbpglhrnfg4d1ldlg4a1gibfijx4";
|
||||
name = "kmediaplayer-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
knewstuff = {
|
||||
version = "5.30.1";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/knewstuff-5.30.1.tar.xz";
|
||||
sha256 = "1vsaprynq6dazg64zmj6j1wd8g4aw6pzz3208nqgjjwk5kw8zh0h";
|
||||
name = "knewstuff-5.30.1.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/knewstuff-5.31.0.tar.xz";
|
||||
sha256 = "06qrgzfxrpmckyjq21ajvw08n5f5bdyqqgrnrbr1cjsfcx7xwdfl";
|
||||
name = "knewstuff-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
knotifications = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/knotifications-5.30.0.tar.xz";
|
||||
sha256 = "199jh1gizdwc1xz97khac9m6bdg38n5hr5c96pq7sk7b2rdr49ks";
|
||||
name = "knotifications-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/knotifications-5.31.0.tar.xz";
|
||||
sha256 = "0nz5dkzgkv4mzcsg2mn9zzcqh484cyh5n1y8sx1831r808jd2wly";
|
||||
name = "knotifications-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
knotifyconfig = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/knotifyconfig-5.30.0.tar.xz";
|
||||
sha256 = "04l5hjdd0376y9ygmrz8a49w8hxnb01y0fi13spvkmx8dhal0fmq";
|
||||
name = "knotifyconfig-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/knotifyconfig-5.31.0.tar.xz";
|
||||
sha256 = "1zdzfqqd32ykd5ibrkssl3p47v704jxs16br1rhrr32ymv4qcbpi";
|
||||
name = "knotifyconfig-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kpackage = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kpackage-5.30.0.tar.xz";
|
||||
sha256 = "1j1vwna5w67wqsdfl5s83gx7vizj5qnsl6nck7ny055yzzwb2gna";
|
||||
name = "kpackage-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kpackage-5.31.0.tar.xz";
|
||||
sha256 = "1hg8f2i10wcs31xhvw40dwgbgfrwx93w5bi5wlbrw55jcs040dfr";
|
||||
name = "kpackage-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kparts = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kparts-5.30.0.tar.xz";
|
||||
sha256 = "1sgqylynq35d6xir99kgqial3p0pf0lcaqagl2vh1qandipmcp8g";
|
||||
name = "kparts-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kparts-5.31.0.tar.xz";
|
||||
sha256 = "093g5zsdqqyx9z69afsmgyszd807pv3wpzwn37x1glg399dsv7fa";
|
||||
name = "kparts-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kpeople = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kpeople-5.30.0.tar.xz";
|
||||
sha256 = "1h72fwr6121w0cfhaci32s4510kwinjah9ynfhjl998mg00k42hj";
|
||||
name = "kpeople-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kpeople-5.31.0.tar.xz";
|
||||
sha256 = "1f71c2q8a9m463ghpq50gbhkvf5szkvvfwbamlrwwygpb89fzfjy";
|
||||
name = "kpeople-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kplotting = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kplotting-5.30.0.tar.xz";
|
||||
sha256 = "00wrz16m4blh130713fk0q3gzpsx33zs6wnd4ghwhaakmqydn2gh";
|
||||
name = "kplotting-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kplotting-5.31.0.tar.xz";
|
||||
sha256 = "15yv1rh1vlxhv77j50inq9kkwalhs2r1mjba82fnxy8z569i66cm";
|
||||
name = "kplotting-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kpty = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kpty-5.30.0.tar.xz";
|
||||
sha256 = "0dna8a0n7lg22522khxq0vxn76g484198p80hzvysnkl218fav60";
|
||||
name = "kpty-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kpty-5.31.0.tar.xz";
|
||||
sha256 = "0hfs1gdi1fqaaki5aa9b93j4pl33g4s82yxpbyc0h9k2891aq196";
|
||||
name = "kpty-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kross = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/portingAids/kross-5.30.0.tar.xz";
|
||||
sha256 = "1bqfznfrr87c88ffs7hj0iqcv8vgzrz57l31zpij3cgiy09q7axz";
|
||||
name = "kross-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/portingAids/kross-5.31.0.tar.xz";
|
||||
sha256 = "0lc9ijn60bw0y9nrlva2fd0hf0b4x6488jjmymrnrc8zzjnigyqp";
|
||||
name = "kross-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
krunner = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/krunner-5.30.0.tar.xz";
|
||||
sha256 = "1smkanc14nlsdrg31skzb9y7f0fahyf09iq1h2xfla4kvgk811qz";
|
||||
name = "krunner-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/krunner-5.31.0.tar.xz";
|
||||
sha256 = "0xqayhd179387m02arxdcl1lgk8f2h0fxlzyigy6ja6wylbwphrw";
|
||||
name = "krunner-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kservice = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kservice-5.30.0.tar.xz";
|
||||
sha256 = "1jcb938m3kllmrzmwz21zjlhrx0r6dmyrglsf0zbjs2cg9hwww0l";
|
||||
name = "kservice-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kservice-5.31.0.tar.xz";
|
||||
sha256 = "0hjlcnypg96np88hgfvqd8g5z4cxgi4a0j5mnlfx65jrzpv5hsjg";
|
||||
name = "kservice-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
ktexteditor = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/ktexteditor-5.30.0.tar.xz";
|
||||
sha256 = "0bhbcqfkmpy95p3w66xxnhi4h7h3k3k362fhsrl38rc83r9agnns";
|
||||
name = "ktexteditor-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/ktexteditor-5.31.0.tar.xz";
|
||||
sha256 = "099axcwl8z4npvcrirycc82zg7sf9ac3yxrwpsp0f337gdl1qvln";
|
||||
name = "ktexteditor-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
ktextwidgets = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/ktextwidgets-5.30.0.tar.xz";
|
||||
sha256 = "1fpqjig6wzb1gycvak9h4p48c623fkzj2lxvf0p3vmb6b0yxr1jw";
|
||||
name = "ktextwidgets-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/ktextwidgets-5.31.0.tar.xz";
|
||||
sha256 = "0n0v42b4bq1f6f120bjhr69qwgnvwlhnnqsh75nl9jvv8g3lyspy";
|
||||
name = "ktextwidgets-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kunitconversion = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kunitconversion-5.30.0.tar.xz";
|
||||
sha256 = "0fjkl355dwcgd4a39212qwmmbj37nfhmw3ik2bxg3gxg07a4yra5";
|
||||
name = "kunitconversion-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kunitconversion-5.31.0.tar.xz";
|
||||
sha256 = "190d2v3bv7ccg2wqjmd6p46d4zz59r1mf86l2wkqw212rr59pafx";
|
||||
name = "kunitconversion-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kwallet = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kwallet-5.30.0.tar.xz";
|
||||
sha256 = "1nnc0gcn7w5jmmzs4zr4qlrhn3ns9x42f2dfcwc5vi281gghl54k";
|
||||
name = "kwallet-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kwallet-5.31.0.tar.xz";
|
||||
sha256 = "0r7n49ii8y1ygc7ncysjif4mrmsd9jq4yfm251m7lrp82drza26n";
|
||||
name = "kwallet-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kwayland = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kwayland-5.30.0.tar.xz";
|
||||
sha256 = "0sc2mdiazql2012qadbqjm4wxmhhanbba9r9qjxqx2li14ax6yci";
|
||||
name = "kwayland-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kwayland-5.31.0.tar.xz";
|
||||
sha256 = "0f134spj1vz3f43bdrb93kr54s50x4a9xvkfhl3inlxmglbk3h8b";
|
||||
name = "kwayland-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kwidgetsaddons = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kwidgetsaddons-5.30.0.tar.xz";
|
||||
sha256 = "0jn2iw46cwfqh550rrb37yfznr4lrlsj8bh8v21xhgm3afm25hrl";
|
||||
name = "kwidgetsaddons-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kwidgetsaddons-5.31.0.tar.xz";
|
||||
sha256 = "0yrhss1x8q4nanpq2gbzqjds9s7hjl3zzkwnd8hahh9fyg8w9815";
|
||||
name = "kwidgetsaddons-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kwindowsystem = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kwindowsystem-5.30.0.tar.xz";
|
||||
sha256 = "0sz1wyawah03ygx3kh1x6wy1y1gp9f5h6296yy1mxy4qz4jp1b10";
|
||||
name = "kwindowsystem-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kwindowsystem-5.31.0.tar.xz";
|
||||
sha256 = "0jzhsdfzzhxfgjqd4pl98ckbbqfwkv6qy5szh82078gxc2rf1wna";
|
||||
name = "kwindowsystem-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kxmlgui = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kxmlgui-5.30.0.tar.xz";
|
||||
sha256 = "005cn74h0rjvjsmfzrn3pai0jrgczj3y6h50g07rgmynmrcnygys";
|
||||
name = "kxmlgui-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kxmlgui-5.31.0.tar.xz";
|
||||
sha256 = "1rnznapp1vflg66k0jk8n8v9zci20bs0v88hci3rf0qfd5cmgnzr";
|
||||
name = "kxmlgui-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kxmlrpcclient = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/kxmlrpcclient-5.30.0.tar.xz";
|
||||
sha256 = "18azc85vfng9gnjf09yhvg5g4432dy5ia9hk54jk9ibmy7kaqlqq";
|
||||
name = "kxmlrpcclient-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/kxmlrpcclient-5.31.0.tar.xz";
|
||||
sha256 = "1lrv1qxbfm1ss2hb171p9s3f3iwn8zfrsipin0gvfwnjrldi4fkb";
|
||||
name = "kxmlrpcclient-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
modemmanager-qt = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/modemmanager-qt-5.30.0.tar.xz";
|
||||
sha256 = "1qh39nd3lwdb8z58brqf0k48k5n3xx9wdi4kak2wg7vwmqwwammf";
|
||||
name = "modemmanager-qt-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/modemmanager-qt-5.31.0.tar.xz";
|
||||
sha256 = "0s2dfz9zvn6f9xpzs412iniipaai5zs9m06lpxss0w1nq5ig856r";
|
||||
name = "modemmanager-qt-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
networkmanager-qt = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/networkmanager-qt-5.30.0.tar.xz";
|
||||
sha256 = "1scxcqrwxjwdzg2j3r6wz3bk23h7v9dil8n892ykfrpxa4cidgzi";
|
||||
name = "networkmanager-qt-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/networkmanager-qt-5.31.0.tar.xz";
|
||||
sha256 = "18wbmd4nsgwzqlp254k1ahy8iyydx59fshb3wci5sgxnsn435np4";
|
||||
name = "networkmanager-qt-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
oxygen-icons5 = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/oxygen-icons5-5.30.0.tar.xz";
|
||||
sha256 = "1b1kfgk2vgr85kbgvx8fwpyib5yvdkz07vi6p1s8a61cabcymkhl";
|
||||
name = "oxygen-icons5-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/oxygen-icons5-5.31.0.tar.xz";
|
||||
sha256 = "0ka4zll8v8wahqg50vpm9mrxlyh9244y0yrprbwxzl9xpx113ppi";
|
||||
name = "oxygen-icons5-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-framework = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/plasma-framework-5.30.0.tar.xz";
|
||||
sha256 = "1qdyc0li07sns71gdyw31jhzhnghcvzc0r0y4y8f157nyz23pw70";
|
||||
name = "plasma-framework-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/plasma-framework-5.31.0.tar.xz";
|
||||
sha256 = "0hq3d96d9xhx6wqrrhnyygwajg69vfxbjc8dlpf5nwc3kqv2wim2";
|
||||
name = "plasma-framework-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
prison = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/prison-5.30.0.tar.xz";
|
||||
sha256 = "15vlz67qv1pm87hlnyak2jbdw87xw3jx3vaqwjfn07hbzlh8dmpc";
|
||||
name = "prison-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/prison-5.31.0.tar.xz";
|
||||
sha256 = "0qaqj5gazby4fdq9yii67cmr04i007blhl27h9c5p169khh9ck2s";
|
||||
name = "prison-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
solid = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/solid-5.30.0.tar.xz";
|
||||
sha256 = "10rfsp39s8d8zgz02f4biyh9n7hbwxkib5r6g3cldbbf0ch3inmh";
|
||||
name = "solid-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/solid-5.31.0.tar.xz";
|
||||
sha256 = "05rgzdzwbnmnvzkf4gz3z5i1ggwyd21y0yli7shas4i8l29kjd7m";
|
||||
name = "solid-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
sonnet = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/sonnet-5.30.0.tar.xz";
|
||||
sha256 = "1i4i59vjq16mmqjfyr5hc7afnc5w2h54iz4rmqi0wdfk37cl5zcr";
|
||||
name = "sonnet-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/sonnet-5.31.0.tar.xz";
|
||||
sha256 = "16vzdhppb2w5vyfr332bcvw4dyw9cz4apxain28d43p0ir03xxz3";
|
||||
name = "sonnet-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
syntax-highlighting = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/syntax-highlighting-5.30.0.tar.xz";
|
||||
sha256 = "0iipg1khc27a3cgysk6qpj5lf846z3n29gj2yas36lgr8n6ddm53";
|
||||
name = "syntax-highlighting-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/syntax-highlighting-5.31.0.tar.xz";
|
||||
sha256 = "0igd6jpbck94gl8gs5a5dgj2cxbv370prnk22037clqry6y38v1a";
|
||||
name = "syntax-highlighting-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
threadweaver = {
|
||||
version = "5.30.0";
|
||||
version = "5.31.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.30/threadweaver-5.30.0.tar.xz";
|
||||
sha256 = "12zirga9qyjrizwxja2n5mh7kxgdb7xyl2d3makdjpnjk5kry8by";
|
||||
name = "threadweaver-5.30.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.31/threadweaver-5.31.0.tar.xz";
|
||||
sha256 = "0wsdv135mxpka0rfg9zwhnzp0svfkvd4idyj38rgipxbada0hb7f";
|
||||
name = "threadweaver-5.31.0.tar.xz";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{ stdenv, fetchurl, guile, autoconf, flex, fetchpatch }:
|
||||
{ stdenv, fetchurl, pkgconfig, guile, autoconf, flex, fetchpatch }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.1.11";
|
||||
name = "libmatheval-${version}";
|
||||
|
||||
nativeBuildInputs = [ autoconf flex ];
|
||||
nativeBuildInputs = [ pkgconfig autoconf flex ];
|
||||
buildInputs = [ guile ];
|
||||
|
||||
src = fetchurl {
|
||||
|
||||
@ -17,19 +17,13 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "CVE-2016-4658.patch";
|
||||
url = "https://git.gnome.org/browse/libxml2/patch/?id=c1d1f7121194036608bf555f08d3062a36fd344b";
|
||||
sha256 = "0q7i5qgwgzp2x4r820mqq3nx69bgkd7n0v00j28wa6hndbfaaxmb";
|
||||
# Contains fixes for CVE-2016-{4658,5131} and other bugs.
|
||||
name = "misc.patch";
|
||||
url = "https://git.gnome.org/browse/libxml2/patch/?id=e905f081&id2=v2.9.4";
|
||||
sha256 = "14rnzilspmh92bcpwbd6kqikj36gx78al42ilgpqgl1609krb5m5";
|
||||
})
|
||||
];
|
||||
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=766834#c5
|
||||
postPatch = "patch -R < " + fetchpatch {
|
||||
name = "schemas-validity.patch";
|
||||
url = "https://git.gnome.org/browse/libxml2/patch/?id=f6599c5164";
|
||||
sha256 = "0i7a0nhxwkxx6dkm8917qn0bsfn1av6ghg2f4dxanxi4bn4b1jjn";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "dev" "out" "doc" ]
|
||||
++ lib.optional pythonSupport "py";
|
||||
propagatedBuildOutputs = "out bin" + lib.optionalString pythonSupport " py";
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
{ stdenv, fetchurl, cmake, openssl, pkgconfig, ccrtp }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libzrtpcpp-2.3.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/ccrtp/${name}.tar.gz";
|
||||
sha256 = "020hfyrh8qdwkqdg1r1n65wdzj5i01ba9dzjghbm9lbz93gd9r83";
|
||||
};
|
||||
|
||||
# We disallow 'lib64', or pkgconfig will not find it.
|
||||
prePatch = ''
|
||||
sed -i s/lib64/lib/ CMakeLists.txt
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
buildInputs = [ openssl ccrtp ];
|
||||
|
||||
meta = {
|
||||
description = "GNU RTP stack for the zrtp protocol developed by Phil Zimmermann";
|
||||
homepage = "http://www.gnutelephony.org/index.php/GNU_ZRTP";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = [ stdenv.lib.maintainers.marcweber ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -2,16 +2,13 @@
|
||||
, openssl, which
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.1.10";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mongoc-${version}";
|
||||
version = "1.5.4";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz";
|
||||
sha256 = "13yg8dpqgbpc44lsblr3szk2a5bnl2prlayv4xlkivx90m86lcx3";
|
||||
sha256 = "0xjk3k76n8yz7zi6a0dx1wgpsvvn5qhpzrapdw4v3h49hwf7rc5q";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ libbson ];
|
||||
|
||||
@ -14,12 +14,12 @@ let
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.30.1";
|
||||
version = "0.30.2";
|
||||
name = "neon-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.webdav.org/neon/${name}.tar.gz";
|
||||
sha256 = "1pawhk02x728xn396a1kcivy9gqm94srmgad6ymr9l0qvk02dih0";
|
||||
sha256 = "1jpvczcx658vimqm7c8my2q41fnmjaf1j03g7bsli6rjxk6xh2yv";
|
||||
};
|
||||
|
||||
patches = optionals stdenv.isDarwin [ ./0.29.6-darwin-fix-configure.patch ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pkcs11-helper-${version}";
|
||||
version = "1.11";
|
||||
version = "1.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenSC";
|
||||
repo = "pkcs11-helper";
|
||||
rev = "${name}";
|
||||
sha256 = "1bfsmy9w2qf7avvs3rsc1ycqczzzw0j2wsqkd2fj4dc1fqzigq2q";
|
||||
sha256 = "17a2cssycl7fh44xikmhszigx57vvn0h2sjsnmsy3772kfj796b1";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig openssl autoreconfHook ];
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
{ stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig
|
||||
, gcc5, openssl, libpng, lua5 }:
|
||||
, gcc5, openssl, libpng, lua5, pkgconfig, libidn, expat }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "podofo-0.9.4";
|
||||
name = "podofo-0.9.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/podofo/${name}.tar.gz";
|
||||
sha256 = "0ngqgwl38afmzcj2zpf18a2g63vhm2fp45cbf9z62129rdgm1pyc";
|
||||
sha256 = "012kgfx5j5n6w4zkc1d290d2cwjk60jhzsjlr2x19g3yi75q2jc5";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng ];
|
||||
nativeBuildInputs = [ cmake gcc5 ];
|
||||
propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng libidn expat ];
|
||||
nativeBuildInputs = [ cmake gcc5 pkgconfig ];
|
||||
buildInputs = [ lua5 stdenv.cc.libc ];
|
||||
|
||||
crossAttrs = {
|
||||
@ -19,15 +19,6 @@ stdenv.mkDerivation rec {
|
||||
lua5.crossDrv stdenv.ccCross.libc ];
|
||||
};
|
||||
|
||||
# fix finding freetype-2.5
|
||||
preConfigure = ''
|
||||
substituteInPlace ./CMakeLists.txt \
|
||||
--replace FREETYPE_INCLUDE_DIR FREETYPE_INCLUDE_DIRS \
|
||||
--replace 'FIND_PACKAGE(FREETYPE' 'FIND_PACKAGE(Freetype'
|
||||
|
||||
rm ./cmake/modules/Find{FREETYPE,ZLIB,PkgConfig}.cmake
|
||||
'';
|
||||
|
||||
cmakeFlags = "-DPODOFO_BUILD_SHARED=ON -DPODOFO_BUILD_STATIC=OFF";
|
||||
|
||||
meta = {
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, kerberos, pkgconfig, gnused }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "serf-1.3.7";
|
||||
name = "serf-1.3.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://serf.googlecode.com/svn/src_releases/${name}.tar.bz2";
|
||||
sha256 = "1bphz616dv1svc50kkm8xbgyszhg3ni2dqbij99sfvjycr7bgk7c";
|
||||
url = "https://www.apache.org/dist/serf/${name}.tar.bz2";
|
||||
sha256 = "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l";
|
||||
};
|
||||
|
||||
buildInputs = [ apr scons openssl aprutil zlib ]
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "tcltls-${version}";
|
||||
version = "1.6";
|
||||
version = "1.6.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/tls/tls${version}-src.tar.gz";
|
||||
sha256 = "adec50143a9ad634a671d24f7c7bbf2455487eb5f12d290f41797c32a98b93f3";
|
||||
sha256 = "1f53sfcnrridjl5ayrq1xrqkahs8khf8c3d0m2brndbhahzdw6ai";
|
||||
};
|
||||
|
||||
buildInputs = [ tcl openssl ];
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
, openssl, makeWrapper }:
|
||||
|
||||
let
|
||||
version = "1.2.20";
|
||||
version = "1.2.23";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xmlsec-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz";
|
||||
sha256 = "01bkbv2y3x8d1sf4dcln1x3y2jyj391s3208d9a2ndhglly5j89j";
|
||||
sha256 = "17qfw5crkqn4v6xbkjxrjvcccfc00dy053892wrwv54qdk8n7m21";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper libxml2 gnutls libxslt pkgconfig libgcrypt libtool openssl ];
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "llvmlite";
|
||||
name = "${pname}-${version}";
|
||||
version = "0.14.0";
|
||||
version = "0.15.0";
|
||||
|
||||
disabled = isPyPy;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
|
||||
sha256 = "1ybgsmvamj0i51dvrn268ziczpm63y2h4sgagf6fkgkpydrr01g8";
|
||||
sha256 = "c855835537eda61f3a0d19aedc44f006d5084a2d322aee8ffa87aa06bb800dc4";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ llvm ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34;
|
||||
@ -47,4 +47,4 @@ buildPythonPackage rec {
|
||||
license = stdenv.lib.licenses.bsd2;
|
||||
maintainers = with stdenv.lib.maintainers; [ fridh ];
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@ -14,12 +14,12 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.29.0";
|
||||
version = "0.30.1";
|
||||
name = "numba-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://pypi/n/numba/${name}.tar.gz";
|
||||
sha256 = "00ae294f3fb3a99e8f0a9f568213cebed26675bacc9c6f8d2e025b6d564e460d";
|
||||
sha256 = "66e6254b3002f448fd212c5df4c8a69964dff9b9f315fb733e3c95e7e2b6c8fd";
|
||||
};
|
||||
|
||||
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
|
||||
@ -28,8 +28,7 @@ buildPythonPackage rec {
|
||||
|
||||
# Copy test script into $out and run the test suite.
|
||||
checkPhase = ''
|
||||
cp runtests.py $out/${python.sitePackages}/numba/runtests.py
|
||||
${python.interpreter} $out/${python.sitePackages}/numba/runtests.py
|
||||
python -m numba.runtests
|
||||
'';
|
||||
# ImportError: cannot import name '_typeconv'
|
||||
doCheck = false;
|
||||
@ -40,4 +39,4 @@ buildPythonPackage rec {
|
||||
description = "Compiling Python code using LLVM";
|
||||
maintainers = with stdenv.lib.maintainers; [ fridh ];
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@ -10,12 +10,10 @@ let
|
||||
baseName = if enableNpm then "nodejs" else "nodejs-slim";
|
||||
in
|
||||
stdenv.mkDerivation (nodejs // rec {
|
||||
version = "6.9.1";
|
||||
version = "6.9.5";
|
||||
name = "${baseName}-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
|
||||
sha256 = "0a87vzb33xdg8w0xi3c605hfav3c9m4ylab1436whz3p0l9qvp8b";
|
||||
sha256 = "1cxnsprv2sy2djskx6yfw14f578s1fwzvmvnw7rh75djajix3znp";
|
||||
};
|
||||
|
||||
})
|
||||
|
||||
|
||||
@ -1,23 +1,15 @@
|
||||
{ stdenv, fetchurl, fetchpatch, pkgconfig, libnl, openssl, sqlite ? null }:
|
||||
{ stdenv, fetchurl, pkgconfig, libnl, openssl, sqlite ? null }:
|
||||
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "hostapd-${version}";
|
||||
version = "2.5";
|
||||
version = "2.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://hostap.epitest.fi/releases/${name}.tar.gz";
|
||||
sha256 = "0jn77r39ysshkzihv5rjbdajqazci59v2yab4rn05my09najs9wf";
|
||||
sha256 = "0z8ilypad82q3l6q6kbv6hczvhjn8k63j8051x5yqfyjq686nlh1";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/voidlinux/void-packages/a7bcbc258ba9884bccde831c0ae2069cade99e41/srcpkgs/wpa_supplicant/patches/patch-src_crypto_tls_openssl_c";
|
||||
sha256 = "1ifa2i54a7ijsha197dyldal3m4q5i05ih2sk15f5a5ybb6x7vmp";
|
||||
addPrefixes = true;
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ libnl openssl sqlite ];
|
||||
|
||||
|
||||
@ -1,17 +1,18 @@
|
||||
{ stdenv, openssl, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "open-isns-${version}";
|
||||
version = "0.95";
|
||||
version = "0.97";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gonzoleeman";
|
||||
repo = "open-isns";
|
||||
rev = "v${version}";
|
||||
sha256 = "1c2x3yf9806gbjsw4xi805rfhyxk353a3whqvpccz8dwas6jajwh";
|
||||
sha256 = "17aichjgkwjfp9dx1piw7dw8ddz1bgm5mk3laid2zvjks1h739k3";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ openssl ];
|
||||
outputs = ["out" "lib" ];
|
||||
outputs = [ "out" "lib" ];
|
||||
outputInclude = "lib";
|
||||
|
||||
installFlags = "etcdir=$(out)/etc vardir=$(out)/var/lib/isns";
|
||||
|
||||
@ -1,19 +1,13 @@
|
||||
{ stdenv, fetchurl, pam, openssl, perl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pam_ssh_agent_auth-0.9.5";
|
||||
name = "pam_ssh_agent_auth-0.10.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/pamsshagentauth/${name}.tar.bz2";
|
||||
sha256 = "1aihfyj17nvqhf0d5i0dg2lsly3r24xjyx0sfqpf60s0libkp4y0";
|
||||
sha256 = "0qx78x7nvqdscyp04hfijl4rgyf64xy03prr28hipvgasrcd6lrw";
|
||||
};
|
||||
|
||||
patches =
|
||||
[ # Allow multiple colon-separated authorized keys files to be
|
||||
# specified in the file= option.
|
||||
./multiple-key-files.patch
|
||||
];
|
||||
|
||||
buildInputs = [ pam openssl perl ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -1,338 +0,0 @@
|
||||
diff -ru -x '*~' pam_ssh_agent_auth-0.9.4-orig/iterate_ssh_agent_keys.c pam_ssh_agent_auth-0.9.4/iterate_ssh_agent_keys.c
|
||||
--- pam_ssh_agent_auth-0.9.4-orig/iterate_ssh_agent_keys.c 2012-06-28 01:47:49.000000000 +0000
|
||||
+++ pam_ssh_agent_auth-0.9.4/iterate_ssh_agent_keys.c 2012-12-17 19:29:16.014226336 +0000
|
||||
@@ -69,14 +69,14 @@
|
||||
return cookie;
|
||||
}
|
||||
|
||||
-int
|
||||
+const char *
|
||||
pamsshagentauth_find_authorized_keys(uid_t uid)
|
||||
{
|
||||
Identity *id;
|
||||
Key *key;
|
||||
AuthenticationConnection *ac;
|
||||
char *comment;
|
||||
- uint8_t retval = 0;
|
||||
+ const char *key_file = 0;
|
||||
|
||||
OpenSSL_add_all_digests();
|
||||
session_id2 = pamsshagentauth_session_id2_gen();
|
||||
@@ -90,13 +90,11 @@
|
||||
id->key = key;
|
||||
id->filename = comment;
|
||||
id->ac = ac;
|
||||
- if(userauth_pubkey_from_id(id)) {
|
||||
- retval = 1;
|
||||
- }
|
||||
+ key_file = userauth_pubkey_from_id(id);
|
||||
pamsshagentauth_xfree(id->filename);
|
||||
pamsshagentauth_key_free(id->key);
|
||||
pamsshagentauth_xfree(id);
|
||||
- if(retval == 1)
|
||||
+ if(key_file)
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -107,5 +105,5 @@
|
||||
}
|
||||
pamsshagentauth_xfree(session_id2);
|
||||
EVP_cleanup();
|
||||
- return retval;
|
||||
+ return key_file;
|
||||
}
|
||||
diff -ru -x '*~' pam_ssh_agent_auth-0.9.4-orig/iterate_ssh_agent_keys.h pam_ssh_agent_auth-0.9.4/iterate_ssh_agent_keys.h
|
||||
--- pam_ssh_agent_auth-0.9.4-orig/iterate_ssh_agent_keys.h 2012-06-28 01:47:49.000000000 +0000
|
||||
+++ pam_ssh_agent_auth-0.9.4/iterate_ssh_agent_keys.h 2012-12-17 19:28:57.454334806 +0000
|
||||
@@ -31,6 +31,6 @@
|
||||
#ifndef _ITERATE_SSH_AGENT_KEYS_H
|
||||
#define _ITERATE_SSH_AGENT_KEYS_H
|
||||
|
||||
-int pamsshagentauth_find_authorized_keys(uid_t);
|
||||
+const char * pamsshagentauth_find_authorized_keys(uid_t);
|
||||
|
||||
#endif
|
||||
diff -ru -x '*~' pam_ssh_agent_auth-0.9.4-orig/pam_ssh_agent_auth.c pam_ssh_agent_auth-0.9.4/pam_ssh_agent_auth.c
|
||||
--- pam_ssh_agent_auth-0.9.4-orig/pam_ssh_agent_auth.c 2012-06-28 01:47:49.000000000 +0000
|
||||
+++ pam_ssh_agent_auth-0.9.4/pam_ssh_agent_auth.c 2012-12-17 19:30:24.013830673 +0000
|
||||
@@ -60,7 +60,6 @@
|
||||
|
||||
#define strncasecmp_literal(A,B) strncasecmp( A, B, sizeof(B) - 1)
|
||||
|
||||
-char *authorized_keys_file = NULL;
|
||||
uint8_t allow_user_owned_authorized_keys_file = 0;
|
||||
|
||||
#if ! HAVE___PROGNAME || HAVE_BUNDLE
|
||||
@@ -161,15 +160,13 @@
|
||||
goto cleanexit;
|
||||
}
|
||||
|
||||
- if(authorized_keys_file_input && user) {
|
||||
- /*
|
||||
- * user is the name of the target-user, and so must be used for validating the authorized_keys file
|
||||
- */
|
||||
- parse_authorized_key_file(user, authorized_keys_file_input);
|
||||
- } else {
|
||||
- pamsshagentauth_verbose("Using default file=/etc/security/authorized_keys");
|
||||
- authorized_keys_file = pamsshagentauth_xstrdup("/etc/security/authorized_keys");
|
||||
- }
|
||||
+ if (!authorized_keys_file_input || !user)
|
||||
+ authorized_keys_file_input = "/etc/security/authorized_keys";
|
||||
+
|
||||
+ /*
|
||||
+ * user is the name of the target-user, and so must be used for validating the authorized_keys file
|
||||
+ */
|
||||
+ parse_authorized_key_files(user, authorized_keys_file_input);
|
||||
|
||||
/*
|
||||
* PAM_USER and PAM_RUSER do not necessarily have to get set by the calling application, and we may be unable to divine the latter.
|
||||
@@ -177,16 +174,17 @@
|
||||
*/
|
||||
|
||||
if(user && strlen(ruser) > 0) {
|
||||
- pamsshagentauth_verbose("Attempting authentication: `%s' as `%s' using %s", ruser, user, authorized_keys_file);
|
||||
+ pamsshagentauth_verbose("Attempting authentication: `%s' as `%s' using %s", ruser, user, authorized_keys_file_input);
|
||||
|
||||
/*
|
||||
* this pw_uid is used to validate the SSH_AUTH_SOCK, and so must be the uid of the ruser invoking the program, not the target-user
|
||||
*/
|
||||
- if(pamsshagentauth_find_authorized_keys(getpwnam(ruser)->pw_uid)) {
|
||||
- pamsshagentauth_logit("Authenticated: `%s' as `%s' using %s", ruser, user, authorized_keys_file);
|
||||
+ const char *key_file;
|
||||
+ if((key_file = pamsshagentauth_find_authorized_keys(getpwnam(ruser)->pw_uid))) {
|
||||
+ pamsshagentauth_logit("Authenticated: `%s' as `%s' using %s", ruser, user, key_file);
|
||||
retval = PAM_SUCCESS;
|
||||
} else {
|
||||
- pamsshagentauth_logit("Failed Authentication: `%s' as `%s' using %s", ruser, user, authorized_keys_file);
|
||||
+ pamsshagentauth_logit("Failed Authentication: `%s' as `%s' using %s", ruser, user, authorized_keys_file_input);
|
||||
}
|
||||
} else {
|
||||
pamsshagentauth_logit("No %s specified, cannot continue with this form of authentication", (user) ? "ruser" : "user" );
|
||||
@@ -198,7 +196,7 @@
|
||||
free(__progname);
|
||||
#endif
|
||||
|
||||
- free(authorized_keys_file);
|
||||
+ free_authorized_key_files();
|
||||
|
||||
return retval;
|
||||
}
|
||||
diff -ru -x '*~' pam_ssh_agent_auth-0.9.4-orig/pam_ssh_agent_auth.pod pam_ssh_agent_auth-0.9.4/pam_ssh_agent_auth.pod
|
||||
--- pam_ssh_agent_auth-0.9.4-orig/pam_ssh_agent_auth.pod 2012-06-28 01:47:49.000000000 +0000
|
||||
+++ pam_ssh_agent_auth-0.9.4/pam_ssh_agent_auth.pod 2012-12-17 19:52:35.968965448 +0000
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
=item file=<path to authorized_keys>
|
||||
|
||||
-Specify the path to the authorized_keys file(s) you would like to use for authentication. Subject to tilde and % EXPANSIONS (below)
|
||||
+Specify the path(s) to the authorized_keys file(s) you would like to use for authentication. Subject to tilde and % EXPANSIONS (below). Paths are separated using colons.
|
||||
|
||||
=item allow_user_owned_authorized_keys_file
|
||||
|
||||
diff -ru -x '*~' pam_ssh_agent_auth-0.9.4-orig/pam_user_authorized_keys.c pam_ssh_agent_auth-0.9.4/pam_user_authorized_keys.c
|
||||
--- pam_ssh_agent_auth-0.9.4-orig/pam_user_authorized_keys.c 2012-06-28 01:47:49.000000000 +0000
|
||||
+++ pam_ssh_agent_auth-0.9.4/pam_user_authorized_keys.c 2012-12-17 19:32:20.830157313 +0000
|
||||
@@ -79,66 +79,96 @@
|
||||
|
||||
#include "identity.h"
|
||||
#include "pam_user_key_allowed2.h"
|
||||
+#include "pam_user_authorized_keys.h"
|
||||
|
||||
-extern char *authorized_keys_file;
|
||||
+#define MAX_AUTHORIZED_KEY_FILES 16
|
||||
+
|
||||
+char *authorized_keys_files[MAX_AUTHORIZED_KEY_FILES];
|
||||
+unsigned int nr_authorized_keys_files = 0;
|
||||
extern uint8_t allow_user_owned_authorized_keys_file;
|
||||
uid_t authorized_keys_file_allowed_owner_uid;
|
||||
|
||||
void
|
||||
-parse_authorized_key_file(const char *user, const char *authorized_keys_file_input)
|
||||
+parse_authorized_key_files(const char *user, const char *authorized_keys_file_input)
|
||||
{
|
||||
- char fqdn[HOST_NAME_MAX] = "";
|
||||
+ const char *pos = authorized_keys_file_input;
|
||||
char hostname[HOST_NAME_MAX] = "";
|
||||
- char auth_keys_file_buf[4096] = "";
|
||||
- char *slash_ptr = NULL;
|
||||
- char owner_uname[128] = "";
|
||||
- size_t owner_uname_len = 0;
|
||||
-
|
||||
- /*
|
||||
- * temporary copy, so that both tilde expansion and percent expansion both get to apply to the path
|
||||
- */
|
||||
- strncat(auth_keys_file_buf, authorized_keys_file_input, sizeof(auth_keys_file_buf) - 1);
|
||||
+ char fqdn[HOST_NAME_MAX] = "";
|
||||
+
|
||||
+#if HAVE_GETHOSTNAME
|
||||
+ *hostname = '\0';
|
||||
+ gethostname(fqdn, HOST_NAME_MAX);
|
||||
+ strncat(hostname, fqdn, strcspn(fqdn,"."));
|
||||
+#endif
|
||||
|
||||
- if(allow_user_owned_authorized_keys_file)
|
||||
- authorized_keys_file_allowed_owner_uid = getpwnam(user)->pw_uid;
|
||||
+ while (pos) {
|
||||
+ const char *colon = strchr(pos, ':');
|
||||
+ char auth_keys_file_buf[4096] = "";
|
||||
+ char *slash_ptr = NULL;
|
||||
+ char owner_uname[128] = "";
|
||||
+ size_t owner_uname_len = 0;
|
||||
+
|
||||
+ strncat(auth_keys_file_buf, pos, sizeof(auth_keys_file_buf) - 1);
|
||||
+ if (colon) {
|
||||
+ auth_keys_file_buf[colon - pos] = 0;
|
||||
+ pos = colon + 1;
|
||||
+ } else {
|
||||
+ pos = 0;
|
||||
+ }
|
||||
|
||||
- if(*auth_keys_file_buf == '~') {
|
||||
- if(*(auth_keys_file_buf+1) == '/') {
|
||||
+ if(allow_user_owned_authorized_keys_file)
|
||||
authorized_keys_file_allowed_owner_uid = getpwnam(user)->pw_uid;
|
||||
+
|
||||
+ if(*auth_keys_file_buf == '~') {
|
||||
+ if(*(auth_keys_file_buf+1) == '/') {
|
||||
+ authorized_keys_file_allowed_owner_uid = getpwnam(user)->pw_uid;
|
||||
+ }
|
||||
+ else {
|
||||
+ slash_ptr = strchr(auth_keys_file_buf,'/');
|
||||
+ if(!slash_ptr)
|
||||
+ pamsshagentauth_fatal("cannot expand tilde in path without a `/'");
|
||||
+
|
||||
+ owner_uname_len = slash_ptr - auth_keys_file_buf - 1;
|
||||
+ if(owner_uname_len > (sizeof(owner_uname) - 1) )
|
||||
+ pamsshagentauth_fatal("Username too long");
|
||||
+
|
||||
+ strncat(owner_uname, auth_keys_file_buf + 1, owner_uname_len);
|
||||
+ if(!authorized_keys_file_allowed_owner_uid)
|
||||
+ authorized_keys_file_allowed_owner_uid = getpwnam(owner_uname)->pw_uid;
|
||||
+ }
|
||||
+ char *tmp = pamsshagentauth_tilde_expand_filename(auth_keys_file_buf, authorized_keys_file_allowed_owner_uid);
|
||||
+ strncpy(auth_keys_file_buf, tmp, sizeof(auth_keys_file_buf) - 1 );
|
||||
+ pamsshagentauth_xfree(tmp);
|
||||
}
|
||||
- else {
|
||||
- slash_ptr = strchr(auth_keys_file_buf,'/');
|
||||
- if(!slash_ptr)
|
||||
- pamsshagentauth_fatal("cannot expand tilde in path without a `/'");
|
||||
-
|
||||
- owner_uname_len = slash_ptr - auth_keys_file_buf - 1;
|
||||
- if(owner_uname_len > (sizeof(owner_uname) - 1) )
|
||||
- pamsshagentauth_fatal("Username too long");
|
||||
-
|
||||
- strncat(owner_uname, auth_keys_file_buf + 1, owner_uname_len);
|
||||
- if(!authorized_keys_file_allowed_owner_uid)
|
||||
- authorized_keys_file_allowed_owner_uid = getpwnam(owner_uname)->pw_uid;
|
||||
+
|
||||
+ if(strstr(auth_keys_file_buf, "%h")) {
|
||||
+ authorized_keys_file_allowed_owner_uid = getpwnam(user)->pw_uid;
|
||||
}
|
||||
- authorized_keys_file = pamsshagentauth_tilde_expand_filename(auth_keys_file_buf, authorized_keys_file_allowed_owner_uid);
|
||||
- strncpy(auth_keys_file_buf, authorized_keys_file, sizeof(auth_keys_file_buf) - 1 );
|
||||
- pamsshagentauth_xfree(authorized_keys_file) /* when we percent_expand later, we'd step on this, so free it immediately */;
|
||||
- }
|
||||
|
||||
- if(strstr(auth_keys_file_buf, "%h")) {
|
||||
- authorized_keys_file_allowed_owner_uid = getpwnam(user)->pw_uid;
|
||||
+ if (nr_authorized_keys_files >= MAX_AUTHORIZED_KEY_FILES)
|
||||
+ pamsshagentauth_fatal("Too many authorized key files");
|
||||
+ authorized_keys_files[nr_authorized_keys_files++] =
|
||||
+ pamsshagentauth_percent_expand(auth_keys_file_buf, "h", getpwnam(user)->pw_dir, "H", hostname, "f", fqdn, "u", user, NULL);
|
||||
}
|
||||
+}
|
||||
|
||||
-#if HAVE_GETHOSTNAME
|
||||
- *hostname = '\0';
|
||||
- gethostname(fqdn, HOST_NAME_MAX);
|
||||
- strncat(hostname, fqdn, strcspn(fqdn,"."));
|
||||
-#endif
|
||||
- authorized_keys_file = pamsshagentauth_percent_expand(auth_keys_file_buf, "h", getpwnam(user)->pw_dir, "H", hostname, "f", fqdn, "u", user, NULL);
|
||||
+void
|
||||
+free_authorized_key_files()
|
||||
+{
|
||||
+ unsigned int n;
|
||||
+ for (n = 0; n < nr_authorized_keys_files; n++)
|
||||
+ free(authorized_keys_files[n]);
|
||||
+ nr_authorized_keys_files = 0;
|
||||
}
|
||||
|
||||
-int
|
||||
+const char *
|
||||
pam_user_key_allowed(Key * key)
|
||||
{
|
||||
- return pam_user_key_allowed2(getpwuid(authorized_keys_file_allowed_owner_uid), key, authorized_keys_file)
|
||||
- || pam_user_key_allowed2(getpwuid(0), key, authorized_keys_file);
|
||||
+ unsigned int n;
|
||||
+ for (n = 0; n < nr_authorized_keys_files; n++) {
|
||||
+ if (pam_user_key_allowed2(getpwuid(authorized_keys_file_allowed_owner_uid), key, authorized_keys_files[n])
|
||||
+ || pam_user_key_allowed2(getpwuid(0), key, authorized_keys_files[n]))
|
||||
+ return authorized_keys_files[n];
|
||||
+ }
|
||||
+ return 0;
|
||||
}
|
||||
diff -ru -x '*~' pam_ssh_agent_auth-0.9.4-orig/pam_user_authorized_keys.h pam_ssh_agent_auth-0.9.4/pam_user_authorized_keys.h
|
||||
--- pam_ssh_agent_auth-0.9.4-orig/pam_user_authorized_keys.h 2010-01-13 02:17:01.000000000 +0000
|
||||
+++ pam_ssh_agent_auth-0.9.4/pam_user_authorized_keys.h 2012-12-17 19:24:34.477894517 +0000
|
||||
@@ -28,11 +28,12 @@
|
||||
*/
|
||||
|
||||
|
||||
-#ifndef _PAM_USER_KEY_ALLOWED_H
|
||||
-#define _PAM_USER_KEY_ALLOWED_H
|
||||
+#ifndef _PAM_USER_AUTHORIZED_KEYS_H
|
||||
+#define _PAM_USER_AUTHORIZED_KEYS_H
|
||||
|
||||
#include "identity.h"
|
||||
-int pam_user_key_allowed(Key *);
|
||||
-void parse_authorized_key_file(const char *, const char *);
|
||||
+const char * pam_user_key_allowed(Key *);
|
||||
+void parse_authorized_key_files(const char *, const char *);
|
||||
+void free_authorized_key_files();
|
||||
|
||||
#endif
|
||||
diff -ru -x '*~' pam_ssh_agent_auth-0.9.4-orig/userauth_pubkey_from_id.c pam_ssh_agent_auth-0.9.4/userauth_pubkey_from_id.c
|
||||
--- pam_ssh_agent_auth-0.9.4-orig/userauth_pubkey_from_id.c 2012-06-28 01:47:49.000000000 +0000
|
||||
+++ pam_ssh_agent_auth-0.9.4/userauth_pubkey_from_id.c 2012-12-17 19:27:30.813843933 +0000
|
||||
@@ -51,7 +51,7 @@
|
||||
extern u_char *session_id2;
|
||||
extern uint8_t session_id_len;
|
||||
|
||||
-int
|
||||
+const char *
|
||||
userauth_pubkey_from_id(Identity * id)
|
||||
{
|
||||
Buffer b = { 0 };
|
||||
@@ -59,11 +59,12 @@
|
||||
u_char *pkblob = NULL, *sig = NULL;
|
||||
u_int blen = 0, slen = 0;
|
||||
int authenticated = 0;
|
||||
+ const char *key_file;
|
||||
|
||||
pkalg = (char *) key_ssh_name(id->key);
|
||||
|
||||
/* first test if this key is even allowed */
|
||||
- if(! pam_user_key_allowed(id->key))
|
||||
+ if(!(key_file = pam_user_key_allowed(id->key)))
|
||||
goto user_auth_clean_exit;
|
||||
|
||||
if(pamsshagentauth_key_to_blob(id->key, &pkblob, &blen) == 0)
|
||||
@@ -96,5 +97,5 @@
|
||||
if(pkblob != NULL)
|
||||
pamsshagentauth_xfree(pkblob);
|
||||
CRYPTO_cleanup_all_ex_data();
|
||||
- return authenticated;
|
||||
+ return authenticated ? key_file : 0;
|
||||
}
|
||||
diff -ru -x '*~' pam_ssh_agent_auth-0.9.4-orig/userauth_pubkey_from_id.h pam_ssh_agent_auth-0.9.4/userauth_pubkey_from_id.h
|
||||
--- pam_ssh_agent_auth-0.9.4-orig/userauth_pubkey_from_id.h 2010-01-13 02:17:01.000000000 +0000
|
||||
+++ pam_ssh_agent_auth-0.9.4/userauth_pubkey_from_id.h 2012-12-17 19:25:54.893412987 +0000
|
||||
@@ -32,6 +32,6 @@
|
||||
#define _USERAUTH_PUBKEY_FROM_ID_H
|
||||
|
||||
#include <identity.h>
|
||||
-int userauth_pubkey_from_id(Identity *);
|
||||
+const char * userauth_pubkey_from_id(Identity *);
|
||||
|
||||
#endif
|
||||
@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "nixos";
|
||||
repo = "systemd";
|
||||
rev = "9a35924a4f15dab2a84b3104b1cd125a3c36f77d";
|
||||
sha256 = "1z3rishvjlr5d4qgd262r13z04vzvlrlgwm7kpsf4hk7w0gmz4i5";
|
||||
rev = "c110fc3504d7a2fa944575b347814f7e97d3c5a0";
|
||||
sha256 = "19carch1adad70nifbqdx649kj5m8pgpiq27hh05ig38yrbmb2vz";
|
||||
};
|
||||
|
||||
outputs = [ "out" "lib" "man" "dev" ];
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, openssl, zlib }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ircd-hybrid-8.2.2";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ircd-hybrid-8.2.21";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/ircd-hybrid/ircd-hybrid-8.2.2.tgz;
|
||||
sha256 = "0k9w2mxgi03cpnmagshcr5v6qjgnmyidf966b50dd6yn1fgqcibm";
|
||||
url = "mirror://sourceforge/ircd-hybrid/${name}.tgz";
|
||||
sha256 = "19cgrgmmz1c72x4gxpd39f9ckm4j9cp1gpgvlkk73d3v13znfzy3";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl zlib ];
|
||||
@ -18,5 +18,6 @@ stdenv.mkDerivation {
|
||||
meta = {
|
||||
description = "An IPv6-capable IRC server";
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
homepage = "http://www.ircd-hybrid.org/";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, zlib, openssl, pam, libiconv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ngircd-21";
|
||||
name = "ngircd-24";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ngircd.barton.de/pub/ngircd/${name}.tar.xz";
|
||||
sha256 = "19llx54zy6hc8k7kcs1f234qc20mqpnlnb30c663c42jxq5x6xii";
|
||||
sha256 = "020h9d1awyxqr0l42x1fhs47q7cmm17fdxzjish8p2kq23ma0gqp";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@ -1,19 +1,19 @@
|
||||
{ fetchurl, stdenv, ncurses, curl, pkgconfig, gnutls, readline
|
||||
, openssl, perl, sqlite, libjpeg, libzrtpcpp, speex, pcre
|
||||
, openssl, perl, sqlite, libjpeg, speex, pcre
|
||||
, ldns, libedit, yasm, which, lua, libopus, libsndfile }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "freeswitch-1.6.9";
|
||||
name = "freeswitch-1.6.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://files.freeswitch.org/freeswitch-releases/${name}.tar.bz2";
|
||||
sha256 = "0g0x4m8rb2ybpxwrszb4w37rb10v9fbszm7l2skjakf4dx0gw5i7";
|
||||
sha256 = "071g7229shr9srwzspx29fcx3ccj3rwakkydpc4vdf1q3lldd2ld";
|
||||
};
|
||||
postPatch = "patchShebangs libs/libvpx/build/make/rtcd.pl";
|
||||
|
||||
buildInputs = [
|
||||
ncurses curl pkgconfig gnutls readline openssl perl libjpeg
|
||||
sqlite libzrtpcpp pcre speex ldns libedit yasm which lua libopus
|
||||
openssl ncurses curl pkgconfig gnutls readline perl libjpeg
|
||||
sqlite pcre speex ldns libedit yasm which lua libopus
|
||||
libsndfile
|
||||
];
|
||||
|
||||
|
||||
@ -2,16 +2,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "uftp-${version}";
|
||||
version = "4.9.2";
|
||||
version = "4.9.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/uftp-multicast/source-tar/uftp-${version}.tar.gz";
|
||||
sha256 = "0pra2sm8rdscyqkagi2v99az1vxbcch47wkdnz9wv4qg1x5phpmr";
|
||||
sha256 = "13y7k6g6jksnllw0mwgzw4dqczh5c5hvq3zlqin7q98m0fpib4ly";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
];
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, libX11, guile }:
|
||||
{ stdenv, fetchurl, pkgconfig, libX11, guile }:
|
||||
|
||||
let version = "1.8.6"; in
|
||||
stdenv.mkDerivation {
|
||||
@ -8,6 +8,7 @@ stdenv.mkDerivation {
|
||||
sha256 = "060df6d8y727jp1inp7blp44cs8a7jig7vcm8ndsn6gw36z1h3bc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ libX11 guile ];
|
||||
|
||||
meta = {
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
python2Packages.buildPythonApplication rec {
|
||||
name = "certbot-${version}";
|
||||
version = "0.9.3";
|
||||
version = "0.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "certbot";
|
||||
repo = "certbot";
|
||||
rev = "v${version}";
|
||||
sha256 = "03yfr8vlq62l0h14qk03flrkbvbv9mc5cf6rmh37naj8jwpl8cic";
|
||||
sha256 = "0f8s6wzj69gnqld6iaskmmwyg5zy5v3zwhp1n1izxixm0vhkzgrq";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python2Packages; [
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ stdenv, fetchFromGitHub
|
||||
, autoreconfHook, pkgconfig
|
||||
, fuse, curl, expat }:
|
||||
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "s3backer-${version}";
|
||||
version = "1.4.2";
|
||||
|
||||
version = "1.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
sha256 = "0b9vmykrfpzs9is31pqb8xvgjraghnax1ph2jkbib1ya0vhxm8dj";
|
||||
sha256 = "0fhkha5kap8dji3iy48cbszhq83b2anssscgjj9d5dsl5dj57zak";
|
||||
rev = version;
|
||||
repo = "s3backer";
|
||||
owner = "archiecobbs";
|
||||
|
||||
@ -8,7 +8,9 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "178nn4dl7wbcw499czikirnkniwnx36argdnqgz4ik9i6zvwkm6y";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ coreutils ];
|
||||
patches = [ ./memory-leak.patch ];
|
||||
|
||||
buildInputs = [ coreutils ]; # bin/updatedb script needs to call sort
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
|
||||
21
pkgs/tools/misc/findutils/memory-leak.patch
Normal file
21
pkgs/tools/misc/findutils/memory-leak.patch
Normal file
@ -0,0 +1,21 @@
|
||||
http://git.savannah.gnu.org/cgit/findutils.git/patch/?id=c1556892a
|
||||
diff --git a/find/fstype.c b/find/fstype.c
|
||||
index 535f920..a0ac8bc 100644
|
||||
--- a/find/fstype.c
|
||||
+++ b/find/fstype.c
|
||||
@@ -75,14 +75,7 @@ free_file_system_list (struct mount_entry *p)
|
||||
while (p)
|
||||
{
|
||||
struct mount_entry *pnext = p->me_next;
|
||||
-
|
||||
- free (p->me_devname);
|
||||
- free (p->me_mountdir);
|
||||
-
|
||||
- if (p->me_type_malloced)
|
||||
- free (p->me_type);
|
||||
- p->me_next = NULL;
|
||||
- free (p);
|
||||
+ free_mount_entry (p);
|
||||
p = pnext;
|
||||
}
|
||||
}
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
let
|
||||
pname = "kronometer";
|
||||
version = "2.1.0";
|
||||
version = "2.1.3";
|
||||
unwrapped = kdeDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
|
||||
sha256 = "1nh7y4c13rscy55f5n8s2v8jij27b55rwkxh9g8r0p7mdwmw8vri";
|
||||
sha256 = "1z06gvaacm3d3a9smlmgg2vf0jdab5kqxx24r6v7iprqzgdpsn4i";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, libpcap, openssl, zlib, wirelesstools, libnl, pkgconfig }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "aircrack-ng-1.2-rc3";
|
||||
name = "aircrack-ng-1.2-rc4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.aircrack-ng.org/${name}.tar.gz";
|
||||
sha256 = "11a53acln0fpar6v75qlybzdg8hdwc9ssd06fxygr47yp755qncf";
|
||||
sha256 = "0dpzx9kddxpgzmgvdpl3rxn0jdaqhm5wxxndp1xd7d75mmmc2fnr";
|
||||
};
|
||||
|
||||
buildInputs = [ libpcap openssl zlib libnl pkgconfig ];
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with stdenv.lib;
|
||||
|
||||
let repo = "openfortivpn";
|
||||
version = "1.1.4";
|
||||
version = "1.2.0";
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
name = "${repo}-${version}";
|
||||
@ -12,12 +12,12 @@ in stdenv.mkDerivation {
|
||||
owner = "adrienverge";
|
||||
inherit repo;
|
||||
rev = "v${version}";
|
||||
sha256 = "08ycz053wa29ckgr93132hr3vrd84r3bks9q807qanri0n35y256";
|
||||
sha256 = "1a1l9f6zivfyxg9g2x7kzkvcyh84s7l6v0kimihhrd19zl0m41jn";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl ppp autoreconfHook ];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=unused-function";
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace src/tunnel.c --replace "/usr/sbin/pppd" "${ppp}/bin/pppd"
|
||||
|
||||
@ -1,17 +1,15 @@
|
||||
{ stdenv, fetchurl, openssl, readline }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "socat-1.7.3.1";
|
||||
name = "socat-1.7.3.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.dest-unreach.org/socat/download/${name}.tar.bz2";
|
||||
sha256 = "1apvi7sahcl44arnq1ad2y6lbfqnmvx7nhz9i3rkk0f382anbnnj";
|
||||
sha256 = "0lcj6zpra33xhgvhmz9l3cqz10v8ybafb8dd1yqkwf1rhy01ymp3";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl readline ];
|
||||
|
||||
patches = [ ./enable-ecdhe.patch ./libressl-fixes.patch ];
|
||||
|
||||
hardeningEnable = [ "pie" ];
|
||||
|
||||
meta = {
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
--- socat-1.7.3.0/xio-openssl.c 2015-01-24 15:33:42.000000000 +0100
|
||||
+++ socat-1.7.3.0-ecdhe/xio-openssl.c 2015-01-25 13:38:54.353641097 +0100
|
||||
@@ -960,7 +960,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
-#if defined(EC_KEY) /* not on Openindiana 5.11 */
|
||||
{
|
||||
/* see http://openssl.6102.n7.nabble.com/Problem-with-cipher-suite-ECDHE-ECDSA-AES256-SHA384-td42229.html */
|
||||
int nid;
|
||||
@@ -982,7 +981,6 @@
|
||||
|
||||
SSL_CTX_set_tmp_ecdh(*ctx, ecdh);
|
||||
}
|
||||
-#endif /* !defined(EC_KEY) */
|
||||
|
||||
#if OPENSSL_VERSION_NUMBER >= 0x00908000L
|
||||
if (opt_compress) {
|
||||
|
||||
@ -1,19 +1,21 @@
|
||||
{ stdenv, lib, fetchFromGitHub, pkgconfig, openssl, curl, libxml2, libxslt, asciidoc, docbook_xsl }:
|
||||
{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig
|
||||
, openssl, curl, libxml2, libxslt, asciidoc, docbook_xsl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "lastpass-cli-${version}";
|
||||
|
||||
version = "1.0.0";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lastpass";
|
||||
repo = "lastpass-cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "0hidx2qfr52bwjb6as4fbfa34jqh3zwvrcx590vbsji3bq4g7avb";
|
||||
sha256 = "1slqrv877c1bhivgd2i9cr1lsd72371dpz6a3h6s56l3qbyk28sa";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
buildInputs = [
|
||||
openssl curl libxml2 pkgconfig asciidoc docbook_xsl libxslt
|
||||
openssl curl libxml2 asciidoc docbook_xsl libxslt
|
||||
];
|
||||
|
||||
makeFlags = "PREFIX=$(out)";
|
||||
|
||||
@ -7,13 +7,13 @@ with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "tcpcrypt-${version}";
|
||||
version = "0.4";
|
||||
version = "0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "tcpcrypt";
|
||||
owner = "scslab";
|
||||
rev = "v${version}";
|
||||
sha256 = "04n1qpf4x8x289xa7jndmx99xp0lbxjzjw013kf64i1n70i9wbnp";
|
||||
sha256 = "0a015rlyvagz714pgwr85f8gjq1fkc0il7d7l39qcgxrsp15b96w";
|
||||
};
|
||||
|
||||
postUnpack = ''mkdir -vp $sourceRoot/m4'';
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
{ stdenv, fetchurl, fetchFromGitHub, autoconf, automake, libtool, pcre
|
||||
{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pcre
|
||||
, withCrypto ? true, openssl
|
||||
, enableMagic ? true, file
|
||||
, enableCuckoo ? true, jansson
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.4.0";
|
||||
version = "3.5.0";
|
||||
name = "yara-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "plusvic";
|
||||
owner = "VirusTotal";
|
||||
repo = "yara";
|
||||
rev = "v${version}";
|
||||
sha256 = "1rv1xixbjqx1vkcij8r01rq08ncqgy6nn98xvkrpixwvi4fy956s";
|
||||
sha256 = "18hn6acfj0cha9cv70f6hyaqf8qbgj0c0dm9db4v2q8z7cgi1681";
|
||||
};
|
||||
|
||||
# FIXME: this is probably not the right way to make it work
|
||||
@ -34,10 +34,6 @@ stdenv.mkDerivation rec {
|
||||
EOF
|
||||
'';
|
||||
patches = [
|
||||
(fetchurl {
|
||||
url = "https://github.com/plusvic/yara/pull/261.diff";
|
||||
sha256 = "1fkxnk84ryvrjq7p225xvw9pn5gm2bjia2jz38fclwbsaxdi6p3b";
|
||||
})
|
||||
"staticlibrary.patch"
|
||||
];
|
||||
|
||||
|
||||
@ -2,9 +2,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "facter-${version}";
|
||||
version = "3.5.1";
|
||||
version = "3.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
sha256 = "1rhfww0knjh6bj3b0ykxgfgw6rg2bzibkdrisq3nhl3djfq7r1a8";
|
||||
sha256 = "1fwvjd84nw39lgclkz4kn90z84fs9lsama3ikq0qs1in3y3jfmvi";
|
||||
rev = version;
|
||||
repo = "facter";
|
||||
owner = "puppetlabs";
|
||||
@ -24,5 +25,4 @@ stdenv.mkDerivation rec {
|
||||
maintainers = [ maintainers.womfoo ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
let
|
||||
pkgname = "ipmitool";
|
||||
version = "1.8.15";
|
||||
version = "1.8.17";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "${pkgname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pkgname}/${pkgname}-${version}.tar.gz";
|
||||
sha256 = "0y6g8xg9p854n7xm3kds8m3d53jrsllnknp8lcr3jscf99j4x5ph";
|
||||
sha256 = "0qcrz1d1dbjg46n3fj6viglzcxlf2q15xa7bx9w1hm2hq1r3jzbi";
|
||||
};
|
||||
|
||||
patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
|
||||
@ -7100,6 +7100,11 @@ with pkgs;
|
||||
dbus_libs = dbus;
|
||||
dbus_daemon = dbus.daemon;
|
||||
|
||||
makeDBusConf = { suidHelper, serviceDirectories }:
|
||||
callPackage ../development/libraries/dbus/make-dbus-conf.nix {
|
||||
inherit suidHelper serviceDirectories;
|
||||
};
|
||||
|
||||
dee = callPackage ../development/libraries/dee { };
|
||||
|
||||
dhex = callPackage ../applications/editors/dhex { };
|
||||
@ -8747,8 +8752,6 @@ with pkgs;
|
||||
|
||||
libzdb = callPackage ../development/libraries/libzdb { };
|
||||
|
||||
libzrtpcpp = callPackage ../development/libraries/libzrtpcpp { };
|
||||
|
||||
libwacom = callPackage ../development/libraries/libwacom { };
|
||||
|
||||
lightning = callPackage ../development/libraries/lightning { };
|
||||
@ -9036,7 +9039,7 @@ with pkgs;
|
||||
|
||||
openslp = callPackage ../development/libraries/openslp {};
|
||||
|
||||
libressl = libressl_2_5;
|
||||
libressl = libressl_2_4;
|
||||
libressl_2_4 = callPackage ../development/libraries/libressl/2.4.nix {
|
||||
fetchurl = fetchurlBoot;
|
||||
};
|
||||
@ -10360,7 +10363,9 @@ with pkgs;
|
||||
|
||||
freeradius = callPackage ../servers/freeradius { };
|
||||
|
||||
freeswitch = callPackage ../servers/sip/freeswitch { };
|
||||
freeswitch = callPackage ../servers/sip/freeswitch {
|
||||
openssl = openssl_1_0_2;
|
||||
};
|
||||
|
||||
gatling = callPackage ../servers/http/gatling { };
|
||||
|
||||
@ -14960,10 +14965,6 @@ with pkgs;
|
||||
|
||||
setbfree = callPackage ../applications/audio/setbfree { };
|
||||
|
||||
sflphone = callPackage ../applications/networking/instant-messengers/sflphone {
|
||||
gtk = gtk3;
|
||||
};
|
||||
|
||||
shfmt = callPackage ../tools/text/shfmt { };
|
||||
|
||||
shutter = callPackage ../applications/graphics/shutter { };
|
||||
@ -15364,8 +15365,6 @@ with pkgs;
|
||||
|
||||
twmn = qt5.callPackage ../applications/misc/twmn { };
|
||||
|
||||
twinkle = callPackage ../applications/networking/instant-messengers/twinkle { };
|
||||
|
||||
umurmur = callPackage ../applications/networking/umurmur { };
|
||||
|
||||
unigine-valley = callPackage ../applications/graphics/unigine-valley { };
|
||||
|
||||
@ -1555,10 +1555,10 @@ let self = _self // overrides; _self = with self; {
|
||||
};
|
||||
|
||||
CGI = buildPerlPackage rec {
|
||||
name = "CGI-4.31";
|
||||
name = "CGI-4.35";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/L/LE/LEEJO/${name}.tar.gz";
|
||||
sha256 = "dee34f45525efb698d02c56ba2458a72acc34c4dcb05344706b587840b4e8c99";
|
||||
sha256 = "07gwnlc7vq58fjwmfsrv0hfyirqqdrpjhf89caq34rjrkz2wsd0b";
|
||||
};
|
||||
buildInputs = [ TestDeep TestWarn ];
|
||||
propagatedBuildInputs = [ HTMLParser self."if" ];
|
||||
@ -2696,10 +2696,10 @@ let self = _self // overrides; _self = with self; {
|
||||
};
|
||||
|
||||
CryptOpenSSLRandom = buildPerlPackage rec {
|
||||
name = "Crypt-OpenSSL-Random-0.10";
|
||||
name = "Crypt-OpenSSL-Random-0.11";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz";
|
||||
sha256 = "12pirh1pj8lpvzcwj2if9i6dbr6a7s9g1zc7gzbd3v87d6mx0rdf";
|
||||
sha256 = "0yjcabkibrkafywvdkmd1xpi6br48skyk3l15ni176wvlg38335v";
|
||||
};
|
||||
NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include";
|
||||
NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto";
|
||||
|
||||
@ -12,14 +12,14 @@ let
|
||||
let
|
||||
pythonAtLeast = versionAtLeast python.pythonVersion;
|
||||
pythonOlder = versionOlder python.pythonVersion;
|
||||
isPy26 = python.majorVersion == "2.6";
|
||||
isPy27 = python.majorVersion == "2.7";
|
||||
isPy33 = python.majorVersion == "3.3";
|
||||
isPy34 = python.majorVersion == "3.4";
|
||||
isPy35 = python.majorVersion == "3.5";
|
||||
isPy36 = python.majorVersion == "3.6";
|
||||
isPy26 = python.pythonVersion == "2.6";
|
||||
isPy27 = python.pythonVersion == "2.7";
|
||||
isPy33 = python.pythonVersion == "3.3";
|
||||
isPy34 = python.pythonVersion == "3.4";
|
||||
isPy35 = python.pythonVersion == "3.5";
|
||||
isPy36 = python.pythonVersion == "3.6";
|
||||
isPyPy = python.executable == "pypy";
|
||||
isPy3k = strings.substring 0 1 python.majorVersion == "3";
|
||||
isPy3k = strings.substring 0 1 python.pythonVersion == "3";
|
||||
|
||||
callPackage = pkgs.newScope self;
|
||||
|
||||
@ -3148,12 +3148,9 @@ in {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = https://github.com/boto3/boto;
|
||||
|
||||
homepage = https://github.com/boto/boto3;
|
||||
license = stdenv.lib.licenses.asl20;
|
||||
|
||||
description = "AWS SDK for Python";
|
||||
|
||||
longDescription = ''
|
||||
Boto3 is the Amazon Web Services (AWS) Software Development Kit (SDK) for
|
||||
Python, which allows Python developers to write software that makes use of
|
||||
@ -4519,11 +4516,11 @@ in {
|
||||
cryptography = buildPythonPackage rec {
|
||||
# also bump cryptography_vectors
|
||||
name = "cryptography-${version}";
|
||||
version = "1.5.3";
|
||||
version = "1.7.2";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/c/cryptography/${name}.tar.gz";
|
||||
sha256 = "cf82ddac919b587f5e44247579b433224cc2e03332d2ea4d89aa70d7e6b64ae5";
|
||||
sha256 = "1ad9zmzi31fnz31qfchxcwiydvlxq88xndlgsvzr7m537n5vd347";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgs.openssl self.pretend self.cryptography_vectors
|
||||
@ -4540,11 +4537,11 @@ in {
|
||||
cryptography_vectors = buildPythonPackage rec {
|
||||
# also bump cryptography
|
||||
name = "cryptography_vectors-${version}";
|
||||
version = "1.5.3";
|
||||
version = "1.7.2";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/c/cryptography-vectors/${name}.tar.gz";
|
||||
sha256 = "e513fecd146a844da19022abd1b4dfbf3335c1941464988f501d7a16f30acdae";
|
||||
sha256 = "1p5cw3dzgcpzmp81qb9860hn9qlcvr4rnf0fy31fbvhxl7lfxr2b";
|
||||
};
|
||||
};
|
||||
|
||||
@ -6486,27 +6483,28 @@ in {
|
||||
};
|
||||
};
|
||||
|
||||
urllib3 = buildPythonPackage rec {
|
||||
name = "urllib3-1.12";
|
||||
urllib3 = let
|
||||
disabled_tests = [
|
||||
"test_headers" "test_headerdict" "test_can_validate_ip_san" "test_delayed_body_read_timeout"
|
||||
"test_timeout_errors_cause_retries" "test_select_multiple_interrupts_with_event"
|
||||
];
|
||||
in buildPythonPackage rec {
|
||||
pname = "urllib3";
|
||||
version = "1.20";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/u/urllib3/${name}.tar.gz";
|
||||
sha256 = "1ikj72kd4cdcq7pmmcd5p6s9dvp7wi0zw01635v4xzkid5vi598f";
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0bx76if7shzlyykmaj4fhjkir5bswc4fdx5r4q0lrn3q51p2pvwp";
|
||||
};
|
||||
|
||||
doCheck = !isPy3k; # lots of transient failures
|
||||
checkPhase = ''
|
||||
# Not worth the trouble
|
||||
rm test/with_dummyserver/test_poolmanager.py
|
||||
rm test/with_dummyserver/test_proxy_poolmanager.py
|
||||
rm test/with_dummyserver/test_socketlevel.py
|
||||
# pypy: https://github.com/shazow/urllib3/issues/736
|
||||
rm test/with_dummyserver/test_connectionpool.py
|
||||
NOSE_EXCLUDE=concatStringsSep "," disabled_tests;
|
||||
|
||||
checkPhase = ''
|
||||
nosetests -v --cover-min-percentage 1
|
||||
'';
|
||||
|
||||
buildInputs = with self; [ coverage tornado mock nose ];
|
||||
buildInputs = with self; [ coverage tornado mock nose psutil pysocks ];
|
||||
|
||||
meta = {
|
||||
description = "A Python library for Dropbox's HTTP-based Core and Datastore APIs";
|
||||
@ -10996,15 +10994,20 @@ in {
|
||||
};
|
||||
|
||||
enum34 = if pythonAtLeast "3.4" then null else buildPythonPackage rec {
|
||||
name = "enum34-${version}";
|
||||
version = "1.0.4";
|
||||
pname = "enum34";
|
||||
version = "1.1.6";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/e/enum34/${name}.tar.gz";
|
||||
sha256 = "0iz4jjdvdgvfllnpmd92qxj5fnfxqpgmjpvpik0jjim3lqk9zhfk";
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1";
|
||||
};
|
||||
|
||||
buildInputs = optional isPy26 self.ordereddict;
|
||||
checkPhase = ''
|
||||
${python.interpreter} -m unittest discover
|
||||
'';
|
||||
|
||||
|
||||
meta = {
|
||||
homepage = https://pypi.python.org/pypi/enum34;
|
||||
@ -21465,11 +21468,11 @@ in {
|
||||
|
||||
pyopenssl = buildPythonPackage rec {
|
||||
name = "pyopenssl-${version}";
|
||||
version = "16.1.0";
|
||||
version = "16.2.0";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/p/pyOpenSSL/pyOpenSSL-${version}.tar.gz";
|
||||
sha256 = "88f7ada2a71daf2c78a4f139b19d57551b4c8be01f53a1cb5c86c2f3bf01355f";
|
||||
sha256 = "0vji4yrfshs15xpczbhzhasnjrwcarsqg87n98ixnyafnyxs6ybp";
|
||||
};
|
||||
|
||||
preCheck = ''
|
||||
@ -26338,14 +26341,17 @@ in {
|
||||
# # 1.0.0 and up create a circle dependency with traceback2/pbr
|
||||
doCheck = false;
|
||||
|
||||
patchPhase = ''
|
||||
postPatch = ''
|
||||
# argparse is needed for python < 2.7, which we do not support anymore.
|
||||
substituteInPlace setup.py --replace "argparse"
|
||||
|
||||
# # fixes a transient error when collecting tests, see https://bugs.launchpad.net/python-neutronclient/+bug/1508547
|
||||
sed -i '510i\ return None, False' unittest2/loader.py
|
||||
# https://github.com/pypa/packaging/pull/36
|
||||
sed -i 's/version=VERSION/version=str(VERSION)/' setup.py
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with self; [ six argparse traceback2 ];
|
||||
propagatedBuildInputs = with self; [ six traceback2 ];
|
||||
|
||||
meta = {
|
||||
description = "A backport of the new features added to the unittest testing framework";
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user