diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-03-17 12:01:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-17 12:01:55 +0000 |
| commit | c222aba0b8a03a3c31bf0132eae0c20960d4902e (patch) | |
| tree | 963960e341a8215fcd4a99dadd70b325f1675541 /pkgs/applications | |
| parent | 6d5111a77f6193c1ac295424a1af217c6843f592 (diff) | |
| parent | 0bd32bf93ac2b37d1b389a3ccb6e881db8b8191e (diff) | |
| download | nixlib-c222aba0b8a03a3c31bf0132eae0c20960d4902e.tar nixlib-c222aba0b8a03a3c31bf0132eae0c20960d4902e.tar.gz nixlib-c222aba0b8a03a3c31bf0132eae0c20960d4902e.tar.bz2 nixlib-c222aba0b8a03a3c31bf0132eae0c20960d4902e.tar.lz nixlib-c222aba0b8a03a3c31bf0132eae0c20960d4902e.tar.xz nixlib-c222aba0b8a03a3c31bf0132eae0c20960d4902e.tar.zst nixlib-c222aba0b8a03a3c31bf0132eae0c20960d4902e.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications')
4 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/networking/compactor/default.nix b/pkgs/applications/networking/compactor/default.nix index 84c0f6ae8ba5..12e6f432c5bd 100644 --- a/pkgs/applications/networking/compactor/default.nix +++ b/pkgs/applications/networking/compactor/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "dns-stats"; - repo = pname; + repo = "compactor"; rev = version; fetchSubmodules = true; hash = "sha256-5Z14suhO5ghhmZsSj4DsSoKm+ct2gQFO6qxhjmx4Xm4="; @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tools to capture DNS traffic and record it in C-DNS files"; homepage = "https://dns-stats.org/"; - changelog = "https://github.com/dns-stats/${pname}/raw/${version}/ChangeLog.txt"; + changelog = "https://github.com/dns-stats/compactor/raw/${version}/ChangeLog.txt"; license = licenses.mpl20; maintainers = with maintainers; [ fdns ]; platforms = platforms.unix; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index f226a32596d3..df2094c3b1fc 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -281,7 +281,7 @@ in stdenv.mkDerivation { ]; license = licenses.gpl2; homepage = "https://www.virtualbox.org/"; - maintainers = with maintainers; [ sander ]; + maintainers = with maintainers; [ sander friedrichaltheide ]; platforms = [ "x86_64-linux" ]; mainProgram = "VirtualBox"; }; diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix index 1831d42a129e..fad5aa6e10fb 100644 --- a/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -19,7 +19,7 @@ fetchurl rec { description = "Oracle Extension pack for VirtualBox"; license = licenses.virtualbox-puel; homepage = "https://www.virtualbox.org/"; - maintainers = with maintainers; [ sander ]; + maintainers = with maintainers; [ sander friedrichaltheide ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 4f0868730c19..a1c2c8d09e24 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -146,7 +146,7 @@ in stdenv.mkDerivation rec { ''; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = "GPL"; - maintainers = [ lib.maintainers.sander ]; + maintainers = [ lib.maintainers.sander lib.maintainers.friedrichaltheide ]; platforms = [ "i686-linux" "x86_64-linux" ]; broken = stdenv.hostPlatform.is32bit && (kernel.kernelAtLeast "5.10"); }; |