diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-12-10 12:01:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-10 12:01:12 +0000 |
| commit | 0f2bb5a63feac3533a8bf5f8a05c1e7e16a32a10 (patch) | |
| tree | 0d122ae3dcc87ff48180df53fd918b0dc3edcf2c | |
| parent | b2a2a5759e699cf227288bba886f27fa1c09836e (diff) | |
| parent | 416d7f1bb7c6254d1b2c7cdd9fb6960ff76308cc (diff) | |
| download | nixpkgs-0f2bb5a63feac3533a8bf5f8a05c1e7e16a32a10.tar nixpkgs-0f2bb5a63feac3533a8bf5f8a05c1e7e16a32a10.tar.gz nixpkgs-0f2bb5a63feac3533a8bf5f8a05c1e7e16a32a10.tar.bz2 nixpkgs-0f2bb5a63feac3533a8bf5f8a05c1e7e16a32a10.tar.lz nixpkgs-0f2bb5a63feac3533a8bf5f8a05c1e7e16a32a10.tar.xz nixpkgs-0f2bb5a63feac3533a8bf5f8a05c1e7e16a32a10.tar.zst nixpkgs-0f2bb5a63feac3533a8bf5f8a05c1e7e16a32a10.zip | |
Merge master into staging-next
112 files changed, 372 insertions, 214 deletions
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 7cd7fa237d5..5c6dea91e63 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -259,4 +259,11 @@ with lib.maintainers; { ]; scope = "coqui-ai TTS (formerly Mozilla TTS) and leaf packages"; }; + + xfce = { + members = [ + romildo + ]; + scope = "Maintain Xfce desktop environment and related packages."; + }; } diff --git a/nixos/modules/services/hardware/rasdaemon.nix b/nixos/modules/services/hardware/rasdaemon.nix index b1efe0f18c8..2d4c6d2ce95 100644 --- a/nixos/modules/services/hardware/rasdaemon.nix +++ b/nixos/modules/services/hardware/rasdaemon.nix @@ -137,7 +137,6 @@ in description = "the RAS logging daemon"; documentation = [ "man:rasdaemon(1)" ]; wantedBy = [ "multi-user.target" ]; - after = [ "syslog.target" ]; serviceConfig = { StateDirectory = optionalString (cfg.record) "rasdaemon"; diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index fb643e7a66e..869feb05eb7 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -192,15 +192,28 @@ in example = "batch"; description = '' Nix daemon process CPU scheduling policy. This policy propagates to - build processes. other is the default scheduling policy for regular - tasks. The batch policy is similar to other, but optimised for - non-interactive tasks. idle is for extremely low-priority tasks - that should only be run when no other task requires CPU time. - - Please note that while using the idle policy may greatly improve - responsiveness of a system performing expensive builds, it may also - slow down and potentially starve crucial configuration updates - during load. + build processes. <literal>other</literal> is the default scheduling + policy for regular tasks. The <literal>batch</literal> policy is + similar to <literal>other</literal>, but optimised for + non-interactive tasks. <literal>idle</literal> is for extremely + low-priority tasks that should only be run when no other task + requires CPU time. + + Please note that while using the <literal>idle</literal> policy may + greatly improve responsiveness of a system performing expensive + builds, it may also slow down and potentially starve crucial + configuration updates during load. + + <literal>idle</literal> may therefore be a sensible policy for + systems that experience only intermittent phases of high CPU load, + such as desktop or portable computers used interactively. Other + systems should use the <literal>other</literal> or + <literal>batch</literal> policy instead. + + For more fine-grained resource control, please refer to + <citerefentry><refentrytitle>systemd.resource-control + </refentrytitle><manvolnum>5</manvolnum></citerefentry> and adjust + <option>systemd.services.nix-daemon</option> directly. ''; }; @@ -210,13 +223,20 @@ in example = "idle"; description = '' Nix daemon process I/O scheduling class. This class propagates to - build processes. best-effort is the default class for regular tasks. - The idle class is for extremely low-priority tasks that should only - perform I/O when no other task does. - - Please note that while using the idle scheduling class can improve - responsiveness of a system performing expensive builds, it might also - slow down or starve crucial configuration updates during load. + build processes. <literal>best-effort</literal> is the default + class for regular tasks. The <literal>idle</literal> class is for + extremely low-priority tasks that should only perform I/O when no + other task does. + + Please note that while using the <literal>idle</literal> scheduling + class can improve responsiveness of a system performing expensive + builds, it might also slow down or starve crucial configuration + updates during load. + + <literal>idle</literal> may therefore be a sensible class for + systems that experience only intermittent phases of high I/O load, + such as desktop or portable computers used interactively. Other + systems should use the <literal>best-effort</literal> class. ''; }; diff --git a/nixos/modules/services/networking/jitsi-videobridge.nix b/nixos/modules/services/networking/jitsi-videobridge.nix index dd06ad98a97..abb0bd0a25e 100644 --- a/nixos/modules/services/networking/jitsi-videobridge.nix +++ b/nixos/modules/services/networking/jitsi-videobridge.nix @@ -217,6 +217,8 @@ in "-Dnet.java.sip.communicator.SC_HOME_DIR_NAME" = "videobridge"; "-Djava.util.logging.config.file" = "/etc/jitsi/videobridge/logging.properties"; "-Dconfig.file" = pkgs.writeText "jvb.conf" (toHOCON jvbConfig); + # Mitigate CVE-2021-44228 + "-Dlog4j2.formatMsgNoLookups" = true; } // (mapAttrs' (k: v: nameValuePair "-D${k}" v) cfg.extraProperties); in { diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 25276e1d649..3cf92f98c56 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -9,7 +9,7 @@ in { meta = { - maintainers = with maintainers; [ ]; + maintainers = teams.xfce.members; }; imports = [ diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 3dca98c2cc7..34de44a1aa3 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_13 }: +{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_15 }: stdenv.mkDerivation rec { pname = "logseq"; - version = "0.4.6"; + version = "0.5.1"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "fGRPuv98sr3wcVbkVCJr2yKxBZ/IiQP854T9NBf/vCk="; + sha256 = "/ZI9kK/9bYRJL8jOyRKpdMcy4Cbau+a28AO+kTUl+SE="; name = "${pname}-${version}.AppImage"; }; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - makeWrapper ${electron_13}/bin/electron $out/bin/${pname} \ + makeWrapper ${electron_15}/bin/electron $out/bin/${pname} \ --add-flags $out/share/${pname}/resources/app ''; diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix index 6884e5ea7a1..faa325023f9 100644 --- a/pkgs/applications/window-managers/i3/gaps.nix +++ b/pkgs/applications/window-managers/i3/gaps.nix @@ -2,13 +2,13 @@ i3.overrideAttrs (oldAttrs : rec { pname = "i3-gaps"; - version = "4.20"; + version = "4.20.1"; src = fetchFromGitHub { owner = "Airblader"; repo = "i3"; rev = version; - sha256 = "sha256-D16wMwCabEOG0AfAhohwcCHeUSvVF93i3zT/yu0FCu8="; + sha256 = "sha256-aS1dLs8KxoJaTf3RlQX+zRrtNmHEFZgkXDjt+8SuGDw="; }; meta = with lib; { diff --git a/pkgs/desktops/xfce/applications/catfish/default.nix b/pkgs/desktops/xfce/applications/catfish/default.nix index 5a4a5dc2a18..7d5ef0a288c 100644 --- a/pkgs/desktops/xfce/applications/catfish/default.nix +++ b/pkgs/desktops/xfce/applications/catfish/default.nix @@ -62,6 +62,6 @@ python3Packages.buildPythonApplication rec { ''; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.romildo ]; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/applications/gigolo/default.nix b/pkgs/desktops/xfce/applications/gigolo/default.nix index 84fec43b3c2..c23abc1d561 100644 --- a/pkgs/desktops/xfce/applications/gigolo/default.nix +++ b/pkgs/desktops/xfce/applications/gigolo/default.nix @@ -10,8 +10,9 @@ mkXfceDerivation { buildInputs = [ gtk3 glib ]; - meta = { + meta = with lib; { description = "A frontend to easily manage connections to remote filesystems"; - license = with lib.licenses; [ gpl2Only ]; + license = with licenses; [ gpl2Only ]; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/applications/mousepad/default.nix b/pkgs/desktops/xfce/applications/mousepad/default.nix index a7c57c3df2f..2b794aa4b8a 100644 --- a/pkgs/desktops/xfce/applications/mousepad/default.nix +++ b/pkgs/desktops/xfce/applications/mousepad/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, gobject-introspection, gtk3, gtksourceview4, gspell }: +{ lib, mkXfceDerivation, gobject-introspection, gtk3, gtksourceview4, gspell }: mkXfceDerivation { category = "apps"; @@ -15,7 +15,8 @@ mkXfceDerivation { # Use the GSettings keyfile backend rather than DConf configureFlags = [ "--enable-keyfile-settings" ]; - meta = { + meta = with lib; { description = "Simple text editor for Xfce"; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/applications/orage/default.nix b/pkgs/desktops/xfce/applications/orage/default.nix index f2747c9c62a..f38dacf0dbb 100644 --- a/pkgs/desktops/xfce/applications/orage/default.nix +++ b/pkgs/desktops/xfce/applications/orage/default.nix @@ -49,5 +49,6 @@ stdenv.mkDerivation rec { homepage = "https://git.xfce.org/archive/orage/"; license = licenses.gpl2Plus; platforms = platforms.linux; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/applications/parole/default.nix b/pkgs/desktops/xfce/applications/parole/default.nix index 8ea2180dea2..70d287dcdf4 100644 --- a/pkgs/desktops/xfce/applications/parole/default.nix +++ b/pkgs/desktops/xfce/applications/parole/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, dbus, dbus-glib +{ lib, mkXfceDerivation, dbus, dbus-glib , gst_all_1, gtk3, libnotify, libxfce4ui, libxfce4util , taglib, xfconf }: @@ -31,7 +31,8 @@ mkXfceDerivation { xfconf ]; - meta = { + meta = with lib; { description = "Modern simple media player"; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/applications/ristretto/default.nix b/pkgs/desktops/xfce/applications/ristretto/default.nix index 0dfb000c727..aef93da5ee9 100644 --- a/pkgs/desktops/xfce/applications/ristretto/default.nix +++ b/pkgs/desktops/xfce/applications/ristretto/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, gtk3, glib, libexif +{ lib, mkXfceDerivation, gtk3, glib, libexif , libxfce4ui, libxfce4util, xfconf }: mkXfceDerivation { @@ -12,7 +12,8 @@ mkXfceDerivation { NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - meta = { + meta = with lib; { description = "A fast and lightweight picture-viewer for the Xfce desktop environment"; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/applications/xfburn/default.nix b/pkgs/desktops/xfce/applications/xfburn/default.nix index f44769ddd69..e9fbd88894b 100644 --- a/pkgs/desktops/xfce/applications/xfburn/default.nix +++ b/pkgs/desktops/xfce/applications/xfburn/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, docbook_xsl, exo, gtk3, libburn, libisofs, libxfce4ui, libxslt }: +{ lib, mkXfceDerivation, docbook_xsl, exo, gtk3, libburn, libisofs, libxfce4ui, libxslt }: mkXfceDerivation { category = "apps"; @@ -9,4 +9,9 @@ mkXfceDerivation { nativeBuildInputs = [ libxslt docbook_xsl ]; buildInputs = [ exo gtk3 libburn libisofs libxfce4ui ]; + + meta = with lib; { + description = "Disc burner and project creator for Xfce"; + maintainers = with maintainers; [ ] ++ teams.xfce.members; + }; } diff --git a/pkgs/desktops/xfce/applications/xfce4-dict/default.nix b/pkgs/desktops/xfce/applications/xfce4-dict/default.nix index 94f6f7c5dd5..989d07a44f6 100644 --- a/pkgs/desktops/xfce/applications/xfce4-dict/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-dict/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, automakeAddFlags, gtk3, libxfce4ui, libxfce4util, xfce4-panel }: +{ lib, mkXfceDerivation, automakeAddFlags, gtk3, libxfce4ui, libxfce4util, xfce4-panel }: mkXfceDerivation { category = "apps"; @@ -17,7 +17,8 @@ mkXfceDerivation { buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel ]; - meta = { + meta = with lib; { description = "A Dictionary Client for the Xfce desktop environment"; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix b/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix index 64fc7db4dbc..75a57ae037a 100644 --- a/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, glib, gtk3, libnotify, libxfce4ui, libxfce4util +{ lib, mkXfceDerivation, glib, gtk3, libnotify, libxfce4ui, libxfce4util , xfce4-panel, xfconf }: mkXfceDerivation { @@ -14,7 +14,8 @@ mkXfceDerivation { "--enable-dbus-start-daemon" ]; - meta = { + meta = with lib; { description = "Simple notification daemon for Xfce"; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/applications/xfce4-panel-profiles/default.nix b/pkgs/desktops/xfce/applications/xfce4-panel-profiles/default.nix index 3c7f99f7d3a..bb8ff12c313 100644 --- a/pkgs/desktops/xfce/applications/xfce4-panel-profiles/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-panel-profiles/default.nix @@ -23,7 +23,8 @@ in mkXfceDerivation { --set GI_TYPELIB_PATH ${makeTypelibPath [ gtk3 libxfce4ui libxfce4util pango harfbuzz gdk-pixbuf atk ]} ''; - meta = { + meta = with lib; { description = "Simple application to manage Xfce panel layouts"; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix index f381b2d6181..99e5457a010 100644 --- a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, exo, gtk3, libsoup, libxfce4ui, libxfce4util, xfce4-panel, glib-networking }: +{ lib, mkXfceDerivation, exo, gtk3, libsoup, libxfce4ui, libxfce4util, xfce4-panel, glib-networking }: mkXfceDerivation { category = "apps"; @@ -10,7 +10,8 @@ mkXfceDerivation { buildInputs = [ exo gtk3 libsoup libxfce4ui libxfce4util xfce4-panel glib-networking ]; - meta = { + meta = with lib; { description = "Screenshot utility for the Xfce desktop"; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix b/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix index 6c7e0b29681..ace9f16e426 100644 --- a/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, exo, gtk3, libwnck, libXmu }: +{ lib, mkXfceDerivation, exo, gtk3, libwnck, libXmu }: mkXfceDerivation { category = "apps"; @@ -10,7 +10,8 @@ mkXfceDerivation { nativeBuildInputs = [ exo ]; buildInputs = [ gtk3 libwnck libXmu ]; - meta = { + meta = with lib; { description = "Easy to use task manager for Xfce"; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix b/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix index ce0c2d1f3cd..4d887f96ffd 100644 --- a/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, gtk3, libxfce4ui, vte, xfconf, pcre2, libxslt, docbook_xml_dtd_45, docbook_xsl }: +{ lib, mkXfceDerivation, gtk3, libxfce4ui, vte, xfconf, pcre2, libxslt, docbook_xml_dtd_45, docbook_xsl }: mkXfceDerivation { category = "apps"; @@ -11,7 +11,8 @@ mkXfceDerivation { buildInputs = [ gtk3 libxfce4ui vte xfconf pcre2 ]; - meta = { + meta = with lib; { description = "A modern terminal emulator"; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix b/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix index fc9328e0e2f..13118103184 100644 --- a/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix @@ -12,6 +12,6 @@ mkXfceDerivation { meta = with lib; { description = "A volume keys control daemon for Xfce using pulseaudio"; license = licenses.gpl3Plus; - maintainers = [ maintainers.abbradar ]; + maintainers = with maintainers; [ abbradar ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/applications/xfdashboard/default.nix b/pkgs/desktops/xfce/applications/xfdashboard/default.nix index c5653ddc9fb..ee09d6196c7 100644 --- a/pkgs/desktops/xfce/applications/xfdashboard/default.nix +++ b/pkgs/desktops/xfce/applications/xfdashboard/default.nix @@ -1,4 +1,5 @@ -{ mkXfceDerivation +{ lib +, mkXfceDerivation , clutter , libXcomposite , libXinerama @@ -39,7 +40,8 @@ mkXfceDerivation { xfconf ]; - meta = { + meta = with lib; { description = "Gnome shell like dashboard"; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/art/xfce4-icon-theme/default.nix b/pkgs/desktops/xfce/art/xfce4-icon-theme/default.nix index 6ece5d68c5f..8c4dff80747 100644 --- a/pkgs/desktops/xfce/art/xfce4-icon-theme/default.nix +++ b/pkgs/desktops/xfce/art/xfce4-icon-theme/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { description = "Icons for Xfce"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.eelco ]; + maintainers = with maintainers; [ eelco ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/art/xfwm4-themes/default.nix b/pkgs/desktops/xfce/art/xfwm4-themes/default.nix index 5548be8f4ab..2c84c619c64 100644 --- a/pkgs/desktops/xfce/art/xfwm4-themes/default.nix +++ b/pkgs/desktops/xfce/art/xfwm4-themes/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { description = "Themes for Xfce"; license = licenses.gpl3Only; platforms = platforms.linux; - maintainers = [ maintainers.volth ]; + maintainers = with maintainers; [ volth ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/core/exo/default.nix b/pkgs/desktops/xfce/core/exo/default.nix index 3ab53444a41..06280220f96 100644 --- a/pkgs/desktops/xfce/core/exo/default.nix +++ b/pkgs/desktops/xfce/core/exo/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, docbook_xsl, glib, libxslt, gtk3 +{ lib, mkXfceDerivation, docbook_xsl, glib, libxslt, gtk3 , libxfce4ui, libxfce4util, perl }: mkXfceDerivation { @@ -25,7 +25,8 @@ mkXfceDerivation { # Workaround https://bugzilla.xfce.org/show_bug.cgi?id=15825 NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - meta = { + meta = with lib; { description = "Application library for Xfce"; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/core/garcon/default.nix b/pkgs/desktops/xfce/core/garcon/default.nix index a3ff8e0afd1..740022550eb 100644 --- a/pkgs/desktops/xfce/core/garcon/default.nix +++ b/pkgs/desktops/xfce/core/garcon/default.nix @@ -11,8 +11,9 @@ mkXfceDerivation { buildInputs = [ gtk3 libxfce4ui libxfce4util ]; - meta = { + meta = with lib; { description = "Xfce menu support library"; - license = with lib.licenses; [ lgpl2Only fdl11Only ]; + license = with licenses; [ lgpl2Only fdl11Only ]; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/core/libxfce4ui/default.nix b/pkgs/desktops/xfce/core/libxfce4ui/default.nix index b70ef2788ac..fc3535127fa 100644 --- a/pkgs/desktops/xfce/core/libxfce4ui/default.nix +++ b/pkgs/desktops/xfce/core/libxfce4ui/default.nix @@ -19,5 +19,6 @@ mkXfceDerivation { meta = with lib; { description = "Widgets library for Xfce"; license = with licenses; [ lgpl2Plus lgpl21Plus ]; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/core/libxfce4util/default.nix b/pkgs/desktops/xfce/core/libxfce4util/default.nix index 638c3a3158d..4262a039303 100644 --- a/pkgs/desktops/xfce/core/libxfce4util/default.nix +++ b/pkgs/desktops/xfce/core/libxfce4util/default.nix @@ -12,5 +12,6 @@ mkXfceDerivation { meta = with lib; { description = "Extension library for Xfce"; license = licenses.lgpl2Plus; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/core/thunar-volman/default.nix b/pkgs/desktops/xfce/core/thunar-volman/default.nix index 31d25f97d37..3fe2df6f1b6 100644 --- a/pkgs/desktops/xfce/core/thunar-volman/default.nix +++ b/pkgs/desktops/xfce/core/thunar-volman/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, exo, gtk3, libgudev, libxfce4ui, libxfce4util, xfconf }: +{ lib, mkXfceDerivation, exo, gtk3, libgudev, libxfce4ui, libxfce4util, xfconf }: mkXfceDerivation { category = "xfce"; @@ -11,7 +11,8 @@ mkXfceDerivation { odd-unstable = false; - meta = { + meta = with lib; { description = "Thunar extension for automatic management of removable drives and media"; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/pkgs/desktops/xfce/core/thunar/default.nix index 2672da6ad37..3319141a8be 100644 --- a/pkgs/desktops/xfce/core/thunar/default.nix +++ b/pkgs/desktops/xfce/core/thunar/default.nix @@ -58,8 +58,9 @@ let unwrapped = mkXfceDerivation { sed -i -e 's|thunar_dialogs_show_insecure_program (parent, _(".*"), file, exec)|1|' thunar/thunar-file.c ''; - meta = { + meta = with lib; { description = "Xfce file manager"; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; }; diff --git a/pkgs/desktops/xfce/core/thunar/wrapper.nix b/pkgs/desktops/xfce/core/thunar/wrapper.nix index 5381dceae4a..584c356547b 100644 --- a/pkgs/desktops/xfce/core/thunar/wrapper.nix +++ b/pkgs/desktops/xfce/core/thunar/wrapper.nix @@ -1,4 +1,4 @@ -{ makeWrapper, symlinkJoin, thunar, thunarPlugins, lib }: +{ lib, makeWrapper, symlinkJoin, thunar, thunarPlugins }: symlinkJoin { name = "thunar-with-plugins-${thunar.version}"; diff --git a/pkgs/desktops/xfce/core/tumbler/default.nix b/pkgs/desktops/xfce/core/tumbler/default.nix index a9642b3b52c..26a28b9b426 100644 --- a/pkgs/desktops/xfce/core/tumbler/default.nix +++ b/pkgs/desktops/xfce/core/tumbler/default.nix @@ -1,4 +1,5 @@ -{ mkXfceDerivation +{ lib +, mkXfceDerivation , ffmpegthumbnailer , gdk-pixbuf , glib @@ -32,7 +33,8 @@ mkXfceDerivation { wrapProgram $out/lib/tumbler-1/tumblerd "''${gappsWrapperArgs[@]}" ''; - meta = { + meta = with lib; { description = "A D-Bus thumbnailer service"; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix b/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix index 4d0f61863e7..d98353a070a 100644 --- a/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, exo, garcon, gtk3, libxfce4util, libxfce4ui, xfconf }: +{ lib, mkXfceDerivation, exo, garcon, gtk3, libxfce4util, libxfce4ui, xfconf }: mkXfceDerivation { category = "xfce"; @@ -10,7 +10,8 @@ mkXfceDerivation { nativeBuildInputs = [ exo ]; buildInputs = [ garcon gtk3 libxfce4ui libxfce4util xfconf ]; - meta = { + meta = with lib; { description = "Appfinder for the Xfce4 Desktop Environment"; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix b/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix index fc8263abb4f..16c35e6002b 100644 --- a/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix @@ -1,4 +1,5 @@ -{ mkXfceDerivation +{ lib +, mkXfceDerivation , autoreconfHook , libxslt , docbook_xsl @@ -34,7 +35,8 @@ mkXfceDerivation { setupHook = ./setup-hook.sh; - meta = { + meta = with lib; { description = "Autoconf macros and scripts to augment app build systems"; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/pkgs/desktops/xfce/core/xfce4-panel/default.nix index 417241235b9..4fa26b3da02 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel/default.nix @@ -1,4 +1,5 @@ -{ mkXfceDerivation +{ lib +, mkXfceDerivation , exo , garcon , glib @@ -51,7 +52,8 @@ mkXfceDerivation { # Workaround https://bugzilla.xfce.org/show_bug.cgi?id=15825 NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - meta = { + meta = with lib; { description = "Panel for the Xfce desktop environment"; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix b/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix index 9877027c403..107357d5a73 100644 --- a/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, automakeAddFlags, exo, gtk3, libnotify +{ lib, mkXfceDerivation, automakeAddFlags, exo, gtk3, libnotify , libxfce4ui, libxfce4util, upower, xfconf, xfce4-panel }: mkXfceDerivation { @@ -17,7 +17,8 @@ mkXfceDerivation { automakeAddFlags settings/Makefile.am xfce4_power_manager_settings_CFLAGS GIO_CFLAGS ''; - meta = { + meta = with lib; { description = "A power manager for the Xfce Desktop Environment"; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/core/xfce4-session/default.nix b/pkgs/desktops/xfce/core/xfce4-session/default.nix index 27eaf94b259..5ce96c1b02b 100644 --- a/pkgs/desktops/xfce/core/xfce4-session/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-session/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, polkit, exo, libxfce4util, libxfce4ui, xfconf, iceauth, gtk3, glib, libwnck, xfce4-session }: +{ lib, mkXfceDerivation, polkit, exo, libxfce4util, libxfce4ui, xfconf, iceauth, gtk3, glib, libwnck, xfce4-session }: mkXfceDerivation { category = "xfce"; @@ -16,7 +16,8 @@ mkXfceDerivation { passthru.xinitrc = "${xfce4-session}/etc/xdg/xfce4/xinitrc"; - meta = { + meta = with lib; { description = "Session manager for Xfce"; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/core/xfce4-settings/default.nix b/pkgs/desktops/xfce/core/xfce4-settings/default.nix index 61382ba8c50..91714976f84 100644 --- a/pkgs/desktops/xfce/core/xfce4-settings/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-settings/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, exo, garcon, gtk3, glib +{ lib, mkXfceDerivation, exo, garcon, gtk3, glib , libnotify, libxfce4ui, libxfce4util, libxklavier , upower, xfconf, xf86inputlibinput }: @@ -34,7 +34,8 @@ mkXfceDerivation { "--enable-sound-settings" ]; - meta = { + meta = with lib; { description = "Settings manager for Xfce"; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/core/xfconf/default.nix b/pkgs/desktops/xfce/core/xfconf/default.nix index f255c5e5e58..c3946258292 100644 --- a/pkgs/desktops/xfce/core/xfconf/default.nix +++ b/pkgs/desktops/xfce/core/xfconf/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, libxfce4util, gobject-introspection, vala }: +{ lib, mkXfceDerivation, libxfce4util, gobject-introspection, vala }: mkXfceDerivation { category = "xfce"; @@ -11,7 +11,8 @@ mkXfceDerivation { buildInputs = [ libxfce4util ]; - meta = { + meta = with lib; { description = "Simple client-server configuration storage and query system for Xfce"; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/core/xfdesktop/default.nix b/pkgs/desktops/xfce/core/xfdesktop/default.nix index bc6a19346ec..7e397b395f3 100644 --- a/pkgs/desktops/xfce/core/xfdesktop/default.nix +++ b/pkgs/desktops/xfce/core/xfdesktop/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, exo, gtk3, libxfce4ui, libxfce4util, libwnck, xfconf, libnotify, garcon, thunar }: +{ lib, mkXfceDerivation, exo, gtk3, libxfce4ui, libxfce4util, libwnck, xfconf, libnotify, garcon, thunar }: mkXfceDerivation { category = "xfce"; @@ -19,7 +19,8 @@ mkXfceDerivation { thunar ]; - meta = { + meta = with lib; { description = "Xfce's desktop manager"; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/core/xfwm4/default.nix b/pkgs/desktops/xfce/core/xfwm4/default.nix index 61e46d3047d..efc12dd91eb 100644 --- a/pkgs/desktops/xfce/core/xfwm4/default.nix +++ b/pkgs/desktops/xfce/core/xfwm4/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, exo, librsvg, dbus-glib, libepoxy, gtk3, libXdamage +{ lib, mkXfceDerivation, exo, librsvg, dbus-glib, libepoxy, gtk3, libXdamage , libstartup_notification, libxfce4ui, libxfce4util, libwnck , libXpresent, xfconf }: @@ -24,7 +24,8 @@ mkXfceDerivation { xfconf ]; - meta = { + meta = with lib; { description = "Window manager for Xfce"; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin/default.nix index ffb0118edee..bfaa340f524 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, gtk3, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: +{ lib, mkXfceDerivation, gtk3, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: mkXfceDerivation { category = "panel-plugins"; @@ -10,7 +10,8 @@ mkXfceDerivation { buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ]; - meta = { + meta = with lib; { description = "Battery plugin for Xfce panel"; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix index 7f18009c51d..0fd84aaba74 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, libXtst, libxfce4ui, xfce4-panel, xfconf }: +{ lib, mkXfceDerivation, libXtst, libxfce4ui, xfce4-panel, xfconf }: mkXfceDerivation { category = "panel-plugins"; @@ -8,7 +8,8 @@ mkXfceDerivation { buildInputs = [ libXtst libxfce4ui xfce4-panel xfconf ]; - meta = { + meta = with lib; { description = "Clipboard manager for Xfce panel"; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix index 358d2b64e44..e382e8024da 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, gtk3, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: +{ lib, mkXfceDerivation, gtk3, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: mkXfceDerivation { category = "panel-plugins"; @@ -8,7 +8,8 @@ mkXfceDerivation { buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ]; - meta = { + meta = with lib; { description = "CPU Freq load plugin for Xfce panel"; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix index f475793f296..0d0bf49161d 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix @@ -56,6 +56,6 @@ in stdenv.mkDerivation rec { description = "CPU graph show for Xfce panel"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ ]; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix index 2626ea74997..70b3eca4137 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix @@ -26,6 +26,6 @@ mkXfceDerivation { meta = with lib; { description = "Shows the date and time in the panel, and a calendar appears when you left-click on it"; - maintainers = [ ]; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix index 23ae5e4e878..97c564a40c6 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix @@ -64,6 +64,6 @@ stdenv.mkDerivation rec { description = "Plugins to embed DockbarX into xfce4-panel"; license = licenses.mit; platforms = platforms.linux; - maintainers = [ maintainers.romildo ]; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix index 00738ccbc62..76868bcd550 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix @@ -45,6 +45,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; broken = true; # unmaintained plugin; no longer compatible with xfce 4.16 - maintainers = [ ]; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix index 4bc03994048..3ee90788137 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix @@ -46,6 +46,6 @@ in stdenv.mkDerivation rec { description = "Rolling eyes (following mouse pointer) plugin for the Xfce panel"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ ]; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix index 1e98a5a6212..084cb764c62 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix @@ -46,6 +46,6 @@ in stdenv.mkDerivation rec { description = "Filesystem usage monitor plugin for the Xfce panel"; license = licenses.bsd2; platforms = platforms.linux; - maintainers = [ ]; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix index e190df90b83..9700d515fbc 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix @@ -44,6 +44,6 @@ in stdenv.mkDerivation rec { description = "Generic monitor plugin for the Xfce panel"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ ]; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin/default.nix index 8ff68c21d61..3f1f9c25c50 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; platforms = platforms.unix; broken = true; # unmaintained plugin; no longer compatible with xfce 4.16 - maintainers = [ maintainers.romildo ]; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin/default.nix index 136b91a8a2f..a65444f2278 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { description = "Workspace switcher plugin for xfce4-panel which can be used for the i3 window manager"; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = [ maintainers.berbiche ]; + maintainers = with maintainers; [ berbiche ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix index 56d9a15aaad..455370ca38b 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { description = "Mail watcher plugin for Xfce panel"; license = licenses.gpl2Only; platforms = platforms.linux; - maintainers = [ ]; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix index 8012b14b138..1f935ac4a4d 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { description = "MPD plugin for Xfce panel"; platforms = platforms.linux; license = licenses.bsd2; - maintainers = [ ]; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix index 0b67e946829..3f749c85b24 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { description = "Plugin which integrates titlebar and window controls into the xfce4-panel"; license = licenses.mit; platforms = platforms.linux; - maintainers = [ maintainers.volth ]; + maintainers = with maintainers; [ volth ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix index dc39001b808..2720520a047 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, gtk3, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: +{ lib, mkXfceDerivation, gtk3, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: mkXfceDerivation { category = "panel-plugins"; @@ -10,7 +10,8 @@ mkXfceDerivation { buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ]; - meta = { + meta = with lib; { description = "Internet load speed plugin for Xfce4 panel"; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix index 6e84c83eafc..c2a7aa694d7 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix @@ -42,6 +42,6 @@ in stdenv.mkDerivation rec { description = "Sticky notes plugin for Xfce panel"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ ]; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix index ab398372161..5915a43372d 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix @@ -1,4 +1,5 @@ -{ mkXfceDerivation +{ lib +, mkXfceDerivation , automakeAddFlags , dbus-glib , dbus @@ -43,7 +44,8 @@ mkXfceDerivation { xfconf ]; - meta = { + meta = with lib; { description = "Adjust the audio volume of the PulseAudio sound system"; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix index db6c50f07de..fa221e65ea1 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { description = "A panel plug-in for different sensors using acpi, lm_sensors and hddtemp"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix index 092985f5acd..7236eb97d6d 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix @@ -42,6 +42,6 @@ in stdenv.mkDerivation rec { description = "System load plugin for Xfce panel"; license = licenses.bsd2; platforms = platforms.linux; - maintainers = [ ]; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix index a31824ab771..35840b9d244 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { description = "Simple countdown and alarm plugin for the Xfce panel"; platforms = platforms.linux; license = licenses.gpl2Plus; - maintainers = [ ]; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix index 838dba46c88..e0d2db11d6f 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix @@ -20,6 +20,6 @@ mkXfceDerivation { meta = with lib; { description = "A command-line plugin"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix index d300329d287..4ce0fae5a39 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { description = "Weather plugin for the Xfce desktop environment"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix index 89f5f9ac38b..9d090e30c93 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, gettext, gtk3, glib, cmake, exo, garcon, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: +{ lib, mkXfceDerivation, gettext, gtk3, glib, cmake, exo, garcon, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: mkXfceDerivation { category = "panel-plugins"; @@ -22,7 +22,8 @@ mkXfceDerivation { --replace $out/bin/xfce4-panel ${xfce4-panel.out}/bin/xfce4-panel ''; - meta = { + meta = with lib; { description = "Alternate application launcher for Xfce"; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix index 8f4751b1737..6a2386e0f89 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix @@ -45,6 +45,6 @@ stdenv.mkDerivation rec { description = "Xfce plugins which allows to put the maximized window title and buttons on the panel"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = [ maintainers.volth ]; + maintainers = with maintainers; [ volth ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix index 8145f1a2af0..97332cf36e9 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix @@ -32,6 +32,6 @@ mkXfceDerivation { meta = with lib; { description = "Allows you to setup and use multiple keyboard layouts"; - maintainers = [ ]; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix index 53d18b4d9b3..ef1271bcba8 100644 --- a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix @@ -33,5 +33,6 @@ mkXfceDerivation { meta = with lib; { description = "Thunar plugin providing file context menus for archives"; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix index 3e8004d3d53..75ef2491fe1 100644 --- a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix @@ -41,5 +41,6 @@ stdenv.mkDerivation rec { description = "A plugin that adds context-menu items for Dropbox to Thunar"; license = licenses.gpl3Only; platforms = platforms.linux; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/thunar-plugins/media-tags/default.nix b/pkgs/desktops/xfce/thunar-plugins/media-tags/default.nix index 5b97bb3066f..65f9942b3a5 100644 --- a/pkgs/desktops/xfce/thunar-plugins/media-tags/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/media-tags/default.nix @@ -32,6 +32,6 @@ mkXfceDerivation { meta = with lib; { description = "Thunar plugin providing tagging and renaming features for media files"; - maintainers = with maintainers; [ ncfavier ]; + maintainers = with maintainers; [ ncfavier ] ++ teams.xfce.members; }; } diff --git a/pkgs/development/compilers/go/1.16.nix b/pkgs/development/compilers/go/1.16.nix index 16fa8823c8d..61d24b0ee0c 100644 --- a/pkgs/development/compilers/go/1.16.nix +++ b/pkgs/development/compilers/go/1.16.nix @@ -40,8 +40,11 @@ let "armv5tel" = "arm"; "armv6l" = "arm"; "armv7l" = "arm"; - "powerpc64le" = "ppc64le"; "mips" = "mips"; + "mipsel" = "mipsle"; + "riscv64" = "riscv64"; + "s390x" = "s390x"; + "powerpc64le" = "ppc64le"; }.${platform.parsed.cpu.name} or (throw "Unsupported system"); # We need a target compiler which is still runnable at build time, diff --git a/pkgs/development/compilers/go/1.17.nix b/pkgs/development/compilers/go/1.17.nix index 1b46ba1aad6..e16e78d21a3 100644 --- a/pkgs/development/compilers/go/1.17.nix +++ b/pkgs/development/compilers/go/1.17.nix @@ -40,6 +40,10 @@ let "armv5tel" = "arm"; "armv6l" = "arm"; "armv7l" = "arm"; + "mips" = "mips"; + "mipsel" = "mipsle"; + "riscv64" = "riscv64"; + "s390x" = "s390x"; "powerpc64le" = "ppc64le"; }.${platform.parsed.cpu.name} or (throw "Unsupported system"); diff --git a/pkgs/development/compilers/llvm/13/compiler-rt/armv7l.patch b/pkgs/development/compilers/llvm/13/compiler-rt/armv7l.patch index 120cfe6feb2..6818684e6a7 100644 --- a/pkgs/development/compilers/llvm/13/compiler-rt/armv7l.patch +++ b/pkgs/development/compilers/llvm/13/compiler-rt/armv7l.patch @@ -1,19 +1,18 @@ diff -ur compiler-rt-10.0.0.src/cmake/builtin-config-ix.cmake compiler-rt-10.0.0.src-patched/cmake/builtin-config-ix.cmake --- compiler-rt-10.0.0.src/cmake/builtin-config-ix.cmake 2020-03-24 00:01:02.000000000 +0900 +++ compiler-rt-10.0.0.src-patched/cmake/builtin-config-ix.cmake 2020-05-10 03:42:00.883450706 +0900 -@@ -24,7 +24,7 @@ - +@@ -37,6 +37,6 @@ set(ARM64 aarch64) --set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k) -+set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l) +-set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv8m.main armv8.1m.main) ++set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l armv8m.main armv8.1m.main) set(HEXAGON hexagon) set(X86 i386) set(X86_64 x86_64) diff -ur compiler-rt-10.0.0.src/lib/builtins/CMakeLists.txt compiler-rt-10.0.0.src-patched/lib/builtins/CMakeLists.txt --- compiler-rt-10.0.0.src/lib/builtins/CMakeLists.txt 2020-03-24 00:01:02.000000000 +0900 +++ compiler-rt-10.0.0.src-patched/lib/builtins/CMakeLists.txt 2020-05-10 03:44:49.468579650 +0900 -@@ -474,6 +474,7 @@ +@@ -555,6 +555,7 @@ set(armv7_SOURCES ${arm_SOURCES}) set(armv7s_SOURCES ${arm_SOURCES}) set(armv7k_SOURCES ${arm_SOURCES}) @@ -21,12 +20,12 @@ diff -ur compiler-rt-10.0.0.src/lib/builtins/CMakeLists.txt compiler-rt-10.0.0.s set(arm64_SOURCES ${aarch64_SOURCES}) # macho_embedded archs -@@ -595,7 +596,7 @@ +@@ -705,7 +705,7 @@ foreach (arch ${BUILTIN_SUPPORTED_ARCH}) if (CAN_TARGET_${arch}) # For ARM archs, exclude any VFP builtins if VFP is not supported -- if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") -+ if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em)$") +- if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em|armv8m.main|armv8.1m.main)$") ++ if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em|armv8m.main|armv8.1m.main)$") string(REPLACE ";" " " _TARGET_${arch}_CFLAGS "${TARGET_${arch}_CFLAGS}") check_compile_definition(__VFP_FP__ "${CMAKE_C_FLAGS} ${_TARGET_${arch}_CFLAGS}" COMPILER_RT_HAS_${arch}_VFP) if(NOT COMPILER_RT_HAS_${arch}_VFP) diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix index c0e3470f973..1ccb0e41e70 100644 --- a/pkgs/development/libraries/ldns/default.nix +++ b/pkgs/development/libraries/ldns/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ldns"; - version = "1.8.0"; + version = "1.8.1"; src = fetchurl { url = "https://www.nlnetlabs.nl/downloads/ldns/${pname}-${version}.tar.gz"; - sha256 = "sha256-glElB2mAMcN5AulByE3so+2tjPeR58MnWi2Z1OU/jPw="; + sha256 = "sha256-lYIpq85NOqoZp1wNEnZmVksXIWkCGG6VLKSu9Hxtf6M="; }; postPatch = '' diff --git a/pkgs/development/libraries/relibc/default.nix b/pkgs/development/libraries/relibc/default.nix index 5f27f902fa9..eb84ed85c61 100644 --- a/pkgs/development/libraries/relibc/default.nix +++ b/pkgs/development/libraries/relibc/default.nix @@ -73,6 +73,6 @@ redoxRustPlatform.buildRustPackage rec { description = "C Library in Rust for Redox and Linux"; license = licenses.mit; maintainers = [ maintainers.aaronjanse ]; - platforms = platforms.redox; + platforms = platforms.redox ++ [ "x86_64-linux" ]; }; } diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index 141c9edbd23..60f532b9779 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "usbredir"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "spice"; repo = "usbredir"; rev = "${pname}-${version}"; - sha256 = "1ra8vpi6wdq1fvvqzx4ny2ga0p0q1cwz72gr15nghyfp75y3d31l"; + sha256 = "sha256-OVLc3FWLBjWJnqIhhe6k+pl/HsJGzqD6xp/fXXEgRwY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/nim-packages/snappy/default.nix b/pkgs/development/nim-packages/snappy/default.nix index 4e0282cd23c..88de1f4552a 100644 --- a/pkgs/development/nim-packages/snappy/default.nix +++ b/pkgs/development/nim-packages/snappy/default.nix @@ -11,7 +11,6 @@ buildNimPackage rec { }; propagatedBuildInputs = [ snappy ]; patches = [ ./config.patch ]; - doCheck = true; preCheck = '' mkdir $NIX_BUILD_TOP/nimcache/ mv -v tests/data $NIX_BUILD_TOP/nimcache/data diff --git a/pkgs/development/ocaml-modules/awa/default.nix b/pkgs/development/ocaml-modules/awa/default.nix index 9f0e252c3e2..4316d06d935 100644 --- a/pkgs/development/ocaml-modules/awa/default.nix +++ b/pkgs/development/ocaml-modules/awa/default.nix @@ -18,12 +18,13 @@ buildDunePackage rec { sha256 = "1l7nsd8jifxjq78xyzcc0z9igc02m2qlvv4cxzsgdim6n1jfzxj2"; }; - nativeBuildInputs = [ ppx_sexp_conv ppx_cstruct ]; + nativeBuildInputs = [ ppx_cstruct ]; propagatedBuildInputs = [ mirage-crypto mirage-crypto-rng mirage-crypto-pk x509 cstruct cstruct-sexp sexplib mtime logs base64 hacl_x25519 zarith + ppx_sexp_conv ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/dolmen/default.nix b/pkgs/development/ocaml-modules/dolmen/default.nix index 56b87a4e971..9a21da98681 100644 --- a/pkgs/development/ocaml-modules/dolmen/default.nix +++ b/pkgs/development/ocaml-modules/dolmen/default.nix @@ -19,7 +19,8 @@ buildDunePackage rec { buildInputs = [ menhir ]; propagatedBuildInputs = [ menhirLib fmt ]; - doCheck = true; + # Testr are not compatible with menhir 20211128 + doCheck = false; meta = { description = "An OCaml library providing clean and flexible parsers for input languages"; diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix index 686cf982058..1938206361e 100644 --- a/pkgs/development/ocaml-modules/menhir/default.nix +++ b/pkgs/development/ocaml-modules/menhir/default.nix @@ -5,6 +5,8 @@ buildDunePackage rec { pname = "menhir"; + minimalOCamlVersion = "4.03"; + inherit (menhirLib) version src useDune2; buildInputs = [ menhirLib menhirSdk ]; diff --git a/pkgs/development/ocaml-modules/menhir/lib.nix b/pkgs/development/ocaml-modules/menhir/lib.nix index 5888833203c..4d27fe32738 100644 --- a/pkgs/development/ocaml-modules/menhir/lib.nix +++ b/pkgs/development/ocaml-modules/menhir/lib.nix @@ -2,14 +2,14 @@ buildDunePackage rec { pname = "menhirLib"; - version = "20211012"; + version = "20211128"; src = fetchFromGitLab { domain = "gitlab.inria.fr"; owner = "fpottier"; repo = "menhir"; rev = version; - sha256 = "08kf5apbv15n2kcr3qhyr3rvsf2lg25ackr3x9kfgiiqc0p3sz40"; + sha256 = "sha256-L/zfjPZfn9L7qqqqJGk3Ge52rvujOVPiL8jxfH5R60g="; }; useDune2 = true; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix index f1ca1fef702..102d3d2de07 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildDunePackage, ounit, cstruct, dune-configurator, eqaf, bigarray-compat, pkg-config +{ lib, fetchurl, buildDunePackage, ounit, cstruct, dune-configurator, eqaf, pkg-config , withFreestanding ? false , ocaml-freestanding }: @@ -7,11 +7,11 @@ buildDunePackage rec { minimumOCamlVersion = "4.08"; pname = "mirage-crypto"; - version = "0.10.3"; + version = "0.10.5"; src = fetchurl { url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz"; - sha256 = "a27910365d59b02c3f0e8a40d93a5b81835acf832e1ffa596ee772b41e8a900b"; + sha256 = "sha256-eeKMSRZrBiTzWLv80P5LeouPib24uTigk2HLtORKpJU="; }; useDune2 = true; @@ -21,7 +21,7 @@ buildDunePackage rec { nativeBuildInputs = [ dune-configurator pkg-config ]; propagatedBuildInputs = [ - cstruct eqaf bigarray-compat + cstruct eqaf ] ++ lib.optionals withFreestanding [ ocaml-freestanding ]; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/pk.nix b/pkgs/development/ocaml-modules/mirage-crypto/pk.nix index d6c4d494510..82400b5da7c 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/pk.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/pk.nix @@ -1,5 +1,5 @@ { buildDunePackage, ounit, randomconv, mirage-crypto, mirage-crypto-rng -, cstruct, sexplib, ppx_sexp_conv, zarith, eqaf, rresult, gmp }: +, cstruct, sexplib0, zarith, eqaf, gmp }: buildDunePackage { pname = "mirage-crypto-pk"; @@ -8,7 +8,7 @@ buildDunePackage { buildInputs = [ gmp ]; propagatedBuildInputs = [ cstruct mirage-crypto mirage-crypto-rng - zarith eqaf rresult sexplib ppx_sexp_conv ]; + zarith eqaf sexplib0 ]; doCheck = true; checkInputs = [ ounit randomconv ]; diff --git a/pkgs/development/ocaml-modules/otr/default.nix b/pkgs/development/ocaml-modules/otr/default.nix index cec5d2ee0d0..d2ed78d51b8 100644 --- a/pkgs/development/ocaml-modules/otr/default.nix +++ b/pkgs/development/ocaml-modules/otr/default.nix @@ -1,24 +1,24 @@ { lib, fetchurl, buildDunePackage -, cstruct, sexplib0, rresult, mirage-crypto, mirage-crypto-pk, astring, base64 -, mirage-crypto-rng +, cstruct, sexplib0, mirage-crypto, mirage-crypto-pk, astring, base64 }: buildDunePackage rec { pname = "otr"; - version = "0.3.8"; + version = "0.3.10"; + + minimumOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/hannesm/ocaml-otr/releases/download/v${version}/otr-v${version}.tbz"; - sha256 = "18hn9l8wznqnlh2jf1hpnp36f1cx80ncwiiivsbj34llhgp3893d"; + sha256 = "0dssc7p6s7z53n0mddyipjghzr8ld8bb7alaxqrx9gdpspwab1gq"; }; useDune2 = true; propagatedBuildInputs = [ cstruct sexplib0 mirage-crypto mirage-crypto-pk - astring rresult base64 ]; + astring base64 ]; doCheck = true; - checkInputs = [ mirage-crypto-rng ]; meta = with lib; { homepage = "https://github.com/hannesm/ocaml-otr"; diff --git a/pkgs/development/python-modules/ansible/base.nix b/pkgs/development/python-modules/ansible/base.nix index e6113b93dcb..a7ab23a3666 100644 --- a/pkgs/development/python-modules/ansible/base.nix +++ b/pkgs/development/python-modules/ansible/base.nix @@ -28,11 +28,11 @@ let in buildPythonPackage rec { pname = "ansible-base"; - version = "2.10.15"; + version = "2.10.16"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RHiBi6gh26FD4SNWjsXTF9yPpKxuFRP3pQFzTlKXa/8="; + sha256 = "sha256-2XQhTtA6wSnCmZZ6pMmCBZQ7o28gBA5/63JI4MPi6hU="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 904a94717a9..a580719fcfe 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -23,17 +23,17 @@ let ansible-collections = callPackage ./collections.nix { - version = "4.8.0"; - sha256 = "0dlfmvh7jqna6rig39wrnxhklc3k5a3ky3bfq73dqbmcr5hzli8k"; + version = "5.0.1"; + sha256 = "sha256:0xn3lpinmflkxwak7zb36wjs9w2y1k5s295apn3v77xnpc2cfz5l"; }; in buildPythonPackage rec { pname = "ansible-core"; - version = "2.12.0"; + version = "2.12.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-DpBJoauLjFTdyAc43AqytXhwvm/kzU5VhdRxVHq3SxM="; + sha256 = "sha256-pFCHByYr4Ru03ZigBvGxSBeHmgVea2xGrZ/KiJT7MHM="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index aec7d975a77..e4f007cf839 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "0.11.1"; + version = "0.12.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+Gu9WaGC2R5TC8XSqDNSJ3t7aMS69IeeKTzytYFcHvE="; + sha256 = "sha256-+NIC+dxajG5wffIFUC5MqRAiodh8ynO1fp1XTOxaR1g="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/reolink/default.nix b/pkgs/development/python-modules/reolink/default.nix index 3616eb1e3c0..71f94d489aa 100644 --- a/pkgs/development/python-modules/reolink/default.nix +++ b/pkgs/development/python-modules/reolink/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "reolink"; - version = "0.0.53"; + version = "0.56"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,9 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fwestenberg"; repo = pname; - # https://github.com/fwestenberg/reolink/issues/78 - rev = "0053"; - sha256 = "sha256-kEG+kRTWaC6eQbmlasAWIESFdKPoxQCdZLRrQwb2aRU="; + rev = "v${version}"; + sha256 = "sha256-ld1KDWweaG7y7EPN6Y19PzQRGCIFAPEb6AmlXXbjgCU="; }; propagatedBuildInputs = [ @@ -41,6 +40,9 @@ buildPythonPackage rec { --replace "ffmpeg" "ffmpeg-python" ''; + # https://github.com/fwestenberg/reolink/issues/83 + doCheck = false; + pytestFlagsArray = [ "test.py" ]; diff --git a/pkgs/development/python-modules/ruyaml/default.nix b/pkgs/development/python-modules/ruyaml/default.nix index 3b5a0d41283..bb0728bd263 100644 --- a/pkgs/development/python-modules/ruyaml/default.nix +++ b/pkgs/development/python-modules/ruyaml/default.nix @@ -10,13 +10,15 @@ buildPythonPackage rec { pname = "ruyaml"; - version = "0.90.0.2"; + version = "0.91.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "pycontribs"; repo = pname; - rev = version; + rev = "v${version}"; sha256 = "0gxvwry7n1gczxkjzyfrr3fammllkvnnamja4yln8xrg3n1h89al"; }; @@ -35,7 +37,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "ruyaml" ]; + pythonImportsCheck = [ + "ruyaml" + ]; meta = with lib; { description = "YAML 1.2 loader/dumper package for Python"; diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index a5a73818718..31dd130bf72 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -121,6 +121,8 @@ buildPythonPackage rec { "tests/integrations/celery/" # pytest-chalice is not available in nixpkgs yet "tests/integrations/chalice/" + # broken since rq-1.10.1: https://github.com/getsentry/sentry-python/issues/1274 + "tests/integrations/rq/" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index 2353def0da3..8a8957459ee 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.12.0"; + version = "3.13.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "v${version}"; - sha256 = "sha256-1IR0pQOxLjxqmjbq6zmp2rU1rBDabADva1R4YBNw+PA="; + sha256 = "sha256-L12faNLwjlEkJZ9s9aIyUHSk7x3n908EHCYU9jECiYQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tailscale/default.nix b/pkgs/development/python-modules/tailscale/default.nix index d560b5e89c2..94de671acaf 100644 --- a/pkgs/development/python-modules/tailscale/default.nix +++ b/pkgs/development/python-modules/tailscale/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "tailscale"; - version = "0.1.3"; + version = "0.1.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-tailscale"; rev = "v${version}"; - sha256 = "sha256-0qWuOSQncEldA073ByFWkpW97HY0JANSvnv8xX/NSs8="; + sha256 = "sha256-xRVkmofD2pOco0kJfVcmUaPow2ZZNEZrhvNmldUjQuw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 61b56a18133..dab8e7f60ed 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -46,13 +46,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.641"; + version = "2.0.648"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - sha256 = "sha256-/WmzMffHaD13aZsz6Ib/yaI+6b3UrexWpPv1oLR+PuM="; + sha256 = "sha256-WhBbZiLPGA9Dvn8xJaPOvOjEeVOWHBVLyEav4Mw/Xy8="; }; nativeBuildInputs = with py.pkgs; [ diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 3d5eec0d937..0bf9715de6f 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.33.1"; + version = "0.33.2"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "1n1xw2h544r6bap2drgrip9i8nl5zg5gcdic8qj3y93ppisgzqml"; + sha256 = "sha256-CjpeBB1krbRJxwfvBbhhHUf5IDOZFWRds/t9h22iLE0="; }; - vendorSha256 = "0fq4nbd0w1nb98g321mns76a60dwwhf4w7g589qz87z29vdy0jbk"; + vendorSha256 = "sha256-y+bPFCjgTu+C5Cx85lYRjUbLd6c5PcckXRpg102d1zk="; doCheck = false; diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index 05c555a6e14..aa7cced5016 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -67,13 +67,13 @@ let sha256 = "0jnqsv6pqp5b5g7lcjwgd75zqqvcwcl5a32zi03zg1kvj79p5gxs"; }; opam = fetchurl { - url = "https://github.com/ocaml/opam/archive/2.1.1.zip"; - sha256 = "0sm9a7yh1iqcd51j5wdrc34w71iga619hvmgyy5fq1hwvgmfssrj"; + url = "https://github.com/ocaml/opam/archive/2.1.2.zip"; + sha256 = "0yq3dgx869016xrf65xv0glmqill1nk2ad12x3l36l70pn90rmyd"; }; }; in stdenv.mkDerivation { pname = "opam"; - version = "2.1.1"; + version = "2.1.2"; nativeBuildInputs = [ makeWrapper unzip ]; buildInputs = [ curl ncurses ocaml getconf ] ++ lib.optional stdenv.isLinux bubblewrap; @@ -133,4 +133,4 @@ in stdenv.mkDerivation { platforms = platforms.all; }; } -# Generated by: ./opam.nix.pl -v 2.1.1 -p opam-shebangs.patch +# Generated by: ./opam.nix.pl -v 2.1.2 -p opam-shebangs.patch diff --git a/pkgs/development/tools/rust/cargo-embed/default.nix b/pkgs/development/tools/rust/cargo-embed/default.nix index 80a8195d77e..70b34dc3506 100644 --- a/pkgs/development/tools/rust/cargo-embed/default.nix +++ b/pkgs/development/tools/rust/cargo-embed/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-embed"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "probe-rs"; repo = pname; rev = "v${version}"; - sha256 = "151zdnv4i0dgkk4w3j2a1sdklcxw07bgqjs7sv6lvkylrx8dfrxa"; + sha256 = "1is58n8y5lvnvzkbnh3gfk3r3f2r1w4l2qjdp2k8373apxzjxdvr"; }; - cargoSha256 = "00p2rwqrax99kwadc8bfq8pbcijals2nzpx43wb03kwxl4955wn9"; + cargoSha256 = "0kalwigck9lf734zdpzg01sf2zzyrgdgq2rg3qj7hy94gfxlsk63"; nativeBuildInputs = [ pkg-config rustfmt ]; buildInputs = [ libusb1 libftdi1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; @@ -30,6 +30,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A cargo extension for working with microcontrollers"; homepage = "https://probe.rs/"; + changelog = "https://github.com/probe-rs/cargo-embed/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ fooker ]; }; diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index d508b9f73d0..d432f5a50fa 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-generate"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "ashleygwilliams"; repo = "cargo-generate"; rev = "v${version}"; - sha256 = "sha256-082rFxC/p68X8g58I7Q7Of70ymq7VsLhkQpcqVx0u/A="; + sha256 = "sha256-t0vIuJUGPgHQFBezmEMOlEJItwOJHlIQMFvcUZlx9is="; }; - cargoSha256 = "sha256-1yTH5FvalzBD13FXh/X1jmZhVyWU3thrjNSsrHUfBNE="; + cargoSha256 = "sha256-esfiMnnij3Tf1qROVViPAqXFJA4DAHarV44pK5zpDrc="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix index d349db0084c..5cc3fa39ead 100644 --- a/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/pkgs/development/tools/rust/cargo-watch/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-watch"; - version = "8.1.1"; + version = "8.1.2"; src = fetchFromGitHub { owner = "passcod"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wv1aD20VHar0V7oKOEKIX3klGVXauMXU4vL+NgNeZPk="; + sha256 = "sha256-zhOYKvsCK5am4Ystt3+cPAQM77IlIBJysAEix5cXKbI="; }; - cargoSha256 = "sha256-qhCDrZAG1FcPYKMj2C/m+5Dplko4Tpp1hGpRdGOK/Ds="; + cargoSha256 = "sha256-OAOzrGS8n0jfUiQyIAHWLJMEkRINyasgkIjiLw977LE="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Foundation libiconv ]; diff --git a/pkgs/development/web/nodejs/v17.nix b/pkgs/development/web/nodejs/v17.nix index d1254ed48a2..38d5a12a712 100644 --- a/pkgs/development/web/nodejs/v17.nix +++ b/pkgs/development/web/nodejs/v17.nix @@ -1,4 +1,4 @@ -{ callPackage, python3, enableNpm ? true }: +{ callPackage, fetchpatch, python3, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { @@ -7,7 +7,15 @@ let in buildNodejs { inherit enableNpm; - version = "17.1.0"; - sha256 = "1iyazwpgv3pxqh7zz3s87qwrbahifrj9sj1a2vwhkc4jxcvkz03b"; - patches = [ ./disable-darwin-v8-system-instrumentation.patch ]; + version = "17.2.0"; + sha256 = "16k5kqanfvsnickkrv0vz072qg4ddzrk4is56yvdg2f1brxwqirb"; + patches = [ + ./disable-darwin-v8-system-instrumentation.patch + # Fixes node incorrectly building vendored OpenSSL when we want system OpenSSL. + # https://github.com/nodejs/node/pull/40965 + (fetchpatch { + url = "https://github.com/nodejs/node/commit/65119a89586b94b0dd46b45f6d315c9d9f4c9261.patch"; + sha256 = "sha256-dihKYEdK68sQIsnfTRambJ2oZr0htROVbNZlFzSAL+I="; + }) + ]; } diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index 8ff8b30809b..508180f298f 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -2,7 +2,7 @@ let # having the full version string here makes it easier to update - modDirVersion = "5.15.5-zen1"; + modDirVersion = "5.15.6-zen2"; parts = lib.splitString "-" modDirVersion; version = lib.elemAt parts 0; suffix = lib.elemAt parts 1; @@ -19,7 +19,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${modDirVersion}"; - sha256 = "sha256-sEt6h29GY18+45jHheRd69eCw+EAzn/CVUK5XRqdZcA="; + sha256 = "sha256-lakNE+Ac3AHfD6e9haXkwQL134UNduk8o8UNtyAQ4U0="; }; structuredExtraConfig = with lib.kernel; { diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix index 3ed80269d3a..6ae44f3fdb8 100644 --- a/pkgs/os-specific/linux/lxcfs/default.nix +++ b/pkgs/os-specific/linux/lxcfs/default.nix @@ -5,13 +5,13 @@ with lib; stdenv.mkDerivation rec { pname = "lxcfs"; - version = "4.0.9"; + version = "4.0.11"; src = fetchFromGitHub { owner = "lxc"; repo = "lxcfs"; rev = "lxcfs-${version}"; - sha256 = "0zx58lair8hwi4bxm5h7i8n1j5fcdgw5cr6f4wk9qhks0sr5dip5"; + sha256 = "sha256-jWOmGV85uTYjBFQZKR3+TgPWZix2vuN8TLA/dhL8jwk="; }; nativeBuildInputs = [ pkg-config help2man autoreconfHook makeWrapper ]; diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix index a724604c725..a0b748be214 100644 --- a/pkgs/os-specific/linux/uclibc/default.nix +++ b/pkgs/os-specific/linux/uclibc/default.nix @@ -39,6 +39,8 @@ let UCLIBC_SUSV4_LEGACY y UCLIBC_HAS_THREADS_NATIVE y KERNEL_HEADERS "${linuxHeaders}/include" + '' + lib.optionalString (stdenv.hostPlatform.gcc.float or "" == "soft") '' + UCLIBC_HAS_FPU n '' + lib.optionalString (stdenv.isAarch32 && stdenv.buildPlatform != stdenv.hostPlatform) '' CONFIG_ARM_EABI y ARCH_WANTS_BIG_ENDIAN n @@ -81,7 +83,8 @@ stdenv.mkDerivation { depsBuildBuild = [ buildPackages.stdenv.cc ]; makeFlags = [ - "ARCH=${stdenv.hostPlatform.parsed.cpu.name}" + "ARCH=${stdenv.hostPlatform.linuxArch}" + "TARGET_ARCH=${stdenv.hostPlatform.linuxArch}" "VERBOSE=1" ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "CROSS=${stdenv.cc.targetPrefix}" @@ -93,7 +96,7 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out - make PREFIX=$out VERBOSE=1 install + make $makeFlags PREFIX=$out VERBOSE=1 install (cd $out/include && ln -s $(ls -d ${linuxHeaders}/include/* | grep -v "scsi$") .) # libpthread.so may not exist, so I do || true sed -i s@/lib/@$out/lib/@g $out/lib/libc.so $out/lib/libpthread.so || true @@ -109,6 +112,7 @@ stdenv.mkDerivation { description = "A small implementation of the C library"; maintainers = with maintainers; [ rasendubi ]; license = licenses.lgpl2; - platforms = intersectLists platforms.linux platforms.x86; # fails to build on ARM + platforms = platforms.linux; + broken = stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index 8c64671251e..37ed309a61e 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "nsd"; - version = "4.3.7"; + version = "4.3.8"; src = fetchurl { url = "https://www.nlnetlabs.nl/downloads/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-/TuexTu9Fo1Wegv83xQMlmUR/a94vVOdCRwaE8E76K0="; + sha256 = "sha256-EYl+JfcvWpj5ICvVN4yTaIbVQ3YFGmFNNojkUenLmeE="; }; prePatch = '' diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix index b205b806e2b..06ae9e176b7 100644 --- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "redis_exporter"; - version = "1.29.0"; + version = "1.32.0"; src = fetchFromGitHub { owner = "oliver006"; repo = "redis_exporter"; rev = "v${version}"; - sha256 = "sha256-13um5/k/Mh/BLgvd9ziR5vo9HfVqgaQMfJTPYRPVlRY="; + sha256 = "sha256-/WrkWhtLNqoLJP0FwPlWr4WmEYweEkyBZlv9NVmaozc="; }; - vendorSha256 = "sha256-vCE1mr7R3o3uiVQvIqg+qOngh5nrr957mgbO+6E72Ss="; + vendorSha256 = "sha256-MVDb4JN2QqZNxANDLUZywgoBc2NpcaPB8TkR1xrq+Yk="; ldflags = [ "-X main.BuildVersion=${version}" diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index eb02b05e5dc..6513617ee26 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "timescaledb"; - version = "2.5.0"; + version = "2.5.1"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl libkrb5 ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { repo = "timescaledb"; # some branches are named like tags which confuses git rev = "refs/tags/${version}"; - sha256 = "0j8fbhf69q0074c02ilzdrhwc1ciyw6dq48217xxv274df2lcxzd"; + sha256 = "sha256-3G/foe4TlKEKP0Vi60oD7ZoxYdkNipyoOhGoF+GojZw="; }; cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DTAP_CHECKS=OFF" ] diff --git a/pkgs/servers/unifiedpush-common-proxies/default.nix b/pkgs/servers/unifiedpush-common-proxies/default.nix index 3488083d34c..9498000c3f9 100644 --- a/pkgs/servers/unifiedpush-common-proxies/default.nix +++ b/pkgs/servers/unifiedpush-common-proxies/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "unifiedpush-common-proxies"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "unifiedpush"; repo = "common-proxies"; rev = "v${version}"; - sha256 = "sha256-1Nl36Ldb0/DrQEKgPBsCgJk7oRCIq2m9Vb8D8wnS1g0="; + sha256 = "sha256-V6LTEwdnVkxc2wm8anlYeYJpk/mMQEsKrq69H8okHBg="; }; - vendorSha256 = "sha256-7A2ErjqmgberMabayWEc3w53+YierfetzmT8DzHwbpE="; + vendorSha256 = "sha256-s0uN6PzIaAHLvRb9T07Xvb6mMAuvKHQ4oFJtl5hsvY4="; meta = with lib; { description = "A set of rewrite proxies and gateways for UnifiedPush"; diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix index 41259f2a45e..1f474f5beb0 100644 --- a/pkgs/tools/filesystems/mtools/default.nix +++ b/pkgs/tools/filesystems/mtools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mtools"; - version = "4.0.35"; + version = "4.0.36"; src = fetchurl { url = "mirror://gnu/mtools/${pname}-${version}.tar.bz2"; - sha256 = "sha256-NHaeFzdR0vDYkaCMdsgEJ+kpuO5DQ4AZuGZsw9ekR0k="; + sha256 = "sha256-5cDlrfLfu59yZJ06gpn/b7c/Jp+DMKKXXZG8xQVSQPQ="; }; patches = lib.optional stdenv.isDarwin ./UNUSED-darwin.patch; diff --git a/pkgs/tools/misc/mysqltuner/default.nix b/pkgs/tools/misc/mysqltuner/default.nix index 2acbfd41adf..d55d2971535 100644 --- a/pkgs/tools/misc/mysqltuner/default.nix +++ b/pkgs/tools/misc/mysqltuner/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mysqltuner"; - version = "1.7.21"; + version = "1.8.3"; src = fetchFromGitHub { owner = "major"; repo = "MySQLTuner-perl"; rev = version; - sha256 = "sha256-Yv1XjD8sZcmGr2SVD6TEElUH7vspJ61WwQwfXLOrao0="; + sha256 = "sha256-ezF0zjQB/KWD5rUcbXx2uwiNLsIJ7ZKMoqkclP7oc98="; }; postPatch = '' diff --git a/pkgs/tools/networking/checkip/default.nix b/pkgs/tools/networking/checkip/default.nix index b379a1725de..6baf1a9a322 100644 --- a/pkgs/tools/networking/checkip/default.nix +++ b/pkgs/tools/networking/checkip/default.nix @@ -5,21 +5,16 @@ buildGoModule rec { pname = "checkip"; - version = "0.2.2"; + version = "0.16.1"; src = fetchFromGitHub { owner = "jreisinger"; repo = pname; rev = "v${version}"; - sha256 = "065426z4iak72h56qvp1vk86r2vw5rdqy3qi1zbw1l0hnyq83zwq"; + sha256 = "sha256-XIrGza8yMC1lrSXiaEADcft4UkaZ33R6LW4ug0+8sxs="; }; - vendorSha256 = "10hk2wfkpvnavs20q390qgaj1gj10j1fy8vlqb9s9f76gpb130h4"; - - postFixup = '' - # Rename binary - mv $out/bin/cmd $out/bin/${pname} - ''; + vendorSha256 = "sha256-4XA7B0gmFE52VoKiPLsa0urPS7IdzrTBXuU4wZv/Lag="; # Requires network doCheck = false; diff --git a/pkgs/tools/security/kube-hunter/default.nix b/pkgs/tools/security/kube-hunter/default.nix new file mode 100644 index 00000000000..6f15bde0104 --- /dev/null +++ b/pkgs/tools/security/kube-hunter/default.nix @@ -0,0 +1,57 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "kube-hunter"; + version = "0.6.3"; + + src = fetchFromGitHub { + owner = "aquasecurity"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-OXiFWdbp6L9S57gRIROzuvXZ0R16lvKDqZR0kW0eEYQ="; + }; + + nativeBuildInputs = with python3.pkgs; [ + setuptools-scm + ]; + + propagatedBuildInputs = with python3.pkgs; [ + netaddr + netifaces + scapy + requests + prettytable + urllib3 + ruamel-yaml + future + packaging + pluggy + kubernetes + ]; + + checkInputs = with python3.pkgs; [ + pytestCheckHook + requests-mock + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "dataclasses" "" \ + --replace "kubernetes==12.0.1" "kubernetes" \ + --replace "--cov=kube_hunter" "" + ''; + + pythonImportsCheck = [ + "kube_hunter" + ]; + + meta = with lib; { + description = "Tool to search issues in Kubernetes clusters"; + homepage = "https://github.com/aquasecurity/kube-hunter"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/text/opencc/default.nix b/pkgs/tools/text/opencc/default.nix index f99062de413..cbb055323a6 100644 --- a/pkgs/tools/text/opencc/default.nix +++ b/pkgs/tools/text/opencc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "opencc"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "BYVoid"; repo = "OpenCC"; rev = "ver.${version}"; - sha256 = "1a15p9idznh23b44r7rw2zjnirbxjs5pyq3k6xkz0k64cdh2zq6h"; + sha256 = "sha256-q/y4tRov/BYCAiE4i7fT6ysTerxxOHMZUWT2Jlo/0rI="; }; nativeBuildInputs = [ cmake python ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b1cc10f9253..ce6411d5830 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14853,6 +14853,8 @@ with pkgs; kube-aws = callPackage ../development/tools/kube-aws { }; + kube-hunter = callPackage ../tools/security/kube-hunter { }; + kubeaudit = callPackage ../tools/security/kubeaudit { }; kubectx = callPackage ../development/tools/kubectx { }; |