diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-03-05 12:49:52 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-03-05 14:53:27 +0100 |
commit | 565bd805e6aea9258ead5449b46c5e56ae0568fb (patch) | |
tree | 81a23c558823fc865d180bb8b6318d24ec38729d /pkgs/tools/misc | |
parent | 25a78f7234ced8840610178a695078b5b08d9e6b (diff) | |
parent | 97693915e1d31478528ee72e8d1fea5aa384577b (diff) | |
download | nixlib-565bd805e6aea9258ead5449b46c5e56ae0568fb.tar nixlib-565bd805e6aea9258ead5449b46c5e56ae0568fb.tar.gz nixlib-565bd805e6aea9258ead5449b46c5e56ae0568fb.tar.bz2 nixlib-565bd805e6aea9258ead5449b46c5e56ae0568fb.tar.lz nixlib-565bd805e6aea9258ead5449b46c5e56ae0568fb.tar.xz nixlib-565bd805e6aea9258ead5449b46c5e56ae0568fb.tar.zst nixlib-565bd805e6aea9258ead5449b46c5e56ae0568fb.zip |
Merge branch 'master'
Diffstat (limited to 'pkgs/tools/misc')
52 files changed, 257 insertions, 135 deletions
diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix index 6214bc216f8b..168a3f887728 100644 --- a/pkgs/tools/misc/aptly/default.nix +++ b/pkgs/tools/misc/aptly/default.nix @@ -2,14 +2,14 @@ let - version = "1.1.1"; + version = "1.2.0"; rev = "v${version}"; aptlySrc = fetchFromGitHub { inherit rev; owner = "smira"; repo = "aptly"; - sha256 = "197a7nh8li20slqxgn8s8xm13x5b8ansmabk8rx32sngb73hp4av"; + sha256 = "1acnkmgarz9rp0skkh7zzwkhisjlmbl74jqjmqd3mn42y528c34b"; }; aptlyCompletionSrc = fetchFromGitHub { diff --git a/pkgs/tools/misc/asciinema/default.nix b/pkgs/tools/misc/asciinema/default.nix index 4d6e90a347e7..0808704ecb78 100644 --- a/pkgs/tools/misc/asciinema/default.nix +++ b/pkgs/tools/misc/asciinema/default.nix @@ -4,7 +4,7 @@ let pythonPackages = python3Packages; in pythonPackages.buildPythonApplication rec { name = "asciinema-${version}"; - version = "1.4.0"; + version = "2.0.0"; buildInputs = with pythonPackages; [ nose ]; propagatedBuildInputs = with pythonPackages; [ requests ]; @@ -13,7 +13,7 @@ in pythonPackages.buildPythonApplication rec { owner = "asciinema"; repo = "asciinema"; rev = "v${version}"; - sha256 = "1m2gjqxb5gqyz19lvp7jmwp7cxjc6nb0b2rrlsg3z2bl6vmi1xn2"; + sha256 = "1f92hv9w58jf1f7igspjxvrxqn3n21kgya2zb56spqyydr4jzwdk"; }; patchPhase = '' diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/tools/misc/aspcud/default.nix index 974b7691cb93..859112d29bc2 100644 --- a/pkgs/tools/misc/aspcud/default.nix +++ b/pkgs/tools/misc/aspcud/default.nix @@ -1,42 +1,27 @@ -{ stdenv, fetchurl, - boost, clasp, cmake, gringo, re2c +{ stdenv, fetchzip +, boost, clasp, cmake, gringo, re2c }: -let - version = "1.9.1"; -in - stdenv.mkDerivation rec { + version = "1.9.4"; name = "aspcud-${version}"; - src = fetchurl { - url = "mirror://sourceforge/project/potassco/aspcud/${version}/aspcud-${version}-source.tar.gz"; - sha256 = "09sqbshwrqz2fvlkz73mns5i3m70fh8mvwhz8450izy5lsligsg0"; + src = fetchzip { + url = "https://github.com/potassco/aspcud/archive/v${version}.tar.gz"; + sha256 = "0vrf7h7g99vw1mybqfrpxamsnf89p18czlzgjmxl1zkiwc7vjpzw"; }; buildInputs = [ boost clasp cmake gringo re2c ]; - buildPhase = '' - cmake -DCMAKE_BUILD_TYPE=Release \ - -DGRINGO_LOC=${gringo}/bin/gringo \ - -DCLASP_LOC=${clasp}/bin/clasp \ - -DENCODING_LOC=$out/share/aspcud/specification.lp \ - . - - make - ''; - - installPhase = '' - mkdir -p $out/bin - cp bin/{aspcud,cudf2lp,lemon} $out/bin - - mkdir -p $out/share/aspcud - cp ../share/aspcud/specification.lp $out/share/aspcud - ''; + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DASPCUD_GRINGO_PATH=${gringo}/bin/gringo" + "-DASPCUD_CLASP_PATH=${clasp}/bin/clasp" + ]; meta = with stdenv.lib; { description = "Solver for package problems in CUDF format using ASP"; - homepage = http://potasssco.sourceforge.net/; + homepage = "https://potassco.org/aspcud/"; platforms = platforms.all; maintainers = [ maintainers.hakuch ]; license = licenses.gpl3Plus; diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix index ba38a55dda02..4d3376108b7e 100644 --- a/pkgs/tools/misc/autojump/default.nix +++ b/pkgs/tools/misc/autojump/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, python, bash }: let - version = "22.5.0"; + version = "22.5.1"; in stdenv.mkDerivation rec { name = "autojump-${version}"; @@ -9,7 +9,7 @@ in src = fetchurl { url = "http://github.com/joelthelion/autojump/archive/release-v${version}.tar.gz"; name = "autojump-${version}.tar.gz"; - sha256 = "00ai0j37ka3557a8m7ig44dby7v01pckwi8gl479vz5b5pw1z8cd"; + sha256 = "17z9j9936x0nizwrzf664bngh60x5qbvrrf1s5qdzd0f2gdanpvn"; }; buildInputs = [ python bash ]; diff --git a/pkgs/tools/misc/autorevision/default.nix b/pkgs/tools/misc/autorevision/default.nix index 02caf6e33f99..75c7b258a449 100644 --- a/pkgs/tools/misc/autorevision/default.nix +++ b/pkgs/tools/misc/autorevision/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "autorevision-${version}"; - version = "1.20"; + version = "1.21"; src = fetchurl { url = "https://github.com/Autorevision/autorevision/releases/download/v%2F${version}/autorevision-${version}.tgz"; - sha256 = "1xlp7wn2vv17rp848ai272sifi6fmwdr6dg4im53hrf32j3gzlhy"; + sha256 = "07ssirjy2mgbqxr792n3rqa408hm7qnhwfjzd73rqfwvjcahy1q8"; }; buildInputs = [ diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix index 899fb5f643ab..a8b6d5f3c252 100644 --- a/pkgs/tools/misc/bandwidth/default.nix +++ b/pkgs/tools/misc/bandwidth/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { name = "bandwidth-${version}"; - version = "1.4.2"; + version = "1.5.1"; src = fetchurl { url = "http://zsmith.co/archives/${name}.tar.gz"; - sha256 = "1p1kp5s3fdgy667q7mc9ywnps0sbj4lpr42561yhi59m69n8c3kd"; + sha256 = "1v9k1a2ilkbhc3viyacgq88c9if60kwsd1fy6rn84317qap4i7ib"; }; buildInputs = [ nasm ]; diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index 7ea3b1fd279c..e06c2dee000d 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bdf2psf-${version}"; - version = "1.175"; + version = "1.178"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "1bbj6wxdpjhy7n2614z0qx2310vhaxlvism6v6lxancb5bwwgdnf"; + sha256 = "1ngxa7hzfhvfhkvyc2qib3qyql5zz8rjg559wpi2jsi4hibj84vc"; }; buildInputs = [ dpkg ]; diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix index 8dbcd08fba6e..6635f2931955 100644 --- a/pkgs/tools/misc/brltty/default.nix +++ b/pkgs/tools/misc/brltty/default.nix @@ -4,11 +4,11 @@ assert alsaSupport -> alsaLib != null; assert systemdSupport -> systemd != null; stdenv.mkDerivation rec { - name = "brltty-5.5"; + name = "brltty-5.6"; src = fetchurl { url = "http://brltty.com/archive/${name}.tar.gz"; - sha256 = "0slrqanwj9cm7ql0rpb296xq676zrc1sjyr13lh5lygp4b8qfpci"; + sha256 = "06by51n35w0jq14w1vimxk3ssrlmiiw49wpxw29rasc106mpysfn"; }; nativeBuildInputs = [ pkgconfig python3.pkgs.cython ]; diff --git a/pkgs/tools/misc/convmv/default.nix b/pkgs/tools/misc/convmv/default.nix index 6a76906a805f..e6ff7e99353b 100644 --- a/pkgs/tools/misc/convmv/default.nix +++ b/pkgs/tools/misc/convmv/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "convmv-1.15"; + name = "convmv-2.04"; src = fetchurl { url = "http://www.j3e.de/linux/convmv/${name}.tar.gz"; - sha256 = "0daiiapsrca8zlbmlz2kw2fn4vmkh48cblb70h08idchhk3sw5f3"; + sha256 = "075xn1ill26hbhg4nl54sp75b55db3ikl7lvhqb9ijvkpi67j6yy"; }; preBuild='' diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix index ec9ca37c082e..052f52e2ebd4 100644 --- a/pkgs/tools/misc/ddcutil/default.nix +++ b/pkgs/tools/misc/ddcutil/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ddcutil-${version}"; - version = "0.8.5"; + version = "0.8.6"; src = fetchFromGitHub { owner = "rockowitz"; repo = "ddcutil"; rev = "v${version}"; - sha256 = "127a5v545gvfgxqqjxqafsg1p8i4qd5wnpdwccr38jbsphl6yzl4"; + sha256 = "1c4cl9cac90xf9rap6ss2d4yshcmhdq8pdfjz3g4cns789fs1vcf"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 418d5e38fd75..894079fad84b 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit, python3Packages, docutils, help2man -, acl, apktool, libbfd, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, diffutils, dtc +, acl, apktool, binutils-unwrapped, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc , e2fsprogs, file, findutils, fontforge-fonttools, fpc, gettext, ghc, ghostscriptX, giflib, gnupg1, gnutar , gzip, imagemagick, jdk, libarchive, libcaca, llvm, mono, openssh, pdftk, pgpdump, poppler_utils, sng, sqlite , squashfsTools, tcpdump, unoconv, unzip, xxd, xz @@ -8,12 +8,12 @@ python3Packages.buildPythonApplication rec { name = "diffoscope-${version}"; - version = "90"; + version = "91"; src = fetchgit { url = "git://anonscm.debian.org/reproducible/diffoscope.git"; rev = "refs/tags/${version}"; - sha256 = "1w16667j6ag2iim1xcy8y9v9965mq50k64wnf693mivddll62704"; + sha256 = "16xqy71115cj4kws6bkcjm98nlaff3a32fz82rn2l1xk9w9n3dnz"; }; patches = [ @@ -27,12 +27,12 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ docutils help2man ]; - # Still missing these tools: docx2txt enjarify js-beautify oggDump Rscript + # Still missing these tools: abootimg docx2txt dumpxsb enjarify js-beautify lipo oggDump otool procyon-decompiler Rscript # Also these libraries: python3-guestfs pythonPath = with python3Packages; [ debian libarchive-c python_magic tlsh rpm ] ++ [ - acl libbfd bzip2 cdrkit colordiff coreutils cpio diffutils dtc e2fsprogs file findutils - fontforge-fonttools gettext gnutar gzip libarchive libcaca pgpdump sng sqlite - squashfsTools unzip xxd xz + acl binutils-unwrapped bzip2 cdrkit colordiff coreutils cpio db diffutils + dtc e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip + libarchive libcaca pgpdump sng sqlite squashfsTools unzip xxd xz ] ++ lib.optionals enableBloat [ apktool cbfstool colord fpc ghc ghostscriptX giflib gnupg1 imagemagick llvm jdk mono openssh pdftk poppler_utils tcpdump unoconv diff --git a/pkgs/tools/misc/diffoscope/list-tools.sh b/pkgs/tools/misc/diffoscope/list-tools.sh new file mode 100755 index 000000000000..9af7f0e38899 --- /dev/null +++ b/pkgs/tools/misc/diffoscope/list-tools.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +diffoscope=$(nix-build --no-out-link -E 'with import ./. {}; diffoscope.override { enableBloat = true; }')/bin/diffoscope + +required=$($diffoscope --list-tools | \ + grep '^External-Tools-Required:' | \ + cut -d ' ' -f2- | \ + tr -d ,) + +# Uber-hacky! +pathScript=$(cat $diffoscope | grep PATH) + +export PATH=$(nix-build --no-out-link -A which)/bin +eval "$pathScript" + +for tool in $required; do + if ! which $tool >/dev/null 2>&1; then + echo $tool + fi +done | sort diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index 4598655092f3..15d8647ff823 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { name = "direnv-${version}"; - version = "2.15.0"; + version = "2.15.1"; goPackagePath = "github.com/direnv/direnv"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv"; rev = "v${version}"; - sha256 = "09mys14acjbrkvjy9zl2k521k3xcs6b0brg8zlhh8qadhbirfkp3"; + sha256 = "07kzfkv5ssys788j0f1bp73gd7b53vwv2jsxkd85zwb3kby1145v"; }; postConfigure = '' diff --git a/pkgs/tools/misc/diskscan/default.nix b/pkgs/tools/misc/diskscan/default.nix index e1024d70bce9..9449b7759a8c 100644 --- a/pkgs/tools/misc/diskscan/default.nix +++ b/pkgs/tools/misc/diskscan/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "diskscan-${version}"; - version = "0.19"; + version = "0.20"; src = fetchFromGitHub { owner = "baruch"; repo = "diskscan"; rev = "${version}"; - sha256 = "0yqpaxfahbjr8hr9xw7nngncwigy7yncdwnyp5wy9s9wdp8mrjra"; + sha256 = "1s2df082yrnr3gqnapdsqz0yd0ld75bin37g0rms83ymzkh4ysgv"; }; buildInputs = [ ncurses zlib ]; diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix index d37655134c55..b8791f5f32a2 100644 --- a/pkgs/tools/misc/entr/default.nix +++ b/pkgs/tools/misc/entr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "entr-${version}"; - version = "3.9"; + version = "4.0"; src = fetchurl { url = "http://entrproject.org/code/${name}.tar.gz"; - sha256 = "0xk8y8asy0wxi5jx03c521p9919gjr8053lxpfzn83jkmqc8zmq2"; + sha256 = "12vc3xp0z0abmsy5kbix0wmn0sca39c8miyga6cijydi128zxm2a"; }; postPatch = '' diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix index 33624302ebcc..1d7c47c2c9ab 100644 --- a/pkgs/tools/misc/esptool/default.nix +++ b/pkgs/tools/misc/esptool/default.nix @@ -2,23 +2,23 @@ python3.pkgs.buildPythonApplication rec { name = "esptool-${version}"; - version = "2.1"; + version = "2.3.1"; src = fetchFromGitHub { owner = "espressif"; repo = "esptool"; rev = "v${version}"; - sha256 = "137p0kcscly95qpjzgx1yxm8k2wf5y9v3srvlhp2ajniirgv8ijv"; + sha256 = "0gwnl6z5s2ax07l3n38h9hdyz71pn8lzn4fybcwyrii0bj2kapvc"; }; - buildInputs = with python3.pkgs; [ flake8 flake8-future-import ]; + checkInputs = with python3.pkgs; [ flake8 flake8-future-import flake8-import-order ]; propagatedBuildInputs = with python3.pkgs; [ pyserial pyaes ecdsa openssl ]; meta = with stdenv.lib; { description = "ESP8266 and ESP32 serial bootloader utility"; homepage = https://github.com/espressif/esptool; license = licenses.gpl2; - maintainers = [ maintainers.dezgeg ]; + maintainers = with maintainers; [ dezgeg dotlambda ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index 503f0df331cf..c07420821ed4 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub, rustPlatform, cmake, perl, pkgconfig, zlib }: +{ stdenv, fetchFromGitHub, rustPlatform, cmake, perl, pkgconfig, zlib +, darwin, libiconv +}: with rustPlatform; @@ -16,7 +18,10 @@ buildRustPackage rec { }; nativeBuildInputs = [ cmake pkgconfig perl ]; - buildInputs = [ zlib ]; + buildInputs = [ zlib ] + ++ stdenv.lib.optionals stdenv.isDarwin [ + libiconv darwin.apple_sdk.frameworks.Security ] + ; # Some tests fail, but Travis ensures a proper build doCheck = false; diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index 0d1c81c00a65..ed210783db19 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, tcl, makeWrapper }: stdenv.mkDerivation rec { - version = "5.45"; + version = "5.45.4"; name = "expect-${version}"; src = fetchurl { url = "mirror://sourceforge/expect/Expect/${version}/expect${version}.tar.gz"; - sha256 = "0h60bifxj876afz4im35rmnbnxjx4lbdqp2ja3k30fwa8a8cm3dj"; + sha256 = "0d1cp5hggjl93xwc8h1y6adbnrvpkk0ywkd00inz9ndxn21xm9s9"; }; buildInputs = [ tcl ]; diff --git a/pkgs/tools/misc/flameshot/default.nix b/pkgs/tools/misc/flameshot/default.nix index 55aa146d301d..5356f8ad065f 100644 --- a/pkgs/tools/misc/flameshot/default.nix +++ b/pkgs/tools/misc/flameshot/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "flameshot-${version}"; - version = "0.5.0"; + version = "0.5.1"; nativeBuildInputs = [ qmake qttools ]; buildInputs = [ qtbase ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "lupoDharkael"; repo = "flameshot"; rev = "v${version}"; - sha256 = "1fy4il7rdj294l9cs642hx23bry25j9phn37274r2b87hwzy1rrv"; + sha256 = "13h77np93r796jf289v4r687cmnpqkyqs34dm9gif4akaig74ky0"; }; enableParallelBuilding = true; @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/lupoDharkael/flameshot; maintainers = [ maintainers.scode ]; license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/fpart/default.nix b/pkgs/tools/misc/fpart/default.nix index b29e76413104..394310e572dd 100644 --- a/pkgs/tools/misc/fpart/default.nix +++ b/pkgs/tools/misc/fpart/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "fpart-${version}"; - version = "0.9.3"; + version = "1.0.0"; src = fetchurl { url = "http://contribs.martymac.org/fpart/${name}.tar.gz"; - sha256 = "0f1vm7c7v9nrd0mnz6qivpnngni6y53b11kvniclqfd25hhw6ggq"; + sha256 = "1p0ajmry18lcg82znfp8nxs4w3izic775l7df08hywlq4vfa66pg"; }; postInstall = '' diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 71cfedcaec72..99c54b6d3964 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, gettext, makeWrapper -, parted, glib, libuuid, pkgconfig, gtkmm2, libxml2, hicolor_icon_theme +, parted, glib, libuuid, pkgconfig, gtkmm2, libxml2, hicolor-icon-theme , gpart, hdparm, procps, utillinux }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-doc" ]; - buildInputs = [ parted glib libuuid gtkmm2 libxml2 hicolor_icon_theme ]; + buildInputs = [ parted glib libuuid gtkmm2 libxml2 hicolor-icon-theme ]; nativeBuildInputs = [ intltool gettext makeWrapper pkgconfig ]; postInstall = '' diff --git a/pkgs/tools/misc/grub4dos/default.nix b/pkgs/tools/misc/grub4dos/default.nix index 40d122242ffc..9719ea6fe554 100644 --- a/pkgs/tools/misc/grub4dos/default.nix +++ b/pkgs/tools/misc/grub4dos/default.nix @@ -6,13 +6,13 @@ let arch = else throw "Unknown architecture"; in stdenv.mkDerivation rec { name = "grub4dos-${version}"; - version = "0.4.6a-2016-12-24"; + version = "0.4.6a-2018-02-20"; src = fetchFromGitHub { owner = "chenall"; repo = "grub4dos"; - rev = "ca0371bb1e2365bfe4e44031a3b8b59e8c58ce0d"; - sha256 = "0a9m7n5la3dmbfx6n5iqlfbm607r1mww0wkimn29mlsc30d8aamr"; + rev = "74f6c862c73a4d21e61832174f4ab2f1d7f8b12a"; + sha256 = "0p85y5adnlcs4cdi9dg6f5fzzc1y12bmfhx13qs0576izx2rma3q"; }; nativeBuildInputs = [ nasm ]; diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix index b8b7666934b8..7fd9897a71bb 100644 --- a/pkgs/tools/misc/keychain/default.nix +++ b/pkgs/tools/misc/keychain/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "keychain-${version}"; - version = "2.8.3"; + version = "2.8.5"; src = fetchFromGitHub { owner = "funtoo"; repo = "keychain"; rev = "${version}"; - sha256 = "0za2fi4g7ixzj3izgwlv71b3cviz3qhz43y4bhdkglg16x5cnzcb"; + sha256 = "1bkjlg0a2bbdjhwp37ci1rwikvrl4s3xlbf2jq2z4azc96dr83mj"; }; buildInputs = [ makeWrapper perl ]; diff --git a/pkgs/tools/misc/kronometer/default.nix b/pkgs/tools/misc/kronometer/default.nix index d74e2b4e12a7..f511e013f368 100644 --- a/pkgs/tools/misc/kronometer/default.nix +++ b/pkgs/tools/misc/kronometer/default.nix @@ -6,14 +6,14 @@ let pname = "kronometer"; - version = "2.1.3"; + version = "2.2.1"; in mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "1z06gvaacm3d3a9smlmgg2vf0jdab5kqxx24r6v7iprqzgdpsn4i"; + sha256 = "18b2qi5b9hn8jy3yhav72n14z5l9w3p5fv5kslhbxc7rfvjr4h3x"; }; meta = with lib; { diff --git a/pkgs/tools/misc/latex2html/default.nix b/pkgs/tools/misc/latex2html/default.nix index 57d29437a211..b7963c3ed817 100644 --- a/pkgs/tools/misc/latex2html/default.nix +++ b/pkgs/tools/misc/latex2html/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "latex2html-${version}"; - version = "2016"; + version = "2018"; src = fetchurl { url = "http://mirrors.ctan.org/support/latex2html/latex2html-${version}.tar.gz"; - sha256 = "028k0ypbq94mlhydf1sbqlphlfl2fhmlzhgqq5jjzihfmccbq7db"; + sha256 = "1qnlg8ajh0amy9gy8rh8sp1l224ak54264i3dhk7rrv9s4k7bqq9"; }; buildInputs = [ ghostscript netpbm perl ]; diff --git a/pkgs/tools/misc/lnav/default.nix b/pkgs/tools/misc/lnav/default.nix index 5ab05c92135a..4d7c27a39445 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 = "1jdjn64cxgbhhyg73cisrfrk7vjg1hr9nvkmfdk8gxc4g82y3xxc"; + sha256 = "0hq9ri6a18z682gihxlbh1rndka0v6brkdqsyfsgh4c2fgib4fb7"; inherit name; }; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/tstack/lnav/releases"; license = licenses.bsd2; - version = "0.8.2"; + version = "0.8.3"; maintainers = [ maintainers.dochang ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index fb4093d89b86..f9983cc0a7f6 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "mc-${version}"; - version = "4.8.19"; + version = "4.8.20"; src = fetchurl { url = "http://www.midnight-commander.org/downloads/${name}.tar.xz"; - sha256 = "1pzjq4nfxl2aakxipdjs5hq9n14374ly1l00s40kd2djnnxmd7pb"; + sha256 = "072h7n9b3j79fqn48xaw0xhlcjavpsmfpz6nyh20lhmfz3sffzh1"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/misc/mdbtools/git.nix b/pkgs/tools/misc/mdbtools/git.nix index 6289c35f35a7..2116815ed0c3 100644 --- a/pkgs/tools/misc/mdbtools/git.nix +++ b/pkgs/tools/misc/mdbtools/git.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, glib, readline, bison, flex, pkgconfig, - libiconv, autoreconfHook, which, txt2man, gnome_doc_utils, scrollkeeper }: + libiconv, autoreconfHook, which, txt2man, gnome-doc-utils, scrollkeeper }: stdenv.mkDerivation { name = "mdbtools-git-2014-07-25"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib readline bison flex autoreconfHook which txt2man - gnome_doc_utils scrollkeeper libiconv + gnome-doc-utils scrollkeeper libiconv ]; preAutoreconf = '' diff --git a/pkgs/tools/misc/mimeo/default.nix b/pkgs/tools/misc/mimeo/default.nix index 81d6d29b2bf2..52f685b22ca6 100644 --- a/pkgs/tools/misc/mimeo/default.nix +++ b/pkgs/tools/misc/mimeo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, desktop_file_utils, file, python3Packages }: +{ stdenv, fetchurl, desktop-file-utils, file, python3Packages }: python3Packages.buildPythonApplication rec { name = "mimeo-${version}"; @@ -9,14 +9,14 @@ python3Packages.buildPythonApplication rec { sha256 = "126g3frks6zn6yc1r005qpmxg1pvvvf06ivpyvd9xribn2mwki2z"; }; - buildInputs = [ file desktop_file_utils ]; + buildInputs = [ file desktop-file-utils ]; propagatedBuildInputs = [ python3Packages.pyxdg ]; preConfigure = '' substituteInPlace Mimeo.py \ --replace "EXE_UPDATE_DESKTOP_DATABASE = 'update-desktop-database'" \ - "EXE_UPDATE_DESKTOP_DATABASE = '${desktop_file_utils}/bin/update-desktop-database'" \ + "EXE_UPDATE_DESKTOP_DATABASE = '${desktop-file-utils}/bin/update-desktop-database'" \ --replace "EXE_FILE = 'file'" \ "EXE_FILE = '${file}/bin/file'" ''; diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index a8332ad494da..3b220153f173 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk_doc, gobjectIntrospection +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, gobjectIntrospection , libgsystem, xz, e2fsprogs, libsoup, gpgme, which, autoconf, automake, libtool, fuse , libarchive, libcap, bzip2, yacc, libxslt, docbook_xsl, docbook_xml_dtd_42 }: @@ -30,7 +30,7 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ - autoconf automake libtool pkgconfig gtk_doc gobjectIntrospection which yacc + autoconf automake libtool pkgconfig gtk-doc gobjectIntrospection which yacc libxslt docbook_xsl docbook_xml_dtd_42 ]; diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix index cb55226109b4..37073daa699d 100644 --- a/pkgs/tools/misc/parcellite/default.nix +++ b/pkgs/tools/misc/parcellite/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook -, gtk2, hicolor_icon_theme, intltool, pkgconfig +, gtk2, hicolor-icon-theme, intltool, pkgconfig , which, wrapGAppsHook, xdotool }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook intltool pkgconfig wrapGAppsHook ]; - buildInputs = [ gtk2 hicolor_icon_theme ]; + buildInputs = [ gtk2 hicolor-icon-theme ]; preFixup = '' # Need which and xdotool on path to fix auto-pasting. diff --git a/pkgs/tools/misc/pastebinit/default.nix b/pkgs/tools/misc/pastebinit/default.nix index fd5004302dff..a5e45dc259b9 100644 --- a/pkgs/tools/misc/pastebinit/default.nix +++ b/pkgs/tools/misc/pastebinit/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, python3 }: stdenv.mkDerivation rec { - version = "1.4.1"; + version = "1.5"; name = "pastebinit-${version}"; src = fetchurl { url = "https://launchpad.net/pastebinit/trunk/${version}/+download/${name}.tar.bz2"; - sha256 = "1rl854izwn1fpaaib6zj7a1a9bis8n7w4zfxcapgfffj37zj0dy2"; + sha256 = "0mw48fgm9lyh9d3pw997fccmglzsjccf2y347gxjas74wx6aira2"; }; buildInputs = [ python3 ]; diff --git a/pkgs/tools/misc/phraseapp-client/default.nix b/pkgs/tools/misc/phraseapp-client/default.nix index d5908210cbdd..b4cfe7b26c0e 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.4.5"; + version = "1.6.0"; goPackagePath = "github.com/phrase/phraseapp-client"; subPackages = [ "." ]; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "phrase"; repo = "phraseapp-client"; rev = version; - sha256 = "0zky7jcs7h6zmvkb0na4la6h7g63jlrziifqk831fd1gspdzgajp"; + sha256 = "0rgwl0rgkci045hg36s0q8jwkni1hzapqpi0mc0gk3rl7nagw622"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/ponysay/default.nix b/pkgs/tools/misc/ponysay/default.nix index 0f5c15241439..e366a03a7f42 100644 --- a/pkgs/tools/misc/ponysay/default.nix +++ b/pkgs/tools/misc/ponysay/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python3, texinfo, makeWrapper }: stdenv.mkDerivation rec { - name = "ponysay-3.0.2"; + name = "ponysay-3.0.3"; src = fetchurl { - url = "https://github.com/erkin/ponysay/archive/3.0.2.tar.gz"; - sha256 = "03avcbl96rv718lgg6yyrq5mvg3xxzccrnnb6brf4g9mcrwqmsb9"; + url = "https://github.com/erkin/ponysay/archive/3.0.3.tar.gz"; + sha256 = "12mjabf5cpp5dgg63s19rlyq3dhhpzzy2sa439yncqzsk7rdg0n3"; }; buildInputs = [ python3 texinfo makeWrapper ]; diff --git a/pkgs/tools/misc/quota/default.nix b/pkgs/tools/misc/quota/default.nix index a13f7160aa69..dfcefe092008 100644 --- a/pkgs/tools/misc/quota/default.nix +++ b/pkgs/tools/misc/quota/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, e2fsprogs, openldap, pkgconfig }: stdenv.mkDerivation rec { - version = "4.03"; + version = "4.04"; name = "quota-${version}"; src = fetchurl { url = "mirror://sourceforge/linuxquota/quota-${version}.tar.gz"; - sha256 = "0jv7vhxhjp3gc4hwgmrhg448sbzzqib80gdas9nm0c5zwyd4sv4w"; + sha256 = "1pwfxza923j75z5lx0w89pj09745zi1swy77cm0zalbzgs4f2nvk"; }; outputs = [ "out" "dev" "doc" "man" ]; diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index 2ff86f5cbdf6..640e641dd477 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, - gettext, glib, json_glib, libelf, pkgconfig, scons, sphinx, utillinux }: + gettext, glib, json-glib, libelf, pkgconfig, scons, sphinx, utillinux }: with stdenv.lib; stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configurePhase = "scons config"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gettext glib json_glib libelf scons sphinx utillinux ]; + buildInputs = [ gettext glib json-glib libelf scons sphinx utillinux ]; buildPhase = "scons"; diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index d6cad51ce753..8c2845dc8ebd 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, ostree, rpm, which, autoconf, automake, libtool, pkgconfig, - libcap, glib, libgsystem, json_glib, libarchive, libsolv, librepo, gtk_doc, elfutils, + libcap, glib, libgsystem, json-glib, libarchive, libsolv, librepo, gtk-doc, elfutils, gperf, cmake, pcre, check, python, libxslt, docbook_xsl, docbook_xml_dtd_42, acl }: let @@ -31,7 +31,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ which autoconf automake libtool libcap ostree rpm glib libgsystem gperf - json_glib libarchive libsolv librepo gtk_doc libxslt docbook_xsl docbook_xml_dtd_42 + json-glib libarchive libsolv librepo gtk-doc libxslt docbook_xsl docbook_xml_dtd_42 cmake pcre check python # FIXME: get rid of this once libarchive properly propagates this acl diff --git a/pkgs/tools/misc/scfbuild/default.nix b/pkgs/tools/misc/scfbuild/default.nix new file mode 100644 index 000000000000..a310135727db --- /dev/null +++ b/pkgs/tools/misc/scfbuild/default.nix @@ -0,0 +1,30 @@ +{ lib, buildPythonApplication, fetchFromGitHub, python, pyyaml, fonttools, fontforge }: + +buildPythonApplication rec { + name = "scfbuild-${version}"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "eosrei"; + repo = "scfbuild"; + rev = "c179c8d279b7cc0a9a3536a713ac880ac6010318"; + sha256 = "1bsi7k4kkj914pycp1g92050hjxscyvc9qflqb3cv5yz3c93cs46"; + }; + + phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + + propagatedBuildInputs = [ pyyaml fonttools fontforge ]; + + installPhase = '' + mkdir -p $out/${python.sitePackages} + cp -r scfbuild $out/${python.sitePackages} + cp -r bin $out + ''; + + meta = with lib; { + description = "SVGinOT color font builder"; + homepage = https://github.com/eosrei/scfbuild; + license = licenses.gpl3; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix new file mode 100644 index 000000000000..709cbbe07912 --- /dev/null +++ b/pkgs/tools/misc/skim/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + name = "skim-${version}"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "lotabout"; + repo = "skim"; + rev = "v${version}"; + sha256 = "0spkkgjjrch1grb0115rn0wxzsh8pzmm96a7j69zy5pc1il2m5lp"; + }; + + outputs = [ "out" "vim" ]; + + cargoSha256 = "0zbjnii8r41ih2m2vqhm3wdiwgi13kipvxx75sg4vm4maf4wpmhv"; + + patchPhase = '' + sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim + ''; + + postInstall = '' + install -D -m 555 bin/sk-tmux -t $out/bin + install -D -m 444 shell/* -t $out/share/skim + install -D -m 444 plugin/skim.vim -t $vim/plugin + + cat <<SCRIPT > $out/bin/sk-share + #! ${stdenv.shell} + # Run this script to find the skim shared folder where all the shell + # integration scripts are living. + echo $out/share/skim + SCRIPT + chmod +x $out/bin/sk-share + ''; + + meta = with stdenv.lib; { + description = "Fuzzy Finder in rust!"; + homepage = https://github.com/lotabout/skim; + license = licenses.mit; + maintainers = []; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index f0fa1c198885..3042dfb215f9 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -5,13 +5,13 @@ let inherit (pythonPackages) python nose pycrypto requests mock; in stdenv.mkDerivation rec { name = "svtplay-dl-${version}"; - version = "1.9.7"; + version = "1.9.9"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "0zj102ir08s9knqqv8y6vy9rkrgk77xs7kqp00v9fzrlqyspf68r"; + sha256 = "1iam2pdcrlpcgk2hx3m7zawznp2p939xdv8cpll6sd6n0l4hpdc9"; }; pythonPaths = [ pycrypto requests ]; diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index 11d61cfe30f3..90a17bdff704 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, udev, intltool, pkgconfig, glib, xmlto, wrapGAppsHook , makeWrapper, gtk3, docbook_xml_dtd_412, docbook_xsl -, libxml2, desktop_file_utils, libusb1, cups, gdk_pixbuf, pango, atk, libnotify -, gobjectIntrospection, libgnome_keyring3 +, libxml2, desktop-file-utils, libusb1, cups, gdk_pixbuf, pango, atk, libnotify +, gobjectIntrospection, libgnome-keyring3 , cups-filters , pythonPackages , withGUI ? true @@ -20,10 +20,10 @@ stdenv.mkDerivation rec { buildInputs = [ intltool pkgconfig glib udev libusb1 cups xmlto - libxml2 docbook_xml_dtd_412 docbook_xsl desktop_file_utils + libxml2 docbook_xml_dtd_412 docbook_xsl desktop-file-utils pythonPackages.python pythonPackages.wrapPython libnotify gobjectIntrospection gdk_pixbuf pango atk - libgnome_keyring3 + libgnome-keyring3 ]; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/tools/misc/ttylog/default.nix b/pkgs/tools/misc/ttylog/default.nix index fa45b0f8bd26..3baafa29677b 100644 --- a/pkgs/tools/misc/ttylog/default.nix +++ b/pkgs/tools/misc/ttylog/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "ttylog-${version}"; - version = "0.29"; + version = "0.31"; src = fetchFromGitHub { owner = "rocasa"; repo = "ttylog"; rev = version; - sha256 = "035i9slmdgds5azwxqwp6skxykvaq3mq4jckvm49fng8jq09z7zr"; + sha256 = "0c746bpjpa77vsr88fxk8h1803p5np1di1mpjf4jy5bv5x3zwm07"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/misc/unclutter-xfixes/default.nix b/pkgs/tools/misc/unclutter-xfixes/default.nix index dd13a0d9adce..9f43a7bd699f 100644 --- a/pkgs/tools/misc/unclutter-xfixes/default.nix +++ b/pkgs/tools/misc/unclutter-xfixes/default.nix @@ -2,7 +2,7 @@ xlibsWrapper, libev, libXi, libXfixes, pkgconfig, asciidoc, libxslt, docbook_xsl }: -let version = "1.2"; in +let version = "1.3"; in stdenv.mkDerivation { name = "unclutter-xfixes-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "Airblader"; repo = "unclutter-xfixes"; rev = "v${version}"; - sha256 = "1pw567mj7mq5kr8mqnyrvy7jj62qfg6zgqfyzz21nncslddnjzg8"; + sha256 = "1iikrz0023wygv29ny20xj1hlv9ry7hghlwjii6rj4jm59vl0mlz"; }; nativeBuildInputs = [pkgconfig]; diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/tools/misc/uutils-coreutils/default.nix new file mode 100644 index 000000000000..411e0324457a --- /dev/null +++ b/pkgs/tools/misc/uutils-coreutils/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, rustPlatform, cargo, cmake, sphinx, lib, prefix ? "uutils-" }: + +rustPlatform.buildRustPackage { + name = "uutils-coreutils-2018-02-09"; + src = fetchFromGitHub { + owner = "uutils"; + repo = "coreutils"; + rev = "f333ab26b03294a32a10c1c203a03c6b5cf8a89a"; + sha256 = "0nkggs5nqvc1mxzzgcsqm1ahchh4ll11xh0xqmcljrr5yg1rhhzf"; + }; + + # too many impure/platform-dependent tests + doCheck = false; + + cargoSha256 = "0qv2wz1bxhm5xhzbic7cqmn8jj8fyap0s18ylia4fbwpmv89nkc5"; + + makeFlags = + [ "CARGO=${cargo}/bin/cargo" "PREFIX=$(out)" "PROFILE=release" "INSTALLDIR_MAN=$(out)/share/man/man1" ] + ++ lib.optional (prefix != null) [ "PROG_PREFIX=${prefix}" ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ cargo sphinx ]; + + # empty {build,install}Phase to use defaults of `stdenv.mkDerivation` rather than rust defaults + buildPhase = ""; + installPhase = ""; + + meta = with stdenv.lib; { + description = "Cross-platform Rust rewrite of the GNU coreutils"; + longDescription = '' + uutils is an attempt at writing universal (as in cross-platform) + CLI utils in Rust. This repo is to aggregate the GNU coreutils rewrites. + ''; + homepage = https://github.com/uutils/coreutils; + maintainers = with maintainers; [ ma27 ]; + license = licenses.mit; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/vmtouch/default.nix b/pkgs/tools/misc/vmtouch/default.nix index 820c5a65c740..e5bb23016ae9 100644 --- a/pkgs/tools/misc/vmtouch/default.nix +++ b/pkgs/tools/misc/vmtouch/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "vmtouch"; - version = "1.1.0"; + version = "1.3.0"; name = "${pname}-git-${version}"; src = fetchFromGitHub { owner = "hoytech"; repo = "vmtouch"; rev = "v${version}"; - sha256 = "1cr8bw3favdvc3kc05n1r7f5fibqqv54bn3z2jwj70br8s5g0qx0"; + sha256 = "0xpigfpwidk25k605y2m2g1952nzl5fgp0wn65hhn7hbra7srglf"; }; buildInputs = [perl]; diff --git a/pkgs/tools/misc/xdo/default.nix b/pkgs/tools/misc/xdo/default.nix index b3c97207b1d6..c33e01fa0e71 100644 --- a/pkgs/tools/misc/xdo/default.nix +++ b/pkgs/tools/misc/xdo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "xdo-${version}"; - version = "0.5.6"; + version = "0.5.7"; src = fetchFromGitHub { owner = "baskerville"; repo = "xdo"; rev = version; - sha256 = "1i8xlsp36ji7cvyh66ajqsf59hxpwm0xvnn9laq7nbajcx3qqlnh"; + sha256 = "1h3jrygcjjbavdbkpx2hscsf0yf97gk487lzjdlvymd7dxdv9hy9"; }; makeFlags = "PREFIX=$(out)"; diff --git a/pkgs/tools/misc/xtitle/default.nix b/pkgs/tools/misc/xtitle/default.nix index 4be863993901..708675fb651c 100644 --- a/pkgs/tools/misc/xtitle/default.nix +++ b/pkgs/tools/misc/xtitle/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libxcb, xcbutil, xcbutilwm, git }: stdenv.mkDerivation rec { - name = "xtitle-0.3"; + name = "xtitle-0.4.3"; src = fetchurl { - url = "https://github.com/baskerville/xtitle/archive/0.3.tar.gz"; - sha256 = "07r36f4ad1q0dpkx3ykd49xlmi24d8mjqwh40j228k81wsvzayl1"; + url = "https://github.com/baskerville/xtitle/archive/0.4.3.tar.gz"; + sha256 = "0bk4mxx0vky37f66b2y34nggi1f7fnrmsprkxyc8mskj6qcrbm5h"; }; diff --git a/pkgs/tools/misc/yad/default.nix b/pkgs/tools/misc/yad/default.nix index 8dfd73ef20cb..31b8d673a988 100644 --- a/pkgs/tools/misc/yad/default.nix +++ b/pkgs/tools/misc/yad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk2, hicolor_icon_theme +{ stdenv, fetchurl, pkgconfig, intltool, gtk2, hicolor-icon-theme , wrapGAppsHook }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # for gcc5: c11 inline semantics breaks the build NIX_CFLAGS_COMPILE = "-fgnu89-inline"; - buildInputs = [ gtk2 hicolor_icon_theme ]; + buildInputs = [ gtk2 hicolor-icon-theme ]; nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; diff --git a/pkgs/tools/misc/yank/default.nix b/pkgs/tools/misc/yank/default.nix index 3d0338febcd5..36aa4ab09c46 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 = "0nf9y3jsvfjxa3mgigywnyirznn1m4zjm1glnwndrjsjrkcpnzb5"; + sha256 = "0v5aynrilm4fj7gz03q0yz6806ssjxhlv4bsa0213bgkin5iiws7"; inherit name; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/mptre/yank/releases"; license = licenses.mit; - version = "0.8.2"; + version = "0.8.3"; 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 3a917040863e..5ae99d239391 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.1011"; + version = "0.4.1025"; # 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 = "0h6aspnfic30s89xsv6qss1jfka9px4ll60bqrjbds4y0k3h818g"; + sha256 = "1dbalpwhzn39kgswjy84720wfjssa087adavbwig53krsjdvhj6k"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 0386896d97f8..4f082f28a7d4 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -16,11 +16,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2018.02.08"; + version = "2018.02.22"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "0iq5mav782gz0gm00rry3v7gdxkkx4y1k0p20pvz32ga4id5k1mg"; + sha256 = "112qmwrkd0cpyx2h20k6y07lw7iixvj8yya7r97h3k1y1py9vbz8"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/pkgs/tools/misc/yubikey-personalization-gui/default.nix index 31f39b887c56..e6a1c93d2bb6 100644 --- a/pkgs/tools/misc/yubikey-personalization-gui/default.nix +++ b/pkgs/tools/misc/yubikey-personalization-gui/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, yubikey-personalization, qt4, qmake4Hook, libyubikey }: stdenv.mkDerivation rec { - name = "yubikey-personalization-gui-3.1.24"; + name = "yubikey-personalization-gui-3.1.25"; src = fetchurl { url = "https://developers.yubico.com/yubikey-personalization-gui/Releases/${name}.tar.gz"; - sha256 = "0aj8cvajswkwzig0py0mjnfw0m8xsilisdcnixpjx9xxsxz5yacq"; + sha256 = "1knyv5yss8lhzaff6jpfqv12fjf1b8b21mfxzx3qi0hw4nl8n2v8"; }; nativeBuildInputs = [ pkgconfig qmake4Hook ]; |