libredirect: skip system() test when not in a sandbox

python310Packages.eventlet: disable test_fork_after_monkey_patch test…

.github/workflows/basic-eval.yml

@@ -19,7 +19,7 @@ jobs:
     # we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback
     steps:
     - uses: actions/checkout@v3
-    - uses: cachix/install-nix-action@v19
+    - uses: cachix/install-nix-action@v18
     - uses: cachix/cachix-action@v12
       with:
         # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.

.github/workflows/editorconfig.yml

@@ -28,7 +28,7 @@ jobs:
       with:
         # pull_request_target checks out the base branch by default
         ref: refs/pull/${{ github.event.pull_request.number }}/merge
-    - uses: cachix/install-nix-action@v19
+    - uses: cachix/install-nix-action@v18
       with:
         # nixpkgs commit is pinned so that it doesn't break
         # editorconfig-checker 2.4.0

.github/workflows/manual-nixos.yml

@@ -18,7 +18,7 @@ jobs:
         with:
           # pull_request_target checks out the base branch by default
           ref: refs/pull/${{ github.event.pull_request.number }}/merge
-      - uses: cachix/install-nix-action@v19
+      - uses: cachix/install-nix-action@v18
         with:
           # explicitly enable sandbox
           extra_nix_config: sandbox = true

.github/workflows/manual-nixpkgs.yml

@@ -18,7 +18,7 @@ jobs:
         with:
           # pull_request_target checks out the base branch by default
           ref: refs/pull/${{ github.event.pull_request.number }}/merge
-      - uses: cachix/install-nix-action@v19
+      - uses: cachix/install-nix-action@v18
         with:
           # explicitly enable sandbox
           extra_nix_config: sandbox = true

.github/workflows/manual-rendering.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: cachix/install-nix-action@v19
+      - uses: cachix/install-nix-action@v18
         with:
           # explicitly enable sandbox
           extra_nix_config: sandbox = true

.github/workflows/update-terraform-providers.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: cachix/install-nix-action@v19
+      - uses: cachix/install-nix-action@v18
         with:
           nix_path: nixpkgs=channel:nixpkgs-unstable
       - name: setup

doc/builders/special.xml

@@ -6,6 +6,7 @@
   This chapter describes several special builders.
  </para>
  <xi:include href="special/fhs-environments.section.xml" />
+ <xi:include href="special/makesetuphook.section.xml" />
  <xi:include href="special/mkshell.section.xml" />
  <xi:include href="special/darwin-builder.section.xml" />
 </chapter>

doc/builders/special/makesetuphook.section.md

@@ -0,0 +1,37 @@
+# pkgs.makeSetupHook {#sec-pkgs.makeSetupHook}
+
+`pkgs.makeSetupHook` is a builder that produces hooks that go in to `nativeBuildInputs`
+
+## Usage {#sec-pkgs.makeSetupHook-usage}
+
+```nix
+pkgs.makeSetupHook {
+  name = "something-hook";
+  propagatedBuildInputs = [ pkgs.commandsomething ];
+  depsTargetTargetPropagated = [ pkgs.libsomething ];
+} ./script.sh
+```
+
+#### setup hook that depends on the hello package and runs hello and @shell@ is substituted with path to bash
+
+```nix
+pkgs.makeSetupHook {
+    name = "run-hello-hook";
+    propagatedBuildInputs = [ pkgs.hello ];
+    substitutions = { shell = "${pkgs.bash}/bin/bash"; };
+    passthru.tests.greeting = callPackage ./test { };
+    meta.platforms = lib.platforms.linux;
+} (writeScript "run-hello-hook.sh" ''
+    #!@shell@
+    hello
+'')
+```
+
+## Attributes
+
+* `name` Set the name of the hook.
+* `propagatedBuildInputs` Runtime dependencies (such as binaries) of the hook.
+* `depsTargetTargetPropagated` Non-binary dependencies.
+* `meta`
+* `passthru`
+* `substitutions` Variables for `substituteAll`

doc/languages-frameworks/beam.section.md

@@ -171,7 +171,6 @@ let
     inherit src version;
     # nix will complain and tell you the right value to replace this with
     hash = lib.fakeHash;
-    mixEnv = ""; # default is "prod", when empty includes all dependencies, such as "dev", "test".
     # if you have build time environment variables add them here
     MY_ENV_VAR="my_value";
   };

doc/languages-frameworks/pkg-config.section.md

@@ -6,7 +6,7 @@ Nixpkgs provides a couple of facilities for working with this tool.
 
 ## Writing packages providing pkg-config modules
 
-Packages should set `meta.pkgConfigModules` with the list of package config modules they provide.
+Packages should set `meta.pkgConfigProvides` with the list of package config modules they provide.
 They should also use `testers.testMetaPkgConfig` to check that the final built package matches that list.
 Additionally, the [`validatePkgConfig` setup hook](https://nixos.org/manual/nixpkgs/stable/#validatepkgconfig), will do extra checks on to-be-installed pkg-config modules.
 

doc/stdenv/stdenv.chapter.md

@@ -95,27 +95,6 @@ installPhase() {
 genericBuild
 ```
 
-### Building a `stdenv` package in `nix-shell` {#sec-building-stdenv-package-in-nix-shell}
-
-To build a `stdenv` package in a [`nix-shell`](https://nixos.org/manual/nix/unstable/command-ref/nix-shell.html), use
-
-```bash
-nix-shell '<nixpkgs>' -A some_package
-eval ${unpackPhase:-unpackPhase}
-cd $sourceRoot
-eval ${patchPhase:-patchPhase}
-eval ${configurePhase:-configurePhase}
-eval ${buildPhase:-buildPhase}
-```
-
-To modify a [phase](#sec-stdenv-phases), first print it with
-
-```bash
-type buildPhase
-```
-
-then change it in a text editor, and paste it back to the terminal.
-
 ## Tools provided by `stdenv` {#sec-tools-of-stdenv}
 
 The standard environment provides the following packages:

lib/customisation.nix

@@ -213,7 +213,14 @@ rec {
             outputSpecified = true;
             drvPath = assert condition; drv.${outputName}.drvPath;
             outPath = assert condition; drv.${outputName}.outPath;
-          };
+          } //
+            # TODO: give the derivation control over the outputs.
+            #       `overrideAttrs` may not be the only attribute that needs
+            #       updating when switching outputs.
+            lib.optionalAttrs (passthru?overrideAttrs) {
+              # TODO: also add overrideAttrs when overrideAttrs is not custom, e.g. when not splicing.
+              overrideAttrs = f: (passthru.overrideAttrs f).${outputName};
+            };
         };
 
       outputsList = map outputToAttrListElement outputs;

lib/systems/architectures.nix

@@ -40,21 +40,14 @@ rec {
   # a superior CPU has all the features of an inferior and is able to build and test code for it
   inferiors = {
     # x86_64 Intel
-    # https://gcc.gnu.org/onlinedocs/gcc/x86-Options.html
     default        = [ ];
     westmere       = [ ];
-    sandybridge    = [ "westmere"       ] ++ inferiors.westmere;
-    ivybridge      = [ "sandybridge"    ] ++ inferiors.sandybridge;
-    haswell        = [ "ivybridge"      ] ++ inferiors.ivybridge;
-    broadwell      = [ "haswell"        ] ++ inferiors.haswell;
-    skylake        = [ "broadwell"      ] ++ inferiors.broadwell;
-    skylake-avx512 = [ "skylake"        ] ++ inferiors.skylake;
-    cannonlake     = [ "skylake-avx512" ] ++ inferiors.skylake-avx512;
-    icelake-client = [ "cannonlake"     ] ++ inferiors.cannonlake;
-    icelake-server = [ "icelake-client" ] ++ inferiors.icelake-client;
-    cascadelake    = [ "skylake-avx512" ] ++ inferiors.cannonlake;
-    cooperlake     = [ "cascadelake"    ] ++ inferiors.cascadelake;
-    tigerlake      = [ "icelake-server" ] ++ inferiors.icelake-server;
+    sandybridge    = [ "westmere"    ] ++ inferiors.westmere;
+    ivybridge      = [ "sandybridge" ] ++ inferiors.sandybridge;
+    haswell        = [ "ivybridge"   ] ++ inferiors.ivybridge;
+    broadwell      = [ "haswell"     ] ++ inferiors.haswell;
+    skylake        = [ "broadwell"   ] ++ inferiors.broadwell;
+    skylake-avx512 = [ "skylake"     ] ++ inferiors.skylake;
 
     # x86_64 AMD
     # TODO: fill this (need testing)

maintainers/maintainer-list.nix

@@ -76,7 +76,7 @@
   _0xB10C = {
     email = "nixpkgs@b10c.me";
     name = "0xB10C";
-    github = "0xB10C";
+    github = "0xb10c";
     githubId = 19157360;
   };
   _0xbe7a = {
@@ -817,7 +817,7 @@
   notbandali = {
     name = "Amin Bandali";
     email = "bandali@gnu.org";
-    github = "bandali0";
+    github = "notbandali";
     githubId = 1254858;
     keys = [{
       fingerprint = "BE62 7373 8E61 6D6D 1B3A  08E8 A21A 0202 4881 6103";
@@ -932,12 +932,6 @@
     githubId = 106511;
     name = "Andrew Kelley";
   };
-  andrewsmith = {
-    email = "andrew@velvet.software";
-    github = "andrewsmith";
-    githubId = 29887;
-    name = "Andrew Smith";
-  };
   andsild = {
     email = "andsild@gmail.com";
     github = "andsild";
@@ -1766,7 +1760,7 @@
   benesim = {
     name = "Benjamin Isbarn";
     email = "benjamin.isbarn@gmail.com";
-    github = "BeneSim";
+    github = "benesim";
     githubId = 29384538;
     keys = [{
       fingerprint = "D35E C9CE E631 638F F1D8  B401 6F0E 410D C3EE D02";
@@ -2388,12 +2382,6 @@
     github = "CaptainJawZ";
     githubId = 43111068;
   };
-  CardboardTurkey = {
-    name = "Kiran Ostrolenk";
-    email = "kostrolenk@gmail.com";
-    github = "CardboardTurkey";
-    githubId = 34030186;
-  };
   carlosdagos = {
     email = "m@cdagostino.io";
     github = "carlosdagos";
@@ -3142,7 +3130,7 @@
   cust0dian = {
     email = "serg@effectful.software";
     github = "cust0dian";
-    githubId = 119854490;
+    githubId = 389387;
     name = "Serg Nesterov";
     keys = [{
       fingerprint = "6E7D BA30 DB5D BA60 693C  3BE3 1512 F6EB 84AE CC8C";
@@ -3421,7 +3409,7 @@
   };
   davsanchez = {
     email = "davidslt+nixpkgs@pm.me";
-    github = "DavSanchez";
+    github = "davsanchez";
     githubId = 11422515;
     name = "David Sánchez";
   };
@@ -3914,7 +3902,6 @@
     name = "Davide Peressoni";
     email = "davide.peressoni@tuta.io";
     matrix = "@dpd-:matrix.org";
-    github = "DPDmancul";
     githubId = 3186857;
   };
   dpercy = {
@@ -4345,7 +4332,7 @@
   };
   elnudev = {
     email = "elnu@elnu.com";
-    github = "ElnuDev";
+    github = "elnudev";
     githubId = 9874955;
     name = "Elnu";
   };
@@ -4633,7 +4620,7 @@
   };
   ewok = {
     email = "ewok@ewok.ru";
-    github = "ewok-old";
+    github = "ewok";
     githubId = 454695;
     name = "Artur Taranchiev";
   };
@@ -5188,12 +5175,6 @@
     githubId = 606000;
     name = "Gabriel Adomnicai";
   };
-  garaiza-93 = {
-    email = "araizagustavo93@gmail.com";
-    github = "garaiza-93";
-    githubId = 57430880;
-    name = "Gustavo Araiza";
-  };
   Gabriel439 = {
     email = "Gabriel439@gmail.com";
     github = "Gabriella439";
@@ -5770,7 +5751,7 @@
   };
   harrisonthorne = {
     email = "harrisonthorne@proton.me";
-    github = "muni-corn";
+    github = "harrisonthorne";
     githubId = 33523827;
     name = "Harrison Thorne";
   };
@@ -7005,7 +6986,7 @@
   };
   jkarlson = {
     email = "jekarlson@gmail.com";
-    github = "ethorsoe";
+    github = "jkarlson";
     githubId = 1204734;
     name = "Emil Karlson";
   };
@@ -7783,7 +7764,7 @@
     name = "Kid";
   };
   kidsan = {
-    github = "Kidsan";
+    github = "kidsan";
     githubId = 8798449;
     name = "kidsan";
   };
@@ -8573,12 +8554,6 @@
     githubId = 22085373;
     name = "Luis Hebendanz";
   };
-  luizirber = {
-    email = "nixpkgs@luizirber.org";
-    github = "luizirber";
-    githubId = 6642;
-    name = "Luiz Irber";
-  };
   luizribeiro = {
     email = "nixpkgs@l9o.dev";
     matrix = "@luizribeiro:matrix.org";
@@ -8686,8 +8661,6 @@
   loveisgrief = {
     name = "LoveIsGrief";
     email = "loveisgrief@tuta.io";
-    github = "LoveIsGrief";
-    githubId = 2829538;
     keys = [{
       fingerprint = "9847 4F48 18C6 4E0A F0C5  3529 E96D 1EDF A053 45EB";
     }];
@@ -8839,7 +8812,7 @@
   };
   lux = {
     email = "lux@lux.name";
-    github = "luxzeitlos";
+    github = "luxferresum";
     githubId = 1208273;
     matrix = "@lux:ontheblueplanet.com";
     name = "Lux";
@@ -9312,7 +9285,7 @@
   };
   maxwell-lt = {
     email = "maxwell.lt@live.com";
-    github = "Maxwell-lt";
+    github = "maxwell-lt";
     githubId = 17859747;
     name = "Maxwell L-T";
   };
@@ -9951,7 +9924,7 @@
     name = "Mon Aaraj";
     email = "owo69uwu69@gmail.com";
     matrix = "@mon:tchncs.de";
-    github = "ribosomerocker";
+    github = "MonAaraj";
     githubId = 46468162;
   };
   monsieurp = {
@@ -10200,7 +10173,7 @@
   munksgaard = {
     name = "Philip Munksgaard";
     email = "philip@munksgaard.me";
-    github = "Munksgaard";
+    github = "munksgaard";
     githubId = 230613;
     matrix = "@philip:matrix.munksgaard.me";
     keys = [{
@@ -10535,12 +10508,6 @@
     github = "nikstur";
     githubId = 61635709;
   };
-  nintron = {
-    email = "nintron@sent.com";
-    github = "Nintron27";
-    githubId = 47835714;
-    name = "Nintron";
-  };
   ngerstle = {
     name = "Nicholas Gerstle";
     email = "ngerstle@gmail.com";
@@ -10823,7 +10790,7 @@
   };
   nrhelmi = {
     email = "helmiinour@gmail.com";
-    github = "NRHelmi";
+    github = "nrhelmi";
     githubId = 15707703;
     name = "Helmi Nour";
   };
@@ -11200,7 +11167,7 @@
   };
   paddygord = {
     email = "pgpatrickgordon@gmail.com";
-    github = "avaunit02";
+    github = "paddygord";
     githubId = 10776658;
     name = "Patrick Gordon";
   };
@@ -11323,12 +11290,6 @@
     githubId = 15645854;
     name = "Brad Christensen";
   };
-  paveloom = {
-    email = "paveloom@riseup.net";
-    github = "paveloom";
-    githubId = 49961859;
-    name = "Pavel Sobolev";
-  };
   payas = {
     email = "relekarpayas@gmail.com";
     github = "bhankas";
@@ -12256,7 +12217,7 @@
   };
   ratsclub = {
     email = "victor@freire.dev.br";
-    github = "ratsclub";
+    github = "vtrf";
     githubId = 25647735;
     name = "Victor Freire";
   };
@@ -12520,7 +12481,7 @@
   };
   rika = {
     email = "rika@paymentswit.ch";
-    github = "ScarletHg";
+    github = "NekomimiScience";
     githubId = 1810487;
     name = "Rika";
   };
@@ -12866,12 +12827,6 @@
     githubId = 5236428;
     name = "Gaëtan André";
   };
-  rvnstn = {
-    email = "github@rvnstn.de";
-    github = "rvnstn";
-    githubId = 2364742;
-    name = "Tobias Ravenstein";
-  };
   rvolosatovs = {
     email = "rvolosatovs@riseup.net";
     github = "rvolosatovs";
@@ -13521,7 +13476,7 @@
   shreerammodi = {
     name = "Shreeram Modi";
     email = "shreerammodi10@gmail.com";
-    github = "shrimpram";
+    github = "Shrimpram";
     githubId = 67710369;
     keys = [{
       fingerprint = "EA88 EA07 26E9 6CBF 6365  3966 163B 16EE 76ED 24CE";
@@ -13759,7 +13714,7 @@
   sno2wman = {
     name = "SnO2WMaN";
     email = "me@sno2wman.net";
-    github = "SnO2WMaN";
+    github = "sno2wman";
     githubId = 15155608;
   };
   snpschaaf = {
@@ -14513,7 +14468,7 @@
   };
   teozkr = {
     email = "teo@nullable.se";
-    github = "nightkr";
+    github = "teozkr";
     githubId = 649832;
     name = "Teo Klestrup Röijezon";
   };
@@ -15000,7 +14955,7 @@
   };
   tonyshkurenko = {
     email = "support@twingate.com";
-    github = "antonshkurenko";
+    github = "tonyshkurenko";
     githubId = 8597964;
     name = "Anton Shkurenko";
   };
@@ -15339,7 +15294,7 @@
   };
   uthar = {
     email = "galkowskikasper@gmail.com";
-    github = "Uthar";
+    github = "uthar";
     githubId = 15697697;
     name = "Kasper Gałkowski";
   };
@@ -16469,7 +16424,7 @@
   zebreus = {
     matrix = "@lennart:cicen.net";
     email = "lennarteichhorn+nixpkgs@gmail.com";
-    github = "zebreus";
+    github = "Zebreus";
     githubId = 1557253;
     name = "Lennart Eichhorn";
   };

nixos/doc/manual/manpages/nixos-rebuild.8

@@ -56,9 +56,7 @@ must run
 .Nm
 to make the changes take effect. It builds the new system in
 .Pa /nix/store Ns
-, runs its activation script (invoking
-.Ic sudo Ns
-\& if required), and stop and (re)starts any system services if
+, runs its activation script, and stop and (re)starts any system services if
 needed. Please note that user services need to be started manually as they
 aren't detected by the activation script at the moment.
 .
@@ -357,11 +355,6 @@ or
 is also set. This is useful when the target-host connection to cache.nixos.org
 is faster than the connection between hosts.
 .
-.It Fl -no-auto-sudo
-When set, disables automatic use of
-.Ic sudo Ns
-\& when deploying to localhost as a non-root user.
-.
 .It Fl -use-remote-sudo
 When set, nixos-rebuild prefixes remote commands that run on the
 .Fl -build-host

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

@@ -10,8 +10,6 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - Cinnamon has been updated to 5.6, see [the pull request](https://github.com/NixOS/nixpkgs/pull/201328#issue-1449910204) for what is changed.
 
-- KDE Plasma has been updated to v5.27, see [the release notes](https://kde.org/announcements/plasma/5/5.27.0/) for what is changed.
-
 - `nixos-rebuild` now supports an extra `--specialisation` option that can be used to change specialisation for `switch` and `test` commands.
 
 ## New Services {#sec-release-23.05-new-services}
@@ -36,8 +34,6 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - [imaginary](https://github.com/h2non/imaginary), a microservice for high-level image processing that Nextcloud can use to generate previews. Available as [services.imaginary](#opt-services.imaginary.enable).
 
-- [opensearch](https://opensearch.org), a search server alternative to Elasticsearch. Available as [services.opensearch](options.html#opt-services.opensearch.enable).
-
 - [goeland](https://github.com/slurdge/goeland), an alternative to rss2email written in golang with many filters. Available as [services.goeland](#opt-services.goeland.enable).
 
 - [atuin](https://github.com/ellie/atuin), a sync server for shell history. Available as [services.atuin](#opt-services.atuin.enable).
@@ -68,8 +64,6 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - `borgbackup` module now has an option for inhibiting system sleep while backups are running, defaulting to off (not inhibiting sleep), available as [`services.borgbackup.jobs.<name>.inhibitsSleep`](#opt-services.borgbackup.jobs._name_.inhibitsSleep).
 
-- The `ssh` client tool now disables the `~C` escape sequence by default. This can be re-enabled by setting `EnableEscapeCommandline yes`
-
 - `podman` now uses the `netavark` network stack. Users will need to delete all of their local containers, images, volumes, etc, by running `podman system reset --force` once before upgrading their systems.
 
 - `git-bug` has been updated to at least version 0.8.0, which includes backwards incompatible changes. The `git-bug-migration` package can be used to upgrade existing repositories.
@@ -205,8 +199,6 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - A new `virtualisation.rosetta` module was added to allow running `x86_64` binaries through [Rosetta](https://developer.apple.com/documentation/apple-silicon/about-the-rosetta-translation-environment) inside virtualised NixOS guests on Apple silicon. This feature works by default with the [UTM](https://docs.getutm.app/) virtualisation [package](https://search.nixos.org/packages?channel=unstable&show=utm&from=0&size=1&sort=relevance&type=packages&query=utm).
 
-- `nixos-rebuild` now uses `sudo` when deploying to localhost as a non-root user. This behaviour can be disabled with `--no-auto-sudo`.
-
 - The new option `users.motdFile` allows configuring a Message Of The Day that can be updated dynamically.
 
 - The `root` package is now built with the `"-Dgnuinstall=ON"` CMake flag, making the output conform the `bin` `lib` `share` layout. In this layout, `tutorials` is under `share/doc/ROOT/`; `cmake`, `font`, `icons`, `js` and `macro` under `share/root`; `Makefile.comp` and `Makefile.config` under `etc/root`.
@@ -255,6 +247,8 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - The new option `services.tailscale.useRoutingFeatures` controls various settings for using Tailscale features like exit nodes and subnet routers. If you wish to use your machine as an exit node, you can set this setting to `server`, otherwise if you wish to use an exit node you can set this setting to `client`. The strict RPF warning has been removed as the RPF will be loosened automatically based on the value of this setting.
 
+- `openjdk` from version 11 and above is not build with `openjfx` (i.e.: JavaFX) support by default anymore. You can re-enable it by overriding, e.g.: `openjdk11.override { enableJavaFX = true; };`.
+
 - [Xastir](https://xastir.org/index.php/Main_Page) can now access AX.25 interfaces via the `libax25` package.
 
 - `tvbrowser-bin` was removed, and now `tvbrowser` is built from source.

nixos/modules/config/no-x-libs.nix

@@ -30,8 +30,8 @@ with lib;
       beam = super.beam_nox;
       cairo = super.cairo.override { x11Support = false; };
       dbus = super.dbus.override { x11Support = false; };
-      ffmpeg_4 = super.ffmpeg_4.override { ffmpegVariant = "headless"; };
-      ffmpeg_5 = super.ffmpeg_5.override { ffmpegVariant = "headless"; };
+      ffmpeg_4 = super.ffmpeg_4-headless;
+      ffmpeg_5 = super.ffmpeg_5-headless;
       # dep of graphviz, libXpm is optional for Xpm support
       gd = super.gd.override { withXorg = false; };
       gobject-introspection = super.gobject-introspection.override { x11Support = false; };

nixos/modules/module-list.nix

@@ -1048,7 +1048,6 @@
   ./services/search/hound.nix
   ./services/search/kibana.nix
   ./services/search/meilisearch.nix
-  ./services/search/opensearch.nix
   ./services/search/solr.nix
   ./services/security/aesmd.nix
   ./services/security/certmgr.nix

nixos/modules/services/databases/clickhouse.nix

@@ -54,7 +54,7 @@ with lib;
         AmbientCapabilities = "CAP_SYS_NICE";
         StateDirectory = "clickhouse";
         LogsDirectory = "clickhouse";
-        ExecStart = "${cfg.package}/bin/clickhouse-server --config-file=/etc/clickhouse-server/config.xml";
+        ExecStart = "${cfg.package}/bin/clickhouse-server --config-file=${cfg.package}/etc/clickhouse-server/config.xml";
       };
     };
 

nixos/modules/services/misc/moonraker.nix

@@ -11,8 +11,6 @@ let
       else lib.concatMapStrings (s: "\n  ${generators.mkValueStringDefault {} s}") l;
     mkKeyValue = generators.mkKeyValueDefault {} ":";
   };
-
-  unifiedConfigDir = cfg.stateDir + "/config";
 in {
   options = {
     services.moonraker = {
@@ -32,10 +30,11 @@ in {
       };
 
       configDir = mkOption {
-        type = types.nullOr types.path;
-        default = null;
+        type = types.path;
+        default = cfg.stateDir + "/config";
+        defaultText = literalExpression ''config.${opt.stateDir} + "/config"'';
         description = lib.mdDoc ''
-          Deprecated directory containing client-writable configuration files.
+          The directory containing client-writable configuration files.
 
           Clients will be able to edit files in this directory via the API. This directory must be writable.
         '';
@@ -97,18 +96,8 @@ in {
   };
 
   config = mkIf cfg.enable {
-    warnings = []
-      ++ optional (cfg.settings ? update_manager)
-        ''Enabling update_manager is not supported on NixOS and will lead to non-removable warnings in some clients.''
-      ++ optional (cfg.configDir != null)
-        ''
-          services.moonraker.configDir has been deprecated upstream and will be removed.
-
-          Action: ${
-            if cfg.configDir == unifiedConfigDir then "Simply remove services.moonraker.configDir from your config."
-            else "Move files from `${cfg.configDir}` to `${unifiedConfigDir}` then remove services.moonraker.configDir from your config."
-          }
-        '';
+    warnings = optional (cfg.settings ? update_manager)
+      ''Enabling update_manager is not supported on NixOS and will lead to non-removable warnings in some clients.'';
 
     assertions = [
       {
@@ -135,20 +124,20 @@ in {
           port = cfg.port;
           klippy_uds_address = cfg.klipperSocket;
         };
-        machine = {
-          validate_service = false;
-        };
-      } // (lib.optionalAttrs (cfg.configDir != null) {
         file_manager = {
           config_path = cfg.configDir;
         };
-      });
+        database = {
+          database_path = "${cfg.stateDir}/database";
+        };
+      };
       fullConfig = recursiveUpdate cfg.settings forcedConfig;
     in format.generate "moonraker.cfg" fullConfig;
 
     systemd.tmpfiles.rules = [
       "d '${cfg.stateDir}' - ${cfg.user} ${cfg.group} - -"
-    ] ++ lib.optional (cfg.configDir != null) "d '${cfg.configDir}' - ${cfg.user} ${cfg.group} - -";
+      "d '${cfg.configDir}' - ${cfg.user} ${cfg.group} - -"
+    ];
 
     systemd.services.moonraker = {
       description = "Moonraker, an API web server for Klipper";
@@ -158,16 +147,9 @@ in {
 
       # Moonraker really wants its own config to be writable...
       script = ''
-        config_path=${
-          # Deprecated separate config dir
-          if cfg.configDir != null then "${cfg.configDir}/moonraker-temp.cfg"
-          # Config in unified data path
-          else "${unifiedConfigDir}/moonraker-temp.cfg"
-        }
-        mkdir -p $(dirname "$config_path")
-        cp /etc/moonraker.cfg "$config_path"
-        chmod u+w "$config_path"
-        exec ${pkg}/bin/moonraker -d ${cfg.stateDir} -c "$config_path"
+        cp /etc/moonraker.cfg ${cfg.configDir}/moonraker-temp.cfg
+        chmod u+w ${cfg.configDir}/moonraker-temp.cfg
+        exec ${pkg}/bin/moonraker -c ${cfg.configDir}/moonraker-temp.cfg
       '';
 
       # Needs `ip` command
@@ -202,6 +184,5 @@ in {
   meta.maintainers = with maintainers; [
     cab404
     vtuan10
-    zhaofengli
   ];
 }

nixos/modules/services/networking/wireguard.nix

@@ -176,7 +176,7 @@ let
 
       publicKey = mkOption {
         example = "xTIBA5rboUvnH4htodjb6e697QjLERt1NAB4mZqp8Dg=";
-        type = types.singleLineStr;
+        type = types.str;
         description = lib.mdDoc "The base64 public key of the peer.";
       };
 

nixos/modules/services/search/opensearch.nix

@@ -1,244 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.services.opensearch;
-
-  settingsFormat = pkgs.formats.yaml {};
-
-  configDir = cfg.dataDir + "/config";
-
-  usingDefaultDataDir = cfg.dataDir == "/var/lib/opensearch";
-  usingDefaultUserAndGroup = cfg.user == "opensearch" && cfg.group == "opensearch";
-
-  opensearchYml = settingsFormat.generate "opensearch.yml" cfg.settings;
-
-  loggingConfigFilename = "log4j2.properties";
-  loggingConfigFile = pkgs.writeTextFile {
-    name = loggingConfigFilename;
-    text = cfg.logging;
-  };
-in
-{
-
-  options.services.opensearch = {
-    enable = mkEnableOption (lib.mdDoc "OpenSearch");
-
-    package = lib.mkPackageOptionMD pkgs "OpenSearch" {
-      default = [ "opensearch" ];
-    };
-
-    settings = lib.mkOption {
-      type = lib.types.submodule {
-        freeformType = settingsFormat.type;
-
-        options."network.host" = lib.mkOption {
-          type = lib.types.str;
-          default = "127.0.0.1";
-          description = lib.mdDoc ''
-            Which port this service should listen on.
-          '';
-        };
-
-        options."cluster.name" = lib.mkOption {
-          type = lib.types.str;
-          default = "opensearch";
-          description = lib.mdDoc ''
-            The name of the cluster.
-          '';
-        };
-
-        options."discovery.type" = lib.mkOption {
-          type = lib.types.str;
-          default = "single-node";
-          description = lib.mdDoc ''
-            The type of discovery to use.
-          '';
-        };
-
-        options."http.port" = lib.mkOption {
-          type = lib.types.port;
-          default = 9200;
-          description = lib.mdDoc ''
-            The port to listen on for HTTP traffic.
-          '';
-        };
-
-        options."transport.port" = lib.mkOption {
-          type = lib.types.port;
-          default = 9300;
-          description = lib.mdDoc ''
-            The port to listen on for transport traffic.
-          '';
-        };
-      };
-
-      default = {};
-
-      description = lib.mdDoc ''
-        OpenSearch configuration.
-      '';
-    };
-
-    logging = lib.mkOption {
-      description = lib.mdDoc "opensearch logging configuration.";
-
-      default = ''
-        logger.action.name = org.opensearch.action
-        logger.action.level = info
-
-        appender.console.type = Console
-        appender.console.name = console
-        appender.console.layout.type = PatternLayout
-        appender.console.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] %marker%m%n
-
-        rootLogger.level = info
-        rootLogger.appenderRef.console.ref = console
-      '';
-      type = types.str;
-    };
-
-    dataDir = lib.mkOption {
-      type = lib.types.path;
-      default = "/var/lib/opensearch";
-      apply = converge (removeSuffix "/");
-      description = lib.mdDoc ''
-        Data directory for OpenSearch. If you change this, you need to
-        manually create the directory. You also need to create the
-        `opensearch` user and group, or change
-        [](#opt-services.opensearch.user) and
-        [](#opt-services.opensearch.group) to existing ones with
-        access to the directory.
-      '';
-    };
-
-    user = lib.mkOption {
-      type = lib.types.str;
-      default = "opensearch";
-      description = lib.mdDoc ''
-        The user OpenSearch runs as. Should be left at default unless
-        you have very specific needs.
-      '';
-    };
-
-    group = lib.mkOption {
-      type = lib.types.str;
-      default = "opensearch";
-      description = lib.mdDoc ''
-        The group OpenSearch runs as. Should be left at default unless
-        you have very specific needs.
-      '';
-    };
-
-    extraCmdLineOptions = lib.mkOption {
-      description = lib.mdDoc "Extra command line options for the OpenSearch launcher.";
-      default = [ ];
-      type = lib.types.listOf lib.types.str;
-    };
-
-    extraJavaOptions = lib.mkOption {
-      description = lib.mdDoc "Extra command line options for Java.";
-      default = [ ];
-      type = lib.types.listOf lib.types.str;
-      example = [ "-Djava.net.preferIPv4Stack=true" ];
-    };
-
-    restartIfChanged = lib.mkOption {
-      type = lib.types.bool;
-      description = lib.mdDoc ''
-        Automatically restart the service on config change.
-        This can be set to false to defer restarts on a server or cluster.
-        Please consider the security implications of inadvertently running an older version,
-        and the possibility of unexpected behavior caused by inconsistent versions across a cluster when disabling this option.
-      '';
-      default = true;
-    };
-  };
-
-  config = mkIf cfg.enable {
-    systemd.services.opensearch = {
-      description = "OpenSearch Daemon";
-      wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" ];
-      path = [ pkgs.inetutils ];
-      inherit (cfg) restartIfChanged;
-      environment = {
-        OPENSEARCH_HOME = cfg.dataDir;
-        OPENSEARCH_JAVA_OPTS = toString cfg.extraJavaOptions;
-        OPENSEARCH_PATH_CONF = configDir;
-      };
-      serviceConfig = {
-        ExecStartPre =
-          let
-            startPreFullPrivileges = ''
-              set -o errexit -o pipefail -o nounset -o errtrace
-              shopt -s inherit_errexit
-            '' + (optionalString (!config.boot.isContainer) ''
-              # Only set vm.max_map_count if lower than ES required minimum
-              # This avoids conflict if configured via boot.kernel.sysctl
-              if [ $(${pkgs.procps}/bin/sysctl -n vm.max_map_count) -lt 262144 ]; then
-                ${pkgs.procps}/bin/sysctl -w vm.max_map_count=262144
-              fi
-            '');
-            startPreUnprivileged = ''
-              set -o errexit -o pipefail -o nounset -o errtrace
-              shopt -s inherit_errexit
-
-              # Install plugins
-              ln -sfT ${cfg.package}/lib ${cfg.dataDir}/lib
-              ln -sfT ${cfg.package}/modules ${cfg.dataDir}/modules
-
-              # opensearch needs to create the opensearch.keystore in the config directory
-              # so this directory needs to be writable.
-              mkdir -p ${configDir}
-              chmod 0700 ${configDir}
-
-              # Note that we copy config files from the nix store instead of symbolically linking them
-              # because otherwise X-Pack Security will raise the following exception:
-              # java.security.AccessControlException:
-              # access denied ("java.io.FilePermission" "/var/lib/opensearch/config/opensearch.yml" "read")
-
-              cp ${opensearchYml} ${configDir}/opensearch.yml
-
-              # Make sure the logging configuration for old OpenSearch versions is removed:
-              rm -f "${configDir}/logging.yml"
-              cp ${loggingConfigFile} ${configDir}/${loggingConfigFilename}
-              mkdir -p ${configDir}/scripts
-              cp ${cfg.package}/config/jvm.options ${configDir}/jvm.options
-
-              # redirect jvm logs to the data directory
-              mkdir -p ${cfg.dataDir}/logs
-              chmod 0700 ${cfg.dataDir}/logs
-              sed -e '#logs/gc.log#${cfg.dataDir}/logs/gc.log#' -i ${configDir}/jvm.options
-            '';
-          in [
-            "+${pkgs.writeShellScript "opensearch-start-pre-full-privileges" startPreFullPrivileges}"
-            "${pkgs.writeShellScript "opensearch-start-pre-unprivileged" startPreUnprivileged}"
-          ];
-        ExecStartPost = pkgs.writeShellScript "opensearch-start-post" ''
-          set -o errexit -o pipefail -o nounset -o errtrace
-          shopt -s inherit_errexit
-
-          # Make sure opensearch is up and running before dependents
-          # are started
-          while ! ${pkgs.curl}/bin/curl -sS -f http://${cfg.settings."network.host"}:${toString cfg.settings."http.port"} 2>/dev/null; do
-            sleep 1
-          done
-        '';
-        ExecStart = "${cfg.package}/bin/opensearch ${toString cfg.extraCmdLineOptions}";
-        User = cfg.user;
-        Group = cfg.group;
-        LimitNOFILE = "1024000";
-        Restart = "always";
-        TimeoutStartSec = "infinity";
-        DynamicUser = usingDefaultUserAndGroup && usingDefaultDataDir;
-      } // (optionalAttrs (usingDefaultDataDir) {
-        StateDirectory = "opensearch";
-        StateDirectoryMode = "0700";
-      });
-    };
-
-    environment.systemPackages = [ cfg.package ];
-  };
-}

nixos/modules/services/web-apps/akkoma.md

@@ -152,7 +152,7 @@ services.akkoma.config.":pleroma".":media_preview_proxy" = {
 
 ## Frontend management {#modules-services-akkoma-frontend-management}
 
-Akkoma will be deployed with the `akkoma-fe` and `admin-fe` frontends by default. These can be
+Akkoma will be deployed with the `pleroma-fe` and `admin-fe` frontends by default. These can be
 modified by setting
 [{option}`services.akkoma.frontends`](options.html#opt-services.akkoma.frontends).
 
@@ -160,7 +160,7 @@ The following example overrides the primary frontend’s default configuration u
 derivation.
 
 ```nix
-services.akkoma.frontends.primary.package = pkgs.runCommand "akkoma-fe" {
+services.akkoma.frontends.primary.package = pkgs.runCommand "pleroma-fe" {
   config = builtins.toJSON {
     expertLevel = 1;
     collapseMessageWithSubject = false;
@@ -177,10 +177,10 @@ services.akkoma.frontends.primary.package = pkgs.runCommand "akkoma-fe" {
   passAsFile = [ "config" ];
 } ''
   mkdir $out
-  lndir ${pkgs.akkoma-frontends.akkoma-fe} $out
+  lndir ${pkgs.akkoma-frontends.pleroma-fe} $out
 
   rm $out/static/config.json
-  jq -s add ${pkgs.akkoma-frontends.akkoma-fe}/static/config.json ${config} \
+  jq -s add ${pkgs.akkoma-frontends.pleroma-fe}/static/config.json ${config} \
     >$out/static/config.json
 '';
 ```

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

@@ -51,13 +51,13 @@ let
       package = mkOption {
         type = types.package;
         description = mdDoc "Akkoma frontend package.";
-        example = literalExpression "pkgs.akkoma-frontends.akkoma-fe";
+        example = literalExpression "pkgs.akkoma-frontends.pleroma-fe";
       };
 
       name = mkOption {
         type = types.nonEmptyStr;
         description = mdDoc "Akkoma frontend name.";
-        example = "akkoma-fe";
+        example = "pleroma-fe";
       };
 
       ref = mkOption {
@@ -476,8 +476,8 @@ in {
         type = with types; attrsOf (submodule frontend);
         default = {
           primary = {
-            package = pkgs.akkoma-frontends.akkoma-fe;
-            name = "akkoma-fe";
+            package = pkgs.akkoma-frontends.pleroma-fe;
+            name = "pleroma-fe";
             ref = "stable";
           };
           admin = {
@@ -489,8 +489,8 @@ in {
         defaultText = literalExpression ''
           {
             primary = {
-              package = pkgs.akkoma-frontends.akkoma-fe;
-              name = "akkoma-fe";
+              package = pkgs.akkoma-frontends.pleroma-fe;
+              name = "pleroma-fe";
               ref = "stable";
             };
             admin = {

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

@@ -79,7 +79,7 @@ in {
       (which can be opened e.g. by running `nixos-help`).
     '')
     (mkRemovedOptionModule [ "services" "nextcloud" "disableImagemagick" ] ''
-      Use services.nextcloud.enableImagemagick instead.
+      Use services.nextcloud.nginx.enableImagemagick instead.
     '')
   ];
 

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

@@ -316,8 +316,7 @@ in
         ++ lib.optional config.services.colord.enable pkgs.colord-kde
         ++ lib.optional config.services.hardware.bolt.enable pkgs.plasma5Packages.plasma-thunderbolt
         ++ lib.optionals config.services.samba.enable [ kdenetwork-filesharing pkgs.samba ]
-        ++ lib.optional config.services.xserver.wacom.enable pkgs.wacomtablet
-        ++ lib.optional config.services.flatpak.enable flatpak-kcm;
+        ++ lib.optional config.services.xserver.wacom.enable pkgs.wacomtablet;
 
       # Extra services for D-Bus activation
       services.dbus.packages = [

nixos/modules/system/boot/systemd/initrd.nix

@@ -495,7 +495,7 @@ in {
 
           # If we are not booting a NixOS closure (e.g. init=/bin/sh),
           # we don't know what root to prepare so we don't do anything
-          if ! [ -x "/sysroot$(readlink "/sysroot$closure/prepare-root" || echo "$closure/prepare-root")" ]; then
+          if ! [ -x "/sysroot$closure/prepare-root" ]; then
             echo "NEW_INIT=''${initParam[1]}" > /etc/switch-root.conf
             echo "$closure does not look like a NixOS installation - not activating"
             exit 0

nixos/modules/virtualisation/podman/default.nix

@@ -7,10 +7,7 @@ let
 
   podmanPackage = (pkgs.podman.override {
     extraPackages = cfg.extraPackages
-      # setuid shadow
-      ++ [ "/run/wrappers" ]
-      # include pkgs.zfs by default in the wrapped podman used by the module so it is cached
-      ++ (if (builtins.elem "zfs" config.boot.supportedFilesystems) then [ config.boot.zfs.package ] else [ pkgs.zfs ]);
+      ++ lib.optional (builtins.elem "zfs" config.boot.supportedFilesystems) config.boot.zfs.package;
   });
 
   # Provides a fake "docker" binary mapping to podman
@@ -184,6 +181,10 @@ in
 
       systemd.packages = [ cfg.package ];
 
+      systemd.services.podman.serviceConfig = {
+        ExecStart = [ "" "${cfg.package}/bin/podman $LOGGING system service" ];
+      };
+
       systemd.services.podman-prune = {
         description = "Prune podman resources";
 
@@ -204,6 +205,10 @@ in
       systemd.sockets.podman.wantedBy = [ "sockets.target" ];
       systemd.sockets.podman.socketConfig.SocketGroup = "podman";
 
+      systemd.user.services.podman.serviceConfig = {
+        ExecStart = [ "" "${cfg.package}/bin/podman $LOGGING system service" ];
+      };
+
       systemd.user.sockets.podman.wantedBy = [ "sockets.target" ];
 
       systemd.tmpfiles.packages = [

nixos/tests/all-tests.nix

@@ -490,7 +490,6 @@ in {
   ombi = handleTest ./ombi.nix {};
   openarena = handleTest ./openarena.nix {};
   openldap = handleTest ./openldap.nix {};
-  opensearch = discoverTests (import ./opensearch.nix);
   openresty-lua = handleTest ./openresty-lua.nix {};
   opensmtpd = handleTest ./opensmtpd.nix {};
   opensmtpd-rspamd = handleTest ./opensmtpd-rspamd.nix {};

nixos/tests/k3s/default.nix

@@ -1,13 +1,9 @@
 { system ? builtins.currentSystem
 , pkgs ? import ../../.. { inherit system; }
-, lib ? pkgs.lib
 }:
-let
-  allK3s = lib.filterAttrs (n: _: lib.strings.hasPrefix "k3s_" n) pkgs;
-in
 {
   # Run a single node k3s cluster and verify a pod can run
-  single-node = lib.mapAttrs (_: k3s: import ./single-node.nix { inherit system pkgs k3s; }) allK3s;
+  single-node = import ./single-node.nix { inherit system pkgs; };
   # Run a multi-node k3s cluster and verify pod networking works across nodes
-  multi-node = lib.mapAttrs (_: k3s: import ./multi-node.nix { inherit system pkgs k3s; }) allK3s;
+  multi-node = import ./multi-node.nix { inherit system pkgs; };
 }

nixos/tests/k3s/multi-node.nix

@@ -1,4 +1,4 @@
-import ../make-test-python.nix ({ pkgs, lib, k3s, ... }:
+import ../make-test-python.nix ({ pkgs, lib, ... }:
   let
     imageEnv = pkgs.buildEnv {
       name = "k3s-pause-image-env";
@@ -39,7 +39,7 @@ import ../make-test-python.nix ({ pkgs, lib, k3s, ... }:
     tokenFile = pkgs.writeText "token" "p@s$w0rd";
   in
   {
-    name = "${k3s.name}-multi-node";
+    name = "k3s-multi-node";
 
     nodes = {
       server = { pkgs, ... }: {
@@ -52,7 +52,7 @@ import ../make-test-python.nix ({ pkgs, lib, k3s, ... }:
           inherit tokenFile;
           enable = true;
           role = "server";
-          package = k3s;
+          package = pkgs.k3s;
           clusterInit = true;
           extraFlags = builtins.toString [
             "--disable" "coredns"

nixos/tests/k3s/single-node.nix

@@ -1,4 +1,4 @@
-import ../make-test-python.nix ({ pkgs, lib, k3s, ... }:
+import ../make-test-python.nix ({ pkgs, lib, ... }:
   let
     imageEnv = pkgs.buildEnv {
       name = "k3s-pause-image-env";
@@ -24,7 +24,7 @@ import ../make-test-python.nix ({ pkgs, lib, k3s, ... }:
     '';
   in
   {
-    name = "${k3s.name}-single-node";
+    name = "k3s";
     meta = with pkgs.lib.maintainers; {
       maintainers = [ euank ];
     };
@@ -38,7 +38,7 @@ import ../make-test-python.nix ({ pkgs, lib, k3s, ... }:
 
       services.k3s.enable = true;
       services.k3s.role = "server";
-      services.k3s.package = k3s;
+      services.k3s.package = pkgs.k3s;
       # Slightly reduce resource usage
       services.k3s.extraFlags = builtins.toString [
         "--disable" "coredns"

nixos/tests/opensearch.nix

@@ -1,52 +0,0 @@
-let
-  opensearchTest =
-    import ./make-test-python.nix (
-      { pkgs, lib, extraSettings ? {} }: {
-        name = "opensearch";
-        meta.maintainers = with pkgs.lib.maintainers; [ shyim ];
-
-        nodes.machine = lib.mkMerge [
-          {
-            virtualisation.memorySize = 2048;
-            services.opensearch.enable = true;
-          }
-          extraSettings
-        ];
-
-        testScript = ''
-          machine.start()
-          machine.wait_for_unit("opensearch.service")
-          machine.wait_for_open_port(9200)
-
-          machine.succeed(
-              "curl --fail localhost:9200"
-          )
-        '';
-      });
-in
-{
-  opensearch = opensearchTest {};
-  opensearchCustomPathAndUser = opensearchTest {
-    extraSettings = {
-      services.opensearch.dataDir = "/var/opensearch_test";
-      services.opensearch.user = "open_search";
-      services.opensearch.group = "open_search";
-      system.activationScripts.createDirectory = {
-        text = ''
-          mkdir -p "/var/opensearch_test"
-          chown open_search:open_search /var/opensearch_test
-          chmod 0700 /var/opensearch_test
-        '';
-        deps = [ "users" "groups" ];
-      };
-      users = {
-        groups.open_search = {};
-        users.open_search = {
-          description = "OpenSearch daemon user";
-          group = "open_search";
-          isSystemUser = true;
-        };
-      };
-    };
-  };
-}

nixos/tests/predictable-interface-names.nix

@@ -13,7 +13,7 @@ in pkgs.lib.listToAttrs (builtins.map ({ predictable, withNetworkd }: {
   name = pkgs.lib.optionalString (!predictable) "un" + "predictable"
        + pkgs.lib.optionalString withNetworkd "Networkd";
   value = makeTest {
-    name = "${pkgs.lib.optionalString (!predictable) "un"}predictableInterfaceNames${pkgs.lib.optionalString withNetworkd "-with-networkd"}";
+    name = "${if predictable then "" else "un"}predictableInterfaceNames${if withNetworkd then "-with-networkd" else ""}";
     meta = {};
 
     nodes.machine = { lib, ... }: {

nixos/tests/wireguard/snakeoil-keys.nix

@@ -6,7 +6,6 @@
 
   peer1 = {
     privateKey = "uO8JVo/sanx2DOM0L9GUEtzKZ82RGkRnYgpaYc7iXmg=";
-    # readFile'd keys may have trailing newlines, emulate this
-    publicKey = "Ks9yRJIi/0vYgRmn14mIOQRwkcUGBujYINbMpik2SBI=\n";
+    publicKey = "Ks9yRJIi/0vYgRmn14mIOQRwkcUGBujYINbMpik2SBI=";
   };
 }

pkgs/applications/audio/espeak/default.nix

@@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
   prePatch = ''
     sed -e s,/bin/ln,ln,g -i src/Makefile
     sed -e 's,^CXXFLAGS=-O2,CXXFLAGS=-O2 -D PATH_ESPEAK_DATA=\\\"$(DATADIR)\\\",' -i src/Makefile
-  '' + (lib.optionalString (portaudio.api_version == 19) ''
+  '' + (if portaudio.api_version == 19 then ''
     cp src/portaudio19.h src/portaudio.h
-  '');
+  '' else "");
 
   configurePhase = ''
     cd src

pkgs/applications/audio/fdkaac/default.nix

@@ -2,15 +2,24 @@
 
 stdenv.mkDerivation rec {
   pname = "fdkaac";
-  version = "1.0.5";
+  version = "1.0.3";
 
   src = fetchFromGitHub {
     owner = "nu774";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-GYvI9T5Bv2OcK0hMAQE7/tE6ajDyqkaak66b3Hc0Fls=";
+    sha256 = "sha256-7a8JlQtMGuMWgU/HePd31/EvtBNc2tBMz8V8NQivuNo=";
   };
 
+  patches = [
+    # To be removed when 1.0.4 is released, see https://github.com/nu774/fdkaac/issues/54
+    (fetchpatch {
+      name = "CVE-2022-37781.patch";
+      url = "https://github.com/nu774/fdkaac/commit/ecddb7d63306e01d137d65bbbe7b78c1e779943c.patch";
+      sha256 = "sha256-uZPf5tqBmF7VWp1fJcjp5pbYGRfzqgPZpBHpkdWYkV0=";
+    })
+  ];
+
   nativeBuildInputs = [ autoreconfHook ];
 
   buildInputs = [ fdk_aac ];

pkgs/applications/audio/gxplugins-lv2/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "GxPlugins.lv2";
-  version = "1.0";
+  version = "0.9";
 
   src = fetchFromGitHub {
     owner = "brummer10";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-NvmFoOAQtAnKrZgzG1Shy1HuJEWgjJloQEx6jw59hag=";
+    sha256 = "02fksl8wr443ygwgcd1c2zab8kp67a6ps12k71ysqx7szv4zq877";
     fetchSubmodules = true;
   };
 

pkgs/applications/audio/listenbrainz-mpd/default.nix

@@ -1,35 +0,0 @@
-{ lib
-, rustPlatform
-, fetchFromGitea
-, pkg-config
-, stdenv
-, openssl
-, libiconv
-, Security }:
-
-rustPlatform.buildRustPackage rec {
-  pname = "listenbrainz-mpd";
-  version = "2.0.2";
-
-  src = fetchFromGitea {
-    domain = "codeberg.org";
-    owner = "elomatreb";
-    repo = "listenbrainz-mpd";
-    rev = "v${version}";
-    hash = "sha256-DO7YUqaJZyVWjiAZ9WIVNTTvOU0qdsI2ct7aT/6O5dQ=";
-  };
-
-  cargoHash = "sha256-MiAalxe0drRHrST3maVvi8GM2y3d0z4Zl7R7Zx8VjEM=";
-
-  nativeBuildInputs = [ pkg-config ];
-
-  buildInputs = if stdenv.isDarwin then [ libiconv Security ] else [ openssl ];
-
-  meta = with lib; {
-    homepage = "https://codeberg.org/elomatreb/listenbrainz-mpd";
-    changelog = "https://codeberg.org/elomatreb/listenbrainz-mpd/src/tag/v${version}/CHANGELOG.md";
-    description = "ListenBrainz submission client for MPD";
-    license = licenses.agpl3Only;
-    maintainers = with maintainers; [ DeeUnderscore ];
-  };
-}

pkgs/applications/audio/mmtc/default.nix

@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mmtc";
-  version = "0.3.2";
+  version = "0.3.1";
 
   src = fetchFromGitHub {
     owner = "figsoda";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-gs6uytX4rm2JrJ4UbtHJDg+b+Z1ZjcsuUR0b13jQIy4=";
+    sha256 = "sha256-7jQwa4BfyI1CPnMt1YEP9rE6cok90FbEJpyLAPFuxtE=";
   };
 
-  cargoSha256 = "sha256-7zV/AsSZHk99ROC1301nkwJ22dvh4afeCI//G1zWHu8=";
+  cargoSha256 = "sha256-f18aXs8PyA0IaGnPG568ZB/oPsAO+U44WsoDNEgKKXk=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/applications/audio/musly/default.nix

@@ -10,11 +10,11 @@ stdenv.mkDerivation {
   };
   nativeBuildInputs = [ cmake ];
   buildInputs = [ eigen ffmpeg ];
-  fixupPhase = lib.optionalString stdenv.isDarwin ''
+  fixupPhase = if stdenv.isDarwin then ''
     install_name_tool -change libmusly.dylib $out/lib/libmusly.dylib $out/bin/musly
     install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/bin/musly
     install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/lib/libmusly.dylib
-  '';
+  '' else "";
 
   meta = with lib; {
     homepage = "https://www.musly.org";

pkgs/applications/audio/praat/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "praat";
-  version = "6.3.08";
+  version = "6.3.07";
 
   src = fetchFromGitHub {
     owner = "praat";
     repo = "praat";
     rev = "v${version}";
-    sha256 = "sha256-65/RGUUuJDE2fvd3ltwdDR6rAWtQaRMIdlZzbh+/pfo=";
+    sha256 = "sha256-hWR6mYD0vBJbX07D/HtFE9qwdbxMliHLCsNDXVYcm1Y=";
   };
 
   configurePhase = ''

pkgs/applications/audio/puddletag/default.nix

@@ -62,7 +62,6 @@ python3.pkgs.buildPythonApplication rec {
   # the file should be executable but it isn't so our wrapper doesn't run
   preFixup = ''
     chmod 555 $out/bin/puddletag
-    wrapQtApp $out/bin/puddletag
   '';
 
   doCheck = false; # there are no tests

pkgs/applications/audio/sonixd/default.nix

@@ -3,25 +3,17 @@
 , appimageTools
 }:
 
-let
+appimageTools.wrapType2 rec {
   pname = "sonixd";
   version = "0.15.3";
+
   src = fetchurl {
     url = "https://github.com/jeffvli/sonixd/releases/download/v${version}/Sonixd-${version}-linux-x86_64.AppImage";
     sha256 = "sha256-+4L3XAuR7T/z5a58SXre6yUiVi7TvSAs8vPgEC7hcIw=";
   };
-  appimageContents = appimageTools.extractType2 { inherit pname version src; };
-in
-appimageTools.wrapType2 rec {
-  inherit pname version src;
 
   extraInstallCommands = ''
-    mv $out/bin/${pname}-${version} $out/bin/${pname}
-
-    install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
-    substituteInPlace $out/share/applications/${pname}.desktop \
-      --replace 'Exec=AppRun --no-sandbox %U' 'Exec=${pname}'
-    cp -r ${appimageContents}/usr/share/icons $out/share
+    mv $out/bin/sonixd-${version} $out/bin/sonixd
   '';
 
   meta = with lib; {

pkgs/applications/audio/spotify/default.nix

@@ -134,8 +134,8 @@ stdenv.mkDerivation {
       ln -s ${nspr.out}/lib/libnspr4.so $libdir/libnspr4.so
       ln -s ${nspr.out}/lib/libplc4.so $libdir/libplc4.so
 
-      ln -s ${ffmpeg.lib}/lib/libavcodec.so* $libdir
-      ln -s ${ffmpeg.lib}/lib/libavformat.so* $libdir
+      ln -s ${ffmpeg.out}/lib/libavcodec.so* $libdir
+      ln -s ${ffmpeg.out}/lib/libavformat.so* $libdir
 
       rpath="$out/share/spotify:$libdir"
 

pkgs/applications/blockchains/chia-dev-tools/default.nix

@@ -36,7 +36,6 @@ python3Packages.buildPythonApplication rec {
   SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}";
 
   propagatedBuildInputs = with python3Packages; [
-    anyio
     (toPythonModule chia)
     pytest # required at runtime by the "test" command
     pytest-asyncio

pkgs/applications/blockchains/chia/default.nix

@@ -6,14 +6,14 @@
 
 let chia = python3Packages.buildPythonApplication rec {
   pname = "chia";
-  version = "1.7.0";
+  version = "1.6.2";
 
   src = fetchFromGitHub {
     owner = "Chia-Network";
     repo = "chia-blockchain";
     rev = version;
     fetchSubmodules = true;
-    hash = "sha256-hsh2HHpm103JfUTPwk+8zIkhVrglIP8xMovFIibn8+g=";
+    hash = "sha256-BgUgTYpjFsKisfFni8TzSYQ8+S3P+7m78DuyjWF5xh8=";
   };
 
   postPatch = ''

pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix

@@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config wrapGAppsHook ];
   buildInputs = [ lightdm gtk3 glib ];
 
-  postUnpack = lib.optionalString (conf != "") ''
+  postUnpack = if conf != "" then ''
     cp ${builtins.toFile "config.h" conf} source/config.h
-  '';
+  '' else "";
 
   buildPhase = ''
     mkdir -p $out/bin $out/share/xgreeters

pkgs/applications/editors/android-studio/default.nix

@@ -10,8 +10,8 @@ let
     inherit tiling_wm;
   };
   stableVersion = {
-    version = "2022.1.1.20"; # "Android Studio Electric Eel (2022.1.1) Patch 1"
-    sha256Hash = "sha256-UX7aOpTM23S7NBPNAz/fKEyK/dqWpok0NnpX9wck6p4=";
+    version = "2022.1.1.19"; # "Android Studio Electric Eel (2022.1.1)"
+    sha256Hash = "luxE6a2C86JB28ezuIZV49TyE314S1RcNXQnCQamjUA=";
   };
   betaVersion = {
     version = "2022.2.1.12"; # "Android Studio Flamingo (2022.2.1) Beta 1"

pkgs/applications/editors/cudatext/default.nix

@@ -38,13 +38,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "cudatext";
-  version = "1.184.0";
+  version = "1.183.0";
 
   src = fetchFromGitHub {
     owner = "Alexey-T";
     repo = "CudaText";
     rev = version;
-    hash = "sha256-bRe9yS9CMsBH04oefImSYkd1jUe3SnJU6JZETLwow/0=";
+    hash = "sha256-hfOEL1Qkf8Sk6cNWUBwZXH/DSuo/ObyA5sRLOj9Iw3M=";
   };
 
   postPatch = ''

pkgs/applications/editors/cudatext/deps.json

@@ -16,8 +16,8 @@
   },
   "ATSynEdit": {
     "owner": "Alexey-T",
-    "rev": "2023.02.12",
-    "hash": "sha256-PSRKxKJkX9GlV8JUACYzDZguv8M8jKVxlW7U4Mmla9o="
+    "rev": "2023.02.05",
+    "hash": "sha256-V0mvSuiO5dTztXZ4uvteF0e7B21Ll1uq6o0UHPcZm1o="
   },
   "ATSynEdit_Cmp": {
     "owner": "Alexey-T",

pkgs/applications/editors/texmacs/common.nix

@@ -27,18 +27,18 @@ rec {
 
   postPatch = (if tex == null then ''
     gunzip < ${fullFontsSrc} | (cd TeXmacs && tar xvf -)
-   '' else lib.optionalString extraFonts ''
+   '' else if extraFonts then ''
     gunzip < ${extraFontsSrc} | (cd TeXmacs && tar xvf -)
-   '') +
-   (lib.optionalString chineseFonts ''
+   '' else "") +
+   (if chineseFonts then ''
     gunzip < ${chineseFontsSrc} | (cd TeXmacs && tar xvf -)
-   '') +
-   (lib.optionalString japaneseFonts ''
+   '' else "") +
+   (if japaneseFonts then ''
     gunzip < ${japaneseFontsSrc} | (cd TeXmacs && tar xvf -)
-   '') +
-   (lib.optionalString koreanFonts ''
+   '' else "") +
+   (if koreanFonts then ''
     gunzip < ${koreanFontsSrc} | (cd TeXmacs && tar xvf -)
-   '');
+   '' else "");
 
 
   meta = {

pkgs/applications/editors/vim/common.nix

@@ -1,12 +1,12 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "9.0.0609";
+  version = "9.0.1275";
 
   src = fetchFromGitHub {
     owner = "vim";
     repo = "vim";
     rev = "v${version}";
-    hash = "sha256-UBj3pXY6rdekKnCX/V/4o8LLBMZkNs1U4Z4KuvisIYQ=";
+    hash = "sha256-WDnlYi9o2Kv/f3Fh1MHcfTlBTe1fxw4UyKJlKY04fyA=";
   };
 
   enableParallelBuilding = true;

pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix

@@ -5,12 +5,12 @@
 {
   ada = buildGrammar {
     language = "ada";
-    version = "42cc2eb";
+    version = "e9e2ec9";
     src = fetchFromGitHub {
       owner = "briot";
       repo = "tree-sitter-ada";
-      rev = "42cc2eb141529b03a91c18ec8646a0a58fb111ba";
-      hash = "sha256-0BWj9MZku+0MfJMPNlbPjHo8Jf1t5PYLPqSr9J970OM=";
+      rev = "e9e2ec9d3b6302e9b455901bec00036e29d1c121";
+      hash = "sha256-buTQ1GjaJSVy4SPikZq88bifWubyHtPSI4ac7p1/tOg=";
     };
     meta.homepage = "https://github.com/briot/tree-sitter-ada";
   };
@@ -27,12 +27,12 @@
   };
   arduino = buildGrammar {
     language = "arduino";
-    version = "257efff";
+    version = "c473c09";
     src = fetchFromGitHub {
       owner = "ObserverOfTime";
       repo = "tree-sitter-arduino";
-      rev = "257efffa387da3283a37816b71dedfecf4af5222";
-      hash = "sha256-Yc3oFzOMyQwW2URyEzSIe6wBNAu9J2vPFIXk43sVUv8=";
+      rev = "c473c09f23b13d9404ec5208fad3eddea89d70f8";
+      hash = "sha256-aAw1ZgKuMWozQzmENUhkdkHV0BjSGmTdH4Bna7EfDaQ=";
     };
     meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino";
   };
@@ -115,23 +115,23 @@
   };
   c_sharp = buildGrammar {
     language = "c_sharp";
-    version = "18e4343";
+    version = "a29bac0";
     src = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-c-sharp";
-      rev = "18e434383a4582b4fd183a30e55022c2923764e1";
-      hash = "sha256-ggvCj2yGDINuGr8Jb+aOoRxlKa5LaXCoiQC/Y5Hrcn0=";
+      rev = "a29bac0681802139710b4d3875540901504d15cb";
+      hash = "sha256-TpOaxR0Do7oGjAZ8IrbXJAP6//Kt7VxhkrWEz7yNiLY=";
     };
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp";
   };
   capnp = buildGrammar {
     language = "capnp";
-    version = "cb85cdd";
+    version = "740c757";
     src = fetchFromGitHub {
       owner = "amaanq";
       repo = "tree-sitter-capnp";
-      rev = "cb85cddfdf398530110c807ba046822dbaee6afb";
-      hash = "sha256-VB8fNF8EtTAkKBLIAByazczPHJYdBULCeoGQ1ZLLRhI=";
+      rev = "740c757b9585925b1ed27cef7d61ac39b7824304";
+      hash = "sha256-0zCSWV3afsEIhN6XavMnn4LrLenjerhdnTfQ/EaL4aA=";
     };
     meta.homepage = "https://github.com/amaanq/tree-sitter-capnp";
   };
@@ -159,12 +159,12 @@
   };
   cmake = buildGrammar {
     language = "cmake";
-    version = "399605a";
+    version = "a322653";
     src = fetchFromGitHub {
       owner = "uyha";
       repo = "tree-sitter-cmake";
-      rev = "399605a02bcd5daa309ce63a6459c600dce3473f";
-      hash = "sha256-7pzKyfR9RmfgzuX9/elUesmsdbLlwgrfiRP73YQu+gM=";
+      rev = "a32265307aa2d31941056d69e8b6633e61750b2f";
+      hash = "sha256-LBd3SMem1dxZr/dOdJdEFTQxI6d+H8uYE46yN02E/6Y=";
     };
     meta.homepage = "https://github.com/uyha/tree-sitter-cmake";
   };
@@ -271,12 +271,12 @@
   };
   diff = buildGrammar {
     language = "diff";
-    version = "f69bde8";
+    version = "1d63cd4";
     src = fetchFromGitHub {
       owner = "the-mikedavis";
       repo = "tree-sitter-diff";
-      rev = "f69bde8e56f431863eba2fe4bab23e7d9692855f";
-      hash = "sha256-MFVXhnNxmGtqu8Y8ciigu/AIi15maPQjnJduBm7iCQI=";
+      rev = "1d63cd49529ef3153393cf8f620718b274bba715";
+      hash = "sha256-nAU3IFUsxcqgx/2cFoqNJXtJ7v7KRHVrfKYIVQEJCEk=";
     };
     meta.homepage = "https://github.com/the-mikedavis/tree-sitter-diff";
   };
@@ -304,12 +304,12 @@
   };
   ebnf = buildGrammar {
     language = "ebnf";
-    version = "8e635b0";
+    version = "ef241bc";
     src = fetchFromGitHub {
       owner = "RubixDev";
       repo = "ebnf";
-      rev = "8e635b0b723c620774dfb8abf382a7f531894b40";
-      hash = "sha256-Cch6WCYq9bsWGypzDGapxBLJ0ZB432uAl6YjEjBJ5yg=";
+      rev = "ef241bc09f2f105c35f5e4f2ccd8a522dd99071c";
+      hash = "sha256-N5TGYJnYNjYIdFXspGn+dDRm0wmJymXHY+Io43wSKlI=";
     };
     location = "crates/tree-sitter-ebnf";
     meta.homepage = "https://github.com/RubixDev/ebnf.git";
@@ -371,12 +371,12 @@
   };
   embedded_template = buildGrammar {
     language = "embedded_template";
-    version = "203f7bd";
+    version = "a130858";
     src = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-embedded-template";
-      rev = "203f7bd3c1bbfbd98fc19add4b8fcb213c059205";
-      hash = "sha256-SaZkyy2wKYoK0+pdHLVpQrdXjEeX/uR5XxgahcAdwz0=";
+      rev = "a13085849cf69e2401ec44e38cffc3d73f22f3df";
+      hash = "sha256-JNyLOW/na8J0WEsLDv3BuC+UXxGpYMYvAlywq4z6Wzo=";
     };
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-embedded-template";
   };
@@ -404,12 +404,12 @@
   };
   fish = buildGrammar {
     language = "fish";
-    version = "f917690";
+    version = "6675b56";
     src = fetchFromGitHub {
       owner = "ram02z";
       repo = "tree-sitter-fish";
-      rev = "f9176908c9eb2e11eb684d79e1d00f3b29bd65c9";
-      hash = "sha256-nPWkKhhG5MvJPOJ5nhm7GXgjnWX71/Ay55rPW+uKu/s=";
+      rev = "6675b56266b3f615fb112205b6b83a79315309c4";
+      hash = "sha256-hU2QMiNfO5/Drjl0QoUb9ERaK/3ETGaIsDBHMZ70n/A=";
     };
     meta.homepage = "https://github.com/ram02z/tree-sitter-fish";
   };
@@ -426,12 +426,12 @@
   };
   fortran = buildGrammar {
     language = "fortran";
-    version = "069bd7c";
+    version = "edcb337";
     src = fetchFromGitHub {
       owner = "stadelmanma";
       repo = "tree-sitter-fortran";
-      rev = "069bd7c864fe2dee1115140cc2621d140b16a643";
-      hash = "sha256-edvAcXKoVHIpOpVPROA9l97B4tFfuJYbjcSy9oE/dzw=";
+      rev = "edcb3374f4698aaedf24bc572f6b2f5ef0e89ac7";
+      hash = "sha256-xZfWtRHWy3MQtkzN9jSwx+sAwLlcRiVLTJjYXyWEIs8=";
     };
     meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran";
   };
@@ -448,12 +448,12 @@
   };
   func = buildGrammar {
     language = "func";
-    version = "f161cfe";
+    version = "88ee7d0";
     src = fetchFromGitHub {
       owner = "amaanq";
       repo = "tree-sitter-func";
-      rev = "f161cfe22452b386eeeab29ba0d2c14893f1a31f";
-      hash = "sha256-Swyg5EdBWVT6P9vgS7h/fmK0ySRwiFlynJEZT9I10qg=";
+      rev = "88ee7d0f569af10ab8c78a12f37217a8d15a0ffa";
+      hash = "sha256-SLI59AtprfCQr6VccCVr+2sazEtUSXnAwHcclWrkXxA=";
     };
     meta.homepage = "https://github.com/amaanq/tree-sitter-func";
   };
@@ -470,12 +470,12 @@
   };
   gdscript = buildGrammar {
     language = "gdscript";
-    version = "31ebb7c";
+    version = "4849e65";
     src = fetchFromGitHub {
       owner = "PrestonKnopp";
       repo = "tree-sitter-gdscript";
-      rev = "31ebb7cd0b880ea53a152eaf9d4df73f737181cc";
-      hash = "sha256-9fP6Us3mDMjJFM1Kxg0KiulCvyVv5qdo8+tyRgzGxUw=";
+      rev = "4849e657b98945cd040ffa7fd833d6130259dbab";
+      hash = "sha256-Rs1W2jahp+J42JzICi+QLAqfHYXth47g4LjejJnJypo=";
     };
     meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-gdscript";
   };
@@ -537,12 +537,12 @@
   };
   glimmer = buildGrammar {
     language = "glimmer";
-    version = "40cfb72";
+    version = "c0bfd26";
     src = fetchFromGitHub {
       owner = "alexlafroscia";
       repo = "tree-sitter-glimmer";
-      rev = "40cfb72a53654cbd666451ca04ffd500257c7b73";
-      hash = "sha256-h9ZZz6mbkErLIG/BamNRRoRdqmuBO3v17W0uvmpbm7A=";
+      rev = "c0bfd260cdcbe2976f4633547c218f09f7222a89";
+      hash = "sha256-Goj900MJxO44KYkzD0UpGFEGHAwr6qhe2bmCzpx5BhE=";
     };
     meta.homepage = "https://github.com/alexlafroscia/tree-sitter-glimmer";
   };
@@ -637,12 +637,12 @@
   };
   haskell = buildGrammar {
     language = "haskell";
-    version = "3bdba07";
+    version = "aee3725";
     src = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-haskell";
-      rev = "3bdba07c7a8eec23f87fa59ce9eb2ea4823348b3";
-      hash = "sha256-/aGUdyVxXqXCvjruI8rqiKzfTsyxzOKaXSAUG5xK4cE=";
+      rev = "aee3725d02cf3bca5f307b35dd3a96a97e109b4e";
+      hash = "sha256-DmrrRht3g0hG+OsJCHRL+xW4jflLqtG57AuFf7zd26c=";
     };
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell";
   };
@@ -835,12 +835,12 @@
   };
   jsonnet = buildGrammar {
     language = "jsonnet";
-    version = "fdc7757";
+    version = "505f5bd";
     src = fetchFromGitHub {
       owner = "sourcegraph";
       repo = "tree-sitter-jsonnet";
-      rev = "fdc775714afa27fdef823adbaba6ab98f5ae66f2";
-      hash = "sha256-KVpSB3LiC1qpF05Y1ScIglaXWIrAL+m7G4Q4/EVn0U8=";
+      rev = "505f5bd90053ae895aa3d6f2bac8071dd9abd8b2";
+      hash = "sha256-XZqywAzM+UCKto/OFn50hhRpEyFVLpFV7Q1Z0NKoPsI=";
     };
     meta.homepage = "https://github.com/sourcegraph/tree-sitter-jsonnet";
   };
@@ -857,12 +857,12 @@
   };
   kdl = buildGrammar {
     language = "kdl";
-    version = "b50d6c8";
+    version = "f83f394";
     src = fetchFromGitHub {
       owner = "amaanq";
       repo = "tree-sitter-kdl";
-      rev = "b50d6c8b77d311639ecbf2b803ffb720c2b4cee2";
-      hash = "sha256-dE2SqRSjy05Un3DPkrVDN0+na1ahddY57RYPMtaWynA=";
+      rev = "f83f3943568c7e7b4f5e0de1b04d722223bd4d80";
+      hash = "sha256-BakY6V4A2N/ZZCkyr7KU04/DWeGTAkkJua5TyZ6uNW4=";
     };
     meta.homepage = "https://github.com/amaanq/tree-sitter-kdl";
   };
@@ -956,24 +956,24 @@
   };
   markdown = buildGrammar {
     language = "markdown";
-    version = "7e7aa9a";
+    version = "abea13b";
     src = fetchFromGitHub {
       owner = "MDeiml";
       repo = "tree-sitter-markdown";
-      rev = "7e7aa9a25ca9729db9fe22912f8f47bdb403a979";
-      hash = "sha256-KsE9oYzD+vVqgR35JdL0NmPfNGJqpC12sEsZVIs7NX0=";
+      rev = "abea13b86c404564991244b69b7afc4ca362d0c0";
+      hash = "sha256-gdRl+jTSGlijc3/hn1BYClAlpYljzSRVpRoi9Q446PU=";
     };
     location = "tree-sitter-markdown";
     meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
   };
   markdown_inline = buildGrammar {
     language = "markdown_inline";
-    version = "7e7aa9a";
+    version = "abea13b";
     src = fetchFromGitHub {
       owner = "MDeiml";
       repo = "tree-sitter-markdown";
-      rev = "7e7aa9a25ca9729db9fe22912f8f47bdb403a979";
-      hash = "sha256-KsE9oYzD+vVqgR35JdL0NmPfNGJqpC12sEsZVIs7NX0=";
+      rev = "abea13b86c404564991244b69b7afc4ca362d0c0";
+      hash = "sha256-gdRl+jTSGlijc3/hn1BYClAlpYljzSRVpRoi9Q446PU=";
     };
     location = "tree-sitter-markdown-inline";
     meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
@@ -1046,12 +1046,12 @@
   };
   norg = buildGrammar {
     language = "norg";
-    version = "1a30509";
+    version = "6348056";
     src = fetchFromGitHub {
       owner = "nvim-neorg";
       repo = "tree-sitter-norg";
-      rev = "1a305093569632de50f9a316ff843dcda25b4ef5";
-      hash = "sha256-dfdykz5DnbuJvRdY3rYehzphIJgDl1efrsEgG2+BhvI=";
+      rev = "6348056b999f06c2c7f43bb0a5aa7cfde5302712";
+      hash = "sha256-5g4K+pYpS0DyYShKAoBCe6PD1wEZ+bvYMuI+ZbNPgJI=";
     };
     meta.homepage = "https://github.com/nvim-neorg/tree-sitter-norg";
   };
@@ -1126,12 +1126,12 @@
   };
   php = buildGrammar {
     language = "php";
-    version = "f860e59";
+    version = "973694f";
     src = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-php";
-      rev = "f860e598194f4a71747f91789bf536b393ad4a56";
-      hash = "sha256-j4RJUBbp2zvCHsZwnz62t2Tf6Cy1LOKrhg/pi8cqzAs=";
+      rev = "973694ffcdeebca245b7ecf0d7c4cadd4f41b3c9";
+      hash = "sha256-upJ8WwosOe4Xv/H9LUFVUVThLSLS+5Htr71Lyc/ZTJo=";
     };
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-php";
   };
@@ -1192,12 +1192,12 @@
   };
   pug = buildGrammar {
     language = "pug";
-    version = "884e225";
+    version = "26f6ac8";
     src = fetchFromGitHub {
       owner = "zealot128";
       repo = "tree-sitter-pug";
-      rev = "884e225b5ecca5d885ae627275f16ef648acd42e";
-      hash = "sha256-qPfVSnsw9bDznq7rhzftGyv9cGi2OiF6DCh55Lxk8xA=";
+      rev = "26f6ac805e11e19c4492089f24aa44fe71be7c1f";
+      hash = "sha256-KUIjt8p4B3LrU9vRQGL9Pf3ZYMfdDrazC2kNwTpRAgg=";
     };
     meta.homepage = "https://github.com/zealot128/tree-sitter-pug";
   };
@@ -1258,12 +1258,12 @@
   };
   racket = buildGrammar {
     language = "racket";
-    version = "1a5df02";
+    version = "dc9c334";
     src = fetchFromGitHub {
       owner = "6cdh";
       repo = "tree-sitter-racket";
-      rev = "1a5df0206b25a05cb1b35a68d2105fc7493df39b";
-      hash = "sha256-cKRShvkpg6M8vxUvp5wKHvX9ZJOUyv7m2hNyfeKw/Bk=";
+      rev = "dc9c33451fefc2d84d226e55c828adc8a66f2e37";
+      hash = "sha256-ie64no94TtAWsSYaBXmic4oyRAA01fMl97+JWcFU1E8=";
     };
     meta.homepage = "https://github.com/6cdh/tree-sitter-racket";
   };
@@ -1311,17 +1311,6 @@
     };
     meta.homepage = "https://github.com/bamonroe/tree-sitter-rnoweb";
   };
-  ron = buildGrammar {
-    language = "ron";
-    version = "049a3ef";
-    src = fetchFromGitHub {
-      owner = "amaanq";
-      repo = "tree-sitter-ron";
-      rev = "049a3ef4e271089107dd08e4aeb195abd1f77103";
-      hash = "sha256-ITWls8kp/UvwWOBE19v1UWQ1/BEiDhsK5VIFHicJM84=";
-    };
-    meta.homepage = "https://github.com/amaanq/tree-sitter-ron";
-  };
   rst = buildGrammar {
     language = "rst";
     version = "25e6328";
@@ -1445,12 +1434,12 @@
   };
   sql = buildGrammar {
     language = "sql";
-    version = "7be06f4";
+    version = "c508e60";
     src = fetchFromGitHub {
       owner = "derekstride";
       repo = "tree-sitter-sql";
-      rev = "7be06f4d5eabace883dd45959c13dc740f1f1b98";
-      hash = "sha256-Hi/4/Aou85MYCMMFqf5xqAyKECTzfeiaksJxdv9MVCU=";
+      rev = "c508e6044adf4298d7b321f966c90cbe32d75d23";
+      hash = "sha256-Ed+6pwxwvwLKOVB9XVHF+IftEiO4bG0yZAe77xBcazI=";
     };
     generate = true;
     meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
@@ -1525,12 +1514,12 @@
   };
   teal = buildGrammar {
     language = "teal";
-    version = "2158ecc";
+    version = "1ae8c68";
     src = fetchFromGitHub {
       owner = "euclidianAce";
       repo = "tree-sitter-teal";
-      rev = "2158ecce11ea542f9b791baf2c7fb33798174ed2";
-      hash = "sha256-Vofqs1AW5/a7kdPjY8+fu/t/mfBpaXiFFeG1Y0hsP6E=";
+      rev = "1ae8c68e90523b26b93af56feb7868fe4214e2b2";
+      hash = "sha256-IGSZurROJLOp1pRPLowHGO1Pu/ehieLKWgI+RCE7wLc=";
     };
     generate = true;
     meta.homepage = "https://github.com/euclidianAce/tree-sitter-teal";
@@ -1549,12 +1538,12 @@
   };
   thrift = buildGrammar {
     language = "thrift";
-    version = "d1f350b";
+    version = "634a73f";
     src = fetchFromGitHub {
       owner = "duskmoon314";
       repo = "tree-sitter-thrift";
-      rev = "d1f350b19dd70ccdbd6d565dbea4879e4cef03da";
-      hash = "sha256-RxrusaDiDjs25EcyrcnnjJIaeZaZhQdcxOWwtZ8Xe0U=";
+      rev = "634a73fd2c80e169f302917ba665c07ec0b6ff7b";
+      hash = "sha256-pB7zd48aonYYKdvD3+35zsD76+F/lqBYveFBxBQISvA=";
     };
     meta.homepage = "https://github.com/duskmoon314/tree-sitter-thrift";
   };
@@ -1571,12 +1560,12 @@
   };
   tlaplus = buildGrammar {
     language = "tlaplus";
-    version = "6d2ec89";
+    version = "6fd16d8";
     src = fetchFromGitHub {
       owner = "tlaplus-community";
       repo = "tree-sitter-tlaplus";
-      rev = "6d2ec894aef843fc89312c904e20c5f555aec4e3";
-      hash = "sha256-5V4sMnjVsdSJdeYspxn0nYqq73lVHvz7eGRfD/orqo4=";
+      rev = "6fd16d8469c6898317423d61738d97e2b3f5caf7";
+      hash = "sha256-s5mYc/kPZ4wHhm1ZeC5WBjBfzTFnANPRAZeE8UOVE1I=";
     };
     meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus";
   };
@@ -1650,12 +1639,12 @@
   };
   v = buildGrammar {
     language = "v";
-    version = "136f3a0";
+    version = "719cf0c";
     src = fetchFromGitHub {
       owner = "vlang";
       repo = "vls";
-      rev = "136f3a0ad91ab8a781c2d4eb419df0a981839f69";
-      hash = "sha256-zmbR2Of/XEJuGvNmXAJ+C4aAMem51LVS3e1rSqjaSb0=";
+      rev = "719cf0cd297f9b2f45ecfbeb0115379fb8cfa9c3";
+      hash = "sha256-4xb5x/JZN1pFvPVqazcZMdZm8DTpBb5nW5AgOrB3YHc=";
     };
     location = "tree_sitter_v";
     meta.homepage = "https://github.com/vlang/vls";
@@ -1695,12 +1684,12 @@
   };
   vim = buildGrammar {
     language = "vim";
-    version = "e39a7bb";
+    version = "55ff1b0";
     src = fetchFromGitHub {
       owner = "vigoux";
       repo = "tree-sitter-viml";
-      rev = "e39a7bbcfdcfc7900629962b785c7e14503ae590";
-      hash = "sha256-f3UAHwCL5yerEjmuDp+guzX4/ik4h7ProH5P8AmdO10=";
+      rev = "55ff1b080c09edeced9b748cf4c16d0b49d17fb9";
+      hash = "sha256-bMh6RPP0+zpNkMS/mpbKTaug9EL6u4kTcztnEXaNGyA=";
     };
     meta.homepage = "https://github.com/vigoux/tree-sitter-viml";
   };
@@ -1761,12 +1750,12 @@
   };
   zig = buildGrammar {
     language = "zig";
-    version = "6b3f578";
+    version = "b0693dd";
     src = fetchFromGitHub {
       owner = "maxxnino";
       repo = "tree-sitter-zig";
-      rev = "6b3f5788f38be900b45f5af5a753bf6a37d614b8";
-      hash = "sha256-KwMo1gwre8/AXkXXwQqPHZIEPXM26PK8SI0p3tmkt24=";
+      rev = "b0693dd473efd91d6085acd8e0ff9c627d37e077";
+      hash = "sha256-Jmz2XDI+mrBYE2TEhxPJZbICbhs5AOC0tyC4OOgT61U=";
     };
     meta.homepage = "https://github.com/maxxnino/tree-sitter-zig";
   };

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

@@ -700,10 +700,6 @@ self: super: {
     callPackage ./nvim-treesitter/overrides.nix { } self super
   );
 
-  nvim-ufo = super.nvim-ufo.overrideAttrs (old: {
-    dependencies = with self; [ promise-async ];
-  });
-
   octo-nvim = super.octo-nvim.overrideAttrs (old: {
     dependencies = with self; [ telescope-nvim plenary-nvim ];
   });
@@ -945,10 +941,6 @@ self: super: {
     dependencies = with self; [ telescope-nvim ];
   });
 
-  telescope-undo-nvim = super.telescope-undo-nvim.overrideAttrs (old: {
-    dependencies = with self; [ telescope-nvim ];
-  });
-
   telescope-z-nvim = super.telescope-z-nvim.overrideAttrs (old: {
     dependencies = with self; [ telescope-nvim ];
   });
@@ -1096,7 +1088,7 @@ self: super: {
             libiconv
           ];
 
-          cargoSha256 = "sha256-MR9n2+B2TUNnWxZhBbXZCBereLxYntBxLfx9g14vDUw=";
+          cargoSha256 = "sha256-jpO26OXaYcWirQ5tTKIwlva7dHIfdmnruF4WdwSq0nI=";
         };
       in
       ''

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

@@ -472,7 +472,6 @@ https://github.com/figsoda/nix-develop.nvim/,HEAD,
 https://github.com/tamago324/nlsp-settings.nvim/,main,
 https://github.com/tjdevries/nlua.nvim/,,
 https://github.com/mcchrish/nnn.vim/,,
-https://github.com/shortcuts/no-neck-pain.nvim/,HEAD,
 https://github.com/folke/noice.nvim/,HEAD,
 https://github.com/arcticicestudio/nord-vim/,,
 https://github.com/shaunsingh/nord.nvim/,,
@@ -552,7 +551,6 @@ https://github.com/windwp/nvim-ts-autotag/,,
 https://github.com/joosepalviste/nvim-ts-context-commentstring/,,
 https://github.com/mrjones2014/nvim-ts-rainbow/,,
 https://gitlab.com/HiPhish/nvim-ts-rainbow2,HEAD,
-https://github.com/kevinhwang91/nvim-ufo/,HEAD,
 https://github.com/kyazdani42/nvim-web-devicons/,,
 https://github.com/AckslD/nvim-whichkey-setup.lua/,,
 https://github.com/roxma/nvim-yarp/,,
@@ -592,7 +590,6 @@ https://github.com/andweeb/presence.nvim/,,
 https://github.com/sotte/presenting.vim/,,
 https://github.com/vim-scripts/prev_indent/,,
 https://github.com/ahmedkhalf/project.nvim/,,
-https://github.com/kevinhwang91/promise-async/,HEAD,
 https://github.com/frigoeu/psc-ide-vim/,,
 https://github.com/purescript-contrib/purescript-vim/,,
 https://github.com/python-mode/python-mode/,,
@@ -702,7 +699,6 @@ https://github.com/nvim-telescope/telescope-project.nvim/,,
 https://github.com/nvim-telescope/telescope-symbols.nvim/,,
 https://github.com/nvim-telescope/telescope-ui-select.nvim/,,
 https://github.com/fhill2/telescope-ultisnips.nvim/,,
-https://github.com/debugloop/telescope-undo.nvim/,HEAD,
 https://github.com/tom-anders/telescope-vim-bookmarks.nvim/,,
 https://github.com/nvim-telescope/telescope-z.nvim/,,
 https://github.com/jvgrootveld/telescope-zoxide/,,
@@ -719,7 +715,6 @@ https://github.com/johmsalas/text-case.nvim/,HEAD,
 https://github.com/ron89/thesaurus_query.vim/,,
 https://github.com/itchyny/thumbnail.vim/,,
 https://github.com/vim-scripts/timestamp.vim/,,
-https://github.com/levouh/tint.nvim/,HEAD,
 https://github.com/tomtom/tlib_vim/,,
 https://github.com/wellle/tmux-complete.vim/,,
 https://github.com/edkolev/tmuxline.vim/,,

pkgs/applications/editors/vim/plugins/vim-utils.nix

@@ -317,8 +317,8 @@ rec {
       lib.warnIf (wrapManual != null) ''
         vim.customize: wrapManual is deprecated: the manual is now included by default if `name == "vim"`.
         ${if wrapManual == true && name != "vim" then "Set `standalone = false` to include the manual."
-        else lib.optionalString (wrapManual == false && name == "vim") "Set `standalone = true` to get the *vim wrappers only."
-        }''
+        else if wrapManual == false && name == "vim" then "Set `standalone = true` to get the *vim wrappers only."
+        else ""}''
       lib.warnIf (wrapGui != null)
         "vim.customize: wrapGui is deprecated: gvim is now automatically included if present"
       lib.throwIfNot (vimExecutableName == null && gvimExecutableName == null)
@@ -330,7 +330,7 @@ rec {
           else throw "at least one of vimrcConfig and vimrcFile must be specified";
         bin = runCommand "${name}-bin" { nativeBuildInputs = [ makeWrapper ]; } ''
           vimrc=${lib.escapeShellArg vimrc}
-          gvimrc=${lib.optionalString (gvimrcFile != null) (lib.escapeShellArg gvimrcFile)}
+          gvimrc=${if gvimrcFile != null then lib.escapeShellArg gvimrcFile else ""}
 
           mkdir -p "$out/bin"
           for exe in ${
@@ -363,7 +363,7 @@ rec {
   vimGenDocHook = callPackage ({ vim }:
     makeSetupHook {
       name = "vim-gen-doc-hook";
-      deps = [ vim ];
+      propagatedBuildInputs = [ vim ];
       substitutions = {
         vimBinary = "${vim}/bin/vim";
         inherit rtpPath;
@@ -373,7 +373,7 @@ rec {
   vimCommandCheckHook = callPackage ({ neovim-unwrapped }:
     makeSetupHook {
       name = "vim-command-check-hook";
-      deps = [ neovim-unwrapped ];
+      propagatedBuildInputs = [ neovim-unwrapped ];
       substitutions = {
         vimBinary = "${neovim-unwrapped}/bin/nvim";
         inherit rtpPath;
@@ -383,7 +383,7 @@ rec {
   neovimRequireCheckHook = callPackage ({ neovim-unwrapped }:
     makeSetupHook {
       name = "neovim-require-check-hook";
-      deps = [ neovim-unwrapped ];
+      propagatedBuildInputs = [ neovim-unwrapped ];
       substitutions = {
         nvimBinary = "${neovim-unwrapped}/bin/nvim";
         inherit rtpPath;

pkgs/applications/editors/vscode/extensions/default.nix

@@ -927,8 +927,8 @@ let
         mktplcRef = {
           name = "gitlens";
           publisher = "eamodio";
-          version = "2023.2.1404";
-          sha256 = "sha256-hszwiETLDKqV4yqchPA1o3WuAgvmY2AwslvvbAhkRCE=";
+          version = "2022.12.604";
+          sha256 = "sha256-yfqGITviASp5ZDEJA+zyVz1LpPWV4FM/4fU4eq52Xng=";
         };
         meta = with lib; {
           changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog";
@@ -1375,8 +1375,8 @@ let
         mktplcRef = {
           name = "todo-tree";
           publisher = "Gruntfuggly";
-          version = "0.0.224";
-          sha256 = "sha256-ObFmzAaOlbtWC31JRYR/1y+JK1h22SVDPPRWWqPzrQs=";
+          version = "0.0.220";
+          sha256 = "06kzb4msfdv11lij4dwbn1vxdxhvnpfcjqw0gvydgkqjy7dridjk";
         };
         meta = with lib; {
           license = licenses.mit;
@@ -1555,8 +1555,8 @@ let
         mktplcRef = {
           name = "svg";
           publisher = "jock";
-          version = "1.5.0";
-          sha256 = "sha256-anIZxqO4pK77FmhUamRnJVN2q8FifH6ffqRE2eFwyWM=";
+          version = "1.4.23";
+          sha256 = "11f1g4a8v8330ki4240bvg5zpydagg1dwqfh1sar9ds7p1795ims";
         };
         meta = with lib; {
           license = licenses.mit;
@@ -1865,8 +1865,8 @@ let
         mktplcRef = {
           name = "vscode-docker";
           publisher = "ms-azuretools";
-          version = "1.23.3";
-          sha256 = "sha256-0qflugzWA1pV0PVWGTzOjdxM/0G8hTLOozoXCAdQnRY=";
+          version = "1.22.2";
+          sha256 = "13scns5iazzsjx8rli311ym2z8i8f4nvbcd5w8hqj5z0rzsds6xi";
         };
         meta = {
           license = lib.licenses.mit;
@@ -1929,8 +1929,8 @@ let
         mktplcRef = {
           name = "PowerShell";
           publisher = "ms-vscode";
-          version = "2023.1.0";
-          sha256 = "sha256-OiVb88BGvzsPTzKU1rGLGSMQSwKV4zI9FthOmutz34U=";
+          version = "2022.11.0";
+          sha256 = "01pq84rqh2q6rd0ljfql37q6i1kg597qy0mr7fiz5ddi15zcfn19";
         };
         meta = with lib; {
           description = "A Visual Studio Code extension for PowerShell language support";
@@ -2146,8 +2146,8 @@ let
         mktplcRef = {
           name = "java";
           publisher = "redhat";
-          version = "1.15.2023021403";
-          sha256 = "sha256-g56+nproGC8zHidyf1Tqz0kbJrmrkgOsDA5jqaZULas=";
+          version = "1.14.2022120303";
+          sha256 = "sha256-tlWb2rkDcEWgdpuidkBGN5Nxr3pmkYxnPJN/UdbQfEw=";
         };
         buildInputs = [ jdk ];
         meta = {
@@ -2226,8 +2226,8 @@ let
         mktplcRef = {
           name = "material-icon-theme";
           publisher = "PKief";
-          version = "4.24.0";
-          sha256 = "sha256-hJy+ymnlF9a2vvN/HhJ5N75lIc2afzkq+S0Cv/KnD3M=";
+          version = "4.22.0";
+          sha256 = "0irrivfidgjqfd205gh27r2ccj2anvqgvq7lfaaf92wrrc2zvlsk";
         };
         meta = {
           license = lib.licenses.mit;
@@ -2737,8 +2737,8 @@ let
         mktplcRef = {
           name = "pdf";
           publisher = "tomoki1207";
-          version = "1.2.2";
-          sha256 = "sha256-i3Rlizbw4RtPkiEsodRJEB3AUzoqI95ohyqZ0ksROps=";
+          version = "1.2.0";
+          sha256 = "1bcj546bp0w4yndd0qxwr8grhiwjd1jvf33jgmpm0j96y34vcszz";
         };
         meta = {
           description = "Show PDF preview in VSCode";
@@ -3089,22 +3089,6 @@ let
         };
       };
 
-      zhwu95.riscv = buildVscodeMarketplaceExtension {
-        mktplcRef = {
-          name = "riscv";
-          publisher = "zhwu95";
-          version = "0.0.8";
-          sha256 = "sha256-PXaHSEXoN0ZboHIoDg37tZ+Gv6xFXP4wGBS3YS/53TY=";
-        };
-        meta = with lib; {
-          description = "Basic RISC-V colorization and snippets support.";
-          downloadPage = "https://marketplace.visualstudio.com/items?itemName=zhwu95.riscv";
-          homepage = "https://github.com/zhuanhao-wu/vscode-riscv-support";
-          license = licenses.mit;
-          maintainers = [ maintainers.CardboardTurkey ];
-        };
-      };
-
       zxh404.vscode-proto3 = buildVscodeMarketplaceExtension {
         mktplcRef = {
           name = "vscode-proto3";

pkgs/applications/editors/vscode/extensions/vscodeEnv.nix

@@ -25,7 +25,8 @@
 }:
 let
   mutableExtensionsFilePath = toString mutableExtensionsFile;
-  mutableExtensions = lib.optionals builtins.pathExists mutableExtensionsFile (import mutableExtensionsFilePath);
+  mutableExtensions = if builtins.pathExists mutableExtensionsFile
+                      then import mutableExtensionsFilePath else [];
   vscodeWithConfiguration = import ./vscodeWithConfiguration.nix {
     inherit lib writeShellScriptBin extensionsFromVscodeMarketplace;
     vscodeDefault = vscode;

pkgs/applications/emulators/c64-debugger/default.nix

@@ -1,101 +0,0 @@
-{ lib
-, stdenv
-, fetchgit
-, alsa-lib
-, gtk3
-, libGL
-, libGLU
-, libX11
-, pkg-config
-, upx
-, xcbutil
-}:
-
-stdenv.mkDerivation {
-  name = "c64-debugger";
-  version = "0.64.58.6";
-
-  src = fetchgit {
-    url = "https://git.code.sf.net/p/c64-debugger/code";
-    rev = "f97772e3f5c8b4fa99e8ed212ed1c4cb1e2389f1";
-    sha256 = "sha256-3SR73AHQlYSEYpJLtQ/aJ1UITZGq7aA9tQKxBsn/yuc=";
-  };
-
-  buildInputs = [
-    alsa-lib
-    gtk3
-    libGL
-    libGLU
-    pkg-config
-    libX11
-    xcbutil
-  ];
-
-  nativeBuildInputs = [
-    upx
-  ];
-
-  postPatch = ''
-    # Disable default definition of RUN_COMMODORE64
-    sed -i 's|^#define RUN_COMMODORE64|//#define RUN_COMMODORE64|' MTEngine/Games/c64/C64D_Version.h
-  '';
-
-  buildPhase = ''
-    runHook preBuild
-
-    # Build C64 debugger
-    make -C MTEngine \
-      CFLAGS="-w -O2 -fcommon" \
-      CXXFLAGS="-w -O2 --std=c++11" \
-      DEFINES="-DRUN_COMMODORE64" \
-      -j$NIX_BUILD_CORES
-    mv MTEngine/c64debugger c64debugger
-    make -C MTEngine clean
-
-    # Build 65XE debugger
-    make -C MTEngine \
-      CFLAGS="-w -O2 -fcommon" \
-      CXXFLAGS="-w -O2 --std=c++11" \
-      DEFINES="-DRUN_ATARI" \
-      -j$NIX_BUILD_CORES
-    mv MTEngine/c64debugger 65xedebugger
-    make -C MTEngine clean
-
-    # Build NES debugger
-    make -C MTEngine \
-      CFLAGS="-w -O2 -fcommon" \
-      CXXFLAGS="-w -O2 --std=c++11" \
-      DEFINES="-DRUN_NES" \
-      -j$NIX_BUILD_CORES
-    mv MTEngine/c64debugger nesdebugger
-
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    install -d "$out/bin"
-    install -d "$out/share/doc"
-    install -m 755 c64debugger 65xedebugger nesdebugger "$out/bin"
-    install -m 644 MTEngine/Assets/*.txt "$out/share/doc"
-    install -m 644 MTEngine/Assets/*.pdf "$out/share/doc"
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    homepage = "https://sourceforge.net/projects/c64-debugger";
-    description = "Commodore 64, Atari XL/XE and NES code and memory debugger that works in real time";
-    license = with licenses; [
-      gpl3Only # c64-debugger
-      mit # MTEngine
-      # emulators included in c64-debugger
-      gpl2Plus # VICE, atari800
-      gpl2 # nestopiaue
-    ];
-    mainProgram = "c64debugger";
-    maintainers = [ maintainers.detegr ];
-    platforms = platforms.linux;
-  };
-}

pkgs/applications/emulators/dosbox-staging/default.nix

@@ -1,10 +1,15 @@
-{ alsa-lib
-, copyDesktopItems
+{ lib
+, stdenv
 , fetchFromGitHub
+, SDL2
+, SDL2_image
+, SDL2_net
+, alsa-lib
+, copyDesktopItems
 , fluidsynth
 , glib
 , gtest
-, lib
+, irr1
 , libGL
 , libGLU
 , libjack2
@@ -20,22 +25,17 @@
 , ninja
 , opusfile
 , pkg-config
-, irr1
-, SDL2
-, SDL2_image
-, SDL2_net
 , speexdsp
-, stdenv
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (self: {
   pname = "dosbox-staging";
   version = "0.80.1";
 
   src = fetchFromGitHub {
-    owner = pname;
-    repo = pname;
-    rev = "v${version}";
+    owner = "dosbox-staging";
+    repo = "dosbox-staging";
+    rev = "v${self.version}";
     hash = "sha256-I90poBeLSq1c8PXyjrx7/UcbfqFNnnNiXfJdWhLPGMc=";
   };
 
@@ -49,6 +49,9 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
+    SDL2
+    SDL2_image
+    SDL2_net
     alsa-lib
     fluidsynth
     glib
@@ -63,9 +66,6 @@ stdenv.mkDerivation rec {
     libslirp
     libsndfile
     opusfile
-    SDL2
-    SDL2_image
-    SDL2_net
     speexdsp
   ];
 
@@ -91,17 +91,17 @@ stdenv.mkDerivation rec {
     # original dosbox. Doing it this way allows us to work with frontends and
     # launchers that expect the binary to be named dosbox, but get out of the
     # way of vanilla dosbox if the user desires to install that as well.
-    mv $out/bin/dosbox $out/bin/${pname}
+    mv $out/bin/dosbox $out/bin/${self.pname}
     makeWrapper $out/bin/dosbox-staging $out/bin/dosbox
 
     # Create a symlink to dosbox manual instead of merely copying it
     pushd $out/share/man/man1/
-    mv dosbox.1.gz ${pname}.1.gz
-    ln -s ${pname}.1.gz dosbox.1.gz
+    mv dosbox.1.gz ${self.pname}.1.gz
+    ln -s ${self.pname}.1.gz dosbox.1.gz
     popd
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://dosbox-staging.github.io/";
     description = "A modernized DOS emulator";
     longDescription = ''
@@ -110,10 +110,14 @@ stdenv.mkDerivation rec {
       existing DOSBox codebase while leveraging modern development tools and
       practices.
     '';
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ joshuafern AndersonTorres ];
-    platforms = platforms.unix;
+    changelog = "https://github.com/dosbox-staging/dosbox-staging/releases/tag/v${self.version}";
+    license = lib.licenses.gpl2Plus;
+    maintainers = [
+      lib.maintainers.joshuafern
+      lib.maintainers.AndersonTorres
+    ];
+    platforms = lib.platforms.unix;
     priority = 101;
   };
-}
-# TODO: report upstream about not finding SDL2_net
+})
+# TODO: report upstream about not finding extra SDL2 libraries

pkgs/applications/emulators/retroarch/cores.nix

@@ -734,7 +734,6 @@ in
 
   picodrive = mkLibretroCore {
     core = "picodrive";
-    version = "unstable-2023-02-15";
     dontConfigure = true;
     makeFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "platform=aarch64" ];
     meta = {

pkgs/applications/emulators/retroarch/hashes.json

@@ -352,8 +352,8 @@
     "picodrive": {
         "owner": "libretro",
         "repo": "picodrive",
-        "rev": "b2d43acfbc288038749d8a8fdfbcb0474568e043",
-        "sha256": "kDSQgF8G/IpZ9NkSwuOjFSkirkum7foRT01qIbNJmJI=",
+        "rev": "62873cab5366999207c197e9f55987daee10be4a",
+        "sha256": "YErmanNczeh6BeanCGllwOoTjXO+9At8l/o4UhIek4o=",
         "fetchSubmodules": true
     },
     "play": {

pkgs/applications/file-managers/mc/default.nix

@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     openssl
     slang
     zip
-  ] ++ lib.optionals x11Support [ libX11 ]
+  ] ++ lib.optional x11Support [ libX11 ]
     ++ lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ];
 
   enableParallelBuilding = true;

pkgs/applications/file-managers/spacefm/default.nix

@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     gtk3 udev desktop-file-utils shared-mime-info
     wrapGAppsHook ffmpegthumbnailer jmtpfs lsof udisks2
-  ] ++ (lib.optionals ifuseSupport [ ifuse ]);
+  ] ++ (if ifuseSupport then [ ifuse ] else []);
   # Introduced because ifuse doesn't build due to CVEs in libplist
   # Revert when libplist builds again…
 

pkgs/applications/file-managers/vifm/default.nix

@@ -34,11 +34,11 @@ in stdenv.mkDerivation rec {
 
     wrapVifmMedia = "wrapProgram $out/share/vifm/vifm-media --prefix PATH : ${path}";
   in ''
-    ${lib.optionalString mediaSupport wrapVifmMedia}
+    ${if mediaSupport then wrapVifmMedia else ""}
   '';
 
   meta = with lib; {
-    description = "A vi-like file manager${lib.optionalString isFullPackage "; Includes support for optional features"}";
+    description = "A vi-like file manager${if isFullPackage then "; Includes support for optional features" else ""}";
     maintainers = with maintainers; [ raskin ];
     platforms = if mediaSupport then platforms.linux else platforms.unix;
     license = licenses.gpl2;

pkgs/applications/gis/saga/default.nix

@@ -31,11 +31,11 @@
 
 mkDerivation rec {
   pname = "saga";
-  version = "8.5.1";
+  version = "8.5.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/saga-gis/SAGA%20-%20${lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz";
-    sha256 = "sha256-JnZ0m0GAgfz3BbiKxqLoMoa4pX//r5t+mbhMCdAo9OE=";
+    sha256 = "sha256-JzSuu1wGfCkxIDcTbP5jpHtJNvl8eAP3jznXvwSPeY0=";
   };
 
   sourceRoot = "saga-${version}/saga-gis";

pkgs/applications/graphics/gimp/plugins/default.nix

@@ -109,9 +109,7 @@ in
     /* menu:
        Video
     */
-    pname = "gap";
-    version = "2.6.0";
-
+    name = "gap-2.6.0";
     src = fetchurl {
       url = "https://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2";
       sha256 = "1jic7ixcmsn4kx2cn32nc5087rk6g8xsrz022xy11yfmgvhzb0ql";
@@ -230,9 +228,7 @@ in
     /* menu:
       Filters/Enhance/Wavelet sharpen
     */
-    pname = "wavelet-sharpen";
-    version = "0.1.2";
-
+    name = "wavelet-sharpen-0.1.2";
     # Workaround build failure on -fno-common toolchains like upstream
     # gcc-10. Otherwise build fails as:
     #   ld: interface.o:(.bss+0xe0): multiple definition of `fimg'; plugin.o:(.bss+0x40): first defined here
@@ -275,7 +271,7 @@ in
 
   gimplensfun = pluginDerivation rec {
     version = "unstable-2018-10-21";
-    pname = "gimplensfun";
+    name = "gimplensfun-${version}";
 
     src = fetchFromGitHub {
       owner = "seebk";

pkgs/applications/graphics/gthumb/default.nix

@@ -1,7 +1,5 @@
-{ stdenv
-, lib
+{ lib, stdenv
 , fetchurl
-, fetchpatch
 , gnome
 , pkg-config
 , meson
@@ -42,15 +40,6 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-l/iv5SJTUhZUHrvx47VG0Spr6zio8OuF8m5naTSq1CU=";
   };
 
-  patches = [
-    # Fix build with libraw 0.21, can be removed on next update
-    # https://hydra.nixos.org/build/209327709/nixlog/1
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/gthumb/-/commit/da0d3f22a5c3a141211d943e7d963d14090011ec.patch";
-      sha256 = "sha256-/l9US19rKxIUJjZ+oynGLr/9PKJPg9VUuA/VSuIT5AQ=";
-    })
-  ];
-
   nativeBuildInputs = [
     bison
     desktop-file-utils

pkgs/applications/kde/kdevelop/wrapper.nix

@@ -1,7 +1,7 @@
-{ lib, symlinkJoin, kdevelop-unwrapped, plugins ? null }:
+{ symlinkJoin, kdevelop-unwrapped, plugins ? null }:
 
 symlinkJoin {
   name = "kdevelop-with-plugins";
 
-  paths = [ kdevelop-unwrapped ] ++ (lib.optionals (plugins != null) plugins);
+  paths = [ kdevelop-unwrapped ] ++ (if plugins != null then plugins else []);
 }

pkgs/applications/misc/auto-multiple-choice/default.nix

@@ -42,14 +42,8 @@ stdenv.mkDerivation rec {
     # Relative paths.
     "BINDIR=/bin"
     "PERLDIR=/share/perl5"
-    "MODSDIR=/lib" # At runtime, AMC will test for that dir before
-    # defaulting to the "portable" strategy we use, so this test
-    # *must* fail.  *But* this variable cannot be set to anything but
-    # "/lib" , because that name is hardcoded in the main executable
-    # and this variable controls both both the path AMC will check at
-    # runtime, AND the path where the actual modules will be stored at
-    # build-time.  This has been reported upstream as
-    # https://project.auto-multiple-choice.net/issues/872
+    "MODSDIR=/nonexistent" # AMC will test for that dir before
+    # defaulting to the "portable" strategy, so this test *must* fail.
     "TEXDIR=/tex/latex/" # what texlive.combine expects
     "TEXDOCDIR=/share/doc/texmf/" # TODO where to put this?
     "MAN1DIR=/share/man/man1"

pkgs/applications/misc/blender/default.nix

@@ -87,10 +87,10 @@ stdenv.mkDerivation rec {
     '' else ''
       substituteInPlace extern/clew/src/clew.c --replace '"libOpenCL.so"' '"${ocl-icd}/lib/libOpenCL.so"'
     '') +
-    (lib.optionalString hipSupport ''
+    (if hipSupport then ''
       substituteInPlace extern/hipew/src/hipew.c --replace '"/opt/rocm/hip/lib/libamdhip64.so"' '"${hip}/lib/libamdhip64.so"'
       substituteInPlace extern/hipew/src/hipew.c --replace '"opt/rocm/hip/bin"' '"${hip}/bin"'
-    '');
+    '' else "");
 
   cmakeFlags =
     [

pkgs/applications/misc/calibre/default.nix

@@ -22,7 +22,6 @@
 , qtbase
 , qtwayland
 , removeReferencesTo
-, speechd
 , sqlite
 , wrapQtAppsHook
 , xdg-utils
@@ -122,7 +121,6 @@ stdenv.mkDerivation rec {
       regex
       sip
       setuptools
-      speechd
       zeroconf
       jeepney
       pycryptodome

pkgs/applications/misc/genxword/default.nix

@@ -26,7 +26,6 @@ python3.pkgs.buildPythonApplication rec {
   ];
 
   buildInputs = [
-    gobject-introspection
     pango
     gtksourceview3
   ];

pkgs/applications/misc/holochain-launcher/default.nix

@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation rec {
   name = "holochain-launcher";
-  version = "0.9.0";
+  version = "0.6.0";
 
   src = fetchurl {
     url = "https://github.com/holochain/launcher/releases/download/v${version}/holochain-launcher_${version}_amd64.deb";
-    sha256 = "sha256-uG7EqM2CKDp+mQQp6wKs0yN0OX8N7O53VaiNcFYh6OY=";
+    sha256 = "sha256-o9cUFtq5XUkbC3yFRFiV2k4uWjb+szlE8qV+G9Gve5E=";
   };
 
   nativeBuildInputs = [

pkgs/applications/misc/ikiwiki/default.nix

@@ -57,11 +57,6 @@ stdenv.mkDerivation rec {
     # Without patched plugin shebangs, some tests like t/rst.t fail
     # (with docutilsSupport enabled)
     patchShebangs plugins/*
-
-    # Creating shared git repo fails when running tests in Nix sandbox.
-    # The error is: "fatal: Could not make /tmp/ikiwiki-test-git.2043/repo/branches/ writable by group".
-    # Hopefully, not many people use `ikiwiki-makerepo` to create locally shared repositories these days.
-    substituteInPlace ikiwiki-makerepo --replace "git --bare init --shared" "git --bare init"
   '';
 
   configurePhase = "perl Makefile.PL PREFIX=$out";

pkgs/applications/misc/maliit-framework/default.nix

@@ -33,14 +33,6 @@ mkDerivation rec {
     sha256 = "sha256-q+hiupwlA0PfG+xtomCUp2zv6HQrGgmOd9CU193ucrY=";
   };
 
-  patches = [
-    # FIXME: backport GCC 12 build fix, remove for next release
-    (fetchpatch {
-      url = "https://github.com/maliit/framework/commit/86e55980e3025678882cb9c4c78614f86cdc1f04.diff";
-      hash = "sha256-5R+sCI05vJX5epu6hcDSWWzlZ8ns1wKEJ+u8xC6d8Xo=";
-    })
-  ];
-
   buildInputs = [
     at-spi2-atk
     at-spi2-core

pkgs/applications/misc/pdfsam-basic/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "pdfsam-basic";
-  version = "5.0.3";
+  version = "5.0.2";
 
   src = fetchurl {
     url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb";
-    hash = "sha256-NST5d5dzO26ifKStbgD7qNbumUMQhfUFNE472LR1z5k=";
+    hash = "sha256-+nBLmbu1aRnfWYNhTBUJdRmdlud8FK7LZFvDNFDrhiI=";
   };
 
   unpackPhase = ''

pkgs/applications/misc/pueue/default.nix

@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, Libsystem
 , SystemConfiguration
 , installShellFiles
 , libiconv
@@ -10,25 +9,20 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "pueue";
-  version = "3.1.0";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "Nukesor";
     repo = "pueue";
     rev = "v${version}";
-    hash = "sha256-vJJ3qQb38b0vr7o+7rc3z5wftI6Ko4mJiGLvVzyjTeE=";
+    hash = "sha256-xUTkjj/PdlgDEp2VMwBuRtF/9iGGiN4FZizdOdcbTag=";
   };
 
-  cargoHash = "sha256-3taLua69kqPnNraIZIesMkFguCbPWTF5Hu9s2Lc02ZA=";
+  cargoSha256 = "sha256-7VdPu+9RYoj4Xfb3J6GLOji7Fqxkk+Fswi4C4q33+jk=";
 
-  nativeBuildInputs = [
-    installShellFiles
-  ] ++ lib.optionals stdenv.isDarwin [
-    rustPlatform.bindgenHook
-  ];
+  nativeBuildInputs = [ installShellFiles ];
 
   buildInputs = lib.optionals stdenv.isDarwin [
-    Libsystem
     SystemConfiguration
     libiconv
   ];

pkgs/applications/misc/tuckr/default.nix

@@ -1,26 +0,0 @@
-{ lib, rustPlatform, fetchFromGitHub }:
-
-rustPlatform.buildRustPackage rec {
-  pname = "tuckr";
-  version = "0.7.0";
-
-  src = fetchFromGitHub {
-    owner = "RaphGL";
-    repo = "Tuckr";
-    rev = version;
-    sha256 = "sha256-mpI0iAGMIzGGdObH5bfyA3iioNdquzLDZoSWxbAOsJ0=";
-  };
-
-  cargoPatches = [ ./update-cargo-lock.diff ];
-
-  cargoSha256 = "sha256-tm8fS8IWxWF4Vh+3QaCiruglZijdOic34vfAyxflDNM=";
-
-  doCheck = false; # test result: FAILED. 5 passed; 3 failed;
-
-  meta = with lib; {
-    description = "A super powered replacement for GNU Stow";
-    homepage = "https://github.com/RaphGL/Tuckr";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ mimame ];
-  };
-}

pkgs/applications/misc/tuckr/update-cargo-lock.diff

@@ -1,49 +0,0 @@
-diff --git i/Cargo.lock w/Cargo.lock
-index 5f5dd43..d7c8370 100644
---- i/Cargo.lock
-+++ w/Cargo.lock
-@@ -107,9 +107,9 @@ dependencies = [
- 
- [[package]]
- name = "clap"
--version = "4.1.4"
-+version = "4.1.6"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76"
-+checksum = "ec0b0588d44d4d63a87dbd75c136c166bbfd9a86a31cb89e09906521c7d3f5e3"
- dependencies = [
-  "bitflags",
-  "clap_derive",
-@@ -248,9 +248,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
- 
- [[package]]
- name = "hermit-abi"
--version = "0.3.0"
-+version = "0.3.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "856b5cb0902c2b6d65d5fd97dfa30f9b70c7538e770b98eab5ed52d8db923e01"
-+checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
- 
- [[package]]
- name = "inout"
-@@ -319,9 +319,9 @@ dependencies = [
- 
- [[package]]
- name = "once_cell"
--version = "1.17.0"
-+version = "1.17.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
-+checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
- 
- [[package]]
- name = "opaque-debug"
-@@ -597,7 +597,7 @@ dependencies = [
- 
- [[package]]
- name = "tuckr"
--version = "0.6.1"
-+version = "0.7.0"
- dependencies = [
-  "chacha20poly1305",
-  "clap",

pkgs/applications/misc/udiskie/default.nix

@@ -43,7 +43,6 @@ python3.pkgs.buildPythonApplication rec {
   dontWrapGApps = true;
 
   buildInputs = [
-    gobject-introspection
     gtk3
     libappindicator-gtk3
     libnotify

pkgs/applications/misc/vhs/default.nix

@@ -1,4 +1,4 @@
-{ lib, buildGoModule, installShellFiles, fetchFromGitHub, ffmpeg, ttyd, chromium, makeWrapper }:
+{ lib, buildGoModule, installShellFiles, fetchFromGitHub, ffmpeg, ttyd, makeWrapper }:
 
 buildGoModule rec {
   pname = "vhs";
@@ -14,11 +14,12 @@ buildGoModule rec {
   vendorHash = "sha256-9nkRr5Jh1nbI+XXbPj9KB0ZbLybv5JUVovpB311fO38=";
 
   nativeBuildInputs = [ installShellFiles makeWrapper ];
+  buildInputs = [ ttyd ffmpeg ];
 
   ldflags = [ "-s" "-w" "-X=main.Version=${version}" ];
 
   postInstall = ''
-    wrapProgram $out/bin/vhs --prefix PATH : ${lib.makeBinPath [ chromium ffmpeg ttyd ]}
+    wrapProgram $out/bin/vhs --prefix PATH : ${lib.makeBinPath [ ffmpeg ttyd ]}
     $out/bin/vhs man > vhs.1
     installManPage vhs.1
     installShellCompletion --cmd vhs \

pkgs/applications/misc/waylock/default.nix

@@ -11,13 +11,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "waylock";
-  version = "0.6.2";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "ifreund";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-jl4jSDWvJB6OfBbVXfVQ7gv/aDkN6bBy+/yK+AQDQL0=";
+    hash = "sha256-AujBvDy10e5HhezCQcXpBUVlktRKNseLxRKdI+gtH6w=";
     fetchSubmodules = true;
   };
 

pkgs/applications/misc/zine/default.nix

@@ -10,14 +10,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "zine";
-  version = "0.10.1";
+  version = "0.10.0";
 
   src = fetchCrate {
     inherit pname version;
-    sha256 = "sha256-3xFJ7v/IZQ3yfU0D09sFXV+4XKRau+Mj3BNxkeUjbbU=";
+    sha256 = "sha256-hkBQ9WaWJrDhGAt35yueINutc7sAMbgbr8Iw5h0Ey4I=";
   };
 
-  cargoHash = "sha256-3Sw/USfGJuf6JGSR3Xkjnmm/UR7NK8rB8St48b4WpIM=";
+  cargoSha256 = "sha256-rY7WHgd5wyx7TUgJamzre8HjeI0BRtaM14V3doCkfVY=";
 
   nativeBuildInputs = [
     pkg-config

pkgs/applications/networking/browsers/chromium/browser.nix

@@ -90,7 +90,9 @@ mkChromiumDerivation (base: rec {
     license = if enableWideVine then lib.licenses.unfree else lib.licenses.bsd3;
     platforms = lib.platforms.linux;
     mainProgram = "chromium";
-    hydraPlatforms = lib.optionals (channel == "stable" || channel == "ungoogled-chromium") ["aarch64-linux" "x86_64-linux"];
+    hydraPlatforms = if (channel == "stable" || channel == "ungoogled-chromium")
+      then ["aarch64-linux" "x86_64-linux"]
+      else [];
     timeout = 172800; # 48 hours (increased from the Hydra default of 10h)
   };
 })

pkgs/applications/networking/browsers/chromium/upstream-info.json

@@ -19,9 +19,9 @@
     }
   },
   "beta": {
-    "version": "111.0.5563.19",
-    "sha256": "0hrapzi45jpkb1b87nzlb896jd2h2jbz1mq91md5r2y6ag6fc55w",
-    "sha256bin64": "1mjrp13xf913xhm9hz6yg595g0jg2afmwvzxzpw79y4snaf2ihza",
+    "version": "110.0.5481.77",
+    "sha256": "1kl1k29sr5qw8pg7shvizw4b37fxjlgah56p57kq641iqhnsnj73",
+    "sha256bin64": "0wnzgvwbpmb5ja4ba5mjk4bk0aaxzbw4zi509vw96q6mbqmr4iwr",
     "deps": {
       "gn": {
         "version": "2022-12-12",
@@ -32,15 +32,15 @@
     }
   },
   "dev": {
-    "version": "112.0.5582.0",
-    "sha256": "139g5cpqxvh6bf2x3aqs4md379rwrx143f8lcsym8hgpqdwq5sfk",
-    "sha256bin64": "1npksnnxcni62wx517xy64ysk3ja868gw48vgx4q8xc93g15n89c",
+    "version": "111.0.5563.19",
+    "sha256": "0hrapzi45jpkb1b87nzlb896jd2h2jbz1mq91md5r2y6ag6fc55w",
+    "sha256bin64": "02aaqny23dcdp611n6jr7swkjnx1wd0lb8dgxq53b806f0s374cp",
     "deps": {
       "gn": {
-        "version": "2023-01-30",
+        "version": "2022-12-12",
         "url": "https://gn.googlesource.com/gn",
-        "rev": "84c8431f3e03cc6226c59dd49637c15ea31169a1",
-        "sha256": "15dqiy1bf1cixqg23bqpfb8mrlcxqbarjwzajc5hjmivykrjn2s3"
+        "rev": "5e19d2fb166fbd4f6f32147fbb2f497091a54ad8",
+        "sha256": "1b5fwldfmkkbpp5x63n1dxv0nc965hphc8rm8ah7zg44zscm9z30"
       }
     }
   },

pkgs/applications/networking/browsers/firefox-bin/update.nix

@@ -46,7 +46,7 @@ in writeScript "update-${pname}" ''
            grep "^[0-9]" | \
            sort --version-sort | \
            grep -v "funnelcake" | \
-           grep -e "${lib.optionalString isBeta "b"}\([[:digit:]]\|[[:digit:]][[:digit:]]\)$" | ${lib.optionalString (not isBeta) "grep -v \"b\" |"} \
+           grep -e "${if isBeta then "b" else ""}\([[:digit:]]\|[[:digit:]][[:digit:]]\)$" | ${if isBeta then "" else "grep -v \"b\" |"} \
            tail -1`
 
   curl --silent -o $HOME/shasums "$url$version/SHA256SUMS"

pkgs/applications/networking/browsers/firefox/packages.nix

@@ -3,10 +3,10 @@
 rec {
   firefox = buildMozillaMach rec {
     pname = "firefox";
-    version = "110.0";
+    version = "109.0.1";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "52a37a8f59a694c4790c0a14cd81fba9e2c982f64e00191afd0897c39ae1d5e25f24cff16f74d0a0b5cdf8e93a9a0974b6042b0de605cf1a533ef4e6a3c0dcf9";
+      sha512 = "58b21449a16a794152888f50e7fe9488c28739a7e067729acdc1de9f2e8384e6316cffdfe89f690f0d211189668d940825b4f8a26b8100468ae120772df99d72";
     };
 
     meta = {
@@ -29,11 +29,11 @@ rec {
 
   firefox-esr-102 = buildMozillaMach rec {
     pname = "firefox-esr-102";
-    version = "102.8.0esr";
+    version = "102.7.0esr";
     applicationName = "Mozilla Firefox ESR";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "93ea87997b66088b94c6e943b6e99e9a71d1908444d096c0f65b6876d2c584e55ff6120266f3851f986b664bd1f12fa31206b03479c2b751e7c3ca097ac14275";
+      sha512 = "2a9d212b5d15e1bf7a6156495126cbc9161d2057aeedea8f7a5a0670a19a9b00cf35044075935c8f3c788118856ba2cc00f9b297c5ac713f094857683f7cd13b";
     };
 
     meta = {

pkgs/applications/networking/browsers/firefox/wrapper.nix

@@ -98,7 +98,7 @@ let
 
       usesNixExtensions = nixExtensions != null;
 
-      nameArray = builtins.map(a: a.name) (lib.optionals usesNixExtensions nixExtensions);
+      nameArray = builtins.map(a: a.name) (if usesNixExtensions then nixExtensions else []);
 
       requiresSigning = browser ? MOZ_REQUIRE_SIGNING
                      -> toString browser.MOZ_REQUIRE_SIGNING != "";
@@ -114,7 +114,7 @@ let
         throw "nixExtensions has an invalid entry. Missing extid attribute. Please use fetchfirefoxaddon"
         else
         a
-      ) (lib.optionals usesNixExtensions nixExtensions);
+      ) (if usesNixExtensions then nixExtensions else []);
 
       enterprisePolicies =
       {

pkgs/applications/networking/browsers/google-chrome/default.nix

@@ -70,7 +70,7 @@ let
     ++ lib.optional libvaSupport libva
     ++ [ gtk3 ];
 
-  suffix = lib.optionalString (channel != "stable") "-${channel}";
+  suffix = if channel != "stable" then "-" + channel else "";
 
   crashpadHandlerBinary = if lib.versionAtLeast version "94"
     then "chrome_crashpad_handler"

pkgs/applications/networking/browsers/librewolf/src.json

@@ -1,11 +1,11 @@
 {
-  "packageVersion": "110.0-1",
+  "packageVersion": "109.0.1-2",
   "source": {
-    "rev": "110.0-1",
-    "sha256": "1fs8z7b1ly3asmgqc4lnidf8k5apaimc875rqm7rqg360bc1qg2p"
+    "rev": "109.0.1-2",
+    "sha256": "1b5572i7aqad0pmjw88d3mhmhhhacp505z0d9l4l89r7gadssbwb"
   },
   "firefox": {
-    "version": "110.0",
-    "sha512": "52a37a8f59a694c4790c0a14cd81fba9e2c982f64e00191afd0897c39ae1d5e25f24cff16f74d0a0b5cdf8e93a9a0974b6042b0de605cf1a533ef4e6a3c0dcf9"
+    "version": "109.0.1",
+    "sha512": "58b21449a16a794152888f50e7fe9488c28739a7e067729acdc1de9f2e8384e6316cffdfe89f690f0d211189668d940825b4f8a26b8100468ae120772df99d72"
   }
 }

pkgs/applications/networking/circumflex/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "circumflex";
-  version = "2.8.1";
+  version = "2.8";
 
   src = fetchFromGitHub {
     owner = "bensadeh";
     repo = "circumflex";
     rev = version;
-    hash = "sha256-hFhK1/ck37lfZJ2wpk1MGCfYEANhh8qzTb8m1t7EoBo=";
+    hash = "sha256-knN+T/dmIwHLqT3MJBjQhGlSeAu0lE2ZOv6tLqkcwS0=";
   };
 
-  vendorHash = "sha256-rwqY6illp5+h/oHOnVg6QfZ6tRFJOamwqJxQx/zlpyI=";
+  vendorHash = "sha256-Xwek2xlvdGO6C/T0a96RGuMcX7jCbvntEYBf10tvmAo=";
 
   nativeBuildInputs = [ makeWrapper ];
 

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

@@ -320,7 +320,8 @@ buildGoModule rec {
   # Fix-Me: Needs to be adapted specifically for 1.23
   # passthru.updateScript = ./update.sh;
 
-  passthru.tests = k3s.passthru.mkTests k3sVersion;
+  # Fix-Me: Needs to be adapted specifically for 1.23
+  # passthru.tests = { inherit (nixosTests) k3s-single-node k3s-single-node-docker; };
 
   meta = baseMeta;
 }

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

@@ -322,7 +322,8 @@ buildGoModule rec {
   # Fix-Me: Needs to be adapted specifically for 1.24
   # passthru.updateScript = ./update.sh;
 
-  passthru.tests = k3s.passthru.mkTests k3sVersion;
+  # Fix-Me: Needs to be adapted specifically for 1.24
+  # passthru.tests = nixosTests.k3s;
 
   meta = baseMeta;
 }

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

@@ -322,7 +322,8 @@ buildGoModule rec {
   # Fix-Me: Needs to be adapted specifically for 1.25
   # passthru.updateScript = ./update.sh;
 
-  passthru.tests = k3s.passthru.mkTests k3sVersion;
+  # Fix-Me: Needs to be adapted specifically for 1.25
+  # passthru.tests = nixosTests.k3s;
 
   meta = baseMeta;
 }

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

@@ -319,14 +319,7 @@ buildGoModule rec {
 
   passthru.updateScript = ./update.sh;
 
-  passthru.mkTests = version:
-    let k3s_version = "k3s_" + lib.replaceStrings ["."] ["_"] (lib.versions.majorMinor version);
-    in {
-      single-node = nixosTests.k3s.single-node.${k3s_version};
-      multi-node = nixosTests.k3s.multi-node.${k3s_version};
-    };
-  passthru.tests = passthru.mkTests k3sVersion;
-
+  passthru.tests = nixosTests.k3s;
 
   meta = baseMeta;
 }

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

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "kluctl";
-  version = "2.19.0";
+  version = "2.18.4";
 
   src = fetchFromGitHub {
     owner = "kluctl";
     repo = "kluctl";
     rev = "v${version}";
-    hash = "sha256-2nAgJj/cMDiE5rw/YixNYQNCWnuC/8EX4BrnXN4Npao=";
+    hash = "sha256-nHfJ7Dt9nAY4fY+U7W46cPRwWSgtGvwdbUjQAynOQdw=";
   };
 
-  vendorHash = "sha256-xBUrY8v4yHtWGaaRXHxQRGdZHzMGoJX2hFLL+0Vb1QY=";
+  vendorHash = "sha256-ADYXLcCYmlQim9KvqkXGdEXJ9cACBsRCb3emcmrL0kg=";
 
   ldflags = [ "-s" "-w" "-X main.version=v${version}" ];