diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-05-09 00:02:27 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-09 00:02:27 +0000 |
commit | f39e774f11735e00cf90bc9eb9c6ab3fcf9a7998 (patch) | |
tree | e3b1221ef08fa7c9b964f1da589a4377241ea4e6 /pkgs/tools | |
parent | e92815729dc9bfb56b23826715df01a453e442da (diff) | |
parent | 806344b3e2d5001743064e0bc79775d4526a6db3 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/misc/bdfresize/default.nix | 20 | ||||
-rw-r--r-- | pkgs/tools/misc/bdfresize/remove-malloc-declaration.patch | 11 | ||||
-rw-r--r-- | pkgs/tools/networking/cmst/default.nix | 11 | ||||
-rw-r--r-- | pkgs/tools/networking/getmail6/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/networking/netcat-openbsd/default.nix | 54 | ||||
-rw-r--r-- | pkgs/tools/networking/p2p/tahoe-lafs/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/security/swtpm/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/virtualization/kubevirt/default.nix | 43 |
8 files changed, 143 insertions, 8 deletions
diff --git a/pkgs/tools/misc/bdfresize/default.nix b/pkgs/tools/misc/bdfresize/default.nix new file mode 100644 index 0000000000000..f1ac559fb672d --- /dev/null +++ b/pkgs/tools/misc/bdfresize/default.nix @@ -0,0 +1,20 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "bdfresize"; + version = "1.5"; + + src = fetchurl { + url = "http://openlab.ring.gr.jp/efont/dist/tools/bdfresize/${pname}-${version}.tar.gz"; + hash = "sha256-RAz8BiCgI35GNSwUoHdMqj8wWXWbCiDe/vyU6EkIl6Y="; + }; + + patches = [ ./remove-malloc-declaration.patch ]; + + meta = with lib; { + description = "Tool to resize BDF fonts"; + homepage = "http://openlab.ring.gr.jp/efont/dist/tools/bdfresize/"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ malvo ]; + }; +} diff --git a/pkgs/tools/misc/bdfresize/remove-malloc-declaration.patch b/pkgs/tools/misc/bdfresize/remove-malloc-declaration.patch new file mode 100644 index 0000000000000..c58888a4be2de --- /dev/null +++ b/pkgs/tools/misc/bdfresize/remove-malloc-declaration.patch @@ -0,0 +1,11 @@ +Remove an unneeded declaration of malloc so gcc doesn't complain. +--- a/charresize.c ++++ b/charresize.c +@@ -46,7 +46,6 @@ static int bit[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 }; + void + processChar(void) + { +- char *malloc(); + char *srcimage; + int *dstgray; + diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix index 2f757edbdb187..1447569020c9e 100644 --- a/pkgs/tools/networking/cmst/default.nix +++ b/pkgs/tools/networking/cmst/default.nix @@ -1,14 +1,14 @@ -{ mkDerivation, lib, fetchFromGitHub, qmake, qtbase, qttools }: +{ mkDerivation, lib, fetchFromGitHub, qmake, qtbase, qttools, gitUpdater }: mkDerivation rec { pname = "cmst"; - version = "2022.03.13"; + version = "2022.05.01"; src = fetchFromGitHub { repo = "cmst"; owner = "andrew-bibb"; rev = "${pname}-${version}"; - sha256 = "sha256-PIS77yYM7tR+0vpTDh9Li/dnaWHUQW+w1NLRb5g+sz8="; + sha256 = "sha256-d3uvJf1tI9vXyq1eIbHkKrinBuPkYoBUcusHsJmSqMA="; }; nativeBuildInputs = [ qmake qttools ]; @@ -21,6 +21,11 @@ mkDerivation rec { done ''; + passthru.updateScript = gitUpdater { + inherit pname version; + rev-prefix = "${pname}-"; + }; + meta = with lib; { description = "QT GUI for Connman with system tray icon"; homepage = "https://github.com/andrew-bibb/cmst"; diff --git a/pkgs/tools/networking/getmail6/default.nix b/pkgs/tools/networking/getmail6/default.nix index dc508ff53efee..c31fe48d5b5cd 100644 --- a/pkgs/tools/networking/getmail6/default.nix +++ b/pkgs/tools/networking/getmail6/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "getmail6"; - version = "6.18.6"; + version = "6.18.7"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "08a5yw6ll1kmd1ardj8rzhsw4wl48zzdc87g5lh4p5snv8w2m4ja"; + hash = "sha256-JghiV0zC9xtOGuGcf0lY5e73/04n6Bat/xOGgXyDWJk="; }; # needs a Docker setup @@ -28,6 +28,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "A program for retrieving mail"; homepage = "https://getmail6.org"; + changelog = "https://github.com/getmail6/getmail6/blob/${src.rev}/docs/CHANGELOG"; license = licenses.gpl2Plus; maintainers = with maintainers; [ abbe dotlambda ]; }; diff --git a/pkgs/tools/networking/netcat-openbsd/default.nix b/pkgs/tools/networking/netcat-openbsd/default.nix new file mode 100644 index 0000000000000..67d458dad1bdd --- /dev/null +++ b/pkgs/tools/networking/netcat-openbsd/default.nix @@ -0,0 +1,54 @@ +{ lib, stdenv, fetchFromGitLab, pkg-config, libbsd, installShellFiles }: + +stdenv.mkDerivation rec { + pname = "netcat-openbsd"; + version = "1.218-5"; + + src = fetchFromGitLab { + domain = "salsa.debian.org"; + owner = "debian"; + repo = "netcat-openbsd"; + rev = "refs/tags/debian/${version}"; + sha256 = "sha256-jEJ8x49Z1UN2qOChGp173aQuPkgl2fWwUUJgUdOv60I="; + }; + + strictDeps = true; + nativeBuildInputs = [ pkg-config installShellFiles ]; + buildInputs = [ libbsd ]; + + NIX_CFLAGS_COMPILE = [ + "-I${lib.getDev libbsd}/include/libbsd" + ]; + + NIX_LDFLAGS = [ "-lbsd" ]; + + postPatch = '' + for file in $(cat debian/patches/series); do + patch -p1 < debian/patches/$file + done + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + mv nc $out/bin/nc + installManPage nc.1 + + runHook postInstall + ''; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/nc -h 2> /dev/null + ''; + + meta = with lib; { + description = "TCP/IP swiss army knife. OpenBSD variant"; + homepage = "https://salsa.debian.org/debian/netcat-openbsd"; + maintainers = with maintainers; [ artturin ]; + license = licenses.bsd3; + platforms = platforms.unix; + mainProgram = "nc"; + }; +} diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index b0f4cd1f788a4..938bfa1dcd610 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -60,7 +60,8 @@ python3Packages.buildPythonApplication rec { html5lib magic-wormhole netifaces pyasn1 pycrypto pyutil pyyaml recommonmark service-identity simplejson sphinx_rtd_theme testtools treq twisted zfec zope_interface - ]; + ] ++ twisted.extras-require.tls + ++ twisted.extras-require.conch; checkInputs = with python3Packages; [ mock hypothesis twisted ]; diff --git a/pkgs/tools/security/swtpm/default.nix b/pkgs/tools/security/swtpm/default.nix index 39128084352e0..5d20b65d5914b 100644 --- a/pkgs/tools/security/swtpm/default.nix +++ b/pkgs/tools/security/swtpm/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "swtpm"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "stefanberger"; repo = "swtpm"; rev = "v${version}"; - sha256 = "sha256-qeyPCJTNnwuaCosHzqnrQc0JNznGBfDTLsuDmuKREjU="; + sha256 = "sha256-YaNQgxk0uT8FLUIxF80jpgO/L9ygGRHaABEcs5ukq5E="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/virtualization/kubevirt/default.nix b/pkgs/tools/virtualization/kubevirt/default.nix new file mode 100644 index 0000000000000..999d5b3dfc1e5 --- /dev/null +++ b/pkgs/tools/virtualization/kubevirt/default.nix @@ -0,0 +1,43 @@ +{ buildGoModule +, fetchFromGitHub +, lib +, testers +, kubevirt +}: + +buildGoModule rec { + pname = "kubevirt"; + version = "0.52.0"; + + src = fetchFromGitHub { + owner = "kubevirt"; + repo = "kubevirt"; + rev = "v${version}"; + sha256 = "0ldc13nypbk3r9ihbdfibpyvzyzz4m68zzb7g6cq551ks9qdiyma"; + }; + + vendorSha256 = null; + + subPackages = [ "cmd/virtctl" ]; + + tags = [ "selinux" ]; + + ldflags = [ + "-X kubevirt.io/client-go/version.gitCommit=v${version}" + "-X kubevirt.io/client-go/version.gitTreeState=clean" + "-X kubevirt.io/client-go/version.gitVersion=v${version}" + ]; + + passthru.tests.version = testers.testVersion { + package = kubevirt; + command = "virtctl version --client"; + version = "v${version}"; + }; + + meta = with lib; { + description = "Client tool to use advanced features such as console access"; + homepage = "https://kubevirt.io/"; + license = licenses.asl20; + maintainers = with maintainers; [ haslersn ]; + }; +} |