Merge staging-next into staging

2025-01-27 23:33:30 +00:00 · 2023-05-13 12:01:36 +00:00 · 2023-05-13 12:01:36 +00:00 · 3270c13879
commit 3270c13879
parent 2c02b17076 51e24f4508
26 changed files with 139 additions and 59 deletions
--- a/nixos/modules/services/x11/desktop-managers/budgie.nix
+++ b/nixos/modules/services/x11/desktop-managers/budgie.nix
@ -45,10 +45,15 @@ in {
      enable = mkEnableOption (mdDoc "the Budgie desktop");

      sessionPath = mkOption {
-        description = mdDoc "Additional list of packages to be added to the session search path. Useful for GSettings-conditional autostart.";
-        type = with types; listOf package;
-        example = literalExpression "[ pkgs.budgie.budgie-desktop-view ]";
+        description = lib.mdDoc ''
+          Additional list of packages to be added to the session search path.
+          Useful for GSettings-conditional autostart.
+
+          Note that this should be a last resort; patching the package is preferred (see GPaste).
+        '';
+        type = types.listOf types.package;
        default = [];
+        example = literalExpression "[ pkgs.gnome.gpaste ]";
      };

      extraGSettingsOverrides = mkOption {
@ -59,20 +64,21 @@ in {

      extraGSettingsOverridePackages = mkOption {
        description = mdDoc "List of packages for which GSettings are overridden.";
-        type = with types; listOf path;
+        type = types.listOf types.path;
        default = [];
      };

      extraPlugins = mkOption {
        description = mdDoc "Extra plugins for the Budgie desktop";
-        type = with types; listOf package;
+        type = types.listOf types.package;
        default = [];
+        example = literalExpression "[ pkgs.budgiePlugins.budgie-analogue-clock-applet ]";
      };
    };

    environment.budgie.excludePackages = mkOption {
      description = mdDoc "Which packages Budgie should exclude from the default environment.";
-      type = with types; listOf package;
+      type = types.listOf types.package;
      default = [];
      example = literalExpression "[ pkgs.mate-terminal ]";
    };
--- a/nixos/modules/system/boot/systemd/repart.nix
+++ b/nixos/modules/system/boot/systemd/repart.nix
@ -121,4 +121,6 @@ in
      ];
    };
  };
+
+  meta.maintainers = with lib.maintainers; [ nikstur ];
 }
--- a/nixos/tests/budgie.nix
+++ b/nixos/tests/budgie.nix
@ -23,7 +23,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
    services.xserver.desktopManager.budgie = {
      enable = true;
      extraPlugins = [
-        pkgs.budgie.budgie-analogue-clock-applet
+        pkgs.budgiePlugins.budgie-analogue-clock-applet
      ];
    };
  };
--- a/pkgs/applications/audio/spotifyd/default.nix
+++ b/pkgs/applications/audio/spotifyd/default.nix
@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, rustPackages, pkg-config, openssl
+{ lib, stdenv, fetchFromGitHub, rustPackages, pkg-config, openssl
 , withALSA ? true, alsa-lib
 , withPulseAudio ? false, libpulseaudio
 , withPortAudio ? false, portaudio
@ -9,20 +9,20 @@

 rustPackages.rustPlatform.buildRustPackage rec {
  pname = "spotifyd";
-  version = "0.3.4";
+  version = "0.3.5";

  src = fetchFromGitHub {
    owner = "Spotifyd";
    repo = "spotifyd";
    rev = "v${version}";
-    sha256 = "sha256-9zwHBDrdvE2R/cdrWgjsfHlm3wEZ9SB2VNcqezB/Op0=";
+    hash = "sha256-+P85FWJIsfAv8/DnQFxfoWvNY8NpbZ2xUidfwN8tiA8=";
  };

-  cargoSha256 = "sha256-fQm7imXpm5AcKdg0cU/Rf2mAeg2ebZKRisJZSnG0REI=";
+  cargoHash = "sha256-j+2yEtn3D+vNRcY4+NnqSX4xRQIE5Sq7bentxTh6kMI=";

  nativeBuildInputs = [ pkg-config ];

-  buildInputs = [ openssl ]
+  buildInputs = lib.optionals stdenv.isLinux [ openssl ]
    ++ lib.optional withALSA alsa-lib
    ++ lib.optional withPulseAudio libpulseaudio
    ++ lib.optional withPortAudio portaudio
@ -39,7 +39,7 @@ rustPackages.rustPlatform.buildRustPackage rec {

  meta = with lib; {
    description = "An open source Spotify client running as a UNIX daemon";
-    homepage = "https://github.com/Spotifyd/spotifyd";
+    homepage = "https://spotifyd.rs/";
    changelog = "https://github.com/Spotifyd/spotifyd/raw/v${version}/CHANGELOG.md";
    license = licenses.gpl3Plus;
    maintainers = with maintainers; [ anderslundstedt Br1ght0ne marsam ];
--- a/pkgs/data/fonts/carlito/default.nix
+++ b/pkgs/data/fonts/carlito/default.nix
@ -1,27 +1,25 @@
-{ lib, fetchFromGitHub, stdenvNoCC }:
+{ lib, fetchurl, stdenvNoCC }:

 stdenvNoCC.mkDerivation rec {
-  pname = "carlito-unstable";
-  version = "20230309";
+  pname = "carlito";
+  version = "20130920";

-  src = fetchFromGitHub {
-    owner = "googlefonts";
-    repo = "carlito";
-    rev = "3a810cab78ebd6e2e4eed42af9e8453c4f9b850a";
-    hash = "sha256-U4TvZZ7n7dr1/14oZkF1Eo96ZcdWIDWron70um77w+E=";
+  src = fetchurl {
+    url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-carlito-${version}.tar.gz";
+    sha256 = "sha256-S9ErbLwyHBzxbaduLFhcklzpVqCAZ65vbGTv9sz9r1o=";
  };

  installPhase = ''
    mkdir -p $out/etc/fonts/conf.d
    mkdir -p $out/share/fonts/truetype
-    cp -v fonts/ttf/*.ttf $out/share/fonts/truetype
+    cp -v *.ttf $out/share/fonts/truetype
    cp -v ${./calibri-alias.conf} $out/etc/fonts/conf.d/30-calibri.conf
  '';

  meta = with lib; {
    # This font doesn't appear to have any official web site but this
    # one provides some good information and samples.
-    homepage = "https://github.com/googlefonts/carlito";
+    homepage = "http://openfontlibrary.org/en/font/carlito";
    description = "A sans-serif font metric-compatible with Microsoft Calibri";
    longDescription = ''
      Carlito is a free font that is metric-compatible with the
--- a/pkgs/desktops/budgie/default.nix
+++ b/pkgs/desktops/budgie/default.nix
@ -1,7 +1,6 @@
 { lib, pkgs }:

 lib.makeScope pkgs.newScope (self: with self; {
-  budgie-analogue-clock-applet = callPackage ./budgie-analogue-clock-applet { };
  budgie-backgrounds = callPackage ./budgie-backgrounds { };
  budgie-control-center = callPackage ./budgie-control-center { };
  budgie-desktop = callPackage ./budgie-desktop { };
--- a/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix
+++ b/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix
@ -5,7 +5,7 @@
 , ninja
 , pkg-config
 , vala
-, budgie-desktop
+, budgie
 , gtk3
 , libpeas
 }:
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
  ];

  buildInputs = [
-    budgie-desktop
+    budgie.budgie-desktop
    gtk3
    libpeas
  ];
--- a/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix
+++ b/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix
@ -0,0 +1,53 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, accountsservice
+, budgie
+, gtk3
+, intltool
+, libgee
+, libpeas
+, meson
+, ninja
+, pkg-config
+, sassc
+, vala
+}:
+
+stdenv.mkDerivation rec {
+  pname = "budgie-user-indicator-redux";
+  version = "1.0.1";
+
+  src = fetchFromGitHub {
+    owner = "EbonJaeger";
+    repo = "budgie-user-indicator-redux";
+    rev = "v${version}";
+    hash = "sha256-HGfcNlkIQD9nNzHm97LpNz3smYwDhxu4EArPo6msahI=";
+  };
+
+  nativeBuildInputs = [
+    intltool
+    meson
+    ninja
+    pkg-config
+    vala
+  ];
+
+  buildInputs = [
+    accountsservice
+    budgie.budgie-desktop
+    gtk3
+    libgee
+    libpeas
+    sassc
+  ];
+
+  meta = with lib; {
+    description = "Manage your user session from the Budgie panel";
+    homepage = "https://github.com/EbonJaeger/budgie-user-indicator-redux";
+    changelog = "https://github.com/EbonJaeger/budgie-user-indicator-redux/blob/${src.rev}/CHANGELOG.md";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.federicoschonborn ];
+  };
+}
--- a/pkgs/desktops/budgie/plugins/default.nix
+++ b/pkgs/desktops/budgie/plugins/default.nix
@ -0,0 +1,4 @@
+{ callPackage }: {
+  budgie-analogue-clock-applet = callPackage ./budgie-analogue-clock-applet { };
+  budgie-user-indicator-redux = callPackage ./budgie-user-indicator-redux { };
+}
--- a/pkgs/desktops/mate/libmatekbd/default.nix
+++ b/pkgs/desktops/mate/libmatekbd/default.nix
@ -3,18 +3,18 @@
 , fetchurl
 , pkg-config
 , gettext
-, gtk3
+, gtk3-x11
 , libxklavier
 , mateUpdateScript
 }:

 stdenv.mkDerivation rec {
  pname = "libmatekbd";
-  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 = "1b8iv2hmy8z2zzdsx8j5g583ddxh178bq8dnlqng9ifbn35fh3i2";
+    sha256 = "Y5ONkSUpRe7qiP2DdNEjG9g9As2WXGu6F8GF7bOXvO0=";
  };

  nativeBuildInputs = [
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
  ];

  buildInputs = [
-    gtk3
+    gtk3-x11
    libxklavier
  ];

--- a/pkgs/desktops/mate/libmateweather/default.nix
+++ b/pkgs/desktops/mate/libmateweather/default.nix
@ -11,11 +11,11 @@

 stdenv.mkDerivation rec {
  pname = "libmateweather";
-  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 = "05bvc220p135l6qnhh3qskljxffds0f7fjbjnrpq524w149rgzd7";
+    sha256 = "wgCZD0uOnU0OLG99MaWHY3TD0qNsa4y1kEQAQ6hg7zo=";
  };

  nativeBuildInputs = [
--- a/pkgs/desktops/mate/mate-notification-daemon/default.nix
+++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix
@ -17,11 +17,11 @@

 stdenv.mkDerivation rec {
  pname = "mate-notification-daemon";
-  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 = "1fmr6hlcy2invp2yxqfqgpdx1dp4qa8xskjq2rm6v4gmz20nag5j";
+    sha256 = "Dq6SlsSKPHH9VvGTGWH5LSnkWgRf5fGgX4PHQAwxmSQ=";
  };

  nativeBuildInputs = [
--- a/pkgs/desktops/mate/mate-settings-daemon/default.nix
+++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix
@ -21,11 +21,11 @@

 stdenv.mkDerivation rec {
  pname = "mate-settings-daemon";
-  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 = "0hbdwqagxh1mdpxfdqr1ps3yqvk0v0c5zm0bwk56y6l1zwbs0ymp";
+    sha256 = "aX6mW1QpIcK3ZhRSktJo0wCcwtqDFtKnhphpBV5LGFk=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/compilers/lingua-franca/default.nix
+++ b/pkgs/development/compilers/lingua-franca/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "lfc";
-  version = "0.3.0";
+  version = "0.4.0";

  src = fetchzip {
-    url = "https://github.com/lf-lang/lingua-franca/releases/download/v${version}/lfc_${version}.zip";
-    sha256 = "sha256-jSINlwHfSOPbti3LJTXpSk6lcUtwKfz7CMLtq2OuNns=";
+    url = "https://github.com/lf-lang/lingua-franca/releases/download/v${version}/lf-cli-${version}.zip";
+    sha256 = "sha256-LrAm77iPUlqVfRdYy2bZ4mim7DHIr5JxPdbrgxokGvc=";
  };

  buildInputs = [ jdk17_headless ];
--- a/pkgs/development/python-modules/bthome-ble/default.nix
+++ b/pkgs/development/python-modules/bthome-ble/default.nix
@ -12,7 +12,7 @@

 buildPythonPackage rec {
  pname = "bthome-ble";
-  version = "2.11.0";
+  version = "2.11.2";
  format = "pyproject";

  disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
    owner = "Bluetooth-Devices";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-VCdXkUdSFX7ARVtgcbsRgh9Kcy490PA+HrT0Eaj8KvI=";
+    hash = "sha256-U0R4WWgXtfP1vvrGdJl70xO88YhvxwJYDnMiN4B+Waw=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/flake8-bugbear/default.nix
+++ b/pkgs/development/python-modules/flake8-bugbear/default.nix
@ -11,7 +11,7 @@

 buildPythonPackage rec {
  pname = "flake8-bugbear";
-  version = "23.2.13";
+  version = "23.5.9";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
    owner = "PyCQA";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-4iOt6KQU8QkNdmGBIyevfwqvbKpylV+BN49GjeX68xE=";
+    hash = "sha256-qjR6WbgewVdmxubtEK6BdZv6zXgp0B9bQLxana3o+WU=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/python3-saml/default.nix
+++ b/pkgs/development/python-modules/python3-saml/default.nix
@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
+, fetchpatch
 , freezegun
 , isodate
 , lxml
@ -22,6 +23,14 @@ buildPythonPackage rec {
    hash = "sha256-xPPR2z3h8RpoAROpKpu9ZoDxGq5Stm9wQVt4Stj/6fg=";
  };

+  patches = [
+    (fetchpatch {
+      name = "test-expired.patch";
+      url = "https://github.com/SAML-Toolkits/python3-saml/commit/bd65578e5a21494c89320094c61c1c77250bea33.diff";
+      hash = "sha256-9Trew6R5JDjtc0NRGoklqMVDEI4IEqFOdK3ezyBU6gI=";
+    })
+  ];
+
  propagatedBuildInputs = [
    isodate
    lxml
--- a/pkgs/development/python-modules/reolink-aio/default.nix
+++ b/pkgs/development/python-modules/reolink-aio/default.nix
@ -11,7 +11,7 @@

 buildPythonPackage rec {
  pname = "reolink-aio";
-  version = "0.5.13";
+  version = "0.5.15";
  format = "setuptools";

  disabled = pythonOlder "3.9";
@ -20,7 +20,7 @@ buildPythonPackage rec {
    owner = "starkillerOG";
    repo = "reolink_aio";
    rev = "refs/tags/${version}";
-    hash = "sha256-jIdKNOYj+ahqfMqTPYwf5fCwHVRn+CLecqlQCXslVG4=";
+    hash = "sha256-YTBx0tMWSyy6A1OuTBmfEpRnZE4gHLIY5qFH9YL+YEo=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/sqlite-utils/default.nix
+++ b/pkgs/development/python-modules/sqlite-utils/default.nix
@ -14,14 +14,14 @@

 buildPythonPackage rec {
  pname = "sqlite-utils";
-  version = "3.30";
+  version = "3.31";
  format = "setuptools";

-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-MABcEtXxNEVln3kXZr62qZAMJfRCvqH5gPIdOLdfbjM=";
+    hash = "sha256-VJifPQntEh+d+Xgx0EFziuSHcdPKhQCJRvG8GIQQmoo=";
  };

  postPatch = ''
@ -49,6 +49,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Python CLI utility and library for manipulating SQLite databases";
    homepage = "https://github.com/simonw/sqlite-utils";
+    changelog = "https://github.com/simonw/sqlite-utils/releases/tag/${version}";
    license = licenses.asl20;
    maintainers = with maintainers; [ meatcar techknowlogick ];
  };
--- a/pkgs/development/python-modules/wagtail/default.nix
+++ b/pkgs/development/python-modules/wagtail/default.nix
@ -30,6 +30,11 @@ buildPythonPackage rec {
    sha256 = "sha256-s89gs3H//Dc3k6BLZUC4APyDgiWY9LetWAkI+kXQTf8=";
  };

+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "beautifulsoup4>=4.8,<4.12" "beautifulsoup4>=4.8"
+  '';
+
  propagatedBuildInputs = [
    django
    django-modelcluster
--- a/pkgs/development/tools/rust/cargo-udeps/default.nix
+++ b/pkgs/development/tools/rust/cargo-udeps/default.nix
@ -2,16 +2,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "cargo-udeps";
-  version = "0.1.38";
+  version = "0.1.39";

  src = fetchFromGitHub {
    owner = "est31";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-UQ6JrzL9yGllhPYN7Dod6UYqu2FJLjInmpE6IUmjZno=";
+    sha256 = "sha256-/TAgAwP4y3MBIvcgCi2SiMfQ61BrFYuUY2LTg8mJn7U=";
  };

-  cargoHash = "sha256-jzBOdMtv47wDOOcPg0B5BYQtYSnDnOnms0SDrW2lFbs=";
+  cargoHash = "sha256-RGIqFTi0CFiPLMI3K7hsWMJXDrjVNbGnS7ZfTeBTPn0=";

  nativeBuildInputs = [ pkg-config ];

--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@ -79,7 +79,8 @@ in buildRubyGem rec {
    in ''
    wrapProgram "$out/bin/vagrant" \
      --set GEM_PATH "${deps}/lib/ruby/gems/${ruby.version.libDir}" \
-      --prefix PATH ':' ${pathAdditions}
+      --prefix PATH ':' ${pathAdditions} \
+      --set-default VAGRANT_CHECKPOINT_DISABLE 1

    mkdir -p "$out/vagrant-plugins/plugins.d"
    echo '{}' > "$out/vagrant-plugins/plugins.json"
--- a/pkgs/tools/admin/lego/default.nix
+++ b/pkgs/tools/admin/lego/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "lego";
-  version = "4.10.2";
+  version = "4.11.0";

  src = fetchFromGitHub {
    owner = "go-acme";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-+bMxZ/ga3LLlZmjfysP/FXiLFokAyagkmds/js3HCzs=";
+    sha256 = "sha256-RotsWr/wUPAAzW9PrUH3DGx2J5beyD+s/PpAUH12gNI=";
  };

-  vendorHash = "sha256-Rf1HY2Q0t3iOuopnPRCkDKauWLFy9qhRh94QiwbDuOQ=";
+  vendorHash = "sha256-6dfwAsCxEYksZXqSWYurAD44YfH4h5p5P1aYZENjHSs=";

  doCheck = false;

--- a/pkgs/tools/security/exploitdb/default.nix
+++ b/pkgs/tools/security/exploitdb/default.nix
@ -6,13 +6,13 @@

 stdenv.mkDerivation rec {
  pname = "exploitdb";
-  version = "2023-05-10";
+  version = "2023-05-12";

  src = fetchFromGitLab {
    owner = "exploit-database";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-09Z4RKLwJGcM11sD5gGBRRJ6ccSJuzDqoPYcr3I4Plg=";
+    hash = "sha256-G7ig1MtdAWz8eCxNhGjP1ekSp61aIyncbtAexBoOCXY=";
  };

  nativeBuildInputs = [
--- a/pkgs/tools/security/pretender/default.nix
+++ b/pkgs/tools/security/pretender/default.nix
@ -5,13 +5,13 @@

 buildGoModule rec {
  pname = "pretender";
-  version = "1.1.0";
+  version = "1.1.1";

  src = fetchFromGitHub {
    owner = "RedTeamPentesting";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-iWAejgI/q1lh8daybPItzQA91Ayg3ZgddGFXWm3cuww=";
+    hash = "sha256-3i7zNzwURSNSleiW+KBkxdqBv9yshtBu1hLKtjWe9OE=";
  };

  vendorHash = "sha256-uw3mpf27OH5uNKmvCFcTw+YFoxVEqT4Fz/CSl9Wjbv0=";
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -31172,6 +31172,7 @@ with pkgs;
    withALSA = stdenv.isLinux;
    withPulseAudio = config.pulseaudio or stdenv.isLinux;
    withPortAudio = stdenv.isDarwin;
+    withMpris = stdenv.isLinux;
  };

  srain = callPackage ../applications/networking/irc/srain { };
@ -37051,6 +37052,7 @@ with pkgs;
  arcanPackages = recurseIntoAttrs (callPackage ../desktops/arcan { });

  budgie = recurseIntoAttrs (callPackage ../desktops/budgie { });
+  budgiePlugins = recurseIntoAttrs (callPackage ../desktops/budgie/plugins { });

  cdesktopenv = callPackage ../desktops/cdesktopenv { };