Merge master into staging-next

maintainers/scripts/pluginupdate-py/pluginupdate.py

@@ -4,7 +4,7 @@
 # - pkgs/development/lua-modules/updater/updater.py
 
 # format:
-# $ nix run nixpkgs#black maintainers/scripts/pluginupdate.py
+# $ nix run nixpkgs#ruff maintainers/scripts/pluginupdate.py
 # type-check:
 # $ nix run nixpkgs#python3.pkgs.mypy maintainers/scripts/pluginupdate.py
 # linted:
@@ -142,7 +142,7 @@ class Repo:
         return loaded
 
     def prefetch(self, ref: Optional[str]) -> str:
-        print("Prefetching %s", self.uri)
+        log.info("Prefetching %s", self.uri)
         loaded = self._prefetch(ref)
         return loaded["sha256"]
 
@@ -195,7 +195,7 @@ class RepoGitHub(Repo):
             xml = req.read()
 
             # Filter out illegal XML characters
-            illegal_xml_regex = re.compile(b"[\x00-\x08\x0B-\x0C\x0E-\x1F\x7F]")
+            illegal_xml_regex = re.compile(b"[\x00-\x08\x0b-\x0c\x0e-\x1f\x7f]")
             xml = illegal_xml_regex.sub(b"", xml)
 
             root = ET.fromstring(xml)
@@ -256,13 +256,7 @@ class PluginDesc:
 
     @property
     def name(self):
-        if self.alias is None:
-            return self.repo.name
-        else:
-            return self.alias
-
-    def __lt__(self, other):
-        return self.repo.name < other.repo.name
+        return self.alias or self.repo.name
 
     @staticmethod
     def load_from_csv(config: FetchConfig, row: Dict[str, str]) -> "PluginDesc":
@@ -270,7 +264,12 @@ class PluginDesc:
         branch = row["branch"]
         repo = make_repo(row["repo"], branch.strip())
         repo.token = config.github_token
-        return PluginDesc(repo, branch.strip(), row["alias"])
+        return PluginDesc(
+            repo,
+            branch.strip(),
+            # alias is usually an empty string
+            row["alias"] if row["alias"] else None,
+        )
 
     @staticmethod
     def load_from_string(config: FetchConfig, line: str) -> "PluginDesc":
@@ -328,12 +327,11 @@ def load_plugins_from_csv(
     return plugins
 
 
-
 def run_nix_expr(expr, nixpkgs: str, **args):
-    '''
+    """
     :param expr nix expression to fetch current plugins
     :param nixpkgs Path towards a nixpkgs checkout
-    '''
+    """
     with CleanEnvironment(nixpkgs) as nix_path:
         cmd = [
             "nix",
@@ -382,16 +380,14 @@ class Editor:
         fetch_config = FetchConfig(args.proc, args.github_token)
         editor = self
         for plugin_line in args.add_plugins:
-            log.debug("using plugin_line", plugin_line)
+            log.debug("using plugin_line %s", plugin_line)
             pdesc = PluginDesc.load_from_string(fetch_config, plugin_line)
-            log.debug("loaded as pdesc", pdesc)
+            log.debug("loaded as pdesc %s", pdesc)
             append = [pdesc]
             editor.rewrite_input(
                 fetch_config, args.input_file, editor.deprecated, append=append
             )
-            plugin, _ = prefetch_plugin(
-                pdesc,
-            )
+            plugin, _ = prefetch_plugin(pdesc)
             autocommit = not args.no_commit
             if autocommit:
                 commit(
@@ -406,9 +402,9 @@ class Editor:
     # Expects arguments generated by 'update' subparser
     def update(self, args):
         """CSV spec"""
-        print("the update member function should be overriden in subclasses")
+        print("the update member function should be overridden in subclasses")
 
-    def get_current_plugins(self, nixpkgs) -> List[Plugin]:
+    def get_current_plugins(self, nixpkgs: str) -> List[Plugin]:
         """To fill the cache"""
         data = run_nix_expr(self.get_plugins, nixpkgs)
         plugins = []
@@ -440,6 +436,7 @@ class Editor:
 
             plugins, redirects = check_results(results)
 
+            plugins = sorted(plugins, key=lambda v: v[1].normalized_name)
             self.generate_nix(plugins, outfile)
 
             return redirects
@@ -559,6 +556,7 @@ class Editor:
         parser = self.create_parser()
         args = parser.parse_args()
         command = args.command or "update"
+        logging.basicConfig()
         log.setLevel(LOG_LEVELS[args.debug])
         log.info("Chose to run command: %s", command)
         self.nixpkgs = args.nixpkgs
@@ -591,25 +589,24 @@ def prefetch_plugin(
     p: PluginDesc,
     cache: "Optional[Cache]" = None,
 ) -> Tuple[Plugin, Optional[Repo]]:
-    repo, branch, alias = p.repo, p.branch, p.alias
-    name = alias or p.repo.name
     commit = None
-    log.info(f"Fetching last commit for plugin {name} from {repo.uri}@{branch}")
-    commit, date = repo.latest_commit()
+    log.info(f"Fetching last commit for plugin {p.name} from {p.repo.uri}@{p.branch}")
+    commit, date = p.repo.latest_commit()
+
     cached_plugin = cache[commit] if cache else None
     if cached_plugin is not None:
-        log.debug("Cache hit !")
-        cached_plugin.name = name
+        log.debug(f"Cache hit for {p.name}!")
+        cached_plugin.name = p.name
         cached_plugin.date = date
-        return cached_plugin, repo.redirect
+        return cached_plugin, p.repo.redirect
 
-    has_submodules = repo.has_submodules()
-    log.debug(f"prefetch {name}")
-    sha256 = repo.prefetch(commit)
+    has_submodules = p.repo.has_submodules()
+    log.debug(f"prefetch {p.name}")
+    sha256 = p.repo.prefetch(commit)
 
     return (
-        Plugin(name, commit, has_submodules, sha256, date=date),
-        repo.redirect,
+        Plugin(p.name, commit, has_submodules, sha256, date=date),
+        p.repo.redirect,
     )
 
 
@@ -624,7 +621,7 @@ def print_download_error(plugin: PluginDesc, ex: Exception):
 
 
 def check_results(
-    results: List[Tuple[PluginDesc, Union[Exception, Plugin], Optional[Repo]]]
+    results: List[Tuple[PluginDesc, Union[Exception, Plugin], Optional[Repo]]],
 ) -> Tuple[List[Tuple[PluginDesc, Plugin]], Redirects]:
     """ """
     failures: List[Tuple[PluginDesc, Exception]] = []
@@ -642,10 +639,9 @@ def check_results(
 
     print(f"{len(results) - len(failures)} plugins were checked", end="")
     if len(failures) == 0:
-        print()
         return plugins, redirects
     else:
-        print(f", {len(failures)} plugin(s) could not be downloaded:\n")
+        log.error(f", {len(failures)} plugin(s) could not be downloaded:\n")
 
         for plugin, exception in failures:
             print_download_error(plugin, exception)
@@ -738,10 +734,7 @@ def rewrite_input(
     append: List[PluginDesc] = [],
 ):
     log.info("Rewriting input file %s", input_file)
-    plugins = load_plugins_from_csv(
-        config,
-        input_file,
-    )
+    plugins = load_plugins_from_csv(config, input_file)
 
     plugins.extend(append)
 
@@ -753,15 +746,25 @@ def rewrite_input(
             deprecations = json.load(f)
         # TODO parallelize this step
         for pdesc, new_repo in redirects.items():
-            log.info("Rewriting input file %s", input_file)
+            log.info("Resolving deprecated plugin %s -> %s", pdesc.name, new_repo.name)
             new_pdesc = PluginDesc(new_repo, pdesc.branch, pdesc.alias)
+
             old_plugin, _ = prefetch_plugin(pdesc)
             new_plugin, _ = prefetch_plugin(new_pdesc)
+
             if old_plugin.normalized_name != new_plugin.normalized_name:
                 deprecations[old_plugin.normalized_name] = {
                     "new": new_plugin.normalized_name,
                     "date": cur_date_iso,
                 }
+
+            # remove plugin from index file, so we won't add it to deprecations again
+            for i, plugin in enumerate(plugins):
+                if plugin.name == pdesc.name:
+                    plugins.pop(i)
+                    break
+            plugins.append(new_pdesc)
+
         with open(deprecated, "w") as f:
             json.dump(deprecations, f, indent=4, sort_keys=True)
             f.write("\n")
@@ -772,7 +775,7 @@ def rewrite_input(
         fieldnames = ["repo", "branch", "alias"]
         writer = csv.DictWriter(f, fieldnames, dialect="unix", quoting=csv.QUOTE_NONE)
         writer.writeheader()
-        for plugin in sorted(plugins):
+        for plugin in sorted(plugins, key=lambda x: x.name):
             writer.writerow(asdict(plugin))
 
 
@@ -792,9 +795,11 @@ def update_plugins(editor: Editor, args):
 
     log.info("Start updating plugins")
     if args.proc > 1 and args.github_token == None:
-        log.warning("You have enabled parallel updates but haven't set a github token.\n"
-        "You may be hit with `HTTP Error 429: too many requests` as a consequence."
-        "Either set --proc=1 or --github-token=YOUR_TOKEN. ")
+        log.warning(
+            "You have enabled parallel updates but haven't set a github token.\n"
+            "You may be hit with `HTTP Error 429: too many requests` as a consequence."
+            "Either set --proc=1 or --github-token=YOUR_TOKEN. "
+        )
 
     fetch_config = FetchConfig(args.proc, args.github_token)
     update = editor.get_update(args.input_file, args.outfile, fetch_config)
@@ -810,11 +815,9 @@ def update_plugins(editor: Editor, args):
     if autocommit:
         try:
             repo = git.Repo(os.getcwd())
-            updated = datetime.now(tz=UTC).strftime('%Y-%m-%d')
+            updated = datetime.now(tz=UTC).strftime("%Y-%m-%d")
             print(args.outfile)
-            commit(repo,
-                   f"{editor.attr_path}: update on {updated}", [args.outfile]
-                   )
+            commit(repo, f"{editor.attr_path}: update on {updated}", [args.outfile])
         except git.InvalidGitRepositoryError as e:
             print(f"Not in a git repository: {e}", file=sys.stderr)
             sys.exit(1)

pkgs/applications/editors/kakoune/plugins/update.py

@@ -2,49 +2,63 @@
 #!nix-shell update-shell.nix -i python3
 
 # format:
-# $ nix run nixpkgs.python3Packages.black -c black update.py
+# $ nix run nixpkgs#python3Packages.ruff -- update.py
 # type-check:
-# $ nix run nixpkgs.python3Packages.mypy -c mypy update.py
+# $ nix run nixpkgs#python3Packages.mypy -- update.py
 # linted:
-# $ nix run nixpkgs.python3Packages.flake8 -c flake8 --ignore E501,E265,E402 update.py
+# $ nix run nixpkgs#python3Packages.flake8 -- --ignore E501,E265,E402 update.py
 
 import inspect
 import os
 import sys
-from typing import List, Tuple
 from pathlib import Path
+from typing import List, Tuple
 
 # Import plugin update library from maintainers/scripts/pluginupdate.py
-ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))) # type: ignore
+ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))))  # type: ignore
 sys.path.insert(
     0, os.path.join(ROOT.parent.parent.parent.parent.parent, "maintainers", "scripts")
 )
 import pluginupdate
 
-GET_PLUGINS = f"""(with import <localpkgs> {{}};
+GET_PLUGINS = f"""(
+with import <localpkgs> {{ }};
 let
-  inherit (kakouneUtils.override {{}}) buildKakounePluginFrom2Nix;
+  inherit (kakouneUtils.override {{ }}) buildKakounePluginFrom2Nix;
   generated = callPackage {ROOT}/generated.nix {{
     inherit buildKakounePluginFrom2Nix;
   }};
-  hasChecksum = value: lib.isAttrs value && lib.hasAttrByPath ["src" "outputHash"] value;
-  getChecksum = name: value:
-    if hasChecksum value then {{
-      submodules = value.src.fetchSubmodules or false;
-      sha256 = value.src.outputHash;
-      rev = value.src.rev;
-    }} else null;
+  hasChecksum =
+    value:
+    lib.isAttrs value
+    && lib.hasAttrByPath [
+      "src"
+      "outputHash"
+    ] value;
+  getChecksum =
+    name: value:
+    if hasChecksum value then
+      {{
+        submodules = value.src.fetchSubmodules or false;
+        sha256 = value.src.outputHash;
+        rev = value.src.rev;
+      }}
+    else
+      null;
   checksums = lib.mapAttrs getChecksum generated;
-in lib.filterAttrs (n: v: v != null) checksums)"""
+in
+lib.filterAttrs (n: v: v != null) checksums
+)"""
+
+HEADER = "# This file has been @generated by ./pkgs/applications/editors/kakoune/plugins/update.py. Do not edit!"
 
-HEADER = "# This file has been generated by ./pkgs/applications/editors/kakoune/plugins/update.py. Do not edit!"
 
 class KakouneEditor(pluginupdate.Editor):
-
-
-    def generate_nix(self, plugins: List[Tuple[pluginupdate.PluginDesc, pluginupdate.Plugin]], outfile: str):
-        sorted_plugins = sorted(plugins, key=lambda v: v[1].name.lower())
-
+    def generate_nix(
+        self,
+        plugins: List[Tuple[pluginupdate.PluginDesc, pluginupdate.Plugin]],
+        outfile: str,
+    ):
         with open(outfile, "w+") as f:
             f.write(HEADER)
             f.write(
@@ -54,7 +68,7 @@ let
 packages = ( self:
 {"""
             )
-            for pluginDesc, plugin in sorted_plugins:
+            for pluginDesc, plugin in plugins:
                 f.write(
                     f"""
   {plugin.normalized_name} = buildKakounePluginFrom2Nix {{

pkgs/applications/editors/lapce/default.nix

@@ -1,28 +1,25 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, nix-update-script
-, rustPlatform
-, cmake
-, pkg-config
-, perl
-, python3
-, fontconfig
-, glib
-, gtk3
-, openssl
-, libGL
-, libobjc
-, libxkbcommon
-, Security
-, CoreServices
-, ApplicationServices
-, Carbon
-, AppKit
-, wrapGAppsHook3
-, wayland
-, gobject-introspection
-, xorg
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  nix-update-script,
+  rustPlatform,
+  cmake,
+  pkg-config,
+  perl,
+  python3,
+  fontconfig,
+  glib,
+  gtk3,
+  openssl,
+  libGL,
+  libobjc,
+  libxkbcommon,
+  wrapGAppsHook3,
+  wayland,
+  gobject-introspection,
+  xorg,
+  apple-sdk_11,
 }:
 let
   rpathLibs = lib.optionals stdenv.hostPlatform.isLinux [
@@ -85,33 +82,37 @@ rustPlatform.buildRustPackage rec {
     gobject-introspection
   ];
 
-  buildInputs = rpathLibs ++ [
-    glib
-    gtk3
-    openssl
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [
-    fontconfig
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    libobjc
-    Security
-    CoreServices
-    ApplicationServices
-    Carbon
-    AppKit
-  ];
+  buildInputs =
+    rpathLibs
+    ++ [
+      glib
+      gtk3
+      openssl
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      fontconfig
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      libobjc
+      apple-sdk_11
+    ];
 
-  postInstall = if stdenv.hostPlatform.isLinux then ''
-    install -Dm0644 $src/extra/images/logo.svg $out/share/icons/hicolor/scalable/apps/dev.lapce.lapce.svg
-    install -Dm0644 $src/extra/linux/dev.lapce.lapce.desktop $out/share/applications/lapce.desktop
+  postInstall =
+    if stdenv.hostPlatform.isLinux then
+      ''
+        install -Dm0644 $src/extra/images/logo.svg $out/share/icons/hicolor/scalable/apps/dev.lapce.lapce.svg
+        install -Dm0644 $src/extra/linux/dev.lapce.lapce.desktop $out/share/applications/lapce.desktop
 
-    $STRIP -S $out/bin/lapce
+        $STRIP -S $out/bin/lapce
 
-    patchelf --add-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/lapce
-  '' else ''
-    mkdir $out/Applications
-    cp -r extra/macos/Lapce.app $out/Applications
-    ln -s $out/bin $out/Applications/Lapce.app/Contents/MacOS
-  '';
+        patchelf --add-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/lapce
+      ''
+    else
+      ''
+        mkdir $out/Applications
+        cp -r extra/macos/Lapce.app $out/Applications
+        ln -s $out/bin $out/Applications/Lapce.app/Contents/MacOS
+      '';
 
   dontPatchELF = true;
 
@@ -124,7 +125,5 @@ rustPlatform.buildRustPackage rec {
     license = with licenses; [ asl20 ];
     maintainers = with maintainers; [ elliot ];
     mainProgram = "lapce";
-    # Undefined symbols for architecture x86_64: "_NSPasteboardTypeFileURL"
-    broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64;
   };
 }

pkgs/applications/editors/vim/plugins/update.py

@@ -3,7 +3,7 @@
 # run with:
 # $ nix run .\#vimPluginsUpdater
 # format:
-# $ nix run nixpkgs#python3Packages.black -- update.py
+# $ nix run nixpkgs#python3Packages.ruff -- update.py
 # type-check:
 # $ nix run nixpkgs#python3Packages.mypy -- update.py
 # linted:
@@ -19,30 +19,24 @@
 #
 
 import inspect
-import os
-import logging
-import textwrap
 import json
+import logging
+import os
 import subprocess
-from typing import List, Tuple
+import textwrap
 from pathlib import Path
-
+from typing import List, Tuple
 
 log = logging.getLogger("vim-updater")
 
-sh = logging.StreamHandler()
-formatter = logging.Formatter("%(name)s:%(levelname)s: %(message)s")
-sh.setFormatter(formatter)
-log.addHandler(sh)
-
 # Import plugin update library from maintainers/scripts/pluginupdate.py
 ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))))
-import pluginupdate
 import importlib
-from pluginupdate import run_nix_expr, PluginDesc
 
-treesitter = importlib.import_module('nvim-treesitter.update')
+import pluginupdate
+from pluginupdate import PluginDesc, run_nix_expr
 
+treesitter = importlib.import_module("nvim-treesitter.update")
 
 
 HEADER = (
@@ -56,17 +50,14 @@ class VimEditor(pluginupdate.Editor):
     nvim_treesitter_updated = False
 
     def generate_nix(
-        self,
-        plugins: List[Tuple[PluginDesc, pluginupdate.Plugin]],
-        outfile: str
+        self, plugins: List[Tuple[PluginDesc, pluginupdate.Plugin]], outfile: str
     ):
         log.info("Generating nix code")
-        sorted_plugins = sorted(plugins, key=lambda v: v[0].name.lower())
         log.debug("Loading nvim-treesitter revision from nix...")
         nvim_treesitter_rev = pluginupdate.run_nix_expr(
             "(import <localpkgs> { }).vimPlugins.nvim-treesitter.src.rev",
             self.nixpkgs,
-            timeout=10
+            timeout=10,
         )
 
         GET_PLUGINS_LUA = """
@@ -98,7 +89,7 @@ class VimEditor(pluginupdate.Editor):
                 """
                 )
             )
-            for pdesc, plugin in sorted_plugins:
+            for pdesc, plugin in plugins:
                 content = self.plugin2nix(pdesc, plugin, _isNeovimPlugin(plugin))
                 f.write(content)
                 if (
@@ -109,8 +100,9 @@ class VimEditor(pluginupdate.Editor):
             f.write("\n}\n")
         print(f"updated {outfile}")
 
-    def plugin2nix(self, pdesc: PluginDesc, plugin: pluginupdate.Plugin, isNeovim: bool) -> str:
-
+    def plugin2nix(
+        self, pdesc: PluginDesc, plugin: pluginupdate.Plugin, isNeovim: bool
+    ) -> str:
         repo = pdesc.repo
 
         content = f"  {plugin.normalized_name} = "
@@ -138,19 +130,25 @@ class VimEditor(pluginupdate.Editor):
         if self.nvim_treesitter_updated:
             print("updating nvim-treesitter grammars")
             cmd = [
-                "nix", "build",
-                "vimPlugins.nvim-treesitter.src", "-f", self.nixpkgs
-                , "--print-out-paths"
+                "nix",
+                "build",
+                "vimPlugins.nvim-treesitter.src",
+                "-f",
+                self.nixpkgs,
+                "--print-out-paths",
             ]
             log.debug("Running command: %s", " ".join(cmd))
-            nvim_treesitter_dir = subprocess.check_output(cmd, text=True, timeout=90).strip()
+            nvim_treesitter_dir = subprocess.check_output(
+                cmd, text=True, timeout=90
+            ).strip()
 
             generated = treesitter.update_grammars(nvim_treesitter_dir)
             treesitter_generated_nix_path = os.path.join(
-                NIXPKGS_NVIMTREESITTER_FOLDER,
-                "generated.nix"
+                NIXPKGS_NVIMTREESITTER_FOLDER, "generated.nix"
+            )
+            open(os.path.join(args.nixpkgs, treesitter_generated_nix_path), "w").write(
+                generated
             )
-            open(os.path.join(args.nixpkgs, treesitter_generated_nix_path), "w").write(generated)
 
             if self.nixpkgs_repo:
                 index = self.nixpkgs_repo.index

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

@@ -116,9 +116,10 @@ https://github.com/AndrewRadev/bufferize.vim/,HEAD,
 https://github.com/akinsho/bufferline.nvim/,,
 https://github.com/kwkarlwang/bufjump.nvim/,HEAD,
 https://github.com/bullets-vim/bullets.vim/,,
-https://github.com/mattn/calendar-vim/,,mattn-calendar-vim
 https://github.com/itchyny/calendar.vim/,,
 https://github.com/bkad/camelcasemotion/,,
+https://github.com/catppuccin/nvim/,,catppuccin-nvim
+https://github.com/catppuccin/vim/,HEAD,catppuccin-vim
 https://github.com/tyru/caw.vim/,,
 https://github.com/uga-rosa/ccc.nvim/,HEAD,
 https://github.com/Eandrju/cellular-automaton.nvim/,HEAD,
@@ -299,6 +300,7 @@ https://github.com/direnv/direnv.vim/,,
 https://github.com/chipsenkbeil/distant.nvim/,HEAD,
 https://github.com/doki-theme/doki-theme-vim/,,
 https://github.com/NTBBloodbath/doom-one.nvim/,,
+https://github.com/dracula/vim/,,dracula-vim
 https://github.com/Mofiqul/dracula.nvim/,HEAD,
 https://github.com/stevearc/dressing.nvim/,,
 https://github.com/Bekaboo/dropbar.nvim/,HEAD,
@@ -313,6 +315,7 @@ https://github.com/creativenull/efmls-configs-nvim/,,
 https://github.com/elixir-tools/elixir-tools.nvim/,HEAD,
 https://github.com/elmcast/elm-vim/,,
 https://github.com/dmix/elvish.vim/,,
+https://github.com/embark-theme/vim/,,embark-vim
 https://github.com/mattn/emmet-vim/,,
 https://github.com/vim-scripts/emodeline/,,
 https://github.com/vim-scripts/errormarker.vim/,,
@@ -361,6 +364,7 @@ https://github.com/gfanto/fzf-lsp.nvim/,,
 https://github.com/ibhagwan/fzf-lua/,HEAD,
 https://github.com/junegunn/fzf.vim/,,
 https://github.com/NTBBloodbath/galaxyline.nvim/,,
+https://github.com/gbprod/nord.nvim/,,gbprod-nord
 https://github.com/jsfaint/gen_tags.vim/,,
 https://github.com/gentoo/gentoo-syntax/,,
 https://github.com/ndmitchell/ghcid/,,
@@ -389,9 +393,9 @@ https://github.com/liuchengxu/graphviz.vim/,,
 https://github.com/cbochs/grapple.nvim/,HEAD,
 https://github.com/blazkowolf/gruber-darker.nvim/,,
 https://github.com/MagicDuck/grug-far.nvim/,,
-https://github.com/gruvbox-community/gruvbox/,,gruvbox-community
 https://github.com/morhetz/gruvbox/,,
 https://github.com/luisiacc/gruvbox-baby/,HEAD,
+https://github.com/gruvbox-community/gruvbox/,,gruvbox-community
 https://github.com/eddyekofo94/gruvbox-flat.nvim/,,
 https://github.com/sainnhe/gruvbox-material/,,
 https://github.com/f4z3r/gruvbox-material.nvim/,HEAD,
@@ -404,8 +408,8 @@ https://github.com/junegunn/gv.vim/,,
 https://github.com/TheSnakeWitcher/hardhat.nvim/,HEAD,
 https://github.com/m4xshen/hardtime.nvim/,HEAD,
 https://git.sr.ht/~sircmpwn/hare.vim,HEAD,
-https://github.com/ThePrimeagen/harpoon/,harpoon2,harpoon2
 https://github.com/ThePrimeagen/harpoon/,master,
+https://github.com/ThePrimeagen/harpoon/,harpoon2,harpoon2
 https://github.com/kiyoon/haskell-scope-highlighting.nvim/,HEAD,
 https://github.com/mrcjkb/haskell-snippets.nvim/,HEAD,
 https://github.com/neovimhaskell/haskell-vim/,,
@@ -434,7 +438,6 @@ https://github.com/idris-hackers/idris-vim/,,
 https://github.com/ShinKage/idris2-nvim/,,
 https://github.com/edwinb/idris2-vim/,,
 https://github.com/3rd/image.nvim/,HEAD,
-https://github.com/samodostal/image.nvim/,HEAD,samodostal-image-nvim
 https://github.com/HakonHarnes/img-clip.nvim/,HEAD,
 https://github.com/lewis6991/impatient.nvim/,,
 https://github.com/backdround/improved-search.nvim/,HEAD,
@@ -447,7 +450,6 @@ https://github.com/Darazaki/indent-o-matic/,,
 https://github.com/Yggdroot/indentLine/,,
 https://github.com/ciaranm/inkpot/,,
 https://github.com/jbyuki/instant.nvim/,HEAD,
-https://github.com/jbyuki/one-small-step-for-vimkind/,HEAD,
 https://github.com/pta2002/intellitab.nvim/,HEAD,
 https://github.com/parsonsmatt/intero-neovim/,,
 https://github.com/keith/investigate.vim/,,
@@ -544,6 +546,7 @@ https://github.com/williamboman/mason.nvim/,HEAD,
 https://github.com/vim-scripts/matchit.zip/,,
 https://github.com/marko-cerovac/material.nvim/,,
 https://github.com/kaicataldo/material.vim/,HEAD,
+https://github.com/mattn/calendar-vim/,,mattn-calendar-vim
 https://github.com/vim-scripts/mayansmoke/,,
 https://github.com/chikamichi/mediawiki.vim/,HEAD,
 https://github.com/savq/melange-nvim/,,
@@ -602,7 +605,6 @@ https://github.com/miikanissi/modus-themes.nvim/,HEAD,
 https://github.com/tomasr/molokai/,,
 https://github.com/benlubas/molten-nvim/,HEAD,
 https://github.com/loctvl842/monokai-pro.nvim/,HEAD,
-https://github.com/shaunsingh/moonlight.nvim/,,pure-lua
 https://github.com/leafo/moonscript-vim/,HEAD,
 https://github.com/yegappan/mru/,,
 https://github.com/smoka7/multicursors.nvim/,HEAD,
@@ -673,7 +675,6 @@ https://github.com/stevanmilic/neotest-scala/,HEAD,
 https://github.com/shunsambongi/neotest-testthat/,HEAD,
 https://github.com/marilari88/neotest-vitest/,HEAD,
 https://github.com/lawrence-laz/neotest-zig/,HEAD,
-https://github.com/rose-pine/neovim/,main,rose-pine
 https://github.com/Shatur/neovim-ayu/,,
 https://github.com/cloudhead/neovim-fuzzy/,,
 https://github.com/jeffkreeftmeijer/neovim-sensible/,,
@@ -688,6 +689,7 @@ https://github.com/fiatjaf/neuron.vim/,,
 https://github.com/Olical/nfnl/,main,
 https://github.com/chr4/nginx.vim/,,
 https://github.com/oxfist/night-owl.nvim/,,
+https://github.com/bluz71/vim-nightfly-colors/,,nightfly
 https://github.com/EdenEast/nightfox.nvim/,,
 https://github.com/Alexis12119/nightly.nvim/,,
 https://github.com/zah/nim.vim/,,
@@ -699,7 +701,7 @@ https://github.com/shortcuts/no-neck-pain.nvim/,HEAD,
 https://github.com/kartikp10/noctis.nvim/,,
 https://github.com/folke/noice.nvim/,HEAD,
 https://github.com/nvimtools/none-ls.nvim/,HEAD,
-https://github.com/gbprod/nord.nvim/,,gbprod-nord
+https://github.com/nordtheme/vim/,,nord-vim
 https://github.com/shaunsingh/nord.nvim/,,
 https://github.com/andersevenrud/nordic.nvim/,,
 https://github.com/vigoux/notifier.nvim/,HEAD,
@@ -708,8 +710,8 @@ https://github.com/MunifTanjim/nui.nvim/,main,
 https://github.com/jose-elias-alvarez/null-ls.nvim/,,
 https://github.com/nacro90/numb.nvim/,,
 https://github.com/nvchad/nvchad/,HEAD,
+https://github.com/nvchad/ui/,HEAD,nvchad-ui
 https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/,,
-https://github.com/catppuccin/nvim/,,catppuccin-nvim
 https://github.com/AckslD/nvim-FeMaco.lua/,HEAD,
 https://github.com/nathanmsmith/nvim-ale-diagnostic/,,
 https://github.com/windwp/nvim-autopairs/,,
@@ -825,6 +827,7 @@ https://github.com/nomnivore/ollama.nvim/,HEAD,
 https://github.com/yonlu/omni.vim/,,
 https://github.com/Hoffs/omnisharp-extended-lsp.nvim/,HEAD,
 https://github.com/Th3Whit3Wolf/one-nvim/,,
+https://github.com/jbyuki/one-small-step-for-vimkind/,HEAD,
 https://github.com/navarasu/onedark.nvim/,,
 https://github.com/joshdick/onedark.vim/,,
 https://github.com/LunarVim/onedarker.nvim/,,
@@ -854,6 +857,7 @@ https://github.com/olimorris/persisted.nvim/,HEAD,
 https://github.com/folke/persistence.nvim/,,
 https://github.com/pest-parser/pest.vim/,HEAD,
 https://github.com/lifepillar/pgsql.vim/,,
+https://github.com/phha/zenburn.nvim/,,phha-zenburn
 https://github.com/motus/pig.vim/,,
 https://github.com/weirongxu/plantuml-previewer.vim/,HEAD,
 https://github.com/aklt/plantuml-syntax/,,
@@ -873,6 +877,7 @@ https://github.com/ahmedkhalf/project.nvim/,,
 https://github.com/kevinhwang91/promise-async/,HEAD,
 https://github.com/frigoeu/psc-ide-vim/,,
 https://github.com/Shougo/pum.vim/,HEAD,
+https://github.com/shaunsingh/moonlight.nvim/,,pure-lua
 https://github.com/purescript-contrib/purescript-vim/,,
 https://github.com/python-mode/python-mode/,,
 https://github.com/vim-python/python-syntax/,,
@@ -905,6 +910,7 @@ https://github.com/gu-fan/riv.vim/,,
 https://github.com/kevinhwang91/rnvimr/,,
 https://github.com/mfukar/robotframework-vim/,,
 https://github.com/ron-rs/ron.vim/,,
+https://github.com/rose-pine/neovim/,main,rose-pine
 https://github.com/jmederosalvarado/roslyn.nvim/,HEAD,
 https://github.com/keith/rspec.vim/,,
 https://github.com/ccarpita/rtorrent-syntax-file/,,
@@ -912,6 +918,7 @@ https://github.com/simrat39/rust-tools.nvim/,,
 https://github.com/rust-lang/rust.vim/,,
 https://github.com/hauleth/sad.vim/,,
 https://github.com/vmware-archive/salt-vim/,,
+https://github.com/samodostal/image.nvim/,HEAD,samodostal-image-nvim
 https://github.com/lewis6991/satellite.nvim/,HEAD,
 https://github.com/davidgranstrom/scnvim/,HEAD,
 https://github.com/tiagovla/scope.nvim/,HEAD,
@@ -935,8 +942,8 @@ https://github.com/mrjones2014/smart-splits.nvim/,,
 https://github.com/m4xshen/smartcolumn.nvim/,,
 https://github.com/gorkunov/smartpairs.vim/,,
 https://github.com/ibhagwan/smartyank.nvim/,,
-https://github.com/camspiers/snap/,,
 https://github.com/folke/snacks.nvim/,HEAD,
+https://github.com/camspiers/snap/,,
 https://github.com/norcalli/snippets.nvim/,,
 https://github.com/shaunsingh/solarized.nvim/,HEAD,
 https://github.com/sainnhe/sonokai/,,
@@ -1068,7 +1075,6 @@ https://github.com/jose-elias-alvarez/typescript.nvim/,,
 https://github.com/MrPicklePinosaur/typst-conceal.vim/,HEAD,
 https://github.com/chomosuke/typst-preview.nvim/,HEAD,
 https://github.com/kaarmu/typst.vim/,HEAD,
-https://github.com/nvchad/ui/,HEAD,nvchad-ui
 https://github.com/altermo/ultimate-autopair.nvim/,HEAD,
 https://github.com/SirVer/ultisnips/,,
 https://github.com/mbbill/undotree/,,
@@ -1084,11 +1090,6 @@ https://github.com/junegunn/vader.vim/,,
 https://github.com/jbyuki/venn.nvim/,,
 https://github.com/vhda/verilog_systemverilog.vim/,,
 https://github.com/vifm/vifm.vim/,,
-https://github.com/catppuccin/vim/,HEAD,catppuccin-vim
-https://github.com/dracula/vim/,,dracula-vim
-https://github.com/embark-theme/vim/,,embark-vim
-https://github.com/nordtheme/vim/,,nord-vim
-https://github.com/inkarkat/vim-AdvancedSorters/,,vim-advanced-sorters
 https://github.com/Konfekt/vim-CtrlXA/,,
 https://github.com/konfekt/vim-DetectSpellLang/,,
 https://github.com/dpelle/vim-LanguageTool/,,
@@ -1115,6 +1116,7 @@ https://github.com/MarcWeber/vim-addon-sql/,,
 https://github.com/MarcWeber/vim-addon-syntax-checker/,,
 https://github.com/MarcWeber/vim-addon-toggle-buffer/,,
 https://github.com/MarcWeber/vim-addon-xdebug/,,
+https://github.com/inkarkat/vim-AdvancedSorters/,,vim-advanced-sorters
 https://github.com/junegunn/vim-after-object/,,
 https://github.com/danilo-augusto/vim-afterglow/,HEAD,
 https://github.com/msuperdock/vim-agda/,HEAD,
@@ -1191,6 +1193,7 @@ https://github.com/kristijanhusak/vim-dirvish-git/,,
 https://github.com/tpope/vim-dispatch/,,
 https://github.com/radenling/vim-dispatch-neovim/,,
 https://github.com/jhradilek/vim-docbk/,,
+https://github.com/jhradilek/vim-snippets/,,vim-docbk-snippets
 https://github.com/tpope/vim-dotenv/,,
 https://github.com/junegunn/vim-easy-align/,,
 https://github.com/zhou13/vim-easyescape/,,
@@ -1344,7 +1347,6 @@ https://github.com/jistr/vim-nerdtree-tabs/,,
 https://github.com/nfnty/vim-nftables/,,
 https://github.com/kana/vim-niceblock/,,
 https://github.com/nickel-lang/vim-nickel/,main,
-https://github.com/bluz71/vim-nightfly-colors/,,nightfly
 https://github.com/tommcdo/vim-ninja-feet/,,
 https://github.com/LnL7/vim-nix/,,
 https://github.com/symphorien/vim-nixhash/,,
@@ -1436,7 +1438,6 @@ https://github.com/bohlender/vim-smt2/,,
 https://github.com/justinmk/vim-sneak/,,
 https://github.com/garbas/vim-snipmate/,,
 https://github.com/honza/vim-snippets/,,
-https://github.com/jhradilek/vim-snippets/,,vim-docbk-snippets
 https://github.com/lifepillar/vim-solarized8/,HEAD,
 https://github.com/tomlion/vim-solidity/,,
 https://github.com/christoomey/vim-sort-motion/,,
@@ -1565,7 +1566,6 @@ https://github.com/Lilja/zellij.nvim/,HEAD,
 https://github.com/folke/zen-mode.nvim/,,
 https://github.com/zenbones-theme/zenbones.nvim/,HEAD,
 https://github.com/jnurmine/zenburn/,,
-https://github.com/phha/zenburn.nvim/,,phha-zenburn
 https://github.com/nvimdev/zephyr-nvim/,,
 https://github.com/ziglang/zig.vim/,,
 https://github.com/zk-org/zk-nvim/,HEAD,

pkgs/applications/misc/blender/fix-include.patch

@@ -1,12 +0,0 @@
-diff --git a/intern/smoke/intern/WAVELET_NOISE.h b/intern/smoke/intern/WAVELET_NOISE.h
-index fce901b..1f73c5e 100644
---- a/intern/smoke/intern/WAVELET_NOISE.h
-+++ b/intern/smoke/intern/WAVELET_NOISE.h
-@@ -43,6 +43,7 @@
- #ifndef WAVELET_NOISE_H
- #define WAVELET_NOISE_H
- 
-+#include <string.h>
- #include <MERSENNETWISTER.h>
- 
- #ifdef WIN32

pkgs/applications/networking/browsers/firefox/rust-1.78.patch

@@ -1,77 +0,0 @@
-From 9dd8048e28b65da0b904dfbace482f70ae768fd8 Mon Sep 17 00:00:00 2001
-From: Jeff Muizelaar <jmuizelaar@mozilla.com>
-Date: Tue, 5 Mar 2024 04:12:28 +0100
-Subject: [PATCH] Bug 1882291. Switch to stdarch_arm_neon_intrinsics feature on
- rust >=1.78. r=glandium
-
-We only need this on ARM32 because the ARM64 intrinsics are stable.
-
-stdarch_arm_neon_intrinsics was split out from stdsimd here:
-https://github.com/rust-lang/stdarch/pull/1486
-
-Differential Revision: https://phabricator.services.mozilla.com/D203039
----
- Cargo.lock          | 1 +
- gfx/qcms/Cargo.toml | 3 +++
- gfx/qcms/build.rs   | 7 +++++++
- gfx/qcms/src/lib.rs | 6 ++++--
- 4 files changed, 15 insertions(+), 2 deletions(-)
- create mode 100644 gfx/qcms/build.rs
-
-diff --git a/Cargo.lock b/Cargo.lock
-index aba397832e..8f0a879a87 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -4276,6 +4276,7 @@ name = "qcms"
- version = "0.2.0"
- dependencies = [
-  "libc",
-+ "version_check",
- ]
- 
- [[package]]
-diff --git a/gfx/qcms/Cargo.toml b/gfx/qcms/Cargo.toml
-index e976054a7b..f50d6623a1 100644
---- a/gfx/qcms/Cargo.toml
-+++ b/gfx/qcms/Cargo.toml
-@@ -20,3 +20,6 @@ cmyk = []
- 
- [dependencies]
- libc = {version = "0.2", optional = true }
-+
-+[build-dependencies]
-+version_check = "0.9"
-diff --git a/gfx/qcms/build.rs b/gfx/qcms/build.rs
-new file mode 100644
-index 0000000000..6810a8828e
---- /dev/null
-+++ b/gfx/qcms/build.rs
-@@ -0,0 +1,7 @@
-+extern crate version_check as rustc;
-+
-+fn main() {
-+    if rustc::is_min_version("1.78.0").unwrap_or(false) {
-+        println!("cargo:rustc-cfg=stdsimd_split");
-+    }
-+}
-diff --git a/gfx/qcms/src/lib.rs b/gfx/qcms/src/lib.rs
-index c311964ee3..fc496816a8 100644
---- a/gfx/qcms/src/lib.rs
-+++ b/gfx/qcms/src/lib.rs
-@@ -7,9 +7,11 @@
- #![allow(non_upper_case_globals)]
- // These are needed for the neon SIMD code and can be removed once the MSRV supports the
- // instrinsics we use
--#![cfg_attr(feature = "neon", feature(stdsimd))]
-+#![cfg_attr(all(stdsimd_split, target_arch = "arm", feature = "neon"), feature(stdarch_arm_neon_intrinsics))]
-+#![cfg_attr(all(stdsimd_split, target_arch = "arm", feature = "neon"), feature(stdarch_arm_feature_detection))]
-+#![cfg_attr(all(not(stdsimd_split), target_arch = "arm", feature = "neon"), feature(stdsimd))]
- #![cfg_attr(
--    feature = "neon",
-+    all(target_arch = "arm", feature = "neon"),
-     feature(arm_target_feature, raw_ref_op)
- 
- )]
--- 
-2.44.0
-

pkgs/applications/networking/irc/tiny/Cargo.lock.patch

@@ -1,11 +0,0 @@
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -1535,7 +1535,7 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
- 
- [[package]]
- name = "tiny"
--version = "0.10.0"
-+version = "0.11.0"
- dependencies = [
-  "clap",
-  "dirs",

pkgs/applications/science/electronics/caneda/gcc6.patch

@@ -1,13 +0,0 @@
-diff --git c/src/cgraphicsscene.cpp i/src/cgraphicsscene.cpp
-index ac2929a..c399706 100644
---- c/src/cgraphicsscene.cpp
-+++ i/src/cgraphicsscene.cpp
-@@ -1436,7 +1436,7 @@ namespace Caneda
-             QPointF newPos = m_currentWiringWire->mapFromScene(pos);
-             QPointF refPos = m_currentWiringWire->port1()->pos();
- 
--            if( abs(refPos.x()-newPos.x()) > abs(refPos.y()-newPos.y()) ) {
-+            if( (refPos.x()-newPos.x()) > (refPos.y()-newPos.y()) ) {
-                 m_currentWiringWire->movePort2(QPointF(newPos.x(), refPos.y()));
-             }
-             else {

pkgs/by-name/cz/czkawka/0000-time.diff

@@ -1,28 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 5ae2bd6..e4c6f18 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -5676,9 +5676,9 @@ dependencies = [
- 
- [[package]]
- name = "time"
--version = "0.3.34"
-+version = "0.3.36"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
-+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
- dependencies = [
-  "deranged",
-  "itoa",
-@@ -5699,9 +5699,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
- 
- [[package]]
- name = "time-macros"
--version = "0.2.17"
-+version = "0.2.18"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
-+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
- dependencies = [
-  "num-conv",
-  "time-core",

pkgs/by-name/lu/luarocks-packages-updater/updater.py

@@ -1,26 +1,26 @@
 #!/usr/bin/env python
 # format:
-# $ nix run nixpkgs#python3Packages.black -- update.py
+# $ nix run nixpkgs#python3Packages.ruff -- update.py
 # type-check:
 # $ nix run nixpkgs#python3Packages.mypy -- update.py
 # linted:
 # $ nix run nixpkgs#python3Packages.flake8 -- --ignore E501,E265,E402 update.py
 
-import inspect
-import os
-import tempfile
-import shutil
-from dataclasses import dataclass
-import subprocess
 import csv
+import inspect
 import logging
+import os
+import shutil
+import subprocess
+import tempfile
 import textwrap
+from dataclasses import dataclass
 from multiprocessing.dummy import Pool
-import pluginupdate
-from pluginupdate import update_plugins, FetchConfig
-
-from typing import List, Tuple, Optional
 from pathlib import Path
+from typing import List, Optional, Tuple
+
+import pluginupdate
+from pluginupdate import FetchConfig, update_plugins
 
 log = logging.getLogger()
 log.addHandler(logging.StreamHandler())
@@ -35,9 +35,7 @@ HEADER = """/* {GENERATED_NIXFILE} is an auto-generated file -- DO NOT EDIT!
 Regenerate it with: nix run nixpkgs#luarocks-packages-updater
 You can customize the generated packages in pkgs/development/lua-modules/overrides.nix
 */
-""".format(
-    GENERATED_NIXFILE=GENERATED_NIXFILE
-)
+""".format(GENERATED_NIXFILE=GENERATED_NIXFILE)
 
 FOOTER = """
 }
@@ -71,7 +69,6 @@ class LuaPlugin:
 
 # rename Editor to LangUpdate/ EcosystemUpdater
 class LuaEditor(pluginupdate.Editor):
-
     def create_parser(self):
         parser = super().create_parser()
         parser.set_defaults(proc=1)
@@ -173,10 +170,7 @@ def generate_pkg_nix(plug: LuaPlugin):
 
     if plug.rockspec != "":
         if plug.ref or plug.version:
-            msg = (
-                "'version' and 'ref' will be ignored as the rockspec is hardcoded for package %s"
-                % plug.name
-            )
+            msg = "'version' and 'ref' will be ignored as the rockspec is hardcoded for package %s" % plug.name
             log.warning(msg)
 
         log.debug("Updating from rockspec %s", plug.rockspec)
@@ -193,7 +187,7 @@ def generate_pkg_nix(plug: LuaPlugin):
 
     if plug.luaversion:
         cmd.append(f"--lua-version={plug.luaversion}")
-        luaver = plug.luaversion.replace('.', '')
+        luaver = plug.luaversion.replace(".", "")
         if luaver := os.getenv(f"LUA_{luaver}"):
             cmd.append(f"--lua-dir={luaver}")
 

pkgs/by-name/ni/nixpkgs-review/package.nix

@@ -54,7 +54,7 @@ python3Packages.buildPythonApplication rec {
     [
       "--prefix PATH : ${lib.makeBinPath binPath}"
       "--set-default NIX_SSL_CERT_FILE ${cacert}/etc/ssl/certs/ca-bundle.crt"
-      # we don't have any runtime deps but nix-review shells might inject unwanted dependencies
+      # we don't have any runtime deps but nixpkgs-review shells might inject unwanted dependencies
       "--unset PYTHONPATH"
     ];
 

pkgs/by-name/ro/roave-backward-compatibility-check/package.nix

@@ -6,18 +6,18 @@
   roave-backward-compatibility-check,
 }:
 
-php.buildComposerProject (finalAttrs: {
+php.buildComposerProject2 (finalAttrs: {
   pname = "roave-backward-compatibility-check";
-  version = "8.9.0";
+  version = "8.10.0";
 
   src = fetchFromGitHub {
     owner = "Roave";
     repo = "BackwardCompatibilityCheck";
     rev = finalAttrs.version;
-    hash = "sha256-Bvqo2SmtRWvatXxtHbctBrY0xe0KA+knNmEg+KC8hgY=";
+    hash = "sha256-wOqF7FkwOnTxYe7OnAl8R7NyGkdJ37H0OIr5e/1Q03I=";
   };
 
-  vendorHash = "sha256-cMVOcLRvfwFbxd2mXJhDx1iaUTHPEsI4vh9/JCoOj3M=";
+  vendorHash = "sha256-Xd+SxqLbm5QCROwq4jDm4cWLxF2nraqA+xdrZxW3ILY=";
 
   passthru = {
     tests.version = testers.testVersion {

pkgs/by-name/ro/robo/package.nix

@@ -2,31 +2,20 @@
   lib,
   php82,
   fetchFromGitHub,
-  fetchpatch,
 }:
 
-php82.buildComposerProject (finalAttrs: {
+php82.buildComposerProject2 (finalAttrs: {
   pname = "robo";
-  version = "5.0.0";
+  version = "5.1.0";
 
   src = fetchFromGitHub {
     owner = "consolidation";
     repo = "robo";
     rev = finalAttrs.version;
-    hash = "sha256-tibG2sR5CsRnUjZEvOewX/fyMuAS1kgKjYbrkk+f0BI=";
+    hash = "sha256-bAT4jHvqWeYcACeyGtBwVBA2Rz+AvkZcUGLDwSf+fLg=";
   };
 
-  patches = [
-    # Fix the version number
-    # Most likely to remove at the next bump update
-    # See https://github.com/drupol/robo/pull/1
-    (fetchpatch {
-      url = "https://github.com/drupol/robo/commit/c3cd001525c1adb5980a3a18a5561a0a5bbe1f50.patch";
-      hash = "sha256-iMdZx+Bldmf1IS6Ypoet7GSsE6J9ZnE0HTskznkyEKM=";
-    })
-  ];
-
-  vendorHash = "sha256-RRnHv6sOYm8fYhY3Q6m5sFDflFXd9b9LPcAqk/D1jdE=";
+  vendorHash = "sha256-PYtZy6c/Z1GTcYyfU77uJjXCzQSfBaNkon8kqGyVq+o=";
 
   meta = {
     changelog = "https://github.com/consolidation/robo/blob/${finalAttrs.version}/CHANGELOG.md";

pkgs/data/themes/qogir-kde/default.nix

@@ -1,31 +1,41 @@
 { lib
 , stdenvNoCC
 , fetchFromGitHub
-, kdeclarative
-, plasma-framework
-, plasma-workspace
 , unstableGitUpdater
 }:
 
+# NOTE:
+#
+# In order to use the qogir sddm theme, the packages
+# kdePackages.plasma-desktop and kdePackages.qtsvg should be added to
+# the option services.displayManager.sddm.extraPackages of the sddm
+# module:
+#
+# environment.systemPackages = with pkgs; [
+#   qogir-kde
+# ];
+#
+# services.displayManager.sddm = {
+#     enable = true;
+#     package = pkgs.kdePackages.sddm;
+#     theme = "Qogir";
+#     extraPackages = with pkgs; [
+#       kdePackages.plasma-desktop
+#       kdePackages.qtsvg
+#     ];
+# };
+
 stdenvNoCC.mkDerivation rec {
   pname = "qogir-kde";
-  version = "0-unstable-2024-09-21";
+  version = "0-unstable-2024-10-30";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = pname;
-    rev = "9f665cc10ded4fe0a3100c9151a5bd12d1ac50ca";
-    hash = "sha256-3WdDzOKO962RykLS8P4paxEiA1keGhuah/GhAKdsuhA=";
+    rev = "f2fdab049c403a356a79c9c3b9d45ec4357c1649";
+    hash = "sha256-6Hl2ozxqufin0fe33HZVuofk61E8Vggyk8/XX2R+2H0=";
   };
 
-  # Propagate sddm theme dependencies to user env otherwise sddm does
-  # not find them. Putting them in buildInputs is not enough.
-  propagatedUserEnvPkgs = [
-    kdeclarative.bin
-    plasma-framework
-    plasma-workspace
-  ];
-
   postPatch = ''
     patchShebangs install.sh
 
@@ -52,11 +62,11 @@ stdenvNoCC.mkDerivation rec {
 
   passthru.updateScript = unstableGitUpdater { };
 
-  meta = with lib; {
+  meta = {
     description = "Flat Design theme for KDE Plasma desktop";
     homepage = "https://github.com/vinceliuice/Qogir-kde";
-    license = licenses.gpl3Only;
-    platforms = platforms.all;
-    maintainers = [ maintainers.romildo ];
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.all;
+    maintainers = [ lib.maintainers.romildo ];
   };
 }

pkgs/data/themes/whitesur-kde/default.nix

@@ -1,29 +1,41 @@
 { lib
 , stdenvNoCC
 , fetchFromGitHub
-, plasma-desktop
-, qtsvg
 , unstableGitUpdater
 }:
 
+# NOTE:
+#
+# In order to use the whitesur sddm themes, the packages
+# kdePackages.plasma-desktop and kdePackages.qtsvg should be added to
+# the option services.displayManager.sddm.extraPackages of the sddm
+# module:
+#
+# environment.systemPackages = with pkgs; [
+#   whitesur-kde
+# ];
+#
+# services.displayManager.sddm = {
+#     enable = true;
+#     package = pkgs.kdePackages.sddm;
+#     theme = "WhiteSur-dark";
+#     extraPackages = with pkgs; [
+#       kdePackages.plasma-desktop
+#       kdePackages.qtsvg
+#     ];
+# };
+
 stdenvNoCC.mkDerivation {
   pname = "whitesur-kde";
-  version = "2022-05-01-unstable-2024-09-26";
+  version = "2022-05-01-unstable-2024-11-01";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = "whitesur-kde";
-    rev = "8cbb617049ad79ecff63eb62770d360b73fed656";
-    hash = "sha256-uNRO/r8kJByS4BDq0jXth+y0rg3GtGsbXoNLOZHpuNU=";
+    rev = "efba411e11f8f4d3219bffb393d25afae62eacf2";
+    hash = "sha256-052mKpf8e5pSecMzaWB3McOZ/uAqp/XGJjcVWnlKPLE=";
   };
 
-  # Propagate sddm theme dependencies to user env otherwise sddm does
-  # not find them. Putting them in buildInputs is not enough.
-  propagatedUserEnvPkgs = [
-    plasma-desktop
-    qtsvg
-  ];
-
   postPatch = ''
     patchShebangs install.sh sddm/install.sh
 
@@ -55,11 +67,11 @@ stdenvNoCC.mkDerivation {
 
   passthru.updateScript = unstableGitUpdater { };
 
-  meta = with lib; {
+  meta = {
     description = "MacOS big sur like theme for KDE Plasma desktop";
     homepage = "https://github.com/vinceliuice/WhiteSur-kde";
-    license = licenses.gpl3Only;
-    platforms = platforms.all;
-    maintainers = [ maintainers.romildo ];
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.all;
+    maintainers = [ lib.maintainers.romildo ];
   };
 }

pkgs/development/compilers/ispc/default.nix

@@ -6,7 +6,7 @@
 
 stdenv.mkDerivation rec {
   pname   = "ispc";
-  version = "1.25.0";
+  version = "1.25.3";
 
   dontFixCmake = true; # https://github.com/NixOS/nixpkgs/pull/232522#issuecomment-2133803566
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     owner  = pname;
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "sha256-DT8YjyAOdtAaWnCUvKRQGhPOazUkuRWkajBVK279Qhk=";
+    sha256 = "sha256-baTJNfhOSYfJJnrutkW06AIMXpVP3eBpEes0GSI1yGY=";
   };
 
   nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev tbb ];

pkgs/development/lua-modules/toml.patch

@@ -1,61 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ab3884c..c0fd356 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -38,32 +38,23 @@ include(FetchContent)
- 
- FetchContent_Declare(
- 	${TOML++}
--	GIT_REPOSITORY "https://github.com/marzer/tomlplusplus.git"
--	GIT_SHALLOW ON
--    GIT_SUBMODULES ""
--	GIT_TAG "v3.3.0"
-+  DOWNLOAD_COMMAND true
- )
- 
- FetchContent_Declare(
- 	${SOL2}
--	GIT_REPOSITORY "https://github.com/ThePhD/sol2.git"
--	GIT_SHALLOW ON
--    GIT_SUBMODULES ""
--	GIT_TAG "v3.3.0"
-+  DOWNLOAD_COMMAND true
- )
- 
- FetchContent_Declare(
- 	${MAGIC_ENUM}
--	GIT_REPOSITORY "https://github.com/Neargye/magic_enum.git"
--	GIT_SHALLOW ON
--    GIT_SUBMODULES ""
--	GIT_TAG "v0.8.2"
-+  DOWNLOAD_COMMAND true
- )
- 
- FetchContent_GetProperties(${TOML++})
- if(NOT ${TOML++}_POPULATED)
-     message(STATUS "Cloning ${TOML++}")
--	FetchContent_Populate(${TOML++}) 
-+	FetchContent_Populate(${TOML++})
-     FetchContent_MakeAvailable(${TOML++})
- endif()
- 
-@@ -113,7 +104,7 @@ if(NOT LUA_INCLUDE_DIR OR (WIN32 AND NOT LUA_LIBRARIES))
-     find_package(Lua)
- endif()
- 
--include_directories(${LUA_INCLUDE_DIR} src src/include ${${TOML++}_SOURCE_DIR} ${${SOL2}_SOURCE_DIR}/include ${${MAGIC_ENUM}_SOURCE_DIR}/include)
-+include_directories(${LUA_INCLUDE_DIR} src src/include TOML_PLUS_PLUS_SRC ${${SOL2}_SOURCE_DIR}/include MAGIC_ENUM_SRC)
- 
- set(SOURCES
-     src/toml.cpp
-@@ -129,8 +120,8 @@ source_group(src FILES ${SOURCES})
- 
- if(WIN32 AND "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
- 	target_link_options(toml.lua PUBLIC ${PROJECT_SOURCE_DIR}\\libs\\lua51.lib)
--else() 
--    target_link_libraries(toml.lua ${LUA_LIBRARIES})    
-+else()
-+    target_link_libraries(toml.lua ${LUA_LIBRARIES})
- endif()
- 
- if (LINK_FLAGS)

pkgs/development/lua-modules/zip.patch

@@ -1,23 +0,0 @@
---- a/Makefile	2007-10-30 01:59:10.000000000 +0300
-+++ b/Makefile	2014-09-18 11:04:53.176320021 +0400
-@@ -6,10 +6,6 @@
-
- include $(CONFIG)
-
--ifeq "$(LUA_VERSION_NUM)" "500"
--COMPAT_O= $(COMPAT_DIR)/compat-5.1.o
--endif
--
- SRCS= src/lua$T.c
- OBJS= src/lua$T.o $(COMPAT_O)
-
-@@ -19,9 +15,6 @@
- src/$(LIBNAME): $(OBJS)
- 	export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) $(CFLAGS) $(LIB_OPTION) -o src/$(LIBNAME) $(OBJS) -lzzip
-
--$(COMPAT_DIR)/compat-5.1.o: $(COMPAT_DIR)/compat-5.1.c
--	$(CC) -c $(CFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c
--
- install: src/$(LIBNAME)
- 	mkdir -p $(LUA_LIBDIR)
- 	cp src/$(LIBNAME) $(LUA_LIBDIR)

pkgs/development/ocaml-modules/spacetime_lib/spacetime.diff

@@ -1,14 +0,0 @@
-diff --git a/src/elf_locations.ml b/src/elf_locations.ml
-index a08b359..0db9274 100644
---- a/src/elf_locations.ml
-+++ b/src/elf_locations.ml
-@@ -37,7 +37,8 @@ let resolve_from_dwarf t ~program_counter =
-     | Some section ->
-       let body = Owee_buf.cursor (Owee_elf.section_body t.map section) in
-       let rec aux () =
--        match Owee_debug_line.read_chunk body with
-+        let pointers_to_other_sections = Owee_elf.debug_line_pointers t.map t.sections in
-+        match Owee_debug_line.read_chunk body ~pointers_to_other_sections with
-         | None -> ()
-         | Some (header, chunk) ->
-           (* CR-soon mshinwell: fix owee .mli to note that [state] is

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

@@ -37,7 +37,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "aiofile" ];
 
   disabledTests = [
-    # Tests (SystemError) fails randomly during nix-review
+    # Tests (SystemError) fails randomly during nixpkgs-review
     "test_async_open_fp"
     "test_async_open_iter_chunked"
     "test_async_open_iter_chunked"

pkgs/development/python-modules/docling-parse/default.nix

@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "docling-parse";
-  version = "2.0.2";
+  version = "2.0.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "DS4SD";
     repo = "docling-parse";
     rev = "refs/tags/v${version}";
-    hash = "sha256-unXGmMp5xyRCqSoFmqcQAZOBzpE0EzgEEBIfZUHhRcQ=";
+    hash = "sha256-pZJ7lneg4ftAoWS5AOflkkKCwZGF4TJIuqDjq4W4VBw=";
   };
 
   dontUseCmakeConfigure = true;

pkgs/development/python-modules/scikit-fmm/default.nix

@@ -18,18 +18,18 @@ buildPythonPackage rec {
     hash = "sha256-q6hqteXv600iH7xpCKHgRLkJYSpy9hIf/QnlsYI+jh4=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "oldest-supported-numpy" "numpy"
-  '';
-
   build-system = [ meson-python ];
 
   dependencies = [ numpy ];
 
   checkPhase = ''
+    runHook preCheck
+    # "Do not run the tests from the source directory"
     mkdir testdir; cd testdir
-    ${python.interpreter} -c "import skfmm, sys; sys.exit(skfmm.test())"
+    (set -x
+      ${python.interpreter} -c "import skfmm, sys; sys.exit(skfmm.test())"
+    )
+    runHook postCheck
   '';
 
   meta = with lib; {

pkgs/development/tools/misc/binutils/ppc-make-machine-less-strict.patch

@@ -1,51 +0,0 @@
-From cebc89b9328eab994f6b0314c263f94e7949a553 Mon Sep 17 00:00:00 2001
-From: Alan Modra <amodra@gmail.com>
-Date: Mon, 21 Feb 2022 10:58:57 +1030
-Subject: [PATCH] binutils 2.38 vs. ppc32 linux kernel
-
-Commit b25f942e18d6 made .machine more strict.  Weaken it again.
-
-	* config/tc-ppc.c (ppc_machine): Treat an early .machine specially,
-	keeping sticky options to work around gcc bugs.
----
- gas/config/tc-ppc.c | 25 ++++++++++++++++++++++++-
- 1 file changed, 24 insertions(+), 1 deletion(-)
-
-diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c
-index 054f9c72161..89bc7d3f9b9 100644
---- a/gas/config/tc-ppc.c
-+++ b/gas/config/tc-ppc.c
-@@ -5965,7 +5965,30 @@ ppc_machine (int ignore ATTRIBUTE_UNUSED)
- 	     options do not count as a new machine, instead they add
- 	     to currently selected opcodes.  */
- 	  ppc_cpu_t machine_sticky = 0;
--	  new_cpu = ppc_parse_cpu (ppc_cpu, &machine_sticky, cpu_string);
-+	  /* Unfortunately, some versions of gcc emit a .machine
-+	     directive very near the start of the compiler's assembly
-+	     output file.  This is bad because it overrides user -Wa
-+	     cpu selection.  Worse, there are versions of gcc that
-+	     emit the *wrong* cpu, not even respecting the -mcpu given
-+	     to gcc.  See gcc pr101393.  And to compound the problem,
-+	     as of 20220222 gcc doesn't pass the correct cpu option to
-+	     gas on the command line.  See gcc pr59828.  Hack around
-+	     this by keeping sticky options for an early .machine.  */
-+	  asection *sec;
-+	  for (sec = stdoutput->sections; sec != NULL; sec = sec->next)
-+	    {
-+	      segment_info_type *info = seg_info (sec);
-+	      /* Are the frags for this section perturbed from their
-+		 initial state?  Even .align will count here.  */
-+	      if (info != NULL
-+		  && (info->frchainP->frch_root != info->frchainP->frch_last
-+		      || info->frchainP->frch_root->fr_type != rs_fill
-+		      || info->frchainP->frch_root->fr_fix != 0))
-+		break;
-+	    }
-+	  new_cpu = ppc_parse_cpu (ppc_cpu,
-+				   sec == NULL ? &sticky : &machine_sticky,
-+				   cpu_string);
- 	  if (new_cpu != 0)
- 	    ppc_cpu = new_cpu;
- 	  else
--- 
-2.31.1

pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff

@@ -1,10 +0,0 @@
---- old/Makefile.conf	2014-05-19 16:53:09.263564921 +0200
-+++ new/Makefile.conf	2014-05-19 16:53:42.213152994 +0200
-@@ -1,6 +1,6 @@
- 
- # Where binaries are installed:
--BINDIR := `dirname  \`which ocamlc\``
-+BINDIR := $(out)/bin
- 
- ####
- 

pkgs/misc/drivers/spacenavd/configure-cfgfile-path.patch

@@ -1,63 +0,0 @@
-diff --git a/src/spnavd.c b/src/spnavd.c
-index 2d4eca6..a5227ed 100644
---- a/src/spnavd.c
-+++ b/src/spnavd.c
-@@ -27,6 +27,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
- #include <sys/select.h>
- #include <sys/socket.h>
- #include <sys/un.h>
-+#include <sys/types.h>
-+#include <pwd.h>
- #include "spnavd.h"
- #include "logger.h"
- #include "dev.h"
-@@ -47,13 +49,39 @@ static void handle_events(fd_set *rset);
- static void sig_handler(int s);
- static char *fix_path(char *str);
- 
--static char *cfgfile = DEF_CFGFILE;
-+static char* config_path;
-+char* cfg_path()
-+{
-+	char* buf;
-+	if((buf = getenv("XDG_CONFIG_HOME"))) {
-+		if(config_path == NULL) {
-+			config_path = malloc(strlen(buf) + strlen("/spnavrc") + 1);
-+			if ( config_path != NULL) {
-+				sprintf(config_path, "%s/spnavrc", buf);
-+			}
-+		};
-+		return config_path;
-+	} else {
-+		if (!(buf = getenv("HOME"))) {
-+			struct passwd *pw = getpwuid(getuid());
-+			buf = pw->pw_dir;
-+		}
-+		config_path = malloc(strlen(buf) + strlen("/.config/spnavrc") + 1);
-+		if ( config_path != NULL) {
-+			sprintf(config_path, "%s/.config/spnavrc", buf);
-+		}
-+		return config_path;
-+	}
-+}
-+
-+static char *cfgfile = NULL;
- static char *logfile = DEF_LOGFILE;
- static char *pidpath = NULL;
- 
- int main(int argc, char **argv)
- {
- 	int i, pid, ret, become_daemon = 1;
-+	cfgfile = cfg_path();
- 
- 	for(i=1; i<argc; i++) {
- 		if(argv[i][0] == '-') {
-@@ -247,7 +275,7 @@ static void print_usage(const char *argv0)
- 	printf("usage: %s [options]\n", argv0);
- 	printf("options:\n");
- 	printf(" -d: do not daemonize\n");
--	printf(" -c <file>: config file path (default: " DEF_CFGFILE ")\n");
-+	printf(" -c <file>: config file path (default: %s)\n", cfg_path());
- 	printf(" -l <file>|syslog: log file path or log to syslog (default: " DEF_LOGFILE ")\n");
- 	printf(" -v: verbose output\n");
- 	printf(" -V,-version: print version number and exit\n");

pkgs/misc/drivers/spacenavd/configure-pidfile-path.patch

@@ -1,82 +0,0 @@
-diff --git a/src/spnavd.c b/src/spnavd.c
-index 03080da..2d4eca6 100644
---- a/src/spnavd.c
-+++ b/src/spnavd.c
-@@ -42,12 +42,14 @@ static void cleanup(void);
- static void daemonize(void);
- static int write_pid_file(void);
- static int find_running_daemon(void);
-+static char *pidfile_path(void);
- static void handle_events(fd_set *rset);
- static void sig_handler(int s);
- static char *fix_path(char *str);
- 
- static char *cfgfile = DEF_CFGFILE;
- static char *logfile = DEF_LOGFILE;
-+static char *pidpath = NULL;
- 
- int main(int argc, char **argv)
- {
-@@ -270,7 +272,7 @@ static void cleanup(void)
- 		remove_device(tmp);
- 	}
- 
--	remove(PIDFILE);
-+	remove(pidfile_path());
- }
- 
- static void daemonize(void)
-@@ -314,7 +316,7 @@ static int write_pid_file(void)
- 	FILE *fp;
- 	int pid = getpid();
- 
--	if(!(fp = fopen(PIDFILE, "w"))) {
-+	if(!(fp = fopen(pidfile_path(), "w"))) {
- 		return -1;
- 	}
- 	fprintf(fp, "%d\n", pid);
-@@ -329,7 +331,7 @@ static int find_running_daemon(void)
- 	struct sockaddr_un addr;
- 
- 	/* try to open the pid-file */
--	if(!(fp = fopen(PIDFILE, "r"))) {
-+	if(!(fp = fopen(pidfile_path(), "r"))) {
- 		return -1;
- 	}
- 	if(fscanf(fp, "%d\n", &pid) != 1) {
-@@ -356,6 +358,22 @@ static int find_running_daemon(void)
- 	return pid;
- }
- 
-+char *pidfile_path(void)
-+{
-+	char *xdg_runtime_dir;
-+	if((xdg_runtime_dir = getenv("XDG_RUNTIME_DIR"))) {
-+		if ( pidpath == NULL ) {
-+			pidpath = malloc(strlen(xdg_runtime_dir) + strlen("/spnavd.pid") + 1);
-+			if ( pidpath != NULL ) {
-+				sprintf(pidpath, "%s/spnavd.pid", xdg_runtime_dir);
-+			}
-+		};
-+		return pidpath;
-+	} else {
-+		return DEFAULT_PIDFILE;
-+	}
-+}
-+
- static void handle_events(fd_set *rset)
- {
- 	int dev_fd, hotplug_fd;
-diff --git a/src/spnavd.h b/src/spnavd.h
-index 2d1c48b..17d22d3 100644
---- a/src/spnavd.h
-+++ b/src/spnavd.h
-@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
- #define DEF_CFGFILE		"/etc/spnavrc"
- #define DEF_LOGFILE		"/var/log/spnavd.log"
- 
--#define PIDFILE		"/var/run/spnavd.pid"
-+#define DEFAULT_PIDFILE		"/run/spnavd.pid"
- #define DEFAULT_SOCK_NAME	"/run/spnav.sock"
- #define SYSLOG_ID	"spnavd"
- 

pkgs/misc/drivers/spacenavd/configure-socket-path.patch

@@ -1,118 +0,0 @@
-diff --git a/src/proto_unix.c b/src/proto_unix.c
-index 998f234..d38452c 100644
---- a/src/proto_unix.c
-+++ b/src/proto_unix.c
-@@ -36,11 +36,14 @@ enum {
- 
- static int lsock = -1;
- 
-+static char *spath = NULL;
-+
- int init_unix(void)
- {
- 	int s;
- 	mode_t prev_umask;
- 	struct sockaddr_un addr;
-+	char *sock_path;
- 
- 	if(lsock >= 0) return 0;
- 
-@@ -49,16 +52,18 @@ int init_unix(void)
- 		return -1;
- 	}
- 
--	unlink(SOCK_NAME);	/* in case it already exists */
-+	sock_path = socket_path();
-+
-+	unlink(sock_path);	/* in case it already exists */
- 
- 	memset(&addr, 0, sizeof addr);
- 	addr.sun_family = AF_UNIX;
--	strcpy(addr.sun_path, SOCK_NAME);
-+	strcpy(addr.sun_path, sock_path);
- 
- 	prev_umask = umask(0);
- 
- 	if(bind(s, (struct sockaddr*)&addr, sizeof addr) == -1) {
--		logmsg(LOG_ERR, "failed to bind unix socket: %s: %s\n", SOCK_NAME, strerror(errno));
-+		logmsg(LOG_ERR, "failed to bind unix socket: %s: %s\n", sock_path, strerror(errno));
- 		close(s);
- 		return -1;
- 	}
-@@ -68,7 +73,7 @@ int init_unix(void)
- 	if(listen(s, 8) == -1) {
- 		logmsg(LOG_ERR, "listen failed: %s\n", strerror(errno));
- 		close(s);
--		unlink(SOCK_NAME);
-+		unlink(sock_path);
- 		return -1;
- 	}
- 
-@@ -82,7 +87,7 @@ void close_unix(void)
- 		close(lsock);
- 		lsock = -1;
- 
--		unlink(SOCK_NAME);
-+		unlink(socket_path());
- 	}
- }
- 
-@@ -173,3 +178,19 @@ int handle_uevents(fd_set *rset)
- 
- 	return 0;
- }
-+
-+char *socket_path(void)
-+{
-+	char *xdg_runtime_dir;
-+	if((xdg_runtime_dir = getenv("XDG_RUNTIME_DIR"))) {
-+		if ( spath == NULL ) {
-+			spath = malloc(strlen(xdg_runtime_dir) + strlen("/spnav.sock") + 1);
-+			if ( spath != NULL ) {
-+				sprintf(spath, "%s/spnav.sock", xdg_runtime_dir);
-+			}
-+		};
-+		return spath;
-+	} else {
-+		return DEFAULT_SOCK_NAME;
-+	}
-+}
-diff --git a/src/proto_unix.h b/src/proto_unix.h
-index 045b379..ec4509c 100644
---- a/src/proto_unix.h
-+++ b/src/proto_unix.h
-@@ -23,6 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
- #include "event.h"
- #include "client.h"
- 
-+char *socket_path(void);
- int init_unix(void);
- void close_unix(void);
- int get_unix_socket(void);
-diff --git a/src/spnavd.c b/src/spnavd.c
-index cbea191..03080da 100644
---- a/src/spnavd.c
-+++ b/src/spnavd.c
-@@ -344,7 +344,7 @@ static int find_running_daemon(void)
- 	}
- 	memset(&addr, 0, sizeof addr);
- 	addr.sun_family = AF_UNIX;
--	strncpy(addr.sun_path, SOCK_NAME, sizeof addr.sun_path);
-+	strncpy(addr.sun_path, socket_path(), sizeof addr.sun_path);
- 
- 	if(connect(s, (struct sockaddr*)&addr, sizeof addr) == -1) {
- 		close(s);
-diff --git a/src/spnavd.h b/src/spnavd.h
-index fa0a916..2d1c48b 100644
---- a/src/spnavd.h
-+++ b/src/spnavd.h
-@@ -26,8 +26,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
- #define DEF_CFGFILE		"/etc/spnavrc"
- #define DEF_LOGFILE		"/var/log/spnavd.log"
- 
--#define SOCK_NAME	"/var/run/spnav.sock"
- #define PIDFILE		"/var/run/spnavd.pid"
-+#define DEFAULT_SOCK_NAME	"/run/spnav.sock"
- #define SYSLOG_ID	"spnavd"
- 
- /* Multiple devices support */

pkgs/os-specific/linux/ffado/fix-build.patch

@@ -1,64 +0,0 @@
-From b0f2b20b23780dd2e67a01c15462070dd86c4ac1 Mon Sep 17 00:00:00 2001
-From: Jan Tojnar <jtojnar@gmail.com>
-Date: Sun, 3 Mar 2019 11:50:27 +0100
-Subject: [PATCH] build: Add datadir option for /usr/share
-
-Hardcoded /usr/share does not work for platforms that do not have global /usr like Nix.
-Let’s introduce a new DATADIR option, that allows overriding the directory and use it for metainfodir.
-
-While at it, let’s also use it for SHAREDIR and MANDIR for consistency,
-following the GNU directory convention:
-https://www.gnu.org/prep/standards/html_node/Directory-Variables.html
----
- SConstruct | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/SConstruct b/SConstruct
-index 05755e4b..3fbdc1d8 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -49,9 +49,10 @@
-     PathVariable( "BINDIR", "Overwrite the directory where apps are installed to.", "$PREFIX/bin", PathVariable.PathAccept ),
-     PathVariable( "LIBDIR", "Overwrite the directory where libs are installed to.", "$PREFIX/lib", PathVariable.PathAccept ),
-     PathVariable( "INCLUDEDIR", "Overwrite the directory where headers are installed to.", "$PREFIX/include", PathVariable.PathAccept ),
--    PathVariable( "SHAREDIR", "Overwrite the directory where misc shared files are installed to.", "$PREFIX/share/libffado", PathVariable.PathAccept ),
-+    PathVariable( "DATADIR", "Overwrite the directory where platform-independent files are installed to.", "$PREFIX/share", PathVariable.PathAccept ),
-+    PathVariable( "SHAREDIR", "Overwrite the directory where misc shared files are installed to.", "$DATADIR/libffado", PathVariable.PathAccept ),
-     PathVariable( "LIBDATADIR", "Location for architecture-dependent data.", "$LIBDIR/libffado", PathVariable.PathAccept ),
--    PathVariable( "MANDIR", "Overwrite the directory where manpages are installed", "$PREFIX/man", PathVariable.PathAccept ),
-+    PathVariable( "MANDIR", "Overwrite the directory where manpages are installed", "$DATADIR/man", PathVariable.PathAccept ),
-     PathVariable( "PYPKGDIR", "The directory where the python modules get installed.",
-         distutils.sysconfig.get_python_lib( prefix="$PREFIX" ), PathVariable.PathAccept ),
-     PathVariable( "UDEVDIR", "Overwrite the directory where udev rules are installed to.", "/lib/udev/rules.d/", PathVariable.PathAccept ),
-@@ -523,6 +524,7 @@
- env['BINDIR'] = Template( env['BINDIR'] ).safe_substitute( env )
- env['LIBDIR'] = Template( env['LIBDIR'] ).safe_substitute( env )
- env['INCLUDEDIR'] = Template( env['INCLUDEDIR'] ).safe_substitute( env )
-+env['DATADIR'] = Template( env['DATADIR'] ).safe_substitute( env )
- env['SHAREDIR'] = Template( env['SHAREDIR'] ).safe_substitute( env )
- env['LIBDATADIR'] = Template( env['LIBDATADIR'] ).safe_substitute( env )
- env['UDEVDIR'] = Template( env['UDEVDIR'] ).safe_substitute( env )
-@@ -531,18 +533,21 @@
- env['bindir'] = Template( env.destdir + env['BINDIR'] ).safe_substitute( env )
- env['libdir'] = Template( env.destdir + env['LIBDIR'] ).safe_substitute( env )
- env['includedir'] = Template( env.destdir + env['INCLUDEDIR'] ).safe_substitute( env )
-+env['datadir'] = Template( env.destdir + env['DATADIR'] ).safe_substitute( env )
- env['sharedir'] = Template( env.destdir + env['SHAREDIR'] ).safe_substitute( env )
- env['libdatadir'] = Template( env.destdir + env['LIBDATADIR'] ).safe_substitute( env )
- env['mandir'] = Template( env.destdir + env['MANDIR'] ).safe_substitute( env )
- env['pypkgdir'] = Template( env.destdir + env['PYPKGDIR'] ).safe_substitute( env )
- env['udevdir'] = Template( env.destdir + env['UDEVDIR'] ).safe_substitute( env )
- env['PYPKGDIR'] = Template( env['PYPKGDIR'] ).safe_substitute( env )
--env['metainfodir'] = Template( env.destdir + "/usr/share/metainfo" ).safe_substitute( env )
--
-+env['metainfodir'] = Template( env.destdir + env['DATADIR'] + "/metainfo" ).safe_substitute( env )
-+
-+env.Command( target=env['datadir'], source="", action=Mkdir( env['datadir'] ) )
- env.Command( target=env['sharedir'], source="", action=Mkdir( env['sharedir'] ) )
- 
- env.Alias( "install", env['libdir'] )
- env.Alias( "install", env['includedir'] )
-+env.Alias( "install", env['datadir'] )
- env.Alias( "install", env['sharedir'] )
- env.Alias( "install", env['libdatadir'] )
- env.Alias( "install", env['bindir'] )

pkgs/servers/invidious/use-etc-ssl-certs.patch

@@ -1,13 +0,0 @@
-diff --git a/crypto/x509/x509_def.c b/crypto/x509/x509_def.c
-index d2bc3e5c1..329580075 100644
---- a/crypto/x509/x509_def.c
-+++ b/crypto/x509/x509_def.c
-@@ -67,7 +67,7 @@
- 
- #define X509_CERT_AREA          OPENSSLDIR
- #define X509_CERT_DIR           OPENSSLDIR "/certs"
--#define X509_CERT_FILE          OPENSSLDIR "/cert.pem"
-+#define X509_CERT_FILE          "/etc/ssl/certs/ca-certificates.crt"
- #define X509_PRIVATE_DIR        OPENSSLDIR "/private"
- #define X509_CERT_DIR_EVP        "SSL_CERT_DIR"
- #define X509_CERT_FILE_EVP       "SSL_CERT_FILE"

pkgs/servers/mail/opensmtpd/cross_fix.diff

@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index c215f3bf..f5aa25d8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -67,7 +67,7 @@ AC_C_BIGENDIAN
- AC_PROG_CPP
- AC_PROG_INSTALL
- AC_PROG_LIBTOOL
--AC_PATH_PROG([AR], [ar])
-+AC_PATH_TOOL([AR], [ar])
- AC_PATH_PROG([CAT], [cat])
- AC_PATH_PROG([CHMOD], [chmod])
- AC_PATH_PROG([CHOWN], [chown])

pkgs/servers/sql/mysql/8.0.x.nix

@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mysql";
-  version = "8.0.39";
+  version = "8.0.40";
 
   src = fetchurl {
     url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz";
-    hash = "sha256-jEpLHUnHFJINJo/jmNeZVZqzxc9ZoDaGGUs3yz020ws=";
+    hash = "sha256-At/ZQ/lnQvf5zXiFWzJwjqTfVIycFK+Sc4F/O72dIrI=";
   };
 
   nativeBuildInputs = [ bison cmake pkg-config ]

pkgs/servers/sql/postgresql/generic.nix

@@ -189,6 +189,12 @@ let
       (if atLeast "13" then ./patches/socketdir-in-run-13+.patch else ./patches/socketdir-in-run.patch)
     ] ++ lib.optionals (stdenv'.hostPlatform.isDarwin && olderThan "16") [
       ./patches/export-dynamic-darwin-15-.patch
+    ] ++ lib.optionals (atLeast "17") [
+      # Fix flaky test, https://www.postgresql.org/message-id/ba8e1bc0-8a99-45b7-8397-3f2e94415e03@suse.de
+      (fetchpatch {
+        url = "https://github.com/postgres/postgres/commit/a358019159de68d4f045cbb5d89c8c8c2e96e483.patch";
+        hash = "sha256-9joQZo93oUTp6CrcGnhj7o+Mrbj/KCWwwGUc9KAst+s=";
+      })
     ];
 
     installTargets = [ "install-world" ];

pkgs/tools/backup/restic/default.nix

@@ -3,13 +3,13 @@
 
 buildGoModule rec {
   pname = "restic";
-  version = "0.17.2";
+  version = "0.17.3";
 
   src = fetchFromGitHub {
     owner = "restic";
     repo = "restic";
     rev = "v${version}";
-    hash = "sha256-CNQUqhFnuxoZpkVKyp/tDEfX91R8kjC2R41o2HA9eaM=";
+    hash = "sha256-PTy/YcojJGrYQhdp98e3rEMqHIWDMR5jiSC6BdzBT/M=";
   };
 
   patches = [
@@ -25,7 +25,9 @@ buildGoModule rec {
 
   nativeCheckInputs = [ python3 ];
 
-  passthru.tests.restic = nixosTests.restic;
+  passthru.tests = lib.optionalAttrs stdenv.isLinux {
+    restic = nixosTests.restic;
+  };
 
   postPatch = ''
     rm cmd/restic/cmd_mount_integration_test.go

pkgs/tools/graphics/gifski/Cargo.lock

@@ -10,9 +10,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "ahash"
-version = "0.8.7"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -22,18 +22,18 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "anstream"
-version = "0.6.11"
+version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5"
+checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -64,7 +64,7 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -74,7 +74,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
 dependencies = [
  "anstyle",
- "windows-sys 0.52.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -85,9 +85,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bindgen"
@@ -117,18 +117,15 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bytemuck"
-version = "1.14.3"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f"
+checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15"
 
 [[package]]
 name = "cc"
-version = "1.0.83"
+version = "1.0.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
-dependencies = [
- "libc",
-]
+checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7"
 
 [[package]]
 name = "cexpr"
@@ -158,18 +155,18 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.0"
+version = "4.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80c21025abd42669a92efc996ef13cfb2c5c627858421ea58d5c3b331a6c134f"
+checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"
 dependencies = [
  "clap_builder",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.5.0"
+version = "4.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "458bf1f341769dfcf849846f65dffdf9146daa56bcd2a47cb4e1de9915567c99"
+checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
 dependencies = [
  "anstream",
  "anstyle",
@@ -191,18 +188,18 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
 
 [[package]]
 name = "crc32fast"
-version = "1.3.2"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
+checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.11"
+version = "0.5.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b"
+checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95"
 dependencies = [
  "crossbeam-utils",
 ]
@@ -240,9 +237,9 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"
 
 [[package]]
 name = "either"
-version = "1.9.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
 
 [[package]]
 name = "fallible_collections"
@@ -298,9 +295,9 @@ dependencies = [
 
 [[package]]
 name = "gif-dispose"
-version = "5.0.0-beta.2"
+version = "5.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0d20a3802e15ff705c260e39152ff1987145a1c5ae016bc3d510abceb45b9ed"
+checksum = "781005a5985b4c723fd3e6586df79d823151846ebcbcf2fcc7e3d3fba18c2d51"
 dependencies = [
  "gif",
  "imgref",
@@ -309,7 +306,7 @@ dependencies = [
 
 [[package]]
 name = "gifski"
-version = "1.14.4"
+version = "1.32.0"
 dependencies = [
  "clap",
  "crossbeam-channel",
@@ -330,6 +327,8 @@ dependencies = [
  "resize",
  "rgb",
  "wild",
+ "y4m",
+ "yuv",
 ]
 
 [[package]]
@@ -349,9 +348,9 @@ dependencies = [
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.5"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0c62115964e08cb8039170eb33c1d0e2388a256930279edca206fff675f82c3"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
 [[package]]
 name = "imagequant"
@@ -392,12 +391,12 @@ checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 
 [[package]]
 name = "libloading"
-version = "0.8.1"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161"
+checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
 dependencies = [
  "cfg-if",
- "windows-sys 0.48.0",
+ "windows-targets",
 ]
 
 [[package]]
@@ -424,9 +423,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.7.1"
+version = "2.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
+checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
 
 [[package]]
 name = "minimal-lexical"
@@ -512,15 +511,15 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb"
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
 dependencies = [
  "unicode-ident",
 ]
@@ -533,18 +532,18 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "rayon"
-version = "1.8.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
 dependencies = [
  "either",
  "rayon-core",
@@ -562,9 +561,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.3"
+version = "1.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
+checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -574,9 +573,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"
+checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -585,9 +584,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
 
 [[package]]
 name = "resize"
@@ -622,9 +621,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "strsim"
-version = "0.11.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
 [[package]]
 name = "syn"
@@ -639,9 +638,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -650,9 +649,9 @@ dependencies = [
 
 [[package]]
 name = "thread_local"
-version = "1.1.7"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -719,137 +718,94 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
-[[package]]
-name = "windows-sys"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.0",
+ "windows-targets",
 ]
 
 [[package]]
 name = "windows-targets"
-version = "0.48.5"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
 dependencies = [
- "windows_aarch64_gnullvm 0.48.5",
- "windows_aarch64_msvc 0.48.5",
- "windows_i686_gnu 0.48.5",
- "windows_i686_msvc 0.48.5",
- "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm 0.48.5",
- "windows_x86_64_msvc 0.48.5",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
-dependencies = [
- "windows_aarch64_gnullvm 0.52.0",
- "windows_aarch64_msvc 0.52.0",
- "windows_i686_gnu 0.52.0",
- "windows_i686_msvc 0.52.0",
- "windows_x86_64_gnu 0.52.0",
- "windows_x86_64_gnullvm 0.52.0",
- "windows_x86_64_msvc 0.52.0",
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
 ]
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.48.5"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.48.5"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.48.5"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
 
 [[package]]
-name = "windows_i686_gnu"
-version = "0.52.0"
+name = "windows_i686_gnullvm"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.48.5"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.48.5"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.48.5"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.48.5"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
 
 [[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.0"
+name = "y4m"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+checksum = "7a5a4b21e1a62b67a2970e6831bc091d7b87e119e7f9791aef9702e3bef04448"
+
+[[package]]
+name = "yuv"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "157c9233496247738a5417ce7e8ecf953c3d4e1931374d16b0c6a95636572be4"
+dependencies = [
+ "num-traits",
+ "rgb",
+]
 
 [[package]]
 name = "zerocopy"
@@ -868,5 +824,5 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.58",
 ]

pkgs/tools/graphics/gifski/default.nix

@@ -7,13 +7,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "gifski";
-  version = "1.14.4";
+  version = "1.32.0";
 
   src = fetchFromGitHub {
     owner = "ImageOptim";
     repo = "gifski";
     rev = version;
-    hash = "sha256-Yhcz3pbEsSlpxQ1couFgQuaS8Eru7PLiGFNHcKmiFak=";
+    hash = "sha256-Sl8HRc5tfRcYxXsXmvZ3M+f7PU7+1jz+IKWPhWWQ/us=";
   };
 
   cargoLock = {

pkgs/tools/package-management/nix/README.md

@@ -11,7 +11,7 @@ Alternatively, you can request access to the Nix community builder for all platf
 To build all dependent packages, use:
 
 ```
-nix-review pr <your-pull-request>
+nixpkgs-review pr <your-pull-request>
 ```
 
 And to build all important NixOS tests, run:

pkgs/tools/package-management/nix/patches/flaky-tests.patch

@@ -1,12 +0,0 @@
-diff --git a/mk/run_test.sh b/mk/run_test.sh
-index 7e95df2ac..58420c317 100755
---- a/mk/run_test.sh
-+++ b/mk/run_test.sh
-@@ -27,7 +27,6 @@ run_test "$1"
- # appear randomly without anyone knowing why.
- # See https://github.com/NixOS/nix/issues/3605 for more info
- if [[ $status -ne 0 && $status -ne 99 && \
--    "$(uname)" == "Darwin" && \
-     "$log" =~ "unexpected EOF reading a line" \
- ]]; then
-     echo "$post_run_msg [${yellow}FAIL$normal] (possibly flaky, so will be retried)"

pkgs/tools/security/gnupg/clang.patch

@@ -1,13 +0,0 @@
-diff --git a/gl/stdint_.h b/gl/stdint_.h
-index bc27595..303e81a 100644
---- a/gl/stdint_.h
-+++ b/gl/stdint_.h
-@@ -62,7 +62,7 @@
-      int{8,16,32,64}_t, uint{8,16,32,64}_t and __BIT_TYPES_DEFINED__.
-      <inttypes.h> also defines intptr_t and uintptr_t.  */
- # define _GL_JUST_INCLUDE_ABSOLUTE_INTTYPES_H
--# include <inttypes.h>
-+// # include <inttypes.h>
- # undef _GL_JUST_INCLUDE_ABSOLUTE_INTTYPES_H
- #elif @HAVE_SYS_INTTYPES_H@
-   /* Solaris 7 <sys/inttypes.h> has the types except the *_fast*_t types, and

pkgs/top-level/all-packages.nix

@@ -2598,7 +2598,6 @@ with pkgs;
 
   lapce = callPackage ../applications/editors/lapce {
     inherit (darwin) libobjc;
-    inherit (darwin.apple_sdk.frameworks) Security CoreServices ApplicationServices Carbon AppKit;
   };
 
   languagetool-rust = callPackage ../tools/text/languagetool-rust {