diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-12-18 09:22:17 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-12-18 09:22:17 +0100 |
commit | 826ab7026e0f18c85fb861ae5f97bad1e9f37006 (patch) | |
tree | 1b4a117399a255f440ce6297211a3eb4baffe4cc /pkgs/tools/misc | |
parent | 0023e1d0de7c0a61f884f286a1a25326f0c0a568 (diff) | |
parent | 982b5ee26f079656875e299b772147217fcc09a2 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/misc')
25 files changed, 159 insertions, 112 deletions
diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix index ec2a2e4b7dd7a..ca006339d023a 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.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "rockowitz"; repo = "ddcutil"; rev = "v${version}"; - sha256 = "0mpd3j570yyfm9ki5in9i92nzg25ahmdfp2f7yby7xnqiy53zd8w"; + sha256 = "02jl0mr5m3h839j3drrkdycnvlhji4xdmnjcqfglds0ir1q1yapi"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index 1b2cdf0402ae5..222a29a0d9cb9 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -15,13 +15,13 @@ let binPath = stdenv.lib.makeBinPath [ ]; in stdenv.mkDerivation rec { name = "debootstrap-${version}"; - version = "1.0.110"; + version = "1.0.111"; 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 = "11bqy2dbqsy9fyx1i6lj0aj1pvq15y8kkwjfrp18k3nvy74y80ca"; + sha256 = "1m2678y2cswd2z7pksknv1cwlv3ww1fmhz4kkhvxlhpmyyc4260w"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/dpt-rp1-py/default.nix b/pkgs/tools/misc/dpt-rp1-py/default.nix new file mode 100644 index 0000000000000..88359adc31854 --- /dev/null +++ b/pkgs/tools/misc/dpt-rp1-py/default.nix @@ -0,0 +1,28 @@ +{ lib, python3Packages, fetchFromGitHub }: +python3Packages.buildPythonApplication rec { + pname = "dpt-rp1-py"; + version = "unstable-2018-10-16"; + + src = fetchFromGitHub { + owner = "janten"; + repo = pname; + rev = "4551b4432f8470de5f2ad9171105f731a6259395"; + sha256 = "176y5j31aci1vpi8v6r5ki55432fbdsazh9bsyzr90im9zimkffl"; + }; + + doCheck = false; + + propagatedBuildInputs = with python3Packages; [ + httpsig + requests + pbkdf2 + urllib3 + ]; + + meta = with lib; { + homepage = https://github.com/janten/dpt-rp1-py; + description = "Python script to manage Sony DPT-RP1 without Digital Paper App"; + license = licenses.mit; + maintainers = with maintainers; [ mt-caret ]; + }; +} diff --git a/pkgs/tools/misc/flameshot/default.nix b/pkgs/tools/misc/flameshot/default.nix index 5356f8ad065fb..3be418af823c2 100644 --- a/pkgs/tools/misc/flameshot/default.nix +++ b/pkgs/tools/misc/flameshot/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub, qtbase, qmake, qttools }: +{ stdenv, fetchFromGitHub, qtbase, qmake, qttools, qtsvg }: stdenv.mkDerivation rec { name = "flameshot-${version}"; - version = "0.5.1"; + version = "0.6.0"; - nativeBuildInputs = [ qmake qttools ]; + nativeBuildInputs = [ qmake qttools qtsvg ]; buildInputs = [ qtbase ]; qmakeFlags = [ @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "lupoDharkael"; repo = "flameshot"; rev = "v${version}"; - sha256 = "13h77np93r796jf289v4r687cmnpqkyqs34dm9gif4akaig74ky0"; + sha256 = "193szslh55v44jzxzx5g9kxhl8p8di7vbcnxlid4acfidhnvgazm"; }; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix index 160ea2faab61f..4a95563b2ecde 100644 --- a/pkgs/tools/misc/fwup/default.nix +++ b/pkgs/tools/misc/fwup/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "fwup-${version}"; - version = "1.2.6"; + version = "1.2.7"; src = fetchFromGitHub { owner = "fhunleth"; repo = "fwup"; rev = "v${version}"; - sha256 = "1rbpa0dcm9w1anz2bhcpmj2b678807s8j43zzkbkwh71aymfwr14"; + sha256 = "0r48l5jcb4pxb72ykigmaissm4ikadi7f6lkfma4jnd037w15bnl"; }; doCheck = true; diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index b7ce52f49b361..fce9f8272f013 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, geoipWithDatabase, ncurses, glib }: stdenv.mkDerivation rec { - version = "1.2"; + version = "1.3"; name = "goaccess-${version}"; src = fetchurl { url = "https://tar.goaccess.io/goaccess-${version}.tar.gz"; - sha256 = "051lrprg9svl5ccc3sif8fl78vfpkrgjcxgi2wngqn7a81jzdabb"; + sha256 = "16vv3pj7pbraq173wlxa89jjsd279004j4kgzlrsk1dz4if5qxwc"; }; configureFlags = [ diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 71d4abd9ca453..86287779792d1 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, bison, python +{ stdenv, fetchurl, fetchpatch, flex, bison, python , gettext, ncurses, libusb, freetype, qemu, lvm2, unifont, pkgconfig , fuse # only needed for grub-mount , zfs ? null @@ -82,7 +82,16 @@ stdenv.mkDerivation rec { unset CPP # setting CPP intereferes with dependency calculation ''; - patches = [ ./fix-bash-completion.patch ]; + patches = [ + ./fix-bash-completion.patch + # This patch makes grub compatible with the XFS sparse inode + # feature introduced by xfsprogs-4.16. + # to be removed in grub-2.03 + (fetchpatch { + url = https://git.savannah.gnu.org/cgit/grub.git/patch/?id=cda0a857dd7a27cd5d621747464bfe71e8727fff; + sha256 = "0k9qrkdxwdqk6sz05q9smqwjr6pvgc9adx1mlf0807g4im91xnm0"; + }) + ]; configureFlags = [ "--enable-grub-mount" ] # dep of os-prober ++ optional zfsSupport "--enable-libzfs" diff --git a/pkgs/tools/misc/intelmetool/default.nix b/pkgs/tools/misc/intelmetool/default.nix new file mode 100644 index 0000000000000..66378e457a26d --- /dev/null +++ b/pkgs/tools/misc/intelmetool/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchgit, zlib, pciutils }: + +stdenv.mkDerivation rec { + name = "intelmetool-${version}"; + version = "4.8.1"; + + src = fetchgit { + url = "https://review.coreboot.org/coreboot.git"; + rev = version; + sha256 = "1gjisy9b7vgzjvy1fwaqhq3589yd59kkylv7apjmg5r2b3dv4zvr"; + fetchSubmodules = false; + }; + + buildInputs = [ zlib pciutils ]; + + buildPhase = '' + make -C util/intelmetool + ''; + + installPhase = '' + mkdir -p $out/bin + cp util/intelmetool/intelmetool $out/bin + ''; + + meta = with stdenv.lib; { + description = "Dump interesting things about Management Engine"; + homepage = https://www.coreboot.org/Nvramtool; + license = licenses.gpl2; + maintainers = [ maintainers.gnidorah ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/logstash-forwarder/default.nix b/pkgs/tools/misc/logstash-forwarder/default.nix deleted file mode 100644 index 44fa1cb7cfb10..0000000000000 --- a/pkgs/tools/misc/logstash-forwarder/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchFromGitHub, go }: - -stdenv.mkDerivation rec { - name = "logstash-forwarder-${version}"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "elasticsearch"; - repo = "logstash-forwarder"; - rev = "v${version}"; - sha256 = "05g7366w8f7h75n1ia7njdpmparr6sfvn45xxfh5412zigqidz6l"; - }; - - buildInputs = [ go ]; - - installPhase = '' - mkdir -p $out/bin - find . -name logstash-forwarder -type f -exec cp {} $out/bin \; - ''; - - meta = { - license = stdenv.lib.licenses.asl20; - homepage = https://github.com/elasticsearch/logstash-forwarder; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/tools/misc/mbuffer/default.nix index 5eefc94a2cd6d..67640cf30abed 100644 --- a/pkgs/tools/misc/mbuffer/default.nix +++ b/pkgs/tools/misc/mbuffer/default.nix @@ -3,12 +3,12 @@ } : stdenv.mkDerivation rec { - version = "20180625"; + version = "20181119"; name = "mbuffer-${version}"; src = fetchurl { url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz"; - sha256 = "174m3zbm0qb68p1qng1vldcs23s7qjhyf7d39sw3r03m7y7f5g5p"; + sha256 = "1pysnvq03g3w4npw15cykgd0n7nj7lmv655szav4802pz1dgywj7"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/misc/me_cleaner/default.nix b/pkgs/tools/misc/me_cleaner/default.nix new file mode 100644 index 0000000000000..d224ad1dcc5d5 --- /dev/null +++ b/pkgs/tools/misc/me_cleaner/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub }: + +buildPythonPackage rec { + pname = "me_cleaner"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "corna"; + repo = pname; + rev = "v${version}"; + sha256 = "1bdj2clm13ir441vn7sv860xsc5gh71ja5lc2wn0gggnff0adxj4"; + }; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "Tool for partial deblobbing of Intel ME/TXE firmware images"; + longDescription = '' + me_cleaner is a Python script able to modify an Intel ME firmware image + with the final purpose of reducing its ability to interact with the system. + ''; + license = licenses.gpl3; + maintainers = with maintainers; [ gnidorah ]; + }; +} diff --git a/pkgs/tools/misc/mimeo/default.nix b/pkgs/tools/misc/mimeo/default.nix index 18e7281ce83a0..727732eb87bb8 100644 --- a/pkgs/tools/misc/mimeo/default.nix +++ b/pkgs/tools/misc/mimeo/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { name = "mimeo-${version}"; - version = "2017.6.6"; + version = "2018.11"; src = fetchurl { url = "https://xyne.archlinux.ca/projects/mimeo/src/${name}.tar.xz"; - sha256 = "126g3frks6zn6yc1r005qpmxg1pvvvf06ivpyvd9xribn2mwki2z"; + sha256 = "0qhsy6d1mg00s3mbykci7zk2n3qp2c27mh9nvjja9x8lx7xyfznm"; }; buildInputs = [ file desktop-file-utils ]; diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index fec81b580f3c4..22a032a4a46ea 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20181022"; + name = "parallel-20181122"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "1v6vrfnn6acjjlp8xiizvcrb3zzs94av5xcl6xm8zfvcapixx11f"; + sha256 = "1mcqymf6vg8jhnjv71sswcz5xrwpq2h2ishi8m1hz8rwhc65h1ig"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 0f035c347cfff..c3d3f916d979c 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2018.12"; + version = "1.2018.13"; name = "plantuml-${version}"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "1ydi4zwzwf9q6hldzd9pcvsbrwy8r52vqxm74j2wq8yivh2p85s4"; + sha256 = "181wm05gp4hs4g0z345pp1x9w1g5bx1vpipkhnwvmy4vdj17b4bg"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index 60851b467ed10..597d0b566d9e9 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.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "okbob"; repo = "pspg"; rev = "${version}"; - sha256 = "0gg94isnmng1qigghc2lrk4mvim20clbfhacwlxnd237ypv4mn2s"; + sha256 = "1k2nnq15h5grymiylnh1iqipxn315paq58habfmaix2zlj3n3dy2"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index d9933e0018f96..9c66ea849e259 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -6,30 +6,31 @@ assert tkremind -> tk != null; assert tkremind -> tcllib != null; assert tkremind -> makeWrapper != null; -stdenv.mkDerivation rec { - name = "remind-3.1.15"; - src = fetchurl { - url = https://www.roaringpenguin.com/files/download/remind-03.01.15.tar.gz; - sha256 = "1hcfcxz5fjzl7606prlb7dgls5kr8z3wb51h48s6qm8ang0b9nla"; - }; - - tclLibraries = if tkremind then [ tcllib tk ] else []; +let + inherit (stdenv.lib) optional optionals optionalString; + tclLibraries = stdenv.lib.optionals tkremind [ tcllib tk ]; tclLibPaths = stdenv.lib.concatStringsSep " " (map (p: "${p}/lib/${p.libPrefix}") tclLibraries); +in stdenv.mkDerivation { + name = "remind-3.1.16"; + src = fetchurl { + url = https://dianne.skoll.ca/projects/remind/download/remind-03.01.16.tar.gz; + sha256 = "14yavwqmimba8rdpwx3wlav9sfb0v5rcd1iyzqrs08wx07a9pdzf"; + }; - buildInputs = if tkremind then [ makeWrapper ] else []; + nativeBuildInputs = optional tkremind makeWrapper; propagatedBuildInputs = tclLibraries; - postPatch = if tkremind then '' + postPatch = optionalString tkremind '' substituteInPlace scripts/tkremind --replace "exec wish" "exec ${tk}/bin/wish" - '' else ""; + ''; - postInstall = if tkremind then '' + postInstall = optionalString tkremind '' wrapProgram $out/bin/tkremind --set TCLLIBPATH "${tclLibPaths}" - '' else ""; + ''; meta = { - homepage = http://www.roaringpenguin.com/products/remind; + homepage = https://dianne.skoll.ca/projects/remind/; description = "Sophisticated calendar and alarm program for the console"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [raskin kovirobi]; diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index ff7518b04deac..8f56ad6f6a27d 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "snapper-${version}"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "openSUSE"; repo = "snapper"; rev = "v${version}"; - sha256 = "1blllmkwh13pnf3hxi1p2az5i77arbm2661n0rd0569s6kf5brb7"; + sha256 = "0kl0najv8jpx94v44v68fmqsg2vv6yz3y5dmy0q8la0zyz766dhm"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/termtosvg/default.nix b/pkgs/tools/misc/termtosvg/default.nix index 33af6a9d67b63..1dca7f4a70bd2 100644 --- a/pkgs/tools/misc/termtosvg/default.nix +++ b/pkgs/tools/misc/termtosvg/default.nix @@ -2,14 +2,14 @@ python3.pkgs.buildPythonApplication rec { pname = "termtosvg"; - version = "0.6.0"; + version = "0.7.0"; # tests are not available when fetching from pypi src = fetchFromGitHub { owner = "nbedos"; repo = pname; rev = version; - sha256 = "07d9ashxph16phhawypm99wlx82975hqk08v1n56hxr0nr4f7nd2"; + sha256 = "17hhdrsn9ggcrwqp2c1h2la9cwhdazfrczd7nnm5mz7w6rk25lx3"; }; propagatedBuildInputs = with python3.pkgs; [ lxml pyte ]; diff --git a/pkgs/tools/misc/thefuck/default.nix b/pkgs/tools/misc/thefuck/default.nix index 1ccfc528e8f60..e6fb908435945 100644 --- a/pkgs/tools/misc/thefuck/default.nix +++ b/pkgs/tools/misc/thefuck/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "thefuck"; - version = "3.27"; + version = "3.28"; src = fetchFromGitHub { owner = "nvbn"; repo = "${pname}"; rev = version; - sha256 = "1lsg0g9lnpj2nidggm16b7jm4xzhg0dgy81crfzny62hah1zk0pj"; + sha256 = "070b2sx8r0b4hry6xg97psxlikxghmz91zicg2cm6kc1yhgz4agc"; }; propagatedBuildInputs = [ colorama decorator psutil pyte six ]; diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix index be6a5070d6117..d7f7c9f166981 100644 --- a/pkgs/tools/misc/tmuxinator/default.nix +++ b/pkgs/tools/misc/tmuxinator/default.nix @@ -8,8 +8,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "tmuxinator"; - version = "0.11.3"; - source.sha256 = "1l9pnfmfxjrszzqbw8w2r6akdi7g52q9iga01bxmy2nm27mbv2q1"; + version = "0.13.0"; + source.sha256 = "0jyyih8w8b30czfv0dc642vj8yp8iqyci89hjb2279xmmigjzmwc"; erubis = buildRubyGem rec { inherit ruby; diff --git a/pkgs/tools/misc/ttwatch/default.nix b/pkgs/tools/misc/ttwatch/default.nix index d7e1171064c6d..5663bcc35fdb4 100644 --- a/pkgs/tools/misc/ttwatch/default.nix +++ b/pkgs/tools/misc/ttwatch/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ttwatch-${version}"; - version = "2018-02-01"; + version = "2018-12-04"; src = fetchFromGitHub { owner = "ryanbinns"; repo = "ttwatch"; - rev = "b5c54647ed9b640584e53c4c15ee12d210790021"; - sha256 = "136sskz9hnbwp49gxp983mswzgpl8yfc25ni79csbsnwp0k4lb94"; + rev = "eeb4e19bf7ca7ca2cee7f5fbeb483b27198d86a1"; + sha256 = "18384apdkq35120cgmda686d293354aibwcq2hwhvvjmnq49fnzr"; }; nativeBuildInputs = [ cmake perl ]; diff --git a/pkgs/tools/misc/ttyplot/default.nix b/pkgs/tools/misc/ttyplot/default.nix index 9fdac0b8b9cc1..d82c7dda96a4b 100644 --- a/pkgs/tools/misc/ttyplot/default.nix +++ b/pkgs/tools/misc/ttyplot/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchFromGitHub, ncurses }: + stdenv.mkDerivation rec { name = "ttyplot-${version}"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "tenox7"; repo = "ttyplot"; rev = version; - sha256 = "1i54hw7fad42gdlrlqg7s0vhsq01yxzdi2s0r3svwbb1sr7ynzn1"; + sha256 = "0icv40fmf8z3a00csjh4c4svq3y6s6j70jgxjd6zqlxyks9wj7mr"; }; buildInputs = [ ncurses ]; @@ -22,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "a simple general purpose plotting utility for tty with data input from stdin."; + description = "A simple general purpose plotting utility for tty with data input from stdin"; homepage = https://github.com/tenox7/ttyplot; license = licenses.unlicense; maintainers = with maintainers; [ lassulus ]; diff --git a/pkgs/tools/misc/unclutter-xfixes/default.nix b/pkgs/tools/misc/unclutter-xfixes/default.nix index 9f43a7bd699fe..5e1661a6a2993 100644 --- a/pkgs/tools/misc/unclutter-xfixes/default.nix +++ b/pkgs/tools/misc/unclutter-xfixes/default.nix @@ -2,45 +2,23 @@ xlibsWrapper, libev, libXi, libXfixes, pkgconfig, asciidoc, libxslt, docbook_xsl }: -let version = "1.3"; in +stdenv.mkDerivation rec { + pname = "unclutter-xfixes"; + version = "1.4"; -stdenv.mkDerivation { - name = "unclutter-xfixes-${version}"; - version = version; - src = fetchFromGitHub { owner = "Airblader"; repo = "unclutter-xfixes"; rev = "v${version}"; - sha256 = "1iikrz0023wygv29ny20xj1hlv9ry7hghlwjii6rj4jm59vl0mlz"; + sha256 = "0anny6hvwf5nh7ghgi4gdcywhwyhgfvqvp7fjhm59kjc3qxnwf96"; }; - nativeBuildInputs = [pkgconfig]; - buildInputs = [ - xlibsWrapper libev libXi libXfixes - asciidoc libxslt docbook_xsl - ]; + nativeBuildInputs = [ pkgconfig asciidoc libxslt docbook_xsl ]; + buildInputs = [ xlibsWrapper libev libXi libXfixes ]; - postPatch = '' - substituteInPlace Makefile --replace "CC = gcc" "CC = cc" - ''; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; - preBuild = '' - # The Makefile calls git only to discover the package version, - # but that doesn't work right in the build environment, - # so we fake it. - git() { echo v${version}; } - export -f git - ''; - - preInstall = '' - export DESTDIR=$out MANDIR=/man/man1 - ''; - - postInstall = '' - mv $out/usr/bin $out/bin - mv $out/usr/share/man $out/man - ''; + installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "Rewrite of unclutter using the X11 Xfixes extension"; diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index 2e033c6bc821e..6ca284f15a60a 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.1167"; + version = "0.4.1181"; # 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 = "0lvddm62c0pwx4cksbwh2n0xzz80p26lz1xsvb4z40h7hlwaf41w"; + sha256 = "1rcy590392aycjazi3z8gf6ll39rxkbgmkgnsbsl6yl5vb3jgk83"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index d898813b0a902..fbf925516f351 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2018.11.18"; + version = "2018.12.17"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "1wvvwyvxg9aadgpbcz0p6nzqmvnxzlbsqja3j6487l41s1ky1fyq"; + sha256 = "1nd4zr3wd35vldm775m9wcgbzma2013yyj134lcz19ipjs38isrk"; }; nativeBuildInputs = [ makeWrapper ]; |