diff options
32 files changed, 318 insertions, 173 deletions
diff --git a/nixos/modules/services/web-apps/nexus.nix b/nixos/modules/services/web-apps/nexus.nix index 3af97e146d0a..d4d507362c97 100644 --- a/nixos/modules/services/web-apps/nexus.nix +++ b/nixos/modules/services/web-apps/nexus.nix @@ -68,6 +68,7 @@ in -Dkaraf.data=${cfg.home}/nexus3 -Djava.io.tmpdir=${cfg.home}/nexus3/tmp -Dkaraf.startLocalConsole=false + -Djava.endorsed.dirs=${cfg.package}/lib/endorsed ''; description = '' diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix index d627f352e734..01a33db5293a 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.5"; + version = "0.6.0"; pname = "qmidinet"; src = fetchurl { url = "mirror://sourceforge/qmidinet/${pname}-${version}.tar.gz"; - sha256 = "0az20hh14g7k6h779dk1b6fshxnfj2664sj6ypgllzriwv430x9y"; + sha256 = "07hgk3a8crx262rm1fzggqarz8f1ml910vwgd32mbvlarws5cv0n"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix index a878f4edad8f..69cc5e6e89f2 100644 --- a/pkgs/applications/audio/qsampler/default.nix +++ b/pkgs/applications/audio/qsampler/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, qttools -, liblscp, libgig, qtbase }: +, liblscp, libgig, qtbase, mkDerivation }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "qsampler"; - version = "0.5.6"; + version = "0.6.0"; src = fetchurl { url = "mirror://sourceforge/qsampler/${pname}-${version}.tar.gz"; - sha256 = "0lx2mzyajmjckwfvgf8p8bahzpj0n0lflyip41jk32nwd2hzjhbs"; + sha256 = "1krhjyd67hvnv6sgndwq81lfvnb4qkhc7da1119fn2lzl7hx9wh3"; }; nativeBuildInputs = [ autoconf automake libtool pkgconfig qttools ]; diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix index 09ab372cf276..aab854d24adc 100644 --- a/pkgs/applications/audio/qsynth/default.nix +++ b/pkgs/applications/audio/qsynth/default.nix @@ -4,11 +4,11 @@ mkDerivation rec { pname = "qsynth"; - version = "0.5.7"; + version = "0.6.0"; src = fetchurl { url = "mirror://sourceforge/qsynth/${pname}-${version}.tar.gz"; - sha256 = "18im4w8agj60nkppwbkxqnhpp13z5li3w30kklv4lgs20rvgbvl6"; + sha256 = "173v0jqybi5szxxvj4n6wyg9sj54rmm6pxwhynx8wkm7nsbh0aij"; }; nativeBuildInputs = [ autoconf pkgconfig ]; diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index bd5dea8014d6..9733f1e2efa0 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -1,13 +1,53 @@ -{ fetchFromGitHub, libGLU, llvmPackages, qtbase, qtscript, qtxmlpatterns }: +{ mkDerivation, lib, fetchFromGitHub +, fetchpatch +, libGLU +, qtbase +, qtscript +, qtxmlpatterns +, lib3ds +, bzip2 +, muparser +, levmar +}: let - meshlabRev = "d596d7c086c51fbdfb56050f9c30b55dd0286d4c"; - vcglibRev = "6c3c940e34327322507c703889f9f1cfa73ab183"; + meshlabRev = "25f3d17b1d1d47ddc51179cb955f3027b7638745"; + vcglibRev = "910da4c3e310f2e6557bd7a39c4f1529e61573e5"; # ^ this should be the latest commit in the vcglib devel branch at the time of the meshlab revision + # We keep it separate here instead of using the `vcg` nix package because + # as of writing, meshlab upstream does not seem to follow a proper + # release process, and the other dependencies of `vcg` may no longer + # work when we upgrade it for the purpose of meshlab. - stdenv = llvmPackages.stdenv; # only building with clang seems to be tested upstream -in stdenv.mkDerivation { - name = "meshlab-20180627-beta"; + # Unfixed upstream compile error; see + # https://github.com/cnr-isti-vclab/meshlab/issues/188#issuecomment-364785362 + # that has with fixed line endings. + import_bundle_out_patch = fetchpatch { + name = "import_bundle_out.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/import_bundle_out.patch?h=meshlab-git&id=f7250ea818470f07dc9b86726407091d39c0be6f"; + sha256 = "1g6nli15i3fjd6jsgkxvb33kzbcv67xjkc3jv9r51lrwlm1ifzxi"; + }; + + # Reduces amount of vendored libraries, fixes `/linux` vs `linux-g++` + # directory name linker errors. + external_patch = fetchpatch { + name = "external.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/external.patch?h=meshlab-git&id=f7250ea818470f07dc9b86726407091d39c0be6f"; + sha256 = "1rxwkxhmxis1420rc1w7dg89gkmym68lpszsq6snl6dzpl3ingsb"; + }; + _3ds_patch = fetchpatch { + name = "3ds.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/3ds.patch?h=meshlab-git&id=f7250ea818470f07dc9b86726407091d39c0be6f"; + sha256 = "1w435b7p1ggi2bzib4yyszmk54drjgpbn8n9mnsk1slsxnp2vmg8"; + }; + muparser_patch = fetchpatch { + name = "muparser.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/muparser.patch?h=meshlab-git&id=f7250ea818470f07dc9b86726407091d39c0be6f"; + sha256 = "1sf7xqwc2j8xxdx2yklwifii9qqgknvx6ahk2hq76mg78ry1nzhq"; + }; + +in mkDerivation { + name = "meshlab-20190129-beta"; srcs = [ @@ -15,38 +55,54 @@ in stdenv.mkDerivation { owner = "cnr-isti-vclab"; repo = "meshlab"; rev = meshlabRev; - sha256 = "0xi7wiyy0yi545l5qvccbqahlcsf70mhx829gf7bq29640si4rax"; + sha256 = "16d2i91hrxvrr5p0k33g3fzis9zp4gsy3n5y2nhafvsgdmaidiij"; name = "meshlab-${meshlabRev}"; }) (fetchFromGitHub { owner = "cnr-isti-vclab"; repo = "vcglib"; rev = vcglibRev; - sha256 = "0jfgjvf21y9ncmyr7caipy3ardhig7hh9z8miy885c99b925hhwd"; + sha256 = "0xpnjpwpj57hgai184rzyk9lbq6d9vbjzr477dvl5nplpwa420m1"; name = "vcglib-${vcglibRev}"; }) ]; sourceRoot = "meshlab-${meshlabRev}"; + # Meshlab is not format-security clean; without disabling hardening, we get: + # ../../external/qhull-2003.1/src/io.c:2169:3: error: format not a string literal and no format arguments [-Werror=format-security] + # fprintf(fp, endfmt); + # ^~~~~~~ hardeningDisable = [ "format" ]; + enableParallelBuilding = true; - patches = [ ./fix-20180627-beta.patch ]; + prePatch = + '' + # MeshLab has ../vcglib hardcoded everywhere, so move the source dir + mv ../vcglib-${vcglibRev} ../vcglib - buildPhase = '' - # MeshLab has ../vcglib hardcoded everywhere, so move the source dir - mv ../vcglib-${vcglibRev} ../vcglib + # Make all source files writable so that patches can be applied. + chmod -R u+w .. + + patch -Np1 --directory=../vcglib -i ${import_bundle_out_patch} + patch -Np1 -i ${external_patch} + # Individual libraries + patch -Np1 -i ${_3ds_patch} + patch -Np1 -i ${muparser_patch} + '' + ; + + buildPhase = '' cd src export NIX_LDFLAGS="-rpath $out/opt/meshlab $NIX_LDFLAGS" - export QMAKESPEC="linux-clang" pushd external - qmake -recursive external.pro + qmake -recursive $QMAKE_FLAGS external.pro buildPhase popd - qmake -recursive meshlab_full.pro + qmake -recursive $QMAKE_FLAGS meshlab_full.pro buildPhase ''; @@ -57,13 +113,22 @@ in stdenv.mkDerivation { ln -s $out/opt/meshlab/meshlabserver $out/bin/meshlabserver ''; - buildInputs = [ libGLU llvmPackages.openmp qtbase qtscript qtxmlpatterns ]; + buildInputs = [ + libGLU + qtbase + qtscript + qtxmlpatterns + lib3ds + bzip2 + muparser + levmar + ]; meta = { description = "A system for processing and editing 3D triangular meshes."; homepage = http://www.meshlab.net/; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/graphics/meshlab/fix-20180627-beta.patch b/pkgs/applications/graphics/meshlab/fix-20180627-beta.patch deleted file mode 100644 index 177b8e90c574..000000000000 --- a/pkgs/applications/graphics/meshlab/fix-20180627-beta.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/src/meshlabplugins/edit_paint/paintbox.cpp b/src/meshlabplugins/edit_paint/paintbox.cpp -index 2097a5b..6bcd1a4 100644 ---- a/src/meshlabplugins/edit_paint/paintbox.cpp -+++ b/src/meshlabplugins/edit_paint/paintbox.cpp -@@ -23,6 +23,7 @@ - - #include "paintbox.h" - #include <QFileDialog> -+#include <QAction> - - Paintbox::Paintbox(QWidget * parent, Qt::WindowFlags flags) : QWidget(parent, flags) - { -diff --git a/src/meshlabplugins/render_gdp/shaderDialog.h b/src/meshlabplugins/render_gdp/shaderDialog.h -index a62d3b5..7eb1594 100644 ---- a/src/meshlabplugins/render_gdp/shaderDialog.h -+++ b/src/meshlabplugins/render_gdp/shaderDialog.h -@@ -32,6 +32,8 @@ - #include "shaderStructs.h" - #include "ui_shaderDialog.h" - #include <QMap> -+#include <QSlider> -+#include <QLineEdit> - - class QGLWidget; - diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 8a3ae2a06a74..8329bf3ef550 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -156,7 +156,11 @@ in stdenv.mkDerivation { export CHROME_DEVEL_SANDBOX="$sandbox/bin/${sandboxExecutableName}" fi - export LD_LIBRARY_PATH="\$LD_LIBRARY_PATH:${libPath}" + '' + lib.optionalString (libPath != "") '' + # To avoid loading .so files from cwd, LD_LIBRARY_PATH here must not + # contain an empty section before or after a colon. + export LD_LIBRARY_PATH="\$LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}${libPath}" + '' + '' # libredirect causes chromium to deadlock on startup export LD_PRELOAD="\$(echo -n "\$LD_PRELOAD" | tr ':' '\n' | grep -v /lib/libredirect\\\\.so$ | tr '\n' ':')" diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 01707f12da22..693a70182130 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -7,7 +7,7 @@ assert lib.elem stdenv.hostPlatform.system platforms; # Dropbox client to bootstrap installation. # The client is self-updating, so the actual version may be newer. let - version = "81.4.195"; + version = "83.4.152"; arch = { x86_64-linux = "x86_64"; diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index e78643fecc98..a0e62271373a 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,9 +1,9 @@ { - "version": "12.4.0", - "repo_hash": "0z2jykjv9sa4akq2qd4bl5ngqk3gpy2xfhxmcbd4d61w6l2jw00f", + "version": "12.4.1", + "repo_hash": "0dmb8ds6c5paxg35nricaywfhsgmp5rr46kk21hy2hsddgwkyb4k", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v12.4.0-ee", + "rev": "v12.4.1-ee", "passthru": { "GITALY_SERVER_VERSION": "1.67.0", "GITLAB_PAGES_VERSION": "1.11.0", diff --git a/pkgs/development/libraries/libabigail/default.nix b/pkgs/development/libraries/libabigail/default.nix new file mode 100644 index 000000000000..dc19adfb6a66 --- /dev/null +++ b/pkgs/development/libraries/libabigail/default.nix @@ -0,0 +1,59 @@ +{ stdenv +, fetchurl +, autoreconfHook +, elfutils +, libxml2 +, pkgconfig +, strace +, python3 +}: + +stdenv.mkDerivation rec { + pname = "libabigail"; + version = "1.6"; + + outputs = [ "bin" "out" "dev" ]; + + src = fetchurl { + url = "https://mirrors.kernel.org/sourceware/${pname}/${pname}-${version}.tar.gz"; + sha256 = "04j07lhvwbp6qp8pdwbf7iqnr7kgpabmqylsw4invpmzwnyp6g6g"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkgconfig + strace + ]; + + buildInputs = [ + elfutils + libxml2 + ]; + + checkInputs = [ + python3 + ]; + + configureFlags = [ + "--enable-bash-completion=yes" + "--enable-cxx11=yes" + ]; + + enableParallelBuilding = true; + + doCheck = true; + + preCheck = '' + # runtestdiffpkg needs cache directory + export XDG_CACHE_HOME="$TEMPDIR" + patchShebangs tests/ + ''; + + meta = with stdenv.lib; { + description = "ABI Generic Analysis and Instrumentation Library"; + homepage = "https://sourceware.org/libabigail/"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libguestfs/appliance.nix b/pkgs/development/libraries/libguestfs/appliance.nix index 9c2b317ab086..ad4a93517e92 100644 --- a/pkgs/development/libraries/libguestfs/appliance.nix +++ b/pkgs/development/libraries/libguestfs/appliance.nix @@ -1,9 +1,9 @@ { fetchzip }: fetchzip { - name = "libguestfs-appliance-1.38.0"; - url = "http://libguestfs.org/download/binaries/appliance/appliance-1.38.0.tar.xz"; - sha256 = "15rxwj5qjflizxk7slpbrj9lcwkd2lgm52f5yv101qba4yyn3g76"; + name = "libguestfs-appliance-1.40.1"; + url = "http://download.libguestfs.org/binaries/appliance/appliance-1.40.1.tar.xz"; + sha256 = "00863mm08p55cv6w8awp7y0lv894rcrm70mjwqfc8nc4yyb70xlm"; meta = { hydraPlatforms = []; # Hydra fails with "Output limit exceeded" diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index 9b50ddd4b7f4..07f2099f11ab 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper , ncurses, cpio, gperf, cdrkit, flex, bison, qemu, pcre, augeas, libxml2 , acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex -, gmp, readline, file, numactl, xen, libapparmor +, gmp, readline, file, numactl, xen, libapparmor, jansson , getopt, perlPackages, ocamlPackages , appliance ? null , javaSupport ? false, jdk ? null }: @@ -11,16 +11,16 @@ assert javaSupport -> jdk != null; stdenv.mkDerivation rec { pname = "libguestfs"; - version = "1.38.6"; + version = "1.40.2"; src = fetchurl { - url = "http://libguestfs.org/download/1.38-stable/libguestfs-${version}.tar.gz"; - sha256 = "1v2mggx2jlaq4m3p5shc46gzf7vmaayha6r0nwdnyzd7x6q0is7p"; + url = "http://libguestfs.org/download/1.40-stable/${pname}-${version}.tar.gz"; + sha256 = "ad6562c48c38e922a314cb45a90996843d81045595c4917f66b02a6c2dfe8058"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ]; buildInputs = [ - makeWrapper autoreconfHook ncurses cpio gperf + ncurses cpio gperf jansson cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig systemd fuse yajl libvirt gmp readline file hivex numactl xen libapparmor getopt perlPackages.ModuleBuild @@ -65,6 +65,8 @@ stdenv.mkDerivation rec { doInstallCheck = appliance != null; installCheckPhase = '' + runHook preInstallCheck + export HOME=$(mktemp -d) # avoid access to /homeless-shelter/.guestfish ${qemu}/bin/qemu-img create -f qcow2 disk1.img 10G @@ -77,12 +79,14 @@ stdenv.mkDerivation rec { mkfs ext2 /dev/sda1 list-filesystems EOF + + runHook postInstallCheck ''; meta = with stdenv.lib; { description = "Tools for accessing and modifying virtual machine disk images"; - license = licenses.gpl2; - homepage = http://libguestfs.org/; + license = with licenses; [ gpl2 lgpl21 ]; + homepage = "http://libguestfs.org/"; maintainers = with maintainers; [offline]; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/spirv-headers/default.nix b/pkgs/development/libraries/spirv-headers/default.nix index 9b2c0032d4e9..86a7ab048fab 100644 --- a/pkgs/development/libraries/spirv-headers/default.nix +++ b/pkgs/development/libraries/spirv-headers/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spirv-headers"; - version = "1.4.1"; + version = "1.5.1"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; rev = version; - sha256 = "1zfmvg3x0q9w652s8g5m5rcckzm6jiiw8rif2qck4vlsryl55akp"; + sha256 = "1fnd8qwss6pxcch5j9qi1pdz70828zxsg4m8apgrhyj0p9lm0rbg"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/ocaml-modules/janestreet/0.12.nix b/pkgs/development/ocaml-modules/janestreet/0.12.nix index 01463f307150..f912bdaa21f1 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.12.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.12.nix @@ -458,6 +458,13 @@ rec { propagatedBuildInputs = [ core_kernel ]; }; + ecaml = janePackage { + pname = "ecaml"; + hash = "0n9xi6agc3lgyj2nsi10cbif0xwn57xyaranad9r285rmbxrgjh7"; + meta.description = "Library for writing Emacs plugin in OCaml"; + propagatedBuildInputs = [ async expect_test_helpers_kernel ]; + }; + ### Packages at version 0.11, with dependencies at version 0.12 configurator = janePackage { diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix index eac6e1af05ce..ced53a134908 100644 --- a/pkgs/development/python-modules/scikit-image/default.nix +++ b/pkgs/development/python-modules/scikit-image/default.nix @@ -12,6 +12,7 @@ , dask , cloudpickle , pytest +, imageio }: buildPythonPackage rec { @@ -25,7 +26,7 @@ buildPythonPackage rec { buildInputs = [ cython ]; - propagatedBuildInputs = [ numpy scipy matplotlib networkx six pillow pywavelets dask cloudpickle ]; + propagatedBuildInputs = [ numpy scipy matplotlib networkx six pillow pywavelets dask cloudpickle imageio ]; checkInputs = [ pytest ]; @@ -37,4 +38,4 @@ buildPythonPackage rec { homepage = http://scikit-image.org; license = lib.licenses.bsd3; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix index 3d2759f025cc..08baa53b1dc0 100644 --- a/pkgs/development/tools/build-managers/qbs/default.nix +++ b/pkgs/development/tools/build-managers/qbs/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "qbs"; - version = "1.13.1"; + version = "1.14.0"; src = fetchFromGitHub { owner = "qbs"; repo = "qbs"; rev = "v${version}"; - sha256 = "1a9mydfsax5pzbnx8g8f9blc4xpk5rdjq8fvkdaiwapdczban1ya"; + sha256 = "19adxjyp5bf5hrjisv3ff9ndcmh1glrxfrzifs46xjn3r69kyv1k"; }; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/development/tools/repository-managers/nexus/default.nix b/pkgs/development/tools/repository-managers/nexus/default.nix index acf9d03843d0..95a9e78383f3 100644 --- a/pkgs/development/tools/repository-managers/nexus/default.nix +++ b/pkgs/development/tools/repository-managers/nexus/default.nix @@ -2,13 +2,15 @@ stdenv.mkDerivation rec { pname = "nexus"; - version = "3.18.1-01"; + version = "3.19.1-01"; src = fetchurl { url = "https://sonatype-download.global.ssl.fastly.net/nexus/3/nexus-${version}-unix.tar.gz"; - sha256 = "0z3hb1ha0yvi09hrndrzzh95g3m42pfsi0gzw7hfx9r0n8r2qgkd"; + sha256 = "0kjzp5n6pkgx5s21jfmh6pbgnjlvs89kcjqikv4lgc5yia264bks"; }; + preferLocalBuild = true; + sourceRoot = "${pname}-${version}"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/rubocop/Gemfile.lock b/pkgs/development/tools/rubocop/Gemfile.lock index df2f0aae8ead..7c523c3ea15c 100644 --- a/pkgs/development/tools/rubocop/Gemfile.lock +++ b/pkgs/development/tools/rubocop/Gemfile.lock @@ -3,11 +3,11 @@ GEM specs: ast (2.4.0) jaro_winkler (1.5.3) - parallel (1.17.0) - parser (2.6.4.1) + parallel (1.18.0) + parser (2.6.5.0) ast (~> 2.4.0) rainbow (3.0.0) - rubocop (0.75.0) + rubocop (0.76.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.6) @@ -24,4 +24,4 @@ DEPENDENCIES rubocop BUNDLED WITH - 1.17.2 + 1.17.3 diff --git a/pkgs/development/tools/rubocop/gemset.nix b/pkgs/development/tools/rubocop/gemset.nix index d113120e3d62..5defb56109ff 100644 --- a/pkgs/development/tools/rubocop/gemset.nix +++ b/pkgs/development/tools/rubocop/gemset.nix @@ -24,10 +24,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x1gzgjrdlkm1aw0hfpyphsxcx90qgs3y4gmp9km3dvf4hc4qm8r"; + sha256 = "091p5zrzzyg3fg48jhdz9lzjf2r9r3akra2cd46yd4nza3xgxshz"; type = "gem"; }; - version = "1.17.0"; + version = "1.18.0"; }; parser = { dependencies = ["ast"]; @@ -35,10 +35,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1axig0czm40ydbnay9b9qzzavszx2p7knidbwim8lgcpfm4ynxdw"; + sha256 = "09davv4ld6caqlczw64vhwf8hr41apys3cj8v2h96yxs4qg1m2iw"; type = "gem"; }; - version = "2.6.4.1"; + version = "2.6.5.0"; }; rainbow = { groups = ["default"]; @@ -56,10 +56,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x0hc3b9admal4684cfa1rh778khsydkv1dwf18cxyvb3v2h9rab"; + sha256 = "07x51ixlx76y194xsszh5lbkaqakz44ykbrjxg3qaggbs18790q0"; type = "gem"; }; - version = "0.75.0"; + version = "0.76.0"; }; ruby-progressbar = { groups = ["default"]; diff --git a/pkgs/games/openarena/default.nix b/pkgs/games/openarena/default.nix index 63abc5d609c0..1e839c46f0fe 100644 --- a/pkgs/games/openarena/default.nix +++ b/pkgs/games/openarena/default.nix @@ -16,33 +16,28 @@ stdenv.mkDerivation { gameDir = "$out/openarena-$version"; interpreter = "$(< \"$NIX_CC/nix-support/dynamic-linker\")"; libPath = stdenv.lib.makeLibraryPath [ SDL libglvnd libogg libvorbis curl openal ]; + arch = { + "x86_64-linux" = "x86_64"; + "i386-linux" = "i386"; + }.${stdenv.hostPlatform.system}; in '' mkdir -pv $out/bin cd $out unzip $src - ${if stdenv.hostPlatform.system == "x86_64-linux" then '' - patchelf --set-interpreter "${interpreter}" "${gameDir}/openarena.x86_64" - makeWrapper "${gameDir}/openarena.x86_64" "$out/bin/openarena" \ - --prefix LD_LIBRARY_PATH : "${libPath}" - patchelf --set-interpreter "${interpreter}" "${gameDir}/oa_ded.x86_64" - makeWrapper "${gameDir}/oa_ded.x86_64" "$out/bin/openarena-server" \ - --prefix LD_LIBRARY_PATH : "${libPath}" - '' else '' - patchelf --set-interpreter "${interpreter}" "${gameDir}/openarena.i386" - makeWrapper "${gameDir}/openarena.i386" "$out/bin/openarena" \ - --prefix LD_LIBRARY_PATH : "${libPath}" - patchelf --set-interpreter "${interpreter}" "${gameDir}/oa_ded.i386" - makeWrapper "${gameDir}/oa_ded.i386" "$out/bin/openarena-server" \ - --prefix LD_LIBRARY_PATH : "${libPath}" - ''} + patchelf --set-interpreter "${interpreter}" "${gameDir}/openarena.${arch}" + patchelf --set-interpreter "${interpreter}" "${gameDir}/oa_ded.${arch}" + + makeWrapper "${gameDir}/openarena.${arch}" "$out/bin/openarena" \ + --prefix LD_LIBRARY_PATH : "${libPath}" + makeWrapper "${gameDir}/oa_ded.${arch}" "$out/bin/oa_ded" ''; meta = { description = "Crossplatform openarena client"; homepage = http://openarena.ws/; maintainers = [ stdenv.lib.maintainers.wyvie ]; - platforms = stdenv.lib.platforms.linux; + platforms = [ "i386-linux" "x86_64-linux" ]; license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index b5df553a97c3..2f725952f0a3 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "fwts"; - version = "19.08.00"; + version = "19.09.00"; src = fetchzip { url = "http://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz"; - sha256 = "14v4vxvfsl008xalsmlhl9wh89xlrfffh3pky9m90flaizdzwyp4"; + sha256 = "039dc1sy2pfj3b7kqcww3qaabrhzks1xfkynzwbjwdk04fjiwxfw"; stripRoot = false; }; diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix index 567dcd1068c5..47adcf938c5b 100644 --- a/pkgs/os-specific/linux/trace-cmd/default.nix +++ b/pkgs/os-specific/linux/trace-cmd/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, asciidoc, docbook_xsl, libxslt }: stdenv.mkDerivation { pname = "trace-cmd"; - version = "2.8.3"; + version = "2.9-dev"; src = fetchgit (import ./src.nix); @@ -17,19 +17,15 @@ stdenv.mkDerivation { buildPhase = "make trace-cmd libs doc"; - installTargets = [ "install_cmd" "install_libs" "install_man" ]; + installTargets = [ "install_cmd" "install_libs" "install_doc" ]; installFlags = [ "bindir=${placeholder "out"}/bin" "man_dir=${placeholder "man"}/share/man" "libdir=${placeholder "lib"}/lib" - "includedir=${placeholder "dev"}/include/trace-cmd" + "includedir=${placeholder "dev"}/include" "BASH_COMPLETE_DIR=${placeholder "out"}/etc/bash_completion.d" ]; - postInstall = '' - mv $dev/include/trace-cmd/traceevent $dev/include/traceevent - ''; - meta = with stdenv.lib; { description = "User-space tools for the Linux kernel ftrace subsystem"; homepage = http://kernelshark.org/; diff --git a/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch b/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch index 0d6f5c5d8bfe..db194e16fdb6 100644 --- a/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch +++ b/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch @@ -1,52 +1,35 @@ -diff --git a/Documentation/Makefile b/Documentation/Makefile -index 21e42fd..826361d 100644 ---- a/Documentation/Makefile -+++ b/Documentation/Makefile -@@ -108,7 +108,11 @@ $(IMGS_INSTALL): %.png.install : %.png force - - GUI_INSTALL = $(HTML_INSTALL) $(IMGS_INSTALL) - --install: $(MAN1_INSTALL) $(MAN5_INSTALL) $(GUI_INSTALL) -+install_man: $(MAN1_INSTALL) $(MAN5_INSTALL) -+ -+install_gui: $(GUI_INSTALL) -+ -+install: install_man install_gui - - clean: - (cd $(obj); \ diff --git a/Makefile b/Makefile -index 2bcc383..107ead0 100644 +index bbdf15e..deb8ef7 100644 --- a/Makefile +++ b/Makefile -@@ -289,7 +289,7 @@ libtraceevent.a: $(LIBTRACEEVENT_STATIC) +@@ -288,7 +288,7 @@ libtraceevent.a: $(LIBTRACEEVENT_STATIC) libtracecmd.a: $(LIBTRACECMD_STATIC) libtracecmd.so: $(LIBTRACECMD_SHARED) -libs: $(LIBTRACECMD_SHARED) $(LIBTRACEEVENT_SHARED) +libs: $(LIBTRACECMD_SHARED) $(LIBTRACEEVENT_SHARED) $(LIBTRACECMD_STATIC) $(LIBTRACEEVENT_STATIC) - plugins: force $(obj)/plugins/trace_plugin_dir $(obj)/plugins/trace_python_dir - $(Q)$(MAKE) -C $(src)/plugins -@@ -345,6 +345,8 @@ install_gui: install_cmd gui + plugins: force $(obj)/lib/traceevent/plugins/traceevent_plugin_dir $(obj)/lib/traceevent/plugins/trace_python_dir + $(Q)$(MAKE) -C $(src)/lib/traceevent/plugins +@@ -344,6 +344,8 @@ install_gui: install_cmd gui install_libs: libs - $(Q)$(call do_install,$(LIBTRACECMD_SHARED),$(libdir_SQ)) - $(Q)$(call do_install,$(LIBTRACEEVENT_SHARED),$(libdir_SQ)) -+ $(Q)$(call do_install,$(LIBTRACECMD_STATIC),$(libdir_SQ)) -+ $(Q)$(call do_install,$(LIBTRACEEVENT_STATIC),$(libdir_SQ)) + $(Q)$(call do_install,$(LIBTRACECMD_SHARED),$(libdir_SQ)/trace-cmd) + $(Q)$(call do_install,$(LIBTRACEEVENT_SHARED),$(libdir_SQ)/traceevent) ++ $(Q)$(call do_install,$(LIBTRACECMD_STATIC),$(libdir_SQ)/trace-cmd) ++ $(Q)$(call do_install,$(LIBTRACEEVENT_STATIC),$(libdir_SQ)/traceevent) $(Q)$(call do_install,$(src)/include/traceevent/event-parse.h,$(includedir_SQ)/traceevent) $(Q)$(call do_install,$(src)/include/traceevent/trace-seq.h,$(includedir_SQ)/traceevent) - $(Q)$(call do_install,$(src)/include/trace-cmd/trace-cmd.h,$(includedir_SQ)) -@@ -356,6 +358,12 @@ doc: - doc_clean: - $(MAKE) -C $(src)/Documentation clean + $(Q)$(call do_install,$(src)/include/trace-cmd/trace-cmd.h,$(includedir_SQ)/trace-cmd) +diff --git a/kernel-shark/src/CMakeLists.txt b/kernel-shark/src/CMakeLists.txt +index e20a030..7fce165 100644 +--- a/kernel-shark/src/CMakeLists.txt ++++ b/kernel-shark/src/CMakeLists.txt +@@ -93,7 +93,7 @@ if (Qt5Widgets_FOUND AND Qt5Network_FOUND) + DESTINATION ${_INSTALL_PREFIX}/share/icons/${KS_APP_NAME}) -+install_man: -+ $(MAKE) -C $(src)/Documentation install_man -+ -+install_gui_docs: -+ $(MAKE) -C $(src)/Documentation install_gui -+ - install_doc: - $(MAKE) -C $(src)/Documentation install + install(FILES "${KS_DIR}/org.freedesktop.kshark-record.policy" +- DESTINATION /usr/share/polkit-1/actions/) ++ DESTINATION ${_INSTALL_PREFIX}/share/polkit-1/actions/) + install(PROGRAMS "${KS_DIR}/bin/kshark-su-record" + DESTINATION ${_INSTALL_PREFIX}/bin/) diff --git a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix index b73de3193d22..2156177f6415 100644 --- a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix +++ b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix @@ -1,7 +1,7 @@ -{ stdenv, mkDerivation, fetchgit, qtbase, cmake, json_c, mesa_glu, freeglut, trace-cmd, pkg-config }: +{ stdenv, mkDerivation, fetchgit, qtbase, cmake, asciidoc, docbook_xsl, json_c, mesa_glu, freeglut, trace-cmd, pkg-config }: mkDerivation { pname = "kernelshark"; - version = "0.9.8"; + version = "1.1.0"; src = fetchgit (import ./src.nix); @@ -11,21 +11,22 @@ mkDerivation { preConfigure = "pushd kernel-shark"; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ pkg-config cmake asciidoc ]; - buildInputs = [ qtbase json_c mesa_glu freeglut pkg-config ]; + buildInputs = [ qtbase json_c mesa_glu freeglut ]; cmakeFlags = [ "-D_INSTALL_PREFIX=${placeholder "out"}" "-DTRACECMD_BIN_DIR=${trace-cmd}/bin" "-DTRACECMD_INCLUDE_DIR=${trace-cmd.dev}/include" - "-DTRACECMD_LIBRARY=${trace-cmd.lib}/lib/libtracecmd.a" - "-DTRACEEVENT_LIBRARY=${trace-cmd.lib}/lib/libtraceevent.a" + "-DTRACECMD_LIBRARY=${trace-cmd.lib}/lib/trace-cmd/libtracecmd.a" + "-DTRACEEVENT_LIBRARY=${trace-cmd.lib}/lib/traceevent/libtraceevent.a" ]; preInstall = '' popd - make install_gui_docs prefix=$doc + make install_doc_gui prefix=$doc \ + FIND_MANPAGE_DOCBOOK_XSL=${docbook_xsl}/share/xml/docbook-xsl-nons/manpages/docbook.xsl pushd kernel-shark/build ''; diff --git a/pkgs/os-specific/linux/trace-cmd/src.nix b/pkgs/os-specific/linux/trace-cmd/src.nix index 836e71b1851e..47c1b82fdd46 100644 --- a/pkgs/os-specific/linux/trace-cmd/src.nix +++ b/pkgs/os-specific/linux/trace-cmd/src.nix @@ -1,5 +1,5 @@ { url = "git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/"; - rev = "138c70106835ee0f05879e7f2f46bca8dae7ca99"; # branch: trace-cmd-stable-v2.8 - sha256 = "1grpip7lywf98nsm7ql1d6bgc0ky0672savr8jz3a8hf9ny265nx"; + rev = "ab370b78b9278fe16657742d46cb95c0a65b47d5"; # branch: kernelshark-v1.1 + sha256 = "0qngwc4qgadrkwlwpz73f12prdkx94kl0bg7g9hib95ipvsdmk1c"; } diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix index ac7733986ce6..512842b3a6a2 100644 --- a/pkgs/servers/foundationdb/cmake.nix +++ b/pkgs/servers/foundationdb/cmake.nix @@ -4,7 +4,7 @@ , cmake, ninja, boost, python3, openjdk, mono, libressl , gccStdenv, llvmPackages -, useClang ? true +, useClang ? false , ... }: diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index b3ca7038ebeb..ea762ed656d6 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, stdenv49, gcc9Stdenv, llvmPackages_8 +{ stdenv, stdenv49, gccStdenv, llvmPackages , lib, fetchurl, fetchpatch, fetchFromGitHub , cmake, ninja, which, findutils, m4, gawk @@ -8,8 +8,8 @@ let vsmakeBuild = import ./vsmake.nix args; cmakeBuild = import ./cmake.nix (args // { - gccStdenv = gcc9Stdenv; - llvmPackages = llvmPackages_8; + gccStdenv = gccStdenv; + llvmPackages = llvmPackages; }); python3-six-patch = fetchpatch { @@ -69,9 +69,9 @@ in with builtins; { # ------------------------------------------------------ foundationdb61 = cmakeBuild { - version = "6.1.10"; + version = "6.1.12"; branch = "release-6.1"; - sha256 = "1v278zlrki3da2i2258j2b4rk4fq6d9bj623z01bjrvmaqxc2gry"; + sha256 = "1yh5hx6rim41m0dwhnb2pcwz67wlnk0zwvyw845d36b29gwy58ab"; patches = [ ./patches/clang-libcxx.patch diff --git a/pkgs/shells/zsh/fzf-zsh/default.nix b/pkgs/shells/zsh/fzf-zsh/default.nix new file mode 100644 index 000000000000..e97ef1074f12 --- /dev/null +++ b/pkgs/shells/zsh/fzf-zsh/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, fzf }: + +stdenv.mkDerivation rec { + pname = "fzf-zsh-unstable"; + version = "2019-09-09"; + + src = fetchFromGitHub { + owner = "Wyntau"; + repo = "fzf-zsh"; + rev = "829d7e40cc437dce8a6e234e259bbd4065e87124"; + sha256 = "1irjmxhcg1fm4g8p3psjqk7sz5qhj5kw73pyhv91njvpdhn9l26z"; + }; + + postPatch = '' + substituteInPlace fzf-zsh.plugin.zsh \ + --replace \ + 'fzf_path="$( cd "$fzf_zsh_path/../fzf/" && pwd )"' \ + "fzf_path=${fzf}" \ + --replace \ + '$fzf_path/shell' \ + '${fzf}/share/fzf' + ''; + + dontBuild = true; + + installPhase = '' + install -Dm0644 fzf-zsh.plugin.zsh $out/share/zsh/plugins/fzf-zsh/fzf-zsh.plugin.zsh + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/wyntau/fzf-zsh; + description = "wrap fzf to use in oh-my-zsh"; + license = licenses.mit; + maintainers = with maintainers; [ ma27 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/filesystems/gitfs/default.nix b/pkgs/tools/filesystems/gitfs/default.nix index 614e323e6b29..cd1e3110a13d 100644 --- a/pkgs/tools/filesystems/gitfs/default.nix +++ b/pkgs/tools/filesystems/gitfs/default.nix @@ -2,13 +2,13 @@ python2Packages.buildPythonApplication rec { pname = "gitfs"; - version = "0.4.5.1"; + version = "0.5.1"; src = fetchFromGitHub { owner = "PressLabs"; repo = "gitfs"; rev = version; - sha256 = "1s9ml2ryqxvzzq9mxa9y3xmzr742qxcpw9kzzbr7vm3bxgkyi074"; + sha256 = "04plfdaai7bvnz39lw0yyda6ahbwx0wkws9fjnxxx43dzm3sjl98"; }; patchPhase = '' diff --git a/pkgs/tools/graphics/jhead/default.nix b/pkgs/tools/graphics/jhead/default.nix index a2592d5522b9..13df4ede8ecf 100644 --- a/pkgs/tools/graphics/jhead/default.nix +++ b/pkgs/tools/graphics/jhead/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libjpeg }: +{ stdenv, fetchurl, fetchpatch, libjpeg }: stdenv.mkDerivation rec { pname = "jhead"; @@ -9,6 +9,19 @@ stdenv.mkDerivation rec { sha256 = "1hn0yqcicq3qa20h1g313l1a671r8mccpb9gz0w1056r500lw6c2"; }; + patches = [ + (fetchpatch { + name = "CVE-2019-1010301.patch"; + url = "https://sources.debian.org/data/main/j/jhead/1:3.03-3/debian/patches/36_CVE-2019-1010301"; + sha256 = "1vvrg50z5y7sjhfi973wh1q1v79sqp7hk5d4z0dlnx3fqgkjrx7q"; + }) + (fetchpatch { + name = "CVE-2019-1010302.patch"; + url = "https://sources.debian.org/data/main/j/jhead/1:3.03-3/debian/patches/37_CVE-2019-1010302"; + sha256 = "1h11mpsi7hpwbi8kpnkjwn6zpqf88f132h0rsg8sggcs3vva2x8y"; + }) + ]; + buildInputs = [ libjpeg ]; patchPhase = '' diff --git a/pkgs/tools/networking/swaks/default.nix b/pkgs/tools/networking/swaks/default.nix index 9d776752c827..8dee8989c064 100644 --- a/pkgs/tools/networking/swaks/default.nix +++ b/pkgs/tools/networking/swaks/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "swaks"; - version = "20181104.0"; + version = "20190914.0"; src = fetchurl { url = "https://www.jetmore.org/john/code/swaks/files/${pname}-${version}.tar.gz"; - sha256 = "0n1yd27xcyb1ylp5gln3yv5gzi9r377hjy1j32367kgb3247ygq2"; + sha256 = "12awq5z4sdd54cxprj834zajxhkpy4jwhzf1fhigcx1zbhdaacsp"; }; buildInputs = [ perl makeWrapper ]; @@ -22,10 +22,8 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.jetmore.org/john/code/swaks/; - description = '' - A featureful, flexible, scriptable, transaction-oriented SMTP test tool - ''; + homepage = "http://www.jetmore.org/john/code/swaks/"; + description = "A featureful, flexible, scriptable, transaction-oriented SMTP test tool"; license = licenses.gpl2; maintainers = with maintainers; [ ndowens ]; platforms = platforms.all; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 899ac48c70fe..3c4af7fab598 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1692,6 +1692,8 @@ in fzf = callPackage ../tools/misc/fzf { }; + fzf-zsh = callPackage ../shells/zsh/fzf-zsh { }; + fzy = callPackage ../tools/misc/fzy { }; g2o = callPackage ../development/libraries/g2o { }; @@ -11750,6 +11752,8 @@ in libaal = callPackage ../development/libraries/libaal { }; + libabigail = callPackage ../development/libraries/libabigail { }; + libaccounts-glib = callPackage ../development/libraries/libaccounts-glib { }; libacr38u = callPackage ../tools/security/libacr38u { }; |