diff options
Diffstat (limited to 'pkgs/tools')
21 files changed, 221 insertions, 90 deletions
diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 369c2366fc14..bb585f6eb64a 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake zlib gettext libtool ] ++ xorg.xorgserver.nativeBuildInputs; - propagatedNativeBuildInputs = xorg.xorgserver.propagatedNativeBuildInputs; + propagatedBuildInputs = xorg.xorgserver.propagatedBuildInputs; enableParallelBuilding = true; diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/tools/filesystems/go-mtpfs/default.nix index 028aef6024b1..f46dd74b2660 100644 --- a/pkgs/tools/filesystems/go-mtpfs/default.nix +++ b/pkgs/tools/filesystems/go-mtpfs/default.nix @@ -16,5 +16,9 @@ buildGoPackage rec { sha256 = "1jcqp9n8fd9psfsnhfj6w97yp0zmyxplsig8pyp2gqzh4lnb5fqm"; }; + preFixup = stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -delete_rpath "$out/lib" $bin/bin/go-mtpfs + ''; + goDeps = ./deps.nix; } diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/tools/misc/aspcud/default.nix index f3d2cbca6516..974b7691cb93 100644 --- a/pkgs/tools/misc/aspcud/default.nix +++ b/pkgs/tools/misc/aspcud/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Solver for package problems in CUDF format using ASP"; homepage = http://potasssco.sourceforge.net/; - platforms = platforms.linux; + platforms = platforms.all; maintainers = [ maintainers.hakuch ]; license = licenses.gpl3Plus; }; diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 48bcf143bb6f..3960fd155c77 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -14,18 +14,17 @@ assert selinuxSupport -> libselinux != null && libsepol != null; with lib; stdenv.mkDerivation rec { - name = "coreutils-8.27"; + name = "coreutils-8.28"; src = fetchurl { url = "mirror://gnu/coreutils/${name}.tar.xz"; - sha256 = "0sv547572iq8ayy8klir4hnngnx92a9nsazmf1wgzfc7xr4x74c8"; + sha256 = "0r8c1bgm68kl70j1lgd0rv12iykw6143k4m9a56xip9rc2hv25qi"; }; # FIXME needs gcc 4.9 in bootstrap tools hardeningDisable = [ "stackprotector" ]; - patches = optional hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch - ++ optional hostPlatform.isDarwin stdenv.secure-format-patch; + patches = optional hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch; # The test tends to fail on btrfs and maybe other unusual filesystems. postPatch = optionalString (!hostPlatform.isDarwin) '' diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 61066cec04df..13d1b149d06c 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -1,23 +1,22 @@ -{ lib, stdenv, fetchgit, fetchpatch, python3Packages, docutils -, acl, binutils, bzip2, cbfstool, cdrkit, colord, cpio, diffutils, e2fsprogs, file, fpc, gettext, ghc -, gnupg1, gzip, jdk, libcaca, mono, pdftk, poppler_utils, sng, sqlite, squashfsTools, unzip, xxd, xz -, colordiff +{ lib, stdenv, fetchgit, python3Packages, docutils +, acl, binutils, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, diffutils, dtc, e2fsprogs +, file, findutils, fpc, gettext, ghc, gnupg1, gnutar, gzip, imagemagick, jdk, libarchive, libcaca, llvm +, mono, openssh, pdftk, poppler_utils, sng, sqlite, squashfsTools, tcpdump, unzip, xxd, xz , enableBloat ? false }: python3Packages.buildPythonApplication rec { name = "diffoscope-${version}"; - version = "85"; + version = "86"; src = fetchgit { url = "git://anonscm.debian.org/reproducible/diffoscope.git"; rev = "refs/tags/${version}"; - sha256 = "0kmcfhgva1fl6x5b07sc7k6ba9mqs3ma0lvspxm31w7nrrrqcvlr"; + sha256 = "0jj3gn7pw7him12bxf0wbs6wkz32ydv909v5gi681p0dyzajd0zr"; }; patches = [ - # Ignore different link counts - doesn't work with 85 - # ./ignore_links.patch + ./ignore_links.patch ]; postPatch = '' @@ -25,12 +24,13 @@ python3Packages.buildPythonApplication rec { sed -i setup.py -e "/'rpm-python',/d" ''; - # Still missing these tools: enjarify, otool & lipo (maybe macOS only), showttf + # Still missing these tools: apktool docx2txt enjarify gifbuild js-beautify odt2txt oggDump pgpdump ps2ascii Rscript showttf # Also these libraries: python3-guestfs - pythonPath = with python3Packages; - [ debian libarchive-c python_magic tlsh rpm cdrkit acl binutils bzip2 cbfstool cpio diffutils e2fsprogs file gettext - gzip libcaca poppler_utils sng sqlite squashfsTools unzip xxd xz colordiff - ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ]; + pythonPath = with python3Packages; [ debian libarchive-c python_magic tlsh rpm ] ++ [ + acl binutils bzip2 cbfstool cdrkit colordiff coreutils cpio diffutils dtc e2fsprogs file + findutils gettext gnutar gzip libarchive libcaca poppler_utils sng sqlite squashfsTools unzip + xxd xz + ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 imagemagick llvm jdk mono openssh pdftk tcpdump ]; doCheck = false; # Calls 'mknod' in squashfs tests, which needs root diff --git a/pkgs/tools/misc/diffoscope/ignore_links.patch b/pkgs/tools/misc/diffoscope/ignore_links.patch index ceea0dc94d4e..b0841ce0bb57 100644 --- a/pkgs/tools/misc/diffoscope/ignore_links.patch +++ b/pkgs/tools/misc/diffoscope/ignore_links.patch @@ -1,19 +1,32 @@ -diff -ru -x '*~' diffoscope-orig/diffoscope/comparators/directory.py diffoscope/diffoscope/comparators/directory.py ---- diffoscope-orig/diffoscope/comparators/directory.py 1970-01-01 01:00:01.000000000 +0100 -+++ diffoscope/diffoscope/comparators/directory.py 2016-12-08 17:37:55.000315157 +0100 -@@ -49,6 +49,7 @@ - FILE_RE = re.compile(r'^\s*File:.*$') - DEVICE_RE = re.compile(r'Device: [0-9a-f]+h/[0-9]+d\s+') - INODE_RE = re.compile(r'Inode: [0-9]+\s+') -+ LINKS_RE = re.compile(r'Links: [0-9]+\s+') - ACCESS_TIME_RE = re.compile(r'^Access: [0-9]{4}-[0-9]{2}-[0-9]{2}.*$') - CHANGE_TIME_RE = re.compile(r'^Change: [0-9]{4}-[0-9]{2}-[0-9]{2}.*$') +From a33e8018092e4a91dbc45e15bbeff760b3418512 Mon Sep 17 00:00:00 2001 +From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> +Date: Wed, 13 Sep 2017 16:53:38 +0300 +Subject: [PATCH] Ignore hard link counts + +--- + diffoscope/comparators/directory.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/diffoscope/comparators/directory.py b/diffoscope/comparators/directory.py +index 3b195bc..9071bb3 100644 +--- a/diffoscope/comparators/directory.py ++++ b/diffoscope/comparators/directory.py +@@ -66,6 +66,7 @@ else: + FILE_RE = re.compile(r'^\s*File:.*$') + DEVICE_RE = re.compile(r'Device: [0-9a-f]+h/[0-9]+d\s+') + INODE_RE = re.compile(r'Inode: [0-9]+\s+') ++ LINKS_RE = re.compile(r'Links: [0-9]+\s+') + ACCESS_TIME_RE = re.compile(r'^Access: [0-9]{4}-[0-9]{2}-[0-9]{2}.*$') + CHANGE_TIME_RE = re.compile(r'^Change: [0-9]{4}-[0-9]{2}-[0-9]{2}.*$') -@@ -57,6 +58,7 @@ - line = Stat.FILE_RE.sub('', line) - line = Stat.DEVICE_RE.sub('', line) - line = Stat.INODE_RE.sub('', line) -+ line = Stat.LINKS_RE.sub('', line) - line = Stat.ACCESS_TIME_RE.sub('', line) - line = Stat.CHANGE_TIME_RE.sub('', line) - return line.encode('utf-8') +@@ -74,6 +75,7 @@ else: + line = Stat.FILE_RE.sub('', line) + line = Stat.DEVICE_RE.sub('', line) + line = Stat.INODE_RE.sub('', line) ++ line = Stat.LINKS_RE.sub('', line) + line = Stat.ACCESS_TIME_RE.sub('', line) + line = Stat.CHANGE_TIME_RE.sub('', line) + return line.encode('utf-8') +-- +2.13.0 + diff --git a/pkgs/tools/misc/diffoscope/locale.patch b/pkgs/tools/misc/diffoscope/locale.patch deleted file mode 100644 index 408d3ba2ce04..000000000000 --- a/pkgs/tools/misc/diffoscope/locale.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ru -x '*~' diffoscope-orig/diffoscope/__init__.py diffoscope/diffoscope/__init__.py ---- diffoscope-orig/diffoscope/__init__.py 1970-01-01 01:00:01.000000000 +0100 -+++ diffoscope/diffoscope/__init__.py 2016-12-08 17:48:51.732122110 +0100 -@@ -81,8 +81,8 @@ - for var in ['LANG', 'LC_NUMERIC', 'LC_TIME', 'LC_COLLATE', 'LC_MONETARY', - 'LC_MESSAGES', 'LC_PAPER', 'LC_NAME', 'LC_ADDRESS', - 'LC_TELEPHONE', 'LC_MEASUREMENT', 'LC_IDENTIFICATION']: -- os.environ[var] = 'C' -- os.environ['LC_CTYPE'] = 'C.UTF-8' -+ os.environ[var] = 'en_US' -+ os.environ['LC_CTYPE'] = 'en_US.UTF-8' - os.environ['TZ'] = 'UTC' - - diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix index 8ea86d1a7a57..dfaefc2b2e22 100644 --- a/pkgs/tools/misc/graylog/plugins.nix +++ b/pkgs/tools/misc/graylog/plugins.nix @@ -25,10 +25,10 @@ in { aggregates = glPlugin rec { name = "graylog-aggregates-${version}"; pluginName = "graylog-plugin-aggregates"; - version = "1.1.1"; + version = "2.0.0"; src = fetchurl { url = "https://github.com/cvtienhoven/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "1wx5i8ls7dgffsy35i91gkrj6p9nh2jbar9pgas190lfb9yk45bx"; + sha256 = "0crgb49msjkvfpksbfhq2hlkc904j184wm1wp6q0x6lzhn07hm8y"; }; meta = { homepage = https://github.com/cvtienhoven/graylog-plugin-aggregates; @@ -48,13 +48,39 @@ in { description = "SSO support for Graylog through trusted HTTP headers set by load balancers or authentication proxies"; }; }; + dnsresolver = glPlugin rec { + name = "graylog-dnsresolver-${version}"; + pluginName = "graylog-plugin-dnsresolver"; + version = "1.1.2"; + src = fetchurl { + url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; + sha256 = "01s7wm6bwcpmdrl35gjp6rrqxixs2s9km2bdgzhv8pn25j5qnw28"; + }; + meta = { + homepage = https://github.com/graylog-labs/graylog-plugin-dnsresolver; + description = "Message filter plugin can be used to do DNS lookups for the source field in Graylog messages"; + }; + }; + filter-messagesize = glPlugin rec { + name = "graylog-filter-messagesize-${version}"; + pluginName = "graylog-plugin-filter-messagesize"; + version = "0.0.2"; + src = fetchurl { + url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; + sha256 = "1vx62yikd6d3lbwsfiyf9j6kx8drvn4xhffwv27fw5jzhfqr61ji"; + }; + meta = { + homepage = https://github.com/graylog-labs/graylog-plugin-filter-messagesize; + description = "Prints out all messages that have an estimated size crossing a configured threshold during processing"; + }; + }; internal-logs = glPlugin rec { name = "graylog-internal-logs-${version}"; pluginName = "graylog-plugin-internal-logs"; - version = "1.0.0"; + version = "2.3.0"; src = fetchurl { url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "1abl7wwr59k9vvr2fmrlrx4ipsjjl8xryqy19fy5irxhpwp93ixl"; + sha256 = "05r4m2gf1hj1b889rmpb6b5a6q2xd0qkl1rpj107yd219j2grzf4"; }; meta = { homepage = https://github.com/graylog-labs/graylog-plugin-internal-logs; @@ -66,11 +92,11 @@ in { pluginName = "graylog-plugin-ipanonymizer"; version = "1.1.2"; src = fetchurl { - url = "https://github.com/Graylog2/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; + url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; sha256 = "0hd66751hp97ddkn29s1cmjmc2h1nrp431bq7d2wq16iyxxlygri"; }; meta = { - homepage = https://github.com/Graylog2/graylog-plugin-ipanonymizer; + homepage = https://github.com/graylog-labs/graylog-plugin-ipanonymizer; description = "A graylog-server plugin that replaces the last octet of IP addresses in messages with xxx"; }; }; @@ -87,6 +113,19 @@ in { description = "Jabber Alarmcallback Plugin for Graylog"; }; }; + metrics = glPlugin rec { + name = "graylog-metrics-${version}"; + pluginName = "graylog-plugin-metrics"; + version = "1.3.0"; + src = fetchurl { + url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; + sha256 = "1v1yzmqp43kxigh3fymdwki7pn21sk2ym3kk4nn4qv4zzkhz59vp"; + }; + meta = { + homepage = https://github.com/graylog-labs/graylog-plugin-metrics; + description = "An output plugin for integrating Graphite, Ganglia and StatsD with Graylog"; + }; + }; mongodb-profiler = glPlugin rec { name = "graylog-mongodb-profiler-${version}"; pluginName = "graylog-plugin-mongodb-profiler"; @@ -113,6 +152,19 @@ in { description = "Graylog NetFlow plugin"; }; }; + pagerduty = glPlugin rec { + name = "graylog-pagerduty-${version}"; + pluginName = "graylog-plugin-pagerduty"; + version = "1.3.0"; + src = fetchurl { + url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; + sha256 = "1g63c6rm5pkz7f0d73wb2lmk4zm430jqnhihbyq112cm4i7ymglh"; + }; + meta = { + homepage = https://github.com/graylog-labs/graylog-plugin-pagerduty; + description = "An alarm callback plugin for integrating PagerDuty into Graylog"; + }; + }; redis = glPlugin rec { name = "graylog-redis-${version}"; pluginName = "graylog-plugin-redis"; @@ -126,16 +178,29 @@ in { description = "Redis plugin for Graylog"; }; }; + slack = glPlugin rec { + name = "graylog-slack-${version}"; + pluginName = "graylog-plugin-slack"; + version = "2.4.0"; + src = fetchurl { + url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; + sha256 = "0v8ilfhs8bnx87pjxg1i3p2vxw61rwpg4k3zhga7slavx70y986p"; + }; + meta = { + homepage = https://github.com/graylog-labs/graylog-plugin-slack; + description = "Can notify Slack or Mattermost channels about triggered alerts in Graylog (Alarm Callback)"; + }; + }; spaceweather = glPlugin rec { name = "graylog-spaceweather-${version}"; pluginName = "graylog-plugin-spaceweather"; version = "1.0"; src = fetchurl { - url = "https://github.com/Graylog2/${pluginName}/releases/download/${version}/spaceweather-input.jar"; + url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/spaceweather-input.jar"; sha256 = "1mwqy3fhyy4zdwyrzvbr565xwf96xs9d3l70l0khmrm848xf8wz4"; }; meta = { - homepage = https://github.com/Graylog2/graylog-plugin-spaceweather; + homepage = https://github.com/graylog-labs/graylog-plugin-spaceweather; description = "Correlate proton density to the response time of your app and the ion temperature to your exception rate."; }; }; @@ -152,16 +217,29 @@ in { description = "Graylog Processing Pipeline functions to enrich log messages with IoC information from threat intelligence databases"; }; }; + twiliosms = glPlugin rec { + name = "graylog-twiliosms-${version}"; + pluginName = "graylog-plugin-twiliosms"; + version = "1.0.0"; + src = fetchurl { + url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; + sha256 = "0kwfv1zfj0fmxh9i6413bcsaxrn1vdwrzb6dphvg3dx27wxn1j1a"; + }; + meta = { + homepage = https://github.com/graylog-labs/graylog-plugin-twiliosms; + description = "An alarm callback plugin for integrating the Twilio SMS API into Graylog"; + }; + }; twitter = glPlugin rec { name = "graylog-twitter-${version}"; pluginName = "graylog-plugin-twitter"; version = "2.0.0"; src = fetchurl { - url = "https://github.com/Graylog2/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; + url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; sha256 = "1pi34swy9nzq35a823zzvqrjhb6wsg302z31vk2y656sw6ljjxyh"; }; meta = { - homepage = https://github.com/Graylog2/graylog-plugin-twitter; + homepage = https://github.com/graylog-labs/graylog-plugin-twitter; description = "Graylog input plugin that reads Twitter messages based on keywords in realtime"; }; }; diff --git a/pkgs/tools/misc/gringo/default.nix b/pkgs/tools/misc/gringo/default.nix index 00879d9505b8..76c60023c063 100644 --- a/pkgs/tools/misc/gringo/default.nix +++ b/pkgs/tools/misc/gringo/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, - bison, re2c, scons + bison, re2c, scons, + libcxx }: let @@ -21,6 +22,23 @@ stdenv.mkDerivation rec { ./gringo-4.5.4-to_string.patch ]; + patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace ./SConstruct \ + --replace \ + "env['CXX'] = 'g++'" \ + "env['CXX'] = '$CXX'" + + substituteInPlace ./SConstruct \ + --replace \ + "env['CPPPATH'] = []" \ + "env['CPPPATH'] = ['${libcxx}/include/c++/v1']" + + substituteInPlace ./SConstruct \ + --replace \ + "env['LIBPATH'] = []" \ + "env['LIBPATH'] = ['${libcxx}/lib']" + ''; + buildPhase = '' scons WITH_PYTHON= --build-dir=release ''; @@ -33,7 +51,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Converts input programs with first-order variables to equivalent ground programs"; homepage = http://potassco.sourceforge.net/; - platforms = platforms.linux; + platforms = platforms.all; maintainers = [ maintainers.hakuch ]; license = licenses.gpl3Plus; }; diff --git a/pkgs/tools/misc/kdecoration-viewer/default.nix b/pkgs/tools/misc/kdecoration-viewer/default.nix index 33ccf28cb0da..62783bb30dff 100644 --- a/pkgs/tools/misc/kdecoration-viewer/default.nix +++ b/pkgs/tools/misc/kdecoration-viewer/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1cc4xxv72a82p1w9r76090xba7g069r41bi4zx32k4gz3vyl1am6"; }; - buildInputs = [ cmake extra-cmake-modules qtquickcontrols kconfigwidgets kdeclarative kdecoration ]; + nativeBuildInputs = [ cmake extra-cmake-modules ]; + buildInputs = [ qtquickcontrols kconfigwidgets kdeclarative kdecoration ]; meta = with stdenv.lib; { description = "Allows to preview a KDecoration plugin"; diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index 503f24946443..b10b7891e5d1 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "lf-unstable-${version}"; - version = "2017-05-15"; + version = "2017-09-06"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; - rev = "9962b378a816c2f792dcbfe9e3f58ae16d5969dd"; # nightly - sha256 = "1ln14ma2iajlp9klj4bhrq0y9955rpw9aggvj7hcj1m5yqa0sdqn"; + rev = "ae4a29e5501f805fadb115658e83df6744a258b2"; # nightly + sha256 = "099ckbnyk08a716fc5qz7yldalb1p9gn2zn8kqp7bp4adi541hid"; }; goPackagePath = "github.com/gokcehan/lf"; diff --git a/pkgs/tools/misc/lf/deps.nix b/pkgs/tools/misc/lf/deps.nix index bb136e98d66d..5b014d18dc1c 100644 --- a/pkgs/tools/misc/lf/deps.nix +++ b/pkgs/tools/misc/lf/deps.nix @@ -4,8 +4,8 @@ fetch = { type = "git"; url = "https://github.com/nsf/termbox-go"; - rev = "7994c181db7761ca3c67a217068cf31826113f5f"; # master - sha256 = "0ssc54wamn3h8z68kv4fdgvk3kjii95psi2kk0slsilmg5v6jzhj"; + rev = "4ed959e0540971545eddb8c75514973d670cf739"; # master + sha256 = "1vx64i1mg660if3wwm81p4b7lzxfb3qbr39i7misdyld3fc486p9"; }; } { diff --git a/pkgs/tools/networking/envoy/default.nix b/pkgs/tools/networking/envoy/default.nix index a4300c724e07..83af542b8ad4 100644 --- a/pkgs/tools/networking/envoy/default.nix +++ b/pkgs/tools/networking/envoy/default.nix @@ -233,7 +233,7 @@ stdenv.mkDerivation rec { patches = [ ./nixos.patch ]; - hardeningDisable = "all"; + hardeningDisable = [ "all" ]; dontPatchELF = true; dontStrip = true; diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index ef2bc0c4828d..66057e5c76e7 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = pname + "-" + version; pname = "i2pd"; - version = "2.14.0"; + version = "2.15.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "1nlnzvb4n351zwg4vd15qjmm8xvbmn2350vfnd249q06va62fqjk"; + sha256 = "02nyk76q2ag0495ph62i0jij27nxpy6qvryjp25wah8f69k7bgfs"; }; buildInputs = [ boost zlib openssl ]; diff --git a/pkgs/tools/networking/iouyap/default.nix b/pkgs/tools/networking/iouyap/default.nix new file mode 100644 index 000000000000..c37b409cdfb5 --- /dev/null +++ b/pkgs/tools/networking/iouyap/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, bison, flex }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "iouyap"; + version = "0.97"; + + src = fetchFromGitHub { + owner = "GNS3"; + repo = pname; + rev = "v${version}"; + sha256 = "028s9kx67b9x7gwzg0fhc6546diw4n0x4kk1xhl3v7hbsz3wdh6s"; + }; + + buildInputs = [ bison flex ]; + + installPhase = '' + install -D -m555 iouyap $out/bin/iouyap; + ''; + + meta = with stdenv.lib; { + description = "Bridge IOU to UDP, TAP and Ethernet"; + inherit (src.meta) homepage; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/pkgs/tools/networking/netcat-openbsd/default.nix b/pkgs/tools/networking/netcat-openbsd/default.nix index 2ac9c5cf6e97..7c22891ab7a3 100644 --- a/pkgs/tools/networking/netcat-openbsd/default.nix +++ b/pkgs/tools/networking/netcat-openbsd/default.nix @@ -1,17 +1,18 @@ {stdenv, fetchurl, pkgconfig, libbsd}: stdenv.mkDerivation rec { - name = "netcat-openbsd-1.105"; - version = "1.105"; + version = "1.130"; + deb-version = "${version}-3"; + name = "netcat-openbsd-${version}"; srcs = [ (fetchurl { - url = "mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_1.105.orig.tar.gz"; - sha256 = "07i1vcz8ycnfwsvz356rqmim8akfh8yhjzmhc5mqf5hmdkk3yra0"; + url = "mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${version}.orig.tar.gz"; + sha256 = "0nqy14yvclgzs98gv0fwp6jlfpfy2kk367zka648jiqbbl30awpx"; }) (fetchurl { - url = "mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_1.105-7.debian.tar.gz"; - sha256 = "0qxkhbwcifrps34s5mzzg79cmkvz3f96gphd3pl978pygwr5krzf"; + url = "mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${deb-version}.debian.tar.xz"; + sha256 = "0f9409vjm6v8a7m1zf5sr7wj6v5v8414i5vvxx1r45c11h69hh9a"; }) ]; @@ -26,10 +27,11 @@ stdenv.mkDerivation rec { install -Dm0644 nc.1 $out/share/man/man1/nc.1 ''; - meta = { - homepage = http://packages.debian.org/netcat-openbsd; + meta = with stdenv.lib; { + homepage = https://packages.debian.org/netcat-openbsd; description = "TCP/IP swiss army knife, OpenBSD variant"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + maintainers = with maintainers; [ willibutz ]; }; } diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index f358f47bcd64..8343f23a1a03 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -16,8 +16,8 @@ let gssapiSrc = fetchpatch { name = "openssh-gssapi.patch"; url = "https://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian" - + "/patches/gssapi.patch?id=a18d56bd84f04292ec9178b4b17ef6d56a0c7aef"; - sha256 = "1sb929lfc3s45km2vpylmlbb6mpqcbr74xl6gx2s4cgnsrfd9kp3"; + + "/patches/gssapi.patch?id=db2122d97eb1ecdd8d99b7bf79b0dd2b5addfd92"; + sha256 = "1rw10pmvjw55521ys59x1kabvbvmla506znakwwjijggdsakvsjm"; }; in diff --git a/pkgs/tools/networking/pirate-get/default.nix b/pkgs/tools/networking/pirate-get/default.nix index bd7e87e2c10a..6e50b11568e6 100644 --- a/pkgs/tools/networking/pirate-get/default.nix +++ b/pkgs/tools/networking/pirate-get/default.nix @@ -5,13 +5,13 @@ with python3Packages; buildPythonApplication rec { name = "${pname}-${version}"; pname = "pirate-get"; - version = "0.2.10"; + version = "0.2.12"; doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "04gsilbyq2plldzi495dcf19h5xfldfyn6zdczj2fdki1m29jyr0"; + sha256 = "1q6hvavj0gswgw3x756h18nmmpnxlgg08qvxphpbzlwd43xrnza3"; }; propagatedBuildInputs = [ colorama veryprettytable beautifulsoup4 ]; diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix index 5b96e513fd49..ae80b5ec0b50 100644 --- a/pkgs/tools/security/afl/default.nix +++ b/pkgs/tools/security/afl/default.nix @@ -11,11 +11,11 @@ in stdenv.mkDerivation rec { name = "afl-${version}"; - version = "2.48b"; + version = "2.51b"; src = fetchurl { url = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz"; - sha256 = "00x7p8lqrpx60hwynl5dqwn6isr8yhl263avcwfw3dqc7v9lwhrz"; + sha256 = "15xvjma2lpawg1wasnja9wmgrpss5mnm3f5xmh5yli5q6m5vjdfl"; }; # Note: libcgroup isn't needed for building, just for the afl-cgroup diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index f452a98a4db6..71c5e352b949 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "highlight-${version}"; - version = "3.35"; + version = "3.39"; src = fetchurl { url = "http://www.andre-simon.de/zip/${name}.tar.bz2"; - sha256 = "8a14b49f5e0c07daa9f40b4ce674baa00bb20061079473a5d386656f6d236d05"; + sha256 = "0z8gs69sqlyis4kvl8wwdgzywi199k73kkvn1mf9pf60npvcxwj4"; }; nativeBuildInputs = [ pkgconfig ] ++ optional stdenv.isDarwin gcc ; diff --git a/pkgs/tools/text/html2text/default.nix b/pkgs/tools/text/html2text/default.nix index 586b34621a92..194484755481 100644 --- a/pkgs/tools/text/html2text/default.nix +++ b/pkgs/tools/text/html2text/default.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation { }; preConfigure = '' - sed -i s,/bin/echo,echo, configure + substituteInPlace configure \ + --replace /bin/echo echo \ + --replace CXX=unknown ':' ''; # the --prefix has no effect |