diff options
Diffstat (limited to 'pkgs/tools')
71 files changed, 581 insertions, 909 deletions
diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/pkgs/tools/admin/azure-cli/default.nix diff --git a/pkgs/tools/admin/mycli/default.nix b/pkgs/tools/admin/mycli/default.nix index bd0f051bd845..1a85bf21b224 100644 --- a/pkgs/tools/admin/mycli/default.nix +++ b/pkgs/tools/admin/mycli/default.nix @@ -7,7 +7,6 @@ with python.pkgs; buildPythonApplication rec { pname = "mycli"; version = "1.6.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index eaae8f40bfab..ef43ba2ba517 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -1,5 +1,5 @@ { - stdenv, python2Packages, openssl, + stdenv, pythonPackages, openssl, # Many Salt modules require various Python modules to be installed, # passing them in this array enables Salt to find them. @@ -8,7 +8,7 @@ let # Use tornado-4.x until https://github.com/saltstack/salt/issues/45790 is resolved - tornado = python2Packages.tornado.overridePythonAttrs (oldAttrs: rec { + tornado = pythonPackages.tornado.overridePythonAttrs (oldAttrs: rec { version = "4.5.3"; name = "${oldAttrs.pname}-${version}"; src = oldAttrs.src.override { @@ -17,17 +17,16 @@ let }; }); in -python2Packages.buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { pname = "salt"; version = "2018.3.0"; - src = python2Packages.fetchPypi { + src = pythonPackages.fetchPypi { inherit pname version; sha256 = "0cbbnmaynnpfknmppzlz04mqw4d3d2ay1dqrli11b5pnzli5v950"; }; - propagatedBuildInputs = with python2Packages; [ - futures + propagatedBuildInputs = with pythonPackages; [ jinja2 markupsafe msgpack-python @@ -36,6 +35,8 @@ python2Packages.buildPythonApplication rec { pyzmq requests tornado + ] ++ stdenv.lib.optional (!pythonPackages.isPy3k) [ + futures ] ++ extraInputs; patches = [ ./fix-libcrypto-loading.patch ]; diff --git a/pkgs/tools/admin/ssl-cert-check/default.nix b/pkgs/tools/admin/ssl-cert-check/default.nix new file mode 100644 index 000000000000..8d30307af2d3 --- /dev/null +++ b/pkgs/tools/admin/ssl-cert-check/default.nix @@ -0,0 +1,59 @@ +{ stdenv +, lib +, fetchFromGitHub +, makeWrapper +, openssl +, which +, gnugrep +, gnused +, gawk +, mktemp +, coreutils +, findutils +}: + +stdenv.mkDerivation rec { + pname = "ssl-cert-check"; + name = "${pname}-${version}"; + version = "3.31"; + + src = fetchFromGitHub { + owner = "Matty9191"; + repo = pname; + rev = "698c1996d05152cfaf2a1a3df4cc70482411fac8"; + sha256 = "0jvi9phs0ngfwrj9zixb03v9byavbwxx8xkp0h5m98qppn1kvl3n"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ + openssl + which + gnugrep + mktemp + gawk + gnused + coreutils + findutils + ]; + + prePatch = '' + substituteInPlace $pname --replace PATH= NOT_PATH= + ''; + + installPhase = '' + mkdir -p $out/bin + cp $pname $out/bin/$pname + wrapProgram $out/bin/$pname \ + --set PATH "${stdenv.lib.makeBinPath buildInputs}" + ''; + + meta = with stdenv.lib; { + description = "a Bourne shell script that can be used to report on expiring SSL certificates"; + homepage = https://github.com/Matty9191/ssl-cert-check; + license = licenses.gpl2; + maintainers = [ maintainers.ryantm ]; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/tools/archivers/innoextract/default.nix b/pkgs/tools/archivers/innoextract/default.nix index 546e9a7aad98..14b128d15c7a 100644 --- a/pkgs/tools/archivers/innoextract/default.nix +++ b/pkgs/tools/archivers/innoextract/default.nix @@ -3,11 +3,11 @@ , withGog ? false, unar ? null }: stdenv.mkDerivation rec { - name = "innoextract-1.6"; + name = "innoextract-1.7"; src = fetchurl { url = "http://constexpr.org/innoextract/files/${name}.tar.gz"; - sha256 = "0gh3q643l8qlwla030cmf3qdcdr85ixjygkb7j4dbm7zbwa3yik6"; + sha256 = "197hs9aj1ska6czrsq4caazsw9v0xbaa0lazbh380fmwy8rbgvy1"; }; buildInputs = [ python lzma boost ]; diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 6de4d3d859ed..0d11ba394e6b 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -2,18 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "borgbackup"; - version = "1.1.5"; + version = "1.1.6"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "4356e6c712871f389e3cb1d6382e341ea635f9e5c65de1cd8fcd103d0fb66d3d"; + sha256 = "a1d2e474c85d3ad3d59b3f8209b5549653c88912082ea0159d27a2e80c910930"; }; - postPatch = '' - # loosen constraint on msgpack version, only 0.5.0 had problems - sed -i "s/'msgpack-python.*'/'msgpack-python'/g" setup.py - ''; - nativeBuildInputs = with python3Packages; [ # For building documentation: sphinx guzzle_sphinx_theme diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index d55783f7f2ce..d4b6b9a72eba 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -2,16 +2,16 @@ python2Packages.buildPythonApplication rec { name = "duplicity-${version}"; - version = "0.7.12"; + version = "0.7.17"; src = fetchurl { - url = "http://code.launchpad.net/duplicity/0.7-series/${version}/+download/${name}.tar.gz"; - sha256 = "1rhgrz2lm9vbfdp2raykrih1c6n2lw5jd572z4dsz488m52avjqi"; + url = "http://code.launchpad.net/duplicity/${stdenv.lib.versions.majorMinor version}-series/${version}/+download/${name}.tar.gz"; + sha256 = "0jmh3h09680xyf33hzxxxl74bwz66zqhzvjlj7j89r9rz3qwa91p"; }; buildInputs = [ librsync makeWrapper python2Packages.wrapPython ]; propagatedBuildInputs = with python2Packages; [ - boto cffi cryptography ecdsa enum idna pygobject3 + boto cffi cryptography ecdsa enum idna pygobject3 fasteners ipaddress lockfile paramiko pyasn1 pycrypto six ]; checkInputs = with python2Packages; [ lockfile mock pexpect ]; diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index 04c83fa03fcf..7e29ee2b856a 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "lz4-${version}"; - version = "131"; + version = "1.8.2"; src = fetchFromGitHub { - sha256 = "1bhvcq8fxxsqnpg5qa6k3nsyhq0nl0iarh08sqzclww27hlpyay2"; - rev = "r${version}"; + sha256 = "0xbjbjrvgzypk8dnldakir06gb8m946d064lxx0qc4ky6m8n9hn2"; + rev = "v${version}"; repo = "lz4"; - owner = "Cyan4973"; + owner = "lz4"; }; outputs = [ "out" "dev" ]; @@ -22,8 +22,6 @@ stdenv.mkDerivation rec { doCheck = false; # tests take a very long time checkTarget = "test"; - patches = [ ./install-on-freebsd.patch ] ; - postInstall = "rm $out/lib/*.a"; meta = with stdenv.lib; { diff --git a/pkgs/tools/compression/lz4/install-on-freebsd.patch b/pkgs/tools/compression/lz4/install-on-freebsd.patch deleted file mode 100644 index 12a2bf72f4ed..000000000000 --- a/pkgs/tools/compression/lz4/install-on-freebsd.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff --git a/Makefile b/Makefile -index d1b0d0c..f8d6a2d 100644 ---- a/Makefile -+++ b/Makefile -@@ -80,8 +80,6 @@ clean: - - - #------------------------------------------------------------------------ --#make install is validated only for Linux, OSX, kFreeBSD and Hurd targets --ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU)) - - install: - @cd $(LZ4DIR); $(MAKE) -e install -@@ -129,4 +127,3 @@ examples: - prg-travis: - @cd $(PRGDIR); $(MAKE) -e test-travis - --endif -diff --git a/lib/Makefile b/lib/Makefile -index 02ddd3b..26ed18f 100644 ---- a/lib/Makefile -+++ b/lib/Makefile -@@ -80,8 +80,6 @@ clean: - - - #------------------------------------------------------------------------ --#make install is validated only for Linux, OSX, kFreeBSD and Hurd targets --ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU)) - - liblz4.pc: liblz4.pc.in Makefile - @echo creating pkgconfig -@@ -114,4 +112,3 @@ uninstall: - @[ -f $(DESTDIR)$(INCLUDEDIR)/lz4frame.h ] && rm -f $(DESTDIR)$(INCLUDEDIR)/lz4frame.h - @echo lz4 libraries successfully uninstalled - --endif -diff --git a/programs/Makefile b/programs/Makefile -index f422902..6943363 100644 ---- a/programs/Makefile -+++ b/programs/Makefile -@@ -113,8 +113,6 @@ clean: - - - #------------------------------------------------------------------------ --#make install is validated only for Linux, OSX, kFreeBSD and Hurd targets --ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU)) - - install: lz4 lz4c - @echo Installing binaries -@@ -307,4 +305,3 @@ test-mem: lz4 datagen fuzzer frametest fullbench - test-mem32: lz4c32 datagen - # unfortunately, valgrind doesn't seem to work with non-native binary. If someone knows how to do a valgrind-test on a 32-bits exe with a 64-bits system... - --endif diff --git a/pkgs/tools/filesystems/s3backer/default.nix b/pkgs/tools/filesystems/s3backer/default.nix index 1007d04036e2..16ecb1c9d153 100644 --- a/pkgs/tools/filesystems/s3backer/default.nix +++ b/pkgs/tools/filesystems/s3backer/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { name = "s3backer-${version}"; - version = "1.4.3"; + version = "1.5.0"; src = fetchFromGitHub { - sha256 = "0fhkha5kap8dji3iy48cbszhq83b2anssscgjj9d5dsl5dj57zak"; + sha256 = "0pmszcnnlqyysljfyysd6jsvdz7fqgbk8z4vnkmda5dwwcm8b8fs"; rev = version; repo = "s3backer"; owner = "archiecobbs"; diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/pkgs/tools/graphics/logstalgia/default.nix index be4cf0f493b6..93a6652eafbc 100644 --- a/pkgs/tools/graphics/logstalgia/default.nix +++ b/pkgs/tools/graphics/logstalgia/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "logstalgia-${version}"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { url = "https://github.com/acaudwell/Logstalgia/releases/download/${name}/${name}.tar.gz"; - sha256 = "0nvnk8q9m2ignzwxak0vch88blywbx4znk70xf9fg38xa4rf94yn"; + sha256 = "1agwjlwzp1c86hqb1p7rmzqzhd3wpnyh8whsfq4sbx01wj0l0gzd"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix index cd0cff0f3899..0cea8d4011c7 100644 --- a/pkgs/tools/graphics/maim/default.nix +++ b/pkgs/tools/graphics/maim/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "maim-${version}"; - version = "5.5.1"; + version = "5.5.2"; src = fetchFromGitHub { owner = "naelstrof"; repo = "maim"; rev = "v${version}"; - sha256 = "106qg85q0aiw4w08vjg9j60brrbln11b8vdycjqkv8fq00pq308i"; + sha256 = "14mfxdm39kc5jk8wysrzx05ag2g4sk9l24i8m5pzqn8j611150v3"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/tools/graphics/nifskope/default.nix b/pkgs/tools/graphics/nifskope/default.nix index 19aa7f00f14a..c5651d0418e4 100644 --- a/pkgs/tools/graphics/nifskope/default.nix +++ b/pkgs/tools/graphics/nifskope/default.nix @@ -1,57 +1,68 @@ -{ stdenv, fetchurl, qt4, qmake4Hook }: +{ stdenv, fetchFromGitHub, qmake, qtbase, qttools, substituteAll, libGLU, makeWrapper }: stdenv.mkDerivation rec { - name = "nifskope-1.1.3"; + name = "nifskope-${version}"; + version = "2.0.dev7"; - src = fetchurl { - url = "https://github.com/niftools/nifskope/releases/download/${name}/${name}.tar.bz2"; - sha256 = "0fcvrcjyvivww10sjhxamcip797b9ykbf5p3rm2k24xhkwdaqp72"; + src = fetchFromGitHub { + owner = "niftools"; + repo = "nifskope"; + rev = "47b788d26ae0fa12e60e8e7a4f0fa945a510c7b2"; # `v${version}` doesn't work with submodules + sha256 = "1wqpn53rkq28ws3apqghkzyrib4wis91x171ns64g8kp4q6mfczi"; + fetchSubmodules = true; }; - patches = [ ./gcc-6.patch ]; + patches = [ + ./external-lib-paths.patch + (substituteAll { + src = ./qttools-bins.patch; + qttools = "${qttools.dev}/bin"; + }) + ]; - buildInputs = [ qt4 ]; + buildInputs = [ qtbase qttools libGLU.dev makeWrapper ]; + nativeBuildInputs = [ qmake ]; - nativeBuildInputs = [ qmake4Hook ]; + preConfigure = '' + shopt -s globstar + for i in **/*.cpp; do + substituteInPlace $i --replace /usr/share/nifskope $out/share/nifskope + done + ''; - preConfigure = - '' - for i in *.cpp gl/*.cpp widgets/*.cpp; do - substituteInPlace $i --replace /usr/share/nifskope $out/share/nifskope - done - ''; + enableParallelBuilding = true; - qmakeFlags = [ "-after TARGET=nifskope" ]; + # Inspired by install/linux-install/nifskope.spec.in. + installPhase = let + qtVersion = "5.${stdenv.lib.versions.minor qtbase.version}"; + in '' + runHook preInstall - enableParallelBuilding = true; + d=$out/share/nifskope + mkdir -p $out/bin $out/share/applications $out/share/pixmaps $d/{shaders,lang} + cp release/NifSkope $out/bin/ + cp ./res/nifskope.png $out/share/pixmaps/ + cp release/{nif.xml,kfm.xml,style.qss} $d/ + cp res/shaders/*.frag res/shaders/*.prog res/shaders/*.vert $d/shaders/ + cp ./res/lang/*.ts ./res/lang/*.tm $d/lang/ + cp ./install/linux-install/nifskope.desktop $out/share/applications + + substituteInPlace $out/share/applications/nifskope.desktop \ + --replace 'Exec=nifskope' "Exec=$out/bin/NifSkope" \ + --replace 'Icon=nifskope' "Icon=$out/share/pixmaps/nifskope.png" + + find $out/share -type f -exec chmod -x {} \; + + wrapProgram $out/bin/NifSkope --prefix QT_PLUGIN_PATH : "${qtbase}/lib/qt-${qtVersion}/plugins" + + runHook postInstall + ''; - hardeningDisable = [ "format" ]; - - # Inspired by linux-install/nifskope.spec.in. - installPhase = - '' - d=$out/share/nifskope - mkdir -p $out/bin $out/share/applications $out/share/pixmaps $d/{shaders,doc,lang} - cp release/nifskope $out/bin/ - cp nifskope.png $out/share/pixmaps/ - cp nif.xml kfm.xml style.qss $d/ - cp shaders/*.frag shaders/*.prog shaders/*.vert $d/shaders/ - cp doc/*.html doc/docsys.css doc/favicon.ico $d/doc/ - cp lang/*.ts lang/*.tm $d/lang/ - - substituteInPlace nifskope.desktop \ - --replace 'Exec=nifskope' "Exec=$out/bin/nifskope" \ - --replace 'Icon=nifskope' "Icon=$out/share/pixmaps/nifskope.png" - cp nifskope.desktop $out/share/applications/ - - find $out/share -type f -exec chmod -x {} \; - ''; # */ - - meta = { - homepage = https://github.com/niftools/nifskope/; + meta = with stdenv.lib; { + homepage = http://niftools.sourceforge.net/wiki/NifSkope; description = "A tool for analyzing and editing NetImmerse/Gamebryo '*.nif' files"; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.bsd3; + maintainers = with maintainers; [ eelco ma27 ]; + platforms = platforms.linux; + license = licenses.bsd3; }; } diff --git a/pkgs/tools/graphics/nifskope/external-lib-paths.patch b/pkgs/tools/graphics/nifskope/external-lib-paths.patch new file mode 100644 index 000000000000..a7f329caf74f --- /dev/null +++ b/pkgs/tools/graphics/nifskope/external-lib-paths.patch @@ -0,0 +1,33 @@ +diff --git a/NifSkope.pro b/NifSkope.pro +index 1c0bc5a..cc29fc5 100644 +--- a/NifSkope.pro ++++ b/NifSkope.pro +@@ -330,14 +330,14 @@ nvtristrip { + } + + qhull { +- !*msvc*:QMAKE_CFLAGS += -isystem ../nifskope/lib/qhull/src +- !*msvc*:QMAKE_CXXFLAGS += -isystem ../nifskope/lib/qhull/src ++ !*msvc*:QMAKE_CFLAGS += -isystem ./lib/qhull/src ++ !*msvc*:QMAKE_CXXFLAGS += -isystem ./lib/qhull/src + else:INCLUDEPATH += lib/qhull/src + HEADERS += $$files($$PWD/lib/qhull/src/libqhull/*.h, false) + } + + gli { +- !*msvc*:QMAKE_CXXFLAGS += -isystem ../nifskope/lib/gli/gli -isystem ../nifskope/lib/gli/external ++ !*msvc*:QMAKE_CXXFLAGS += -isystem ./lib/gli/gli -isystem ./lib/gli/external + else:INCLUDEPATH += lib/gli/gli lib/gli/external + HEADERS += $$files($$PWD/lib/gli/gli/*.hpp, true) + HEADERS += $$files($$PWD/lib/gli/gli/*.inl, true) +@@ -346,8 +346,8 @@ gli { + } + + zlib { +- !*msvc*:QMAKE_CFLAGS += -isystem ../nifskope/lib/zlib +- !*msvc*:QMAKE_CXXFLAGS += -isystem ../nifskope/lib/zlib ++ !*msvc*:QMAKE_CFLAGS += -isystem ./lib/zlib ++ !*msvc*:QMAKE_CXXFLAGS += -isystem ./lib/zlib + else:INCLUDEPATH += lib/zlib + HEADERS += $$files($$PWD/lib/zlib/*.h, false) + SOURCES += $$files($$PWD/lib/zlib/*.c, false) diff --git a/pkgs/tools/graphics/nifskope/gcc-6.patch b/pkgs/tools/graphics/nifskope/gcc-6.patch deleted file mode 100644 index 2bb8af9cfe4c..000000000000 --- a/pkgs/tools/graphics/nifskope/gcc-6.patch +++ /dev/null @@ -1,123 +0,0 @@ -Based on https://github.com/niftools/nifskope/commit/7261b0a119a549b11006d8e41ba990d706171f1c - -diff -ru -x '*~' nifskope-1.1.3-orig/gl/dds/ColorBlock.cpp nifskope-1.1.3/gl/dds/ColorBlock.cpp ---- nifskope-1.1.3-orig/gl/dds/ColorBlock.cpp 2012-11-17 23:40:31.000000000 +0100 -+++ nifskope-1.1.3/gl/dds/ColorBlock.cpp 2017-09-10 10:50:36.766909836 +0200 -@@ -78,8 +78,8 @@ - - void ColorBlock::init(const Image * img, uint x, uint y) - { -- const uint bw = min(img->width() - x, 4U); -- const uint bh = min(img->height() - y, 4U); -+ const uint bw = std::min(img->width() - x, 4U); -+ const uint bh = std::min(img->height() - y, 4U); - - static int remainder[] = { - 0, 0, 0, 0, -diff -ru -x '*~' nifskope-1.1.3-orig/gl/dds/Common.h nifskope-1.1.3/gl/dds/Common.h ---- nifskope-1.1.3-orig/gl/dds/Common.h 2012-11-17 23:40:31.000000000 +0100 -+++ nifskope-1.1.3/gl/dds/Common.h 2017-09-10 10:48:08.462099032 +0200 -@@ -33,14 +33,10 @@ - #ifndef _DDS_COMMON_H - #define _DDS_COMMON_H - --#ifndef min --#define min(a,b) ((a) <= (b) ? (a) : (b)) --#endif --#ifndef max --#define max(a,b) ((a) >= (b) ? (a) : (b)) --#endif -+#include <algorithm> -+ - #ifndef clamp --#define clamp(x,a,b) min(max((x), (a)), (b)) -+#define clamp(x,a,b) std::min( std::max( (x), (a) ), (b) ) - #endif - - template<typename T> -diff -ru -x '*~' nifskope-1.1.3-orig/gl/dds/DirectDrawSurface.cpp nifskope-1.1.3/gl/dds/DirectDrawSurface.cpp ---- nifskope-1.1.3-orig/gl/dds/DirectDrawSurface.cpp 2012-11-17 23:40:31.000000000 +0100 -+++ nifskope-1.1.3/gl/dds/DirectDrawSurface.cpp 2017-09-10 10:48:45.912056969 +0200 -@@ -63,6 +63,7 @@ - #include "DirectDrawSurface.h" - #include "BlockDXT.h" - #include "PixelFormat.h" -+#include "Common.h" - - #include <stdio.h> // printf - #include <math.h> // sqrt -@@ -685,8 +686,8 @@ - // Compute width and height. - for (uint m = 0; m < mipmap; m++) - { -- w = max(1U, w / 2); -- h = max(1U, h / 2); -+ w = std::max(1U, w / 2); -+ h = std::max(1U, h / 2); - } - - img->allocate(w, h); -@@ -787,9 +788,9 @@ - readBlock(&block); - - // Write color block. -- for (uint y = 0; y < min(4U, h-4*by); y++) -+ for (uint y = 0; y < std::min(4U, h-4*by); y++) - { -- for (uint x = 0; x < min(4U, w-4*bx); x++) -+ for (uint x = 0; x < std::min(4U, w-4*bx); x++) - { - img->pixel(4*bx+x, 4*by+y) = block.color(x, y); - } -@@ -909,9 +910,9 @@ - - for (uint m = 0; m < mipmap; m++) - { -- w = max(1U, w / 2); -- h = max(1U, h / 2); -- d = max(1U, d / 2); -+ w = std::max(1U, w / 2); -+ h = std::max(1U, h / 2); -+ d = std::max(1U, d / 2); - } - - if (header.pf.flags & DDPF_FOURCC) -diff -ru -x '*~' nifskope-1.1.3-orig/gl/gltexloaders.cpp nifskope-1.1.3/gl/gltexloaders.cpp ---- nifskope-1.1.3-orig/gl/gltexloaders.cpp 2012-11-17 23:40:31.000000000 +0100 -+++ nifskope-1.1.3/gl/gltexloaders.cpp 2017-09-10 10:51:23.586839810 +0200 -@@ -1736,8 +1736,8 @@ - - // generate next offset, resize - mipmapOffset += mipmapWidth * mipmapHeight * 4; -- mipmapWidth = max( 1, mipmapWidth / 2 ); -- mipmapHeight = max( 1, mipmapHeight / 2 ); -+ mipmapWidth = std::max( 1, mipmapWidth / 2 ); -+ mipmapHeight = std::max( 1, mipmapHeight / 2 ); - } - - // set total pixel size -@@ -1932,11 +1932,11 @@ - { - if ( ddsHeader.ddsPixelFormat.dwFourCC == FOURCC_DXT1 ) - { -- mipmapOffset += max( 8, ( mipmapWidth * mipmapHeight / 2 ) ); -+ mipmapOffset += std::max( 8, ( mipmapWidth * mipmapHeight / 2 ) ); - } - else if ( ddsHeader.ddsPixelFormat.dwFourCC == FOURCC_DXT5 ) - { -- mipmapOffset += max( 16, ( mipmapWidth * mipmapHeight ) ); -+ mipmapOffset += std::max( 16, ( mipmapWidth * mipmapHeight ) ); - } - } - else if ( ddsHeader.ddsPixelFormat.dwBPP == 24 ) -@@ -1947,8 +1947,8 @@ - { - mipmapOffset += ( mipmapWidth * mipmapHeight * 4 ); - } -- mipmapWidth = max( 1, mipmapWidth / 2 ); -- mipmapHeight = max( 1, mipmapHeight / 2 ); -+ mipmapWidth = std::max( 1, mipmapWidth / 2 ); -+ mipmapHeight = std::max( 1, mipmapHeight / 2 ); - } - - nif->set<quint32>( iData, "Num Pixels", mipmapOffset ); diff --git a/pkgs/tools/graphics/nifskope/qttools-bins.patch b/pkgs/tools/graphics/nifskope/qttools-bins.patch new file mode 100644 index 000000000000..5d85f9ef4fdd --- /dev/null +++ b/pkgs/tools/graphics/nifskope/qttools-bins.patch @@ -0,0 +1,22 @@ +diff --git a/NifSkope_targets.pri b/NifSkope_targets.pri +index 05324c2..d8389b1 100644 +--- a/NifSkope_targets.pri ++++ b/NifSkope_targets.pri +@@ -11,7 +11,7 @@ else:EXE = "" + ## lupdate / lrelease + ############################### + +-QMAKE_LUPDATE = $$[QT_INSTALL_BINS]/lupdate$${EXE} ++QMAKE_LUPDATE = @qttools@/lupdate$${EXE} + exists($$QMAKE_LUPDATE) { + # Make target for Updating .ts + updatets.target = updatets +@@ -23,7 +23,7 @@ exists($$QMAKE_LUPDATE) { + message("lupdate could not be found, ignoring make target") + } + +-QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease$${EXE} ++QMAKE_LRELEASE = @qttools@/lrelease$${EXE} + exists($$QMAKE_LRELEASE) { + # Build Step for Releasing .ts->.qm + updateqm.input = TRANSLATIONS diff --git a/pkgs/tools/graphics/qrencode/default.nix b/pkgs/tools/graphics/qrencode/default.nix index 5620f5058a5f..8e186399d638 100644 --- a/pkgs/tools/graphics/qrencode/default.nix +++ b/pkgs/tools/graphics/qrencode/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpng, pkgconfig }: stdenv.mkDerivation rec { - name = "qrencode-4.0.1"; + name = "qrencode-4.0.2"; src = fetchurl { url = "${meta.homepage}/${name}.tar.bz2"; - sha256 = "0j7cqhjc0l6i99lzph51gakmcmfs74x483plna93r4ngz328knph"; + sha256 = "1d2q5d3v8g3hsi3h5jq4n177bjhf3kawms09immw7p187f6jgjy9"; }; buildInputs = [ libpng ]; diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index d1dfe7afbf84..da63cb58a55f 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "vips-${version}"; - version = "8.6.3"; + version = "8.6.4"; src = fetchurl { url = "https://github.com/jcupitt/libvips/releases/download/v${version}/${name}.tar.gz"; - sha256 = "14h9w61gaimldmqaym0zhf9fkxjj1pkd5lhglhs6pxphynwxnnpq"; + sha256 = "1x4ai997yfl4155r4k3m5fa5hj3030c4abi5g49kfarbr60a0ca6"; }; buildInputs = diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix index 1bdbef2fde6c..b8510b102cbb 100644 --- a/pkgs/tools/inputmethods/uim/default.nix +++ b/pkgs/tools/inputmethods/uim/default.nix @@ -38,15 +38,15 @@ assert withFFI -> libffi != null; assert withMisc -> libeb != null; stdenv.mkDerivation rec { - version = "1.8.6-20180501-git"; + version = "1.8.8"; name = "uim-${version}"; src = fetchFromGitHub { owner = "uim"; repo = "uim"; - rev = "c79432cb5aba3a67fb7e7557f4817c749865cc8a"; + rev = "2c0958c9c505a87e70e344c2192e2e5123c71ea5"; fetchSubmodules = true; - sha256 = "12rznfwq1mh750i18bl1743c51akyyvy6la5rgrxmrnp0mha9ba5"; + sha256 = "1hkjxi5r49gcna37m3jvykny5hz9ram4y8a3q7lw4qzr52mz9pdp"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/bepasty/default.nix b/pkgs/tools/misc/bepasty/default.nix index f69f654cda3d..ae88b7e99c65 100644 --- a/pkgs/tools/misc/bepasty/default.nix +++ b/pkgs/tools/misc/bepasty/default.nix @@ -10,7 +10,6 @@ with python.pkgs; buildPythonPackage rec { pname = "bepasty"; version = "0.4.0"; - name = "${pname}-${version}"; propagatedBuildInputs = [ flask @@ -39,4 +38,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.makefu ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/misc/bibutils/default.nix b/pkgs/tools/misc/bibutils/default.nix index 90a2211235d7..d86908559742 100644 --- a/pkgs/tools/misc/bibutils/default.nix +++ b/pkgs/tools/misc/bibutils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bibutils-${version}"; - version = "6.3"; + version = "6.5"; src = fetchurl { url = "mirror://sourceforge/bibutils/bibutils_${version}_src.tgz"; - sha256 = "10r5v5xbhsxdh6vq6g2xp6lgmpjdzba83h4m4clfhrzqis8clwqy"; + sha256 = "0bc5b9nyxbcc1y4vrhghj9y9221i34qq384zslfyb0ihkb6kq521"; }; configureFlags = [ "--dynamic" "--install-dir" "$(out)/bin" "--install-lib" "$(out)/lib" ]; diff --git a/pkgs/tools/misc/blink1-tool/default.nix b/pkgs/tools/misc/blink1-tool/default.nix index e87987aa0835..4248dd6bd93c 100644 --- a/pkgs/tools/misc/blink1-tool/default.nix +++ b/pkgs/tools/misc/blink1-tool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "blink1-${version}"; - version = "1.98"; + version = "1.98a"; src = fetchurl { url = "https://github.com/todbot/blink1/archive/v${version}.tar.gz"; - sha256 = "05hbnp20cdvyyqf6jr01waz1ycis20qzsd8hn27snmn6qd48igrb"; + sha256 = "1waci6hccv5i50v5d3z7lx4h224fbkj66ywfynnsgn46w0jm6imv"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 1987c6aed0ad..e2e2f66f558b 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -8,12 +8,12 @@ python3Packages.buildPythonApplication rec { name = "diffoscope-${version}"; - version = "91"; + version = "95"; src = fetchgit { url = "https://anonscm.debian.org/git/reproducible/diffoscope.git"; rev = "refs/tags/${version}"; - sha256 = "16xqy71115cj4kws6bkcjm98nlaff3a32fz82rn2l1xk9w9n3dnz"; + sha256 = "1x06krs3lp41x5w2l8ck8g47il3qzlclyphw9a2wv71sqkb5zxzi"; }; patches = [ diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index d9da04c1fa1b..ba85c5376db1 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "fzf-${version}"; - version = "0.17.3"; + version = "0.17.4"; rev = "${version}"; goPackagePath = "github.com/junegunn/fzf"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "junegunn"; repo = "fzf"; - sha256 = "1wsyykvnss5r0sx344kjbprnb87849462p9rg9xj37cp7qzciwdn"; + sha256 = "10k21v9x82imly36lgra8a7rlvz5a1jd49db16g9xc11wx7cdg8g"; }; outputs = [ "bin" "out" "man" ]; diff --git a/pkgs/tools/misc/hyperfine/default.nix b/pkgs/tools/misc/hyperfine/default.nix index 0b04ee1e2811..d9c255d2a7a8 100644 --- a/pkgs/tools/misc/hyperfine/default.nix +++ b/pkgs/tools/misc/hyperfine/default.nix @@ -1,16 +1,14 @@ { stdenv, fetchFromGitHub, rustPlatform }: -with rustPlatform; - -buildRustPackage rec { +rustPlatform.buildRustPackage rec { name = "hyperfine-${version}"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "hyperfine"; rev = "refs/tags/v${version}"; - sha256 = "0prmnhyp20w71l3mjqgdr38q94cqr1xayzgj7ibbq2hdick4w5nn"; + sha256 = "13h43sjp059yq3bmdbb9i1082fkx5yzmhrkf5kpkxhnyn67xbdsg"; }; cargoSha256 = "0saf0hl21ba2ckqbsw64908nvs0x1rjrnm73ackzpmv5pi9j567s"; diff --git a/pkgs/tools/misc/ical2org/default.nix b/pkgs/tools/misc/ical2org/default.nix new file mode 100644 index 000000000000..decc4afde0b9 --- /dev/null +++ b/pkgs/tools/misc/ical2org/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, buildGoPackage}: + +buildGoPackage rec { + name = "ical2org-${version}"; + version="v.1.1.5"; + + goPackagePath = "github.com/rjhorniii/ical2org"; + + src = fetchFromGitHub { + owner = "rjhorniii"; + repo = "ical2org"; + rev = "${version}"; + sha256 = "0hdx2j2innjh0z4kxcfzwdl2d54nv0g9ai9fyacfiagjhnzgf7cm"; + fetchSubmodules = true; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "Convert an iCal file to org agenda format, optionally deduplicating entries."; + homepage = https://github.com/rjhorniii/ical2org; + license = licenses.gpl3; + maintainers = with maintainers; [ swflint ]; + platforms = platforms.unix; + }; + +} diff --git a/pkgs/tools/misc/ical2org/deps.nix b/pkgs/tools/misc/ical2org/deps.nix new file mode 100644 index 000000000000..b948fac3d116 --- /dev/null +++ b/pkgs/tools/misc/ical2org/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "github.com/rjhorniii/ics-golang"; + fetch = { + type = "git"; + url = "https://github.com/rjhorniii/ics-golang"; + rev = "da66d6f502fac65073773ea3779cae2959545cb2"; + sha256 = "1mm5rssvyjk29n1gq4l5xw26gm8bhvbzrs5c059i41zh9af121px"; + }; + } +] diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index 79f70da9e26c..11759cc6d408 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "lf-${version}"; - version = "4"; + version = "5"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - sha256 = "0wvx5hhkj3l68xjcr0i5lk623zi3si79hhvwi6mw9s52i43irr31"; + sha256 = "0qgvaa69xs97x42j1ikb03bzpm497z9h3qk7adbdippaqcj40s70"; }; goPackagePath = "github.com/gokcehan/lf"; diff --git a/pkgs/tools/misc/lf/deps.nix b/pkgs/tools/misc/lf/deps.nix index e22a31a8fe2f..c372b0d669c5 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 = "21a4d435a86280a2927985fd6296de56cbce453e"; # master - sha256 = "0afbb0nr9rqzlpg5n7dg070w5scdvckyzyy525mhndp8phhzwpg7"; + rev = "5c94acc5e6eb520f1bcd183974e01171cc4c23b3"; # master + sha256 = "1fi8imdgwvlsgifw2qfl3ww0lsrgkfsimkzz7bnrq41nar78s0fw"; }; } { diff --git a/pkgs/tools/misc/lice/default.nix b/pkgs/tools/misc/lice/default.nix new file mode 100644 index 000000000000..bb0f93ba3283 --- /dev/null +++ b/pkgs/tools/misc/lice/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonPackage rec { + + version = "0.4"; + name = "lice-${version}"; + + src = fetchFromGitHub { + owner = "licenses"; + repo = "lice"; + rev = version; + sha256 = "0yxf70fi8ds3hmwjply2815k466r99k8n22r0ppfhwjvp3rn60qx"; + fetchSubmodules = true; + }; + + meta = with stdenv.lib; { + description = "Print license based on selection and user options."; + homepage = https://github.com/licenses/lice; + license = licenses.bsd3; + maintainers = with maintainers; [ swflint ]; + platforms = platforms.unix; + }; + +} diff --git a/pkgs/tools/misc/riemann-tools/Gemfile b/pkgs/tools/misc/riemann-tools/Gemfile index 3d56cd85c617..ac6abd42c895 100644 --- a/pkgs/tools/misc/riemann-tools/Gemfile +++ b/pkgs/tools/misc/riemann-tools/Gemfile @@ -1,3 +1,3 @@ source 'https://rubygems.org' -gem "riemann-tools", "0.2.6" +gem "riemann-tools", "0.2.13" diff --git a/pkgs/tools/misc/riemann-tools/Gemfile.lock b/pkgs/tools/misc/riemann-tools/Gemfile.lock index 58c12fd51516..9fc17ccea56a 100644 --- a/pkgs/tools/misc/riemann-tools/Gemfile.lock +++ b/pkgs/tools/misc/riemann-tools/Gemfile.lock @@ -1,142 +1,24 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (2.3.1) - beefcake (1.1.0) - builder (3.2.2) - excon (0.45.3) - faraday (0.9.1) - multipart-post (>= 1.2, < 3) - fission (0.5.0) - CFPropertyList (~> 2.2) - fog (1.31.0) - fog-atmos - fog-aws (~> 0.0) - fog-brightbox (~> 0.4) - fog-core (~> 1.30) - fog-ecloud - fog-google (>= 0.0.2) - fog-json - fog-local - fog-powerdns (>= 0.1.1) - fog-profitbricks - fog-radosgw (>= 0.0.2) - fog-riakcs - fog-sakuracloud (>= 0.0.4) - fog-serverlove - fog-softlayer - fog-storm_on_demand - fog-terremark - fog-vmfusion - fog-voxel - fog-xml (~> 0.1.1) - ipaddress (~> 0.5) - nokogiri (~> 1.5, >= 1.5.11) - fog-atmos (0.1.0) - fog-core - fog-xml - fog-aws (0.6.0) - fog-core (~> 1.27) - fog-json (~> 1.0) - fog-xml (~> 0.1) - ipaddress (~> 0.8) - fog-brightbox (0.7.2) - fog-core (~> 1.22) - fog-json - inflecto (~> 0.0.2) - fog-core (1.31.1) - builder - excon (~> 0.45) - formatador (~> 0.2) - mime-types - net-scp (~> 1.1) - net-ssh (>= 2.1.3) - fog-ecloud (0.3.0) - fog-core - fog-xml - fog-google (0.0.6) - fog-core - fog-json - fog-xml - fog-json (1.0.2) - fog-core (~> 1.0) - multi_json (~> 1.10) - fog-local (0.2.1) - fog-core (~> 1.27) - fog-powerdns (0.1.1) - fog-core (~> 1.27) - fog-json (~> 1.0) - fog-xml (~> 0.1) - fog-profitbricks (0.0.3) - fog-core - fog-xml - nokogiri - fog-radosgw (0.0.4) - fog-core (>= 1.21.0) - fog-json - fog-xml (>= 0.0.1) - fog-riakcs (0.1.0) - fog-core - fog-json - fog-xml - fog-sakuracloud (1.0.1) - fog-core - fog-json - fog-serverlove (0.1.2) - fog-core - fog-json - fog-softlayer (0.4.7) - fog-core - fog-json - fog-storm_on_demand (0.1.1) - fog-core - fog-json - fog-terremark (0.1.0) - fog-core - fog-xml - fog-vmfusion (0.1.0) - fission - fog-core - fog-voxel (0.1.0) - fog-core - fog-xml - fog-xml (0.1.2) - fog-core - nokogiri (~> 1.5, >= 1.5.11) - formatador (0.2.5) - inflecto (0.0.2) - ipaddress (0.8.0) - mime-types (2.6.1) - mini_portile (0.6.2) + beefcake (1.0.0) + json (1.8.6) mtrc (0.0.4) - multi_json (1.11.1) - multipart-post (2.0.0) - munin-ruby (0.2.5) - net-scp (1.2.1) - net-ssh (>= 2.6.5) - net-ssh (2.9.2) - nokogiri (1.6.6.2) - mini_portile (~> 0.6.0) - riemann-client (0.2.5) - beefcake (>= 0.3.5) + riemann-client (0.2.6) + beefcake (>= 0.3.5, <= 1.0.0) mtrc (>= 0.0.4) trollop (>= 1.16.2) - riemann-tools (0.2.6) - faraday (>= 0.8.5) - fog (>= 1.4.0) - munin-ruby (>= 0.2.1) - nokogiri (>= 1.5.6) - riemann-client (>= 0.2.2) + riemann-tools (0.2.13) + json (~> 1.8) + riemann-client (>= 0.2.6) trollop (>= 1.16.2) - yajl-ruby (>= 1.1.0) trollop (2.1.2) - yajl-ruby (1.2.1) PLATFORMS ruby DEPENDENCIES - riemann-tools (= 0.2.6) + riemann-tools (= 0.2.13) BUNDLED WITH - 1.10.2 + 1.14.6 diff --git a/pkgs/tools/misc/riemann-tools/default.nix b/pkgs/tools/misc/riemann-tools/default.nix index c518bc66984d..a20046deafc8 100644 --- a/pkgs/tools/misc/riemann-tools/default.nix +++ b/pkgs/tools/misc/riemann-tools/default.nix @@ -1,7 +1,7 @@ { bundlerEnv }: bundlerEnv { - name = "riemann-tools-0.2.6"; + name = "riemann-tools-0.2.13"; gemfile = ./Gemfile; lockfile = ./Gemfile.lock; gemset = ./gemset.nix; diff --git a/pkgs/tools/misc/riemann-tools/gemset.nix b/pkgs/tools/misc/riemann-tools/gemset.nix index 07818fc76bcd..a57139d2f7ca 100644 --- a/pkgs/tools/misc/riemann-tools/gemset.nix +++ b/pkgs/tools/misc/riemann-tools/gemset.nix @@ -1,444 +1,52 @@ { - "CFPropertyList" = { - version = "2.3.1"; + beefcake = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "10gid0a7pdllh3qmjiqkqxgfqvd7m1f2dmcm4gcd19s63pv620gv"; type = "gem"; - sha256 = "1wnk3gxnhfafbhgp0ic7qhzlx3lhv04v8nws2s31ii5s8135hs6k"; }; + version = "1.0.0"; }; - "beefcake" = { - version = "1.1.0"; + json = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5"; type = "gem"; - sha256 = "009gzy9jp81lsnxnwisinhc58cd0qljdiipj2701lzzrha5d826z"; }; + version = "1.8.6"; }; - "builder" = { - version = "3.2.2"; + mtrc = { source = { - type = "gem"; - sha256 = "14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2"; - }; - }; - "excon" = { - version = "0.45.3"; - source = { - type = "gem"; - sha256 = "183kfxfjjlc97w4rxkrxjw3kis4lxm65vppmvl4bkblvlw4nq94j"; - }; - }; - "faraday" = { - version = "0.9.1"; - source = { - type = "gem"; - sha256 = "1h33znnfzxpscgpq28i9fcqijd61h61zgs3gabpdgqfa1043axsn"; - }; - dependencies = [ - "multipart-post" - ]; - }; - "fission" = { - version = "0.5.0"; - source = { - type = "gem"; - sha256 = "09pmp1j1rr8r3pcmbn2na2ls7s1j9ijbxj99xi3a8r6v5xhjdjzh"; - }; - dependencies = [ - "CFPropertyList" - ]; - }; - "fog" = { - version = "1.31.0"; - source = { - type = "gem"; - sha256 = "0xr8xyrrkljm2hxi420x4qr5v6wqcj8d63v0qy1g6rkb3b1yhl9i"; - }; - dependencies = [ - "fog-atmos" - "fog-aws" - "fog-brightbox" - "fog-core" - "fog-ecloud" - "fog-google" - "fog-json" - "fog-local" - "fog-powerdns" - "fog-profitbricks" - "fog-radosgw" - "fog-riakcs" - "fog-sakuracloud" - "fog-serverlove" - "fog-softlayer" - "fog-storm_on_demand" - "fog-terremark" - "fog-vmfusion" - "fog-voxel" - "fog-xml" - "ipaddress" - "nokogiri" - ]; - }; - "fog-atmos" = { - version = "0.1.0"; - source = { - type = "gem"; - sha256 = "1aaxgnw9zy96gsh4h73kszypc32sx497s6bslvhfqh32q9d1y8c9"; - }; - dependencies = [ - "fog-core" - "fog-xml" - ]; - }; - "fog-aws" = { - version = "0.6.0"; - source = { - type = "gem"; - sha256 = "1m79s5ha6qq60pxqqxr9qs9fg8fwaz79sfxckidyhxdydcsjwx6z"; - }; - dependencies = [ - "fog-core" - "fog-json" - "fog-xml" - "ipaddress" - ]; - }; - "fog-brightbox" = { - version = "0.7.2"; - source = { - type = "gem"; - sha256 = "0636sqaf2w1rh4i2hxfgs24374l4ai8dgch8a7nycqhvjk2dm0aq"; - }; - dependencies = [ - "fog-core" - "fog-json" - "inflecto" - ]; - }; - "fog-core" = { - version = "1.31.1"; - source = { - type = "gem"; - sha256 = "1bcsy4cq7vyjmdf3h2v7q6hfj64v6phn0rfvwgj5wfza7yaxnhk7"; - }; - dependencies = [ - "builder" - "excon" - "formatador" - "mime-types" - "net-scp" - "net-ssh" - ]; - }; - "fog-ecloud" = { - version = "0.3.0"; - source = { - type = "gem"; - sha256 = "18rb4qjad9xwwqvvpj8r2h0hi9svy71pm4d3fc28cdcnfarmdi06"; - }; - dependencies = [ - "fog-core" - "fog-xml" - ]; - }; - "fog-google" = { - version = "0.0.6"; - source = { - type = "gem"; - sha256 = "1g3ykk239nxpdsr5anhprkp8vzk106gi4q6aqjh4z8q4bii0dflm"; - }; - dependencies = [ - "fog-core" - "fog-json" - "fog-xml" - ]; - }; - "fog-json" = { - version = "1.0.2"; - source = { - type = "gem"; - sha256 = "0advkkdjajkym77r3c0bg2rlahl2akj0vl4p5r273k2qmi16n00r"; - }; - dependencies = [ - "fog-core" - "multi_json" - ]; - }; - "fog-local" = { - version = "0.2.1"; - source = { - type = "gem"; - sha256 = "0i5hxwzmc2ag3z9nlligsaf679kp2pz39cd8n2s9cmxaamnlh2s3"; - }; - dependencies = [ - "fog-core" - ]; - }; - "fog-powerdns" = { - version = "0.1.1"; - source = { - type = "gem"; - sha256 = "08zavzwfkk344gz83phz4sy9nsjznsdjsmn1ifp6ja17bvydlhh7"; - }; - dependencies = [ - "fog-core" - "fog-json" - "fog-xml" - ]; - }; - "fog-profitbricks" = { - version = "0.0.3"; - source = { - type = "gem"; - sha256 = "01a3ylfkjkyagf4b4xg9x2v20pzapr3ivn9ydd92v402bjsm1nmr"; - }; - dependencies = [ - "fog-core" - "fog-xml" - "nokogiri" - ]; - }; - "fog-radosgw" = { - version = "0.0.4"; - source = { - type = "gem"; - sha256 = "1pxbvmr4dsqx4x2klwnciyhki4r5ryr9y0hi6xmm3n6fdv4ii7k3"; - }; - dependencies = [ - "fog-core" - "fog-json" - "fog-xml" - ]; - }; - "fog-riakcs" = { - version = "0.1.0"; - source = { - type = "gem"; - sha256 = "1nbxc4dky3agfwrmgm1aqmi59p6vnvfnfbhhg7xpg4c2cf41whxm"; - }; - dependencies = [ - "fog-core" - "fog-json" - "fog-xml" - ]; - }; - "fog-sakuracloud" = { - version = "1.0.1"; - source = { - type = "gem"; - sha256 = "1s16b48kh7y03hjv74ccmlfwhqqq7j7m4k6cywrgbyip8n3258n8"; - }; - dependencies = [ - "fog-core" - "fog-json" - ]; - }; - "fog-serverlove" = { - version = "0.1.2"; - source = { - type = "gem"; - sha256 = "0hxgmwzygrw25rbsy05i6nzsyr0xl7xj5j2sjpkb9n9wli5sagci"; - }; - dependencies = [ - "fog-core" - "fog-json" - ]; - }; - "fog-softlayer" = { - version = "0.4.7"; - source = { - type = "gem"; - sha256 = "0fgfbhqnyp8ywymvflflhvbns54d1432x57pgpnfy8k1cxvhv9b8"; - }; - dependencies = [ - "fog-core" - "fog-json" - ]; - }; - "fog-storm_on_demand" = { - version = "0.1.1"; - source = { - type = "gem"; - sha256 = "0fif1x8ci095b2yyilf65n7x6iyvn448azrsnmwsdkriy8vxxv3y"; - }; - dependencies = [ - "fog-core" - "fog-json" - ]; - }; - "fog-terremark" = { - version = "0.1.0"; - source = { - type = "gem"; - sha256 = "01lfkh9jppj0iknlklmwyb7ym3bfhkq58m3absb6rf5a5mcwi3lf"; - }; - dependencies = [ - "fog-core" - "fog-xml" - ]; - }; - "fog-vmfusion" = { - version = "0.1.0"; - source = { - type = "gem"; - sha256 = "0g0l0k9ylxk1h9pzqr6h2ba98fl47lpp3j19lqv4jxw0iw1rqxn4"; - }; - dependencies = [ - "fission" - "fog-core" - ]; - }; - "fog-voxel" = { - version = "0.1.0"; - source = { - type = "gem"; - sha256 = "10skdnj59yf4jpvq769njjrvh2l0wzaa7liva8n78qq003mvmfgx"; - }; - dependencies = [ - "fog-core" - "fog-xml" - ]; - }; - "fog-xml" = { - version = "0.1.2"; - source = { - type = "gem"; - sha256 = "1576sbzza47z48p0k9h1wg3rhgcvcvdd1dfz3xx1cgahwr564fqa"; - }; - dependencies = [ - "fog-core" - "nokogiri" - ]; - }; - "formatador" = { - version = "0.2.5"; - source = { - type = "gem"; - sha256 = "1gc26phrwlmlqrmz4bagq1wd5b7g64avpx0ghxr9xdxcvmlii0l0"; - }; - }; - "inflecto" = { - version = "0.0.2"; - source = { - type = "gem"; - sha256 = "085l5axmvqw59mw5jg454a3m3gr67ckq9405a075isdsn7bm3sp4"; - }; - }; - "ipaddress" = { - version = "0.8.0"; - source = { - type = "gem"; - sha256 = "0cwy4pyd9nl2y2apazp3hvi12gccj5a3ify8mi8k3knvxi5wk2ir"; - }; - }; - "mime-types" = { - version = "2.6.1"; - source = { - type = "gem"; - sha256 = "1vnrvf245ijfyxzjbj9dr6i1hkjbyrh4yj88865wv9bs75axc5jv"; - }; - }; - "mini_portile" = { - version = "0.6.2"; - source = { - type = "gem"; - sha256 = "0h3xinmacscrnkczq44s6pnhrp4nqma7k056x5wv5xixvf2wsq2w"; - }; - }; - "mtrc" = { - version = "0.0.4"; - source = { - type = "gem"; + remotes = ["https://rubygems.org"]; sha256 = "0xj2pv4cpn0ad1xw38sinsxfzwhgqs6ff18hw0cwz5xmsf3zqmiz"; - }; - }; - "multi_json" = { - version = "1.11.1"; - source = { - type = "gem"; - sha256 = "0lrmadw2scqwz7nw3j5pfdnmzqimlbaxlxi37xsydrpbbr78qf6g"; - }; - }; - "multipart-post" = { - version = "2.0.0"; - source = { - type = "gem"; - sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x"; - }; - }; - "munin-ruby" = { - version = "0.2.5"; - source = { - type = "gem"; - sha256 = "0378jyf0hdbfs2vvk7v8k7hqilzi1rfkpn271dyrqqal7g2lnjl2"; - }; - }; - "net-scp" = { - version = "1.2.1"; - source = { - type = "gem"; - sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j"; - }; - dependencies = [ - "net-ssh" - ]; - }; - "net-ssh" = { - version = "2.9.2"; - source = { - type = "gem"; - sha256 = "1p0bj41zrmw5lhnxlm1pqb55zfz9y4p9fkrr9a79nrdmzrk1ph8r"; - }; - }; - "nokogiri" = { - version = "1.6.6.2"; - source = { type = "gem"; - sha256 = "1j4qv32qjh67dcrc1yy1h8sqjnny8siyy4s44awla8d6jk361h30"; }; - dependencies = [ - "mini_portile" - ]; + version = "0.0.4"; }; - "riemann-client" = { - version = "0.2.5"; + riemann-client = { + dependencies = ["beefcake" "mtrc" "trollop"]; source = { + remotes = ["https://rubygems.org"]; + sha256 = "02rp8x2y8h61x8mx9c8kwgm2yyvgg63g8km93zmwmkpp5fyi3fi8"; type = "gem"; - sha256 = "1myhyh31f290jm1wlhhjvf331n5l8qdm7axkxyacdgjsfg4szsjc"; }; - dependencies = [ - "beefcake" - "mtrc" - "trollop" - ]; - }; - "riemann-tools" = { version = "0.2.6"; - source = { - type = "gem"; - sha256 = "0qjm7p55h70l5bs876hhvz3isr204663f97py9g0ajxz2z8jkzpi"; - }; - dependencies = [ - "faraday" - "fog" - "munin-ruby" - "nokogiri" - "riemann-client" - "trollop" - "yajl-ruby" - ]; }; - "trollop" = { - version = "2.1.2"; + riemann-tools = { + dependencies = ["json" "riemann-client" "trollop"]; source = { + remotes = ["https://rubygems.org"]; + sha256 = "0brf44cq4xz0nqhs189zlg76527bfv3jr453yc00410qdzz8fpxa"; type = "gem"; - sha256 = "0415y63df86sqj43c0l82and65ia5h64if7n0znkbrmi6y0jwhl8"; }; + version = "0.2.13"; }; - "yajl-ruby" = { - version = "1.2.1"; + trollop = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "0415y63df86sqj43c0l82and65ia5h64if7n0znkbrmi6y0jwhl8"; type = "gem"; - sha256 = "0zvvb7i1bl98k3zkdrnx9vasq0rp2cyy5n7p9804dqs4fz9xh9vf"; }; + version = "2.1.2"; }; } \ No newline at end of file diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix index 169389928d06..31303dcdd4d7 100644 --- a/pkgs/tools/misc/skim/default.nix +++ b/pkgs/tools/misc/skim/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { name = "skim-${version}"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "lotabout"; repo = "skim"; rev = "v${version}"; - sha256 = "067ds1sdi9ya1yqz9saczj1vml8arwzd46w35gmvdxgmxx4wmihs"; + sha256 = "0hk19mqfmrsyx28lb8h1hixivl6zrc8dg3imygk1ppgn66c0zf00"; }; outputs = [ "out" "vim" ]; @@ -17,6 +17,8 @@ rustPlatform.buildRustPackage rec { patchPhase = '' sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim + # fix Cargo.lock version + sed -i -e '168s|0.4.0|0.5.0|' Cargo.lock ''; postInstall = '' diff --git a/pkgs/tools/misc/smenu/default.nix b/pkgs/tools/misc/smenu/default.nix index 77622ce8a1ea..30475047c4f7 100644 --- a/pkgs/tools/misc/smenu/default.nix +++ b/pkgs/tools/misc/smenu/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - version = "0.9.11"; + version = "0.9.13"; name = "smenu-${version}"; src = fetchFromGitHub { owner = "p-gen"; repo = "smenu"; rev = "v${version}"; - sha256 = "1va5gsxniin02casgdrqxvpzccm0vwjiql60qrsvncrq6nm6bz0d"; + sha256 = "0ixfl1dxkvmzb3xy6zs1x94hlf8y7zmd14gmb50rp7gb7ff1ivm5"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix index 77308ecf2ed8..113c7e127d4f 100644 --- a/pkgs/tools/misc/trash-cli/default.nix +++ b/pkgs/tools/misc/trash-cli/default.nix @@ -1,8 +1,6 @@ { stdenv, fetchFromGitHub, fetchpatch, coreutils , python3, python3Packages, substituteAll }: -assert stdenv.isLinux; - python3Packages.buildPythonApplication rec { name = "trash-cli-${version}"; version = "0.17.1.14"; @@ -19,7 +17,8 @@ python3Packages.buildPythonApplication rec { (substituteAll { src = ./nix-paths.patch; df = "${coreutils}/bin/df"; - libc = "${stdenv.cc.libc.out}/lib/libc.so.6"; + libc = let ext = if stdenv.isDarwin then ".dylib" else ".so.6"; + in "${stdenv.cc.libc}/lib/libc${ext}"; }) # Fix build on Python 3.6. @@ -37,7 +36,7 @@ python3Packages.buildPythonApplication rec { homepage = https://github.com/andreafrancia/trash-cli; description = "Command line tool for the desktop trash can"; maintainers = [ maintainers.rycee ]; - platforms = platforms.all; + platforms = platforms.unix; license = licenses.gpl2; }; } diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/tools/misc/woeusb/default.nix index 197eea17d886..9c6211b13dfe 100644 --- a/pkgs/tools/misc/woeusb/default.nix +++ b/pkgs/tools/misc/woeusb/default.nix @@ -3,14 +3,14 @@ , wxGTK30 }: stdenv.mkDerivation rec { - version = "3.1.5"; + version = "3.2.1"; name = "woeusb-${version}"; src = fetchFromGitHub { owner = "slacka"; repo = "WoeUSB"; rev = "v${version}"; - sha256 = "0jbyrd49ikwkfpnka884y3p600bm3nfil2zinrgbac7vyhxxqjmw"; + sha256 = "0qymdc216ws6adkzmzxz6hx43dim0hpwab9c4qmgg8jnkhnpvnj1"; }; buildInputs = [ wxGTK30 autoreconfHook makeWrapper ]; diff --git a/pkgs/tools/networking/connect/default.nix b/pkgs/tools/networking/connect/default.nix index f7a0c00fb481..3d63340adb0b 100644 --- a/pkgs/tools/networking/connect/default.nix +++ b/pkgs/tools/networking/connect/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; homepage = https://bitbucket.org/gotoh/connect/wiki/Home; license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = with stdenv.lib.maintainers; [ jcumming ]; }; } diff --git a/pkgs/tools/networking/dnsperf/default.nix b/pkgs/tools/networking/dnsperf/default.nix index 97aad141239e..b978925c62b5 100644 --- a/pkgs/tools/networking/dnsperf/default.nix +++ b/pkgs/tools/networking/dnsperf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bind, libseccomp, zlib, openssl }: +{ stdenv, fetchurl, bind, libseccomp, zlib, openssl, libcap }: stdenv.mkDerivation rec { name = "dnsperf-${version}"; @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" "doc" ]; - buildInputs = [ bind libseccomp zlib openssl ]; + buildInputs = [ bind zlib openssl ] + ++ stdenv.lib.optional stdenv.isLinux [ libcap libseccomp ]; postInstall = '' mkdir -p "$out/share/doc/" @@ -29,4 +30,3 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.vcunat ]; }; } - diff --git a/pkgs/tools/networking/maxscale/default.nix b/pkgs/tools/networking/maxscale/default.nix new file mode 100644 index 000000000000..425e531419e4 --- /dev/null +++ b/pkgs/tools/networking/maxscale/default.nix @@ -0,0 +1,87 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, gcc, glibc +, bison2, curl, flex, gperftools, jansson, jemalloc, kerberos, lua, mariadb +, ncurses, openssl, pcre, pcre2, perl, rabbitmq-c, sqlite, tcl +, libaio, libedit, libtool, libui, libuuid, zlib +}: + +stdenv.mkDerivation rec { + name = "maxscale-${version}"; + version = "2.1.17"; + + src = fetchFromGitHub { + owner = "mariadb-corporation"; + repo = "MaxScale"; + rev = "${name}"; + sha256 = "161kc6aqqj3z509q4qwvsd86h06hlyzdask4gawn2ij0h3ca58q6"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ + bison2 curl flex gperftools jansson jemalloc kerberos lua mariadb.connector-c + ncurses openssl pcre pcre2 perl rabbitmq-c sqlite tcl + libaio libedit libtool libui libuuid zlib + ]; + + patches = [ ./getopt.patch ]; + + preConfigure = '' + for i in `grep -l -R '#include <getopt.h>' .`; do + substituteInPlace $i --replace "#include <getopt.h>" "#include <${glibc.dev}/include/getopt.h>" + done + ''; + + cmakeFlags = [ + "-DUSE_C99=YES" + "-DDEFAULT_ADMIN_USER=root" + "-DWITH_MAXSCALE_CNF=YES" + "-DSTATIC_EMBEDDED=YES" + "-DBUILD_RABBITMQ=YES" + "-DBUILD_BINLOG=YES" + "-DBUILD_CDC=NO" + "-DBUILD_MMMON=YES" + "-DBUILD_LUAFILTER=YES" + "-DLUA_LIBRARIES=${lua}/lib" + "-DLUA_INCLUDE_DIR=${lua}/include" + "-DGCOV=NO" + "-DWITH_SCRIPTS=OFF" + "-DBUILD_TESTS=NO" + "-DBUILD_TOOLS=NO" + "-DPROFILE=NO" + "-DWITH_TCMALLOC=YES" + "-DWITH_JEMALLOC=YES" + "-DINSTALL_EXPERIMENTAL=YES" + "-DTARGET_COMPONENT=all" + ]; + + CFLAGS = "-std=gnu99"; + + enableParallelBuilding = false; + + dontStrip = true; + + postInstall = '' + find $out/bin -type f -perm -0100 | while read f1; do + patchelf \ + --set-rpath "$(patchelf --print-rpath $f1):${mariadb.connector-c}/lib/mariadb:$out/lib/maxscale" \ + --set-interpreter "$(cat ${stdenv.cc}/nix-support/dynamic-linker)" $f1 \ + && patchelf --shrink-rpath $f1 + done + + find $out/lib/maxscale -type f -perm -0100 | while read f2; do + patchelf \ + --set-rpath "$(patchelf --print-rpath $f2)":$out/lib/maxscale $f2 + done + + mv $out/share/maxscale/create_grants $out/bin + rm -rf $out/{etc,var} + ''; + + meta = with stdenv.lib; { + description = ''MaxScale database proxy extends MariaDB Server's high availability''; + homepage = https://mariadb.com/products/technology/maxscale; + license = licenses.bsl11; + platforms = platforms.linux; + maintainers = with maintainers; [ izorkin ]; + }; +} diff --git a/pkgs/tools/networking/maxscale/getopt.patch b/pkgs/tools/networking/maxscale/getopt.patch new file mode 100644 index 000000000000..db09a8e8f1ec --- /dev/null +++ b/pkgs/tools/networking/maxscale/getopt.patch @@ -0,0 +1,11 @@ +--- a/server/core/maxpasswd.c 2018-01-12 05:06:49.000000000 -0500 ++++ b/server/core/maxpasswd.c 2018-01-12 06:50:18.518000000 -0500 +@@ -25,6 +25,7 @@ + + #include <maxscale/cdefs.h> + ++#include <getopt.h> + #include <stdio.h> + #include <errno.h> + #include <sys/stat.h> + diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix index 5f7537eda18d..d3b62d3259cc 100644 --- a/pkgs/tools/networking/mitmproxy/default.nix +++ b/pkgs/tools/networking/mitmproxy/default.nix @@ -18,6 +18,8 @@ buildPythonPackage rec { sed 's/>=\([0-9]\.\?\)\+\( \?, \?<\([0-9]\.\?\)\+\)\?//' -i setup.py ''; + doCheck = (!stdenv.isDarwin); + checkPhase = '' export HOME=$(mktemp -d) export LC_CTYPE=en_US.UTF-8 diff --git a/pkgs/tools/networking/ntp/seccomp.patch b/pkgs/tools/networking/ntp/seccomp.patch index 28de2f01d073..872bf8e7fcc2 100644 --- a/pkgs/tools/networking/ntp/seccomp.patch +++ b/pkgs/tools/networking/ntp/seccomp.patch @@ -34,11 +34,12 @@ diff -urN ntp-4.2.8p10.orig/ntpd/ntpd.c ntp-4.2.8p10/ntpd/ntpd.c SCMP_SYS(madvise), SCMP_SYS(mmap), SCMP_SYS(mmap2), -@@ -1211,6 +1216,7 @@ +@@ -1211,6 +1216,8 @@ SCMP_SYS(select), SCMP_SYS(setitimer), SCMP_SYS(setsid), + SCMP_SYS(setsockopt), ++ SCMP_SYS(openat), SCMP_SYS(sigprocmask), SCMP_SYS(sigreturn), SCMP_SYS(socketcall), diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index c1d00dba2b46..c7d153186986 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -2,7 +2,7 @@ asciidoc, libxml2, libxslt, docbook_xml_xslt }: pythonPackages.buildPythonApplication rec { - version = "7.2.0"; + version = "7.2.1"; name = "offlineimap-${version}"; namePrefix = ""; @@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec { owner = "OfflineIMAP"; repo = "offlineimap"; rev = "v${version}"; - sha256 = "0xyvqgy36n0bb41c4ffldyrcnaja5gpwx2ngbnk3qs22ldb2n1sb"; + sha256 = "1m5i74baazwazqp98ssma968rnwzfl1nywb7icf0swc8447ps97q"; }; postPatch = '' diff --git a/pkgs/tools/networking/pirate-get/default.nix b/pkgs/tools/networking/pirate-get/default.nix index 6e50b11568e6..8e05e49962cd 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.12"; + version = "0.2.13"; doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "1q6hvavj0gswgw3x756h18nmmpnxlgg08qvxphpbzlwd43xrnza3"; + sha256 = "c5b159e02067136d3157d56061958a50e997a078510e4403bb7de40217833f3f"; }; propagatedBuildInputs = [ colorama veryprettytable beautifulsoup4 ]; diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix index ff0441c40787..623081fbb4ef 100644 --- a/pkgs/tools/networking/speedtest-cli/default.nix +++ b/pkgs/tools/networking/speedtest-cli/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { name = "speedtest-cli-${version}"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "sivel"; repo = "speedtest-cli"; rev = "v${version}"; - sha256 = "0d3av50qm7bahsdg0k7hp04r9ripsafn95yqcgsy5h5y9yj4rsvf"; + sha256 = "0vv2z37g2kgm2dzkfa4bhri92hs0d1acxi8z66gznsl5148q7sdi"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix index 4f6bec9c0084..9ef5ff2a4f08 100644 --- a/pkgs/tools/networking/tinc/default.nix +++ b/pkgs/tools/networking/tinc/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, lzo, openssl, zlib}: stdenv.mkDerivation rec { - version = "1.0.33"; + version = "1.0.34"; name = "tinc-${version}"; src = fetchurl { url = "http://www.tinc-vpn.org/packages/tinc-${version}.tar.gz"; - sha256 = "1x0hpfz13vn4pl6dcpnls6xq3rfcbdsg90awcfn53ijb8k35svvz"; + sha256 = "1nngdp2x5kykrgh13q5wjry8m82vahqv53csvlb22ifxvrhrnfn0"; }; buildInputs = [ lzo openssl zlib ]; diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix index 0f5fd2836921..db4b6a2281d4 100644 --- a/pkgs/tools/networking/tinc/pre.nix +++ b/pkgs/tools/networking/tinc/pre.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "tinc-${version}"; - version = "1.1pre15"; + version = "1.1pre16"; src = fetchgit { rev = "refs/tags/release-${version}"; url = "git://tinc-vpn.org/tinc"; - sha256 = "1msym63jpipvzb5dn8yn8yycrii43ncfq6xddxh2ifrakr48l6y5"; + sha256 = "03dsm1kxagq8srskzg649xyhbdqbbqxc84pdwrz7yakpa9m6225c"; }; outputs = [ "out" "man" "info" ]; @@ -23,10 +23,6 @@ stdenv.mkDerivation rec { sed -i '/AC_INIT/s/m4_esyscmd_s.*/${version})/' configure.ac ''; - postInstall = '' - rm $out/bin/tinc-gui - ''; - configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index 4a40c3200407..e644578b6642 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.3.0"; + version = "5.3.1"; name = "whois-${version}"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; - sha256 = "01pfl1ap62hc27574sx1a4yaaf7hr2zkksspn5z97sgacl6h1rnf"; + sha256 = "1xqvcsh70590bwmy37kwlwyl0rvnlqx987km3mnij93q4kvabg5n"; }; nativeBuildInputs = [ perl gettext pkgconfig ]; diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix index 62ea3d64468a..c6b8cb242fdc 100644 --- a/pkgs/tools/networking/wireguard-go/default.nix +++ b/pkgs/tools/networking/wireguard-go/default.nix @@ -2,22 +2,17 @@ buildGoPackage rec { name = "wireguard-go-${version}"; - version = "0.0.20180531"; + version = "0.0.20180613"; goPackagePath = "git.zx2c4.com/wireguard-go"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz"; - sha256 = "1vs11kr5a2s99v0g7079nfrfvmjfh1p2lnkj2icjyn2cb0s1vqiy"; + sha256 = "0pvg7s1kyn48az54lsnyn1ryhjk0flmpz5dx520rc94g6xn88fic"; }; goDeps = ./deps.nix; - postPatch = '' - # Replace local imports so that go tools do not trip on them - find . -name '*.go' -exec sed -i '/import (/,/)/s@"./@"${goPackagePath}/@' {} \; - ''; - meta = with stdenv.lib; { description = "Userspace Go implementation of WireGuard"; homepage = https://git.zx2c4.com/wireguard-go/about/; diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index 276d7066c561..e8f8b4258721 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "wireguard-tools-${version}"; - version = "0.0.20180531"; + version = "0.0.20180613"; src = fetchzip { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "0944zxmpx2cs71nxl7rcyhpqlwplkzd7jsf1n66vflngw2sjxm03"; + sha256 = "0xndf5qxc4s0gsidzm0v4ivara6k2shjbr74xfcdpc0apfgyk2fz"; }; sourceRoot = "source/src/tools"; diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index 43aa44809ed8..bc8b1a5e0cdf 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, openssl, lzo, zlib, iproute, which, ronn }: stdenv.mkDerivation rec { - version = "1.2.8"; + version = "1.2.10"; name = "zerotierone-${version}"; src = fetchurl { url = "https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz"; - sha256 = "0iwaaicf3wa1xi20k2w18q01d0dlmf5w9akf227bcsqdalsdzqh8"; + sha256 = "0mqckh51xj79z468n2683liczqracip36jvhfyd0fr3pwrbyqy8w"; }; preConfigure = '' diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index 5eb20169412d..456469f150f7 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchFromGitHub, lib -, intltool, glib, pkgconfig, polkit, python, sqlite, systemd +, intltool, glib, pkgconfig, polkit, python, sqlite , gobjectIntrospection, vala_0_38, gtk-doc, autoreconfHook, autoconf-archive # TODO: set enableNixBackend to true, as soon as it builds , nix, enableNixBackend ? false, boost , enableCommandNotFound ? false -, enableBashCompletion ? false, bash-completion ? null }: +, enableBashCompletion ? false, bash-completion ? null +, enableSystemd ? stdenv.isLinux, systemd }: stdenv.mkDerivation rec { name = "packagekit-${version}"; @@ -17,7 +18,8 @@ stdenv.mkDerivation rec { sha256 = "11drd6ixx75q3w12am3z1npwllq1kxnhbxv0npng92c69kn291zs"; }; - buildInputs = [ glib polkit systemd python gobjectIntrospection vala_0_38 ] + buildInputs = [ glib polkit python gobjectIntrospection vala_0_38 ] + ++ lib.optional enableSystemd systemd ++ lib.optional enableBashCompletion bash-completion; propagatedBuildInputs = [ sqlite nix boost ]; nativeBuildInputs = [ intltool pkgconfig autoreconfHook autoconf-archive gtk-doc ]; @@ -28,7 +30,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--enable-systemd" + (if enableSystemd then "--enable-systemd" else "--disable-systemd") "--disable-dummy" "--disable-cron" "--disable-introspection" @@ -63,7 +65,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.packagekit.org/; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ matthewbauer ]; }; } diff --git a/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix b/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix new file mode 100644 index 000000000000..e04b41557482 --- /dev/null +++ b/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, imagemagick, libqrencode +, testQR ? false, zbar ? null +}: + +assert testQR -> zbar != false; + +stdenv.mkDerivation rec { + name = "asc-key-to-qr-code-gif-${version}"; + version = "20180613"; + + src = fetchFromGitHub { + owner = "yishilin14"; + repo = "asc-key-to-qr-code-gif"; + rev = "5b7b239a0089a5269444cbe8a651c99dd43dce3f"; + sha256 = "0yrc302a2fhbzryb10718ky4fymfcps3lk67ivis1qab5kbp6z8r"; + }; + + buildInputs = [ imagemagick libqrencode ] ++ stdenv.lib.optional testQR zbar; + dontBuild = true; + dontStrip = true; + dontPatchELF = true; + + preInstall = '' + substituteInPlace asc-to-gif.sh \ + --replace "convert" "${imagemagick}/bin/convert" \ + --replace "qrencode" "${libqrencode}/bin/qrencode" + ''; + + installPhase = '' + mkdir -p $out/bin + cp * $out/bin/ + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/yishilin14/asc-key-to-qr-code-gif; + description = "Convert ASCII-armored PGP keys to animated QR code"; + platforms = platforms.linux; + maintainers = with maintainers; [ asymmetric ]; + }; +} diff --git a/pkgs/tools/security/gnupg/1.nix b/pkgs/tools/security/gnupg/1.nix index 9a147caa7e21..b86bb1a221c6 100644 --- a/pkgs/tools/security/gnupg/1.nix +++ b/pkgs/tools/security/gnupg/1.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, readline, bzip2 }: stdenv.mkDerivation rec { - name = "gnupg-1.4.22"; + name = "gnupg-1.4.23"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "1d1hz4szh1kvwhsw7w2zxa6q5ndrk3qy6hj289l1b8k3xi5s554m"; + sha256 = "1fkq4sqldvf6a25mm2qz95swv1qjg464736091w51djiwqbjyin9"; }; buildInputs = [ readline bzip2 ]; diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index 0f575d748b6c..f28d57fa62bd 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null; stdenv.mkDerivation rec { name = "gnupg-${version}"; - version = "2.2.7"; + version = "2.2.8"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "0vlpis0q7gvq9mhdc43hkyn3cdriz4mwgj20my3gyzpgwqg3cnyr"; + sha256 = "1k8dnnfs9888yp713l7kg2jg110lw47s4krx0njna6fjrsw4qyvp"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/security/nwipe/default.nix b/pkgs/tools/security/nwipe/default.nix new file mode 100644 index 000000000000..214ffccc7aea --- /dev/null +++ b/pkgs/tools/security/nwipe/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub, ncurses, parted, automake, autoconf, pkgconfig }: + +stdenv.mkDerivation rec { + version = "0.24"; + name = "nwipe-${version}"; + src = fetchFromGitHub { + owner = "martijnvanbrummelen"; + repo = "nwipe"; + rev = "v${version}"; + sha256 = "0zminjngz98b4jl1ii6ssa7pkmf4xw6mmk8apxz3xr68cps12ls0"; + }; + nativeBuildInputs = [ automake autoconf pkgconfig ]; + buildInputs = [ ncurses parted ]; + preConfigure = "sh init.sh || :"; + meta = with stdenv.lib; { + description = "Securely erase disks"; + homepage = https://github.com/martijnvanbrummelen/nwipe; + license = licenses.gpl2; + maintainers = [ maintainers.woffs ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 5ce0ce0dbc21..37efbd80fbbe 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -29,12 +29,12 @@ let }; generic = extensionsEnv: extraPassthru: stdenv.mkDerivation rec { - version = "1.7.1"; + version = "1.7.2"; name = "password-store-${version}"; src = fetchurl { url = "http://git.zx2c4.com/password-store/snapshot/${name}.tar.xz"; - sha256 = "0scqkpll2q8jhzcgcsh9kqz0gwdpvynivqjmmbzax2irjfaiklpn"; + sha256 = "1sl0d7nc85c6c2bmmmyb8rpmn47vhkj831l153mjlkawjvhwas27"; }; patches = [ ./set-correct-program-name-for-sleep.patch diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index 589316b1d1c5..bf5856aec357 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -6,9 +6,7 @@ stdenv.mkDerivation rec { version = "1.8.23"; src = fetchurl { - # This URL changes in unpredictable ways, so it is not sensible - # to put a version variable in there. - url = "https://alioth.debian.org/frs/download.php/file/4235/pcsc-lite-1.8.23.tar.bz2"; + url = "https://pcsclite.apdu.fr/files/pcsc-lite-${version}.tar.bz2"; sha256 = "1jc9ws5ra6v3plwraqixin0w0wfxj64drahrbkyrrwzghqjjc9ss"; }; @@ -36,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Middleware to access a smart card using SCard API (PC/SC)"; - homepage = http://pcsclite.alioth.debian.org/; + homepage = https://pcsclite.apdu.fr/; license = licenses.bsd3; maintainers = with maintainers; [ viric wkennington ]; platforms = with platforms; unix; diff --git a/pkgs/tools/security/stoken/default.nix b/pkgs/tools/security/stoken/default.nix index a9902fe50422..d28260ffb8b9 100644 --- a/pkgs/tools/security/stoken/default.nix +++ b/pkgs/tools/security/stoken/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "stoken"; - version = "0.90"; + version = "0.92"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "cernekee"; repo = pname; rev = "v${version}"; - sha256 = "1k7wn8pmp7dv646g938dsr99090lsphl7zy4m9x7qbh2zlnnf9af"; + sha256 = "0q7cv8vy5b2cslm57maqb6jsm7s4rwacjyv6gplwp26yhm38hw7y"; }; preConfigure = '' diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 795925a221c2..3efba58ea11d 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -15,11 +15,11 @@ }: stdenv.mkDerivation rec { - name = "tor-0.3.3.6"; + name = "tor-0.3.3.7"; src = fetchurl { url = "https://dist.torproject.org/${name}.tar.gz"; - sha256 = "1drk2h8zd05xrfpx7xn77pcxz0hs4nrq6figw56qk5gkvgv5kg4r"; + sha256 = "036ybfvldj7yfci9ipjki8smpzyxdg8c5r12bghc9yxdqh9basza"; }; outputs = [ "out" "geoip" ]; diff --git a/pkgs/tools/system/acpica-tools/default.nix b/pkgs/tools/system/acpica-tools/default.nix index edb7828f95b7..c9a33bc64e0c 100644 --- a/pkgs/tools/system/acpica-tools/default.nix +++ b/pkgs/tools/system/acpica-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "acpica-tools-${version}"; - version = "20180508"; + version = "20180531"; src = fetchurl { url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"; - sha256 = "1n7lqmv77kg28drahvxzybwl9v4hzwi8i7xkpgliclfcp5ff909b"; + sha256 = "0rbn0anxs6r1ks1lgaxqhiv2kqgh4f1fq5qi2kdv7hir82mdqv4g"; }; NIX_CFLAGS_COMPILE = "-O3"; diff --git a/pkgs/tools/system/loadwatch/default.nix b/pkgs/tools/system/loadwatch/default.nix new file mode 100644 index 000000000000..eb7f1e3bb59b --- /dev/null +++ b/pkgs/tools/system/loadwatch/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchgit, ... }: + +stdenv.mkDerivation { + name = "loadwatch-1.1-1-g6d2544c"; + src = fetchgit { + url = "git://woffs.de/git/fd/loadwatch.git"; + sha256 = "1bhw5ywvhyb6snidsnllfpdi1migy73wg2gchhsfbcpm8aaz9c9b"; + rev = "6d2544c0caaa8a64bbafc3f851e06b8056c30e6e"; + }; + installPhase = '' + mkdir -p $out/bin + install loadwatch lw-ctl $out/bin + ''; + meta = with stdenv.lib; { + description = "Run a program using only idle cycles"; + license = licenses.gpl2; + maintainers = with maintainers; [ woffs ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix index a0aaa846bc73..c2d31ccb0fbf 100644 --- a/pkgs/tools/system/osquery/default.nix +++ b/pkgs/tools/system/osquery/default.nix @@ -12,15 +12,15 @@ let thirdparty = fetchFromGitHub { owner = "osquery"; repo = "third-party"; - rev = "4ef099c31a1165c5e7e3a699f9e4b3eb68c3c3d9"; - sha256 = "1vm0prw4dix0m51vkw9z0vwfd8698gqjw499q8h604hs1rvn6132"; + rev = "32e01462fbea75d3b1904693f937dfd62eaced15"; + sha256 = "0va24gmgk43a1lyjs63q9qrhvpv8gmqjzpjr5595vhr16idv8wyf"; }; in stdenv.mkDerivation rec { name = "osquery-${version}"; - version = "3.2.2"; + version = "3.2.8"; # this is what `osquery --help` will show as the version. OSQUERY_BUILD_VERSION = version; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "facebook"; repo = "osquery"; rev = version; - sha256 = "0qwj4cy6m25sqwb0irqfqinipx50l4imnz1gqxx147vzfwb52jlq"; + sha256 = "1py5jizl7z1f9xzpg7pylbdnawvvifiyv9gpjwiim8ilgkmpaiv4"; }; patches = [ ./misc.patch ]; diff --git a/pkgs/tools/system/osquery/misc.patch b/pkgs/tools/system/osquery/misc.patch index acdbf6346c83..859e398616ab 100644 --- a/pkgs/tools/system/osquery/misc.patch +++ b/pkgs/tools/system/osquery/misc.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b8eb5a16..319d81dc 100644 +index 71921740..156ea6dc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -447,12 +447,6 @@ elseif(CLANG AND DEPS AND NOT FREEBSD) +@@ -456,12 +456,6 @@ elseif(CLANG AND DEPS AND NOT FREEBSD) set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -flto=thin") endif() @@ -15,7 +15,7 @@ index b8eb5a16..319d81dc 100644 # Make sure deps were built before compiling (else show warning). execute_process( COMMAND "${CMAKE_SOURCE_DIR}/tools/provision.sh" check "${CMAKE_BINARY_DIR}" -@@ -518,6 +512,8 @@ endif() +@@ -528,6 +522,8 @@ endif() if(APPLE) LOG_PLATFORM("OS X") @@ -24,7 +24,7 @@ index b8eb5a16..319d81dc 100644 elseif(OSQUERY_BUILD_PLATFORM STREQUAL "debian") LOG_PLATFORM("Debian") elseif(OSQUERY_BUILD_PLATFORM STREQUAL "ubuntu") -@@ -567,7 +563,6 @@ if(POSIX AND DEPS) +@@ -577,7 +573,6 @@ if(POSIX AND DEPS) endif() endif() @@ -32,7 +32,7 @@ index b8eb5a16..319d81dc 100644 include_directories("${CMAKE_SOURCE_DIR}/include") include_directories("${CMAKE_SOURCE_DIR}") -@@ -655,18 +650,6 @@ if(FREEBSD OR "${HAVE_TR1_TUPLE}" STREQUAL "") +@@ -668,18 +663,6 @@ if(FREEBSD OR "${HAVE_TR1_TUPLE}" STREQUAL "") add_definitions(-DGTEST_USE_OWN_TR1_TUPLE=0) endif() @@ -52,7 +52,7 @@ index b8eb5a16..319d81dc 100644 add_subdirectory("${CMAKE_SOURCE_DIR}/third-party/linenoise-ng") endif() diff --git a/osquery/CMakeLists.txt b/osquery/CMakeLists.txt -index 1c8201ee..a89e6821 100644 +index c8cbac4e..a4382420 100644 --- a/osquery/CMakeLists.txt +++ b/osquery/CMakeLists.txt @@ -35,8 +35,6 @@ if(CLANG AND POSIX) @@ -64,7 +64,7 @@ index 1c8201ee..a89e6821 100644 -Wno-unused-parameter -Wno-gnu-case-range -Weffc++ -@@ -61,14 +59,7 @@ endif() +@@ -65,14 +63,7 @@ endif() # Construct a set of all object files, starting with third-party and all # of the osquery core objects (sources from ADD_CORE_LIBRARY macros). @@ -80,7 +80,7 @@ index 1c8201ee..a89e6821 100644 # Add subdirectories add_subdirectory(config) -@@ -147,10 +138,11 @@ if(APPLE OR LINUX) +@@ -153,10 +144,11 @@ if(APPLE OR LINUX) ADD_OSQUERY_LINK_ADDITIONAL("rocksdb_lite") elseif(FREEBSD) ADD_OSQUERY_LINK_CORE("icuuc") @@ -93,15 +93,20 @@ index 1c8201ee..a89e6821 100644 if(POSIX) ADD_OSQUERY_LINK_CORE("boost_system") ADD_OSQUERY_LINK_CORE("boost_filesystem") -@@ -168,6 +160,8 @@ endif() +@@ -174,10 +166,10 @@ endif() ADD_OSQUERY_LINK_CORE("glog${WO_KEY}") if(POSIX) +- # Hashing methods in core use libcrypto. +- ADD_OSQUERY_LINK_CORE("crypto") +- + ADD_OSQUERY_LINK_ADDITIONAL("benchmark") + ADD_OSQUERY_LINK_ADDITIONAL("snappy") ADD_OSQUERY_LINK_ADDITIONAL("ssl") - ADD_OSQUERY_LINK_ADDITIONAL("crypto") ++ ADD_OSQUERY_LINK_ADDITIONAL("crypto") ADD_OSQUERY_LINK_ADDITIONAL("libpthread") + ADD_OSQUERY_LINK_ADDITIONAL("magic") + endif() diff --git a/osquery/extensions/CMakeLists.txt b/osquery/extensions/CMakeLists.txt index 52f3bf80..066ed1c0 100644 --- a/osquery/extensions/CMakeLists.txt diff --git a/pkgs/tools/system/uptimed/default.nix b/pkgs/tools/system/uptimed/default.nix index 58e194d38b94..849baa7159ae 100644 --- a/pkgs/tools/system/uptimed/default.nix +++ b/pkgs/tools/system/uptimed/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "uptimed-${version}"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { - sha256 = "0h3192angfiv01bjk3f3nd2fmjic37cl72pvmr556n0wy3cfybas"; + sha256 = "0hqs7n3agayckwdgwadzw5shpdh4h1inqgvp4zr5fi324pj5x80j"; rev = "v${version}"; repo = "uptimed"; owner = "rpodgorny"; diff --git a/pkgs/tools/text/ispell/default.nix b/pkgs/tools/text/ispell/default.nix index b2219d1e66d6..dbec8d353d94 100644 --- a/pkgs/tools/text/ispell/default.nix +++ b/pkgs/tools/text/ispell/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; postPatch = '' cat >> local.h <<EOF - #define USG + ${stdenv.lib.optionalString (!stdenv.isDarwin) "#define USG"} #define TERMLIB "-lncurses" #define LANGUAGES "{american,MASTERDICTS=american.med,HASHFILES=americanmed.hash}" #define MASTERHASH "americanmed.hash" diff --git a/pkgs/tools/text/kakasi/default.nix b/pkgs/tools/text/kakasi/default.nix index b6b647b43982..b0baeaab5f66 100644 --- a/pkgs/tools/text/kakasi/default.nix +++ b/pkgs/tools/text/kakasi/default.nix @@ -1,8 +1,10 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, libiconv }: stdenv.mkDerivation rec { name = "kakasi-2.3.6"; + buildInputs = stdenv.lib.optional stdenv.isDarwin [ libiconv ]; + meta = with stdenv.lib; { description = "Kanji Kana Simple Inverter"; longDescription = '' @@ -12,7 +14,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://kakasi.namazu.org/"; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; src = fetchurl { diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index f3f0a60b4802..8ce2a6b0aa3c 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.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "tectonic-typesetting"; repo = "tectonic"; rev = "v${version}"; - sha256 = "007l0l9xnyayiqiap22zlsp8l9afdw803064cj8inr3q7ckzfcpb"; + sha256 = "1bm3s2zkyy44xrc804c65hrbc6ixzcr95na671b0dannjrikrx1x"; }; - cargoSha256 = "0kjy9zrjlrlkr2il62nz35hm1nndyym9dbnas43hzz7y8hdf859k"; + cargoSha256 = "1pyaw72h85ydq794mpgfjfq7dcq3a1dg4infh770swfaycyll6h6"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index 35fee64ba54f..3bf7ee1fdfec 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -30,7 +30,7 @@ let pkgNeedsRuby = pkg: pkg.tlType == "run" && pkg.pname == "match-parens"; extraInputs = lib.optional (lib.any pkgNeedsPython splitBin.wrong) python - ++ lib.optional (lib.any pkgNeedsPython splitBin.wrong) ruby; + ++ lib.optional (lib.any pkgNeedsRuby splitBin.wrong) ruby; }; mkUniquePkgs = pkgs: fastUnique (a: b: a < b) # highlighting hack: > |