Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-12-10 12:01:12 +00:00 committed by GitHub
commit 0f2bb5a63f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
112 changed files with 370 additions and 212 deletions

@ -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.";
};
}

@ -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";

@ -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.
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 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.
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.
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 idle scheduling class can improve
responsiveness of a system performing expensive builds, it might also
slow down or starve crucial configuration updates during load.
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.
'';
};

@ -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
{

@ -9,7 +9,7 @@ in
{
meta = {
maintainers = with maintainers; [ ];
maintainers = teams.xfce.members;
};
imports = [

@ -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
'';

@ -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; {

@ -62,6 +62,6 @@ python3Packages.buildPythonApplication rec {
'';
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.romildo ];
maintainers = with maintainers; [ ] ++ teams.xfce.members;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -19,5 +19,6 @@ mkXfceDerivation {
meta = with lib; {
description = "Widgets library for Xfce";
license = with licenses; [ lgpl2Plus lgpl21Plus ];
maintainers = with maintainers; [ ] ++ teams.xfce.members;
};
}

@ -12,5 +12,6 @@ mkXfceDerivation {
meta = with lib; {
description = "Extension library for Xfce";
license = licenses.lgpl2Plus;
maintainers = with maintainers; [ ] ++ teams.xfce.members;
};
}

@ -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;
};
}

@ -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;
};
};

@ -1,4 +1,4 @@
{ makeWrapper, symlinkJoin, thunar, thunarPlugins, lib }:
{ lib, makeWrapper, symlinkJoin, thunar, thunarPlugins }:
symlinkJoin {
name = "thunar-with-plugins-${thunar.version}";

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -20,6 +20,6 @@ mkXfceDerivation {
meta = with lib; {
description = "A command-line plugin";
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ ] ++ teams.xfce.members;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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;
};
}

@ -33,5 +33,6 @@ mkXfceDerivation {
meta = with lib; {
description = "Thunar plugin providing file context menus for archives";
maintainers = with maintainers; [ ] ++ teams.xfce.members;
};
}

@ -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;
};
}

@ -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;
};
}

@ -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,

@ -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");

@ -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)

@ -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 = ''

@ -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" ];
};
}

@ -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 = [

@ -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

@ -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;

@ -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";

@ -5,6 +5,8 @@
buildDunePackage rec {
pname = "menhir";
minimalOCamlVersion = "4.03";
inherit (menhirLib) version src useDune2;
buildInputs = [ menhirLib menhirSdk ];

@ -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;

@ -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
];

@ -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 ];

@ -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";

@ -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

@ -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

@ -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 = [

@ -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"
];

@ -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";

@ -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 = [

@ -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 = [

@ -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 = [

@ -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; [

@ -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;

@ -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

@ -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 ];
};

@ -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 ];

@ -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 ];

@ -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=";
})
];
}

@ -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; {

Some files were not shown because too many files have changed in this diff Show More