diff options
Diffstat (limited to 'pkgs/tools/misc')
52 files changed, 559 insertions, 225 deletions
diff --git a/pkgs/tools/misc/abduco/default.nix b/pkgs/tools/misc/abduco/default.nix index cdfb57fc5f0e..4fc254b76b40 100644 --- a/pkgs/tools/misc/abduco/default.nix +++ b/pkgs/tools/misc/abduco/default.nix @@ -10,9 +10,11 @@ stdenv.mkDerivation rec { license = licenses.isc; description = "Allows programs to be run independently from its controlling terminal"; maintainers = with maintainers; [ pSub ]; - platforms = platforms.linux; + platforms = platforms.unix; }; + CFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE"; + src = fetchurl { url = "http://www.brain-dump.org/projects/abduco/${name}.tar.gz"; sha256 = "1x1m58ckwsprljgmdy93mvgjyg9x3cqrzdf3mysp0mx97zhhj2f9"; diff --git a/pkgs/tools/misc/agedu/default.nix b/pkgs/tools/misc/agedu/default.nix index 2f9615a1fdbb..d0254e9ce9f5 100644 --- a/pkgs/tools/misc/agedu/default.nix +++ b/pkgs/tools/misc/agedu/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchgit, autoreconfHook, halibut}: let - date = "20180522"; - rev = "5b12791"; + date = "20180918"; + rev = "80c7beb"; in stdenv.mkDerivation { name = "agedu-${date}.${rev}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchgit { url = https://git.tartarus.org/simon/agedu.git; inherit rev; - sha256 = "1zyxif0i3yil4xm8y9aqk6wsdwi7b3jg682lv6ds6a6bl047fz1q"; + sha256 = "0i930izna3s73p2q52qa377ixd14zij5q1n7w3irl7csyy78g0cd"; }; nativeBuildInputs = [autoreconfHook halibut]; diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index 03895f6c8478..0cacfa6e54e4 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -1,24 +1,28 @@ -{ stdenv, rustPlatform, fetchFromGitHub, cmake, pkgconfig, zlib, libiconv, darwin }: +{ stdenv, rustPlatform, fetchFromGitHub, cmake, pkgconfig, zlib +, Security, libiconv +}: rustPlatform.buildRustPackage rec { name = "bat-${version}"; - version = "0.6.1"; + version = "0.7.1"; src = fetchFromGitHub { owner = "sharkdp"; repo = "bat"; rev = "v${version}"; - sha256 = "19xmj3a3npx4v1mlvd31r3icml73mxjq6la5qifb2i35ciqnx9bd"; + sha256 = "1fzk0z7r70rjvv2c6531zaa1jzbcb7j9wbi0xqb9y4dls538bmz0"; fetchSubmodules = true; }; - cargoSha256 = "062vvpj514h85h9gm3jipp6z256cnnbxbjy7ja6bm7i6bpglyvvi"; + cargoSha256 = "19syz0sxcpk3i4675bfq5gpb9i6hp81in36w820kkvamaimq10nd"; nativeBuildInputs = [ cmake pkgconfig zlib ]; - buildInputs = [ libiconv ] ++ stdenv.lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security libiconv ]; + + postInstall = '' + install -m 444 -Dt $out/share/man/man1 doc/bat.1 + ''; meta = with stdenv.lib; { description = "A cat(1) clone with syntax highlighting and Git integration"; diff --git a/pkgs/tools/misc/bibutils/default.nix b/pkgs/tools/misc/bibutils/default.nix index d0434ebe28b4..d7cca2a77bdc 100644 --- a/pkgs/tools/misc/bibutils/default.nix +++ b/pkgs/tools/misc/bibutils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bibutils-${version}"; - version = "6.6"; + version = "6.7"; src = fetchurl { url = "mirror://sourceforge/bibutils/bibutils_${version}_src.tgz"; - sha256 = "1zqwhjsngnflzdp2nd3762bvmkjq5mal417fly1n2xfgdqpg37ps"; + sha256 = "072cmhv692nk1lfcwmaqid5gpg8q4jc4vai5ss8lj72zms32p882"; }; configureFlags = [ "--dynamic" "--install-dir" "$(out)/bin" "--install-lib" "$(out)/lib" ]; diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index e154e217e951..c799b08bd446 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "calamares"; - version = "3.2.1"; + version = "3.2.2"; # release including submodule src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.gz"; - sha256 = "06i1fivcdzdf6fzj4db3izqcgy5q4wwgsmlx24szi88rd2j6prx9"; + sha256 = "14hsv2m0jza33kf68l3rhqfjj7224fmvgvk1kg2qwhvplpjdn16v"; }; buildInputs = [ diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix index 97c0251d9d64..0eff3f0c3916 100644 --- a/pkgs/tools/misc/cloc/default.nix +++ b/pkgs/tools/misc/cloc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "cloc-${version}"; - version = "1.76"; + version = "1.78"; src = fetchFromGitHub { owner = "AlDanial"; repo = "cloc"; - rev = "v${version}"; - sha256 = "03z4ar959ximsddd92zchi013lh82ganzisk309y3b09q10hl9k7"; + rev = version; + sha256 = "030cnvl83hgynri3jimhhqp238375m1g6liqfiggl0habrnlbck2"; }; setSourceRoot = '' diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/tools/misc/cloud-utils/default.nix index fd6df64e5e76..bda8ebcf3b0e 100644 --- a/pkgs/tools/misc/cloud-utils/default.nix +++ b/pkgs/tools/misc/cloud-utils/default.nix @@ -30,5 +30,8 @@ stdenv.mkDerivation rec { dontBuild = true; - meta.platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + platforms = platforms.unix; + license = licenses.gpl3; + }; } diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 6ffdd3b5d47d..3d1c7145698c 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -1,8 +1,11 @@ { stdenv, lib, buildPackages , autoreconfHook, texinfo, fetchurl, perl, xz, libiconv, gmp ? null -, aclSupport ? false, acl ? null -, attrSupport ? false, attr ? null +, aclSupport ? stdenv.isLinux, acl ? null +, attrSupport ? stdenv.isLinux, attr ? null , selinuxSupport? false, libselinux ? null, libsepol ? null +# No openssl in default version, so openssl-induced rebuilds aren't too big. +# It makes *sum functions significantly faster. +, minimal ? true, withOpenssl ? !minimal, openssl ? null , withPrefix ? false , singleBinary ? "symlinks" # you can also pass "shebangs" or false }: @@ -36,9 +39,10 @@ stdenv.mkDerivation rec { outputs = [ "out" "info" ]; nativeBuildInputs = [ perl xz.bin ]; - configureFlags = - optional (singleBinary != false) + configureFlags = [ "--with-packager=https://NixOS.org" ] + ++ optional (singleBinary != false) ("--enable-single-binary" + optionalString (isString singleBinary) "=${singleBinary}") + ++ optional withOpenssl "--with-openssl" ++ optional stdenv.hostPlatform.isSunOS "ac_cv_func_inotify_init=no" ++ optional withPrefix "--program-prefix=g" ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.libc == "glibc") [ @@ -51,6 +55,7 @@ stdenv.mkDerivation rec { buildInputs = [ gmp ] ++ optional aclSupport acl ++ optional attrSupport attr + ++ optional withOpenssl openssl ++ optionals stdenv.hostPlatform.isCygwin [ autoreconfHook texinfo ] # due to patch ++ optionals selinuxSupport [ libselinux libsepol ] # TODO(@Ericson2314): Investigate whether Darwin could benefit too @@ -81,9 +86,13 @@ stdenv.mkDerivation rec { sed -i Makefile -e 's|^INSTALL =.*|INSTALL = ${buildPackages.coreutils}/bin/install -c|' ''; - postInstall = optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + postInstall = optionalString (stdenv.hostPlatform != stdenv.buildPlatform && !minimal) '' rm $out/share/man/man1/* cp ${buildPackages.coreutils}/share/man/man1/* $out/share/man/man1 + '' + # du: 8.7 M locale + 0.4 M man pages + + optionalString minimal '' + rm -r "$out/share" ''; meta = { diff --git a/pkgs/tools/misc/ddccontrol/automake.patch b/pkgs/tools/misc/ddccontrol/automake.patch deleted file mode 100644 index a890654ca7c7..000000000000 --- a/pkgs/tools/misc/ddccontrol/automake.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/gnome-ddcc-applet/Makefile.am b/src/gnome-ddcc-applet/Makefile.am -index d85ff56..b13e74c 100644 ---- a/src/gnome-ddcc-applet/Makefile.am -+++ b/src/gnome-ddcc-applet/Makefile.am -@@ -6,7 +6,8 @@ DDCC_LDADD = ../lib/libddccontrol.la - - EXTRA_DIST = GNOME_ddcc-applet.server.in.in GNOME_ddcc-applet.xml - --pkglib_PROGRAMS = ddcc-applet -+programfilesdir = $(pkglibdir) -+programfiles_PROGRAMS = ddcc-applet - ddcc_applet_SOURCES = ddcc-applet.c ddcc-applet.h - - ddcc_applet_LDADD = $(GNOME_LDFLAGS) $(DDCC_LDADD) diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix index b03a286d2022..8453aa677477 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -1,36 +1,39 @@ -{ stdenv, fetchurl, autoreconfHook, intltool, perl, perlPackages, libxml2 +{ stdenv, fetchFromGitHub, autoreconfHook, intltool, libxml2 , pciutils, pkgconfig, gtk2, ddccontrol-db , makeDesktopItem }: -let version = "0.4.2"; in +let version = "0.4.4"; in stdenv.mkDerivation rec { name = "ddccontrol-${version}"; - src = fetchurl { - url = "mirror://sourceforge/ddccontrol/ddccontrol-${version}.tar.bz2"; - sha1 = "fd5c53286315a61a18697a950e63ed0c8d5acff1"; + src = fetchFromGitHub { + owner = "ddccontrol"; + repo = "ddccontrol"; + rev = "0.4.4"; + sha256 = "09npy6z2j3jrvpvlr46vih31y2mbrh7wsqlbrjprxjv1j0kkz5q2"; }; nativeBuildInputs = [ autoreconfHook intltool pkgconfig ]; buildInputs = [ - perl perlPackages.libxml_perl libxml2 pciutils gtk2 ddccontrol-db + libxml2 + pciutils + gtk2 + ddccontrol-db ]; - patches = [ ./automake.patch ]; - hardeningDisable = [ "format" "bindnow" ]; prePatch = '' - newPath=$(echo "${ddccontrol-db}/share/ddccontrol-db" | sed "s/\\//\\\\\\//g") - mv configure.ac configure.ac.old - oldPath="\$" - oldPath+="{datadir}\/ddccontrol-db" - sed "s/$oldPath/$newPath/" <configure.ac.old >configure.ac - rm configure.ac.old - - sed -e "s/chmod 4711/chmod 0711/" -i src/ddcpci/Makefile* + oldPath="\$""{datadir}/ddccontrol-db" + newPath="${ddccontrol-db}/share/ddccontrol-db" + sed -i -e "s|$oldPath|$newPath|" configure.ac + sed -i -e "s/chmod 4711/chmod 0711/" src/ddcpci/Makefile* + ''; + + preConfigure = '' + intltoolize --force ''; postInstall = '' @@ -53,10 +56,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A program used to control monitor parameters by software"; - homepage = http://ddccontrol.sourceforge.net/; + homepage = https://github.com/ddccontrol/ddccontrol; license = licenses.gpl2; platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = [ stdenv.lib.maintainers.pakhfn ]; }; } - diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index a11e8a44de92..bb4302d8aaec 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -4,13 +4,13 @@ # There is also cdebootstrap now. Is that easier to maintain? stdenv.mkDerivation rec { name = "debootstrap-${version}"; - version = "1.0.107"; + version = "1.0.109"; src = fetchurl { # git clone git://git.debian.org/d-i/debootstrap.git # I'd like to use the source. However it's lacking the lanny script ? (still true?) url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz"; - sha256 = "1gq5r4fa0hrq4c69l2s0ygnfyvr90k2wqaq15s869hayhnssx4g1"; + sha256 = "117xgrv6mpszyndmsvkn4ynh57b2s40qc68bpmfmxggw58j42klw"; }; buildInputs = [ dpkg gettext gawk perl wget ]; diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/tools/misc/desktop-file-utils/default.nix index a6280ff4008a..70bc34954b2c 100644 --- a/pkgs/tools/misc/desktop-file-utils/default.nix +++ b/pkgs/tools/misc/desktop-file-utils/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { homepage = http://www.freedesktop.org/wiki/Software/desktop-file-utils; description = "Command line utilities for working with .desktop files"; platforms = platforms.linux ++ platforms.darwin; + license = licenses.gpl2; }; } diff --git a/pkgs/tools/misc/doitlive/default.nix b/pkgs/tools/misc/doitlive/default.nix index 3520d67abd21..a8ff34af9757 100644 --- a/pkgs/tools/misc/doitlive/default.nix +++ b/pkgs/tools/misc/doitlive/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "doitlive"; - version = "3.0.3"; + version = "4.0.1"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "19i16ca835rb3gal1sxyvpyilj9a80n6nikf0smlzmxck38x86fj"; + sha256 = "1icnjkczy52i3cp1fmsijqny571fz1h4b3wpdzz79cn90fr326pc"; }; - propagatedBuildInputs = with python3Packages; [ click ]; + propagatedBuildInputs = with python3Packages; [ click click-completion click-didyoumean ]; # disable tests (too many failures) doCheck = false; diff --git a/pkgs/tools/misc/dvtm/default.nix b/pkgs/tools/misc/dvtm/default.nix index f25d134ca790..58c602113ddb 100644 --- a/pkgs/tools/misc/dvtm/default.nix +++ b/pkgs/tools/misc/dvtm/default.nix @@ -9,6 +9,17 @@ stdenv.mkDerivation rec { sha256 = "0475w514b7i3gxk6khy8pfj2gx9l7lv2pwacmq92zn1abv01a84g"; }; + patches = [ + # https://github.com/martanne/dvtm/pull/69 + # Use self-pipe instead of signal blocking fixes issues on darwin. + (fetchurl { + url = "https://github.com/martanne/dvtm/commit/1f1ed664d64603f3f1ce1388571227dc723901b2.patch"; + sha256 = "1cby8x3ckvhzqa8yxlfrwzgm8wk7yz84kr9psdjr7xwpnca1cqrd"; + }) + ]; + + CFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE"; + postPatch = stdenv.lib.optionalString (customConfig != null) '' cp ${builtins.toFile "config.h" customConfig} ./config.h ''; @@ -28,7 +39,7 @@ stdenv.mkDerivation rec { description = "Dynamic virtual terminal manager"; homepage = http://www.brain-dump.org/projects/dvtm; license = licenses.mit; - platforms = platforms.linux; maintainers = [ maintainers.vrthra ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/ent/default.nix b/pkgs/tools/misc/ent/default.nix index f4354ad2416c..d4f69340d0ae 100644 --- a/pkgs/tools/misc/ent/default.nix +++ b/pkgs/tools/misc/ent/default.nix @@ -21,9 +21,10 @@ stdenv.mkDerivation rec { cp ent $out/bin/ ''; - meta = { + meta = with stdenv.lib; { description = "Pseudorandom Number Sequence Test Program"; homepage = http://www.fourmilab.ch/random/; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + license = licenses.publicDomain; }; } diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix index 0e0bc37ad537..105733e00333 100644 --- a/pkgs/tools/misc/ethtool/default.nix +++ b/pkgs/tools/misc/ethtool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ethtool-${version}"; - version = "4.17"; + version = "4.18"; src = fetchurl { url = "mirror://kernel/software/network/ethtool/${name}.tar.xz"; - sha256 = "11f5503mgcwjn1q4dvhjiqwnw3zmp2gbhirjvgfr71y72ys1wsy4"; + sha256 = "0461nwqp1z9a89nmxf7kq0r4jfl9c7fg55c71lfmc5y0siaqb54h"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix index 360808f4280b..f0dc3ab64604 100644 --- a/pkgs/tools/misc/execline/default.nix +++ b/pkgs/tools/misc/execline/default.nix @@ -1,27 +1,18 @@ -{ stdenv, fetchgit, skalibs }: +{ stdenv, skawarePackages }: -let +with skawarePackages; - version = "2.5.0.0"; +buildPackage { + pname = "execline"; + version = "2.5.0.1"; + sha256 = "0j8hwdw8wn0rv8njdza8fbgmvyjg7hqp3qlbw00i7fwskr7d21wd"; -in stdenv.mkDerivation rec { - - name = "execline-${version}"; - - src = fetchgit { - url = "git://git.skarnet.org/execline"; - rev = "refs/tags/v${version}"; - sha256 = "19vd8252g5bmzm4i9gybpj7i2mhsflcgfl4ns5k3g1vv7f69i1dn"; - }; + description = "A small scripting language, to be used in place of a shell in non-interactive scripts"; outputs = [ "bin" "lib" "dev" "doc" "out" ]; - dontDisableStatic = true; - - enableParallelBuilding = true; - + # TODO: nsss support configureFlags = [ - "--enable-absolute-paths" "--libdir=\${lib}/lib" "--dynlibdir=\${lib}/lib" "--bindir=\${bin}/bin" @@ -30,22 +21,15 @@ in stdenv.mkDerivation rec { "--with-include=${skalibs.dev}/include" "--with-lib=${skalibs.lib}/lib" "--with-dynlib=${skalibs.lib}/lib" - ] - ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]) - ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.hostPlatform.system}"); + ]; postInstall = '' - mkdir -p $doc/share/doc/execline + # remove all execline executables from build directory + rm $(find -type f -mindepth 1 -maxdepth 1 -executable) + rm libexecline.* + mv doc $doc/share/doc/execline/html mv examples $doc/share/doc/execline/examples ''; - meta = { - homepage = http://skarnet.org/software/execline/; - description = "A small scripting language, to be used in place of a shell in non-interactive scripts"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ]; - }; - } diff --git a/pkgs/tools/misc/fzy/default.nix b/pkgs/tools/misc/fzy/default.nix index f1b049ba2cee..6a04213e21ae 100644 --- a/pkgs/tools/misc/fzy/default.nix +++ b/pkgs/tools/misc/fzy/default.nix @@ -2,21 +2,22 @@ stdenv.mkDerivation rec { name = "fzy-${version}"; - version = "0.9"; + version = "1.0"; src = fetchFromGitHub { owner = "jhawthorn"; repo = "fzy"; rev = version; - sha256 = "1f1sh88ivdgnqaqha5ircfd9vb0xmss976qns022n0ddb91k5ka6"; + sha256 = "1gkzdvj73f71388jvym47075l9zw61v6l8wdv2lnc0mns6dxig0k"; }; makeFlags = "PREFIX=$(out)"; - meta = { + meta = with stdenv.lib; { description = "A better fuzzy finder"; homepage = https://github.com/jhawthorn/fzy; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; + license = licenses.mit; + maintainers = with maintainers; [ dywedir ]; + platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index 12c199801c71..b7ce52f49b36 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Real-time web log analyzer and interactive viewer that runs in a terminal in *nix systems"; - homepage = http://goaccess.prosoftcorp.com; + homepage = https://goaccess.io; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = with stdenv.lib.maintainers; [ ederoyd46 garbas ]; diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index 6ba931ad80d6..f5ba8b7fe100 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -1,52 +1,30 @@ {stdenv, fetchurl, autoreconfHook, texinfo, buggyBiosCDSupport ? true}: +let +in stdenv.mkDerivation { - name = "grub-0.97-patch-1.12"; + name = "grub-0.97-73"; src = fetchurl { url = ftp://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz; sha256 = "02r6b52r0nsp6ryqfiqchnl7r1d9smm80sqx24494gmx5p8ia7af"; }; - # Lots of patches from Gentoo, in particular splash screen support - # (not the fancy SUSE gfxmenu stuff though). Also a fix for boot - # failures on systems with more than 2 GiB RAM, and for booting from - # ext3 filesystems with 256-byte inodes as well as ext4 filesystems. - gentooPatches = fetchurl { - url = mirror://gentoo/distfiles/grub-0.97-patches-1.12.tar.bz2; - sha256 = "15xc5349hkzl03lbn2cadrmvjrf3s8sn147vv2142cwys9sdzkl0"; - }; - patches = [ # Properly handle the case of symlinks such as # /dev/disk/by-label/bla. The symlink resolution code in # grub-install isn't smart enough. ./symlink.patch - - # Provide support for the "savedefault --once" command in the Grub - # shell. KDE uses this to allow rebooting into a non-default - # entry. - (fetchurl { - url = "https://raw.github.com/andatche/centos-grub/master/SOURCES/grub-0.97-once.patch"; - sha256 = "1g5qfn8lvl32h4pggdf7dmjqjpi42jblknzakb5h909fi5i1qyw8"; - }) - - ] ++ (stdenv.lib.optional buggyBiosCDSupport ./buggybios.patch); + ] + ++ (stdenv.lib.optional buggyBiosCDSupport ./buggybios.patch) + ++ map fetchurl (import ./grub1.patches.nix) + ; # autoreconfHook required for the splashimage patch. nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ texinfo ]; - hardeningDisable = [ "stackprotector" ]; - - prePatch = '' - unpackFile $gentooPatches - rm patch/400_all_grub-0.97-reiser4-20050808-gentoo.patch - for i in patch/*.patch; do - echo "applying patch $i" - patch -p1 < $i || patch -p0 < $i - done - ''; + hardeningDisable = [ "format" "stackprotector" ]; passthru.grubTarget = ""; diff --git a/pkgs/tools/misc/grub/grub1.patches.nix b/pkgs/tools/misc/grub/grub1.patches.nix new file mode 100644 index 000000000000..5ee8722b5eca --- /dev/null +++ b/pkgs/tools/misc/grub/grub1.patches.nix @@ -0,0 +1,34 @@ +# Generated by grub1-patches.sh +let + prefix = "https://salsa.debian.org/grub-team/grub-legacy/raw/1dad5507d74ef97fdd3c6cf2a028084f6f2850c3/debian/patches"; +in +[ +{ url = "${prefix}/snapshot.patch"; sha256 = "0ixymrn5w1dq0kkxnzdjwwvhjchgyrlivfvnrfncxcv30v84xzna"; } +{ url = "${prefix}/menu.lst_gnu-hurd.patch"; sha256 = "0mz8dvgmxlyrl28dza1ncfq1xipihxgymw4aw688bgg7xxmw7jbs"; } +{ url = "${prefix}/graphics.patch"; sha256 = "1v9kp832f3rhncfdrd28djhw0zfrznfmiadch33mclnkcxprcqcs"; } +{ url = "${prefix}/raid.patch"; sha256 = "0cq6dz5s7m48g76frvbf296bv4pvqkxqcbydsvs43ymqdsary7hj"; } +{ url = "${prefix}/raid_cciss.patch"; sha256 = "0sy5xvzjsllgbn26nykkq4b69lp1fcwjkjs2kmxq38sk3dzadjfl"; } +{ url = "${prefix}/xfs_freeze.patch"; sha256 = "1wqgj8ar4x4zwa37bj4a7kldiz5v92msigy3cv879nnk6sz4rmhg"; } +{ url = "${prefix}/2gb_limit.patch"; sha256 = "06f9lfl4va3alz87wzli0df5ay0xxlqj2akr2dcay6jr27z6ks29"; } +{ url = "${prefix}/grub-special_device_names.patch"; sha256 = "098608xh20sqdjqf42fm2z23r8xd9ify1v0vmy1j9qhrhk3g9qyz"; } +{ url = "${prefix}/grub-xvd_drives.patch"; sha256 = "13k0m1c1w5d1d4qd1bshjc8kp7qba4agk2j64gb7mg8vfzjd35bj"; } +{ url = "${prefix}/initrd_max_address.patch"; sha256 = "05q90rxdnyncpanhbkrknshkk7g8ff4v8fpk7wj4sg8666d9llg3"; } +{ url = "${prefix}/splashimage_help.patch"; sha256 = "1lj3xh56wf1pdcf0fg585vmggrz7qqfzbhg91qv0rf4snf3ybfvr"; } +{ url = "${prefix}/grub-install_addsyncs.patch"; sha256 = "1dzcpxi806kw3j8mx4amyy4ibc0ir3qhqyyyxz3w43741p351r65"; } +{ url = "${prefix}/grub-install_regexp.patch"; sha256 = "0ph9lb63x858019c25aa3fpsm8rzn00ad8fp88yqqvq0xq2jxq69"; } +{ url = "${prefix}/grub-install_aoe_support.patch"; sha256 = "19szmvg13h2hhijrwbgdszldg26iz7vjnagvajxb7nav7vca6k3n"; } +{ url = "${prefix}/grub-install_xvd.patch"; sha256 = "1cgh731nhs0chj2r2dzh5dcfj5xmap34i3fk0i0aq59j83cwflgz"; } +{ url = "${prefix}/geometry-26kernel.patch"; sha256 = "01vka7jrxrwlj9m1d6schygyh964a3k1rdrm3j9x910xkz74i13n"; } +{ url = "${prefix}/print_func.patch"; sha256 = "0dvrcy1i58fgrv2x1qniqfr5az9b834hm5l94k0cy8ii2nfvk27g"; } +{ url = "${prefix}/mprotect.patch"; sha256 = "0ahgnhgw2b86j024ajs6m3h2fy2shqdssjzz0ahk8ny9f4mnvns6"; } +{ url = "${prefix}/savedefault.patch"; sha256 = "1l6x1s9mxkrf3k4j9dpg7qhvrk816vs70sw073iiisvqspnrz2j3"; } +{ url = "${prefix}/find-grub-dir.patch"; sha256 = "1vkgig4dylji03jflwikhap87lz8l470ck1bhmcy8jh0slg6ndbf"; } +{ url = "${prefix}/intelmac.patch"; sha256 = "04l9mk9xm9ml8vdlpbv3qbj7gbaa0g5k4dl7xp8wm7kmqwxd9l3m"; } +{ url = "${prefix}/crossreference_manpages.patch"; sha256 = "0kd12ck4s4bg414fmllgvq8n4b58i3kgdhmcx6riaz43gg2g2b9p"; } +{ url = "${prefix}/ext3_256byte_inode.patch"; sha256 = "0ay9svbdj7mw8p1ld0iiryg6nhd9hc1xpmr9rqg9990xzmg2h4pi"; } +{ url = "${prefix}/objcopy-absolute.patch"; sha256 = "0hkmicjli7bsmc56kr40ls21v6x3yd188xpwc08dvqxnb0763077"; } +{ url = "${prefix}/no-reorder-functions.patch"; sha256 = "0gmv0nzkqim2901hd0an90kwnr83155qp2zjp52biznad2p415gw"; } +{ url = "${prefix}/modern-automake.patch"; sha256 = "08l3y6cbk6gfj63kpqlpzrlain7nmvki7jjjxq86n7himj078znj"; } +{ url = "${prefix}/no-combine-stack-adjustments.patch"; sha256 = "0h4di8zja0rg45rs02x9qm8q1vxly1bcl6ms08wgdl5ywn6849nr"; } +{ url = "${prefix}/no-pie.patch"; sha256 = "0kshdsclza7lsd31apd28qq04arv42nd6wsj2v6q6jx7f8bgdaqw"; } +] diff --git a/pkgs/tools/misc/grub/grub1.patches.sh b/pkgs/tools/misc/grub/grub1.patches.sh new file mode 100755 index 000000000000..d3b138ad3577 --- /dev/null +++ b/pkgs/tools/misc/grub/grub1.patches.sh @@ -0,0 +1,70 @@ +#!/usr/bin/env nix-shell +#!nix-shell -p nix -i bash --pure + +# Does like `maintainers/scripts/debian-patches.sh`, but specialized for +# grub1 patches, and using the new salsa service. + +# Most common usage: `pkgs/tools/misc/grub/grub1.patches.sh pkgs/tools/misc/grub/grub1.patches.nix` +# That is, after updating the script with the new list from the series file, +# removing (by commenting) patches as required. + +set -e +set -u + +# https://salsa.debian.org/grub-team/grub-legacy/tree/master/debian/patches +SERIES=( + snapshot.patch + menu.lst_gnu-hurd.patch + graphics.patch + raid.patch + raid_cciss.patch + xfs_freeze.patch + 2gb_limit.patch + grub-special_device_names.patch + grub-xvd_drives.patch + initrd_max_address.patch + splashimage_help.patch + grub-install_addsyncs.patch + grub-install_regexp.patch + grub-install_aoe_support.patch + grub-install_xvd.patch + geometry-26kernel.patch + print_func.patch + mprotect.patch + savedefault.patch + find-grub-dir.patch + intelmac.patch + crossreference_manpages.patch + ext3_256byte_inode.patch + # Breaks on NixOS. + #use_grub-probe_in_grub-install.patch + objcopy-absolute.patch + no-reorder-functions.patch + + # We aren't building amd64 binaries, see #244498 + #fix_amd64_compile.patch + modern-automake.patch + no-combine-stack-adjustments.patch + no-pie.patch +) + +# Revision mapping to current tip of the 0.97-73 branch. +rev="1dad5507d74ef97fdd3c6cf2a028084f6f2850c3" +prefix="https://salsa.debian.org/grub-team/grub-legacy/raw/${rev}/debian/patches" +FILE="$1" +shift + +cat <<EOF > "$FILE" +# Generated by grub1-patches.sh +let + prefix = "${prefix}"; +in +[ +EOF + +for PATCH in "${SERIES[@]}"; do + URL="$prefix/$PATCH" + HASH="$(nix-prefetch-url "$URL")" + echo "{ url = \"\${prefix}/$PATCH\"; sha256 = \"$HASH\"; }" >> "$FILE" +done +echo "]" >> "$FILE" diff --git a/pkgs/tools/misc/hashit/default.nix b/pkgs/tools/misc/hashit/default.nix new file mode 100644 index 000000000000..69d73aafff92 --- /dev/null +++ b/pkgs/tools/misc/hashit/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, cmake, vala, python3, gnome3, gtk3, granite, gobjectIntrospection, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "hashit"; + version = "0.2.0"; + + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "artemanufrij"; + repo = pname; + rev = version; + sha256 = "1d2g7cm7hhs354waidak9xkhhcvqlwnsl9d0bar9p82gfnpjdg7v"; + }; + + nativeBuildInputs = [ + gobjectIntrospection + meson + ninja + pkgconfig + python3 + vala + wrapGAppsHook + ]; + + buildInputs = [ + granite + gtk3 + gnome3.libgee + ]; + + meta = with stdenv.lib; { + description = "A simple app for checking usual checksums"; + homepage = https://github.com/artemanufrij/hashit; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix index d0bbd10d1e51..ef3839f67de9 100644 --- a/pkgs/tools/misc/hdf4/default.nix +++ b/pkgs/tools/misc/hdf4/default.nix @@ -1,4 +1,5 @@ { stdenv +, fetchpatch , fetchurl , cmake , libjpeg @@ -14,6 +15,22 @@ stdenv.mkDerivation rec { sha256 = "0n29klrrbwan9307np0d9hr128dlpc4nnlf57a140080ll3jmp8l"; }; + patches = let + # The Debian patch revision to fetch from; this may differ from our package + # version, but older patches should still apply. + patchRev = "4.2.13-4"; + getPatch = name: sha256: fetchpatch { + inherit sha256; + url = "https://salsa.debian.org/debian-gis-team/hdf4/raw/debian/${patchRev}/debian/patches/${name}"; + }; + + in [ + (getPatch "64bit" "1xqk9zpch4m6ipa0f3x2cm8rwaz4p0ppp1vqglvz18j6q91p8b5y") + (getPatch "hdfi.h" "01fr9csylnvk9jd9jn9y23bvxy192s07p32pr76mm3gwhgs9h7r4") + (getPatch "hdf-4.2.10-aarch64.patch" "1hl0xw5pd9xhpq49xpwgg7c4z6vv5p19x6qayixw0myvgwj1r4zn") + (getPatch "reproducible-builds.patch" "02j639w26xkxpxx3pdhbi18ywz8w3qmjpqjb83n47gq29y4g13hc") + ]; + buildInputs = [ cmake libjpeg diff --git a/pkgs/tools/misc/hebcal/default.nix b/pkgs/tools/misc/hebcal/default.nix index fb6944c1cf36..da231c16cc90 100644 --- a/pkgs/tools/misc/hebcal/default.nix +++ b/pkgs/tools/misc/hebcal/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - version = "4.13"; + version = "4.14"; name = "hebcal-${version}"; src = fetchFromGitHub { owner = "hebcal"; repo = "hebcal"; rev = "v${version}"; - sha256 = "0h9hbfkbq620sw9gnnkivv7yi7dnp1k6axzwr0yccbv5cg67xs3h"; + sha256 = "1zq8f7cigh5r31p03az338sbygkx8gbday35c9acppglci3r8fvc"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix index bf5e04a511f7..991066690ee4 100644 --- a/pkgs/tools/misc/jdupes/default.nix +++ b/pkgs/tools/misc/jdupes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "jdupes-${version}"; - version = "1.10.2"; + version = "1.10.4"; src = fetchFromGitHub { owner = "jbruchon"; repo = "jdupes"; rev = "v${version}"; - sha256 = "0msp68h1gaipwpvdylpwd6w9al5gcmawj9cmvi7nw8ihh184g3m7"; + sha256 = "03a2jxv634xy5qwjrk784k3y3pd8f94pndf5m84yg2y7i8dvppnk"; # Unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation. The testdir # directories have such files and will be removed. diff --git a/pkgs/tools/misc/kdecoration-viewer/default.nix b/pkgs/tools/misc/kdecoration-viewer/default.nix index 62783bb30dff..5c2e410cd930 100644 --- a/pkgs/tools/misc/kdecoration-viewer/default.nix +++ b/pkgs/tools/misc/kdecoration-viewer/default.nix @@ -2,13 +2,13 @@ , cmake, extra-cmake-modules, qtquickcontrols, kconfigwidgets, kdeclarative, kdecoration }: stdenv.mkDerivation rec { - name = "kdecoration-viewer-2015-08-20"; + name = "kdecoration-viewer-2018-07-24"; src = fetchFromGitHub { owner = "KDE"; repo = "kdecoration-viewer"; - rev = "d7174acee01475fbdb71cfd48ca49d487a141701"; - sha256 = "1cc4xxv72a82p1w9r76090xba7g069r41bi4zx32k4gz3vyl1am6"; + rev = "6e50b39c651bbf92fd7e7116d43bf57288254288"; + sha256 = "01v6i081vx0mydqvnj05xli86m52v6bxxc3z1zlyyap9cfhag7lj"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/tools/misc/kt/default.nix b/pkgs/tools/misc/kt/default.nix index eb0f78e787ab..be0ceda511c4 100644 --- a/pkgs/tools/misc/kt/default.nix +++ b/pkgs/tools/misc/kt/default.nix @@ -18,5 +18,6 @@ buildGoPackage rec { homepage = https://github.com/fgeller/kt; maintainers = with maintainers; [ utdemir ]; platforms = with platforms; unix; + license = licenses.mit; }; } diff --git a/pkgs/tools/misc/lnav/default.nix b/pkgs/tools/misc/lnav/default.nix index 4d7c27a39445..85e4ecd3229b 100644 --- a/pkgs/tools/misc/lnav/default.nix +++ b/pkgs/tools/misc/lnav/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "tstack"; repo = "lnav"; rev = "v${meta.version}"; - sha256 = "0hq9ri6a18z682gihxlbh1rndka0v6brkdqsyfsgh4c2fgib4fb7"; + sha256 = "0wzzny0sgrq1ga9qw9nr8ly4j3vy4agszma73902dsw2rwf17j6y"; inherit name; }; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/tstack/lnav/releases"; license = licenses.bsd2; - version = "0.8.3"; + version = "0.8.4"; maintainers = [ maintainers.dochang ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/lockfile-progs/default.nix b/pkgs/tools/misc/lockfile-progs/default.nix index 308b5217a6fc..e851855834a4 100644 --- a/pkgs/tools/misc/lockfile-progs/default.nix +++ b/pkgs/tools/misc/lockfile-progs/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { _name = "lockfile-progs"; - version = "0.1.17"; + version = "0.1.18"; name = "${_name}-${version}"; src = fetchurl { url = "mirror://debian/pool/main/l/${_name}/${_name}_${version}.tar.gz"; - sha256 = "04f5cvhrld15w58wkg6k2azywszsc5xp9cbmfx4jylwrak90byq3"; + sha256 = "1rjwn3fh2hy8hmpr66y8yp7v5i3325v1mk0gr7pqhqbyp6j9aad4"; }; buildInputs = [ liblockfile ]; diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/tools/misc/mbuffer/default.nix index 664c5cc8e78e..5eefc94a2cd6 100644 --- a/pkgs/tools/misc/mbuffer/default.nix +++ b/pkgs/tools/misc/mbuffer/default.nix @@ -3,12 +3,12 @@ } : stdenv.mkDerivation rec { - version = "20180318"; + version = "20180625"; name = "mbuffer-${version}"; src = fetchurl { url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz"; - sha256 = "1sh0ipf77aav1k17dgl9dcjlb17zygs07x01g0nn0cg7yw5y5hfk"; + sha256 = "174m3zbm0qb68p1qng1vldcs23s7qjhyf7d39sw3r03m7y7f5g5p"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/misc/mdbtools/default.nix b/pkgs/tools/misc/mdbtools/default.nix index acb3bd9d3773..d251bee71d96 100644 --- a/pkgs/tools/misc/mdbtools/default.nix +++ b/pkgs/tools/misc/mdbtools/default.nix @@ -15,8 +15,10 @@ stdenv.mkDerivation { sed -e 's@static \(GHashTable [*]mdb_backends;\)@\1@' -i src/libmdb/backend.c ''; - meta = { + meta = with stdenv.lib; { description = ".mdb (MS Access) format tools"; - platforms = stdenv.lib.platforms.unix; + homepage = http://mdbtools.sourceforge.net; + platforms = platforms.unix; + license = with licenses; [ gpl2 lgpl2 ]; }; } diff --git a/pkgs/tools/misc/mdbtools/git.nix b/pkgs/tools/misc/mdbtools/git.nix index 2116815ed0c3..b275002e1105 100644 --- a/pkgs/tools/misc/mdbtools/git.nix +++ b/pkgs/tools/misc/mdbtools/git.nix @@ -26,8 +26,10 @@ stdenv.mkDerivation { sed -e 's@static \(GHashTable [*]mdb_backends;\)@\1@' -i src/libmdb/backend.c ''; - meta = { + meta = with stdenv.lib; { description = ".mdb (MS Access) format tools"; - platforms = stdenv.lib.platforms.linux; + homepage = http://mdbtools.sourceforge.net; + platforms = platforms.linux; + license = with licenses; [ gpl2 lgpl2 ]; }; } diff --git a/pkgs/tools/misc/noti/default.nix b/pkgs/tools/misc/noti/default.nix new file mode 100644 index 000000000000..23646abe7875 --- /dev/null +++ b/pkgs/tools/misc/noti/default.nix @@ -0,0 +1,42 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, Cocoa }: + +buildGoPackage rec { + name = "noti-${version}"; + version = "3.1.0"; + + src = fetchFromGitHub { + owner = "variadico"; + repo = "noti"; + rev = "${version}"; + sha256 = "1chsqfqk0pnhx5k2nr4c16cpb8m6zv69l1jvv4v4903zgfzcm823"; + }; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; + # TODO: Remove this when we update apple_sdk + NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.isDarwin [ "-fno-objc-arc" ]; + + goPackagePath = "github.com/variadico/noti"; + + preBuild = '' + buildFlagsArray+=("-ldflags" "-X ${goPackagePath}/internal/command.Version=${version}") + ''; + + postInstall = '' + mkdir -p $out/share/man/man{1,5}/ + cp $src/docs/man/noti.1 $out/share/man/man1/ + cp $src/docs/man/noti.yaml.5 $out/share/man/man5/ + ''; + + meta = with stdenv.lib; { + description = "Monitor a process and trigger a notification."; + longDescription = '' + Monitor a process and trigger a notification. + + Never sit and wait for some long-running process to finish. Noti can alert you when it's done. You can receive messages on your computer or phone. + ''; + homepage = https://github.com/variadico/noti; + license = licenses.mit; + maintainers = [ maintainers.stites ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/nvramtool/default.nix b/pkgs/tools/misc/nvramtool/default.nix new file mode 100644 index 000000000000..fdce7076661a --- /dev/null +++ b/pkgs/tools/misc/nvramtool/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchgit, iasl, flex, bison }: + +stdenv.mkDerivation rec { + name = "nvramtool-${version}"; + version = "4.8.1"; + + src = fetchgit { + url = "http://review.coreboot.org/p/coreboot"; + rev = "refs/tags/${version}"; + sha256 = "0nrf840jg4fn38zcnz1r10w2yfpvrk1nvsrnbbgdbgkmpjxz0zw9"; + }; + + nativeBuildInputs = [ flex bison ]; + buildInputs = [ iasl ]; + + buildPhase = '' + export LEX=${flex}/bin/flex + make -C util/nvramtool + ''; + + installPhase = '' + mkdir -p $out/bin + cp util/nvramtool/nvramtool $out/bin + ''; + + meta = with stdenv.lib; { + description = "utility for reading/writing coreboot parameters and displaying information from the coreboot table in CMOS/NVRAM"; + homepage = https://www.coreboot.org/Nvramtool; + license = licenses.gpl2; + maintainers = [ maintainers.cryptix ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index 98154d9d5628..3cbdd498aa73 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -4,13 +4,13 @@ }: let - version = "2018.6"; + version = "2018.8"; libglnx-src = fetchFromGitHub { owner = "GNOME"; repo = "libglnx"; - rev = "e1a78cf2f5351d5394ccfb79f3f5a7b4917f73f3"; - sha256 = "10kzyjbrmr98i65hlz8jc1v5bijyqwwfp6qqjbd5g3y0n520iaxc"; + rev = "470af8763ff7b99bec950a6ae0a957c1dcfc8edd"; + sha256 = "1fwik38i6w3r6pn4qkizradcqp1m83n7ljh9jg0y3p3kvrbfxh15"; }; bsdiff-src = fetchFromGitHub { @@ -28,10 +28,15 @@ in stdenv.mkDerivation { rev = "v${version}"; owner = "ostreedev"; repo = "ostree"; - sha256 = "0kk04pznk6m6fqdz609m2zcnkalcw9q8fsx8wm42k6dhf6cw7l3g"; + sha256 = "0i7b7hvlv8m44k39fr5389wskf810vda8s7ivy2whj1nan5951yx"; }; patches = [ + # Workarounds for https://github.com/ostreedev/ostree/issues/1592 + ./fix-1592.patch + # Disable test-gpg-verify-result.test, + # https://github.com/ostreedev/ostree/issues/1634 + ./disable-test-gpg-verify-result.patch # Tests access the helper using relative path # https://github.com/ostreedev/ostree/issues/1593 (fetchpatch { @@ -58,10 +63,13 @@ in stdenv.mkDerivation { cp --no-preserve=mode -r ${bsdiff-src} bsdiff ''; + preConfigure = '' env NOCONFIGURE=1 ./autogen.sh ''; + enableParallelBuilding = true; + configureFlags = [ "--with-systemdsystemunitdir=$(out)/lib/systemd/system" "--with-systemdsystemgeneratordir=$(out)/lib/systemd/system-generators" @@ -73,6 +81,7 @@ in stdenv.mkDerivation { "installed_test_metadir=$(installedTests)/share/installed-tests/libostree" ]; + meta = with stdenv.lib; { description = "Git for operating system binaries"; homepage = https://ostree.readthedocs.io/en/latest/; diff --git a/pkgs/tools/misc/ostree/disable-test-gpg-verify-result.patch b/pkgs/tools/misc/ostree/disable-test-gpg-verify-result.patch new file mode 100644 index 000000000000..d3ef7e08357a --- /dev/null +++ b/pkgs/tools/misc/ostree/disable-test-gpg-verify-result.patch @@ -0,0 +1,12 @@ +diff -aur --no-dereference a/Makefile-tests.am b/Makefile-tests.am +--- a/Makefile-tests.am 1970-01-01 01:00:01.000000000 +0100 ++++ b/Makefile-tests.am 2018-09-17 00:24:11.977841113 +0200 +@@ -243,7 +243,7 @@ + + _installed_or_uninstalled_test_programs = tests/test-varint tests/test-ot-unix-utils tests/test-bsdiff tests/test-mutable-tree \ + tests/test-keyfile-utils tests/test-ot-opt-utils tests/test-ot-tool-util \ +- tests/test-gpg-verify-result tests/test-checksum tests/test-lzma tests/test-rollsum \ ++ tests/test-checksum tests/test-lzma tests/test-rollsum \ + tests/test-basic-c tests/test-sysroot-c tests/test-pull-c tests/test-repo tests/test-include-ostree-h + + if USE_AVAHI diff --git a/pkgs/tools/misc/ostree/fix-1592.patch b/pkgs/tools/misc/ostree/fix-1592.patch new file mode 100644 index 000000000000..f26a924c0d83 --- /dev/null +++ b/pkgs/tools/misc/ostree/fix-1592.patch @@ -0,0 +1,97 @@ +diff -aur --no-dereference a/tests/pull-test.sh b/tests/pull-test.sh +--- a/tests/pull-test.sh 1970-01-01 01:00:01.000000000 +0100 ++++ b/tests/pull-test.sh 2018-09-16 23:55:44.214593856 +0200 +@@ -275,7 +275,7 @@ + if ${CMD_PREFIX} ostree --repo=mirrorrepo-local pull-local otherrepo 2>err.txt; then + fatal "pull with mixed refs succeeded?" + fi +-assert_file_has_content err.txt "error: Invalid ref name origin:main" ++assert_file_has_content err.txt "Invalid ref name origin:main" + ${CMD_PREFIX} ostree --repo=mirrorrepo-local pull-local otherrepo localbranch + ${CMD_PREFIX} ostree --repo=mirrorrepo-local rev-parse localbranch + ${CMD_PREFIX} ostree --repo=mirrorrepo-local fsck +@@ -286,7 +286,7 @@ + fatal "pulled nonexistent branch" + fi + # So true +-assert_file_has_content_literal err.txt "error: Refspec 'nosuchbranch' not found" ++assert_file_has_content_literal err.txt "Refspec 'nosuchbranch' not found" + echo "ok pull-local nonexistent branch" + + cd ${test_tmpdir} +@@ -587,5 +587,5 @@ + if ${CMD_PREFIX} ostree --repo=repo pull origin main 2>err.txt; then + fatal "pull of invalid ref succeeded" + fi +-assert_file_has_content_literal err.txt 'error: Fetching checksum for ref ((empty), main): Invalid rev lots of html here lots of html here lots of html here lots of' ++assert_file_has_content_literal err.txt 'Fetching checksum for ref ((empty), main): Invalid rev lots of html here lots of html here lots of html here lots of' + echo "ok pull got HTML for a ref" +diff -aur --no-dereference a/tests/test-fsck-collections.sh b/tests/test-fsck-collections.sh +--- a/tests/test-fsck-collections.sh 1970-01-01 01:00:01.000000000 +0100 ++++ b/tests/test-fsck-collections.sh 2018-09-17 02:22:48.922502037 +0200 +@@ -100,7 +100,7 @@ + if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then + assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" + fi +-assert_file_has_content fsck-error "Commit has no requested ref ‘new-ref’ in ref binding metadata (‘ref1’)" ++assert_file_has_content fsck-error "Commit has no requested ref .new-ref. in ref binding metadata (.ref1.)" + assert_file_has_content fsck "^Validating refs...$" + + echo "ok 3 fsck detects missing ref bindings" +@@ -113,7 +113,7 @@ + if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then + assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" + fi +-assert_file_has_content fsck-error "Commit has no requested ref ‘new-ref’ in ref binding metadata (‘ref1’)" ++assert_file_has_content fsck-error "Commit has no requested ref .new-ref. in ref binding metadata (.ref1.)" + assert_file_has_content fsck "^Validating refs...$" + assert_file_has_content fsck "^Validating refs in collections...$" + +@@ -127,7 +127,7 @@ + if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then + assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" + fi +-assert_file_has_content fsck-error "Commit has collection ID ‘org.example.Collection’ in collection binding metadata, while the remote it came from has collection ID ‘org.example.Collection2’" ++assert_file_has_content fsck-error "Commit has collection ID .org.example.Collection. in collection binding metadata, while the remote it came from has collection ID .org.example.Collection2." + assert_file_has_content fsck "^Validating refs...$" + assert_file_has_content fsck "^Validating refs in collections...$" + +@@ -147,7 +147,7 @@ + if ${CMD_PREFIX} ostree fsck --repo=repo --verify-back-refs > fsck 2> fsck-error; then + assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" + fi +-assert_file_has_content fsck-error "Collection–ref (org.example.Collection, ref1) in bindings for commit .* does not exist" ++assert_file_has_content fsck-error 'Collection.ref (org.example.Collection, ref1) in bindings for commit .* does not exist' + assert_file_has_content fsck "^Validating refs...$" + assert_file_has_content fsck "^Validating refs in collections...$" + +@@ -186,7 +186,7 @@ + if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then + assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" + fi +-assert_file_has_content fsck-error "Commit has no requested ref ‘new-ref’ in ref binding metadata (‘ref3’, ‘ref4’)" ++assert_file_has_content fsck-error "Commit has no requested ref .new-ref. in ref binding metadata (.ref3., .ref4.)" + assert_file_has_content fsck "^Validating refs...$" + + echo "ok 9 fsck detects missing ref bindings" +@@ -205,7 +205,7 @@ + if ${CMD_PREFIX} ostree fsck --repo=repo --verify-back-refs > fsck 2> fsck-error; then + assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" + fi +-assert_file_has_content fsck-error "Ref ‘ref3’ in bindings for commit .* does not exist" ++assert_file_has_content fsck-error 'Ref .ref3. in bindings for commit .* does not exist' + assert_file_has_content fsck "^Validating refs...$" + + echo "ok 11 fsck ignores unreferenced ref bindings" +diff -aur --no-dereference a/tests/test-remote-add.sh b/tests/test-remote-add.sh +--- a/tests/test-remote-add.sh 1970-01-01 01:00:01.000000000 +0100 ++++ b/tests/test-remote-add.sh 2018-09-17 00:14:16.486788225 +0200 +@@ -83,7 +83,7 @@ + if $OSTREE remote delete nosuchremote 2>err.txt; then + assert_not_reached "Deleting remote unexpectedly succeeded" + fi +-assert_file_has_content err.txt "error: " ++assert_file_has_content err.txt "not found" + + $OSTREE remote delete --if-exists nosuchremote + echo "ok" diff --git a/pkgs/tools/misc/phraseapp-client/default.nix b/pkgs/tools/misc/phraseapp-client/default.nix index b4cfe7b26c0e..74d24db574ff 100644 --- a/pkgs/tools/misc/phraseapp-client/default.nix +++ b/pkgs/tools/misc/phraseapp-client/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "phraseapp-client-${version}"; - version = "1.6.0"; + version = "1.11.0"; goPackagePath = "github.com/phrase/phraseapp-client"; subPackages = [ "." ]; @@ -11,9 +11,13 @@ buildGoPackage rec { owner = "phrase"; repo = "phraseapp-client"; rev = version; - sha256 = "0rgwl0rgkci045hg36s0q8jwkni1hzapqpi0mc0gk3rl7nagw622"; + sha256 = "0lfx0wv95hgczi74qnkw2cripwgvl53z2gi5i6nyflisy4r7vvkr"; }; + postInstall = '' + ln -s $bin/bin/phraseapp-client $bin/bin/phraseapp + ''; + meta = with stdenv.lib; { homepage = http://docs.phraseapp.com; description = "PhraseApp API v2 Command Line Client"; diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 51844c8e5faa..b3ceb41191de 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,37 +1,34 @@ -{ stdenv, fetchurl, jre, graphviz }: +{ stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2018.9"; + version = "1.2018.11"; name = "plantuml-${version}"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "0g5wd80brwqb0v9rbs66y3clv9jsccc8937jzz4r9gzp38rkvzmn"; + sha256 = "006bpxz6zsjypxscxbnz3b7icg47bfwcq1v7rvijflchw12hq9nm"; }; - # It's only a .jar file and a shell wrapper - phases = [ "installPhase" ]; + nativeBuildInputs = [ makeWrapper ]; - installPhase = '' - mkdir -p "$out/bin" - mkdir -p "$out/lib" + buildCommand = '' + install -Dm644 $src $out/lib/plantuml.jar - cp "$src" "$out/lib/plantuml.jar" + mkdir -p $out/bin + makeWrapper ${jre}/bin/java $out/bin/plantuml \ + --argv0 plantuml \ + --set GRAPHVIZ_DOT ${graphviz}/bin/dot \ + --add-flags "-jar $out/lib/plantuml.jar" - cat > "$out/bin/plantuml" << EOF - #!${stdenv.shell} - export GRAPHVIZ_DOT="${graphviz}/bin/dot" - exec "${jre}/bin/java" -jar "$out/lib/plantuml.jar" "\$@" - EOF - chmod a+x "$out/bin/plantuml" + $out/bin/plantuml -help ''; meta = with stdenv.lib; { description = "Draw UML diagrams using a simple and human readable text description"; homepage = http://plantuml.sourceforge.net/; - # "java -jar plantuml.jar -license" says GPLv3 or later + # "plantuml -license" says GPLv3 or later license = licenses.gpl3Plus; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix index b16be0b5bdca..67f805988a3e 100644 --- a/pkgs/tools/misc/powerline-rs/default.nix +++ b/pkgs/tools/misc/powerline-rs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, file, perl, curl, cmake, openssl_1_1_0, libssh2, libgit2, libzip, Security }: +{ stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, file, perl, curl, cmake, openssl, libssh2, libgit2, libzip, Security }: rustPlatform.buildRustPackage rec { pname = "powerline-rs"; name = "${pname}-${version}"; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "184s432a6damzvl0lv6jar1iml9dq60r190aqjy44lcg938981zc"; nativeBuildInputs = [ pkgconfig file perl cmake curl ]; - buildInputs = [ openssl_1_1_0 libssh2 libgit2 libzip ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ openssl libssh2 libgit2 libzip ] ++ lib.optional stdenv.isDarwin Security; postInstall = '' install -Dm 755 "${pname}.bash" "$out/etc/bash_completion.d/${pname}" diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index 21d81507dee0..60851b467ed1 100644 --- a/pkgs/tools/misc/pspg/default.nix +++ b/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pspg-${version}"; - version = "1.4.2"; + version = "1.6.2"; src = fetchFromGitHub { owner = "okbob"; repo = "pspg"; rev = "${version}"; - sha256 = "0hmx9p5pbydnf8sil4vqpmly5mq2rvcj8a33s9fvfisnxxsqz73v"; + sha256 = "0gg94isnmng1qigghc2lrk4mvim20clbfhacwlxnd237ypv4mn2s"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/misc/recoverjpeg/default.nix b/pkgs/tools/misc/recoverjpeg/default.nix index 72ea7f2ea0b0..484bb765c0db 100644 --- a/pkgs/tools/misc/recoverjpeg/default.nix +++ b/pkgs/tools/misc/recoverjpeg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "recoverjpeg-${version}"; - version = "2.6.2"; + version = "2.6.3"; src = fetchurl { url = "https://www.rfc1149.net/download/recoverjpeg/${name}.tar.gz"; - sha256 = "01vayn2b3mqmyqz2ka2j3k4a93bjdvkhv5ry9207v04r83r7iwfp"; + sha256 = "009jgxi8lvdp00dwfj0n4x5yqrf64x00xdkpxpwgl2v8wcqn56fv"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/rkflashtool/default.nix b/pkgs/tools/misc/rkflashtool/default.nix index ff606c6b72bb..fb55b15bbd55 100644 --- a/pkgs/tools/misc/rkflashtool/default.nix +++ b/pkgs/tools/misc/rkflashtool/default.nix @@ -24,10 +24,11 @@ stdenv.mkDerivation rec { cp rkunpack rkcrc rkflashtool rkparameters rkparametersblock rkunsign rkmisc $out/bin ''; - meta = { + meta = with stdenv.lib; { homepage = https://sourceforge.net/projects/rkflashtool/; description = "Tools for flashing Rockchip devices"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.viric ]; + platforms = platforms.linux; + maintainers = [ maintainers.viric ]; + license = licenses.bsd2; }; } diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index 5f56daf3a48d..ae4385a0048a 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -1,47 +1,35 @@ -{ stdenv, fetchurl, skalibs }: +{ stdenv, skawarePackages }: -with stdenv.lib; +with skawarePackages; -stdenv.mkDerivation rec { - name = "s6-portable-utils-${version}"; - version = "2.2.1.1"; +let + pname = "s6-portable-utils"; - src = fetchurl { - url = "https://www.skarnet.org/software/s6-portable-utils/${name}.tar.gz"; - sha256 = "0ca5iiq3n6isj64jb81xpwjzjx1q8jg145nnnn91ra2qqk93kqka"; - }; +in buildPackage { + pname = pname; + version = "2.2.1.2"; + sha256 = "0if77z07rfygd1yk9d2abxkdbx3dg52vcjhb20isb8kvqxhkg8ih"; - outputs = [ "bin" "dev" "doc" "out" ]; + description = "A set of tiny general Unix utilities optimized for simplicity and small size"; - dontDisableStatic = true; + outputs = [ "bin" "dev" "doc" "out" ]; configureFlags = [ - "--enable-absolute-paths" "--bindir=\${bin}/bin" "--includedir=\${dev}/include" "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps" "--with-include=${skalibs.dev}/include" "--with-lib=${skalibs.lib}/lib" "--with-dynlib=${skalibs.lib}/lib" - ] - # On darwin, the target triplet from -dumpmachine includes version number, but - # skarnet.org software uses the triplet to test binary compatibility. - # Explicitly setting target ensures code can be compiled against a skalibs - # binary built on a different version of darwin. - # http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph - ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.hostPlatform.system}"); + ]; postInstall = '' - mkdir -p $doc/share/doc/s6-portable-utils/ - mv doc $doc/share/doc/s6-portable-utils/html + # remove all s6 executables from build directory + rm $(find -name "s6-*" -type f -mindepth 1 -maxdepth 1 -executable) + rm seekablepipe + + mv doc $doc/share/doc/${pname}/html ''; - meta = { - homepage = http://www.skarnet.org/software/s6-portable-utils/; - description = "A set of tiny general Unix utilities optimized for simplicity and small size"; - platforms = platforms.all; - license = licenses.isc; - maintainers = with maintainers; [ pmahoney Profpatsch ]; - }; } diff --git a/pkgs/tools/misc/smenu/default.nix b/pkgs/tools/misc/smenu/default.nix index 30475047c4f7..b5c963307dfd 100644 --- a/pkgs/tools/misc/smenu/default.nix +++ b/pkgs/tools/misc/smenu/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - version = "0.9.13"; + version = "0.9.14"; name = "smenu-${version}"; src = fetchFromGitHub { owner = "p-gen"; repo = "smenu"; rev = "v${version}"; - sha256 = "0ixfl1dxkvmzb3xy6zs1x94hlf8y7zmd14gmb50rp7gb7ff1ivm5"; + sha256 = "1q2jvzia5ggkifkawm791p2nkmnpm6cmd5x3al7zf76gpdm6j87d"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/tools/misc/woeusb/default.nix index 9c6211b13dfe..0f0455fe0fe3 100644 --- a/pkgs/tools/misc/woeusb/default.nix +++ b/pkgs/tools/misc/woeusb/default.nix @@ -3,14 +3,14 @@ , wxGTK30 }: stdenv.mkDerivation rec { - version = "3.2.1"; + version = "3.2.9"; name = "woeusb-${version}"; src = fetchFromGitHub { owner = "slacka"; repo = "WoeUSB"; rev = "v${version}"; - sha256 = "0qymdc216ws6adkzmzxz6hx43dim0hpwab9c4qmgg8jnkhnpvnj1"; + sha256 = "1h2msp45slcd2s5jgw7ma9r7pl7schrvifw3kp53skxfpyax4j35"; }; buildInputs = [ wxGTK30 autoreconfHook makeWrapper ]; diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix index c4cfc00308e9..bfc2a03e6cb8 100644 --- a/pkgs/tools/misc/xvfb-run/default.nix +++ b/pkgs/tools/misc/xvfb-run/default.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation { --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux gawk coreutils ]} ''; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + platforms = platforms.linux; + license = licenses.gpl2; }; } diff --git a/pkgs/tools/misc/yank/default.nix b/pkgs/tools/misc/yank/default.nix index 36aa4ab09c46..eaefd6d61aa6 100644 --- a/pkgs/tools/misc/yank/default.nix +++ b/pkgs/tools/misc/yank/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "mptre"; repo = "yank"; rev = "v${meta.version}"; - sha256 = "0v5aynrilm4fj7gz03q0yz6806ssjxhlv4bsa0213bgkin5iiws7"; + sha256 = "03h99i59kq8jlmshfwas1qm4y5ksw9lxaf9kr14l2mp028g7930n"; inherit name; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/mptre/yank/releases"; license = licenses.mit; - version = "0.8.3"; + version = "1.0.0"; maintainers = [ maintainers.dochang ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index 5254d1091680..6a56d23f7490 100644 --- a/pkgs/tools/misc/you-get/default.nix +++ b/pkgs/tools/misc/you-get/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "you-get"; - version = "0.4.1128"; + version = "0.4.1148"; # Tests aren't packaged, but they all hit the real network so # probably aren't suitable for a build environment anyway. @@ -10,7 +10,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "0i0wspmgblxwvvbm3q8zz4l450fs3bccqxxfm0ysfgprgcy8fp3l"; + sha256 = "1ypgqaxf5qn5b3c2n4hcsiixyvvpvmpx5gny523cd5igb7h0yja5"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 7ed8f3bfd71b..7e79614c04ca 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,5 +1,6 @@ { lib, fetchurl, buildPythonPackage , zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc +, fetchpatch # 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 @@ -15,20 +16,21 @@ buildPythonPackage rec { pname = "youtube-dl"; - version = "2018.08.28"; + version = "2018.09.18"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "1swdp4czvm0752psbi8a4qw5i9x18s7nhivh7iw92274pmqxq9wi"; + sha256 = "0mlsdmddmyy3xaqy366k48xds14g17l81al3kglndjkbrrji63sb"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ zip ] ++ lib.optional generateManPage pandoc; propagatedBuildInputs = lib.optional hlsEncryptedSupport pycryptodome; - # Ensure ffmpeg is available in $PATH for post-processing & transcoding support. - # rtmpdump is required to download files over RTMP - # atomicparsley for embedding thumbnails + # Ensure these utilities are available in $PATH: + # - ffmpeg: post-processing & transcoding support + # - rtmpdump: download files over RTMP + # - atomicparsley: embedding thumbnails makeWrapperArgs = let packagesToBinPath = [ atomicparsley ] diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix index d0b7ebf3fc83..ab9eb5d001b2 100644 --- a/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, openssl, pcsclite, check }: stdenv.mkDerivation rec { - name = "yubico-piv-tool-1.6.1"; + name = "yubico-piv-tool-1.6.2"; src = fetchurl { url = "https://developers.yubico.com/yubico-piv-tool/Releases/${name}.tar.gz"; - sha256 = "10xgdc51xvszkxmsvqnbjs8ixxz7rfnfahh3wn8glllynmszbhwi"; + sha256 = "06r3vxgj7qrk8si7khjy696sm45h3w9d0rrrj0hyswalqzavqqga"; }; nativeBuildInputs = [ pkgconfig ]; |