From 231b04201c2bd09f1c739343369400356c531242 Mon Sep 17 00:00:00 2001 From: SaltyKitkat <954537646@qq.com> Date: Wed, 15 Jun 2022 10:44:34 +0800 Subject: [PATCH 01/44] logseq: make dugite use the `git` in nixpkgs --- pkgs/applications/misc/logseq/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 70d21acc05b4..ff1e13299932 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, appimageTools, makeWrapper, autoPatchelfHook, electron, git, curl, expat, gcc, openssl, zlib }: +{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron, git }: stdenv.mkDerivation rec { pname = "logseq"; @@ -19,8 +19,7 @@ stdenv.mkDerivation rec { dontConfigure = true; dontBuild = true; - nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; - buildInputs = [ stdenv.cc.cc curl expat openssl zlib ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' runHook preInstall @@ -29,6 +28,12 @@ stdenv.mkDerivation rec { cp -a ${appimageContents}/{locales,resources} $out/share/${pname} cp -a ${appimageContents}/Logseq.desktop $out/share/applications/${pname}.desktop + # remove the `git` in `dugite` because we want the `git` in `nixpkgs` + chmod +w -R $out/share/${pname}/resources/app/node_modules/dugite/git + chmod +w $out/share/${pname}/resources/app/node_modules/dugite + rm -rf $out/share/${pname}/resources/app/node_modules/dugite/git + chmod -w $out/share/${pname}/resources/app/node_modules/dugite + substituteInPlace $out/share/applications/${pname}.desktop \ --replace Exec=Logseq Exec=${pname} \ --replace Icon=Logseq Icon=$out/share/${pname}/resources/app/icons/logseq.png @@ -37,8 +42,9 @@ stdenv.mkDerivation rec { ''; postFixup = '' + # set the env "LOCAL_GIT_DIRECTORY" for dugite so that we can use the git in nixpkgs makeWrapper ${electron}/bin/electron $out/bin/${pname} \ - --prefix PATH : ${lib.makeBinPath [ git ]} \ + --set "LOCAL_GIT_DIRECTORY" ${git} \ --add-flags $out/share/${pname}/resources/app ''; From deeb80c04abf0d19fb0159a48df6cc4649774ae6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Tue, 12 Jul 2022 08:56:56 -0300 Subject: [PATCH 02/44] mate: reformat nix expressions --- pkgs/desktops/mate/atril/default.nix | 17 +++++--- pkgs/desktops/mate/caja-dropbox/default.nix | 16 +++++-- .../desktops/mate/caja-extensions/default.nix | 16 ++++++- .../mate/caja-with-extensions/default.nix | 13 +++++- pkgs/desktops/mate/caja/default.nix | 16 ++++++- pkgs/desktops/mate/engrampa/default.nix | 15 ++++++- pkgs/desktops/mate/eom/default.nix | 21 ++++++++- pkgs/desktops/mate/libmatekbd/default.nix | 20 +++++++-- pkgs/desktops/mate/libmatemixer/default.nix | 27 +++++++++--- pkgs/desktops/mate/libmateweather/default.nix | 22 ++++++++-- pkgs/desktops/mate/marco/default.nix | 21 ++++++++- pkgs/desktops/mate/mate-applets/default.nix | 29 +++++++++++-- .../mate/mate-backgrounds/default.nix | 10 ++++- pkgs/desktops/mate/mate-calc/default.nix | 14 +++++- pkgs/desktops/mate/mate-common/default.nix | 6 ++- .../mate/mate-control-center/default.nix | 23 ++++++++-- pkgs/desktops/mate/mate-desktop/default.nix | 13 +++++- .../mate/mate-icon-theme-faenza/default.nix | 20 +++++++-- .../desktops/mate/mate-icon-theme/default.nix | 22 ++++++++-- .../mate/mate-indicator-applet/default.nix | 13 +++++- pkgs/desktops/mate/mate-media/default.nix | 14 +++++- pkgs/desktops/mate/mate-menus/default.nix | 22 ++++++++-- pkgs/desktops/mate/mate-netbook/default.nix | 14 +++++- .../mate/mate-notification-daemon/default.nix | 18 +++++++- pkgs/desktops/mate/mate-panel/default.nix | 19 +++++++- pkgs/desktops/mate/mate-polkit/default.nix | 13 +++++- .../mate/mate-power-manager/default.nix | 43 +++++++++++++------ .../mate/mate-screensaver/default.nix | 17 +++++++- .../mate/mate-sensors-applet/default.nix | 19 +++++++- .../mate/mate-session-manager/default.nix | 21 +++++++-- .../mate/mate-settings-daemon/default.nix | 24 +++++++++-- .../mate/mate-settings-daemon/wrapped.nix | 22 ++++++++-- .../mate/mate-system-monitor/default.nix | 17 +++++++- pkgs/desktops/mate/mate-terminal/default.nix | 16 ++++++- pkgs/desktops/mate/mate-themes/default.nix | 34 ++++++++++++--- .../desktops/mate/mate-user-guide/default.nix | 20 +++++++-- .../desktops/mate/mate-user-share/default.nix | 20 ++++++++- pkgs/desktops/mate/mate-utils/default.nix | 20 ++++++++- pkgs/desktops/mate/mozo/default.nix | 30 +++++++++++-- pkgs/desktops/mate/pluma/default.nix | 20 ++++++++- pkgs/desktops/mate/python-caja/default.nix | 11 ++++- 41 files changed, 685 insertions(+), 103 deletions(-) diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index c88e3a72ea45..1a35169d5a27 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , pkg-config , gettext @@ -12,10 +13,14 @@ , texlive , mate , wrapGAppsHook -, enableEpub ? true, webkitgtk -, enableDjvu ? true, djvulibre -, enablePostScript ? true, libspectre -, enableXps ? true, libgxps +, enableEpub ? true +, webkitgtk +, enableDjvu ? true +, djvulibre +, enablePostScript ? true +, libspectre +, enableXps ? true +, libgxps , enableImages ? false , mateUpdateScript }: @@ -47,7 +52,7 @@ stdenv.mkDerivation rec { mate.caja mate.mate-desktop hicolor-icon-theme - texlive.bin.core # for synctex, used by the pdf back-end + texlive.bin.core # for synctex, used by the pdf back-end ] ++ optionals enableDjvu [ djvulibre ] ++ optionals enableEpub [ webkitgtk ] diff --git a/pkgs/desktops/mate/caja-dropbox/default.nix b/pkgs/desktops/mate/caja-dropbox/default.nix index 0d347b39f108..3806d8cf482c 100644 --- a/pkgs/desktops/mate/caja-dropbox/default.nix +++ b/pkgs/desktops/mate/caja-dropbox/default.nix @@ -1,6 +1,16 @@ -{ lib, stdenv, fetchurl, substituteAll -, pkg-config, gobject-introspection, gdk-pixbuf -, gtk3, mate, python3, dropbox, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, substituteAll +, pkg-config +, gobject-introspection +, gdk-pixbuf +, gtk3 +, mate +, python3 +, dropbox +, mateUpdateScript +}: let dropboxd = "${dropbox}/bin/dropbox"; diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix index 25563c5d5a88..cc3a6ce30cab 100644 --- a/pkgs/desktops/mate/caja-extensions/default.nix +++ b/pkgs/desktops/mate/caja-extensions/default.nix @@ -1,5 +1,17 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, gupnp, mate, imagemagick, wrapGAppsHook, mateUpdateScript -, glib, substituteAll }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, gtk3 +, gupnp +, mate +, imagemagick +, wrapGAppsHook +, mateUpdateScript +, glib +, substituteAll +}: stdenv.mkDerivation rec { pname = "caja-extensions"; diff --git a/pkgs/desktops/mate/caja-with-extensions/default.nix b/pkgs/desktops/mate/caja-with-extensions/default.nix index dd9ab9be1d37..4de6d5d6d760 100644 --- a/pkgs/desktops/mate/caja-with-extensions/default.nix +++ b/pkgs/desktops/mate/caja-with-extensions/default.nix @@ -1,4 +1,11 @@ -{ stdenv, lib, makeWrapper, caja-extensions, caja, extensions ? [ caja-extensions ], mateUpdateScript }: +{ stdenv +, lib +, makeWrapper +, caja-extensions +, caja +, extensions ? [ caja-extensions ] +, mateUpdateScript +}: stdenv.mkDerivation { pname = "${caja.pname}-with-extensions"; @@ -6,7 +13,9 @@ stdenv.mkDerivation { dontUnpack = true; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + ]; inherit caja; diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index 098182664658..649f6f3c7e46 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -1,4 +1,18 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, gtk3 +, libnotify +, libxml2 +, libexif +, exempi +, mate +, hicolor-icon-theme +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "caja"; diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index 7fde8fb1958d..98e03044ad43 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -1,4 +1,17 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, gtk3, file, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, libxml2 +, gtk3 +, file +, mate +, hicolor-icon-theme +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "engrampa"; diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index 9862c3059d21..45f9a714c23e 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -1,4 +1,23 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gtk3, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, exempi +, lcms2 +, libexif +, libjpeg +, librsvg +, libxml2 +, libpeas +, shared-mime-info +, gtk3 +, mate +, hicolor-icon-theme +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "eom"; diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix index d7969f55efce..4a0e1b604a53 100644 --- a/pkgs/desktops/mate/libmatekbd/default.nix +++ b/pkgs/desktops/mate/libmatekbd/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libxklavier, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, gtk3 +, libxklavier +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "libmatekbd"; @@ -9,9 +17,15 @@ stdenv.mkDerivation rec { sha256 = "1b8iv2hmy8z2zzdsx8j5g583ddxh178bq8dnlqng9ifbn35fh3i2"; }; - nativeBuildInputs = [ pkg-config gettext ]; + nativeBuildInputs = [ + pkg-config + gettext + ]; - buildInputs = [ gtk3 libxklavier ]; + buildInputs = [ + gtk3 + libxklavier + ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix index 2ef34f2ea67d..5021a0f870e7 100644 --- a/pkgs/desktops/mate/libmatemixer/default.nix +++ b/pkgs/desktops/mate/libmatemixer/default.nix @@ -1,6 +1,14 @@ -{ config, lib, stdenv, fetchurl, pkg-config, gettext, glib -, alsaSupport ? stdenv.isLinux, alsa-lib -, pulseaudioSupport ? config.pulseaudio or true, libpulseaudio +{ config +, lib +, stdenv +, fetchurl +, pkg-config +, gettext +, glib +, alsaSupport ? stdenv.isLinux +, alsa-lib +, pulseaudioSupport ? config.pulseaudio or true +, libpulseaudio , ossSupport ? false , mateUpdateScript }: @@ -14,11 +22,16 @@ stdenv.mkDerivation rec { sha256 = "1wcz4ppg696m31f5x7rkyvxxdriik2vprsr83b4wbs97bdhcr6ws"; }; - nativeBuildInputs = [ pkg-config gettext ]; + nativeBuildInputs = [ + pkg-config + gettext + ]; - buildInputs = [ glib ] - ++ lib.optional alsaSupport alsa-lib - ++ lib.optional pulseaudioSupport libpulseaudio; + buildInputs = [ + glib + ] + ++ lib.optional alsaSupport alsa-lib + ++ lib.optional pulseaudioSupport libpulseaudio; configureFlags = lib.optional ossSupport "--enable-oss"; diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix index 3d99b0ccd82e..f68d33a4a516 100644 --- a/pkgs/desktops/mate/libmateweather/default.nix +++ b/pkgs/desktops/mate/libmateweather/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libsoup, tzdata, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, gtk3 +, libsoup +, tzdata +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "libmateweather"; @@ -9,9 +18,16 @@ stdenv.mkDerivation rec { sha256 = "05bvc220p135l6qnhh3qskljxffds0f7fjbjnrpq524w149rgzd7"; }; - nativeBuildInputs = [ pkg-config gettext ]; + nativeBuildInputs = [ + pkg-config + gettext + ]; - buildInputs = [ gtk3 libsoup tzdata ]; + buildInputs = [ + gtk3 + libsoup + tzdata + ]; configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index 597538a9f8a1..612a2c22b101 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -1,5 +1,22 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, libcanberra-gtk3, libgtop -, libXdamage, libXpresent, libstartup_notification, gnome, glib, gtk3, mate-settings-daemon, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, libxml2 +, libcanberra-gtk3 +, libgtop +, libXdamage +, libXpresent +, libstartup_notification +, gnome +, glib +, gtk3 +, mate-settings-daemon +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "marco"; diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index 30b51e9ed5bd..7ffa1abe0876 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -1,6 +1,29 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, dbus-glib, glib, gtk3, gtksourceview3 -, gucharmap, libmateweather, libnl, libwnck, libgtop, libxml2, libnotify, mate-panel, polkit -, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, dbus-glib +, glib +, gtk3 +, gtksourceview3 +, gucharmap +, libmateweather +, libnl +, libwnck +, libgtop +, libxml2 +, libnotify +, mate-panel +, polkit +, upower +, wirelesstools +, mate +, hicolor-icon-theme +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-applets"; diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix index 3076a7170cbf..cb006cf53279 100644 --- a/pkgs/desktops/mate/mate-backgrounds/default.nix +++ b/pkgs/desktops/mate/mate-backgrounds/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, gettext, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, meson +, ninja +, gettext +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-backgrounds"; diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix index b26347f73397..12ea1adf5538 100644 --- a/pkgs/desktops/mate/mate-calc/default.nix +++ b/pkgs/desktops/mate/mate-calc/default.nix @@ -1,4 +1,16 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libmpc, libxml2, mpfr, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, gtk3 +, libmpc +, libxml2 +, mpfr +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-calc"; diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix index c3d2910e8696..e247eef07cc3 100644 --- a/pkgs/desktops/mate/mate-common/default.nix +++ b/pkgs/desktops/mate/mate-common/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchurl, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-common"; diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index 58828aa52b9d..25d8f889d398 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -1,6 +1,23 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, dbus-glib -, libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3, glib -, desktop-file-utils, dconf, gtk3, polkit, mate, hicolor-icon-theme, wrapGAppsHook +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, libxml2 +, dbus-glib +, libxklavier +, libcanberra-gtk3 +, librsvg +, libappindicator-gtk3 +, glib +, desktop-file-utils +, dconf +, gtk3 +, polkit +, mate +, hicolor-icon-theme +, wrapGAppsHook , mateUpdateScript }: diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index e4928ac748b5..85d6ca40532b 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -1,4 +1,15 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, isocodes, gnome, gtk3, dconf, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, isocodes +, gnome +, gtk3 +, dconf +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-desktop"; diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix index 69f780f6083f..481684ba5bb7 100644 --- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchurl, autoreconfHook, gtk3, mate, hicolor-icon-theme, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, autoreconfHook +, gtk3 +, mate +, hicolor-icon-theme +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-icon-theme-faenza"; @@ -9,9 +17,15 @@ stdenv.mkDerivation rec { sha256 = "000vr9cnbl2qlysf2gyg1lsjirqdzmwrnh6d3hyrsfc0r2vh4wna"; }; - nativeBuildInputs = [ autoreconfHook gtk3 ]; + nativeBuildInputs = [ + autoreconfHook + gtk3 + ]; - propagatedBuildInputs = [ mate.mate-icon-theme hicolor-icon-theme ]; + propagatedBuildInputs = [ + mate.mate-icon-theme + hicolor-icon-theme + ]; dontDropIconThemeCache = true; diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix index 001b6e418792..0f4f7a71e281 100644 --- a/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -1,4 +1,14 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, iconnamingutils, librsvg, gtk3, hicolor-icon-theme, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, iconnamingutils +, librsvg +, gtk3 +, hicolor-icon-theme +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-icon-theme"; @@ -9,9 +19,15 @@ stdenv.mkDerivation rec { sha256 = "0nha555fhhn0j5wmzmdc7bh93ckzwwdm8mwmzma5whkzslv09xa1"; }; - nativeBuildInputs = [ pkg-config gettext iconnamingutils ]; + nativeBuildInputs = [ + pkg-config + gettext + iconnamingutils + ]; - buildInputs = [ librsvg ]; + buildInputs = [ + librsvg + ]; propagatedBuildInputs = [ hicolor-icon-theme diff --git a/pkgs/desktops/mate/mate-indicator-applet/default.nix b/pkgs/desktops/mate/mate-indicator-applet/default.nix index 08985608cd61..be5db13e11a5 100644 --- a/pkgs/desktops/mate/mate-indicator-applet/default.nix +++ b/pkgs/desktops/mate/mate-indicator-applet/default.nix @@ -1,4 +1,15 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, gtk3 +, libindicator-gtk3 +, mate +, hicolor-icon-theme +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-indicator-applet"; diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix index 839e1dc20341..5663821ab417 100644 --- a/pkgs/desktops/mate/mate-media/default.nix +++ b/pkgs/desktops/mate/mate-media/default.nix @@ -1,4 +1,16 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, libtool, libxml2, libcanberra-gtk3, gtk3, mate, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, libtool +, libxml2 +, libcanberra-gtk3 +, gtk3 +, mate +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-media"; diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix index 2d384d4687b3..cab4bc0b1605 100644 --- a/pkgs/desktops/mate/mate-menus/default.nix +++ b/pkgs/desktops/mate/mate-menus/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, glib, gobject-introspection, python3, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, glib +, gobject-introspection +, python3 +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-menus"; @@ -9,9 +18,16 @@ stdenv.mkDerivation rec { sha256 = "1r7zf64aclaplz77hkl9kq0xnz6jk1l49z64i8v56c41pm59c283"; }; - nativeBuildInputs = [ pkg-config gettext gobject-introspection ]; + nativeBuildInputs = [ + pkg-config + gettext + gobject-introspection + ]; - buildInputs = [ glib python3 ]; + buildInputs = [ + glib + python3 + ]; makeFlags = [ "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/" diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix index f9c4737bab1c..fbbedce99a95 100644 --- a/pkgs/desktops/mate/mate-netbook/default.nix +++ b/pkgs/desktops/mate/mate-netbook/default.nix @@ -1,4 +1,16 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libwnck, libfakekey, libXtst, mate, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, gtk3 +, libwnck +, libfakekey +, libXtst +, mate +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-netbook"; diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index a66f8de43462..1e79e778699b 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -1,5 +1,19 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, glib, libcanberra-gtk3, - libnotify, libwnck, gtk3, libxml2, mate-desktop, mate-panel, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, glib +, libcanberra-gtk3 +, libnotify +, libwnck +, gtk3 +, libxml2 +, mate-desktop +, mate-panel +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-notification-daemon"; diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index 77569e116642..258fe5f68f9f 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -1,4 +1,21 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, libwnck, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, glib +, libwnck +, librsvg +, libxml2 +, dconf +, gtk3 +, mate +, hicolor-icon-theme +, gobject-introspection +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-panel"; diff --git a/pkgs/desktops/mate/mate-polkit/default.nix b/pkgs/desktops/mate/mate-polkit/default.nix index 9b1d77d78240..1c67e62bb800 100644 --- a/pkgs/desktops/mate/mate-polkit/default.nix +++ b/pkgs/desktops/mate/mate-polkit/default.nix @@ -1,4 +1,15 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, gobject-introspection, libappindicator-gtk3, libindicator-gtk3, polkit, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, gtk3 +, gobject-introspection +, libappindicator-gtk3 +, libindicator-gtk3 +, polkit +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-polkit"; diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index 72f9ba93a437..d77fb6b5b2eb 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -1,4 +1,23 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate-panel, libnotify, libcanberra-gtk3, libsecret, dbus-glib, upower, gtk3, libtool, polkit, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, glib +, itstool +, libxml2 +, mate-panel +, libnotify +, libcanberra-gtk3 +, libsecret +, dbus-glib +, upower +, gtk3 +, libtool +, polkit +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-power-manager"; @@ -17,17 +36,17 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - glib - itstool - libxml2 - libcanberra-gtk3 - gtk3 - libsecret - libnotify - dbus-glib - upower - polkit - mate-panel + glib + itstool + libxml2 + libcanberra-gtk3 + gtk3 + libsecret + libnotify + dbus-glib + upower + polkit + mate-panel ]; configureFlags = [ "--enable-applets" ]; diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix index d80a19e29bb1..e9994e15e637 100644 --- a/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/pkgs/desktops/mate/mate-screensaver/default.nix @@ -1,4 +1,19 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, dbus-glib, libXScrnSaver, libnotify, libxml2, pam, systemd, mate, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, gtk3 +, dbus-glib +, libXScrnSaver +, libnotify +, libxml2 +, pam +, systemd +, mate +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-screensaver"; diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix index 6faceee002e9..48a16c84d1da 100644 --- a/pkgs/desktops/mate/mate-sensors-applet/default.nix +++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix @@ -1,5 +1,20 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify -, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, gtk3 +, libxml2 +, libxslt +, libatasmart +, libnotify +, lm_sensors +, mate +, hicolor-icon-theme +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-sensors-applet"; diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index dba5c374f94a..03a18008e436 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -1,6 +1,21 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, xtrans, dbus-glib, systemd, - libSM, libXtst, gtk3, libepoxy, polkit, hicolor-icon-theme, mate, - wrapGAppsHook, fetchpatch, mateUpdateScript +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, xtrans +, dbus-glib +, systemd +, libSM +, libXtst +, gtk3 +, libepoxy +, polkit +, hicolor-icon-theme +, mate +, wrapGAppsHook +, fetchpatch +, mateUpdateScript }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index ff46b339b2fc..20a9a97d2514 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -1,7 +1,23 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, glib, dbus-glib, libxklavier, - libcanberra-gtk3, libnotify, nss, polkit, dconf, gtk3, mate, - pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio, - wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, glib +, dbus-glib +, libxklavier +, libcanberra-gtk3 +, libnotify +, nss +, polkit +, dconf +, gtk3 +, mate +, pulseaudioSupport ? stdenv.config.pulseaudio or true +, libpulseaudio +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-settings-daemon"; diff --git a/pkgs/desktops/mate/mate-settings-daemon/wrapped.nix b/pkgs/desktops/mate/mate-settings-daemon/wrapped.nix index 8fe7a4cf2b28..1bbe53c44786 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/wrapped.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/wrapped.nix @@ -1,16 +1,31 @@ -{ stdenv, mate, glib, wrapGAppsHook }: +{ stdenv +, mate +, glib +, wrapGAppsHook +}: stdenv.mkDerivation { pname = "${mate.mate-settings-daemon.pname}-wrapped"; version = mate.mate-settings-daemon.version; - nativeBuildInputs = [ wrapGAppsHook ]; - buildInputs = [ glib mate.mate-control-center ]; + + nativeBuildInputs = [ + wrapGAppsHook + ]; + + buildInputs = [ + glib + mate.mate-control-center + ]; + dontWrapGApps = true; + dontUnpack = true; + installPhase = '' mkdir -p $out/etc/xdg/autostart cp ${mate.mate-settings-daemon}/etc/xdg/autostart/mate-settings-daemon.desktop $out/etc/xdg/autostart ''; + postFixup = '' mkdir -p $out/libexec makeWrapper ${mate.mate-settings-daemon}/libexec/mate-settings-daemon $out/libexec/mate-settings-daemon \ @@ -18,5 +33,6 @@ stdenv.mkDerivation { substituteInPlace $out/etc/xdg/autostart/mate-settings-daemon.desktop \ --replace "${mate.mate-settings-daemon}/libexec/mate-settings-daemon" "$out/libexec/mate-settings-daemon" ''; + meta = mate.mate-settings-daemon.meta // { priority = -10; }; } diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix index 9b4a510b7286..9da865f2dcfc 100644 --- a/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -1,4 +1,19 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtkmm3, libxml2, libgtop, libwnck, librsvg, polkit, systemd, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, gtkmm3 +, libxml2 +, libgtop +, libwnck +, librsvg +, polkit +, systemd +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-system-monitor"; diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index fcae87a869ee..9f19d905ca4b 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -1,4 +1,18 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, mate-desktop, dconf, vte, pcre2, wrapGAppsHook, mateUpdateScript, nixosTests }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, libxml2 +, mate-desktop +, dconf +, vte +, pcre2 +, wrapGAppsHook +, mateUpdateScript +, nixosTests +}: stdenv.mkDerivation rec { pname = "mate-terminal"; diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index 274501976235..1ae2c74c77e5 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -1,5 +1,17 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, mate-icon-theme, gtk2, gtk3, - gtk_engines, gtk-engine-murrine, gdk-pixbuf, librsvg, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, mate-icon-theme +, gtk2 +, gtk3 +, gtk_engines +, gtk-engine-murrine +, gdk-pixbuf +, librsvg +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-themes"; @@ -10,11 +22,23 @@ stdenv.mkDerivation rec { sha256 = "1avgzccdmr7y18rnp3xrhwk82alv2dlig3wh7ivgahcqdiiavrb1"; }; - nativeBuildInputs = [ pkg-config gettext gtk3 ]; + nativeBuildInputs = [ + pkg-config + gettext + gtk3 + ]; - buildInputs = [ mate-icon-theme gtk2 gtk_engines gdk-pixbuf librsvg ]; + buildInputs = [ + mate-icon-theme + gtk2 + gtk_engines + gdk-pixbuf + librsvg + ]; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; dontDropIconThemeCache = true; diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix index ecbe2e667aad..f24b02e79378 100644 --- a/pkgs/desktops/mate/mate-user-guide/default.nix +++ b/pkgs/desktops/mate/mate-user-guide/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchurl, gettext, itstool, libxml2, yelp, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, gettext +, itstool +, libxml2 +, yelp +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-user-guide"; @@ -9,9 +17,15 @@ stdenv.mkDerivation rec { sha256 = "1h620ngryqc4m8ybvc92ba8404djnm0l65f34mlw38g9ad8d9085"; }; - nativeBuildInputs = [ itstool gettext libxml2 ]; + nativeBuildInputs = [ + itstool + gettext + libxml2 + ]; - buildInputs = [ yelp ]; + buildInputs = [ + yelp + ]; postPatch = '' substituteInPlace mate-user-guide.desktop.in.in \ diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix index 264389a68836..04a09d6f06cd 100644 --- a/pkgs/desktops/mate/mate-user-share/default.nix +++ b/pkgs/desktops/mate/mate-user-share/default.nix @@ -1,5 +1,21 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, dbus-glib, libnotify, libxml2 -, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, gtk3 +, dbus-glib +, libnotify +, libxml2 +, libcanberra-gtk3 +, mod_dnssd +, apacheHttpd +, hicolor-icon-theme +, mate +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-user-share"; diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix index 48e662f54f71..13e5e5154ca7 100644 --- a/pkgs/desktops/mate/mate-utils/default.nix +++ b/pkgs/desktops/mate/mate-utils/default.nix @@ -1,5 +1,21 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, gtk3, libxml2, libgtop, libcanberra-gtk3 -, inkscape, udisks2, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, glib +, gtk3 +, libxml2 +, libgtop +, libcanberra-gtk3 +, inkscape +, udisks2 +, mate +, hicolor-icon-theme +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-utils"; diff --git a/pkgs/desktops/mate/mozo/default.nix b/pkgs/desktops/mate/mozo/default.nix index 6388b2319e8c..a4c08eba6144 100644 --- a/pkgs/desktops/mate/mozo/default.nix +++ b/pkgs/desktops/mate/mozo/default.nix @@ -1,4 +1,15 @@ -{ lib, python3, fetchurl, pkg-config, gettext, mate, gtk3, glib, wrapGAppsHook, gobject-introspection, mateUpdateScript }: +{ lib +, python3 +, fetchurl +, pkg-config +, gettext +, mate +, gtk3 +, glib +, wrapGAppsHook +, gobject-introspection +, mateUpdateScript +}: python3.pkgs.buildPythonApplication rec { pname = "mozo"; @@ -12,11 +23,22 @@ python3.pkgs.buildPythonApplication rec { sha256 = "DyRCmjsDe9BojsTDkdnYeB5Csj7zRfXlCvHnLF7y+jk="; }; - nativeBuildInputs = [ pkg-config gettext gobject-introspection wrapGAppsHook ]; + nativeBuildInputs = [ + pkg-config + gettext + gobject-introspection + wrapGAppsHook + ]; - propagatedBuildInputs = [ mate.mate-menus python3.pkgs.pygobject3 ]; + propagatedBuildInputs = [ + mate.mate-menus + python3.pkgs.pygobject3 + ]; - buildInputs = [ gtk3 glib ]; + buildInputs = [ + gtk3 + glib + ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index 53b0251229ac..76ea344a88f9 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -1,5 +1,21 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, perl, itstool, isocodes, enchant, libxml2, python3 -, adwaita-icon-theme, gtksourceview4, libpeas, mate-desktop, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, perl +, itstool +, isocodes +, enchant +, libxml2 +, python3 +, adwaita-icon-theme +, gtksourceview4 +, libpeas +, mate-desktop +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "pluma"; diff --git a/pkgs/desktops/mate/python-caja/default.nix b/pkgs/desktops/mate/python-caja/default.nix index 452a7943d664..0b0a1a833fc0 100644 --- a/pkgs/desktops/mate/python-caja/default.nix +++ b/pkgs/desktops/mate/python-caja/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, mate, python3Packages, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, gtk3 +, mate +, python3Packages +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "python-caja"; From f26e356bf1d699a824fd4b92aa4221f196e61b30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Tue, 12 Jul 2022 09:52:12 -0300 Subject: [PATCH 03/44] mate: update script list versions from the git repository --- pkgs/desktops/mate/default.nix | 7 ++++--- pkgs/desktops/mate/mate-icon-theme-faenza/default.nix | 7 +++++-- pkgs/desktops/mate/mate-themes/default.nix | 5 +---- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix index b9ce82e345bf..d52066be3f26 100644 --- a/pkgs/desktops/mate/default.nix +++ b/pkgs/desktops/mate/default.nix @@ -6,9 +6,10 @@ let self = rec { # Update script tailored to mate packages from git repository - mateUpdateScript = { pname, version, odd-unstable ? true, url ? "https://pub.mate-desktop.org/releases" }: - pkgs.httpTwoLevelsUpdater { - inherit pname version odd-unstable url; + mateUpdateScript = { pname, version, odd-unstable ? true, rev-prefix ? "v", url ? null }: + pkgs.gitUpdater { + inherit pname version odd-unstable rev-prefix; + url = if url == null then "https://git.mate-desktop.org/${pname}" else url; attrPath = "mate.${pname}"; }; diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix index 481684ba5bb7..0b46d092c70f 100644 --- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix @@ -37,12 +37,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.updateScript = mateUpdateScript { + inherit pname version; + url = "https://github.com/mate-desktop-legacy-archive/mate-icon-theme-faenza"; + }; meta = with lib; { description = "Faenza icon theme from MATE"; homepage = "https://mate-desktop.org"; - license = licenses.gpl2Plus; + license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = teams.mate.members; }; diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index 1ae2c74c77e5..af186e4c5a2d 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -48,10 +48,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { - inherit pname version; - url = "https://pub.mate-desktop.org/releases/themes"; - }; + passthru.updateScript = mateUpdateScript { inherit pname version; }; meta = with lib; { description = "A set of themes from MATE"; From 8e2a1bc54194a617b953bdc5ae7de7a1ed329505 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Tue, 12 Jul 2022 18:29:20 -0300 Subject: [PATCH 04/44] mate.mate-applets: 1.26.0 -> 1.26.1 --- pkgs/desktops/mate/mate-applets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index 30b51e9ed5bd..6073857659a7 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "mate-applets"; - version = "1.26.0"; + version = "1.26.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xy9dwiqvmimqshbfq80jxq65aznlgx491lqq8rl4x8c9sdl7q5p"; + sha256 = "Orj2HbN23DM85MGHIsY6B/qz6OEnK34OCXrUWXsXwsI="; }; nativeBuildInputs = [ From 87c1d847d2f5480ac9c4af83900a1ae5677787cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Tue, 12 Jul 2022 19:21:42 -0300 Subject: [PATCH 05/44] xfce.xfce4-settings: 4.16.2 -> 4.16.3 --- pkgs/desktops/xfce/core/xfce4-settings/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/xfce4-settings/default.nix b/pkgs/desktops/xfce/core/xfce4-settings/default.nix index 91714976f84d..7cedaaca7532 100644 --- a/pkgs/desktops/xfce/core/xfce4-settings/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-settings/default.nix @@ -5,9 +5,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-settings"; - version = "4.16.2"; + version = "4.16.3"; - sha256 = "sha256-DkybMfkgsC8fJuhOWLzKO5f2Y8YtqzUXMH/npTv21yY="; + sha256 = "sha256-Jd1PJrIqzsutParZu8rNMuzHnycjr3eeZGXWIG3PqZY="; postPatch = '' for f in xfsettingsd/pointers.c dialogs/mouse-settings/main.c; do From 58e9223c218d75078ae68ae41735517ed99e049e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Tue, 12 Jul 2022 19:29:44 -0300 Subject: [PATCH 06/44] xfce.mousepad: 0.5.9 -> 0.5.10 --- pkgs/desktops/xfce/applications/mousepad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/applications/mousepad/default.nix b/pkgs/desktops/xfce/applications/mousepad/default.nix index 1da88a0104f8..884fffb35fd3 100644 --- a/pkgs/desktops/xfce/applications/mousepad/default.nix +++ b/pkgs/desktops/xfce/applications/mousepad/default.nix @@ -3,10 +3,10 @@ mkXfceDerivation { category = "apps"; pname = "mousepad"; - version = "0.5.9"; + version = "0.5.10"; odd-unstable = false; - sha256 = "sha256-xuSv2H1+/NNUAm+D8f+f5fPVR97iJ5vIDzPa3S0HLM0="; + sha256 = "sha256-AKyFCzQE6OfMzKh5Lk16W01255vPeco1II80oLqT4oM="; nativeBuildInputs = [ gobject-introspection ]; From 829b778aa2492cc25561247772cf2da8c4676cdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Tue, 12 Jul 2022 19:36:10 -0300 Subject: [PATCH 07/44] xfce.ristretto: 0.12.2 -> 0.12.3 --- pkgs/desktops/xfce/applications/ristretto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/applications/ristretto/default.nix b/pkgs/desktops/xfce/applications/ristretto/default.nix index 281cc78a0ba2..6a092fce88c6 100644 --- a/pkgs/desktops/xfce/applications/ristretto/default.nix +++ b/pkgs/desktops/xfce/applications/ristretto/default.nix @@ -4,9 +4,9 @@ mkXfceDerivation { category = "apps"; pname = "ristretto"; - version = "0.12.2"; + version = "0.12.3"; - sha256 = "sha256-OIt92DpDAZpy/fAOauGnzsufUi+y3Ag7KblZ5EUGuyQ="; + sha256 = "sha256-Tkjl01OD6yDbKAHzZVRG7c7KnP0MURmsc0d0DbcFuFk="; buildInputs = [ glib gtk3 libexif libxfce4ui libxfce4util xfconf ]; From 64b01772cb94fc5831fc89997bc119083f8dc417 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 16 Jul 2022 04:20:00 +0000 Subject: [PATCH 08/44] mloader: init at 1.1.8 --- pkgs/tools/misc/mloader/default.nix | 32 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/misc/mloader/default.nix diff --git a/pkgs/tools/misc/mloader/default.nix b/pkgs/tools/misc/mloader/default.nix new file mode 100644 index 000000000000..dcecbc903687 --- /dev/null +++ b/pkgs/tools/misc/mloader/default.nix @@ -0,0 +1,32 @@ +{ lib, python3Packages, fetchFromGitHub }: + +python3Packages.buildPythonApplication rec { + pname = "mloader"; + version = "1.1.8"; + + # PyPI tarball doesn't ship requirements.txt + src = fetchFromGitHub { + owner = "hurlenko"; + repo = "mloader"; + rev = version; + sha256 = "sha256-cZ9jaRrzzc5M7QYGuLxMv1J1mlfp/UEJ4dugTuJIQ/A="; + }; + + propagatedBuildInputs = with python3Packages; [ + click + protobuf + requests + ]; + + # No tests in repository + doCheck = false; + + pythonImportsCheck = [ "mloader" ]; + + meta = with lib; { + description = "Command-line tool to download manga from mangaplus"; + homepage = "https://github.com/hurlenko/mloader"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ marsam ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 982614abc0fe..08e22f8226aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8621,6 +8621,8 @@ with pkgs; mktorrent = callPackage ../tools/misc/mktorrent { }; + mloader = callPackage ../tools/misc/mloader { }; + mmake = callPackage ../tools/misc/mmake { }; mmixware = callPackage ../development/tools/mmixware { }; From 2e803ded2558cad0cad4b22316fd757620acfc5d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Jul 2022 12:42:24 +0000 Subject: [PATCH 09/44] python310Packages.homematicip: 1.0.4 -> 1.0.5 --- pkgs/development/python-modules/homematicip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/homematicip/default.nix b/pkgs/development/python-modules/homematicip/default.nix index aded4c94b125..2330a356dd89 100644 --- a/pkgs/development/python-modules/homematicip/default.nix +++ b/pkgs/development/python-modules/homematicip/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "homematicip"; - version = "1.0.4"; + version = "1.0.5"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,8 +25,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hahn-th"; repo = "homematicip-rest-api"; - rev = version; - hash = "sha256-rTTYJ/2R+/FLuL3rTWT7ieixN+Gv9GhwkUaKPfLqUGc="; + rev = "refs/tags/${version}"; + hash = "sha256-pfVjnRO6iKEgLDQz4JMARzab21XLbbUDUMyMWatGlJ8="; }; propagatedBuildInputs = [ From f90821b265923a5464d15188976fd7b565ce7f16 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 17 Jul 2022 15:27:19 +0200 Subject: [PATCH 10/44] python3Packages.tatsu: Remove myself as maintainer I only ever maintained this package for ics but I don't maintain/use ics anymore (9ce8939ba59). --- pkgs/development/python-modules/tatsu/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/tatsu/default.nix b/pkgs/development/python-modules/tatsu/default.nix index a78952b1e493..2bbd7dd532f9 100644 --- a/pkgs/development/python-modules/tatsu/default.nix +++ b/pkgs/development/python-modules/tatsu/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { ''; homepage = "https://tatsu.readthedocs.io/"; license = licenses.bsd2; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ ]; }; } From ed477a70780699842779b174ac065960631eaab0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Jul 2022 04:46:24 +0000 Subject: [PATCH 11/44] python310Packages.hahomematic: 2022.7.8 -> 2022.7.9 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 197fc18e88d3..74727321bb51 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2022.7.8"; + version = "2022.7.9"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-Tzl7LH4Wisge3B7d2ChQnNPBAj1SNGmHI94k8fkMuqk="; + sha256 = "sha256-yIzxgZOOra5hiAdrLA9miL50fwg/dCwP/lfAmfzWlaI="; }; propagatedBuildInputs = [ From c34749dd635bcb3df89afca4269d3b6ca519e706 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Sun, 17 Jul 2022 22:02:34 -0700 Subject: [PATCH 12/44] nixos/github-runner: fix systemd defaults for common workflows --- .../continuous-integration/github-runner.nix | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/continuous-integration/github-runner.nix b/nixos/modules/services/continuous-integration/github-runner.nix index 30dd919b81a3..a64d08c36cbb 100644 --- a/nixos/modules/services/continuous-integration/github-runner.nix +++ b/nixos/modules/services/continuous-integration/github-runner.nix @@ -280,7 +280,6 @@ in CapabilityBoundingSet = ""; # ProtectClock= adds DeviceAllow=char-rtc r DeviceAllow = ""; - LockPersonality = true; NoNewPrivileges = true; PrivateDevices = true; PrivateMounts = true; @@ -300,13 +299,17 @@ in RestrictSUIDSGID = true; UMask = "0066"; ProtectProc = "invisible"; - ProcSubset = "pid"; SystemCallFilter = [ - "~@debug" - "~@mount" - "~@privileged" + "~@capset" + "~@clock" "~@cpu-emulation" + "~@module" + "~@mount" "~@obsolete" + "~@raw-io" + "~@reboot" + "~setdomainname" + "~sethostname" ]; RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" "AF_NETLINK" ]; @@ -314,6 +317,17 @@ in PrivateNetwork = false; # Cannot be true due to Node MemoryDenyWriteExecute = false; + + # The more restrictive "pid" option makes `nix` commands in CI emit + # "GC Warning: Couldn't read /proc/stat" + # You may want to set this to "pid" if not using `nix` commands + ProcSubset = "all"; + # Coverage programs for compiled code such as `cargo-tarpaulin` disable + # ASLR (address space layout randomization) which requires the + # `personality` syscall + # You may want to set this to `true` if not using coverage tooling on + # compiled code + LockPersonality = false; }; }; }; From 088df050d8c296b5e797e73fe0d0f8cf06d4475c Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 18 Jul 2022 09:28:59 -0300 Subject: [PATCH 13/44] shellhub-agent: 0.9.3 -> 0.9.4 Signed-off-by: Otavio Salvador --- pkgs/applications/networking/shellhub-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix index 531c0f965834..da0e03a272b9 100644 --- a/pkgs/applications/networking/shellhub-agent/default.nix +++ b/pkgs/applications/networking/shellhub-agent/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "shellhub-agent"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - sha256 = "WSK2b1DYSYEFqmVIOlhjFGyqC9ok/9rWAz2ZgUZejzo="; + sha256 = "WcxRVup7wjA9YNyL6UpFoMfkCmXixfbYatcrmA4OHh4="; }; modRoot = "./agent"; From 9ce4b4c70260e2ebe9ef29d71bf9272b59033346 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Mon, 18 Jul 2022 09:41:26 -0300 Subject: [PATCH 14/44] fluxcd: 0.31.3 -> 0.31.4 --- pkgs/applications/networking/cluster/fluxcd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 7d060c546d59..4aab9ed9f4c1 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: let - version = "0.31.3"; - sha256 = "16c6rr0hzlzlfc5xsphp23s3rxavkgfcsblzm15wzd85c2ahm81l"; - manifestsSha256 = "1nr44h5sy97ki2vn2426i2idnnc4pv1n3j6n4p11mf73dy9qzgzp"; + version = "0.31.4"; + sha256 = "182h6is1kq3yc7il1a0xr5mbrsn3z900dkzxb4m79gl5lsrpb1vm"; + manifestsSha256 = "0h37ydgykl5kc50zwqn8xyi89aby75937cqaiw1hkpnw9ilc0akz"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-vHRk6oADEvDmYCeBK/puGSMd4L9K1x/CVPtuYZY9klk="; + vendorSha256 = "sha256-2DeX5si2yVh1C+ikkg9xEpcf2trEBr0qPp+9fgbMfO4="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests From dd9c0fb5c54711dc76de2107d729798922a5cd0f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Jul 2022 13:09:32 +0000 Subject: [PATCH 15/44] python310Packages.dvc-objects: 0.0.24 -> 0.0.26 --- pkgs/development/python-modules/dvc-objects/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvc-objects/default.nix b/pkgs/development/python-modules/dvc-objects/default.nix index 903a39383b09..9b4b4b83af08 100644 --- a/pkgs/development/python-modules/dvc-objects/default.nix +++ b/pkgs/development/python-modules/dvc-objects/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dvc-objects"; - version = "0.0.24"; + version = "0.0.26"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Hy/KLmu5mEIUazRi+XesTbKe+or/fzFL8e0zdV2WtC0="; + hash = "sha256-g2oKxPQogdfS544fYgKBAxvmJgU35A0ewsPQcX1XOJE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 71adc6c2ed17ab1a04b8ff3b48be27436c6886a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Jul 2022 16:42:20 +0000 Subject: [PATCH 16/44] python310Packages.google-cloud-appengine-logging: 1.1.2 -> 1.1.3 --- .../python-modules/google-cloud-appengine-logging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix index ec355d51fd07..5378243fe1a6 100644 --- a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-appengine-logging"; - version = "1.1.2"; + version = "1.1.3"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-undhXBAPB+3akWVu3ht0ZZBwErhmOq18TnXvloeZQjc="; + hash = "sha256-pTakW1aYx5KlU8vgOXwu4kJDI4nEVi2y0YE0pTo3k30="; }; propagatedBuildInputs = [ From e846844d85e9a4793732e0d731b1b8ea227c4624 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Jul 2022 16:47:40 +0000 Subject: [PATCH 17/44] python310Packages.google-cloud-audit-log: 0.2.2 -> 0.2.3 --- .../python-modules/google-cloud-audit-log/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-audit-log/default.nix b/pkgs/development/python-modules/google-cloud-audit-log/default.nix index 84bdaf7afe51..2fae768eb3a3 100644 --- a/pkgs/development/python-modules/google-cloud-audit-log/default.nix +++ b/pkgs/development/python-modules/google-cloud-audit-log/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-audit-log"; - version = "0.2.2"; + version = "0.2.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bYmQOEiu6YF0d+zjBlRIUbkDpexWHalmu7pajRJQmk0="; + sha256 = "sha256-Yi8baD1TgpLr1zNH2i+CBeY+3gwL7Aq5nnmgZcSSZr0="; }; propagatedBuildInputs = [ googleapis-common-protos protobuf ]; From 2379e02542a0b1d05e601f32410749c4a56d8a93 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Jul 2022 16:55:33 +0000 Subject: [PATCH 18/44] python310Packages.google-cloud-bigquery-datatransfer: 3.6.2 -> 3.7.0 --- .../google-cloud-bigquery-datatransfer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index e67b32272e54..8adc7d1b25a3 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.6.2"; + version = "3.7.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-y8W0qwm4rTHlDO8L+/fhIJlfW5PonUhAYBU5wLIZJ94="; + hash = "sha256-WSFulX1aN+mSW3RTukXDe0N/BsLDQX2RKjqzPUsWb2Y="; }; propagatedBuildInputs = [ From 3b033d9f33c348910436abc8751cbbaf6ac6edc4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Jul 2022 17:00:31 +0000 Subject: [PATCH 19/44] python310Packages.google-cloud-bigquery-logging: 1.0.3 -> 1.0.4 --- .../python-modules/google-cloud-bigquery-logging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix index 59859e4ccea7..97d3ec13e99a 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-logging"; - version = "1.0.3"; + version = "1.0.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-hIwKcQNPG6AHudqjy2dotACk51IeivwRbJZZaiFweqs="; + sha256 = "sha256-n8LMhjyZmWnb8ALrOZkKZ8Ctlo70zjyTRF9HxJIudmQ="; }; propagatedBuildInputs = [ From 08d9ed61d56687e2edba217dc8bee2c7f350a85f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Jul 2022 17:05:50 +0000 Subject: [PATCH 20/44] python310Packages.google-cloud-container: 2.10.8 -> 2.11.0 --- .../python-modules/google-cloud-container/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index 41b85f50a43e..b7089078ff81 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.10.8"; + version = "2.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cQ5wFAwgqT2NT+jTfsg13wA7OOq8bk/QIRiIsK2ZyJ0="; + hash = "sha256-cmgyWHK3JLXYEJPLAN5M4edWJlv71tfbhu0KNs5H1k4="; }; propagatedBuildInputs = [ From 2f828a1487a3ecc9ed010f6e5ac57bbadad1dbbb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Jul 2022 17:13:02 +0000 Subject: [PATCH 21/44] python310Packages.google-cloud-datacatalog: 3.8.1 -> 3.9.0 --- .../python-modules/google-cloud-datacatalog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index f38b604ddb39..a58768417059 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.8.1"; + version = "3.9.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-t7kFCkyH3/MNGFX8S4OzgWnW/NSomAFDbDPCx9hV40g="; + hash = "sha256-1VhEg22JMfUDeMT5/A1uX7jwqND4i0zVScFpMJKyCro="; }; propagatedBuildInputs = [ From 627d22d385ae1af42e18f92bfaea801421ed73ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Jul 2022 17:19:22 +0000 Subject: [PATCH 22/44] python310Packages.screenlogicpy: 0.5.4 -> 0.5.5 --- pkgs/development/python-modules/screenlogicpy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/screenlogicpy/default.nix b/pkgs/development/python-modules/screenlogicpy/default.nix index 90caa943ebde..ca137888ce7c 100644 --- a/pkgs/development/python-modules/screenlogicpy/default.nix +++ b/pkgs/development/python-modules/screenlogicpy/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "screenlogicpy"; - version = "0.5.4"; + version = "0.5.5"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dieselrabbit"; repo = pname; - rev = "v${version}"; - sha256 = "0r9227s4v17jm5n0j31ssnak9f5p7xfvz4r1fwy61286is3j5gbb"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-1tBr7k7RutCHvea/56J7drl9P+WZ5bQpDeQwhgktc1s="; }; checkInputs = [ From ed2dac5aab7de9b206156b740a8583b7e3a96183 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Jul 2022 17:20:58 +0000 Subject: [PATCH 23/44] python310Packages.google-cloud-dlp: 3.7.1 -> 3.8.0 --- pkgs/development/python-modules/google-cloud-dlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index 279893faf33e..5478fa83934c 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.7.1"; + version = "3.8.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-q2I3ku8f55rSJQE5oiDttQOJFYtGPjmrW7htrZ+BMPU="; + hash = "sha256-xidZ7EteyDUFxxXOXgSg6OUkzlIzEgnAMRledha0s/Y="; }; propagatedBuildInputs = [ From 6132922358f9ddf290a35e6b5dff3d8bb828bfd9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Jul 2022 17:26:28 +0000 Subject: [PATCH 24/44] python310Packages.google-cloud-firestore: 2.5.3 -> 2.6.0 --- .../python-modules/google-cloud-firestore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix index de0f9c32adfb..922d94c83caa 100644 --- a/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.5.3"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ISPjpV2fjZSMbkJa6YzFGdrwyEC8MauLwS6pohMtFoY="; + sha256 = "sha256-Iq+rOR7gMAfhn5WxfpFQ7s8MlwOxPm868DpgKg/sT/k="; }; propagatedBuildInputs = [ From c230a239b8648a2a58d8b1e187e1c9d775196d28 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Jul 2022 17:37:24 +0000 Subject: [PATCH 25/44] python310Packages.google-cloud-secret-manager: 2.11.1 -> 2.12.0 --- .../python-modules/google-cloud-secret-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index edb73853cace..f03b854abf1f 100644 --- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.11.1"; + version = "2.12.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-tSy0d8kdyDSE+/gcg4B+fplnLJ4ipoa+TZvUoExaYVU="; + hash = "sha256-vlMh7Ww7ZPHWVUJMDqRO58bmn4nfTi3Gj/sBReHOvtQ="; }; propagatedBuildInputs = [ From 169456dd918bcec3c32c6c205b25818433a78ec0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Jul 2022 17:43:10 +0000 Subject: [PATCH 26/44] python310Packages.google-cloud-tasks: 2.9.1 -> 2.10.0 --- .../development/python-modules/google-cloud-tasks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix index 7f4c31419839..44ef6afed987 100644 --- a/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.9.1"; + version = "2.10.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wIO22BScrDJdbia6oOEuuXptedxrCehqWKLXmxTJmKE="; + sha256 = "sha256-bN5nW/vqDXiSy/gGC/OVxhRQRJl0VLWL/G5BqViueY0="; }; propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ]; From c54d7bdce6f7fb1673ade6610e4e1fa3d85d85f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Jul 2022 17:50:08 +0000 Subject: [PATCH 27/44] python310Packages.google-cloud-texttospeech: 2.11.1 -> 2.12.0 --- .../python-modules/google-cloud-texttospeech/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index 92d2272440e9..cc3d35c88599 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.11.1"; + version = "2.12.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4I7zmjZMjXjkxjEtwWNbev0ryTOIyOWsVkC46tgRyqc="; + sha256 = "sha256-HcLY/dpWQzsfCmwtwePidqlDuLHmlEgLUEdGkHOgdsw="; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; From ea54b2a58f24aaf6f48bc5d13019292f1f998c4f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Jul 2022 17:55:10 +0000 Subject: [PATCH 28/44] python310Packages.google-cloud-trace: 1.6.2 -> 1.7.0 --- .../development/python-modules/google-cloud-trace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix index 8665718fb00f..9f5df9bd989e 100644 --- a/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-trace"; - version = "1.6.2"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-nxyd8zE8PEQupVutLWhLD4I1jNhhJ0ARpTi52f21iBE="; + sha256 = "sha256-4EC6jLcFNF8G0dXvc+cZB6Ok3zeltc6Xon8EGRTkyCs="; }; propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ]; From 9ed49fcd00796202eb0a2a8785e9c3e657b7acf5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Jul 2022 18:05:22 +0000 Subject: [PATCH 29/44] python310Packages.google-cloud-vision: 2.8.0 -> 3.0.0 --- .../python-modules/google-cloud-vision/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix index ce4142fa1141..dac5109f6651 100644 --- a/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "2.8.0"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-LOGfvz61Fw6QNH83lFe8TwI3a72fHLeTFFcqM9QL3QY="; + hash = "sha256-YQiqLVa9CVW82eXuzPWvcWFKzXcvX8v7cxazH2hrqAs="; }; propagatedBuildInputs = [ From 9b808d0491c0eb68bf2c0e9c5c3df7787a466118 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Jul 2022 20:24:40 +0000 Subject: [PATCH 30/44] python310Packages.safety: 2.0.0 -> 2.1.1 --- pkgs/development/python-modules/safety/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/safety/default.nix b/pkgs/development/python-modules/safety/default.nix index b897d6ced4a3..10ee872576d7 100644 --- a/pkgs/development/python-modules/safety/default.nix +++ b/pkgs/development/python-modules/safety/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "safety"; - version = "2.0.0"; + version = "2.1.1"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "d739d00a9e4203cfaba34540c822a73ca1d327159ed7776b3dce09391f81c35d"; + sha256 = "sha256-28Xf+i5H2nbMQ9/oy7v8qZ0pEY0MbFTfz6EcK9NJ3/Y="; }; postPatch = '' From c7d1b54136c5242c7a4bee88c04741c92348b72c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 19 Jul 2022 02:54:37 +0000 Subject: [PATCH 31/44] wafw00f: 2.1.0 -> 2.2.0 --- pkgs/tools/security/wafw00f/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/wafw00f/default.nix b/pkgs/tools/security/wafw00f/default.nix index 0e363b608fd4..55d4b7591e38 100644 --- a/pkgs/tools/security/wafw00f/default.nix +++ b/pkgs/tools/security/wafw00f/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "wafw00f"; - version = "2.1.0"; + version = "2.2.0"; format = "setuptools"; src = fetchFromGitHub { owner = "EnableSecurity"; repo = pname; - rev = "v${version}"; - sha256 = "0526kz6ypww9nxc2vddkhpn1gqvn25mzj3wmi91wwxwxjjb6w4qj"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-wJZ1/aRMFpE6Q5YAtGxXwxe2G9H/de+l3l0C5rwEWA8="; }; propagatedBuildInputs = with python3.pkgs; [ From 48b7d7fc38da565cf259e38fe57412ce616f312e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 19 Jul 2022 04:20:00 +0000 Subject: [PATCH 32/44] redis: 7.0.3 -> 7.0.4 https://github.com/redis/redis/releases/tag/7.0.4 --- pkgs/servers/nosql/redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 2095ac009de7..7dc692e113cc 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "redis"; - version = "7.0.3"; + version = "7.0.4"; src = fetchurl { url = "https://download.redis.io/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-LN59FyFP/jBZU9qf/xIzPopyyqV/1JI+SHL2NiogjnM="; + sha256 = "sha256-8OZf2nTESj3U+p1RLU1Ngz3Qk5yTTpRqXGIqYw0Ffy8="; }; # Cross-compiling fixes From d2460bd625e7cbdd08d0cd77115e5648dfaa284d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 19 Jul 2022 05:03:46 +0000 Subject: [PATCH 33/44] python310Packages.types-requests: 2.28.1 -> 2.28.2 --- pkgs/development/python-modules/types-requests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index a409f71a4745..90fd0a6bf413 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.28.1"; + version = "2.28.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rNjteFCdJ73wTN3MBfcGbf3k0w3X26Z7gIzbEUHWL/4="; + sha256 = "sha256-OY+IzZMCx5bLY9ECGvKh+3rlB3QaPVCO344HRtjBagQ="; }; propagatedBuildInputs = [ From 642aeda7afa26e94296ba02be415d6521fa03f39 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 19 Jul 2022 05:22:44 +0000 Subject: [PATCH 34/44] k3s: 1.24.2+k3s2 -> 1.24.3+k3s1 --- pkgs/applications/networking/cluster/k3s/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index b1c00f223b40..3f216213849d 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -46,10 +46,10 @@ with lib; # Those pieces of software we entirely ignore upstream's handling of, and just # make sure they're in the path if desired. let - k3sVersion = "1.24.2+k3s2"; # k3s git tag - k3sCommit = "a237260237b549b90dd3aae449de09231caf1351"; # k3s git commit at the above version - k3sRepoSha256 = "1dmlsq7f0z0wq8ypbmdqwk1hl59pcnywvqhz7qblzm3wnbdb62cl"; - k3sVendorSha256 = "sha256-w5dYkewoNnI9GvqCAkmecg7JsKgO+gu1WcyPRItLvWY="; + k3sVersion = "1.24.3+k3s1"; # k3s git tag + k3sCommit = "990ba0e88c90f8ed8b50e0ccd375937b841b176e"; # k3s git commit at the above version + k3sRepoSha256 = "0slw2j7d7ccj7k9z06l5ch3nxi07jbm6xijs774hisyv25jx94rd"; + k3sVendorSha256 = "sha256-8jWpTUE/tJf2qpFjdsV+0i8hRf6JqATwr/YbXrZa/iA="; # taken from ./manifests/traefik.yaml, extracted from '.spec.chart' https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/download#L9 # The 'patch' and 'minor' versions are currently hardcoded as single digits only, so ignore the trailing two digits. Weird, I know. From b0a0087d53b276b3e3f9bed8788f9c2dd8481ebc Mon Sep 17 00:00:00 2001 From: Wei Tang Date: Tue, 19 Jul 2022 08:09:42 +0200 Subject: [PATCH 35/44] nixos/flannel: upgrade to etcdv3 (#180315) --- nixos/modules/services/networking/flannel.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/networking/flannel.nix b/nixos/modules/services/networking/flannel.nix index ac84b3d35a3d..4698c1f682c9 100644 --- a/nixos/modules/services/networking/flannel.nix +++ b/nixos/modules/services/networking/flannel.nix @@ -155,10 +155,11 @@ in { FLANNELD_ETCD_KEYFILE = cfg.etcd.keyFile; FLANNELD_ETCD_CERTFILE = cfg.etcd.certFile; FLANNELD_ETCD_CAFILE = cfg.etcd.caFile; - ETCDCTL_CERT_FILE = cfg.etcd.certFile; - ETCDCTL_KEY_FILE = cfg.etcd.keyFile; - ETCDCTL_CA_FILE = cfg.etcd.caFile; - ETCDCTL_PEERS = concatStringsSep "," cfg.etcd.endpoints; + ETCDCTL_CERT = cfg.etcd.certFile; + ETCDCTL_KEY = cfg.etcd.keyFile; + ETCDCTL_CACERT = cfg.etcd.caFile; + ETCDCTL_ENDPOINTS = concatStringsSep "," cfg.etcd.endpoints; + ETCDCTL_API = "3"; } // optionalAttrs (cfg.storageBackend == "kubernetes") { FLANNELD_KUBE_SUBNET_MGR = "true"; FLANNELD_KUBECONFIG_FILE = cfg.kubeconfig; @@ -167,7 +168,7 @@ in { path = [ pkgs.iptables ]; preStart = optionalString (cfg.storageBackend == "etcd") '' echo "setting network configuration" - until ${pkgs.etcd}/bin/etcdctl set /coreos.com/network/config '${builtins.toJSON networkConfig}' + until ${pkgs.etcd}/bin/etcdctl put /coreos.com/network/config '${builtins.toJSON networkConfig}' do echo "setting network configuration, retry" sleep 1 From 328fb7f7a513ec4a8d7b92d97b10c6b7d06270f7 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Tue, 19 Jul 2022 09:17:30 +0200 Subject: [PATCH 36/44] dbeaver: 22.1.1 -> 22.1.2 --- pkgs/applications/misc/dbeaver/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index c36d98a1b6e5..64193190b5c6 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -23,16 +23,16 @@ inherit maven; # use overridden maven version (see dbeaver's entry in all-packages.nix) }) rec { pname = "dbeaver"; - version = "22.1.1"; # When updating also update mvnSha256 + version = "22.1.2"; # When updating also update mvnSha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "sha256-+MFULieuwfvuAP0HjJ+C0hb/uqhHtnP/nOoIfWwjtoI="; + sha256 = "sha256-iADQls//lgoq+IY4mzy/emyraFAJidHn46dMeAy5k6k="; }; - mvnSha256 = "pSZL+GDSXSm+sLymlSlq2ZIRdYJY1B3PCmCpjtosdGY="; + mvnSha256 = "cTFeH9MxPnF1vaV+Q5/7HfIsO5eEbNDIsyekHsFH9vw="; mvnParameters = "-P desktop,all-platforms"; nativeBuildInputs = [ From d2db10786f27619d5519b12b03fb10dc8ca95e59 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Jul 2022 14:42:42 +0000 Subject: [PATCH 37/44] flannel: 0.18.0 -> 0.18.1 --- pkgs/tools/networking/flannel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix index 36623c021f6d..68c3dc6b99cd 100644 --- a/pkgs/tools/networking/flannel/default.nix +++ b/pkgs/tools/networking/flannel/default.nix @@ -4,7 +4,7 @@ with lib; buildGoModule rec { pname = "flannel"; - version = "0.18.0"; + version = "0.18.1"; rev = "v${version}"; vendorSha256 = null; @@ -13,7 +13,7 @@ buildGoModule rec { inherit rev; owner = "flannel-io"; repo = "flannel"; - sha256 = "sha256-cxdbXhj79xp5jT5xY3cIzt5XYndPC+TWIrxBjAvbP0g="; + sha256 = "sha256-l0W896miwnILQo3VWozV1aMNZoSerydUzWltl7D9y1E="; }; ldflags = [ "-X github.com/flannel-io/flannel/version.Version=${rev}" ]; From e8f68df62a918fb1733ad23f4e4a3869b74c82ca Mon Sep 17 00:00:00 2001 From: Enno Richter Date: Tue, 19 Jul 2022 06:40:13 +0200 Subject: [PATCH 38/44] platformio: unset broken on aarch64 --- pkgs/development/embedded/platformio/core.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix index f44ba4e95b8e..8a775b825152 100644 --- a/pkgs/development/embedded/platformio/core.nix +++ b/pkgs/development/embedded/platformio/core.nix @@ -148,7 +148,6 @@ with python.pkgs; buildPythonApplication rec { ''; meta = with lib; { - broken = stdenv.isAarch64; description = "An open source ecosystem for IoT development"; homepage = "https://platformio.org"; license = licenses.asl20; From 03800f3251838633a8f9e4aceef2c3ed1f9fd6e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 19 Jul 2022 09:45:18 +0000 Subject: [PATCH 39/44] python310Packages.aioguardian: 2022.03.2 -> 2022.07.0 --- pkgs/development/python-modules/aioguardian/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/aioguardian/default.nix b/pkgs/development/python-modules/aioguardian/default.nix index ed902288d0f2..511400ccfc59 100644 --- a/pkgs/development/python-modules/aioguardian/default.nix +++ b/pkgs/development/python-modules/aioguardian/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "aioguardian"; - version = "2022.03.2"; + version = "2022.07.0"; src = fetchFromGitHub { owner = "bachya"; repo = pname; - rev = version; - sha256 = "sha256-eEvvcj8tHNErU6RrWar5mxG3xbQ5wCEEYJ95hXkdY54="; + rev = "refs/tags/${version}"; + sha256 = "sha256-87MumQ6MuhRRDHrcH1nmOPviKDaT4crYnq5Pd26qsLw="; }; format = "pyproject"; From f158ac45eff3cd023af83c43b22573dd71b85e59 Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Tue, 19 Jul 2022 01:58:25 -0700 Subject: [PATCH 40/44] nixos/k3s: use default cgroup-driver again Setting `cgroup-driver=systemd` was originally necessary to match with docker, else the kubelet would not start (#111835) However, since then, docker support has been dropped from k3s (#177790). As such, this option is much less necessary. More importantly, it now seems to be actively causing issues. Due to an upstream k3s bug, it's resulting in the kubelet and containerd having different cgroup drivers, which seems to result in some difficult to debug failure modes. See https://github.com/NixOS/nixpkgs/issues/181790#issuecomment-1188840862 for a description of this problem. Removing this flag entirely seems reasonable to me, and it results in k3s working again on my machine. --- nixos/modules/services/cluster/k3s/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/cluster/k3s/default.nix b/nixos/modules/services/cluster/k3s/default.nix index 421aa0aac60e..bc5e8c66e2a5 100644 --- a/nixos/modules/services/cluster/k3s/default.nix +++ b/nixos/modules/services/cluster/k3s/default.nix @@ -111,7 +111,6 @@ in [ "${cfg.package}/bin/k3s ${cfg.role}" ] - ++ (optional (config.systemd.enableUnifiedCgroupHierarchy) "--kubelet-arg=cgroup-driver=systemd") ++ (optional cfg.disableAgent "--disable-agent") ++ (optional (cfg.serverAddr != "") "--server ${cfg.serverAddr}") ++ (optional (cfg.token != "") "--token ${cfg.token}") From a8df6f3109133c25e00c610e485ca056fd27f276 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 19 Jul 2022 07:43:49 -0300 Subject: [PATCH 41/44] qogir-theme: 2022-05-29 -> 2022-07-17 (#181761) * qogir-theme: 2022-05-29 -> 2022-07-17 * qogir-theme: replace duplicate files with links * qogir-theme: move patchShebangs to post patch phase * qogir-theme: run pre and post install hooks * qogir-theme: add optional arguments --- pkgs/data/themes/qogir/default.nix | 41 +++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/pkgs/data/themes/qogir/default.nix b/pkgs/data/themes/qogir/default.nix index b447ab4230b6..f6ea2c61aa89 100644 --- a/pkgs/data/themes/qogir/default.nix +++ b/pkgs/data/themes/qogir/default.nix @@ -1,27 +1,40 @@ { lib , stdenv , fetchFromGitHub +, gitUpdater , gdk-pixbuf , gnome-themes-extra , gtk-engine-murrine +, jdupes , librsvg , sassc , which -, gitUpdater +, themeVariants ? [] # default: blue +, colorVariants ? [] # default: all +, tweaks ? [] }: -stdenv.mkDerivation rec { +let pname = "qogir-theme"; - version = "2022-05-29"; + +in +lib.checkListOfEnum "${pname}: theme variants" [ "default" "manjaro" "ubuntu" "all" ] themeVariants +lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] colorVariants +lib.checkListOfEnum "${pname}: tweaks" [ "image" "square" "round" ] tweaks + +stdenv.mkDerivation rec { + inherit pname; + version = "2022-07-17"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "z8o/1Qc7XmefX9CuVr0Gq2MmKw2NlkUk+5Lz0Z593do="; + sha256 = "NGgTToaSJBwmHnZjWbJ3dSJg9Mmfchj3W0xgK0CMb9M="; }; nativeBuildInputs = [ + jdupes sassc which ]; @@ -36,13 +49,29 @@ stdenv.mkDerivation rec { gtk-engine-murrine # murrine engine for Gtk2 ]; + postPatch = '' + patchShebangs install.sh clean-old-theme.sh + ''; + installPhase = '' - patchShebangs . + runHook preInstall + mkdir -p $out/share/themes - name= HOME="$TMPDIR" ./install.sh -t all -d $out/share/themes + + name= HOME="$TMPDIR" ./install.sh \ + ${lib.optionalString (themeVariants != []) "--theme " + builtins.toString themeVariants} \ + ${lib.optionalString (colorVariants != []) "--color " + builtins.toString colorVariants} \ + ${lib.optionalString (tweaks != []) "--tweaks " + builtins.toString tweaks} \ + --dest $out/share/themes + mkdir -p $out/share/doc/${pname} cp -a src/firefox $out/share/doc/${pname} + rm $out/share/themes/*/{AUTHORS,COPYING} + + jdupes --link-soft --recurse $out/share + + runHook postInstall ''; passthru.updateScript = gitUpdater { inherit pname version; }; From c8585bf4a88d6ec2b659cf5fd02a10cac2d31c82 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Mon, 18 Jul 2022 16:47:49 +0200 Subject: [PATCH 42/44] coqPackages.coq-elpi 1.14.0 -> 1.15.1 --- pkgs/development/coq-modules/coq-elpi/default.nix | 3 +++ pkgs/development/ocaml-modules/elpi/default.nix | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index 4b471b55b482..0ccde962fce8 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -7,6 +7,7 @@ with builtins; with lib; let { case = "8.13"; out = { version = "1.13.7"; };} { case = "8.14"; out = { version = "1.13.7"; };} { case = "8.15"; out = { version = "1.15.0"; };} + { case = "8.16"; out = { version = "1.16.5"; };} ] {} ); in mkCoqDerivation { pname = "elpi"; @@ -14,12 +15,14 @@ in mkCoqDerivation { owner = "LPCIC"; inherit version; defaultVersion = lib.switch coq.coq-version [ + { case = "8.16"; out = "1.15.1"; } { case = "8.15"; out = "1.14.0"; } { case = "8.14"; out = "1.11.2"; } { case = "8.13"; out = "1.11.1"; } { case = "8.12"; out = "1.8.3_8.12"; } { case = "8.11"; out = "1.6.3_8.11"; } ] null; + release."1.15.1".sha256 = "sha256-NT2RlcIsFB9AvBhMxil4ZZIgx+KusMqDflj2HgQxsZg="; release."1.14.0".sha256 = "sha256:1v2p5dlpviwzky2i14cj7gcgf8cr0j54bdm9fl5iz1ckx60j6nvp"; release."1.13.0".sha256 = "1j7s7dlnjbw222gnbrsjgmjck1yrx7h6hwm8zikcyxi0zys17w7n"; release."1.12.1".sha256 = "sha256-4mO6/co7NcIQSGIQJyoO8lNWXr6dqz+bIYPO/G0cPkY="; diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix index 3b133407c30a..b9a81a6c9d9c 100644 --- a/pkgs/development/ocaml-modules/elpi/default.nix +++ b/pkgs/development/ocaml-modules/elpi/default.nix @@ -2,15 +2,18 @@ , buildDunePackage, camlp5 , ocaml , menhir, menhirLib +, atdgen , stdlib-shims , re, perl, ncurses , ppxlib, ppx_deriving , ppxlib_0_15, ppx_deriving_0_15 , coqPackages -, version ? if lib.versionAtLeast ocaml.version "4.07" then "1.15.2" else "1.14.1" +, version ? if lib.versionAtLeast ocaml.version "4.08" then "1.16.5" + else if lib.versionAtLeast ocaml.version "4.07" then "1.15.2" else "1.14.1" }: with lib; let fetched = coqPackages.metaFetch ({ + release."1.16.5".sha256 = "sha256-tKX5/cVPoBeHiUe+qn7c5FIRYCwY0AAukN7vSd/Nz9A="; release."1.15.2".sha256 = "sha256-XgopNP83POFbMNyl2D+gY1rmqGg03o++Ngv3zJfCn2s="; release."1.15.0".sha256 = "sha256:1ngdc41sgyzyz3i3lkzjhnj66gza5h912virkh077dyv17ysb6ar"; release."1.14.1".sha256 = "sha256-BZPVL8ymjrE9kVGyf6bpc+GA2spS5JBpkUtZi04nPis="; @@ -31,7 +34,8 @@ buildDunePackage rec { minimalOCamlVersion = "4.04"; buildInputs = [ perl ncurses ] - ++ optional (versionAtLeast version "1.15" || version == "dev") menhir; + ++ optional (versionAtLeast version "1.15" || version == "dev") menhir + ++ optional (versionAtLeast version "1.16" || version == "dev") atdgen; propagatedBuildInputs = [ re stdlib-shims ] ++ (if versionAtLeast version "1.15" || version == "dev" From 310ce906b6aed2714787df92636ab284b2493a40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Gia=20Phong?= Date: Sun, 17 Jul 2022 02:02:26 +0900 Subject: [PATCH 43/44] hedgewars: use qt514's overridden glibc++ --- pkgs/games/hedgewars/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index a45c4fee05ec..d69ba93aaeb5 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -1,7 +1,7 @@ -{ mkDerivation, SDL2_image, SDL2_ttf, SDL2_net, fpc, ghcWithPackages, ffmpeg, freeglut +{ stdenv, SDL2_image, SDL2_ttf, SDL2_net, fpc, ghcWithPackages, ffmpeg, freeglut , lib, fetchurl, cmake, pkg-config, lua5_1, SDL2, SDL2_mixer , zlib, libpng, libGL, libGLU, physfs -, qtbase, qttools +, qtbase, qttools, wrapQtAppsHook , llvm , withServer ? true }: @@ -14,7 +14,7 @@ let ]); in -mkDerivation rec { +stdenv.mkDerivation rec { pname = "hedgewars"; version = "1.0.0"; @@ -23,7 +23,7 @@ mkDerivation rec { sha256 = "0nqm9w02m0xkndlsj6ys3wr0ik8zc14zgilq7k6fwjrf3zk385i1"; }; - nativeBuildInputs = [ cmake pkg-config qttools ]; + nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ]; buildInputs = [ SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image @@ -103,10 +103,5 @@ mkDerivation rec { all movement on the battlefield has ceased).''; maintainers = with maintainers; [ kragniz fpletz ]; inherit (fpc.meta) platforms; - - # Appears to be some sort of C++ linking error. - # Example: https://hydra.nixos.org/build/174544990/nixlog/6 - broken = true; - hydraPlatforms = platforms.none; }; } From 00f62a4a6f25d9d663a4b9e8c9809737465c9509 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 18 Jul 2022 11:40:18 +0200 Subject: [PATCH 44/44] domination: 1.2.4 -> 1.2.5 --- pkgs/games/domination/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/domination/default.nix b/pkgs/games/domination/default.nix index 8bba2d1f94e3..919d22b41dae 100644 --- a/pkgs/games/domination/default.nix +++ b/pkgs/games/domination/default.nix @@ -26,7 +26,7 @@ let in stdenv.mkDerivation { pname = "domination"; - version = "1.2.4"; + version = "1.2.5"; # The .zip releases do not contain the build.xml file src = fetchsvn { @@ -34,8 +34,8 @@ in stdenv.mkDerivation { # There are no tags in the repository. # Look for commits like "new version x.y.z info on website" # or "website update for x.y.z". - rev = "2109"; - sha256 = "sha256-awTaEkv0zUXgrKVKuFzi5sgHgrfiNmAFMODO5U0DL6I="; + rev = "2212"; + sha256 = "sha256-XuPMxGDap8x7I+U7+1C+DlkQkoV/u2FCwYyTZFWmYHM="; }; nativeBuildInputs = [