diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-28 08:26:42 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-28 08:26:42 +0200 |
commit | 5061fe0c2c7743370e1d379d6fa60eed26ff1470 (patch) | |
tree | 4a4ee79a6e0694d3c7ad6fbeff33343d83458e6c /pkgs/tools/misc | |
parent | a2538606e3115e16db2e5075ecf37b886ad64ede (diff) | |
parent | 98640fd48212f8e6552517f667bba1901f5936d4 (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools/misc')
33 files changed, 356 insertions, 126 deletions
diff --git a/pkgs/tools/misc/3llo/Gemfile b/pkgs/tools/misc/3llo/Gemfile new file mode 100644 index 0000000000000..17a1086d78f0e --- /dev/null +++ b/pkgs/tools/misc/3llo/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem '3llo', '0.3.0' diff --git a/pkgs/tools/misc/3llo/Gemfile.lock b/pkgs/tools/misc/3llo/Gemfile.lock new file mode 100644 index 0000000000000..0696ba341651d --- /dev/null +++ b/pkgs/tools/misc/3llo/Gemfile.lock @@ -0,0 +1,27 @@ +GEM + remote: https://rubygems.org/ + specs: + 3llo (0.3.0) + tty-prompt (~> 0.12.0) + equatable (0.6.1) + necromancer (0.4.0) + pastel (0.7.3) + equatable (~> 0.6) + tty-color (~> 0.5) + tty-color (0.5.0) + tty-cursor (0.4.0) + tty-prompt (0.12.0) + necromancer (~> 0.4.0) + pastel (~> 0.7.0) + tty-cursor (~> 0.4.0) + wisper (~> 1.6.1) + wisper (1.6.1) + +PLATFORMS + ruby + +DEPENDENCIES + 3llo (= 0.3.0) + +BUNDLED WITH + 1.17.2 diff --git a/pkgs/tools/misc/3llo/default.nix b/pkgs/tools/misc/3llo/default.nix new file mode 100644 index 0000000000000..1f59d1f16a785 --- /dev/null +++ b/pkgs/tools/misc/3llo/default.nix @@ -0,0 +1,31 @@ +{ lib, ruby, bundlerApp, fetchpatch }: + +bundlerApp { + pname = "3llo"; + + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + + gemset = lib.recursiveUpdate (import ./gemset.nix) ({ + "3llo" = { + dontBuild = false; + patches = [ + (fetchpatch { + url = https://github.com/qcam/3llo/commit/7667c67fdc975bac315da027a3c69f49e7c06a2e.patch; + sha256 = "0ahp19igj77x23b2j9zk3znlmm7q7nija7mjgsmgqkgfbz2r1y7v"; + }) + ]; + }; + }); + + inherit ruby; + + exes = [ "3llo" ]; + + meta = with lib; { + description = "Trello interactive CLI on terminal"; + license = licenses.mit; + homepage = https://github.com/qcam/3llo; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/tools/misc/3llo/gemset.nix b/pkgs/tools/misc/3llo/gemset.nix new file mode 100644 index 0000000000000..5c50ea9b21229 --- /dev/null +++ b/pkgs/tools/misc/3llo/gemset.nix @@ -0,0 +1,85 @@ +{ + "3llo" = { + dependencies = ["tty-prompt"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "082g42lkkynnb2piz37ih696zm2ms63mz2q9rnfzjsd149ig39yy"; + type = "gem"; + }; + version = "0.3.0"; + }; + equatable = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fzx2ishipnp6c124ka6fiw5wk42s7c7gxid2c4c1mb55b30dglf"; + type = "gem"; + }; + version = "0.6.1"; + }; + necromancer = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0v9nhdkv6zrp7cn48xv7n2vjhsbslpvs0ha36mfkcd56cp27pavz"; + type = "gem"; + }; + version = "0.4.0"; + }; + pastel = { + dependencies = ["equatable" "tty-color"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m43wk7gswwkl6lfxwlliqc9v1qp8arfygihyz91jc9icf270xzm"; + type = "gem"; + }; + version = "0.7.3"; + }; + tty-color = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zpp6zixkkchrc2lqnabrsy24pxikz2px87ggz5ph6355fs803da"; + type = "gem"; + }; + version = "0.5.0"; + }; + tty-cursor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07whfm8mnp7l49s2cm2qy1snhsqq3a90sqwb71gvym4hm2kx822a"; + type = "gem"; + }; + version = "0.4.0"; + }; + tty-prompt = { + dependencies = ["necromancer" "pastel" "tty-cursor" "wisper"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1026nyqhgmgxi2nmk8xk3hca07gy5rpisjs8y6w00wnw4f01kpv0"; + type = "gem"; + }; + version = "0.12.0"; + }; + wisper = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19bw0z1qw1dhv7gn9lad25hgbgpb1bkw8d599744xdfam158ms2s"; + type = "gem"; + }; + version = "1.6.1"; + }; +} \ No newline at end of file diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index 3c0d42e832e7b..fd9bbda699f15 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -52,11 +52,11 @@ in sha256 = "1bp1cqkrpg77rjyh4lq1agc719fmxn92jkiicf6nbhfl8kf3l3vy"; }; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/phillipberndt/autorandr/; description = "Automatically select a display configuration based on connected devices"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.coroa ]; - platforms = stdenv.lib.platforms.unix; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ coroa globin ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index 070b7a7699ca0..2c48f995ca2d7 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { pname = "calamares"; - version = "3.2.8"; + version = "3.2.11"; # release including submodule src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "1ymyl12fzxc5jjfbw4pfmgzp036w0dai76f7anilw2bnwfzq5g62"; + sha256 = "1djrc8p6kll8szycyj86v02jphiw2xwfhn563siykphfqr0jknlw"; }; buildInputs = [ diff --git a/pkgs/tools/misc/ckb-next/default.nix b/pkgs/tools/misc/ckb-next/default.nix index 9d2126db9ff20..575cb686f9d46 100644 --- a/pkgs/tools/misc/ckb-next/default.nix +++ b/pkgs/tools/misc/ckb-next/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, substituteAll, udev +{ stdenv, mkDerivation, fetchFromGitHub, substituteAll, udev , pkgconfig, qtbase, cmake, zlib, kmod }: -stdenv.mkDerivation rec { +mkDerivation rec { version = "0.3.2"; pname = "ckb-next"; @@ -23,6 +23,10 @@ stdenv.mkDerivation rec { cmake ]; + cmakeFlags = [ + "-DINSTALL_DIR_ANIMATIONS=libexec" + ]; + patches = [ ./install-dirs.patch ./systemd-service.patch diff --git a/pkgs/tools/misc/docui/default.nix b/pkgs/tools/misc/docui/default.nix index 74ce8c102c678..66c0cfc82b1b0 100644 --- a/pkgs/tools/misc/docui/default.nix +++ b/pkgs/tools/misc/docui/default.nix @@ -2,21 +2,22 @@ buildGoModule rec { pname = "docui"; - version = "1.0.3"; + version = "2.0.0"; src = fetchFromGitHub { owner = "skanehira"; repo = "docui"; rev = version; - sha256 = "1kbap36hccwlj273is98cvgf5z5cl2c3s6p46nh6bnykz3zqzs71"; + sha256 = "0rizl4rxmb3brzvqxw5llbgvq3rncix3h60pgq50djdf0jjnn5hs"; }; - modSha256 = "1qma9bnd4k594cr5dcv74xns53mhfyl4jsm01chf85dxywjjd9vd"; + modSha256 = "0asqz9nnx80g2wi7dzxrfmppcraywrwdqi9vzr66vaihwpfpfnwz"; meta = with stdenv.lib; { description = "TUI Client for Docker"; homepage = https://github.com/skanehira/docui; license = licenses.mit; platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ aethelz ]; }; } diff --git a/pkgs/tools/misc/dynamic-colors/default.nix b/pkgs/tools/misc/dynamic-colors/default.nix index 799236a580462..6cb01f14a2c0b 100644 --- a/pkgs/tools/misc/dynamic-colors/default.nix +++ b/pkgs/tools/misc/dynamic-colors/default.nix @@ -2,37 +2,25 @@ stdenv.mkDerivation rec { pname = "dynamic-colors"; - version = "0.2.2.1"; + version = "0.2.2.2"; src = fetchFromGitHub { owner = "peterhoeg"; repo = "dynamic-colors"; rev = "v${version}"; - sha256 = "0qz76n5sspgpz6bz66jfkyr42da3skbpw9wbvxgm3ha343azfaiw"; + sha256 = "0i63570z9aqbxa8ixh4ayb3akgjdnlqyl2sbf9d7x8f1pxhk5kd5"; }; - dontBuild = true; - dontStrip = true; + PREFIX = placeholder "out"; - installPhase = '' - mkdir -p \ - $out/bin \ - $out/share/dynamic-colors/colorschemes \ - $out/share/bash-completion/completions \ - $out/share/zsh/site-packages - - install -m755 bin/dynamic-colors $out/bin/ - install -m644 completions/dynamic-colors.bash $out/share/bash-completion/completions/dynamic-colors - install -m644 completions/dynamic-colors.zsh $out/share/zsh/site-packages/_dynamic-colors - install -m644 colorschemes/* -t $out/share/dynamic-colors/colorschemes - - substituteInPlace $out/bin/dynamic-colors \ + postPatch = '' + substituteInPlace bin/dynamic-colors \ --replace /usr/share/dynamic-colors $out/share/dynamic-colors ''; meta = with stdenv.lib; { description = "Change terminal colors on the fly"; - homepage = https://github.com/peterhoeg/dynamic-colors; + homepage = "https://github.com/peterhoeg/dynamic-colors"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index 7c43638ea562f..1447c70412b69 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -52,6 +52,6 @@ buildRustPackage rec { ''; homepage = https://the.exa.website; license = licenses.mit; - maintainers = with maintainers; [ ehegnes lilyball ]; + maintainers = with maintainers; [ ehegnes lilyball globin ]; }; } diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 64bceb355a29c..91c1b3b707194 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/sharkdp/fd"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ dywedir ]; + maintainers = with maintainers; [ dywedir globin ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix index 22697cfb24d33..73734ee5ea0fe 100644 --- a/pkgs/tools/misc/ffsend/default.nix +++ b/pkgs/tools/misc/ffsend/default.nix @@ -16,16 +16,16 @@ with rustPlatform; buildRustPackage rec { pname = "ffsend"; - version = "0.2.49"; + version = "0.2.50"; src = fetchFromGitLab { owner = "timvisee"; repo = "ffsend"; rev = "v${version}"; - sha256 = "08x0kakhn75yzajxpvpdp1ml9z77i2x2k02kqcx3ssr6mbc7xnpf"; + sha256 = "06virzmg3prvwk5gilr19qrpi93wvv7jq096kgsbn3rmnv3ys1zh"; }; - cargoSha256 = "1dmkij25gj0ya1i6h5l7pkjnqvj02zvsx15hddbjn1q06pihcsjm"; + cargoSha256 = "1g72nz3nha41cvsb514z4k78yw7xcsh3nm0bl2wqy9dvdzgp1lm1"; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ openssl ] diff --git a/pkgs/tools/misc/fpp/default.nix b/pkgs/tools/misc/fpp/default.nix index bfaf30f3f3708..ac731bcdbe86e 100644 --- a/pkgs/tools/misc/fpp/default.nix +++ b/pkgs/tools/misc/fpp/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, python27 }: +{ stdenv, fetchFromGitHub, python3 }: stdenv.mkDerivation rec { pname = "fpp"; - version = "0.7.2"; + version = "0.8.2"; src = fetchFromGitHub { owner = "facebook"; repo = "PathPicker"; rev = version; - sha256 = "03n8sc2fvs2vk46jv6qfkjbyqz85yxnphvabji7qnmd3jv631w47"; + sha256 = "00916xx4scd4xr9zxqkyhilczi27f2qm5y042592wr79ddix4n9v"; }; postPatch = '' - substituteInPlace fpp --replace 'PYTHONCMD="python"' 'PYTHONCMD="${python27.interpreter}"' + substituteInPlace fpp --replace 'PYTHONCMD="python"' 'PYTHONCMD="${python3.interpreter}"' ''; installPhase = '' diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix index 33b884a5eb999..0f32d1e63b1e8 100644 --- a/pkgs/tools/misc/geekbench/default.nix +++ b/pkgs/tools/misc/geekbench/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "geekbench"; - version = "4.4.0"; + version = "4.4.1"; src = fetchurl { url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; - sha256 = "1awdr54vw29ah7aah2bxpy4qkqasxj67sqk6gir8ybnxb5hxm3ri"; + sha256 = "0s3v8frflqqifyzq84xi6322wg8c9f5wcaic9zlpdf6wylqsiali"; }; dontConfigure = true; diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix index fde08702f675a..828d4e4dab783 100644 --- a/pkgs/tools/misc/grc/default.nix +++ b/pkgs/tools/misc/grc/default.nix @@ -1,8 +1,9 @@ -{ stdenv, fetchFromGitHub, python3Packages, makeWrapper }: +{ stdenv, fetchFromGitHub, python3Packages }: -stdenv.mkDerivation rec { +python3Packages.buildPythonApplication rec { pname = "grc"; version = "1.11.3"; + format = "other"; src = fetchFromGitHub { owner = "garabik"; @@ -11,22 +12,18 @@ stdenv.mkDerivation rec { sha256 = "0b3wx9zr7l642hizk93ysbdss7rfymn22b2ykj4kpkf1agjkbv35"; }; - buildInputs = with python3Packages; [ wrapPython makeWrapper ]; + postPatch = '' + for f in grc grcat; do + substituteInPlace $f \ + --replace /usr/local/ $out/ + done + ''; installPhase = '' runHook preInstall ./install.sh "$out" "$out" - - for f in $out/bin/* ; do - patchPythonScript $f - substituteInPlace $f \ - --replace ' /usr/bin/env python3' '${python3Packages.python.interpreter}' \ - --replace "'/etc/grc.conf'" "'$out/etc/grc.conf'" \ - --replace "'/usr/share/grc/'" "'$out/share/grc/'" - wrapProgram $f \ - --prefix PATH : $out/bin - done + install -Dm444 -t $out/share/zsh/vendor-completions _grc runHook postInstall ''; diff --git a/pkgs/tools/misc/ix/default.nix b/pkgs/tools/misc/ix/default.nix new file mode 100644 index 0000000000000..fdbd7611dce50 --- /dev/null +++ b/pkgs/tools/misc/ix/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, makeWrapper, curl }: + +stdenv.mkDerivation rec { + pname = "ix"; + version = "20190815"; + + src = fetchurl { + url = "http://ix.io/client"; + sha256 = "0xc2s4s1aq143zz8lgkq5k25dpf049dw253qxiav5k7d7qvzzy57"; + }; + + buildInputs = [ makeWrapper ]; + + phases = [ "installPhase" "fixupPhase" ]; + + installPhase = '' + install -Dm +x $src $out/bin/ix + ''; + + postFixup = '' + wrapProgram $out/bin/ix --prefix PATH : "${stdenv.lib.makeBinPath [ curl ]}" + ''; + + meta = with stdenv.lib; { + homepage = "http://ix.io"; + description = "Command line pastebin"; + maintainers = with maintainers; [ asymmetric ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/kdecoration-viewer/default.nix b/pkgs/tools/misc/kdecoration-viewer/default.nix index 5c2e410cd930a..ce343c7cc3949 100644 --- a/pkgs/tools/misc/kdecoration-viewer/default.nix +++ b/pkgs/tools/misc/kdecoration-viewer/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, mkDerivation , cmake, extra-cmake-modules, qtquickcontrols, kconfigwidgets, kdeclarative, kdecoration }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "kdecoration-viewer-2018-07-24"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/lazydocker/default.nix b/pkgs/tools/misc/lazydocker/default.nix index ea8f781e4055e..a8ca200129a04 100644 --- a/pkgs/tools/misc/lazydocker/default.nix +++ b/pkgs/tools/misc/lazydocker/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lazydocker"; - version = "0.5.5"; + version = "0.7"; src = fetchFromGitHub { owner = "jesseduffield"; repo = "lazydocker"; rev = "v${version}"; - sha256 = "0h2c1f9r67i6a8ppspsg1ln9rkm272092aaaw55sd15xxr51s4hb"; + sha256 = "0vai88g31yf55988paqzs7fqlxgi0ydrsgszzjig9ai3x9c52xim"; }; - modSha256 = "1lrrwcr95fxk4dlinyg74vqyxwwzagymncfps9bgig5v5d8gdd8j"; + modSha256 = "1iin1m6s9xxdskvj6jy2jwlqrsrm432ld13cpa28hpx7pylx61ij"; subPackages = [ "." ]; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin.nix b/pkgs/tools/misc/libbitcoin/libbitcoin.nix index 18177c0a7e305..8009fe563ee17 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin.nix @@ -3,7 +3,7 @@ let pname = "libbitcoin"; - version = "3.5.0"; + version = "3.6.0"; in stdenv.mkDerivation { name = "${pname}-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1qy637hpv6kkhf602yxxi5b9j0qhsp644fazljcqbnxzp7vv2qyd"; + sha256 = "1rppyp3zpb6ymwangjpblwf6qh4y3d1hczrjx8aavmrq7hznnrhq"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index 97842f82ae914..d29626c99d188 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ncdu"; - version = "1.14"; + version = "1.14.1"; src = fetchurl { url = "https://dev.yorhel.nl/download/${pname}-${version}.tar.gz"; - sha256 = "0i4cap2z3037xx2rdzhrlazl2igk3xy4ncddp9j7xqi1mcx7i566"; + sha256 = "0gp1aszzrh8b6fhv8fspvkmr0qwc55z6z4w6l7r8j09sq7lf0cdy"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/osinfo-db-tools/default.nix b/pkgs/tools/misc/osinfo-db-tools/default.nix index 9b45680ffca2c..0b7a7826a972f 100644 --- a/pkgs/tools/misc/osinfo-db-tools/default.nix +++ b/pkgs/tools/misc/osinfo-db-tools/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, libxml2 -, libxslt, libarchive, bzip2, lzma, json-glib +{ stdenv, fetchurl, pkgconfig, gettext, glib, libxml2, perl +, libxslt, libarchive, bzip2, lzma, json-glib, libsoup }: stdenv.mkDerivation rec { pname = "osinfo-db-tools"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.gz"; - sha256 = "1pihjwajmahldxi3isnq6wcsbwj0hsnq8z5kp3w4j615ygrn0cgl"; + sha256 = "0x155d4hqz7mabgqvgydqjm9d8aabc78vr0v0pnsp9vkdlcv3mfh"; }; - nativeBuildInputs = [ pkgconfig intltool ]; - buildInputs = [ glib json-glib libxml2 libxslt libarchive bzip2 lzma ]; + nativeBuildInputs = [ pkgconfig gettext perl ]; + buildInputs = [ glib json-glib libxml2 libxslt libarchive bzip2 lzma libsoup ]; meta = with stdenv.lib; { description = "Tools for managing the osinfo database"; diff --git a/pkgs/tools/misc/riemann-c-client/default.nix b/pkgs/tools/misc/riemann-c-client/default.nix index 970cf28c26d7b..69bf9cafa5369 100644 --- a/pkgs/tools/misc/riemann-c-client/default.nix +++ b/pkgs/tools/misc/riemann-c-client/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/algernon/riemann-c-client; description = "A C client library for the Riemann monitoring system"; license = licenses.gpl3; - maintainers = with maintainers; [ rickynils pradeepchhetri ]; + maintainers = with maintainers; [ pradeepchhetri ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/shallot/default.nix b/pkgs/tools/misc/shallot/default.nix index a22799b2073b8..ced15038b0c1c 100644 --- a/pkgs/tools/misc/shallot/default.nix +++ b/pkgs/tools/misc/shallot/default.nix @@ -1,13 +1,10 @@ -{ - stdenv, fetchFromGitHub, - openssl +{ stdenv, fetchFromGitHub, fetchpatch +, openssl }: -let - version = "0.0.3"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "shallot"; - inherit version; + version = "0.0.3"; src = fetchFromGitHub { owner = "katmagic"; @@ -18,6 +15,21 @@ in stdenv.mkDerivation { buildInputs = [ openssl ]; + patches = [ + (fetchpatch { + url = "https://github.com/katmagic/Shallot/commit/c913088dfaaaf249494514f20a62f2a17b5c6606.patch"; + sha256 = "19l1ppbxpdb0736f7plhybj08wh6rqk1lr3bxsp8jpzpnkh114b2"; + }) + (fetchpatch { + url = "https://github.com/katmagic/Shallot/commit/cd6628d97b981325e700a38f408a43df426fd569.patch"; + sha256 = "1gaffp5wp1l5p2qdk0ix3i5fhzpx4xphl0haa6ajhqn8db7hbr9y"; + }) + (fetchpatch { + url = "https://github.com/katmagic/Shallot/commit/5c7c1ccecbbad5a121c50ba7153cbbee7ee0ebf9.patch"; + sha256 = "1zmll4iqz39zwk8vj40n1dpvyq3403l64p2127gsjgh2l2v91s4k"; + }) + ]; + installPhase = '' mkdir -p $out/bin cp ./shallot $out/bin/ diff --git a/pkgs/tools/misc/sl/default.nix b/pkgs/tools/misc/sl/default.nix index bb7586ee37909..4ef91f6c55a31 100644 --- a/pkgs/tools/misc/sl/default.nix +++ b/pkgs/tools/misc/sl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sl"; - version = "5.04"; + version = "5.05"; src = fetchFromGitHub { owner = "eyJhb"; repo = "sl"; rev = version; - sha256 = "029lv6vw39c7gj8bkfyqs8q4g32174vbmghhhgfk8wrhnxq60qn7"; + sha256 = "11a1rdgb8wagikhxgm81g80g5qsl59mv4qgsval3isykqh8729bj"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix new file mode 100644 index 0000000000000..e0bd36b21952e --- /dev/null +++ b/pkgs/tools/misc/starship/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, rustPlatform, openssl, pkgconfig, libiconv, darwin }: + +rustPlatform.buildRustPackage rec { + pname = "starship"; + version = "0.12.0"; + + src = fetchFromGitHub { + owner = "starship"; + repo = "starship"; + rev = "v${version}"; + sha256 = "0zq99ll0vyafr2piffazprhvbs3sxb6863cp2qw596ilqg7ffi04"; + }; + + buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; + nativeBuildInputs = [ pkgconfig ]; + + cargoSha256 = "0qlgng5j6l1r9j5vn3wnq25qr6f4nh10x90awiqyzz8jypb0ng2c"; + checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root"; + + meta = with stdenv.lib; { + description = "A minimal, blazing fast, and extremely customizable prompt for any shell"; + homepage = "https://starship.rs"; + license = licenses.isc; + maintainers = with maintainers; [ bbigras ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/thin-provisioning-tools/default.nix b/pkgs/tools/misc/thin-provisioning-tools/default.nix index 2ca5dfb775835..0739435084d29 100644 --- a/pkgs/tools/misc/thin-provisioning-tools/default.nix +++ b/pkgs/tools/misc/thin-provisioning-tools/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { description = "A suite of tools for manipulating the metadata of the dm-thin device-mapper target"; license = licenses.gpl3; platforms = platforms.unix; - maintainers = with maintainers; [ globin ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/misc/uhubctl/default.nix b/pkgs/tools/misc/uhubctl/default.nix new file mode 100644 index 0000000000000..5c858944b3feb --- /dev/null +++ b/pkgs/tools/misc/uhubctl/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, fetchFromGitHub +, libusb +}: + +stdenv.mkDerivation rec { + pname = "uhubctl"; + version = "unstable-2019-07-31"; + + src = fetchFromGitHub { + owner = "mvp"; + repo = "uhubctl"; + rev = "1961aa02e9924a54a6219d16c61a0beb0d626e46"; + sha256 = "15mvqp1xh079nqp0mynh3l1wmw4maa320pn4jr8bz7nh3knmk0n1"; + }; + + buildInputs = [ libusb ]; + + installFlags = [ "prefix=$(out)" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/mvp/uhubctl"; + description = "Utility to control USB power per-port on smart USB hubs"; + license = licenses.gpl2; + maintainers = with maintainers; [ prusnak ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/tools/misc/unclutter-xfixes/default.nix b/pkgs/tools/misc/unclutter-xfixes/default.nix index 8e2342f4269ed..7d2e5e0c367df 100644 --- a/pkgs/tools/misc/unclutter-xfixes/default.nix +++ b/pkgs/tools/misc/unclutter-xfixes/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; license = stdenv.lib.licenses.mit; inherit version; + maintainers = [ maintainers.globin ]; }; } diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index b3b1b4b310a79..8f79f5463e30e 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -8,17 +8,18 @@ python3Packages.buildPythonApplication rec { name = "${pname}-${version}"; src = fetchFromGitHub { - owner = "pimutils"; + owner = "spk"; repo = pname; - rev = "ac45cf144b0ceb72cc2a9f454808688f3ac9ba4f"; - sha256 = "0hqsjdpgvm7d34q5b2hzmrzfxk43ald1bx22mvgg559kw1ck54s9"; + # fix-build-style branch, see https://github.com/pimutils/vdirsyncer/pull/798 + rev = "2c62d03bd73f8b44a47c2e769ade046697896ae9"; + sha256 = "1q6xvzz5rf5sqdaj3mdvhpgwy5b16isavgg7vardgjwqwv1yal28"; }; native = rustPlatform.buildRustPackage { name = "${name}-native"; inherit src; sourceRoot = "source/rust"; - cargoSha256 = "1qziwlf6nlkpxb1hamb7qsipqg9ibp871rimgpwil38vqmyd570s"; + cargoSha256 = "1n1dxq3klsry5mmbfff2jv7ih8mr5zvpncrdgba6qs93wi77qi0y"; buildInputs = [ pkgconfig openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; }; @@ -36,18 +37,6 @@ python3Packages.buildPythonApplication rec { checkInputs = with python3Packages; [ hypothesis pytest pytest-localserver pytest-subtesthack ]; - patches = [ - # Fixes for hypothesis: https://github.com/pimutils/vdirsyncer/pull/779 - (fetchpatch { - url = https://github.com/pimutils/vdirsyncer/commit/22ad88a6b18b0979c5d1f1d610c1d2f8f87f4b89.patch; - sha256 = "0dbzj6jlxhdidnm3i21a758z83sdiwzhpd45pbkhycfhgmqmhjpl"; - }) - (fetchpatch { - url = https://github.com/pimutils/vdirsyncer/commit/29417235321c249c65904bc7948b066ef5683aee.patch; - sha256 = "0zvr0y88gm3vprjcdzs4m151laa9qhkyi61rvrfdjmf42fwhbm80"; - }) - ]; - postPatch = '' # Invalid argument: 'perform_health_check' is not a valid setting substituteInPlace tests/conftest.py \ @@ -74,7 +63,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { homepage = https://github.com/pimutils/vdirsyncer; description = "Synchronize calendars and contacts"; - maintainers = with maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ matthiasbeyer gebner ]; license = licenses.mit; }; } diff --git a/pkgs/tools/misc/vfdecrypt/default.nix b/pkgs/tools/misc/vfdecrypt/default.nix deleted file mode 100644 index 48bd2b140b7e9..0000000000000 --- a/pkgs/tools/misc/vfdecrypt/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchFromGitHub, openssl }: - -stdenv.mkDerivation rec { - pname = "vfdecrypt"; - version = "unstable-2010-08-13"; - - src = fetchFromGitHub { - owner = "Tomer1510"; - repo = "VFDecrypt"; - rev = "4e2fa32816254907e82886b936afcae9859a876c"; - sha256 = "0b945805f7f60bf48556c2db45c9ab26485fb05acbc6160a563d529b20cb56a3"; - }; - - buildInputs = [ openssl ]; - - installPhase = '' - mkdir -p $out/bin - cp vfdecrypt $out/bin - ''; - - meta = with stdenv.lib; { - description = "A cross platform dmg decryption tool"; - license = licenses.mit; - inherit (src.meta) homepage; - }; -} diff --git a/pkgs/tools/misc/wev/default.nix b/pkgs/tools/misc/wev/default.nix new file mode 100644 index 0000000000000..fa69cc4445ee5 --- /dev/null +++ b/pkgs/tools/misc/wev/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl +, pkg-config, scdoc +, wayland, wayland-protocols, libxkbcommon +}: + +let + version = "2019-08-11"; + commit = "47d17393473be152cf601272faf5704fff1c3f92"; +in stdenv.mkDerivation { + pname = "wev-unstable"; + inherit version; + + src = fetchurl { + url = "https://git.sr.ht/~sircmpwn/wev/archive/${commit}.tar.gz"; + sha256 = "0a5kvrviz77bf7357gqs2iy7a1bvb3izgkmiv1rdxzzmihd563ga"; + }; + + nativeBuildInputs = [ pkg-config scdoc ]; + buildInputs = [ wayland wayland-protocols libxkbcommon ]; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + description = "Wayland event viewer"; + longDescription = '' + This is a tool for debugging events on a Wayland window, analagous to the + X11 tool xev. + ''; + homepage = https://git.sr.ht/~sircmpwn/wev; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/pkgs/tools/misc/yank/default.nix b/pkgs/tools/misc/yank/default.nix index 0e88e79eb1ba3..9fb5399fd7243 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 = "0jhr4ywn5x5s15sczhdyyaqy3xh5z4zsx3g42ma26prpnr4gjczz"; + sha256 = "1izygx7f1z35li74i2cwca0p28c3v8fbr7w72dwpiqdaiwywa8xc"; inherit name; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/mptre/yank/releases"; license = licenses.mit; - version = "1.1.0"; + version = "1.2.0"; maintainers = [ maintainers.dochang ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/yubikey-manager-qt/default.nix b/pkgs/tools/misc/yubikey-manager-qt/default.nix index 44b2f3451c1dd..810c2f49a5ec7 100644 --- a/pkgs/tools/misc/yubikey-manager-qt/default.nix +++ b/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -20,11 +20,11 @@ let inherit (stdenv) lib; in stdenv.mkDerivation rec { pname = "yubikey-manager-qt"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; - sha256 = "01ax8zjrahs2sjbgsys2ahh57sdcap0ij3y1r1bbvsgzr7xxm2q8"; + sha256 = "087ms9i0n3rm8a0hvc4a2dk3rffbm6rmgz0m8gbjk6g37iml6nb7"; }; nativeBuildInputs = [ wrapQtAppsHook python3.pkgs.wrapPython qmake ]; |