diff options
author | William A. Kennington III <william@wkennington.com> | 2015-10-15 10:22:28 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-10-15 10:22:28 -0700 |
commit | 8a44a36ca496d2c61904b22f8ba6a77ec5aa0b36 (patch) | |
tree | 90013bf1e284372e7de0ad6b3715dc5a0ea926d1 /pkgs/development/libraries | |
parent | 1283e3da5d0bc4657677d40fa3cb117b66489ee5 (diff) | |
parent | 62e676b9598d2638e846761160082f6fec392ffe (diff) | |
download | nixpkgs-8a44a36ca496d2c61904b22f8ba6a77ec5aa0b36.tar nixpkgs-8a44a36ca496d2c61904b22f8ba6a77ec5aa0b36.tar.gz nixpkgs-8a44a36ca496d2c61904b22f8ba6a77ec5aa0b36.tar.bz2 nixpkgs-8a44a36ca496d2c61904b22f8ba6a77ec5aa0b36.tar.lz nixpkgs-8a44a36ca496d2c61904b22f8ba6a77ec5aa0b36.tar.xz nixpkgs-8a44a36ca496d2c61904b22f8ba6a77ec5aa0b36.tar.zst nixpkgs-8a44a36ca496d2c61904b22f8ba6a77ec5aa0b36.zip |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/cppzmq/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/folly/default.nix | 18 | ||||
-rw-r--r-- | pkgs/development/libraries/glfw/3.x.nix | 15 | ||||
-rw-r--r-- | pkgs/development/libraries/javascript/jquery-ui/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/javascript/jquery/default.nix | 6 | ||||
-rwxr-xr-x | pkgs/development/libraries/kde-frameworks-5.13/fetchsrcs.sh | 47 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.13/srcs.nix | 549 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/attica.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/attica.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/baloo.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/baloo.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/bluez-qt.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/bluez-qt.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/default.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/extra-cmake-modules/0001-extra-cmake-modules-paths.patch (renamed from pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/0001-extra-cmake-modules-paths.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/extra-cmake-modules/default.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/extra-cmake-modules/setup-hook.sh (renamed from pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/setup-hook.sh) | 0 | ||||
-rwxr-xr-x | pkgs/development/libraries/kde-frameworks-5.14/fetchsrcs.sh | 57 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/frameworkintegration.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/frameworkintegration.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kactivities.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kapidox.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kapidox.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/karchive.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/karchive.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kauth/default.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kauth/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kauth/kauth-policy-install.patch (renamed from pkgs/development/libraries/kde-frameworks-5.13/kauth/kauth-policy-install.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kbookmarks.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kbookmarks.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kcmutils/default.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kcmutils/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kcmutils/kcmutils-pluginselector-follow-symlinks.patch (renamed from pkgs/development/libraries/kde-frameworks-5.13/kcmutils/kcmutils-pluginselector-follow-symlinks.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kcodecs.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kcodecs.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kcompletion.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kcompletion.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kconfig.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kconfig.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kconfigwidgets/default.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kconfigwidgets/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch (renamed from pkgs/development/libraries/kde-frameworks-5.13/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kcoreaddons.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kcoreaddons.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kcrash.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kcrash.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kdbusaddons.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kdbusaddons.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kdeclarative.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kdeclarative.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kded.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kded.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kdelibs4support.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kdelibs4support.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kdesignerplugin.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kdesignerplugin.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kdesu.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kdesu.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kdewebkit.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kdewebkit.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kdnssd.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kdnssd.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kdoctools/default.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kdoctools/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kdoctools/kdoctools-no-find-docbook-xml.patch (renamed from pkgs/development/libraries/kde-frameworks-5.13/kdoctools/kdoctools-no-find-docbook-xml.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kemoticons.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kemoticons.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kfilemetadata.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kfilemetadata.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kglobalaccel.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kglobalaccel.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kguiaddons.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kguiaddons.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/khtml.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/khtml.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/ki18n.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/ki18n.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kiconthemes.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kiconthemes.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kidletime.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kidletime.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kimageformats.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kimageformats.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kinit/0001-kinit-libpath.patch (renamed from pkgs/development/libraries/kde-frameworks-5.13/kinit/0001-kinit-libpath.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kinit/default.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kinit/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kio.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kio.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kitemmodels.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kitemmodels.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kitemviews.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kitemviews.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kjobwidgets.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kjobwidgets.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kjs.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kjs.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kjsembed.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kjsembed.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kmediaplayer.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kmediaplayer.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/knewstuff.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/knewstuff.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/knotifications.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/knotifications.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/knotifyconfig.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/knotifyconfig.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kpackage/0001-allow-external-paths.patch (renamed from pkgs/development/libraries/kde-frameworks-5.13/kpackage/0001-allow-external-paths.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kpackage/default.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kpackage/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kparts.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kparts.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kpeople.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kpeople.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kplotting.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kplotting.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kpty.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kpty.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kross.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kross.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/krunner.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/krunner.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kservice/default.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kservice/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kservice/kservice-kbuildsycoca-follow-symlinks.patch (renamed from pkgs/development/libraries/kde-frameworks-5.13/kservice/kservice-kbuildsycoca-follow-symlinks.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch (renamed from pkgs/development/libraries/kde-frameworks-5.13/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kservice/setup-hook.sh (renamed from pkgs/development/libraries/kde-frameworks-5.13/kservice/setup-hook.sh) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/ktexteditor/0001-no-qcoreapplication.patch (renamed from pkgs/development/libraries/kde-frameworks-5.13/ktexteditor/0001-no-qcoreapplication.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/ktexteditor/default.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/ktexteditor/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/ktextwidgets.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/ktextwidgets.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kunitconversion.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kunitconversion.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kwallet.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kwallet.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kwidgetsaddons.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kwidgetsaddons.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kwindowsystem.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kwindowsystem.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kxmlgui.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kxmlgui.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/kxmlrpcclient.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/kxmlrpcclient.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/modemmanager-qt.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/modemmanager-qt.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/networkmanager-qt.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/networkmanager-qt.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/plasma-framework/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/solid.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/solid.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/sonnet.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/sonnet.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/srcs.nix | 549 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.14/threadweaver.nix (renamed from pkgs/development/libraries/kde-frameworks-5.13/threadweaver.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/libbluray/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/libeb/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/libev/default.nix | 11 | ||||
-rw-r--r-- | pkgs/development/libraries/libev/noreturn.patch | 13 | ||||
-rw-r--r-- | pkgs/development/libraries/libmicrohttpd/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/libmp3splt/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/libnetfilter_conntrack/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/libpsl/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/libtermkey/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/libuv/default.nix | 26 | ||||
-rw-r--r-- | pkgs/development/libraries/libwps/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/neon/0.29.nix | 44 | ||||
-rw-r--r-- | pkgs/development/libraries/opensubdiv/default.nix | 47 | ||||
-rw-r--r-- | pkgs/development/libraries/pcre2/default.nix | 23 | ||||
-rw-r--r-- | pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/science/math/ipopt/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/science/math/openblas/default.nix | 15 | ||||
-rw-r--r-- | pkgs/development/libraries/science/math/openlibm/default.nix | 19 | ||||
-rw-r--r-- | pkgs/development/libraries/science/math/openspecfun/default.nix | 21 | ||||
-rw-r--r-- | pkgs/development/libraries/science/math/suitesparse/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/swiften/default.nix | 30 | ||||
-rw-r--r-- | pkgs/development/libraries/utf8proc/default.nix | 12 | ||||
-rw-r--r-- | pkgs/development/libraries/zeroc-ice/default.nix | 4 |
113 files changed, 865 insertions, 698 deletions
diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix index 282ad7bfcd7..f74ee51cab2 100644 --- a/pkgs/development/libraries/cppzmq/default.nix +++ b/pkgs/development/libraries/cppzmq/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - name = "cppzmq-2015-07-06"; + name = "cppzmq-20150926"; src = fetchgit { url = "https://github.com/zeromq/cppzmq"; - rev = "a88bf3e0b0bc6ed5f5b25a58f8997a1dae374c8b"; - sha256 = "75a6630b870c1f0d5b9d6a0ba03e83ceee47aaa2a253894e75a8a93a6d65d3aa"; + rev = "fa2f2c67a79c31d73bfef6862cc8ce12a98dd022"; + sha256 = "7b46712b5fa7e59cd0ffae190674046c71d5762c064003c125d6cd7a3da19b71"; }; installPhase = '' diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 4659ba21123..046b7f97ba4 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -1,21 +1,29 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, boost, libevent, double_conversion, glog +{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, boost, libevent, double_conversion, glog , google-gflags, python, libiberty, openssl }: stdenv.mkDerivation rec { - version = "2015-09-17"; + version = "0.57.0"; name = "folly-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; - rev = "e4527fb5d04f5fec823bd6a2402b620a6e1a64e3"; - sha256 = "0iicq19yylafr7qs221xgk8pcwf6nnyx6srgsx9y9cyf72siadcb"; + rev = "v${version}"; + sha256 = "12b9bkwmndfwmsknc209kpplxn9wqmwr3p2h0l2szrppq4qqyfq9"; }; + patches = [ + # Fix compatibility with Boost 1.59 + (fetchpatch { + url = "https://github.com/facebook/folly/commit/29193aca605bb93d82a3c92acd95bb342115f3a4.patch"; + sha256 = "1ixpgq1wjr3i7madx4faw72n17ilc9cr435k5w1x95jr954m9j7b"; + }) + ]; + nativeBuildInputs = [ autoreconfHook python ]; buildInputs = [ libiberty boost libevent double_conversion glog google-gflags openssl ]; - postUnpack = "sourceRoot=\${sourceRoot}/folly"; + postPatch = "cd folly"; preBuild = '' patchShebangs build ''; diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 02d26759834..681137cd590 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -1,13 +1,16 @@ -{ stdenv, fetchurl, cmake, mesa, libXrandr, libXi, libXxf86vm, libXfixes, xlibsWrapper +{ stdenv, fetchFromGitHub, cmake, mesa, libXrandr, libXi, libXxf86vm, libXfixes, xlibsWrapper , libXinerama, libXcursor }: stdenv.mkDerivation rec { - name = "glfw-3.1.1"; + version = "3.1.2"; + name = "glfw-${version}"; - src = fetchurl { - url = "mirror://sourceforge/glfw/${name}.tar.bz2"; - sha256 = "0q9dhbj2az7jwwi556zai0qr8zmg6d2lyxcqngppkw0x7hi1d1aa"; + src = fetchFromGitHub { + owner = "glfw"; + repo = "GLFW"; + rev = "${version}"; + sha256 = "1aj1dfyyd0170gpz32j2xlqbvbsxwbg028xiqai3mqc44xfp10kw"; }; enableParallelBuilding = true; @@ -21,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time"; - homepage = "http://glfw.sourceforge.net/"; + homepage = "http://www.glfw.org/"; license = licenses.zlib; maintainers = with maintainers; [ marcweber ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/javascript/jquery-ui/default.nix b/pkgs/development/libraries/javascript/jquery-ui/default.nix index fd7f5367c8e..e65107a3c2f 100644 --- a/pkgs/development/libraries/javascript/jquery-ui/default.nix +++ b/pkgs/development/libraries/javascript/jquery-ui/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "jquery-ui-1.11.1"; + name = "jquery-ui-1.11.4"; src = fetchurl { url = "http://jqueryui.com/resources/download/${name}.zip"; - sha256 = "05dlcfwklymx94fb4n88l5syf80l6zrs862zzmla477vd8ndk537"; + sha256 = "0ciyaj1acg08g8hpzqx6whayq206fvf4whksz2pjgxlv207lqgjh"; }; buildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/javascript/jquery/default.nix b/pkgs/development/libraries/javascript/jquery/default.nix index 3491b2b3970..103721cadc3 100644 --- a/pkgs/development/libraries/javascript/jquery/default.nix +++ b/pkgs/development/libraries/javascript/jquery/default.nix @@ -3,17 +3,17 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "jquery-1.11.2"; + name = "jquery-1.11.3"; src = if compressed then fetchurl { url = "http://code.jquery.com/${name}.min.js"; - sha256 = "1h09zz6cjm66g30wa7c41by1jswx9gjpgqgbxln0dv2v55fjkk9f"; + sha256 = "1f4glgxxn3jnvry3dpzmazj3207baacnap5w20gr2xlk789idfgc"; } else fetchurl { url = "http://code.jquery.com/${name}.js"; - sha256 = "098gnzndmmjygpsfywxgmb0vi42b882pwpby77gqkrd2nwsp1hjq"; + sha256 = "1v956yf5spw0156rni5z77hzqwmby7ajwdcd6mkhb6zvl36awr90"; }; unpackPhase = "true"; diff --git a/pkgs/development/libraries/kde-frameworks-5.13/fetchsrcs.sh b/pkgs/development/libraries/kde-frameworks-5.13/fetchsrcs.sh deleted file mode 100755 index a329d8b8562..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/fetchsrcs.sh +++ /dev/null @@ -1,47 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i bash -p coreutils findutils gnused nix wget - -set -x - -# The trailing slash at the end is necessary! -RELEASE_URL="http://download.kde.org/stable/frameworks/5.13/" -EXTRA_WGET_ARGS='-A *.tar.xz' - -mkdir tmp; cd tmp - -wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS - -cat >../srcs.nix <<EOF -# DO NOT EDIT! This file is generated automatically by manifest.sh -{ fetchurl, mirror }: - -{ -EOF - -workdir=$(pwd) - -find . | while read src; do - if [[ -f "${src}" ]]; then - url="${src:2}" - # Sanitize file name - filename=$(basename "$src" | tr '@' '_') - nameversion="${filename%.tar.*}" - name=$(echo "$nameversion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,') - version=$(echo "$nameversion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,') - sha256=$(nix-hash --type sha256 --base32 --flat "$src") - cat >>../srcs.nix <<EOF - $name = { - version = "$version"; - src = fetchurl { - url = "\${mirror}/$url"; - sha256 = "$sha256"; - name = "$filename"; - }; - }; -EOF - fi -done - -echo "}" >>../srcs.nix - -cd .. diff --git a/pkgs/development/libraries/kde-frameworks-5.13/srcs.nix b/pkgs/development/libraries/kde-frameworks-5.13/srcs.nix deleted file mode 100644 index 9cfb9c2006a..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/srcs.nix +++ /dev/null @@ -1,549 +0,0 @@ -# DO NOT EDIT! This file is generated automatically by manifest.sh -{ fetchurl, mirror }: - -{ - kiconthemes = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kiconthemes-5.13.0.tar.xz"; - sha256 = "1zsqmq1vzpiflnhr4ydwyg84cfima2hh0m61pgsxki98a8cfjz78"; - name = "kiconthemes-5.13.0.tar.xz"; - }; - }; - kitemmodels = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kitemmodels-5.13.0.tar.xz"; - sha256 = "1bcnssm0sp4xs2wm9x65705671y97bhgjlbqvngdw95qr8mjalda"; - name = "kitemmodels-5.13.0.tar.xz"; - }; - }; - kactivities = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kactivities-5.13.0.tar.xz"; - sha256 = "0k1f3iliwws30f9d3gfrx3cxqcmr3v9w0p4nxnk35qa7bflkw2jp"; - name = "kactivities-5.13.0.tar.xz"; - }; - }; - threadweaver = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/threadweaver-5.13.0.tar.xz"; - sha256 = "06hvraianc559plk50rfg4a7rwykq7s9ak343xylm37mg3sx3myn"; - name = "threadweaver-5.13.0.tar.xz"; - }; - }; - bluez-qt = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/bluez-qt-5.13.0.tar.xz"; - sha256 = "0ccylfkph8kxni2kfbdk7zzvywsn447kkvfx5xm63l19acff74c8"; - name = "bluez-qt-5.13.0.tar.xz"; - }; - }; - plasma-framework = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/plasma-framework-5.13.0.tar.xz"; - sha256 = "0fk3a7xzhi761kl2xwxhxv2kp4cblqzn7ylk6q60x2cr3vd3jxgb"; - name = "plasma-framework-5.13.0.tar.xz"; - }; - }; - kguiaddons = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kguiaddons-5.13.0.tar.xz"; - sha256 = "0p33i1hwzcbczxdw8mnkknb35v7n8m6x9jr9gysvzhg76l2z6ca7"; - name = "kguiaddons-5.13.0.tar.xz"; - }; - }; - ktexteditor = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/ktexteditor-5.13.0.tar.xz"; - sha256 = "1paiqpi73pvhqjcgk9l7agqk4s9pw9fghh1ipfw6clklrkpwjy2f"; - name = "ktexteditor-5.13.0.tar.xz"; - }; - }; - kinit = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kinit-5.13.0.tar.xz"; - sha256 = "06jcznxw346g6cr08ykgl2bc8wfann5s4rs0py6ah1al5py87jbq"; - name = "kinit-5.13.0.tar.xz"; - }; - }; - kxmlgui = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kxmlgui-5.13.0.tar.xz"; - sha256 = "06i873lsy0k67jdipzakc5gxmya82s8mkprkzb7pvac2ird2y66q"; - name = "kxmlgui-5.13.0.tar.xz"; - }; - }; - kdbusaddons = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kdbusaddons-5.13.0.tar.xz"; - sha256 = "1w118l5qc0kn5fmv5dqaxidxjsgzzq4ak9pk6vgafrdf7f79dy82"; - name = "kdbusaddons-5.13.0.tar.xz"; - }; - }; - kunitconversion = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kunitconversion-5.13.0.tar.xz"; - sha256 = "1cff7ighx6r64vv5wc88gnnq4k0c6c18k92nlj56b61g94sjx5xp"; - name = "kunitconversion-5.13.0.tar.xz"; - }; - }; - kemoticons = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kemoticons-5.13.0.tar.xz"; - sha256 = "0cxi6gldp9qpi47g0chg6bhr17w43bv36pf2gg2dsy5mymnw1iaj"; - name = "kemoticons-5.13.0.tar.xz"; - }; - }; - kcompletion = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kcompletion-5.13.0.tar.xz"; - sha256 = "0j47bwi7sw2khyi3qp0b77npgf40wfax1j9zic68xg1yjf4y52b4"; - name = "kcompletion-5.13.0.tar.xz"; - }; - }; - kpackage = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kpackage-5.13.0.tar.xz"; - sha256 = "0ybdzx33gcpb4j18vnv99hbycrlwxzhwblz07m1a0q1k2x004hla"; - name = "kpackage-5.13.0.tar.xz"; - }; - }; - kpty = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kpty-5.13.0.tar.xz"; - sha256 = "0c37zv1lrdma4659chmh27naxflhjz614h385im0m717hx67v5v0"; - name = "kpty-5.13.0.tar.xz"; - }; - }; - kservice = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kservice-5.13.0.tar.xz"; - sha256 = "1a7pz9m948xfiqphm29k7wnc24qv5xm8zb7f61mfbmzic18p4076"; - name = "kservice-5.13.0.tar.xz"; - }; - }; - kwidgetsaddons = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kwidgetsaddons-5.13.0.tar.xz"; - sha256 = "19s31brrqhb1vncc4rkik42l4si28ky3d5ysvnyx7mw2jip4929i"; - name = "kwidgetsaddons-5.13.0.tar.xz"; - }; - }; - kimageformats = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kimageformats-5.13.0.tar.xz"; - sha256 = "0lqraljikwkp88wnb1zxmylk7gn7rsp9301jn2qff3i0aa8m56ly"; - name = "kimageformats-5.13.0.tar.xz"; - }; - }; - kwindowsystem = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kwindowsystem-5.13.0.tar.xz"; - sha256 = "18ihvj1s4apsb647gbp8ghl083f3idpld693vwi138fsk89nhn67"; - name = "kwindowsystem-5.13.0.tar.xz"; - }; - }; - kxmlrpcclient = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kxmlrpcclient-5.13.0.tar.xz"; - sha256 = "18gdfb2yqzyid6zhx98xwd3vk2bnvxgpsk0dmy0098b9jl5gi39h"; - name = "kxmlrpcclient-5.13.0.tar.xz"; - }; - }; - kconfig = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kconfig-5.13.0.tar.xz"; - sha256 = "0qhymvqccl568ib975fx2jpm91ydsixx8lmf2803m89nad3bi77p"; - name = "kconfig-5.13.0.tar.xz"; - }; - }; - kdeclarative = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kdeclarative-5.13.0.tar.xz"; - sha256 = "1c65ls02pqg1apmxvw3xhi8d7i4pwvx777jp755zbz6f0k2q5h14"; - name = "kdeclarative-5.13.0.tar.xz"; - }; - }; - kapidox = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kapidox-5.13.0.tar.xz"; - sha256 = "0gg72qli7yix0v6riywbw0iw3y28jzk84p161lh7izql8kb463zj"; - name = "kapidox-5.13.0.tar.xz"; - }; - }; - knotifyconfig = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/knotifyconfig-5.13.0.tar.xz"; - sha256 = "19my0x60vhhngdzb5nr0cdi5yby4113pzqzg39wslbb1n5mcfqky"; - name = "knotifyconfig-5.13.0.tar.xz"; - }; - }; - kcodecs = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kcodecs-5.13.0.tar.xz"; - sha256 = "0b1jaxkkqmi7r013vpyhhqaqbg6hwc4nb0bm23nr1az9qasdvxzm"; - name = "kcodecs-5.13.0.tar.xz"; - }; - }; - kdnssd = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kdnssd-5.13.0.tar.xz"; - sha256 = "1jaa8lwqq4y1rl381j85qzxxyqw2if95rs8q5lsm14xq9jgwrf6r"; - name = "kdnssd-5.13.0.tar.xz"; - }; - }; - ktextwidgets = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/ktextwidgets-5.13.0.tar.xz"; - sha256 = "1p38j96z19fy1pdc249myl5mm0nbs7nrrhkmgfjig24lamivy98h"; - name = "ktextwidgets-5.13.0.tar.xz"; - }; - }; - kauth = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kauth-5.13.0.tar.xz"; - sha256 = "1j1kx9dypirpw41i8cx8dylwqaqm8rdbkxb0xmvyi7x8pax7rmkk"; - name = "kauth-5.13.0.tar.xz"; - }; - }; - kplotting = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kplotting-5.13.0.tar.xz"; - sha256 = "0f4vafy4b473407lm2kazllxzdiq1blvmypab7jlk0bj206vmdhq"; - name = "kplotting-5.13.0.tar.xz"; - }; - }; - ki18n = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/ki18n-5.13.0.tar.xz"; - sha256 = "1izriaip8r7cgm36mid6fxsvg661311lm6aalqaxq9xa70lkq3xm"; - name = "ki18n-5.13.0.tar.xz"; - }; - }; - knotifications = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/knotifications-5.13.0.tar.xz"; - sha256 = "04n50hkg6h3j49l1bi0igr79vgb8xfw74mbaw5s20nw55y2xyziv"; - name = "knotifications-5.13.0.tar.xz"; - }; - }; - kitemviews = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kitemviews-5.13.0.tar.xz"; - sha256 = "0iazr2fyhksa3wsfrqaknxs74h66fb6drg9vcg18dml9mv0v9jgw"; - name = "kitemviews-5.13.0.tar.xz"; - }; - }; - kcoreaddons = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kcoreaddons-5.13.0.tar.xz"; - sha256 = "0qc9lmc90bhrzaaf611vn7x5z549yvl1dk2ba726qaxb8hf5fhmx"; - name = "kcoreaddons-5.13.0.tar.xz"; - }; - }; - kwallet = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kwallet-5.13.0.tar.xz"; - sha256 = "0p7as0ma40dssd171mpi68sdih5fr03lcwvhy3zazhhpf5gjfwv8"; - name = "kwallet-5.13.0.tar.xz"; - }; - }; - modemmanager-qt = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/modemmanager-qt-5.13.0.tar.xz"; - sha256 = "17a4d7pp2qj7zvxfd8qicj332n25nj6d8xs585fkqlwsk5qvv5mh"; - name = "modemmanager-qt-5.13.0.tar.xz"; - }; - }; - kio = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kio-5.13.0.tar.xz"; - sha256 = "1m6vids0ahdvqw1wgiss11cb6z2x81acig8x38jgjna8al6dw7y3"; - name = "kio-5.13.0.tar.xz"; - }; - }; - baloo = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/baloo-5.13.0.tar.xz"; - sha256 = "159gkr4xsyj7sb6dqvjlldyl8hdm0sgzhbczb24q182dnwqrmmbq"; - name = "baloo-5.13.0.tar.xz"; - }; - }; - karchive = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/karchive-5.13.0.tar.xz"; - sha256 = "0qg90h4iiyb3frnqs01r440pan1m0mn6y0b4025ync1g50iyf1jz"; - name = "karchive-5.13.0.tar.xz"; - }; - }; - kdoctools = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kdoctools-5.13.0.tar.xz"; - sha256 = "0604rmrg6b8h4pw14kwal04s21f9gkrf495csj3jsm7042z5p6rf"; - name = "kdoctools-5.13.0.tar.xz"; - }; - }; - kparts = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kparts-5.13.0.tar.xz"; - sha256 = "1mqklszbhlk8pdwig88yqa5jpjbdzkz9q618c4029aqiazzjqs39"; - name = "kparts-5.13.0.tar.xz"; - }; - }; - kdewebkit = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kdewebkit-5.13.0.tar.xz"; - sha256 = "1n8x0biy5s73qihx9niivhmfdfglnai360k4llpjq9vhd8fassjx"; - name = "kdewebkit-5.13.0.tar.xz"; - }; - }; - kidletime = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kidletime-5.13.0.tar.xz"; - sha256 = "1d6p4ld8wday3sb3gdvivigw7vk33akawf531ghc8rhmi7mr2db2"; - name = "kidletime-5.13.0.tar.xz"; - }; - }; - extra-cmake-modules = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/extra-cmake-modules-5.13.0.tar.xz"; - sha256 = "1hnmsghfnl99ihgnp90pbh3ngh4l6n6d5g7ial6bfzrlfn588lms"; - name = "extra-cmake-modules-5.13.0.tar.xz"; - }; - }; - frameworkintegration = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/frameworkintegration-5.13.0.tar.xz"; - sha256 = "03pzic63vi1bmcf4vlk2kfcs6fbc9p0plzydizqmm34iiv8k48jb"; - name = "frameworkintegration-5.13.0.tar.xz"; - }; - }; - kjs = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/portingAids/kjs-5.13.0.tar.xz"; - sha256 = "1ij3f303k1higj5l7l3pxl6qlp8arf3qizbar2d36f3qczyql5r8"; - name = "kjs-5.13.0.tar.xz"; - }; - }; - krunner = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/portingAids/krunner-5.13.0.tar.xz"; - sha256 = "1yj97lp6ny9m45nankgkq7zdw929mw218pq7yalr21vqqxwvd84a"; - name = "krunner-5.13.0.tar.xz"; - }; - }; - khtml = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/portingAids/khtml-5.13.0.tar.xz"; - sha256 = "0mykidqkhs0hd6s4i8li25gk8dzysw6imc2lfjbwvyyvx6lyd55m"; - name = "khtml-5.13.0.tar.xz"; - }; - }; - kmediaplayer = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/portingAids/kmediaplayer-5.13.0.tar.xz"; - sha256 = "19kazkjsc2s1wfcslmi46ic1h7jvwdbbc6y9713jb1yymp6jzz30"; - name = "kmediaplayer-5.13.0.tar.xz"; - }; - }; - kross = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/portingAids/kross-5.13.0.tar.xz"; - sha256 = "18237mj3bzwj4vdxjxqn1b865syi3z3f1zlrnfslijssgw6qs41m"; - name = "kross-5.13.0.tar.xz"; - }; - }; - kjsembed = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/portingAids/kjsembed-5.13.0.tar.xz"; - sha256 = "0inlb47rkfriwnbkkhgb20kc86b38yl9xxwn8cjx80m61sj8ici8"; - name = "kjsembed-5.13.0.tar.xz"; - }; - }; - kdelibs4support = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/portingAids/kdelibs4support-5.13.0.tar.xz"; - sha256 = "1hlniaw259yz6vs42w0q7mjycq1vf8ggvsigc09ij8bj7k7ih3s3"; - name = "kdelibs4support-5.13.0.tar.xz"; - }; - }; - kcrash = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kcrash-5.13.0.tar.xz"; - sha256 = "07cb6jmf1w74ndcfj4mcpc60xkpnl69jzdd5ljxsi2k1awvjs58n"; - name = "kcrash-5.13.0.tar.xz"; - }; - }; - kcmutils = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kcmutils-5.13.0.tar.xz"; - sha256 = "13jc3053jf3lg2zrrqi4mcsnma6xd6p56ilaw86bgvdsq1fkr84b"; - name = "kcmutils-5.13.0.tar.xz"; - }; - }; - knewstuff = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/knewstuff-5.13.0.tar.xz"; - sha256 = "12pyxdb9rq60hcw7k8sh79mq6l5h5zdrixn778yps27ckf69icsr"; - name = "knewstuff-5.13.0.tar.xz"; - }; - }; - kded = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kded-5.13.0.tar.xz"; - sha256 = "0yfpx2dc2x7jzyxmj0k92ar2rvzabz75dwh09rr93wyzyjr1l7i9"; - name = "kded-5.13.0.tar.xz"; - }; - }; - kconfigwidgets = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kconfigwidgets-5.13.0.tar.xz"; - sha256 = "1m5n24c34sdr9hfap2riws0n58pka0a0n23gxdzxwbk9z1fj97zy"; - name = "kconfigwidgets-5.13.0.tar.xz"; - }; - }; - solid = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/solid-5.13.0.tar.xz"; - sha256 = "1s06qbicni2g99kmp7kd06xrps0pqb9d9q04pmmlqdg24fcm0aik"; - name = "solid-5.13.0.tar.xz"; - }; - }; - kjobwidgets = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kjobwidgets-5.13.0.tar.xz"; - sha256 = "0vjqidawgca5zr5vfm55lqnvzr9pk0dp1w85pdpp576rsjg34404"; - name = "kjobwidgets-5.13.0.tar.xz"; - }; - }; - kdesignerplugin = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kdesignerplugin-5.13.0.tar.xz"; - sha256 = "0iibam8d34kyvq0qpbfx1ligwcyp84x4ycr01bydnbc58qz6hg3y"; - name = "kdesignerplugin-5.13.0.tar.xz"; - }; - }; - kglobalaccel = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kglobalaccel-5.13.0.tar.xz"; - sha256 = "1fdfcyb93p39gbkvmzv43hg33vjsr9g2y9vbr07j38q9vgjipynl"; - name = "kglobalaccel-5.13.0.tar.xz"; - }; - }; - attica = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/attica-5.13.0.tar.xz"; - sha256 = "0fxqf8ab8y7lkj0c09zrshwykx2na5yqb3wxlfd8ngd6cyk34r8h"; - name = "attica-5.13.0.tar.xz"; - }; - }; - kdesu = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kdesu-5.13.0.tar.xz"; - sha256 = "0413lddgrwhx3jn2xhmi6gllv4cg2136f00bg0zxdnvgjbavj50g"; - name = "kdesu-5.13.0.tar.xz"; - }; - }; - sonnet = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/sonnet-5.13.0.tar.xz"; - sha256 = "05j79i2aq6cy2crjwsifsfj5kb74ca0bz9yl1302gkdn6qy3lx57"; - name = "sonnet-5.13.0.tar.xz"; - }; - }; - kfilemetadata = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kfilemetadata-5.13.0.tar.xz"; - sha256 = "0c7m1ha1s020jbb5925s859lknq10df1162aal8g99nxvadvkafx"; - name = "kfilemetadata-5.13.0.tar.xz"; - }; - }; - networkmanager-qt = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/networkmanager-qt-5.13.0.tar.xz"; - sha256 = "16v2vr92yfins23h2h6ddlvlf2iasbz67dr8gzyhwa9kcwr23a19"; - name = "networkmanager-qt-5.13.0.tar.xz"; - }; - }; - kbookmarks = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kbookmarks-5.13.0.tar.xz"; - sha256 = "0gmsvhphilv7aqci51hlvaikgpxhbgi6f41qb1ybkjjh6gfcz6lg"; - name = "kbookmarks-5.13.0.tar.xz"; - }; - }; - kpeople = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kpeople-5.13.0.tar.xz"; - sha256 = "1fw9jgkqv1hx5llpkws0v0pcfjjbh7z9b7z474y7ix2ycg9ikxqn"; - name = "kpeople-5.13.0.tar.xz"; - }; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/attica.nix b/pkgs/development/libraries/kde-frameworks-5.14/attica.nix index 98721876c12..98721876c12 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/attica.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/attica.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/baloo.nix b/pkgs/development/libraries/kde-frameworks-5.14/baloo.nix index 8b6b3509f0d..8b6b3509f0d 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/baloo.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/baloo.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks-5.14/bluez-qt.nix index f981b0516f7..f981b0516f7 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/bluez-qt.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/bluez-qt.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/default.nix index 1ff433c13c8..1ff433c13c8 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/development/libraries/kde-frameworks-5.14/extra-cmake-modules/0001-extra-cmake-modules-paths.patch index 9717716faf5..9717716faf5 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/0001-extra-cmake-modules-paths.patch +++ b/pkgs/development/libraries/kde-frameworks-5.14/extra-cmake-modules/0001-extra-cmake-modules-paths.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/extra-cmake-modules/default.nix index 4d669b72a89..4d669b72a89 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/extra-cmake-modules/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.14/extra-cmake-modules/setup-hook.sh index ce9aafb90e8..ce9aafb90e8 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/setup-hook.sh +++ b/pkgs/development/libraries/kde-frameworks-5.14/extra-cmake-modules/setup-hook.sh diff --git a/pkgs/development/libraries/kde-frameworks-5.14/fetchsrcs.sh b/pkgs/development/libraries/kde-frameworks-5.14/fetchsrcs.sh new file mode 100755 index 00000000000..a402d406b8a --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/fetchsrcs.sh @@ -0,0 +1,57 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p coreutils findutils gnused nix wget + +set -x + +# The trailing slash at the end is necessary! +RELEASE_URL="http://download.kde.org/stable/frameworks/5.14/" +EXTRA_WGET_ARGS='-A *.tar.xz' + +mkdir tmp; cd tmp + +rm -f ../srcs.csv + +wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS + +find . | while read src; do + if [[ -f "${src}" ]]; then + # Sanitize file name + filename=$(basename "$src" | tr '@' '_') + nameVersion="${filename%.tar.*}" + name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,') + version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,') + echo "$name,$version,$src,$filename" >>../srcs.csv + fi +done + +cat >../srcs.nix <<EOF +# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh +{ fetchurl, mirror }: + +{ +EOF + +gawk -F , "{ print \$1 }" ../srcs.csv | sort | uniq | while read name; do + versions=$(gawk -F , "/^$name,/ { print \$2 }" ../srcs.csv) + latestVersion=$(echo "$versions" | sort -rV | head -n 1) + src=$(gawk -F , "/^$name,$latestVersion,/ { print \$3 }" ../srcs.csv) + filename=$(gawk -F , "/^$name,$latestVersion,/ { print \$4 }" ../srcs.csv) + url="${src:2}" + sha256=$(nix-hash --type sha256 --base32 --flat "$src") + cat >>../srcs.nix <<EOF + $name = { + version = "$latestVersion"; + src = fetchurl { + url = "\${mirror}/$url"; + sha256 = "$sha256"; + name = "$filename"; + }; + }; +EOF +done + +echo "}" >>../srcs.nix + +rm -f ../srcs.csv + +cd .. diff --git a/pkgs/development/libraries/kde-frameworks-5.13/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks-5.14/frameworkintegration.nix index ad30cc87ecf..ad30cc87ecf 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/frameworkintegration.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/frameworkintegration.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kactivities.nix b/pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix index c8e296bad80..c8e296bad80 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kactivities.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kapidox.nix b/pkgs/development/libraries/kde-frameworks-5.14/kapidox.nix index 647be8f052c..647be8f052c 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kapidox.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kapidox.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/karchive.nix b/pkgs/development/libraries/kde-frameworks-5.14/karchive.nix index a8d9a0003c3..a8d9a0003c3 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/karchive.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/karchive.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kauth/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/kauth/default.nix index 42a10019334..42a10019334 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kauth/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kauth/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kauth/kauth-policy-install.patch b/pkgs/development/libraries/kde-frameworks-5.14/kauth/kauth-policy-install.patch index 340155256f2..340155256f2 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kauth/kauth-policy-install.patch +++ b/pkgs/development/libraries/kde-frameworks-5.14/kauth/kauth-policy-install.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kbookmarks.nix b/pkgs/development/libraries/kde-frameworks-5.14/kbookmarks.nix index 1a469ab4db6..1a469ab4db6 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kbookmarks.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kbookmarks.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/kcmutils/default.nix index ac7a5af06a4..ac7a5af06a4 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kcmutils/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kcmutils/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kcmutils/kcmutils-pluginselector-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.14/kcmutils/kcmutils-pluginselector-follow-symlinks.patch index 47b8dfad180..47b8dfad180 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kcmutils/kcmutils-pluginselector-follow-symlinks.patch +++ b/pkgs/development/libraries/kde-frameworks-5.14/kcmutils/kcmutils-pluginselector-follow-symlinks.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kcodecs.nix b/pkgs/development/libraries/kde-frameworks-5.14/kcodecs.nix index 53a69a69b69..53a69a69b69 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kcodecs.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kcodecs.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kcompletion.nix b/pkgs/development/libraries/kde-frameworks-5.14/kcompletion.nix index e393774f16a..e393774f16a 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kcompletion.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kcompletion.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kconfig.nix b/pkgs/development/libraries/kde-frameworks-5.14/kconfig.nix index ce890745767..ce890745767 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kconfig.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kconfig.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/kconfigwidgets/default.nix index d16f7f92bea..d16f7f92bea 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kconfigwidgets/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kconfigwidgets/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.14/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch index 3bd946cbd84..3bd946cbd84 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch +++ b/pkgs/development/libraries/kde-frameworks-5.14/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks-5.14/kcoreaddons.nix index 43c21bb51ef..43c21bb51ef 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kcoreaddons.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kcoreaddons.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kcrash.nix b/pkgs/development/libraries/kde-frameworks-5.14/kcrash.nix index b919c7ad222..b919c7ad222 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kcrash.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kcrash.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks-5.14/kdbusaddons.nix index eb76e14705e..eb76e14705e 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kdbusaddons.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdbusaddons.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks-5.14/kdeclarative.nix index b62a13f8fa9..b62a13f8fa9 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kdeclarative.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdeclarative.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kded.nix b/pkgs/development/libraries/kde-frameworks-5.14/kded.nix index 47ae2d68c68..47ae2d68c68 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kded.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kded.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdelibs4support.nix b/pkgs/development/libraries/kde-frameworks-5.14/kdelibs4support.nix index f54fa3e9be6..f54fa3e9be6 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kdelibs4support.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdelibs4support.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks-5.14/kdesignerplugin.nix index 100d16d64bc..100d16d64bc 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kdesignerplugin.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdesignerplugin.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdesu.nix b/pkgs/development/libraries/kde-frameworks-5.14/kdesu.nix index 4503d8bcd10..4503d8bcd10 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kdesu.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdesu.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks-5.14/kdewebkit.nix index 52ae0162b86..52ae0162b86 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kdewebkit.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdewebkit.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdnssd.nix b/pkgs/development/libraries/kde-frameworks-5.14/kdnssd.nix index f00432b0c9c..f00432b0c9c 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kdnssd.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdnssd.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/kdoctools/default.nix index 0ec13d1a15c..0ec13d1a15c 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kdoctools/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdoctools/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.14/kdoctools/kdoctools-no-find-docbook-xml.patch index 4e3a33efab3..4e3a33efab3 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kdoctools/kdoctools-no-find-docbook-xml.patch +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdoctools/kdoctools-no-find-docbook-xml.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kemoticons.nix b/pkgs/development/libraries/kde-frameworks-5.14/kemoticons.nix index d165f84e3a2..d165f84e3a2 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kemoticons.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kemoticons.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kfilemetadata.nix b/pkgs/development/libraries/kde-frameworks-5.14/kfilemetadata.nix index 53c509417f2..53c509417f2 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kfilemetadata.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kfilemetadata.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks-5.14/kglobalaccel.nix index f7c5ea56266..f7c5ea56266 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kglobalaccel.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kglobalaccel.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks-5.14/kguiaddons.nix index bc4e9ab1184..bc4e9ab1184 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kguiaddons.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kguiaddons.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/khtml.nix b/pkgs/development/libraries/kde-frameworks-5.14/khtml.nix index 45dd45089c4..45dd45089c4 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/khtml.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/khtml.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/ki18n.nix b/pkgs/development/libraries/kde-frameworks-5.14/ki18n.nix index 915e3294b46..915e3294b46 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/ki18n.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/ki18n.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kiconthemes.nix b/pkgs/development/libraries/kde-frameworks-5.14/kiconthemes.nix index 862c17f104f..862c17f104f 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kiconthemes.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kiconthemes.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kidletime.nix b/pkgs/development/libraries/kde-frameworks-5.14/kidletime.nix index fc086560023..fc086560023 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kidletime.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kidletime.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kimageformats.nix b/pkgs/development/libraries/kde-frameworks-5.14/kimageformats.nix index 49d66bbcc2c..49d66bbcc2c 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kimageformats.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kimageformats.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kinit/0001-kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.14/kinit/0001-kinit-libpath.patch index 9c76079a382..9c76079a382 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kinit/0001-kinit-libpath.patch +++ b/pkgs/development/libraries/kde-frameworks-5.14/kinit/0001-kinit-libpath.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kinit/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/kinit/default.nix index 47f1aec72de..47f1aec72de 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kinit/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kinit/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kio.nix b/pkgs/development/libraries/kde-frameworks-5.14/kio.nix index 6605de03e38..6605de03e38 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kio.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kio.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks-5.14/kitemmodels.nix index a9024d771cc..a9024d771cc 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kitemmodels.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kitemmodels.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kitemviews.nix b/pkgs/development/libraries/kde-frameworks-5.14/kitemviews.nix index 931019ce495..931019ce495 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kitemviews.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kitemviews.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.14/kjobwidgets.nix index c3f1d37f858..c3f1d37f858 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kjobwidgets.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kjobwidgets.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kjs.nix b/pkgs/development/libraries/kde-frameworks-5.14/kjs.nix index 902674d49b7..902674d49b7 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kjs.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kjs.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kjsembed.nix b/pkgs/development/libraries/kde-frameworks-5.14/kjsembed.nix index bbc5169a1cc..bbc5169a1cc 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kjsembed.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kjsembed.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kmediaplayer.nix b/pkgs/development/libraries/kde-frameworks-5.14/kmediaplayer.nix index 460458b2232..460458b2232 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kmediaplayer.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kmediaplayer.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/knewstuff.nix b/pkgs/development/libraries/kde-frameworks-5.14/knewstuff.nix index d0b884f8f68..d0b884f8f68 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/knewstuff.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/knewstuff.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/knotifications.nix b/pkgs/development/libraries/kde-frameworks-5.14/knotifications.nix index f3aa29f018c..f3aa29f018c 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/knotifications.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/knotifications.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks-5.14/knotifyconfig.nix index f6509a166d4..f6509a166d4 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/knotifyconfig.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/knotifyconfig.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kpackage/0001-allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.14/kpackage/0001-allow-external-paths.patch index 440e979c008..440e979c008 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kpackage/0001-allow-external-paths.patch +++ b/pkgs/development/libraries/kde-frameworks-5.14/kpackage/0001-allow-external-paths.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/kpackage/default.nix index f7c3689503b..f7c3689503b 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kpackage/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kpackage/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kparts.nix b/pkgs/development/libraries/kde-frameworks-5.14/kparts.nix index 96c1b984ab7..96c1b984ab7 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kparts.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kparts.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kpeople.nix b/pkgs/development/libraries/kde-frameworks-5.14/kpeople.nix index ffc028d97c3..ffc028d97c3 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kpeople.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kpeople.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kplotting.nix b/pkgs/development/libraries/kde-frameworks-5.14/kplotting.nix index c16f51b5ac3..c16f51b5ac3 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kplotting.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kplotting.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kpty.nix b/pkgs/development/libraries/kde-frameworks-5.14/kpty.nix index 72ac842a00a..72ac842a00a 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kpty.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kpty.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kross.nix b/pkgs/development/libraries/kde-frameworks-5.14/kross.nix index ca14e9827e2..ca14e9827e2 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kross.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kross.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/krunner.nix b/pkgs/development/libraries/kde-frameworks-5.14/krunner.nix index 618494ef5c5..618494ef5c5 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/krunner.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/krunner.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kservice/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/kservice/default.nix index b46797f5e0e..b46797f5e0e 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kservice/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kservice/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kservice/kservice-kbuildsycoca-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.14/kservice/kservice-kbuildsycoca-follow-symlinks.patch index e9bc418544a..e9bc418544a 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kservice/kservice-kbuildsycoca-follow-symlinks.patch +++ b/pkgs/development/libraries/kde-frameworks-5.14/kservice/kservice-kbuildsycoca-follow-symlinks.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.14/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch index 7e21ebfe86f..7e21ebfe86f 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch +++ b/pkgs/development/libraries/kde-frameworks-5.14/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kservice/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.14/kservice/setup-hook.sh index 007876a0b30..007876a0b30 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kservice/setup-hook.sh +++ b/pkgs/development/libraries/kde-frameworks-5.14/kservice/setup-hook.sh diff --git a/pkgs/development/libraries/kde-frameworks-5.13/ktexteditor/0001-no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.14/ktexteditor/0001-no-qcoreapplication.patch index c2e77a537c5..c2e77a537c5 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/ktexteditor/0001-no-qcoreapplication.patch +++ b/pkgs/development/libraries/kde-frameworks-5.14/ktexteditor/0001-no-qcoreapplication.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.13/ktexteditor/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/ktexteditor/default.nix index 8c02e602c5d..8c02e602c5d 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/ktexteditor/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/ktexteditor/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.14/ktextwidgets.nix index e27839162ef..e27839162ef 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/ktextwidgets.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/ktextwidgets.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks-5.14/kunitconversion.nix index 6c6a4caeb98..6c6a4caeb98 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kunitconversion.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kunitconversion.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kwallet.nix b/pkgs/development/libraries/kde-frameworks-5.14/kwallet.nix index 267ddf8303d..267ddf8303d 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kwallet.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kwallet.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks-5.14/kwidgetsaddons.nix index d95f44d3fec..d95f44d3fec 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kwidgetsaddons.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kwidgetsaddons.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kwindowsystem.nix b/pkgs/development/libraries/kde-frameworks-5.14/kwindowsystem.nix index 09ab1f2200d..09ab1f2200d 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kwindowsystem.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kwindowsystem.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks-5.14/kxmlgui.nix index 6e1398d2f84..6e1398d2f84 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kxmlgui.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kxmlgui.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks-5.14/kxmlrpcclient.nix index b28c00a33be..b28c00a33be 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kxmlrpcclient.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kxmlrpcclient.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.14/modemmanager-qt.nix index 7d7f769d6a9..7d7f769d6a9 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/modemmanager-qt.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/modemmanager-qt.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.14/networkmanager-qt.nix index 333378bd143..333378bd143 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/networkmanager-qt.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/networkmanager-qt.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/plasma-framework/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix index d838996f99c..d838996f99c 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/plasma-framework/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/solid.nix b/pkgs/development/libraries/kde-frameworks-5.14/solid.nix index 06b0797cbc1..06b0797cbc1 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/solid.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/solid.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/sonnet.nix b/pkgs/development/libraries/kde-frameworks-5.14/sonnet.nix index 943fe04a1c9..943fe04a1c9 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/sonnet.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/sonnet.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/srcs.nix b/pkgs/development/libraries/kde-frameworks-5.14/srcs.nix new file mode 100644 index 00000000000..f9923e3645f --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/srcs.nix @@ -0,0 +1,549 @@ +# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh +{ fetchurl, mirror }: + +{ + attica = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/attica-5.14.0.tar.xz"; + sha256 = "0n5znf19112i1j2mwvyzc3g75bc83fdr1p7vljw670fjy2wm1fjy"; + name = "attica-5.14.0.tar.xz"; + }; + }; + baloo = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/baloo-5.14.0.tar.xz"; + sha256 = "0q72ij44r827259mw26q9f6518nj6jbawa94m8m2vrqdhcfjn25d"; + name = "baloo-5.14.0.tar.xz"; + }; + }; + bluez-qt = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/bluez-qt-5.14.0.tar.xz"; + sha256 = "136kjw4d91k85pkj90hs01nnqq51apppzbhjl7mx3xjqd2f15ljz"; + name = "bluez-qt-5.14.0.tar.xz"; + }; + }; + extra-cmake-modules = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/extra-cmake-modules-5.14.0.tar.xz"; + sha256 = "1c6frrvs8j56fyj0d9gcbqq3phhxmvn5ciy6bvj8vch3lynxrvyg"; + name = "extra-cmake-modules-5.14.0.tar.xz"; + }; + }; + frameworkintegration = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/frameworkintegration-5.14.0.tar.xz"; + sha256 = "194vhbjbjpdc8v69g1i08qcm8ywxfxm4ryc75dpp20117jfy9xy8"; + name = "frameworkintegration-5.14.0.tar.xz"; + }; + }; + kactivities = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kactivities-5.14.0.tar.xz"; + sha256 = "0q6c06qjypg3iy8x60wvyhm5n8fvdkcw5ibvns0zxxa8vw13l6z9"; + name = "kactivities-5.14.0.tar.xz"; + }; + }; + kapidox = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kapidox-5.14.0.tar.xz"; + sha256 = "14ai2n5ajm8sqdv0yy5hr0fg1ks9mvkf3diij7zjfzqi315wav6q"; + name = "kapidox-5.14.0.tar.xz"; + }; + }; + karchive = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/karchive-5.14.0.tar.xz"; + sha256 = "1sary49lwp09vrgwndaz3lhp6j3zkllxklbvm5s05i9mjxzgqww4"; + name = "karchive-5.14.0.tar.xz"; + }; + }; + kauth = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kauth-5.14.0.tar.xz"; + sha256 = "1kfqp6jrgx1wlznplr29spi08927cmiln718wzpzvzy8h3sfjc0l"; + name = "kauth-5.14.0.tar.xz"; + }; + }; + kbookmarks = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kbookmarks-5.14.0.tar.xz"; + sha256 = "12kv62ykys5rvmsia955nxv7m4xd551z762bjvvwjq3zds8pj5p3"; + name = "kbookmarks-5.14.0.tar.xz"; + }; + }; + kcmutils = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kcmutils-5.14.0.tar.xz"; + sha256 = "0c71b8gqja1qv8lkb7yn0z7qrgvnmhvhb751k9xsiabp306apx5f"; + name = "kcmutils-5.14.0.tar.xz"; + }; + }; + kcodecs = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kcodecs-5.14.0.tar.xz"; + sha256 = "0prhj43h7dh4811f3kfp6n0wvskczg42q17lbfn6p0d5qa0bz07y"; + name = "kcodecs-5.14.0.tar.xz"; + }; + }; + kcompletion = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kcompletion-5.14.0.tar.xz"; + sha256 = "14ba77fmcf4ldqbwc86frai9hz9jsz9663b0v8r3aca0mg7k096v"; + name = "kcompletion-5.14.0.tar.xz"; + }; + }; + kconfig = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kconfig-5.14.0.tar.xz"; + sha256 = "1c2rw3blgc7rmkaybr9jc3dfc1vzhvskrll7bc8xdm82b5m1850x"; + name = "kconfig-5.14.0.tar.xz"; + }; + }; + kconfigwidgets = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kconfigwidgets-5.14.0.tar.xz"; + sha256 = "103c2vd05ccmyzqf7yznz8d0vhd94c1381p5ajvibvzfv9cs4djg"; + name = "kconfigwidgets-5.14.0.tar.xz"; + }; + }; + kcoreaddons = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kcoreaddons-5.14.0.tar.xz"; + sha256 = "0xm2n7gvzq674cwi8gb8zkawj9pkaiv1qi63a76hl9vylidrm26q"; + name = "kcoreaddons-5.14.0.tar.xz"; + }; + }; + kcrash = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kcrash-5.14.0.tar.xz"; + sha256 = "18cc444wwfdfbr0m1064l34azl6f560f5npcz5spvz0yydlh0fs4"; + name = "kcrash-5.14.0.tar.xz"; + }; + }; + kdbusaddons = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kdbusaddons-5.14.0.tar.xz"; + sha256 = "009rzlr5a8znn4f31gz6zwi93mla09jy3rs336i7f6b111ha4yqy"; + name = "kdbusaddons-5.14.0.tar.xz"; + }; + }; + kdeclarative = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kdeclarative-5.14.0.tar.xz"; + sha256 = "1d87s26crv94w0g88xkqand3a1d02dcr9glbvpx1xxpz64mybvr4"; + name = "kdeclarative-5.14.0.tar.xz"; + }; + }; + kded = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kded-5.14.0.tar.xz"; + sha256 = "03s95pq283vjng106bs9lrj1i2fcb1pnp58cnk1fr6w3w8fp6daq"; + name = "kded-5.14.0.tar.xz"; + }; + }; + kdelibs4support = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/portingAids/kdelibs4support-5.14.0.tar.xz"; + sha256 = "1qdw5alnf643bw0pzq3yjwajl87000xpbs8h4k2c1872rmqq1m8r"; + name = "kdelibs4support-5.14.0.tar.xz"; + }; + }; + kdesignerplugin = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kdesignerplugin-5.14.0.tar.xz"; + sha256 = "1bb79szygplysckx7p4x66inbn9i2hmf6p7ikynbvkzph33zm375"; + name = "kdesignerplugin-5.14.0.tar.xz"; + }; + }; + kdesu = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kdesu-5.14.0.tar.xz"; + sha256 = "1l232jhl6x7b6xqw21qw0s342c6n2gnldsdd5fmh6grx4vv556nn"; + name = "kdesu-5.14.0.tar.xz"; + }; + }; + kdewebkit = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kdewebkit-5.14.0.tar.xz"; + sha256 = "0pz0z43mgcp4m5kdcqjl6x0cwafl0j2nidayj3vhaxcj40kn4k8l"; + name = "kdewebkit-5.14.0.tar.xz"; + }; + }; + kdnssd = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kdnssd-5.14.0.tar.xz"; + sha256 = "0cc0adzn4pc0s6mdv71bv6h8k7x0q941f6xdmj7jpcz2q6lycav1"; + name = "kdnssd-5.14.0.tar.xz"; + }; + }; + kdoctools = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kdoctools-5.14.0.tar.xz"; + sha256 = "06477pk0wni40c88c1v6rcl1yy91msfs399djb0i0ipkjnbj8gbs"; + name = "kdoctools-5.14.0.tar.xz"; + }; + }; + kemoticons = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kemoticons-5.14.0.tar.xz"; + sha256 = "1dsr9hbqjrwn44zm9i5anm8sy8jb90yjyv4s219kll5rkrbxk0zr"; + name = "kemoticons-5.14.0.tar.xz"; + }; + }; + kfilemetadata = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kfilemetadata-5.14.0.tar.xz"; + sha256 = "1ixn5yc7j4s3nvn03h7whkxsg15gf1cqnd3z2qxngvyvchzqhsd2"; + name = "kfilemetadata-5.14.0.tar.xz"; + }; + }; + kglobalaccel = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kglobalaccel-5.14.0.tar.xz"; + sha256 = "0cr62as4n3k34dbdcarmhkxkcznnkp65q57sy6k29a68jxgxq6c3"; + name = "kglobalaccel-5.14.0.tar.xz"; + }; + }; + kguiaddons = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kguiaddons-5.14.0.tar.xz"; + sha256 = "0658nn4lb59vzn6b9kmasl2a4g58c81cran6kz0fwc82d2310ncn"; + name = "kguiaddons-5.14.0.tar.xz"; + }; + }; + khtml = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/portingAids/khtml-5.14.0.tar.xz"; + sha256 = "1hj406v06isggbzvsw47ws510iz128jv5ggxw64p9pcibs3wb5j2"; + name = "khtml-5.14.0.tar.xz"; + }; + }; + ki18n = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/ki18n-5.14.0.tar.xz"; + sha256 = "0pwpxda5k7hl6njzzaj68brm1slfffprncgwknhaxksizprdh1qz"; + name = "ki18n-5.14.0.tar.xz"; + }; + }; + kiconthemes = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kiconthemes-5.14.0.tar.xz"; + sha256 = "0mhykdhzab112h5pb2s2sma821x57mnr3ydwq96qjr7xhdib8dwr"; + name = "kiconthemes-5.14.0.tar.xz"; + }; + }; + kidletime = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kidletime-5.14.0.tar.xz"; + sha256 = "07qhmyld01xcidbhkwscz5x8xvnnbphz7hfiqkn20d0n6kmlfbr8"; + name = "kidletime-5.14.0.tar.xz"; + }; + }; + kimageformats = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kimageformats-5.14.0.tar.xz"; + sha256 = "13s25pxxjddbbzvf9l0pcrjcwkkc108318v7yglqrm58ankq8pyy"; + name = "kimageformats-5.14.0.tar.xz"; + }; + }; + kinit = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kinit-5.14.0.tar.xz"; + sha256 = "1g6wvpd7kzmnayfax2ph7sng1blaa91fclzfxpvwnxqpayzj2z6a"; + name = "kinit-5.14.0.tar.xz"; + }; + }; + kio = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kio-5.14.0.tar.xz"; + sha256 = "1brirg53khh8wyyd3sbnas82924idxbbc81wqk8433ryv645i8ra"; + name = "kio-5.14.0.tar.xz"; + }; + }; + kitemmodels = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kitemmodels-5.14.0.tar.xz"; + sha256 = "0phf2278fpiyippz347l18gw3kgfvmdm2mv2wx56rsfy5inih8qf"; + name = "kitemmodels-5.14.0.tar.xz"; + }; + }; + kitemviews = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kitemviews-5.14.0.tar.xz"; + sha256 = "1yk8djnrw4z5dw7xmwwsgz3fw1n3c1yjkggkgjy75659656psac1"; + name = "kitemviews-5.14.0.tar.xz"; + }; + }; + kjobwidgets = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kjobwidgets-5.14.0.tar.xz"; + sha256 = "0ibxbhh335b8j5603z500fw4mnk776jj364ha9c1n4qdd7ar5yi0"; + name = "kjobwidgets-5.14.0.tar.xz"; + }; + }; + kjs = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/portingAids/kjs-5.14.0.tar.xz"; + sha256 = "1xwp9jpwmkc5h1rab6bda6ffib064qn1wpmz6hdhrgzp77v5ljw4"; + name = "kjs-5.14.0.tar.xz"; + }; + }; + kjsembed = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/portingAids/kjsembed-5.14.0.tar.xz"; + sha256 = "09vlq2d0nzhw1fiy7nww0ixa15ciwc6i9f4xqay746xy9f5i30vl"; + name = "kjsembed-5.14.0.tar.xz"; + }; + }; + kmediaplayer = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/portingAids/kmediaplayer-5.14.0.tar.xz"; + sha256 = "1mcvrffg9lfvhy6qs9v1caxf523zh2jy1mhd88m34p7sfdxp8azm"; + name = "kmediaplayer-5.14.0.tar.xz"; + }; + }; + knewstuff = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/knewstuff-5.14.0.tar.xz"; + sha256 = "0yprn590g5y0gcvmlk5p79v2svn29zyhgq9lmp5qzhh7wgz8jp26"; + name = "knewstuff-5.14.0.tar.xz"; + }; + }; + knotifications = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/knotifications-5.14.0.tar.xz"; + sha256 = "0w0b9wb5zpwjhzph5cqfvcgxz2dafi33f3jgwmdw9sm2cgmwavgb"; + name = "knotifications-5.14.0.tar.xz"; + }; + }; + knotifyconfig = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/knotifyconfig-5.14.0.tar.xz"; + sha256 = "04872agypbnj3kc6q0xa5ndzd7lzny5zp1llad0x10k7spvwk0rb"; + name = "knotifyconfig-5.14.0.tar.xz"; + }; + }; + kpackage = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kpackage-5.14.0.tar.xz"; + sha256 = "0rvm9vwlirk38wbjyp8kkvs2m03mb1bby63zakbd7y2x5l26hyd5"; + name = "kpackage-5.14.0.tar.xz"; + }; + }; + kparts = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kparts-5.14.0.tar.xz"; + sha256 = "149mck84rlbvw0am7jqbs6irhhabp8xd49m1b5avgdqfrkjsrrz5"; + name = "kparts-5.14.0.tar.xz"; + }; + }; + kpeople = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kpeople-5.14.0.tar.xz"; + sha256 = "08khnnywj7f3xkgr7yclz7wdhq4lyi9xfm7f7lzsfk6vpvzn84p5"; + name = "kpeople-5.14.0.tar.xz"; + }; + }; + kplotting = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kplotting-5.14.0.tar.xz"; + sha256 = "1d3fii89ziqnjv864qp7v9r5wd9v2qb56n6m5v9j0pz8gysc2fyp"; + name = "kplotting-5.14.0.tar.xz"; + }; + }; + kpty = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kpty-5.14.0.tar.xz"; + sha256 = "0lyayl4z6a1fn1lr1plikx22crdalnr1sv66nwhld7dh9j3lgd6j"; + name = "kpty-5.14.0.tar.xz"; + }; + }; + kross = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/portingAids/kross-5.14.0.tar.xz"; + sha256 = "1s7icj7xsnj8sxg99ahv3h8rbv6xnkyqpybxgaj9xs6k738rjclv"; + name = "kross-5.14.0.tar.xz"; + }; + }; + krunner = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/portingAids/krunner-5.14.0.tar.xz"; + sha256 = "0lxsbg4r0hxq9cgj2c8bs5yyzaxbpn73nsxhh1a9ivjcdbdz52x3"; + name = "krunner-5.14.0.tar.xz"; + }; + }; + kservice = { + version = "5.14.3"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kservice-5.14.3.tar.xz"; + sha256 = "0x3lbzs39vxyndh3v3kcwbp9127llfxyjgbm6yga1mff29ld57g7"; + name = "kservice-5.14.3.tar.xz"; + }; + }; + ktexteditor = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/ktexteditor-5.14.0.tar.xz"; + sha256 = "1r3zshqn7f7z81i2zzswc0a4158q21jgk5ydlx82v5w41lgsng9z"; + name = "ktexteditor-5.14.0.tar.xz"; + }; + }; + ktextwidgets = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/ktextwidgets-5.14.0.tar.xz"; + sha256 = "0nm6jaqx2jrwmqds3hdpkxmzl03vz46f147q0q659gashq9i6nlr"; + name = "ktextwidgets-5.14.0.tar.xz"; + }; + }; + kunitconversion = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kunitconversion-5.14.0.tar.xz"; + sha256 = "080y8lxggb1dm4hjv0qb6baklb42mngz7ic3fdp9nc7jrsfbn4qq"; + name = "kunitconversion-5.14.0.tar.xz"; + }; + }; + kwallet = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kwallet-5.14.0.tar.xz"; + sha256 = "1sk1mami15wygx7rmq2p445qdvx7yq10rhvbxgwclmvd4lj8vnly"; + name = "kwallet-5.14.0.tar.xz"; + }; + }; + kwidgetsaddons = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kwidgetsaddons-5.14.0.tar.xz"; + sha256 = "0vqrz54f57qz2jls7iw3hsfgglidfjhk88rkpr0sam449hmqxw2v"; + name = "kwidgetsaddons-5.14.0.tar.xz"; + }; + }; + kwindowsystem = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kwindowsystem-5.14.0.tar.xz"; + sha256 = "0fgqbrm1ngisjz11ccwvjb05v9v8fy85hvxaqnak0xysmvsw4sq1"; + name = "kwindowsystem-5.14.0.tar.xz"; + }; + }; + kxmlgui = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kxmlgui-5.14.0.tar.xz"; + sha256 = "1j3m37h6lxkk3bs2klqqlqlpnrlqvc1a3yd1hn8sr5sn279src30"; + name = "kxmlgui-5.14.0.tar.xz"; + }; + }; + kxmlrpcclient = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kxmlrpcclient-5.14.0.tar.xz"; + sha256 = "13s1np7sjjkmnih5r6rszqs3pvq0m4wq9za73cwhwnmlha7m3q0s"; + name = "kxmlrpcclient-5.14.0.tar.xz"; + }; + }; + modemmanager-qt = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/modemmanager-qt-5.14.0.tar.xz"; + sha256 = "1njg0gmzmj6g1w6d7id44g6dw7bki8xsq3sk0p7jqh1lcnsww4ck"; + name = "modemmanager-qt-5.14.0.tar.xz"; + }; + }; + networkmanager-qt = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/networkmanager-qt-5.14.0.tar.xz"; + sha256 = "1j2srgz4z2jd6b0iyb1rj979k0jz9hk8k7wx23146cvgrr4h4s86"; + name = "networkmanager-qt-5.14.0.tar.xz"; + }; + }; + plasma-framework = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/plasma-framework-5.14.0.tar.xz"; + sha256 = "16yghp353l9apndwqcaa310cxhm6vn0c2amggzvpr5fdwa3jb6mh"; + name = "plasma-framework-5.14.0.tar.xz"; + }; + }; + solid = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/solid-5.14.0.tar.xz"; + sha256 = "0znrmpw9nr2yccqs1xr0kai3sfhi175gfr006h4h88kfr0gc9s4i"; + name = "solid-5.14.0.tar.xz"; + }; + }; + sonnet = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/sonnet-5.14.0.tar.xz"; + sha256 = "06nn9zxxvj7sf6pdg35vay1f022c2binhl8p7i29w7vmxnxdg4w9"; + name = "sonnet-5.14.0.tar.xz"; + }; + }; + threadweaver = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/threadweaver-5.14.0.tar.xz"; + sha256 = "01vdqhlg5jp14dhalpggy359hw9620309zbssp0pdv7bflnwl0n3"; + name = "threadweaver-5.14.0.tar.xz"; + }; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/threadweaver.nix b/pkgs/development/libraries/kde-frameworks-5.14/threadweaver.nix index 52817921cc7..52817921cc7 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/threadweaver.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/threadweaver.nix diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index d8571254967..77fa6dec43e 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -19,12 +19,12 @@ assert withFonts -> freetype != null; stdenv.mkDerivation rec { baseName = "libbluray"; - version = "0.8.1"; + version = "0.9.0"; name = "${baseName}-${version}"; src = fetchurl { url = "ftp://ftp.videolan.org/pub/videolan/${baseName}/${version}/${name}.tar.bz2"; - sha256 = "13zvkrwy2fr877gkifgwnqfsb3krbz7hklfcwqfjbhmvqn0cdgnd"; + sha256 = "0kb9znxk6610vi0fjhqxn4z5i98nvxlsz1f8dakj99rg42livdl4"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ] diff --git a/pkgs/development/libraries/libeb/default.nix b/pkgs/development/libraries/libeb/default.nix index 9315a8f12b5..ba3c6fb1a8f 100644 --- a/pkgs/development/libraries/libeb/default.nix +++ b/pkgs/development/libraries/libeb/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { common way to distribute electronic dictionaries in Japan. It supports the EB, EBG, EBXA, EBXA-C, S-EBXA and EPWING formats. ''; - licence = licenses.bsd3; + license = licenses.bsd3; maintainers = with maintainers; [ gebner ]; }; } diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix index d27df16eb94..0472aeef694 100644 --- a/pkgs/development/libraries/libev/default.nix +++ b/pkgs/development/libraries/libev/default.nix @@ -2,18 +2,13 @@ stdenv.mkDerivation rec { name = "libev-${version}"; - version="4.19"; + version="4.20"; + src = fetchurl { url = "http://dist.schmorp.de/libev/Attic/${name}.tar.gz"; - sha256 = "1jyw7qbl0spxqa0dccj9x1jsw7cj7szff43cq4acmklnra4mzz48"; + sha256 = "17j47pbkr65a18mfvy2861p5k7w4pxmdgiw723ryfqd9gx636w7q"; }; - patches = [ ./noreturn.patch ]; - - # Version 4.19 is not valid C11 (which Clang default to) - # Check if this is still necessary on upgrade - NIX_CFLAGS_COMPILE = if stdenv.cc.isClang then "-std=c99" else null; - meta = { description = "A high-performance event loop/event model with lots of features"; maintainers = [ stdenv.lib.maintainers.raskin ]; diff --git a/pkgs/development/libraries/libev/noreturn.patch b/pkgs/development/libraries/libev/noreturn.patch deleted file mode 100644 index 85e2eaee6b4..00000000000 --- a/pkgs/development/libraries/libev/noreturn.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/ev.c b/ev.c -index 6f36c6d..b8a1c5f 100644 ---- a/ev.c -+++ b/ev.c -@@ -1026,7 +1026,7 @@ ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) { return (x << ( - #define ecb_unreachable() __builtin_unreachable () - #else - /* this seems to work fine, but gcc always emits a warning for it :/ */ -- ecb_inline void ecb_unreachable (void) ecb_noreturn; -+ ecb_inline ecb_noreturn void ecb_unreachable (void); - ecb_inline void ecb_unreachable (void) { } - #endif - diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index fb6ba1761b5..3ef4ba77c31 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -1,13 +1,15 @@ { lib, stdenv, fetchurl, libgcrypt }: stdenv.mkDerivation rec { - name = "libmicrohttpd-0.9.43"; + name = "libmicrohttpd-0.9.44"; src = fetchurl { url = "mirror://gnu/libmicrohttpd/${name}.tar.gz"; - sha256 = "17q6v5q0jpg57vylby6rx1qkil72bdx8gij1g9m694gxf5sb6js1"; + sha256 = "07j1p21rvbrrfpxngk8xswzkmjkh94bp1971xfjh1p0ja709qwzj"; }; + outputs = [ "out" "info" ]; + buildInputs = [ libgcrypt ]; preCheck = diff --git a/pkgs/development/libraries/libmp3splt/default.nix b/pkgs/development/libraries/libmp3splt/default.nix index 9ad2498dfa0..9074eb470b6 100644 --- a/pkgs/development/libraries/libmp3splt/default.nix +++ b/pkgs/development/libraries/libmp3splt/default.nix @@ -1,14 +1,14 @@ -{stdenv, fetchurl, libtool, libmad }: +{ stdenv, fetchurl, libtool, libmad, libid3tag }: stdenv.mkDerivation rec { name = "libmp3splt-0.9.1"; - + src = fetchurl { url = "http://prdownloads.sourceforge.net/mp3splt/${name}.tar.gz"; sha256 = "17ar9d669cnirkz1kdrim687wzi36y8inapnj4svlsvr00vdzfxa"; }; - buildInputs = [ libtool libmad ]; + buildInputs = [ libtool libmad libid3tag ]; configureFlags = "--disable-pcre"; diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix index 874d9000712..72aaa1593cc 100644 --- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix +++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://netfilter.org/projects/libnetfilter_conntrack/files/${name}.tar.bz2"; - sha256 = "0zcwjav1qgr7ikmvfmy7g3nc7s1kj4j4939d18mpyha9mwy4mv6r"; + sha256 = "0fnpja3g8s38cp7ipija5pvhfgna1gybn0z2bl276nk08fppv7gw"; }; buildInputs = [ libmnl ]; diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 913341c49b9..80f725c0451 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -5,10 +5,10 @@ let version = "${libVersion}-list-${listVersion}"; - listVersion = "2015-09-25"; + listVersion = "2015-10-11"; listSources = fetchFromGitHub { - sha256 = "045snl0pz8ma5rk51xxbjcamm28hi4z2v7gd8zkkv8yrjyg9yp82"; - rev = "509db00ef21795e58bfc2c576cebf72c8ee7a6f9"; + sha256 = "1zvfywi43kyh7b6hsm8ldmdypk9n36jzp0s1lf2rzd4yzcyxwgzy"; + rev = "8952c0c398ba44d507a8ed430fd1cff7b92dfde8"; repo = "list"; owner = "publicsuffix"; }; diff --git a/pkgs/development/libraries/libtermkey/default.nix b/pkgs/development/libraries/libtermkey/default.nix index c59542fdfed..bbc7c9a6094 100644 --- a/pkgs/development/libraries/libtermkey/default.nix +++ b/pkgs/development/libraries/libtermkey/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "libtermkey-${version}"; - version = "0.17"; + version = "0.18"; src = fetchzip { url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-${version}.tar.gz"; - sha256 = "085mdshgqsn76gfnnzfns7awv6lals9mgv5a6bybd9f9aj7lvrm5"; + sha256 = "0a0ih1a114phzmyq6jzgbp03x97463fwvrp1cgnl26awqw3f8sbf"; }; makeFlags = [ "PREFIX=$(out)" ] diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 158152abade..48d12321248 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -76,33 +76,7 @@ in with lib; - mapAttrs (v: h: mkWithoutAutotools stable (toVersion v) h) { - v0_10_27 = "0i00v216ha74xi374yhgmfrb4h84q2w4y1ync3y1qsngbm8irjhg"; - } - // mapAttrs (v: h: mkWithAutotools unstable (toVersion v) h) { - # Versions >= 0.11.1 and < 0.11.6 do not build a dynamic library - v0_11_6 = "15h903hz6kn8j1lp1160ia7llx0ypa5ch8ygkwpmrm31p50ng8r4"; - v0_11_7 = "1l6hrz3g2c7qspy28inbrcd7byn2sncd42ncf4pr0ifpkkj083hh"; - v0_11_8 = "0aag2v7bfi7kksna0867srlqcjxn8m287bpl2j5k11d07m382zs1"; - v0_11_9 = "12ap0ix5ra24f30adgdr48l175vxfmh398mlilm8kdkld0dqfx24"; - v0_11_10 = "17mn9xbygc2jpqv4a068i57rcp585bmcalpb9jpyz1jf030lllyy"; - v0_11_11 = "1l06sznvd5nxzg3fqqb451g4fzygyb37apqyhyvbdb6dmklcm7xk"; - v0_11_12 = "1kwqd3wk06mffhglawx7b2g4yddkg5597aa5jyw2zhzwkz2z4a27"; - v0_11_13 = "0z30ljwgxbm120dy0i4knhj5zw6q7jcx5wi9v0v51ax6mhdgqy8a"; - v0_11_14 = "0bk1bchfkbyyry3d4ggv754w5fyj6qbivbd42ggcr0hq55h49iwg"; - v0_11_15 = "09qayz2k0337h7jbf8zs9lyxgp3ln0gq37r43wixfll7jjjkacvd"; - v0_11_16 = "06jrwwnliqadqgp7fn2093xxljiz8iwdyywh2yljyp4zk8r4vzis"; - v0_11_17 = "0i6nlxnlxwzpib0sp1191h9yymfvgwjwciiq9avcqljiklfg432r"; - v0_11_18 = "0jxrfxf4iq34fjgbwdrvi36hqzgph87928n4q4gchpahywf2pjxk"; - v0_11_19 = "16aw8jx571xxc6am4sbz17j2wb9pylv1svsmwxbczb3vd624vm32"; - v0_11_20 = "0r7cyzxysgcfl4h9xis050b7x8cvmrwzwh1rr545q53j0gjxvzvi"; - v0_11_21 = "0bxjzrlcs2f0va26i0ahvcpjbb0j66rq74smi95s6q73zl99n326"; - v0_11_22 = "0r6nfavsndm1dzinzzxndr2h75g33vigx21z3f7w2x7qwa8a8hpp"; - v0_11_23 = "01dlmpk8a4zvq6lm88bsfi7dzhl7xvma7q5ygi2x5ghdm4svki1m"; - v0_11_24 = "1hygn81iwbdshzrq603qm6k1r7pjflx9qqazmlb72c3vy1hq21c6"; - v0_11_25 = "1abszivlxf0sddwvcj3jywfsip5q9vz6axvn40qqyl8sjs80zcvj"; - v0_11_26 = "1pfjdwrxhqz1vqcdm42g3j45ghrb4yl7wsngvraclhgqicff1sc3"; v0_11_29 = "1z07phfwryfy2155p3lxcm2a33h20sfl96lds5dghn157x6csz7m"; } // diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/development/libraries/libwps/default.nix index e17540e96a4..798284c3b89 100644 --- a/pkgs/development/libraries/libwps/default.nix +++ b/pkgs/development/libraries/libwps/default.nix @@ -1,17 +1,18 @@ { stdenv, fetchurl, boost, pkgconfig, librevenge, zlib }: +let version = "0.4.2"; in stdenv.mkDerivation rec { name = "libwps-${version}"; - version = "0.4.1"; src = fetchurl { url = "mirror://sourceforge/libwps/${name}.tar.gz"; - sha256 = "0nc44ia5sn9mmhkq5hjacz0vm520wldq03whc5psgcb9dahvsjsc"; + sha256 = "0c90i3zafxxsj989bd9bs577blx3mrb90rj52iv6ijc4qivi4wkr"; }; buildInputs = [ boost pkgconfig librevenge zlib ]; meta = with stdenv.lib; { + inherit version; homepage = http://libwps.sourceforge.net/; description = "Microsoft Works file word processor format import filter library"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/0.29.nix new file mode 100644 index 00000000000..1be9f453bb4 --- /dev/null +++ b/pkgs/development/libraries/neon/0.29.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, libxml2, pkgconfig +, compressionSupport ? true, zlib ? null +, sslSupport ? true, openssl ? null +, static ? false +, shared ? true +}: + +assert compressionSupport -> zlib != null; +assert sslSupport -> openssl != null; +assert static || shared; + +let + inherit (stdenv.lib) optionals; +in + +stdenv.mkDerivation rec { + version = "0.29.6"; + name = "neon-${version}"; + + src = fetchurl { + url = "http://www.webdav.org/neon/${name}.tar.gz"; + sha256 = "0hzbjqdx1z8zw0vmbknf159wjsxbcq8ii0wgwkqhxj3dimr0nr4w"; + }; + + patches = optionals stdenv.isDarwin [ ./0.29.6-darwin-fix-configure.patch ]; + + buildInputs = [libxml2 pkgconfig openssl] + ++ stdenv.lib.optional compressionSupport zlib; + + configureFlags = '' + ${if shared then "--enable-shared" else "--disable-shared"} + ${if static then "--enable-static" else "--disable-static"} + ${if compressionSupport then "--with-zlib" else "--without-zlib"} + ${if sslSupport then "--with-ssl" else "--without-ssl"} + --enable-shared + ''; + + passthru = {inherit compressionSupport sslSupport;}; + + meta = { + description = "An HTTP and WebDAV client library"; + homepage = http://www.webdav.org/neon/; + }; +} diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix new file mode 100644 index 00000000000..91ebc7cc661 --- /dev/null +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -0,0 +1,47 @@ +{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, xorg, mesa, glew +, cudaSupport ? false, cudatoolkit +}: + +stdenv.mkDerivation { + name = "opensubdiv-3.0.3"; + + src = fetchFromGitHub { + owner = "PixarAnimationStudios"; + repo = "OpenSubdiv"; + rev = "v3_0_3"; + sha256 = "1pd7xsz4lx5l2hdixfgqx9yijchw108wqkvxj78rbblkkawvqhmx"; + }; + + patches = + [ # Fix for building with cudatoolkit 7. + (fetchurl { + url = "https://github.com/opeca64/OpenSubdiv/commit/c3c258d00feaeffe1123f6077179c155e71febfb.patch"; + sha256 = "0vazhp35v8vsgnvprkzwvfkbalr0kzcwlin9ygyfb77cz7mwicnf"; + }) + ]; + + buildInputs = + [ cmake pkgconfig mesa + # FIXME: these are not actually needed, but the configure script wants them. + glew xorg.libX11 xorg.libXrandr xorg.libXxf86vm xorg.libXcursor xorg.libXinerama + ] + ++ lib.optional cudaSupport cudatoolkit; + + cmakeFlags = + [ "-DNO_TUTORIALS=1" + "-DNO_REGRESSION=1" + "-DNO_EXAMPLES=1" + "-DGLEW_INCLUDE_DIR=${glew}/include" + "-DGLEW_LIBRARY=${glew}/lib" + ]; + + enableParallelBuilding = true; + + meta = { + description = "An Open-Source subdivision surface library"; + homepage = http://graphics.pixar.com/opensubdiv; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.eelco ]; + license = lib.licenses.asl20; + }; +} diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix new file mode 100644 index 00000000000..4f8d5cf1aaa --- /dev/null +++ b/pkgs/development/libraries/pcre2/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "pcre2-10.20"; + src = fetchurl { + url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre2-10.20.tar.bz2"; + sha256 = "0yj8mm9ll9zj3v47rvmmqmr1ybxk72rr2lym3rymdsf905qjhbik"; + }; + + configureFlags = [ + "--enable-pcre2-16" + "--enable-pcre2-32" + "--enable-jit" + ]; + + meta = { + description = "Perl Compatible Regular Expressions"; + homepage = "http://www.pcre.org/"; + license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.ttuegel ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh b/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh index d9690559b42..9f1bafc9f49 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh @@ -62,9 +62,9 @@ setQMakePath() { wrapQtProgram() { wrapProgram "$1" \ - --set QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \ - --set QML_IMPORT_PATH : "$QML_IMPORT_PATH" \ - --set QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \ + --set QT_PLUGIN_PATH "$QT_PLUGIN_PATH" \ + --set QML_IMPORT_PATH "$QML_IMPORT_PATH" \ + --set QML2_IMPORT_PATH "$QML2_IMPORT_PATH" \ "$@" } diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index 89d2a242f96..f9897e4add3 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, unzip, openblas, gfortran }: stdenv.mkDerivation rec { - version = "3.12.3"; + version = "3.12.4"; name = "ipopt-${version}"; src = fetchurl { url = "http://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip"; - sha256 = "0h8qx3hq2m21qrg4v3n26v2qbhl6saxrpa7rbhnmkkcfj5s942yr"; + sha256 = "0hxmpi3zx5zgv2ijscdvc40xf88hx5if0d9sgch155z70g15wx0l"; }; preConfigure = '' diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index a4bf1efbb73..7a1a860b9e4 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -6,6 +6,8 @@ with stdenv.lib; +let blas64_ = blas64; in + let local = config.openblas.preferLocalBuild or false; binary = { i686-linux = "32"; @@ -18,11 +20,11 @@ let local = config.openblas.preferLocalBuild or false; ]; localFlags = config.openblas.flags or optionals (hasAttr "target" config.openblas) [ "TARGET=${config.openblas.target}" ]; - blas64Orig = blas64; -in -stdenv.mkDerivation rec { - version = "0.2.14"; + blas64 = if blas64_ != null then blas64_ else hasPrefix "x86_64" stdenv.system; + version = "0.2.14"; +in +stdenv.mkDerivation { name = "openblas-${version}"; src = fetchurl { url = "https://github.com/xianyi/OpenBLAS/tarball/v${version}"; @@ -30,6 +32,8 @@ stdenv.mkDerivation rec { name = "openblas-${version}.tar.gz"; }; + inherit blas64; + preBuild = "cp ${liblapack.src} lapack-${liblapack.meta.version}.tgz"; nativeBuildInputs = optionals stdenv.isDarwin [coreutils] ++ [gfortran perl]; @@ -50,7 +54,8 @@ stdenv.mkDerivation rec { "INTERFACE64=${if blas64 then "1" else "0"}" ]; - blas64 = if blas64Orig != null then blas64Orig else hasPrefix "x86_64" stdenv.system; + doCheck = true; + checkTarget = "tests"; meta = with stdenv.lib; { description = "Basic Linear Algebra Subprograms"; diff --git a/pkgs/development/libraries/science/math/openlibm/default.nix b/pkgs/development/libraries/science/math/openlibm/default.nix new file mode 100644 index 00000000000..e38e6c9e31f --- /dev/null +++ b/pkgs/development/libraries/science/math/openlibm/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "openlibm-0.4.1"; + src = fetchurl { + url = "https://github.com/JuliaLang/openlibm/archive/v0.4.1.tar.gz"; + sha256 = "0cwqqqlblj3kzp9aq1wnpfs1fl0qd1wp1xzm5shb09w06i4rh9nn"; + }; + + makeFlags = [ "prefix=$(out)" ]; + + meta = { + description = "High quality system independent, portable, open source libm implementation"; + homepage = "http://www.openlibm.org/"; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.ttuegel ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/science/math/openspecfun/default.nix b/pkgs/development/libraries/science/math/openspecfun/default.nix new file mode 100644 index 00000000000..1988c0c07af --- /dev/null +++ b/pkgs/development/libraries/science/math/openspecfun/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, gfortran }: + +stdenv.mkDerivation { + name = "openspecfun-0.4"; + src = fetchurl { + url = "https://github.com/JuliaLang/openspecfun/archive/v0.4.tar.gz"; + sha256 = "0nsa3jjmlhcqkw5ba5ypbn3n0c8b6lc22zzlxnmxkxi9shhdx65z"; + }; + + makeFlags = [ "prefix=$(out)" ]; + + nativeBuildInputs = [ gfortran ]; + + meta = { + description = "A collection of special mathematical functions"; + homepage = "https://github.com/JuliaLang/openspecfun"; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.ttuegel ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix index f30db472b0d..e32b8b34426 100644 --- a/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { for i in "$out"/lib/lib*.a; do ar -x $i done - gcc *.o --shared -o "$out/lib/libsuitesparse.so" + gcc *.o --shared -o "$out/lib/libsuitesparse.so" -lopenblas ) for i in umfpack cholmod amd camd colamd spqr; do ln -s libsuitesparse.so "$out"/lib/lib$i.so; diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix new file mode 100644 index 00000000000..3978461d0ca --- /dev/null +++ b/pkgs/development/libraries/swiften/default.nix @@ -0,0 +1,30 @@ +{ stdenv, python, fetchurl, openssl, boost }: +stdenv.mkDerivation rec { + name = "swiften-${version}"; + version = "3.0beta2"; + + buildInputs = [ python ]; + propagatedBuildInputs = [ openssl boost ]; + + src = fetchurl { + url = "http://swift.im/downloads/releases/swift-${version}/swift-${version}.tar.gz"; + sha256 = "0i6ks122rry9wvg6qahk3yiggi7nlkpgws1z0r41vi4i1siq0ls0"; + }; + + buildPhase = '' + ./scons openssl=${openssl} \ + boost_includedir=${boost.dev}/include \ + boost_libdir=${boost.lib}/lib \ + boost_bundled_enable=false \ + SWIFTEN_INSTALLDIR=$out $out + ''; + installPhase = "true"; + + meta = with stdenv.lib; { + description = "An XMPP library for C++, used by the Swift client"; + homepage = http://swift.im/swiften.html; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.twey ]; + }; +} diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix index c8a2fd6a4e9..4b7d06fe8c7 100644 --- a/pkgs/development/libraries/utf8proc/default.nix +++ b/pkgs/development/libraries/utf8proc/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "utf8proc-${version}"; - version = "v1.2"; + version = "1.3"; - src = fetchFromGitHub { - owner = "JuliaLang"; - repo = "utf8proc"; - rev = "${version}"; - sha256 = "1ryjlcnpfm7fpkq6444ybi576hbnh2l0w7kjhbqady5lxwjyg3pf"; + src = fetchurl { + url = "https://github.com/JuliaLang/utf8proc/archive/v${version}.tar.gz"; + sha256 = "07r7djkmd399wl9cn0s2iqjhmm7l5iifp5h1yf2in9s366mlhkkg"; }; makeFlags = [ "prefix=$(out)" ]; diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix index d89fae5c964..144af122d73 100644 --- a/pkgs/development/libraries/zeroc-ice/default.nix +++ b/pkgs/development/libraries/zeroc-ice/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "zeroc-ice-${version}"; - version = "3.6.0"; + version = "3.6.1"; src = fetchFromGitHub { owner = "zeroc-ice"; repo = "ice"; rev = "v${version}"; - sha256 = "192lhynf369bbrvbb9nldc49n09kyxp8vg8j9d7w5h2c1yxpjgjq"; + sha256 = "044511zbhwiach1867r3xjz8i4931wn7c1l3nz4kcpgks16kqhhz"; }; buildInputs = [ mcpp bzip2 expat openssl db5 ]; |