diff options
Diffstat (limited to 'pkgs')
76 files changed, 1008 insertions, 548 deletions
diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix index e004e8c847cb..18673a2186cc 100644 --- a/pkgs/applications/audio/drumgizmo/default.nix +++ b/pkgs/applications/audio/drumgizmo/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "0.9.14"; + version = "0.9.15"; name = "drumgizmo-${version}"; src = fetchurl { url = "https://www.drumgizmo.org/releases/${name}/${name}.tar.gz"; - sha256 = "1q2jghjz0ygaja8dgvxp914if8yyzpa204amdcwb9yyinpxsahz4"; + sha256 = "13bgqyw74pq3ss63zd9bjmgr4dah792pcphyqmr7bnvrgfjr6bx6"; }; configureFlags = [ "--enable-lv2" ]; diff --git a/pkgs/applications/audio/fldigi/default.nix b/pkgs/applications/audio/fldigi/default.nix index fc01a543e285..fb4454269d78 100644 --- a/pkgs/applications/audio/fldigi/default.nix +++ b/pkgs/applications/audio/fldigi/default.nix @@ -2,13 +2,13 @@ libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: stdenv.mkDerivation rec { - version = "4.0.17"; + version = "4.0.18"; pname = "fldigi"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.gz"; - sha256 = "1z8w0dxfc2nm1iy1vv18s5s88ys9vvbqawjvhsymxj56jqjzzp4q"; + sha256 = "0a3z9xj9gsa6fskiai9410kwqfb6156km59y36a31mhyddzk27p7"; }; buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio diff --git a/pkgs/applications/audio/ir.lv2/default.nix b/pkgs/applications/audio/ir.lv2/default.nix index cc613541a256..84be6b866fae 100644 --- a/pkgs/applications/audio/ir.lv2/default.nix +++ b/pkgs/applications/audio/ir.lv2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "ir.lv2-${version}"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "tomszilagyi"; repo = "ir.lv2"; rev = "${version}"; - sha256 = "16vy06qb0vgwg4yx15grzh5m2q3cbzm3jd0p37g2qb8rgvjhladg"; + sha256 = "1p6makmgr898fakdxzl4agh48qqwgv1k1kwm8cgq187n0mhiknp6"; }; buildInputs = [ fftw gtk2 lv2 libsamplerate libsndfile zita-convolver ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { mkdir "$out/include" mkdir -p "$out/share/doc" - make PREFIX="$out" install + make PREFIX="$out" INSTDIR="$out/lib/lv2" install install -Dm755 convert4chan "$out/bin/convert4chan" ''; diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix index 6431a50ddd9a..37677cc211cc 100644 --- a/pkgs/applications/audio/qmidinet/default.nix +++ b/pkgs/applications/audio/qmidinet/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, qt5, alsaLib, libjack2 }: stdenv.mkDerivation rec { - version = "0.5.1"; + version = "0.5.2"; name = "qmidinet-${version}"; src = fetchurl { url = "mirror://sourceforge/qmidinet/${name}.tar.gz"; - sha256 = "1cvz8y63vdqfpxh7lq5qadqjcyhahbyq0py0qz6xrmpk5sxvy7ml"; + sha256 = "0y2w3rymvc35r291sp2qaxn36wjwvxzk2iaw9y30q9fqc0vlpdns"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index cb581bc83033..7c57b884c8eb 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -3,12 +3,12 @@ , libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { - version = "20180803"; + version = "20180812"; name = "x42-plugins-${version}"; src = fetchurl { url = "https://gareus.org/misc/x42-plugins/${name}.tar.xz"; - sha256 = "1v7p6vnkcbzyvmcysabhmn603cndzx9mwzaw5dppy4wd687vhgis"; + sha256 = "0gzwzxpa2k2w9c6j3pspwi9slfyd57wb192d6yqcg92pfmnxy9dz"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix index de217cb60f3f..d17d5c1e85df 100644 --- a/pkgs/applications/editors/neovim/qt.nix +++ b/pkgs/applications/editors/neovim/qt.nix @@ -13,8 +13,7 @@ stdenv.mkDerivation rec { }; cmakeFlags = [ - "-DMSGPACK_INCLUDE_DIRS=${msgpack}/include" - "-DMSGPACK_LIBRARIES=${msgpack}/lib/msgpackc.so" + "-DUSE_SYSTEM_MSGPACK=1" ]; buildInputs = with pythonPackages; [ @@ -28,13 +27,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; preConfigure = '' - # avoid cmake trying to download msgpack - echo "" > third-party/CMakeLists.txt # we rip out a number of tests that fail in the build env # the GUI tests will never work but the others should - they did before neovim 0.2.0 # was released sed -i test/CMakeLists.txt \ -e '/^add_xtest_gui/d' \ + -e '/tst_neovimobject/d' \ -e '/tst_neovimconnector/d' \ -e '/tst_callallmethods/d' \ -e '/tst_encoding/d' @@ -42,7 +40,14 @@ stdenv.mkDerivation rec { doCheck = true; - postInstall = '' + postInstall = if stdenv.isDarwin then '' + mkdir -p $out/Applications + mv $out/bin/nvim-qt.app $out/Applications + rmdir $out/bin || : + + wrapProgram "$out/Applications/nvim-qt.app/Contents/MacOS/nvim-qt" \ + --prefix PATH : "${neovim}/bin" + '' else '' wrapProgram "$out/bin/nvim-qt" \ --prefix PATH : "${neovim}/bin" ''; diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix index abbffeb91807..efe728f68494 100644 --- a/pkgs/applications/editors/okteta/default.nix +++ b/pkgs/applications/editors/okteta/default.nix @@ -4,16 +4,16 @@ stdenv.mkDerivation rec { name = "okteta-${version}"; - version = "17.12.3"; + version = "0.25.2"; src = fetchurl { - url = "mirror://kde/stable/applications/${version}/src/${name}.tar.xz"; - sha256 = "03wsv83l1cay2dpcsksad124wzan7kh8zxdw1h0yicn398kdbck4"; + url = "mirror://kde/stable/okteta/${version}/src/${name}.tar.xz"; + sha256 = "00mw8gdqvn6vn6ir6kqnp7xi3lpn6iyp4f5aknxwq6mdcxgjmh1p"; }; - + nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ]; buildInputs = [ shared-mime-info ]; - + propagatedBuildInputs = [ kconfig kinit @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { karchive kcrash ]; - + meta = with stdenv.lib; { license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg bkchr ]; diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index 521f957ec1e9..e0aea87c90c3 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "avocode-${version}"; - version = "3.2.0"; + version = "3.4.0"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "111kcjqm8j2v941m2ly4ahhxalylnsvy5zmclj1f490japz2h1xy"; + sha256 = "1dk4vgam9r5nl8dvpfwrn52gq6r4zxs4zz63p3c4gk73d8qnh4dl"; }; libPath = stdenv.lib.makeLibraryPath (with xorg; with gnome2; [ diff --git a/pkgs/applications/graphics/fig2dev/default.nix b/pkgs/applications/graphics/fig2dev/default.nix new file mode 100644 index 000000000000..1e54152fff4d --- /dev/null +++ b/pkgs/applications/graphics/fig2dev/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, ghostscript, libpng } : + +let + version = "3.2.7a"; + +in stdenv.mkDerivation { + name = "fig2dev-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/mcj/fig2dev-${version}.tar.xz"; + sha256 = "0a7vkfl38fvkhg3na5gr9c4fskas9wbs84y9djg85nzwbshik8mx"; + }; + + buildInputs = [ libpng ]; + + GSEXE="${ghostscript}/bin/gs"; + + meta = with stdenv.lib; { + description = "Tool to convert Xfig files to other formats"; + homepage = http://mcj.sourceforge.net/; + license = licenses.xfig; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/applications/graphics/xfig/builder.sh b/pkgs/applications/graphics/xfig/builder.sh deleted file mode 100644 index 9d95eca01226..000000000000 --- a/pkgs/applications/graphics/xfig/builder.sh +++ /dev/null @@ -1,28 +0,0 @@ -source $stdenv/setup - -makeFlags="XAWLIB=-lXaw3d BINDIR=$out/bin XAPPLOADDIR=$out/etc/X11/app-defaults LIBDIR=$out/lib/X11 XFIGDOCDIR=$out/share/doc/xfig MANPATH=$out/man" - -# We need chmod +wx on dirs, not just chmod +w -dontMakeSourcesWritable=1 -postUnpack() { - find . -type d -exec chmod +x '{}' \; -} - -preBuild() { - echo "#define XAW3D" >> Imakefile.tmp - echo "#define XAW3D1_5E" >> Imakefile.tmp - cat Imakefile >> Imakefile.tmp - mv Imakefile.tmp Imakefile - xmkmf - - sed -e 's@[$][$]m@-- &@g' -i Makefile -} - -installPhase() { - make install.all $makeFlags - - wrapProgram $out/bin/xfig \ - --set XAPPLRESDIR $out/etc/X11/app-defaults -} - -genericBuild diff --git a/pkgs/applications/graphics/xfig/default.nix b/pkgs/applications/graphics/xfig/default.nix index 7e276aaf406c..429af12b9bb3 100644 --- a/pkgs/applications/graphics/xfig/default.nix +++ b/pkgs/applications/graphics/xfig/default.nix @@ -1,50 +1,42 @@ -{ stdenv, fetchurl, makeWrapper, imake -, xlibsWrapper, libXpm, libXmu, libXi, libXp, Xaw3d, libpng, libjpeg}: +{ stdenv, fetchurl, xlibsWrapper, makeWrapper, libXpm +, libXmu, libXi, libXp, Xaw3d, fig2dev +}: -let version = "3.2.5b"; in -stdenv.mkDerivation { +let + version = "3.2.7a"; + +in stdenv.mkDerivation { name = "xfig-${version}"; src = fetchurl { - url = "mirror://sourceforge/mcj/xfig.${version}.full.tar.gz"; - sha256 = "1hl5x49sgc0vap411whhcq6qhvh4xbjg7jggv7ih9pplg5nwy0aw"; + url = "mirror://sourceforge/mcj/xfig-${version}.tar.xz"; + sha256 = "096zgp0bqnxhgxbrv2jjylrjz3pr4da0xxznlk2z7ffxr5pri2fa"; }; - builder = ./builder.sh; + postPatch = '' + sed -i 's:"fig2dev":"${fig2dev}/bin/fig2dev":' src/main.c + ''; - buildInputs = [xlibsWrapper libXpm libXmu libXi libXp Xaw3d libpng libjpeg]; + postInstall = '' + mkdir -p $out/share/X11/app-defaults + cp app-defaults/* $out/share/X11/app-defaults - nativeBuildInputs = [ imake makeWrapper ]; + wrapProgram $out/bin/xfig \ + --set XAPPLRESDIR $out/share/X11/app-defaults + ''; - hardeningDisable = [ "format" ]; + enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = "-I${libXpm.dev}/include/X11"; + nativeBuildInputs = [ makeWrapper ]; - patches = - let - debPrefix = "http://patch-tracker.debian.org/patch/series/dl/xfig/1:3.2.5.b-3"; - in - [ - (fetchurl { - url = "${debPrefix}/35_CVE-2010-4262.patch"; - sha256 = "1pj669sz49wzjvvm96gwbnani7wqi0ijh21imqdzqw47qxdv7zp5"; - }) - (fetchurl { - url = "${debPrefix}/13_remove_extra_libs.patch"; - sha256 = "1qb14ay0c8xrjzhi21jl7sl8mdzxardldzpnflkzml774bbpn8av"; - }) - (fetchurl { - url = "${debPrefix}/36_libpng15.patch"; - sha256 = "0jd5bqj7sj9bbnxg2d0y6zmv4ka4qif2x4zc84ngdqga5433anvn"; - }) - ]; + buildInputs = [ xlibsWrapper libXpm libXmu libXi libXp Xaw3d ]; - meta = { + meta = with stdenv.lib; { description = "An interactive drawing tool for X11"; - homepage = http://mcj.sourceforge.net/; - license = { - url = "http://mcj.sourceforge.net/authors.html#xfig"; - }; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice + longDescription = '' + Note that you need to have the <literal>netpbm</literal> tools + in your path to export bitmaps. + ''; + inherit (fig2dev.meta) license homepage platforms; }; } diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index d839a7141e3b..f995abf28361 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -77,6 +77,7 @@ let calendarsupport = callPackage ./calendarsupport.nix {}; dolphin = callPackage ./dolphin.nix {}; dolphin-plugins = callPackage ./dolphin-plugins.nix {}; + dragon = callPackage ./dragon.nix {}; eventviews = callPackage ./eventviews.nix {}; ffmpegthumbs = callPackage ./ffmpegthumbs.nix { }; filelight = callPackage ./filelight.nix {}; diff --git a/pkgs/applications/kde/dragon.nix b/pkgs/applications/kde/dragon.nix new file mode 100644 index 000000000000..9dd55ec4b9c1 --- /dev/null +++ b/pkgs/applications/kde/dragon.nix @@ -0,0 +1,25 @@ +{ + mkDerivation, lib, + extra-cmake-modules, kdoctools, + baloo, baloo-widgets, kactivities, kbookmarks, kcmutils, + kcompletion, kconfig, kcoreaddons, kdelibs4support, kdbusaddons, + kfilemetadata, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications, + kparts, ktexteditor, kwindowsystem, phonon, solid, phonon-backend-gstreamer +}: + +mkDerivation { + name = "dragon"; + meta = { + license = with lib.licenses; [ gpl2 fdl12 ]; + description = "A simple media player for KDE"; + maintainers = [ lib.maintainers.jonathanreeve ]; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + propagatedBuildInputs = [ + baloo baloo-widgets kactivities kbookmarks kcmutils kcompletion kconfig + kcoreaddons kdelibs4support kdbusaddons kfilemetadata ki18n kiconthemes + kinit kio knewstuff knotifications kparts ktexteditor kwindowsystem + phonon solid phonon-backend-gstreamer + ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index 83ba02933fd5..dacfa908b516 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -1,28 +1,23 @@ { stdenv, python3, fetchFromGitHub, fetchpatch }: with python3.pkgs; buildPythonApplication rec { - version = "3.7"; + version = "3.8"; pname = "buku"; src = fetchFromGitHub { owner = "jarun"; repo = "buku"; rev = "v${version}"; - sha256 = "0qc6xkrhf2phaj9fhym19blr4rr2vllvnyljjz909xr4vsynvb41"; - }; - - patches = fetchpatch { - url = https://github.com/jarun/Buku/commit/495d6eac4d9371e8ce6d3f601e2bb9e5e74962b4.patch; - sha256 = "0py4l5qcgdzqr0iqmcc8ddld1bspk8iwypz4dcr88y70j86588gk"; + sha256 = "0gv26c4rr1akcaiff1nrwil03sv7d58mfxr86pgsw6nwld67ns0r"; }; checkInputs = [ pytestcov - pytest-catchlog hypothesis pytest pylint flake8 + pyyaml ]; propagatedBuildInputs = [ @@ -30,6 +25,14 @@ with python3.pkgs; buildPythonApplication rec { beautifulsoup4 requests urllib3 + flask + flask-api + flask-bootstrap + flask-paginate + flask_wtf + arrow + werkzeug + click ]; preCheck = '' @@ -43,7 +46,7 @@ with python3.pkgs; buildPythonApplication rec { --replace "self.assertEqual(url, 'https://www.google.com')" "" ''; - installPhase = '' + postInstall = '' make install PREFIX=$out mkdir -p $out/share/zsh/site-functions $out/share/bash-completion/completions $out/share/fish/vendor_completions.d diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix index 8c57ebead6ae..8a26631d5c0d 100644 --- a/pkgs/applications/misc/chirp/default.nix +++ b/pkgs/applications/misc/chirp/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "chirp-daily-${version}"; - version = "20180707"; + version = "20180815"; src = fetchurl { url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz"; - sha256 = "09siq74k0ss65ssck7i7h515dxp7fhdz5klc3y0yp9wajn706ic3"; + sha256 = "0z3jh9sbszs8x0xjmkgxa3b1xnw3w9b13pml4i5apx3mj171npyv"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix index 6dc448c6bf48..70915ca87073 100644 --- a/pkgs/applications/misc/krusader/default.nix +++ b/pkgs/applications/misc/krusader/default.nix @@ -6,13 +6,13 @@ let pname = "krusader"; - version = "2.7.0"; + version = "2.7.1"; in mkDerivation rec { name = "krusader-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz"; - sha256 = "09ws3samxnjk0qi9pcfm2rmw0nr5mzn9pzpljgrdb5qj7cmm4hcb"; + sha256 = "1svxj1qygyr3a4dkx0nh2d6r4q7pfj00brzghl94mf4q0rz4vhfm"; }; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 5899ca92eb0c..9fe03b274cff 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, dpkg, makeWrapper +{ stdenv, fetchurl, dpkg , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, glibc, gnome2, gnome3 -, gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, xorg }: +, gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook, xorg }: let @@ -68,7 +68,12 @@ in stdenv.mkDerivation { inherit src; - buildInputs = [ dpkg makeWrapper ]; + nativeBuildInputs = [ + wrapGAppsHook + glib # For setup hook populating GSETTINGS_SCHEMA_PATH + ]; + + buildInputs = [ dpkg ]; unpackPhase = "true"; installPhase = '' @@ -78,6 +83,8 @@ in stdenv.mkDerivation { rm -rf $out/opt $out/usr rm $out/bin/skypeforlinux + ln -s "$out/share/skypeforlinux/skypeforlinux" "$out/bin/skypeforlinux" + # Otherwise it looks "suspicious" chmod -R g-w $out ''; @@ -88,8 +95,6 @@ in stdenv.mkDerivation { patchelf --set-rpath ${rpath}:$out/share/skypeforlinux $file || true done - ln -s "$out/share/skypeforlinux/skypeforlinux" "$out/bin/skypeforlinux" - # Fix the desktop link substituteInPlace $out/share/applications/skypeforlinux.desktop \ --replace /usr/bin/ $out/bin/ \ diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix index 46de1d532dd4..0db18e77bfa6 100644 --- a/pkgs/applications/networking/resilio-sync/default.nix +++ b/pkgs/applications/networking/resilio-sync/default.nix @@ -9,13 +9,13 @@ let in stdenv.mkDerivation rec { name = "resilio-sync-${version}"; - version = "2.5.12"; + version = "2.6.0"; src = fetchurl { url = "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz"; sha256 = { - "x86_64-linux" = "176gf5704wh22kqig8n0gg83048w71grw7h37k2qvxjaf4vypnc7"; - "i686-linux" = "15m2s2cqrkpb7ladbwimbs9agqb4ww9jr4gf0ifjwzm2grv5ffnh"; + "x86_64-linux" = "0041axi9carspkfaxvyirfvsa29zz55al01x90nh93nzxvpvywsz"; + "i686-linux" = "1ar36lp4f6a1z9i82g3gpak4q4ny09faqxdd59q1pvfzq25ypdhs"; }.${stdenv.system}; }; diff --git a/pkgs/applications/science/biology/strelka/default.nix b/pkgs/applications/science/biology/strelka/default.nix new file mode 100644 index 000000000000..1527f5d3ddad --- /dev/null +++ b/pkgs/applications/science/biology/strelka/default.nix @@ -0,0 +1,37 @@ +{stdenv, fetchFromGitHub, cmake, zlib, python2}: + +stdenv.mkDerivation rec { + name = "strelka-${version}"; + version = "2.9.5"; + + src = fetchFromGitHub { + owner = "Illumina"; + repo = "strelka"; + rev = "v${version}"; + sha256 = "0x4a6nkx1jnyag9svghsdjz1fz6q7qx5pn77wphdfnk81f9yspf8"; + }; + + buildInputs = [ cmake zlib python2 ]; + + preConfigure = '' + sed -i 's|/usr/bin/env python|${python2}/bin/python|' src/python/lib/makeRunScript.py + patchShebangs . + ''; + + postFixup = '' + pushd $out/lib/python/pyflow + sed -i 's|/bin/bash|${stdenv.shell}|' pyflowTaskWrapper.py + rm pyflowTaskWrapper.pyc + echo "import pyflowTaskWrapper" | python2 + popd + ''; + + meta = with stdenv.lib; { + description = "Germline and small variant caller"; + license = licenses.gpl3; + homepage = https://github.com/Illumina/strelka; + maintainers = with maintainers; [ jbedo ]; + platforms = [ "x86_64-linux" ]; + }; + +} diff --git a/pkgs/applications/science/chemistry/molden/default.nix b/pkgs/applications/science/chemistry/molden/default.nix index 1472b4b2af9e..76a19d410ef8 100644 --- a/pkgs/applications/science/chemistry/molden/default.nix +++ b/pkgs/applications/science/chemistry/molden/default.nix @@ -1,17 +1,19 @@ { stdenv, fetchurl, which, gfortran, libGLU, xorg } : stdenv.mkDerivation rec { - version = "5.7"; + version = "5.8.2"; name = "molden-${version}"; src = fetchurl { url = "ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/molden${version}.tar.gz"; - sha256 = "0gaq11gm09ax25lvgfrvxv9dxvi76hps116fp6k7sqgvdd68vf0s"; + sha256 = "1lhjx8fa8xynnlk5g6ipvchhfnz6j5lgqxlsifx82pbbnbm6mps4"; }; nativeBuildInputs = [ which ]; buildInputs = [ gfortran libGLU xorg.libX11 xorg.libXmu ]; + patches = [ ./dont_register_file_types.patch ]; + postPatch = '' substituteInPlace ./makefile --replace '-L/usr/X11R6/lib' "" \ --replace '-I/usr/X11R6/include' "" \ diff --git a/pkgs/applications/science/chemistry/molden/dont_register_file_types.patch b/pkgs/applications/science/chemistry/molden/dont_register_file_types.patch new file mode 100644 index 000000000000..75ce593ed29a --- /dev/null +++ b/pkgs/applications/science/chemistry/molden/dont_register_file_types.patch @@ -0,0 +1,29 @@ +diff --git a/makefile b/makefile +index 58a9e74..64615b6 100644 +--- a/makefile ++++ b/makefile +@@ -32,8 +32,6 @@ os := + ifeq ($(uname), Linux) + os := $(shell head -n 1 /etc/issue | cut -d" " -f1) + ifeq ($(os), Ubuntu) +- EXTEN = exten +- EXTENZ = exten2 + LIBSG = -L/usr/X11R6/lib -lGLU -lGL -lX11 -lm + endif + ifeq ($(os), Debian) +@@ -278,7 +276,7 @@ LIBSOGL = -lglut -lGLU -lGL -lXmu -lX11 -lm + # + #LIBSG = -L/usr/X11R6/lib -Wl,-framework -Wl,GLUT -Wl,-framework -Wl,OpenGL -Wl,-framework -Wl,Cocoa -lGLU -lGL -lXmu -lX11 -lm + +-all: molden gmolden ambfor/ambfor ambfor/ambmd surf/surf $(EXTEN) ++all: molden gmolden ambfor/ambfor ambfor/ambmd surf/surf + xwin.o: xwin.c rots.h + xwingl.o: xwin.c rots.h + +@@ -344,5 +342,5 @@ exten: + exten2: + ./register_extension.sh /usr/local/bin + +-install: $(EXTENZ) ++install: + sudo install -t /usr/local/bin -m 755 molden gmolden ambfor/ambfor ambfor/ambmd surf/surf diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index 5daf4c296012..dd8162382023 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { name = "efl-${version}"; - version = "1.20.7"; + version = "1.21.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz"; - sha256 = "1zkn5ix81xck3n84dxvkjh4alwc6zj8x989d0zqi5c6ppijvgadh"; + sha256 = "0jxfrcz2aq1synxzd6sh9nhxz7fg9qgz0idr8zj6gaiplmwbwrby"; }; nativeBuildInputs = [ pkgconfig ]; @@ -29,6 +29,9 @@ stdenv.mkDerivation rec { harfbuzz jbig2dec librsvg dbus alsaLib poppler ghostscript libraw libspectre xineLib libwebp curl libdrm libinput utillinux fribidi SDL2 ]; + # as of 1.21.0 compilation will fail due to -Werror=format-security + hardeningDisable = [ "format" ]; + # ac_ct_CXX must be set to random value, because then it skips some magic which does alternative searching for g++ configureFlags = [ "--enable-sdl" diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index bdf5ac29ca61..44d07231d2eb 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "mate-themes-${version}"; - version = "3.22.17"; + version = "3.22.18"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/themes/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "1bf1swyrr5dkfsp1ihc0svr5nnwv22zxjwgmf6zhxl638ng9f41h"; + sha256 = "0538bw8qismp16ymxbjk0ww7yjw1ch5v3f3d4vib3770xvgmmcfm"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix index 2f4cb10bd4db..51544783d8c6 100644 --- a/pkgs/development/compilers/fpc/default.nix +++ b/pkgs/development/compilers/fpc/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { makeFlags = "NOGDB=1 FPC=${startFPC}/bin/fpc"; installFlags = "INSTALL_PREFIX=\${out}"; - + postInstall = '' for i in $out/lib/fpc/*/ppc*; do ln -fs $i $out/bin/$(basename $i) @@ -35,10 +35,12 @@ stdenv.mkDerivation rec { bootstrap = startFPC; }; - meta = { + meta = with stdenv.lib; { description = "Free Pascal Compiler from a source distribution"; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + homepage = https://www.freepascal.org; + maintainers = [ maintainers.raskin ]; + license = with licenses; [ gpl2 lgpl2 ]; + platforms = platforms.linux; inherit version; }; } diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix index f503427b326e..233372caa800 100644 --- a/pkgs/development/compilers/gcl/default.nix +++ b/pkgs/development/compilers/gcl/default.nix @@ -36,9 +36,10 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fgnu89-inline"; - meta = { + meta = with stdenv.lib; { description = "GNU Common Lisp compiler working via GCC"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ maintainers.raskin ]; + license = licenses.gpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/development/interpreters/ruby/rubygems-src.nix b/pkgs/development/interpreters/ruby/rubygems-src.nix index cb36c96a4c52..4e5793f11139 100644 --- a/pkgs/development/interpreters/ruby/rubygems-src.nix +++ b/pkgs/development/interpreters/ruby/rubygems-src.nix @@ -1,8 +1,8 @@ { fetchurl -, version ? "2.7.6" -, sha256 ? "1sqy6z1kngq91nxmv1hw4xhw1ycwx9s76hfbpcdlgkm9haji9xv7" +, version ? "2.7.7" +, sha256 ? "1jsmmd31j8j066b83lin4bbqz19jhrirarzb41f3sjhfdjiwkcjc" }: fetchurl { - url = "http://production.cf.rubygems.org/rubygems/rubygems-${version}.tgz"; + url = "https://rubygems.org/rubygems/rubygems-${version}.tgz"; sha256 = sha256; } diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 952f7435c069..8e89aeb21a24 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "arrow-cpp-${version}"; - version = "0.9.0"; + version = "0.10.0"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - sha256 = "16l91fixb5dgx3v6xc73ipn1w1hjgbmijyvs81j7ywzpna2cdcdy"; + sha256 = "0bc4krapz1kzdm16npzmgdz7zvg9lip6rnqbwph8vfn7zji0fcll"; }; sourceRoot = "apache-arrow-${version}/cpp"; diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index 5f99f35a1599..bf7630608f7d 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, openblas +{ stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, blas , gmpxx , optimize ? false # impure }: @@ -6,23 +6,30 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "fflas-ffpack"; version = "2.3.2"; + src = fetchFromGitHub { owner = "linbox-team"; repo = "${pname}"; rev = "v${version}"; sha256 = "1cqhassj2dny3gx0iywvmnpq8ca0d6m82xl5rz4mb8gaxr2kwddl"; }; + checkInputs = [ gmpxx ]; + + enableParallelBuilding = true; + nativeBuildInputs = [ autoreconfHook pkgconfig ] ++ stdenv.lib.optionals doCheck checkInputs; - buildInputs = [ givaro openblas]; + + buildInputs = [ givaro blas ]; + configureFlags = [ - "--with-blas-libs=-lopenblas" - "--with-lapack-libs=-lopenblas" + "--with-blas-libs=-l${blas.linkName}" + "--with-lapack-libs=-l${blas.linkName}" ] ++ stdenv.lib.optionals (!optimize) [ # disable SIMD instructions (which are enabled *when available* by default) "--disable-sse" @@ -36,13 +43,15 @@ stdenv.mkDerivation rec { "--disable-fma" "--disable-fma4" ]; + doCheck = true; + meta = { inherit version; description = ''Finite Field Linear Algebra Subroutines''; license = stdenv.lib.licenses.lgpl21Plus; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; homepage = https://linbox-team.github.io/fflas-ffpack/; }; } diff --git a/pkgs/development/libraries/fontconfig-ultimate/default.nix b/pkgs/development/libraries/fontconfig-ultimate/default.nix index a2e5f69202c4..9aeb12344ece 100644 --- a/pkgs/development/libraries/fontconfig-ultimate/default.nix +++ b/pkgs/development/libraries/fontconfig-ultimate/default.nix @@ -38,4 +38,11 @@ stdenv.mkDerivation { cp fontconfig_patches/free/*.conf $out/etc/fonts/presets/free cp fontconfig_patches/ms/*.conf $out/etc/fonts/presets/ms ''; + + meta = with stdenv.lib; { + description = "Font configuration files, patches, scripts and source packages (Infinality & friends)"; + homepage = https://github.com/bohoomil/fontconfig-ultimate; + license = licenses.mit; + platforms = platforms.all; + }; } diff --git a/pkgs/development/libraries/funambol/default.nix b/pkgs/development/libraries/funambol/default.nix index d0850128ebcc..100c00eea497 100644 --- a/pkgs/development/libraries/funambol/default.nix +++ b/pkgs/development/libraries/funambol/default.nix @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook unzip ]; - meta = { + meta = with stdenv.lib; { description = "SyncML client sdk by Funambol project"; homepage = http://www.funambol.com; - maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + license = licenses.agpl3; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix index a4e0bcfb52b0..4cff22457403 100644 --- a/pkgs/development/libraries/gamin/default.nix +++ b/pkgs/development/libraries/gamin/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation (rec { homepage = https://people.gnome.org/~veillard/gamin/; description = "A file and directory monitoring system"; maintainers = with maintainers; [ lovek323 ]; + license = licenses.gpl2; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/development/libraries/gcab/default.nix index 0758d1252274..dc0ca5fffa3a 100644 --- a/pkgs/development/libraries/gcab/default.nix +++ b/pkgs/development/libraries/gcab/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, gettext, gobjectIntrospection, pkgconfig, meson, ninja, glibcLocales, git, vala, glib, zlib }: +{ stdenv, fetchurl, gettext, gobjectIntrospection, pkgconfig +, meson, ninja, glibcLocales, git, vala, glib, zlib +}: stdenv.mkDerivation rec { name = "gcab-${version}"; @@ -22,6 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; + license = licenses.lgpl21; maintainers = [ maintainers.lethalman ]; }; diff --git a/pkgs/development/libraries/git2/0.27.nix b/pkgs/development/libraries/git2/0.27.nix index 8d9ff3cfe43c..bafd6be37df6 100644 --- a/pkgs/development/libraries/git2/0.27.nix +++ b/pkgs/development/libraries/git2/0.27.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "0.27.3"; + version = "0.27.4"; name = "libgit2-${version}"; src = fetchFromGitHub { owner = "libgit2"; repo = "libgit2"; rev = "v${version}"; - sha256 = "044dzwgl8zf1i1mk2g1z07hzxz46gma9sh63x09hswhw8j6zqx61"; + sha256 = "1cmc8ldhpyp62pswb7dmjjya3ng0ssaggcsxs1labvp6xyxjvp6s"; }; cmakeFlags = [ "-DTHREADSAFE=ON" ]; diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 1d389f914ddf..48f009f8d3e0 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.48/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.49/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 1ad2254ccf89..4f866974b61b 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -3,627 +3,627 @@ { attica = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/attica-5.48.0.tar.xz"; - sha256 = "1q2133gmhfi3wd9978556syzzqc1s6zgjc0p1353w6dmfwxfyzq8"; - name = "attica-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/attica-5.49.0.tar.xz"; + sha256 = "1iqclahs9yzyjnkzbzr8hl9j6q8m2djdm6mix92xwrakgirnl3gn"; + name = "attica-5.49.0.tar.xz"; }; }; baloo = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/baloo-5.48.0.tar.xz"; - sha256 = "0rgz2gx99c1k8vgfskx7w6q1sjf98wcvybv88djdlj2s6h2qn8lj"; - name = "baloo-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/baloo-5.49.0.tar.xz"; + sha256 = "0xj12v0k58sr3snxyj4vx7dqhinrvk6qm0ikymscqgbmw9ijwxph"; + name = "baloo-5.49.0.tar.xz"; }; }; bluez-qt = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/bluez-qt-5.48.0.tar.xz"; - sha256 = "149px5gnplk0y7cl3cz258qks3rq5p0kkk9rc48y59zvlxiyy949"; - name = "bluez-qt-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/bluez-qt-5.49.0.tar.xz"; + sha256 = "0mgnq7w52ksr8b7ys2f1m3irnviy011bsaggh489fjy0xlzk5ard"; + name = "bluez-qt-5.49.0.tar.xz"; }; }; breeze-icons = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/breeze-icons-5.48.0.tar.xz"; - sha256 = "1p0krrxfz6p0qhy79lnjyi0xsrprw1q4z65xah89kj0wmfriiyqh"; - name = "breeze-icons-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/breeze-icons-5.49.0.tar.xz"; + sha256 = "178620hhqlv6dl8qal2bmiw55s8b3p4h16q8cgkmq5q5i59nzcph"; + name = "breeze-icons-5.49.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - 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"; + url = "${mirror}/stable/frameworks/5.49/extra-cmake-modules-5.49.0.tar.xz"; + sha256 = "07pdgjyrxniacqcfvrzw8ij3kasx5pkbq38k6491qbhzfm8vi7y0"; + name = "extra-cmake-modules-5.49.0.tar.xz"; }; }; frameworkintegration = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/frameworkintegration-5.48.0.tar.xz"; - sha256 = "1na913ndc55nlmfc61122b1p29h4prxnpc5pqvh6drsgfyacnm8y"; - name = "frameworkintegration-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/frameworkintegration-5.49.0.tar.xz"; + sha256 = "1ni4jrny630zf3zwmqbm8z7dqgiar58992lylfv7kspdg5crcgfx"; + name = "frameworkintegration-5.49.0.tar.xz"; }; }; kactivities = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kactivities-5.48.0.tar.xz"; - sha256 = "1zxdzwz8j43hh8d7v1qfihf95kwxvsbqki0zgdhlnj7s0xds0yz8"; - name = "kactivities-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kactivities-5.49.0.tar.xz"; + sha256 = "117f3zrdbs0pa10wn7vy691n02m01h6x4pm8m1q3f4pjm0k4kqim"; + name = "kactivities-5.49.0.tar.xz"; }; }; kactivities-stats = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kactivities-stats-5.48.0.tar.xz"; - sha256 = "11r61qnrjpc4ls18apb4a13j1lizjq48bxfw3f8p8hjxxxh8z0j6"; - name = "kactivities-stats-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kactivities-stats-5.49.0.tar.xz"; + sha256 = "129z2m5330j0l1nw8g3qjib60xmx54c6d2g9vnp4w8z0agnihs5f"; + name = "kactivities-stats-5.49.0.tar.xz"; }; }; kapidox = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kapidox-5.48.0.tar.xz"; - sha256 = "1b22np0lygnm2r2q1anh0f4b7dh2h0lccx767g4r2w0fw5r1bbb4"; - name = "kapidox-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kapidox-5.49.0.tar.xz"; + sha256 = "09jph3hvasqx1ia0l7is9brc08nxvh9qmg8564nh5cmqaxdwj559"; + name = "kapidox-5.49.0.tar.xz"; }; }; karchive = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/karchive-5.48.0.tar.xz"; - sha256 = "10qbx8k1yqqfp1pq5yj8ln3gpj2wnfnlln99gczf99f51fqd65p6"; - name = "karchive-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/karchive-5.49.0.tar.xz"; + sha256 = "1p1gwqda2bsjdysp4ggwdsldbasyfl075xn3wchqyakdv2bdzmn0"; + name = "karchive-5.49.0.tar.xz"; }; }; kauth = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kauth-5.48.0.tar.xz"; - sha256 = "00mpbs24dm9ycabpcm2wwlv1vdq4dq5qr2zw6bbqpgj3jplakbs7"; - name = "kauth-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kauth-5.49.0.tar.xz"; + sha256 = "0qg3zwg3kfx2snmvsw4ixr0qds7bd7992dxggvi9dcny7dm9q0n8"; + name = "kauth-5.49.0.tar.xz"; }; }; kbookmarks = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kbookmarks-5.48.0.tar.xz"; - sha256 = "11ics7gbdkx1f0pxryf2xwjq4fyqh6a3gzcizymm1m7gmygggqar"; - name = "kbookmarks-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kbookmarks-5.49.0.tar.xz"; + sha256 = "0clmfdcc1fc98q3vbfjf8x140a6df88ixhz0mny3dpv1wcr5cz53"; + name = "kbookmarks-5.49.0.tar.xz"; }; }; kcmutils = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kcmutils-5.48.0.tar.xz"; - sha256 = "0nvlzvv2gmc2hz11w6bixz4mccnj09g69byrnvsrwh0psf1kqlmw"; - name = "kcmutils-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kcmutils-5.49.0.tar.xz"; + sha256 = "0xv899p9f0hj6hd089mhn910qn66bihzpaa11ikrhbimckw8g19q"; + name = "kcmutils-5.49.0.tar.xz"; }; }; kcodecs = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kcodecs-5.48.0.tar.xz"; - sha256 = "1pz0s3krb4vv01hvpjdr5ngnw1ndxgsfln944fm9pfj0pmk7p92n"; - name = "kcodecs-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kcodecs-5.49.0.tar.xz"; + sha256 = "07va63gsfjrc5ha9rdli923cwyzxpb3v8xgf1zfhw75cfkgda3nz"; + name = "kcodecs-5.49.0.tar.xz"; }; }; kcompletion = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kcompletion-5.48.0.tar.xz"; - sha256 = "129mmh46y0r6dcnbxf5yswsr48qj5l25n930nlx7wzaav28y55lp"; - name = "kcompletion-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kcompletion-5.49.0.tar.xz"; + sha256 = "16br6wnqzndk8v41im23h2ww4hypi2i1qfg6m9c49mpxflgmspbi"; + name = "kcompletion-5.49.0.tar.xz"; }; }; kconfig = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kconfig-5.48.0.tar.xz"; - sha256 = "1g640cnd9j2jp35bb5zgjfxskbg3fj9p03r0yf3dkm1d1681x9a3"; - name = "kconfig-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kconfig-5.49.0.tar.xz"; + sha256 = "0cb3crnlr8hr5npq3ykfxqd4yckmkykzrrizfs89ryhmznc2ngsf"; + name = "kconfig-5.49.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kconfigwidgets-5.48.0.tar.xz"; - sha256 = "0xlnbw34zbmy7fwsi9iks4iv7shki4fqs7wd3yblmyxa2l18ldh9"; - name = "kconfigwidgets-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kconfigwidgets-5.49.0.tar.xz"; + sha256 = "1nqcrqr67m3kvq2r83x45zcdghk12bas9fp0s43s68imrhy5xikz"; + name = "kconfigwidgets-5.49.0.tar.xz"; }; }; kcoreaddons = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kcoreaddons-5.48.0.tar.xz"; - sha256 = "157k4l67iswny5krinfigfc6pabqfyfzya6hc5gcjrdplmnccy1f"; - name = "kcoreaddons-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kcoreaddons-5.49.0.tar.xz"; + sha256 = "00s22jvbwav20cidnp8v9fgc6pqbp4wnqkb2spv18mjhg4pv3bqj"; + name = "kcoreaddons-5.49.0.tar.xz"; }; }; kcrash = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kcrash-5.48.0.tar.xz"; - sha256 = "0qqwdx7piz4wfm4lh41kknfcyw5saw17qh07ghhi7j80whpkazk8"; - name = "kcrash-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kcrash-5.49.0.tar.xz"; + sha256 = "0xmr9rrl0xahpnq1rw4bbar1nbr21x2bk4hhv79la6dsg9ha25b3"; + name = "kcrash-5.49.0.tar.xz"; }; }; kdbusaddons = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kdbusaddons-5.48.0.tar.xz"; - sha256 = "0vpd4cij52v43fsifbk3nnmi5csik8h4avima6jw0b09s8xdz8rr"; - name = "kdbusaddons-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kdbusaddons-5.49.0.tar.xz"; + sha256 = "1fnmrrffp3kfwyjfzqkzlizflpyqgzbjljb51ppmdypcq8wy9ibh"; + name = "kdbusaddons-5.49.0.tar.xz"; }; }; kdeclarative = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kdeclarative-5.48.0.tar.xz"; - sha256 = "09nfp6vrj6dc3kfknicr8629ifz976wi4wxdh5bfx15z9296l8pd"; - name = "kdeclarative-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kdeclarative-5.49.0.tar.xz"; + sha256 = "0kgawb8wfx4snk2ckwxj0hmpgcvq3k1zpsxqdawi4cmsy4bxzfs9"; + name = "kdeclarative-5.49.0.tar.xz"; }; }; kded = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kded-5.48.0.tar.xz"; - sha256 = "13527iv6cf44wgxpqfhmkhryihjfi02fi78lf2bnvgwmhd2nl954"; - name = "kded-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kded-5.49.0.tar.xz"; + sha256 = "1l6hs3spbs3618jwg3n7r3hrrkqxmmd43f0km8849x4641p72zyc"; + name = "kded-5.49.0.tar.xz"; }; }; kdelibs4support = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/portingAids/kdelibs4support-5.48.0.tar.xz"; - sha256 = "058s5h6sfhi1i3pa59hwpyxzd01jgpb8r68nnbphmryimi5nazqf"; - name = "kdelibs4support-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/portingAids/kdelibs4support-5.49.0.tar.xz"; + sha256 = "1cz70c77l66lbw4fbgmfbq1fldybqxsiay2pg9risgqp3ra8wahi"; + name = "kdelibs4support-5.49.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kdesignerplugin-5.48.0.tar.xz"; - sha256 = "1kswvxgjpyi1p1kg4z5x5df8yqhrwhcpavzx4a83dg6hp5xk0l2l"; - name = "kdesignerplugin-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kdesignerplugin-5.49.0.tar.xz"; + sha256 = "0hj4ng0i22rvw4kl0irhqhww3kvn4c0pncn38w1j5vim4gxv0xcd"; + name = "kdesignerplugin-5.49.0.tar.xz"; }; }; kdesu = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kdesu-5.48.0.tar.xz"; - sha256 = "14ka3h06xbfv357z29zgbwnjcfwspi42f0fm3m7lszqhz9skj4v5"; - name = "kdesu-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kdesu-5.49.0.tar.xz"; + sha256 = "1gwvby51qqbkrs2vjpnplxr6m6xa5ddfdjs1iygh8kpqsh8a765k"; + name = "kdesu-5.49.0.tar.xz"; }; }; kdewebkit = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kdewebkit-5.48.0.tar.xz"; - sha256 = "0wf2prv85sayz1mqq0ymrqw3p0f3ikakhgzy01pixrp7qgwqkkrv"; - name = "kdewebkit-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kdewebkit-5.49.0.tar.xz"; + sha256 = "05idyw94ayjh7qdia9pnjmx29r5lsch421kv8h5ivr7ixcbrgk6n"; + name = "kdewebkit-5.49.0.tar.xz"; }; }; kdnssd = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kdnssd-5.48.0.tar.xz"; - sha256 = "01hra59b0sm82j7ry78f3clrypc80q59vx9h0ahacbab4pzq41p5"; - name = "kdnssd-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kdnssd-5.49.0.tar.xz"; + sha256 = "1n61id2x1iianshg8g6fw389mqihz4h8sj9hnng7cdg4csh72ffr"; + name = "kdnssd-5.49.0.tar.xz"; }; }; kdoctools = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kdoctools-5.48.0.tar.xz"; - sha256 = "0v8x198kfgz2p56nyy9cb6lks5yazdbdg55c4ps5bw36dbmpd3v8"; - name = "kdoctools-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kdoctools-5.49.0.tar.xz"; + sha256 = "1dmpk453s71ls0q8hgpqqd5dcr7zlimf5wykizcy2wn7p77gzsgl"; + name = "kdoctools-5.49.0.tar.xz"; }; }; kemoticons = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kemoticons-5.48.0.tar.xz"; - sha256 = "166sjwrn9dm4km8sypdwcfsylcamhl1gfl28h8hrv498zhnyrfb9"; - name = "kemoticons-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kemoticons-5.49.0.tar.xz"; + sha256 = "0mz9hkhnprjbrfq54mqcvj8w87h025785m1bas80brsqzvni5krn"; + name = "kemoticons-5.49.0.tar.xz"; }; }; kfilemetadata = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kfilemetadata-5.48.0.tar.xz"; - sha256 = "0krn53a2s950fb980gdap5hwf994kxfd4h8zk7a4s9cick957z5f"; - name = "kfilemetadata-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kfilemetadata-5.49.0.tar.xz"; + sha256 = "045k1mgn8kg0qfsr5sl1499nzhzmbcvrqc205pmq6sh4r14nvk80"; + name = "kfilemetadata-5.49.0.tar.xz"; }; }; kglobalaccel = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kglobalaccel-5.48.0.tar.xz"; - sha256 = "15dlpm69d38bsgl6hc7f1mjjq8qyxac010whx4rcsk4vsrwdfnm7"; - name = "kglobalaccel-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kglobalaccel-5.49.0.tar.xz"; + sha256 = "1fk7wazfwr7smqiym3phm5yvw6cmiczag52y1vad8fgb3izd6zhl"; + name = "kglobalaccel-5.49.0.tar.xz"; }; }; kguiaddons = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kguiaddons-5.48.0.tar.xz"; - sha256 = "0viqq9qg448fh12isc1kkmzcnnsjqw5fx4wlshyza19gfr4ym0dz"; - name = "kguiaddons-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kguiaddons-5.49.0.tar.xz"; + sha256 = "1zkjd3l5pyvvilcc9lbdgqaxnpvh586yf0cndl90h3x89hy1d4xk"; + name = "kguiaddons-5.49.0.tar.xz"; }; }; kholidays = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kholidays-5.48.0.tar.xz"; - sha256 = "04vjp2jm2c6qgj50jbqkkgqh8b759pd4dpsczfkyq30p03vybxr4"; - name = "kholidays-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kholidays-5.49.0.tar.xz"; + sha256 = "0yc4i4qsk3w1v0andw737ps1ad70696q140k0ycfhk6qmv1wvsdp"; + name = "kholidays-5.49.0.tar.xz"; }; }; khtml = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/portingAids/khtml-5.48.0.tar.xz"; - sha256 = "1zrilnvvvvjq82hm6gbh5pvzfygy8w7a0140d3l74jjgy01394m1"; - name = "khtml-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/portingAids/khtml-5.49.0.tar.xz"; + sha256 = "0k9m2pgq64grmgc6ywpzfnn65h8wfkkiwjbmz2mwbf2yi9c1ky64"; + name = "khtml-5.49.0.tar.xz"; }; }; ki18n = { - version = "5.48.1"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/ki18n-5.48.1.tar.xz"; - sha256 = "0m9x6bagviqrnm0hx7ykggqiykxv3qi11bmi0xz2f02y78q89f3h"; - name = "ki18n-5.48.1.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/ki18n-5.49.0.tar.xz"; + sha256 = "1i4rdrxann45zl6fkmfd1b96q52g0mpc5x19fx9h80crapkm8jjz"; + name = "ki18n-5.49.0.tar.xz"; }; }; kiconthemes = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kiconthemes-5.48.0.tar.xz"; - sha256 = "1xqbg10qlk1zdha4kfyya1471r35gnz63iyj0ks3gzyfjvbivpy4"; - name = "kiconthemes-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kiconthemes-5.49.0.tar.xz"; + sha256 = "1f7pk6smi2f0mm7jkrw5ymmkhd9gi8vnmppyblp1v3pvmy571c2m"; + name = "kiconthemes-5.49.0.tar.xz"; }; }; kidletime = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kidletime-5.48.0.tar.xz"; - sha256 = "184b1qdh4bwsdg9lyl4d8rcs833fqcmfvbb5qmdd3mqvvg8xv9mm"; - name = "kidletime-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kidletime-5.49.0.tar.xz"; + sha256 = "1fd02anlmaa0hnnp5q1s9973m3asy56qppwq1va1g6ga3csv3wrv"; + name = "kidletime-5.49.0.tar.xz"; }; }; kimageformats = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kimageformats-5.48.0.tar.xz"; - sha256 = "1myxp583gw5d50ddkkv6ipbdzf6k3sdk9gambklay1dzmy4b91sc"; - name = "kimageformats-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kimageformats-5.49.0.tar.xz"; + sha256 = "1q7019gbk59fwampna1ayjvw016c0q79hmldpaqh3xa9sh082wy4"; + name = "kimageformats-5.49.0.tar.xz"; }; }; kinit = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kinit-5.48.0.tar.xz"; - sha256 = "08sf3j1bpxzqjim777d6znn8f7rzs5vpm4wz21s1ng3f32z2km9a"; - name = "kinit-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kinit-5.49.0.tar.xz"; + sha256 = "1rq9b59gdgcpvwd694l8h55sqahpdaky0n7ag5psjlfn5myf1d95"; + name = "kinit-5.49.0.tar.xz"; }; }; kio = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kio-5.48.0.tar.xz"; - sha256 = "0am03nwbfidb5dxs8j8qaan4mcs7xv75sk135rslwfp5q56v1fa0"; - name = "kio-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kio-5.49.0.tar.xz"; + sha256 = "0rrsg3g1b204cdp58vxd5dig1ggwyvk1382p1c86vn6w8qbrq27k"; + name = "kio-5.49.0.tar.xz"; }; }; kirigami2 = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kirigami2-5.48.0.tar.xz"; - sha256 = "0f01rnzzv2w7mmb0war8kph46c3wbdbz7s9i6rwh6g7kg6zvzn52"; - name = "kirigami2-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kirigami2-5.49.0.tar.xz"; + sha256 = "1wan9h7kvjzvyzfjfjd512lxiac5prhs493xjqwxgags6kxwglaz"; + name = "kirigami2-5.49.0.tar.xz"; }; }; kitemmodels = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kitemmodels-5.48.0.tar.xz"; - sha256 = "13b0fqy4yg4zahqq8376gnna36mfg94yb5d1fz0cgw7fk9d920gf"; - name = "kitemmodels-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kitemmodels-5.49.0.tar.xz"; + sha256 = "1frha301540js45mrxiw034m9b2rwsa56xphkqn6cm4jmn48qdjg"; + name = "kitemmodels-5.49.0.tar.xz"; }; }; kitemviews = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kitemviews-5.48.0.tar.xz"; - sha256 = "0cdyw0gy67yhhxv44j1bhhd4qnj7rwi0fjzf275532bf3js1j12w"; - name = "kitemviews-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kitemviews-5.49.0.tar.xz"; + sha256 = "1aj605q2p72w4rb9i0f2xb93bn5xfjq9sl5i4h6rqflcvvy7qpdp"; + name = "kitemviews-5.49.0.tar.xz"; }; }; kjobwidgets = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kjobwidgets-5.48.0.tar.xz"; - sha256 = "0a5awpbka6mk4r4m5if7s9i5ybysykpcmlj69liabzcv0k1x5y6w"; - name = "kjobwidgets-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kjobwidgets-5.49.0.tar.xz"; + sha256 = "04i5cvbxii7n0jr3ai1dh44miqbdkxb6an5w8s7qvkv0xmkml35g"; + name = "kjobwidgets-5.49.0.tar.xz"; }; }; kjs = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/portingAids/kjs-5.48.0.tar.xz"; - sha256 = "0ysbf6m63cw2iywwr7p5ngsh7s7ml9sc1sqkhnbh7racn0pzc1l4"; - name = "kjs-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/portingAids/kjs-5.49.0.tar.xz"; + sha256 = "057ikyi4wffjvxdyk08hmj7h8vmbwbcxv98apmjzgsd611zvx5p0"; + name = "kjs-5.49.0.tar.xz"; }; }; kjsembed = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/portingAids/kjsembed-5.48.0.tar.xz"; - sha256 = "0j74g3xb23k55pixk76z2ib6yyc7f2iwvwqvvw1f907rn43g6qqx"; - name = "kjsembed-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/portingAids/kjsembed-5.49.0.tar.xz"; + sha256 = "0qddjkfm6f0f5dynqvi3l23mgyfdbk4xzg967sj3a2qlq423ah0m"; + name = "kjsembed-5.49.0.tar.xz"; }; }; kmediaplayer = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/portingAids/kmediaplayer-5.48.0.tar.xz"; - sha256 = "1kw35c5dmwsrkinfgmylzgvw3zcg0yimlfcl52bhdg0x7sgdbjkq"; - name = "kmediaplayer-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/portingAids/kmediaplayer-5.49.0.tar.xz"; + sha256 = "0hbx48ivj4i96yagd9n9vd22ycsljrvijm6nfms4x7z7jr49flrx"; + name = "kmediaplayer-5.49.0.tar.xz"; }; }; knewstuff = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/knewstuff-5.48.0.tar.xz"; - sha256 = "0g2sxk6wqqgynmqgz6jxknlrsmpj4y94cn7vpw84isd9brsr5hfv"; - name = "knewstuff-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/knewstuff-5.49.0.tar.xz"; + sha256 = "1vhcl2z9rcqg8390l1cwn3yyi1n17pn6mn8fsplp25qhzimb8bmk"; + name = "knewstuff-5.49.0.tar.xz"; }; }; knotifications = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/knotifications-5.48.0.tar.xz"; - sha256 = "11p03jgkw8zvfsal6q3yxz5shkpxiknnryw2a120sjmsab87imzb"; - name = "knotifications-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/knotifications-5.49.0.tar.xz"; + sha256 = "10481j2irlqhqd16xi412xbglnyjl0ndanlv9s0d3fxirs95zdd9"; + name = "knotifications-5.49.0.tar.xz"; }; }; knotifyconfig = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/knotifyconfig-5.48.0.tar.xz"; - sha256 = "1rlzmp1lzrniav2d5sjzh43mdm47i5dpa2rlsqppqq5887wjphcm"; - name = "knotifyconfig-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/knotifyconfig-5.49.0.tar.xz"; + sha256 = "09v4aq5x98sqg2awhw0n0y0rnjkr77kbf51xij0fiykd4llp9lfa"; + name = "knotifyconfig-5.49.0.tar.xz"; }; }; kpackage = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kpackage-5.48.0.tar.xz"; - sha256 = "18q6gp1gmzjyid803j7mcm9dbqg4bcd059qlp6sb6rkllygv4pcr"; - name = "kpackage-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kpackage-5.49.0.tar.xz"; + sha256 = "1xbfjwxb4gff8gg0hs5m9s0jcnzqk27rs2jr71g5ckhvs5psnkcd"; + name = "kpackage-5.49.0.tar.xz"; }; }; kparts = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kparts-5.48.0.tar.xz"; - sha256 = "1p4xdrxfvq5xj17zf8gfxc0c9lryp8n9ahinardlb3rnb1wcw4hv"; - name = "kparts-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kparts-5.49.0.tar.xz"; + sha256 = "0zdz0byj0gsbgb007y8x37w8yf1gkw6dsp2s9bbdc4w6h9ipdj2k"; + name = "kparts-5.49.0.tar.xz"; }; }; kpeople = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kpeople-5.48.0.tar.xz"; - sha256 = "1gddld3phsqknm3x0k0wnhgqid5dqsqbw06v91vbl8746np04zf7"; - name = "kpeople-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kpeople-5.49.0.tar.xz"; + sha256 = "0i5pd1d2jphsvpc3dpdw28dsdal1qrnnrx3k6qx4wax3f8ph5khv"; + name = "kpeople-5.49.0.tar.xz"; }; }; kplotting = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kplotting-5.48.0.tar.xz"; - sha256 = "17f78wppaj433x6fm108z5zw849qvnjsxisa92rxmkm9c64wzijg"; - name = "kplotting-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kplotting-5.49.0.tar.xz"; + sha256 = "13fzqqkyxs4ja6n5yb9lc5jx4qpsmrbsiihnwrgj3lhpzhlr91n0"; + name = "kplotting-5.49.0.tar.xz"; }; }; kpty = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kpty-5.48.0.tar.xz"; - sha256 = "0ywkiw7gpqx7zrj6wrvfsn2sjkyxzsmqn8p91z0kz1s3id2s04fk"; - name = "kpty-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kpty-5.49.0.tar.xz"; + sha256 = "1pnj07079l6gkz6171fcvljh0dcdy9s77p1q0l9nnkknjbr102pg"; + name = "kpty-5.49.0.tar.xz"; }; }; kross = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/portingAids/kross-5.48.0.tar.xz"; - sha256 = "0zxhn8wai71ll1113k47xmcspbp16iz1rybm6m2qs6f4j5ghif8q"; - name = "kross-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/portingAids/kross-5.49.0.tar.xz"; + sha256 = "194zcf499fkwk3wcs3kc3l0fi9h8gn5yqh6gxrgiyn6iyy9a4qdz"; + name = "kross-5.49.0.tar.xz"; }; }; krunner = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/krunner-5.48.0.tar.xz"; - sha256 = "0mdwyvx656ba8pwvg4qw8jr268iffqrp9ipr28m71hkx0sh7k6hn"; - name = "krunner-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/krunner-5.49.0.tar.xz"; + sha256 = "02l5gch9hpag1q5ixnb541g7m9lx25pbggldpa8zykp63apyca19"; + name = "krunner-5.49.0.tar.xz"; }; }; kservice = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kservice-5.48.0.tar.xz"; - sha256 = "1r5d3cdvmbyqn8hm2hjalgg1ncnpdh1w7fd5rr0k97j5qj29ypis"; - name = "kservice-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kservice-5.49.0.tar.xz"; + sha256 = "1wwb6c6m8f3b16p47adkc05rrlszvvym7ckks5xp08s58pk1dm8z"; + name = "kservice-5.49.0.tar.xz"; }; }; ktexteditor = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/ktexteditor-5.48.0.tar.xz"; - sha256 = "1fnq6d3ky277rbg3ngq55gdswrgfxsn19c43s23xcbfaymmhapj7"; - name = "ktexteditor-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/ktexteditor-5.49.0.tar.xz"; + sha256 = "14iss8svx49vav0h2kg8vhv8g5hg4ky30s7049csfwz7xhp7jmcj"; + name = "ktexteditor-5.49.0.tar.xz"; }; }; ktextwidgets = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/ktextwidgets-5.48.0.tar.xz"; - sha256 = "0hf4rpnkc9qfpnpfm6bsrrjrvvkr6785pnakqyfbjcgbyavp58hg"; - name = "ktextwidgets-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/ktextwidgets-5.49.0.tar.xz"; + sha256 = "14gclshmpwmfwkp2hzlnf823pjjmknd9q0gdclsh3yy268c2rsw1"; + name = "ktextwidgets-5.49.0.tar.xz"; }; }; kunitconversion = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kunitconversion-5.48.0.tar.xz"; - sha256 = "0hipqjj82zkq8ysvg304m5jblxxrvjh8vfc3wgl93zvj0mwx06db"; - name = "kunitconversion-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kunitconversion-5.49.0.tar.xz"; + sha256 = "11jnqz218rga3f4ppf1d927c7qhh2qpghwjpsrnrxdkz5nrvnf79"; + name = "kunitconversion-5.49.0.tar.xz"; }; }; kwallet = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kwallet-5.48.0.tar.xz"; - sha256 = "047jp26igla05isq6hg5bq9l3xd3dfa3v8dq3rz4im7dwa10hshr"; - name = "kwallet-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kwallet-5.49.0.tar.xz"; + sha256 = "13bmks9jb3yhp6clv25qkqkrvbhfyk9z16laxsv79jdd82lxgn1z"; + name = "kwallet-5.49.0.tar.xz"; }; }; kwayland = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kwayland-5.48.0.tar.xz"; - sha256 = "1qcb2kg1a23fvl6i0xky6mzmn3f6pqkvpv0dy245bd01x7q4csg4"; - name = "kwayland-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kwayland-5.49.0.tar.xz"; + sha256 = "0d95l2i3j1xxkc15n57w4rhf3di02zna4zzn4gap9qdhfxlfbqi6"; + name = "kwayland-5.49.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kwidgetsaddons-5.48.0.tar.xz"; - sha256 = "079f28ifadxhvk4miwlnhw3dvg7bmb6gjiqcg2w65bmp21rsywb7"; - name = "kwidgetsaddons-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kwidgetsaddons-5.49.0.tar.xz"; + sha256 = "1frgqz9njbc81pfy6gl6p0hyh1977lg31ynrx5wy7lg7fwaxwl92"; + name = "kwidgetsaddons-5.49.0.tar.xz"; }; }; kwindowsystem = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kwindowsystem-5.48.0.tar.xz"; - sha256 = "1b6cvx3yqkqmvji2y7ys421hmj98xhww1rlgphfdvrdaqzl4579n"; - name = "kwindowsystem-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kwindowsystem-5.49.0.tar.xz"; + sha256 = "175rzwrjndhawyy4x11lbihdr1r9gwxmxjpbz4x06hlz4g50wffp"; + name = "kwindowsystem-5.49.0.tar.xz"; }; }; kxmlgui = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kxmlgui-5.48.0.tar.xz"; - sha256 = "0n38bxxip1c4fgj00jvph98qhb11ifx40z4m0pjafm52bg0kaa2h"; - name = "kxmlgui-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kxmlgui-5.49.0.tar.xz"; + sha256 = "0wsgs5ya3wnc5cryi1r9i30sq8dnnhh15p02skdjlhwjfvdhxmfa"; + name = "kxmlgui-5.49.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kxmlrpcclient-5.48.0.tar.xz"; - sha256 = "0s0xrx2p0jngk83zb8zjn4vkwnj46wzbxzj904g71ca428nmfx40"; - name = "kxmlrpcclient-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kxmlrpcclient-5.49.0.tar.xz"; + sha256 = "0l4jnvn7s77jkvd2z44mz24mfzcw499plms79j21pjryc88drh06"; + name = "kxmlrpcclient-5.49.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/modemmanager-qt-5.48.0.tar.xz"; - sha256 = "17pnzpv3g3g25vnh9jjjk3fk6i3lhk6icl56ifcsmpj09nlw41im"; - name = "modemmanager-qt-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/modemmanager-qt-5.49.0.tar.xz"; + sha256 = "1wf3v552vbr4kh2d770zn3yn0q3bqjqbfrvnf813mnld7961m7p2"; + name = "modemmanager-qt-5.49.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/networkmanager-qt-5.48.0.tar.xz"; - sha256 = "15qikndykampl63bnp6rik1vkmwpivqf1krbsb0r29fmwyzhy38v"; - name = "networkmanager-qt-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/networkmanager-qt-5.49.0.tar.xz"; + sha256 = "16pnd52m9srcb2ml3vc3kd9k1yak5rq09yci39qp7z5jbdy7jk2z"; + name = "networkmanager-qt-5.49.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/oxygen-icons5-5.48.0.tar.xz"; - sha256 = "08y1gy2xgzby9wxbh90cfzly1aym9nym5r8m7z848a4v7chp0wpw"; - name = "oxygen-icons5-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/oxygen-icons5-5.49.0.tar.xz"; + sha256 = "0llx06sr36cd6vgkgm3jw6k4cv1cfx3r6x6lmb477wpahis0n75g"; + name = "oxygen-icons5-5.49.0.tar.xz"; }; }; plasma-framework = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/plasma-framework-5.48.0.tar.xz"; - sha256 = "1hl1q1v8kmq20bzm2bfrpjx1f1rljg2akib0sc65nw6vclrcgh82"; - name = "plasma-framework-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/plasma-framework-5.49.0.tar.xz"; + sha256 = "1yrccbkdpnfbgn7fzpmzzxm5c7fhkv1vqygq1f96r30fia0cj5jv"; + name = "plasma-framework-5.49.0.tar.xz"; }; }; prison = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/prison-5.48.0.tar.xz"; - sha256 = "04asjh9k6qhz6mzqvcw5famjh8fdfrjj5gwhar9lpzvl53k9236q"; - name = "prison-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/prison-5.49.0.tar.xz"; + sha256 = "0dppz9x6k84sl0aiyjlh3xigqgda64r8mij3bzxcdkv2wbc4ld9d"; + name = "prison-5.49.0.tar.xz"; }; }; purpose = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/purpose-5.48.0.tar.xz"; - sha256 = "015dcsz2pybfl13dq0fhja7j05bvchjd6bcwmniq8cwc2dg2qxyp"; - name = "purpose-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/purpose-5.49.0.tar.xz"; + sha256 = "014izz6vvk3vqw7s2qy33dqfflyylk8vqr9srkf391f6yfld9ygz"; + name = "purpose-5.49.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - 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"; + url = "${mirror}/stable/frameworks/5.49/qqc2-desktop-style-5.49.0.tar.xz"; + sha256 = "1vbms7b8x1y7yh8im8dv1q3wwl3j2x4r47yqg86f28grw2r2n2zj"; + name = "qqc2-desktop-style-5.49.0.tar.xz"; }; }; solid = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/solid-5.48.0.tar.xz"; - sha256 = "0fy070kbqs9hvi1ngmqzfz8a9vnry0mrin51z1yfdc44806bk2ns"; - name = "solid-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/solid-5.49.0.tar.xz"; + sha256 = "1p7rdmf2f8520xc7zp7wxlcizyyjfxwq5mf95qsfpwc4dl0c43gp"; + name = "solid-5.49.0.tar.xz"; }; }; sonnet = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/sonnet-5.48.0.tar.xz"; - sha256 = "1mzl2a61jrqflnlkkrp079z428sf2bc811qwfx0rdh0jp7bc7sq4"; - name = "sonnet-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/sonnet-5.49.0.tar.xz"; + sha256 = "0m5pmka1hwjsg3c3qvx087z3fjrfw0ayk7ylgjls5iwd39kkl1b3"; + name = "sonnet-5.49.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/syntax-highlighting-5.48.0.tar.xz"; - sha256 = "03cfljg90iszpxmx6f0dv1w1r451yqzi9bk27x56s5xzsghj8bv5"; - name = "syntax-highlighting-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/syntax-highlighting-5.49.0.tar.xz"; + sha256 = "17rkgzkfiz5dv0xr67na7ikqszgwjnf2gc11b2h47qdsr7pgx95v"; + name = "syntax-highlighting-5.49.0.tar.xz"; }; }; threadweaver = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/threadweaver-5.48.0.tar.xz"; - sha256 = "0pks8sddqdhlcrqgb106b6jy0gh3gfcss2rdavqfck6d9780v125"; - name = "threadweaver-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/threadweaver-5.49.0.tar.xz"; + sha256 = "099bs429p71dzrqy25z61rvn48w3b73p7yag4q69jnxcpj0qcyz7"; + name = "threadweaver-5.49.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index d043820aa083..649541e22627 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libelf }: let - version = "20180527"; + version = "20180809"; src = fetchurl { url = "https://www.prevanders.net/libdwarf-${version}.tar.gz"; # Upstream displays this hash broken into three parts: diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index e9010852eb33..6001946cb970 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -11,11 +11,11 @@ assert javaSupport -> jdk != null; stdenv.mkDerivation rec { name = "libguestfs-${version}"; - version = "1.38.3"; + version = "1.38.4"; src = fetchurl { url = "http://libguestfs.org/download/1.38-stable/libguestfs-${version}.tar.gz"; - sha256 = "130nc9v9f8k5kwz9hzqd43fjxg01hl7jh0jw1fhs4ah5hmg71v34"; + sha256 = "1xsazw6yrbgmc647j8l896fzv534157sqmdzac09rxkxwiy0wm16"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix index 083ea88301a6..521f963e277c 100644 --- a/pkgs/development/libraries/librelp/default.nix +++ b/pkgs/development/libraries/librelp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gnutls, zlib }: stdenv.mkDerivation rec { - name = "librelp-1.2.16"; + name = "librelp-1.2.17"; src = fetchurl { url = "http://download.rsyslog.com/librelp/${name}.tar.gz"; - sha256 = "0lzxc2ydjbbs50dalqp2s107ckp63arpk223cigasq0hl395s8qc"; + sha256 = "1w6blhfr3rlmvjj0fbr8rsycrkm5b92n44zaaijg1jnvxjfqpy0v"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 63f11daad288..4b104a04c15d 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -60,7 +60,9 @@ in stdenv.mkDerivation rec { --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",' patchShebangs . # fixes /usr/bin/python references - ''; + substituteInPlace src/util/virjsoncompat.c --replace \ + '"libjansson.so.4"' '"${jansson}/lib/libjansson${stdenv.targetPlatform.extensions.sharedLibrary}"' + ''; configureFlags = [ "--localstatedir=/var" diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/development/libraries/libwps/default.nix index 2f89c0abdfc6..b0449d8205d1 100644 --- a/pkgs/development/libraries/libwps/default.nix +++ b/pkgs/development/libraries/libwps/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libwps-${version}"; - version = "0.4.9"; + version = "0.4.10"; src = fetchurl { url = "mirror://sourceforge/libwps/${name}.tar.bz2"; - sha256 = "1wn5lvx7c9dp98d9akqjhkv5fk94725hbvqzbjpy1v8y4mm9knb6"; + sha256 = "1adx2wawl0i16p8df80m6k6a137h709ip4zc0zlzr6wal8gpn0i4"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix index c4ff0e892a82..a9a649e2de76 100644 --- a/pkgs/development/libraries/linbox/default.nix +++ b/pkgs/development/libraries/linbox/default.nix @@ -4,7 +4,7 @@ , autoreconfHook , givaro , pkgconfig -, openblas +, blas , fflas-ffpack , gmpxx , optimize ? false # impure @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { buildInputs = [ givaro - openblas + blas gmpxx fflas-ffpack ]; configureFlags = [ - "--with-blas-libs=-lopenblas" + "--with-blas-libs=-l${blas.linkName}" "--disable-optimization" ] ++ stdenv.lib.optionals (!optimize) [ # disable SIMD instructions (which are enabled *when available* by default) @@ -65,12 +65,14 @@ stdenv.mkDerivation rec { doCheck = true; + enableParallelBuilding = true; + meta = { inherit version; description = "C++ library for exact, high-performance linear algebra"; license = stdenv.lib.licenses.lgpl21Plus; maintainers = [stdenv.lib.maintainers.timokau]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; homepage = http://linalg.org/; }; } diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix index 9955af046597..286be260052b 100644 --- a/pkgs/development/libraries/science/math/blas/default.nix +++ b/pkgs/development/libraries/science/math/blas/default.nix @@ -59,4 +59,10 @@ stdenv.mkDerivation rec { homepage = http://www.netlib.org/blas/; platforms = stdenv.lib.platforms.unix; }; + + # We use linkName to pass a different name to --with-blas-libs for + # fflas-ffpack and linbox, because we use blas on darwin but openblas + # elsewhere. + # See see https://github.com/NixOS/nixpkgs/pull/45013. + passthru.linkName = "blas"; } diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index e00a5ca9f8d9..18483f9e327c 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -143,4 +143,10 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ ttuegel ]; }; + + # We use linkName to pass a different name to --with-blas-libs for + # fflas-ffpack and linbox, because we use blas on darwin but openblas + # elsewhere. + # See see https://github.com/NixOS/nixpkgs/pull/45013. + passthru.linkName = "openblas"; } diff --git a/pkgs/development/python-modules/dominate/default.nix b/pkgs/development/python-modules/dominate/default.nix new file mode 100644 index 000000000000..86b3271990d5 --- /dev/null +++ b/pkgs/development/python-modules/dominate/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k }: + +buildPythonPackage rec { + pname = "dominate"; + version = "2.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0s9s9j9xmhkzw7apqx170fyvc0f800fd4a5jfn8xvj9k6vryd32b"; + }; + + doCheck = !isPy3k; + + meta = with lib; { + homepage = https://github.com/Knio/dominate/; + description = "Dominate is a Python library for creating and manipulating HTML documents using an elegant DOM API"; + license = licenses.lgpl3; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/flask-api/default.nix b/pkgs/development/python-modules/flask-api/default.nix new file mode 100644 index 000000000000..cee93a759200 --- /dev/null +++ b/pkgs/development/python-modules/flask-api/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchPypi, flask, markdown }: + +buildPythonPackage rec { + pname = "Flask-API"; + version = "1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0dffcy2hdkajbvl2wkz9dam49v05x9d87cf2mh2cyvza2c5ah47w"; + }; + + propagatedBuildInputs = [ flask markdown ]; + + meta = with lib; { + homepage = https://github.com/miracle2k/flask-assets; + description = "Browsable web APIs for Flask"; + license = licenses.bsd2; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/flask-bootstrap/default.nix b/pkgs/development/python-modules/flask-bootstrap/default.nix new file mode 100644 index 000000000000..7c12b79bb2f3 --- /dev/null +++ b/pkgs/development/python-modules/flask-bootstrap/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchPypi, flask, visitor, dominate }: + +buildPythonPackage rec { + pname = "Flask-Bootstrap"; + version = "3.3.7.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1j1s2bplaifsnmr8vfxa3czca4rz78xyhrg4chx39xl306afs26b"; + }; + + propagatedBuildInputs = [ flask visitor dominate ]; + + meta = with lib; { + homepage = https://github.com/mbr/flask-bootstrap; + description = "Ready-to-use Twitter-bootstrap for use in Flask."; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/flask-paginate/default.nix b/pkgs/development/python-modules/flask-paginate/default.nix new file mode 100644 index 000000000000..7af4aa2b8dd4 --- /dev/null +++ b/pkgs/development/python-modules/flask-paginate/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchPypi, flask }: + +buildPythonPackage rec { + pname = "flask-paginate"; + version = "0.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0pgk6ngqzh7lgq2nr6hraqp3z76f3f0kjhai50vxb6j1civ8v3mn"; + }; + + propagatedBuildInputs = [ flask ]; + + meta = with lib; { + homepage = https://github.com/lixxu/flask-paginate; + description = "Pagination support for Flask"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/visitor/default.nix b/pkgs/development/python-modules/visitor/default.nix new file mode 100644 index 000000000000..78dc29bbeb0e --- /dev/null +++ b/pkgs/development/python-modules/visitor/default.nix @@ -0,0 +1,18 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "visitor"; + version = "0.1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "02j87v93c50gz68gbgclmbqjcwcr7g7zgvk7c6y4x1mnn81pjwrc"; + }; + + meta = with lib; { + homepage = https://github.com/mbr/visitor; + description = "A tiny pythonic visitor implementation"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index a526cf8578ab..9bbab76d4a2f 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -273,6 +273,7 @@ let igraph = [ pkgs.gmp pkgs.libxml2.dev ]; JavaGD = [ pkgs.jdk ]; jpeg = [ pkgs.libjpeg.dev ]; + jqr = [ pkgs.jq.dev ]; KFKSDS = [ pkgs.gsl_1 ]; kza = [ pkgs.fftw.dev ]; libamtrack = [ pkgs.gsl_1 ]; @@ -413,6 +414,7 @@ let geoCount = [ pkgs.pkgconfig ]; gdtools = [ pkgs.pkgconfig ]; JuniperKernel = lib.optionals stdenv.isDarwin [ pkgs.darwin.binutils ]; + jqr = [ pkgs.jq.lib ]; kza = [ pkgs.pkgconfig ]; magick = [ pkgs.pkgconfig ]; mwaved = [ pkgs.pkgconfig ]; @@ -776,6 +778,12 @@ let ''; }); + jqr = old.jqr.overrideDerivation (attrs: { + preConfigure = '' + patchShebangs configure + ''; + }); + pbdZMQ = old.pbdZMQ.overrideDerivation (attrs: { postPatch = lib.optionalString stdenv.isDarwin '' for file in R/*.{r,r.in}; do diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix index 19609e15c765..7cf709066542 100644 --- a/pkgs/development/tools/backblaze-b2/default.nix +++ b/pkgs/development/tools/backblaze-b2/default.nix @@ -22,7 +22,7 @@ buildPythonApplication rec { postInstall = '' mv "$out/bin/b2" "$out/bin/backblaze-b2" - sed 's/^have b2 \&\&$/have backblaze-b2 \&\&/' -i contrib/bash_completion/b2 + sed 's/^have b2 \&\&$/_have backblaze-b2 \&\&/' -i contrib/bash_completion/b2 sed 's/^\(complete -F _b2\) b2/\1 backblaze-b2/' -i contrib/bash_completion/b2 mkdir -p "$out/etc/bash_completion.d" diff --git a/pkgs/development/tools/database/sqldeveloper/18.2.nix b/pkgs/development/tools/database/sqldeveloper/18.2.nix new file mode 100644 index 000000000000..adb22f45c8e1 --- /dev/null +++ b/pkgs/development/tools/database/sqldeveloper/18.2.nix @@ -0,0 +1,84 @@ +{ stdenv, makeDesktopItem, makeWrapper, requireFile, unzip, jdk }: + +let + version = "18.2.0.183.1748"; + + desktopItem = makeDesktopItem { + name = "sqldeveloper"; + exec = "sqldeveloper"; + icon = "sqldeveloper"; + desktopName = "Oracle SQL Developer 18"; + genericName = "Oracle SQL Developer 18"; + comment = "Oracle's Oracle DB GUI client"; + categories = "Application;Development;"; + }; +in + stdenv.mkDerivation rec { + + inherit version; + name = "sqldeveloper-${version}"; + + src = requireFile rec { + name = "sqldeveloper-${version}-no-jre.zip"; + url = "http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/"; + message = '' + This Nix expression requires that ${name} already be part of the store. To + obtain it you need to + + - navigate to ${url} + - make sure that it says "Version ${version}" above the list of downloads + - if it does not, click on the "Previous Version" link below the downloads + and repeat until the version is correct. This is necessarry because as the + time of this writing there exists no permanent link for the current version + yet. + Also consider updating this package yourself (you probably just need to + change the `version` variable and update the sha256 to the one of the + new file) or opening an issue at the nixpkgs repo. + - accept the license agreement + - download the file listed under "Other Platforms" + - sign in or create an oracle account if neccessary + + and then add the file to the Nix store using either: + + nix-store --add-fixed sha256 ${name} + + or + + nix-prefetch-url --type sha256 file:///path/to/${name} + ''; + sha256 = "0clz2w4ghqczy9sz6j4qqygk20whdwkca192pd3v0dw09875as0k"; + }; + + buildInputs = [ makeWrapper unzip ]; + + unpackCmd = "unzip $curSrc"; + + installPhase = '' + mkdir -p $out/libexec $out/share/{applications,pixmaps} + mv * $out/libexec/ + + mv $out/libexec/icon.png $out/share/pixmaps/sqldeveloper.png + cp ${desktopItem}/share/applications/* $out/share/applications + + makeWrapper $out/libexec/sqldeveloper/bin/sqldeveloper $out/bin/sqldeveloper \ + --set JAVA_HOME ${jdk.home} \ + --run "cd $out/libexec/sqldeveloper/bin" + ''; + + meta = with stdenv.lib; { + description = "Oracle's Oracle DB GUI client"; + longDescription = '' + Oracle SQL Developer is a free integrated development environment that + simplifies the development and management of Oracle Database in both + traditional and Cloud deployments. SQL Developer offers complete + end-to-end development of your PL/SQL applications, a worksheet for + running queries and scripts, a DBA console for managing the database, + a reports interface, a complete data modeling solution, and a migration + platform for moving your 3rd party databases to Oracle. + ''; + homepage = http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ ardumont flokli ma27 ]; + }; +} diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index b950ab0f10ff..45e8ba4f7c02 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -79,6 +79,6 @@ in homepage = http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/; license = licenses.unfree; platforms = [ "x86_64-linux" "x86_64-darwin" ]; - maintainers = [ maintainers.ardumont ]; + maintainers = with maintainers; [ ardumont flokli ]; }; } diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix index 7c32d7faa3c5..99c369fdce80 100644 --- a/pkgs/games/mnemosyne/default.nix +++ b/pkgs/games/mnemosyne/default.nix @@ -4,11 +4,11 @@ python.pkgs.buildPythonApplication rec { pname = "mnemosyne"; - version = "2.6"; + version = "2.6.1"; src = fetchurl { url = "mirror://sourceforge/project/mnemosyne-proj/mnemosyne/mnemosyne-${version}/Mnemosyne-${version}.tar.gz"; - sha256 = "0b7b5sk5bfbsg5cyybkv5xw9zw257v3khsn0lwlbxnlhakd0rsg4"; + sha256 = "0xcwikq51abrlqfn5bv7kcw1ccd3ip0w6cjd5vnnzwnaqwdj8cb3"; }; propagatedBuildInputs = with python.pkgs; [ diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix index f7c920abc48e..0410af974f61 100644 --- a/pkgs/misc/themes/adapta/default.nix +++ b/pkgs/misc/themes/adapta/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "adapta-gtk-theme-${version}"; - version = "3.94.0.1"; + version = "3.94.0.92"; src = fetchFromGitHub { owner = "adapta-project"; repo = "adapta-gtk-theme"; rev = version; - sha256 = "17hck0hzkdj1bibn9wi7cxca8r539idb916v2l71gz7ynhav006d"; + sha256 = "18gdsk07954wxsgr8i9kkpc8p6wvdr039lszz8hcplf2134bmb96"; }; preferLocalBuild = true; diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 28358a4a2ea1..5944dfc991de 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -192,11 +192,11 @@ self = rec { }; vim-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-nix-2018-07-01"; + name = "vim-nix-2018-08-19"; src = fetchgit { url = "https://github.com/LnL7/vim-nix"; - rev = "7d71026ba7c2d0a4bdb915e884c4ac8dbdc45bf0"; - sha256 = "084vs1p0qpkc4cx049v3mkyylj1n1yvd45i1sc9qafgp4x5va457"; + rev = "ab3c4d52d08e9e8d2a0919e38f98ba25a2b8ad18"; + sha256 = "1waan5vgba8qx3107hdrnmbnq5kr1n49q43p7m2g7wmj81v050yb"; }; dependencies = []; diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix index 7cc58c19c07d..d23ae7594be3 100644 --- a/pkgs/os-specific/linux/fuse/common.nix +++ b/pkgs/os-specific/linux/fuse/common.nix @@ -72,6 +72,7 @@ in stdenv.mkDerivation rec { inherit (src.meta) homepage; description = "Kernel module and library that allows filesystems to be implemented in user space"; platforms = platforms.linux; + license = with licenses; [ gpl2 lgpl21 ]; maintainers = [ maintainers.primeos ]; }; } diff --git a/pkgs/os-specific/linux/fxload/default.nix b/pkgs/os-specific/linux/fxload/default.nix index 8485b0e60328..61bd2a229ab6 100644 --- a/pkgs/os-specific/linux/fxload/default.nix +++ b/pkgs/os-specific/linux/fxload/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "fxload-2002_04_11"; - + src = fetchurl { url = mirror://sourceforge/linux-hotplug/fxload-2002_04_11.tar.gz; sha256 = "1hql93bp3dxrv1p67nc63xsbqwljyynm997ysldrc3n9ifi6s48m"; @@ -27,9 +27,10 @@ stdenv.mkDerivation { mkdir -p $out/share/usb ''; - meta = { + meta = with stdenv.lib; { homepage = http://linux-hotplug.sourceforge.net/?selected=usb; description = "Tool to upload firmware to Cypress EZ-USB microcontrollers"; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index 3430797666eb..557bc2f186f3 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -1,33 +1,45 @@ -{ stdenv, fetchurl -, sysfsutils, openssl -, libcap, opensp, docbook_sgml_dtd_31 -, libidn, nettle -, SGMLSpm, libgcrypt }: +{ stdenv, fetchFromGitHub, fetchpatch +, libxslt, docbook_xsl, docbook_xml_dtd_44 +, sysfsutils, openssl, libcap, libgcrypt, nettle, libidn2 +}: let - time = "20161105"; + time = "20180629"; in stdenv.mkDerivation rec { name = "iputils-${time}"; - src = fetchurl { - url = "https://github.com/iputils/iputils/archive/s${time}.tar.gz"; - sha256 = "12mdmh4qbf5610csaw3rkzhpzf6djndi4jsl4gyr8wni0cphj4zq"; + src = fetchFromGitHub { + owner = "iputils"; + repo = "iputils"; + rev = "s${time}"; + sha256 = "19rpl48pjgmyqlm4h7sml5gy7yg4cxciadxcs24q1zj40c05jls0"; }; + patches = [ + (fetchpatch { + name = "dont-hardcode-the-location-of-xsltproc.patch"; + url = "https://github.com/iputils/iputils/commit/d0ff83e87ea9064d9215a18e93076b85f0f9e828.patch"; + sha256 = "05wrwf0bfmax69bsgzh3b40n7rvyzw097j8z5ix0xsg0kciygjvx"; + }) + ]; + prePatch = '' - sed -e s/sgmlspl/sgmlspl.pl/ \ - -e s/nsgmls/onsgmls/ \ - -i doc/Makefile + substituteInPlace doc/custom-man.xsl \ + --replace "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl" "${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl" + for xmlFile in doc/*.xml; do + substituteInPlace $xmlFile \ + --replace "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" "${docbook_xml_dtd_44}/xml/dtd/docbook/docbookx.dtd" + done ''; # Disable idn usage w/musl: https://github.com/iputils/iputils/pull/111 makeFlags = [ "USE_GNUTLS=no" ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "USE_IDN=no"; - depsBuildBuild = [ opensp SGMLSpm docbook_sgml_dtd_31 ]; + nativeBuildInputs = [ libxslt.bin ]; buildInputs = [ sysfsutils openssl libcap libgcrypt nettle - ] ++ stdenv.lib.optional (!stdenv.hostPlatform.isMusl) libidn; + ] ++ stdenv.lib.optional (!stdenv.hostPlatform.isMusl) libidn2; # ninfod probably could build on cross, but the Makefile doesn't pass --host etc to the sub configure... buildFlags = "man all" + stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) " ninfod"; @@ -35,21 +47,23 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp -p ping tracepath clockdiff arping rdisc rarpd $out/bin/ + cp -p arping clockdiff ping rarpd rdisc tftpd tracepath traceroute6 $out/bin/ if [ -x ninfod/ninfod ]; then cp -p ninfod/ninfod $out/bin fi mkdir -p $out/share/man/man8 + cd doc cp -p \ - doc/clockdiff.8 doc/arping.8 doc/ping.8 doc/rdisc.8 doc/rarpd.8 doc/tracepath.8 doc/ninfod.8 \ + arping.8 clockdiff.8 ninfod.8 pg3.8 ping.8 rarpd.8 rdisc.8 tftpd.8 tracepath.8 traceroute6.8 \ $out/share/man/man8 ''; meta = with stdenv.lib; { homepage = https://github.com/iputils/iputils; description = "A set of small useful utilities for Linux networking"; + license = with licenses; [ gpl2Plus bsd3 ]; # TODO: AS-IS, SUN MICROSYSTEMS license platforms = platforms.linux; - maintainers = with maintainers; [ lheckemann ]; + maintainers = with maintainers; [ primeos lheckemann ]; }; } diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix index 1eec10860f72..c7b71d4e5018 100644 --- a/pkgs/os-specific/linux/psmisc/default.nix +++ b/pkgs/os-specific/linux/psmisc/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, ncurses}: stdenv.mkDerivation rec { - name = "psmisc-23.1"; + name = "psmisc-23.2"; src = fetchurl { url = "mirror://sourceforge/psmisc/${name}.tar.xz"; - sha256 = "0c5s94hqpwfmyswx2f96gifa6wdbpxxpkyxcrlzbxpvmrxsd911f"; + sha256 = "0s1kjhrik0wzqbm7hv4gkhywhjrwhp9ajw0ad05fwharikk6ah49"; }; buildInputs = [ncurses]; diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 2bdd758b9802..77d8e8fb17d5 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in # Note: ATM only the libraries have been tested in nixpkgs. stdenv.mkDerivation rec { name = "knot-dns-${version}"; - version = "2.6.8"; + version = "2.7.1"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "0daee8efd6262f10c54ee6f5fb99ca4d0f72e275513ec0902032af594cac1b15"; + sha256 = "7d6ae20ada0f0ee7700d5df17f47f86b49eb21ee34977d0d70de6a0947371381"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index fbca2951766f..b859645b111f 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -12,11 +12,11 @@ inherit (stdenv.lib) optional concatStringsSep; unwrapped = stdenv.mkDerivation rec { name = "knot-resolver-${version}"; - version = "2.4.1"; + version = "3.0.0"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; - sha256 = "e8044316cd897ad29b3c5284de06652e1568c4d5861e3147ec2191fbacd8d9ff"; + sha256 = "68a0137e0e15061ee7dec53a2e424aa3266611720db3843853c6e7774a414f40"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/hydron/default.nix b/pkgs/servers/hydron/default.nix index 400f15565ef2..03fdf7908cc4 100644 --- a/pkgs/servers/hydron/default.nix +++ b/pkgs/servers/hydron/default.nix @@ -3,15 +3,15 @@ buildGoPackage rec { name = "hydron-unstable-${version}"; - version = "2018-08-15"; + version = "2018-08-18"; goPackagePath = "github.com/bakape/hydron"; goDeps = ./deps.nix; src = fetchFromGitHub { owner = "bakape"; repo = "hydron"; - rev = "4c219dc016f18e11a50e52485cbeb28135921386"; - sha256 = "0xj705wdyajzli66p0cxvl47gx6z7nx9cbzm7lbbqn51qxw71p64"; + rev = "78257f1c1f34cdad1931531601163071f7f29aa9"; + sha256 = "0rpvbayx48xncy70vzbxn3cs0lslza0i3hxmywlngyl17da97bf0"; }; enableParallelBuilding = true; diff --git a/pkgs/servers/hydron/deps.nix b/pkgs/servers/hydron/deps.nix index 9b0890d36f40..c5d584f1bcd3 100644 --- a/pkgs/servers/hydron/deps.nix +++ b/pkgs/servers/hydron/deps.nix @@ -104,8 +104,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "c39426892332e1bb5ec0a434a079bf82f5d30c54"; - sha256 = "1w26avkg623xilnwnad0cq6768cfbs4mxk875382xh0da6ai50s3"; + rev = "aaf60122140d3fcf75376d319f0554393160eb50"; + sha256 = "03i6ij7jcf5mp9dc8ps8b63g1k843z7c823qyzn5a276gpxvxlvv"; }; } ] diff --git a/pkgs/servers/sql/pgbouncer/default.nix b/pkgs/servers/sql/pgbouncer/default.nix index 7906546ec1ca..ef8b77ad1176 100644 --- a/pkgs/servers/sql/pgbouncer/default.nix +++ b/pkgs/servers/sql/pgbouncer/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pgbouncer-${version}"; - version = "1.8.1"; + version = "1.9.0"; src = fetchurl { url = "https://pgbouncer.github.io/downloads/files/${version}/${name}.tar.gz"; - sha256 = "1j4d7rkivg3vg27pvirigq9cy4v7pi48x7w57baq131c5lmdx2zs"; + sha256 = "012zh9l68r1ramrd66yam6y3al0i85dvvg4wwwkn6qwq6dhskv1r"; }; buildInputs = [ libevent openssl ]; diff --git a/pkgs/servers/sql/postgresql/pgroonga/default.nix b/pkgs/servers/sql/postgresql/pgroonga/default.nix index c8ef00b279e0..f4c7bfb1b85f 100644 --- a/pkgs/servers/sql/postgresql/pgroonga/default.nix +++ b/pkgs/servers/sql/postgresql/pgroonga/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pgroonga-${version}"; - version = "2.0.6"; + version = "2.0.9"; src = fetchurl { url = "https://packages.groonga.org/source/pgroonga/${name}.tar.gz"; - sha256 = "1hfmz3d0xwhsa4vw8i08s15i7pfd0h0smi2rv663x3cjjjn40i68"; + sha256 = "0dfkhl2im4cn2lczbsvb8zyylrzlm0vqk9ixjsalcaqxgxph2dpz"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/web-apps/frab/default.nix b/pkgs/servers/web-apps/frab/default.nix index 8ee6afaa8499..657bd423f3f4 100644 --- a/pkgs/servers/web-apps/frab/default.nix +++ b/pkgs/servers/web-apps/frab/default.nix @@ -43,4 +43,10 @@ stdenv.mkDerivation rec { passthru = { inherit env ruby; }; + + meta = with stdenv.lib; { + description = "Web-based conference planning and management system"; + homepage = https://github.com/frab/frab; + license = licenses.mit; + }; } diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index 1d0d499db03c..11671aba633d 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -30,7 +30,7 @@ let dontPatchShebangs = false; propagatedBuildInputs = with py.pkgs; [ - pycrypto paramiko jinja2 pyyaml httplib2 boto six netaddr dnspython + pycrypto paramiko jinja2 pyyaml httplib2 boto six netaddr dnspython jmespath ] ++ stdenv.lib.optional windowsSupport pywinrm; meta = with stdenv.lib; { diff --git a/pkgs/tools/admin/cli53/default.nix b/pkgs/tools/admin/cli53/default.nix index e70a7ba9b50c..6fe568966e9f 100644 --- a/pkgs/tools/admin/cli53/default.nix +++ b/pkgs/tools/admin/cli53/default.nix @@ -1,30 +1,20 @@ -{ lib, python2, fetchurl }: +# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: -python2.pkgs.buildPythonApplication rec { +buildGoPackage rec { name = "cli53-${version}"; - version = "0.4.4"; + version = "0.8.12"; - src = fetchurl { - url = "mirror://pypi/c/cli53/${name}.tar.gz"; - sha256 = "0s9jzigq6a16m2c3qklssx2lz16cf13g5zh80vh24kxazaxqzbig"; - }; - - postPatch = '' - substituteInPlace setup.py --replace "'argparse', " "" - ''; + goPackagePath = "github.com/barnybug/cli53"; - checkPhase = '' - ${python2.interpreter} -m unittest discover -s tests - ''; - - # Tests do not function - doCheck = false; + src = fetchFromGitHub { + owner = "barnybug"; + repo = "cli53"; + rev = "2624c7c4b38a33cdbd166dad1d3e512830f453e4"; + sha256 = "0bhczmzrgf7ypnhhzdrgnvg8cw8ch1x1d0cgajc5kklq9ixv9ygi"; + }; - propagatedBuildInputs = with python2.pkgs; [ - argparse - boto - dnspython - ]; + goDeps = ./deps.nix; meta = with lib; { description = "CLI tool for the Amazon Route 53 DNS service"; diff --git a/pkgs/tools/admin/cli53/deps.nix b/pkgs/tools/admin/cli53/deps.nix index 0cb0360e499d..4742bc00851b 100644 --- a/pkgs/tools/admin/cli53/deps.nix +++ b/pkgs/tools/admin/cli53/deps.nix @@ -1,3 +1,93 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.0 +# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev [ + { + goPackagePath = "github.com/aws/aws-sdk-go"; + fetch = { + type = "git"; + url = "https://github.com/aws/aws-sdk-go"; + rev = "3e7014382cdc91695381614d0110a3cff997ba72"; + sha256 = "1xnjhmb31k63k13aiiiispc7vkgnlxkbihslwwfsjc7b86vrllm5"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "346938d642f2ec3594ed81d874461961cd0faa76"; + sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; + }; + } + { + goPackagePath = "github.com/go-ini/ini"; + fetch = { + type = "git"; + url = "https://github.com/go-ini/ini"; + rev = "20b96f641a5ea98f2f8619ff4f3e061cff4833bd"; + sha256 = "0mp18hlhnazg3sd02fhv88kbbipmhcrkb6n8imq8gk2dvmxk64ch"; + }; + } + { + goPackagePath = "github.com/gucumber/gucumber"; + fetch = { + type = "git"; + url = "https://github.com/gucumber/gucumber"; + rev = "71608e2f6e76fd4da5b09a376aeec7a5c0b5edbc"; + sha256 = "1h1d9j515v1nyqsyb73v4ahlvm9n6z7hgl2ld8dryr4sw8q7ybw3"; + }; + } + { + goPackagePath = "github.com/jmespath/go-jmespath"; + fetch = { + type = "git"; + url = "https://github.com/jmespath/go-jmespath"; + rev = "0b12d6b5"; + sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "e4205768578dc90c2669e75a2f8a8bf77e3083a4"; + sha256 = "0247qcc9i41wrm73ivqs2wvy3vi3nb44m3nh27lnhd4a0ilir6wv"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "792786c7400a136282c1664665ae0a8db921c6c2"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/shiena/ansicolor"; + fetch = { + type = "git"; + url = "https://github.com/shiena/ansicolor"; + rev = "a422bbe96644373c5753384a59d678f7d261ff10"; + sha256 = "1dcn8a9z6a5dxa2m3fkppnajcls8lanbl38qggkf646yi5qsk1hc"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "12b6f73e6084dad08a7c6e575284b177ecafbc71"; + sha256 = "01f80s0q64pw5drfgqwwk1wfwwkvd2lhbs56lhhkff4ni83k73fd"; + }; + } + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "cfb38830724cc34fedffe9a2a29fb54fa9169cd1"; + sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; + }; + } ] diff --git a/pkgs/tools/filesystems/fusesmb/default.nix b/pkgs/tools/filesystems/fusesmb/default.nix index 5a3451810a12..286403c70c4b 100644 --- a/pkgs/tools/filesystems/fusesmb/default.nix +++ b/pkgs/tools/filesystems/fusesmb/default.nix @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = { + meta = with stdenv.lib; { description = "Samba mounted via FUSE"; - homepage = http://www.ricardis.tudelft.nl/~vincent/fusesmb/; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/peruse/default.nix b/pkgs/tools/misc/peruse/default.nix index 69b60ae0997e..045c004fb6ac 100644 --- a/pkgs/tools/misc/peruse/default.nix +++ b/pkgs/tools/misc/peruse/default.nix @@ -6,7 +6,7 @@ let pname = "peruse"; - version = "1.2.20180219"; + version = "1.2.20180816"; in mkDerivation rec { name = "${pname}-${version}"; @@ -15,8 +15,8 @@ in mkDerivation rec { src = fetchFromGitHub { owner = "KDE"; repo = pname; - rev = "4125d3149c45d196600258686610de701130113d"; - sha256 = "1x8in7z17gzgiibshw7xfs6m6bhr3n5fys3nlpab77nm0dl3f4r5"; + rev = "f50027c6c9c680c4e2ce1dba4ec43364e661e7a3"; + sha256 = "1217fa6w9ryh499agcc67mnp8k9dah4r0sw74qzsbk4p154jbgch"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix index 2b19c8e6a057..adcb59135ee1 100644 --- a/pkgs/tools/networking/fping/default.nix +++ b/pkgs/tools/networking/fping/default.nix @@ -10,10 +10,11 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-ipv6" "--enable-ipv4" ]; - meta = { + meta = with stdenv.lib; { homepage = http://fping.org/; description = "Send ICMP echo probes to network hosts"; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; - platforms = with stdenv.lib.platforms; all; + maintainers = with maintainers; [ the-kenny ]; + license = licenses.bsd0; + platforms = platforms.all; }; } diff --git a/pkgs/tools/text/discount/default.nix b/pkgs/tools/text/discount/default.nix index 81b88ff8d835..75e380a6b661 100644 --- a/pkgs/tools/text/discount/default.nix +++ b/pkgs/tools/text/discount/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - version = "2.2.3a"; + version = "2.2.4"; name = "discount-${version}"; src = fetchurl { url = "http://www.pell.portland.or.us/~orc/Code/discount/discount-${version}.tar.bz2"; - sha256 = "0m09x9dd75d3pqvmrwr0kqw3dm2x3ss9clj5fxf7lq79lbyxbxbm"; + sha256 = "199hwajpspqil0a4y3yxsmhdp2dm73gqkzfk4mrwzsmlq8y1xzbl"; }; patches = ./fix-configure-path.patch; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ccc60c9cd303..1c2322d5f844 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7169,6 +7169,13 @@ with pkgs; sqldeveloper = callPackage ../development/tools/database/sqldeveloper { }; + # sqldeveloper_18 needs JavaFX, which currently only is available inside the + # (non-free and net yet packaged for Darwin) OracleJDK + # we might be able to get rid of it, as soon as we have an OpenJDK with OpenJFX included + sqldeveloper_18 = callPackage ../development/tools/database/sqldeveloper/18.2.nix { + jdk = oraclejdk; + }; + squeak = callPackage ../development/compilers/squeak { }; squirrel-sql = callPackage ../development/tools/database/squirrel-sql { @@ -9195,9 +9202,19 @@ with pkgs; ffcast = callPackage ../tools/X11/ffcast { }; - fflas-ffpack = callPackage ../development/libraries/fflas-ffpack {}; + fflas-ffpack = callPackage ../development/libraries/fflas-ffpack { + # We need to use blas instead of openblas on darwin, + # see https://github.com/NixOS/nixpkgs/pull/45013. + blas = if stdenv.isDarwin then blas else openblas; + }; + fflas-ffpack_1 = callPackage ../development/libraries/fflas-ffpack/1.nix {}; - linbox = callPackage ../development/libraries/linbox {}; + linbox = callPackage ../development/libraries/linbox { + # We need to use blas instead of openblas on darwin, see + # https://github.com/NixOS/nixpkgs/pull/45013 and + # https://github.com/NixOS/nixpkgs/pull/45015. + blas = if stdenv.isDarwin then blas else openblas; + }; ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; @@ -13741,9 +13758,7 @@ with pkgs; iproute = callPackage ../os-specific/linux/iproute { }; - iputils = callPackage ../os-specific/linux/iputils { - inherit (buildPackages.buildPackages.perlPackages) SGMLSpm; - }; + iputils = callPackage ../os-specific/linux/iputils { }; iptables = callPackage ../os-specific/linux/iptables { }; @@ -16151,6 +16166,8 @@ with pkgs; fetchmail = callPackage ../applications/misc/fetchmail { }; + fig2dev = callPackage ../applications/graphics/fig2dev { }; + flacon = callPackage ../applications/audio/flacon { }; flexget = callPackage ../applications/networking/flexget { }; @@ -16999,7 +17016,7 @@ with pkgs; recurseIntoAttrs (makeOverridable mkApplications attrs); inherit (kdeApplications) - akonadi akregator ark dolphin ffmpegthumbs filelight gwenview k3b + akonadi akregator ark dolphin dragon ffmpegthumbs filelight gwenview k3b kaddressbook kate kcachegrind kcalc kcolorchooser kcontacts kdenlive kdf kdialog keditbookmarks kget kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole kontact korganizer krdc krfb ksystemlog kwalletmanager marble minuet okular spectacle; @@ -20539,6 +20556,8 @@ with pkgs; star = callPackage ../applications/science/biology/star { }; + strelka = callPackage ../applications/science/biology/strelka { }; + varscan = callPackage ../applications/science/biology/varscan { }; hmmer = callPackage ../applications/science/biology/hmmer { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 94881cf2ff37..19f09ee99b9b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16147,7 +16147,7 @@ let install_name_tool -change "$oldPath" "$newPath" "$out/bin/biblex" install_name_tool -change "$oldPath" "$newPath" "$out/bin/bibparse" install_name_tool -change "$oldPath" "$newPath" "$out/bin/dumpnames" - install_name_tool -change "$oldPath" "$newPath" "$out/lib/perl5/site_perl/5.24.4/darwin-2level/auto/Text/BibTeX/BibTeX.bundle" + install_name_tool -change "$oldPath" "$newPath" "$out/lib/perl5/site_perl/${perl.version}/darwin-2level/auto/Text/BibTeX/BibTeX.bundle" ''; meta = { description = "Interface to read and parse BibTeX files"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ebbcccd6f3d8..92dd3b5cee42 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -254,6 +254,8 @@ in { docrep = callPackage ../development/python-modules/docrep { }; + dominate = callPackage ../development/python-modules/dominate { }; + emcee = callPackage ../development/python-modules/emcee { }; email_validator = callPackage ../development/python-modules/email-validator { }; @@ -5363,12 +5365,16 @@ in { flask = callPackage ../development/python-modules/flask { }; + flask-api = callPackage ../development/python-modules/flask-api { }; + flask_assets = callPackage ../development/python-modules/flask-assets { }; flask-autoindex = callPackage ../development/python-modules/flask-autoindex { }; flask-babel = callPackage ../development/python-modules/flask-babel { }; + flask-bootstrap = callPackage ../development/python-modules/flask-bootstrap { }; + flask-caching = callPackage ../development/python-modules/flask-caching { }; flask-common = callPackage ../development/python-modules/flask-common { }; @@ -5393,6 +5399,8 @@ in { flask_oauthlib = callPackage ../development/python-modules/flask-oauthlib { }; + flask-paginate = callPackage ../development/python-modules/flask-paginate { }; + flask_principal = callPackage ../development/python-modules/flask-principal { }; flask-pymongo = callPackage ../development/python-modules/Flask-PyMongo { }; @@ -17288,6 +17296,8 @@ EOF vine = callPackage ../development/python-modules/vine { }; + visitor = callPackage ../development/python-modules/visitor { }; + whitenoise = callPackage ../development/python-modules/whitenoise { }; XlsxWriter = callPackage ../development/python-modules/XlsxWriter { }; |