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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Vladimír Čunát
2017-02-20 21:24:35 +01:00
parent 292efffb62 dd054e890f
commit 5a38ab8add
236 changed files with 4238 additions and 2752 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
pkgs/tools/admin/intecture/agent.nix Normal file
View File

@@ -0,0 +1,29 @@
{ stdenv, lib, fetchFromGitHub, rustPlatform
, openssl, zeromq, czmq, pkgconfig, cmake, zlib }:
with rustPlatform;
buildRustPackage rec {
name = "intecture-agent-${version}";
version = "0.3.0";
src = fetchFromGitHub {
owner = "intecture";
repo = "agent";
rev = version;
sha256 = "0b59ij9c7hv2p4jx96f3acbygw27wiv8cfzzg6sg73l6k244k6l6";
};
depsSha256 = "1f94j54pg94f2x2lmmyj8dlki8plq6vnppmf3hzk3kd0rp7fzban";
buildInputs = [ openssl zeromq czmq zlib ];
nativeBuildInputs = [ pkgconfig cmake ];
meta = with lib; {
description = "Authentication client/server for Intecture components";
homepage = https://intecture.io;
license = licenses.mpl20;
maintainers = [ maintainers.rushmorem ];
};
}

29
pkgs/tools/admin/intecture/auth.nix Normal file
View File

@@ -0,0 +1,29 @@
{ stdenv, lib, fetchFromGitHub, rustPlatform
, openssl, zeromq, czmq, pkgconfig, cmake, zlib }:
with rustPlatform;
buildRustPackage rec {
name = "intecture-auth-${version}";
version = "0.1.0";
src = fetchFromGitHub {
owner = "intecture";
repo = "auth";
rev = version;
sha256 = "1p3jahha8k139f22ijg050cl8akfzxda4gzvijpqv869hmhc70py";
};
depsSha256 = "0mki57yzb29y9fhh16xvpi5gfp6c14r5q3f45f3v8sdj95rjahz1";
buildInputs = [ openssl zeromq czmq zlib ];
nativeBuildInputs = [ pkgconfig cmake ];
meta = with lib; {
description = "Authentication client/server for Intecture components";
homepage = https://intecture.io;
license = licenses.mpl20;
maintainers = [ maintainers.rushmorem ];
};
}

32
pkgs/tools/admin/intecture/cli.nix Normal file
View File

@@ -0,0 +1,32 @@
{ stdenv, lib, fetchFromGitHub, rustPlatform
, openssl, zeromq, czmq, pkgconfig, cmake, zlib }:
with rustPlatform;
buildRustPackage rec {
name = "intecture-cli-${version}";
version = "0.3.2";
src = fetchFromGitHub {
owner = "intecture";
repo = "cli";
rev = version;
sha256 = "0f5pyrlkxzz4kdfzwambxzqr48g3n06f1pv163h06ggssqa51wbc";
};
depsSha256 = "0f3rhjs5addppva4cjx3ngpa5gz2i2n46hyc3zd4l7lhh8gaggix";
buildInputs = [ openssl zeromq czmq zlib ];
nativeBuildInputs = [ pkgconfig cmake ];
# Needed for tests
USER = "$(whoami)";
meta = with lib; {
description = "A developer friendly, language agnostic configuration management tool for server systems";
homepage = https://intecture.io;
license = licenses.mpl20;
maintainers = [ maintainers.rushmorem ];
};
}

26
pkgs/tools/admin/simp_le/default.nix
View File

@@ -1,20 +1,28 @@
{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages }:
pythonPackages.buildPythonApplication rec {
name = "simp_le-2016-12-16";
pname = "simp_le-client";
version = "0.1.1";
name = "${pname}-${version}";
# kuba/simp_le seems unmaintained
src = fetchFromGitHub {
owner = "zenhack";
repo = "simp_le";
rev = "63a43b8547cd9fbc87db6bcd9497c6e37f73abef";
sha256 = "04dr8lvcpi797722lsy06nxhlihrxdqgdy187pg3hl1ki2iq3ixx";
src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "18y8mg0s0i2bs57pi6mbkwgjlr5mmivchiyvrpcbdmkg9qlbfwaa";
};
propagatedBuildInputs = with pythonPackages; [ acme ];
prePatch = ''
substituteInPlace setup.py \
--replace 'acme>=0.9,<0.10' acme
'';
checkPhase = ''
$out/bin/simp_le --test
'';
propagatedBuildInputs = with pythonPackages; [ acme setuptools_scm ];
meta = with stdenv.lib; {
inherit (src.meta) homepage;
homepage = "https://github.com/zenhack/simp_le";
description = "Simple Let's Encrypt client";
license = licenses.gpl3;
maintainers = with maintainers; [ gebner nckx ];

13
pkgs/tools/audio/beets/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, writeScript, glibcLocales
, pythonPackages, imagemagick
, pythonPackages, imagemagick, gobjectIntrospection, gst_all_1
, enableAcousticbrainz ? true
, enableAcoustid ? true
@@ -93,6 +93,9 @@ in pythonPackages.buildPythonApplication rec {
pythonPackages.pathlib
pythonPackages.pyyaml
pythonPackages.unidecode
pythonPackages.gst-python
pythonPackages.pygobject3
gobjectIntrospection
] ++ optional enableAcoustid pythonPackages.pyacoustid
++ optional (enableFetchart
|| enableEmbyupdate
@@ -119,7 +122,11 @@ in pythonPackages.buildPythonApplication rec {
nose
rarfile
responses
];
] ++ (with gst_all_1; [
gst-plugins-base
gst-plugins-good
gst-plugins-ugly
]);
patches = [
./replaygain-default-bs1770gain.patch
@@ -198,6 +205,8 @@ in pythonPackages.buildPythonApplication rec {
runHook postInstallCheck
'';
makeWrapperArgs = [ "--set GI_TYPELIB_PATH \"$GI_TYPELIB_PATH\"" "--set GST_PLUGIN_SYSTEM_PATH_1_0 \"$GST_PLUGIN_SYSTEM_PATH_1_0\"" ];
meta = {
description = "Music tagger and library organizer";
homepage = http://beets.radbox.org;

14
pkgs/tools/compression/brotli/default.nix
View File

@@ -1,25 +1,19 @@
{ stdenv, fetchFromGitHub }:
{ stdenv, fetchFromGitHub, cmake }:
# ?TODO: there's also python lib in there
stdenv.mkDerivation rec {
name = "brotli-${version}";
version = "0.3.0";
version = "0.5.2";
src = fetchFromGitHub {
owner = "google";
repo = "brotli";
rev = "v" + version;
sha256 = "1ijwr8fbrajp4gh8x6lrrpf8gymm0i6w06s97rv294q5dcszn299";
sha256 = "0wjypkzhbv30x30j2z8ba45r6nm4k98hsa4i42kqx03vzarsr2l4";
};
preConfigure = "cd tools";
# Debian installs "brotli" instead of "bro" but let's keep upstream choice for now.
installPhase = ''
mkdir -p "$out/bin"
mv ./bro "$out/bin/"
'';
buildInputs = [ cmake ];
meta = with stdenv.lib; {
inherit (src.meta) homepage;

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

@@ -3,10 +3,10 @@
stdenv.mkDerivation rec {
name = "zstd-${version}";
version = "1.1.1";
version = "1.1.3";
src = fetchFromGitHub {
sha256 = "18snd1jiz0j6r1yk4vkgqmil2gbzwxgmcv2chvpnc5i93pp18hri";
sha256 = "1d46hs6pyq55izcmnk7hzvbl8iyxh7bp7qchc7rl8ay396ax2sd5";
rev = "v${version}";
repo = "zstd";
owner = "facebook";

26
pkgs/tools/filesystems/btrfs-dedupe/default.nix Normal file
View File

@@ -0,0 +1,26 @@
{ stdenv, fetchurl, rustPlatform, lzo, zlib }:
with rustPlatform;
buildRustPackage rec {
name = "btrfs-dedupe-${version}";
version = "1.1.0";
src = fetchurl {
url = "https://gitlab.wellbehavedsoftware.com/well-behaved-software/btrfs-dedupe/repository/archive.tar.bz2?ref=72c6a301d20f935827b994db210bf0a1e121273a";
sha256 = "0qy1g4crhfgs2f5cmrsjv6qscg3r66gb8n6sxhimm9ksivhjyyjp";
};
depsSha256 = "04jlz7nzsmg86i73w75i8rmlbk635xrg8m1dfac8h17dwb29yj6a";
buildInputs = [ lzo zlib ];
meta = with stdenv.lib; {
homepage = "https://gitlab.wellbehavedsoftware.com/well-behaved-software/btrfs-dedupe";
description = "BTRFS deduplication utility";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ ikervagyok ];
};
}

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

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libuuid }:
stdenv.mkDerivation rec {
name = "e2fsprogs-1.43.3";
name = "e2fsprogs-1.43.4";
src = fetchurl {
url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz";
sha256 = "09wrn60rlqdgjkmm09yv32zxdjba2pd4ya3704bhywyln2xz33nf";
sha256 = "a648a90a513f1b25113c7f981af978b8a19f832b3a32bd10707af3ff682ba66d";
};
outputs = [ "bin" "dev" "out" "man" ];

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

@@ -1,11 +1,13 @@
{stdenv, fetchurl, autoconf, automake, pkgconfig, curl, openssl, libxml2, fuse}:
stdenv.mkDerivation {
name = "s3fs-fuse-1.79";
name = "s3fs-fuse-1.80";
src = fetchurl {
url = https://github.com/s3fs-fuse/s3fs-fuse/archive/v1.79.tar.gz;
sha256 = "0rmzkngzq040g020pv75qqx3jy34vdxzqvxz29k6q8yfb3wpkhb1";
url = https://github.com/s3fs-fuse/s3fs-fuse/archive/v1.80.tar.gz;
sha256 = "0ddx5khlyyrxm4s8is4gqbczmrcivj11hmkk9s893r3kpp4q30yy";
};
preConfigure = "./autogen.sh";
buildInputs = [ autoconf automake pkgconfig curl openssl libxml2 fuse ];

13
pkgs/tools/graphics/netpbm/default.nix
View File

@@ -1,13 +1,16 @@
{ lib, stdenv, fetchurl, pkgconfig, libjpeg, libpng, flex, zlib, perl, libxml2
{ lib, stdenv, fetchsvn, pkgconfig, libjpeg, libpng, flex, zlib, perl, libxml2
, makeWrapper, libtiff
, enableX11 ? false, libX11 }:
stdenv.mkDerivation rec {
name = "netpbm-10.70.00";
# Determine version and revision from:
# https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced
name = "netpbm-10.77.02";
src = fetchurl {
url = "mirror://gentoo/distfiles/${name}.tar.xz";
sha256 = "14vxmzbwsy4rzrqjnzr4cvz1s0amacq69faps3v1j1kr05lcns0j";
src = fetchsvn {
url = "svn://svn.code.sf.net/p/netpbm/code/advanced";
rev = 2883;
sha256 = "1lxa5gasmqrwgihkk8ij7vb9kgdw3d5mp25kydkrf6x4wibg1w5f";
};
postPatch = /* CVE-2005-2471, from Arch */ ''

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

@@ -6,12 +6,12 @@ let
pythonPackages = python3Packages;
in
pythonPackages.buildPythonApplication rec {
version = "0.14.0";
version = "0.14.1";
name = "vdirsyncer-${version}";
src = fetchurl {
url = "mirror://pypi/v/vdirsyncer/${name}.tar.gz";
sha256 = "1mbh2gykx9sqsnyfa962ifxksx4afl2lb9rcsbd6rsh3gj2il898";
sha256 = "044f01fjd8dpz4y9dm3qcc1a8cihcxxbr1sz6y6fkvglpb6k85y5";
};
propagatedBuildInputs = with pythonPackages; [

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

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, buildPythonApplication, makeWrapper, zip, ffmpeg, rtmpdump, pandoc
, atomicparsley
{ stdenv, fetchurl, buildPythonApplication
, zip, ffmpeg, rtmpdump, atomicparsley, pandoc
# Pandoc is required to build the package's man page. Release tarballs contain a
# formatted man page already, though, it will still be installed. We keep the
# manpage argument in place in case someone wants to use this derivation to
@@ -8,29 +8,31 @@
, generateManPage ? false
, ffmpegSupport ? true
, rtmpSupport ? true
}:
, makeWrapper }:
with stdenv.lib;
buildPythonApplication rec {
name = "youtube-dl-${version}";
version = "2017.02.16";
version = "2017.02.17";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
sha256 = "21a5014f25d8ad2882999dd8cbf8cc2fd13c42116f5fe7b4781c982421ea59b0";
sha256 = "06k0g3s0c27f0kwhvm2gpk01q0q0cbhqh09zvh19svl1zc2ky72b";
};
buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc;
buildInputs = [ zip makeWrapper ] ++ optional generateManPage pandoc;
# Ensure ffmpeg is available in $PATH for post-processing & transcoding support.
# rtmpdump is required to download files over RTMP
# atomicparsley for embedding thumbnails
postInstall = let
packagesthatwillbeusedbelow = [ atomicparsley ] ++ optional ffmpegSupport ffmpeg ++ optional rtmpSupport rtmpdump;
packagesToBinPath =
[ atomicparsley ]
++ optional ffmpegSupport ffmpeg
++ optional rtmpSupport rtmpdump;
in ''
wrapProgram $out/bin/youtube-dl --prefix PATH : "${makeBinPath packagesthatwillbeusedbelow}"
wrapProgram $out/bin/youtube-dl --prefix PATH : "${makeBinPath packagesToBinPath}"
'';
# Requires network

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

@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "fping-3.15";
name = "fping-3.16";
src = fetchurl {
url = "http://www.fping.org/dist/${name}.tar.gz";
sha256 = "072jhm9wpz1bvwnwgvz24ijw0xwwnn3z3zan4mgr5s5y6ml8z54n";
sha256 = "2f753094e4df3cdb1d99be1687c0fb7d2f14c0d526ebf03158c8c5519bc78f54";
};
configureFlags = [ "--enable-ipv6" "--enable-ipv4" ];

4
pkgs/tools/networking/http-prompt/default.nix
View File

@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, pythonPackages, httpie }:
pythonPackages.buildPythonApplication rec {
version = "0.8.0";
version = "0.9.1";
name = "http-prompt";
src = fetchFromGitHub {
rev = "v${version}";
repo = "http-prompt";
owner = "eliangcs";
sha256 = "0zvkmdc6mhc5kk7cbrgzxsl8n2d02gnxy1sppm83mhwx6s1dkz30";
sha256 = "0s2syjjz5n7256a4hn8gv3xfr0zd3qqimf4w8l188dbfvx8b8s06";
};
propagatedBuildInputs = with pythonPackages; [

15
pkgs/tools/networking/isync/unstable.nix
View File

@@ -1,17 +1,17 @@
{ fetchgit, stdenv, openssl, pkgconfig, db, cyrus_sasl
{ fetchgit, stdenv, openssl, pkgconfig, db, cyrus_sasl, zlib
, autoconf, automake }:
stdenv.mkDerivation rec {
name = "isync-git-2015-11-08";
rev = "46e792";
name = "isync-git-20161218";
rev = "77acc268123b8233843ca9bc3dcf90669efde08f";
src = fetchgit {
url = "git://git.code.sf.net/p/isync/isync";
url = "https://git.code.sf.net/p/isync/isync";
inherit rev;
sha256 = "02bm5m3bwpfns7qdwfybyl4fwa146n55v67pdchkhxaqpa4ddws1";
sha256 = "0i21cgmgm8acvd7xwdk9pll3kl6cxj9s1hakqzbwks8j4ncygwkj";
};
buildInputs = [ openssl pkgconfig db cyrus_sasl autoconf automake ];
buildInputs = [ openssl pkgconfig db cyrus_sasl zlib autoconf automake ];
preConfigure = ''
touch ChangeLog
@@ -22,8 +22,7 @@ stdenv.mkDerivation rec {
homepage = http://isync.sourceforge.net/;
description = "Free IMAP and MailDir mailbox synchronizer";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ the-kenny ];
maintainers = with maintainers; [ the-kenny ttuegel ];
platforms = platforms.unix;
};
}

38
pkgs/tools/networking/keepalived/default.nix
View File

@@ -1,33 +1,29 @@
{ stdenv, fetchurl, openssl, net_snmp, libnl }:
{ stdenv, fetchFromGitHub, libnfnetlink, libnl, net_snmp, openssl, pkgconfig }:
stdenv.mkDerivation rec {
name = "keepalived-1.2.19";
name = "keepalived-${version}";
version = "1.3.4";
src = fetchurl {
url = "http://keepalived.org/software/${name}.tar.gz";
sha256 = "0lrq963pxhgh74qmxjyy5hvxdfpm4r50v4vsrp559n0w5irsxyrj";
src = fetchFromGitHub {
owner = "acassen";
repo = "keepalived";
rev = "v${version}";
sha256 = "0vmflvr7j53dhpfawd1l2kkqw9prs2vl6r4a8rv5ilrrj3j0q989";
};
buildInputs = [ openssl net_snmp libnl ];
buildInputs = [
libnfnetlink
libnl
net_snmp
openssl
];
postPatch = ''
sed -i 's,$(DESTDIR)/usr/share,$out/share,g' Makefile.in
'';
# It doesn't know about the include/libnl<n> directory
NIX_CFLAGS_COMPILE="-I${libnl.dev}/include/libnl3";
NIX_LDFLAGS="-lnl-3 -lnl-genl-3";
nativeBuildInputs = [ pkgconfig ];
configureFlags = [
"--sysconfdir=/etc"
"--localstatedir=/var"
"--enable-snmp"
"--enable-sha1"
];
installFlags = [
"sysconfdir=\${out}/etc"
];
"--enable-snmp"
];
meta = with stdenv.lib; {
homepage = http://keepalived.org;

9
pkgs/tools/networking/wuzz/default.nix
View File

@@ -1,16 +1,17 @@
{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "wuzz-${version}";
version = "2017-02-09";
version = "0.2.0";
rev = "v${version}";
goPackagePath = "https://github.com/asciimoo/wuzz";
src = fetchFromGitHub {
owner = "asciimoo";
repo = "wuzz";
rev = "dd696dc6e014e08b6042a71dca600356eb3156c2";
sha256 = "0m7jcb6rk0cb3giz1cbfhy3h4nzjl6qrk2k6czhn9267688rznpx";
inherit rev;
sha256 = "1fcr5jr0vn5w60bn08lkh2mi0hdarwp361h94in03139j7hhqrfs";
};
goDeps = ./deps.nix;

67
pkgs/tools/networking/wuzz/deps.nix
View File

@@ -4,8 +4,8 @@
fetch = {
type = "git";
url = "https://github.com/jroimartin/gocui";
rev = "7ac95c981b8a07b624ab197b3ad5813fdfbe4864";
sha256 = "1xr752gpjv32mnzzy5v367maczl7sn8frn258wqrs6gqf07sdmjp";
rev = "ed41d1bd2c217d4d1e312c2ee5d2f0c7793a99cc";
sha256 = "1h4jxhvkf43jsbn85w45fq2xsmcg08mc9g7pkxf880g6sqznrmcz";
};
}
{
@@ -26,4 +26,67 @@
sha256 = "0y6yq9zd4kh7fimnc00r3h9pr2pwa5j85b3jcn5dyfamsnm2xdsv";
};
}
{
goPackagePath = "github.com/mitchellh/go-homedir";
fetch = {
type = "git";
url = "https://github.com/mitchellh/go-homedir";
rev = "b8bc1bf767474819792c23f32d8286a45736f1c6";
sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q";
};
}
{
goPackagePath = "github.com/BurntSushi/toml";
fetch = {
type = "git";
url = "https://github.com/BurntSushi/toml";
rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4";
sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw";
};
}
{
goPackagePath = "github.com/nwidger/jsoncolor";
fetch = {
type = "git";
url = "https://github.com/nwidger/jsoncolor";
rev = "0192e84d44af834c3a90c8a17bf670483b91ad5a";
sha256 = "17mndgd1d233c22bd19xv4v2l2i5k8kz7y6n4n54a9i7fi9d10al";
};
}
{
goPackagePath = "github.com/fatih/color";
fetch = {
type = "git";
url = "https://github.com/fatih/color";
rev = "e8e01ee22a7d4a91b49646e39245fe08e69c7878";
sha256 = "1660g29qhshk6zxhpnc0f52m69jdqqdw2ccbkqw9y4kilnripfvl";
};
}
{
goPackagePath = "github.com/mattn/go-isatty";
fetch = {
type = "git";
url = "https://github.com/mattn/go-isatty";
rev = "30a891c33c7cde7b02a981314b4228ec99380cca";
sha256 = "03gsxn89pgkj4jkxm9avnj4f0ckvcskc6fj2lcd98l3akrz50ndg";
};
}
{
goPackagePath = "github.com/mattn/go-colorable";
fetch = {
type = "git";
url = "https://github.com/mattn/go-colorable";
rev = "d228849504861217f796da67fae4f6e347643f15";
sha256 = "0ch5sfcpmqczsh8kjbwpzdw31lacbkfyzvpzh4disnhhydbxjq0d";
};
}
{
goPackagePath = "github.com/asciimoo/wuzz";
fetch = {
type = "git";
url = "https://github.com/asciimoo/wuzz";
rev = "f34c82a4386951022f8bfc011fe6a7362dd8286c";
sha256 = "1fcr5jr0vn5w60bn08lkh2mi0hdarwp361h94in03139j7hhqrfs";
};
}
]

27
pkgs/tools/security/gnupg/21.nix
View File

@@ -1,5 +1,5 @@
{ fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, libiconv, npth
, gettext, texinfo, pcsclite, sqlite
{ fetchurl, fetchpatch, stdenv, pkgconfig, libgcrypt, libassuan, libksba
, libiconv, npth, gettext, texinfo, pcsclite, sqlite
# Each of the dependencies below are optional.
# Gnupg can be built without them at the cost of reduced functionality.
@@ -29,7 +29,20 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
patches = [ ./fix-libusb-include-path.patch ];
patches = [
./fix-libusb-include-path.patch
# TODO: Remove the following two patches on the next gnupg release after 2.1.18
(fetchpatch {
name = "scd-Backport-two-fixes-from-master";
url = "https://anonscm.debian.org/git/pkg-gnupg/gnupg2.git/plain/debian/patches/0028-scd-Backport-two-fixes-from-master.patch?h=debian/2.1.18-6";
sha256 = "01l2s4s7kp6j2f3qd371arq7pfphvncc9k1m63rqm0kyzy9jk20k";
})
(fetchpatch {
name = "scd-Fix-use-case-of-PC-SC";
url = "https://anonscm.debian.org/git/pkg-gnupg/gnupg2.git/plain/debian/patches/0029-scd-Fix-use-case-of-PC-SC.patch?h=debian/2.1.18-6";
sha256 = "0lxqj614fialbqs2x0z13q5ikq2rc9xwphmkly179qs03d4mawsz";
})
];
postPatch = stdenv.lib.optionalString stdenv.isLinux ''
sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c
''; #" fix Emacs syntax highlighting :-(
@@ -37,6 +50,14 @@ stdenv.mkDerivation rec {
pinentryBinaryPath = pinentry.binaryPath or "bin/pinentry";
configureFlags = optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentryBinaryPath}";
postInstall = ''
mkdir -p $out/lib/systemd/user
for f in doc/examples/systemd-user/*.{service,socket} ; do
substitute $f $out/lib/systemd/user/$(basename $f) \
--replace /usr/bin $out/bin
done
'';
meta = with stdenv.lib; {
homepage = http://gnupg.org;
description = "A complete and free implementation of the OpenPGP standard";

8
pkgs/tools/security/kbfs/default.nix
View File

@@ -1,8 +1,8 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "kbfs-2016-11-18-git";
version = "1.0.2";
name = "kbfs-${version}";
version = "20170209.d1db463";
goPackagePath = "github.com/keybase/kbfs";
subPackages = [ "kbfsfuse" ];
@@ -12,8 +12,8 @@ buildGoPackage rec {
src = fetchFromGitHub {
owner = "keybase";
repo = "kbfs";
rev = "aac615d7c50e7512a51a133c14cb699d9941ba8c";
sha256 = "0vah6x37g2w1f7mb5x16f1815608mvv2d1mrpkpnhz2gz7qzz6bv";
rev = "d1db46315d9271f21ca2700a84ca19767e638296";
sha256 = "12i2m370r27mmn37s55krdkhr5k8kpl3x8y3gzg7w5zn2wiw8i1g";
};
buildFlags = [ "-tags production" ];

91
pkgs/tools/security/keybase-gui/default.nix Normal file
View File

@@ -0,0 +1,91 @@
{ stdenv, fetchurl, buildFHSUserEnv, writeTextFile, alsaLib, atk, cairo, cups
, dbus, expat, fontconfig, freetype, gcc, gdk_pixbuf, glib, gnome2, gtk2, nspr
, nss, pango, systemd, xorg, utillinuxMinimal }:
let
libPath = stdenv.lib.makeLibraryPath [
alsaLib
atk
cairo
cups
dbus
expat
fontconfig
freetype
gcc.cc
gdk_pixbuf
glib
gnome2.GConf
gtk2
nspr
nss
pango
systemd
xorg.libX11
xorg.libXScrnSaver
xorg.libXcomposite
xorg.libXcursor
xorg.libXdamage
xorg.libXext
xorg.libXfixes
xorg.libXi
xorg.libXrandr
xorg.libXrender
xorg.libXtst
];
in
stdenv.mkDerivation rec {
name = "keybase-gui-${version}";
version = "1.0.18-20170209170023.17b641d";
src = fetchurl {
url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version}_amd64.deb";
sha256 = "01mr6hyzs208g3ankl4swikna66n85xzn7ig4k7p6hxmnnvplgb3";
};
phases = ["unpackPhase" "installPhase" "fixupPhase"];
unpackPhase = ''
ar xf $src
tar xf data.tar.xz
'';
installPhase = ''
mkdir -p $out/{bin,share}
mv opt/keybase $out/share/
cat > $out/bin/keybase-gui <<EOF
#!${stdenv.shell}
checkFailed() {
if [ "\$NIX_SKIP_KEYBASE_CHECKS" = "1" ]; then
return
fi
echo "Set NIX_SKIP_KEYBASE_CHECKS=1 if you want to skip this check." >&2
exit 1
}
if [ ! -S "\$XDG_RUNTIME_DIR/keybase/keybased.sock" ]; then
echo "Keybase service doesn't seem to be running." >&2
echo "You might need to run: keybase service" >&2
checkFailed
fi
${utillinuxMinimal}/bin/mountpoint /keybase &>/dev/null
if [ "\$?" -ne "0" ]; then
echo "Keybase is not mounted to /keybase." >&2
echo "You might need to run: kbfsfuse /keybase" >&2
checkFailed
fi
exec $out/share/keybase/Keybase "\$@"
EOF
chmod +x $out/bin/keybase-gui
'';
postFixup = ''
patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath "${libPath}:\$ORIGIN" "$out/share/keybase/Keybase"
'';
meta = with stdenv.lib; {
homepage = https://www.keybase.io/;
description = "The Keybase official GUI.";
platforms = platforms.linux;
maintainers = with maintainers; [ puffnfresh ];
};
}

7
pkgs/tools/security/keybase/default.nix
View File

@@ -2,8 +2,7 @@
buildGoPackage rec {
name = "keybase-${version}";
version = "1.0.18";
rev = "v${version}";
version = "20170209.17b641d";
goPackagePath = "github.com/keybase/client";
subPackages = [ "go/keybase" ];
@@ -13,8 +12,8 @@ buildGoPackage rec {
src = fetchFromGitHub {
owner = "keybase";
repo = "client";
inherit rev;
sha256 = "16n9fwx8v3jradp1l2564872akq6npib794jadfl5d122cll0n7h";
rev = "17b641de629a85ad77621d0efa3e2442661b5ee7";
sha256 = "0y6kiwj690yd0alvcyd74wx2wlbh110k1rdcvimszyb9gqig8p11";
};
buildFlags = [ "-tags production" ];

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

@@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, makeWrapper, pkgconfig, udev, dbus_libs, pcsclite
, wget, coreutils
, perl, pcscperl, Glib, Gtk2, Pango
, perl, pcscperl, Glib, Gtk2, Pango, Cairo
}:
let deps = lib.makeBinPath [ wget coreutils ];
@@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
wrapProgram $out/bin/scriptor \
--set PERL5LIB "${lib.makePerlPath [ pcscperl ]}"
wrapProgram $out/bin/gscriptor \
--set PERL5LIB "${lib.makePerlPath [ pcscperl Glib Gtk2 Pango ]}"
--set PERL5LIB "${lib.makePerlPath [ pcscperl Glib Gtk2 Pango Cairo ]}"
wrapProgram $out/bin/ATR_analysis \
--set PERL5LIB "${lib.makePerlPath [ pcscperl ]}"
wrapProgram $out/bin/pcsc_scan \

5
pkgs/tools/security/vault/default.nix
View File

@@ -9,7 +9,7 @@ let
};
in buildGoPackage rec {
name = "vault-${version}";
version = "0.6.4";
version = "0.6.5";
goPackagePath = "github.com/hashicorp/vault";
@@ -17,7 +17,7 @@ in buildGoPackage rec {
owner = "hashicorp";
repo = "vault";
rev = "v${version}";
sha256 = "0rrrzkza12zbbfc24q4q7ygfczq1j8ljsjagsa8vpp3375dflzdy";
sha256 = "0ci46zn9d9h26flgjf4inmvk4mb1hlixvx5g7vg02raw0cqvknnb";
};
buildFlagsArray = ''
@@ -33,6 +33,7 @@ in buildGoPackage rec {
meta = with stdenv.lib; {
homepage = https://www.vaultproject.io;
description = "A tool for managing secrets";
platforms = platforms.linux ++ platforms.darwin;
license = licenses.mpl20;
maintainers = with maintainers; [ rushmorem offline pradeepchhetri ];
};

4
pkgs/tools/system/consul-template/default.nix
View File

@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "consul-template-${version}";
version = "0.18.0";
version = "0.18.1";
rev = "v${version}";
goPackagePath = "github.com/hashicorp/consul-template";
@@ -11,7 +11,7 @@ buildGoPackage rec {
inherit rev;
owner = "hashicorp";
repo = "consul-template";
sha256 = "1a1r7jwv0d4l8bcjal9chvr871hmw0ljbihgjqasp6gvjg0hfbx6";
sha256 = "0swyhc5smjbp5wql43qhpxrcbg47v89l5icb1s60gszhxizlkk7d";
};
meta = with stdenv.lib; {

24
pkgs/tools/system/envconsul/default.nix Normal file
View File

@@ -0,0 +1,24 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "envconsul-${version}";
version = "0.6.2";
rev = "v${version}";
goPackagePath = "github.com/hashicorp/envconsul";
src = fetchFromGitHub {
inherit rev;
owner = "hashicorp";
repo = "envconsul";
sha256 = "176jbicyg7vwd0kgawz859gq7ldrxyw1gx55wig7azakiidkl731";
};
meta = with stdenv.lib; {
homepage = https://github.com/hashicorp/envconsul/;
description = "Read and set environmental variables for processes from Consul";
platforms = platforms.linux ++ platforms.darwin;
license = licenses.mpl20;
maintainers = with maintainers; [ pradeepchhetri ];
};
}

15
pkgs/tools/system/fakechroot/default.nix
View File

@@ -1,14 +1,19 @@
{stdenv, fetchurl}:
{ stdenv, fetchFromGitHub, autoreconfHook, perl }:
stdenv.mkDerivation rec {
name = "fakechroot-${version}";
version = "2.17.2";
version = "2.19";
src = fetchurl {
url = "https://github.com/dex4er/fakechroot/archive/${version}.tar.gz";
sha256 = "0z4cxj4lb8cfb63sw82dbc31hf082fv3hshbmhk49cqkc0f673q3";
# TODO: move back to mainline once https://github.com/dex4er/fakechroot/pull/46 is merged
src = fetchFromGitHub {
owner = "copumpkin";
repo = "fakechroot";
rev = "dcc0cfe3941e328538f9e62b2c0b15430d393ec1";
sha256 = "1ls3y97qqfcfd3z0balz94xq1gskfk04pg85x6b7wjw8dm4030qd";
};
buildInputs = [ autoreconfHook perl ];
meta = with stdenv.lib; {
homepage = https://github.com/dex4er/fakechroot;
description = "Give a fake chroot environment through LD_PRELOAD";

24
pkgs/tools/virtualization/awless/default.nix Normal file
View File

@@ -0,0 +1,24 @@
{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "awless-${version}";
version = "0.0.13";
rev = "${version}";
goPackagePath = "github.com/wallix/awless";
src = fetchFromGitHub {
inherit rev;
owner = "wallix";
repo = "awless";
sha256 = "045n4r2mk40pjggsfcjlxni6q4arybs9x9raghqb9n8dyfg9v5kv";
};
meta = with stdenv.lib; {
homepage = https://github.com/wallix/awless/;
description = "A Mighty CLI for AWS";
platforms = platforms.linux ++ platforms.darwin;
license = licenses.asl20;
maintainers = with maintainers; [ pradeepchhetri ];
};
}

1
pkgs/tools/virtualization/nixos-container/nixos-container.pl
View File

@@ -248,6 +248,7 @@ if ($action eq "destroy") {
safeRemoveTree($profileDir) if -e $profileDir;
safeRemoveTree($gcRootsDir) if -e $gcRootsDir;
system("chattr", "-i", "$root/var/empty") if -e $root;
safeRemoveTree($root) if -e $root;
unlink($confFile) or die;
}