diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2019-02-01 09:22:29 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2019-02-01 09:22:29 +0100 |
commit | 5effa4e0f98b317fe4607b1a6548811017c3325d (patch) | |
tree | d62ab19ccca3b0c6409595074b637eeb3d4371dc /pkgs/tools/misc | |
parent | ca2edf79f75ad2a43a5af5c1283db9f0f843680a (diff) | |
parent | 8f58e00226e3192994050b12aa9ed119be0220f3 (diff) | |
download | nixlib-5effa4e0f98b317fe4607b1a6548811017c3325d.tar nixlib-5effa4e0f98b317fe4607b1a6548811017c3325d.tar.gz nixlib-5effa4e0f98b317fe4607b1a6548811017c3325d.tar.bz2 nixlib-5effa4e0f98b317fe4607b1a6548811017c3325d.tar.lz nixlib-5effa4e0f98b317fe4607b1a6548811017c3325d.tar.xz nixlib-5effa4e0f98b317fe4607b1a6548811017c3325d.tar.zst nixlib-5effa4e0f98b317fe4607b1a6548811017c3325d.zip |
Merge branch 'master' into staging-next
Comments on conflicts: - llvm: d6f401e1 vs. 469ecc70 - docs for 6 and 7 say the default is to build all targets, so we should be fine - some pypi hashes: they were equivalent, just base16 vs. base32
Diffstat (limited to 'pkgs/tools/misc')
33 files changed, 359 insertions, 55 deletions
diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix index e50faaca8995..4f90c0f03e9a 100644 --- a/pkgs/tools/misc/bandwidth/default.nix +++ b/pkgs/tools/misc/bandwidth/default.nix @@ -34,6 +34,5 @@ stdenv.mkDerivation rec { description = "Artificial benchmark for identifying weaknesses in the memory subsystem"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index b4913970715a..4da8527208e6 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -22,13 +22,6 @@ rustPlatform.buildRustPackage rec { postInstall = '' install -m 444 -Dt $out/share/man/man1 doc/bat.1 - - install -Dm644 target/release/build/bat-*/out/_bat \ - "$out/share/zsh/site-functions/_bat" - install -Dm644 target/release/build/bat-*/out/bat.bash \ - "$out/share/bash-completions/completions/bat.bash" - install -Dm644 target/release/build/bat-*/out/bat.fish \ - "$out/share/fish/vendor_completions.d/bat.fish" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/birdfont/default.nix b/pkgs/tools/misc/birdfont/default.nix new file mode 100644 index 000000000000..9dd84471922c --- /dev/null +++ b/pkgs/tools/misc/birdfont/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig, python3, xmlbird, +cairo, gdk_pixbuf, libgee, glib, gtk3, webkitgtk, libnotify, sqlite, vala, +gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "birdfont"; + version = "2.25.0"; + + src = fetchurl { + url = "https://birdfont.org/releases/${pname}-${version}.tar.xz"; + sha256 = "0fi86km9iaxs9b8lqz81079vppzp346kqiqk44vk45dclr5r6x22"; + }; + + nativeBuildInputs = [ python3 pkgconfig vala gobject-introspection wrapGAppsHook ]; + buildInputs = [ xmlbird libgee cairo gdk_pixbuf glib gtk3 webkitgtk libnotify sqlite gsettings-desktop-schemas ]; + + postPatch = "patchShebangs ."; + + buildPhase = "./build.py"; + + installPhase = "./install.py"; + + meta = with stdenv.lib; { + description = "Font editor which can generate fonts in TTF, EOT, SVG and BIRDFONT format"; + homepage = https://birdfont.org; + license = licenses.gpl3; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/tools/misc/birdfont/xmlbird.nix b/pkgs/tools/misc/birdfont/xmlbird.nix new file mode 100644 index 000000000000..a5581c84d504 --- /dev/null +++ b/pkgs/tools/misc/birdfont/xmlbird.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, python3, pkgconfig, vala, glib, gobject-introspection }: + +stdenv.mkDerivation rec { + pname = "xmlbird"; + version = "1.2.10"; + + src = fetchurl { + url = "https://birdfont.org/${pname}-releases/lib${pname}-${version}.tar.xz"; + sha256 = "0qpqpqqd4wj711jzczfsr38fgcz1rzxchrqbssxnan659ycd9c78"; + }; + + nativeBuildInputs = [ python3 pkgconfig vala gobject-introspection ]; + + buildInputs = [ glib ]; + + postPatch = "patchShebangs ."; + + buildPhase = "./build.py"; + + installPhase = "./install.py"; + + meta = with stdenv.lib; { + description = "XML parser for Vala and C programs"; + homepage = https://birdfont.org/xmlbird.php; + license = licenses.lgpl3; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/tools/misc/capture/0001-eval-fix.patch b/pkgs/tools/misc/capture/0001-eval-fix.patch new file mode 100644 index 000000000000..4b5bdc6a0bcf --- /dev/null +++ b/pkgs/tools/misc/capture/0001-eval-fix.patch @@ -0,0 +1,10 @@ +diff --git a/src/capture.sh b/src/capture.sh +index a32b018..82d1f15 100755 +--- a/src/capture.sh ++++ b/src/capture.sh +@@ -103,4 +103,4 @@ capture () { + + + # remove this line if you want to source this file instead +-eval " ${0##*/}" "$@" ++capture "$@" diff --git a/pkgs/tools/misc/capture/0002-sane-defaults.patch b/pkgs/tools/misc/capture/0002-sane-defaults.patch new file mode 100644 index 000000000000..1bd49ae41e38 --- /dev/null +++ b/pkgs/tools/misc/capture/0002-sane-defaults.patch @@ -0,0 +1,22 @@ +diff --git a/src/capture.sh b/src/capture.sh +index a32b018..42f3936 100755 +--- a/src/capture.sh ++++ b/src/capture.sh +@@ -9,7 +9,7 @@ set -e + # + + scale="-1:-1" +-fps="15" ++fps="30" + raw_video="-vf fps=$fps -c:v utvideo -f nut" + raw_video_container=".nut" + +@@ -18,7 +18,7 @@ raw_video_container=".nut" + # https://stackoverflow.com/questions/41372045/vp9-encoding-limited-to-4-threads + webm_video="-pix_fmt yuv420p -c:v libvpx-vp9 -crf 25 -b:v 0 -f webm -tile-columns 6 -frame-parallel 1 -threads 8" + +-tmpdir="/var/tmp" ++tmpdir="/tmp" + + + # capture_raw ./foo.nut diff --git a/pkgs/tools/misc/capture/default.nix b/pkgs/tools/misc/capture/default.nix new file mode 100644 index 000000000000..49c238b0bd0f --- /dev/null +++ b/pkgs/tools/misc/capture/default.nix @@ -0,0 +1,31 @@ +{ stdenv, pkgs, slop, ffmpeg, fetchFromGitHub, makeWrapper}: + +stdenv.mkDerivation rec { + name = "capture-${version}"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "buhman"; + repo = "capture"; + rev = "4be986f17462b8d520559429c74da6bf3a436259"; + sha256 = "172y06vs993x5v78zwl81xma1gkvjq1ad9rvmf3a217fyxsz4nhh"; + }; + + buildInputs = [ makeWrapper ]; + + patches = [ ./0001-eval-fix.patch ./0002-sane-defaults.patch ]; + + installPhase = '' + install -Dm755 src/capture.sh $out/bin/capture + + patchShebangs $out/bin/capture + wrapProgram $out/bin/capture \ + --prefix PATH : '${stdenv.lib.makeBinPath [ slop ffmpeg ]}' + ''; + + meta = with stdenv.lib; { + description = "A no bullshit screen capture tool"; + homepage = "https://github.com/buhman/capture"; + maintainers = [ maintainers.ar1a ]; + }; +} diff --git a/pkgs/tools/misc/chelf/default.nix b/pkgs/tools/misc/chelf/default.nix new file mode 100644 index 000000000000..4c54ab239d29 --- /dev/null +++ b/pkgs/tools/misc/chelf/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "chelf-${version}"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "Gottox"; + repo = "chelf"; + rev = "v${version}"; + sha256 = "0xwd84aynyqsi2kcndbff176vmhrak3jmn3lfcwya59653pppjr6"; + }; + + installPhase = '' + mkdir -p $out/bin + mv chelf $out/bin/chelf + ''; + + meta = with stdenv.lib; { + description = "change or display the stack size of an ELF binary"; + homepage = https://github.com/Gottox/chelf; + license = licenses.bsd2; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/tools/misc/crex/default.nix b/pkgs/tools/misc/crex/default.nix new file mode 100644 index 000000000000..696fbe863832 --- /dev/null +++ b/pkgs/tools/misc/crex/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "crex"; + version = "0.2.5"; + + src = fetchFromGitHub { + owner = "octobanana"; + repo = "crex"; + rev = version; + sha256 = "086rvwl494z48acgsq3yq11qh1nxm8kbf11adn16aszai4d4ipr3"; + }; + + postPatch = '' + substituteInPlace CMakeLists.txt --replace "/usr/local/bin" "bin" + ''; + + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "Explore, test, and check regular expressions in the terminal"; + homepage = https://octobanana.com/software/crex; + license = licenses.mit; + maintainers = with maintainers; [ dtzWill ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index ed210783db19..bb701f187fa8 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -38,6 +38,5 @@ stdenv.mkDerivation rec { homepage = http://expect.sourceforge.net/; license = "Expect"; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/tools/misc/hebcal/default.nix b/pkgs/tools/misc/hebcal/default.nix index edb5973fbb70..2c19facd1d36 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.15"; + version = "4.16"; name = "hebcal-${version}"; src = fetchFromGitHub { owner = "hebcal"; repo = "hebcal"; rev = "v${version}"; - sha256 = "1s9iardqyzn42hs0x9p4rig2m87v87jvzcrbb9arcci7nds66y3i"; + sha256 = "081h3dan0v14camv6j3swl9y31yzfwjfkp2h8xz5qmrh0scv8azr"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index 8137379a4da6..cab1d1b5958b 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "lf-${version}"; - version = "8"; + version = "9"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - sha256 = "0rmcac9wx9lldl57m1cim1adf2fqkva1yi4v6934jgccqhlqvk58"; + sha256 = "08dwnlgw1dcnd2hl5ma6qqzcyjn9wjp28mjbnidyvc5dmmxc87dq"; }; goPackagePath = "github.com/gokcehan/lf"; diff --git a/pkgs/tools/misc/lf/deps.nix b/pkgs/tools/misc/lf/deps.nix index 57877822b08d..8f1e5c75c281 100644 --- a/pkgs/tools/misc/lf/deps.nix +++ b/pkgs/tools/misc/lf/deps.nix @@ -4,8 +4,8 @@ fetch = { type = "git"; url = "https://github.com/nsf/termbox-go"; - rev = "b66b20ab708e289ff1eb3e218478302e6aec28ce"; # master - sha256 = "0wrgnwfdxrspni5q15vzr5q1bxnzb7m6q4xjhllcyddgn2zqprsa"; + rev = "02980233997d87bbda048393d47b4d453f7a398d"; # master + sha256 = "1zxysi00bk7bv5ka6vn9dnzk5q9wjp0252cm3v6l2hbrcx7405zw"; }; } { @@ -13,8 +13,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-runewidth"; - rev = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb"; # v0.0.3 - sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; + rev = "3ee7d812e62a0804a7d0a324e0249ca2db3476d3"; # v0.0.4 + sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs"; }; } ] diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/tools/misc/mbuffer/default.nix index 67640cf30abe..e39a514bcb8c 100644 --- a/pkgs/tools/misc/mbuffer/default.nix +++ b/pkgs/tools/misc/mbuffer/default.nix @@ -3,12 +3,12 @@ } : stdenv.mkDerivation rec { - version = "20181119"; + version = "20190113"; name = "mbuffer-${version}"; src = fetchurl { url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz"; - sha256 = "1pysnvq03g3w4npw15cykgd0n7nj7lmv655szav4802pz1dgywj7"; + sha256 = "07rgv98ys3bd0q35ivxjrgrhq199z19lj14jafzq96gcwspy8783"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix index e87328f271e9..a7cfed568b16 100644 --- a/pkgs/tools/misc/moreutils/default.nix +++ b/pkgs/tools/misc/moreutils/default.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "moreutils-${version}"; - version = "0.62"; + version = "0.63"; src = fetchgit { url = "git://git.joeyh.name/moreutils"; rev = "refs/tags/${version}"; - sha256 = "0sk7rgqsqbdwr69mh7y4v9lv4v0nfmsrqgvbpy2gvy82snhfzar2"; + sha256 = "17sszmcdck4w01hgcq7vd25p2iw3yzvjwx1yf20jg85gzs1dplrd"; }; preBuild = '' diff --git a/pkgs/tools/misc/mstflint/default.nix b/pkgs/tools/misc/mstflint/default.nix index 748c0917defb..f3cd1c6e5277 100644 --- a/pkgs/tools/misc/mstflint/default.nix +++ b/pkgs/tools/misc/mstflint/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { homepage = https://www.openfabrics.org/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; broken = true; # 2018-04-11 }; } diff --git a/pkgs/tools/misc/oci-image-tool/default.nix b/pkgs/tools/misc/oci-image-tool/default.nix new file mode 100644 index 000000000000..6d508a48901a --- /dev/null +++ b/pkgs/tools/misc/oci-image-tool/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub, buildGoPackage }: + +buildGoPackage rec { + name = "oci-image-tool-${version}"; + version = "1.0.0-rc1"; + + goPackagePath = "github.com/opencontainers/image-tools"; + subPackages = [ "cmd/oci-image-tool" ]; + + src = fetchFromGitHub { + owner = "opencontainers"; + repo = "image-tools"; + rev = "v${version}"; + sha256 = "0c4n69smqlkf0r6khy9gbg5f810qh9g8jqsl9kibb0dyswizr14r"; + }; + + meta = { + description = "A collection of tools for working with the OCI image format specification"; + homepage = https://github.com/opencontainers/image-tools; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ nzhang-zh ]; + }; +} diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 4697c0a09f06..6caaff37acd6 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-20181222"; + name = "parallel-20190122"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "0sd39nzgff3rpyzfwkffb5yxbdm5r6amrkslbgpjlrcrymy9z305"; + sha256 = "030rjhis8s47gkm05k4vc9p886cxvadpgzs8rqmgzvlc38h5ywxf"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/pb_cli/0001-eval-fix.patch b/pkgs/tools/misc/pb_cli/0001-eval-fix.patch new file mode 100644 index 000000000000..7188cf372977 --- /dev/null +++ b/pkgs/tools/misc/pb_cli/0001-eval-fix.patch @@ -0,0 +1,10 @@ +diff --git a/src/pb.sh b/src/pb.sh +index be1e472..eb9e6f9 100755 +--- a/src/pb.sh ++++ b/src/pb.sh +@@ -61,4 +61,4 @@ pb () { + esac + } + +-eval " ${0##*/}" "$@" ++pb "$@" diff --git a/pkgs/tools/misc/pb_cli/default.nix b/pkgs/tools/misc/pb_cli/default.nix new file mode 100644 index 000000000000..6fab44891c52 --- /dev/null +++ b/pkgs/tools/misc/pb_cli/default.nix @@ -0,0 +1,40 @@ +{ screenshots ? true, video ? false, clipboard ? true +, stdenv, pkgs, jq, curl, fetchFromGitHub, makeWrapper, maim ? null, xclip ? null, capture ? null }: + +assert screenshots -> maim != null; +assert video -> capture != null; +assert clipboard -> xclip != null; + +stdenv.mkDerivation rec { + name = "pb_cli-${version}"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "ptpb"; + repo = "pb_cli"; + rev = "5242382b3d6b5c0ddaf6e4843a69746b40866e57"; + sha256 = "0543x3377apinhxnsfq82zlp5sm8g1bf6hmsvvcwra5rsshv2ybk"; + }; + + patches = [ ./0001-eval-fix.patch ]; + + buildInputs = [ makeWrapper ]; + + liveDeps = [ jq curl ] ++ stdenv.lib.optional screenshots maim + ++ stdenv.lib.optional video capture + ++ stdenv.lib.optional clipboard xclip; + + installPhase = '' + install -Dm755 src/pb.sh $out/bin/pb + + patchShebangs $out/bin/pb + wrapProgram $out/bin/pb \ + --prefix PATH : '${stdenv.lib.makeBinPath liveDeps}' + ''; + + meta = with stdenv.lib; { + description = "A no bullshit ptpb client"; + homepage = "https://github.com/ptpb/pb_cli"; + maintainers = [ maintainers.ar1a ]; + }; +} diff --git a/pkgs/tools/misc/picocom/default.nix b/pkgs/tools/misc/picocom/default.nix index bb66b97039da..c49695fd9ad9 100644 --- a/pkgs/tools/misc/picocom/default.nix +++ b/pkgs/tools/misc/picocom/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchFromGitHub, makeWrapper, lrzsz }: +{ stdenv, fetchFromGitHub, makeWrapper, lrzsz, IOKit }: + +assert stdenv.isDarwin -> IOKit != null; + +with stdenv.lib; stdenv.mkDerivation rec { name = "picocom-${version}"; @@ -11,7 +15,8 @@ stdenv.mkDerivation rec { sha256 = "1vvjydqf0ax47nvdyyl67jafw5b3sfsav00xid6qpgia1gs2r72n"; }; - buildInputs = [ makeWrapper ]; + buildInputs = [ makeWrapper ] + ++ optionals stdenv.isDarwin [ IOKit ]; installPhase = '' mkdir -p $out/bin $out/share/man/man1 @@ -26,6 +31,6 @@ stdenv.mkDerivation rec { description = "Minimal dumb-terminal emulation program"; homepage = https://github.com/npat-efault/picocom/; license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index 640e641dd477..320edd83021f 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -1,26 +1,30 @@ -{ stdenv, fetchFromGitHub, - gettext, glib, json-glib, libelf, pkgconfig, scons, sphinx, utillinux }: +{ stdenv, fetchFromGitHub +, gettext, pkgconfig, scons +, glib, json-glib, libelf, sphinx, utillinux }: with stdenv.lib; stdenv.mkDerivation rec { name = "rmlint-${version}"; - version = "2.6.1"; + version = "2.8.0"; src = fetchFromGitHub { owner = "sahib"; repo = "rmlint"; rev = "v${version}"; - sha256 = "1j09qk3zypw4my713q9g36kq37ggqd5v9vrs3h821p6p3qmmkdn8"; + sha256 = "1gc7gbnh0qg1kl151cv1ld87vhpm1v3pnkn7prhscdcc21jrg8nz"; }; - configurePhase = "scons config"; + CFLAGS="-I${stdenv.lib.getDev utillinux}/include"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gettext glib json-glib libelf scons sphinx utillinux ]; + nativeBuildInputs = [ + pkgconfig sphinx gettext scons + ]; - buildPhase = "scons"; + buildInputs = [ + glib json-glib libelf utillinux + ]; - installPhase = "scons --prefix=$out install"; + prefixKey = "--prefix="; meta = { description = "Extremely fast tool to remove duplicates and other lint from your filesystem"; diff --git a/pkgs/tools/misc/slurp/default.nix b/pkgs/tools/misc/slurp/default.nix new file mode 100644 index 000000000000..a729ea6381ac --- /dev/null +++ b/pkgs/tools/misc/slurp/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, cairo, meson, ninja, wayland, pkgconfig, wayland-protocols }: + +stdenv.mkDerivation rec { + name = "slurp-${version}"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "emersion"; + repo = "slurp"; + rev = "v${version}"; + sha256 = "03igv8r8n772xb0y7whhs1pa298l3d94jbnknaxpwp2n4fi04syb"; + }; + + nativeBuildInputs = [ + meson + ninja + pkgconfig + ]; + + buildInputs = [ + cairo + wayland + wayland-protocols + ]; + + meta = with stdenv.lib; { + description = "Grab images from a Wayland compositor"; + homepage = https://github.com/emersion/slurp; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ buffet ]; + }; +} diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index 8f56ad6f6a27..3d1eedab8c47 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.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "openSUSE"; repo = "snapper"; rev = "v${version}"; - sha256 = "0kl0najv8jpx94v44v68fmqsg2vv6yz3y5dmy0q8la0zyz766dhm"; + sha256 = "0f3xvvmyln7rjvv4w0zsd4b4d1mzcdx0xrgcscqj2v18xgwwcc4p"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/termtosvg/default.nix b/pkgs/tools/misc/termtosvg/default.nix index 1dca7f4a70bd..9912202f867e 100644 --- a/pkgs/tools/misc/termtosvg/default.nix +++ b/pkgs/tools/misc/termtosvg/default.nix @@ -2,20 +2,20 @@ python3.pkgs.buildPythonApplication rec { pname = "termtosvg"; - version = "0.7.0"; + version = "0.8.0"; # tests are not available when fetching from pypi src = fetchFromGitHub { owner = "nbedos"; repo = pname; rev = version; - sha256 = "17hhdrsn9ggcrwqp2c1h2la9cwhdazfrczd7nnm5mz7w6rk25lx3"; + sha256 = "0si5l8cdbzapcibr4yavhld2vhfrpk7qj4cy7m4ws7js8g9iwzd4"; }; propagatedBuildInputs = with python3.pkgs; [ lxml pyte ]; meta = with lib; { - homepage = https://github.com/nbedos/termtosvg; + homepage = https://nbedos.github.io/termtosvg/; description = "Record terminal sessions as SVG animations"; license = licenses.bsd3; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index fe31d324087c..c4cedf426507 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -4,11 +4,11 @@ with python.pkgs; buildPythonApplication rec { pname = "tmuxp"; - version = "1.4.2"; + version = "1.5.0a1"; src = fetchPypi { inherit pname version; - sha256 = "087icp1n1qdf53f1314g5biz16sigrnpqr835xqlr6vj85imm2dm"; + sha256 = "88b6ece3ff59a0882b5c5bff169cc4c1d688161fe61e5553b0a0802ff64b6da8"; }; postPatch = '' @@ -29,9 +29,8 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "Manage tmux workspaces from JSON and YAML"; - homepage = http://tmuxp.readthedocs.io; + homepage = https://tmuxp.git-pull.com/; license = licenses.bsd3; - platforms = platforms.linux; maintainers = with maintainers; [ jgeerds ]; }; } diff --git a/pkgs/tools/misc/ttylog/default.nix b/pkgs/tools/misc/ttylog/default.nix index 3baafa29677b..fda9dc506e2f 100644 --- a/pkgs/tools/misc/ttylog/default.nix +++ b/pkgs/tools/misc/ttylog/default.nix @@ -22,6 +22,5 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/tools/misc/txr/default.nix b/pkgs/tools/misc/txr/default.nix new file mode 100644 index 000000000000..c7ff9e18238f --- /dev/null +++ b/pkgs/tools/misc/txr/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, bison, flex, libffi }: + +stdenv.mkDerivation rec { + name = "txr-${version}"; + version = "208"; + + src = fetchurl { + url = "http://www.kylheku.com/cgit/txr/snapshot/${name}.tar.bz2"; + sha256 = "091yki3a24pscwd0lg2ymy86r223amjnz9c71z4a2kxz5brhl5my"; + }; + + nativeBuildInputs = [ bison flex ]; + buildInputs = [ libffi ]; + + enableParallelBuilding = true; + + doCheck = true; + checkTarget = "tests"; + + # Remove failing test-- mentions 'usr/bin' so probably related :) + preCheck = "rm -rf tests/017"; + + # TODO: install 'tl.vim', make avail when txr is installed or via plugin + + meta = with stdenv.lib; { + description = "Programming language for convenient data munging"; + license = licenses.bsd2; + homepage = http://nongnu.org/txr; + maintainers = with stdenv.lib.maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix index dd3eddf73954..61f1752823d7 100644 --- a/pkgs/tools/misc/watchexec/default.nix +++ b/pkgs/tools/misc/watchexec/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "watchexec-${version}"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "watchexec"; repo = "watchexec"; rev = version; - sha256 = "0zp5s2dy5zbar0virvy1izjpvvgwbz7rvjmcy6bph6rb5c4bhm70"; + sha256 = "15fnf3r4pvl9gyvq0fy0l7p8xjaz44z9g4dzkn1l0fdhldib6z1c"; }; - cargoSha256 = "1li84kq9myaw0zwx69y72f3lx01s7i9p8yays4rwvl1ymr614y1l"; + cargoSha256 = "1xlcfr2q2pw47sav9iryjva7w9chv90g18hszq8s0q0w71sccv6j"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index 2d0ed3ac1c50..9dbc4a57bca8 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.1193"; + version = "0.4.1205"; # 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 = "1q7wha0d55pw077bs92bbzx6ck3nsmhnxblz7zaqzladn23hs9zg"; + sha256 = "06xb72vm11pbqhw320kk3w4xj0ymkskx1bh80nvq2wc1y7rpd39n"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix index ab9eb5d001b2..c214598ce1b3 100644 --- a/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { certificates, and create certificate requests, and other operations. A shared library and a command-line tool is included. ''; - maintainers = with maintainers; [ wkennington ]; license = licenses.bsd2; platforms = platforms.all; }; diff --git a/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/pkgs/tools/misc/yubikey-personalization-gui/default.nix index d507816dbd38..405ff745baaf 100644 --- a/pkgs/tools/misc/yubikey-personalization-gui/default.nix +++ b/pkgs/tools/misc/yubikey-personalization-gui/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ yubikey-personalization qtbase libyubikey ]; - + installPhase = '' mkdir -p $out/bin cp build/release/yubikey-personalization-gui $out/bin @@ -21,6 +21,5 @@ stdenv.mkDerivation rec { description = "A QT based cross-platform utility designed to facilitate reconfiguration of the Yubikey"; license = licenses.bsd2; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix index 48827ec0aae4..43814a3f613f 100644 --- a/pkgs/tools/misc/yubikey-personalization/default.nix +++ b/pkgs/tools/misc/yubikey-personalization/default.nix @@ -28,6 +28,5 @@ stdenv.mkDerivation rec { description = "A library and command line tool to personalize YubiKeys"; license = licenses.bsd2; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } |