aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--nixos/modules/services/misc/home-assistant.nix1
-rw-r--r--pkgs/applications/networking/mailreaders/trojita/default.nix35
-rw-r--r--pkgs/os-specific/linux/hyperv-daemons/default.nix37
-rw-r--r--pkgs/top-level/all-packages.nix4
-rw-r--r--pkgs/top-level/perl-packages.nix29
5 files changed, 78 insertions, 28 deletions
diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix
index f1b35124674..74702c97f55 100644
--- a/nixos/modules/services/misc/home-assistant.nix
+++ b/nixos/modules/services/misc/home-assistant.nix
@@ -224,6 +224,7 @@ in {
KillSignal = "SIGINT";
PrivateTmp = true;
RemoveIPC = true;
+ AmbientCapabilities = "cap_net_raw,cap_net_admin+eip";
};
path = [
"/run/wrappers" # needed for ping
diff --git a/pkgs/applications/networking/mailreaders/trojita/default.nix b/pkgs/applications/networking/mailreaders/trojita/default.nix
index 7f7296cd700..4b4c711042f 100644
--- a/pkgs/applications/networking/mailreaders/trojita/default.nix
+++ b/pkgs/applications/networking/mailreaders/trojita/default.nix
@@ -1,37 +1,50 @@
-{ mkDerivation
-, lib
-, fetchurl
+{ akonadi-contacts
, cmake
+, fetchgit
+, gpgme
+, kcontacts
+, lib
+, mimetic
+, mkDerivation
+, pkgconfig
+, qgpgme
, qtbase
-, qtwebkit
+, qtkeychain
, qttools
+, qtwebkit
}:
mkDerivation rec {
pname = "trojita";
- version = "0.7";
+ version = "0.7.20190618";
- src = fetchurl {
- url = "mirror://sourceforge/trojita/trojita/${pname}-${version}.tar.xz";
- sha256 = "1n9n07md23ny6asyw0xpih37vlwzp7vawbkprl7a1bqwfa0si3g0";
+ src = fetchgit {
+ url = "https://anongit.kde.org/trojita.git";
+ rev = "90b417b131853553c94ff93aef62abaf301aa8f1";
+ sha256 = "0xpxq5bzqaa68lkz90wima5q2m0mdcn0rvnigb66lylb4n20mnql";
};
buildInputs = [
+ akonadi-contacts
+ gpgme
+ kcontacts
+ mimetic
+ qgpgme
qtbase
+ qtkeychain
qtwebkit
];
nativeBuildInputs = [
cmake
+ pkgconfig
qttools
];
-
meta = with lib; {
description = "A Qt IMAP e-mail client";
- homepage = http://trojita.flaska.net/;
+ homepage = "http://trojita.flaska.net/";
license = with licenses; [ gpl2 gpl3 ];
platforms = platforms.linux;
};
-
}
diff --git a/pkgs/os-specific/linux/hyperv-daemons/default.nix b/pkgs/os-specific/linux/hyperv-daemons/default.nix
index a209f1ab4bb..1a111a295a4 100644
--- a/pkgs/os-specific/linux/hyperv-daemons/default.nix
+++ b/pkgs/os-specific/linux/hyperv-daemons/default.nix
@@ -1,7 +1,10 @@
-{ stdenv, lib, python, kernel, makeWrapper, writeText }:
+{ stdenv, lib, python, kernel, makeWrapper, writeText
+, gawk, iproute }:
let
- daemons = stdenv.mkDerivation {
+ libexec = "libexec/hypervkvpd";
+
+ daemons = stdenv.mkDerivation rec {
pname = "hyperv-daemons-bin";
inherit (kernel) src version;
@@ -10,10 +13,15 @@ let
# as of 4.9 compilation will fail due to -Werror=format-security
hardeningDisable = [ "format" ];
- preConfigure = ''
+ postPatch = ''
cd tools/hv
+ substituteInPlace hv_kvp_daemon.c \
+ --replace /usr/libexec/hypervkvpd/ $out/${libexec}/
'';
+ # We don't actually need the hv_get_{dhcp,dns}_info scripts on NixOS in
+ # their current incarnation but with them in place, we stop the spam of
+ # errors in the log.
installPhase = ''
runHook preInstall
@@ -21,7 +29,9 @@ let
install -Dm755 hv_''${f}_daemon -t $out/bin
done
- install -Dm755 hv_get_dns_info.sh lsvmbus -t $out/bin
+ install -Dm755 lsvmbus $out/bin/lsvmbus
+ install -Dm755 hv_get_dhcp_info.sh $out/${libexec}/hv_get_dhcp_info
+ install -Dm755 hv_get_dns_info.sh $out/${libexec}/hv_get_dns_info
# I don't know why this isn't being handled automatically by fixupPhase
substituteInPlace $out/bin/lsvmbus \
@@ -31,8 +41,8 @@ let
'';
postFixup = ''
- # kvp needs to be able to find the script(s)
- wrapProgram $out/bin/hv_kvp_daemon --prefix PATH : $out/bin
+ wrapProgram $out/bin/hv_kvp_daemon \
+ --prefix PATH : $out/bin:${lib.makeBinPath [ gawk iproute ]}
'';
};
@@ -56,24 +66,19 @@ let
in stdenv.mkDerivation {
pname = "hyperv-daemons";
-
inherit (kernel) version;
# we just stick the bins into out as well as it requires "out"
outputs = [ "bin" "lib" "out" ];
- phases = [ "installPhase" ];
-
buildInputs = [ daemons ];
- installPhase = ''
+ buildCommand = ''
system=$lib/lib/systemd/system
- mkdir -p $system
-
- cp ${service "fcopy" "file copy (FCOPY)" "hv_fcopy" } $system/hv-fcopy.service
- cp ${service "kvp" "key-value pair (KVP)" "" } $system/hv-kvp.service
- cp ${service "vss" "volume shadow copy (VSS)" "" } $system/hv-vss.service
+ install -Dm444 ${service "fcopy" "file copy (FCOPY)" "hv_fcopy" } $system/hv-fcopy.service
+ install -Dm444 ${service "kvp" "key-value pair (KVP)" "" } $system/hv-kvp.service
+ install -Dm444 ${service "vss" "volume shadow copy (VSS)" "" } $system/hv-vss.service
cat > $system/hyperv-daemons.target <<EOF
[Unit]
@@ -102,7 +107,7 @@ in stdenv.mkDerivation {
Microsoft calls their guest agents "Integration Services" which is why
we use that name here.
'';
- homepage = https://kernel.org;
+ homepage = "https://kernel.org";
maintainers = with maintainers; [ peterhoeg ];
platforms = kernel.meta.platforms;
};
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 336408961b6..ccd80a92091 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20925,7 +20925,9 @@ in
tribler = callPackage ../applications/networking/p2p/tribler { };
- trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { };
+ trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita {
+ inherit (kdeApplications) akonadi-contacts;
+ };
tudu = callPackage ../applications/office/tudu { };
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8b1e7943fb6..047ef07746a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -12665,6 +12665,21 @@ let
};
};
+ NetPrometheus = buildPerlModule {
+ pname = "Net-Prometheus";
+ version = "0.07";
+ src = fetchurl {
+ url = mirror://cpan/authors/id/P/PE/PEVANS/Net-Prometheus-0.07.tar.gz;
+ sha256 = "1dh498b26wdaip053hw52317jjmb2n2r5209a1zv5yfrlxpblqm7";
+ };
+ propagatedBuildInputs = [ RefUtil StructDumb ];
+ buildInputs = [ TestFatal ];
+ meta = {
+ description = "export monitoring metrics for F<prometheus>";
+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
NetSCP = buildPerlPackage {
pname = "Net-SCP";
version = "0.08.reprise";
@@ -15736,6 +15751,20 @@ let
};
};
+ StructDumb = buildPerlModule {
+ pname = "Struct-Dumb";
+ version = "0.09";
+ src = fetchurl {
+ url = mirror://cpan/authors/id/P/PE/PEVANS/Struct-Dumb-0.09.tar.gz;
+ sha256 = "0g9rziaqxkm00vh30g1yfwzq3b1xl23p8fbm4rszqsp641wr2z9k";
+ };
+ buildInputs = [ TestFatal ];
+ meta = {
+ description = "make simple lightweight record-like structures";
+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
SubExporter = buildPerlPackage {
pname = "Sub-Exporter";
version = "0.987";
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 15:29:51 +0000