diff options
Diffstat (limited to 'pkgs/tools')
39 files changed, 157 insertions, 109 deletions
diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix index dc665bf9c41b..74a6777d9491 100644 --- a/pkgs/tools/X11/ckbcomp/default.nix +++ b/pkgs/tools/X11/ckbcomp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "ckbcomp"; - version = "1.194"; + version = "1.195"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = "console-setup"; rev = version; - sha256 = "0fkabv05j5dj10mfrpjyvv7lnxl9qaqkbjhwj72r18i9i4019vgh"; + sha256 = "0d0xagigs5k3appzz5lzxdjncvnkgz4amz6ks7imiq8kkjixvmfy"; }; buildInputs = [ perl ]; diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index 64b205bada58..ccea6a2233cc 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { xset() { ${xset}/bin/xset "$@"; }\ perl() { PERL5LIB=${perlPath} ${perlPackages.perl}/bin/perl "$@"; }\ mimetype() { ${perlPackages.FileMimeInfo}/bin/mimetype "$@"; }\ + PATH=$PATH:'"$out"'/bin\ &#' -i "$out"/bin/* substituteInPlace $out/bin/xdg-open \ diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 91a58438c17d..6fe433daf8b9 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, callPackage, substituteAll, python3, pkgconfig, writeText , xorg, gtk3, glib, pango, cairo, gdk-pixbuf, atk , wrapGAppsHook, xorgserver, getopt, xauth, utillinux, which -, ffmpeg_4, x264, libvpx, libwebp, x265 +, ffmpeg, x264, libvpx, libwebp, x265 , libfakeXinerama , gst_all_1, pulseaudio, gobject-introspection , pam }: @@ -60,7 +60,7 @@ in buildPythonApplication rec { pango cairo gdk-pixbuf atk.out gtk3 glib - ffmpeg_4 libvpx x264 libwebp x265 + ffmpeg libvpx x264 libwebp x265 gst_all_1.gstreamer gst_all_1.gst-plugins-base diff --git a/pkgs/tools/audio/video2midi/default.nix b/pkgs/tools/audio/video2midi/default.nix index dca8a0610da8..cf9297119e9f 100644 --- a/pkgs/tools/audio/video2midi/default.nix +++ b/pkgs/tools/audio/video2midi/default.nix @@ -8,7 +8,7 @@ let }); in pythonPackages.buildPythonApplication rec { pname = "video2midi"; - version = "0.4.0.1"; + version = "0.4.0.2"; format = "other"; @@ -16,7 +16,7 @@ in pythonPackages.buildPythonApplication rec { owner = "svsdval"; repo = pname; rev = version; - sha256 = "1869w60kprjdikqk4iwx058zri2jg4aznzlg668w9myka4mp01r9"; + sha256 = "174ijn8bc306529scd23szvgx1apanm2qmwk4lwmi64rhkm6dapx"; }; propagatedBuildInputs = with pythonPackages; [ opencv3_ midiutil pygame pyopengl ]; diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index a9fd2f19b897..8bf253a7b121 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, sqlite, postgresql, zlib, acl, ncurses, openssl, readline }: stdenv.mkDerivation rec { - name = "bacula-9.6.3"; + name = "bacula-9.6.5"; src = fetchurl { url = "mirror://sourceforge/bacula/${name}.tar.gz"; - sha256 = "02jvijwfw8nqrq61pyr5b9d5zjpmrsimkg6dq42rbd71g2k6a4zc"; + sha256 = "0yn7qwkzix78bs811vmrn5gbywy7ggnsv72mdjz2lirqc6w3a3si"; }; buildInputs = [ postgresql sqlite zlib ncurses openssl readline ] diff --git a/pkgs/tools/filesystems/bees/default.nix b/pkgs/tools/filesystems/bees/default.nix index c6bb07e7b87d..e87cecbf8fd3 100644 --- a/pkgs/tools/filesystems/bees/default.nix +++ b/pkgs/tools/filesystems/bees/default.nix @@ -1,4 +1,4 @@ -{ stdenv, runCommand, fetchFromGitHub, bash, btrfs-progs, coreutils, pythonPackages, utillinux }: +{ stdenv, runCommand, fetchFromGitHub, bash, btrfs-progs, coreutils, python3Packages, utillinux }: let @@ -22,7 +22,7 @@ let ]; nativeBuildInputs = [ - pythonPackages.markdown # documentation build + python3Packages.markdown # documentation build ]; preBuild = '' diff --git a/pkgs/tools/filesystems/convoy/default.nix b/pkgs/tools/filesystems/convoy/default.nix index 77d6dca066a4..f12187be810f 100644 --- a/pkgs/tools/filesystems/convoy/default.nix +++ b/pkgs/tools/filesystems/convoy/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { pname = "convoy"; - version = "0.5.0"; + version = "0.5.2"; goPackagePath = "github.com/rancher/convoy"; @@ -11,7 +11,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "rancher"; repo = "convoy"; - sha256 = "0ihy0cfq7sa2wml904ajwr165hx2mas3jb1bqk3i0m4fg1lx1xw1"; + sha256 = "09nygrxd5hril4xcfsvgjg74xxhhimznqq4sdk0f360c5ra0dbhj"; }; buildInputs = [lvm2]; diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/pkgs/tools/graphics/luxcorerender/default.nix index fc8a98c19930..3afb6ebd9877 100644 --- a/pkgs/tools/graphics/luxcorerender/default.nix +++ b/pkgs/tools/graphics/luxcorerender/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, python35 +{ stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, python36 , tbb, openimageio, libjpeg, libpng, zlib, libtiff, ilmbase , freetype, openexr, libXdmcp, libxkbcommon, epoxy, at-spi2-core , dbus, doxygen, qt5, c-blosc, libGLU, gnome3, dconf, gtk3, pcre @@ -7,28 +7,34 @@ , withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp }: -let boost_static = boost165.override { - python = python35; +let + python = python36; + + boost_static = boost165.override { + inherit python; enableStatic = true; enablePython = true; }; + version = "2.0"; + sha256 = "15nn39ybsfjf3cw3xgkbarvxn4a9ymfd579ankm7yjxkw5gcif38"; + in stdenv.mkDerivation { pname = "luxcorerender"; - version = "2.0"; + inherit version; src = fetchFromGitHub { owner = "LuxCoreRender"; repo = "LuxCore"; - rev = "luxcorerender_v2.0"; - sha256 = "15nn39ybsfjf3cw3xgkbarvxn4a9ymfd579ankm7yjxkw5gcif38"; + rev = "luxcorerender_v${version}"; + inherit sha256; }; buildInputs = [ embree2 pkgconfig cmake zlib boost_static libjpeg libtiff libpng ilmbase freetype openexr openimageio tbb qt5.full c-blosc libGLU pcre bison - flex libX11 libpthreadstubs python35 libXdmcp libxkbcommon + flex libX11 libpthreadstubs python libXdmcp libxkbcommon epoxy at-spi2-core dbus doxygen # needed for GSETTINGS_SCHEMAS_PATH gsettings-desktop-schemas glib gtk3 @@ -43,15 +49,15 @@ in stdenv.mkDerivation { "-DOpenEXR_IlmThread_INCLUDE_DIR=${ilmbase.dev}/include/OpenEXR" "-DOpenEXR_Imath_INCLUDE_DIR=${openexr.dev}/include/OpenEXR" "-DOpenEXR_half_INCLUDE_DIR=${ilmbase.dev}/include" - "-DPYTHON_LIBRARY=${python35}/lib/libpython3.so" - "-DPYTHON_INCLUDE_DIR=${python35}/include/python3.5" + "-DPYTHON_LIBRARY=${python}/lib/libpython3.so" + "-DPYTHON_INCLUDE_DIR=${python}/include/python${python.pythonVersion}" "-DEMBREE_INCLUDE_PATH=${embree2}/include" "-DEMBREE_LIBRARY=${embree2}/lib/libembree.so" "-DBoost_PYTHON_LIBRARY_RELEASE=${boost_static}/lib/libboost_python3-mt.so" ] ++ stdenv.lib.optional withOpenCL "-DOPENCL_INCLUDE_DIR=${opencl-headers}/include"; preConfigure = '' - NIX_CFLAGS_COMPILE+=" -isystem ${python35}/include/python3.5" + NIX_CFLAGS_COMPILE+=" -isystem ${python}/include/python${python.pythonVersion}" NIX_LDFLAGS+=" -lpython3" ''; diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/tools/graphics/wkhtmltopdf/default.nix index ee083c3e301b..093ab9ad5c43 100644 --- a/pkgs/tools/graphics/wkhtmltopdf/default.nix +++ b/pkgs/tools/graphics/wkhtmltopdf/default.nix @@ -3,14 +3,14 @@ , openssl, libX11, libXext, libXrender }: mkDerivation rec { - version = "0.12.5"; + version = "0.12.6"; pname = "wkhtmltopdf"; src = fetchFromGitHub { owner = "wkhtmltopdf"; repo = "wkhtmltopdf"; rev = version; - sha256 = "0i6b6z3f4szspbbi23qr3hv22j9bhmcj7c1jizr7y0ra43mrgws1"; + sha256 = "0m2zy986kzcpg0g3bvvm815ap9n5ann5f6bdy7pfj6jv482bm5mg"; }; buildInputs = [ diff --git a/pkgs/tools/inputmethods/interception-tools/default.nix b/pkgs/tools/inputmethods/interception-tools/default.nix index a6aed47d964c..39a28214fe20 100644 --- a/pkgs/tools/inputmethods/interception-tools/default.nix +++ b/pkgs/tools/inputmethods/interception-tools/default.nix @@ -2,14 +2,14 @@ libevdev, udev }: let - version = "0.1.1"; + version = "0.2.1"; baseName = "interception-tools"; in stdenv.mkDerivation { name = "${baseName}-${version}"; src = fetchurl { url = "https://gitlab.com/interception/linux/tools/repository/v${version}/archive.tar.gz"; - sha256 = "14g4pphvylqdb922va322z1pbp12ap753hcf7zf9sii1ikvif83j"; + sha256 = "0lqz89wsf9r5xdgflincysxg4l8fpgg5z8zczhhrg9s5787srfzi"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/tools/misc/bdf2sfd/default.nix b/pkgs/tools/misc/bdf2sfd/default.nix index 15154f73a699..ca67525bb8c4 100644 --- a/pkgs/tools/misc/bdf2sfd/default.nix +++ b/pkgs/tools/misc/bdf2sfd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bdf2sfd"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "fcambus"; repo = pname; rev = version; - sha256 = "02dzvrgwpgbd0wgfnlpiv2qlwvspwl7a0qh8cg363lpnxv8akw9q"; + sha256 = "1fhdl739a4v8296wpn2390fhlb6vlg9m1zik7mql4l9008ncd5mv"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index dfd227f917ed..5e5550e0b41d 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchpatch, runCommand, makeWrapper, python3Packages, docutils, help2man , abootimg, acl, apktool, binutils-unwrapped, build-tools, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc -, e2fsprogs, file, findutils, fontforge-fonttools, ffmpeg_4, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar +, e2fsprogs, file, findutils, fontforge-fonttools, ffmpeg, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar , gzip, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, openssh, openssl, pdftk, pgpdump, poppler_utils, qemu, R , sng, sqlite, squashfsTools, tcpdump, odt2txt, unzip, wabt, xxd, xz, zip, zstd , enableBloat ? false @@ -62,7 +62,7 @@ python3Packages.buildPythonApplication rec { ]) ++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr acl cdrkit ] ++ lib.optionals enableBloat ([ - abootimg apksigner apktool cbfstool colord ffmpeg_4 fpc ghc ghostscriptX giflib gnupg gnumeric + abootimg apksigner apktool cbfstool colord ffmpeg fpc ghc ghostscriptX giflib gnupg gnumeric hdf5 imagemagick llvm jdk mono odt2txt openssh pdftk poppler_utils qemu R tcpdump wabt ] ++ (with python3Packages; [ binwalk guestfs h5py ])); diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index 439979068f5a..d882c6efb5e8 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "1.4.5"; + version = "1.4.6"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "0kxbq174a5fdcdh1hvnrlk79cg7lyily7iskfxhyz9l26qana9jp"; + sha256 = "0qxyjmgl85q7xk629l548bpzizma5n4j1r6nqbwh9j15ajvq7mq8"; }; nativeBuildInputs = [ cmake flex bison ]; diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix index 153a74f94567..9c250390e11c 100644 --- a/pkgs/tools/misc/geekbench/default.nix +++ b/pkgs/tools/misc/geekbench/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "geekbench"; - version = "5.1.1"; + version = "5.2.0"; src = fetchurl { url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; - sha256 = "1wjyn3fkc2zgj0xrd73kidrg1d1wqmil278ak36wf87685w4n0b1"; + sha256 = "1rvzll57igivhlxp058mhmcbq07q2zr52xbi1wyn85qr9ihrhx08"; }; dontConfigure = true; diff --git a/pkgs/tools/misc/gh-ost/default.nix b/pkgs/tools/misc/gh-ost/default.nix index d78e7f9439fd..17893ef18ae6 100644 --- a/pkgs/tools/misc/gh-ost/default.nix +++ b/pkgs/tools/misc/gh-ost/default.nix @@ -2,8 +2,8 @@ let goPackagePath = "github.com/github/gh-ost"; - version = "1.0.47"; - sha256 = "0yyhkqis4j2cl6w2drrjxdy5j8x9zp4j89gsny6w4ql8gm5qgvvk"; + version = "1.0.49"; + sha256 = "0mncjhmv25wnhgjkn9gwkz2gzh0v6954w47ql7fs2iqr9al111dq"; in buildGoPackage ({ diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index 17ea28724782..8530d04b49a3 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "graylog"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "1ydplg2lifql5s4bh64a4lwqp1q5vrvbljhn1pnxv9vz0ab73q1k"; + sha256 = "1jcv2dqm49vbz810ypv024r3lqgz804l06yhhwshrih61xzj7dvh"; }; dontBuild = true; diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix index 5dbcc7479e5d..ec6c16f53131 100644 --- a/pkgs/tools/misc/graylog/plugins.nix +++ b/pkgs/tools/misc/graylog/plugins.nix @@ -64,10 +64,10 @@ in { enterprise-integrations = glPlugin rec { name = "graylog-enterprise-integrations-${version}"; pluginName = "graylog-plugin-enterprise-integrations"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { url = "https://downloads.graylog.org/releases/graylog-enterprise-integrations/graylog-enterprise-integrations-plugins-${version}.tgz"; - sha256 = "1480ccii3nzvm0jp1xm2iddgc789zcwbgd19201q7p3v0ph02yj8"; + sha256 = "0la91f5hfakrp5d37q3r1z15zzya9vmwgp8gf5ifkh6fasa811ll"; }; installPhase = '' mkdir -p $out/bin @@ -75,7 +75,7 @@ in { cp ${pluginName}-${version}.jar $out/bin/${pluginName}-${version}.jar ''; meta = { - homepage = "https://docs.graylog.org/en/3.2/pages/integrations.html#enterprise"; + homepage = "https://docs.graylog.org/en/3.3/pages/integrations.html#enterprise"; description = "Integrations are tools that help Graylog work with external systems (unfree enterprise integrations)"; license = stdenv.lib.licenses.unfree; }; @@ -96,10 +96,10 @@ in { integrations = glPlugin rec { name = "graylog-integrations-${version}"; pluginName = "graylog-plugin-integrations"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { url = "https://downloads.graylog.org/releases/graylog-integrations/graylog-integrations-plugins-${version}.tgz"; - sha256 = "08cpxviwk2p4zsgbr2h3symr88rf3fjfz1kkg4iglvdc5mqf71xx"; + sha256 = "1k90q50p4ly9d8fj0riyb1xw0bd6f8wm2xmkr71908j2v0jaskpq"; }; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index 71b7f9c6cd47..2d56ab9c09bd 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ncdu"; - version = "1.15"; + version = "1.15.1"; src = fetchurl { url = "https://dev.yorhel.nl/download/${pname}-${version}.tar.gz"; - sha256 = "1ywpa8yg74a5xa46f0qig92xw5z5s1lmspwzcslr497brk2ksnaa"; + sha256 = "1c1zxalm5asyhn4p1hd51h7khw17515gbqmvdz63kc8xpx6xqbdh"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 09dba27a1efe..cb8cf1ec0a8e 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2020.10"; + version = "1.2020.12"; pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "00azasannh77ns3wpy6yrlw77pgq89frx0f4c7gk1gqiqjavsvdy"; + sha256 = "0c0270kjw8vg8nphharap2p66yl72j5k4k3s5r9klafgp3sg4sjj"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index 4dd440850120..2ea1668409a5 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "rmlint"; - version = "2.10.0"; + version = "2.10.1"; src = fetchFromGitHub { owner = "sahib"; repo = "rmlint"; rev = "v${version}"; - sha256 = "1r7j1bmm83p6wdw0jhvkm4sa568r534zsy45bvas7qq4433jl019"; + sha256 = "15xfkcw1bkfyf3z8kl23k3rlv702m0h7ghqxvhniynvlwbgh6j2x"; }; CFLAGS="-I${stdenv.lib.getDev utillinux}/include"; diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index e9ee91de6776..8a0c881a277b 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, udev, intltool, pkgconfig, glib, xmlto, wrapGAppsHook +{ stdenv, fetchFromGitHub, fetchpatch, udev, intltool, pkgconfig, glib, xmlto, wrapGAppsHook , docbook_xml_dtd_412, docbook_xsl , libxml2, desktop-file-utils, libusb1, cups, gdk-pixbuf, pango, atk, libnotify , gobject-introspection, libsecret, packagekit @@ -24,7 +24,20 @@ stdenv.mkDerivation rec { substituteInPlace Makefile.am --replace /bin/bash ${bash}/bin/bash ''; - patches = [ ./detect_serverbindir.patch ]; + patches = [ + ./detect_serverbindir.patch + + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=958104 + # (Fixes will be included in next upstream release.) + (fetchpatch { + url = "https://github.com/OpenPrinting/system-config-printer/commit/cf9903466c1a2d18a701f3b5e8c7e03483e1244d.patch"; + sha256 = "03gpav618w50q90m2kdkgwclc7fv17m493fgjd633zfavb5kqr3n"; + }) + (fetchpatch { + url = "https://github.com/OpenPrinting/system-config-printer/commit/b9289dfe105bdb502f183f0afe7a115ecae5f2af.patch"; + sha256 = "12w47hy3ly4phh8jcqxvdnd5sgbnbp8dnscjd7d5y2i43kxj7b23"; + }) + ]; buildInputs = [ glib udev libusb1 cups diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 529252901a4a..21e464c6d29e 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "4.5.0"; + version = "4.7.0"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "0df79vlbclv1qx4zwir728c6ggqfawxh2x1py16m5q0ga1hd799j"; + sha256 = "1hg03mj3rd778hq1856139nwz7y5gykwvg7xhxlsiabv7gr06m2m"; }; - cargoSha256 = "0wwxh71i94h68sryckbvrr43gd19qjcs0cgcpycnimkhdcdy8nlj"; + cargoSha256 = "14qv2157jhj7hilvqi3c00p11rzv0vvimr4d34nyspgzxz2si6sm"; buildInputs = lib.optional stdenv.isDarwin Foundation; diff --git a/pkgs/tools/misc/txt2man/default.nix b/pkgs/tools/misc/txt2man/default.nix index c7d8837f8235..6013dc1c26b9 100644 --- a/pkgs/tools/misc/txt2man/default.nix +++ b/pkgs/tools/misc/txt2man/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "txt2man"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { url = "https://github.com/mvertes/txt2man/archive/${pname}-${version}.tar.gz"; - sha256 = "168cj96974n2z0igin6j1ic1m45zyic7nm5ark7frq8j78rrx4zn"; + sha256 = "06jf8hqav095db1v3njavx0rphmpmi3mgki4va6qkxjnvmdx4742"; }; preConfigure = '' diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index dc2d3cf8a1e8..94f4de6e364f 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,5 +1,5 @@ { lib, fetchurl, buildPythonPackage -, zip, ffmpeg_4, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc +, zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc # Pandoc is required to build the package's man page. Release tarballs contain a # formatted man page already, though, it will still be installed. We keep the # manpage argument in place in case someone wants to use this derivation to @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2020.06.06"; + version = "2020.06.16.1"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "1qrrr14glv0jv377n61paq55b6k58jpnwbz2sp5xfl4wnxy5hqny"; + sha256 = "1q0080cvxpfakgbzigbnl9adnga3jz1sqig2rsiq52rarqbc01px"; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -36,7 +36,7 @@ buildPythonPackage rec { makeWrapperArgs = let packagesToBinPath = [ atomicparsley ] - ++ lib.optional ffmpegSupport ffmpeg_4 + ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional rtmpSupport rtmpdump ++ lib.optional phantomjsSupport phantomjs2; in [ ''--prefix PATH : "${lib.makeBinPath packagesToBinPath}"'' ]; diff --git a/pkgs/tools/networking/acme-client/default.nix b/pkgs/tools/networking/acme-client/default.nix index 06c2898248d0..00f8778cafd5 100644 --- a/pkgs/tools/networking/acme-client/default.nix +++ b/pkgs/tools/networking/acme-client/default.nix @@ -1,7 +1,5 @@ { stdenv -, fetchFromGitHub -, autoreconfHook -, bison +, fetchurl , apple_sdk ? null , libbsd , libressl @@ -12,22 +10,20 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "acme-client"; - version = "0.2.5"; + version = "1.0.1"; - src = fetchFromGitHub { - owner = "graywolf"; - repo = "acme-client-portable"; - rev = "v${version}"; - sha256 = "1d9yk87nj5gizkq26m4wqfh4xhlrn5xlfj7mfgvrpsdiwibqxrrw"; + src = fetchurl { + url = "https://data.wolfsden.cz/sources/acme-client-${version}.tar.xz"; + sha256 = "0gmdvmyw8a61w08hrxllypf7rpnqg0fxipbk3zmvsxj7m5i6iysj"; }; - nativeBuildInputs = [ autoreconfHook bison pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libbsd libressl ] ++ optional stdenv.isDarwin apple_sdk.sdk; makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = { - homepage = "https://github.com/graywolf/acme-client-portable"; + homepage = "https://sr.ht/~graywolf/acme-client-portable/"; description = "Secure ACME/Let's Encrypt client"; platforms = platforms.unix; license = licenses.isc; diff --git a/pkgs/tools/networking/dnscrypt-proxy2/default.nix b/pkgs/tools/networking/dnscrypt-proxy2/default.nix index 508d9ecd0f30..d5b92c17a65a 100644 --- a/pkgs/tools/networking/dnscrypt-proxy2/default.nix +++ b/pkgs/tools/networking/dnscrypt-proxy2/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "dnscrypt-proxy2"; - version = "2.0.43"; + version = "2.0.44"; vendorSha256 = null; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "DNSCrypt"; repo = "dnscrypt-proxy"; rev = version; - sha256 = "1c12y8h7dww72a3agb74vr5fzxzy6k8394rdbgz9knk82fdwah1c"; + sha256 = "08bg60j5z349blj5sip1f8f793q12ix3zmqkayym5nf69s1pfm7l"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix index a52088ed231d..7ecfb559dcc7 100644 --- a/pkgs/tools/networking/flannel/default.nix +++ b/pkgs/tools/networking/flannel/default.nix @@ -4,7 +4,7 @@ with lib; buildGoPackage rec { pname = "flannel"; - version = "0.11.0"; + version = "0.12.0"; rev = "v${version}"; goPackagePath = "github.com/coreos/flannel"; @@ -13,7 +13,7 @@ buildGoPackage rec { inherit rev; owner = "coreos"; repo = "flannel"; - sha256 = "0akxlrrsm2w51g0qd7dnsdy0hdajx98sdhxw4iknjr2kn7j3gph9"; + sha256 = "04g7rzgyi3xs3sf5p1a9dmd08crdrz6y1b02ziv3444qk40jyswd"; }; meta = { diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 7c6e6ada4c5a..b686ea4d04f2 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -9,13 +9,13 @@ assert upnpSupport -> miniupnpc != null; stdenv.mkDerivation rec { pname = "i2pd"; - version = "2.30.0"; + version = "2.32.1"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "1wvn8hs2ps3yzxzv05jnbm7zr1v8gv0phbx38m7l5xhqjmrpnscw"; + sha256 = "15ng2c7i3jxmhpc2q0dl8arc72qbsq9y9paz5hgln907yy7dqx7c"; }; buildInputs = with stdenv.lib; [ boost zlib openssl ] diff --git a/pkgs/tools/networking/memtier-benchmark/default.nix b/pkgs/tools/networking/memtier-benchmark/default.nix index 3579002e4169..a45c3a2e33a1 100644 --- a/pkgs/tools/networking/memtier-benchmark/default.nix +++ b/pkgs/tools/networking/memtier-benchmark/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "memtier-benchmark"; - version = "1.2.17"; + version = "1.3.0"; src = fetchFromGitHub { owner = "redislabs"; repo = "memtier_benchmark"; rev = "refs/tags/${version}"; - sha256 = "18cka6sv3w8ffa81126nzi04if9g1wd3i3apxsgmv7xm2p8fsa39"; + sha256 = "0m2qnnc71qpdj8w421bxn0zxz6ddvzy7b0n19jvyncnzvk1ff0sq"; }; patchPhase = '' diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index bd1c02f9b545..a5e46c6bc575 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; let repo = "openfortivpn"; - version = "1.14.0"; + version = "1.14.1"; in stdenv.mkDerivation { name = "${repo}-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "adrienverge"; inherit repo; rev = "v${version}"; - sha256 = "1qn48sp3ydbik7nc9x5l22gvvnr99f89jy1lvnf64bdg218kr0z7"; + sha256 = "1r9lp19fmqx9dw33j5967ydijbnacmr80mqnhbbxyqiw4k5c10ds"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index fdcf9832e667..fee282de52fc 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -1,15 +1,15 @@ -{ stdenv +{ stdenv, lib , pkgconfig, autoreconfHook , fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libarchive, nspr, nss, popt, db, xz, python, lua }: stdenv.mkDerivation rec { pname = "rpm"; - version = "4.14.2.1"; + version = "4.15.1"; src = fetchurl { - url = "http://ftp.rpm.org/releases/rpm-4.14.x/rpm-${version}.tar.bz2"; - sha256 = "1nmck2fq9h85fgs3zhh6w1avlw5y16cbz5khd459ry3jfd5w4f8i"; + url = "http://ftp.rpm.org/releases/rpm-${lib.versions.majorMinor version}.x/rpm-${version}.tar.bz2"; + sha256 = "0c6jwail90fhha3bpx70w4a2i8ycxwvnx6zwxm121l8wc3wlbvyx"; }; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/tools/security/bitwarden_rs/default.nix b/pkgs/tools/security/bitwarden_rs/default.nix index 158485dc982f..f2d0eb9b7d3a 100644 --- a/pkgs/tools/security/bitwarden_rs/default.nix +++ b/pkgs/tools/security/bitwarden_rs/default.nix @@ -8,13 +8,13 @@ let in rustPlatform.buildRustPackage rec { pname = "bitwarden_rs"; - version = "1.15.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "dani-garcia"; repo = pname; rev = version; - sha256 = "12mr7d0mjlh7za4nc3s7cizzbd6v0zfmd7q9s0f7pqz56vw5m21s"; + sha256 = "1982bfprixdp8mx2hwidfvsi0zy7wmzf40m9m3cl5r7i2qydznwb"; }; nativeBuildInputs = [ pkgconfig ]; @@ -25,7 +25,7 @@ in rustPlatform.buildRustPackage rec { RUSTC_BOOTSTRAP = 1; - cargoSha256 = "0nacc8xvbkdzbyx4c17hdh03v9ykpis74pbpxkn6v95njw14wq53"; + cargoSha256 = "08cygzgv82i10cj8lkjdah0arrdmlfcbdjwc8piwa629rr0584zf"; cargoBuildFlags = [ featuresFlag ]; checkPhase = '' diff --git a/pkgs/tools/security/certstrap/default.nix b/pkgs/tools/security/certstrap/default.nix index fb3c00e48f91..4d2e2fe7e950 100644 --- a/pkgs/tools/security/certstrap/default.nix +++ b/pkgs/tools/security/certstrap/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "certstrap"; - version = "1.1.1"; + version = "1.2.0"; goPackagePath = "github.com/square/certstrap"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "square"; repo = "certstrap"; rev = "v${version}"; - sha256 = "0j7gi2nzykny7i0gjax9vixw72l9jcm4wnwxgm72hh1pji0ysa8n"; + sha256 = "1ymchnn7c9g3pq7rw4lrwsd6z3wfjx90g7qgrw6r5hssl77mnscj"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/chipsec/default.nix b/pkgs/tools/security/chipsec/default.nix index 387fa4d750bd..5dccf295065c 100644 --- a/pkgs/tools/security/chipsec/default.nix +++ b/pkgs/tools/security/chipsec/default.nix @@ -2,13 +2,13 @@ , kernel ? null, withDriver ? false }: pythonPackages.buildPythonApplication rec { pname = "chipsec"; - version = "1.4.9"; + version = "1.5.1"; src = fetchFromGitHub { owner = "chipsec"; repo = "chipsec"; rev = version; - sha256 = "1p6w8294w5z2f4jwc22mqaggv5qajvmf9iifv7fl7wdz3wsvskrk"; + sha256 = "1rxr9i08a22m15slvlkrhnki30jixi2ds096kmmc2nqzfr9yibmb"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/keycard-cli/default.nix b/pkgs/tools/security/keycard-cli/default.nix index a76c102b2bb9..73eab6c3dec9 100644 --- a/pkgs/tools/security/keycard-cli/default.nix +++ b/pkgs/tools/security/keycard-cli/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "keycard-cli"; - version = "0.0.12"; + version = "0.4.0"; goPackagePath = "github.com/status-im/keycard-cli"; subPackages = [ "." ]; @@ -14,7 +14,7 @@ buildGoPackage rec { owner = "status-im"; repo = pname; rev = version; - sha256 = "1jnbaq57i6i9bad1hcvd28mxfqq6v8rv806c6l74vlb79ff4v1wb"; + sha256 = "0917vl5lw8wgvyn5l8q6xa8bqh342fibaa38syr8hmz8b09qkh38"; }; buildFlagsArray = [ diff --git a/pkgs/tools/security/rage/default.nix b/pkgs/tools/security/rage/default.nix index cdba2f2beb01..26ae27dff6b2 100644 --- a/pkgs/tools/security/rage/default.nix +++ b/pkgs/tools/security/rage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, Security }: +{ stdenv, rustPlatform, fetchFromGitHub, installShellFiles, Security }: rustPlatform.buildRustPackage rec { pname = "rage"; @@ -13,8 +13,20 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "08njl8irkqkfxj54pz4sx3l9aqb40h10wxb82zza52pqd4zapgn6"; + nativeBuildInputs = [ installShellFiles ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + postBuild = '' + cargo run --example generate-docs + cargo run --example generate-completions + ''; + + postInstall = '' + installManPage target/manpages/* + installShellCompletion target/completions/*.{bash,fish,zsh} + ''; + meta = with stdenv.lib; { description = "A simple, secure and modern encryption tool with small explicit keys, no config options, and UNIX-style composability"; homepage = "https://github.com/str4d/rage"; diff --git a/pkgs/tools/security/tpm2-abrmd/default.nix b/pkgs/tools/security/tpm2-abrmd/default.nix index fbebde2e7bf6..6fe116d7015a 100644 --- a/pkgs/tools/security/tpm2-abrmd/default.nix +++ b/pkgs/tools/security/tpm2-abrmd/default.nix @@ -1,24 +1,44 @@ -{ stdenv, fetchurl, lib -, tpm2-tss, pkgconfig, glib, which, dbus, cmocka }: +{ stdenv, lib, fetchFromGitHub +, autoreconfHook, pkg-config, autoconf-archive, makeWrapper, which +, tpm2-tss, glib, dbus +, cmocka +}: stdenv.mkDerivation rec { pname = "tpm2-abrmd"; - version = "2.2.0"; + version = "2.3.2"; - src = fetchurl { - url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "1lbfhyyh9k54r8s1h8ca2czxv4hg0yq984kdh3vqh3990aca0x9a"; + src = fetchFromGitHub { + owner = "tpm2-software"; + repo = pname; + rev = version; + sha256 = "0jzglnlb700clcq6mjhhgvcq29a6893h888wsn9fbrh4f255sw8q"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - tpm2-tss glib which dbus cmocka - ]; + nativeBuildInputs = [ pkg-config makeWrapper autoreconfHook autoconf-archive which ]; + buildInputs = [ tpm2-tss glib dbus ]; + checkInputs = [ cmocka ]; + + enableParallelBuilding = true; + + # Emulate the required behavior of ./bootstrap in the original + # package + preAutoreconf = '' + echo "${version}" > VERSION + ''; # Unit tests are currently broken as the check phase attempts to start a dbus daemon etc. #configureFlags = [ "--enable-unit" ]; doCheck = false; + # Even though tpm2-tss is in the RUNPATH, starting from 2.3.0 abrmd + # seems to require the path to the device TCTI (used for accessing + # /dev/tpm0) in it's LD_LIBRARY_PATH + postFixup = '' + wrapProgram $out/bin/tpm2-abrmd \ + --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ tpm2-tss ]}" + ''; + meta = with lib; { description = "TPM2 resource manager, accessible via D-Bus"; homepage = "https://github.com/tpm2-software/tpm2-tools"; diff --git a/pkgs/tools/system/di/default.nix b/pkgs/tools/system/di/default.nix index 239544d20a6d..0a6ae26547bf 100644 --- a/pkgs/tools/system/di/default.nix +++ b/pkgs/tools/system/di/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "di"; - version = "4.47.3"; + version = "4.48"; src = fetchurl { url = "https://gentoo.com/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0m4npba50sf5s61g5z3xd2r7937zwja941f2h3f081xi24c2hfck"; + sha256 = "0crvvfsxh8ryc0j19a2x52i9zacvggm8zi6j3kzygkcwnpz4km8r"; }; makeFlags = [ "INSTALL_DIR=$(out)" ]; diff --git a/pkgs/tools/virtualization/govc/default.nix b/pkgs/tools/virtualization/govc/default.nix index e3329ea13f11..433da1b07f27 100644 --- a/pkgs/tools/virtualization/govc/default.nix +++ b/pkgs/tools/virtualization/govc/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "govc"; - version = "0.22.1"; + version = "0.23.0"; goPackagePath = "github.com/vmware/govmomi"; @@ -12,7 +12,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "vmware"; repo = "govmomi"; - sha256 = "1z4am6143jrrls0023flnqgadm1z9p60w09cp1j5pnslm60vvw78"; + sha256 = "05nb5xd90kbazdx4l9bw72729dh5hrcaqdi9wpf5ma7bz7mw9wzi"; }; meta = { |