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

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2021-02-26 10:25:13 +01:00
parent babf9d6100 6d7128414c
commit c456a2512f
579 changed files with 9802 additions and 3062 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/security/fprintd/default.nix
+23 -29
View File
@@ -1,7 +1,7 @@
{ lib, stdenv
, fetchFromGitLab
, fetchpatch
, pkg-config
, gobject-introspection
, meson
, ninja
, perl
@@ -11,9 +11,10 @@
, libxslt
, docbook-xsl-nons
, docbook_xml_dtd_412
, fetchurl
, glib
, gusb
, dbus
, dbus-glib
, polkit
, nss
, pam
@@ -24,52 +25,41 @@
stdenv.mkDerivation rec {
pname = "fprintd";
version = "1.90.1";
version = "1.90.9";
outputs = [ "out" "devdoc" ];
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "libfprint";
repo = pname;
rev = version;
sha256 = "0mbzk263x7f58i9cxhs44mrngs7zw5wkm62j5r6xlcidhmfn03cg";
rev = "v${version}";
sha256 = "rOTVThHOY/Q2IIu2RGiv26UE2V/JFfWWnfKZQfKl5Mg=";
};
patches = [
# Fixes issue with ":" when there is multiple paths (might be the case on NixOS)
# https://gitlab.freedesktop.org/libfprint/fprintd/-/merge_requests/50
(fetchpatch {
url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/d7fec03f24d10f88d34581c72f0eef201f5eafac.patch";
sha256 = "0f88dhizai8jz7hpm5lpki1fx4593zcy89iwi4brsqbqc7jp9ls0";
})
# Fix locating libpam_wrapper for tests
(fetchpatch {
url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/merge_requests/40.patch";
sha256 = "0qqy090p93lzabavwjxzxaqidkcb3ifacl0d3yh1q7ms2a58yyz3";
})
(fetchpatch {
url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/f401f399a85dbeb2de165b9b9162eb552ab6eea7.patch";
sha256 = "1bc9g6kc95imlcdpvp8qgqjsnsxg6nipr6817c1pz5i407yvw1iy";
})
];
nativeBuildInputs = [
pkg-config
meson
ninja
perl
perl # for pod2man
gettext
gtk-doc
libxslt
dbus
# TODO: apply this to D-Bus so that other packages can benefit.
# https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/202
(dbus.overrideAttrs (attrs: {
postInstall = attrs.postInstall or "" + ''
ln -s ${fetchurl {
url = "https://gitlab.freedesktop.org/dbus/dbus/-/raw/b207135dbd8c09cf8da28f7e3b0a18bb11483663/doc/catalog.xml";
sha256 = "1/43XwAIcmRXfM4OXOPephyQyUnW8DSveiZbiPvW72I=";
}} $out/share/xml/dbus-1/catalog.xml
'';
}))
docbook-xsl-nons
docbook_xml_dtd_412
];
buildInputs = [
glib
dbus-glib
polkit
nss
pam
@@ -78,11 +68,13 @@ stdenv.mkDerivation rec {
];
checkInputs = with python3.pkgs; [
gobject-introspection # for setup hook
python-dbusmock
dbus-python
pygobject3
pycairo
pypamtest
gusb # Required by libfprint’s typelib
];
mesonFlags = [
@@ -103,13 +95,15 @@ stdenv.mkDerivation rec {
doCheck = true;
postPatch = ''
patchShebangs po/check-translations.sh
patchShebangs \
po/check-translations.sh \
tests/unittest_inspector.py
'';
meta = with lib; {
homepage = "https://fprint.freedesktop.org/";
description = "D-Bus daemon that offers libfprint functionality over the D-Bus interprocess communication bus";
license = licenses.gpl2;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar elyhaka ];
};
pkgs/tools/security/gitjacker/default.nix
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "gitjacker";
version = "0.0.2";
version = "0.0.3";
src = fetchFromGitHub {
owner = "liamg";
repo = "gitjacker";
rev = "v${version}";
sha256 = "0fg95i2y8sj7dsvqj8mx0k5pps7d0h1i4a3lk85l8jjab4kxx8h9";
sha256 = "sha256-cMjjVjHGTVT33bknAo2DVH/qPSeazVIIw3RpXGDxF5E=";
};
vendorSha256 = null;
pkgs/tools/security/gopass/default.nix
+4 -3
View File
@@ -13,7 +13,7 @@
buildGoModule rec {
pname = "gopass";
version = "1.12.0";
version = "1.12.1";
nativeBuildInputs = [ installShellFiles makeWrapper ];
@@ -21,10 +21,10 @@ buildGoModule rec {
owner = "gopasspw";
repo = pname;
rev = "v${version}";
sha256 = "0y3dcikw6gl436mhza5j0b3lm49jzl590a9ry53rkmzrv2lqx9w6";
sha256 = "0ickzq2swhabxqcg32n1i99bam6ip7c0mhhncgvmw332w6pzgvlb";
};
vendorSha256 = "09lbkm7c361c2s87qi1wpfsqgpp3r862wcn98dzdg5j6pvpgwbag";
vendorSha256 = "0i0dhipp1gdn0xdl4bpi13ksxf7dc9biz9riapm988bldcr5s1kr";
subPackages = [ "." ];
@@ -41,6 +41,7 @@ buildGoModule rec {
);
postInstall = ''
HOME=$TMPDIR
for shell in bash fish zsh; do
$out/bin/gopass completion $shell > gopass.$shell
installShellCompletion gopass.$shell
pkgs/tools/security/honggfuzz/default.nix
+2 -2
View File
@@ -5,13 +5,13 @@
let
honggfuzz = stdenv.mkDerivation rec {
pname = "honggfuzz";
version = "2.3.1";
version = "2.4";
src = fetchFromGitHub {
owner = "google";
repo = pname;
rev = version;
sha256 = "0dcl5a5jykgfmnfj42vl7kah9k26wg38l2g6yfh5pssmlf0nax33";
sha256 = "sha256-sU5lmlfmvVWo4K96sI+xQsPfTMd1wsLbihcKI4aTj6g=";
};
postPatch = ''
pkgs/tools/security/kbs2/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "kbs2";
version = "0.2.5";
version = "0.2.6";
src = fetchFromGitHub {
owner = "woodruffw";
repo = pname;
rev = "v${version}";
sha256 = "1jilsczz22fyqbgz43gl5ilz62gfqsahfk30gayj7q5bx9k35m4w";
sha256 = "sha256-PtXTC0VufUR5kle9C5KhCHHEQtQZvTTU1Q/cRMCB1g0=";
};
cargoSha256 = "1gvvmfavaq29p40p5mq1phpp2a1nw04dz4975pzm1b6z89p0jlzl";
cargoSha256 = "sha256-S2czYglyHRkRN3Dq5reXFOaB1i/oIHXTY8Ile+Twvzo=";
nativeBuildInputs = [ installShellFiles ]
++ lib.optionals stdenv.isLinux [ python3 ];
pkgs/tools/security/libtpms/default.nix
+43
View File
@@ -0,0 +1,43 @@
{ lib
, stdenv
, fetchFromGitHub
, pkg-config, autoreconfHook
, openssl, perl
, tpm2Support ? false
}:
stdenv.mkDerivation rec {
pname = "libtpms";
version = "0.7.4";
src = fetchFromGitHub {
owner = "stefanberger";
repo = "libtpms";
rev = "v${version}";
sha256 = "sha256-nZSBD3WshlZHVMBFmDBBdFkhBjNgtASfg6+lYOOAhZ8=";
};
nativeBuildInputs = [
autoreconfHook
pkg-config
perl # needed for pod2man
];
buildInputs = [ openssl ];
outputs = [ "out" "lib" "man" "dev" ];
enableParallelBuilding = true;
configureFlags = [
"--with-openssl"
] ++ lib.optionals tpm2Support [
"--with-tpm2" # TPM2 support is flagged experimental by upstream
];
meta = with lib; {
description = "The libtpms library provides software emulation of a Trusted Platform Module (TPM 1.2 and TPM 2.0)";
homepage = "https://github.com/stefanberger/libtpms";
license = licenses.bsd3;
maintainers = [ maintainers.baloo ];
};
}
pkgs/tools/security/pass/extensions/import.nix
+1 -1
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, pass, fetchFromGitHub, pythonPackages, makeWrapper, fetchpatch }:
{ lib, stdenv, fetchFromGitHub, pythonPackages, makeWrapper, fetchpatch }:
let
pythonEnv = pythonPackages.python.withPackages (p: [
pkgs/tools/security/saml2aws/default.nix
+3 -3
View File
@@ -2,17 +2,17 @@
buildGoModule rec {
pname = "saml2aws";
version = "2.27.1";
version = "2.28.0";
src = fetchFromGitHub {
owner = "Versent";
repo = "saml2aws";
rev = "v${version}";
sha256 = "1ffq7jh14cj45wn5rx9awh5k8hqbfwm4fjz0a0rq22yqfwbbkkj2";
sha256 = "sha256-2t1MytLjAxhVVsWyMYcQZ9c+ox+X2OszG5mLAv8c7xE=";
};
runVend = true;
vendorSha256 = "1w7vnpv36lhxpaljdhslbckkr7p81nzc91a0503wk8nrrc4ljsyy";
vendorSha256 = "sha256-8Kox01iyWhv/Fp7jHPeNXxc/K2TT1WPyWFieHZkqLho=";
doCheck = false;
pkgs/tools/security/ssh-audit/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "ssh-audit";
version = "2.3.1";
version = "2.4.0";
src = fetchFromGitHub {
owner = "jtesta";
repo = pname;
rev = "v${version}";
sha256 = "1h739r5nv5zkmjyyjwkw8r6d4avddjjxsamc5rffwfxi1kjavpxm";
sha256 = "sha256-Xq1q/i43vZAv8BayVOdKuZ3+mJcQQ0x4Kc3WlASE6m8=";
};
checkInputs = with python3Packages; [
pkgs/tools/security/ssh-to-pgp/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "ssh-to-pgp";
version = "1.0.0";
version = "1.0.1";
src = fetchFromGitHub {
owner = "Mic92";
repo = "ssh-to-pgp";
rev = version;
sha256 = "sha256-TDrpnWAez8muysMdmKFBDZfK8CyhGn1VqHB8+zD6jSk=";
sha256 = "sha256-5Wg0ItAkAb0zlhzcuDT9o0XIIbG9kqk4mIYb6hSJlsI=";
};
vendorSha256 = "sha256-ZF/WsmqmGHZIAGTPKJ70UhtmssNhiInEZfzrKxQLw9I=";
vendorSha256 = "sha256-OMWiJ1n8ynvIGcmotjuGGsRuAidYgVo5Y5JjrAw8fpc=";
checkInputs = [ gnupg ];
checkPhase = ''
pkgs/tools/security/swtpm/default.nix
+76
View File
@@ -0,0 +1,76 @@
{ lib
, stdenv
, fetchFromGitHub
, autoreconfHook
, pkg-config
, libtasn1, openssl, fuse, glib, libseccomp
, libtpms
, unixtools, expect, socat
, gnutls
, perl
, python3, python3Packages
}:
stdenv.mkDerivation rec {
pname = "swtpm";
version = "0.5.2";
src = fetchFromGitHub {
owner = "stefanberger";
repo = "swtpm";
rev = "v${version}";
sha256 = "sha256-KY5V4z/8I15ePjorgZueNahlD/xvFa3tDarA0tuRxFk=";
};
pythonPath = with python3Packages; requiredPythonModules [
setuptools
cryptography
];
patches = [
# upstream looks for /usr directory in $prefix to check
# whether or not to proceed with installation of python
# tools (swtpm_setup utility).
./python-installation.patch
];
prePatch = ''
patchShebangs src/swtpm_setup/setup.py
patchShebangs samples/setup.py
'';
nativeBuildInputs = [
pkg-config unixtools.netstat expect socat
perl # for pod2man
autoreconfHook
python3
];
buildInputs = [
libtpms
openssl libtasn1 libseccomp
fuse glib
gnutls
python3.pkgs.wrapPython
];
propagatedBuildInputs = pythonPath;
configureFlags = [
"--with-cuse"
];
postInstall = ''
wrapPythonProgramsIn $out/bin "$out $pythonPath"
wrapPythonProgramsIn $out/share/swtpm "$out $pythonPath"
'';
enableParallelBuilding = true;
outputs = [ "out" "man" ];
meta = with lib; {
description = "Libtpms-based TPM emulator";
homepage = "https://github.com/stefanberger/swtpm";
license = licenses.bsd3;
maintainers = [ maintainers.baloo ];
};
}
pkgs/tools/security/swtpm/python-installation.patch
+60
View File
@@ -0,0 +1,60 @@
commit 353794feb596d95e3f8893e39b174c5a89d1013e
Author: Arthur Gautier <baloo@superbaloo.net>
Date: Wed Feb 17 02:27:40 2021 +0000
python-install
Signed-off-by: Arthur Gautier <baloo@superbaloo.net>
diff --git a/samples/Makefile.am b/samples/Makefile.am
index 7d69bf8..1803bb9 100644
--- a/samples/Makefile.am
+++ b/samples/Makefile.am
@@ -39,19 +39,9 @@ python-uninstall:
$(PIP3) uninstall -y $(PY_PACKAGE_NAME)
if PYTHON_INSTALLATION
-install-exec-local: $(PY_PACKAGE)
- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \
- echo "Warning: Not installing python package to $(DESTDIR)$(bindir)"; \
- else \
- $(MAKE) python-install; \
- fi
+install-exec-local: python-install
-uninstall-local:
- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \
- echo "Cleanup for distcheck build not implemented" ; \
- else \
- $(MAKE) python-uninstall; \
- fi
+uninstall-local: python-uninstall
endif
diff --git a/src/swtpm_setup/Makefile.am b/src/swtpm_setup/Makefile.am
index 529eefe..533b1b3 100644
--- a/src/swtpm_setup/Makefile.am
+++ b/src/swtpm_setup/Makefile.am
@@ -29,19 +29,9 @@ python-uninstall:
$(PIP3) uninstall -y $(PY_PACKAGE_NAME)
if PYTHON_INSTALLATION
-install-exec-local: $(PY_PACKAGE)
- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \
- echo "Warning: Not installing python package to $(DESTDIR)$(bindir)"; \
- else \
- $(MAKE) python-install; \
- fi
+install-exec-local: python-install
-uninstall-local:
- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \
- echo "Cleanup for distcheck build not implemented" ; \
- else \
- $(MAKE) python-uninstall; \
- fi
+uninstall-local: python-uninstall
endif
# for out-of-tree builds we need to clean up
pkgs/tools/security/teler/default.nix
+2 -2
View File
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "teler";
version = "1.0.2-dev";
version = "1.0.3";
src = fetchFromGitHub {
owner = "kitabisa";
repo = "teler";
rev = "v${version}";
sha256 = "sha256-Hmoj44/rprM9oSFAsRWLszew0RvCTjdHISUSrx/4IPs=";
sha256 = "sha256-6OeGlpimQtw4w26HRzw2wmd3wjASY199p8XXPD/JMy8=";
};
vendorSha256 = "sha256-L+wjurURpesCA2IK0r1sxvOUvNJT1wiRp75kpe6LH5s=";
pkgs/tools/security/vault/default.nix
+3 -3
View File
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "vault";
version = "1.6.2";
version = "1.6.3";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "vault";
rev = "v${version}";
sha256 = "1g6fz6dl90cb5pnvvmkndqgncfjy50j9jw3xzn8s91yzvvld8ds7";
sha256 = "0ffynqk16bnc4nqnffbid4v72mxafzi0fy4cbrzfs9qfi56vcbm9";
};
goPackagePath = "github.com/hashicorp/vault";
@@ -32,6 +32,6 @@ buildGoPackage rec {
changelog = "https://github.com/hashicorp/vault/blob/v${version}/CHANGELOG.md";
platforms = platforms.linux ++ platforms.darwin;
license = licenses.mpl20;
maintainers = with maintainers; [ rushmorem lnl7 offline pradeepchhetri ];
maintainers = with maintainers; [ rushmorem lnl7 offline pradeepchhetri Chili-Man ];
};
}
pkgs/tools/security/vault/vault-bin.nix
+5 -5
View File
@@ -1,26 +1,26 @@
{ lib, stdenv, fetchurl, unzip }:
let
version = "1.6.2";
version = "1.6.3";
sources = let
base = "https://releases.hashicorp.com/vault/${version}";
in {
x86_64-linux = fetchurl {
url = "${base}/vault_${version}_linux_amd64.zip";
sha256 = "1vcxnky8qnn2ib33r9604cbjrgm939ddrhwqcjylbv217cmc9alf";
sha256 = "0ijc80r9rbbbblmf5s3j5b2kk6zsriyxwhsijhgy86rr6bvdljl4";
};
i686-linux = fetchurl {
url = "${base}/vault_${version}_linux_386.zip";
sha256 = "0mcav36dcmvky8v4y65jvh837i72aqz7arv2ivjpajym3gf7qrq1";
sha256 = "1blma0ywkmv8ykqc4sgcbk1g9jb9rjxqk2b6kmp5z31lilg4a7my";
};
x86_64-darwin = fetchurl {
url = "${base}/vault_${version}_darwin_amd64.zip";
sha256 = "1is7s445jc4ll2lyfxgjwwl89fly1l8kskqp2p8z179d8hhgd0ms";
sha256 = "1mzkj7ixpzfhn9i4092qw8g38dx4lh3kzp6g4fr5x84sbs6anl3j";
};
aarch64-linux = fetchurl {
url = "${base}/vault_${version}_linux_arm64.zip";
sha256 = "0i5d87a393464r68rjv83bjhg51yaysccqbwaaydmzk1m45icg7x";
sha256 = "14l8ic5hgsbq4q1b6832ss1wyrgqwyvgkrvcxbw5nqy5la95fl8i";
};
};