Merge staging-next into staging

nixos/modules/services/x11/desktop-managers/pantheon.nix

@@ -160,6 +160,7 @@ in
       services.udisks2.enable = true;
       services.upower.enable = config.powerManagement.enable;
       services.libinput.enable = mkDefault true;
+      services.switcherooControl.enable = mkDefault true;
       services.xserver.updateDbusEnvironment = true;
       services.zeitgeist.enable = mkDefault true;
       services.geoclue2.enable = mkDefault true;
@@ -193,6 +194,7 @@ in
 
       # Global environment
       environment.systemPackages = (with pkgs.pantheon; [
+        elementary-bluetooth-daemon
         elementary-session-settings
         elementary-settings-daemon
         gala

nixos/modules/virtualisation/oci-containers.nix

@@ -33,6 +33,25 @@ let
           example = literalExpression "pkgs.dockerTools.buildImage {...};";
         };
 
+        imageStream = mkOption {
+          type = with types; nullOr package;
+          default = null;
+          description = ''
+            Path to a script that streams the desired image on standard output.
+
+            This option is mainly intended for use with
+            `pkgs.dockerTools.streamLayeredImage` so that the intermediate
+            image archive does not need to be stored in the Nix store.  For
+            larger images this optimization can significantly reduce Nix store
+            churn compared to using the `imageFile` option, because you don't
+            have to store a new copy of the image archive in the Nix store
+            every time you change the image.  Instead, if you stream the image
+            then you only need to build and store the layers that differ from
+            the previous image.
+          '';
+          example = literalExpression "pkgs.dockerTools.streamLayeredImage {...};";
+        };
+
         login = {
 
           username = mkOption {
@@ -275,6 +294,9 @@ let
         ${optionalString (container.imageFile != null) ''
           ${cfg.backend} load -i ${container.imageFile}
         ''}
+        ${optionalString (container.imageStream != null) ''
+          ${container.imageStream} | ${cfg.backend} load
+        ''}
         ${optionalString (cfg.backend == "podman") ''
           rm -f /run/podman-${escapedName}.ctr-id
         ''}
@@ -282,10 +304,10 @@ let
     };
   in {
     wantedBy = [] ++ optional (container.autoStart) "multi-user.target";
-    wants = lib.optional (container.imageFile == null)  "network-online.target";
+    wants = lib.optional (container.imageFile == null && container.imageStream == null)  "network-online.target";
     after = lib.optionals (cfg.backend == "docker") [ "docker.service" "docker.socket" ]
-            # if imageFile is not set, the service needs the network to download the image from the registry
-            ++ lib.optionals (container.imageFile == null) [ "network-online.target" ]
+            # if imageFile or imageStream is not set, the service needs the network to download the image from the registry
+            ++ lib.optionals (container.imageFile == null && container.imageStream == null) [ "network-online.target" ]
             ++ dependsOn;
     requires = dependsOn;
     environment = proxy_env;
@@ -393,6 +415,17 @@ in {
   config = lib.mkIf (cfg.containers != {}) (lib.mkMerge [
     {
       systemd.services = mapAttrs' (n: v: nameValuePair "${cfg.backend}-${n}" (mkService n v)) cfg.containers;
+
+      assertions =
+        let
+          toAssertion = _: { imageFile, imageStream, ... }:
+            { assertion = imageFile == null || imageStream == null;
+
+              message = "You can only define one of imageFile and imageStream";
+            };
+
+        in
+          lib.mapAttrsToList toAssertion cfg.containers;
     }
     (lib.mkIf (cfg.backend == "podman") {
       virtualisation.podman.enable = true;

nixos/tests/cntr.nix

@@ -18,7 +18,7 @@ let
             inherit backend;
             containers.nginx = {
               image = "nginx-container";
-              imageFile = pkgs.dockerTools.examples.nginx;
+              imageStream = pkgs.dockerTools.examples.nginxStream;
               ports = [ "8181:80" ];
             };
           };

nixos/tests/oci-containers.nix

@@ -20,7 +20,7 @@ let
           inherit backend;
           containers.nginx = {
             image = "nginx-container";
-            imageFile = pkgs.dockerTools.examples.nginx;
+            imageStream = pkgs.dockerTools.examples.nginxStream;
             ports = ["8181:80"];
           };
         };

nixos/tests/traefik.nix

@@ -23,7 +23,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
             "traefik.http.routers.nginx.rule=Host(`nginx.traefik.test`)"
           ];
           image = "nginx-container";
-          imageFile = pkgs.dockerTools.examples.nginx;
+          imageStream = pkgs.dockerTools.examples.nginxStream;
         };
       };
 

pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/package.nix

@@ -56,7 +56,7 @@ melpaBuild {
   '';
 
   preInstall = ''
-    install -D --target-directory=$out/bin source/notdeft-xapian
+    install -D --target-directory=$out/bin notdeft-xapian
   '';
 
   ignoreCompilationError = false;

pkgs/applications/editors/emacs/elisp-packages/manual-packages/pod-mode/package.nix

@@ -23,7 +23,7 @@ melpaBuild {
 
   postInstall = ''
     mkdir -p ''${!outputDoc}/share/doc/pod-mode/
-    install -Dm644 -t ''${!outputDoc}/share/doc/pod-mode/ $sourceRoot/ChangeLog $sourceRoot/README
+    install -Dm644 -t ''${!outputDoc}/share/doc/pod-mode/ ChangeLog README
   '';
 
   ignoreCompilationError = false;

pkgs/applications/misc/gcalcli/default.nix

@@ -1,32 +1,44 @@
-{ stdenv, lib, fetchFromGitHub, python3
-, libnotify ? null }:
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  python3Packages,
+  libnotify,
+}:
 
-with python3.pkgs;
-
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "gcalcli";
   version = "4.3.0";
+  pyproject = true;
 
   src = fetchFromGitHub {
-    owner  = "insanum";
-    repo   = pname;
-    rev    = "v${version}";
-    sha256 = "0s5fhcmz3n0dwh3vkqr4aigi59q43v03ch5jhh6v75149icwr0df";
+    owner = "insanum";
+    repo = "gcalcli";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-roHMWUwklLMNhLJANsAeBKcSX1Qk47kH5A3Y8SuDrmg=";
   };
 
   postPatch = lib.optionalString stdenv.isLinux ''
     substituteInPlace gcalcli/argparsers.py \
-      --replace "'notify-send" "'${libnotify}/bin/notify-send"
+      --replace-fail "'notify-send" "'${lib.getExe libnotify}"
   '';
 
-  propagatedBuildInputs = [
-    python-dateutil gflags httplib2 parsedatetime six vobject
-    google-api-python-client oauth2client uritemplate
+  build-system = with python3Packages; [ setuptools ];
+
+  dependencies = with python3Packages; [
+    python-dateutil
+    gflags
+    httplib2
+    parsedatetime
+    six
+    vobject
+    google-api-python-client
+    oauth2client
+    uritemplate
     libnotify
   ];
 
-  # There are no tests as of 4.0.0a4
-  doCheck = false;
+  nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
 
   meta = with lib; {
     description = "CLI for Google Calendar";

pkgs/applications/misc/onboard/default.nix

@@ -1,4 +1,5 @@
 { fetchurl
+, fetchpatch
 , lib
 , substituteAll
 , aspellWithDicts
@@ -54,6 +55,22 @@ python3.pkgs.buildPythonApplication rec {
     })
     # Allow loading hunspell dictionaries installed in NixOS system path
     ./hunspell-use-xdg-datadirs.patch
+
+    # Python 3.12 fixes (otherwise crashes at startup)
+    (fetchpatch {
+      url = "https://github.com/void-linux/void-packages/raw/1be95325d320122efd5dedf7437839cfcca01f7a/srcpkgs/onboard/patches/python-3.12.patch";
+      hash = "sha256-Lw5wlaWFlP5rFlEWmlPo5Ux8idrmhET/X9yiu+2Akkk=";
+    })
+    (fetchpatch {
+      url = "https://github.com/void-linux/void-packages/raw/1be95325d320122efd5dedf7437839cfcca01f7a/srcpkgs/onboard/patches/thread-state.patch";
+      hash = "sha256-fJfxD7HshroiEVkaKVBGV7py8tdOhbcprcmBQNuxR9U=";
+    })
+
+    # Fix for https://bugs.launchpad.net/onboard/+bug/1948723
+    (fetchpatch {
+      url = "https://github.com/void-linux/void-packages/raw/9ef46bf26ac5acc1af5809f11c97b19c5e2233ed/srcpkgs/onboard/patches/fix-brokenformat.patch";
+      hash = "sha256-r9mvJNWpPR1gsayuSSLpzIuafEKqtADYklre0Ju+KOM=";
+    })
   ];
 
   nativeBuildInputs = [

pkgs/build-support/docker/examples.nix

@@ -17,6 +17,52 @@ let
   };
   evalMinimalConfig = module: nixosLib.evalModules { modules = [ module ]; };
 
+  nginxArguments = let
+    nginxPort = "80";
+    nginxConf = pkgs.writeText "nginx.conf" ''
+      user nobody nobody;
+      daemon off;
+      error_log /dev/stdout info;
+      pid /dev/null;
+      events {}
+      http {
+        access_log /dev/stdout;
+        server {
+          listen ${nginxPort};
+          index index.html;
+          location / {
+            root ${nginxWebRoot};
+          }
+        }
+      }
+    '';
+    nginxWebRoot = pkgs.writeTextDir "index.html" ''
+      <html><body><h1>Hello from NGINX</h1></body></html>
+    '';
+  in
+  { name = "nginx-container";
+    tag = "latest";
+    contents = [
+      fakeNss
+      pkgs.nginx
+    ];
+
+    extraCommands = ''
+      mkdir -p tmp/nginx_client_body
+
+      # nginx still tries to read this directory even if error_log
+      # directive is specifying another file :/
+      mkdir -p var/log/nginx
+    '';
+
+    config = {
+      Cmd = [ "nginx" "-c" nginxConf ];
+      ExposedPorts = {
+        "${nginxPort}/tcp" = {};
+      };
+    };
+  };
+
 in
 
 rec {
@@ -60,52 +106,10 @@ rec {
   };
 
   # 3. another service example
-  nginx = let
-    nginxPort = "80";
-    nginxConf = pkgs.writeText "nginx.conf" ''
-      user nobody nobody;
-      daemon off;
-      error_log /dev/stdout info;
-      pid /dev/null;
-      events {}
-      http {
-        access_log /dev/stdout;
-        server {
-          listen ${nginxPort};
-          index index.html;
-          location / {
-            root ${nginxWebRoot};
-          }
-        }
-      }
-    '';
-    nginxWebRoot = pkgs.writeTextDir "index.html" ''
-      <html><body><h1>Hello from NGINX</h1></body></html>
-    '';
-  in
-  buildLayeredImage {
-    name = "nginx-container";
-    tag = "latest";
-    contents = [
-      fakeNss
-      pkgs.nginx
-    ];
+  nginx = buildLayeredImage nginxArguments;
 
-    extraCommands = ''
-      mkdir -p tmp/nginx_client_body
-
-      # nginx still tries to read this directory even if error_log
-      # directive is specifying another file :/
-      mkdir -p var/log/nginx
-    '';
-
-    config = {
-      Cmd = [ "nginx" "-c" nginxConf ];
-      ExposedPorts = {
-        "${nginxPort}/tcp" = {};
-      };
-    };
-  };
+  # Used to demonstrate how virtualisation.oci-containers.imageStream works
+  nginxStream = pkgs.dockerTools.streamLayeredImage nginxArguments;
 
   # 4. example of pulling an image. could be used as a base for other images
   nixFromDockerHub = pullImage {

pkgs/by-name/co/cosmic-randr/package.nix

@@ -25,10 +25,6 @@ rustPlatform.buildRustPackage rec {
     };
   };
 
-  postPatch = ''
-    substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)"
-  '';
-
   nativeBuildInputs = [ just pkg-config ];
   buildInputs = [ wayland ];
 

pkgs/by-name/mu/music-assistant/frontend.nix

@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "music-assistant-frontend";
-  version = "2.8.7";
+  version = "2.8.9";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-L7ASmYtJja+Hy4MnGrNWIwSjvhfq2iXfWm4gGKAnEec=";
+    hash = "sha256-vXdBqMe5+GfB2D9G1YceUJ0ksqQAtUktpYrJgDZcBGU=";
   };
 
   postPatch = ''

pkgs/by-name/mu/music-assistant/package.nix

@@ -24,14 +24,14 @@ in
 
 python.pkgs.buildPythonApplication rec {
   pname = "music-assistant";
-  version = "2.2.0";
+  version = "2.2.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "music-assistant";
     repo = "server";
     rev = "refs/tags/${version}";
-    hash = "sha256-GQvbkdyybJ3X09fCKwu+iZvq7UdHIMzCpYjenGg/zQA=";
+    hash = "sha256-7PIyo3srKwftakDiaxvZjrzo/1I9LGUwG+QGfIU5pRA=";
   };
 
   patches = [

pkgs/by-name/mu/music-assistant/providers.nix

@@ -1,7 +1,7 @@
 # Do not edit manually, run ./update-providers.py
 
 {
-  version = "2.2.0";
+  version = "2.2.2";
   providers = {
     airplay = [
     ];

pkgs/by-name/oa/oama/generated-package.nix

@@ -0,0 +1,94 @@
+# This file has been autogenerate with cabal2nix.
+# Update via ./update.sh
+{
+  mkDerivation,
+  aeson,
+  base,
+  bytestring,
+  containers,
+  directory,
+  fetchgit,
+  hsyslog,
+  http-conduit,
+  lib,
+  mtl,
+  network,
+  network-uri,
+  optparse-applicative,
+  pretty-simple,
+  process,
+  streaming-commons,
+  string-qq,
+  strings,
+  text,
+  time,
+  twain,
+  unix,
+  utf8-string,
+  warp,
+  yaml,
+}:
+mkDerivation {
+  pname = "oama";
+  version = "0.14";
+  src = fetchgit {
+    url = "https://github.com/pdobsan/oama.git";
+    sha256 = "1hdhkc6hh4nvx31vkaii7hd2rxlwqrsvr6i1i0a9r1xlda05ffq0";
+    rev = "4e1ffd3001034771d284678f0160060c1871707c";
+    fetchSubmodules = true;
+  };
+  isLibrary = true;
+  isExecutable = true;
+  libraryHaskellDepends = [
+    aeson
+    base
+    bytestring
+    containers
+    directory
+    hsyslog
+    http-conduit
+    mtl
+    network
+    network-uri
+    optparse-applicative
+    pretty-simple
+    process
+    streaming-commons
+    string-qq
+    strings
+    text
+    time
+    twain
+    unix
+    utf8-string
+    warp
+    yaml
+  ];
+  executableHaskellDepends = [
+    aeson
+    base
+    bytestring
+    containers
+    directory
+    hsyslog
+    http-conduit
+    mtl
+    network
+    network-uri
+    optparse-applicative
+    pretty-simple
+    process
+    streaming-commons
+    string-qq
+    strings
+    text
+    time
+    twain
+    unix
+    utf8-string
+    warp
+    yaml
+  ];
+  license = lib.licenses.bsd3;
+  mainProgram = "oama";
+}

pkgs/by-name/oa/oama/package.nix

@@ -0,0 +1,29 @@
+{
+  haskell,
+  haskellPackages,
+  lib,
+}:
+let
+  inherit (haskell.lib.compose) overrideCabal justStaticExecutables;
+
+  overrides = {
+    description = "OAuth credential MAnager";
+    homepage = "https://github.com/pdobsan/oama";
+    maintainers = with lib.maintainers; [ aidalgol ];
+
+    passthru.updateScript = ./update.sh;
+  };
+
+  raw-pkg = (haskellPackages.callPackage ./generated-package.nix { }).overrideScope (
+    final: prev: {
+      # Dependency twain requires an older version of http2, and we cannot mix
+      # versions of transitive dependencies.
+      http2 = final.http2_3_0_3;
+      warp = final.warp_3_3_30;
+    }
+  );
+in
+lib.pipe raw-pkg [
+  (overrideCabal overrides)
+  justStaticExecutables
+]

pkgs/by-name/oa/oama/update.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p cabal2nix curl jq nixfmt-rfc-style
+
+set -euo pipefail
+
+# This is the directory of this update.sh script.
+script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+derivation_file="${script_dir}/generated-package.nix"
+latest_version="$(curl --silent https://api.github.com/repos/pdobsan/oama/releases/latest | jq --raw-output '.tag_name')"
+
+echo "Updating oama to version ${latest_version}."
+echo "Running cabal2nix and outputting to ${derivation_file}..."
+
+cat > "${derivation_file}" << EOF
+# This file has been autogenerate with cabal2nix.
+# Update via ./update.sh
+EOF
+
+cabal2nix --revision "${latest_version}" https://github.com/pdobsan/oama.git >> "${derivation_file}"
+nixfmt "${derivation_file}"
+
+echo "Finished."

pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix

@@ -1,69 +0,0 @@
-{ lib
-, stdenv
-, substituteAll
-, fetchFromGitHub
-, fetchpatch
-, nix-update-script
-, meson
-, ninja
-, pkg-config
-, vala
-, libgee
-, granite
-, gtk3
-, switchboard
-, wingpanel-indicator-a11y
-, onboard
-}:
-
-stdenv.mkDerivation rec {
-  pname = "switchboard-plug-a11y";
-  version = "2.3.0";
-
-  src = fetchFromGitHub {
-    owner = "elementary";
-    repo = pname;
-    rev = version;
-    sha256 = "0dc5jv335j443rg08cb7p8wvmcg36wrf1vlcfg9r20cksdis9v4l";
-  };
-
-  patches = [
-    (substituteAll {
-      src = ./fix-paths.patch;
-      inherit onboard;
-    })
-    # Upstream code not respecting our localedir
-    # https://github.com/elementary/switchboard-plug-a11y/pull/79
-    (fetchpatch {
-      url = "https://github.com/elementary/switchboard-plug-a11y/commit/08db4b696128a6bf809da3403a818834fcd62b02.patch";
-      sha256 = "1s13ak23bdxgcb74wdz3ql192bla5qhabdicqyjv1rp32plhkbg5";
-    })
-  ];
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    pkg-config
-    vala
-  ];
-
-  buildInputs = [
-    granite
-    gtk3
-    libgee
-    switchboard
-    wingpanel-indicator-a11y
-  ];
-
-  passthru = {
-    updateScript = nix-update-script { };
-  };
-
-  meta = with lib; {
-    description = "Switchboard Universal Access Plug";
-    homepage = "https://github.com/elementary/switchboard-plug-a11y";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = teams.pantheon.members;
-  };
-}

pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/fix-paths.patch

@@ -1,13 +0,0 @@
-diff --git a/src/Panes/Typing.vala b/src/Panes/Typing.vala
-index b4ae8b0..5b8fd7e 100644
---- a/src/Panes/Typing.vala
-+++ b/src/Panes/Typing.vala
-@@ -83,7 +83,7 @@ public class Accessibility.Panes.Typing : Categories.Pane {
- 
-         onboard_settings_label.clicked.connect (() => {
-             try {
--                var appinfo = AppInfo.create_from_commandline ("onboard-settings", null, AppInfoCreateFlags.NONE);
-+                var appinfo = AppInfo.create_from_commandline ("@onboard@/bin/onboard-settings", null, AppInfoCreateFlags.NONE);
-                 appinfo.launch (null, null);
-             } catch (Error e) {
-                 warning ("%s\n", e.message);

pkgs/desktops/pantheon/default.nix

@@ -4,7 +4,6 @@
 lib.makeScope pkgs.newScope (self: with self; {
 
   switchboardPlugs = [
-    switchboard-plug-a11y
     switchboard-plug-about
     switchboard-plug-applications
     switchboard-plug-bluetooth
@@ -26,7 +25,6 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   wingpanelIndicators = [
     wingpanel-applications-menu
-    wingpanel-indicator-a11y
     wingpanel-indicator-bluetooth
     wingpanel-indicator-datetime
     wingpanel-indicator-keyboard
@@ -34,8 +32,8 @@ lib.makeScope pkgs.newScope (self: with self; {
     wingpanel-indicator-nightlight
     wingpanel-indicator-notifications
     wingpanel-indicator-power
-    wingpanel-indicator-session
     wingpanel-indicator-sound
+    wingpanel-quick-settings
   ];
 
   maintainers = lib.teams.pantheon.members;
@@ -157,10 +155,10 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   wingpanel-indicator-power = callPackage ./desktop/wingpanel-indicators/power { };
 
-  wingpanel-indicator-session = callPackage ./desktop/wingpanel-indicators/session { };
-
   wingpanel-indicator-sound = callPackage ./desktop/wingpanel-indicators/sound { };
 
+  wingpanel-quick-settings = callPackage ./desktop/wingpanel-indicators/quick-settings { };
+
   #### SWITCHBOARD
 
   switchboard = callPackage ./apps/switchboard { };
@@ -169,8 +167,6 @@ lib.makeScope pkgs.newScope (self: with self; {
     plugs = null;
   };
 
-  switchboard-plug-a11y = callPackage ./apps/switchboard-plugs/a11y { };
-
   switchboard-plug-about = callPackage ./apps/switchboard-plugs/about { };
 
   switchboard-plug-applications = callPackage ./apps/switchboard-plugs/applications { };
@@ -244,4 +240,8 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   notes-up = throw "The ‘pantheon.notes-up’ alias was removed on 2022-02-02, please use ‘pkgs.notes-up’ directly."; # added 2021-12-18
 
+  switchboard-plug-a11y = throw "pantheon.switchboard-plug-a11y has been removed, abandoned by upstream."; # added 2024-08-23
+
+  wingpanel-indicator-session = throw "pantheon.wingpanel-indicator-session has been removed, abandoned by upstream."; # added 2024-08-23
+
 }

pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix

@@ -3,6 +3,7 @@
 , fetchFromGitHub
 , nix-update-script
 , desktop-file-utils
+, gettext
 , pkg-config
 , writeScript
 , gnome-keyring
@@ -91,20 +92,18 @@ in
 
 stdenv.mkDerivation rec {
   pname = "elementary-session-settings";
-  version = "6.0.0-unstable-2024-03-29";
+  version = "8.0.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "session-settings";
-    # For systemd managed gnome-session support.
-    # https://github.com/NixOS/nixpkgs/issues/228946
-    # nixpkgs-update: no auto update
-    rev = "53bf57e5b32936befc3003a0f99c5b3a69349c76";
-    sha256 = "sha256-TX9V6gZiuPEKSHQoSD4+5QptuqEvuErCJ8OF2KFRf9k=";
+    rev = version;
+    sha256 = "sha256-CtArMzM6eukH/Ob0W/U4xh2vvqm17m3T0w7lhcRid74=";
   };
 
   nativeBuildInputs = [
     desktop-file-utils
+    gettext
     meson
     ninja
     pkg-config

pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix

@@ -4,7 +4,6 @@
 , nix-update-script
 , pkg-config
 , meson
-, python3
 , ninja
 , vala
 , gtk3
@@ -18,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wingpanel-indicator-bluetooth";
-  version = "7.0.1";
+  version = "8.0.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "sha256-VLW3r5X0AWhNRQpajYmCNMIl/UvZCWz14gpxZLlLJdQ=";
+    sha256 = "sha256-N0ehiK8sYAZ/3Lu2u7dut7ZflroFptALFCxjbI0++BA=";
   };
 
   nativeBuildInputs = [
@@ -33,7 +32,6 @@ stdenv.mkDerivation rec {
     meson
     ninja
     pkg-config
-    python3
     vala
   ];
 
@@ -46,11 +44,6 @@ stdenv.mkDerivation rec {
     wingpanel
   ];
 
-  postPatch = ''
-    chmod +x meson/post_install.py
-    patchShebangs meson/post_install.py
-  '';
-
   passthru = {
     updateScript = nix-update-script { };
   };

pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix

@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wingpanel-indicator-notifications";
-  version = "7.1.0";
+  version = "7.1.1";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "sha256-vm+wMHyWWtOWM0JyiesfpzC/EmkTNbprXaBgVUDQvDg=";
+    sha256 = "sha256-fuC9ldDjKuy1kBeFOAIZ/Onhl2o45Xj+YjSrfYz1xvw=";
   };
 
   nativeBuildInputs = [

pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix

@@ -8,9 +8,9 @@
 , meson
 , ninja
 , vala
+, elementary-settings-daemon
 , gtk3
 , granite
-, bamf
 , libgtop
 , libnotify
 , udev
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wingpanel-indicator-power";
-  version = "6.2.1";
+  version = "8.0.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "sha256-EEY32O7GeXBHSjZQ3XGogT1sUzIKGX+CzcGx8buGLq4=";
+    sha256 = "sha256-RelK4HIyTQ6kXi7/K8U33sKIrDrhA3IFVnnvX4x88UQ=";
   };
 
   patches = [
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    bamf
+    elementary-settings-daemon
     granite
     gtk3
     libgee

pkgs/desktops/pantheon/desktop/wingpanel-indicators/quick-settings/default.nix

@@ -0,0 +1,65 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  nix-update-script,
+  glib,
+  meson,
+  ninja,
+  pkg-config,
+  vala,
+  elementary-settings-daemon,
+  granite,
+  gtk3,
+  libgee,
+  libhandy,
+  libportal,
+  packagekit,
+  wayland,
+  wingpanel,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "wingpanel-quick-settings";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "elementary";
+    repo = "quick-settings";
+    rev = finalAttrs.version;
+    hash = "sha256-k8K6zGTLYGSsi5NtohbaGg4oVVovktR7BInN8BUE5bQ=";
+  };
+
+  nativeBuildInputs = [
+    glib # glib-compile-resources
+    meson
+    ninja
+    pkg-config
+    vala
+  ];
+
+  buildInputs = [
+    elementary-settings-daemon # for prefers-color-scheme
+    glib
+    granite
+    gtk3
+    libgee
+    libhandy
+    libportal
+    packagekit
+    wayland
+    wingpanel
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Quick settings menu for Wingpanel";
+    homepage = "https://github.com/elementary/quick-settings";
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = lib.teams.pantheon.members;
+  };
+})

pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix

@@ -1,55 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, nix-update-script
-, pkg-config
-, meson
-, ninja
-, vala
-, gtk3
-, granite
-, wingpanel
-, accountsservice
-, libgee
-, libhandy
-}:
-
-stdenv.mkDerivation rec {
-  pname = "wingpanel-indicator-session";
-  version = "2.3.1";
-
-  src = fetchFromGitHub {
-    owner = "elementary";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-2AEMe5dctTicW1MiGRV1SMjN/uFxQGbOYzCNFS1/KNk=";
-  };
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    pkg-config
-    vala
-  ];
-
-  buildInputs = [
-    accountsservice
-    granite
-    gtk3
-    libgee
-    libhandy
-    wingpanel
-  ];
-
-  passthru = {
-    updateScript = nix-update-script { };
-  };
-
-  meta = with lib; {
-    description = "Session Indicator for Wingpanel";
-    homepage = "https://github.com/elementary/wingpanel-indicator-session";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = teams.pantheon.members;
-  };
-}

pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix

@@ -4,7 +4,6 @@
 , nix-update-script
 , pkg-config
 , meson
-, python3
 , ninja
 , vala
 , gnome-settings-daemon
@@ -20,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wingpanel-indicator-sound";
-  version = "7.0.0";
+  version = "8.0.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "sha256-gQyL8g4Y5kM9/1EDLAQYiTSZ6CxuvfQv7LBRZNcGPVk=";
+    sha256 = "sha256-5VJnRFjyiy+CIOrwabmgWjVF4Jh0lfkhPUoGXivnbtY=";
   };
 
   nativeBuildInputs = [
@@ -34,7 +33,6 @@ stdenv.mkDerivation rec {
     meson
     ninja
     pkg-config
-    python3
     vala
   ];
 
@@ -49,11 +47,6 @@ stdenv.mkDerivation rec {
     wingpanel
   ];
 
-  postPatch = ''
-    chmod +x meson/post_install.py
-    patchShebangs meson/post_install.py
-  '';
-
   passthru = {
     updateScript = nix-update-script { };
   };

pkgs/desktops/pantheon/desktop/wingpanel/default.nix

@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, fetchpatch
 , nix-update-script
 , wrapGAppsHook3
 , pkg-config
@@ -32,6 +33,13 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./indicators.patch
+
+    # Add sorting for QuickSettings
+    # https://github.com/elementary/wingpanel/pull/516
+    (fetchpatch {
+      url = "https://github.com/elementary/wingpanel/commit/cae197c953f4332e67cf0a5457b4e54f8adc3424.patch";
+      hash = "sha256-P7Cl6M3qvh9pa1qIwWQV4XG5NoCQId+buzEChcUOapk=";
+    })
   ];
 
   nativeBuildInputs = [

pkgs/development/libraries/itk/generic.nix

@@ -1,8 +1,30 @@
-{ version, rev, sourceSha256 }:
+{
+  version,
+  rev,
+  sourceSha256,
+}:
 
-{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake
-, expat, fftw, gdcm, hdf5-cpp, libjpeg, libminc, libtiff, libpng
-, libX11, libuuid, xz, vtk, zlib, Cocoa }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchpatch,
+  cmake,
+  expat,
+  fftw,
+  gdcm,
+  hdf5-cpp,
+  libjpeg,
+  libminc,
+  libtiff,
+  libpng,
+  libX11,
+  libuuid,
+  xz,
+  vtk,
+  zlib,
+  Cocoa,
+}:
 
 let
   itkGenericLabelInterpolatorSrc = fetchFromGitHub {
@@ -59,12 +81,12 @@ stdenv.mkDerivation {
     "-DBUILD_EXAMPLES=OFF"
     "-DBUILD_SHARED_LIBS=ON"
     "-DITK_FORBID_DOWNLOADS=ON"
-    "-DITK_USE_SYSTEM_LIBRARIES=ON"  # finds common libraries e.g. hdf5, libpng, libtiff, zlib, but not GDCM, NIFTI, MINC, etc.
+    "-DITK_USE_SYSTEM_LIBRARIES=ON" # finds common libraries e.g. hdf5, libpng, libtiff, zlib, but not GDCM, NIFTI, MINC, etc.
     # note ITK_USE_SYSTEM_EIGEN, part of ITK_USE_SYSTEM_LIBRARIES,
     # causes "...-itk-5.2.1/include/ITK-5.2/itkSymmetricEigenAnalysis.h:23:31: fatal error: Eigen/Eigenvalues: No such file or directory"
     # when compiling c3d, but maybe an ITK 5.2/eigen version issue:
     "-DITK_USE_SYSTEM_EIGEN=OFF"
-    "-DITK_USE_SYSTEM_GOOGLETEST=OFF"  # ANTs build failure due to https://github.com/ANTsX/ANTs/issues/1489
+    "-DITK_USE_SYSTEM_GOOGLETEST=OFF" # ANTs build failure due to https://github.com/ANTsX/ANTs/issues/1489
     "-DITK_USE_SYSTEM_GDCM=ON"
     "-DITK_USE_SYSTEM_MINC=ON"
     "-DLIBMINC_DIR=${libminc}/lib/cmake"
@@ -79,7 +101,10 @@ stdenv.mkDerivation {
     "-DModule_GenericLabelInterpolator=ON"
   ];
 
-  nativeBuildInputs = [ cmake xz ];
+  nativeBuildInputs = [
+    cmake
+    xz
+  ];
   buildInputs = [
     libX11
     libuuid
@@ -109,9 +134,8 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Insight Segmentation and Registration Toolkit";
-    mainProgram = "itkTestDriver";
     homepage = "https://www.itk.org";
     license = lib.licenses.asl20;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ bcdarwin ];
   };
 }

pkgs/development/python-modules/jaraco-path/default.nix

@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "jaraco-path";
-  version = "3.7.0";
+  version = "3.7.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jaraco";
     repo = "jaraco.path";
     rev = "refs/tags/v${version}";
-    hash = "sha256-P22sA138guKTlOxSxUJ0mU41W16984yYlkZea06juOM=";
+    hash = "sha256-i6FPM4aPfpwLdde1COXZNoKel3sRK8PXnkzy50XvVdw=";
   };
 
   build-system = [ setuptools-scm ];

pkgs/development/python-modules/kde-material-you-colors/default.nix

@@ -0,0 +1,44 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+
+  dbus-python,
+  numpy,
+  pillow,
+  materialyoucolor,
+}:
+
+buildPythonPackage rec {
+  pname = "kde-material-you-colors";
+  version = "1.9.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "luisbocanegra";
+    repo = "kde-material-you-colors";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-hew+aWbfWmqTsxsNx/0Ow0WZAVl0e6OyzDxcKm+nlzQ=";
+  };
+
+  build-system = [ setuptools ];
+  dependencies = [
+    dbus-python
+    numpy
+    pillow
+    materialyoucolor
+  ];
+
+  pythonImportsCheck = [ "kde_material_you_colors" ];
+
+  doCheck = false; # no unittests, and would require KDE desktop environment
+
+  meta = {
+    homepage = "https://store.kde.org/p/2136963";
+    description = "Automatic color scheme generator from your wallpaper for KDE Plasma powered by Material You";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ sigmanificient ];
+    mainProgram = "kde-material-you-colors";
+  };
+}

pkgs/development/python-modules/keyring/default.nix

@@ -2,7 +2,7 @@
   lib,
   stdenv,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   pythonOlder,
   installShellFiles,
   setuptools-scm,
@@ -13,27 +13,31 @@
   jaraco-functools,
   jeepney,
   secretstorage,
+  pyfakefs,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "keyring";
-  version = "25.2.1";
+  version = "25.3.0";
   pyproject = true;
   disabled = pythonOlder "3.8";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-2q/9QtvaJd2vsa1f7EAk5bvP5CRZfKHKRSspmGHknxs=";
+  src = fetchFromGitHub {
+    owner = "jaraco";
+    repo = "keyring";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-P7rm5fkNudUEWdzVPMeGsP9sjBXoCBKojbh5oHhw4y4=";
   };
 
+  build-system = [ setuptools-scm ];
+
   nativeBuildInputs = [
     installShellFiles
-    setuptools-scm
     shtab
   ];
 
-  propagatedBuildInputs =
+  dependencies =
     [
       jaraco-classes
       jaraco-context
@@ -56,7 +60,10 @@ buildPythonPackage rec {
     "keyring.backend"
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pyfakefs
+    pytestCheckHook
+  ];
 
   disabledTestPaths =
     [ "tests/backends/test_macOS.py" ]

pkgs/development/python-modules/keyrings-alt/default.nix

@@ -1,7 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   jaraco-classes,
   jaraco-context,
   keyring,
@@ -12,20 +12,21 @@
 
 buildPythonPackage rec {
   pname = "keyrings-alt";
-  version = "5.0.1";
-  format = "pyproject";
+  version = "5.0.2";
+  pyproject = true;
 
   disabled = pythonOlder "3.8";
 
-  src = fetchPypi {
-    pname = "keyrings.alt";
-    inherit version;
-    hash = "sha256-zTcqHsRGobxakGJKUsiOg7kzAhjjkEemyaSK430RZ0U=";
+  src = fetchFromGitHub {
+    owner = "jaraco";
+    repo = "keyrings.alt";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-m/hIXjri3FZ3rPIymiIBy8cKNOwJoj14WjsOyDtcWmU=";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
+  build-system = [ setuptools-scm ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     jaraco-classes
     jaraco-context
   ];

pkgs/development/python-modules/pyopengltk/default.nix

@@ -0,0 +1,51 @@
+{
+  stdenv,
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  pyopengl,
+  writers,
+  tkinter,
+  pyopengltk,
+}:
+
+buildPythonPackage rec {
+  pname = "pyopengltk";
+  version = "0.0.4";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "jonwright";
+    repo = "pyopengltk";
+    rev = "dbed7b7d01cc5a90fd3e79769259b1dc0894b673"; # there is no tag
+    hash = "sha256-hQoTj8h/L5VZgmq7qgRImLBKZMecrilyir5Ar6ne4S0=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    pyopengl
+    tkinter
+  ];
+
+  doCheck = false;
+
+  pythonImportsCheck = [ "pyopengltk" ];
+
+  passthru.tests = {
+    cube = writers.writePython3 "cube" {
+      libraries = [ pyopengltk ];
+      doCheck = false;
+    } (builtins.readFile "${src}/examples/cube.py");
+  };
+
+  meta = {
+    description = "OpenGL frame for Python/Tkinter via ctypes and pyopengl";
+    homepage = "https://github.com/jonwright/pyopengltk";
+    maintainers = with lib.maintainers; [ sigmanificient ];
+    license = lib.licenses.mit;
+    # not supported yet, see: https://github.com/jonwright/pyopengltk/issues/12
+    broken = stdenv.isDarwin;
+  };
+}

pkgs/development/python-modules/pyquil/default.nix

@@ -25,7 +25,7 @@
 
 buildPythonPackage rec {
   pname = "pyquil";
-  version = "4.14.1";
+  version = "4.14.2";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     owner = "rigetti";
     repo = "pyquil";
     rev = "refs/tags/v${version}";
-    hash = "sha256-PmzzYhnbNdb3nl51awpxftSeW93vo3exHJxdZ+sgwZs=";
+    hash = "sha256-9P2AJPr65jNOHsKuF9qYcF/8s8IIIb9WeNUfAwrnlgE=";
   };
 
   pythonRelaxDeps = [

pkgs/development/python-modules/pytibber/default.nix

@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "pytibber";
-  version = "0.30.0";
+  version = "0.30.1";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "Danielhiversen";
     repo = "pyTibber";
     rev = "refs/tags/${version}";
-    hash = "sha256-9l3hfffj+7oLXfynBXWL4oZB9v7hwt0q5oyxsaJqNpY=";
+    hash = "sha256-bIFWI1pfX2C5H1/lHXiFs6FeaFn5r5uZZERlyAuJp8s=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/qcs-sdk-python/Cargo.lock

@@ -311,9 +311,9 @@ checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce"
 
 [[package]]
 name = "bytemuck"
-version = "1.16.1"
+version = "1.16.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e"
+checksum = "102087e286b4677862ea56cf8fc58bb2cdfa8725c40ffb80fe3a008eb7f2fc83"
 
 [[package]]
 name = "byteorder"
@@ -2674,7 +2674,7 @@ dependencies = [
 
 [[package]]
 name = "qcs"
-version = "0.23.1"
+version = "0.23.2"
 dependencies = [
  "assert2",
  "async-trait",
@@ -2815,7 +2815,7 @@ dependencies = [
 
 [[package]]
 name = "qcs-sdk-python"
-version = "0.19.2"
+version = "0.19.3"
 dependencies = [
  "async-trait",
  "numpy",

pkgs/development/python-modules/qcs-sdk-python/default.nix

@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "qcs-sdk-python";
-  version = "0.19.2";
+  version = "0.19.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "rigetti";
     repo = "qcs-sdk-rust";
     rev = "python/v${version}";
-    hash = "sha256-5PQLFGZmQDpX3IUwQOZhIgSbMhW+PACdH+7ztBHN20A=";
+    hash = "sha256-TyXUkuiYdz6Z6s96DD33QdEuI0ch4hRjUGWahEBpkX4=";
   };
 
   cargoDeps = rustPlatform.importCargoLock {

pkgs/development/python-modules/safety-schemas/default.nix

@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "safety-schemas";
-  version = "0.0.3";
+  version = "0.0.5";
   pyproject = true;
 
   src = fetchPypi {
     pname = "safety_schemas";
     inherit version;
-    hash = "sha256-s5VU+cAQ5PEffJ5Xc+sx0slsFk96WVwnOpiwdND7mPQ=";
+    hash = "sha256-DeX8mlPUQjZEqM6aF6LkdHFKon5X81BhRulaQXEP8QQ=";
   };
 
   build-system = [ hatchling ];

pkgs/development/python-modules/safety/default.nix

@@ -26,7 +26,7 @@
 
 buildPythonPackage rec {
   pname = "safety";
-  version = "3.2.5";
+  version = "3.2.6";
 
   disabled = pythonOlder "3.7";
 
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     owner = "pyupio";
     repo = "safety";
     rev = "refs/tags/${version}";
-    hash = "sha256-vLibQfSwxZF48KL/vfkCOUi2qH5QGMySbdakLQNP+Ug=";
+    hash = "sha256-pC9ruEGT3v5C5EpxIN+uZX+6sVYG4+MpXU0gt9yb+IE=";
   };
 
   postPatch = ''

pkgs/servers/gemini/stargazer/default.nix

@@ -6,25 +6,25 @@
 , scdoc
 , Security
 , nixosTests
+, nix-update-script
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "stargazer";
-  version = "1.2.1";
+  version = "1.3.0";
 
   src = fetchFromSourcehut {
     owner = "~zethra";
     repo = "stargazer";
     rev = version;
-    hash = "sha256-pYize+MGChi1GxCNaQsNlHELtsPUvfFZMPl0Q+pOTp0=";
+    hash = "sha256-Qzg9sCdD29FghHMY6obeVHMD0SRvzi9J6MhEUvcQgbE=";
   };
 
-  cargoHash = "sha256-KmVNRVyKD5q4/vWtnHM4nfiGg+uZvRl+l+Zk5hjWg9E=";
+  cargoHash = "sha256-SQzYEFdSUC1znukot3G3WoOsQGlYP7ICXpoy/w9eO8A=";
 
-  doCheck = false; # Uses external testing framework that requires network
-
-  passthru.tests = {
-    basic-functionality = nixosTests.stargazer;
+  passthru = {
+    tests.basic-functionality = nixosTests.stargazer;
+    updateScript = nix-update-script { };
   };
 
   nativeBuildInputs = [ installShellFiles scdoc ];

pkgs/top-level/aliases.nix

@@ -926,6 +926,7 @@ mapAliases ({
 
   ma1sd = throw "ma1sd was dropped as it is unmaintained"; # Added 2024-07-10
   MACS2 = macs2; # Added 2023-06-12
+  mailctl = throw "mailctl has been renamed to oama"; # Added 2024-08-19
   mailman-rss = throw "The mailman-rss package was dropped since it was unmaintained."; # Added 2024-06-21
   mariadb_104 = throw "mariadb_104 has been removed from nixpkgs, please switch to another version like mariadb_106"; # Added 2023-09-11
   mariadb_1010 = throw "mariadb_1010 has been removed from nixpkgs, please switch to another version like mariadb_1011"; # Added 2023-11-14

pkgs/top-level/all-packages.nix

@@ -2644,13 +2644,6 @@ with pkgs;
 
   mainsail = callPackage ../applications/misc/mainsail { };
 
-  mailctl = (haskellPackages.callPackage ../tools/networking/mailctl {}).overrideScope (final: prev: {
-    # Dependency twain requires an older version of http2, and we cannot mix
-    # versions of transitive dependencies.
-    http2 = final.http2_3_0_3;
-    warp = final.warp_3_3_30;
-  });
-
   mame = libsForQt5.callPackage ../applications/emulators/mame { };
 
   mame-tools = lib.addMetaAttrs {
@@ -5674,7 +5667,7 @@ with pkgs;
         substitutions = {
           crossFile = writeText "cross-file.conf" ''
               [binaries]
-              exe_wrapper = ${lib.escapeShellArg (stdenv.targetPlatform.emulator pkgs)}
+              exe_wrapper = '${lib.escape [ "'" "\\" ] (stdenv.targetPlatform.emulator pkgs)}'
             '';
         };
       }

pkgs/top-level/python-packages.nix

@@ -6628,6 +6628,8 @@ self: super: with self; {
 
   kconfiglib = callPackage ../development/python-modules/kconfiglib { };
 
+  kde-material-you-colors = callPackage ../development/python-modules/kde-material-you-colors { };
+
   keba-kecontact = callPackage ../development/python-modules/keba-kecontact { };
 
   keep = callPackage ../development/python-modules/keep { };
@@ -12008,6 +12010,8 @@ self: super: with self; {
 
   pyopengl-accelerate = callPackage ../development/python-modules/pyopengl-accelerate { };
 
+  pyopengltk = callPackage ../development/python-modules/pyopengltk { };
+
   pyopenssl = callPackage ../development/python-modules/pyopenssl { };
 
   pyopenuv = callPackage ../development/python-modules/pyopenuv { };