diff options
Diffstat (limited to 'pkgs/tools')
43 files changed, 454 insertions, 120 deletions
diff --git a/pkgs/tools/admin/aws-google-auth/default.nix b/pkgs/tools/admin/aws-google-auth/default.nix index 5d4ba0bfbc8..0fc001d5a19 100644 --- a/pkgs/tools/admin/aws-google-auth/default.nix +++ b/pkgs/tools/admin/aws-google-auth/default.nix @@ -19,7 +19,7 @@ buildPythonApplication rec { pname = "aws-google-auth"; - version = "0.0.29"; + version = "0.0.32"; # Pypi doesn't ship the tests, so we fetch directly from GitHub # https://github.com/cevoaustralia/aws-google-auth/issues/120 @@ -27,7 +27,7 @@ buildPythonApplication rec { owner = "cevoaustralia"; repo = "aws-google-auth"; rev = version; - sha256 = "06dalrwjy1sbc5wvj5ip4h999izlb0j5g6b6f3l5znnsm0vfvfia"; + sha256 = "0blsvdkb28g1s3c7f8brjjai7lq9ij76xqr5z6zlxxafc4qqwhh3"; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 8de71ce1256..a5e2df9ad21 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,24 +2,20 @@ buildGoModule rec { pname = "eksctl"; - version = "0.2.1"; + version = "0.3.1"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "0f8rj7jw8ym97bjqaxzn1rnhp5nfx3jf5f51jwczljvr67ik9q75"; + sha256 = "1xinkr9xnbfbr58ci7hprabqv0p292x016knbb7fqxzb8043f9lh"; }; - modSha256 = "1lmkwx0r19c2wg9nm85k92nlxjzr8q917jf3f333yf3csfyiix2f"; + modSha256 = "1y0pkd588wsqhqywlv1yd5mlr4limybfpdj2g3pbxw09hv18ysa4"; subPackages = [ "cmd/eksctl" ]; - buildFlags = - '' - -tags netgo - -tags release - ''; + buildFlags = [ "-tags netgo" "-tags release" ]; postInstall = '' diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix index 12734cdcf9a..ebdf6b17ed6 100644 --- a/pkgs/tools/admin/pulumi/default.nix +++ b/pkgs/tools/admin/pulumi/default.nix @@ -4,17 +4,17 @@ with lib; let - version = "0.17.17"; + version = "0.17.27"; # switch the dropdown to “manual” on https://pulumi.io/quickstart/install.html # TODO: update script pulumiArchPackage = { "x86_64-linux" = { url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-linux-x64.tar.gz"; - sha256 = "1h1z8bngix1gvma3hahfyprrx3af5yncgvrsvr1cdsaa79bzvc5c"; + sha256 = "13ajgc8x5l3s93hmz6jg88if10bvd319jmkljy4n26zdp30vfqmw"; }; "x86_64-darwin" = { url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-darwin-x64.tar.gz"; - sha256 = "0pipykwpqqnhqg28s27lnkbrm55rshf25ikil7ycwq05p9ynf5gq"; + sha256 = "0chpbnz2s4icwgmfq6kl8blz5mg4lpdqg061w3nh0p04adpgrn48"; }; }; diff --git a/pkgs/tools/backup/pyznap/default.nix b/pkgs/tools/backup/pyznap/default.nix index e37327c429d..eb714b64a97 100644 --- a/pkgs/tools/backup/pyznap/default.nix +++ b/pkgs/tools/backup/pyznap/default.nix @@ -1,21 +1,17 @@ { lib , buildPythonApplication , fetchPypi -, paramiko -, configparser }: buildPythonApplication rec { pname = "pyznap"; - version = "1.1.2"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "9ac0da5d7f6461d1d6f128362786e297144b415f9e3a2f1835642ab3dda82d55"; + sha256 = "0pnngr4zdxkf6b570ikzvkrm3a8fr47w6crjaw7ln094qkniywvj"; }; - propagatedBuildInputs = [ configparser paramiko ]; - # tests aren't included in the PyPI packages doCheck = false; diff --git a/pkgs/tools/backup/zfs-replicate/default.nix b/pkgs/tools/backup/zfs-replicate/default.nix new file mode 100644 index 00000000000..83fa76b0800 --- /dev/null +++ b/pkgs/tools/backup/zfs-replicate/default.nix @@ -0,0 +1,42 @@ +{ buildPythonApplication, click, fetchPypi, hypothesis, mypy, pytest +, pytestcov, pytestrunner, stdenv, stringcase +}: + +buildPythonApplication rec { + pname = "zfs-replicate"; + version = "1.1.11"; + + src = fetchPypi { + inherit pname version; + sha256 = "0386xc6rw6bhzw2a08g90afb3snqhm1ikx65bjfh22ha69fwmga8"; + }; + + checkInputs = [ + hypothesis + mypy + pytest + pytestcov + ]; + + buildInputs = [ + pytestrunner + ]; + + propagatedBuildInputs = [ + click + stringcase + ]; + + doCheck = true; + + checkPhase = '' + pytest --doctest-modules + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/alunduil/zfs-replicate; + description = "ZFS Snapshot Replication"; + license = licenses.bsd2; + maintainers = with maintainers; [ alunduil ]; + }; +} diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix index ad5b4669498..3fd1efcc343 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix @@ -21,15 +21,15 @@ mkDerivation rec { buildInputs = [ fcitx qtbase ]; - preInstall = '' - substituteInPlace platforminputcontext/cmake_install.cmake \ - --replace ${qtbase.bin} $out - substituteInPlace quickphrase-editor/cmake_install.cmake \ - --replace ${fcitx} $out + preConfigure = '' + substituteInPlace platforminputcontext/CMakeLists.txt \ + --replace \$"{CMAKE_INSTALL_QTPLUGINDIR}" $out/${qtbase.qtPluginPrefix} + substituteInPlace quickphrase-editor/CMakeLists.txt \ + --replace \$"{FCITX4_ADDON_INSTALL_DIR}" $out/lib/fcitx ''; meta = with lib; { - homepage = https://gitlab.com/fcitx/fcitx-qt5; + homepage = "https://gitlab.com/fcitx/fcitx-qt5"; description = "Qt5 IM Module for Fcitx"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/misc/birdfont/default.nix b/pkgs/tools/misc/birdfont/default.nix index 56e7650673e..092c83114e7 100644 --- a/pkgs/tools/misc/birdfont/default.nix +++ b/pkgs/tools/misc/birdfont/default.nix @@ -4,11 +4,11 @@ gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "birdfont"; - version = "2.26.0"; + version = "2.27.0"; src = fetchurl { url = "https://birdfont.org/releases/${pname}-${version}.tar.xz"; - sha256 = "0lcbwmwfb18dpr5kpnrl2zx59jhvj7k7vzjld51zv0zhcvl9fg3j"; + sha256 = "0dr2cnvq30wak0j2k8089is7fvhw0ppwkfrrw1m649s2b95wav3q"; }; nativeBuildInputs = [ python3 pkgconfig vala gobject-introspection wrapGAppsHook ]; diff --git a/pkgs/tools/misc/cht.sh/default.nix b/pkgs/tools/misc/cht.sh/default.nix index 837bc0e9ed7..48ce782536f 100644 --- a/pkgs/tools/misc/cht.sh/default.nix +++ b/pkgs/tools/misc/cht.sh/default.nix @@ -9,15 +9,15 @@ stdenv.mkDerivation rec { name = "cht.sh-${version}"; - version = "unstable-2018-11-02"; + version = "unstable-2019-08-06"; nativeBuildInputs = [ makeWrapper ]; src = fetchFromGitHub { owner = "chubin"; repo = "cheat.sh"; - rev = "9595805ac68b3c096f7c51fa024dcb97a7dfac44"; - sha256 = "11g8say5fksg0zg0bqrgl92rprn4lwp20g9rz1i0r38f0jy3nyrf"; + rev = "f507ba51d6bc1ae6c7df808cadbe4f8603951b6b"; + sha256 = "0r7x9a3qzzkbd1m5zdlkpmhx0p7b7ja42190s7fidls3dsm710g0"; }; # Fix ".cht.sh-wrapped" in the help message @@ -25,6 +25,12 @@ stdenv.mkDerivation rec { installPhase = '' install -m755 -D share/cht.sh.txt "$out/bin/cht.sh" + + # install shell completion files + mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions + mv share/bash_completion.txt $out/share/bash-completion/completions/cht.sh + cp share/zsh.txt $out/share/zsh/site-functions/_cht + wrapProgram "$out/bin/cht.sh" \ --prefix PATH : "${stdenv.lib.makeBinPath [ curl rlwrap ncurses xsel ]}" ''; @@ -32,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "CLI client for cheat.sh, a community driven cheat sheet"; license = licenses.mit; - maintainers = with maintainers; [ fgaz ]; + maintainers = with maintainers; [ fgaz evanjs ]; homepage = https://github.com/chubin/cheat.sh; }; } diff --git a/pkgs/tools/misc/debianutils/default.nix b/pkgs/tools/misc/debianutils/default.nix index 3613905db48..b42c302a38f 100644 --- a/pkgs/tools/misc/debianutils/default.nix +++ b/pkgs/tools/misc/debianutils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "debianutils"; - version = "4.8.6.2"; + version = "4.8.6.3"; src = fetchurl { url = "mirror://debian/pool/main/d/${pname}/${pname}_${version}.tar.xz"; - sha256 = "1fhbn62v85ydcap4pjx6jb37bly42lf3l64ig4ppr7yiaax8i8xc"; + sha256 = "08g2gdm6n66w5m8qwm4f48wzgs3ymkpki6dg01nwzwbdzhxdxirc"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/disper/default.nix b/pkgs/tools/misc/disper/default.nix index 22951eecf53..167b4a547f8 100644 --- a/pkgs/tools/misc/disper/default.nix +++ b/pkgs/tools/misc/disper/default.nix @@ -1,9 +1,19 @@ -{stdenv, fetchurl, python, xorg, makeWrapper}: +{ stdenv, fetchFromGitHub, python, xorg, makeWrapper }: stdenv.mkDerivation rec { - name = "disper-0.3.1"; + pname = "disper"; + version = "0.3.1.1"; - buildInputs = [python makeWrapper]; + src = fetchFromGitHub { + owner = "apeyser"; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "1kl4py26n95q0690npy5mc95cv1cyfvh6kxn8rvk62gb8scwg9zn"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ python ]; preConfigure = '' export makeFlags="PREFIX=$out" @@ -14,11 +24,6 @@ stdenv.mkDerivation rec { --prefix "LD_LIBRARY_PATH" : "${stdenv.lib.makeLibraryPath [ xorg.libXrandr xorg.libX11 ]}" ''; - src = fetchurl { - url = http://ppa.launchpad.net/disper-dev/ppa/ubuntu/pool/main/d/disper/disper_0.3.1.tar.gz; - sha256 = "1l8brcpfn4iascb454ym0wrv5kqyz4f0h8k6db54nc3zhfwy7vvw"; - }; - meta = { description = "On-the-fly display switch utility"; homepage = http://willem.engen.nl/projects/disper/; diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix index 50ee066d96a..8793685069a 100644 --- a/pkgs/tools/misc/esptool/default.nix +++ b/pkgs/tools/misc/esptool/default.nix @@ -2,13 +2,13 @@ python3.pkgs.buildPythonApplication rec { pname = "esptool"; - version = "2.6"; + version = "2.7"; src = fetchFromGitHub { owner = "espressif"; repo = "esptool"; rev = "v${version}"; - sha256 = "1hxgzqh5z81dq1k2xd6329h8idk9y8q29izrwm1vhn0m9v1pxa22"; + sha256 = "1p5hx0rhs986ffqz78rdxg7jayndsq632399xby39k17kvd3mb31"; }; checkInputs = with python3.pkgs; [ flake8 flake8-future-import flake8-import-order openssl ]; diff --git a/pkgs/tools/misc/hashit/default.nix b/pkgs/tools/misc/hashit/default.nix index b773fc5d680..6d928524713 100644 --- a/pkgs/tools/misc/hashit/default.nix +++ b/pkgs/tools/misc/hashit/default.nix @@ -1,32 +1,31 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, pantheon, python3, gnome3, gtk3, gobject-introspection, desktop-file-utils, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, pantheon, python3, libgee, gtk3, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "hashit"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "artemanufrij"; repo = pname; rev = version; - sha256 = "1ba38qmwdk7vkarsxqn89irbymzx52gbks4isx0klg880xm2z4dv"; + sha256 = "1s8fbzg1z2ypn55xg1pfm5xh15waq55fkp49j8rsqiq8flvg6ybf"; }; nativeBuildInputs = [ desktop-file-utils - gobject-introspection meson ninja + pantheon.vala pkgconfig python3 - pantheon.vala wrapGAppsHook ]; buildInputs = [ + gtk3 + libgee pantheon.elementary-icon-theme - gnome3.libgee pantheon.granite - gtk3 ]; postPatch = '' @@ -35,10 +34,10 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A simple app for checking usual checksums"; + description = "A simple app for checking usual checksums - Designed for elementary OS"; homepage = https://github.com/artemanufrij/hashit; license = licenses.gpl2Plus; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = pantheon.maintainers; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/kronometer/default.nix b/pkgs/tools/misc/kronometer/default.nix index 0307cd86df8..4e83c2479f1 100644 --- a/pkgs/tools/misc/kronometer/default.nix +++ b/pkgs/tools/misc/kronometer/default.nix @@ -6,14 +6,14 @@ let pname = "kronometer"; - version = "2.2.2"; + version = "2.2.3"; in mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "142f1kqygil6d4pvh6pallin355h2rq5s1hs6gd11plcin6rkg2j"; + sha256 = "05hs8729a3aqjpwmn2xdf2sriacrll4sj4ax3lm4s1ravj09n9bm"; }; meta = with lib; { diff --git a/pkgs/tools/misc/lesspipe/default.nix b/pkgs/tools/misc/lesspipe/default.nix index 9bb46f113fd..bb99521cc27 100644 --- a/pkgs/tools/misc/lesspipe/default.nix +++ b/pkgs/tools/misc/lesspipe/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "lesspipe"; - version = "1.83"; + version = "1.84"; buildInputs = [ perl ]; preConfigure = "patchShebangs ."; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "wofr06"; repo = "lesspipe"; rev = version; - sha256 = "1vqch6k4fz5pyf8szlnqm3qhlvgs9l4njd13yczjh4kpaxpn0rxb"; + sha256 = "124ffhzrikr88ab14rk6753n8adxijpmg7q3zx7nmqc52wpkfd8q"; }; patches = [ diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index 8d0728b7556..ced4a156137 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -63,6 +63,6 @@ stdenv.mkDerivation rec { homepage = http://man-db.nongnu.org; description = "An implementation of the standard Unix documentation system accessed using the man command"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/tools/misc/mbuffer/default.nix index 6cf8de2fea0..59ed474e9bc 100644 --- a/pkgs/tools/misc/mbuffer/default.nix +++ b/pkgs/tools/misc/mbuffer/default.nix @@ -3,12 +3,12 @@ } : stdenv.mkDerivation rec { - version = "20190127"; + version = "20190725"; name = "mbuffer-${version}"; src = fetchurl { url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz"; - sha256 = "1p7d9jaiyqcg5q14hlcji6llhjqkg6izc9cfz23jwgq8z2a6zjy5"; + sha256 = "1hjhyh3q0q22czq3s2wk5mcky1jrq9xw8fppw6r7cix1riq74m91"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix index f03b536c615..16762d243db 100644 --- a/pkgs/tools/misc/mongodb-compass/default.nix +++ b/pkgs/tools/misc/mongodb-compass/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, dpkg , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib -, gnome2, libnotify, libxcb, nspr, nss, systemd, xorg }: +, gnome2, gnome3, libnotify, libxcb, nspr, nss, systemd, xorg }: let - version = "1.13.1"; + version = "1.17.0"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -19,7 +19,7 @@ let glib gnome2.GConf gnome2.gdk_pixbuf - gnome2.gtk + gnome3.gtk gnome2.pango libnotify libxcb @@ -46,7 +46,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; - sha256 = "0x23jshnr0rafm5sn2vhq2y2gryg8mksahzyv5fszblgaxay234p"; + sha256 = "085xq1ik8kyza1kq9kn0pf98zk6g2qa21clxhn48rgnqk20aninv"; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 49611aa0c3f..06ae22c86ff 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-20190622"; + name = "parallel-20190722"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "1v5fbrxw9l1navmvxapb1raa2jr19vfjw3i28h7fgdqd8n6gs79z"; + sha256 = "19xwdkmia2dw2hry9sbaq0ln79qy9dsqx11hq2s9dcyvhhqqdl0f"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 42d03c06b87..1cf64362e6d 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.2019.7"; + version = "1.2019.8"; name = "plantuml-${version}"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "1md8dyjlvwfg4hbvigcvzipj1gf8hb39rqqh825aa2swchs8nvhm"; + sha256 = "0kbyjsy8zp3325syg9g91rfgy2dzkffdj2ji82b5h9zy3rkrz08p"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index ea304d2aa89..1aaed4feafe 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.5"; + version = "1.6.8"; src = fetchFromGitHub { owner = "okbob"; repo = "pspg"; rev = "${version}"; - sha256 = "0zz924fl0b99a09gi5l3vxv9dmxnkv1v679w6k9zf365b44z91ki"; + sha256 = "1lwzyimn28a7q8k2c8z7and4qhrdil0za8lixh96z6x4lcb0rz5q"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/misc/tmate/default.nix b/pkgs/tools/misc/tmate/default.nix index f5e1d69a039..c87fe8bf446 100644 --- a/pkgs/tools/misc/tmate/default.nix +++ b/pkgs/tools/misc/tmate/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "tmate-${version}"; - version = "2.2.1"; + version = "2.3.0"; src = fetchFromGitHub { owner = "tmate-io"; repo = "tmate"; rev = version; - sha256 = "0pfl9vrswzim9ydi1n652h3rax2zrmy6sqkp0r09yy3lw83h4y1r"; + sha256 = "0fwqhmkp1jfp8qk7497ws3nzvly7p06mv04z8z0qicn6a961v1sa"; }; dontUseCmakeConfigure = true; diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix index d15bfb3887a..848a5858b91 100644 --- a/pkgs/tools/misc/watchexec/default.nix +++ b/pkgs/tools/misc/watchexec/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "watchexec"; - version = "1.10.2"; + version = "1.10.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "10h9g6r5zkm71zpr33imh49187xx1wcv9sw7bf5dllgnxabd0lql"; + sha256 = "0iaxicghvfy85hrxn151hz8frgfknk3s1z0ngjn7cv5x5zvfxspf"; }; cargoSha256 = "1sqwplvpg0n9j0h9j94m7a6ylgqi4y4wyx489y09z9gm7aqgrsjc"; diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index c00b832b961..a900e26019c 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.1314"; + version = "0.4.1328"; # 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 = "1pbyhk3078va7435bsvysy34bvx0zvwd2gk28cvqyn62vwkcjyig"; + sha256 = "1rbsf7dphvlzahrzgdj1bq62mqhp2fmr61lckcyzq6jdq3vsf0w8"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/pkgs/tools/misc/yubikey-personalization-gui/default.nix index 405ff745baa..5b0ad830b19 100644 --- a/pkgs/tools/misc/yubikey-personalization-gui/default.nix +++ b/pkgs/tools/misc/yubikey-personalization-gui/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, yubikey-personalization, qtbase, qmake, libyubikey }: +{ stdenv, fetchurl, mkDerivation, pkgconfig, yubikey-personalization, qtbase, qmake, libyubikey }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "yubikey-personalization-gui-3.1.25"; src = fetchurl { diff --git a/pkgs/tools/misc/zabbix-cli/default.nix b/pkgs/tools/misc/zabbix-cli/default.nix index 2218bb5a57a..a8b621e32ac 100644 --- a/pkgs/tools/misc/zabbix-cli/default.nix +++ b/pkgs/tools/misc/zabbix-cli/default.nix @@ -4,7 +4,7 @@ let in pythonPackages.buildPythonApplication rec { name = "zabbix-cli-${version}"; - version = "2.0.1"; + version = "2.1.1"; propagatedBuildInputs = with pythonPackages; [ ipaddr requests ]; @@ -17,7 +17,7 @@ in pythonPackages.buildPythonApplication rec { owner = "usit-gd"; repo = "zabbix-cli"; rev = version; - sha256 = "0kwrfgq6h26dajll11f21c8b799bsfl1axmk2fdghl1gclxra7ry"; + sha256 = "10a1cvjqwlqqfz52ajv9i53h6v95w8y7xmgqr79q2c4v1nz5bfks"; }; meta = with lib; { diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix index 7dfc8e9d7ad..ce372f6b752 100644 --- a/pkgs/tools/networking/babeld/default.nix +++ b/pkgs/tools/networking/babeld/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "babeld-1.8.4"; + name = "babeld-1.8.5"; src = fetchurl { url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${name}.tar.gz"; - sha256 = "11wbs1x17lr7jk2578zwy3cdwc6zhxwv97nnp13z14613320s1wq"; + sha256 = "1i2v7npl9aykq8d6zhkinqnbdpqx5x910dqkrv30fib0fp19jb90"; }; preBuild = '' diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix index 3c2ced1712f..59242551f92 100644 --- a/pkgs/tools/networking/mtr/default.nix +++ b/pkgs/tools/networking/mtr/default.nix @@ -1,38 +1,42 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, ncurses +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +, libcap, ncurses , withGtk ? false, gtk2 ? null }: assert withGtk -> gtk2 != null; stdenv.mkDerivation rec { - name="mtr-${version}"; - version="0.92"; + pname = "mtr"; + version = "0.93"; src = fetchFromGitHub { owner = "traviscross"; repo = "mtr"; rev = "v${version}"; - sha256 = "0ca2ml846cv0zzkpd8y7ah6i9b3czrr8wlxja3cray94ybwb294d"; + sha256 = "0n0zr9k61w7a9psnzgp7xnc7ll1ic2xzcvqsbbbyndg3v9rff6bw"; }; - preConfigure = '' + # we need this before autoreconfHook does its thing + postPatch = '' echo ${version} > .tarball-version + ''; - ./bootstrap.sh - - substituteInPlace Makefile.in --replace ' install-exec-hook' "" + # and this after autoreconfHook has generated Makefile.in + preConfigure = '' + substituteInPlace Makefile.in \ + --replace ' install-exec-hook' "" ''; configureFlags = stdenv.lib.optional (!withGtk) "--without-gtk"; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ ncurses ] ++ stdenv.lib.optional withGtk gtk2; + buildInputs = [ libcap ncurses ] ++ stdenv.lib.optional withGtk gtk2; enableParallelBuilding = true; meta = with stdenv.lib; { description = "A network diagnostics tool"; - homepage = http://www.bitwizard.nl/mtr/; + homepage = "https://www.bitwizard.nl/mtr/"; license = licenses.gpl2; maintainers = with maintainers; [ koral orivej raskin ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix index 4f2a26de327..363963b1b14 100644 --- a/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "4.0.1"; + version = "4.0.3"; pname = "openapi-generator-cli"; jarfilename = "${pname}-${version}.jar"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://central.maven.org/maven2/org/openapitools/${pname}/${version}/${jarfilename}"; - sha256 = "1fglvn6ricvb0csbrjkjfp902y6drjf6cby5fihmr5v9m7pjym1y"; + sha256 = "1x09db62i81gamj6pm9bng994z54y7gqc6wvj8hnn0j0ay9gkcf5"; }; phases = [ "installPhase" ]; diff --git a/pkgs/tools/networking/tendermint/default.nix b/pkgs/tools/networking/tendermint/default.nix new file mode 100644 index 00000000000..a884ed0ccd4 --- /dev/null +++ b/pkgs/tools/networking/tendermint/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "tendermint"; + version = "0.32.2"; + + src = fetchFromGitHub { + owner = "tendermint"; + repo = pname; + rev = "d70135ec71979e7588c649c80f2acea65346a99a"; + sha256 = "062lzc1c96nwg22ql10mwjkxhq68lyak7s0id5y4f9mmj6d4rd69"; + }; + + modSha256 = "0hl8ly2qx0fv9diipqkcrlaz3ncsb2h81i0ccf5gn9cmyl37x0yk"; + + meta = with stdenv.lib; { + description = "Byzantine-Fault Tolerant State Machines. Or Blockchain, for short."; + homepage = https://tendermint.com/; + license = licenses.asl20; + maintainers = with maintainers; [ alexfmpe ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index 5ec3199fb89..ddac709e577 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, perl, gettext, pkgconfig, libidn2, libiconv }: stdenv.mkDerivation rec { - version = "5.4.3"; + version = "5.5.0"; name = "whois-${version}"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; - sha256 = "0rf6ggk9y6gvhyj6zcjvjsbksal8pczlw905h70mgylq20qy3jr4"; + sha256 = "0h6lvsz868533irx68vd3hjhwcz93zh88axfq0qzji5ndc0ks4qb"; }; nativeBuildInputs = [ perl gettext pkgconfig ]; diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix new file mode 100644 index 00000000000..5cbb207ec4f --- /dev/null +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "nfpm"; + version = "0.12.0"; + + src = fetchFromGitHub { + owner = "goreleaser"; + repo = pname; + rev = "v${version}"; + sha256 = "090mxkmbfzi3mby18zhrr34fr6vzc7j0r2ss3rjr5lyfgilw1qwr"; + }; + + modSha256 = "02nkqmljb528ppsr2dw2r3rc83j3qmys3a8v0a1z2b4sq2sv1v7w"; + + meta = with lib; { + description = "A simple deb and rpm packager written in Go"; + homepage = "https://github.com/goreleaser/nfpm"; + maintainers = [ maintainers.marsam ]; + license = licenses.mit; + }; +} diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix index ae8dfc59075..2683192c89e 100644 --- a/pkgs/tools/package-management/protontricks/default.nix +++ b/pkgs/tools/package-management/protontricks/default.nix @@ -4,13 +4,13 @@ buildPythonApplication rec { pname = "protontricks"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "Matoking"; repo = pname; rev = version; - sha256 = "1v7bgr1rkm8j99s5bv45cslw01qcx8i8zb6ysfrb53qz86zgkgsn"; + sha256 = "0kwf2m62v4w7ds9y2fpcb8scazirkj114rn8y0ak62ph7lav8ma4"; }; propagatedBuildInputs = [ vdf ]; diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix new file mode 100644 index 00000000000..e6874d085d2 --- /dev/null +++ b/pkgs/tools/security/bitwarden/default.nix @@ -0,0 +1,87 @@ +{ atomEnv +, autoPatchelfHook +, dpkg +, fetchurl +, libsecret +, makeDesktopItem +, makeWrapper +, stdenv +, udev +, wrapGAppsHook +}: + +let + inherit (stdenv.hostPlatform) system; + + pname = "bitwarden"; + + version = { + "x86_64-linux" = "1.15.2"; + }.${system} or ""; + + sha256 = { + "x86_64-linux" = "0yz4hkqqwq2zrdjfxk5kybhs90n80k6bkn0625m47b09lwl2di4f"; + }.${system} or ""; + + meta = with stdenv.lib; { + description = "A secure and free password manager for all of your devices"; + homepage = "https://bitwarden.com"; + license = licenses.gpl3; + maintainers = with maintainers; [ kiwi ]; + platforms = [ "x86_64-linux" ]; + }; + + linux = stdenv.mkDerivation rec { + inherit pname version meta; + + src = fetchurl { + url = "https://github.com/bitwarden/desktop/releases/download/" + + "v${version}/Bitwarden-${version}-amd64.deb"; + inherit sha256; + }; + + desktopItem = makeDesktopItem { + name = "bitwarden"; + exec = "bitwarden %U"; + icon = "bitwarden"; + comment = "A secure and free password manager for all of your devices"; + desktopName = "Bitwarden"; + categories = "Utility"; + }; + + dontBuild = true; + dontConfigure = true; + dontPatchElf = true; + dontWrapGApps = true; + + buildInputs = [ libsecret ] ++ atomEnv.packages; + + nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook wrapGAppsHook ]; + + unpackPhase = "dpkg-deb -x $src ."; + + installPhase = '' + mkdir -p "$out/bin" + cp -R "opt" "$out" + cp -R "usr/share" "$out/share" + chmod -R g-w "$out" + + # Desktop file + mkdir -p "$out/share/applications" + cp "${desktopItem}/share/applications/"* "$out/share/applications" + ''; + + runtimeDependencies = [ + udev.lib + ]; + + postFixup = '' + makeWrapper $out/opt/Bitwarden/bitwarden $out/bin/bitwarden \ + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libsecret stdenv.cc.cc ] }" \ + "''${gappsWrapperArgs[@]}" + ''; + }; + +in if stdenv.isDarwin +then throw "Bitwarden has not been packaged for macOS yet" +else linux diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index a0b1f28854b..41a0d6eb7a5 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -15,12 +15,11 @@ buildGoPackage rec { sha256 = "0v3sx9hb03bdn4rvsv2r0jzif6p1rx47hrkpsbnwva31k396mck2"; }; - wrapperPath = with stdenv.lib; makeBinPath ([ + wrapperPath = stdenv.lib.makeBinPath ([ git gnupg xclip - wl-clipboard - ]); + ] ++ stdenv.lib.optional stdenv.isLinux wl-clipboard); postInstall = '' mkdir -p \ diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix new file mode 100644 index 00000000000..b58e41d850d --- /dev/null +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchurl, unzip }: + +let + version = "1.1.3"; + + sources = let + base = "https://releases.hashicorp.com/vault/${version}"; + in { + "x86_64-linux" = fetchurl { + url = "${base}/vault_${version}_linux_amd64.zip"; + sha256 = "293b88f4d31f6bcdcc8b508eccb7b856a0423270adebfa0f52f04144c5a22ae0"; + }; + "i686-linux" = fetchurl { + url = "${base}/vault_${version}_linux_386.zip"; + sha256 = "9f2fb99e08fa3d25af1497516d08b5d2d8a73bcacd5354ddec024e9628795867"; + }; + "x86_64-darwin" = fetchurl { + url = "${base}/vault_${version}_darwin_amd64.zip"; + sha256 = "a0a7a242f8299ac4a00af8aa10ccedaf63013c8a068f56eadfb9d730b87155ea"; + }; + "i686-darwin" = fetchurl { + url = "${base}/vault_${version}_darwin_386.zip"; + sha256 = "50542cfb37abb06e8bb6b8ba41f5ca7d72a4d6a4396d4e3f4a8391bed14f63be"; + }; + "aarch64-linux" = fetchurl { + url = "${base}/vault_${version}_linux_arm64.zip"; + sha256 = "c243dce14b2e48e3667c2aa5b7fb37009dd7043b56032d6ebe50dd456715fd3f"; + }; + }; + +in stdenv.mkDerivation { + name = "vault-bin-${version}"; + + src = sources."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}"); + + nativeBuildInputs = [ unzip ]; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/bin $out/share/bash-completion/completions + mv vault $out/bin + echo "complete -C $out/bin/vault vault" > $out/share/bash-completion/completions/vault + ''; + + meta = with stdenv.lib; { + homepage = https://www.vaultproject.io; + description = "A tool for managing secrets, this binary includes the UI"; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" "i686-darwin" ]; + license = licenses.mpl20; + maintainers = with maintainers; [ offline psyanticy ]; + }; +} diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix index ff937638056..eba8c8f41b4 100644 --- a/pkgs/tools/system/hwinfo/default.nix +++ b/pkgs/tools/system/hwinfo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "hwinfo-${version}"; - version = "21.66"; + version = "21.67"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = "${version}"; - sha256 = "1f841hzh9ik02690h9b1k3ysqv91avsb0zir2ykqz8qj39c5qsxz"; + sha256 = "1fvlrqx1wgl79a9j3xhhhdihj4lkpbrchfsc27il0p52fynn4dji"; }; patchPhase = '' diff --git a/pkgs/tools/text/coloursum/default.nix b/pkgs/tools/text/coloursum/default.nix new file mode 100644 index 00000000000..49db5e13d72 --- /dev/null +++ b/pkgs/tools/text/coloursum/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + name = "coloursum-${version}"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "ticky"; + repo = "coloursum"; + rev = "v${version}"; + sha256 = "18ikwi0ihn0vadazrkh85jfz8a2f0dkfb3zns5jzh7p7mb0ylrr2"; + }; + + cargoSha256 = "0f73vqa82w4ccr0cc95mxga3r8jgd92jnksshxzaffbpx4s334p3"; + + meta = with stdenv.lib; { + description = "Colourise your checksum output"; + homepage = "https://github.com/ticky/coloursum"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ fgaz ]; + }; +} diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index 34dacc80d92..46fe9ab1cd7 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "highlight-${version}"; - version = "3.52"; + version = "3.53"; src = fetchFromGitLab { owner = "saalen"; repo = "highlight"; rev = "v${version}"; - sha256 = "0zhn1k70ck82ks7ckzsy1yiz686ym2ps7c28wjmkgxfpyjanilrq"; + sha256 = "11szws4q6qyffq2fsvh1vksh1d0kcwg6smyyba9yr61hzx6zmzgr"; }; enableParallelBuilding = true; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Source code highlighting tool"; - homepage = http://www.andre-simon.de/doku/highlight/en/highlight.php; + homepage = "http://www.andre-simon.de/doku/highlight/en/highlight.php"; platforms = platforms.unix; maintainers = with maintainers; [ ndowens willibutz ]; }; diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix index 52d197759ea..de395f183d1 100644 --- a/pkgs/tools/text/mdbook/default.nix +++ b/pkgs/tools/text/mdbook/default.nix @@ -2,23 +2,23 @@ rustPlatform.buildRustPackage rec { name = "mdbook-${version}"; - version = "0.1.8"; + version = "0.3.1"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "mdBook"; rev = "v${version}"; - sha256 = "1xmw4v19ff6mvimwk5l437wslzw5npy60zdb8r4319bjf32pw9pn"; + sha256 = "0py69267jbs6b7zw191hcs011cm1v58jz8mglqx3ajkffdfl3ghw"; }; - cargoSha256 = "1xpsc4qff2lrq15mz1gvmw6n5vl88sfwpjbsnp5ja5k1im156lam"; + cargoSha256 = "0qwhc42a86jpvjcaysmfcw8kmwa150lmz01flmlg74g6qnimff5m"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; meta = with stdenv.lib; { description = "Create books from MarkDown"; homepage = https://github.com/rust-lang-nursery/mdbook; - license = [ licenses.asl20 licenses.mit ]; + license = [ licenses.mpl20 ]; maintainers = [ maintainers.havvy ]; platforms = platforms.all; }; diff --git a/pkgs/tools/text/ripgrep-all/default.nix b/pkgs/tools/text/ripgrep-all/default.nix new file mode 100644 index 00000000000..a9253b02ddd --- /dev/null +++ b/pkgs/tools/text/ripgrep-all/default.nix @@ -0,0 +1,39 @@ +{ stdenv, lib, fetchFromGitHub, rustPlatform, makeWrapper, ffmpeg +, pandoc, poppler_utils, ripgrep, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "ripgrep-all"; + version = "0.9.2"; + + src = fetchFromGitHub { + owner = "phiresky"; + repo = pname; + rev = version; + sha256 = "1knv0gpanrid9i9mxg7zwqh9igdksp1623wl9iwmysiyaajlbif2"; + }; + + cargoSha256 = "0xwsx0x9n766bxamhnpzibrnvnqsxz3wh1f0rj29kbl32xl8yyfg"; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = lib.optional stdenv.isDarwin Security; + + postInstall = '' + wrapProgram $out/bin/rga \ + --prefix PATH ":" "${lib.makeBinPath [ ffmpeg pandoc poppler_utils ripgrep ]}" + ''; + + meta = with stdenv.lib; { + description = "Ripgrep, but also search in PDFs, E-Books, Office documents, zip, tar.gz, and more"; + longDescription = '' + Ripgrep, but also search in PDFs, E-Books, Office documents, zip, tar.gz, etc. + + rga is a line-oriented search tool that allows you to look for a regex in + a multitude of file types. rga wraps the awesome ripgrep and enables it + to search in pdf, docx, sqlite, jpg, movie subtitles (mkv, mp4), etc. + ''; + homepage = https://github.com/phiresky/ripgrep-all; + license = with licenses; [ agpl3Plus ]; + maintainers = with maintainers; [ zaninime ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/text/xml/xmloscopy/default.nix b/pkgs/tools/text/xml/xmloscopy/default.nix index 9703bd1ecea..5d085e41196 100644 --- a/pkgs/tools/text/xml/xmloscopy/default.nix +++ b/pkgs/tools/text/xml/xmloscopy/default.nix @@ -5,10 +5,10 @@ fzf, coreutils, libxml2, libxslt, jing, findutils, gnugrep, gnused, docbook5 }: stdenv.mkDerivation rec { - name = "xmloscopy-${version}"; - version = "0.1.2"; + pname = "xmloscopy"; + version = "0.1.3"; - buildInputs = [ + nativeBuildInputs = [ makeWrapper dev_only_shellcheck ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "grahamc"; repo = "xmloscopy"; rev = "v${version}"; - sha256 = "07fcnf1vv0x72lksl1v0frmlh73gca199ldqqbgdjpybjdffz456"; + sha256 = "06y5bckrmnq7b5ny2hfvlmdws910jw3xbw5nzy3bcpqsccqnjxrc"; }; installPhase = '' @@ -43,10 +43,11 @@ stdenv.mkDerivation rec { --set PATH "${spath}" ''; - meta = { + meta = with stdenv.lib; { description = "wtf is my docbook broken?"; homepage = https://github.com/grahamc/xmloscopy; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ grahamc ]; }; } diff --git a/pkgs/tools/video/gopro/default.nix b/pkgs/tools/video/gopro/default.nix new file mode 100644 index 00000000000..f783b086345 --- /dev/null +++ b/pkgs/tools/video/gopro/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub +, ffmpeg +, imagemagick +, makeWrapper +, mplayer +}: + +stdenv.mkDerivation rec { + pname = "gopro"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "KonradIT"; + repo = "gopro-linux"; + rev = version; + sha256 = "0sb9vpiadrq8g4ag828h8mvq01fg0306j0wjwkxdmwfqync1128l"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + install -Dm755 gopro -t $out/bin + wrapProgram $out/bin/gopro \ + --prefix PATH ":" "${stdenv.lib.makeBinPath [ ffmpeg imagemagick mplayer ]}" + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Command line interface for processing media filmed on GoPro HERO 3, 4, 5, 6, and 7 cameras"; + homepage = "https://github.com/KonradIT/gopro-linux"; + platforms = platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/tools/virtualization/mininet/default.nix b/pkgs/tools/virtualization/mininet/default.nix index a2f4b165087..0ee27d36e0a 100644 --- a/pkgs/tools/virtualization/mininet/default.nix +++ b/pkgs/tools/virtualization/mininet/default.nix @@ -8,8 +8,8 @@ let pyEnv = python.withPackages(ps: [ ps.setuptools ]); in stdenv.mkDerivation rec { - name = "mininet-${version}"; - version = "2.3.0d4"; + pname = "mininet"; + version = "2.3.0d6"; outputs = [ "out" "py" ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "mininet"; repo = "mininet"; rev = version; - sha256 = "02hsqa7r5ykj8m1ycl32xwn1agjrw78wkq87xif0dl2vkzln41i4"; + sha256 = "0wc6gni9dxj9jjnw66a28jdvcfm8bxv1i776m5dh002bn5wjcl6x"; }; buildFlags = [ "mnexec" ]; @@ -40,8 +40,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Emulator for rapid prototyping of Software Defined Networks"; license = { - fullName = "Mininet 2.3.0d4 License"; + fullName = "Mininet 2.3.0d6 License"; }; + platforms = platforms.linux; homepage = https://github.com/mininet/mininet; maintainers = with maintainers; [ teto ]; }; |