diff options
Diffstat (limited to 'pkgs/applications')
21 files changed, 136 insertions, 52 deletions
diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 45006fb8ef62..3e89101e0420 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.32.4"; + version = "3.32.5"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "16b3dkxland4mjzjs2rz5gbqjapzzmap4d1mfhbrj2ch3plmdy7g"; + sha256 = "0vs8x26zcakk6c31sc774h2lcdw3syp236vyymmx1jnfsh1jaqpn"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index 87f5f94bb30b..d35cefb88416 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, boost, mpd_clientlib, ncurses, pkgconfig, readline , libiconv, icu, curl -, outputsSupport ? false # outputs screen +, outputsSupport ? true # outputs screen , visualizerSupport ? false, fftw ? null # visualizer screen -, clockSupport ? false # clock screen +, clockSupport ? true # clock screen , taglibSupport ? true, taglib ? null # tag editor }: diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 4f268a3a104e..4a48cde571ae 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d +{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d, libXcursor , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux , alsaLib, cairo, acl, gpm, cf-private, AppKit, GSS, ImageIO, m17n_lib, libotf @@ -118,6 +118,17 @@ stdenv.mkDerivation rec { mv nextstep/Emacs.app $out/Applications ''; + postFixup = + let libPath = lib.makeLibraryPath [ + libXcursor + ]; + in lib.optionalString (withX && toolkit == "lucid") '' + patchelf --set-rpath \ + "$(patchelf --print-rpath "$out/bin/emacs"):${libPath}" \ + "$out/bin/emacs" + patchelf --add-needed "libXcursor.so.1" "$out/bin/emacs" + ''; + meta = with stdenv.lib; { description = "The extensible, customizable GNU text editor"; homepage = https://www.gnu.org/software/emacs/; diff --git a/pkgs/applications/editors/kdevelop5/kdev-php.nix b/pkgs/applications/editors/kdevelop5/kdev-php.nix new file mode 100644 index 000000000000..532bb99e7d8e --- /dev/null +++ b/pkgs/applications/editors/kdevelop5/kdev-php.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, fetchurl, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, kdevelop-pg-qt }: + +let + pname = "kdev-php"; + version = "5.3.1"; +in +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; + sha256 = "1xiz4v6w30dsa7l4nk3jw3hxpkx71b0yaaj2k8s7xzgjif824bgl"; + }; + + cmakeFlags = [ + "-DBUILD_TESTING=OFF" + ]; + + nativeBuildInputs = [ cmake extra-cmake-modules ]; + buildInputs = [ kdevelop-pg-qt threadweaver ktexteditor kdevelop-unwrapped ]; + + meta = with lib; { + maintainers = [ maintainers.aanderse ]; + platforms = platforms.linux; + description = "PHP support for KDevelop"; + homepage = https://www.kdevelop.org; + license = [ licenses.gpl2 ]; + }; +} diff --git a/pkgs/applications/editors/kdevelop5/kdev-python.nix b/pkgs/applications/editors/kdevelop5/kdev-python.nix new file mode 100644 index 000000000000..be27e10f42a1 --- /dev/null +++ b/pkgs/applications/editors/kdevelop5/kdev-python.nix @@ -0,0 +1,30 @@ +{ stdenv, lib, fetchurl, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, python }: + +let + pname = "kdev-python"; + version = "5.3.1"; +in +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; + sha256 = "11hf8n6vrlaz31c0p3xbnf0df2q5j6ykgc9ip0l5g33kadwn5b9j"; + }; + + cmakeFlags = [ + "-DBUILD_TESTING=OFF" + "-DPYTHON_EXECUTABLE=${python}/bin/python" + ]; + + nativeBuildInputs = [ cmake extra-cmake-modules ]; + buildInputs = [ threadweaver ktexteditor kdevelop-unwrapped ]; + + meta = with lib; { + maintainers = [ maintainers.aanderse ]; + platforms = platforms.linux; + description = "Python support for KDevelop"; + homepage = https://www.kdevelop.org; + license = [ licenses.gpl2 ]; + }; +} diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix index a35bd14f310c..98154b4a5eb5 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -43,6 +43,13 @@ mkDerivation rec { "-DCLANG_BUILTIN_DIR=${llvmPackages.clang-unwrapped}/lib/clang/${(builtins.parseDrvName llvmPackages.clang.name).version}/include" ]; + postPatch = '' + # FIXME: temporary until https://invent.kde.org/kde/kdevelop/merge_requests/8 is merged + substituteInPlace kdevplatform/language/backgroundparser/parsejob.cpp --replace \ + 'if (internalFilePath.startsWith(dataPath.canonicalPath() + QStringLiteral("/kdev"))) {' \ + 'if (internalFilePath.startsWith(dataPath.canonicalPath() + QStringLiteral("/kdev")) || localFile.startsWith(path + QStringLiteral("/kdev"))) {' + ''; + postInstall = '' # The kdevelop! script (shell environment) needs qdbus and kioclient5 in PATH. wrapProgram "$out/bin/kdevelop!" \ diff --git a/pkgs/applications/editors/kdevelop5/wrapper.nix b/pkgs/applications/editors/kdevelop5/wrapper.nix new file mode 100644 index 000000000000..86d3de9eb39a --- /dev/null +++ b/pkgs/applications/editors/kdevelop5/wrapper.nix @@ -0,0 +1,7 @@ +{ symlinkJoin, kdevelop-unwrapped, plugins ? null }: + +symlinkJoin { + name = "kdevelop-with-plugins"; + + paths = [ kdevelop-unwrapped ] ++ (if plugins != null then plugins else []); +} diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 44855d5c8b49..bce2e8826983 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -28,6 +28,9 @@ stdenv.mkDerivation rec { qmakeFlags = [ "VERSION=${version}" ]; + # src/lexer.l:36:10: fatal error: parser.hxx: No such file or directory + enableParallelBuilding = false; # true by default due to qmake + doCheck = false; meta = { diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 9839bb740778..cf13c6fb05e9 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -6,7 +6,7 @@ stdenv, fetchFromGitHub, cmake, makeWrapper stdenv.mkDerivation rec { name = "paraview-${version}"; - version = "5.5.2"; + version = "5.6.0"; # fetching from GitHub instead of taking an "official" source # tarball because of missing submodules there @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "Kitware"; repo = "ParaView"; rev = "v${version}"; - sha256 = "1jivph7lppnflmjsiirhgv0mnh8mxx41i1vzkk78ynn00rzacx3j"; + sha256 = "1j13yfdgcv4yzfr449i4c8r4rs1c9zr6qd3igr4vv3ani8zixkzi"; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 89bd8ee4b3e0..353cf620ee74 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -1,10 +1,10 @@ -{ stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew +{ config, stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew , ilmbase, libXi, libX11, libXext, libXrender , libjpeg, libpng, libsamplerate, libsndfile , libtiff, libGLU_combined, openal, opencolorio, openexr, openimageio, openjpeg_1, pythonPackages , zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd , jackaudioSupport ? false, libjack2 -, cudaSupport ? false, cudatoolkit +, cudaSupport ? config.cudaSupport or false, cudatoolkit , colladaSupport ? true, opencollada , enableNumpy ? false, makeWrapper }: diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index c6f83104fb13..5f252d97d867 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -14,13 +14,13 @@ in python3Packages.buildPythonApplication rec { pname = "electrum"; - version = "3.3.2"; + version = "3.3.4"; src = fetchFromGitHub { owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "1jsn02azdydpq4plr2552s7ijyqgw6zqm2zx8skwsalgbwmhx12i"; + sha256 = "0yxdpc602jnd14xz3px85ka0b6db98zwbgfi9a3vj8p1k3mmiwaj"; }; propagatedBuildInputs = with python3Packages; [ @@ -53,9 +53,6 @@ python3Packages.buildPythonApplication rec { preBuild = '' sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py - pyrcc5 icons.qrc -o electrum/gui/qt/icons_rc.py - # Recording the creation timestamps introduces indeterminism to the build - sed -i '/Created: .*/d' electrum/gui/qt/icons_rc.py sed -i "s|name = 'libzbar.*'|name='${zbar}/lib/libzbar.so'|" electrum/qrscanner.py substituteInPlace ./electrum/ecc_fast.py --replace libsecp256k1.so.0 ${secp256k1}/lib/libsecp256k1.so.0 ''; diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix index 0fb2cec29161..6878bc5ab03e 100644 --- a/pkgs/applications/misc/xmr-stak/default.nix +++ b/pkgs/applications/misc/xmr-stak/default.nix @@ -12,13 +12,13 @@ in stdenv'.mkDerivation rec { name = "xmr-stak-${version}"; - version = "2.7.1"; + version = "2.8.2"; src = fetchFromGitHub { owner = "fireice-uk"; repo = "xmr-stak"; rev = "${version}"; - sha256 = "1mlli8sx1f3922ygnwakmi2h3swccz62njxbzxfzbi4hlmvsaz0y"; + sha256 = "0z0fdh5fmiisx5dgfyyin3ddl8g28fpd64gn8nl8dd6sf3iw8z7p"; }; NIX_CFLAGS_COMPILE = "-O3"; diff --git a/pkgs/applications/networking/cluster/minishift/default.nix b/pkgs/applications/networking/cluster/minishift/default.nix index de11a116533b..bb10349470f6 100644 --- a/pkgs/applications/networking/cluster/minishift/default.nix +++ b/pkgs/applications/networking/cluster/minishift/default.nix @@ -4,7 +4,7 @@ }: let - version = "1.30.0"; + version = "1.31.0"; # Update these on version bumps according to Makefile centOsIsoVersion = "v1.14.0"; @@ -18,7 +18,7 @@ in buildGoPackage rec { owner = "minishift"; repo = "minishift"; rev = "v${version}"; - sha256 = "0p7g7r4m3brssy2znw7pd60aph6m6absqy23x88c07n5n4mv9wj8"; + sha256 = "0v5hngfz393yi3x4c328g5bjazw02jr59ljqh6ws0j6wzxzm8jxf"; }; nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ]; @@ -28,9 +28,6 @@ in buildGoPackage rec { subPackages = [ "cmd/minishift" ]; postPatch = '' - substituteInPlace vendor/github.com/containers/image/storage/storage_image.go \ - --replace 'nil, diff' 'diff' - # minishift downloads openshift if not found therefore set the cache to /nix/store/... substituteInPlace pkg/minishift/cache/oc_caching.go \ --replace 'filepath.Join(oc.MinishiftCacheDir, OC_CACHE_DIR, oc.OpenShiftVersion, runtime.GOOS)' '"${openshift}/bin"' \ diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 106be4fddc4c..2fff46a17373 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -12,7 +12,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "0.28.1"; + version = "0.28.2"; name = "notmuch-${version}"; passthru = { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "0mcsfkrp6mpy374m5rwwgm9md8qzvwa3s4rbzid4cnkx2cwfj4fi"; + sha256 = "0cg9ff7h7mklgbqqknxigxxx1j3p3s2a9cxvrs5ih7j56f04k9l5"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index 794430ebbe84..234b74749977 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -1,17 +1,20 @@ -{ fetchurl, stdenv, ocamlPackages }: +{ fetchurl, stdenv, which, dune, ocamlPackages }: stdenv.mkDerivation rec { name = "alt-ergo-${version}"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { url = "https://alt-ergo.ocamlpro.com/download_manager.php?target=${name}.tar.gz"; name = "${name}.tar.gz"; - sha256 = "106zfgisq6qxr7dlk8z7gi68ly7qff4frn8wab2g8z2nkkwla92w"; + sha256 = "1ycr3ff0gacq1aqzs16n6swgfniwpim0m7rvhcam64kj0a80c6bz"; }; - buildInputs = with ocamlPackages; - [ ocaml findlib camlzip ocamlgraph zarith lablgtk ocplib-simplex psmt2-frontend menhir num ]; + buildInputs = [ dune which ] ++ (with ocamlPackages; [ + ocaml findlib camlzip lablgtk menhir num ocplib-simplex psmt2-frontend seq zarith + ]); + + preConfigure = "patchShebangs ./configure"; meta = { description = "High-performance theorem prover and SMT solver"; diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index 4e8829f7e31c..9ee56041ed38 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, runCommand +{ config, stdenv, lib, runCommand , fetchFromGitHub , fetchurl , cmake @@ -13,8 +13,8 @@ , Accelerate, CoreGraphics, CoreVideo , lmdbSupport ? true, lmdb , leveldbSupport ? true, leveldb, snappy -, cudaSupport ? stdenv.isLinux, cudatoolkit -, cudnnSupport ? false, cudnn ? null +, cudaSupport ? config.cudaSupport or false, cudatoolkit +, cudnnSupport ? cudaSupport, cudnn ? null , ncclSupport ? false, nccl ? null , pythonSupport ? false, python ? null, numpy ? null , substituteAll diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix index fe5c77be8b22..4bf922c4e169 100644 --- a/pkgs/applications/science/math/cntk/default.nix +++ b/pkgs/applications/science/math/cntk/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchgit, fetchFromGitHub, cmake +{ config, lib, stdenv, fetchgit, fetchFromGitHub, cmake , openblas, opencv3, libzip, boost, protobuf, openmpi , onebitSGDSupport ? false -, cudaSupport ? false, cudatoolkit, nvidia_x11 -, cudnnSupport ? false, cudnn +, cudaSupport ? config.cudaSupport or false, cudatoolkit, nvidia_x11 +, cudnnSupport ? cudaSupport, cudnn }: assert cudnnSupport -> cudaSupport; diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index 990d3f1a5d59..061f48bb3d93 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -1,7 +1,7 @@ -{ stdenv, lib, fetchurl, bash, cmake +{ config, stdenv, lib, fetchurl, bash, cmake , opencv, gtest, openblas, liblapack, perl -, cudaSupport ? false, cudatoolkit, nvidia_x11 -, cudnnSupport ? false, cudnn +, cudaSupport ? config.cudaSupport or false, cudatoolkit, nvidia_x11 +, cudnnSupport ? cudaSupport, cudnn }: assert cudnnSupport -> cudaSupport; diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index b5a5a9feb76b..3298bc167517 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,32 +1,32 @@ { "ce": { - "version": "11.7.4", - "repo_hash": "0qq9snykdlpkpbznwpkv0n7bz1rsgz4z7lcjl4xkjxkf2gkf8pxp", - "deb_hash": "1j76jya0ydyg7v3vcdfjmcr5ir23yzdwmg9fxlirvgh74py7q85c", - "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.7.4-ce.0_amd64.deb/download.deb", + "version": "11.7.5", + "repo_hash": "0bbyx9zmscf9273fgypb82gw166psy7d3p7dnwb6f5r9yz7rmhbn", + "deb_hash": "1m6hdvrz467q33z626l9f3d5pssl0bbj2hkqy5g0b05wvdznmldy", + "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.7.5-ce.0_amd64.deb/download.deb", "owner": "gitlab-org", "repo": "gitlab-ce", - "rev": "v11.7.4", + "rev": "v11.7.5", "passthru": { "GITALY_SERVER_VERSION": "1.12.2", "GITLAB_PAGES_VERSION": "1.3.1", "GITLAB_SHELL_VERSION": "8.4.4", - "GITLAB_WORKHORSE_VERSION": "8.0.1" + "GITLAB_WORKHORSE_VERSION": "8.0.2" } }, "ee": { - "version": "11.7.4", - "repo_hash": "0riqww094ylbbwb9mhjpsqhrdpxlcf6rc5p796p7x7f46p31mcjb", - "deb_hash": "02hnhhyrm4a3lgwnl399byka2dr5q3pjirki447373270ca93h5i", - "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.7.4-ee.0_amd64.deb/download.deb", + "version": "11.7.5", + "repo_hash": "05dzvqrdgxbzsrf9rbis5m3iic04midx2arxgg3g4f78qfjxzylm", + "deb_hash": "1nfd68vzy3zc6a3xn5lhr83kqv9d7aaxvzv4ca9awcz4va5b33kc", + "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.7.5-ee.0_amd64.deb/download.deb", "owner": "gitlab-org", "repo": "gitlab-ee", - "rev": "v11.7.4-ee", + "rev": "v11.7.5-ee", "passthru": { "GITALY_SERVER_VERSION": "1.12.2", "GITLAB_PAGES_VERSION": "1.3.1", "GITLAB_SHELL_VERSION": "8.4.4", - "GITLAB_WORKHORSE_VERSION": "8.0.1" + "GITLAB_WORKHORSE_VERSION": "8.0.2" } } } \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 96ea361a2548..ad3b11f3b2ce 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "gitlab-workhorse-${version}"; - version = "8.0.1"; + version = "8.0.2"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "1aslcadag1q2rdirf9m0dl5vfaz8v3yy1232mvyjyvy1wb51pf4q"; + sha256 = "12xwr9yl59i58gnf0yn5yjp7zwz3s46042lk7rihvvzsa0kax690"; }; buildInputs = [ git go ]; diff --git a/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/pkgs/applications/window-managers/xmonad/log-applet/default.nix index 57f00887103f..f7ccda273890 100644 --- a/pkgs/applications/window-managers/xmonad/log-applet/default.nix +++ b/pkgs/applications/window-managers/xmonad/log-applet/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, dbus-glib -, desktopSupport, xorg +, desktopSupport ? "gnomeflashback", xorg , gtk2 , gtk3, gnome3, mate , libxfce4util, xfce4-panel |