public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging-next

Browse Source 
Hydra nixpkgs: ?compare=1512490
This commit is contained in:
Vladimír Čunát
2019-04-02 20:56:53 +02:00
parent ba18b47c2a ef5fd41a11
commit 2771375d6e
677 changed files with 14350 additions and 6998 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/X11/ckbcomp/default.nix
View File

@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
name = "ckbcomp-${version}";
version = "1.190";
version = "1.191";
src = fetchFromGitLab {
domain = "salsa.debian.org";
owner = "installer-team";
repo = "console-setup";
rev = version;
sha256 = "0qklm9ww1wap2bs7hp31xkfjyhdrirg2mk4hiv7h6fiqckzmdwvd";
sha256 = "0wplhjadk530fqxhfnizil32rcvkcl5m2r18yskspcib53r4pmim";
};
buildInputs = [ perl ];

6
pkgs/tools/X11/wpgtk/default.nix
View File

@@ -3,13 +3,13 @@
python3Packages.buildPythonApplication rec {
pname = "wpgtk";
version = "5.8.7";
version = "6.0.3";
src = fetchFromGitHub {
owner = "deviantfero";
repo = "wpgtk";
rev = "${version}";
sha256 = "1pwchmipswk5sld1l5p8mdiicb848glnh7r3s5x9qvijp5s57c5i";
rev = version;
sha256 = "1ma1d4h751qnxadfn42h29knq0rl1lgzraifx6ypidjph5i5a10l";
};
buildInputs = [

18
pkgs/tools/X11/xtruss/default.nix Normal file
View File

@@ -0,0 +1,18 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "xtruss";
version = "20181001.82973f5";
src = fetchurl {
url = "https://www.chiark.greenend.org.uk/~sgtatham/xtruss/${pname}-${version}.tar.gz";
sha256 = "1mm8k92zc318jk71wlf2r4rb723nd9lalhjl0pf48raiajb5ifgd";
};
meta = with stdenv.lib; {
description = "easy-to-use X protocol tracing program";
homepage = https://www.chiark.greenend.org.uk/~sgtatham/xtruss;
license = licenses.mit;
maintainers = with maintainers; [ dtzWill ];
};
}

4
pkgs/tools/audio/gvolicon/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook }:
{ stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook }:
stdenv.mkDerivation {
name = "gvolicon-2014-04-28";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
makeWrapper alsaLib gnome3.gtk gdk_pixbuf gnome3.adwaita-icon-theme
makeWrapper alsaLib gtk3 gdk_pixbuf gnome3.adwaita-icon-theme
librsvg wrapGAppsHook
];

6
pkgs/tools/audio/opl3bankeditor/default.nix
View File

@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, qttools, alsaLib }:
stdenv.mkDerivation rec {
version = "2019-01-12";
version = "1.5";
pname = "OPL3BankEditor";
src = fetchFromGitHub {
owner = "Wohlstand";
repo = pname;
rev = "a254c923df5b385e140de6ae42cf4908af8728d3";
sha256 = "181zkr2zkv9xy6zijbzqbqf4z6phg98ramzh9hmwi5zcbw68wkqw";
rev = "v${version}";
sha256 = "16va5xfbyn2m63722ab5yph0l7kmghkbk6dkia93041mfhdyg9rc";
fetchSubmodules = true;
};

24
pkgs/tools/audio/picotts/default.nix Normal file
View File

@@ -0,0 +1,24 @@
{ stdenv, fetchFromGitHub, autoconf, automake, libtool, popt }:
stdenv.mkDerivation {
name = "picotts-unstable-2018-10-19";
src = fetchFromGitHub {
repo = "picotts";
owner = "naggety";
rev = "2f86050dc5da9ab68fc61510b594d8e6975c4d2d";
sha256 = "1k2mdv9llkh77jr4qr68yf0zgjqk87np35fgfmnc3rpdp538sccl";
};
nativeBuildInputs = [ autoconf automake ];
buildInputs = [ libtool popt ];
sourceRoot = "source/pico";
preConfigure = "./autogen.sh";
meta = {
description = "Text to speech voice sinthesizer from SVox.";
homepage = https://github.com/naggety/picotts;
license = stdenv.lib.licenses.asl20;
maintainers = [ stdenv.lib.maintainers.canndrew ];
platforms = stdenv.lib.platforms.linux;
};
}

4
pkgs/tools/backup/bacula/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, sqlite, postgresql, zlib, acl, ncurses, openssl, readline }:
stdenv.mkDerivation rec {
name = "bacula-9.4.1";
name = "bacula-9.4.2";
src = fetchurl {
url = "mirror://sourceforge/bacula/${name}.tar.gz";
sha256 = "0hpxk0f81yx4p1xndsjbwnj7hvvplqlgrw74gv1scq6krabn2pvb";
sha256 = "1878jk541b8gvqbh15f0k3bvki1mx02q8mxnxhn9fdc1qk9083d4";
};
buildInputs = [ postgresql sqlite zlib ncurses openssl readline ]

4
pkgs/tools/backup/dar/default.nix
View File

@@ -3,12 +3,12 @@
with stdenv.lib;
stdenv.mkDerivation rec {
version = "2.6.2";
version = "2.6.3";
name = "dar-${version}";
src = fetchurl {
url = "mirror://sourceforge/dar/${name}.tar.gz";
sha256 = "0bjrv6pxrzmb4d09yikl5wg6hz3llc30xl0ldzik4jzjrr8bcfpn";
sha256 = "00jlmbg80xam3xg1vvrbi5wl6cwij5bz8w80d4k0bmmk4rrwq4rc";
};
buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ]

4
pkgs/tools/bluetooth/bluez-alsa/default.nix
View File

@@ -13,13 +13,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "bluez-alsa-${version}";
version = "1.3.1";
version = "1.4.0";
src = fetchFromGitHub {
owner = "Arkq";
repo = "bluez-alsa";
rev = "v${version}";
sha256 = "1rzcl65gipszsmlcg24gh1xkjkyk4929xhakn6y2smrgwv1zjqdh";
sha256 = "12kc2896rbir8viywd6bjwcklkwf46j4svh9viryn6kmk084nb49";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];

4
pkgs/tools/compression/ncompress/default.nix
View File

@@ -1,7 +1,7 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "ncompress-4.2.4.4";
name = "ncompress-4.2.4.5";
builder = ./builder.sh;
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/project/ncompress/${name}.tar.gz";
sha256 = "0yjiwv1hwb253x3m6r1dq2k7m5c9nz0ib2j7fnm3hark7y6s42xh";
sha256 = "0fwhfijnzggqpbmln82zq7zp6sra7p9arfakswicwi7qsp6vnxgm";
};
meta = {

4
pkgs/tools/filesystems/s3fs/default.nix
View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "s3fs-fuse-${version}";
version = "1.84";
version = "1.85";
src = fetchFromGitHub {
owner = "s3fs-fuse";
repo = "s3fs-fuse";
rev = "v${version}";
sha256 = "1iafzlrqrjyphd1p74q5xzhgacc4gzijq8f6mdkvikbdsibch871";
sha256 = "0sk2b7bxb2wzni1f39l4976dy47s7hqv62l7x7fwcjp62y22nw7m";
};
buildInputs = [ curl openssl libxml2 fuse ];

33
pkgs/tools/graphics/blur-effect/default.nix Normal file
View File

@@ -0,0 +1,33 @@
{ stdenv, fetchFromGitHub, pkgconfig, cmake, gdk_pixbuf, libGL, mesa }:
stdenv.mkDerivation rec {
pname = "blur-effect";
version = "1.1.3";
src = fetchFromGitHub {
owner = "sonald";
repo = pname;
rev = version;
sha256 = "0cjw7iz0p7x1bi4vmwrivfidry5wlkgfgdl9wly88cm3z9ib98jj";
};
nativeBuildInputs = [
pkgconfig
cmake
];
buildInputs = [
gdk_pixbuf
libGL
mesa
];
meta = with stdenv.lib; {
homepage = https://github.com/sonald/blur-effect;
description = "Off-screen image blurring utility using OpenGL ES 3.0";
license = licenses.gpl3;
platforms = platforms.unix;
broken = stdenv.hostPlatform.isDarwin; # packages 'libdrm' and 'gbm' not found
maintainers = with maintainers; [ romildo ];
};
}

6
pkgs/tools/graphics/imgurbash2/default.nix
View File

@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, bash, curl, xsel }:
stdenv.mkDerivation rec {
name = "imgurbash2-${version}";
version = "2.1";
pname = "imgurbash2";
version = "3.1";
src = fetchFromGitHub {
owner = "ram-on";
repo = "imgurbash2";
rev = version;
sha256 = "1vdkyy0gvjqwc2g7a1lqx6cbynfxbd4f66m8sg1xjvd0kdpgi9wk";
sha256 = "1hqghlk8c6svfszhmp02bhkc791lqhqffgiypf05giqmr5d8b9a9";
};
installPhase = ''

4
pkgs/tools/graphics/luxcorerender/default.nix
View File

@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, python35
, tbb, openimageio, libjpeg, libpng, zlib, libtiff, ilmbase
, freetype, openexr, libXdmcp, libxkbcommon, epoxy, at-spi2-core
, dbus, doxygen, qt5, c-blosc, libGLU, gnome3, pcre
, dbus, doxygen, qt5, c-blosc, libGLU, gnome3, gtk3, pcre
, bison, flex, libpthreadstubs, libX11
, embree2, makeWrapper, gsettings-desktop-schemas, glib
, withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp
@@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {
flex libX11 libpthreadstubs python35 libXdmcp libxkbcommon
epoxy at-spi2-core dbus doxygen
# needed for GSETTINGS_SCHEMAS_PATH
gsettings-desktop-schemas glib gnome3.gtk
gsettings-desktop-schemas glib gtk3
# needed for XDG_ICON_DIRS
gnome3.adwaita-icon-theme
makeWrapper

10
pkgs/tools/graphics/oxipng/default.nix
View File

@@ -1,17 +1,17 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
version = "2.2.0";
name = "oxipng-${version}";
version = "2.2.1";
pname = "oxipng";
src = fetchFromGitHub {
owner = "shssoichiro";
repo = "oxipng";
repo = pname;
rev = "v${version}";
sha256 = "00ys1dy8r1g84j04w50qcjas0qnfw4vphazvbfasd9q2b1p5z69l";
sha256 = "1r195x3wdkshjwy23fpqsyyrw7iaj7yb39nhcnx9d4nhgq8w0pcl";
};
cargoSha256 = "125r3jmgwcq8qddm8hjpyzaam96kkifaxixksyaw2iqk9xq0nrpm";
cargoSha256 = "08mw937s61r4fj9bqrg492ss13zkik9557n9yk90r97a81972zbn";
# https://crates.io/crates/cloudflare-zlib#arm-vs-nightly-rust
cargoBuildFlags = [ "--features=cloudflare-zlib/arm-always" ];

4
pkgs/tools/graphics/vulkan-tools/default.nix
View File

@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "vulkan-tools-${version}";
version = "1.1.92";
version = "1.1.101.0";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "Vulkan-Tools";
rev = "sdk-${version}";
sha256 = "1khbfxp2mha7h0vqs0fkqscxm76gn3zlia8yya11lkhk7sn3h0d3";
sha256 = "03227qxa8q19qgzk30h0h49sh03idr6vh9srnrhiziw2vzmahmpp";
};
nativeBuildInputs = [ cmake pkgconfig ];

32
pkgs/tools/graphics/xcur2png/default.nix Normal file
View File

@@ -0,0 +1,32 @@
{ stdenv, fetchFromGitHub, pkgconfig, libpng, xorg }:
stdenv.mkDerivation rec {
pname = "xcur2png";
version = "0.7.1";
src = fetchFromGitHub {
owner = "eworm-de";
repo = pname;
rev = version;
sha256 = "0858wn2p14bxpv9lvaz2bz1rk6zk0g8zgxf8iy595m8fqv4q2fya";
};
nativeBuildInputs = [
pkgconfig
];
buildInputs = [
libpng
xorg.libX11
xorg.libXcursor
xorg.xorgproto
];
meta = with stdenv.lib; {
homepage = https://github.com/eworm-de/xcur2png/releases;
description = "Convert X cursors to PNG images";
license = licenses.gpl3;
platforms = platforms.unix;
maintainers = with maintainers; [ romildo ];
};
}

64
pkgs/tools/graphics/zbar/default.nix
View File

@@ -1,53 +1,35 @@
{ stdenv, fetchurl, imagemagickBig, pkgconfig, python2Packages, perl
, libX11, libv4l, qt4, lzma, gtk2, fetchpatch, autoreconfHook
{ stdenv, fetchFromGitHub, imagemagickBig, pkgconfig, python2Packages, perl
, libX11, libv4l, qt5, lzma, gtk2, xmlto, docbook_xsl, autoreconfHook
, enableVideo ? stdenv.isLinux
}:
let
inherit (python2Packages) pygtk python;
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "zbar";
version = "0.10";
src = fetchurl {
url = "mirror://sourceforge/project/${pname}/${pname}/${version}/${name}.tar.bz2";
sha256 = "1imdvf5k34g1x2zr6975basczkz3zdxg6xnci50yyp5yvcwznki3";
version = "0.22";
src = fetchFromGitHub {
owner = "mchehab";
repo = "zbar";
rev = version;
sha256 = "0pz0vq6a97vnc3lcjw9k12dk2awgmws46cjfh16zin0jiz18d1xq";
};
patches = [
(fetchpatch {
name = "0001-Description-Linux-2.6.38-and-later-do-not-support-th.patch";
url = "https://git.recluse.de/raw/debian/pkg-zbar.git/35182c3ac2430c986579b25f1826fe1b7dfd15de/debian!patches!0001-Description-Linux-2.6.38-and-later-do-not-support-th.patch";
sha256 = "1zy1wdyhmpw877pv6slfhjy0c6dm0gxli0i4zs1akpvh052j4a69";
})
(fetchpatch {
name = "python-zbar-import-fix-am.patch";
url = "https://git.recluse.de/raw/debian/pkg-zbar.git/1f15f52e53ee0bf7b4761d673dc859c6b10e6be5/debian!patches!python-zbar-import-fix-am.patch";
sha256 = "15xx9ms137hvwpynbgvbc6zgmmzfaf7331rfhls24rgbnywbgirx";
})
(fetchpatch {
name = "new_autotools_build_fix.patch";
url = "https://git.recluse.de/raw/debian/pkg-zbar.git/2c641cc94d4f728421ed750d95d6d1c2d06a534d/debian!patches!new_autotools_build_fix.patch";
sha256 = "0jhl5jnnjhfdv51xqimkbkdvj8d38z05fhd11yx1sgmw82f965s3";
})
(fetchpatch {
name = "threading-fix.patch";
url = "https://git.recluse.de/raw/debian/pkg-zbar.git/d3eba6e2c3acb0758d19519015bf1a53ffb8e645/debian!patches!threading-fix.patch";
sha256 = "1jjgrx9nc7788vfriai4z26mm106sg5ylm2w5rdyrwx7420x1wh7";
})
nativeBuildInputs = [ pkgconfig xmlto autoreconfHook docbook_xsl ];
buildInputs = [
imagemagickBig python pygtk perl libX11
] ++ stdenv.lib.optionals enableVideo [
libv4l gtk2 qt5.qtbase qt5.qtx11extras
];
buildInputs =
[ imagemagickBig pkgconfig python pygtk perl libX11
lzma autoreconfHook ] ++
stdenv.lib.optionals enableVideo [ libv4l gtk2 qt4 ];
configureFlags = stdenv.lib.optionals (!enableVideo) [
configureFlags = [
"--with-dbusconfdir=$out/etc/dbus-1/system.d"
] ++ stdenv.lib.optionals (!enableVideo) [
"--disable-video" "--without-gtk" "--without-qt"
];
hardeningDisable = [ "fortify" ];
meta = with stdenv.lib; {
description = "Bar code reader";
longDescription = ''
@@ -57,15 +39,9 @@ in stdenv.mkDerivation rec {
EAN-13/UPC-A, UPC-E, EAN-8, Code 128, Code 39, Interleaved 2 of 5 and QR
Code.
'';
maintainers = with maintainers; [ raskin ];
maintainers = with maintainers; [ delroth raskin ];
platforms = platforms.unix;
license = licenses.lgpl21;
homepage = http://zbar.sourceforge.net/;
};
passthru = {
updateInfo = {
downloadPage = "http://zbar.sourceforge.net/";
};
homepage = https://github.com/mchehab/zbar;
};
}

4
pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
View File

@@ -13,13 +13,13 @@ in
stdenv.mkDerivation rec {
name = "ibus-typing-booster-${version}";
version = "2.5.3";
version = "2.6.0";
src = fetchFromGitHub {
owner = "mike-fabian";
repo = "ibus-typing-booster";
rev = version;
sha256 = "124a6yd7g6ws8s6p5146rhvyjswk001fqncc32jsfmjjgmgisqn2";
sha256 = "1d32p9k9vp64rpmj2cs3552ak9jn54vyi2hqdpzag33v16cydsl4";
};
patches = [ ./hunspell-dirs.patch ];

6
pkgs/tools/misc/bdf2psf/default.nix
View File

@@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, dpkg }:
stdenv.mkDerivation rec {
name = "bdf2psf-${version}";
version = "1.190";
pname = "bdf2psf";
version = "1.191";
src = fetchurl {
url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb";
sha256 = "1dm1lwlnr3ikbl2nkmvj60n9qj5qa0g4dyszrv3qx88m2f6zq99w";
sha256 = "0bqhn9rwrjipj7wd6c8i7rq39fc5jj5nc3mir931mfakknakkimk";
};
buildInputs = [ dpkg ];

4
pkgs/tools/misc/brltty/default.nix
View File

@@ -6,11 +6,11 @@ assert alsaSupport -> alsaLib != null;
assert systemdSupport -> systemd != null;
stdenv.mkDerivation rec {
name = "brltty-5.6";
name = "brltty-6.0";
src = fetchurl {
url = "http://brltty.com/archive/${name}.tar.gz";
sha256 = "06by51n35w0jq14w1vimxk3ssrlmiiw49wpxw29rasc106mpysfn";
sha256 = "0lmp9ab8gp4yv8m3qx4gxns3prrh7kvh8sfcd6vc45h40cgcsjxg";
};
nativeBuildInputs = [ pkgconfig python3.pkgs.cython ];

4
pkgs/tools/misc/broot/default.nix
View File

@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "broot";
version = "0.7.2";
version = "0.7.4";
src = fetchFromGitHub {
owner = "Canop";
repo = pname;
rev = "v${version}";
sha256 = "1hv9plgbwffdv94d8h6qlmazbwi56967wzqvfzr47iigbvx81vwj";
sha256 = "1qi29qy4kwqfbca5ghdmjidpwn2wghr19jwzrrk0xvlq1xb13jfa";
};
cargoSha256 = "0cq78im3hg7wns260gwvajikj80l7kjbg3zycy3nvdx34llgv0n5";

45
pkgs/tools/misc/chafa/default.nix Normal file
View File

@@ -0,0 +1,45 @@
{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, which, libxslt, libxml2, docbook_xml_dtd_412, docbook_xsl, glib, imagemagick, darwin }:
stdenv.mkDerivation rec{
version = "1.0.1";
pname = "chafa";
src = fetchFromGitHub {
owner = "hpjansson";
repo = "chafa";
rev = version;
sha256 = "1i1cnzmb12pxldc7y4q1xdmybv9xkhzrjyhdvmk3qsn02p859q04";
};
nativeBuildInputs = [ autoconf
automake
libtool
pkgconfig
which
libxslt
libxml2
docbook_xml_dtd_412
docbook_xsl
];
buildInputs = [ glib imagemagick ] ++ stdenv.lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices ];
patches = [ ./xmlcatalog_patch.patch ];
preConfigure = ''
./autogen.sh
'';
configureFlags = [ "--enable-man"
"--with-xml-catalog=${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml"
];
meta = with stdenv.lib; {
description = "Terminal graphics for the 21st century.";
homepage = https://hpjansson.org/chafa/;
license = licenses.lgpl3Plus;
platforms = platforms.all;
maintainers = [ maintainers.mog ];
};
}

23
pkgs/tools/misc/chafa/xmlcatalog_patch.patch Normal file
View File

@@ -0,0 +1,23 @@
diff --git a/configure.ac b/configure.ac
index 0055a70..fd4a905 100644
--- a/configure.ac
+++ b/configure.ac
@@ -111,18 +111,6 @@ AS_IF([ test "$enable_man" != no ], [
])
])
-AS_IF([test "$enable_man" != no], [
- dnl check for DocBook XSL stylesheets in the local catalog
- JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl],
- [DocBook XSL Stylesheets], [have_docbook_style=yes],[have_docbook_style=no])
- AS_IF([ test "$have_docbook_style" != yes ], [
- AS_IF([ test "$enable_man" = yes ], [
- AC_MSG_ERROR([DocBook XSL Stylesheets are required for --enable-man])
- ])
- enable_man=no
- ])
-])
-
AM_CONDITIONAL(ENABLE_MAN, test "$enable_man" != no)
AC_MSG_CHECKING([whether to generate man pages])

1
pkgs/tools/misc/colord/default.nix
View File

@@ -56,6 +56,7 @@ stdenv.mkDerivation rec {
"-Dlibcolordcompat=true"
"-Dsane=true"
"-Dvapi=true"
"-Ddaemon_user=colord"
];
nativeBuildInputs = [

4
pkgs/tools/misc/dateutils/default.nix
View File

@@ -1,12 +1,12 @@
{ stdenv, fetchurl, autoreconfHook, tzdata }:
stdenv.mkDerivation rec {
version = "0.4.5";
version = "0.4.6";
name = "dateutils-${version}";
src = fetchurl {
url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${name}.tar.xz";
sha256 = "1pnbc186mnvmyb5rndm0ym50sjihsy6m6crz62xxsjbxggza1mhn";
sha256 = "1kaphw474lz7336awr9rzsgcsr1p9njsjsryd8i0ywg5g8qp3816";
};
nativeBuildInputs = [ autoreconfHook ];

4
pkgs/tools/misc/direnv/default.nix
View File

@@ -2,14 +2,14 @@
buildGoPackage rec {
name = "direnv-${version}";
version = "2.19.2";
version = "2.20.0";
goPackagePath = "github.com/direnv/direnv";
src = fetchFromGitHub {
owner = "direnv";
repo = "direnv";
rev = "v${version}";
sha256 = "1iq9wmc63x1c7g1ixdhd6q3w1sx8xl8kf1bprxwq26n9zpd0g13g";
sha256 = "0ds8abwasymbsn9vak2105gczfgka4mz1i6kf1lvc3zm27v55cij";
};
postConfigure = ''

6
pkgs/tools/misc/ffsend/default.nix
View File

@@ -11,16 +11,16 @@ with rustPlatform;
buildRustPackage rec {
name = "ffsend-${version}";
version = "0.2.38";
version = "0.2.39";
src = fetchFromGitLab {
owner = "timvisee";
repo = "ffsend";
rev = "v${version}";
sha256 = "1kxxcqyilbhzcsnddlf7ha3dd57qj82yvbb9jsssimnlcskx84hx";
sha256 = "0109g2h8673q6kx1lbci59zg9iczj676fvbip3sf1xfypvca22j9";
};
cargoSha256 = "1qxvm2pz01na6nijdn0hlv5hxshiz3pfy6km7n9hjyakwi684a0l";
cargoSha256 = "0yf9zfilj2whhnmbvh8p8vz4gkd8ds21gshylwp4ykqwv5p59nqq";
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ openssl ]

14
pkgs/tools/misc/flashrom/default.nix
View File

@@ -1,19 +1,19 @@
{ lib, stdenv, fetchurl, pkgconfig, libftdi, pciutils }:
let version = "1.0"; in
stdenv.mkDerivation rec {
name = "flashrom-${version}";
version = "1.0.1";
src = fetchurl {
url = "https://download.flashrom.org/releases/${name}.tar.bz2";
sha256 = "0i9wg1lyfg99bld7d00zqjm9f0lk6m0q3h3n9c195c9yysq5ccfb";
url = "https://download.flashrom.org/releases/flashrom-v${version}.tar.bz2";
sha256 = "0i6yrrl69hrqmwd7azj7x3j46m0qpvzmk3b5basym7mnlpfzhyfm";
};
# Newer versions of libusb deprecate some API flashrom uses.
postPatch = ''
substituteInPlace Makefile \
--replace "-Werror" "-Werror -Wno-error=deprecated-declarations -Wno-error=unused-const-variable="
'';
#postPatch = ''
# substituteInPlace Makefile \
# --replace "-Werror" "-Werror -Wno-error=deprecated-declarations -Wno-error=unused-const-variable="
#'';
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libftdi pciutils ];

32
pkgs/tools/misc/html-proofer/Gemfile.lock
View File

@@ -1,42 +1,42 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (5.2.0)
activesupport (5.2.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.5.2)
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
colorize (0.8.1)
concurrent-ruby (1.0.5)
ethon (0.11.0)
concurrent-ruby (1.1.5)
ethon (0.12.0)
ffi (>= 1.3.0)
ffi (1.9.23)
html-proofer (3.8.0)
ffi (1.10.0)
html-proofer (3.10.2)
activesupport (>= 4.2, < 6.0)
addressable (~> 2.3)
colorize (~> 0.8)
mercenary (~> 0.3.2)
nokogiri (~> 1.8.1)
nokogiri (~> 1.9)
parallel (~> 1.3)
typhoeus (~> 1.3)
yell (~> 2.0)
i18n (1.0.1)
i18n (1.6.0)
concurrent-ruby (~> 1.0)
mercenary (0.3.6)
mini_portile2 (2.3.0)
mini_portile2 (2.4.0)
minitest (5.11.3)
nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
parallel (1.12.1)
public_suffix (3.0.2)
nokogiri (1.10.2)
mini_portile2 (~> 2.4.0)
parallel (1.17.0)
public_suffix (3.0.3)
thread_safe (0.3.6)
typhoeus (1.3.0)
typhoeus (1.3.1)
ethon (>= 0.9.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
yell (2.0.7)
yell (2.1.0)
PLATFORMS
ruby
@@ -45,4 +45,4 @@ DEPENDENCIES
html-proofer
BUNDLED WITH
1.14.6
1.17.2

88
pkgs/tools/misc/html-proofer/gemset.nix
View File

@@ -1,23 +1,29 @@
{
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1nkzg31x501l8d1hbygyh1lr4c3vnw88a3c1rxz5ifvvzb10i6zm";
sha256 = "110vp4frgkw3mpzlmshg2f2ig09cknls2w68ym1r1s39d01v0mi8";
type = "gem";
};
version = "5.2.0";
version = "5.2.3";
};
addressable = {
dependencies = ["public_suffix"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l";
type = "gem";
};
version = "2.5.2";
version = "2.6.0";
};
colorize = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "133rqj85n400qk6g3dhf2bmfws34mak1wqihvh3bgy9jhajw580b";
@@ -26,49 +32,61 @@
version = "0.8.1";
};
concurrent-ruby = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf";
sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an";
type = "gem";
};
version = "1.0.5";
version = "1.1.5";
};
ethon = {
dependencies = ["ffi"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0y70szwm2p0b9qfvpqrzjrgm3jz0ig65vlbfr6ppc3z0m1h7kv48";
sha256 = "0gggrgkcq839mamx7a8jbnp2h7x2ykfn34ixwskwb0lzx2ak17g9";
type = "gem";
};
version = "0.11.0";
version = "0.12.0";
};
ffi = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr";
sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p";
type = "gem";
};
version = "1.9.23";
version = "1.10.0";
};
html-proofer = {
dependencies = ["activesupport" "addressable" "colorize" "mercenary" "nokogiri" "parallel" "typhoeus" "yell"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06ggsx2fhsis1iw0sw12a709h99ksbs9kbmv0j05kvbak7b9m51a";
sha256 = "0qwy5cdl5l6rl9cqpcydl4126rwv1f4l9ixf3z6j2rdy979l2jaf";
type = "gem";
};
version = "3.8.0";
version = "3.10.2";
};
i18n = {
dependencies = ["concurrent-ruby"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1milplpsdpxlvn23q6pvir4jgxsphq2ps2jgdb3i29kzpc55gm7y";
sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl";
type = "gem";
};
version = "1.0.1";
version = "1.6.0";
};
mercenary = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "10la0xw82dh5mqab8bl0dk21zld63cqxb1g16fk8cb39ylc4n21a";
@@ -77,14 +95,18 @@
version = "0.3.6";
};
mini_portile2 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
type = "gem";
};
version = "2.3.0";
version = "2.4.0";
};
minitest = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq";
@@ -94,30 +116,38 @@
};
nokogiri = {
dependencies = ["mini_portile2"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "05fm3xh462glvs0rwnfmc1spmgl4ljg2giifynbmwwqvl42zaaiq";
sha256 = "0sy96cc8i5y4p67fhf4d9c6sg8ymrrva21zyvzw55l0pa1582wx2";
type = "gem";
};
version = "1.8.2";
version = "1.10.2";
};
parallel = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01hj8v1qnyl5ndrs33g8ld8ibk0rbcqdpkpznr04gkbxd11pqn67";
sha256 = "1x1gzgjrdlkm1aw0hfpyphsxcx90qgs3y4gmp9km3dvf4hc4qm8r";
type = "gem";
};
version = "1.12.1";
version = "1.17.0";
};
public_suffix = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s";
sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
type = "gem";
};
version = "3.0.2";
version = "3.0.3";
};
thread_safe = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
@@ -127,15 +157,19 @@
};
typhoeus = {
dependencies = ["ethon"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01pd16n6bvknyip42r1r7js0j8x8ly37gmr72z3695zcczh1blyq";
sha256 = "0cni8b1idcp0dk8kybmxydadhfpaj3lbs99w5kjibv8bsmip2zi5";
type = "gem";
};
version = "1.3.0";
version = "1.3.1";
};
tzinfo = {
dependencies = ["thread_safe"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z";
@@ -144,11 +178,13 @@
version = "1.2.5";
};
yell = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1m3q1l33sznrl86myjhd2l7chma1wdcdrdmnf2fi7aydapwd4vib";
sha256 = "161kfwyv7aq983m2gd90c67sqcs0p1z6nhjall2mdr7iz0gqf9wn";
type = "gem";
};
version = "2.0.7";
version = "2.1.0";
};
}

4
pkgs/tools/misc/ms-sys/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "ms-sys-${version}";
version = "2.5.3";
version = "2.6.0";
src = fetchurl {
url = "mirror://sourceforge/ms-sys/${name}.tar.gz";
sha256 = "0mijf82cbji4laip6hiy3l5ka5mzq5sivjvyv7wxnc2fd3v7hgp0";
sha256 = "06xqpm2s9cg8fj7a1822wmh3p4arii0sifssazg1gr6i7xg7kbjz";
};
nativeBuildInputs = [ gettext ];

29
pkgs/tools/misc/paps/default.nix Normal file
View File

@@ -0,0 +1,29 @@
{ stdenv, fetchFromGitHub
, autoconf, automake, pkgconfig, pango }:
stdenv.mkDerivation rec {
pname = "paps";
version = "0.7.0";
src = fetchFromGitHub {
owner = "dov";
repo = pname;
rev = version;
sha256 = "1f0qcawak76zk2xypipb6sy4bd8mixlrjby851x216a7f6z8fd4y";
};
nativeBuildInputs = [ autoconf automake pkgconfig ];
buildInputs = [ pango ];
preConfigure = ''
./autogen.sh
'';
meta = with stdenv.lib; {
description = "Pango to PostScript converter";
homepage = https://github.com/dov/paps;
license = licenses.lgpl2;
maintainers = with maintainers; [ etu ];
platforms = platforms.linux;
};
}

8
pkgs/tools/misc/qt5ct/default.nix
View File

@@ -3,12 +3,12 @@
let inherit (stdenv.lib) getDev; in
stdenv.mkDerivation rec {
name = "qt5ct-${version}";
version = "0.37";
pname = "qt5ct";
version = "0.38";
src = fetchurl {
url = "mirror://sourceforge/qt5ct/${name}.tar.bz2";
sha256 = "0n8csvbpislxjr2s1xi8r5a4q4bqn4kylcy2zws6w7z4m8pdzrny";
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
sha256 = "0p0317z79h906qwaf0p8ga6lmr1dlabkx12gn31bv9lnp9f55jwg";
};
nativeBuildInputs = [ qmake qttools ];

8
pkgs/tools/misc/skim/default.nix
View File

@@ -2,18 +2,18 @@
rustPlatform.buildRustPackage rec {
pname = "skim";
version = "0.6.2";
version = "0.6.4";
src = fetchFromGitHub {
owner = "lotabout";
repo = pname;
rev = "v${version}";
sha256 = "06d2mh60qzm62gn06m1b4pvn9wq2jcna2prgzl69alb6fsfdyp7z";
sha256 = "0ywrqfxxqv7mpm4szw8n3hcvc4jn9a490j9s7qh3vzqgrsx2sxk3";
};
outputs = [ "out" "vim" ];
cargoSha256 = "0jypd49cha6fy8dwji7xqp2vsi2as20lk4zymx8z4ifqj0s2qjyb";
cargoSha256 = "0vxyi7f5p9blv1isngvad8jrgpwmmv3dkr39qsb2i217jx3mzj2i";
patchPhase = ''
sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
postInstall = ''
install -D -m 555 bin/sk-tmux -t $out/bin
install -D -m 644 shell/skim.1 $out/man/man1/skim.1
install -D -m 644 man/man1/* -t $out/man/man1
install -D -m 444 shell/* -t $out/share/skim
install -D -m 444 plugin/skim.vim -t $vim/plugin

4
pkgs/tools/misc/snapper/default.nix
View File

@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "snapper-${version}";
version = "0.8.2";
version = "0.8.3";
src = fetchFromGitHub {
owner = "openSUSE";
repo = "snapper";
rev = "v${version}";
sha256 = "0f3xvvmyln7rjvv4w0zsd4b4d1mzcdx0xrgcscqj2v18xgwwcc4p";
sha256 = "0f3nsqk8820jh08qdh23n01vxbigsfcn9s5qvgqz6jf4pwin6j0x";
};
nativeBuildInputs = [

4
pkgs/tools/misc/ttyplot/default.nix
View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "ttyplot-${version}";
version = "1.1";
version = "1.2";
src = fetchFromGitHub {
owner = "tenox7";
repo = "ttyplot";
rev = version;
sha256 = "0icv40fmf8z3a00csjh4c4svq3y6s6j70jgxjd6zqlxyks9wj7mr";
sha256 = "1xaqzm71w2n0q532wpa3w818mvjvch3h34m2aq7pldkyk09frjxh";
};
buildInputs = [ ncurses ];

39
pkgs/tools/misc/vimpager/build.nix Normal file
View File

@@ -0,0 +1,39 @@
{ stdenv
, fetchFromGitHub
, coreutils
, sharutils
, version
, sha256
}:
stdenv.mkDerivation rec {
inherit version;
name = "vimpager-${version}";
src = fetchFromGitHub {
inherit sha256;
owner = "rkitover";
repo = "vimpager";
rev = "${version}";
};
buildInputs = [ coreutils sharutils ]; # for uuencode
makeFlags = [
"PREFIX=$(out)"
];
buildPhase = ''
sed -i 's,/bin/cat,${coreutils}/bin/cat,g' vimpager
make
'';
meta = with stdenv.lib; {
description = "Use Vim as PAGER";
homepage = "https://www.vim.org/scripts/script.php?script_id = 1723";
license = with licenses; [ bsd2 mit vim ];
platforms = platforms.unix;
};
}

6
pkgs/tools/misc/vimpager/default.nix Normal file
View File

@@ -0,0 +1,6 @@
{ callPackage }:
callPackage ./build.nix {
version = "2.06";
sha256 = "05yr7j72bw64nx7a0y6w9fjmz54zd4g46fn1qjfbbqvbc19fjpl8";
}

7
pkgs/tools/misc/vimpager/latest.nix Normal file
View File

@@ -0,0 +1,7 @@
{ callPackage }:
callPackage ./build.nix {
version = "a4da4dfac44d1bbc6986c5c76fea45a60ebdd8e5";
sha256 = "0gcjpw2q263hh8w2sjvq3f3k2d28qpkkv0jnl8hw1l7v604i8zxg";
}

4
pkgs/tools/misc/websocat/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, rustPlatform
{ stdenv, fetchFromGitHub, rustPlatform, Security
}:
rustPlatform.buildRustPackage rec {
@@ -14,6 +14,8 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "0vkb3jmyb3zg3xiig5vlxhh74m27rvqbkgrwdqzprifn9vcj17ir";
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
meta = with stdenv.lib; {
description = "Command-line client for WebSockets (like netcat/socat)";
homepage = https://github.com/vi/websocat;

4
pkgs/tools/misc/youtube-dl/default.nix
View File

@@ -19,11 +19,11 @@ buildPythonPackage rec {
# The websites youtube-dl deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
version = "2019.03.01";
version = "2019.04.01";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
sha256 = "0bxk6adyppdv50jnp5cika8wc6wfgd6d8zbg1njgmcs1pxskllmf";
sha256 = "0srh04k0p088rxbyxvnhngqyymwqhykqv02sdaqvkl9jhp43r0sm";
};
nativeBuildInputs = [ makeWrapper ];

15
pkgs/tools/networking/autossh/default.nix
View File

@@ -2,14 +2,19 @@
stdenv.mkDerivation rec {
name = "autossh-1.4g";
src = fetchurl {
url = "http://www.harding.motd.ca/autossh/${name}.tgz";
sha256 = "0xqjw8df68f4kzkns5gcah61s5wk0m44qdk2z1d6388w6viwxhsz";
};
buildInputs = [ openssh ];
preConfigure = ''
export ac_cv_func_malloc_0_nonnull=yes
export ac_cv_func_realloc_0_nonnull=yes
'';
nativeBuildInputs = [ openssh ];
installPhase =
''
install -D -m755 autossh $out/bin/autossh || return 1
@@ -19,7 +24,7 @@ stdenv.mkDerivation rec {
install -D -m644 rscreen $out/share/autossh/examples/rscreen || return 1
install -D -m644 autossh.1 $out/man/man1/autossh.1 || return 1
'';
meta = with stdenv.lib; {
homepage = http://www.harding.motd.ca/autossh/;
description = "Automatically restart SSH sessions and tunnels";

1
pkgs/tools/networking/curl/default.nix
View File

@@ -94,6 +94,7 @@ stdenv.mkDerivation rec {
postInstall = ''
moveToOutput bin/curl-config "$dev"
'' + stdenv.lib.optionalString scpSupport ''
sed '/^dependency_libs/s|${libssh2.dev}|${libssh2.out}|' -i "$out"/lib/*.la
'' + stdenv.lib.optionalString gnutlsSupport ''
ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so

4
pkgs/tools/networking/nbd/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, glib, which }:
stdenv.mkDerivation rec {
name = "nbd-3.18";
name = "nbd-3.19";
src = fetchurl {
url = "mirror://sourceforge/nbd/${name}.tar.xz";
sha256 = "0cb0sjiv0j9sh9dk24nrjm7sa0axbrcp2av5hc91g1ryzk764dyq";
sha256 = "1446rdg490fxd8mg5gvrf4nddbw1w7lf2daxy9cpc19yy4968iml";
};
buildInputs = [ glib ]

4
pkgs/tools/networking/ndisc6/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, perl }:
stdenv.mkDerivation rec {
name = "ndisc6-1.0.3";
name = "ndisc6-1.0.4";
src = fetchurl {
url = "https://www.remlab.net/files/ndisc6/archive/${name}.tar.bz2";
sha256 = "08f8xrsck2ykszp12yxx4ssf6wnkn7l6m59456hw3vgjyp5dch8g";
sha256 = "07swyar1hl83zxmd7fqwb2q0c0slvrswkcfp3nz5lknrk15dmcdb";
};
buildInputs = [ perl ];

7
pkgs/tools/networking/network-manager/l2tp/default.nix
View File

@@ -1,17 +1,18 @@
{ stdenv, substituteAll, fetchFromGitHub, autoreconfHook, libtool, intltool, pkgconfig
, file, findutils
, gtk3, networkmanager, ppp, xl2tpd, strongswan, libsecret
, withGnome ? true, gnome3, networkmanagerapplet }:
stdenv.mkDerivation rec {
name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
pname = "NetworkManager-l2tp";
version = "1.2.10";
version = "1.2.12";
src = fetchFromGitHub {
owner = "nm-l2tp";
repo = "network-manager-l2tp";
rev = "${version}";
sha256 = "1vm004nj2n5abpywr7ji6r28scf7xs45zw4rqrm8jn7mysf96h0x";
sha256 = "0cq07kvlm98s8a7l4a3zmqnif8x3307kv7n645zx3f1r7x72b8m4";
};
patches = [
@@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
buildInputs = [ networkmanager ppp ]
++ stdenv.lib.optionals withGnome [ gtk3 libsecret networkmanagerapplet ];
nativeBuildInputs = [ autoreconfHook libtool intltool pkgconfig ];
nativeBuildInputs = [ autoreconfHook libtool intltool pkgconfig file findutils ];
preConfigure = ''
intltoolize -f

10
pkgs/tools/networking/network-manager/l2tp/fix-paths.patch
View File

@@ -1,6 +1,8 @@
--- a/src/nm-l2tp-service.c
+++ b/src/nm-l2tp-service.c
@@ -480,7 +480,7 @@
diff --git a/shared/utils.c b/shared/utils.c
index c978a1f..d2c36cd 100644
--- a/shared/utils.c
+++ b/shared/utils.c
@@ -52,7 +52,7 @@ nm_find_ipsec (void)
{
static const char *ipsec_binary_paths[] =
{
@@ -9,7 +11,7 @@
"/usr/sbin/ipsec",
"/usr/local/sbin/ipsec",
"/sbin/strongswan",
@@ -505,7 +505,7 @@
@@ -77,7 +77,7 @@ nm_find_l2tpd (void)
{
static const char *l2tp_binary_paths[] =
{

5
pkgs/tools/networking/network-manager/strongswan.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, intltool, pkgconfig, networkmanager, strongswanNM
, gnome3, libsecret }:
, gtk3, gnome3, libsecret }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
@@ -11,8 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1xhj5cipwbihf0cna8lpicpz7cd8fgkagpmg0xvj6pshymm5jbcd";
};
buildInputs = [ networkmanager strongswanNM libsecret ]
++ (with gnome3; [ gtk networkmanagerapplet ]);
buildInputs = [ networkmanager strongswanNM libsecret gtk3 gnome3.networkmanagerapplet ];
nativeBuildInputs = [ intltool pkgconfig ];

4
pkgs/tools/networking/openvpn/default.nix
View File

@@ -10,11 +10,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "openvpn-${version}";
version = "2.4.6";
version = "2.4.7";
src = fetchurl {
url = "https://swupdate.openvpn.net/community/releases/${name}.tar.xz";
sha256 = "09lck4wmkas3iyrzaspin9gn3wiclqb1m9sf8diy7j8wakx38r2g";
sha256 = "0j7na936isk9j8nsdrrbw7wmy09inmjqvsb8mw8az7k61xbm6bx4";
};
nativeBuildInputs = [ pkgconfig ];

2
pkgs/tools/networking/p2p/tahoe-lafs/default.nix
View File

@@ -59,7 +59,7 @@ pythonPackages.buildPythonApplication rec {
service-identity pyyaml magic-wormhole treq
];
checkInputs = with pythonPackages; [ hypothesis ];
checkInputs = with pythonPackages; [ hypothesis twisted ];
# Install the documentation.
postInstall = ''

6
pkgs/tools/networking/uget/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, openssl, curl, libnotify,
libappindicator-gtk3, gst_all_1, gnome3, wrapGAppsHook, aria2 ? null
libappindicator-gtk3, gst_all_1, gtk3, gnome3, wrapGAppsHook, aria2 ? null
}:
stdenv.mkDerivation rec {
@@ -16,13 +16,13 @@ stdenv.mkDerivation rec {
intltool
wrapGAppsHook
];
buildInputs = [
openssl
curl
libnotify
libappindicator-gtk3
gnome3.gtk
gtk3
(stdenv.lib.getLib gnome3.dconf)
]
++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ])

4
pkgs/tools/networking/whois/default.nix
View File

@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, perl, gettext, pkgconfig, libidn2, libiconv }:
stdenv.mkDerivation rec {
version = "5.4.1";
version = "5.4.2";
name = "whois-${version}";
src = fetchFromGitHub {
owner = "rfc1036";
repo = "whois";
rev = "v${version}";
sha256 = "01pfil456q3241awilszx5iq1x6kr1rddkraj8yyxyab45l2ssk9";
sha256 = "17i9620gm100plza0qdzfx9nvkvgyb6jcc5g412y5r7wvh7q19mh";
};
nativeBuildInputs = [ perl gettext pkgconfig ];

20
pkgs/tools/package-management/appimagekit/default.nix
View File

@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub
, pkgconfig, cmake, autoconf, automake, libtool
, wget, xxd, desktop-file-utils
, glib, zlib, cairo, openssl, fuse, xz, squashfuse, inotify-tools, libarchive
, pkgconfig, cmake, autoconf, automake, libtool, makeWrapper
, wget, xxd, desktop-file-utils, file
, gnupg, glib, zlib, cairo, openssl, fuse, xz, squashfuse, inotify-tools, libarchive
, squashfsTools
, gtest
}:
@@ -72,9 +72,13 @@ in stdenv.mkDerivation rec {
buildInputs = [
glib zlib cairo openssl fuse
xz inotify-tools libarchive
squashfsTools
squashfsTools makeWrapper
];
postPatch = ''
substituteInPlace src/appimagetool.c --replace "/usr/bin/file" "${file}/bin/file"
'';
preConfigure = ''
export HOME=$(pwd)
'';
@@ -90,6 +94,14 @@ in stdenv.mkDerivation rec {
"-DBUILD_TESTING=${if doCheck then "ON" else "OFF"}"
];
postInstall = ''
cp "${squashfsTools}/bin/mksquashfs" "$out/lib/appimagekit/"
cp "${desktop-file-utils}/bin/desktop-file-validate" "$out/bin"
wrapProgram "$out/bin/appimagetool" \
--prefix PATH : "${stdenv.lib.makeBinPath [ file gnupg ]}"
'';
checkInputs = [ gtest ];
doCheck = false; # fails 1 out of 4 tests, I'm too lazy to debug why

34
pkgs/tools/security/afl/libdislocator.nix Normal file
View File

@@ -0,0 +1,34 @@
{ stdenv, afl}:
stdenv.mkDerivation rec {
version = (builtins.parseDrvName afl.name).version;
name = "libdislocator-${version}";
src = afl.src;
sourceRoot = "${afl.name}/libdislocator";
makeFlags = [ "PREFIX=$(out)" ];
preInstall = ''
mkdir -p $out/lib/afl
'';
postInstall = ''
mkdir $out/bin
cat > $out/bin/get-libdislocator-so <<END
#!${stdenv.shell}
echo $out/lib/afl/libdislocator.so
END
chmod +x $out/bin/get-libdislocator-so
'';
meta = with stdenv.lib; {
homepage = "http://lcamtuf.coredump.cx/afl/";
description = ''
Drop-in replacement for the libc allocator which improves
the odds of bumping into heap-related security bugs in
several ways.
'';
license = stdenv.lib.licenses.asl20;
maintainers = with maintainers; [ ris ];
};
}

43
pkgs/tools/security/browserpass/2.nix Normal file
View File

@@ -0,0 +1,43 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
{ stdenv, buildGoPackage, fetchFromGitHub, gnupg }:
buildGoPackage rec {
name = "browserpass-${version}";
version = "2.0.22";
goPackagePath = "github.com/dannyvankooten/browserpass";
goDeps = ./2deps.nix;
src = fetchFromGitHub {
repo = "browserpass";
owner = "dannyvankooten";
rev = version;
sha256 = "05cacrx08k99c5zra7ksdik9xxn3vih3x6in7536zs5gm55mkbfx";
};
postPatch = ''
substituteInPlace browserpass.go \
--replace /usr/local/bin/gpg ${gnupg}/bin/gpg
'';
postInstall = ''
host_file="$bin/bin/browserpass"
mkdir -p "$bin/etc"
sed -e "s!%%replace%%!$host_file!" go/src/${goPackagePath}/chrome/host.json > chrome-host.json
sed -e "s!%%replace%%!$host_file!" go/src/${goPackagePath}/firefox/host.json > firefox-host.json
install chrome-host.json $bin/etc/
install -D firefox-host.json $bin/lib/mozilla/native-messaging-hosts/com.dannyvankooten.browserpass.json
install go/src/${goPackagePath}/chrome/policy.json $bin/etc/chrome-policy.json
'';
meta = with stdenv.lib; {
description = "A Chrome & Firefox extension for zx2c4's pass";
homepage = https://github.com/dannyvankooten/browserpass;
license = licenses.mit;
platforms = with platforms; linux ++ darwin ++ openbsd;
maintainers = with maintainers; [ rvolosatovs ];
};
}

39
pkgs/tools/security/browserpass/2deps.nix Normal file
View File

@@ -0,0 +1,39 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
[
{
goPackagePath = "github.com/gokyle/twofactor";
fetch = {
type = "git";
url = "https://github.com/gokyle/twofactor";
rev = "eaad1884d40f9cabff98a57a524c17afd00c9fe7";
sha256 = "07kvga6f2b56kpy52a3xk16garvlqz950s350dax97x7cayba95g";
};
}
{
goPackagePath = "github.com/mattn/go-zglob";
fetch = {
type = "git";
url = "https://github.com/mattn/go-zglob";
rev = "4959821b481786922ac53e7ef25c61ae19fb7c36";
sha256 = "0rwkdw143kphpmingsrw1zp030zf3p08f64h347jpdm4lz8z5449";
};
}
{
goPackagePath = "github.com/sahilm/fuzzy";
fetch = {
type = "git";
url = "https://github.com/sahilm/fuzzy";
rev = "a154b19bb758dcdd6ede58dc11ea53c2950527b2";
sha256 = "0jkw6474d5ik2fq2zznqxj4y3p42z47r7mbg856ln5wyara2sg0l";
};
}
{
goPackagePath = "rsc.io/qr";
fetch = {
type = "git";
url = "https://github.com/rsc/qr";
rev = "48b2ede4844e13f1a2b7ce4d2529c9af7e359fc5";
sha256 = "1npxy32glnkvsp0871972jzjzgkwaqmbv6jsj9wgqsa1s2jr004p";
};
}
]

82
pkgs/tools/security/browserpass/default.nix
View File

@@ -1,43 +1,65 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
{ stdenv, buildGoPackage, fetchFromGitHub, gnupg }:
buildGoPackage rec {
name = "browserpass-${version}";
version = "2.0.22";
goPackagePath = "github.com/dannyvankooten/browserpass";
goDeps = ./deps.nix;
{ lib, callPackage, buildGoPackage, fetchFromGitHub, makeWrapper, gnupg }:
let
# For backwards compatibility with v2 of the browser extension, we embed v2
# of the native host in v3. Because the extension will auto-update when it
# is released, this code can be removed from that point on.
# Don't forget to remove v2 references down below and the v2 files in this
# folder
v2 = callPackage ./2.nix {};
in buildGoPackage rec {
pname = "browserpass";
version = "3.0.1";
src = fetchFromGitHub {
repo = "browserpass";
owner = "dannyvankooten";
owner = "browserpass";
repo = "browserpass-native";
rev = version;
sha256 = "05cacrx08k99c5zra7ksdik9xxn3vih3x6in7536zs5gm55mkbfx";
sha256 = "1i3xxysiiapz9y2v0gp13inx7j0d7n0khpmcsy9k95pzn53526dx";
};
nativeBuildInputs = [ makeWrapper ];
goPackagePath = "github.com/browserpass/browserpass-native";
goDeps = ./deps.nix;
postPatch = ''
substituteInPlace browserpass.go \
--replace /usr/local/bin/gpg ${gnupg}/bin/gpg
# Because this Makefile will be installed to be used by the user, patch
# variables to be valid by default
substituteInPlace Makefile \
--replace "PREFIX ?= /usr" ""
'';
postInstall = ''
host_file="$bin/bin/browserpass"
mkdir -p "$bin/etc"
DESTDIR = placeholder "bin";
sed -e "s!%%replace%%!$host_file!" go/src/${goPackagePath}/chrome/host.json > chrome-host.json
sed -e "s!%%replace%%!$host_file!" go/src/${goPackagePath}/firefox/host.json > firefox-host.json
install chrome-host.json $bin/etc/
install -D firefox-host.json $bin/lib/mozilla/native-messaging-hosts/com.dannyvankooten.browserpass.json
install go/src/${goPackagePath}/chrome/policy.json $bin/etc/chrome-policy.json
postConfigure = ''
cd "go/src/$goPackagePath"
make configure
'';
meta = with stdenv.lib; {
description = "A Chrome & Firefox extension for zx2c4's pass";
homepage = https://github.com/dannyvankooten/browserpass;
license = licenses.mit;
platforms = with platforms; linux ++ darwin ++ openbsd;
maintainers = with maintainers; [ rvolosatovs ];
buildPhase = ''
make
'';
installPhase = ''
make install
wrapProgram $bin/bin/browserpass \
--suffix PATH : ${lib.makeBinPath [ gnupg ]}
# This path is used by our firefox wrapper for finding native messaging hosts
mkdir -p $bin/lib/mozilla/native-messaging-hosts
ln -s $bin/lib/browserpass/hosts/firefox/*.json $bin/lib/mozilla/native-messaging-hosts
# These can be removed too, see comment up top
ln -s ${lib.getBin v2}/etc $bin/etc
ln -s ${lib.getBin v2}/lib/mozilla/native-messaging-hosts/* $bin/lib/mozilla/native-messaging-hosts
'';
meta = with lib; {
description = "Browserpass native client app";
homepage = https://github.com/browserpass/browserpass-native;
license = licenses.isc;
platforms = platforms.all;
maintainers = with maintainers; [ rvolosatovs infinisil ];
};
}

84
pkgs/tools/security/browserpass/deps.nix generated
View File

@@ -1,12 +1,21 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
[
{
goPackagePath = "github.com/gokyle/twofactor";
goPackagePath = "github.com/davecgh/go-spew";
fetch = {
type = "git";
url = "https://github.com/gokyle/twofactor";
rev = "eaad1884d40f9cabff98a57a524c17afd00c9fe7";
sha256 = "07kvga6f2b56kpy52a3xk16garvlqz950s350dax97x7cayba95g";
url = "https://github.com/davecgh/go-spew";
rev = "v1.1.1";
sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
};
}
{
goPackagePath = "github.com/konsorten/go-windows-terminal-sequences";
fetch = {
type = "git";
url = "https://github.com/konsorten/go-windows-terminal-sequences";
rev = "v1.0.2";
sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7";
};
}
{
@@ -14,26 +23,71 @@
fetch = {
type = "git";
url = "https://github.com/mattn/go-zglob";
rev = "4959821b481786922ac53e7ef25c61ae19fb7c36";
sha256 = "0rwkdw143kphpmingsrw1zp030zf3p08f64h347jpdm4lz8z5449";
rev = "v0.0.1";
sha256 = "1sncdyq5fbd42al4amyy91h7vlzm3wm6c9vl8za2pjgfgsd581fz";
};
}
{
goPackagePath = "github.com/sahilm/fuzzy";
goPackagePath = "github.com/pmezard/go-difflib";
fetch = {
type = "git";
url = "https://github.com/sahilm/fuzzy";
rev = "a154b19bb758dcdd6ede58dc11ea53c2950527b2";
sha256 = "0jkw6474d5ik2fq2zznqxj4y3p42z47r7mbg856ln5wyara2sg0l";
url = "https://github.com/pmezard/go-difflib";
rev = "v1.0.0";
sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
};
}
{
goPackagePath = "rsc.io/qr";
goPackagePath = "github.com/rifflock/lfshook";
fetch = {
type = "git";
url = "https://github.com/rsc/qr";
rev = "48b2ede4844e13f1a2b7ce4d2529c9af7e359fc5";
sha256 = "1npxy32glnkvsp0871972jzjzgkwaqmbv6jsj9wgqsa1s2jr004p";
url = "https://github.com/rifflock/lfshook";
rev = "b9218ef580f5";
sha256 = "0wxqjcjfg8c0klmdgmbw3ckagby3wg9rkga9ihd4fsf05x5scxrc";
};
}
{
goPackagePath = "github.com/sirupsen/logrus";
fetch = {
type = "git";
url = "https://github.com/sirupsen/logrus";
rev = "v1.4.0";
sha256 = "1y1qjcg19z7q9sy32rhc148kdql2aw7xkcm9d6r1blrl0mdgpx0w";
};
}
{
goPackagePath = "github.com/stretchr/objx";
fetch = {
type = "git";
url = "https://github.com/stretchr/objx";
rev = "v0.1.1";
sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls";
};
}
{
goPackagePath = "github.com/stretchr/testify";
fetch = {
type = "git";
url = "https://github.com/stretchr/testify";
rev = "v1.3.0";
sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "c2843e01d9a2";
sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "fead79001313";
sha256 = "12vwl6sv6w7q0dyvynjhbp67242rhh77d6nlsb22ajr8rf17c63i";
};
}
]

2
pkgs/tools/security/bundler-audit/Gemfile Normal file
View File

@@ -0,0 +1,2 @@
source 'https://rubygems.org'
gem 'bundler-audit'

16
pkgs/tools/security/bundler-audit/Gemfile.lock Normal file
View File

@@ -0,0 +1,16 @@
GEM
remote: https://rubygems.org/
specs:
bundler-audit (0.6.1)
bundler (>= 1.2.0, < 3)
thor (~> 0.18)
thor (0.20.3)
PLATFORMS
ruby
DEPENDENCIES
bundler-audit
BUNDLED WITH
1.14.6

26
pkgs/tools/security/bundler-audit/default.nix Normal file
View File

@@ -0,0 +1,26 @@
{ bundlerEnv, ruby, lib }:
bundlerEnv rec {
name = "${pname}-${version}";
pname = "bundler-audit";
version = (import ./gemset.nix).bundler-audit.version;
inherit ruby;
gemdir = ./.;
meta = with lib; {
description = "Patch-level verification for Bundler";
longDescription = ''
Features:
- Checks for vulnerable versions of gems in Gemfile.lock.
- Checks for insecure gem sources (http://).
- Allows ignoring certain advisories that have been manually worked around.
- Prints advisory information.
- Does not require a network connection.
'';
homepage = https://github.com/rubysec/bundler-audit;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ primeos ];
platforms = platforms.unix;
};
}

19
pkgs/tools/security/bundler-audit/gemset.nix Normal file
View File

@@ -0,0 +1,19 @@
{
bundler-audit = {
dependencies = ["thor"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0pm22xpn3xyymsainixnrk8v3l3xi9bzwkjkspx00cfzp84xvxbq";
type = "gem";
};
version = "0.6.1";
};
thor = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29";
type = "gem";
};
version = "0.20.3";
};
}

4
pkgs/tools/security/clamav/default.nix
View File

@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "clamav-${version}";
version = "0.101.1";
version = "0.101.2";
src = fetchurl {
url = "https://www.clamav.net/downloads/production/${name}.tar.gz";
sha256 = "01mq3z04fjbq5iq8wfwfim72iv3dn04d3ishc5lkhxpmnalqydps";
sha256 = "0d3n4y8i5q594h4cjglmvpk4jd73r9ajpp1bvq5lr9zpdzgyn4ha";
};
# don't install sample config files into the absolute sysconfdir folder

28
pkgs/tools/security/default.nix Normal file
View File

@@ -0,0 +1,28 @@
{ stdenv, pkgs }:
stdenv.mkDerivation rec {
version = "0.0.1";
name = "ecdsatool-${version}";
src = pkgs.fetchFromGitHub {
owner = "kaniini";
repo = "ecdsatool";
rev = "7c0b2c51e2e64d1986ab1dc2c57c2d895cc00ed1";
sha256 = "08z9309znkhrjpwqd4ygvm7cd1ha1qbrnlzw64fr8704jrmx762k";
};
configurePhase = ''
./autogen.sh
./configure --prefix=$out
'';
nativeBuildInputs = with pkgs; [openssl autoconf automake];
buildInputs = with pkgs; [libuecc];
meta = with stdenv.lib; {
description = "Create and manipulate ECC NISTP256 keypairs.";
homepage = https://github.com/kaniini/ecdsatool/;
license = with licenses; [free];
platforms = platforms.unix;
};
}

16
pkgs/tools/security/gnupg/22.nix
View File

@@ -1,5 +1,6 @@
{ fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba
{ fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, libgpgerror
, libiconv, npth, gettext, texinfo, pcsclite, sqlite
, buildPackages
# Each of the dependencies below are optional.
# Gnupg can be built without them at the cost of reduced functionality.
@@ -15,13 +16,14 @@ assert guiSupport -> pinentry != null;
stdenv.mkDerivation rec {
name = "gnupg-${version}";
version = "2.2.14";
version = "2.2.15";
src = fetchurl {
url = "mirror://gnupg/gnupg/${name}.tar.bz2";
sha256 = "0yzqrg24j9fc4f8ss5pclyvg70a9z53sv89vl77xii8yvi3fvy8v";
sha256 = "0m6lyphbb20i84isdxzfhcbzyc682hdrdv4aqkzmhrdksycf536b";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
libgcrypt libassuan libksba libiconv npth gettext texinfo
@@ -36,7 +38,13 @@ stdenv.mkDerivation rec {
''; #" fix Emacs syntax highlighting :-(
pinentryBinaryPath = pinentry.binaryPath or "bin/pinentry";
configureFlags = optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentryBinaryPath}";
configureFlags = [
"--with-libgpg-error-prefix=${libgpgerror.dev}"
"--with-libgcrypt-prefix=${libgcrypt.dev}"
"--with-libassuan-prefix=${libassuan.dev}"
"--with-ksba-prefix=${libksba.dev}"
"--with-npth-prefix=${npth}"
] ++ optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentryBinaryPath}";
postInstall = ''
mkdir -p $out/lib/systemd/user

18
pkgs/tools/security/lastpass-cli/default.nix
View File

@@ -2,15 +2,14 @@
, bash-completion, openssl, curl, libxml2, libxslt }:
stdenv.mkDerivation rec {
name = "lastpass-cli-${version}";
version = "1.3.1";
pname = "lastpass-cli";
version = "1.3.2";
src = fetchFromGitHub {
owner = "lastpass";
repo = "lastpass-cli";
repo = pname;
rev = "v${version}";
sha256 = "11drzmfdvb8ydw1dxaz9zz8rk0jjqmfv076vydz05qqvgx59s38h";
sha256 = "12qjqvqzi3pq7hrdpq59bcxqy6yj1mhx145g9rky1jm2ipzpfayq";
};
nativeBuildInputs = [ asciidoc cmake docbook_xsl pkgconfig ];
@@ -21,11 +20,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
cmakeFlags = [
"-DBASH_COMPLETION_COMPLETIONSDIR=./share/bash-completion/completions"
];
installTargets = [ "install" "install-doc" ];
installTargets = "install install-doc";
postInstall = ''
install -Dm644 -T ../contrib/lpass_zsh_completion $out/share/zsh/site-functions/_lpass
install -Dm644 -T ../contrib/completions-lpass.fish $out/share/fish/vendor_completions.d/lpass.fish
'';
meta = with lib; {
description = "Stores, retrieves, generates, and synchronizes passwords securely";

4
pkgs/tools/security/lynis/default.nix
View File

@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "lynis";
version = "2.7.1";
version = "2.7.2";
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "CISOfy";
repo = "${pname}";
rev = "${version}";
sha256 = "1nv2dqd2k2n8mcdr6xl5g713xxkgvja6487by1wn4k0b416jij9i";
sha256 = "0dbbfk47dpxx7zpb98n4w3ls3z5di57qnr2nsgxjvp49gk9j3f6k";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/tools/security/modsecurity/default.nix
View File

@@ -11,11 +11,11 @@ in
stdenv.mkDerivation rec {
name = "modsecurity-${version}";
version = "2.9.2";
version = "2.9.3";
src = fetchurl {
url = "https://www.modsecurity.org/tarball/${version}/${name}.tar.gz";
sha256 = "41a8f73476ec891f3a9e8736b98b64ea5c2105f1ce15ea57a1f05b4bf2ffaeb5";
sha256 = "0611nskd2y6yagrciqafxdn4rxbdk2v4swf45kc1sgwx2sfh34j1";
};
nativeBuildInputs = [ pkgconfig ];

3
pkgs/tools/security/pass/default.nix
View File

@@ -73,6 +73,9 @@ let
# Link extensions env
rmdir $out/lib/password-store/extensions
ln -s ${extensionsEnv}/lib/password-store/extensions $out/lib/password-store/.
for f in ${extensionsEnv}/share/man/man1/*.1.gz; do
ln -s $f $out/share/man/man1/
done
# Fix program name in --help
substituteInPlace $out/bin/pass \

4
pkgs/tools/security/sslscan/default.nix
View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "sslscan-${version}";
version = "1.11.12";
version = "1.11.13";
src = fetchFromGitHub {
owner = "rbsec";
repo = "sslscan";
rev = "${version}-rbsec";
sha256 = "0wa0z6my6aqjp8si6x522ivk0yy55izbs3ch298gxjw5r15f4jb1";
sha256 = "0sa8iw91wi3515lw761j84wagab1x9rxr0mn8m08qj300z2044yk";
};
buildInputs = [ openssl ];

25
pkgs/tools/security/zzuf/default.nix Normal file
View File

@@ -0,0 +1,25 @@
{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig }:
stdenv.mkDerivation rec {
pname = "zzuf";
version = "0.15";
src = fetchFromGitHub {
owner = "samhocevar";
repo = "zzuf";
rev = "v${version}";
sha256 = "0li1s11xf32dafxq1jbnc8c63313hy9ry09dja2rymk9mza4x2n9";
};
buildInputs = [ autoconf automake libtool pkgconfig ];
preConfigure = "./bootstrap";
meta = with stdenv.lib; {
description = "Transparent application input fuzzer.";
homepage = http://caca.zoy.org/wiki/zzuf;
license = licenses.wtfpl;
platforms = platforms.linux;
maintainers = with maintainers; [ lihop ];
};
}

4
pkgs/tools/system/hwinfo/default.nix
View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "hwinfo-${version}";
version = "21.63";
version = "21.64";
src = fetchFromGitHub {
owner = "opensuse";
repo = "hwinfo";
rev = "${version}";
sha256 = "0rwc30vs7clhl0kmniw4vms1ngx3xl6l1a979hywszvzhgmdclxh";
sha256 = "0jdwd6xvcsyyk03hv0kyz6pn4nzmgn2ynj8gqai1fxh3l8hv48w8";
};
patchPhase = ''

4
pkgs/tools/system/inxi/default.nix
View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "inxi-${version}";
version = "3.0.32-1";
version = "3.0.33-1";
src = fetchFromGitHub {
owner = "smxi";
repo = "inxi";
rev = version;
sha256 = "171xdip2alkp3g0k0sanaavvdcz6d0wlldj9lgj11xsdbhaaknnv";
sha256 = "19bfdid4zp39irsdq3m6yyqf2336c30da35qgslrzcr2vh815g8c";
};
buildInputs = [ perl ];

4
pkgs/tools/system/logcheck/default.nix
View File

@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "logcheck-${version}";
version = "1.3.19";
version = "1.3.20";
_name = "logcheck_${version}";
src = fetchurl {
url = "mirror://debian/pool/main/l/logcheck/${_name}.tar.xz";
sha256 = "1a9ccy92lg1lnx86di6i1wpdv4ccf5w7gials2iyq5915c4lqa86";
sha256 = "1rmkvxhcwr9gb6z4dlgr6rrx5l70hshlxdggs6qx0w1ljcmx1dlz";
};
prePatch = ''

4
pkgs/tools/system/monit/default.nix
View File

@@ -6,11 +6,11 @@
}:
stdenv.mkDerivation rec {
name = "monit-5.25.2";
name = "monit-5.25.3";
src = fetchurl {
url = "${meta.homepage}dist/${name}.tar.gz";
sha256 = "0jn6mdsh50zd3jc61hr1y8sd80r01gqcyvd860zf8m8i3lvfc35a";
sha256 = "0s8577ixcmx45b081yx6cw54iq7m5yzpq3ir616qc84xhg45h0n1";
};
nativeBuildInputs = [ bison flex ];

4
pkgs/tools/system/syslog-ng/default.nix
View File

@@ -11,11 +11,11 @@ in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
version = "3.19.1";
version = "3.20.1";
src = fetchurl {
url = "https://github.com/balabit/${pname}/releases/download/${name}/${name}.tar.gz";
sha256 = "0y2ixmbl4af4yf0a56pmg1c00nh0yvlfwr9ck9nhxbdysylk3yaw";
sha256 = "185xixf48rp6isg2bs2y0hm6kf6a8ncncqgz4fd12jf6x6pmhn56";
};
nativeBuildInputs = [ pkgconfig which ];

40
pkgs/tools/text/poedit/default.nix
View File

@@ -1,20 +1,46 @@
{ stdenv, fetchurl, wxGTK29, boost }:
{ stdenv, fetchurl, autoconf, automake, libtool, gettext, pkgconfig, wxGTK30,
boost, icu, lucenepp, asciidoc, libxslt, xmlto, gtk2, gtkspell2, pugixml,
nlohmann_json, hicolor-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "poedit-1.5.7";
name = "poedit-${version}";
version = "2.2.1";
src = fetchurl {
url = "mirror://sourceforge/poedit/${name}.tar.gz";
sha256 = "0y0gbkb1jvp61qhh8sh7ar8849mwirizc42pk57zpxy84an5qlr4";
url = "https://github.com/vslavik/poedit/archive/v${version}-oss.tar.gz";
sha256 = "0brj6ysisxng2xn8l9ii2rngsj5b4rk27hzfjbp3zwb2caagd3vq";
};
buildInputs = [ wxGTK29 boost ];
nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook
libxslt xmlto boost libtool pkgconfig ];
buildInputs = [ lucenepp nlohmann_json wxGTK30 icu pugixml gtk2 gtkspell2 hicolor-icon-theme ];
propagatedBuildInputs = [ gettext ];
preConfigure = "
patchShebangs bootstrap
./bootstrap
";
configureFlags = [
"--without-cld2"
"--without-cpprest"
"--with-boost-libdir=${boost.out}/lib"
"CPPFLAGS=-I${nlohmann_json}/include/nlohmann/"
];
preFixup = ''
gappsWrapperArgs+=(--prefix PATH : "${stdenv.lib.makeBinPath [ gettext ]}")
'';
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Cross-platform gettext catalogs (.po files) editor";
homepage = http://www.poedit.net/;
homepage = https://www.poedit.net/;
license = licenses.mit;
platforms = platforms.unix;
maintainers = with maintainers; [ domenkozar ];
maintainers = with maintainers; [ domenkozar genesis ];
};
}

30
pkgs/tools/typesetting/pdfsandwich/default.nix Normal file
View File

@@ -0,0 +1,30 @@
{ stdenv, ocaml, makeWrapper, fetchsvn, ghostscript, imagemagick, perl, poppler_utils, tesseract, unpaper }:
stdenv.mkDerivation rec {
version = "0.1.7";
pname = "pdfsandwich";
src = fetchsvn {
url = "svn://svn.code.sf.net/p/pdfsandwich/code/trunk/src";
rev = "75";
sha256 = "1420c33divch087xrr61lvyf975bapqkgjqaighl581i69nlzsm6";
};
buildInputs = [ ocaml perl makeWrapper];
installPhase = ''
mkdir -p $out/bin
cp -p pdfsandwich $out/bin
wrapProgram $out/bin/pdfsandwich --prefix PATH : ${stdenv.lib.makeBinPath [ imagemagick ghostscript poppler_utils unpaper tesseract ]}
mkdir -p $out/man/man1
cp -p pdfsandwich.1.gz $out/man/man1
'';
meta = with stdenv.lib; {
description = "OCR tool for scanned PDFs";
homepage = http://www.tobias-elze.de/pdfsandwich/;
license = licenses.gpl2;
maintainers = [ maintainers.rps ];
platforms = platforms.linux;
};
}

9
pkgs/tools/typesetting/tex/texlive/combine.nix
View File

@@ -87,7 +87,8 @@ in buildEnv {
export TEXMFSYSVAR="$out/share/texmf-var"
export PERL5LIB="$out/share/texmf/scripts/texlive"
'' +
# patch texmf-{dist,local} -> texmf to be sure
# patch texmf-dist -> $out/share/texmf
# patch texmf-local -> $out/share/texmf-local
# TODO: perhaps do lua actions?
# tried inspiration from install-tl, sub do_texmf_cnf
''
@@ -99,8 +100,7 @@ in buildEnv {
rm ./texmfcnf.lua
sed \
-e 's,texmf-dist,texmf,g' \
-e 's,texmf-local,texmf,g' \
-e "s,\(TEXMFLOCAL[ ]*=[ ]*\)[^\,]*,\1\"$out/share/texmf\",g" \
-e "s,\(TEXMFLOCAL[ ]*=[ ]*\)[^\,]*,\1\"$out/share/texmf-local\",g" \
-e "s,\$SELFAUTOLOC,$out,g" \
-e "s,selfautodir:/,$out/share/,g" \
-e "s,selfautodir:,$out/share/,g" \
@@ -116,7 +116,6 @@ in buildEnv {
rm ./texmf.cnf
sed \
-e 's,texmf-dist,texmf,g' \
-e 's,texmf-local,texmf,g' \
-e "s,\$SELFAUTOLOC,$out,g" \
-e "s,\$SELFAUTODIR,$out/share,g" \
-e "s,\$SELFAUTOPARENT,$out/share,g" \
@@ -126,6 +125,8 @@ in buildEnv {
patchCnfLua "./texmfcnf.lua"
mkdir $out/share/texmf-local
rm updmap.cfg
)
'' +

22
pkgs/tools/virtualization/rootlesskit/default.nix Normal file
View File

@@ -0,0 +1,22 @@
{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "rootlesskit-${version}";
version = "0.3.0-alpha.2";
goPackagePath = "github.com/rootless-containers/rootlesskit";
src = fetchFromGitHub {
owner = "rootless-containers";
repo = "rootlesskit";
rev = "v${version}";
sha256 = "11y4hcrpayyyi9j3b80ilccxs5bbwnqfpi5nsjgmjb9v01z35fw6";
};
meta = with lib; {
homepage = https://github.com/rootless-containers/rootlesskit;
description = ''Kind of Linux-native "fake root" utility, made for mainly running Docker and Kubernetes as an unprivileged user'';
license = licenses.asl20;
maintainers = with maintainers; [ offline ];
platforms = platforms.linux;
};
}