Merge master into haskell-updates

lib/modules.nix

@@ -567,15 +567,19 @@ rec {
         zipAttrsWith (n: concatLists)
           (map (module: let subtree = module.${attr}; in
               if !(builtins.isAttrs subtree) then
-                throw ''
-                  You're trying to declare a value of type `${builtins.typeOf subtree}'
-                  rather than an attribute-set for the option
+                throw (if attr == "config" then ''
+                  You're trying to define a value of type `${builtins.typeOf subtree}'
+                  rather than an attribute set for the option
                   `${builtins.concatStringsSep "." prefix}'!
 
                   This usually happens if `${builtins.concatStringsSep "." prefix}' has option
                   definitions inside that are not matched. Please check how to properly define
                   this option by e.g. referring to `man 5 configuration.nix'!
-                ''
+                '' else ''
+                  An option declaration for `${builtins.concatStringsSep "." prefix}' has type
+                  `${builtins.typeOf subtree}' rather than an attribute set.
+                  Did you mean to define this outside of `options'?
+                '')
               else
                 mapAttrs (n: f module) subtree
               ) modules);

lib/strings.nix

@@ -2,7 +2,9 @@
 { lib }:
 let
 
-inherit (builtins) length;
+  inherit (builtins) length;
+
+  inherit (lib.trivial) warnIf;
 
 asciiTable = import ./ascii-table.nix;
 
@@ -207,7 +209,20 @@ rec {
        normalizePath "/a//b///c/"
        => "/a/b/c/"
   */
-  normalizePath = s: (builtins.foldl' (x: y: if y == "/" && hasSuffix "/" x then x else x+y) "" (stringToCharacters s));
+  normalizePath = s:
+    warnIf
+      (isPath s)
+      ''
+        lib.strings.normalizePath: The argument (${toString s}) is a path value, but only strings are supported.
+            Path values are always normalised in Nix, so there's no need to call this function on them.
+            This function also copies the path to the Nix store and returns the store path, the same as "''${path}" will, which may not be what you want.
+            This behavior is deprecated and will throw an error in the future.''
+      (
+        builtins.foldl'
+          (x: y: if y == "/" && hasSuffix "/" x then x else x+y)
+          ""
+          (stringToCharacters s)
+      );
 
   /* Depending on the boolean `cond', return either the given string
      or the empty string. Useful to concatenate against a bigger string.
@@ -240,7 +255,17 @@ rec {
     # Prefix to check for
     pref:
     # Input string
-    str: substring 0 (stringLength pref) str == pref;
+    str:
+    # Before 23.05, paths would be copied to the store before converting them
+    # to strings and comparing. This was surprising and confusing.
+    warnIf
+      (isPath pref)
+      ''
+        lib.strings.hasPrefix: The first argument (${toString pref}) is a path value, but only strings are supported.
+            There is almost certainly a bug in the calling code, since this function always returns `false` in such a case.
+            This function also copies the path to the Nix store, which may not be what you want.
+            This behavior is deprecated and will throw an error in the future.''
+      (substring 0 (stringLength pref) str == pref);
 
   /* Determine whether a string has given suffix.
 
@@ -260,8 +285,20 @@ rec {
     let
       lenContent = stringLength content;
       lenSuffix = stringLength suffix;
-    in lenContent >= lenSuffix &&
-       substring (lenContent - lenSuffix) lenContent content == suffix;
+    in
+    # Before 23.05, paths would be copied to the store before converting them
+    # to strings and comparing. This was surprising and confusing.
+    warnIf
+      (isPath suffix)
+      ''
+        lib.strings.hasSuffix: The first argument (${toString suffix}) is a path value, but only strings are supported.
+            There is almost certainly a bug in the calling code, since this function always returns `false` in such a case.
+            This function also copies the path to the Nix store, which may not be what you want.
+            This behavior is deprecated and will throw an error in the future.''
+      (
+        lenContent >= lenSuffix
+        && substring (lenContent - lenSuffix) lenContent content == suffix
+      );
 
   /* Determine whether a string contains the given infix
 
@@ -278,7 +315,16 @@ rec {
       => false
   */
   hasInfix = infix: content:
-    builtins.match ".*${escapeRegex infix}.*" "${content}" != null;
+    # Before 23.05, paths would be copied to the store before converting them
+    # to strings and comparing. This was surprising and confusing.
+    warnIf
+      (isPath infix)
+      ''
+        lib.strings.hasInfix: The first argument (${toString infix}) is a path value, but only strings are supported.
+            There is almost certainly a bug in the calling code, since this function always returns `false` in such a case.
+            This function also copies the path to the Nix store, which may not be what you want.
+            This behavior is deprecated and will throw an error in the future.''
+      (builtins.match ".*${escapeRegex infix}.*" "${content}" != null);
 
   /* Convert a string to a list of characters (i.e. singleton strings).
      This allows you to, e.g., map a function over each character.  However,
@@ -570,14 +616,23 @@ rec {
     prefix:
     # Input string
     str:
-    let
+    # Before 23.05, paths would be copied to the store before converting them
+    # to strings and comparing. This was surprising and confusing.
+    warnIf
+      (isPath prefix)
+      ''
+        lib.strings.removePrefix: The first argument (${toString prefix}) is a path value, but only strings are supported.
+            There is almost certainly a bug in the calling code, since this function never removes any prefix in such a case.
+            This function also copies the path to the Nix store, which may not be what you want.
+            This behavior is deprecated and will throw an error in the future.''
+    (let
       preLen = stringLength prefix;
       sLen = stringLength str;
     in
-      if hasPrefix prefix str then
+      if substring 0 preLen str == prefix then
         substring preLen (sLen - preLen) str
       else
-        str;
+        str);
 
   /* Return a string without the specified suffix, if the suffix matches.
 
@@ -594,14 +649,23 @@ rec {
     suffix:
     # Input string
     str:
-    let
+    # Before 23.05, paths would be copied to the store before converting them
+    # to strings and comparing. This was surprising and confusing.
+    warnIf
+      (isPath suffix)
+      ''
+        lib.strings.removeSuffix: The first argument (${toString suffix}) is a path value, but only strings are supported.
+            There is almost certainly a bug in the calling code, since this function never removes any suffix in such a case.
+            This function also copies the path to the Nix store, which may not be what you want.
+            This behavior is deprecated and will throw an error in the future.''
+    (let
       sufLen = stringLength suffix;
       sLen = stringLength str;
     in
       if sufLen <= sLen && suffix == substring (sLen - sufLen) sufLen str then
         substring 0 (sLen - sufLen) str
       else
-        str;
+        str);
 
   /* Return true if string v1 denotes a version older than v2.
 

lib/tests/modules.sh

@@ -189,7 +189,7 @@ checkConfigOutput '^"foo"$' config.submodule.foo ./declare-submoduleWith-special
 ## shorthandOnlyDefines config behaves as expected
 checkConfigOutput '^true$' config.submodule.config ./declare-submoduleWith-shorthand.nix ./define-submoduleWith-shorthand.nix
 checkConfigError 'is not of type `boolean' config.submodule.config ./declare-submoduleWith-shorthand.nix ./define-submoduleWith-noshorthand.nix
-checkConfigError "You're trying to declare a value of type \`bool'\n\s*rather than an attribute-set for the option" config.submodule.config ./declare-submoduleWith-noshorthand.nix ./define-submoduleWith-shorthand.nix
+checkConfigError "You're trying to define a value of type \`bool'\n\s*rather than an attribute set for the option" config.submodule.config ./declare-submoduleWith-noshorthand.nix ./define-submoduleWith-shorthand.nix
 checkConfigOutput '^true$' config.submodule.config ./declare-submoduleWith-noshorthand.nix ./define-submoduleWith-noshorthand.nix
 
 ## submoduleWith should merge all modules in one swoop

maintainers/maintainer-list.nix

@@ -13792,12 +13792,6 @@
     github = "ShamrockLee";
     githubId = 44064051;
   };
-  shanemikel = {
-    email = "shanepearlman@pm.me";
-    github = "shanemikel";
-    githubId = 6720672;
-    name = "Shane Pearlman";
-  };
   shanesveller = {
     email = "shane@sveller.dev";
     github = "shanesveller";

nixos/doc/manual/release-notes/rl-2305.section.md

@@ -154,6 +154,8 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - `lib.systems.examples.ghcjs` and consequently `pkgsCross.ghcjs` now use the target triplet `javascript-unknown-ghcjs` instead of `js-unknown-ghcjs`. This has been done to match an [upstream decision](https://gitlab.haskell.org/ghc/ghc/-/commit/6636b670233522f01d002c9b97827d00289dbf5c) to follow Cabal's platform naming more closely. Nixpkgs will also reject `js` as an architecture name.
 
+- The old unsupported version 6.x of the ELK-stack and Elastic beats have been removed. Use OpenSearch instead.
+
 - The `cosmoc` package has been removed. The upstream scripts in `cosmocc` should be used instead.
 
 - Qt 5.12 and 5.14 have been removed, as the corresponding branches have been EOL upstream for a long time. This affected under 10 packages in nixpkgs, largely unmaintained upstream as well, however, out-of-tree package expressions may need to be updated manually.

nixos/modules/services/databases/neo4j.nix

@@ -636,6 +636,6 @@ in {
     };
 
   meta = {
-    maintainers = with lib.maintainers; [ patternspandemic jonringer erictapen ];
+    maintainers = with lib.maintainers; [ patternspandemic jonringer ];
   };
 }

nixos/modules/services/networking/unifi.nix

@@ -194,5 +194,5 @@ in
     (mkRenamedOptionModule [ "services" "unifi" "openPorts" ] [ "services" "unifi" "openFirewall" ])
   ];
 
-  meta.maintainers = with lib.maintainers; [ erictapen pennae ];
+  meta.maintainers = with lib.maintainers; [ pennae ];
 }

nixos/modules/services/web-apps/mediawiki.nix

@@ -46,6 +46,15 @@ let
     done
   '';
 
+  dbAddr = if cfg.database.socket == null then
+    "${cfg.database.host}:${toString cfg.database.port}"
+  else if cfg.database.type == "mysql" then
+    "${cfg.database.host}:${cfg.database.socket}"
+  else if cfg.database.type == "postgres" then
+    "${cfg.database.socket}"
+  else
+    throw "Unsupported database type: ${cfg.database.type} for socket: ${cfg.database.socket}";
+
   mediawikiConfig = pkgs.writeText "LocalSettings.php" ''
     <?php
       # Protect against web entry
@@ -87,7 +96,8 @@ let
 
       ## Database settings
       $wgDBtype = "${cfg.database.type}";
-      $wgDBserver = "${cfg.database.host}:${if cfg.database.socket != null then cfg.database.socket else toString cfg.database.port}";
+      $wgDBserver = "${dbAddr}";
+      $wgDBport = "${toString cfg.database.port}";
       $wgDBname = "${cfg.database.name}";
       $wgDBuser = "${cfg.database.user}";
       ${optionalString (cfg.database.passwordFile != null) "$wgDBpassword = file_get_contents(\"${cfg.database.passwordFile}\");"}
@@ -246,7 +256,8 @@ in
 
         port = mkOption {
           type = types.port;
-          default = 3306;
+          default = if cfg.database.type == "mysql" then 3306 else 5432;
+          defaultText = literalExpression "3306";
           description = lib.mdDoc "Database host port.";
         };
 
@@ -286,14 +297,19 @@ in
 
         socket = mkOption {
           type = types.nullOr types.path;
-          default = if cfg.database.createLocally then "/run/mysqld/mysqld.sock" else null;
+          default = if (cfg.database.type == "mysql" && cfg.database.createLocally) then
+              "/run/mysqld/mysqld.sock"
+            else if (cfg.database.type == "postgres" && cfg.database.createLocally) then
+              "/run/postgresql"
+            else
+              null;
           defaultText = literalExpression "/run/mysqld/mysqld.sock";
           description = lib.mdDoc "Path to the unix socket file to use for authentication.";
         };
 
         createLocally = mkOption {
           type = types.bool;
-          default = cfg.database.type == "mysql";
+          default = cfg.database.type == "mysql" || cfg.database.type == "postgres";
           defaultText = literalExpression "true";
           description = lib.mdDoc ''
             Create the database and database user locally.
@@ -354,8 +370,8 @@ in
   config = mkIf cfg.enable {
 
     assertions = [
-      { assertion = cfg.database.createLocally -> cfg.database.type == "mysql";
-        message = "services.mediawiki.createLocally is currently only supported for database type 'mysql'";
+      { assertion = cfg.database.createLocally -> (cfg.database.type == "mysql" || cfg.database.type == "postgres");
+        message = "services.mediawiki.createLocally is currently only supported for database type 'mysql' and 'postgres'";
       }
       { assertion = cfg.database.createLocally -> cfg.database.user == user;
         message = "services.mediawiki.database.user must be set to ${user} if services.mediawiki.database.createLocally is set true";
@@ -374,15 +390,23 @@ in
       Vector = "${cfg.package}/share/mediawiki/skins/Vector";
     };
 
-    services.mysql = mkIf cfg.database.createLocally {
+    services.mysql = mkIf (cfg.database.type == "mysql" && cfg.database.createLocally) {
       enable = true;
       package = mkDefault pkgs.mariadb;
       ensureDatabases = [ cfg.database.name ];
-      ensureUsers = [
-        { name = cfg.database.user;
-          ensurePermissions = { "${cfg.database.name}.*" = "ALL PRIVILEGES"; };
-        }
-      ];
+      ensureUsers = [{
+        name = cfg.database.user;
+        ensurePermissions = { "${cfg.database.name}.*" = "ALL PRIVILEGES"; };
+      }];
+    };
+
+    services.postgresql = mkIf (cfg.database.type == "postgres" && cfg.database.createLocally) {
+      enable = true;
+      ensureDatabases = [ cfg.database.name ];
+      ensureUsers = [{
+        name = cfg.database.user;
+        ensurePermissions = { "DATABASE \"${cfg.database.name}\"" = "ALL PRIVILEGES"; };
+      }];
     };
 
     services.phpfpm.pools.mediawiki = {
@@ -431,7 +455,8 @@ in
     systemd.services.mediawiki-init = {
       wantedBy = [ "multi-user.target" ];
       before = [ "phpfpm-mediawiki.service" ];
-      after = optional cfg.database.createLocally "mysql.service";
+      after = optional (cfg.database.type == "mysql" && cfg.database.createLocally) "mysql.service"
+              ++ optional (cfg.database.type == "postgres" && cfg.database.createLocally) "postgresql.service";
       script = ''
         if ! test -e "${stateDir}/secret.key"; then
           tr -dc A-Za-z0-9 </dev/urandom 2>/dev/null | head -c 64 > ${stateDir}/secret.key
@@ -442,7 +467,7 @@ in
         ${pkgs.php}/bin/php ${pkg}/share/mediawiki/maintenance/install.php \
           --confpath /tmp \
           --scriptpath / \
-          --dbserver ${cfg.database.host}${optionalString (cfg.database.socket != null) ":${cfg.database.socket}"} \
+          --dbserver "${dbAddr}" \
           --dbport ${toString cfg.database.port} \
           --dbname ${cfg.database.name} \
           ${optionalString (cfg.database.tablePrefix != null) "--dbprefix ${cfg.database.tablePrefix}"} \
@@ -464,7 +489,8 @@ in
       };
     };
 
-    systemd.services.httpd.after = optional (cfg.database.createLocally && cfg.database.type == "mysql") "mysql.service";
+    systemd.services.httpd.after = optional (cfg.database.createLocally && cfg.database.type == "mysql") "mysql.service"
+      ++ optional (cfg.database.createLocally && cfg.database.type == "postgres") "postgresql.service";
 
     users.users.${user} = {
       group = group;

nixos/tests/elk.nix

@@ -268,14 +268,6 @@ let
     '';
   }) { inherit pkgs system; };
 in {
-  ELK-6 = mkElkTest "elk-6-oss" {
-    name = "elk-6-oss";
-    elasticsearch = pkgs.elasticsearch6-oss;
-    logstash      = pkgs.logstash6-oss;
-    kibana        = pkgs.kibana6-oss;
-    journalbeat   = pkgs.journalbeat6;
-    metricbeat    = pkgs.metricbeat6;
-  };
   # We currently only package upstream binaries.
   # Feel free to package an SSPL licensed source-based package!
   # ELK-7 = mkElkTest "elk-7-oss" {
@@ -287,13 +279,6 @@ in {
   #   metricbeat    = pkgs.metricbeat7;
   # };
   unfree = lib.dontRecurseIntoAttrs {
-    ELK-6 = mkElkTest "elk-6" {
-      elasticsearch = pkgs.elasticsearch6;
-      logstash      = pkgs.logstash6;
-      kibana        = pkgs.kibana6;
-      journalbeat   = pkgs.journalbeat6;
-      metricbeat    = pkgs.metricbeat6;
-    };
     ELK-7 = mkElkTest "elk-7" {
       elasticsearch = pkgs.elasticsearch7;
       logstash      = pkgs.logstash7;

nixos/tests/graylog.nix

@@ -8,7 +8,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
 
     services.mongodb.enable = true;
     services.elasticsearch.enable = true;
-    services.elasticsearch.package = pkgs.elasticsearch-oss;
     services.elasticsearch.extraConf = ''
       network.publish_host: 127.0.0.1
       network.bind_host: 127.0.0.1

nixos/tests/mediawiki.nix

@@ -1,28 +1,57 @@
-import ./make-test-python.nix ({ pkgs, lib, ... }: {
-  name = "mediawiki";
-  meta.maintainers = [ lib.maintainers.aanderse ];
+{
+  system ? builtins.currentSystem,
+  config ? {},
+  pkgs ? import ../.. { inherit system config; },
+}:
 
-  nodes.machine =
-    { ... }:
-    { services.mediawiki.enable = true;
-      services.mediawiki.virtualHost.hostName = "localhost";
-      services.mediawiki.virtualHost.adminAddr = "root@example.com";
-      services.mediawiki.passwordFile = pkgs.writeText "password" "correcthorsebatterystaple";
-      services.mediawiki.extensions = {
-        Matomo = pkgs.fetchzip {
-          url = "https://github.com/DaSchTour/matomo-mediawiki-extension/archive/v4.0.1.tar.gz";
-          sha256 = "0g5rd3zp0avwlmqagc59cg9bbkn3r7wx7p6yr80s644mj6dlvs1b";
-        };
-        ParserFunctions = null;
+let
+  shared = {
+    services.mediawiki.enable = true;
+    services.mediawiki.virtualHost.hostName = "localhost";
+    services.mediawiki.virtualHost.adminAddr = "root@example.com";
+    services.mediawiki.passwordFile = pkgs.writeText "password" "correcthorsebatterystaple";
+    services.mediawiki.extensions = {
+      Matomo = pkgs.fetchzip {
+        url = "https://github.com/DaSchTour/matomo-mediawiki-extension/archive/v4.0.1.tar.gz";
+        sha256 = "0g5rd3zp0avwlmqagc59cg9bbkn3r7wx7p6yr80s644mj6dlvs1b";
       };
+      ParserFunctions = null;
     };
+  };
 
-  testScript = ''
-    start_all()
+  testLib = import ../lib/testing-python.nix {
+    inherit system pkgs;
+    extraConfigurations = [ shared ];
+  };
+in
+{
+  mysql = testLib.makeTest {
+    name = "mediawiki-mysql";
+    nodes.machine = {
+      services.mediawiki.database.type = "mysql";
+    };
+    testScript = ''
+      start_all()
 
-    machine.wait_for_unit("phpfpm-mediawiki.service")
+      machine.wait_for_unit("phpfpm-mediawiki.service")
 
-    page = machine.succeed("curl -fL http://localhost/")
-    assert "MediaWiki has been installed" in page
-  '';
-})
+      page = machine.succeed("curl -fL http://localhost/")
+      assert "MediaWiki has been installed" in page
+    '';
+  };
+
+  postgresql = testLib.makeTest {
+    name = "mediawiki-postgres";
+    nodes.machine = {
+      services.mediawiki.database.type = "postgres";
+    };
+    testScript = ''
+      start_all()
+
+      machine.wait_for_unit("phpfpm-mediawiki.service")
+
+      page = machine.succeed("curl -fL http://localhost/")
+      assert "MediaWiki has been installed" in page
+    '';
+  };
+}

nixos/tests/parsedmarc/default.nix

@@ -84,8 +84,6 @@ in
             };
           };
 
-          services.elasticsearch.package = pkgs.elasticsearch-oss;
-
           environment.systemPackages = [
             (sendEmail "dmarc@localhost")
             pkgs.jq
@@ -158,8 +156,6 @@ in
                 };
               };
 
-              services.elasticsearch.package = pkgs.elasticsearch-oss;
-
               environment.systemPackages = [
                 pkgs.jq
               ];

pkgs/applications/audio/proteus/default.nix

@@ -0,0 +1,52 @@
+{ lib, stdenv, fetchFromGitHub, autoPatchelfHook, cmake, pkg-config
+, alsa-lib, freetype, libjack2
+, libX11, libXext, libXcursor, libXinerama, libXrandr, libXrender
+}:
+
+stdenv.mkDerivation rec {
+  pname = "proteus";
+  version = "1.2";
+
+  src = fetchFromGitHub {
+    owner = "GuitarML";
+    repo = "Proteus";
+    rev = "v${version}";
+    fetchSubmodules = true;
+    hash = "sha256-WhJh+Sx64JYxQQ1LXpDUwXeodFU1EZ0TmMhn+6w0hQg=";
+  };
+
+  nativeBuildInputs = [ autoPatchelfHook cmake pkg-config ];
+  buildInputs = [
+    alsa-lib freetype libjack2
+    libX11 libXext libXcursor libXinerama libXrandr libXrender
+  ];
+  # JUCE loads most dependencies at runtime:
+  runtimeDependencies = map lib.getLib buildInputs;
+
+  env.NIX_CFLAGS_COMPILE = toString [
+    # Support JACK output in the standalone application:
+    "-DJUCE_JACK"
+    # Accomodate -flto:
+    "-ffat-lto-objects"
+  ];
+
+  # The default "make install" only installs JUCE, which should not be installed, and does not install proteus.
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/lib
+    cp -rT Proteus_artefacts/*/Standalone $out/bin
+    cp -rT Proteus_artefacts/*/LV2 $out/lib/lv2
+    cp -rT Proteus_artefacts/*/VST3 $out/lib/vst3
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Guitar amp and pedal capture plugin using neural networks";
+    homepage = "https://github.com/GuitarML/Proteus";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ orivej ];
+  };
+}

pkgs/applications/audio/spotify/default.nix

@@ -1,4 +1,4 @@
-{ fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeWrapper, wrapGAppsHook, openssl, freetype
+{ fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeShellWrapper, wrapGAppsHook, openssl, freetype
 , glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss, libpng, libnotify
 , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curlWithGnuTls, zlib, gnome
 , at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon
@@ -13,14 +13,14 @@ let
   # If an update breaks things, one of those might have valuable info:
   # https://aur.archlinux.org/packages/spotify/
   # https://community.spotify.com/t5/Desktop-Linux
-  version = "1.1.84.716.gc5f8b819";
+  version = "1.1.99.878.g1e4ccc6e";
   # To get the latest stable revision:
   # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated'
   # To get general information:
   # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.'
   # More examples of api usage:
   # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py
-  rev = "60";
+  rev = "62";
 
   deps = [
     alsa-lib
@@ -75,7 +75,7 @@ stdenv.mkDerivation {
 
   # fetch from snapcraft instead of the debian repository most repos fetch from.
   # That is a bit more cumbersome. But the debian repository only keeps the last
-  # two versions, while snapcraft should provide versions indefinately:
+  # two versions, while snapcraft should provide versions indefinitely:
   # https://forum.snapcraft.io/t/how-can-a-developer-remove-her-his-app-from-snap-store/512
 
   # This is the next-best thing, since we're not allowed to re-distribute
@@ -83,10 +83,10 @@ stdenv.mkDerivation {
   # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334
   src = fetchurl {
     url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap";
-    sha512 = "1209b956822d8bb661daa2c88616bed403ec26dc22c6b866cecff59235c56112284c2f99aa06352fc0df6fcd15225a6ad60afd3b4ff4d7b948ab83e70ab31a71";
+    sha512 = "339r2q13nnpwi7gjd1axc6z2gycfm9gwz3x9dnqyaqd1g3rw7nk6nfbp6bmpkr68lfq1jfgvqwnimcgs84rsi7nmgsiabv3cz0673wv";
   };
 
-  nativeBuildInputs = [ makeWrapper wrapGAppsHook squashfsTools ];
+  nativeBuildInputs = [ wrapGAppsHook makeShellWrapper squashfsTools ];
 
   dontStrip = true;
   dontPatchELF = true;
@@ -144,13 +144,14 @@ stdenv.mkDerivation {
         --set-rpath $rpath $out/share/spotify/spotify
 
       librarypath="${lib.makeLibraryPath deps}:$libdir"
-      wrapProgram $out/share/spotify/spotify \
+      wrapProgramShell $out/share/spotify/spotify \
         ''${gappsWrapperArgs[@]} \
         ${lib.optionalString (deviceScaleFactor != null) ''
           --add-flags "--force-device-scale-factor=${toString deviceScaleFactor}" \
         ''} \
         --prefix LD_LIBRARY_PATH : "$librarypath" \
-        --prefix PATH : "${gnome.zenity}/bin"
+        --prefix PATH : "${gnome.zenity}/bin" \
+        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"
 
       # fix Icon line in the desktop file (#48062)
       sed -i "s:^Icon=.*:Icon=spotify-client:" "$out/share/spotify/spotify.desktop"

pkgs/applications/audio/spotify/update.sh

@@ -78,6 +78,7 @@ sed --regexp-extended \
 # try to build the updated version
 #
 
+export NIXPKGS_ALLOW_UNFREE=1
 if ! nix-build -A spotify "$nixpkgs"; then
   echo "The updated spotify failed to build."
   exit 1

pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix

@@ -106,6 +106,31 @@ self: let
         };
       });
 
+      jinx = super.jinx.overrideAttrs (old: {
+        dontUnpack = false;
+
+        nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [
+            pkgs.pkg-config
+        ];
+
+        buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.enchant2 ];
+
+        postBuild = ''
+          NIX_CFLAGS_COMPILE="$($PKG_CONFIG --cflags enchant-2) $NIX_CFLAGS_COMPILE"
+          $CC -shared -o jinx-mod.so jinx-mod.c -lenchant-2
+        '';
+
+        postInstall = (old.postInstall or "") + "\n" + ''
+          outd=$out/share/emacs/site-lisp/elpa/jinx-*
+          install -m444 -t $outd jinx-mod.so
+          rm $outd/jinx-mod.c $outd/emacs-module.h
+        '';
+
+        meta = old.meta // {
+          maintainers = [ lib.maintainers.DamienCassou ];
+        };
+      });
+
       plz = super.plz.overrideAttrs (
         old: {
           dontUnpack = false;

pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix

@@ -314,6 +314,33 @@ let
 
         ivy-rtags = fix-rtags super.ivy-rtags;
 
+        jinx = super.jinx.overrideAttrs (old: {
+          nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [
+            pkgs.pkg-config
+          ];
+
+          buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.enchant2 ];
+
+          postBuild = ''
+            pushd working/jinx
+            NIX_CFLAGS_COMPILE="$($PKG_CONFIG --cflags enchant-2) $NIX_CFLAGS_COMPILE"
+            $CC -shared -o jinx-mod.so jinx-mod.c -lenchant-2
+            popd
+          '';
+
+          postInstall = (old.postInstall or "") + "\n" + ''
+            pushd source
+            outd=$(echo $out/share/emacs/site-lisp/elpa/jinx-*)
+            install -m444 --target-directory=$outd jinx-mod.so
+            rm $outd/jinx-mod.c $outd/emacs-module.h
+            popd
+          '';
+
+          meta = old.meta // {
+            maintainers = [ lib.maintainers.DamienCassou ];
+          };
+        });
+
         libgit = super.libgit.overrideAttrs(attrs: {
           nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ [ pkgs.cmake ];
           buildInputs = attrs.buildInputs ++ [ pkgs.libgit2 ];
@@ -410,6 +437,8 @@ let
 
         orgit-forge = buildWithGit super.orgit-forge;
 
+        ox-rss = buildWithGit super.ox-rss;
+
         # upstream issue: missing file header
         mhc = super.mhc.override {
           inherit (self.melpaPackages) calfw;

pkgs/applications/editors/vim/plugins/generated.nix

@@ -809,6 +809,18 @@ final: prev:
     meta.homepage = "https://github.com/vim-scripts/autoload_cscope.vim/";
   };
 
+  autosave-nvim = buildVimPluginFrom2Nix {
+    pname = "autosave.nvim";
+    version = "2022-10-13";
+    src = fetchFromGitHub {
+      owner = "nullishamy";
+      repo = "autosave.nvim";
+      rev = "406a09c1ce679bc6fbde47d6ec61c753632b55f0";
+      sha256 = "0f3rp80hwf6v2kw2hg5jysz9j4946bmwpbk6hxpw89b1vcgny66v";
+    };
+    meta.homepage = "https://github.com/nullishamy/autosave.nvim/";
+  };
+
   awesome-vim-colorschemes = buildVimPluginFrom2Nix {
     pname = "awesome-vim-colorschemes";
     version = "2022-05-04";
@@ -941,6 +953,18 @@ final: prev:
     meta.homepage = "https://github.com/sblumentritt/bitbake.vim/";
   };
 
+  blamer-nvim = buildVimPluginFrom2Nix {
+    pname = "blamer.nvim";
+    version = "2021-11-17";
+    src = fetchFromGitHub {
+      owner = "APZelos";
+      repo = "blamer.nvim";
+      rev = "f4eb22a9013642c411725fdda945ae45f8d93181";
+      sha256 = "1czjagkfjw57f2nvjjgbma1gcy1ylcd68dyfc5ivr2wc6fdw5lks";
+    };
+    meta.homepage = "https://github.com/APZelos/blamer.nvim/";
+  };
+
   blueballs-neovim = buildVimPluginFrom2Nix {
     pname = "blueballs-neovim";
     version = "2021-11-28";

pkgs/applications/editors/vim/plugins/overrides.nix

@@ -121,6 +121,10 @@
 
 self: super: {
 
+  autosave-nvim = super.autosave-nvim.overrideAttrs(old: {
+    dependencies = with super; [ plenary-nvim ];
+  });
+
   barbecue-nvim = super.barbecue-nvim.overrideAttrs (old: {
     dependencies = with self; [ nvim-lspconfig nvim-navic nvim-web-devicons ];
     meta = {
@@ -1354,6 +1358,13 @@ self: super: {
 
   vim-wakatime = super.vim-wakatime.overrideAttrs (old: {
     buildInputs = [ python3 ];
+    patchPhase = ''
+      substituteInPlace plugin/wakatime.vim \
+        --replace 'autocmd BufEnter,VimEnter' \
+                  'autocmd VimEnter' \
+        --replace 'autocmd CursorMoved,CursorMovedI' \
+                  'autocmd CursorMoved,CursorMovedI,BufEnter'
+    '';
   });
 
   vim-xdebug = super.vim-xdebug.overrideAttrs (old: {

pkgs/applications/editors/vim/plugins/vim-plugin-names

@@ -66,6 +66,7 @@ https://github.com/pocco81/auto-save.nvim/,HEAD,
 https://github.com/rmagatti/auto-session/,,
 https://github.com/m4xshen/autoclose.nvim/,HEAD,
 https://github.com/vim-scripts/autoload_cscope.vim/,,
+https://github.com/nullishamy/autosave.nvim/,HEAD,
 https://github.com/rafi/awesome-vim-colorschemes/,,
 https://github.com/ayu-theme/ayu-vim/,,
 https://github.com/taybart/b64.nvim/,HEAD,
@@ -77,6 +78,7 @@ https://github.com/vim-scripts/bats.vim/,,
 https://github.com/rbgrouleff/bclose.vim/,,
 https://github.com/max397574/better-escape.nvim/,,
 https://github.com/sblumentritt/bitbake.vim/,,
+https://github.com/APZelos/blamer.nvim/,HEAD,
 https://github.com/blueballs-theme/blueballs-neovim/,,
 https://github.com/nat-418/boole.nvim/,HEAD,
 https://github.com/turbio/bracey.vim/,,

pkgs/applications/gis/qgis/ltr.nix

@@ -18,6 +18,7 @@ in symlinkJoin rec {
   pythonInputs = qgis-ltr-unwrapped.pythonBuildInputs ++ (extraPythonPackages qgis-ltr-unwrapped.py.pkgs);
 
   postBuild = ''
+    # unpackPhase
 
     buildPythonPath "$pythonInputs"
 

pkgs/applications/gis/qgis/unwrapped-ltr.nix

@@ -73,14 +73,14 @@ let
     six
   ];
 in mkDerivation rec {
-  version = "3.22.16";
+  version = "3.28.5";
   pname = "qgis-ltr-unwrapped";
 
   src = fetchFromGitHub {
     owner = "qgis";
     repo = "QGIS";
     rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
-    hash = "sha256-6UpWVEyh94Oo6eI/dEmDuJHRwpPtkEsksjE90iAUgo8=";
+    hash = "sha256-3fQB0oCIZSVEVMZzmeyvw8/Ew+JjzAFnTIsnsklAayI=";
   };
 
   passthru = {
@@ -157,6 +157,6 @@ in mkDerivation rec {
     homepage = "https://www.qgis.org";
     license = lib.licenses.gpl2Plus;
     platforms = with lib.platforms; linux;
-    maintainers = with lib.maintainers; [ lsix sikmir erictapen willcohen ];
+    maintainers = with lib.maintainers; [ lsix sikmir willcohen ];
   };
 }

pkgs/applications/gis/qgis/unwrapped.nix

@@ -157,6 +157,6 @@ in mkDerivation rec {
     homepage = "https://www.qgis.org";
     license = lib.licenses.gpl2Plus;
     platforms = with lib.platforms; linux;
-    maintainers = with lib.maintainers; [ lsix sikmir erictapen willcohen ];
+    maintainers = with lib.maintainers; [ lsix sikmir willcohen ];
   };
 }

pkgs/applications/misc/josm/default.nix

@@ -3,20 +3,20 @@
 }:
 let
   pname = "josm";
-  version = "18678";
+  version = "18700";
   srcs = {
     jar = fetchurl {
       url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
-      hash = "sha256-p0HjjF4SLPsD/KcAPNyHasuGrDPSQ/2KHjX1R2eywNo=";
+      hash = "sha256-rJw38pOHi+OIjIKgglU0Y2Tlc/b8K9f04ru2IH0CUJ0=";
     };
     macosx = fetchurl {
       url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip";
-      hash = "sha256-YlSFHx37RkdTlQ3/ZAqj+ezv+cSVifsxR7s6S7pDd4o=";
+      hash = "sha256-RTRe2GZz5B9QEYF04PiKtKJkWu0Em5WBqK4dVQVHK0g=";
     };
     pkg = fetchsvn {
       url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";
       rev = version;
-      sha256 = "sha256-Cga17ymUROJb5scpyOlo6JIgQ77yHavI0ciUpZN+jLk=";
+      sha256 = "sha256-/zdOaiyuvSwdVZcnw0ghDj2I+YKpFLc12fjZUMtRtVg=";
     };
   };
 in

pkgs/applications/misc/lutris/default.nix

@@ -44,7 +44,6 @@
 , p7zip
 , xgamma
 , libstrangle
-, wine
 , fluidsynth
 , xorgserver
 , xorg
@@ -64,7 +63,6 @@ let
     p7zip
     xgamma
     libstrangle
-    wine
     fluidsynth
     xorgserver
     xorg.setxkbmap

pkgs/applications/networking/cluster/clusterctl/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "clusterctl";
-  version = "1.4.0";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = "kubernetes-sigs";
     repo = "cluster-api";
     rev = "v${version}";
-    hash = "sha256-K67TpHpA4gCyJbdTKKRGnHzY+gM3wN6GIxxfFW+zyYI=";
+    hash = "sha256-ST/3zoZgeG0P8TwxHEKucZ7DHoD6e6Qx47jv6e+r4Rs=";
   };
 
-  vendorHash = "sha256-b3bvLkBl8I/MJe16fRvjpYX2MbZhuG3loACArtZ5mg0=";
+  vendorHash = "sha256-ZJFpzBeC048RZ6YfjXQPyohCO1WagxXvBBacifkfkjE=";
 
   subPackages = [ "cmd/clusterctl" ];
 

pkgs/applications/networking/cluster/k3s/1_23/chart-versions.nix

@@ -1,10 +0,0 @@
-{
-    traefik-crd  = {
-        url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-20.3.1+up20.3.0.tgz";
-        sha256 = "1775vjldvqvhzdbzanxhbaqbmkih09yb91im651q8bc7z5sb9ckn";
-    };
-    traefik = {
-        url = "https://k3s.io/k3s-charts/assets/traefik/traefik-20.3.1+up20.3.0.tgz";
-        sha256 = "1rj0f0n0vgjcbzfwzhqmsd501i2f6vw145w9plbp8gwdyzmg2nc6";
-    };
-}

pkgs/applications/networking/cluster/k3s/1_23/default.nix

@@ -1,331 +0,0 @@
-{ stdenv
-, lib
-, makeWrapper
-, socat
-, iptables
-, iproute2
-, ipset
-, bridge-utils
-, btrfs-progs
-, conntrack-tools
-, buildGoModule
-, runc
-, rsync
-, kmod
-, libseccomp
-, pkg-config
-, ethtool
-, util-linux
-, fetchFromGitHub
-, fetchurl
-, fetchzip
-, fetchgit
-, zstd
-, yq-go
-, sqlite
-, nixosTests
-, k3s
-, pkgsBuildBuild
-}:
-
-with lib;
-
-# k3s is a kinda weird derivation. One of the main points of k3s is the
-# simplicity of it being one binary that can perform several tasks.
-# However, when you have a good package manager (like nix), that doesn't
-# actually make much of a difference; you don't really care if it's one binary
-# or 10 since with a good package manager, installing and running it is
-# identical.
-# Since upstream k3s packages itself as one large binary with several
-# "personalities" (in the form of subcommands like 'k3s agent' and 'k3s
-# kubectl'), it ends up being easiest to mostly mimic upstream packaging, with
-# some exceptions.
-# K3s also carries patches to some packages (such as containerd and cni
-# plugins), so we intentionally use the k3s versions of those binaries for k3s,
-# even if the upstream version of those binaries exist in nixpkgs already. In
-# the end, that means we have a thick k3s binary that behaves like the upstream
-# one for the most part.
-# However, k3s also bundles several pieces of unpatched software, from the
-# strongswan vpn software, to iptables, to socat, conntrack, busybox, etc.
-# 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.23.16+k3s1";     # k3s git tag
-  k3sCommit = "64b0feeb36c2a26976a364a110f23ebcf971f976"; # k3s git commit at the above version
-  k3sRepoSha256 = "sha256-H6aaYa5OYAaD5hjSi8+RNXiP1zhRZCgKXQA6eU7AWBk=";
-  k3sVendorSha256 = "sha256-+xygljXp27NahsHSgoigMANBQCRwGFYwGHQEwlI9YsQ=";
-
-  # Based on the traefik charts here: https://github.com/k3s-io/k3s/blob/v1.23.16%2Bk3s1/scripts/download#L29-L32
-  # see also https://github.com/k3s-io/k3s/blob/v1.23.16%2Bk3s1/manifests/traefik.yaml#L8-L16
-  # At the time of writing, there are two traefik charts, and that's it
-  charts = import ./chart-versions.nix;
-
-  # taken from ./scripts/version.sh VERSION_ROOT https://github.com/k3s-io/k3s/blob/v1.23.16%2Bk3s1/scripts/version.sh#L54
-  k3sRootVersion = "0.12.1";
-  k3sRootSha256 = "sha256-xCXbarWztnvW2xn3cGa84hie3OevVZeGEDWh+Uf3RBw=";
-
-  # taken from ./scripts/version.sh VERSION_CNIPLUGINS https://github.com/k3s-io/k3s/blob/v1.23.16%2Bk3s1/scripts/version.sh#L47
-  k3sCNIVersion = "1.1.1-k3s1";
-  k3sCNISha256 = "sha256-1Br7s+iMtfiPjM0EcNPuFdSlp9dVPjSG1UGuiPUfq5I=";
-
-  # taken from go.mod, the 'github.com/containerd/containerd' line
-  # run `grep github.com/containerd/containerd go.mod | head -n1 | awk '{print $4}'`
-  # https://github.com/k3s-io/k3s/blob/v1.23.16%2Bk3s1/go.mod#L9
-  containerdVersion = "1.5.16-k3s2-1-22";
-  containerdSha256 = "sha256-PRrp05Jgx368Ox4hTC66lbCInWuex0OtAuCY4l8geqA=";
-
-  # run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag
-  # https://github.com/k3s-io/k3s/blob/v1.23.16%2Bk3s1/go.mod#L19
-  criCtlVersion = "1.22.0-k3s1";
-
-  baseMeta = k3s.meta;
-
-  # https://github.com/k3s-io/k3s/blob/5fb370e53e0014dc96183b8ecb2c25a61e891e76/scripts/build#L19-L40
-  versionldflags = [
-    "-X github.com/rancher/k3s/pkg/version.Version=v${k3sVersion}"
-    "-X github.com/rancher/k3s/pkg/version.GitCommit=${lib.substring 0 8 k3sCommit}"
-    "-X k8s.io/client-go/pkg/version.gitVersion=v${k3sVersion}"
-    "-X k8s.io/client-go/pkg/version.gitCommit=${k3sCommit}"
-    "-X k8s.io/client-go/pkg/version.gitTreeState=clean"
-    "-X k8s.io/client-go/pkg/version.buildDate=1970-01-01T01:01:01Z"
-    "-X k8s.io/component-base/version.gitVersion=v${k3sVersion}"
-    "-X k8s.io/component-base/version.gitCommit=${k3sCommit}"
-    "-X k8s.io/component-base/version.gitTreeState=clean"
-    "-X k8s.io/component-base/version.buildDate=1970-01-01T01:01:01Z"
-    "-X github.com/kubernetes-sigs/cri-tools/pkg/version.Version=v${criCtlVersion}"
-    "-X github.com/containerd/containerd/version.Version=v${containerdVersion}"
-    "-X github.com/containerd/containerd/version.Package=github.com/k3s-io/containerd"
-  ];
-
-  # bundled into the k3s binary
-  traefikChart = fetchurl charts.traefik;
-  traefik-crdChart = fetchurl charts.traefik-crd;
-
-  # so, k3s is a complicated thing to package
-  # This derivation attempts to avoid including any random binaries from the
-  # internet. k3s-root is _mostly_ binaries built to be bundled in k3s (which
-  # we don't care about doing, we can add those as build or runtime
-  # dependencies using a real package manager).
-  # In addition to those binaries, it's also configuration though (right now
-  # mostly strongswan configuration), and k3s does use those files.
-  # As such, we download it in order to grab 'etc' and bundle it into the final
-  # k3s binary.
-  k3sRoot = fetchzip {
-    # Note: marked as apache 2.0 license
-    url = "https://github.com/k3s-io/k3s-root/releases/download/v${k3sRootVersion}/k3s-root-amd64.tar";
-    sha256 = k3sRootSha256;
-    stripRoot = false;
-  };
-  k3sCNIPlugins = buildGoModule rec {
-    pname = "k3s-cni-plugins";
-    version = k3sCNIVersion;
-    vendorSha256 = null;
-
-    subPackages = [ "." ];
-
-    src = fetchFromGitHub {
-      owner = "rancher";
-      repo = "plugins";
-      rev = "v${version}";
-      sha256 = k3sCNISha256;
-    };
-
-    postInstall = ''
-      mv $out/bin/plugins $out/bin/cni
-    '';
-
-    meta = baseMeta // {
-      description = "CNI plugins, as patched by rancher for k3s";
-    };
-  };
-  # Grab this separately from a build because it's used by both stages of the
-  # k3s build.
-  k3sRepo = fetchgit {
-    url = "https://github.com/k3s-io/k3s";
-    rev = "v${k3sVersion}";
-    sha256 = k3sRepoSha256;
-  };
-  # Stage 1 of the k3s build:
-  # Let's talk about how k3s is structured.
-  # One of the ideas of k3s is that there's the single "k3s" binary which can
-  # do everything you need, from running a k3s server, to being a worker node,
-  # to running kubectl.
-  # The way that actually works is that k3s is a single go binary that contains
-  # a bunch of bindata that it unpacks at runtime into directories (either the
-  # user's home directory or /var/lib/rancher if run as root).
-  # This bindata includes both binaries and configuration.
-  # In order to let nixpkgs do all its autostripping/patching/etc, we split this into two derivations.
-  # First, we build all the binaries that get packed into the thick k3s binary
-  # (and output them from one derivation so they'll all be suitably patched up).
-  # Then, we bundle those binaries into our thick k3s binary and use that as
-  # the final single output.
-  # This approach was chosen because it ensures the bundled binaries all are
-  # correctly built to run with nix (we can lean on the existing buildGoModule
-  # stuff), and we can again lean on that tooling for the final k3s binary too.
-  # Other alternatives would be to manually run the
-  # strip/patchelf/remove-references step ourselves in the installPhase of the
-  # derivation when we've built all the binaries, but haven't bundled them in
-  # with generated bindata yet.
-
-  k3sServer = buildGoModule rec {
-    pname = "k3s-server";
-    version = k3sVersion;
-
-    src = k3sRepo;
-    vendorSha256 = k3sVendorSha256;
-
-    nativeBuildInputs = [ pkg-config ];
-    buildInputs = [ libseccomp sqlite.dev ];
-
-    subPackages = [ "cmd/server" ];
-    ldflags = versionldflags;
-
-    tags = [ "libsqlite3" "linux" ];
-
-    # create the multicall symlinks for k3s
-    postInstall = ''
-      mv $out/bin/server $out/bin/k3s
-      pushd $out
-      # taken verbatim from https://github.com/k3s-io/k3s/blob/v1.23.16%2Bk3s1/scripts/build#L123-L131
-      ln -s k3s ./bin/k3s-agent
-      ln -s k3s ./bin/k3s-server
-      ln -s k3s ./bin/k3s-etcd-snapshot
-      ln -s k3s ./bin/k3s-secrets-encrypt
-      ln -s k3s ./bin/k3s-certificate
-      ln -s k3s ./bin/k3s-completion
-      ln -s k3s ./bin/kubectl
-      ln -s k3s ./bin/crictl
-      ln -s k3s ./bin/ctr
-      popd
-    '';
-
-    meta = baseMeta // {
-      description = "The various binaries that get packaged into the final k3s binary";
-    };
-  };
-  k3sContainerd = buildGoModule {
-    pname = "k3s-containerd";
-    version = containerdVersion;
-    src = fetchFromGitHub {
-      owner = "k3s-io";
-      repo = "containerd";
-      rev = "v${containerdVersion}";
-      sha256 = containerdSha256;
-    };
-    vendorSha256 = null;
-    buildInputs = [ btrfs-progs ];
-    subPackages = [ "cmd/containerd" "cmd/containerd-shim-runc-v2" ];
-    ldflags = versionldflags;
-  };
-in
-buildGoModule rec {
-  pname = "k3s";
-  version = k3sVersion;
-
-  src = k3sRepo;
-  vendorSha256 = k3sVendorSha256;
-
-  postPatch = ''
-    # Nix prefers dynamically linked binaries over static binary.
-
-    substituteInPlace scripts/package-cli \
-      --replace '"$LDFLAGS $STATIC" -o' \
-                '"$LDFLAGS" -o' \
-      --replace "STATIC=\"-extldflags \'-static\'\"" \
-                ""
-
-    # Upstream codegen fails with trimpath set. Removes "trimpath" for 'go generate':
-
-    substituteInPlace scripts/package-cli \
-      --replace '"''${GO}" generate' \
-                'GOFLAGS="" \
-                 GOOS="${pkgsBuildBuild.go.GOOS}" \
-                 GOARCH="${pkgsBuildBuild.go.GOARCH}" \
-                 CC="${pkgsBuildBuild.stdenv.cc}/bin/cc" \
-                 "''${GO}" generate'
-  '';
-
-  # Important utilities used by the kubelet, see
-  # https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-237202494
-  # Note the list in that issue is stale and some aren't relevant for k3s.
-  k3sRuntimeDeps = [
-    kmod
-    socat
-    iptables
-    iproute2
-    ipset
-    bridge-utils
-    ethtool
-    util-linux # kubelet wants 'nsenter' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388
-    conntrack-tools
-  ];
-
-  buildInputs = k3sRuntimeDeps;
-
-  nativeBuildInputs = [
-    makeWrapper
-    rsync
-    yq-go
-    zstd
-  ];
-
-  # embedded in the final k3s cli
-  propagatedBuildInputs = [
-    k3sCNIPlugins
-    k3sContainerd
-    k3sServer
-    runc
-  ];
-
-  # We override most of buildPhase due to peculiarities in k3s's build.
-  # Specifically, it has a 'go generate' which runs part of the package. See
-  # this comment:
-  # https://github.com/NixOS/nixpkgs/pull/158089#discussion_r799965694
-  # So, why do we use buildGoModule at all? For the `vendorSha256` / `go mod download` stuff primarily.
-  buildPhase = ''
-    patchShebangs ./scripts/package-cli ./scripts/download ./scripts/build-upload
-
-    # copy needed 'go generate' inputs into place
-    mkdir -p ./bin/aux
-    rsync -a --no-perms ${k3sServer}/bin/ ./bin/
-    ln -vsf ${runc}/bin/runc ./bin/runc
-    ln -vsf ${k3sCNIPlugins}/bin/cni ./bin/cni
-    ln -vsf ${k3sContainerd}/bin/* ./bin/
-    rsync -a --no-perms --chmod u=rwX ${k3sRoot}/etc/ ./etc/
-    mkdir -p ./build/static/charts
-
-    cp ${traefikChart} ./build/static/charts
-    cp ${traefik-crdChart} ./build/static/charts
-
-    export ARCH=$GOARCH
-    export DRONE_TAG="v${k3sVersion}"
-    export DRONE_COMMIT="${k3sCommit}"
-    # use ./scripts/package-cli to run 'go generate' + 'go build'
-
-    ./scripts/package-cli
-    mkdir -p $out/bin
-  '';
-
-  # Otherwise it depends on 'getGoDirs', which is normally set in buildPhase
-  doCheck = false;
-
-  installPhase = ''
-    # wildcard to match the arm64 build too
-    install -m 0755 dist/artifacts/k3s* -D $out/bin/k3s
-    wrapProgram $out/bin/k3s \
-      --prefix PATH : ${lib.makeBinPath k3sRuntimeDeps} \
-      --prefix PATH : "$out/bin"
-  '';
-
-  doInstallCheck = true;
-  installCheckPhase = ''
-    $out/bin/k3s --version | grep -F "v${k3sVersion}" >/dev/null
-  '';
-
-  # Fix-Me: Needs to be adapted specifically for 1.23
-  # passthru.updateScript = ./update.sh;
-
-  passthru.tests = k3s.passthru.mkTests k3sVersion;
-
-  meta = baseMeta;
-}

pkgs/applications/networking/cluster/terraform-providers/providers.json

@@ -210,13 +210,13 @@
     "vendorHash": null
   },
   "cloudamqp": {
-    "hash": "sha256-/KttKu5KDmjFhJ7Z8vVlLJjtgNQOa93Wjv2r65DZjjk=",
+    "hash": "sha256-sXt0q6eKWk1BRm0GDsXKl/Rr3mro7FZkQcSIDan1df4=",
     "homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp",
     "owner": "cloudamqp",
     "repo": "terraform-provider-cloudamqp",
-    "rev": "v1.24.2",
+    "rev": "v1.25.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-V5nI7B45VJb7j7AoPrKQknJbVW5C9oyDs9q2u8LXD+M="
+    "vendorHash": "sha256-w7Rsr3UgijW/3RMKzhMyWCvn5b1R1oqRs87/ZPO7jHs="
   },
   "cloudflare": {
     "hash": "sha256-jf2NAhiavSWsKTRIJF8Ypm7tobzvTlESKEkDRre4ZVo=",
@@ -228,11 +228,11 @@
     "vendorHash": "sha256-9YmvaKPZVu+Fi0zlmJbKcU2iw2WUdzZJzgWPfkI1C24="
   },
   "cloudfoundry": {
-    "hash": "sha256-/2MUyn5+lpIp/UeT/7hfwLKF/mXTgtlJSs/B7lzXFys=",
+    "hash": "sha256-MKhsUGuDpKfYFf9Vk0uVrP/Z4hnQyO+2WiqWXO9EAC0=",
     "homepage": "https://registry.terraform.io/providers/cloudfoundry-community/cloudfoundry",
     "owner": "cloudfoundry-community",
     "repo": "terraform-provider-cloudfoundry",
-    "rev": "v0.50.6",
+    "rev": "v0.50.7",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-nBp/0HhflaoDzdHY6t42/gq3x6092ERIlNKv8ggahKE="
   },
@@ -420,11 +420,11 @@
     "vendorHash": "sha256-uWTY8cFztXFrQQ7GW6/R+x9M6vHmsb934ldq+oeW5vk="
   },
   "github": {
-    "hash": "sha256-5HOGOISVozkwJU1/CRpzBOqChWEG3TTNrE5tssgWtH8=",
+    "hash": "sha256-QsytXQ1bf9/OI4+XyZ+lBIuwTwAbdSOdquH1oyp6rOE=",
     "homepage": "https://registry.terraform.io/providers/integrations/github",
     "owner": "integrations",
     "repo": "terraform-provider-github",
-    "rev": "v5.18.3",
+    "rev": "v5.19.0",
     "spdx": "MIT",
     "vendorHash": null
   },
@@ -973,13 +973,13 @@
     "vendorHash": null
   },
   "scaleway": {
-    "hash": "sha256-Ru3jcpnZR3guA3kGxO3iS/ZADtekTOy48kPFpv84wp8=",
+    "hash": "sha256-cHleY4quCLquw4XH0TmvQ+TO0XP+ikclCvd0LASgC2w=",
     "homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
     "owner": "scaleway",
     "repo": "terraform-provider-scaleway",
-    "rev": "v2.14.1",
+    "rev": "v2.15.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-7uatC3EI9IEgGEAaYWUNzPStGqtf+0vp8Liuru9NMZI="
+    "vendorHash": "sha256-BIXxAGvF4+MjfU5X9/wNLUgzcVkiuz60EGXU/mNyqd8="
   },
   "secret": {
     "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=",
@@ -1036,11 +1036,11 @@
     "vendorHash": null
   },
   "snowflake": {
-    "hash": "sha256-rNKb1jmpVmId2ftuQ/+cCYyRNGmdsQj5UswRrVxlMe0=",
+    "hash": "sha256-IAS0IJwWBmZi0x32ZMWFRyiiPZrnL6z1SGQ3AxuFAd8=",
     "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake",
     "owner": "Snowflake-Labs",
     "repo": "terraform-provider-snowflake",
-    "rev": "v0.60.0",
+    "rev": "v0.61.0",
     "spdx": "MIT",
     "vendorHash": "sha256-INAtZefgxjNpf/PWGLn8SS2PxKu3SBhY+06cEnr9V3g="
   },
@@ -1245,11 +1245,11 @@
     "vendorHash": "sha256-guUjkk7oW+Gvu015LUAxGqUwZF4H+4xmmOaMqKixZaI="
   },
   "vultr": {
-    "hash": "sha256-5pI/jLG8UdMxgubvp5SJDW49C6iHKXOtlnr3EuzwtsQ=",
+    "hash": "sha256-fEeKvV2t38gD5SLYAgEOJJSPjTcIhCtIYmOYMFiwcYg=",
     "homepage": "https://registry.terraform.io/providers/vultr/vultr",
     "owner": "vultr",
     "repo": "terraform-provider-vultr",
-    "rev": "v2.12.1",
+    "rev": "v2.13.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

pkgs/applications/networking/instant-messengers/discord/default.nix

@@ -49,7 +49,7 @@ let
     downloadPage = "https://discordapp.com/download";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.unfree;
-    maintainers = with maintainers; [ MP2E devins2518 artturin infinidoge ];
+    maintainers = with maintainers; [ MP2E artturin infinidoge ];
     platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
   };
   package =

pkgs/applications/networking/instant-messengers/signal-cli/default.nix

@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/AsamK/signal-cli";
     description = "Command-line and dbus interface for communicating with the Signal messaging service";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ ivan erictapen ];
+    maintainers = with maintainers; [ ivan ];
     platforms = platforms.all;
   };
 }

pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix

@@ -1,6 +1,7 @@
 { lib
 , fetchFromGitHub
 , fetchpatch
+, fetchurl
 , callPackage
 , pkg-config
 , cmake
@@ -70,10 +71,17 @@ let
       cxxStandard = "20";
     };
   };
+  glibmm = glibmm_2_68.overrideAttrs (_: {
+    version = "2.76.0";
+    src = fetchurl {
+      url = "mirror://gnome/sources/glibmm/2.76/glibmm-2.76.0.tar.xz";
+      sha256 = "sha256-hjfYDOq9lP3dbkiXCggqJkVY1KuCaE4V/8h+fvNGKrI=";
+    };
+  });
 in
 stdenv.mkDerivation rec {
   pname = "telegram-desktop";
-  version = "4.6.5";
+  version = "4.7.1";
   # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
 
   # Telegram-Desktop with submodules
@@ -82,7 +90,7 @@ stdenv.mkDerivation rec {
     repo = "tdesktop";
     rev = "v${version}";
     fetchSubmodules = true;
-    sha256 = "0c65ry82ffmh1qzc2lnsyjs78r9jllv62p9vglpz0ikg86zf36sk";
+    sha256 = "1qv8029xzp2j1j58b1lkw3q53cwaaazvp2la80mfbjv348c29iyk";
   };
 
   patches = [
@@ -140,7 +148,7 @@ stdenv.mkDerivation rec {
     range-v3
     tl-expected
     hunspell
-    glibmm_2_68
+    glibmm
     webkitgtk_4_1
     jemalloc
     rnnoise

pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix

@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation {
   pname = "tg_owt";
-  version = "unstable-2023-01-05";
+  version = "unstable-2023-03-14";
 
   src = fetchFromGitHub {
     owner = "desktop-app";
     repo = "tg_owt";
-    rev = "5098730b9eb6173f0b52068fe2555b7c1015123a";
-    sha256 = "0dnh0l9qb9q43cvm4wfgmgqp48grqqz9fb7f48nvys1b6pzhh3pk";
+    rev = "1a18da2ed4d5ce134e984d1586b915738e0da257";
+    sha256 = "18srnl688ng8grfpmgcjpdyr4cw87yjdvyw94b2jjq5jmnq9n3a3";
     fetchSubmodules = true;
   };
 

pkgs/applications/networking/mailreaders/meli/default.nix

@@ -53,7 +53,7 @@ rustPlatform.buildRustPackage rec {
     description = "Experimental terminal mail client aiming for configurability and extensibility with sane defaults";
     homepage = "https://meli.delivery";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ _0x4A6F matthiasbeyer erictapen ];
+    maintainers = with maintainers; [ _0x4A6F matthiasbeyer ];
     platforms = platforms.linux;
   };
 }

pkgs/applications/networking/sync/celeste/default.nix

@@ -29,16 +29,16 @@ let
   };
 in rustPlatform.buildRustPackage rec {
   pname = "celeste";
-  version = "0.4.6";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "hwittenborn";
     repo = "celeste";
     rev = "v${version}";
-    hash = "sha256-VEyQlycpqsGKqtV/QvqBfVHqQhl/H6HsWPRDBtQO3qM=";
+    hash = "sha256-pFtyfKGPlwum/twGXi/e82BjINy6/MMvvmVfrwWHTQg=";
   };
 
-  cargoHash = "sha256-fqt0XklJJAXi2jO7eo0tIwRo2Y3oM56qYwoaelKY8iU=";
+  cargoHash = "sha256-wcgu4KApkn68Tpk3PQ9Tkxif++/8CmS4f8AOOpCA/X8=";
 
   patches = [
     (substituteAll {

pkgs/applications/office/wpsoffice/default.nix

@@ -101,6 +101,7 @@ stdenv.mkDerivation rec {
     description = "Office suite, formerly Kingsoft Office";
     homepage = "https://www.wps.com";
     platforms = [ "x86_64-linux" ];
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     hydraPlatforms = [ ];
     license = licenses.unfreeRedistributable;
     maintainers = with maintainers; [ mlatus th0rgal rewine ];

pkgs/applications/science/electronics/kicad/base.nix

@@ -20,9 +20,7 @@
 , pcre
 , libpthreadstubs
 , libXdmcp
-, lndir
 , unixODBC
-, fetchpatch
 
 , util-linux
 , libselinux
@@ -48,7 +46,6 @@
 , baseName
 , kicadSrc
 , kicadVersion
-, withOCC
 , withNgspice
 , withScripting
 , withI18n
@@ -72,19 +69,6 @@ stdenv.mkDerivation rec {
   patches = [
     # upstream issue 12941 (attempted to upstream, but appreciably unacceptable)
     ./writable.patch
-  ]
-  ++ optionals (stable) # the 2 wxGTK ones should in the next stable point release
-  [
-    (fetchpatch { # for wxGTK 3.2.2.1's .1 field
-      name = "support wxWidgets subrelease field";
-      url = "https://gitlab.com/kicad/code/kicad/-/commit/b536580119c59fde78e38d8d6388f2540ecb6cf9.diff";
-      hash = "sha256-F+J5oZO0BsT1VWKpx0KGA7ecn5/PBgCw8uiScihM+54=";
-    })
-    (fetchpatch { # for wxGTK 3.2.2.1's .1 field, but for wxPython
-      name = "relax wxPython check to just major.minor";
-      url = "https://gitlab.com/kicad/code/kicad/-/commit/1e8cc6855d6a8fc1f9dfc933224c3a10fb759f9c.diff";
-      hash = "sha256-CGNgxZ7QiVLkaauNl7Pmcl152lwyDZqA/HSyFdOswwU=";
-    })
   ];
 
   # tagged releases don't have "unknown"
@@ -97,40 +81,42 @@ stdenv.mkDerivation rec {
 
   makeFlags = optionals (debug) [ "CFLAGS+=-Og" "CFLAGS+=-ggdb" ];
 
+  # some ngspice tests attempt to write to $HOME/.cache/
+  XDG_CACHE_HOME = "$TMP";
+  # failing tests still attempt to create $HOME though
+
   cmakeFlags = [
-    # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
-    "-DCMAKE_SKIP_BUILD_RPATH=ON"
     "-DKICAD_USE_EGL=ON"
-    "-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;qa_eeschema'"  # upstream issue 12491
+    "-DOCC_INCLUDE_DIR=${opencascade-occt}/include/opencascade"
   ]
-  ++ optionals (withScripting) [
-    "-DKICAD_SCRIPTING_WXPYTHON=ON"
+  ++ optionals (stable) [
+    # https://gitlab.com/kicad/code/kicad/-/issues/12491
+    # should be resolved in the next release
+    "-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;qa_eeschema'"
   ]
+  ++ optionals (!stable) [ # workaround for https://gitlab.com/kicad/code/kicad/-/issues/14346
+    "-DPYTHON_SITE_PACKAGE_PATH=${placeholder "out"}/${python.sitePackages}/"
+  ]
+  ++ optional (stable && !withNgspice) "-DKICAD_SPICE=OFF"
   ++ optionals (!withScripting) [
     "-DKICAD_SCRIPTING_WXPYTHON=OFF"
   ]
-  ++ optional (!withNgspice) "-DKICAD_SPICE=OFF"
-  ++ optional (!withOCC) "-DKICAD_USE_OCC=OFF"
-  ++ optionals (withOCC) [
-    "-DKICAD_USE_OCC=ON"
-    "-DOCC_INCLUDE_DIR=${opencascade-occt}/include/opencascade"
+  ++ optionals (withI18n) [
+    "-DKICAD_BUILD_I18N=ON"
+  ]
+  ++ optionals (!doInstallCheck) [
+    "-DKICAD_BUILD_QA_TESTS=OFF"
   ]
   ++ optionals (debug) [
     "-DCMAKE_BUILD_TYPE=Debug"
     "-DKICAD_STDLIB_DEBUG=ON"
     "-DKICAD_USE_VALGRIND=ON"
   ]
-  ++ optionals (!doInstallCheck) [
-    "-DKICAD_BUILD_QA_TESTS=OFF"
-  ]
   ++ optionals (sanitizeAddress) [
     "-DKICAD_SANITIZE_ADDRESS=ON"
   ]
   ++ optionals (sanitizeThreads) [
     "-DKICAD_SANITIZE_THREADS=ON"
-  ]
-  ++ optionals (withI18n) [
-    "-DKICAD_BUILD_I18N=ON"
   ];
 
   nativeBuildInputs = [
@@ -138,7 +124,6 @@ stdenv.mkDerivation rec {
     doxygen
     graphviz
     pkg-config
-    lndir
   ]
   # wanted by configuration on linux, doesn't seem to affect performance
   # no effect on closure size
@@ -177,10 +162,10 @@ stdenv.mkDerivation rec {
     python
     unixODBC
     libdeflate
+    opencascade-occt
   ]
   ++ optional (withScripting) wxPython
   ++ optional (withNgspice) libngspice
-  ++ optional (withOCC) opencascade-occt
   ++ optional (debug) valgrind;
 
   # debug builds fail all but the python test

pkgs/applications/science/electronics/kicad/default.nix

@@ -14,7 +14,6 @@
 
 , pname ? "kicad"
 , stable ? true
-, withOCC ? true
 , withNgspice ? !stdenv.isDarwin
 , libngspice
 , withScripting ? true
@@ -117,7 +116,7 @@ stdenv.mkDerivation rec {
     inherit stable baseName;
     inherit kicadSrc kicadVersion;
     inherit wxGTK python wxPython;
-    inherit withOCC withNgspice withScripting withI18n;
+    inherit withNgspice withScripting withI18n;
     inherit debug sanitizeAddress sanitizeThreads;
   };
 
@@ -131,7 +130,7 @@ stdenv.mkDerivation rec {
   dontFixup = true;
 
   pythonPath = optionals (withScripting)
-    [ wxPython python.pkgs.six ];
+    [ wxPython python.pkgs.six python.pkgs.requests ];
 
   nativeBuildInputs = [ makeWrapper ]
     ++ optionals (withScripting)

pkgs/applications/science/electronics/kicad/versions.nix

@@ -3,45 +3,45 @@
 {
   "kicad" = {
     kicadVersion = {
-      version =			"7.0.0";
+      version =			"7.0.1";
       src = {
-        rev =			"da2b9df05c3ccd5ec104cf8cd8ded34f5dd25216";
-        sha256 =		"1zgpj1rvf97qv36hg4dja46pbzyixlh2g04wlh7cizcrs16b9mzw";
+        rev =			"3b83917a115be1ce2f33a73039f59f8784b5c2e7";
+        sha256 =		"021safxvyq9qzs08jy3jvpazmhvix4kyl05s9y9hwmyzdmdl2smn";
       };
     };
     libVersion = {
-      version =			"7.0.0";
+      version =			"7.0.1";
       libSources = {
-        symbols.rev =		"08a25991d07924b263cbf87c6e513feac2b2169f";
-        symbols.sha256 =	"1r87xr1453dpfglkg1m4p5d7kcv9gxls1anwk3vp2yppnwz24ydm";
+        symbols.rev =		"adfe3c06b5750d81580ed44e669b578f49c205eb";
+        symbols.sha256 =	"14c5gci13m30xv0cmic5jxsmfx9lq3fnd8hyq3mmgkrw7443zy30";
         templates.rev =		"66d76556d9e81f8a5be74457686d211c666ed200";
         templates.sha256 =	"02i279269mhq7wjhb1yqk90820ncssxl9n7b20qr2r4fmm7jpvxv";
-        footprints.rev =	"a0388d07e4a37e8db13a716efb3ad4750c839f9c";
-        footprints.sha256 =	"1akhifnjm8jvqsvscn2rr1wpzrls73bpdc6sk40355r1in2djmry";
-        packages3d.rev =	"bbee2295519bcf469d97f5e06bcf7175cddd2037";
-        packages3d.sha256 =	"1qw5xm0wbhv6gqvd8mn0jp4abjbizrkx79r6y8f6911mkzi47r6n";
+        footprints.rev =	"1cf5a1d979cffebd62464c1bb0d7b09c5ee3b8c3";
+        footprints.sha256 =	"0k0z40wmaq665hjxb6kp1yl3v7clxz49r6ki0chyphsxv1cnixmy";
+        packages3d.rev =	"e54b5b6368d03f396098448bcce37f2e432dac33";
+        packages3d.sha256 =	"0nzi7ijfb3rjm98kaa9va2mkh0nfzpq4vfhxkq8j18qhx24h5c8v";
       };
     };
   };
   "kicad-unstable" = {
     kicadVersion = {
-      version =			"2023-02-14";
+      version =			"2023-03-29";
       src = {
-        rev =			"29c4482bc898f627cebcd5f64e063e8a813a5445";
-        sha256 =		"1hs1p79skmrn2k7qrpnkynzkk2g8ry20lqivzfqg87c56rd1522y";
+        rev =			"d5bc223ff2cd1fbf4e923e23b5bb442bb54faa95";
+        sha256 =		"0pbzmv9vh4bzhsxj46gjkgh7kk6a0v8gijvkmb56fy5i8xv2ixkn";
       };
     };
     libVersion = {
-      version =			"2023-02-14";
+      version =			"2023-03-29";
       libSources = {
-        symbols.rev =		"3ad8b98287ddf528ce8ff07bbe70aed85cb4410a";
-        symbols.sha256 =	"1p0wa3bhw2qgdvb5vzwvrbhkb6sqpc93d754rbcs2xh79d75l9nn";
+        symbols.rev =		"36fc1c88921bf32ebf667e027dfe63cca649fd95";
+        symbols.sha256 =	"177mqvjf3knldnl7pf1abv4pmlgi5cg02ggfwbc655jq4x6x8fkz";
         templates.rev =		"867eef383a0f61015cb69677d5c632d78a2ea01a";
         templates.sha256 =	"1qi20mrsfn4fxmr1fyphmil2i9p2nzmwk5rlfchc5aq2194nj3lq";
-        footprints.rev =	"a168dd18ea63c2df948c2de3026dc19730cb70cf";
-        footprints.sha256 =	"0y3cl9fcyi8z4yrn0kfgfy28gn9ngrdvnpgbpwykbbp8fpx401nk";
-        packages3d.rev =	"a0919e5e805157bccd65af313806de3833c1673e";
-        packages3d.sha256 =	"1yizw9g3skz7i9x9iwbnn3gk3lnh10krf6xg32plb2plxfynz3cw";
+        footprints.rev =	"dc4574eb65136d95a7775d09412d5159f8d7832c";
+        footprints.sha256 =	"1iz4wyiysdii378c3pjgkgwh1cssxbh5jkbhvj7rmi2vmgngl6nc";
+        packages3d.rev =	"e54b5b6368d03f396098448bcce37f2e432dac33";
+        packages3d.sha256 =	"0nzi7ijfb3rjm98kaa9va2mkh0nfzpq4vfhxkq8j18qhx24h5c8v";
       };
     };
   };

pkgs/applications/version-management/gh/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "gh";
-  version = "2.25.1";
+  version = "2.26.0";
 
   src = fetchFromGitHub {
     owner = "cli";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-CE3Ds9z5CB49Hb9IVuDKwRjGwuw+0d5zBpw2IVsO7Tc=";
+    hash = "sha256-PsZSlLI6ZcHsKWIwETJKPdNWin4YySGNpgH2Yc7rdF8=";
   };
 
-  vendorHash = "sha256-nn2DzjcXHiuSaiEuWNZTAZ3+OKrEpRzUPzqmH+gZ9sY=";
+  vendorHash = "sha256-+8/cA0UxyVu7nyLhHYBWmn8Vs0O/EYepqTAOVU4gwt4=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/applications/version-management/git-gone/default.nix

@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "git-gone";
-  version = "0.4.3";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
-    owner = "lunaryorn";
+    owner = "swsnr";
     repo = "git-gone";
     rev = "v${version}";
-    sha256 = "sha256-pHtFLJGZYlxvQxqG/LWoWeQDxa8i3ws0olAtuoyHXTM=";
+    hash = "sha256-bb7xeLxo/qk2yKctaX1JXzru1+tGTt8DmDVH6ZaARkU=";
   };
 
-  cargoSha256 = "sha256-BfUR/9WBgyUlKZ80qtqX6+AK7hRBCCsEG/IWjbcDU3c=";
+  cargoHash = "sha256-tngsqAnQ2Um0UCSqBvrnpbDygF6CvL2fi0o9MVY0f4g=";
 
   nativeBuildInputs = [ installShellFiles ];
 
@@ -29,8 +29,8 @@ rustPlatform.buildRustPackage rec {
 
   meta = with lib; {
     description = "Cleanup stale Git branches of merge requests";
-    homepage = "https://github.com/lunaryorn/git-gone";
-    changelog = "https://github.com/lunaryorn/git-gone/raw/v${version}/CHANGELOG.md";
+    homepage = "https://github.com/swsnr/git-gone";
+    changelog = "https://github.com/swsnr/git-gone/raw/v${version}/CHANGELOG.md";
     license = licenses.asl20;
     maintainers = [ maintainers.marsam ];
   };

pkgs/applications/virtualization/nvidia-container-runtime/default.nix

@@ -1,71 +0,0 @@
-{ lib
-, glibc
-, fetchFromGitHub
-, makeWrapper
-, buildGoPackage
-, linkFarm
-, writeShellScript
-, containerRuntimePath
-, configTemplate
-}:
-let
-  isolatedContainerRuntimePath = linkFarm "isolated_container_runtime_path" [
-    {
-      name = "runc";
-      path = containerRuntimePath;
-    }
-  ];
-  warnIfXdgConfigHomeIsSet = writeShellScript "warn_if_xdg_config_home_is_set" ''
-    set -eo pipefail
-
-    if [ -n "$XDG_CONFIG_HOME" ]; then
-      echo >&2 "$(tput setaf 3)warning: \$XDG_CONFIG_HOME=$XDG_CONFIG_HOME$(tput sgr 0)"
-    fi
-  '';
-in
-buildGoPackage rec {
-  pname = "nvidia-container-runtime";
-  version = "3.5.0";
-
-  src = fetchFromGitHub {
-    owner = "NVIDIA";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-+LZjsN/tKqsPJamoI8xo9LFv14c3e9vVlSP4NJhElcs=";
-  };
-
-  goPackagePath = "github.com/nvidia/nvidia-container-runtime";
-  ldflags = [ "-s" "-w" ];
-  nativeBuildInputs = [ makeWrapper ];
-
-  postInstall = ''
-    mkdir -p $out/etc/nvidia-container-runtime
-
-    # nvidia-container-runtime invokes docker-runc or runc if that isn't
-    # available on PATH.
-    #
-    # Also set XDG_CONFIG_HOME if it isn't already to allow overriding
-    # configuration. This in turn allows users to have the nvidia container
-    # runtime enabled for any number of higher level runtimes like docker and
-    # podman, i.e., there's no need to have mutually exclusivity on what high
-    # level runtime can enable the nvidia runtime because each high level
-    # runtime has its own config.toml file.
-    wrapProgram $out/bin/nvidia-container-runtime \
-      --run "${warnIfXdgConfigHomeIsSet}" \
-      --prefix PATH : ${isolatedContainerRuntimePath} \
-      --set-default XDG_CONFIG_HOME $out/etc
-
-    cp ${configTemplate} $out/etc/nvidia-container-runtime/config.toml
-
-    substituteInPlace $out/etc/nvidia-container-runtime/config.toml \
-      --subst-var-by glibcbin ${lib.getBin glibc}
-  '';
-
-  meta = with lib; {
-    homepage = "https://github.com/NVIDIA/nvidia-container-runtime";
-    description = "NVIDIA container runtime";
-    license = licenses.asl20;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ cpcloud ];
-  };
-}

pkgs/applications/virtualization/nvidia-container-toolkit/default.nix

@@ -1,35 +1,83 @@
 { lib
-, fetchFromGitHub
-, buildGoModule
+, glibc
+, fetchFromGitLab
 , makeWrapper
-, nvidia-container-runtime
+, buildGoPackage
+, linkFarm
+, writeShellScript
+, containerRuntimePath
+, configTemplate
+, libnvidia-container
 }:
-buildGoModule rec {
-  pname = "nvidia-container-toolkit";
-  version = "1.5.0";
+let
+  isolatedContainerRuntimePath = linkFarm "isolated_container_runtime_path" [
+    {
+      name = "runc";
+      path = containerRuntimePath;
+    }
+  ];
+  warnIfXdgConfigHomeIsSet = writeShellScript "warn_if_xdg_config_home_is_set" ''
+    set -eo pipefail
 
-  src = fetchFromGitHub {
-    owner = "NVIDIA";
+    if [ -n "$XDG_CONFIG_HOME" ]; then
+      echo >&2 "$(tput setaf 3)warning: \$XDG_CONFIG_HOME=$XDG_CONFIG_HOME$(tput sgr 0)"
+    fi
+  '';
+in
+buildGoPackage rec {
+  pname = "container-toolkit/container-toolkit";
+  version = "1.9.0";
+
+  src = fetchFromGitLab {
+    owner = "nvidia";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-YvwqnwYOrlSE6PmNNZ5xjEaEcXdHKcakIwua+tOvIJ0=";
+    sha256 = "sha256-b4mybNB5FqizFTraByHk5SCsNO66JaISj18nLgLN7IA=";
   };
 
-  vendorSha256 = "17zpiyvf22skfcisflsp6pn56y6a793jcx89kw976fq2x5br1bz7";
+  goPackagePath = "github.com/NVIDIA/nvidia-container-toolkit";
+
   ldflags = [ "-s" "-w" ];
+
   nativeBuildInputs = [ makeWrapper ];
 
+  preBuild = ''
+    # replace the default hookDefaultFilePath to the $out path
+    substituteInPlace go/src/github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-container-runtime/main.go \
+      --replace '/usr/bin/nvidia-container-runtime-hook' '${placeholder "out"}/bin/nvidia-container-runtime-hook'
+  '';
+
   postInstall = ''
-    mv $out/bin/{pkg,${pname}}
+    mkdir -p $out/etc/nvidia-container-runtime
+
+    # nvidia-container-runtime invokes docker-runc or runc if that isn't
+    # available on PATH.
+    #
+    # Also set XDG_CONFIG_HOME if it isn't already to allow overriding
+    # configuration. This in turn allows users to have the nvidia container
+    # runtime enabled for any number of higher level runtimes like docker and
+    # podman, i.e., there's no need to have mutually exclusivity on what high
+    # level runtime can enable the nvidia runtime because each high level
+    # runtime has its own config.toml file.
+    wrapProgram $out/bin/nvidia-container-runtime \
+      --run "${warnIfXdgConfigHomeIsSet}" \
+      --prefix PATH : ${isolatedContainerRuntimePath}:${libnvidia-container}/bin \
+      --set-default XDG_CONFIG_HOME $out/etc
+
+    cp ${configTemplate} $out/etc/nvidia-container-runtime/config.toml
+
+    substituteInPlace $out/etc/nvidia-container-runtime/config.toml \
+      --subst-var-by glibcbin ${lib.getBin glibc}
+
     ln -s $out/bin/nvidia-container-{toolkit,runtime-hook}
 
     wrapProgram $out/bin/nvidia-container-toolkit \
-      --add-flags "-config ${nvidia-container-runtime}/etc/nvidia-container-runtime/config.toml"
+      --add-flags "-config ${placeholder "out"}/etc/nvidia-container-runtime/config.toml"
   '';
 
   meta = with lib; {
-    homepage = "https://github.com/NVIDIA/nvidia-container-toolkit";
-    description = "NVIDIA container runtime hook";
+    homepage = "https://gitlab.com/nvidia/container-toolkit/container-toolkit";
+    description = "NVIDIA Container Toolkit";
     license = licenses.asl20;
     platforms = platforms.linux;
     maintainers = with maintainers; [ cpcloud ];

pkgs/desktops/plasma-5/fetch.sh

@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/plasma/5.27.3/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.27.4/ -A '*.tar.xz' )

pkgs/desktops/plasma-5/srcs.nix

@@ -4,483 +4,475 @@
 
 {
   aura-browser = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/aura-browser-5.27.3.tar.xz";
-      sha256 = "00ysfwf4r9x5csyxws7c7fazvcpr6240f8wshrg9dqsp5bwd86bl";
-      name = "aura-browser-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/aura-browser-5.27.4.tar.xz";
+      sha256 = "0m69p3pnb4kwpibqi8p4kg15sd47298hbhxgkj6ijpbd0422p4c9";
+      name = "aura-browser-5.27.4.tar.xz";
     };
   };
   bluedevil = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/bluedevil-5.27.3.tar.xz";
-      sha256 = "1n8v2vdjp3mby2p9dpf53rjzsjwgw5z63s4lhm17090a152jwc1b";
-      name = "bluedevil-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/bluedevil-5.27.4.tar.xz";
+      sha256 = "18wnr31rdpk70g7l3ig03kw99ss6qkfjmhqysrkyd6m1dpsp260h";
+      name = "bluedevil-5.27.4.tar.xz";
     };
   };
   breeze = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/breeze-5.27.3.tar.xz";
-      sha256 = "12krg073i08dly13zhy8jxpw6asdl7cc1dvafp48gr4irsygar3p";
-      name = "breeze-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/breeze-5.27.4.tar.xz";
+      sha256 = "008rdgyn10wdm393hgxvshfcqrxg6y5yr6xi0nzj4y0cd6yhxn32";
+      name = "breeze-5.27.4.tar.xz";
     };
   };
   breeze-grub = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/breeze-grub-5.27.3.tar.xz";
-      sha256 = "0mpjvll5ca0rg4nxsplqynrnc6bmlwg9m2xdvgbljpa7yiwymw06";
-      name = "breeze-grub-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/breeze-grub-5.27.4.tar.xz";
+      sha256 = "0ymivw0pwia1vbf45pr04f825r8w6gsgn450s5x35144vg6lqkqb";
+      name = "breeze-grub-5.27.4.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/breeze-gtk-5.27.3.tar.xz";
-      sha256 = "0ydz7xrmjfwq4nmdrazhyzm8n0jlqi3p8srydk2ivcjaq24v3f9p";
-      name = "breeze-gtk-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/breeze-gtk-5.27.4.tar.xz";
+      sha256 = "17wr4ri1jxsfx8pcm41mp0fsszlf6wi80gxlkixghrc04p6pv5nb";
+      name = "breeze-gtk-5.27.4.tar.xz";
     };
   };
   breeze-plymouth = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/breeze-plymouth-5.27.3.tar.xz";
-      sha256 = "0kqls4ss7m0dxzhqm747b2wig4nfbwcj1fi7qdwqy4lf1fw3r4sm";
-      name = "breeze-plymouth-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/breeze-plymouth-5.27.4.tar.xz";
+      sha256 = "1fzidj0dqmr5baphffr5fyxww7v6bigfvbj1hndhk5silm28krkv";
+      name = "breeze-plymouth-5.27.4.tar.xz";
     };
   };
   discover = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/discover-5.27.3.tar.xz";
-      sha256 = "1nqav8zh6290c5jxjs1vfgxxbq5szzln7skhqvx0v0mkd1889i48";
-      name = "discover-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/discover-5.27.4.tar.xz";
+      sha256 = "0rpr0c87nlm3fanv5fxs930rp5mrw357cfar6d81mwacmp86d7yw";
+      name = "discover-5.27.4.tar.xz";
     };
   };
   drkonqi = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/drkonqi-5.27.3.tar.xz";
-      sha256 = "1p1mv0qbnbpj640sv4w965jry4w9179w0mvq1avv2hkpj6mx7jy3";
-      name = "drkonqi-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/drkonqi-5.27.4.tar.xz";
+      sha256 = "1lcidwcsm216acr6ybhyma64gl37n1pn7y8ilkh2iilwm1fwwfnn";
+      name = "drkonqi-5.27.4.tar.xz";
     };
   };
   flatpak-kcm = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/flatpak-kcm-5.27.3.tar.xz";
-      sha256 = "1zjv7p8r3bic9jkla629n9a1g347d7mv22w0znpiah4xcdzci49n";
-      name = "flatpak-kcm-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/flatpak-kcm-5.27.4.tar.xz";
+      sha256 = "0i917li4cm8p0qq28m4jfasy5lph58spf9bfsbp3ka1x7i25cqdd";
+      name = "flatpak-kcm-5.27.4.tar.xz";
     };
   };
   kactivitymanagerd = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/kactivitymanagerd-5.27.3.tar.xz";
-      sha256 = "097fx3rqilqihgs4miylgx7vwgmrrwac7c1g9l7ydc20ihx4l434";
-      name = "kactivitymanagerd-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/kactivitymanagerd-5.27.4.tar.xz";
+      sha256 = "0wnsj5mbzjc3bylzyhgj8bw0qsf5c9jcyxmfr0h7w4hj414zvqfr";
+      name = "kactivitymanagerd-5.27.4.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/kde-cli-tools-5.27.3.tar.xz";
-      sha256 = "191sz7v39fzhhpf81hjdxhw08p45fx83s1mfyyd3w39bfmv038m1";
-      name = "kde-cli-tools-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/kde-cli-tools-5.27.4.tar.xz";
+      sha256 = "06dl811mwssjylgkn74wjhxi98q1qacf5c2m0jfyny7hbphgv565";
+      name = "kde-cli-tools-5.27.4.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/kde-gtk-config-5.27.3.tar.xz";
-      sha256 = "04bix5d6n480qwfkhihss3nqpra3kcp939ppa4kws5ry1s759b5a";
-      name = "kde-gtk-config-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/kde-gtk-config-5.27.4.tar.xz";
+      sha256 = "1qi0cbx9yilbxs19nbh8iplj5hi19mllk63ldyah2vn5bgwavxcq";
+      name = "kde-gtk-config-5.27.4.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/kdecoration-5.27.3.tar.xz";
-      sha256 = "1nzym6qf7pqsk03qs3583lisf9vzcy13mwwhcjpri0bng57ih3h7";
-      name = "kdecoration-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/kdecoration-5.27.4.tar.xz";
+      sha256 = "0vpshfjb2m1m4lx4sh1mhfpx70wvy6laaids9q1cip3k22i24ps1";
+      name = "kdecoration-5.27.4.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/kdeplasma-addons-5.27.3.tar.xz";
-      sha256 = "17rvsxg1fsbm5vyrm4sq4q0x720wj2y89i9n5w4v41fygarbia8w";
-      name = "kdeplasma-addons-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/kdeplasma-addons-5.27.4.tar.xz";
+      sha256 = "128zjkbvxkibh1d5d1m5xsg3f6hrkgs1f0k371bk8dpki1wsb0ka";
+      name = "kdeplasma-addons-5.27.4.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/kgamma5-5.27.3.tar.xz";
-      sha256 = "0z5ngivlg9zz844k55m2sxvzpjdivlggml38l0rzcqpzdqaab2fy";
-      name = "kgamma5-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/kgamma5-5.27.4.tar.xz";
+      sha256 = "00jq6pc40k1dd6g38bjyb52z8xf3iz9s2n0bwvqaddcngw5wb0aa";
+      name = "kgamma5-5.27.4.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/khotkeys-5.27.3.tar.xz";
-      sha256 = "1sq6p22bikjdxbb43l9s8rgzamyl83h00y5ksp281287k3swn6z6";
-      name = "khotkeys-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/khotkeys-5.27.4.tar.xz";
+      sha256 = "08qhj9m5dkg1vgjyzm93ns8c5yvbwfa5r6z7xgn0filvlzg284l4";
+      name = "khotkeys-5.27.4.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/kinfocenter-5.27.3.tar.xz";
-      sha256 = "12wqryghhvs1a1l80k7zmwldyclvp3c2cdaaank7xwy3nyrnnzw4";
-      name = "kinfocenter-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/kinfocenter-5.27.4.tar.xz";
+      sha256 = "15g4czd8pm4vliaax8kgy8zdgxqj73x1icy4gc09y4zwqhaclxb8";
+      name = "kinfocenter-5.27.4.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/kmenuedit-5.27.3.tar.xz";
-      sha256 = "126wcw38abnwpfcapkbhk8xi2m5gp7qshvayzh23xdajg0lkh47p";
-      name = "kmenuedit-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/kmenuedit-5.27.4.tar.xz";
+      sha256 = "1cx7ih68by4slrxrgf8yh49fxszfrzgfhrajk8xjgq9s34nvgarp";
+      name = "kmenuedit-5.27.4.tar.xz";
     };
   };
   kpipewire = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/kpipewire-5.27.3.tar.xz";
-      sha256 = "0b95jjkfpkvc2ld3x6p7nw6kn6fkqba9q7x95ywvgag2b00jdb56";
-      name = "kpipewire-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/kpipewire-5.27.4.tar.xz";
+      sha256 = "0r9ii0mwv2d8nlq3p0g5hsp3m0j8my17ji1an7hzw5pajf340lx6";
+      name = "kpipewire-5.27.4.tar.xz";
     };
   };
   kscreen = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/kscreen-5.27.3.tar.xz";
-      sha256 = "0ddxd0rmzq6bp00nw65z854pc8dsgiqdvwhkfrs9cprjdprnf3n1";
-      name = "kscreen-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/kscreen-5.27.4.tar.xz";
+      sha256 = "1vf5lhbm1r55l1y06sib1fdv5mbmd77ns1xmq3f0ff7mfabj8vs5";
+      name = "kscreen-5.27.4.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/kscreenlocker-5.27.3.tar.xz";
-      sha256 = "0m48bjrq95psmd11hny15nwqb4ypbfp7sik40hzzx216pqs9ma8s";
-      name = "kscreenlocker-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/kscreenlocker-5.27.4.tar.xz";
+      sha256 = "14bip40nkkj6xhmws14hqzjmw23348dpvip4vad8fdgyndcpznm9";
+      name = "kscreenlocker-5.27.4.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/ksshaskpass-5.27.3.tar.xz";
-      sha256 = "0bgnxx0k62a26pkq2alvb8r9kqyd80wnxci3sxa7rppdx8z3ahd5";
-      name = "ksshaskpass-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/ksshaskpass-5.27.4.tar.xz";
+      sha256 = "0spl7v7narfpvx37f1fqyk9mbsqhymy7jvd3gbxyln0x31j041d9";
+      name = "ksshaskpass-5.27.4.tar.xz";
     };
   };
   ksystemstats = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/ksystemstats-5.27.3.tar.xz";
-      sha256 = "0rk34pav5zkw01h51m97i7jhq2wslhzap3wdp32v1xgsgmjlhs22";
-      name = "ksystemstats-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/ksystemstats-5.27.4.tar.xz";
+      sha256 = "1knykvf6ygg75y7qj8087v8sg6m54ywsk8v9d5yc7f0g8mhqkmhz";
+      name = "ksystemstats-5.27.4.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/kwallet-pam-5.27.3.tar.xz";
-      sha256 = "1nqzx8pxk9yqqxpmra3mi8m61b7vl03vjpmnyrlh7krzynfjj672";
-      name = "kwallet-pam-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/kwallet-pam-5.27.4.tar.xz";
+      sha256 = "0v0jzkmdbwry6k70nk4gmzv758744q4qi50gry9bcz619imkz8ff";
+      name = "kwallet-pam-5.27.4.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/kwayland-integration-5.27.3.tar.xz";
-      sha256 = "0jkgkzh9zp1yb72npzgfbhq79zmgwzf7vzw8xxbz3vsmk3rih0fd";
-      name = "kwayland-integration-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/kwayland-integration-5.27.4.tar.xz";
+      sha256 = "027y4r02g26mv5a76s2yr0fxyx7dq81md41lgjnr3gg0jdm8ajpp";
+      name = "kwayland-integration-5.27.4.tar.xz";
     };
   };
   kwin = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/kwin-5.27.3.tar.xz";
-      sha256 = "1ry0mwah77ly1b4ywhiprjq5aqrb0njawqik11997q0k720i4b78";
-      name = "kwin-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/kwin-5.27.4.tar.xz";
+      sha256 = "1d76m6vp9kg4qgr62ppb5wyi7g49j84kzb75zqkq5racsr9r0i2q";
+      name = "kwin-5.27.4.tar.xz";
     };
   };
   kwrited = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/kwrited-5.27.3.tar.xz";
-      sha256 = "1m2qcqnsq3nbqa00y0fa0bnya8j7741pp3zgn58hjvhfbrh52262";
-      name = "kwrited-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/kwrited-5.27.4.tar.xz";
+      sha256 = "1z07fjw3b8q7cgy7vvlh1bmx4qm609mipgm5wjf6lb63ss04nfpd";
+      name = "kwrited-5.27.4.tar.xz";
     };
   };
   layer-shell-qt = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/layer-shell-qt-5.27.3.tar.xz";
-      sha256 = "1rvjkw11nxcj0fl9b45hfv20xaqq87jvfrxz72xkmixnsv3wv70f";
-      name = "layer-shell-qt-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/layer-shell-qt-5.27.4.tar.xz";
+      sha256 = "1znhwg86wnjrmw5lfbwarl2va90zf4b0lpafia73q0i39g0ysfiv";
+      name = "layer-shell-qt-5.27.4.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/libkscreen-5.27.3.tar.xz";
-      sha256 = "0py6x6l0bc64wakd3x6j4lmcnqzjxx0a4qr2p3i94rrx68b73mw5";
-      name = "libkscreen-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/libkscreen-5.27.4.tar.xz";
+      sha256 = "0zps0z0j4yln2yda4sj15rn3i6y3qipb5yb4q90qm5a0iiggp7d8";
+      name = "libkscreen-5.27.4.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/libksysguard-5.27.3.tar.xz";
-      sha256 = "07xvs6pr605p9mjm6s8f5x53lyv2mscxvm4xfa0y056ngipvpwiz";
-      name = "libksysguard-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/libksysguard-5.27.4.tar.xz";
+      sha256 = "1y7q4bkgpg1j9yw9glm0566fbx6vf9ccz9f46vg3zfjwa468s4p0";
+      name = "libksysguard-5.27.4.tar.xz";
     };
   };
   milou = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/milou-5.27.3.tar.xz";
-      sha256 = "07vf2mi6jnmw28r8bw5qj7f7467ja5mhsdp1k8hb32ivls92sv7b";
-      name = "milou-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/milou-5.27.4.tar.xz";
+      sha256 = "1a2p3y3zcmjigwywl7k7mgwvilpyjzjnbylx8zadp0051yw6f3sd";
+      name = "milou-5.27.4.tar.xz";
     };
   };
   oxygen = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/oxygen-5.27.3.tar.xz";
-      sha256 = "1drmjf8bgzm9gzpy887wbyi4zd71vlilhx7057qr8df6sbnzh4ch";
-      name = "oxygen-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/oxygen-5.27.4.tar.xz";
+      sha256 = "1sz3rnsz8qabln3jn5bg1f5vgijgmm13242k65kiksvigfdrc3p2";
+      name = "oxygen-5.27.4.tar.xz";
     };
   };
   oxygen-sounds = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/oxygen-sounds-5.27.3.tar.xz";
-      sha256 = "1kppckhyll3v973jg2csp5z3ryxbipp9jpg6hfqrw1rqkv83rf8d";
-      name = "oxygen-sounds-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/oxygen-sounds-5.27.4.tar.xz";
+      sha256 = "1v44jcy0zkvpqkc6yih55j6xmb0g3pd26szk95mpjkn7jxsav8wy";
+      name = "oxygen-sounds-5.27.4.tar.xz";
     };
   };
   plank-player = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/plank-player-5.27.3.tar.xz";
-      sha256 = "0iv26dics4w89j9xfms9bi4fs9b1cq4wnjgz1jv5w6834imvplrw";
-      name = "plank-player-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/plank-player-5.27.4.tar.xz";
+      sha256 = "0650v644nvbnl9b0caa83pbq8y7jrklqzqxdlcrml6km85avhx5n";
+      name = "plank-player-5.27.4.tar.xz";
     };
   };
   plasma-bigscreen = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/plasma-bigscreen-5.27.3.tar.xz";
-      sha256 = "0vp1n2048d9f15hnfiz2jkkk209n6zn6z45s9xa4a622xrqbvr3x";
-      name = "plasma-bigscreen-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/plasma-bigscreen-5.27.4.tar.xz";
+      sha256 = "18jdgk3aydk394r91c279fnlhyrvmklqznxjikq25mx449wa3acp";
+      name = "plasma-bigscreen-5.27.4.tar.xz";
     };
   };
   plasma-browser-integration = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/plasma-browser-integration-5.27.3.tar.xz";
-      sha256 = "10ivly31xb2s1d2cizjppm805qxdh8lij8cry46fbgg51r5w1qnd";
-      name = "plasma-browser-integration-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/plasma-browser-integration-5.27.4.tar.xz";
+      sha256 = "0rpljxnir2nbh4ww5ycgpdrj739cr1dg46mmfqj65h8yn60zfynk";
+      name = "plasma-browser-integration-5.27.4.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/plasma-desktop-5.27.3.tar.xz";
-      sha256 = "1q9lyc213fyvrjv816mhm0b0dzsjqy2m2hli9a70cy5i36id3pg2";
-      name = "plasma-desktop-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/plasma-desktop-5.27.4.tar.xz";
+      sha256 = "0068wcm586gv31aqjgppj1n5a81jv10q01spsxl24c91y7aiqkxr";
+      name = "plasma-desktop-5.27.4.tar.xz";
     };
   };
   plasma-disks = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/plasma-disks-5.27.3.tar.xz";
-      sha256 = "0m9wdqf1k346kbpc6c2d5z2xiqiyp598k1973g06jr1af0b2pi9f";
-      name = "plasma-disks-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/plasma-disks-5.27.4.tar.xz";
+      sha256 = "08w3x7hd3wkgj41g9xcaylsz8lsjv1d4pgmzq7dy436vwbiaxx4p";
+      name = "plasma-disks-5.27.4.tar.xz";
     };
   };
   plasma-firewall = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/plasma-firewall-5.27.3.tar.xz";
-      sha256 = "0qd40ihgd60znxmsr6s7vpr9af8r5dbasm4yjld4p7250pjvvn01";
-      name = "plasma-firewall-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/plasma-firewall-5.27.4.tar.xz";
+      sha256 = "1b538c9jngyj5zg6bvih2x7nskzdn8g9g04bxdjnayldj2hb979l";
+      name = "plasma-firewall-5.27.4.tar.xz";
     };
   };
   plasma-integration = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/plasma-integration-5.27.3.tar.xz";
-      sha256 = "13lrg0r4zq71wvfah8brm53v9cbsn7zpknafi948nq3smbd1h196";
-      name = "plasma-integration-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/plasma-integration-5.27.4.tar.xz";
+      sha256 = "0bl99gr2clqs6wxlx0652gcypgxqw9s34yxvhc9df0fn53v9b84s";
+      name = "plasma-integration-5.27.4.tar.xz";
     };
   };
   plasma-mobile = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/plasma-mobile-5.27.3.tar.xz";
-      sha256 = "0rf09rqc2avcma61r6ngc6bc1lmrivrvi7rkv73mrw8klnh3vf9f";
-      name = "plasma-mobile-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/plasma-mobile-5.27.4.tar.xz";
+      sha256 = "1a05lnhnxnizzs9fswsrlddwb0629xfl3wmm2rw635gqldd0f66m";
+      name = "plasma-mobile-5.27.4.tar.xz";
     };
   };
   plasma-nano = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/plasma-nano-5.27.3.tar.xz";
-      sha256 = "11ivbr03dv75ryp0lcmj9iyw7y2x7pplybglpavmfz2ryq2vsy93";
-      name = "plasma-nano-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/plasma-nano-5.27.4.tar.xz";
+      sha256 = "1z70bj5s3qkx2rbrbn9xqf4vzyj7yx9vq9givcagncxnldi1x3pa";
+      name = "plasma-nano-5.27.4.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/plasma-nm-5.27.3.tar.xz";
-      sha256 = "02646jl8qq28b11hgxg73xycb2biy6girxkgpxnpdb1gxmfmfnvn";
-      name = "plasma-nm-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/plasma-nm-5.27.4.tar.xz";
+      sha256 = "0jr1a4d9qj43925abr36nvc9fhvyd58qhdg4w5i805p533wbzrif";
+      name = "plasma-nm-5.27.4.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/plasma-pa-5.27.3.tar.xz";
-      sha256 = "177hwsr75xif0r36hib1gh6bjyljnilb4s9zyzvr5z1lwiz10y91";
-      name = "plasma-pa-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/plasma-pa-5.27.4.tar.xz";
+      sha256 = "1rpjscmfb7i9h50m9xglxf4rgca63y0i8x341jgmf5kmpm9lad7d";
+      name = "plasma-pa-5.27.4.tar.xz";
     };
   };
   plasma-remotecontrollers = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/plasma-remotecontrollers-5.27.3.tar.xz";
-      sha256 = "04am5shh882k86yic1ca42j60l2rnqn9487i30k0332kzd0wir1w";
-      name = "plasma-remotecontrollers-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/plasma-remotecontrollers-5.27.4.tar.xz";
+      sha256 = "0l9n0q318720yx02whrp9qfhhwcnw261sdvyw78y9c3n4v22k31n";
+      name = "plasma-remotecontrollers-5.27.4.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/plasma-sdk-5.27.3.tar.xz";
-      sha256 = "0rsz846x3rldz950zm31aj8192b0h5d33fvizmgxnxjibxxf2q24";
-      name = "plasma-sdk-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/plasma-sdk-5.27.4.tar.xz";
+      sha256 = "08fv6rnb7vc3wxkwk3xrrvb3k1gac7sncjdvk0lik6y1c7ilk27r";
+      name = "plasma-sdk-5.27.4.tar.xz";
     };
   };
   plasma-systemmonitor = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/plasma-systemmonitor-5.27.3.tar.xz";
-      sha256 = "122rw8nfzhk0808d1bk54ld41b45616fg3hca9jg4ib6k7nka367";
-      name = "plasma-systemmonitor-5.27.3.tar.xz";
-    };
-  };
-  plasma-tests = {
-    version = "5.27.3";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/plasma-tests-5.27.3.tar.xz";
-      sha256 = "1ijh1lfr81bwdw8nla55n6snxkmmz95qf3j8wbf61v64r9n3w2zp";
-      name = "plasma-tests-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/plasma-systemmonitor-5.27.4.tar.xz";
+      sha256 = "1sy38lmkrvma4kkf96n68f65hdjvpyaszx13hynhrplsgn24fj19";
+      name = "plasma-systemmonitor-5.27.4.tar.xz";
     };
   };
   plasma-thunderbolt = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/plasma-thunderbolt-5.27.3.tar.xz";
-      sha256 = "17hs1mrr7lkd9nkxs9269bs3hs4c8qxg3ksirksrgnbz4zas1m55";
-      name = "plasma-thunderbolt-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/plasma-thunderbolt-5.27.4.tar.xz";
+      sha256 = "1zzl59qyajf8xcxxs5lijx85v8gm3y4izf3qd502smq2841hbxi8";
+      name = "plasma-thunderbolt-5.27.4.tar.xz";
     };
   };
   plasma-vault = {
-    version = "5.27.3";
+    version = "5.27.4.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/plasma-vault-5.27.3.tar.xz";
-      sha256 = "0ilpkdd0nfg9z2klyf5s02npmqr1ypb0wgm584zi27q048hnicls";
-      name = "plasma-vault-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/plasma-vault-5.27.4.1.tar.xz";
+      sha256 = "1bh2662ghdq5qkvn4347yc2dh6c616qiax4k4yylkf37czqdil77";
+      name = "plasma-vault-5.27.4.1.tar.xz";
     };
   };
   plasma-welcome = {
-    version = "5.27.3";
+    version = "5.27.4.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/plasma-welcome-5.27.3.tar.xz";
-      sha256 = "1m6mpzbcyy7cimhcsbbmk1v86pibcrp86b22dh7pwgrg309ihsm4";
-      name = "plasma-welcome-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/plasma-welcome-5.27.4.1.tar.xz";
+      sha256 = "0rg80rc07q63z0ds4q8lf9yrv3ys9cvjcfwx39ibjy9nrkismrca";
+      name = "plasma-welcome-5.27.4.1.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.27.3";
+    version = "5.27.4.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/plasma-workspace-5.27.3.tar.xz";
-      sha256 = "0g710y1l2hpxnjg6r1k60dkvn6gf98fg5yhx72wa2y1in3nkglzl";
-      name = "plasma-workspace-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/plasma-workspace-5.27.4.1.tar.xz";
+      sha256 = "19b5mydi995aa634v57dlc769nmbz6mb2hs8c620gzabjnn0cffb";
+      name = "plasma-workspace-5.27.4.1.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.27.3";
+    version = "5.27.4.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/plasma-workspace-wallpapers-5.27.3.tar.xz";
-      sha256 = "1ppsi5ic6yp9wnqwmz37jsmjs3l5jxafjarxa0xasalg69k10k4c";
-      name = "plasma-workspace-wallpapers-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/plasma-workspace-wallpapers-5.27.4.1.tar.xz";
+      sha256 = "0sv58kp088vxqd5dfs3hvc93xlydk7nyxm1ly0xy377r2v3pnkg4";
+      name = "plasma-workspace-wallpapers-5.27.4.1.tar.xz";
     };
   };
   plymouth-kcm = {
-    version = "5.27.3";
+    version = "5.27.4.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/plymouth-kcm-5.27.3.tar.xz";
-      sha256 = "09p6ii29lq08h8999zb1ddbaa4l7piykcr5xmhwir75pi7gnnacg";
-      name = "plymouth-kcm-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/plymouth-kcm-5.27.4.1.tar.xz";
+      sha256 = "0x20dswpy1vg1rh01m7pbicd1fn0rbh5gfaqdlizdcpnd6gjjfh5";
+      name = "plymouth-kcm-5.27.4.1.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.27.3";
+    version = "1-5.27.4.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/polkit-kde-agent-1-5.27.3.tar.xz";
-      sha256 = "1axgqg07xm12qrrww8jvbh8yvhi7pf2x4ssq65qja0zz9kxiahcx";
-      name = "polkit-kde-agent-1-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/polkit-kde-agent-1-5.27.4.1.tar.xz";
+      sha256 = "1ikhrs17ffrsji6phwxhz8b6gxldksjb4625zpin8vkf07v9brr6";
+      name = "polkit-kde-agent-1-5.27.4.1.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.27.3";
+    version = "5.27.4.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/powerdevil-5.27.3.tar.xz";
-      sha256 = "16bcnm56g5amwygzkdz0sy396dfn47n6wiynnvr7nfhpzbfx81y8";
-      name = "powerdevil-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/powerdevil-5.27.4.1.tar.xz";
+      sha256 = "0s6k7kcfa717lcjdlx61h21ldk4fg67is6r2vzcq0507gp3r8jb4";
+      name = "powerdevil-5.27.4.1.tar.xz";
     };
   };
   qqc2-breeze-style = {
-    version = "5.27.3";
+    version = "5.27.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/qqc2-breeze-style-5.27.3.tar.xz";
-      sha256 = "13hd2f08cb6gjdyns1qfszq7sn1ckr78l3lhl6g6yiab3jn1v6b4";
-      name = "qqc2-breeze-style-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/qqc2-breeze-style-5.27.4.tar.xz";
+      sha256 = "0x96xa5j3726i4ci6g51hk364hhcq9xip4jrb1qssb9l0v1324n4";
+      name = "qqc2-breeze-style-5.27.4.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.27.3";
+    version = "5.27.4.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/sddm-kcm-5.27.3.tar.xz";
-      sha256 = "0hicpzsyym1r3amd6crz964gk19rhg5z9g87fr6i77r77iavb1ds";
-      name = "sddm-kcm-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/sddm-kcm-5.27.4.1.tar.xz";
+      sha256 = "0l85mk8mj3g5fga6z93w5k88pkpf8wrx6vaf4f1q9lgy2dkm4ylp";
+      name = "sddm-kcm-5.27.4.1.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.27.3";
+    version = "5.27.4.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/systemsettings-5.27.3.tar.xz";
-      sha256 = "0gjh9hny0h2x5cqqsn5scm1k9hjfl3vgpmsjqqc66hb1ac8a9g04";
-      name = "systemsettings-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/systemsettings-5.27.4.1.tar.xz";
+      sha256 = "03kk2bangg9nixdwpyrp2k4wgv3r3d3ymklqfx37b7c25wpiv7az";
+      name = "systemsettings-5.27.4.1.tar.xz";
     };
   };
   xdg-desktop-portal-kde = {
-    version = "5.27.3";
+    version = "5.27.4.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.3/xdg-desktop-portal-kde-5.27.3.tar.xz";
-      sha256 = "0d47kx9y4bfylmn3q4s11vg6fzz1yjlcbxmpgpd9al8nils2ifnd";
-      name = "xdg-desktop-portal-kde-5.27.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.4/xdg-desktop-portal-kde-5.27.4.1.tar.xz";
+      sha256 = "0hrxlql13yab3w778wgdsr92g65q81qk5dvlqnn0fdc9lbfw5ipg";
+      name = "xdg-desktop-portal-kde-5.27.4.1.tar.xz";
     };
   };
 }

pkgs/development/compilers/mozart/default.nix

@@ -7,7 +7,6 @@
 , boost169
 , pinnedBoost ? boost169
 , llvmPackages
-, llvmPackages_5
 , gmp
 , emacs
 , jre_headless
@@ -42,23 +41,9 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake makeWrapper unzip ];
 
-  # We cannot compile with both gcc and clang, but we need clang during the
-  # process, so we compile everything with clang.
-  # BUT, we need clang4 for parsing, and a more recent clang for compiling.
   cmakeFlags = [
-    "-DCMAKE_CXX_COMPILER=${llvmPackages.clang}/bin/clang++"
-    "-DCMAKE_C_COMPILER=${llvmPackages.clang}/bin/clang"
     "-DBoost_USE_STATIC_LIBS=OFF"
     "-DMOZART_BOOST_USE_STATIC_LIBS=OFF"
-    "-DCMAKE_PROGRAM_PATH=${llvmPackages_5.clang}/bin"
-    # Rationale: Nix's cc-wrapper needs to see a compile flag (like -c) to
-    # infer that it is not a linking call, and stop trashing the command line
-    # with linker flags.
-    # As it does not recognise -emit-ast, we pass -c immediately overridden
-    # by -emit-ast.
-    # The remaining is just the default flags that we cannot reuse and need
-    # to repeat here.
-    "-DMOZART_GENERATOR_FLAGS='-c;-emit-ast;--std=c++0x;-Wno-invalid-noreturn;-Wno-return-type;-Wno-braced-scalar-init'"
     # We are building with clang, as nix does not support having clang and
     # gcc together as compilers and we need clang for the sources generation.
     # However, clang emits tons of warnings about gcc's atomic-base library.
@@ -71,9 +56,6 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [
     pinnedBoost
-    llvmPackages_5.llvm
-    llvmPackages_5.clang
-    llvmPackages_5.clang-unwrapped
     gmp
     emacs
     jre_headless

pkgs/development/compilers/solc/default.nix

@@ -4,10 +4,11 @@
 , cmake
 , coreutils
 , fetchpatch
+, jq
 , ncurses
 , python3
 , z3Support ? true
-, z3 ? null
+, z3_4_11 ? null
 , cvc4Support ? gccStdenv.isLinux
 , cvc4 ? null
 , cln ? null
@@ -16,8 +17,9 @@
 
 # compiling source/libsmtutil/CVC4Interface.cpp breaks on clang on Darwin,
 # general commandline tests fail at abiencoderv2_no_warning/ on clang on NixOS
+let z3 = z3_4_11; in
 
-assert z3Support -> z3 != null && lib.versionAtLeast z3.version "4.6.0";
+assert z3Support -> z3 != null && lib.versionAtLeast z3.version "4.11.0";
 assert cvc4Support -> cvc4 != null && cln != null && gmp != null;
 
 let
@@ -28,11 +30,11 @@ let
     sha256 = "1vbhi503rgwarf275ajfdb8vpdcbn1f7917wjkf8jghqwb1c24lq";
   };
 
-  range3Version = "0.11.0";
+  range3Version = "0.12.0";
   range3Url = "https://github.com/ericniebler/range-v3/archive/${range3Version}.tar.gz";
   range3 = fetchzip {
     url = range3Url;
-    sha256 = "18230bg4rq9pmm5f8f65j444jpq56rld4fhmpham8q3vr1c1bdjh";
+    sha256 = "sha256-bRSX91+ROqG1C3nB9HSQaKgLzOHEFy9mrD2WW3PRBWU=";
   };
 
   fmtlibVersion = "8.0.1";
@@ -43,7 +45,7 @@ let
   };
 
   pname = "solc";
-  version = "0.8.13";
+  version = "0.8.19";
   meta = with lib; {
     description = "Compiler for Ethereum smart contract language Solidity";
     homepage = "https://github.com/ethereum/solidity";
@@ -57,9 +59,13 @@ let
     # upstream suggests avoid using archive generated by github
     src = fetchzip {
       url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz";
-      hash = "sha256-cFC9M65kSYgYq9rhBXZKEdfvIMbMaDiDwdPmU8v9s7k=";
+      sha256 = "sha256-xh/QPYNEWxPtDaVmBeIE/Ch98g0ox9gJ/lR6ziOu+bg=";
     };
 
+    patches = [
+      ./tests.patch
+    ];
+
     postPatch = ''
       substituteInPlace cmake/jsoncpp.cmake \
         --replace "${jsoncppUrl}" ${jsoncpp}
@@ -84,7 +90,7 @@ let
     buildInputs = [ boost ]
       ++ lib.optionals z3Support [ z3 ]
       ++ lib.optionals cvc4Support [ cvc4 cln gmp ];
-    nativeCheckInputs = [ ncurses python3 ];
+    nativeCheckInputs = [ jq ncurses (python3.withPackages (ps: with ps; [ colorama deepdiff devtools docopt docutils requests sphinx tabulate z3 ])) ]; # contextlib2 glob2 textwrap3 traceback2 urllib3
 
     # tests take 60+ minutes to complete, only run as part of passthru tests
     doCheck = false;
@@ -96,7 +102,8 @@ let
       for i in ./scripts/*.sh ./scripts/*.py ./test/*.sh ./test/*.py; do
         patchShebangs "$i"
       done
-      TERM=xterm ./scripts/tests.sh ${lib.optionalString z3Support "--no-smt"}
+      ## TODO: reenable tests below after adding evmone and hera and their dependencies to nixpkgs
+      #TERM=xterm ./scripts/tests.sh ${lib.optionalString z3Support "--no-smt"}
       popd
     '';
 
@@ -113,7 +120,7 @@ let
 
     src = pkgs.fetchurl {
       url = "https://github.com/ethereum/solidity/releases/download/v${version}/solc-macos";
-      sha256 = "sha256-FNTvAT6oKtlekf2Um3+nt4JxpIP/GnnEPWzFi4JvW+o=";
+      sha256 = "sha256-OMhSOrZ+Cz4hxIGJ1r+5mtaHm5zgLg2ALsi+WYuyYi0=";
     };
     dontUnpack = true;
 

pkgs/development/compilers/solc/tests.patch

@@ -0,0 +1,14 @@
+diff --git a/test/lsp.py b/test/lsp.py
+index 669951ca4..11007ae82 100755
+--- a/test/lsp.py
++++ b/test/lsp.py
+@@ -28,7 +28,8 @@ else:
+     import tty
+     # Turn off user input buffering so we get the input immediately,
+     # not only after a line break
+-    tty.setcbreak(sys.stdin.fileno())
++    if os.isatty(sys.stdin.fileno()):
++        tty.setcbreak(sys.stdin.fileno())
+ 
+ 
+ # Type for the pure test name without .sol suffix or sub directory

pkgs/development/coq-modules/coq-lsp/default.nix

@@ -8,10 +8,12 @@ mkCoqDerivation rec {
   useDune = true;
 
   release."0.1.6.1+8.16".sha256 = "sha256-aX8/pN4fVYaF7ZEPYfvYpEZLiQM++ZG1fAhiLftQ9Aw=";
+  release."0.1.6.1+8.17".sha256 = "sha256-je+OlKM7x3vYB36sl406GREAWB4ePmC0ewHS6rCmWfk=";
 
   inherit version;
   defaultVersion = with lib.versions; lib.switch coq.coq-version [
     { case = isEq "8.16"; out = "0.1.6.1+8.16"; }
+    { case = isEq "8.17"; out = "0.1.6.1+8.17"; }
   ] null;
 
   nativeBuildInputs = [ makeWrapper ];
@@ -30,7 +32,7 @@ mkCoqDerivation rec {
     description = "Language Server Protocol and VS Code Extension for Coq";
     homepage = "https://github.com/ejgallego/coq-lsp";
     changelog = "https://github.com/ejgallego/coq-lsp/blob/${defaultVersion}/CHANGES.md";
-    maintainers = with maintainers; [ marsam ];
+    maintainers = with maintainers; [ alizter marsam ];
     license = licenses.lgpl21Only;
   };
 }

pkgs/development/coq-modules/serapi/default.nix

@@ -2,6 +2,7 @@
 
 let
   release = {
+    "8.17.0+0.17.0".sha256 = "sha256-I81qvaXpJfXcbFw8vyzYLzlnhPg1QD0lTqAFXhoZ0rI=";
     "8.16.0+0.16.3".sha256 = "sha256-22Kawp8jAsgyBTppwN5vmN7zEaB1QfPs0qKxd6x/7Uc=";
     "8.15.0+0.15.0".sha256 = "1vh99ya2dq6a8xl2jrilgs0rpj4j227qx8zvzd2v5xylx0p4bbrp";
     "8.14.0+0.14.0".sha256 = "1kh80yb791yl771qbqkvwhbhydfii23a7lql0jgifvllm2k8hd8d";
@@ -12,12 +13,13 @@ let
   };
 in
 
-(with lib; mkCoqDerivation rec {
+(with lib; mkCoqDerivation {
   pname = "serapi";
   inherit version release;
 
   defaultVersion =  with versions;
     lib.switch coq.version [
+      { case = isEq "8.17"; out = "8.17.0+0.17.0"; }
       { case = isEq "8.16"; out = "8.16.0+0.16.3"; }
       { case = isEq "8.15"; out = "8.15.0+0.15.0"; }
       { case = isEq "8.14"; out = "8.14.0+0.14.0"; }
@@ -39,6 +41,7 @@ in
       ppx_deriving_yojson
       ppx_import
       ppx_sexp_conv
+      ppx_hash
       sexplib
       yojson
       zarith # needed because of Coq
@@ -54,7 +57,7 @@ in
     homepage = "https://github.com/ejgallego/coq-serapi";
     description = "SerAPI is a library for machine-to-machine interaction with the Coq proof assistant";
     license = licenses.lgpl21Plus;
-    maintainers = [ maintainers.Zimmi48 ];
+    maintainers = with maintainers; [ alizter Zimmi48 ];
   };
 }).overrideAttrs(o:
   let inherit (o) version; in {

pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml

@@ -195,9 +195,6 @@ package-maintainers:
     - vulkan-utils
   erictapen:
     - hakyll
-    - hakyll-contrib-hyphenation
-    - webify
-    - squeal-postgresql
   Gabriel439:
     - annah
     - bench

pkgs/development/interpreters/php/generic.nix

@@ -170,19 +170,19 @@ let
               ln -s ${extraInit} $out/lib/php.ini
 
               if test -e $out/bin/php; then
-                wrapProgram $out/bin/php --set PHP_INI_SCAN_DIR $out/lib
+                wrapProgram $out/bin/php --set-default PHP_INI_SCAN_DIR $out/lib
               fi
 
               if test -e $out/bin/php-fpm; then
-                wrapProgram $out/bin/php-fpm --set PHP_INI_SCAN_DIR $out/lib
+                wrapProgram $out/bin/php-fpm --set-default PHP_INI_SCAN_DIR $out/lib
               fi
 
               if test -e $out/bin/phpdbg; then
-                wrapProgram $out/bin/phpdbg --set PHP_INI_SCAN_DIR $out/lib
+                wrapProgram $out/bin/phpdbg --set-default PHP_INI_SCAN_DIR $out/lib
               fi
 
               if test -e $out/bin/php-cgi; then
-                wrapProgram $out/bin/php-cgi --set PHP_INI_SCAN_DIR $out/lib
+                wrapProgram $out/bin/php-cgi --set-default PHP_INI_SCAN_DIR $out/lib
               fi
             '';
           };

pkgs/development/libraries/cimg/default.nix

@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cimg";
-  version = "3.2.2";
+  version = "3.2.3";
 
   src = fetchFromGitHub {
     owner = "GreycLab";
     repo = "CImg";
     rev = "v.${version}";
-    hash = "sha256-koXew0Lwb7wW8MQctTjxpo7TNVtrS5MzxQFfUS1gwZs=";
+    hash = "sha256-DFTqx4v3Hf2HyT02yBLo4n1yKPuPVz1oa2C5LsIeyCY=";
   };
 
   outputs = [ "out" "doc" ];

pkgs/development/libraries/libassuan/default.nix

@@ -38,6 +38,6 @@ stdenv.mkDerivation rec {
     homepage = "http://gnupg.org";
     license = licenses.lgpl2Plus;
     platforms = platforms.all;
-    maintainers = [ maintainers.erictapen ];
+    maintainers = [ ];
   };
 }

pkgs/development/libraries/libepoxy/default.nix

@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
     description = "A library for handling OpenGL function pointer management";
     homepage = "https://github.com/anholt/libepoxy";
     license = licenses.mit;
-    maintainers = with maintainers; [ goibhniu erictapen ];
+    maintainers = with maintainers; [ goibhniu ];
     platforms = platforms.unix;
   };
 }

pkgs/development/libraries/libviperfx/default.nix

@@ -26,5 +26,6 @@ stdenv.mkDerivation rec {
     license = licenses.unfreeRedistributable;
     maintainers = with maintainers; [ rewine ];
     platforms = [ "x86_64-linux" ];
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
   };
 }

pkgs/development/libraries/mapnik/default.nix

@@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "An open source toolkit for developing mapping applications";
     homepage = "https://mapnik.org";
-    maintainers = with maintainers; [ hrdinka erictapen ];
+    maintainers = with maintainers; [ hrdinka ];
     license = licenses.lgpl21Plus;
     platforms = platforms.all;
   };

pkgs/development/lisp-modules/ql.nix

@@ -56,7 +56,7 @@ let
       nativeLibs = [ pkgs.glib pkgs.gobject-introspection ];
     });
     cl-mysql = super.cl-mysql.overrideLispAttrs (o: {
-      nativeLibs = [ pkgs.mysql-client ];
+      nativeLibs = [ pkgs.mariadb.client ];
     });
     clsql-postgresql = super.clsql-postgresql.overrideLispAttrs (o: {
       nativeLibs = [ pkgs.postgresql.lib ];
@@ -68,7 +68,7 @@ let
       nativeLibs = [ pkgs.webkitgtk ];
     });
     dbd-mysql = super.dbd-mysql.overrideLispAttrs (o: {
-      nativeLibs = [ pkgs.mysql-client ];
+      nativeLibs = [ pkgs.mariadb.client ];
     });
     lla = super.lla.overrideLispAttrs (o: {
       nativeLibs = [ pkgs.openblas ];

pkgs/development/ocaml-modules/algaeff/default.nix

@@ -0,0 +1,26 @@
+{ lib
+, buildDunePackage
+, fetchFromGitHub
+}:
+
+buildDunePackage rec {
+  pname = "algaeff";
+  version = "0.2.1";
+
+  minimalOCamlVersion = "5.0";
+  duneVersion = "3";
+
+  src = fetchFromGitHub {
+    owner = "RedPRL";
+    repo = pname;
+    rev = version;
+    hash = "sha256-jpnJhF+LN2ef6QPLcCHxcMg3Fr3GSLOnJkZ9ZUIOrlY=";
+  };
+
+  meta = {
+    description = "Reusable Effects-Based Components";
+    homepage = "https://github.com/RedPRL/algaeff";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.vbgl ];
+  };
+}

pkgs/development/ocaml-modules/bwd/default.nix

@@ -2,15 +2,16 @@
 
 buildDunePackage rec {
   pname = "bwd";
-  version = "2.0.0";
+  version = "2.1.0";
 
   minimalOCamlVersion = "4.12";
+  duneVersion = "3";
 
   src = fetchFromGitHub {
     owner = "RedPRL";
     repo = "ocaml-bwd";
     rev = version;
-    sha256 = "sha256:0zgi8an53z6wr6nzz0zlmhx19zhqy1w2vfy1sq3sikjwh74jjq60";
+    hash = "sha256-ucXOBjD1behL2h8CZv64xtRjCPkajZic7G1oxxDmEXY=";
   };
 
   doCheck = true;

pkgs/development/ocaml-modules/cooltt/default.nix

@@ -49,6 +49,8 @@ let
       sha256 = "sha256:1xb754fha4s0bgjfqjxzqljvalmkfdwdn5y4ycsp51wiah235bsy";
     };
 
+    duneVersion = "3";
+
     propagatedBuildInputs = [ bwd ];
 
     doCheck = true;

pkgs/development/ocaml-modules/jsonm/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "ocaml${ocaml.version}-jsonm";
-  version = "1.0.1";
+  version = "1.0.2";
 
   src = fetchurl {
     url = "https://erratique.ch/software/jsonm/releases/jsonm-${version}.tbz";
-    sha256 = "1176dcmxb11fnw49b7yysvkjh0kpzx4s48lmdn5psq9vshp5c29w";
+    hash = "sha256-6ikjn+tAUyAd8+Hm0nws4SOIKsRljhyL6plYvhGKe9Y=";
   };
 
   nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];

pkgs/development/ocaml-modules/yuujinchou/default.nix

@@ -1,24 +1,41 @@
-{ lib, fetchFromGitHub, buildDunePackage, qcheck-alcotest }:
+{ lib, ocaml, fetchFromGitHub, buildDunePackage
+, algaeff, bwd
+, qcheck-alcotest
+}:
+
+let params = if lib.versionAtLeast ocaml.version "5.0" then {
+    version = "4.0.0";
+    hash = "sha256-yNLN5bBe4aft9Rl5VHmlOYTlnCdR2NgDWsc3uJHaZy4=";
+    propagatedBuildInputs = [ algaeff bwd ];
+  } else {
+    version = "2.0.0";
+    hash = "sha256:1nhz44cyipy922anzml856532m73nn0g7iwkg79yzhq6yb87109w";
+  }
+; in
 
 buildDunePackage rec {
   pname = "yuujinchou";
-  version = "2.0.0";
+  inherit (params) version;
 
   minimalOCamlVersion = "4.12";
+  duneVersion = "3";
 
   src = fetchFromGitHub {
     owner = "RedPRL";
     repo = pname;
     rev = version;
-    sha256 = "sha256:1nhz44cyipy922anzml856532m73nn0g7iwkg79yzhq6yb87109w";
+    inherit (params) hash;
   };
 
+  propagatedBuildInputs = params.propagatedBuildInputs or [];
+
+
   doCheck = true;
   checkInputs = [ qcheck-alcotest ];
 
   meta = {
     description = "Name pattern combinators";
-    inherit (src.meta) homepage;
+    homepage = "https://github.com/RedPRL/yuujinchou";
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.vbgl ];
   };

pkgs/development/python-modules/adafruit-platformdetect/default.nix

@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "adafruit-platformdetect";
-  version = "3.42.0";
+  version = "3.43.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "Adafruit-PlatformDetect";
     inherit version;
-    hash = "sha256-nFpPJKQv7UNsza1PAcTsZNVp9nFVa/pHlvNRVM4UIUY=";
+    hash = "sha256-7JsdHeYjPSXGdnvs67haOYqX+le+RmivfXPtxDT6BJ8=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

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

@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "aiocoap";
-  version = "0.4.5";
+  version = "0.4.7";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "chrysn";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-t2yfWWfkJmOr14XdLsIV48HMgVRaEnUO4IG2jQHbKWA=";
+    hash = "sha256-4iwoPfmIwk+PlWUp60aqA5qZgzyj34pnZHf9uH5UhnY=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/ansible-doctor/default.nix

@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "ansible-doctor";
-  version = "2.0.2";
+  version = "2.0.3";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "thegeeklab";
     repo = "ansible-doctor";
     rev = "refs/tags/v${version}";
-    hash = "sha256-hbHQbYc/cOqbeubAMa0J+UtI00jtyG/WUBe0xcSaGSI=";
+    hash = "sha256-rhXhz6aUQ9hw83cfHmOLXMyyLQc7pSCGgurFhuglKjU=";
   };
 
   pythonRelaxDeps = true;

pkgs/development/python-modules/bc-detect-secrets/default.nix

@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "bc-detect-secrets";
-  version = "1.4.14";
+  version = "1.4.16";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "bridgecrewio";
     repo = "detect-secrets";
     rev = "refs/tags/${version}";
-    hash = "sha256-WgUbVpn5KoayiWv3sYp+hZxqfQg73k0pXkxgUK8wrPg=";
+    hash = "sha256-PBpxhZPFO4X4dhSYWG2TtHgaNx/SCQlnr2D57uB0kr4=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/cyclonedx-python-lib/default.nix

@@ -6,9 +6,10 @@
 , jsonschema
 , lxml
 , packageurl-python
+, py-serializable
+, pythonRelaxDepsHook
 , poetry-core
 , pytestCheckHook
-, python
 , pythonOlder
 , requirements-parser
 , sortedcontainers
@@ -21,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "cyclonedx-python-lib";
-  version = "3.1.5";
+  version = "4.0.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -30,11 +31,12 @@ buildPythonPackage rec {
     owner = "CycloneDX";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-4lA8OdmvQD94jTeDf+Iz7ZyEQ9fZzCxnXQG9Ir8FKhk=";
+    hash = "sha256-xXtUEunPYiuVh+1o4xoFutGstZ918ju5xK5zLvgbLHc=";
   };
 
   nativeBuildInputs = [
     poetry-core
+    pythonRelaxDepsHook
   ];
 
   propagatedBuildInputs = [
@@ -44,6 +46,7 @@ buildPythonPackage rec {
     setuptools
     sortedcontainers
     toml
+    py-serializable
     types-setuptools
     types-toml
   ];
@@ -60,6 +63,10 @@ buildPythonPackage rec {
     "cyclonedx"
   ];
 
+  pythonRelaxDeps = [
+    "py-serializable"
+  ];
+
   preCheck = ''
     export PYTHONPATH=tests''${PYTHONPATH+:$PYTHONPATH}
   '';

pkgs/development/python-modules/django-auth-ldap/default.nix

@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "django-auth-ldap";
-  version = "4.1.0";
+  version = "4.2.0";
   format = "pyproject";
 
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-d/dJ07F4B86OtWqcnI5XRv8xZWf4HVumE0ldnHSVqUk=";
+    hash = "sha256-qsceZbCovc/FzQi3CZfuPNw3eG/9XZdbfiz6R1ldQn8=";
   };
 
   nativeBuildInputs = [

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

@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "easyenergy";
-  version = "0.2.3";
+  version = "0.3.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "klaasnicolaas";
     repo = "python-easyenergy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-xDrfOiAAH6qD7qv0ERlQDJ2+CXJiHgvNhxbSlbhpdtw=";
+    hash = "sha256-J+iWmbuaEErrMxF62rf/L8Rkqo7/7RDXv0CmIuywbjI=";
   };
 
   postPatch = ''

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

@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "fakeredis";
-  version = "2.10.2";
+  version = "2.10.3";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "dsoftwareinc";
     repo = "fakeredis-py";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ZQC8KNHM6Nnytkr6frZMl5mBVPkpduWZwwooCPymbFY=";
+    hash = "sha256-qd8tofR5FdfV/A37gfNRYALf5rUMh7ldhS/hETUHo/k=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/faraday-plugins/default.nix

@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "faraday-plugins";
-  version = "1.10.0";
+  version = "1.11.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "infobyte";
     repo = "faraday_plugins";
     rev = "refs/tags/${version}";
-    hash = "sha256-bVuysEr8VVFgA4OZ7N7UlL2FigbyLVyPr1HHwkshSMU=";
+    hash = "sha256-rbmD+UeMzsccYq7AzANziUZCgKtShRe/fJersODMrF8=";
   };
 
   postPatch = ''

pkgs/development/python-modules/fastapi-mail/default.nix

@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "fastapi-mail";
-  version = "1.2.6";
+  version = "1.2.7";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "sabuhish";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-PL/0swFiAG8HlvxnsEqwEEec1CIsA3qFer3LKyS2y/Y=";
+    hash = "sha256-zZjC8tNM6rjpgbMw4MHPVr1UOEhjlgCFcZMvSDmKfzs=";
   };
 
   postPatch = ''

pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix

@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-bigquery-logging";
-  version = "1.2.0";
+  version = "1.2.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-OsQeBJMvq/NOC6T7N4jyrsKzcazOAn838CDjfDq7dZA=";
+    hash = "sha256-zTVOt3175ruIHatHTemOAt9VF4pvJn/fQIvm/DXXw9M=";
   };
 
   propagatedBuildInputs = [

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

@@ -5,14 +5,15 @@
 , colorama
 , fetchFromGitHub
 , git
-, pdm-pep517
+, jsonschema
+, pdm-backend
 , pytestCheckHook
 , pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "griffe";
-  version = "0.25.5";
+  version = "0.26.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -21,7 +22,7 @@ buildPythonPackage rec {
     owner = "mkdocstrings";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-0+n5v93ERcQDKNtXxSZYfCUMTRzcbtQEXl023KSxfrE=";
+    hash = "sha256-p5JYBVvKvqKdYIYFh8ZiEgepJips9jg/6ao5yZ/fbcs=";
   };
 
   postPatch = ''
@@ -32,7 +33,7 @@ buildPythonPackage rec {
   '';
 
   nativeBuildInputs = [
-    pdm-pep517
+    pdm-backend
   ];
 
   propagatedBuildInputs = [
@@ -43,6 +44,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     git
+    jsonschema
     pytestCheckHook
   ];
 

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

@@ -0,0 +1,46 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, pythonOlder
+, regex
+}:
+
+buildPythonPackage rec {
+  pname = "iocextract";
+  version = "1.15.1";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "InQuest";
+    repo = "python-iocextract";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-muto8lr3sP44bLFIoAuPeS8pRv7pNP1JFKaAJV01TZY=";
+  };
+
+  propagatedBuildInputs = [
+    regex
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "iocextract"
+  ];
+
+  pytestFlagsArray = [
+    "tests.py"
+  ];
+
+  meta = with lib; {
+    description = "Module to extract Indicator of Compromises (IOC)";
+    homepage = "https://github.com/InQuest/python-iocextract";
+    changelog = "https://github.com/InQuest/python-iocextract/releases/tag/v${version}";
+    license = licenses.gpl2Only;
+    maintainers = with maintainers; [ fab ];
+  };
+}

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

@@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, poetry-core
+, rapidfuzz
+, click
+}:
+
+buildPythonPackage rec {
+  pname = "jiwer";
+  version = "3.0.1";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "jitsi";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-bH5TE6mcSG+WqvjW8Sd/o5bCBJmv9zurFEG2cVY/vYQ=";
+  };
+
+  nativeBuildInputs = [
+    poetry-core
+  ];
+
+  propagatedBuildInputs = [
+    rapidfuzz
+    click
+  ];
+
+  pythonImportsCheck = [ "jiwer" ];
+
+  meta = with lib; {
+    description = "JiWER is a simple and fast python package to evaluate an automatic speech recognition system";
+    homepage = "https://github.com/jitsi/jiwer";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ GaetanLepage ];
+  };
+}

pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix

@@ -45,6 +45,6 @@ buildPythonPackage rec {
     description = "JupyterHub Spawner using systemd for resource isolation";
     homepage = "https://github.com/jupyterhub/systemdspawner";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ costrouc erictapen ];
+    maintainers = with maintainers; [ costrouc ];
   };
 }

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

@@ -2,24 +2,33 @@
 , buildPythonPackage
 , cython
 , fetchPypi
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "lupa";
-  version = "1.14.1";
+  version = "2.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-0P1OYK0Un+JckFMOKg4DKkKm8EVfKcoO24Fw1ux1HG4=";
+    hash = "sha256-rT/vSGvnrd3TSf6anDk3iQYTEs+Y68UztIm+NPSEy3k=";
   };
 
-  nativeBuildInputs = [ cython ];
+  nativeBuildInputs = [
+    cython
+  ];
 
-  pythonImportsCheck = [ "lupa" ];
+  pythonImportsCheck = [
+    "lupa"
+  ];
 
   meta = with lib; {
     description = "Lua in Python";
     homepage = "https://github.com/scoder/lupa";
+    changelog = "https://github.com/scoder/lupa/blob/lupa-${version}/CHANGES.rst";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
   };

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

@@ -3,13 +3,14 @@
 , camel-converter
 , fetchFromGitHub
 , pythonOlder
+, setuptools
 , requests
 }:
 
 buildPythonPackage rec {
   pname = "meilisearch";
-  version = "0.25.0";
-  format = "setuptools";
+  version = "0.26.0";
+  format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
@@ -17,9 +18,13 @@ buildPythonPackage rec {
     owner = "meilisearch";
     repo = "meilisearch-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-tN6rjUozN+VqUAm4vHN3RDQoNmkPE49pSUl+zuei9lc=";
+    hash = "sha256-DhArrKIA9S/huO3QRjZNZ2xOpHybZgj6tIBKfRX6ZYg=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   propagatedBuildInputs = [
     camel-converter
     requests

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

@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "mkdocstrings-python";
-  version = "0.8.3";
+  version = "0.9.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "mkdocstrings";
     repo = "python";
     rev = version;
-    hash = "sha256-JGk6oJQ6mcLtn7SDtltsLPT+CxPZNRbq8bnY9pMcXHc=";
+    hash = "sha256-PM6J21yT5paukDB8uJkcIyy+miYwN4+gk8Ej1xI8Q1A=";
   };
 
   nativeBuildInputs = [

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

@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "msgspec";
-  version = "0.13.1";
+  version = "0.14.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "jcrist";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-Sq0hV5ZftUCIR/6QOWvdfzg8UHYLZXo5ba5ydTnjqPg=";
+    hash = "sha256-adjLXMHJx9sP5qbg9sw+fV2h843KuG1NKqNyX3gEkVY=";
   };
 
   # Requires libasan to be accessible

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

@@ -68,7 +68,7 @@ let nbclient = buildPythonPackage rec {
     homepage = "https://github.com/jupyter/nbclient";
     description = "A client library for executing notebooks";
     license = licenses.bsd3;
-    maintainers = [ maintainers.erictapen ];
+    maintainers = [ ];
   };
 };
 in nbclient

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

@@ -55,6 +55,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/mocnik-science/osm-python-tools";
     license = licenses.gpl3Only;
     changelog = "https://raw.githubusercontent.com/mocnik-science/osm-python-tools/v${version}/version-history.md";
-    maintainers = with maintainers; [ das-g erictapen ];
+    maintainers = with maintainers; [ das-g ];
   };
 }

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

@@ -6,14 +6,14 @@
 
 buildPythonPackage rec {
   pname = "peaqevcore";
-  version = "13.4.14";
+  version = "15.0.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-BTRv/vzOo5/Ak8J0wnVMxUbeYmPHAZfsISQ6eMkhHeU=";
+    hash = "sha256-UH9QlfOzMGxoLgsoVr/+OqI53YGDMXfilW9sIM3EsD8=";
   };
 
   postPatch = ''

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

@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "phonenumbers";
-  version = "8.13.6";
+  version = "8.13.7";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-+L2Sl1unRjt4KK4vleEDe34KuPAj6ej/t8Vg/X9dZtc=";
+    hash = "sha256-JTuw4BJQ0hoR8rQrPm4WG39ssqxEDi4qlcHacdIh7ho=";
   };
 
   nativeCheckInputs = [

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

@@ -3,15 +3,17 @@
 , fetchFromGitHub
 , fetchpatch
 , flask
+, hatchling
+, hatch-vcs
 , isPy27
 , pytestCheckHook
-, pythonAtLeast
-, setuptools-scm
 }:
 
 buildPythonPackage rec {
   pname = "picobox";
-  version = "2.2.0";
+  version = "3.0.0";
+
+  format = "pyproject";
 
   disabled = isPy27;
 
@@ -19,26 +21,14 @@ buildPythonPackage rec {
     owner = "ikalnytskyi";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-B2A8GMhBFU/mb/JiiqtP+HvpPj5FYwaYO3gQN2QI6z0=";
+    hash = "sha256-LQiSurL+eFRJ9iQheoo66o44BlfBtAatk8deuMFROcc=";
   };
 
-  patches = [
-    (fetchpatch {
-      # already in master, but no new release yet.
-      # https://github.com/ikalnytskyi/picobox/issues/55
-      url = "https://github.com/ikalnytskyi/picobox/commit/1fcc4a0c26a7cd50ee3ef6694139177b5dfb2be0.patch";
-      hash = "sha256-/NIEzTFlZ5wG7jHT/YdySYoxT/UhSk29Up9/VqjG/jg=";
-      includes = [
-        "tests/test_box.py"
-        "tests/test_stack.py"
-      ];
-    })
-  ];
-
   SETUPTOOLS_SCM_PRETEND_VERSION = version;
 
   nativeBuildInputs = [
-    setuptools-scm
+    hatchling
+    hatch-vcs
   ];
 
   nativeCheckInputs = [

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

@@ -2,6 +2,7 @@
 , stdenv
 , buildPythonPackage
 , fetchFromGitHub
+, fetchpatch
 , fetchurl
 , pythonOlder
 , substituteAll
@@ -48,6 +49,11 @@ let
       libpq = "${postgresql.lib}/lib/libpq${stdenv.hostPlatform.extensions.sharedLibrary}";
       libc = "${stdenv.cc.libc}/lib/libc.so.6";
     })
+    (fetchpatch {
+      name = "cython-3.0.0b1-compat.patch";
+      url = "https://github.com/psycopg/psycopg/commit/573446a14312f36257ed9dcfb8eb2756b69d5d9b.patch";
+      hash = "sha256-NWItarNb/Yyfj1avb/SXTkinVGxvWUGH8y6tR/zhVmE=";
+    })
   ];
 
   baseMeta = {
@@ -148,7 +154,6 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     psycopg-c
-  ] ++ lib.optionals (pythonOlder "3.11") [
     typing-extensions
   ] ++ lib.optionals (pythonOlder "3.9") [
     backports-zoneinfo

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

@@ -17,6 +17,7 @@
 , pytest-lazy-fixture
 , pkg-config
 , scipy
+, fetchpatch
 , setuptools-scm
 }:
 
@@ -84,6 +85,15 @@ buildPythonPackage rec {
 
   __darwinAllowLocalNetworking = true;
 
+  # fix on current master
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/apache/arrow/commit/bce43175aa8cfb4534d3efbcc092f697f25f0f5a.patch";
+      hash = "sha256-naOAQjQgSKIoCAGCKr7N4dCkOMtweAdfggGOQKDY3k0=";
+      stripLen = 1;
+    })
+  ];
+
   preBuild = ''
     export PYARROW_PARALLEL=$NIX_BUILD_CORES
   '';

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

@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "python-gvm";
-  version = "23.2.0";
+  version = "23.4.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "greenbone";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-6EmmiJjadC6zJM4+HhL8w2Xw1p7pG5LI0TS53bH61Tc=";
+    hash = "sha256-qpPoE5QSm6JwBG3842gjxGeSd87yY2/T/HFi4k8U/qY=";
   };
 
   nativeBuildInputs = [

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

@@ -35,6 +35,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/taynaud/python-louvain";
     description = "Louvain Community Detection";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ erictapen ];
+    maintainers = with maintainers; [ ];
   };
 }

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

@@ -134,7 +134,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Python bindings for Mapnik";
-    maintainers = with maintainers; [ erictapen ];
+    maintainers = with maintainers; [ ];
     homepage = "https://mapnik.org";
     license = licenses.lgpl21Plus;
   };

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

@@ -38,6 +38,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/WestHealth/pyvis";
     description = "Python package for creating and visualizing interactive network graphs";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ erictapen ];
+    maintainers = with maintainers; [ ];
   };
 }

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

@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "rapidfuzz";
-  version = "2.13.7";
+  version = "2.14.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "maxbachmann";
     repo = "RapidFuzz";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ZovXYOoLriAmJHptolD135qCn7XHeVvzLJNzI08mqwY=";
+    hash = "sha256-qZfVr1V7YBuMoFiMwRoEVosof6kCSiIb944gXzPn4P0=";
   };
 
   nativeBuildInputs = [

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

@@ -0,0 +1,47 @@
+{ fetchFromGitHub
+, buildPythonPackage
+, rustPlatform
+, setuptools-rust
+, numpy
+, fixtures
+, networkx
+, libiconv
+, stdenv
+, lib
+}:
+
+buildPythonPackage rec {
+  pname = "rustworkx";
+  version = "0.12.1";
+
+  src = fetchFromGitHub {
+    owner = "Qiskit";
+    repo = pname;
+    rev = version;
+    hash = "sha256-d/KCxhJdyzhTjwJZ+GsXJE4ww30iPaXcPngpCi4hBZw=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoTarball {
+    inherit src;
+    hash = "sha256-imhiPj763iumRQb+oeBOpICD1nCvzZx+3yQWu1QRRQQ=";
+  };
+
+  nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [
+    cargoSetupHook
+    rust.cargo
+    rust.rustc
+  ]);
+
+  buildInputs = [ numpy ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
+
+  checkInputs = [ fixtures networkx ];
+
+  pythonImportsCheck = [ "rustworkx" ];
+
+  meta = with lib; {
+    description = "A high performance Python graph library implemented in Rust.";
+    homepage = "https://github.com/Qiskit/rustworkx";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ raitobezarius ];
+  };
+}

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

@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "shtab";
-  version = "1.5.8";
+  version = "1.6.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "iterative";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-FVV8AKe3PG387jarWYbXWxwVUAX6sM89KM8MuOr5cRw=";
+    hash = "sha256-CR6fUDLjwUu2pD/1crUDPjU22evybUAfBA/YF/zf1mk=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

pkgs/development/python-modules/tensorflow/bin.nix

@@ -201,5 +201,26 @@ in buildPythonPackage {
     license = licenses.asl20;
     maintainers = with maintainers; [ jyp abbradar cdepillabout ];
     platforms = [ "x86_64-linux" "x86_64-darwin" ];
+    knownVulnerabilities = optionals (versionOlder packages.version "2.12.0") [
+      "CVE-2023-27579"
+      "CVE-2023-25801"
+      "CVE-2023-25676"
+      "CVE-2023-25675"
+      "CVE-2023-25674"
+      "CVE-2023-25673"
+      "CVE-2023-25671"
+      "CVE-2023-25670"
+      "CVE-2023-25669"
+      "CVE-2023-25668"
+      "CVE-2023-25667"
+      "CVE-2023-25665"
+      "CVE-2023-25666"
+      "CVE-2023-25664"
+      "CVE-2023-25663"
+      "CVE-2023-25662"
+      "CVE-2023-25660"
+      "CVE-2023-25659"
+      "CVE-2023-25658"
+    ];
   };
 }

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

@@ -448,6 +448,27 @@ let
       maintainers = with maintainers; [ abbradar ];
       platforms = with platforms; linux ++ darwin;
       broken = !(xlaSupport -> cudaSupport);
+      knownVulnerabilities = [
+        "CVE-2023-27579"
+        "CVE-2023-25801"
+        "CVE-2023-25676"
+        "CVE-2023-25675"
+        "CVE-2023-25674"
+        "CVE-2023-25673"
+        "CVE-2023-25671"
+        "CVE-2023-25670"
+        "CVE-2023-25669"
+        "CVE-2023-25668"
+        "CVE-2023-25667"
+        "CVE-2023-25665"
+        "CVE-2023-25666"
+        "CVE-2023-25664"
+        "CVE-2023-25663"
+        "CVE-2023-25662"
+        "CVE-2023-25660"
+        "CVE-2023-25659"
+        "CVE-2023-25658"
+      ];
     } // lib.optionalAttrs stdenv.isDarwin {
       timeout = 86400; # 24 hours
       maxSilent = 14400; # 4h, double the default of 7200s

pkgs/development/python-modules/tlslite-ng/default.nix

@@ -19,7 +19,7 @@ buildPythonPackage rec {
     description = "Pure python implementation of SSL and TLS.";
     homepage = "https://pypi.python.org/pypi/tlslite-ng";
     license = licenses.lgpl2;
-    maintainers = [ maintainers.erictapen ];
+    maintainers = [ ];
   };
 
 }

pkgs/development/python-modules/xiaomi-ble/default.nix

@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "xiaomi-ble";
-  version = "0.16.4";
+  version = "0.17.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "Bluetooth-Devices";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-ye/BuVKLNSC0zJzDyuairbrmZgQ+sX0y9bHWEfb/MJE=";
+    hash = "sha256-sXmwLXbFNckw9lCZ4V5hyZyDnStTp2x4InmoBz3c++w=";
   };
 
   nativeBuildInputs = [