diff options
Diffstat (limited to 'pkgs/development/libraries')
60 files changed, 712 insertions, 575 deletions
diff --git a/pkgs/development/libraries/audio/zita-convolver/default.nix b/pkgs/development/libraries/audio/zita-convolver/default.nix index 48a409b5367a..11a06d4f39ac 100644 --- a/pkgs/development/libraries/audio/zita-convolver/default.nix +++ b/pkgs/development/libraries/audio/zita-convolver/default.nix @@ -15,11 +15,14 @@ stdenv.mkDerivation rec { sed -e "s@ldconfig@@" -i Makefile ''; - installPhase = '' - make PREFIX="$out" SUFFIX="" install + makeFlags = [ + "PREFIX=$(out)" + "SUFFIX=" + ]; + postInstall = '' # create lib link for building apps - ln -s $out/lib/libzita-convolver.so.$version $out/lib/libzita-convolver.so.3 + ln -s $out/lib/libzita-convolver.so.${version} $out/lib/libzita-convolver.so.${stdenv.lib.versions.major version} ''; meta = { diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 2144dc4eec26..9f41bf1af47c 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -15,13 +15,13 @@ let else throw "Unsupported system!"; in stdenv.mkDerivation rec { name = "aws-sdk-cpp-${version}"; - version = "1.4.78"; + version = "1.4.82"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "15nrrv94vp8i1azi2bcpi08wxb2dbqlmy9y6jyfw0n1vkr6gz2fw"; + sha256 = "1m5xylcwx5vhz0q3srlq9rbr4x9kydd77mf45agd60clq25sxs69"; }; # FIXME: might be nice to put different APIs in different outputs diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix index dd926ac20817..0a2badea7cbf 100644 --- a/pkgs/development/libraries/bamf/default.nix +++ b/pkgs/development/libraries/bamf/default.nix @@ -1,12 +1,14 @@ { stdenv, fetchurl, libgtop, libwnck3, glib, vala, pkgconfig , libstartup_notification, gobjectIntrospection, gtk-doc -, python27, pythonPackages, libxml2 }: +, xorgserver, dbus, python2 }: stdenv.mkDerivation rec { pname = "bamf"; version = "0.5.3"; name = "${pname}-${version}"; + outputs = [ "out" "dev" "devdoc" ]; + src = fetchurl { url = "https://launchpad.net/${pname}/0.5/${version}/+download/${name}.tar.gz"; sha256 = "051vib8ndp09ph5bfwkgmzda94varzjafwxf6lqx7z1s8rd7n39l"; @@ -16,22 +18,40 @@ stdenv.mkDerivation rec { pkgconfig gtk-doc gobjectIntrospection + vala + # Tests + xorgserver + dbus + (python2.withPackages (pkgs: with pkgs; [ libxslt libxml2 ])) ]; - buildInputs = [ libgtop libwnck3 vala libstartup_notification - python27 pythonPackages.libxslt libxml2 glib ]; + buildInputs = [ + libgtop + libwnck3 + libstartup_notification + glib + ]; + # Fix hard-coded path + # https://bugs.launchpad.net/bamf/+bug/1780557 postPatch = '' substituteInPlace data/Makefile.in \ - --replace '/usr/lib/systemd/user' '@datarootdir@/systemd/user' + --replace '/usr/lib/systemd/user' '@prefix@/lib/systemd/user' ''; + configureFlags = [ + "--enable-headless-tests" + ]; + # fix paths makeFlags = [ - "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/" + "INTROSPECTION_GIRDIR=$(dev)/share/gir-1.0/" "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0" ]; + # TODO: Requires /etc/machine-id + doCheck = false; + # ignore deprecation errors NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations"; diff --git a/pkgs/development/libraries/curlcpp/default.nix b/pkgs/development/libraries/curlcpp/default.nix index c1c867abcdf5..a2188f687d13 100644 --- a/pkgs/development/libraries/curlcpp/default.nix +++ b/pkgs/development/libraries/curlcpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "curlcpp-${version}"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "JosephP91"; repo = "curlcpp"; rev = "${version}"; - sha256 = "1akibhrmqsy0dlz9lq93508bhkh7r1l0aycbzy2x45a9gqxfdi4q"; + sha256 = "025qg5hym73xrvyhalv3jgbf9jqnnzkdjs3zwsgbpqx58zyd5bg5"; }; buildInputs = [ cmake curl ]; diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix index b2a224e10b11..e4d1fa2073fa 100644 --- a/pkgs/development/libraries/eclib/default.nix +++ b/pkgs/development/libraries/eclib/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, fetchpatch , autoreconfHook , libtool , gettext @@ -17,13 +18,25 @@ assert withFlint -> flint != null; stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "eclib"; - version = "20171219"; + version = "20180710"; # upgrade might break the sage interface + # sage tests to run: + # src/sage/interfaces/mwrank.py + # src/sage/libs/eclib + # ping @timokau for more info src = fetchFromGitHub { owner = "JohnCremona"; repo = "${pname}"; rev = "v${version}"; - sha256 = "1yw488ng0labpxqqpxq0710qnndxl8plvcaqklpbwwd62a47knlr"; + sha256 = "1kmwpw971sipb4499c9b35q5pz6sms5qndqrvq7396d8hhwjg1i2"; }; + patches = [ + # One of the headers doesn't get installed. + # See https://github.com/NixOS/nixpkgs/pull/43476. + (fetchpatch { + url = "https://github.com/JohnCremona/eclib/pull/42/commits/c9b96429815e31a6e3372c106e31eef2a96431f9.patch"; + sha256 = "0cw26h94m66rbh8jjsfnb1bvc6z7ybh8zcp8xl5nhxjxiawhcl73"; + }) + ]; buildInputs = [ pari ntl @@ -35,12 +48,12 @@ stdenv.mkDerivation rec { autoreconfHook ]; doCheck = true; - meta = { + meta = with stdenv.lib; { inherit version; description = ''Elliptic curve tools''; homepage = https://github.com/JohnCremona/eclib; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ raskin timokau ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/elementary-cmake-modules/default.nix b/pkgs/development/libraries/elementary-cmake-modules/default.nix index 5287db756094..710338842f8d 100644 --- a/pkgs/development/libraries/elementary-cmake-modules/default.nix +++ b/pkgs/development/libraries/elementary-cmake-modules/default.nix @@ -1,7 +1,8 @@ { stdenv, lib, fetchFromGitHub, cmake, pkgconfig }: -stdenv.mkDerivation { - name = "elementary-cmake-modules"; +stdenv.mkDerivation rec { + name = "elementary-cmake-modules-${version}"; + version = "0.1.0"; src = fetchFromGitHub { owner = "elementary"; diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index fcbaaaba6ba4..c5ce5e252fac 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -232,11 +232,11 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing; stdenv.mkDerivation rec { name = "ffmpeg-full-${version}"; - version = "4.0"; + version = "4.0.1"; src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"; - sha256 = "0gx4ngnhi5glmxh38603qy5n6vq8bl1cr4sqd1xff95i82pmv57d"; + sha256 = "1vn04n0n46zdxq14cma3w8ml2ckh5jxwlybsc4xmvcqdqq0mqpv0"; }; prePatch = '' diff --git a/pkgs/development/libraries/ffmpeg/3.4.nix b/pkgs/development/libraries/ffmpeg/3.4.nix index 98cbfdf43f6c..05da9e18c594 100644 --- a/pkgs/development/libraries/ffmpeg/3.4.nix +++ b/pkgs/development/libraries/ffmpeg/3.4.nix @@ -6,7 +6,7 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; - branch = "3.4.2"; - sha256 = "0nkq4451masmzlx3p4vprqwc0sl2iwqxbzjrngmvj29q4azp00zb"; + branch = "3.4.3"; + sha256 = "0s2p2bcrywlya4wjlyzi1382vngkiijjvjr6ms64xww5jplwmhmk"; darwinFrameworks = [ Cocoa CoreMedia ]; }) diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index a6e67052cd03..40b697c7a76a 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -6,7 +6,7 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; - branch = "4.0"; - sha256 = "1f3k8nz5ag6szsfhlrz66qm8s1yxk1vphqvcfr4ps4690vckk2ii"; + branch = "4.0.1"; + sha256 = "0w0nq98sn5jwx982wzg3vfrxv4p0k1fvsksiz9az0rpvwyqr3rby"; darwinFrameworks = [ Cocoa CoreMedia ]; }) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 270e96055822..3d9027db1602 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -26,7 +26,7 @@ * see `ffmpeg-full' for an ffmpeg build with all features included. * * Need fixes to support Darwin: - * libvpx pulseaudio + * pulseaudio * * Known issues: * 0.6 - fails to compile (unresolved) (so far, only disabling a number of @@ -58,6 +58,8 @@ let disDarwinOrArmFix = origArg: minVer: fixArg: if ((isDarwin || isAarch32) && reqMin minVer) then fixArg else origArg; vaapiSupport = reqMin "0.6" && ((isLinux || isFreeBSD) && !isAarch32); + + vpxSupport = reqMin "0.6" && !isAarch32; in assert openglSupport -> libGLU_combined != null; @@ -130,7 +132,7 @@ stdenv.mkDerivation rec { (ifMinVer "0.6" (enableFeature vaapiSupport "vaapi")) "--enable-vdpau" "--enable-libvorbis" - (disDarwinOrArmFix (ifMinVer "0.6" "--enable-libvpx") "0.6" "--disable-libvpx") + (ifMinVer "0.6" (enableFeature vpxSupport "libvpx")) (ifMinVer "2.4" "--enable-lzma") (ifMinVer "2.2" (enableFeature openglSupport "opengl")) (disDarwinOrArmFix (ifMinVer "0.9" "--enable-libpulse") "0.9" "--disable-libpulse") @@ -148,7 +150,7 @@ stdenv.mkDerivation rec { "--disable-stripping" # Disable mmx support for 0.6.90 (verFix null "0.6.90" "--disable-mmx") - ] ++ optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--cross-prefix=${stdenv.cc.targetPrefix}" "--enable-cross-compile" ] ++ optional stdenv.cc.isClang "--cc=clang"; @@ -159,7 +161,8 @@ stdenv.mkDerivation rec { bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus ] ++ optional openglSupport libGLU_combined - ++ optionals (!isDarwin && !isAarch32) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM + ++ optional vpxSupport libvpx + ++ optionals (!isDarwin && !isAarch32) [ libpulseaudio ] # Need to be fixed on Darwin and ARM ++ optional ((isLinux || isFreeBSD) && !isAarch32) libva ++ optional isLinux alsaLib ++ optionals isDarwin darwinFrameworks @@ -170,9 +173,15 @@ stdenv.mkDerivation rec { doCheck = false; # fails + # ffmpeg 3+ generates pkg-config (.pc) files that don't have the + # form automatically handled by the multiple-outputs hooks. postFixup = '' moveToOutput bin "$bin" moveToOutput share/ffmpeg/examples "$doc" + for pc in ''${!outputDev}/lib/pkgconfig/*.pc; do + substituteInPlace $pc \ + --replace "includedir=$out" "includedir=''${!outputInclude}" + done ''; installFlags = [ "install-man" ]; diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index 9a7acc287cc4..b8b55d6a8742 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, autoreconfHook, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43, docbook_xsl, which, libxml2 -, gobjectIntrospection, gtk_doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc -, bubblewrap, bzip2, dbus, glib, gpgme, json_glib, libarchive, libcap, libseccomp, coreutils, python2, hicolor-icon-theme -, libsoup, lzma, ostree, polkit, python3, systemd, xlibs, valgrind, glib_networking, makeWrapper, gnome3 }: +, gobjectIntrospection, gtk-doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc +, bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, python2, hicolor-icon-theme +, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, makeWrapper, gnome3 }: let - version = "0.99.2"; + version = "0.99.3"; desktop_schemas = gnome3.gsettings_desktop_schemas; in stdenv.mkDerivation rec { name = "flatpak-${version}"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${version}/${name}.tar.xz"; - sha256 = "1cc82nxd290m4ljkd1phllwb3hkhz41h4ncfdrmhbg3gk47zgpyw"; + sha256 = "0wd6ix1qyz8wmjkfrmr6j99gwywqs7ak1ilsn1ljp72g2z449ayk"; }; patches = [ @@ -28,12 +28,12 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook libxml2 docbook_xml_dtd_412 docbook_xml_dtd_42 docbook_xml_dtd_43 docbook_xsl which gobjectIntrospection - gtk_doc intltool libxslt pkgconfig xmlto appstream-glib yacc makeWrapper + gtk-doc intltool libxslt pkgconfig xmlto appstream-glib yacc makeWrapper ] ++ stdenv.lib.optionals doCheck checkInputs; buildInputs = [ - bubblewrap bzip2 dbus glib gpgme json_glib libarchive libcap libseccomp - libsoup lzma ostree polkit python3 systemd xlibs.libXau + bubblewrap bzip2 dbus glib gpgme json-glib libarchive libcap libseccomp + libsoup lzma ostree polkit python3 systemd xorg.libXau ]; checkInputs = [ valgrind ]; @@ -60,7 +60,7 @@ in stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/bin/flatpak \ - --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "${desktop_schemas}/share/gsettings-schemas/${desktop_schemas.name}" ''; diff --git a/pkgs/development/libraries/flatpak/fix-test-paths.patch b/pkgs/development/libraries/flatpak/fix-test-paths.patch index 0c2b7da79eb3..3f4bc56721ee 100644 --- a/pkgs/development/libraries/flatpak/fix-test-paths.patch +++ b/pkgs/development/libraries/flatpak/fix-test-paths.patch @@ -1,6 +1,6 @@ --- a/tests/libtest.sh +++ b/tests/libtest.sh -@@ -324,7 +324,7 @@ +@@ -315,7 +315,7 @@ # running installed-tests: assume we know what we're doing : elif ! "$FLATPAK_BWRAP" --unshare-ipc --unshare-net --unshare-pid \ @@ -9,7 +9,7 @@ sed -e 's/^/# /' < bwrap-result echo "1..0 # SKIP Cannot run bwrap" exit 0 -@@ -332,7 +332,7 @@ +@@ -323,7 +323,7 @@ } skip_without_python2 () { @@ -18,7 +18,7 @@ echo "1..0 # SKIP this test requires /usr/bin/python2 (2.7) support" exit 0 fi -@@ -352,12 +352,12 @@ +@@ -335,12 +335,12 @@ export DBUS_SESSION_BUS_ADDRESS="$(cat dbus-session-bus-address)" DBUS_SESSION_BUS_PID="$(cat dbus-session-bus-pid)" @@ -135,12 +135,12 @@ collection_args=--collection-id=${COLLECTION_ID} --- a/tests/testlibrary.c +++ b/tests/testlibrary.c -@@ -610,7 +610,7 @@ +@@ -584,7 +584,7 @@ { gint exit_code = 0; - char *argv[] = { (char *)bwrap, "--unshare-ipc", "--unshare-net", -- "--unshare-pid", "--ro-bind", "/", "/", "/bin/true", NULL }; -+ "--unshare-pid", "--ro-bind", "/", "/", "@coreutils@/bin/true", NULL }; + char *argv[] = { (char *) bwrap, "--unshare-ipc", "--unshare-net", +- "--unshare-pid", "--ro-bind", "/", "/", "/bin/true", NULL }; ++ "--unshare-pid", "--ro-bind", "/", "/", "@coreutils@/bin/true", NULL }; g_autofree char *argv_str = g_strjoinv (" ", argv); g_test_message ("Spawning %s", argv_str); g_spawn_sync (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL, &exit_code, &error); diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/development/libraries/flint/default.nix index 67bf7503db98..2b3f75b80dbd 100644 --- a/pkgs/development/libraries/flint/default.nix +++ b/pkgs/development/libraries/flint/default.nix @@ -37,6 +37,10 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optionals withBlas [ "--with-blas=${openblas}" ]; + + # issues with ntl -- https://github.com/wbhart/flint2/issues/487 + NIX_CFLAGS_COMPILE = [ "-std=c++11" ]; + patches = [ (fetchpatch { # Always produce libflint.so.MAJOR; will be included in the next flint version diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index ddc962d0aab6..405d80031e37 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -1,13 +1,11 @@ -{ stdenv, composableDerivation, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi -, freeglut, libGLU_combined, libjpeg, zlib, libXinerama, libXft, libpng -, cfg ? {} +{ stdenv, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi +, freeglut, libGLU_combined, libjpeg, zlib, libXft, libpng , darwin, libtiff, freetype }: -let inherit (composableDerivation) edf; in - -let version = "1.3.4"; in -composableDerivation.composableDerivation {} { +let + version = "1.3.4"; +in stdenv.mkDerivation { name = "fltk-${version}"; src = fetchurl { @@ -18,6 +16,23 @@ composableDerivation.composableDerivation {} { patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ]; nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ + libGLU_combined + libjpeg + zlib + libpng + libXft + ]; + + configureFlags = [ + "--enable-gl" + "--enable-largefile" + "--enable-shared" + "--enable-threads" + "--enable-xft" + ]; + propagatedBuildInputs = [ inputproto ] ++ (if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [Cocoa AGL GLUT freetype libtiff]) @@ -25,33 +40,6 @@ composableDerivation.composableDerivation {} { enableParallelBuilding = true; - flags = - # this could be tidied up (?).. eg why does it require freeglut without glSupport? - edf { name = "cygwin"; } # use the CygWin libraries default=no - // edf { name = "debug"; } # turn on debugging default=no - // edf { name = "gl"; enable = { buildInputs = [ libGLU_combined ]; }; } # turn on OpenGL support default=yes - // edf { name = "shared"; } # turn on shared libraries default=no - // edf { name = "threads"; } # enable multi-threading support - // edf { name = "quartz"; enable = { buildInputs = "quartz"; }; } # don't konw yet what quartz is # use Quartz instead of Quickdraw (default=no) - // edf { name = "largefile"; } # omit support for large files - // edf { name = "localjpeg"; disable = { buildInputs = [libjpeg]; }; } # use local JPEG library, default=auto - // edf { name = "localzlib"; disable = { buildInputs = [zlib]; }; } # use local ZLIB library, default=auto - // edf { name = "localpng"; disable = { buildInputs = [libpng]; }; } # use local PNG library, default=auto - // edf { name = "xinerama"; enable = { buildInputs = [libXinerama]; }; } # turn on Xinerama support default=no - // edf { name = "xft"; enable = { buildInputs=[libXft]; }; } # turn on Xft support default=no - // edf { name = "xdbe"; }; # turn on Xdbe support default=no - - cfg = { - largefileSupport = true; # is default - glSupport = true; # doesn't build without it. Why? - localjpegSupport = false; - localzlibSupport = false; - localpngSupport = false; - sharedSupport = true; - threadsSupport = true; - xftSupport = true; - } // cfg; - meta = { description = "A C++ cross-platform lightweight GUI library"; homepage = http://www.fltk.org; diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 75335f08545e..ccf2d6d05855 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "folly-${version}"; - version = "2018.06.25.00"; + version = "2018.07.09.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "0i0c2130xjrpzf5k29j09ckl1nc9ab2hapf5l6004axq6v1kw9sa"; + sha256 = "08irwa2pb3f2gnk31rq31jjrqk2xxx0a0m72gf0bsv2w9fgn5sfm"; }; nativeBuildInputs = [ autoreconfHook python pkgconfig ]; diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix index 3fd0bb082440..a1980d62490a 100644 --- a/pkgs/development/libraries/gdbm/default.nix +++ b/pkgs/development/libraries/gdbm/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, buildPlatform, fetchurl }: stdenv.mkDerivation rec { - name = "gdbm-1.14.1"; + name = "gdbm-1.15"; src = fetchurl { url = "mirror://gnu/gdbm/${name}.tar.gz"; - sha256 = "0pxwz3jlwvglq2mrbxvrjgr8pa0aj73p3v9sxmdlj570zw0gzknd"; + sha256 = "03nwsbixdp3nx3fzn3gjy0n7rcppmkkxb2nxbmd8mvb7gwhf7zgr"; }; doCheck = true; # not cross; diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix index 5796425e4385..56d8cd21f844 100644 --- a/pkgs/development/libraries/geis/default.nix +++ b/pkgs/development/libraries/geis/default.nix @@ -3,7 +3,7 @@ , python3Packages , wrapGAppsHook , atk -, dbus_libs +, dbus , evemu , frame , gdk_pixbuf @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { [ pygobject3 ]; nativeBuildInputs = [ pkgconfig wrapGAppsHook python3Packages.wrapPython]; - buildInputs = [ atk dbus_libs evemu frame gdk_pixbuf gobjectIntrospection grail + buildInputs = [ atk dbus evemu frame gdk_pixbuf gobjectIntrospection grail gtk3 libX11 libXext libXi libXtst pango python3Packages.python xorgserver ]; diff --git a/pkgs/development/libraries/glew/1.10.nix b/pkgs/development/libraries/glew/1.10.nix index fafcf82258ab..af0830ab7042 100644 --- a/pkgs/development/libraries/glew/1.10.nix +++ b/pkgs/development/libraries/glew/1.10.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libGLU, x11, libXmu, libXi +{ stdenv, fetchurl, libGLU, xlibsWrapper, libXmu, libXi , buildPlatform, hostPlatform , AGL ? null }: @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "01zki46dr5khzlyywr3cg615bcal32dazfazkf360s1znqh17i4r"; }; - buildInputs = [ x11 libXmu libXi ] ++ optionals stdenv.isDarwin [ AGL ]; + buildInputs = [ xlibsWrapper libXmu libXi ] + ++ optionals stdenv.isDarwin [ AGL ]; propagatedBuildInputs = [ libGLU ]; # GL/glew.h includes GL/glu.h patchPhase = '' diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index ff870f525f23..fd6e0a65abce 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -4,7 +4,8 @@ , utillinuxMinimal ? null # this is just for tests (not in closure of any regular package) -, coreutils, dbus_daemon, libxml2, tzdata, desktop-file-utils, shared-mime-info, doCheck ? false +, coreutils, dbus, libxml2, tzdata, desktop-file-utils +, shared-mime-info, doCheck ? false }: with stdenv.lib; @@ -121,7 +122,7 @@ stdenv.mkDerivation rec { export XDG_RUNTIME_HOME="$TMP" export HOME="$TMP" export XDG_DATA_DIRS="${desktop-file-utils}/share:${shared-mime-info}/share" - export G_TEST_DBUS_DAEMON="${dbus_daemon.out}/bin/dbus-daemon" + export G_TEST_DBUS_DAEMON="${dbus.daemon}/bin/dbus-daemon" export PATH="$PATH:$(pwd)/gobject" echo "PATH=$PATH" diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix index f206a169b93d..656afef22f90 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/pkgs/development/libraries/gtkd/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchzip, atk, cairo, dmd, gdk_pixbuf, gnome3, gst_all_1, librsvg -, pango, pkgconfig, substituteAll, which }: +, pango, pkgconfig, substituteAll, which, gst_plugins_base }: stdenv.mkDerivation rec { name = "gtkd-${version}"; diff --git a/pkgs/development/libraries/gupnp-dlna/default.nix b/pkgs/development/libraries/gupnp-dlna/default.nix index 642e10ea541d..75818f756921 100644 --- a/pkgs/development/libraries/gupnp-dlna/default.nix +++ b/pkgs/development/libraries/gupnp-dlna/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, gupnp, gst_plugins_base }: +{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, gupnp, gst-plugins-base }: stdenv.mkDerivation rec { name = "gupnp-dlna-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; - buildInputs = [ gupnp gst_plugins_base ]; + buildInputs = [ gupnp gst-plugins-base ]; meta = { homepage = https://wiki.gnome.org/Projects/GUPnP/; diff --git a/pkgs/development/libraries/hspell/default.nix b/pkgs/development/libraries/hspell/default.nix index 424ffd184994..20dda589b9cc 100644 --- a/pkgs/development/libraries/hspell/default.nix +++ b/pkgs/development/libraries/hspell/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { version = "1.1"; }; + PERL_USE_UNSAFE_INC = stdenv.lib.optionalString (stdenv.lib.versionAtLeast (stdenv.lib.getVersion perl) "5.26") "1"; + src = fetchurl { url = "${meta.homepage}${name}.tar.gz"; sha256 = "08x7rigq5pa1pfpl30qp353hbdkpadr1zc49slpczhsn0sg36pd6"; @@ -21,6 +23,5 @@ stdenv.mkDerivation rec { homepage = http://hspell.ivrix.org.il/; platforms = stdenv.lib.platforms.all; maintainers = [ ]; -# Note that I don't speak hebrew, so I can only fix compile problems }; } diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch index a74340a6dc96..66f10f4abc1e 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch @@ -1,21 +1,23 @@ -Index: extra-cmake-modules-5.18.0/kde-modules/KDEInstallDirs.cmake -=================================================================== ---- extra-cmake-modules-5.18.0.orig/kde-modules/KDEInstallDirs.cmake -+++ extra-cmake-modules-5.18.0/kde-modules/KDEInstallDirs.cmake -@@ -200,32 +200,6 @@ +diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake +index 52b2eb2..a04596c 100644 +--- a/kde-modules/KDEInstallDirs.cmake ++++ b/kde-modules/KDEInstallDirs.cmake +@@ -232,34 +232,6 @@ # GNUInstallDirs code deals with re-configuring, but that is dealt with # by the _define_* macros in this module). set(_LIBDIR_DEFAULT "lib") -# Override this default 'lib' with 'lib64' iff: -# - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling -# - we are NOT on debian +-# - we are NOT on flatpak -# - we are on a 64 bits system -# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf -# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if -# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu" -# See http://wiki.debian.org/Multiarch -if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU") -- AND NOT CMAKE_CROSSCOMPILING) +- AND NOT CMAKE_CROSSCOMPILING +- AND NOT DEFINED ENV{FLATPAK_ID}) - if (EXISTS "/etc/debian_version") # is this a debian system ? - if(CMAKE_LIBRARY_ARCHITECTURE) - set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}") diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 9b4f26a90633..1d389f914ddf 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.47/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.48/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix index 0a600fe8d057..68b5c08aa090 100644 --- a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, - extra-cmake-modules, docbook_xml_dtd_45, docbook5_xsl, + extra-cmake-modules, docbook_xml_dtd_45, docbook_xsl_ns, karchive, ki18n, qtbase, perl, perlPackages }: @@ -24,7 +24,7 @@ mkDerivation { patches = [ ./kdoctools-no-find-docbook-xml.patch ]; cmakeFlags = [ "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" - "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook" + "-DDocBookXSL_DIR=${docbook_xsl_ns}/xml/xsl/docbook" ]; postFixup = '' moveToOutput "share/doc" "$dev" diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index d0db2284509b..1ad2254ccf89 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -3,627 +3,627 @@ { attica = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/attica-5.47.0.tar.xz"; - sha256 = "17i580hhi9rpd6d4nf408snlnf8xivwskkzbjja0snajx0nrd8bj"; - name = "attica-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/attica-5.48.0.tar.xz"; + sha256 = "1q2133gmhfi3wd9978556syzzqc1s6zgjc0p1353w6dmfwxfyzq8"; + name = "attica-5.48.0.tar.xz"; }; }; baloo = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/baloo-5.47.0.tar.xz"; - sha256 = "15jpbl47pr86h5ji2x3079b6x38fchc2pf03rjqlf5mgkabdpafq"; - name = "baloo-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/baloo-5.48.0.tar.xz"; + sha256 = "0rgz2gx99c1k8vgfskx7w6q1sjf98wcvybv88djdlj2s6h2qn8lj"; + name = "baloo-5.48.0.tar.xz"; }; }; bluez-qt = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/bluez-qt-5.47.0.tar.xz"; - sha256 = "1pqgvpgr9xmgv8cxgvqx08jnabgmgzh2skkhwc9d9rdc2i4g7b1k"; - name = "bluez-qt-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/bluez-qt-5.48.0.tar.xz"; + sha256 = "149px5gnplk0y7cl3cz258qks3rq5p0kkk9rc48y59zvlxiyy949"; + name = "bluez-qt-5.48.0.tar.xz"; }; }; breeze-icons = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/breeze-icons-5.47.0.tar.xz"; - sha256 = "0fyzk196r8r0mzvijs9ws8ldh5vrw4yrgnvd1szb57vyy1agnnd7"; - name = "breeze-icons-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/breeze-icons-5.48.0.tar.xz"; + sha256 = "1p0krrxfz6p0qhy79lnjyi0xsrprw1q4z65xah89kj0wmfriiyqh"; + name = "breeze-icons-5.48.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/extra-cmake-modules-5.47.0.tar.xz"; - sha256 = "1591d27r6a2b7jn6zi2ik0i195pvl014dwxfpxv974hbbb8qnvcp"; - name = "extra-cmake-modules-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/extra-cmake-modules-5.48.0.tar.xz"; + sha256 = "1675xnc9hv8z8gp95ici2zqmbv7i6f65g0kln4fskxmlxnfplnzw"; + name = "extra-cmake-modules-5.48.0.tar.xz"; }; }; frameworkintegration = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/frameworkintegration-5.47.0.tar.xz"; - sha256 = "0iwdfa7q8ryszsl2w3bgix8bxkn3jj2lfdlcicfz9qh6av76p4yf"; - name = "frameworkintegration-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/frameworkintegration-5.48.0.tar.xz"; + sha256 = "1na913ndc55nlmfc61122b1p29h4prxnpc5pqvh6drsgfyacnm8y"; + name = "frameworkintegration-5.48.0.tar.xz"; }; }; kactivities = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kactivities-5.47.0.tar.xz"; - sha256 = "01h5a4m0wkgz1gafhbqdidxdr2x6g5siwcx4csv9293pc5xf0qcd"; - name = "kactivities-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kactivities-5.48.0.tar.xz"; + sha256 = "1zxdzwz8j43hh8d7v1qfihf95kwxvsbqki0zgdhlnj7s0xds0yz8"; + name = "kactivities-5.48.0.tar.xz"; }; }; kactivities-stats = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kactivities-stats-5.47.0.tar.xz"; - sha256 = "0linsga4d7lincnpj747wnbgidp2x7xk3jzh31lpfq8izkmqz1q5"; - name = "kactivities-stats-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kactivities-stats-5.48.0.tar.xz"; + sha256 = "11r61qnrjpc4ls18apb4a13j1lizjq48bxfw3f8p8hjxxxh8z0j6"; + name = "kactivities-stats-5.48.0.tar.xz"; }; }; kapidox = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kapidox-5.47.0.tar.xz"; - sha256 = "1z2ka5fnwqsmjhxdbahk7gkjmhgzndg3lq6196dmpws1zjqf14vq"; - name = "kapidox-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kapidox-5.48.0.tar.xz"; + sha256 = "1b22np0lygnm2r2q1anh0f4b7dh2h0lccx767g4r2w0fw5r1bbb4"; + name = "kapidox-5.48.0.tar.xz"; }; }; karchive = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/karchive-5.47.0.tar.xz"; - sha256 = "0r8xxfg1wsnpzyfggpzhxap853gqfsnmbci1al6xyd0pslgcsb5r"; - name = "karchive-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/karchive-5.48.0.tar.xz"; + sha256 = "10qbx8k1yqqfp1pq5yj8ln3gpj2wnfnlln99gczf99f51fqd65p6"; + name = "karchive-5.48.0.tar.xz"; }; }; kauth = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kauth-5.47.0.tar.xz"; - sha256 = "1s80grzkxvbkw39z5xida50ijb0k3aqy80k5h0025m9rqpbc7ir9"; - name = "kauth-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kauth-5.48.0.tar.xz"; + sha256 = "00mpbs24dm9ycabpcm2wwlv1vdq4dq5qr2zw6bbqpgj3jplakbs7"; + name = "kauth-5.48.0.tar.xz"; }; }; kbookmarks = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kbookmarks-5.47.0.tar.xz"; - sha256 = "0b4b2yp3pvlisf0g1gwnisn2rc94wn874aad3dlg0607kd11xmwk"; - name = "kbookmarks-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kbookmarks-5.48.0.tar.xz"; + sha256 = "11ics7gbdkx1f0pxryf2xwjq4fyqh6a3gzcizymm1m7gmygggqar"; + name = "kbookmarks-5.48.0.tar.xz"; }; }; kcmutils = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kcmutils-5.47.0.tar.xz"; - sha256 = "0qpsjijd51cxmp3y8knr6k6bx8bg5hhngsh63nr8yskpms38kj5d"; - name = "kcmutils-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kcmutils-5.48.0.tar.xz"; + sha256 = "0nvlzvv2gmc2hz11w6bixz4mccnj09g69byrnvsrwh0psf1kqlmw"; + name = "kcmutils-5.48.0.tar.xz"; }; }; kcodecs = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kcodecs-5.47.0.tar.xz"; - sha256 = "1qhdj54cx98dqdy8bqkxm8jgq8mm2i7l3h9vyd2bvvzc8nzhd1hv"; - name = "kcodecs-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kcodecs-5.48.0.tar.xz"; + sha256 = "1pz0s3krb4vv01hvpjdr5ngnw1ndxgsfln944fm9pfj0pmk7p92n"; + name = "kcodecs-5.48.0.tar.xz"; }; }; kcompletion = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kcompletion-5.47.0.tar.xz"; - sha256 = "1wdw434bi90ldmdxw8wpkgszligqapy19klpnn528vh3gv5is00p"; - name = "kcompletion-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kcompletion-5.48.0.tar.xz"; + sha256 = "129mmh46y0r6dcnbxf5yswsr48qj5l25n930nlx7wzaav28y55lp"; + name = "kcompletion-5.48.0.tar.xz"; }; }; kconfig = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kconfig-5.47.0.tar.xz"; - sha256 = "0ifv7i6w7jz221rw07vb40sljx95kdjhxd7l9nfx95dbd5bjb0nq"; - name = "kconfig-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kconfig-5.48.0.tar.xz"; + sha256 = "1g640cnd9j2jp35bb5zgjfxskbg3fj9p03r0yf3dkm1d1681x9a3"; + name = "kconfig-5.48.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kconfigwidgets-5.47.0.tar.xz"; - sha256 = "05pxa7519f0730wrbh2bsqzfvc9dwvrh8l9vjh24rkaiaxnzhd6k"; - name = "kconfigwidgets-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kconfigwidgets-5.48.0.tar.xz"; + sha256 = "0xlnbw34zbmy7fwsi9iks4iv7shki4fqs7wd3yblmyxa2l18ldh9"; + name = "kconfigwidgets-5.48.0.tar.xz"; }; }; kcoreaddons = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kcoreaddons-5.47.0.tar.xz"; - sha256 = "0ihbggv5ziazhv66cnc6d4h4m2bci0cgwh498k49phaagrsh9zs0"; - name = "kcoreaddons-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kcoreaddons-5.48.0.tar.xz"; + sha256 = "157k4l67iswny5krinfigfc6pabqfyfzya6hc5gcjrdplmnccy1f"; + name = "kcoreaddons-5.48.0.tar.xz"; }; }; kcrash = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kcrash-5.47.0.tar.xz"; - sha256 = "15wn4g7c26f3cpk7q2imci7p8pmcksw47h6csihyvlpi3b6ykqg9"; - name = "kcrash-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kcrash-5.48.0.tar.xz"; + sha256 = "0qqwdx7piz4wfm4lh41kknfcyw5saw17qh07ghhi7j80whpkazk8"; + name = "kcrash-5.48.0.tar.xz"; }; }; kdbusaddons = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kdbusaddons-5.47.0.tar.xz"; - sha256 = "04270rnfmasb9cq7kj40wny7vgkb7hksjnhr4sgyg4v2p8v5dmib"; - name = "kdbusaddons-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kdbusaddons-5.48.0.tar.xz"; + sha256 = "0vpd4cij52v43fsifbk3nnmi5csik8h4avima6jw0b09s8xdz8rr"; + name = "kdbusaddons-5.48.0.tar.xz"; }; }; kdeclarative = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kdeclarative-5.47.0.tar.xz"; - sha256 = "183l926yyhdw270rcwqh2lf1rjd4a9vbkcjlqyss2k7d79mj6m9s"; - name = "kdeclarative-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kdeclarative-5.48.0.tar.xz"; + sha256 = "09nfp6vrj6dc3kfknicr8629ifz976wi4wxdh5bfx15z9296l8pd"; + name = "kdeclarative-5.48.0.tar.xz"; }; }; kded = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kded-5.47.0.tar.xz"; - sha256 = "0z5xsxalxasnyhhkvy247a08l37012fiaahwyy0477p7p5x3c845"; - name = "kded-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kded-5.48.0.tar.xz"; + sha256 = "13527iv6cf44wgxpqfhmkhryihjfi02fi78lf2bnvgwmhd2nl954"; + name = "kded-5.48.0.tar.xz"; }; }; kdelibs4support = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/portingAids/kdelibs4support-5.47.0.tar.xz"; - sha256 = "1rij23ns9axlwi2fvbiz2wv3y3vh1p9cm3nxkkrj3axc0hs39n20"; - name = "kdelibs4support-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/portingAids/kdelibs4support-5.48.0.tar.xz"; + sha256 = "058s5h6sfhi1i3pa59hwpyxzd01jgpb8r68nnbphmryimi5nazqf"; + name = "kdelibs4support-5.48.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kdesignerplugin-5.47.0.tar.xz"; - sha256 = "0ijdjjfqj2wpl0jrr2n90i74d378986lkqwdicig2rwkylsivr1g"; - name = "kdesignerplugin-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kdesignerplugin-5.48.0.tar.xz"; + sha256 = "1kswvxgjpyi1p1kg4z5x5df8yqhrwhcpavzx4a83dg6hp5xk0l2l"; + name = "kdesignerplugin-5.48.0.tar.xz"; }; }; kdesu = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kdesu-5.47.0.tar.xz"; - sha256 = "1rc2v13d4i0wwzmgrbwf6i6khcd4wfa79flq764cvx62flingfvr"; - name = "kdesu-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kdesu-5.48.0.tar.xz"; + sha256 = "14ka3h06xbfv357z29zgbwnjcfwspi42f0fm3m7lszqhz9skj4v5"; + name = "kdesu-5.48.0.tar.xz"; }; }; kdewebkit = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kdewebkit-5.47.0.tar.xz"; - sha256 = "1yg4lydz03y6cc1f44larfd4xnvnbnzpkfa97qxjzvvrk06hdxx3"; - name = "kdewebkit-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kdewebkit-5.48.0.tar.xz"; + sha256 = "0wf2prv85sayz1mqq0ymrqw3p0f3ikakhgzy01pixrp7qgwqkkrv"; + name = "kdewebkit-5.48.0.tar.xz"; }; }; kdnssd = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kdnssd-5.47.0.tar.xz"; - sha256 = "0xgv4fvhyr3gk99vaicq45zqf5mnbc4xpyz66jfhsk1w655bqijp"; - name = "kdnssd-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kdnssd-5.48.0.tar.xz"; + sha256 = "01hra59b0sm82j7ry78f3clrypc80q59vx9h0ahacbab4pzq41p5"; + name = "kdnssd-5.48.0.tar.xz"; }; }; kdoctools = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kdoctools-5.47.0.tar.xz"; - sha256 = "06zlk04ldi9cq3ricni74s3737gmvs73g2k9mgfkdjq5grcsw177"; - name = "kdoctools-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kdoctools-5.48.0.tar.xz"; + sha256 = "0v8x198kfgz2p56nyy9cb6lks5yazdbdg55c4ps5bw36dbmpd3v8"; + name = "kdoctools-5.48.0.tar.xz"; }; }; kemoticons = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kemoticons-5.47.0.tar.xz"; - sha256 = "1hg72mf629g67wll5b80rw9k85qia1jdfhabg64vy7n7i9fm912y"; - name = "kemoticons-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kemoticons-5.48.0.tar.xz"; + sha256 = "166sjwrn9dm4km8sypdwcfsylcamhl1gfl28h8hrv498zhnyrfb9"; + name = "kemoticons-5.48.0.tar.xz"; }; }; kfilemetadata = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kfilemetadata-5.47.0.tar.xz"; - sha256 = "0ywp45akvn0cky757azkf6p4ql2l02xy7fplbhv7j6qz39s0p2vm"; - name = "kfilemetadata-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kfilemetadata-5.48.0.tar.xz"; + sha256 = "0krn53a2s950fb980gdap5hwf994kxfd4h8zk7a4s9cick957z5f"; + name = "kfilemetadata-5.48.0.tar.xz"; }; }; kglobalaccel = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kglobalaccel-5.47.0.tar.xz"; - sha256 = "1lcac55kanddpn6nphmyixp33mk8zmhfih7p9vzhnxvrc5k9r6hb"; - name = "kglobalaccel-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kglobalaccel-5.48.0.tar.xz"; + sha256 = "15dlpm69d38bsgl6hc7f1mjjq8qyxac010whx4rcsk4vsrwdfnm7"; + name = "kglobalaccel-5.48.0.tar.xz"; }; }; kguiaddons = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kguiaddons-5.47.0.tar.xz"; - sha256 = "14pivzmpsmmqrhvmvlc10fc7mc6gdq214qy27r4dsxmjdvgljhhj"; - name = "kguiaddons-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kguiaddons-5.48.0.tar.xz"; + sha256 = "0viqq9qg448fh12isc1kkmzcnnsjqw5fx4wlshyza19gfr4ym0dz"; + name = "kguiaddons-5.48.0.tar.xz"; }; }; kholidays = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kholidays-5.47.0.tar.xz"; - sha256 = "001misp4bdd4q05ns4bch7gx1j8h2wpa2is7zdazqy0bp1blsfwb"; - name = "kholidays-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kholidays-5.48.0.tar.xz"; + sha256 = "04vjp2jm2c6qgj50jbqkkgqh8b759pd4dpsczfkyq30p03vybxr4"; + name = "kholidays-5.48.0.tar.xz"; }; }; khtml = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/portingAids/khtml-5.47.0.tar.xz"; - sha256 = "1c9fja1mb2jrlrial2mz2bvw004s14kn7jnakawqg0d19fhlqg1h"; - name = "khtml-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/portingAids/khtml-5.48.0.tar.xz"; + sha256 = "1zrilnvvvvjq82hm6gbh5pvzfygy8w7a0140d3l74jjgy01394m1"; + name = "khtml-5.48.0.tar.xz"; }; }; ki18n = { - version = "5.47.0"; + version = "5.48.1"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/ki18n-5.47.0.tar.xz"; - sha256 = "1a190wf2ms09cwzpk1ylx7kjfz8yvzv2p14fjwyld6vf32hgl9r6"; - name = "ki18n-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/ki18n-5.48.1.tar.xz"; + sha256 = "0m9x6bagviqrnm0hx7ykggqiykxv3qi11bmi0xz2f02y78q89f3h"; + name = "ki18n-5.48.1.tar.xz"; }; }; kiconthemes = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kiconthemes-5.47.0.tar.xz"; - sha256 = "14j8d1glrcd6a9xn86jxa7wx80bpf5wax5vkv09swcbbshp7vqdp"; - name = "kiconthemes-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kiconthemes-5.48.0.tar.xz"; + sha256 = "1xqbg10qlk1zdha4kfyya1471r35gnz63iyj0ks3gzyfjvbivpy4"; + name = "kiconthemes-5.48.0.tar.xz"; }; }; kidletime = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kidletime-5.47.0.tar.xz"; - sha256 = "0dirflwwnq83nxml66kk4bf70nl04dhrg8pvh9md3hip5cn6mq2f"; - name = "kidletime-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kidletime-5.48.0.tar.xz"; + sha256 = "184b1qdh4bwsdg9lyl4d8rcs833fqcmfvbb5qmdd3mqvvg8xv9mm"; + name = "kidletime-5.48.0.tar.xz"; }; }; kimageformats = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kimageformats-5.47.0.tar.xz"; - sha256 = "19j6wdfv9yncdgcm5ij0rz5rv0a3jlgdnwmyrw1gjyz5isv2qp4f"; - name = "kimageformats-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kimageformats-5.48.0.tar.xz"; + sha256 = "1myxp583gw5d50ddkkv6ipbdzf6k3sdk9gambklay1dzmy4b91sc"; + name = "kimageformats-5.48.0.tar.xz"; }; }; kinit = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kinit-5.47.0.tar.xz"; - sha256 = "1rc0ig4gw7lkvkpwcik6krn5w1zqj6y710c58i9kr9vxxpffj170"; - name = "kinit-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kinit-5.48.0.tar.xz"; + sha256 = "08sf3j1bpxzqjim777d6znn8f7rzs5vpm4wz21s1ng3f32z2km9a"; + name = "kinit-5.48.0.tar.xz"; }; }; kio = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kio-5.47.0.tar.xz"; - sha256 = "0847dxrhdywrx2v6knf6l70slm8dfz4n4j1c1si13jrj1fp2w4ji"; - name = "kio-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kio-5.48.0.tar.xz"; + sha256 = "0am03nwbfidb5dxs8j8qaan4mcs7xv75sk135rslwfp5q56v1fa0"; + name = "kio-5.48.0.tar.xz"; }; }; kirigami2 = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kirigami2-5.47.0.tar.xz"; - sha256 = "1mdahdb5z0i9bf63480b2j6xm7cgsh1anx0cljn2hivglpixjbgd"; - name = "kirigami2-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kirigami2-5.48.0.tar.xz"; + sha256 = "0f01rnzzv2w7mmb0war8kph46c3wbdbz7s9i6rwh6g7kg6zvzn52"; + name = "kirigami2-5.48.0.tar.xz"; }; }; kitemmodels = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kitemmodels-5.47.0.tar.xz"; - sha256 = "0151arf7s5ns2qadn86z385i9v9z8rga0jcj8pnw329k4pjpc2ks"; - name = "kitemmodels-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kitemmodels-5.48.0.tar.xz"; + sha256 = "13b0fqy4yg4zahqq8376gnna36mfg94yb5d1fz0cgw7fk9d920gf"; + name = "kitemmodels-5.48.0.tar.xz"; }; }; kitemviews = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kitemviews-5.47.0.tar.xz"; - sha256 = "0dnk7y50d5wxpl4fppb0hdzy5w6xa04a178y49zggpjm5x048mp5"; - name = "kitemviews-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kitemviews-5.48.0.tar.xz"; + sha256 = "0cdyw0gy67yhhxv44j1bhhd4qnj7rwi0fjzf275532bf3js1j12w"; + name = "kitemviews-5.48.0.tar.xz"; }; }; kjobwidgets = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kjobwidgets-5.47.0.tar.xz"; - sha256 = "05vgqm3nfpbwbnv46ajb8hc5wzs1444513ahay1qn8vpah4kqbpp"; - name = "kjobwidgets-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kjobwidgets-5.48.0.tar.xz"; + sha256 = "0a5awpbka6mk4r4m5if7s9i5ybysykpcmlj69liabzcv0k1x5y6w"; + name = "kjobwidgets-5.48.0.tar.xz"; }; }; kjs = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/portingAids/kjs-5.47.0.tar.xz"; - sha256 = "1rhvmdwmsr48ih0qrpwphiwcl25af8shwj8nrkq619krc549gf8q"; - name = "kjs-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/portingAids/kjs-5.48.0.tar.xz"; + sha256 = "0ysbf6m63cw2iywwr7p5ngsh7s7ml9sc1sqkhnbh7racn0pzc1l4"; + name = "kjs-5.48.0.tar.xz"; }; }; kjsembed = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/portingAids/kjsembed-5.47.0.tar.xz"; - sha256 = "104nv33zpqh78zxqj1z9sj6cyliv0l9gzgmsc4n9nq9fcr1f2hdd"; - name = "kjsembed-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/portingAids/kjsembed-5.48.0.tar.xz"; + sha256 = "0j74g3xb23k55pixk76z2ib6yyc7f2iwvwqvvw1f907rn43g6qqx"; + name = "kjsembed-5.48.0.tar.xz"; }; }; kmediaplayer = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/portingAids/kmediaplayer-5.47.0.tar.xz"; - sha256 = "0cz0m2sa48893p6vq4pm92xmvq2aqqgfmijlskzdpd3gp3x9l1qw"; - name = "kmediaplayer-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/portingAids/kmediaplayer-5.48.0.tar.xz"; + sha256 = "1kw35c5dmwsrkinfgmylzgvw3zcg0yimlfcl52bhdg0x7sgdbjkq"; + name = "kmediaplayer-5.48.0.tar.xz"; }; }; knewstuff = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/knewstuff-5.47.0.tar.xz"; - sha256 = "04zn4iy0gy00d835qjfmb0prm802ggphj4aw328v29474nqs14nf"; - name = "knewstuff-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/knewstuff-5.48.0.tar.xz"; + sha256 = "0g2sxk6wqqgynmqgz6jxknlrsmpj4y94cn7vpw84isd9brsr5hfv"; + name = "knewstuff-5.48.0.tar.xz"; }; }; knotifications = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/knotifications-5.47.0.tar.xz"; - sha256 = "08cm2aks35lzspchyb6p25bfk4mrljb6wf7yi29674k4kg7gr6sv"; - name = "knotifications-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/knotifications-5.48.0.tar.xz"; + sha256 = "11p03jgkw8zvfsal6q3yxz5shkpxiknnryw2a120sjmsab87imzb"; + name = "knotifications-5.48.0.tar.xz"; }; }; knotifyconfig = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/knotifyconfig-5.47.0.tar.xz"; - sha256 = "0zava15sabmxc38ngmw9yylwnm27h8ah8df0jadxbqjpaaf0jssl"; - name = "knotifyconfig-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/knotifyconfig-5.48.0.tar.xz"; + sha256 = "1rlzmp1lzrniav2d5sjzh43mdm47i5dpa2rlsqppqq5887wjphcm"; + name = "knotifyconfig-5.48.0.tar.xz"; }; }; kpackage = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kpackage-5.47.0.tar.xz"; - sha256 = "1pwlvcmn9crjgqf1ccwb86zq962jnwavx6h6dcx7vb982z772j98"; - name = "kpackage-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kpackage-5.48.0.tar.xz"; + sha256 = "18q6gp1gmzjyid803j7mcm9dbqg4bcd059qlp6sb6rkllygv4pcr"; + name = "kpackage-5.48.0.tar.xz"; }; }; kparts = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kparts-5.47.0.tar.xz"; - sha256 = "1b21kmn8bjq69qhldacqpby9pa56c4y8j84kkwailylk3nngilsf"; - name = "kparts-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kparts-5.48.0.tar.xz"; + sha256 = "1p4xdrxfvq5xj17zf8gfxc0c9lryp8n9ahinardlb3rnb1wcw4hv"; + name = "kparts-5.48.0.tar.xz"; }; }; kpeople = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kpeople-5.47.0.tar.xz"; - sha256 = "13x1f5jwxhmdq5qq43qzfmxm20j95dwa0fck1ns1rg8k7gazmdqb"; - name = "kpeople-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kpeople-5.48.0.tar.xz"; + sha256 = "1gddld3phsqknm3x0k0wnhgqid5dqsqbw06v91vbl8746np04zf7"; + name = "kpeople-5.48.0.tar.xz"; }; }; kplotting = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kplotting-5.47.0.tar.xz"; - sha256 = "0sw448g5wa2gz6krzp7d8q1ryh6qs51hgxv432fjpblijnwzb6xx"; - name = "kplotting-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kplotting-5.48.0.tar.xz"; + sha256 = "17f78wppaj433x6fm108z5zw849qvnjsxisa92rxmkm9c64wzijg"; + name = "kplotting-5.48.0.tar.xz"; }; }; kpty = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kpty-5.47.0.tar.xz"; - sha256 = "1q4hkm701ridf07a4m93zvifi1sk6vn8z1h0b1rz5srxasaxnxlh"; - name = "kpty-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kpty-5.48.0.tar.xz"; + sha256 = "0ywkiw7gpqx7zrj6wrvfsn2sjkyxzsmqn8p91z0kz1s3id2s04fk"; + name = "kpty-5.48.0.tar.xz"; }; }; kross = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/portingAids/kross-5.47.0.tar.xz"; - sha256 = "13nav8fihj1pammiwz8na482qpsmcxmyxd47rqhwldvxz1z0kbq1"; - name = "kross-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/portingAids/kross-5.48.0.tar.xz"; + sha256 = "0zxhn8wai71ll1113k47xmcspbp16iz1rybm6m2qs6f4j5ghif8q"; + name = "kross-5.48.0.tar.xz"; }; }; krunner = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/krunner-5.47.0.tar.xz"; - sha256 = "0j3j6831y5j96cl19jdwcnd9h4rl95ymj3gy5sxilazgafzfihbd"; - name = "krunner-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/krunner-5.48.0.tar.xz"; + sha256 = "0mdwyvx656ba8pwvg4qw8jr268iffqrp9ipr28m71hkx0sh7k6hn"; + name = "krunner-5.48.0.tar.xz"; }; }; kservice = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kservice-5.47.0.tar.xz"; - sha256 = "0ryipmvydh924zjpfzmwivwagaad9dicnfcfa4drrygbwnm60bd9"; - name = "kservice-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kservice-5.48.0.tar.xz"; + sha256 = "1r5d3cdvmbyqn8hm2hjalgg1ncnpdh1w7fd5rr0k97j5qj29ypis"; + name = "kservice-5.48.0.tar.xz"; }; }; ktexteditor = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/ktexteditor-5.47.0.tar.xz"; - sha256 = "1k089k9ssk06734wnjyfmvlgxy2hqxh7fgy5qiyjvp807kmf4jkb"; - name = "ktexteditor-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/ktexteditor-5.48.0.tar.xz"; + sha256 = "1fnq6d3ky277rbg3ngq55gdswrgfxsn19c43s23xcbfaymmhapj7"; + name = "ktexteditor-5.48.0.tar.xz"; }; }; ktextwidgets = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/ktextwidgets-5.47.0.tar.xz"; - sha256 = "19w84d6v8yrci4fb6c7m91q2ykc9p24cf85cnm6lsb8ggis4dsyr"; - name = "ktextwidgets-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/ktextwidgets-5.48.0.tar.xz"; + sha256 = "0hf4rpnkc9qfpnpfm6bsrrjrvvkr6785pnakqyfbjcgbyavp58hg"; + name = "ktextwidgets-5.48.0.tar.xz"; }; }; kunitconversion = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kunitconversion-5.47.0.tar.xz"; - sha256 = "0avm3g78zfzrh4h6ampf54n9j715ii5cra8praq0waiy94idn7cq"; - name = "kunitconversion-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kunitconversion-5.48.0.tar.xz"; + sha256 = "0hipqjj82zkq8ysvg304m5jblxxrvjh8vfc3wgl93zvj0mwx06db"; + name = "kunitconversion-5.48.0.tar.xz"; }; }; kwallet = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kwallet-5.47.0.tar.xz"; - sha256 = "0hy3kzkcqbzkjkvnaaanfdcnwcidnbw6j14ifvhlh2padql7kyix"; - name = "kwallet-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kwallet-5.48.0.tar.xz"; + sha256 = "047jp26igla05isq6hg5bq9l3xd3dfa3v8dq3rz4im7dwa10hshr"; + name = "kwallet-5.48.0.tar.xz"; }; }; kwayland = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kwayland-5.47.0.tar.xz"; - sha256 = "0j15xzlzxqi0g8lj5k9w0lbnvx26h6bblgz8rhqlkl80ml2wzgfv"; - name = "kwayland-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kwayland-5.48.0.tar.xz"; + sha256 = "1qcb2kg1a23fvl6i0xky6mzmn3f6pqkvpv0dy245bd01x7q4csg4"; + name = "kwayland-5.48.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kwidgetsaddons-5.47.0.tar.xz"; - sha256 = "0d2sxh6g7igjdsgj9agknx8zvymyvq9rb0xkfbr044vg5q0g99js"; - name = "kwidgetsaddons-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kwidgetsaddons-5.48.0.tar.xz"; + sha256 = "079f28ifadxhvk4miwlnhw3dvg7bmb6gjiqcg2w65bmp21rsywb7"; + name = "kwidgetsaddons-5.48.0.tar.xz"; }; }; kwindowsystem = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kwindowsystem-5.47.0.tar.xz"; - sha256 = "1hfbjy17b6iw6443a3zw304syi4j0vid7nmm5hqdv8685lnp4wx6"; - name = "kwindowsystem-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kwindowsystem-5.48.0.tar.xz"; + sha256 = "1b6cvx3yqkqmvji2y7ys421hmj98xhww1rlgphfdvrdaqzl4579n"; + name = "kwindowsystem-5.48.0.tar.xz"; }; }; kxmlgui = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kxmlgui-5.47.0.tar.xz"; - sha256 = "194linh0px5mk404hbgrzcfx9zblk4q835nvj4lrbl62nffzwnlp"; - name = "kxmlgui-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kxmlgui-5.48.0.tar.xz"; + sha256 = "0n38bxxip1c4fgj00jvph98qhb11ifx40z4m0pjafm52bg0kaa2h"; + name = "kxmlgui-5.48.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kxmlrpcclient-5.47.0.tar.xz"; - sha256 = "1wmsycpg5yljdpa0slv47baqpag6jzg75g0l2jddl3knznp7br8i"; - name = "kxmlrpcclient-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kxmlrpcclient-5.48.0.tar.xz"; + sha256 = "0s0xrx2p0jngk83zb8zjn4vkwnj46wzbxzj904g71ca428nmfx40"; + name = "kxmlrpcclient-5.48.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/modemmanager-qt-5.47.0.tar.xz"; - sha256 = "00wxsc4wz5fflld4h1w77726w1c06g1ql5qld2r30yibx1fb2slb"; - name = "modemmanager-qt-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/modemmanager-qt-5.48.0.tar.xz"; + sha256 = "17pnzpv3g3g25vnh9jjjk3fk6i3lhk6icl56ifcsmpj09nlw41im"; + name = "modemmanager-qt-5.48.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/networkmanager-qt-5.47.0.tar.xz"; - sha256 = "02c2d1jm3azzbwd52awq6ikjsgfg9f2dc12dkw14zkz41r87gcyh"; - name = "networkmanager-qt-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/networkmanager-qt-5.48.0.tar.xz"; + sha256 = "15qikndykampl63bnp6rik1vkmwpivqf1krbsb0r29fmwyzhy38v"; + name = "networkmanager-qt-5.48.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/oxygen-icons5-5.47.0.tar.xz"; - sha256 = "19w7ab5b7qdhj3j0pg8378k918kwjd1m5lm13jdg2kkn1f4j0j4m"; - name = "oxygen-icons5-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/oxygen-icons5-5.48.0.tar.xz"; + sha256 = "08y1gy2xgzby9wxbh90cfzly1aym9nym5r8m7z848a4v7chp0wpw"; + name = "oxygen-icons5-5.48.0.tar.xz"; }; }; plasma-framework = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/plasma-framework-5.47.0.tar.xz"; - sha256 = "1d3f2k5y966jnwrjps1x5lx9scpakq3ri3111m5h0vidkrlvnhsa"; - name = "plasma-framework-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/plasma-framework-5.48.0.tar.xz"; + sha256 = "1hl1q1v8kmq20bzm2bfrpjx1f1rljg2akib0sc65nw6vclrcgh82"; + name = "plasma-framework-5.48.0.tar.xz"; }; }; prison = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/prison-5.47.0.tar.xz"; - sha256 = "17j12mg11fnjnlj04fzxd5x95cs2f34xc2lk09hjlm7ihkw932xh"; - name = "prison-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/prison-5.48.0.tar.xz"; + sha256 = "04asjh9k6qhz6mzqvcw5famjh8fdfrjj5gwhar9lpzvl53k9236q"; + name = "prison-5.48.0.tar.xz"; }; }; purpose = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/purpose-5.47.0.tar.xz"; - sha256 = "1symzvzk50d3szz2rh7c9jd60hzpvlv6d8n7r6j9rzrplvshk879"; - name = "purpose-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/purpose-5.48.0.tar.xz"; + sha256 = "015dcsz2pybfl13dq0fhja7j05bvchjd6bcwmniq8cwc2dg2qxyp"; + name = "purpose-5.48.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/qqc2-desktop-style-5.47.0.tar.xz"; - sha256 = "1w897ixs0bfhzrzq8v4yg3rsrd8zmb08j5xh52ysb4mp7zs8jcyk"; - name = "qqc2-desktop-style-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/qqc2-desktop-style-5.48.0.tar.xz"; + sha256 = "1wc4vxjipdw3zq1lqwz3s7f0gzrcvs8svy9ip5r40qcz2w55s4an"; + name = "qqc2-desktop-style-5.48.0.tar.xz"; }; }; solid = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/solid-5.47.0.tar.xz"; - sha256 = "041fvxxlazbpdl5ncdpxzj8jq48rk31kd1nqsm8p5wqglzrz6dsl"; - name = "solid-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/solid-5.48.0.tar.xz"; + sha256 = "0fy070kbqs9hvi1ngmqzfz8a9vnry0mrin51z1yfdc44806bk2ns"; + name = "solid-5.48.0.tar.xz"; }; }; sonnet = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/sonnet-5.47.0.tar.xz"; - sha256 = "14nfrv1z1lpjhxsxhjx8bi88yp1qx4dzwf6v22w0mk71qc6z2rgr"; - name = "sonnet-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/sonnet-5.48.0.tar.xz"; + sha256 = "1mzl2a61jrqflnlkkrp079z428sf2bc811qwfx0rdh0jp7bc7sq4"; + name = "sonnet-5.48.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/syntax-highlighting-5.47.0.tar.xz"; - sha256 = "0bv25cv3xvhl9v23dn3yxhdcv5ag2i1zhvna6gnng6k30n316v0c"; - name = "syntax-highlighting-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/syntax-highlighting-5.48.0.tar.xz"; + sha256 = "03cfljg90iszpxmx6f0dv1w1r451yqzi9bk27x56s5xzsghj8bv5"; + name = "syntax-highlighting-5.48.0.tar.xz"; }; }; threadweaver = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/threadweaver-5.47.0.tar.xz"; - sha256 = "0h48b6mvgq3igbs6jzngj1iad7m5kgkird17shk86ma79k6igriz"; - name = "threadweaver-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/threadweaver-5.48.0.tar.xz"; + sha256 = "0pks8sddqdhlcrqgb106b6jy0gh3gfcss2rdavqfck6d9780v125"; + name = "threadweaver-5.48.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix index e84df0c1aedf..b5402984d16f 100644 --- a/pkgs/development/libraries/libblockdev/default.nix +++ b/pkgs/development/libraries/libblockdev/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, libxslt, docbook_xsl -, docbook_xml_dtd_43, python3, gobjectIntrospection, glib, libudev, kmod, parted, libyaml -, cryptsetup, devicemapper, dmraid, utillinux, libbytesize, libndctl, nss, volume_key +, docbook_xml_dtd_43, python3, gobjectIntrospection, glib, udev, kmod, parted, libyaml +, cryptsetup, lvm2, dmraid, utillinux, libbytesize, libndctl, nss, volume_key }: let @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - glib libudev kmod parted cryptsetup devicemapper dmraid utillinux libbytesize libndctl nss volume_key libyaml + glib udev kmod parted cryptsetup lvm2 dmraid utillinux libbytesize libndctl nss volume_key libyaml ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index 6531a4cd9ed4..347e3218c1dc 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ libevent openssl ]; - doCheck = (!stdenv.isDarwin); + doCheck = !stdenv.isDarwin; checkPhase = "ctest"; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix index b5b2b8e37349..59651af2b8cf 100644 --- a/pkgs/development/libraries/libebml/default.nix +++ b/pkgs/development/libraries/libebml/default.nix @@ -1,19 +1,27 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "libebml-1.3.5"; + name = "libebml-${version}"; + version = "1.3.6"; - src = fetchurl { - url = "https://dl.matroska.org/downloads/libebml/${name}.tar.xz"; - sha256 = "005a0ipqnfbsq47zrc61zszi439jw32q5xd6dc1jyb3lc0zl266q"; + src = fetchFromGitHub { + owner = "Matroska-Org"; + repo = "libebml"; + rev = "release-${version}"; + sha256 = "0fl8d35ywj9id93yp78qlxy7j81kjri957agq40r420kmwac3dzs"; }; + nativeBuildInputs = [ cmake pkgconfig ]; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=YES" + ]; + meta = with stdenv.lib; { description = "Extensible Binary Meta Language library"; - license = licenses.lgpl21; homepage = https://dl.matroska.org/downloads/libebml/; - maintainers = [ maintainers.spwhitt ]; + license = licenses.lgpl21; + maintainers = with maintainers; [ spwhitt ]; platforms = platforms.unix; }; } - diff --git a/pkgs/development/libraries/libgnome-keyring/default.nix b/pkgs/development/libraries/libgnome-keyring/default.nix index b2a0021d53b5..e7157afbaee5 100644 --- a/pkgs/development/libraries/libgnome-keyring/default.nix +++ b/pkgs/development/libraries/libgnome-keyring/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, +{ stdenv, fetchurl, glib, dbus, libgcrypt, pkgconfig, intltool }: stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; - propagatedBuildInputs = [ glib dbus_libs libgcrypt ]; + propagatedBuildInputs = [ glib dbus libgcrypt ]; nativeBuildInputs = [ pkgconfig intltool ]; meta = { diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index fd9c8dc9a5e3..1efc16b2bf5c 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -1,29 +1,53 @@ -{ stdenv, fetchFromGitHub, perl, cmake }: +{ stdenv, fetchFromGitHub, perl, pkgconfig, cmake, ninja, vala, gobjectIntrospection +, python3, tzdata, gtk-doc, docbook_xsl, docbook_xml_dtd_43, glib, libxml2, icu }: stdenv.mkDerivation rec { name = "libical-${version}"; - version = "2.0.0"; + version = "3.0.3"; + + outputs = [ "out" "dev" "devdoc" ]; src = fetchFromGitHub { owner = "libical"; repo = "libical"; rev = "v${version}"; - sha256 = "0xsvqy1hzmwxn783wrb2k8p751544pzv39v9ynr9pj4yzkwjzsvb"; + sha256 = "0dhlfn6n136di4fbqd74gdaibyh5zz1vac5x8ii3bjc2d5h7hw8h"; }; - nativeBuildInputs = [ perl cmake ]; + nativeBuildInputs = [ + perl pkgconfig cmake ninja vala gobjectIntrospection + (python3.withPackages (pkgs: with pkgs; [ pygobject3 ])) # running libical-glib tests + gtk-doc docbook_xsl docbook_xml_dtd_43 # docs + ]; + buildInputs = [ glib libxml2 icu ]; + + cmakeFlags = [ + "-DGOBJECT_INTROSPECTION=True" + "-DICAL_GLIB_VAPI=True" + ]; patches = [ # TODO: upstream this patch + # https://github.com/libical/libical/issues/350 ./respect-env-tzdir.patch ]; - doCheck = false; # fails all the tests (ctest) + # Using install check so we do not have to manually set + # LD_LIBRARY_PATH and GI_TYPELIB_PATH variables + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + export TZDIR=${tzdata}/share/zoneinfo + ctest --output-on-failure + + runHook postInstallCheck + ''; meta = with stdenv.lib; { homepage = https://github.com/libical/libical; description = "An Open Source implementation of the iCalendar protocols"; - license = licenses.mpl10; + license = licenses.mpl20; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; }; diff --git a/pkgs/development/libraries/libical/respect-env-tzdir.patch b/pkgs/development/libraries/libical/respect-env-tzdir.patch index 715ba1fa8426..59d23e490e5a 100644 --- a/pkgs/development/libraries/libical/respect-env-tzdir.patch +++ b/pkgs/development/libraries/libical/respect-env-tzdir.patch @@ -1,9 +1,9 @@ --- a/src/libical/icaltz-util.c +++ b/src/libical/icaltz-util.c -@@ -96,9 +96,9 @@ typedef struct - static char *zdir = NULL; +@@ -94,9 +94,9 @@ + static const char *zdir = NULL; - static char *search_paths[] = { + static const char *search_paths[] = { + "/etc/zoneinfo", "/usr/share/zoneinfo", "/usr/lib/zoneinfo", @@ -11,13 +11,13 @@ "/usr/share/lib/zoneinfo" }; -@@ -179,6 +179,15 @@ static void set_zonedir(void) +@@ -178,6 +178,15 @@ const char *fname = ZONES_TAB_SYSTEM_FILENAME; size_t i, num_search_paths; + const char *env_tzdir = getenv ("TZDIR"); + if (env_tzdir) { -+ snprintf(file_path, MAXPATHLEN, "%s/%s", env_tzdir, fname); ++ sprintf (file_path, "%s/%s", env_tzdir, fname); + if (!access (file_path, F_OK|R_OK)) { + zdir = env_tzdir; + return; diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 0e900ca9db64..24dd4f2465c6 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -29,9 +29,10 @@ stdenv.mkDerivation rec { sed -i -e '/preload/d' Makefile.in ''; - configureFlags = lib.optional stdenv.isFreeBSD "--with-pic" - ++ lib.optional enableStatic "--enable-static" - ++ lib.optional (!enableShared) "--disable-shared"; + configureFlags = [ + (lib.enableFeature enableStatic "static") + (lib.enableFeature enableShared "shared") + ] ++ lib.optional stdenv.isFreeBSD "--with-pic"; meta = { description = "An iconv(3) implementation"; diff --git a/pkgs/development/libraries/libindicate/default.nix b/pkgs/development/libraries/libindicate/default.nix index 1bde9336c66d..1f5ee90337aa 100644 --- a/pkgs/development/libraries/libindicate/default.nix +++ b/pkgs/development/libraries/libindicate/default.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, lib, file , pkgconfig, autoconf -, glib, dbus-glib, libdbusmenu-glib +, glib, dbus-glib, libdbusmenu , gtkVersion ? "3", gtk2 ? null, gtk3 ? null , pythonPackages, gobjectIntrospection, vala, gnome-doc-utils , monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoconf gobjectIntrospection vala gnome-doc-utils ]; buildInputs = [ - glib dbus-glib libdbusmenu-glib + glib dbus-glib libdbusmenu python pygobject2 pygtk ] ++ (if gtkVersion == "2" then [ gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ] diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix index e7bce0e80187..bbc694619d4c 100644 --- a/pkgs/development/libraries/libmatroska/default.nix +++ b/pkgs/development/libraries/libmatroska/default.nix @@ -1,23 +1,30 @@ -{ stdenv, fetchurl, pkgconfig, libebml }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig +, libebml }: stdenv.mkDerivation rec { - name = "libmatroska-1.4.8"; + name = "libmatroska-${version}"; + version = "1.4.9"; - src = fetchurl { - url = "https://dl.matroska.org/downloads/libmatroska/${name}.tar.xz"; - sha256 = "14n9sw974prr3yp4yjb7aadi6x2yz5a0hjw8fs3qigy5shh2piyq"; + src = fetchFromGitHub { + owner = "Matroska-Org"; + repo = "libmatroska"; + rev = "release-${version}"; + sha256 = "1hfrcpvmyqnvdkw8rz1z20zw7fpnjyl5h0g9ky7k6y1a44b1fz86"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ libebml ]; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=YES" + ]; + meta = with stdenv.lib; { description = "A library to parse Matroska files"; homepage = https://matroska.org/; license = licenses.lgpl21; - maintainers = [ maintainers.spwhitt ]; + maintainers = with maintainers; [ spwhitt ]; platforms = platforms.unix; }; } - diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix index 7d8ec42700c5..d1dae0cfee6e 100644 --- a/pkgs/development/libraries/libqmatrixclient/default.nix +++ b/pkgs/development/libraries/libqmatrixclient/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "libqmatrixclient-${version}"; - version = "0.2.1"; + version = "0.3.0.2"; src = fetchFromGitHub { owner = "QMatrixClient"; repo = "libqmatrixclient"; rev = "v${version}"; - sha256 = "0sv5hhdsffq7092n6hggfz9a78qn3jfmbvw2flmc4ippzz563akv"; + sha256 = "03pxmr4wa818fgqddkr2fkwz6pda538x3ic9yq7c40x98zqf55w5"; }; buildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/libstroke/default.nix b/pkgs/development/libraries/libstroke/default.nix index bd54b3aa343a..400a107c5186 100644 --- a/pkgs/development/libraries/libstroke/default.nix +++ b/pkgs/development/libraries/libstroke/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, automake, autoconf, x11}: +{stdenv, fetchurl, automake, autoconf, xlibsWrapper}: stdenv.mkDerivation { name = "libstroke-0.5.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0bbpqzsqh9zrc6cg62f6vp1p4dzvv37blsd0gdlzdskgwvyzba8d"; }; - buildInputs = [ automake autoconf x11 ]; + buildInputs = [ automake autoconf xlibsWrapper ]; # libstroke ships with an ancient config.sub that doesn't know about x86_64, so regenerate it. # Also, modern automake doesn't like things and returns error code 63. But it generates the file. diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 4dc601745a42..c902a8b216a8 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,17 +1,23 @@ -{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig -, ApplicationServices, CoreServices }: +{ stdenv, lib, fetchpatch, fetchFromGitHub, autoconf, automake, libtool, pkgconfig }: stdenv.mkDerivation rec { - version = "1.20.3"; + version = "1.21.0"; name = "libuv-${version}"; src = fetchFromGitHub { owner = "libuv"; repo = "libuv"; rev = "v${version}"; - sha256 = "1a8a679wni560z7x6w5i431vh2g0f34cznflcn52klx1vwcggrg7"; + sha256 = "1jjg34ppnlrnb634q9mla7whl7rm9xmjgnzckrznqcycwzir074b"; }; + patches = [ + (fetchpatch { + url = "https://github.com/libuv/libuv/pull/1909.patch"; + sha256 = "1s2692h4dvqnzwwicrkpj0zph1i2bhv39w31z5vh7ssgvykaradj"; + }) + ]; + postPatch = let toDisable = [ "getnameinfo_basic" "udp_send_hang_loop" # probably network-dependent @@ -19,15 +25,28 @@ stdenv.mkDerivation rec { "getaddrinfo_fail" "getaddrinfo_fail_sync" "threadpool_multiple_event_loops" # times out on slow machines ] - # sometimes: timeout (no output), failed uv_listen - ++ stdenv.lib.optionals stdenv.isDarwin [ "process_title" "emfile" ]; + # Sometimes: timeout (no output), failed uv_listen. Someone + # should report these failures to libuv team. There tests should + # be much more robust. + ++ stdenv.lib.optionals stdenv.isDarwin [ + "process_title" "emfile" "poll_duplex" "poll_unidirectional" + "ipc_listen_before_write" "ipc_listen_after_write" "ipc_tcp_connection" + "tcp_alloc_cb_fail" "tcp_ping_pong" "tcp_ref3" "tcp_ref4" + "tcp_bind6_error_inval" "tcp_bind6_error_addrinuse" "tcp_read_stop" + "tcp_unexpected_read" "tcp_write_to_half_open_connection" + "tcp_oob" "tcp_close_accept" "tcp_create_early_accept" + "tcp_create_early" "tcp_close" "tcp_bind_error_inval" + "tcp_bind_error_addrinuse" "tcp_shutdown_after_write" + "tcp_open" "tcp_write_queue_order" "tcp_try_write" "tcp_writealot" + "multiple_listen" "delayed_accept" + "shutdown_close_tcp" "shutdown_eof" "shutdown_twice" "callback_stack" + ]; tdRegexp = lib.concatStringsSep "\\|" toDisable; in lib.optionalString doCheck '' sed '/${tdRegexp}/d' -i test/test-list.h ''; nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ]; preConfigure = '' LIBTOOLIZE=libtoolize ./autogen.sh @@ -35,10 +54,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # These should be turned back on, but see https://github.com/NixOS/nixpkgs/issues/23651 - # For now the tests are just breaking large swaths of the nixpkgs binary cache for Darwin, - # and I'd rather have everything else work at all than have stronger assurance here. - doCheck = !stdenv.isDarwin; + doCheck = true; meta = with lib; { description = "A multi-platform support library with a focus on asynchronous I/O"; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index f2be3b7831a3..02c13e413e33 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchgit , pkgconfig, makeWrapper, libtool, autoconf, automake -, coreutils, libxml2, gnutls, devicemapper, perl, python2, attr +, coreutils, libxml2, gnutls, perl, python2, attr , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages @@ -16,19 +16,19 @@ let buildFromTarball = stdenv.isDarwin; in stdenv.mkDerivation rec { name = "libvirt-${version}"; - version = "4.4.0"; + version = "4.5.0"; src = if buildFromTarball then fetchurl { url = "http://libvirt.org/sources/${name}.tar.xz"; - sha256 = "1djaz3b5n4ksyw6z4n4qs82g5zyxdl2gm4rsb5181bv1rdiisqs6"; + sha256 = "02dbfyi80im37gdsxglb4fja78q63b8ahmgdc5kh8lx51kf5xsg7"; } else fetchgit { url = git://libvirt.org/libvirt.git; rev = "v${version}"; - sha256 = "0rhas7hbisfh0aib75nsh9wspxj8pvcqagds1mp2jgfls7hfna0r"; + sha256 = "0ija9a02znajsa2pbxamrmz87zwpmba9s29vdzzqqqw5c1rdpcr6"; fetchSubmodules = true; }; @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { ] ++ optionals (!buildFromTarball) [ libtool autoconf automake ] ++ optionals stdenv.isLinux [ - libpciaccess devicemapper lvm2 utillinux systemd libnl numad zfs + libpciaccess lvm2 lvm2 utillinux systemd libnl numad zfs libapparmor libcap_ng numactl attr parted ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [ xen diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/development/libraries/libxc/default.nix index 67ec3b57fa77..1293b0af8cce 100644 --- a/pkgs/development/libraries/libxc/default.nix +++ b/pkgs/development/libraries/libxc/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, gfortran, perl }: let - version = "3.0.1"; + version = "4.2.3"; in stdenv.mkDerivation { name = "libxc-${version}"; src = fetchurl { url = "http://www.tddft.org/programs/octopus/down.php?file=libxc/${version}/libxc-${version}.tar.gz"; - sha256 = "1xyac89yx03vm86rvk07ps1d39xss3amw46a1k53mv30mgr94rl3"; + sha256 = "0mj26jga0nj76blf2rp9cmgf0v0yhsp7xrg92zgih7fjlydrxr02"; }; buildInputs = [ gfortran ]; diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix index 1150d04e1b49..263796cdc783 100644 --- a/pkgs/development/libraries/libxklavier/default.nix +++ b/pkgs/development/libraries/libxklavier/default.nix @@ -1,15 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, xkeyboard_config, libxml2, xorg +{ stdenv, fetchgit, autoreconfHook, pkgconfig, gtk-doc, xkeyboard_config, libxml2, xorg, docbook_xsl , glib, isocodes, gobjectIntrospection }: let - version = "5.3"; + version = "5.4"; in stdenv.mkDerivation rec { name = "libxklavier-${version}"; - src = fetchurl { - url = "mirror://gnome/sources/libxklavier/${version}/${name}.tar.xz"; - sha256 = "016lpdv35z0qsw1cprdc2k5qzkdi5waj6qmr0a2q6ljn9g2kpv7b"; + src = fetchgit { + url = "git://anongit.freedesktop.org/git/libxklavier"; + rev = name; + sha256 = "1w1x5mrgly2ldiw3q2r6y620zgd89gk7n90ja46775lhaswxzv7a"; }; outputs = [ "out" "dev" "devdoc" ]; @@ -17,14 +18,20 @@ stdenv.mkDerivation rec { # TODO: enable xmodmap support, needs xmodmap DB propagatedBuildInputs = with xorg; [ libX11 libXi xkeyboard_config libxml2 libICE glib libxkbfile isocodes ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig gtk-doc docbook_xsl ]; buildInputs = [ gobjectIntrospection ]; + preAutoreconf = '' + export NOCONFIGURE=1 + gtkdocize + ''; + configureFlags = [ "--with-xkb-base=${xkeyboard_config}/etc/X11/xkb" "--with-xkb-bin-base=${xorg.xkbcomp}/bin" "--disable-xmodmap-support" + "--enable-gtk-doc" ]; meta = with stdenv.lib; { @@ -34,4 +41,3 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; } - diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix index 3828ebcb7a70..367c4e963842 100644 --- a/pkgs/development/libraries/mailcore2/default.nix +++ b/pkgs/development/libraries/mailcore2/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, libetpan, icu, cyrus_sasl, libctemplate -, libuchardet, pkgconfig, glib, libtidy, libxml2, libuuid, openssl +, libuchardet, pkgconfig, glib, html-tidy, libxml2, libuuid, openssl }: stdenv.mkDerivation rec { @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libetpan cmake icu cyrus_sasl libctemplate libuchardet glib - libtidy libxml2 libuuid openssl + html-tidy libxml2 libuuid openssl ]; postPatch = '' substituteInPlace CMakeLists.txt \ --replace " icule iculx" "" \ --replace "tidy/tidy.h" "tidy.h" \ - --replace "/usr/include/tidy" "${libtidy}/include" \ + --replace "/usr/include/tidy" "${html-tidy}/include" \ --replace "/usr/include/libxml2" "${libxml2.dev}/include/libxml2" substituteInPlace src/core/basetypes/MCHTMLCleaner.cpp \ --replace buffio.h tidybuffio.h diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index f8152bea2cc1..9c0bf29d4908 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -67,7 +67,7 @@ let in let - version = "18.0.3"; + version = "18.1.4"; branch = head (splitString "." version); in @@ -81,7 +81,7 @@ let self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" ]; - sha256 = "0c4yskqwmh5k0wavjrkfcldafvnpcx8gjcx584bscxks69krd789"; + sha256 = "12zm9hc3v4wnzhqyrvf2kfnz55idzdn82hs3ry940l45bn5lhq9h"; }; prePatch = "patchShebangs ."; @@ -154,7 +154,7 @@ let self = stdenv.mkDerivation { libX11 libXext libxcb libXt libXfixes libxshmfence libffi wayland wayland-protocols libvdpau libelf libXvMC libomxil-bellagio libva-minimal libpthreadstubs openssl/*or another sha1 provider*/ - valgrind-light python2 + valgrind-light python2 python2.pkgs.Mako ]; enableParallelBuilding = true; @@ -205,6 +205,11 @@ let self = stdenv.mkDerivation { for js in $drivers/share/glvnd/egl_vendor.d/*.json; do substituteInPlace "$js" --replace '"libEGL_' '"'"$drivers/lib/libEGL_" done + + # Update search path used by pkg-config + for pc in $dev/lib/pkgconfig/{d3d,dri,xatracker}.pc; do + substituteInPlace "$pc" --replace $out $drivers + done '' + optionalString (vulkanDrivers != []) '' # Update search path used by Vulkan (it's pointing to $out but # drivers are in $drivers) diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 57b810c0b448..2d4de3390422 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "mlt-${version}"; - version = "6.8.0"; + version = "6.10.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - sha256 = "0hmxlz3i9yasw5jdkrczak8shzlnpi1acaahn50lvgg9b14kg7b8"; + sha256 = "0ki86yslr5ywa6sz8pjrgd9a4rn2rr4mss2zkmqi7pq8prgsm1fr"; }; buildInputs = [ diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix index 32467e4849b5..ab50cf1e17ca 100644 --- a/pkgs/development/libraries/ntl/default.nix +++ b/pkgs/development/libraries/ntl/default.nix @@ -1,27 +1,60 @@ -{ stdenv, fetchurl, perl, gmp, libtool +{ stdenv +, lib +, fetchurl +, perl +, gmp +, gf2x ? null +# I asked the ntl maintainer weather or not to include gf2x by default: +# > If I remember correctly, gf2x is now thread safe, so there's no reason not to use it. +, withGf2x ? true +, tune ? false # tune for current system; non reproducible and time consuming }: +assert withGf2x -> gf2x != null; + stdenv.mkDerivation rec { name = "ntl-${version}"; - version = "9.11.0"; + version = "11.2.1"; src = fetchurl { url = "http://www.shoup.net/ntl/ntl-${version}.tar.gz"; - sha256 = "1wcwxpcby1c50llncz131334qq26lzh3dz21rahymgvakrq0369p"; + sha256 = "04avzmqflx2a33n7v9jj32g83p7m6z712fg1mw308jk5ca2qp489"; }; - buildInputs = [ perl gmp libtool ]; + buildInputs = [ + gmp + ]; + + nativeBuildInputs = [ + perl # needed for ./configure + ]; sourceRoot = "${name}/src"; enableParallelBuilding = true; - dontAddPrefix = true; + dontAddPrefix = true; # DEF_PREFIX instead - configureFlags = [ "DEF_PREFIX=$(out)" "WIZARD=off" "SHARED=on" "NATIVE=off" "CXX=c++" ]; + # reference: http://shoup.net/ntl/doc/tour-unix.html + configureFlags = [ + "DEF_PREFIX=$(out)" + "SHARED=on" # genereate a shared library (as well as static) + "NATIVE=off" # don't target code to current hardware (reproducibility, portability) + "TUNE=${ + if tune then + "auto" + else if stdenv.targetPlatform.isx86 then + "x86" # "chooses options that should be well suited for most x86 platforms" + else + "generic" # "chooses options that should be OK for most platforms" + }" + ] ++ lib.optionals withGf2x [ + "NTL_GF2X_LIB=on" + "GF2X_PREFIX=${gf2x}" + ]; - # doCheck = true; # takes some time + doCheck = true; # takes some time - meta = { + meta = with lib; { description = "A Library for doing Number Theory"; longDescription = '' NTL is a high-performance, portable C++ library providing data @@ -30,7 +63,8 @@ stdenv.mkDerivation rec { the integers and over finite fields. ''; homepage = http://www.shoup.net/ntl/; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ timokau ]; + license = licenses.gpl2Plus; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index 2e1ed060acac..73e7fd42cdba 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "pcre2-${version}"; - version = "10.23"; + version = "10.31"; src = fetchurl { url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${name}.tar.bz2"; - sha256 = "0vn5g0mkkp99mmzpissa06hpyj6pk9s4mlwbjqrjvw3ihy8rpiyz"; + sha256 = "1b389pzw91k1hzydsh4smdsxyppwz4pv74m3nrvy8rda0j3m6zg0"; }; configureFlags = [ @@ -14,34 +14,8 @@ stdenv.mkDerivation rec { "--enable-jit" ]; - patches = [ - (fetchpatch { - name = "CVE-2017-7186-part1.patch"; - url = "https://vcs.pcre.org/pcre2/code/trunk/src/pcre2_ucd.c?view=patch&r1=316&r2=670&sortby=date"; - sha256 = "10yzglvbn7h06hg7zffr5zh378i5jihvx7d5gggkynws79vgwvfr"; - stripLen = 2; - extraPrefix = ""; - }) - (fetchpatch { - name = "CVE-2017-7186-part2.patch"; - url = "https://vcs.pcre.org/pcre2/code/trunk/src/pcre2_internal.h?view=patch&r1=600&r2=670&sortby=date"; - sha256 = "1bggk7vd5hg0bjg96lj4h1lacmr6grq68dm6iz1n7vg3zf7virjn"; - stripLen = 2; - extraPrefix = ""; - }) - (fetchpatch { - name = "CVE-2017-8786.patch"; - url = "https://vcs.pcre.org/pcre2/code/trunk/src/pcre2test.c?r1=692&r2=697&view=patch"; - sha256 = "1c629nzrk4il2rfclwyc1a373q58m4q9ys9wr91zhl4skfk7x19b"; - stripLen = 2; - extraPrefix = ""; - }) - ]; - outputs = [ "bin" "dev" "out" "doc" "man" "devdoc" ]; - doCheck = false; # fails 1 of 3 tests - postFixup = '' moveToOutput bin/pcre2-config "$dev" ''; diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 7e7314c936dd..c50fc9fb35c8 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind -, glib, dbus, gst_all_1, v4l_utils, alsaLib, ffmpeg, libjack2, libudev, libva, xorg +, glib, dbus, gst_all_1, v4l_utils, alsaLib, ffmpeg, libjack2, udev, libva, xorg , sbc, SDL2, makeFontsConf, freefont_ttf }: @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer v4l_utils - alsaLib ffmpeg libjack2 libudev libva xorg.libX11 sbc SDL2 + alsaLib ffmpeg libjack2 udev libva xorg.libX11 sbc SDL2 ]; mesonFlags = [ diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix index 84709441b5e7..9a43470de3b7 100644 --- a/pkgs/development/libraries/podofo/default.nix +++ b/pkgs/development/libraries/podofo/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "podofo-0.9.5"; + name = "podofo-0.9.6"; src = fetchurl { url = "mirror://sourceforge/podofo/${name}.tar.gz"; - sha256 = "012kgfx5j5n6w4zkc1d290d2cwjk60jhzsjlr2x19g3yi75q2jc5"; + sha256 = "0wj0y4zcmj4q79wrn3vv3xq4bb0vhhxs8yifafwy9f2sjm83c5p9"; }; propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng libidn expat ]; diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix index 1a98ecc87436..c89e9e4296cf 100644 --- a/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/default.nix @@ -9,10 +9,11 @@ in { cudnn_cudatoolkit_7 = generic rec { - version = "4.0"; + # Old URL is v4 instead of v4.0 for some reason... + version = "4"; cudatoolkit = cudatoolkit_7; - srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v${version}-prod.tgz"; - sha256 = "0zgr6qdbc29qw6sikhrh6diwwz7150rqc8a49f2qf37j2rvyyr2f"; + srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v4.0-prod.tgz"; + sha256 = "01a4v5j4v9n2xjqcc4m28c3m67qrvsx87npvy7zhx7w8smiif2fd"; }; cudnn_cudatoolkit_7_5 = generic rec { diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix index 51bda19cf139..bb1258655b5b 100644 --- a/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -5,24 +5,18 @@ { stdenv , lib -, requireFile , cudatoolkit +, fetchurl }: stdenv.mkDerivation rec { name = "cudatoolkit-${cudatoolkit.majorVersion}-cudnn-${version}"; inherit version; - - src = requireFile rec { - name = srcName; + src = fetchurl { + # URL from NVIDIA docker containers: https://gitlab.com/nvidia/cuda/blob/centos7/7.0/runtime/cudnn4/Dockerfile + url = "https://developer.download.nvidia.com/compute/redist/cudnn/v${version}/${srcName}"; inherit sha256; - message = '' - This nix expression requires that ${name} is already part of the store. - Register yourself to NVIDIA Accelerated Computing Developer Program, retrieve the cuDNN library - at https://developer.nvidia.com/cudnn, and run the following command in the download directory: - nix-prefetch-url file://\$PWD/${name} - ''; }; installPhase = '' diff --git a/pkgs/development/libraries/stb/default.nix b/pkgs/development/libraries/stb/default.nix new file mode 100644 index 000000000000..4f36ac2ba1c7 --- /dev/null +++ b/pkgs/development/libraries/stb/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "stb-${version}"; + version = "20180211"; + + src = fetchFromGitHub { + owner = "nothings"; + repo = "stb"; + rev = "e6afb9cbae4064da8c3e69af3ff5c4629579c1d2"; + sha256 = "079nsn9bnb8c0vfq26g5l53q6gzx19a5x9q2nb55mpcljxsgxnmf"; + }; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/include/stb + cp *.h $out/include/stb/ + ''; + + meta = with stdenv.lib; { + description = "Single-file public domain libraries for C/C++"; + homepage = https://github.com/nothings/stb; + license = licenses.publicDomain; + platforms = platforms.all; + maintainers = with maintainers; [ jfrankenau ]; + }; +} diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix index 63060bf55533..36768acd991a 100644 --- a/pkgs/development/libraries/strigi/default.nix +++ b/pkgs/development/libraries/strigi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, qt4, perl, bzip2, libxml2, exiv2 -, clucene_core, fam, zlib, dbus_tools, pkgconfig +, clucene_core, fam, zlib, dbus, pkgconfig }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { CLUCENE_HOME = clucene_core; buildInputs = - [ zlib bzip2 libxml2 qt4 exiv2 clucene_core fam dbus_tools ]; + [ zlib bzip2 libxml2 qt4 exiv2 clucene_core fam dbus.out ]; nativeBuildInputs = [ cmake pkgconfig perl ]; diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index dc3c2c157138..f6e4a0472828 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "tdb-1.3.15"; + name = "tdb-1.3.16"; src = fetchurl { url = "mirror://samba/tdb/${name}.tar.gz"; - sha256 = "0a37jhpij8wr4f4pjqdlwnffy2l6a2vkqdpz1bqxj6v06cwbz8dl"; + sha256 = "1ibcz466xwk1x6xvzlgzd5va4lyrjzm3rnjak29kkwk7cmhw4gva"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index 24dc3667d172..d14010c857e4 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python2Packages, dbus-glib, dbus_daemon +{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python2Packages, dbus-glib, dbus , telepathy-farstream, telepathy-glib, fetchpatch }: let @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig python ]; propagatedBuildInputs = [ qtbase telepathy-farstream telepathy-glib ]; buildInputs = [ dbus-glib ]; - checkInputs = [ dbus_daemon dbus-python ]; + checkInputs = [ dbus.daemon dbus-python ]; patches = [ # https://github.com/TelepathyIM/telepathy-qt/issues/25 diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix index 12576eed14ce..e43c62684240 100644 --- a/pkgs/development/libraries/tevent/default.nix +++ b/pkgs/development/libraries/tevent/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "tevent-0.9.36"; + name = "tevent-0.9.37"; src = fetchurl { url = "mirror://samba/tevent/${name}.tar.gz"; - sha256 = "0k1v4vnlzpf7h3p4khaw8a7damrc68g136bf2xzys08nzpinnaxx"; + sha256 = "1q77vbjic2bb79li2a54ffscnrnwwww55fbpry2kgh7acpnlb0qn"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/development/libraries/volume-key/default.nix index 53faf07623e9..a8515975c353 100644 --- a/pkgs/development/libraries/volume-key/default.nix +++ b/pkgs/development/libraries/volume-key/default.nix @@ -1,31 +1,27 @@ -{ stdenv, fetchgit, fetchpatch, autoreconfHook, pkgconfig, gettext, python2 -, swig, glib, utillinux, cryptsetup, nss, gpgme +{ stdenv, fetchgit, autoreconfHook, pkgconfig, gettext, python3 +, ncurses, swig, glib, utillinux, cryptsetup, nss, gpgme }: let - version = "0.3.10"; + version = "0.3.11"; in stdenv.mkDerivation rec { name = "volume_key-${version}"; src = fetchgit { url = https://pagure.io/volume_key.git; - rev = "ece1ce305234da454e330905c615ec474d9781c5"; - sha256 = "16qdi5s6ycsh0iyc362gly7ggrwamky8i0zgbd4ajp3ymk9vqdva"; + rev = "volume_key-${version}"; + sha256 = "1sqdbcih1c39bjiv4mm1m7acc3lfh2i2hf2r9i7rk8adfzq8awma"; }; - outputs = [ "out" "man" "dev" ]; + outputs = [ "out" "man" "dev" "py" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig gettext python2 swig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig gettext python3 ncurses swig ]; buildInputs = [ glib cryptsetup nss utillinux gpgme ]; - patches = [ - # Use pkg-config for locating Python.h - # https://pagure.io/volume_key/pull-request/12 - (fetchpatch { - url = https://pagure.io/fork/cathay4t/volume_key/c/8eda66d3b734ea335e37cf9d7d173b9e8ebe2fd9.patch; - sha256 = "01lr1zijk0imkk681zynm4w5ad3y6c9vdrmrzaib7w7ima75iczr"; - }) + makeFlags = [ + "pyexecdir=$(py)/${python3.sitePackages}" + "pythondir=$(py)/${python3.sitePackages}" ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 4b84f696eec6..e44a678194ae 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig, - x11, libxcb, libXrandr, libXext, wayland, libGL_driver }: + xlibsWrapper, libxcb, libXrandr, libXext, wayland, libGL_driver }: let version = "1.1.77.0"; in assert version == vulkan-headers.version; stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake python3 x11 libxcb libXrandr libXext wayland ]; + buildInputs = [ cmake python3 xlibsWrapper libxcb libXrandr libXext wayland ]; enableParallelBuilding = true; cmakeFlags = [ diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix index a672bbf52a90..2b9244ff1b18 100644 --- a/pkgs/development/libraries/wlc/default.nix +++ b/pkgs/development/libraries/wlc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig , wayland, pixman, libxkbcommon, libinput, xcbutilwm, xcbutilimage, libGL -, libX11, dbus_libs, wayland-protocols, libdrm, mesa_noglu +, libX11, dbus, wayland-protocols, libdrm, mesa_noglu , libpthreadstubs, libXdmcp, libXext, libXfixes , withOptionalPackages ? true, zlib, valgrind, doxygen }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ wayland pixman libxkbcommon libinput xcbutilwm xcbutilimage libGL - libX11 libXfixes dbus_libs wayland-protocols + libX11 libXfixes dbus wayland-protocols libpthreadstubs libXdmcp libXext libdrm mesa_noglu ] ++ stdenv.lib.optionals withOptionalPackages [ zlib valgrind doxygen ]; diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix index 82b72a0fc7b3..59f6af7eddb2 100644 --- a/pkgs/development/libraries/wxSVG/default.nix +++ b/pkgs/development/libraries/wxSVG/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "wxSVG-${version}"; srcName = "wxsvg-${version}"; - version = "1.5.13"; + version = "1.5.14"; src = fetchurl { url = "mirror://sourceforge/project/wxsvg/wxsvg/${version}/${srcName}.tar.bz2"; - sha256 = "029a1rayp4c480x8ayng13rcjk1j98ar0z6ggijrznkn8kgx8j2j"; + sha256 = "0xl5ghd8yj1ciwf87f12ii7vg38ir0snrds2rhi47pv5gypfkiq5"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix index 33cf5dd4af84..7acbaa260a0c 100644 --- a/pkgs/development/libraries/zeitgeist/default.nix +++ b/pkgs/development/libraries/zeitgeist/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, pkgconfig, glib, sqlite, vala_0_38 -, autoconf, automake, libtool, gettext, dbus_libs, telepathy-glib +, autoconf, automake, libtool, gettext, dbus, telepathy-glib , gtk3, json-glib, librdf_raptor2, dbus-glib , pythonSupport ? true, python2Packages }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake libtool pkgconfig gettext vala_0_38 python2Packages.python ]; buildInputs = [ - glib sqlite dbus_libs telepathy-glib dbus-glib + glib sqlite dbus telepathy-glib dbus-glib gtk3 json-glib librdf_raptor2 python2Packages.rdflib ]; |