diff options
Diffstat (limited to 'pkgs/tools')
33 files changed, 1164 insertions, 155 deletions
diff --git a/pkgs/tools/X11/ncview/default.nix b/pkgs/tools/X11/ncview/default.nix index e4ba08a6ff36..1f793aa6c4c9 100644 --- a/pkgs/tools/X11/ncview/default.nix +++ b/pkgs/tools/X11/ncview/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, netcdf, x11, xorg, udunits, expat +, netcdf, xlibsWrapper, xorg, udunits, expat }: let @@ -14,7 +14,7 @@ in stdenv.mkDerivation { sha256 = "1gliziyxil2fcz85hj6z0jq33avrxdcjs74d500lhxwvgd8drfp8"; }; - buildInputs = [ netcdf x11 xorg.libXaw udunits expat ]; + buildInputs = [ netcdf xlibsWrapper xorg.libXaw udunits expat ]; meta = with stdenv.lib; { description = "Visual browser for netCDF format files"; diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index 80df9148220c..6cf997cd738c 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -23,7 +23,7 @@ pythonPackages.buildPythonApplication rec { pyyaml pyzmq requests - tornado + tornado_4 ] ++ stdenv.lib.optional (!pythonPackages.isPy3k) [ futures ] ++ extraInputs; diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/pkgs/tools/admin/scaleway-cli/default.nix index 0e8aacea4ef2..b246c7712ec9 100644 --- a/pkgs/tools/admin/scaleway-cli/default.nix +++ b/pkgs/tools/admin/scaleway-cli/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec{ name = "scaleway-cli-${version}"; - version = "1.14"; + version = "1.17"; goPackagePath = "github.com/scaleway/scaleway-cli"; @@ -10,7 +10,7 @@ buildGoPackage rec{ owner = "scaleway"; repo = "scaleway-cli"; rev = "v${version}"; - sha256 = "09rqw82clfdiixa9m3hphxh5v7w1gks3wicz1dvpay2sx28bpddr"; + sha256 = "0v50wk6q8537880whi6w83dia9y934v0s2xr1z52cn3mrsjghsnd"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/audio/accuraterip-checksum/default.nix b/pkgs/tools/audio/accuraterip-checksum/default.nix new file mode 100644 index 000000000000..502859cd52d3 --- /dev/null +++ b/pkgs/tools/audio/accuraterip-checksum/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, libsndfile }: + +stdenv.mkDerivation rec { + name = "accuraterip-checksum-${version}"; + version = "1.5"; + + src = fetchFromGitHub { + owner = "leo-bogert"; + repo = "accuraterip-checksum"; + rev = "version${version}"; + sha256 = "1a6biy78jb094rifazn4a2g1dlhryg5q8p8gwj0a60ipl0vfb9bj"; + }; + + buildInputs = [ libsndfile ]; + + installPhase = '' + runHook preInstall + + install -D -m755 accuraterip-checksum "$out/bin/accuraterip-checksum" + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Program for computing the AccurateRip checksum of singletrack WAV files"; + homepage = https://github.com/leo-bogert/accuraterip-checksum; + license = licenses.gpl3; + maintainers = with maintainers; [ ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/tools/filesystems/exfat/default.nix b/pkgs/tools/filesystems/exfat/default.nix index 47ff22ae20dd..97a96651a68e 100644 --- a/pkgs/tools/filesystems/exfat/default.nix +++ b/pkgs/tools/filesystems/exfat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "exfat-${version}"; - version = "1.2.8"; + version = "1.3.0"; src = fetchFromGitHub { owner = "relan"; repo = "exfat"; rev = "v${version}"; - sha256 = "0q02g3yvfmxj70h85a69d8s4f6y7jask268vr87j44ya51lzndd9"; + sha256 = "1q29pcysv747y6dis07953dkax8k9x50b5gg99gpz6rr46xwgkgb"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/filesystems/tmsu/default.nix b/pkgs/tools/filesystems/tmsu/default.nix index 359653465059..3c6dd2648ef6 100644 --- a/pkgs/tools/filesystems/tmsu/default.nix +++ b/pkgs/tools/filesystems/tmsu/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "tmsu-${version}"; - version = "0.7.0"; + version = "0.7.1"; go-sqlite3 = fetchgit { url = "git://github.com/mattn/go-sqlite3"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "oniony"; repo = "tmsu"; rev = "v${version}"; - sha256 = "0vccxb8mlr7wf92xawnqpvzwlw2xs3b962hjn09dnd6yxqscql64"; + sha256 = "0d1sryq80chb9vrf9z0lfx4xb3sdkg01f9hqf3bb9c89vm6v2lwg"; }; buildInputs = [ go fuse ]; diff --git a/pkgs/tools/graphics/pdftag/default.nix b/pkgs/tools/graphics/pdftag/default.nix index 6f492a3ccc5d..8428480ca037 100644 --- a/pkgs/tools/graphics/pdftag/default.nix +++ b/pkgs/tools/graphics/pdftag/default.nix @@ -4,23 +4,17 @@ stdenv.mkDerivation rec { pname = "pdftag"; name = "${pname}-${version}"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "arrufat"; repo = pname; - rev = version; - sha256 = "17zk42h0n33b4p8fqlq2riqwcdi8y9m5n0ccydnk6a4x8rli97b3"; + rev = "v${version}"; + sha256 = "1paj8hs27akzsivn01a30fl3zx5gfn1h89wxg2m72fd806hk0hql"; }; - nativeBuildInputs = [ pkgconfig meson ninja wrapGAppsHook ]; - buildInputs = [ gtk3 poppler vala ]; - - patchPhase = ''substituteInPlace meson.build \ - --replace "install_dir: '/usr" "install_dir: '$out" - ''; - - preInstall = "mkdir -p $out/share/licenses/${pname}"; + nativeBuildInputs = [ pkgconfig meson ninja wrapGAppsHook vala ]; + buildInputs = [ gtk3 poppler ]; meta = with stdenv.lib; { description = "Edit metadata found in PDFs"; diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index 03895f6c8478..01e720e5b877 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -1,24 +1,24 @@ -{ stdenv, rustPlatform, fetchFromGitHub, cmake, pkgconfig, zlib, libiconv, darwin }: +{ stdenv, rustPlatform, fetchFromGitHub, cmake, pkgconfig, zlib +, Security, libiconv +}: rustPlatform.buildRustPackage rec { name = "bat-${version}"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "bat"; rev = "v${version}"; - sha256 = "19xmj3a3npx4v1mlvd31r3icml73mxjq6la5qifb2i35ciqnx9bd"; + sha256 = "1dhn88asf08dvl4827v4mkxafcr01m1h5jmicvzda9ywmr82g1cs"; fetchSubmodules = true; }; - cargoSha256 = "062vvpj514h85h9gm3jipp6z256cnnbxbjy7ja6bm7i6bpglyvvi"; + cargoSha256 = "10s8ig08prs1wcsisrllvsixqkrkwjx769y1w5fypldn9kfk2lka"; nativeBuildInputs = [ cmake pkgconfig zlib ]; - buildInputs = [ libiconv ] ++ stdenv.lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security libiconv ]; meta = with stdenv.lib; { description = "A cat(1) clone with syntax highlighting and Git integration"; diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index 6ba931ad80d6..f5ba8b7fe100 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -1,52 +1,30 @@ {stdenv, fetchurl, autoreconfHook, texinfo, buggyBiosCDSupport ? true}: +let +in stdenv.mkDerivation { - name = "grub-0.97-patch-1.12"; + name = "grub-0.97-73"; src = fetchurl { url = ftp://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz; sha256 = "02r6b52r0nsp6ryqfiqchnl7r1d9smm80sqx24494gmx5p8ia7af"; }; - # Lots of patches from Gentoo, in particular splash screen support - # (not the fancy SUSE gfxmenu stuff though). Also a fix for boot - # failures on systems with more than 2 GiB RAM, and for booting from - # ext3 filesystems with 256-byte inodes as well as ext4 filesystems. - gentooPatches = fetchurl { - url = mirror://gentoo/distfiles/grub-0.97-patches-1.12.tar.bz2; - sha256 = "15xc5349hkzl03lbn2cadrmvjrf3s8sn147vv2142cwys9sdzkl0"; - }; - patches = [ # Properly handle the case of symlinks such as # /dev/disk/by-label/bla. The symlink resolution code in # grub-install isn't smart enough. ./symlink.patch - - # Provide support for the "savedefault --once" command in the Grub - # shell. KDE uses this to allow rebooting into a non-default - # entry. - (fetchurl { - url = "https://raw.github.com/andatche/centos-grub/master/SOURCES/grub-0.97-once.patch"; - sha256 = "1g5qfn8lvl32h4pggdf7dmjqjpi42jblknzakb5h909fi5i1qyw8"; - }) - - ] ++ (stdenv.lib.optional buggyBiosCDSupport ./buggybios.patch); + ] + ++ (stdenv.lib.optional buggyBiosCDSupport ./buggybios.patch) + ++ map fetchurl (import ./grub1.patches.nix) + ; # autoreconfHook required for the splashimage patch. nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ texinfo ]; - hardeningDisable = [ "stackprotector" ]; - - prePatch = '' - unpackFile $gentooPatches - rm patch/400_all_grub-0.97-reiser4-20050808-gentoo.patch - for i in patch/*.patch; do - echo "applying patch $i" - patch -p1 < $i || patch -p0 < $i - done - ''; + hardeningDisable = [ "format" "stackprotector" ]; passthru.grubTarget = ""; diff --git a/pkgs/tools/misc/grub/grub1.patches.nix b/pkgs/tools/misc/grub/grub1.patches.nix new file mode 100644 index 000000000000..5ee8722b5eca --- /dev/null +++ b/pkgs/tools/misc/grub/grub1.patches.nix @@ -0,0 +1,34 @@ +# Generated by grub1-patches.sh +let + prefix = "https://salsa.debian.org/grub-team/grub-legacy/raw/1dad5507d74ef97fdd3c6cf2a028084f6f2850c3/debian/patches"; +in +[ +{ url = "${prefix}/snapshot.patch"; sha256 = "0ixymrn5w1dq0kkxnzdjwwvhjchgyrlivfvnrfncxcv30v84xzna"; } +{ url = "${prefix}/menu.lst_gnu-hurd.patch"; sha256 = "0mz8dvgmxlyrl28dza1ncfq1xipihxgymw4aw688bgg7xxmw7jbs"; } +{ url = "${prefix}/graphics.patch"; sha256 = "1v9kp832f3rhncfdrd28djhw0zfrznfmiadch33mclnkcxprcqcs"; } +{ url = "${prefix}/raid.patch"; sha256 = "0cq6dz5s7m48g76frvbf296bv4pvqkxqcbydsvs43ymqdsary7hj"; } +{ url = "${prefix}/raid_cciss.patch"; sha256 = "0sy5xvzjsllgbn26nykkq4b69lp1fcwjkjs2kmxq38sk3dzadjfl"; } +{ url = "${prefix}/xfs_freeze.patch"; sha256 = "1wqgj8ar4x4zwa37bj4a7kldiz5v92msigy3cv879nnk6sz4rmhg"; } +{ url = "${prefix}/2gb_limit.patch"; sha256 = "06f9lfl4va3alz87wzli0df5ay0xxlqj2akr2dcay6jr27z6ks29"; } +{ url = "${prefix}/grub-special_device_names.patch"; sha256 = "098608xh20sqdjqf42fm2z23r8xd9ify1v0vmy1j9qhrhk3g9qyz"; } +{ url = "${prefix}/grub-xvd_drives.patch"; sha256 = "13k0m1c1w5d1d4qd1bshjc8kp7qba4agk2j64gb7mg8vfzjd35bj"; } +{ url = "${prefix}/initrd_max_address.patch"; sha256 = "05q90rxdnyncpanhbkrknshkk7g8ff4v8fpk7wj4sg8666d9llg3"; } +{ url = "${prefix}/splashimage_help.patch"; sha256 = "1lj3xh56wf1pdcf0fg585vmggrz7qqfzbhg91qv0rf4snf3ybfvr"; } +{ url = "${prefix}/grub-install_addsyncs.patch"; sha256 = "1dzcpxi806kw3j8mx4amyy4ibc0ir3qhqyyyxz3w43741p351r65"; } +{ url = "${prefix}/grub-install_regexp.patch"; sha256 = "0ph9lb63x858019c25aa3fpsm8rzn00ad8fp88yqqvq0xq2jxq69"; } +{ url = "${prefix}/grub-install_aoe_support.patch"; sha256 = "19szmvg13h2hhijrwbgdszldg26iz7vjnagvajxb7nav7vca6k3n"; } +{ url = "${prefix}/grub-install_xvd.patch"; sha256 = "1cgh731nhs0chj2r2dzh5dcfj5xmap34i3fk0i0aq59j83cwflgz"; } +{ url = "${prefix}/geometry-26kernel.patch"; sha256 = "01vka7jrxrwlj9m1d6schygyh964a3k1rdrm3j9x910xkz74i13n"; } +{ url = "${prefix}/print_func.patch"; sha256 = "0dvrcy1i58fgrv2x1qniqfr5az9b834hm5l94k0cy8ii2nfvk27g"; } +{ url = "${prefix}/mprotect.patch"; sha256 = "0ahgnhgw2b86j024ajs6m3h2fy2shqdssjzz0ahk8ny9f4mnvns6"; } +{ url = "${prefix}/savedefault.patch"; sha256 = "1l6x1s9mxkrf3k4j9dpg7qhvrk816vs70sw073iiisvqspnrz2j3"; } +{ url = "${prefix}/find-grub-dir.patch"; sha256 = "1vkgig4dylji03jflwikhap87lz8l470ck1bhmcy8jh0slg6ndbf"; } +{ url = "${prefix}/intelmac.patch"; sha256 = "04l9mk9xm9ml8vdlpbv3qbj7gbaa0g5k4dl7xp8wm7kmqwxd9l3m"; } +{ url = "${prefix}/crossreference_manpages.patch"; sha256 = "0kd12ck4s4bg414fmllgvq8n4b58i3kgdhmcx6riaz43gg2g2b9p"; } +{ url = "${prefix}/ext3_256byte_inode.patch"; sha256 = "0ay9svbdj7mw8p1ld0iiryg6nhd9hc1xpmr9rqg9990xzmg2h4pi"; } +{ url = "${prefix}/objcopy-absolute.patch"; sha256 = "0hkmicjli7bsmc56kr40ls21v6x3yd188xpwc08dvqxnb0763077"; } +{ url = "${prefix}/no-reorder-functions.patch"; sha256 = "0gmv0nzkqim2901hd0an90kwnr83155qp2zjp52biznad2p415gw"; } +{ url = "${prefix}/modern-automake.patch"; sha256 = "08l3y6cbk6gfj63kpqlpzrlain7nmvki7jjjxq86n7himj078znj"; } +{ url = "${prefix}/no-combine-stack-adjustments.patch"; sha256 = "0h4di8zja0rg45rs02x9qm8q1vxly1bcl6ms08wgdl5ywn6849nr"; } +{ url = "${prefix}/no-pie.patch"; sha256 = "0kshdsclza7lsd31apd28qq04arv42nd6wsj2v6q6jx7f8bgdaqw"; } +] diff --git a/pkgs/tools/misc/grub/grub1.patches.sh b/pkgs/tools/misc/grub/grub1.patches.sh new file mode 100755 index 000000000000..d3b138ad3577 --- /dev/null +++ b/pkgs/tools/misc/grub/grub1.patches.sh @@ -0,0 +1,70 @@ +#!/usr/bin/env nix-shell +#!nix-shell -p nix -i bash --pure + +# Does like `maintainers/scripts/debian-patches.sh`, but specialized for +# grub1 patches, and using the new salsa service. + +# Most common usage: `pkgs/tools/misc/grub/grub1.patches.sh pkgs/tools/misc/grub/grub1.patches.nix` +# That is, after updating the script with the new list from the series file, +# removing (by commenting) patches as required. + +set -e +set -u + +# https://salsa.debian.org/grub-team/grub-legacy/tree/master/debian/patches +SERIES=( + snapshot.patch + menu.lst_gnu-hurd.patch + graphics.patch + raid.patch + raid_cciss.patch + xfs_freeze.patch + 2gb_limit.patch + grub-special_device_names.patch + grub-xvd_drives.patch + initrd_max_address.patch + splashimage_help.patch + grub-install_addsyncs.patch + grub-install_regexp.patch + grub-install_aoe_support.patch + grub-install_xvd.patch + geometry-26kernel.patch + print_func.patch + mprotect.patch + savedefault.patch + find-grub-dir.patch + intelmac.patch + crossreference_manpages.patch + ext3_256byte_inode.patch + # Breaks on NixOS. + #use_grub-probe_in_grub-install.patch + objcopy-absolute.patch + no-reorder-functions.patch + + # We aren't building amd64 binaries, see #244498 + #fix_amd64_compile.patch + modern-automake.patch + no-combine-stack-adjustments.patch + no-pie.patch +) + +# Revision mapping to current tip of the 0.97-73 branch. +rev="1dad5507d74ef97fdd3c6cf2a028084f6f2850c3" +prefix="https://salsa.debian.org/grub-team/grub-legacy/raw/${rev}/debian/patches" +FILE="$1" +shift + +cat <<EOF > "$FILE" +# Generated by grub1-patches.sh +let + prefix = "${prefix}"; +in +[ +EOF + +for PATCH in "${SERIES[@]}"; do + URL="$prefix/$PATCH" + HASH="$(nix-prefetch-url "$URL")" + echo "{ url = \"\${prefix}/$PATCH\"; sha256 = \"$HASH\"; }" >> "$FILE" +done +echo "]" >> "$FILE" diff --git a/pkgs/tools/misc/hashit/default.nix b/pkgs/tools/misc/hashit/default.nix new file mode 100644 index 000000000000..69d73aafff92 --- /dev/null +++ b/pkgs/tools/misc/hashit/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, cmake, vala, python3, gnome3, gtk3, granite, gobjectIntrospection, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "hashit"; + version = "0.2.0"; + + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "artemanufrij"; + repo = pname; + rev = version; + sha256 = "1d2g7cm7hhs354waidak9xkhhcvqlwnsl9d0bar9p82gfnpjdg7v"; + }; + + nativeBuildInputs = [ + gobjectIntrospection + meson + ninja + pkgconfig + python3 + vala + wrapGAppsHook + ]; + + buildInputs = [ + granite + gtk3 + gnome3.libgee + ]; + + meta = with stdenv.lib; { + description = "A simple app for checking usual checksums"; + homepage = https://github.com/artemanufrij/hashit; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/nvramtool/default.nix b/pkgs/tools/misc/nvramtool/default.nix new file mode 100644 index 000000000000..fdce7076661a --- /dev/null +++ b/pkgs/tools/misc/nvramtool/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchgit, iasl, flex, bison }: + +stdenv.mkDerivation rec { + name = "nvramtool-${version}"; + version = "4.8.1"; + + src = fetchgit { + url = "http://review.coreboot.org/p/coreboot"; + rev = "refs/tags/${version}"; + sha256 = "0nrf840jg4fn38zcnz1r10w2yfpvrk1nvsrnbbgdbgkmpjxz0zw9"; + }; + + nativeBuildInputs = [ flex bison ]; + buildInputs = [ iasl ]; + + buildPhase = '' + export LEX=${flex}/bin/flex + make -C util/nvramtool + ''; + + installPhase = '' + mkdir -p $out/bin + cp util/nvramtool/nvramtool $out/bin + ''; + + meta = with stdenv.lib; { + description = "utility for reading/writing coreboot parameters and displaying information from the coreboot table in CMOS/NVRAM"; + homepage = https://www.coreboot.org/Nvramtool; + license = licenses.gpl2; + maintainers = [ maintainers.cryptix ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index 98154d9d5628..3cbdd498aa73 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -4,13 +4,13 @@ }: let - version = "2018.6"; + version = "2018.8"; libglnx-src = fetchFromGitHub { owner = "GNOME"; repo = "libglnx"; - rev = "e1a78cf2f5351d5394ccfb79f3f5a7b4917f73f3"; - sha256 = "10kzyjbrmr98i65hlz8jc1v5bijyqwwfp6qqjbd5g3y0n520iaxc"; + rev = "470af8763ff7b99bec950a6ae0a957c1dcfc8edd"; + sha256 = "1fwik38i6w3r6pn4qkizradcqp1m83n7ljh9jg0y3p3kvrbfxh15"; }; bsdiff-src = fetchFromGitHub { @@ -28,10 +28,15 @@ in stdenv.mkDerivation { rev = "v${version}"; owner = "ostreedev"; repo = "ostree"; - sha256 = "0kk04pznk6m6fqdz609m2zcnkalcw9q8fsx8wm42k6dhf6cw7l3g"; + sha256 = "0i7b7hvlv8m44k39fr5389wskf810vda8s7ivy2whj1nan5951yx"; }; patches = [ + # Workarounds for https://github.com/ostreedev/ostree/issues/1592 + ./fix-1592.patch + # Disable test-gpg-verify-result.test, + # https://github.com/ostreedev/ostree/issues/1634 + ./disable-test-gpg-verify-result.patch # Tests access the helper using relative path # https://github.com/ostreedev/ostree/issues/1593 (fetchpatch { @@ -58,10 +63,13 @@ in stdenv.mkDerivation { cp --no-preserve=mode -r ${bsdiff-src} bsdiff ''; + preConfigure = '' env NOCONFIGURE=1 ./autogen.sh ''; + enableParallelBuilding = true; + configureFlags = [ "--with-systemdsystemunitdir=$(out)/lib/systemd/system" "--with-systemdsystemgeneratordir=$(out)/lib/systemd/system-generators" @@ -73,6 +81,7 @@ in stdenv.mkDerivation { "installed_test_metadir=$(installedTests)/share/installed-tests/libostree" ]; + meta = with stdenv.lib; { description = "Git for operating system binaries"; homepage = https://ostree.readthedocs.io/en/latest/; diff --git a/pkgs/tools/misc/ostree/disable-test-gpg-verify-result.patch b/pkgs/tools/misc/ostree/disable-test-gpg-verify-result.patch new file mode 100644 index 000000000000..d3ef7e08357a --- /dev/null +++ b/pkgs/tools/misc/ostree/disable-test-gpg-verify-result.patch @@ -0,0 +1,12 @@ +diff -aur --no-dereference a/Makefile-tests.am b/Makefile-tests.am +--- a/Makefile-tests.am 1970-01-01 01:00:01.000000000 +0100 ++++ b/Makefile-tests.am 2018-09-17 00:24:11.977841113 +0200 +@@ -243,7 +243,7 @@ + + _installed_or_uninstalled_test_programs = tests/test-varint tests/test-ot-unix-utils tests/test-bsdiff tests/test-mutable-tree \ + tests/test-keyfile-utils tests/test-ot-opt-utils tests/test-ot-tool-util \ +- tests/test-gpg-verify-result tests/test-checksum tests/test-lzma tests/test-rollsum \ ++ tests/test-checksum tests/test-lzma tests/test-rollsum \ + tests/test-basic-c tests/test-sysroot-c tests/test-pull-c tests/test-repo tests/test-include-ostree-h + + if USE_AVAHI diff --git a/pkgs/tools/misc/ostree/fix-1592.patch b/pkgs/tools/misc/ostree/fix-1592.patch new file mode 100644 index 000000000000..f26a924c0d83 --- /dev/null +++ b/pkgs/tools/misc/ostree/fix-1592.patch @@ -0,0 +1,97 @@ +diff -aur --no-dereference a/tests/pull-test.sh b/tests/pull-test.sh +--- a/tests/pull-test.sh 1970-01-01 01:00:01.000000000 +0100 ++++ b/tests/pull-test.sh 2018-09-16 23:55:44.214593856 +0200 +@@ -275,7 +275,7 @@ + if ${CMD_PREFIX} ostree --repo=mirrorrepo-local pull-local otherrepo 2>err.txt; then + fatal "pull with mixed refs succeeded?" + fi +-assert_file_has_content err.txt "error: Invalid ref name origin:main" ++assert_file_has_content err.txt "Invalid ref name origin:main" + ${CMD_PREFIX} ostree --repo=mirrorrepo-local pull-local otherrepo localbranch + ${CMD_PREFIX} ostree --repo=mirrorrepo-local rev-parse localbranch + ${CMD_PREFIX} ostree --repo=mirrorrepo-local fsck +@@ -286,7 +286,7 @@ + fatal "pulled nonexistent branch" + fi + # So true +-assert_file_has_content_literal err.txt "error: Refspec 'nosuchbranch' not found" ++assert_file_has_content_literal err.txt "Refspec 'nosuchbranch' not found" + echo "ok pull-local nonexistent branch" + + cd ${test_tmpdir} +@@ -587,5 +587,5 @@ + if ${CMD_PREFIX} ostree --repo=repo pull origin main 2>err.txt; then + fatal "pull of invalid ref succeeded" + fi +-assert_file_has_content_literal err.txt 'error: Fetching checksum for ref ((empty), main): Invalid rev lots of html here lots of html here lots of html here lots of' ++assert_file_has_content_literal err.txt 'Fetching checksum for ref ((empty), main): Invalid rev lots of html here lots of html here lots of html here lots of' + echo "ok pull got HTML for a ref" +diff -aur --no-dereference a/tests/test-fsck-collections.sh b/tests/test-fsck-collections.sh +--- a/tests/test-fsck-collections.sh 1970-01-01 01:00:01.000000000 +0100 ++++ b/tests/test-fsck-collections.sh 2018-09-17 02:22:48.922502037 +0200 +@@ -100,7 +100,7 @@ + if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then + assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" + fi +-assert_file_has_content fsck-error "Commit has no requested ref ‘new-ref’ in ref binding metadata (‘ref1’)" ++assert_file_has_content fsck-error "Commit has no requested ref .new-ref. in ref binding metadata (.ref1.)" + assert_file_has_content fsck "^Validating refs...$" + + echo "ok 3 fsck detects missing ref bindings" +@@ -113,7 +113,7 @@ + if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then + assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" + fi +-assert_file_has_content fsck-error "Commit has no requested ref ‘new-ref’ in ref binding metadata (‘ref1’)" ++assert_file_has_content fsck-error "Commit has no requested ref .new-ref. in ref binding metadata (.ref1.)" + assert_file_has_content fsck "^Validating refs...$" + assert_file_has_content fsck "^Validating refs in collections...$" + +@@ -127,7 +127,7 @@ + if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then + assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" + fi +-assert_file_has_content fsck-error "Commit has collection ID ‘org.example.Collection’ in collection binding metadata, while the remote it came from has collection ID ‘org.example.Collection2’" ++assert_file_has_content fsck-error "Commit has collection ID .org.example.Collection. in collection binding metadata, while the remote it came from has collection ID .org.example.Collection2." + assert_file_has_content fsck "^Validating refs...$" + assert_file_has_content fsck "^Validating refs in collections...$" + +@@ -147,7 +147,7 @@ + if ${CMD_PREFIX} ostree fsck --repo=repo --verify-back-refs > fsck 2> fsck-error; then + assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" + fi +-assert_file_has_content fsck-error "Collection–ref (org.example.Collection, ref1) in bindings for commit .* does not exist" ++assert_file_has_content fsck-error 'Collection.ref (org.example.Collection, ref1) in bindings for commit .* does not exist' + assert_file_has_content fsck "^Validating refs...$" + assert_file_has_content fsck "^Validating refs in collections...$" + +@@ -186,7 +186,7 @@ + if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then + assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" + fi +-assert_file_has_content fsck-error "Commit has no requested ref ‘new-ref’ in ref binding metadata (‘ref3’, ‘ref4’)" ++assert_file_has_content fsck-error "Commit has no requested ref .new-ref. in ref binding metadata (.ref3., .ref4.)" + assert_file_has_content fsck "^Validating refs...$" + + echo "ok 9 fsck detects missing ref bindings" +@@ -205,7 +205,7 @@ + if ${CMD_PREFIX} ostree fsck --repo=repo --verify-back-refs > fsck 2> fsck-error; then + assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" + fi +-assert_file_has_content fsck-error "Ref ‘ref3’ in bindings for commit .* does not exist" ++assert_file_has_content fsck-error 'Ref .ref3. in bindings for commit .* does not exist' + assert_file_has_content fsck "^Validating refs...$" + + echo "ok 11 fsck ignores unreferenced ref bindings" +diff -aur --no-dereference a/tests/test-remote-add.sh b/tests/test-remote-add.sh +--- a/tests/test-remote-add.sh 1970-01-01 01:00:01.000000000 +0100 ++++ b/tests/test-remote-add.sh 2018-09-17 00:14:16.486788225 +0200 +@@ -83,7 +83,7 @@ + if $OSTREE remote delete nosuchremote 2>err.txt; then + assert_not_reached "Deleting remote unexpectedly succeeded" + fi +-assert_file_has_content err.txt "error: " ++assert_file_has_content err.txt "not found" + + $OSTREE remote delete --if-exists nosuchremote + echo "ok" diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index e497f2a698c7..d688e5fe6625 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -16,29 +16,21 @@ buildPythonPackage rec { pname = "youtube-dl"; - version = "2018.09.01"; + version = "2018.09.10"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "0h8x8agl4s5cnfzwmshbcg4pxcgg3iyb86w8krs21y2k9d1ng036"; + sha256 = "12gd84i5drc2z4wzah7r2vj8fkj9yilm7q8dm7q9n95abrdb7sh8"; }; - patches = [ - # https://github.com/rg3/youtube-dl/pull/17464 - (fetchpatch { - name = "youtube-js-player-fix.patch"; - url = "https://github.com/rg3/youtube-dl/pull/17464/commits/6d7359775ae4eef1d1213aae81e092467a2c675c.patch"; - sha256 = "12mwfmp7iwlawpx6r4rhz546b3anxrx6zc4nyjs8grbh5vxhj9yg"; - }) - ]; - nativeBuildInputs = [ makeWrapper ]; buildInputs = [ zip ] ++ lib.optional generateManPage pandoc; propagatedBuildInputs = lib.optional hlsEncryptedSupport pycryptodome; - # Ensure ffmpeg is available in $PATH for post-processing & transcoding support. - # rtmpdump is required to download files over RTMP - # atomicparsley for embedding thumbnails + # Ensure these utilities are available in $PATH: + # - ffmpeg: post-processing & transcoding support + # - rtmpdump: download files over RTMP + # - atomicparsley: embedding thumbnails makeWrapperArgs = let packagesToBinPath = [ atomicparsley ] diff --git a/pkgs/tools/networking/dd-agent/6.nix b/pkgs/tools/networking/dd-agent/6.nix index c095a77fda05..b26e915e6909 100644 --- a/pkgs/tools/networking/dd-agent/6.nix +++ b/pkgs/tools/networking/dd-agent/6.nix @@ -63,7 +63,8 @@ in buildGoPackage rec { cp -R $src/pkg/status/dist/templates $bin/share/datadog-agent wrapProgram "$bin/bin/agent" \ - --set PYTHONPATH "$bin/${python.sitePackages}" + --set PYTHONPATH "$bin/${python.sitePackages}" \ + --prefix LD_LIBRARY_PATH : ${systemd.lib}/lib ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/dd-agent/datadog-process-agent-deps.nix b/pkgs/tools/networking/dd-agent/datadog-process-agent-deps.nix new file mode 100644 index 000000000000..863402854aeb --- /dev/null +++ b/pkgs/tools/networking/dd-agent/datadog-process-agent-deps.nix @@ -0,0 +1,669 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "bitbucket.org/ww/goautoneg"; + fetch = { + type = "hg"; + url = "https://bitbucket.org/ww/goautoneg"; + rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + }; + } + { + goPackagePath = "github.com/DataDog/agent-payload"; + fetch = { + type = "git"; + url = "https://github.com/DataDog/agent-payload"; + rev = "f0521943f60221829c6bb5de1c7f788cd4411372"; + sha256 = "19m3kiwi0g2a0rysjabrb2nkkz7yx632g7s05mylv1x2ixparhrg"; + }; + } + { + goPackagePath = "github.com/DataDog/datadog-agent"; + fetch = { + type = "git"; + url = "https://github.com/DataDog/datadog-agent"; + rev = "f2d7ce69202c8212cae1ebf476d038b28f3a895e"; + sha256 = "0by3qvj6468r3532x1q6ingf6hlgv4dk8g1aa0hmh9gm25dbfsg5"; + }; + } + { + goPackagePath = "github.com/DataDog/datadog-go"; + fetch = { + type = "git"; + url = "https://github.com/DataDog/datadog-go"; + rev = "a9c7a9896c1847c9cc2b068a2ae68e9d74540a5d"; + sha256 = "1m1vpi2s22dqcq0fqhfp3skzkmsbmhzyiw2kh2dw6ii7qimy8zki"; + }; + } + { + goPackagePath = "github.com/DataDog/gopsutil"; + fetch = { + type = "git"; + url = "https://github.com/DataDog/gopsutil"; + rev = "771928d86fa878b9d62f073a7a6f91ee0a358105"; + sha256 = "0dr5a67jy2zh42dcndx981ca1wv0phc16zlimahjlr00qxam90xi"; + }; + } + { + goPackagePath = "github.com/DataDog/tcptracer-bpf"; + fetch = { + type = "git"; + url = "https://github.com/DataDog/tcptracer-bpf"; + rev = "636ee01a99a4bd352329de98f40fb9fdf611d1c9"; + sha256 = "13373wg1x90jydzgbblxpq2gg9b7ppk6nkjzhw8d27mxd047i74m"; + }; + } + { + goPackagePath = "github.com/DataDog/zstd"; + fetch = { + type = "git"; + url = "https://github.com/DataDog/zstd"; + rev = "2bf71ec4836011b92dc78df3b9ace6b40e65f7df"; + sha256 = "0j0qmnzjxx86kavrb3qcashp2irzjbvip15df97k87pcfvl1gsig"; + }; + } + { + goPackagePath = "github.com/Microsoft/go-winio"; + fetch = { + type = "git"; + url = "https://github.com/Microsoft/go-winio"; + rev = "97e4973ce50b2ff5f09635a57e2b88a037aae829"; + sha256 = "14y1gryr3pb3zy09v2g8dh89m363rfd9sch0wgbabh531hfx72vn"; + }; + } + { + goPackagePath = "github.com/StackExchange/wmi"; + fetch = { + type = "git"; + url = "https://github.com/StackExchange/wmi"; + rev = "b12b22c5341f0c26d88c4d66176330500e84db68"; + sha256 = "0kzkb4zllhrdiq0m9m5ka9i393r1hnx75lnd3hz5rg2fs0n3ym16"; + }; + } + { + goPackagePath = "github.com/aws/aws-sdk-go"; + fetch = { + type = "git"; + url = "https://github.com/aws/aws-sdk-go"; + rev = "bff41fb23b7550368282029f6478819d6a99ae0f"; + sha256 = "1hcd8f3m2cq02mj9i8c1ynbh3j0iyw14l1wszm0qgs18nsj1rzgn"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "3ac7bf7a47d159a033b107610db8a1b6575507a4"; + sha256 = "1qc3l4r818xpvrhshh1sisc5lvl9479qspcfcdbivdyh0apah83r"; + }; + } + { + goPackagePath = "github.com/cenkalti/backoff"; + fetch = { + type = "git"; + url = "https://github.com/cenkalti/backoff"; + rev = "b7325b0f3f1097c6546ea5e83c4a23267e58ad71"; + sha256 = "0vx4ggryxd9w111mf1bi2g51559r8sh99gdqah72k4dfj3vrv19d"; + }; + } + { + goPackagePath = "github.com/cihub/seelog"; + fetch = { + type = "git"; + url = "https://github.com/cihub/seelog"; + rev = "d2c6e5aa9fbfdd1c624e140287063c7730654115"; + sha256 = "0ab9kyrh51x1x71z37pwjsla0qv11a1qv697xafyc4r5nq5hds6p"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + goPackagePath = "github.com/docker/distribution"; + fetch = { + type = "git"; + url = "https://github.com/docker/distribution"; + rev = "48294d928ced5dd9b378f7fd7c6f5da3ff3f2c89"; + sha256 = "0nj4xd72mik4pj8g065cqb0yjmgpj5ppsqf2k5ibz9f68c39c00b"; + }; + } + { + goPackagePath = "github.com/docker/docker"; + fetch = { + type = "git"; + url = "https://github.com/docker/docker"; + rev = "092cba3727bb9b4a2f0e922cd6c0f93ea270e363"; + sha256 = "0l9kjibnpwcgk844sibxk9ppyqniw9r0np1mzp95f8f461jb0iar"; + }; + } + { + goPackagePath = "github.com/docker/go-connections"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-connections"; + rev = "97c2040d34dfae1d1b1275fa3a78dbdd2f41cf7e"; + sha256 = "11szydahzjz7zia3hr8kplnlxsg9papbvc2mgr1vlwrahxpdx7l7"; + }; + } + { + goPackagePath = "github.com/docker/go-units"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-units"; + rev = "47565b4f722fb6ceae66b95f853feed578a4a51c"; + sha256 = "0npxsb3pp89slwf4a73fxm20hykad8xggij6i6hcd5jy19bjrd93"; + }; + } + { + goPackagePath = "github.com/emicklei/go-restful"; + fetch = { + type = "git"; + url = "https://github.com/emicklei/go-restful"; + rev = "68c9750c36bb8cb433f1b88c807b4b30df4acc40"; + sha256 = "0bc0wd5nipz1x078vpq82acyc7ip0qv1sddl451d7f7bvfms6h67"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "ccc981bf80385c528a65fbfdd49bf2d8da22aa23"; + sha256 = "0hcrfmiyx27izac3v0ii0qq2kfjvhr9ma1i79hrl6a6y2ayagzz7"; + }; + } + { + goPackagePath = "github.com/ghodss/yaml"; + fetch = { + type = "git"; + url = "https://github.com/ghodss/yaml"; + rev = "73d445a93680fa1a78ae23a5839bad48f32ba1ee"; + sha256 = "0pg53ky4sy3sp9j4n7vgf1p3gw4nbckwqfldcmmi9rf13kjh0mr7"; + }; + } + { + goPackagePath = "github.com/go-ini/ini"; + fetch = { + type = "git"; + url = "https://github.com/go-ini/ini"; + rev = "d3de07a94d22b4a0972deb4b96d790c2c0ce8333"; + sha256 = "1lpwqhcfhaa6aighd2lpjfswbb6aw5d5bsmyr0vqaqg6g5kz0ikg"; + }; + } + { + goPackagePath = "github.com/go-ole/go-ole"; + fetch = { + type = "git"; + url = "https://github.com/go-ole/go-ole"; + rev = "7a0fa49edf48165190530c675167e2f319a05268"; + sha256 = "00v6fixm35pj8jyqbj0z3kyv7bhrqa2dr2fgmlc9xqwbf0nayssy"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "d76fbc1373015ced59b43ac267f28d546b955683"; + sha256 = "051a3imx2m7gpns8cjm1gckif9z6i4ik0svc1i8j7h86800c5rg0"; + }; + } + { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "44145f04b68cf362d9c4df2182967c2275eaefed"; + sha256 = "1k7sf6qmpgm0iw81gx2dwggf9di6lgw0n54mni7862hihwfrb5rq"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265"; + sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq"; + }; + } + { + goPackagePath = "github.com/google/gofuzz"; + fetch = { + type = "git"; + url = "https://github.com/google/gofuzz"; + rev = "44d81051d367757e1c7c6a5a86423ece9afcf63c"; + sha256 = "0ivq2sl2fv8x0xxrcys27c42s8yq7irgl7lp6l0im9i7ky63nk0i"; + }; + } + { + goPackagePath = "github.com/googleapis/gnostic"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/gnostic"; + rev = "0c5108395e2debce0d731cf0287ddf7242066aba"; + sha256 = "0jf3cp5clli88gpjf24r6wxbkvngnc1kf59d4cgjczsn2wasvsfc"; + }; + } + { + goPackagePath = "github.com/hashicorp/golang-lru"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/golang-lru"; + rev = "a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"; + sha256 = "1z3h4aca31l3qs0inqr5l49vrlycpjm7vq1l9nh1mp0mb2ij0kmp"; + }; + } + { + goPackagePath = "github.com/hashicorp/hcl"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/hcl"; + rev = "65a6292f0157eff210d03ed1bf6c59b190b8b906"; + sha256 = "00qgmygfa4vgf9v3lpz4vp1ca1hcfcxnjqjrvp6z4jjklc8x4mqf"; + }; + } + { + goPackagePath = "github.com/hectane/go-acl"; + fetch = { + type = "git"; + url = "https://github.com/hectane/go-acl"; + rev = "7f56832555fc229dad908c67d65ed3ce6156b70c"; + sha256 = "17crpqmn51fqcz0j1vi4grwwiaqpvc3zhl102hn5sy7s2lmdf630"; + }; + } + { + goPackagePath = "github.com/howeyc/gopass"; + fetch = { + type = "git"; + url = "https://github.com/howeyc/gopass"; + rev = "bf9dde6d0d2c004a008c27aaee91170c786f6db8"; + sha256 = "1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45"; + }; + } + { + goPackagePath = "github.com/imdario/mergo"; + fetch = { + type = "git"; + url = "https://github.com/imdario/mergo"; + rev = "6633656539c1639d9d78127b7d47c622b5d7b6dc"; + sha256 = "1fffbq1l17i0gynmvcxypl7d9h4v81g5vlimiph5bfgf4sp4db7g"; + }; + } + { + goPackagePath = "github.com/iovisor/gobpf"; + fetch = { + type = "git"; + url = "https://github.com/iovisor/gobpf"; + rev = "3b07770c6d5e2bd37e582ecd49460e6ef094f257"; + sha256 = "0inv9vwjd8r365rdpf6z4kzs8b36890vrfkifw228mjlxxx8rg7f"; + }; + } + { + goPackagePath = "github.com/jmespath/go-jmespath"; + fetch = { + type = "git"; + url = "https://github.com/jmespath/go-jmespath"; + rev = "0b12d6b5"; + sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld"; + }; + } + { + goPackagePath = "github.com/json-iterator/go"; + fetch = { + type = "git"; + url = "https://github.com/json-iterator/go"; + rev = "f2b4162afba35581b6d4a50d3b8f34e33c144682"; + sha256 = "0siqfghsm2lkdwinvg8x5gls3p76rq3cdm59c1r4x0b2mdfhnvcd"; + }; + } + { + goPackagePath = "github.com/kubernetes-incubator/custom-metrics-apiserver"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes-incubator/custom-metrics-apiserver"; + rev = "e61f72fec56ab519d74ebd396cd3fcf31b084558"; + sha256 = "1cgbn0yzvrqrxq4kwwz2d6vddi9py2z18dx33yjd8w85j9ghhg6g"; + }; + } + { + goPackagePath = "github.com/magiconair/properties"; + fetch = { + type = "git"; + url = "https://github.com/magiconair/properties"; + rev = "c2353362d570a7bfa228149c62842019201cfb71"; + sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; + }; + } + { + goPackagePath = "github.com/mailru/easyjson"; + fetch = { + type = "git"; + url = "https://github.com/mailru/easyjson"; + rev = "60711f1a8329503b04e1c88535f419d0bb440bff"; + sha256 = "0234jp6134wkihdpdwq1hvzqblgl5khc1wp6dyi2h0hgh88bhdk1"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; + sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "fa473d140ef3c6adf42d6b391fe76707f1f243c8"; + sha256 = "0f06q4fpzg0c370cvmpsl0iq2apl5nkbz5cd3nba5x5ysmshv1lm"; + }; + } + { + goPackagePath = "github.com/modern-go/concurrent"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/concurrent"; + rev = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"; + sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; + }; + } + { + goPackagePath = "github.com/modern-go/reflect2"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/reflect2"; + rev = "4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd"; + sha256 = "1721y3yr3dpx5dx5ashf063qczk2awy5zjir1jvp1h5hn7qz4i49"; + }; + } + { + goPackagePath = "github.com/patrickmn/go-cache"; + fetch = { + type = "git"; + url = "https://github.com/patrickmn/go-cache"; + rev = "a3647f8e31d79543b2d0f0ae2fe5c379d72cedc0"; + sha256 = "10020inkzrm931r4bixf8wqr9n39wcrb78vfyxmbvjavvw4zybgs"; + }; + } + { + goPackagePath = "github.com/pborman/uuid"; + fetch = { + type = "git"; + url = "https://github.com/pborman/uuid"; + rev = "ca53cad383cad2479bbba7f7a1a05797ec1386e4"; + sha256 = "0rcx669bbjkkwdlw81spnra4ffgzd4rbpywnrj3w41m9vq6mk1gn"; + }; + } + { + goPackagePath = "github.com/pelletier/go-toml"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-toml"; + rev = "c2dbbc24a97911339e01bda0b8cabdbd8f13b602"; + sha256 = "0v1dsqnk5zmn6ir8jgxijx14s47jvijlqfz3aq435snfrgybd5rz"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "816c9085562cd7ee03e7f8188a1cfd942858cded"; + sha256 = "1ws5crb7c70wdicavl6qr4g03nn6m92zd6wwp9n2ygz5c8rmxh8k"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "792786c7400a136282c1664665ae0a8db921c6c2"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "e7e903064f5e9eb5da98208bae10b475d4db0f8c"; + sha256 = "0mn6x6za7br81vc9s8d58ivylpx5j4xdq72n7kz3aybniif49r3i"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207"; + sha256 = "0i6mpcnsawi7f00rfmjfjq8llaplyzq4xrkrawlcgfd762p5hnp8"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "65c1f6f8f0fc1e2185eb9863a3bc751496404259"; + sha256 = "0jfzmr8642hr04naim1maa3wklxvcxklykri2z7k4ayizc974lkq"; + }; + } + { + goPackagePath = "github.com/shirou/gopsutil"; + fetch = { + type = "git"; + url = "https://github.com/shirou/gopsutil"; + rev = "8048a2e9c5773235122027dd585cf821b2af1249"; + sha256 = "17ri1ijhvg6gxscaw4sy0r5pkcyiqdsf6nn2d4q36hd0nrswvk29"; + }; + } + { + goPackagePath = "github.com/shirou/w32"; + fetch = { + type = "git"; + url = "https://github.com/shirou/w32"; + rev = "bb4de0191aa41b5507caa14b0650cdbddcd9280b"; + sha256 = "0xh5vqblhr2c3mlaswawx6nipi4rc2x73rbdvlkakmgi0nnl50m4"; + }; + } + { + goPackagePath = "github.com/spf13/afero"; + fetch = { + type = "git"; + url = "https://github.com/spf13/afero"; + rev = "d40851caa0d747393da1ffb28f7f9d8b4eeffebd"; + sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k"; + }; + } + { + goPackagePath = "github.com/spf13/cast"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cast"; + rev = "8965335b8c7107321228e3e3702cab9832751bac"; + sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2"; + }; + } + { + goPackagePath = "github.com/spf13/jwalterweatherman"; + fetch = { + type = "git"; + url = "https://github.com/spf13/jwalterweatherman"; + rev = "4a4406e478ca629068e7768fc33f3f044173c0a6"; + sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "583c0c0531f06d5278b7d917446061adc344b5cd"; + sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5"; + }; + } + { + goPackagePath = "github.com/spf13/viper"; + fetch = { + type = "git"; + url = "https://github.com/spf13/viper"; + rev = "b5e8006cbee93ec955a89ab31e0e3ce3204f3736"; + sha256 = "0y3r6ysi5vn0yq5c7pbl62yg2i64fkv54xgj2jf1hn3v6zzyimis"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "f35b8ab0b5a2cef36673838d662e249dd9c94686"; + sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "c10c31b5e94b6f7a0283272dc2bb27163dcea24b"; + sha256 = "1a4k61xrwmr99fib2m1rcavbaxihnsmy1bgqhff5hkcv4n7bpsl2"; + }; + } + { + goPackagePath = "golang.org/x/mobile"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/mobile"; + rev = "0ff817254b04da935cce10d2d1270ccf047fbbd7"; + sha256 = "0hzsis106xh3hcydjribcar75va3ghp4hwbj9982h2msi27v54x4"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "1c05540f6879653db88113bc4a2b70aec4bd491f"; + sha256 = "0h8yqb0vcqgllgydrf9d3rzp83w8wlr8f0nm6r1rwf2qg30pq1pd"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "95c6576299259db960f6c5b9b69ea52422860fce"; + sha256 = "1fhq8bianb9a1iccpr92mi2hix9zvm10n0f7syx6vfbxdw32i316"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "b19bf474d317b857955b12035d2c5acb57ce8b01"; + sha256 = "0wc8csaafp0ps9jb2hdk8d6xpyw1axhk1np73h0z17x09zk3ylcr"; + }; + } + { + goPackagePath = "golang.org/x/time"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/time"; + rev = "a4bde12657593d5e90d0533a3e4fd95e635124cb"; + sha256 = "07r227rrqgwkchm63dzmdyv5yplbla1vnwkn6qrr940l4psy15aw"; + }; + } + { + goPackagePath = "gopkg.in/inf.v0"; + fetch = { + type = "git"; + url = "https://github.com/go-inf/inf"; + rev = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4"; + sha256 = "0rf3vwyb8aqnac9x9d6ax7z5526c45a16yjm2pvkijr6qgqz8b82"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://github.com/go-yaml/yaml"; + rev = "d670f9405373e636a5a2765eea47fac0c9bc91a4"; + sha256 = "1w1xid51n8v1mydn2m3vgggw8qgpd5a5sr62snsc77d99fpjsrs0"; + }; + } + { + goPackagePath = "gopkg.in/zorkian/go-datadog-api.v2"; + fetch = { + type = "git"; + url = "https://github.com/zorkian/go-datadog-api"; + rev = "6c08e2322af96e867e5715aedd6ea194c42cf44f"; + sha256 = "16ha3azq9981hwpn18sd50ai6d1h85fsawbdxp352c4gi8bhj8zw"; + }; + } + { + goPackagePath = "k8s.io/api"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/api"; + rev = "9e5ffd1f1320950b238cfce291b926411f0af722"; + sha256 = "03992x9n9b8w9rlf70wizn7iqk8cbyksxg0sdc1mm5jyzyvgksgf"; + }; + } + { + goPackagePath = "k8s.io/apimachinery"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/apimachinery"; + rev = "e386b2658ed20923da8cc9250e552f082899a1ee"; + sha256 = "0lgwpsvx0gpnrdnkqc9m96xwkifdq50l7cj9rvh03njws4rbd8jz"; + }; + } + { + goPackagePath = "k8s.io/apiserver"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/apiserver"; + rev = "2cf66d2375dce045e1e02e1d7b74a0d1e34fedb3"; + sha256 = "0x0am99n25njpbd1x20bhyadpv9w6qqjmspp1ahzpmdwjzrnsagg"; + }; + } + { + goPackagePath = "k8s.io/client-go"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/client-go"; + rev = "23781f4d6632d88e869066eaebb743857aa1ef9b"; + sha256 = "0cazbcv7j7fgjs00arx3a8f0z0ikybmv16ccy0yg0wp0nbc05r6v"; + }; + } + { + goPackagePath = "k8s.io/metrics"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/metrics"; + rev = "0d9ea2ac660031c8f2726a735dda29441f396f99"; + sha256 = "0bcsb7s4wlmrja35zvz4s10cf3w7dfn2ckjv6apxd1ykdjxnsk71"; + }; + } +] diff --git a/pkgs/tools/networking/dd-agent/datadog-process-agent.nix b/pkgs/tools/networking/dd-agent/datadog-process-agent.nix new file mode 100644 index 000000000000..7541eee0a20e --- /dev/null +++ b/pkgs/tools/networking/dd-agent/datadog-process-agent.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, buildGoPackage }: + +buildGoPackage rec { + name = "datadog-process-agent-${version}"; + # NOTE: this is 6.5.0 + https://github.com/DataDog/datadog-process-agent/pull/185 + version = "6.5.0"; + owner = "DataDog"; + repo = "datadog-process-agent"; + + src = fetchFromGitHub { + inherit owner repo; + rev = "bd96c99c97e8639fd3ea72e61a492c0a74686abe"; + sha256 = "0afdf344256jivzhdv3k9n9i4aik1yr805dnrc2i3d4di9w8vg8c"; + }; + + goDeps = ./datadog-process-agent-deps.nix; + goPackagePath = "github.com/${owner}/${repo}"; + + meta = with stdenv.lib; { + description = "Live process collector for the DataDog Agent v6"; + homepage = https://www.datadoghq.com; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ domenkozar rvl ]; + }; +} diff --git a/pkgs/tools/networking/gnirehtet/default.nix b/pkgs/tools/networking/gnirehtet/default.nix index 8a2d32e543b0..d40b85591b59 100644 --- a/pkgs/tools/networking/gnirehtet/default.nix +++ b/pkgs/tools/networking/gnirehtet/default.nix @@ -1,11 +1,11 @@ {stdenv, rustPlatform, fetchFromGitHub, fetchzip, androidenv, substituteAll}: let -version = "2.2.1"; +version = "2.3"; apk = stdenv.mkDerivation { name = "gnirehtet.apk-${version}"; src = fetchzip { url = "https://github.com/Genymobile/gnirehtet/releases/download/v${version}/gnirehtet-rust-linux64-v${version}.zip"; - sha256 = "1rz2wdjc1y7n8fhskmki1nj0ak80ylxspcsrcdnjkk9r7jbq0kan"; + sha256 = "08pgmpbz82cd8ndr2syiv25l5xk1gvh9gzji4pgva5gw269bjmpz"; }; installPhase = '' mkdir $out @@ -20,10 +20,10 @@ rustPlatform.buildRustPackage rec { owner = "Genymobile"; repo = "gnirehtet"; rev = "v${version}"; - sha256 = "1mv8nq4422k2d766qjqqnqp47qzzbbvlwhdni0k6w4nmd3m5cnd9"; + sha256 = "118ig42qzr2xyra7r8zfxq38xidaxfc98ja9836jwnn9fgbigczr"; }; sourceRoot = "source/relay-rust"; - cargoSha256 = "11qf9n6h6akvb0rbmsgdlfmypkbnas8ss1cs7i8w19mh7524n0v5"; + cargoSha256 = "0370jbllahcdhs132szbxb2yr675s5smm74sx58qi8jhykbb5qs7"; patchFlags = [ "-p2" ]; patches = [ diff --git a/pkgs/tools/networking/gnirehtet/paths.patch b/pkgs/tools/networking/gnirehtet/paths.patch index 72a8445d83b9..e5df4b8e4fe7 100644 --- a/pkgs/tools/networking/gnirehtet/paths.patch +++ b/pkgs/tools/networking/gnirehtet/paths.patch @@ -1,7 +1,7 @@ -diff --git a/relay-rust/src/main.rs b/relay-rust/src/main.rs -index 4f1be53..96d2e78 100644 ---- a/relay-rust/src/main.rs -+++ b/relay-rust/src/main.rs +Index: gnirehtet/relay-rust/src/main.rs +=================================================================== +--- gnirehtet.orig/relay-rust/src/main.rs ++++ gnirehtet/relay-rust/src/main.rs @@ -299,7 +299,7 @@ impl Command for RelayCommand { fn cmd_install(serial: Option<&String>) -> Result<(), CommandExecutionError> { @@ -11,7 +11,7 @@ index 4f1be53..96d2e78 100644 } fn cmd_uninstall(serial: Option<&String>) -> Result<(), CommandExecutionError> { -@@ -467,8 +467,8 @@ fn exec_adb<S: Into<String>>( +@@ -464,8 +464,8 @@ fn exec_adb<S: Into<String>>( args: Vec<S>, ) -> Result<(), CommandExecutionError> { let adb_args = create_adb_args(serial, args); @@ -22,7 +22,7 @@ index 4f1be53..96d2e78 100644 Ok(exit_status) => { if exit_status.success() { Ok(()) -@@ -490,8 +490,8 @@ fn must_install_client(serial: Option<&String>) -> Result<bool, CommandExecution +@@ -487,8 +487,8 @@ fn must_install_client(serial: Option<&S serial, vec!["shell", "dumpsys", "package", "com.genymobile.gnirehtet"], ); @@ -33,3 +33,16 @@ index 4f1be53..96d2e78 100644 Ok(output) => { if output.status.success() { // the "regex" crate makes the binary far bigger, so just parse the versionCode +Index: gnirehtet/relay-rust/src/adb_monitor.rs +=================================================================== +--- gnirehtet.orig/relay-rust/src/adb_monitor.rs ++++ gnirehtet/relay-rust/src/adb_monitor.rs +@@ -206,7 +206,7 @@ impl AdbMonitor { + + fn start_adb_daemon() -> bool { + info!(target: TAG, "Restarting adb daemon"); +- match process::Command::new("adb") ++ match process::Command::new("@adb@") + .args(&["start-server"]) + .status() { + Ok(exit_status) => { diff --git a/pkgs/tools/networking/mpack/default.nix b/pkgs/tools/networking/mpack/default.nix index 62cec7c41eef..5a8af7de36a0 100644 --- a/pkgs/tools/networking/mpack/default.nix +++ b/pkgs/tools/networking/mpack/default.nix @@ -8,18 +8,13 @@ stdenv.mkDerivation rec { sha256 = "0k590z96509k96zxmhv72gkwhrlf55jkmyqlzi72m61r7axhhh97"; }; - patches = [ ./build-fix.patch ]; + patches = [ ./build-fix.patch ./sendmail-via-execvp.diff ]; postPatch = '' for f in *.{c,man,pl,unix} ; do substituteInPlace $f --replace /usr/tmp /tmp done - for f in unixpk.c ; do - substituteInPlace $f \ - --replace /usr/sbin /run/current-system/sw/bin - done - # this just shuts up some warnings for f in {decode,encode,part,unixos,unixpk,unixunpk,xmalloc}.c ; do sed -i 'i#include <stdlib.h>' $f diff --git a/pkgs/tools/networking/mpack/sendmail-via-execvp.diff b/pkgs/tools/networking/mpack/sendmail-via-execvp.diff new file mode 100644 index 000000000000..8f10901038d6 --- /dev/null +++ b/pkgs/tools/networking/mpack/sendmail-via-execvp.diff @@ -0,0 +1,12 @@ +--- mpack-1.6/unixpk.c 2003-07-21 22:50:41.000000000 +0200 ++++ mpack-1.6/unixpk.c 2018-09-16 12:57:14.104026964 +0200 +@@ -254,8 +254,9 @@ + #ifdef SCO + execv("/usr/lib/mail/execmail", addr+start); + #else ++ execvp("sendmail", addr+start); + execv("/usr/lib/sendmail", addr+start); + execv("/usr/sbin/sendmail", addr+start); + #endif + perror("execv"); + _exit(1); diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index 0f7f75b989e2..75e2b45110fe 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib }: +{ stdenv, fetchurl, pkgconfig, glib, which }: stdenv.mkDerivation rec { name = "nbd-3.18"; @@ -8,10 +8,11 @@ stdenv.mkDerivation rec { sha256 = "0cb0sjiv0j9sh9dk24nrjm7sa0axbrcp2av5hc91g1ryzk764dyq"; }; - buildInputs = - [ pkgconfig glib ] + buildInputs = [ glib ] ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.linuxHeaders; + nativeBuildInputs = [ pkgconfig which ]; + postInstall = '' mkdir -p "$out/share/doc/${name}" cp README.md "$out/share/doc/${name}/" diff --git a/pkgs/tools/networking/pcapfix/default.nix b/pkgs/tools/networking/pcapfix/default.nix index 98113551c0cc..970844ea6d6d 100644 --- a/pkgs/tools/networking/pcapfix/default.nix +++ b/pkgs/tools/networking/pcapfix/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "pcapfix-1.1.1"; + name = "pcapfix-1.1.2"; src = fetchurl { url = "https://f00l.de/pcapfix/${name}.tar.gz"; - sha256 = "07dfgl99iv88mgpnpfcb9y7h0zjq9fcf4sp5s7d0d3d5a5sshjay"; + sha256 = "0dl6pgqw6d8i5rhn6xwdx7sny16lpf771sn45c3p0l8z4mfzg6ay"; }; postPatch = ''sed -i "s|/usr|$out|" Makefile''; diff --git a/pkgs/tools/package-management/cargo-update/default.nix b/pkgs/tools/package-management/cargo-update/default.nix index 70a14ded7bf3..50dc748e07ef 100644 --- a/pkgs/tools/package-management/cargo-update/default.nix +++ b/pkgs/tools/package-management/cargo-update/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, defaultCrateOverrides, fetchFromGitHub, cmake, libssh2, libgit2, openssl, zlib }: +{ stdenv, callPackage, defaultCrateOverrides, fetchFromGitHub, cmake, curl, libssh2, libgit2, openssl, zlib }: ((callPackage ./cargo-update.nix {}).cargo_update {}).override { crateOverrides = defaultCrateOverrides // { @@ -13,7 +13,9 @@ sha256 = "1bvrdgcw2akzd78wgvsisvghi8pvdk3szyg9s46qxv4km9sf88s7"; }; - buildInputs = [ cmake libssh2 libgit2 openssl zlib ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libssh2 libgit2 openssl zlib ] + ++ stdenv.lib.optional stdenv.isDarwin curl; meta = with stdenv.lib; { description = "A cargo subcommand for checking and applying updates to installed executables"; diff --git a/pkgs/tools/security/sops/default.nix b/pkgs/tools/security/sops/default.nix index bbcfc4c78907..a0c183b3a2ee 100644 --- a/pkgs/tools/security/sops/default.nix +++ b/pkgs/tools/security/sops/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "sops-${version}"; - version = "3.0.2"; + version = "3.1.0"; goPackagePath = "go.mozilla.org/sops"; @@ -10,12 +10,12 @@ buildGoPackage rec { rev = version; owner = "mozilla"; repo = "sops"; - sha256 = "0zszlb35cmw9j9dg1bpcbwxwh094wcfxhas4ns58jp5n79rqwv9i"; + sha256 = "02s85affgs2991p4akff68myx4h7m3jcly6xihv9g2knml7ixrkj"; }; meta = with stdenv.lib; { + inherit (src.meta) homepage; description = "Mozilla sops (Secrets OPerationS) is an editor of encrypted files"; - homepage = https://github.com/mozilla/sops; license = licenses.mpl20; }; } diff --git a/pkgs/tools/system/krakenx/default.nix b/pkgs/tools/system/krakenx/default.nix index db0987d70739..c6866264a9b0 100644 --- a/pkgs/tools/system/krakenx/default.nix +++ b/pkgs/tools/system/krakenx/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "krakenx"; - version = "0.0.1"; + version = "0.0.3"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1vxyindph81srya0pfmb3n64n8h7ghp38ak86vc2zc5nyirf5zq8"; + sha256 = "1khw1rxra5hn7hwp16i6kgj89znq8vjsyly3r2dxx2z2bddil000"; }; propagatedBuildInputs = lib.singleton python3Packages.pyusb; @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; # there are no tests meta = with lib; { - description = "Python script to control NZXT cooler Kraken X52/X62"; + description = "Python script to control NZXT cooler Kraken X52/X62/X72"; homepage = https://github.com/KsenijaS/krakenx; license = licenses.gpl2; maintainers = [ maintainers.willibutz ]; diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 84ef164ce248..5fe4ab5d7239 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "vale-${version}"; - version = "0.11.2"; + version = "1.0.3"; rev = "v${version}"; goPackagePath = "github.com/errata-ai/vale"; @@ -11,13 +11,13 @@ buildGoPackage rec { inherit rev; owner = "errata-ai"; repo = "vale"; - sha256 = "0zs6bdwnc5fpa0skw1xhdwg6jzsc7wcb8lsfj235jc8jd2w13mvm"; + sha256 = "132zzgry19alcdn3m3q62sp2lm3yxc4kil12lm309jl7b3n0850h"; }; goDeps = ./deps.nix; meta = with stdenv.lib; { - inherit (src.meta) homepage; + homepage = https://errata.ai/vale/getting-started/; description = "Vale is an open source linter for prose"; license = licenses.mit; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/tools/text/vale/deps.nix b/pkgs/tools/text/vale/deps.nix index e63becb5b4b3..c19af2cd4f0f 100644 --- a/pkgs/tools/text/vale/deps.nix +++ b/pkgs/tools/text/vale/deps.nix @@ -23,8 +23,8 @@ fetch = { type = "git"; url = "https://github.com/davecgh/go-spew"; - rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + rev = "346938d642f2ec3594ed81d874461961cd0faa76"; + sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; }; } { @@ -32,8 +32,8 @@ fetch = { type = "git"; url = "https://github.com/fatih/color"; - rev = "507f6050b8568533fb3f5504de8e5205fa62a114"; - sha256 = "0k1v9dkhrxiqhg48yqkwzpd7x40xx38gv2pgknswbsy4r8w644i7"; + rev = "570b54cabe6b8eb0bc2dfce68d964677d63b5260"; + sha256 = "1hw9hgkfzbzqjhy29pqpk20xggxaqjv45wx8yn69488mw5ph7khh"; }; } { @@ -41,8 +41,8 @@ fetch = { type = "git"; url = "https://github.com/gobwas/glob"; - rev = "f00a7392b43971b2fdb562418faab1f18da2067a"; - sha256 = "1b7jnb7rx99na25lkm9m9jr583mv7y0lwp57w58sv7ir9iiilx29"; + rev = "bea32b9cd2d6f55753d94a28e959b13f0244797a"; + sha256 = "0dx0f293v1a0d8qi7ik5hdl26dapd8xm0hj9a9gc620vhj7khi9q"; }; } { @@ -50,8 +50,8 @@ fetch = { type = "git"; url = "https://github.com/jdkato/prose"; - rev = "e27abfd3f31b84c37bbce37179b0428fcb1384be"; - sha256 = "04rjqh3jdxaqr9czp4vcj14hqfv7yppv4nb7ynb04c9jcq23ajw7"; + rev = "4d68d1b77f66e36b6897a79f59f434d558e5e0c2"; + sha256 = "1g2wwj6azpcjy6j7pk4dqx868v3hrqwjg5d737p4441a55026prj"; }; } { @@ -68,8 +68,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-colorable"; - rev = "efa589957cd060542a26d2dd7832fd6a6c6c3ade"; - sha256 = "0kshi4hvm0ayrsxqxy0599iv81kryhd2fn9lwjyczpj593cq069r"; + rev = "941b50ebc6efddf4c41c8e4537a5f68a4e686b24"; + sha256 = "0dw492z5w0fzv1cxm3xx26n8qpqjaf2ybiwpmvimzyhv65n8nrf8"; }; } { @@ -77,8 +77,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-isatty"; - rev = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c"; - sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; + rev = "fc9e8d8ef48496124e79ae0df75490096eccf6fe"; + sha256 = "1r5f9gkavkb1w6sr0qs5kj16706xirl3qnlq3hqpszkw9w27x65a"; }; } { @@ -86,8 +86,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-runewidth"; - rev = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb"; - sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; + rev = "9e777a8366cce605130a531d2cd6363d07ad7317"; + sha256 = "0vkrfrz3fzn5n6ix4k8s0cg0b448459sldq8bp4riavsxm932jzb"; }; } { @@ -104,8 +104,8 @@ fetch = { type = "git"; url = "https://github.com/mitchellh/mapstructure"; - rev = "00c29f56e2386353d58c599509e8dc3801b0d716"; - sha256 = "1vw8fvhax0d567amgvxr7glcl12lvzg2sbzs007q5k5bbwn1szyb"; + rev = "d0303fe809921458f417bcf828397a65db30a7e4"; + sha256 = "1fjwi5ghc1ibyx93apz31n4hj6gcq1hzismpdfbg2qxwshyg0ya8"; }; } { @@ -113,8 +113,8 @@ fetch = { type = "git"; url = "https://github.com/montanaflynn/stats"; - rev = "1bf9dbcd8cbe1fdb75add3785b1d4a9a646269ab"; - sha256 = "0qnx3hvd3lhwnmxg7nr4nwl5kbsc7ffnjk9ifyk0f05h61l3v9pz"; + rev = "eeaced052adbcfeea372c749c281099ed7fdaa38"; + sha256 = "0kamcla633692n81w0j0d423ws3qdds97r2c0i193ypsh9xknpq9"; }; } { @@ -122,8 +122,8 @@ fetch = { type = "git"; url = "https://github.com/olekukonko/tablewriter"; - rev = "d5dd8a50526aadb3d5f2c9b5233277bc2db90e88"; - sha256 = "0l7y3mmwkzpa7p56drw6d6416j9zfapznfyr1dab44d6kk48rvjx"; + rev = "be5337e7b39e64e5f91445ce7e721888dbab7387"; + sha256 = "04zg261i4bq29bc460nyx9r2j70mj0sbxlprn87ylk8y5j2m1d1w"; }; } { @@ -140,8 +140,8 @@ fetch = { type = "git"; url = "https://github.com/remeh/sizedwaitgroup"; - rev = "5582a674300c427060d06980c142aeb52ed20040"; - sha256 = "152a1xnaswh9fx6f71llggm513c6ch171gc61jk3b6b0il6npb57"; + rev = "4b44541c93591ee0e73747d6081e61bd8c58b5c7"; + sha256 = "1kz7h8r09c95r3hc8bngznc4lrnkz2vm50lrl96cqxja0pw8jl92"; }; } { @@ -149,8 +149,8 @@ fetch = { type = "git"; url = "https://github.com/russross/blackfriday"; - rev = "16ac584625fae401e2778e7af317dc415844c44b"; - sha256 = "0g0dbqm76aqsc2a43j95i0h5138cmlgnldhkv3blgn0ga6s8ypfg"; + rev = "0b647d0506a698cca42caca173e55559b12a69f2"; + sha256 = "1bv6mvnrqrcrp5d45l5p07q855sval8l3jzw1cf2dajkpcpysqln"; }; } { @@ -158,8 +158,8 @@ fetch = { type = "git"; url = "https://github.com/shogo82148/go-shuffle"; - rev = "27e6095f230d6c769aafa7232db643a628bd87ad"; - sha256 = "0nig0q0f0v6ay2w0k3r0pqlvjp1yg9s06f00qpizp679vc46gqs1"; + rev = "4789c7c401f229b3ae1673acbccca451480660cd"; + sha256 = "1gaii1h51df8vr28ww5np8nhvfcy4plv0nja9b9h0cmcxa3jf1lp"; }; } { @@ -167,8 +167,8 @@ fetch = { type = "git"; url = "https://github.com/shurcooL/sanitized_anchor_name"; - rev = "86672fcb3f950f35f2e675df2240550f2a50762f"; - sha256 = "142m507s9971cl8qdmbcw7sqxnkgi3xqd8wzvfq15p0w7w8i4a3h"; + rev = "541ff5ee47f1dddf6a5281af78307d921524bcb5"; + sha256 = "1fslblamqkd0yrvl1kbq95hnnji78bq9m33nnxiqs7y9w32zylv5"; }; } { @@ -176,8 +176,8 @@ fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "c679ae2cc0cb27ec3293fea7e254e47386f05d69"; - sha256 = "1rrdn7k83j492rzhqwkh6956sj8m2nbk44d7r1xa9nsn3hfwj691"; + rev = "69483b4bd14f5845b5a1e55bca19e954e827f1d0"; + sha256 = "11lzrwkdzdd8yyag92akncc008h2f9d1bpc489mxiwp0jrmz4ivb"; }; } { @@ -185,8 +185,8 @@ fetch = { type = "git"; url = "https://github.com/urfave/cli"; - rev = "8e01ec4cd3e2d84ab2fe90d8210528ffbb06d8ff"; - sha256 = "0cpr10n4ps3gcdbcink71ry9hzhdb5rrcysmylybs8h2lzxqgc1i"; + rev = "0bdeddeeb0f650497d603c4ad7b20cfe685682f6"; + sha256 = "1ny63c7bfwfrsp7vfkvb4i0xhq4v7yxqnwxa52y4xlfxs4r6v6fg"; }; } { @@ -203,8 +203,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "5f9ae10d9af5b1c89ae6904293b14b064d4ada23"; - sha256 = "10vzmdg8z73krbp2qhsqygvqd0f0s98376mrxm614xdcdljn73dn"; + rev = "ab5485076ff3407ad2d02db054635913f017b0ed"; + sha256 = "10805rk5rfgc3ivx35r9qmnps8hy3k3m57g0j6mz10w96k8i7pk7"; }; } { @@ -212,8 +212,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "bb9c189858d91f42db229b04d45a4c3d23a7662a"; - sha256 = "0z20pql3hzlplcc8ywfq7a1s8mfixmcp84k656fdkmkdjfyvsl0v"; + rev = "14ac33bf8474b62c65cae263af2e4d3b543cc699"; + sha256 = "1453l5v5kizq142fiq3bg5hka7b0yvnf9fsq8y2ayj4bc9h5vqf3"; }; } { @@ -221,8 +221,8 @@ fetch = { type = "git"; url = "https://github.com/go-ini/ini"; - rev = "bda519ae5f4cbc60d391ff8610711627a08b86ae"; - sha256 = "05vcc3ssxyrk8g3sr4gs888vllgjqfq11na63qz2pvaiy7m0rqrs"; + rev = "d3de07a94d22b4a0972deb4b96d790c2c0ce8333"; + sha256 = "1lpwqhcfhaa6aighd2lpjfswbb6aw5d5bsmyr0vqaqg6g5kz0ikg"; }; } { @@ -230,8 +230,8 @@ fetch = { type = "git"; url = "https://github.com/neurosnap/sentences"; - rev = "b0f23a5b35b961fe821f49e51235242d2a8193f3"; - sha256 = "0f5lmww1g4frd5avmqw120zzklcxk5z4l20r4d8zix7406ry7zrg"; + rev = "a7f18ead1433a139742a8b42ce7a059cfb484d60"; + sha256 = "1b64xv5anfbnq6354jaygxapwgkdhbszzi604b96sm682brwl0p7"; }; } { @@ -239,8 +239,8 @@ fetch = { type = "git"; url = "https://github.com/go-yaml/yaml"; - rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + rev = "25c4ec802a7d637f88d584ab26798e94ad14c13b"; + sha256 = "053mknsl3xhjscmd552005xnwbfcg0z2iphvbvj3wi0w3pvmlw44"; }; } ] \ No newline at end of file diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index 0d082eac4bba..bcc69c7b223e 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { name = "tectonic-${version}"; - version = "0.1.8"; + version = "0.1.9"; src = fetchFromGitHub { owner = "tectonic-typesetting"; repo = "tectonic"; rev = "v${version}"; - sha256 = "1bm3s2zkyy44xrc804c65hrbc6ixzcr95na671b0dannjrikrx1x"; + sha256 = "1prrw1npmmqjx966dxrr4jll16scf0cv24nnc70zlbwwb15zhgiq"; }; - cargoSha256 = "1pyaw72h85ydq794mpgfjfq7dcq3a1dg4infh770swfaycyll6h6"; + cargoSha256 = "00hcs9k9x23xy1pgf8skgb6i5kjwgipy8c0d27nniaxa3dpy5daq"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix index e987bc7986b1..bfa8217b9a09 100644 --- a/pkgs/tools/virtualization/google-compute-engine/default.nix +++ b/pkgs/tools/virtualization/google-compute-engine/default.nix @@ -10,14 +10,14 @@ buildPythonApplication rec { name = "google-compute-engine-${version}"; - version = "20180129"; + version = "20180510"; namePrefix = ""; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "compute-image-packages"; rev = version; - sha256 = "0380fnr64109hv8l1f3sgdg8a5mf020axj7jh8y25xq6wzkjm20c"; + sha256 = "13hmg29s1pljcvf40lrv5yickg8x51rcnv68wxhs6zkkg75k448p"; }; postPatch = '' |