Merge staging-next into staging

.github/actions/checkout/action.yml

@@ -13,7 +13,7 @@ inputs:
 runs:
   using: composite
   steps:
-    - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+    - uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
       env:
         MERGED_SHA: ${{ inputs.merged-as-untrusted-at }}
         TARGET_SHA: ${{ inputs.target-as-trusted-at }}

.github/dependabot.yml

@@ -1,7 +1,9 @@
 version: 2
 updates:
   - package-ecosystem: "github-actions"
-    directory: "/"
+    directories:
+      - "/"
+      - ".github/actions/*/*"
     schedule:
       interval: "weekly"
     labels: []

maintainers/github-teams.json

@@ -2,11 +2,10 @@
   "acme": {
     "description": "Maintain ACME-related packages and modules.",
     "id": 3806126,
-    "maintainers": {
-      "emilazy": 18535642
-    },
+    "maintainers": {},
     "members": {
       "arianvp": 628387,
+      "emilazy": 18535642,
       "m1cr0man": 3044438
     },
     "name": "ACME"
@@ -60,7 +59,6 @@
       "adamcstephens": 2071575,
       "ankhers": 750786,
       "gleber": 33185,
-      "minijackson": 1200507,
       "yurrriq": 1866448
     },
     "name": "Beam"
@@ -68,11 +66,10 @@
   "boot-security": {
     "description": "Maintain support for boot security technologies like Secure Boot",
     "id": 18686947,
-    "maintainers": {
-      "emilazy": 18535642
-    },
+    "maintainers": {},
     "members": {
-      "ElvishJerricco": 1365692
+      "ElvishJerricco": 1365692,
+      "emilazy": 18535642
     },
     "name": "Boot security"
   },
@@ -98,8 +95,8 @@
       "fgaz": 8182846,
       "natsukium": 25083790,
       "philiptaron": 43863,
-      "pyrotelekinetic": 29682759,
-      "tomodachi94": 68489118
+      "tomodachi94": 68489118,
+      "tr3foil": 29682759
     },
     "members": {},
     "name": "Categorization"
@@ -184,7 +181,6 @@
     "description": "Improve Darwin-support across Nixpkgs and help maintainers without access to Darwin hardware. Apply to join through https://github.com/NixOS/nixpkgs/issues/323144 to keep the process transparent.",
     "id": 2385202,
     "maintainers": {
-      "emilazy": 18535642,
       "toonn": 1486805
     },
     "members": {
@@ -211,10 +207,12 @@
       "cideM": 4246921,
       "cidkidnix": 67574902,
       "copumpkin": 2623,
+      "delafthi": 50531499,
       "devusb": 4951663,
       "domenkozar": 126339,
       "dwt": 57199,
       "eclairevoyant": 848000,
+      "emilazy": 18535642,
       "ethancedwards8": 60861925,
       "fiddlerwoaroof": 808745,
       "fulsomenko": 14945057,
@@ -580,11 +578,11 @@
     "id": 9955829,
     "maintainers": {
       "RossComputerGuy": 19699320,
-      "alyssais": 2768870,
-      "emilazy": 18535642
+      "alyssais": 2768870
     },
     "members": {
       "Ericson2314": 1055245,
+      "emilazy": 18535642,
       "peterwaller-arm": 52030119,
       "rrbutani": 7833358
     },
@@ -756,16 +754,6 @@
     },
     "name": "Nixpkgs CI"
   },
-  "nixpkgs-core": {
-    "description": "Provides leadership for and has authority over Nixpkgs.",
-    "id": 14317027,
-    "maintainers": {
-      "alyssais": 2768870,
-      "emilazy": 18535642
-    },
-    "members": {},
-    "name": "Nixpkgs core"
-  },
   "nixpkgs-merge-bot": {
     "description": "This team exists as a target for triggering the nixpkgs merge bot.",
     "id": 13926892,
@@ -1001,11 +989,11 @@
     "id": 11265412,
     "maintainers": {
       "RossComputerGuy": 19699320,
-      "emilazy": 18535642,
       "philiptaron": 43863
     },
     "members": {
       "Ericson2314": 1055245,
+      "emilazy": 18535642,
       "reckenrode": 7413633
     },
     "name": "stdenv"

maintainers/maintainer-list.nix

@@ -2193,6 +2193,12 @@
     githubId = 8436007;
     name = "Aria Edmonds";
   };
+  ar4m1s = {
+    name = "Aramis";
+    github = "Ar4m1s";
+    githubId = 59250656;
+    matrix = "@vegardbm:matrix.org";
+  };
   arbel-arad = {
     email = "arbel@spacetime.technology";
     github = "arbel-arad";
@@ -7972,6 +7978,12 @@
     github = "edlimerkaj";
     githubId = 71988351;
   };
+  edoars = {
+    name = "Edoardo Signorini";
+    email = "mail@edoars.me";
+    github = "edoars";
+    githubId = 44139791;
+  };
   edrex = {
     email = "ericdrex@gmail.com";
     github = "edrex";
@@ -20963,6 +20975,12 @@
     githubId = 1839979;
     name = "Niklas Thörne";
   };
+  ntsk = {
+    email = "ntsk@ntsk.jp";
+    github = "ntsk";
+    githubId = 5681281;
+    name = "ntsk";
+  };
   nudelsalat = {
     email = "nudelsalat@clouz.de";
     name = "Fabian Dreßler";
@@ -30898,6 +30916,13 @@
     githubId = 1595132;
     name = "Kranium Gikos Mendoza";
   };
+  WOnder93 = {
+    email = "omosnacek@gmail.com";
+    github = "WOnder93";
+    githubId = 3041388;
+    matrix = "@omos:fedora.im";
+    name = "Ondrej Mosnáček";
+  };
   workflow = {
     email = "4farlion@gmail.com";
     github = "workflow";
@@ -31209,6 +31234,12 @@
     githubId = 3028542;
     name = "Guillermo NWDD";
   };
+  xoconoch = {
+    email = "github@cordovault.com";
+    github = "xoconoch";
+    githubId = 93692082;
+    name = "Xoconoch";
+  };
   xokdvium = {
     email = "sergei@zimmerman.foo";
     github = "xokdvium";

nixos/modules/programs/zsh/zsh.nix

@@ -58,6 +58,8 @@ in
         type = lib.types.bool;
       };
 
+      package = lib.mkPackageOption pkgs "zsh" { };
+
       shellAliases = lib.mkOption {
         default = { };
         description = ''
@@ -195,7 +197,7 @@ in
           . ${config.system.build.setEnvironment}
       fi
 
-      HELPDIR="${pkgs.zsh}/share/zsh/$ZSH_VERSION/help"
+      HELPDIR="${cfg.package}/share/zsh/$ZSH_VERSION/help"
 
       # Tell zsh how to find installed completions.
       for p in ''${(z)NIX_PROFILES}; do
@@ -307,7 +309,7 @@ in
     environment.etc.zinputrc.text = builtins.readFile ./zinputrc;
 
     environment.systemPackages = [
-      pkgs.zsh
+      cfg.package
     ]
     ++ lib.optional cfg.enableCompletion pkgs.nix-zsh-completions;
 
@@ -317,7 +319,7 @@ in
 
     environment.shells = [
       "/run/current-system/sw/bin/zsh"
-      "${pkgs.zsh}/bin/zsh"
+      "${cfg.package}/bin/zsh"
     ];
 
   };

nixos/modules/services/matrix/mautrix-meta.nix

@@ -18,6 +18,7 @@ let
   settingsFileUnsubstituted = cfg: settingsFormat.generate "mautrix-meta-config.yaml" cfg.settings;
 
   metaName = name: "mautrix-meta-${name}";
+  packageName = network: if network == "instagram" then "mautrix-instagram" else "mautrix-meta";
 
   enabledInstances = lib.filterAttrs (
     name: config: config.enable
@@ -200,8 +201,10 @@ in
                   '';
                   description = ''
                     {file}`config.yaml` configuration as a Nix attribute set.
-                    Configuration options should match those described in
-                    [example-config.yaml](https://github.com/mautrix/meta/blob/main/example-config.yaml).
+                    Configuration options should match those described in the example configuration.
+                    Get an example configuration by executing one of those commands
+                      - `mautrix-meta -c example.yaml --generate-example-config`
+                      - `mautrix-instagram -c example.yaml --generate-example-config`
 
                     Secret tokens should be specified using {option}`environmentFile`
                     instead
@@ -471,7 +474,7 @@ in
               cp '${settingsFile cfg}' '${settingsFile cfg}.tmp'
 
               echo "Generating registration file"
-              mautrix-meta \
+              ${lib.getExe' upperCfg.package (packageName cfg.settings.network.mode)} \
                 --generate-registration \
                 --config='${settingsFile cfg}.tmp' \
                 --registration='${cfg.registrationFile}'
@@ -568,7 +571,7 @@ in
               EnvironmentFile = cfg.environmentFile;
 
               ExecStart = lib.escapeShellArgs [
-                (lib.getExe upperCfg.package)
+                (lib.getExe' upperCfg.package (packageName cfg.settings.network.mode))
                 "--config=${settingsFile cfg}"
               ];
             };

nixos/modules/services/monitoring/beszel-agent.nix

@@ -16,6 +16,11 @@ in
   options.services.beszel.agent = {
     enable = lib.mkEnableOption "beszel agent";
     package = lib.mkPackageOption pkgs "beszel" { };
+    dataDir = lib.mkOption {
+      type = lib.types.path;
+      default = "/var/lib/beszel-agent";
+      description = "Data directory of beszel-agent.";
+    };
     openFirewall = (lib.mkEnableOption "") // {
       description = "Whether to open the firewall port (default 45876).";
     };
@@ -126,7 +131,7 @@ in
 
       environment = lib.mapAttrs (
         _: value: if lib.isBool value then (lib.boolToString value) else value
-      ) cfg.environment;
+      ) (cfg.environment // { DATA_DIR = cfg.dataDir; });
 
       path =
         cfg.extraPath
@@ -147,6 +152,7 @@ in
         '';
 
         EnvironmentFile = cfg.environmentFile;
+        StateDirectory = baseNameOf cfg.dataDir;
 
         # adds ability to monitor docker/podman containers
         SupplementaryGroups =

nixos/modules/services/torrent/transmission.nix

@@ -383,7 +383,8 @@ in
 
     systemd.services.transmission = {
       description = "Transmission BitTorrent Service";
-      after = [ "network.target" ] ++ optional apparmor.enable "apparmor.service";
+      wants = [ "network-online.target" ];
+      after = [ "network-online.target" ] ++ optional apparmor.enable "apparmor.service";
       requires = optional apparmor.enable "apparmor.service";
       wantedBy = [ "multi-user.target" ];
 

nixos/tests/matrix/mautrix-meta-postgres.nix

@@ -90,12 +90,21 @@ in
               as_token = "$AS_TOKEN";
               hs_token = "$HS_TOKEN";
 
-              database = {
-                type = "postgres";
-                uri = "postgres:///mautrix-meta-instagram?host=/var/run/postgresql";
+              bot = {
+                username = botUserName;
+                avatar = "";
               };
+            };
 
-              bot.username = botUserName;
+            database = {
+              type = "postgres";
+              uri = "postgres:///mautrix-meta-instagram?host=/var/run/postgresql";
+            };
+
+            encryption = {
+              allow = false;
+              default = false;
+              require = false;
             };
 
             bridge.permissions."@${userName}:server" = "user";
@@ -127,13 +136,14 @@ in
               import functools
               import asyncio
 
-              from nio import AsyncClient, RoomMessageNotice, RoomCreateResponse, RoomInviteResponse
+              from nio import AsyncClient, RoomMessageText, RoomCreateResponse, RoomInviteResponse
 
 
-              async def message_callback(matrix: AsyncClient, msg: str, _r, e):
+              async def message_callback(matrix: AsyncClient, expected_msg: str, expected_sender: str, _r, e):
                   print("Received matrix text message: ", e)
-                  assert msg in e.body
-                  exit(0)  # Success!
+                  if getattr(e, "sender", "") == expected_sender and expected_msg in getattr(e, "body", ""):
+                      print("Success!")
+                      exit(0)  # Success!
 
 
               async def run(homeserver: str):
@@ -151,9 +161,9 @@ in
                   assert isinstance(response, RoomInviteResponse)
 
                   callback = functools.partial(
-                      message_callback, matrix, "Hello, I'm an Instagram bridge bot."
+                      message_callback, matrix, "Hello, I'm a Instagram bridge bot.", "@${botUserName}:${homeserverDomain}"
                   )
-                  matrix.add_event_callback(callback, RoomMessageNotice)
+                  matrix.add_event_callback(callback, RoomMessageText)
 
                   print("Waiting for matrix message...")
                   await matrix.sync_forever(timeout=30000)
@@ -171,11 +181,10 @@ in
     def extract_token(data):
         stdout = data[1]
         stdout = stdout.strip()
-        line = stdout.split('\n')[-1]
-        return line.split(':')[-1].strip("\" '\n")
+        return stdout.split(':')[-1].strip("\" '\n")
 
     def get_token_from(token, file):
-        data = server.execute(f"cat {file} | grep {token}")
+        data = server.execute(f"grep -E '^\\s*{token}:' {file}")
         return extract_token(data)
 
     def get_as_token_from(file):

nixos/tests/matrix/mautrix-meta-sqlite.nix

@@ -4,7 +4,7 @@ let
   homeserverUrl = "http://server:8008";
   username = "alice";
   instagramBotUsername = "instagrambot";
-  facebookBotUsername = "facebookbot";
+  metaBotUsername = "metabot";
 in
 {
   name = "mautrix-meta-sqlite";
@@ -60,7 +60,16 @@ in
             appservice = {
               port = 8009;
 
-              bot.username = facebookBotUsername;
+              bot = {
+                username = metaBotUsername;
+                avatar = "";
+              };
+            };
+
+            encryption = {
+              allow = false;
+              default = false;
+              require = false;
             };
 
             bridge.permissions."@${username}:server" = "user";
@@ -79,7 +88,16 @@ in
             appservice = {
               port = 8010;
 
-              bot.username = instagramBotUsername;
+              bot = {
+                username = instagramBotUsername;
+                avatar = "";
+              };
+            };
+
+            encryption = {
+              allow = false;
+              default = false;
+              require = false;
             };
 
             bridge.permissions."@${username}:server" = "user";
@@ -136,16 +154,17 @@ in
               import functools
               import asyncio
 
-              from nio import AsyncClient, RoomMessageNotice, RoomCreateResponse, RoomInviteResponse
+              from nio import AsyncClient, RoomMessageText, RoomCreateResponse, RoomInviteResponse
 
 
-              async def message_callback(matrix: AsyncClient, msg: str, _r, e):
+              async def message_callback(matrix: AsyncClient, expected_msg: str, expected_sender: str, _r, e):
                   print("Received matrix text message: ", e)
-                  assert msg in e.body
-                  exit(0)  # Success!
+                  if getattr(e, "sender", "") == expected_sender and expected_msg in getattr(e, "body", ""):
+                      print("Success!")
+                      exit(0)  # Success!
 
 
-              async def run(username: str, bot_username: str, homeserver: str):
+              async def run(username: str, bot_username: str, homeserver: str, expected_msg: str):
                   matrix = AsyncClient(homeserver, f"@{username}:${homeserverDomain}")
 
                   response = await matrix.login("foobar")
@@ -161,16 +180,16 @@ in
                   assert isinstance(response, RoomInviteResponse)
 
                   callback = functools.partial(
-                      message_callback, matrix, "Hello, I'm an Instagram bridge bot."
+                      message_callback, matrix, expected_msg, f"@{bot_username}:${homeserverDomain}"
                   )
-                  matrix.add_event_callback(callback, RoomMessageNotice)
+                  matrix.add_event_callback(callback, RoomMessageText)
 
                   print("Waiting for matrix message...")
                   await matrix.sync_forever(timeout=30000)
 
 
               if __name__ == "__main__":
-                  asyncio.run(run(sys.argv[1], sys.argv[2], sys.argv[3]))
+                  asyncio.run(run(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4]))
             ''
           )
         ];
@@ -181,11 +200,10 @@ in
     def extract_token(data):
         stdout = data[1]
         stdout = stdout.strip()
-        line = stdout.split('\n')[-1]
-        return line.split(':')[-1].strip("\" '\n")
+        return stdout.split(':')[-1].strip("\" '\n")
 
     def get_token_from(token, file):
-        data = server.execute(f"cat {file} | grep {token}")
+        data = server.execute(f"grep -E '^\\s*{token}:' {file}")
         return extract_token(data)
 
     def get_as_token_from(file):
@@ -216,8 +234,8 @@ in
         client.succeed("register_user ${username} ${homeserverUrl} >&2")
 
     with subtest("ensure messages can be exchanged"):
-        client.succeed("do_test ${username} ${facebookBotUsername} ${homeserverUrl} >&2")
-        client.succeed("do_test ${username} ${instagramBotUsername} ${homeserverUrl} >&2")
+        client.succeed("do_test ${username} ${metaBotUsername} ${homeserverUrl} \"Hello, I'm a Facebook Messenger bridge bot.\" >&2")
+        client.succeed("do_test ${username} ${instagramBotUsername} ${homeserverUrl} \"Hello, I'm a Instagram bridge bot.\" >&2")
 
     with subtest("ensure as_token and hs_token stays same after restart"):
         generated_as_token_facebook = get_as_token_from(config_yaml)
@@ -252,7 +270,7 @@ in
         assert generated_hs_token_facebook == new_hs_token_facebook, f"hs_token should stay the same after restart inside the registration file (is: {new_hs_token_facebook}, was: {generated_hs_token_facebook})"
 
     with subtest("ensure messages can be exchanged after restart"):
-        client.succeed("do_test ${username} ${instagramBotUsername} ${homeserverUrl} >&2")
-        client.succeed("do_test ${username} ${facebookBotUsername} ${homeserverUrl} >&2")
+        client.succeed("do_test ${username} ${instagramBotUsername} ${homeserverUrl} \"Hello, I'm a Instagram bridge bot.\" >&2")
+        client.succeed("do_test ${username} ${metaBotUsername} ${homeserverUrl} \"Hello, I'm a Facebook Messenger bridge bot.\" >&2")
   '';
 }

pkgs/applications/audio/quodlibet/default.nix

@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   fetchFromGitHub,
   tag ? "",
 
@@ -196,5 +197,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     homepage = "https://quodlibet.readthedocs.io/en/latest";
     license = lib.licenses.gpl2Plus;
     maintainers = [ ];
+    broken = stdenv.hostPlatform.isDarwin;
   };
 })

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

@@ -16,9 +16,9 @@ let
       inherit tiling_wm;
     };
   stableVersion = {
-    version = "2026.1.3.7"; # "Android Studio Quail 3 | 2026.1.3"
-    sha256Hash = "sha256-NoMhIlV6tzymjf2b2YndrEAQOsADyhDgTJSaH2FXimc=";
-    url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.3.7/android-studio-quail3-linux.tar.gz";
+    version = "2026.1.3.8"; # "Android Studio Quail 3 | 2026.1.3 Patch 1"
+    sha256Hash = "sha256-W9XuXW50exP4L7oyQTgL01jML0qEeBXI6GB1ffE9w18=";
+    url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.3.8/android-studio-quail3-patch1-linux.tar.gz";
   };
   betaVersion = {
     version = "2026.1.3.6"; # "Android Studio Quail 3 | 2026.1.3 RC 2"

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

@@ -1023,8 +1023,8 @@ let
         mktplcRef = {
           name = "coder-remote";
           publisher = "coder";
-          version = "1.15.2";
-          hash = "sha256-mBACvGUQF3LoaFJ9MIewN9zu4jDTWfUgyd1MQvZQUvk=";
+          version = "1.16.0";
+          hash = "sha256-ZQivZPBQ10KwtY8LaQPeDNYl5jcpY1kAkT65yiQvR+M=";
         };
         meta = {
           description = "Extension for Visual Studio Code to open any Coder workspace in VS Code with a single click";
@@ -1259,8 +1259,8 @@ let
         mktplcRef = {
           name = "vscode-markdownlint";
           publisher = "DavidAnson";
-          version = "0.62.0";
-          hash = "sha256-cupXtTdzTKxhvTEHKe/OU8TFlp1CeAIIy2XCLvLMZ5s=";
+          version = "0.62.1";
+          hash = "sha256-zR0pWpxWTTxeAEfX49vlhaTPc2YZxcJCv62abriPtRg=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/DavidAnson.vscode-markdownlint/changelog";
@@ -1391,8 +1391,8 @@ let
         mktplcRef = {
           name = "competitive-programming-helper";
           publisher = "DivyanshuAgrawal";
-          version = "2026.7.1784984280";
-          hash = "sha256-0re8raTXTv61JUr0WeIOmSWIy5NsgmqKpkJo5nt8z+w=";
+          version = "2026.8.1785865132";
+          hash = "sha256-/JVuIOoTgeENtbvYFri1/RtiZ6PCabOrwC1mzHoaML4=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/DivyanshuAgrawal.competitive-programming-helper/changelog";
@@ -4868,8 +4868,8 @@ let
         mktplcRef = {
           name = "emacs-mcx";
           publisher = "tuttieee";
-          version = "0.111.1";
-          hash = "sha256-+0wIC/7xbun2Wf8wePU6NSR9UMNd0RvLz6UdAM3X5Y4=";
+          version = "0.111.3";
+          hash = "sha256-yMiEvC7zCVnBSSo+HvK9m7RbD6Bmv7zwKabOtlsEXjE=";
         };
         meta = {
           changelog = "https://github.com/whitphx/vscode-emacs-mcx/blob/main/CHANGELOG.md";

pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix

@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "windows-ai-studio";
     publisher = "ms-windows-ai-studio";
-    version = "1.6.6";
-    hash = "sha256-3eG6OIjCLBYgP0bweyZGv9OUiKN1xQa3ufdt3JUq9FQ=";
+    version = "1.6.7";
+    hash = "sha256-87ioUa5bpqSlerMvgqSWiWB2xPbb8lje8MChSPV/mKw=";
   };
 
   meta = {

pkgs/applications/emulators/libretro/cores/gambatte.nix

@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "gambatte";
-  version = "0-unstable-2026-07-17";
+  version = "0-unstable-2026-07-31";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "gambatte-libretro";
-    rev = "9b3b5e3cc18ec92f460d37dd551eaf90c55bfcea";
-    hash = "sha256-IBQmVcWx839rRV8uLUou4fdwxgZqVbMWyqRVa3Dq0rc=";
+    rev = "96174369b3c30d9fc57c926fa3379c273dc6a9a5";
+    hash = "sha256-DEXyycFfQMK3RksP+4YxBIPYqmCFH4fM39MKxw6VOBU=";
   };
 
   meta = {

pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix

@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "genesis-plus-gx";
-  version = "0-unstable-2026-07-27";
+  version = "0-unstable-2026-08-07";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "Genesis-Plus-GX";
-    rev = "f687c49dc4b825101f26a483b222620686616b78";
-    hash = "sha256-CztdCuoNIGzpntWmdFmWaTv4TGbo3PdRiH57UMp785M=";
+    rev = "84fcf2ec8e6b8d901c2fec55c884f285f93a1679";
+    hash = "sha256-FQmDiCaxgWwDpUXT8NpiV/xtLdiRHizCVJpqs9PhpvM=";
   };
 
   meta = {

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

@@ -1067,11 +1067,11 @@
     "vendorHash": null
   },
   "ovh_ovh": {
-    "hash": "sha256-KVYxtk94GyVhMVB0E0HZ8Cszm4RWMrSMJB0hh/Llcbk=",
+    "hash": "sha256-b5kPy36JoD+h/v06m93lnccPKvJ4zW/8wAmAttEAv/I=",
     "homepage": "https://registry.terraform.io/providers/ovh/ovh",
     "owner": "ovh",
     "repo": "terraform-provider-ovh",
-    "rev": "v2.18.0",
+    "rev": "v2.19.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

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

@@ -1,49 +1,45 @@
 {
+  # Package metadata
   pname,
   source,
   meta,
-  stdenv,
   binaryName,
   desktopName,
-  self,
+  passthru,
+  moduleSrcs,
+  # Package utilities
+  disableBreakingUpdates,
+  stageModules,
+  # Feature flags (cross-platform)
+  withOpenASAR ? false,
+  withVencord ? false,
+  withEquicord ? false,
+  withMoonlight ? false,
+  # Disabling this would normally break Discord.
+  # The intended use-case for this is when SKIP_HOST_UPDATE is enabled via other means,
+  # for example if a settings.json is linked declaratively (e.g., with home-manager).
+  disableUpdates ? true,
+  # Package arguments
+  commandLineArgs ? "",
+  # Miscellaneous
   lib,
-  fetchurl,
+  stdenv,
   makeWrapper,
-  writeScript,
-  writeShellScript,
   brotli,
   python3,
-  runCommand,
-  branch,
-  withOpenASAR ? false,
+  writeScript,
+  fetchurl,
   openasar,
-  withVencord ? false,
   vencord,
-  withEquicord ? false,
   equicord,
-  withMoonlight ? false,
   moonlight,
-  commandLineArgs ? "",
 }:
 
 let
-  discordMods = [
-    withVencord
-    withEquicord
-    withMoonlight
-  ];
-  enabledDiscordModsCount = builtins.length (lib.filter (x: x) discordMods);
-
   inherit (source) version;
 
   src = fetchurl { inherit (source.distro) url hash; };
 
-  moduleSrcs = lib.mapAttrs (_: mod: fetchurl { inherit (mod) url hash; }) source.modules;
-
-  moduleVersions = lib.mapAttrs (_: mod: mod.version) source.modules;
-
-  configDirName = lib.replaceStrings [ " " ] [ "" ] (lib.toLower binaryName);
-
   fixDistroSymlinks = writeScript "discord-fix-distro-symlinks.py" ''
     #!${python3.interpreter}
     import pathlib
@@ -61,44 +57,16 @@ let
             path.unlink(missing_ok=True)
             path.symlink_to(member.linkname)
   '';
-
-  stageModules = writeShellScript "discord-stage-modules" ''
-    store_modules="$1"
-    user_data_dir="''${DISCORD_USER_DATA_DIR-$HOME/Library/Application Support}"
-    modules_dir="$user_data_dir''${user_data_dir:+/}${configDirName}/${version}/modules"
-    mkdir -p "$modules_dir"
-    for m in ${lib.concatStringsSep " " (lib.attrNames moduleSrcs)}; do
-      rm -rf "$modules_dir/$m"
-      ln -s "$store_modules/$m" "$modules_dir/$m"
-    done
-    echo '${builtins.toJSON (lib.mapAttrs (_: mod: { installedVersion = mod; }) moduleVersions)}' \
-      > "$modules_dir/installed.json"
-  '';
-
-  disableBreakingUpdates =
-    runCommand "disable-breaking-updates.py"
-      {
-        pythonInterpreter = "${python3.interpreter}";
-        configDirName = lib.toLower binaryName;
-        skipModuleUpdate = lib.boolToString withOpenASAR;
-        meta.mainProgram = "disable-breaking-updates.py";
-      }
-      ''
-        mkdir -p $out/bin
-        cp ${./disable-breaking-updates.py} $out/bin/disable-breaking-updates.py
-        substituteAllInPlace $out/bin/disable-breaking-updates.py
-        chmod +x $out/bin/disable-breaking-updates.py
-      '';
 in
-assert lib.assertMsg (
-  enabledDiscordModsCount <= 1
-) "discord: Only one of Vencord, Equicord or Moonlight can be enabled at the same time";
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   inherit
     pname
     version
     src
     meta
+    passthru
+    disableBreakingUpdates
+    stageModules
     ;
 
   nativeBuildInputs = [
@@ -142,8 +110,8 @@ stdenv.mkDerivation {
     # wrap executable to $out/bin
     mkdir -p $out/bin
     makeWrapper "$out/Applications/${desktopName}.app/Contents/MacOS/${binaryName}" "$out/bin/${binaryName}" \
-      --run ${lib.getExe disableBreakingUpdates} \
-      --run "${stageModules} \"$out/Applications/${desktopName}.app/Contents/Resources/modules\"" \
+      ${lib.strings.optionalString disableUpdates "--run ${lib.getExe finalAttrs.disableBreakingUpdates}"} \
+      --run "${finalAttrs.stageModules} \"$out/Applications/${desktopName}.app/Contents/Resources/modules\"" \
       --add-flags ${lib.escapeShellArg commandLineArgs}
 
     runHook postInstall
@@ -171,26 +139,4 @@ stdenv.mkDerivation {
       echo '{"name":"discord","main":"injector.js","private": true}' > "$out/Applications/${desktopName}.app/Contents/Resources/app.asar/package.json"
       echo 'require("${moonlight}/injector.js").inject(require("path").join(__dirname, "../_app.asar"));' > "$out/Applications/${desktopName}.app/Contents/Resources/app.asar/injector.js"
     '';
-
-  passthru = {
-    # make it possible to run disableBreakingUpdates standalone
-    inherit disableBreakingUpdates;
-    inherit source;
-    updateScript = ./update.py;
-
-    tests = {
-      withVencord = self.override {
-        withVencord = true;
-      };
-      withEquicord = self.override {
-        withEquicord = true;
-      };
-      withMoonlight = self.override {
-        withMoonlight = true;
-      };
-      withOpenASAR = self.override {
-        withOpenASAR = true;
-      };
-    };
-  };
-}
+})

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

@@ -77,6 +77,7 @@ let
       infinidoge
       jopejoe1
       Scrumplex
+      sophiebsw
     ];
     platforms = [
       "x86_64-linux"
@@ -84,7 +85,6 @@ let
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
-  package = if stdenv.hostPlatform.isLinux then ./linux.nix else ./darwin.nix;
 
   sources = lib.importJSON ./sources.json;
 in
@@ -95,7 +95,7 @@ lib.genAttrs [ "discord" "discord-ptb" "discord-canary" "discord-development" ]
     platformName = if stdenv.hostPlatform.isDarwin then "osx" else "linux";
     source = sources."${platformName}-${args.branch}";
   in
-  callPackage package (
+  callPackage ./wrapper.nix (
     args
     // {
       inherit pname source;

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

@@ -1,195 +1,170 @@
 {
+  # Package metadata
   pname,
   source,
   meta,
   binaryName,
   desktopName,
-  self,
-  autoPatchelfHook,
+  passthru,
+  moduleSrcs,
+  # Package utilities
+  disableBreakingUpdates,
+  stageModules,
+  # Feature flags (cross-platform)
+  withOpenASAR ? false,
+  withVencord ? false,
+  withEquicord ? false,
+  withMoonlight ? false,
+  # Disabling this would normally break Discord.
+  # The intended use-case for this is when SKIP_HOST_UPDATE is enabled via other means,
+  # for example if a settings.json is linked declaratively (e.g., with home-manager).
+  disableUpdates ? true,
+  # Feature flags (Linux exclusive)
+  withTTS ? true,
+  enableAutoscroll ? false,
+  # Package arguments
+  commandLineArgs ? "",
+  useFHSEnv ? true,
+  # Miscellaneous
+  lib,
+  stdenv,
+  makeShellWrapper,
+  gtk3,
+  brotli,
   addDriverRunpath,
   fetchurl,
   makeDesktopItem,
-  lib,
-  stdenv,
+  autoPatchelfHook,
+  cups,
+  libdrm,
+  libuuid,
+  libxdamage,
+  libx11,
+  libxscrnsaver,
+  libxtst,
+  libxcb,
+  libxshmfence,
   wrapGAppsHook3,
-  makeShellWrapper,
   alsa-lib,
+  libgbm,
+  nspr,
+  nss,
+  libpulseaudio,
+  libcxx,
+  systemdLibs,
+  atk,
   at-spi2-atk,
   at-spi2-core,
-  atk,
   cairo,
-  cups,
   dbus,
   expat,
   fontconfig,
   freetype,
   gdk-pixbuf,
   glib,
-  gtk3,
-  libcxx,
-  libdrm,
   libglvnd,
   libnotify,
-  libpulseaudio,
-  libuuid,
-  libva,
-  libx11,
-  libxscrnsaver,
   libxcomposite,
+  libunity,
+  libva,
   libxcursor,
-  libxdamage,
   libxext,
   libxfixes,
   libxi,
   libxrandr,
   libxrender,
-  libxtst,
-  libxcb,
   libxkbcommon,
-  libxshmfence,
-  libgbm,
-  nspr,
-  nss,
   pango,
-  systemdLibs,
+  pipewire,
   libappindicator-gtk3,
   libdbusmenu,
-  brotli,
-  writeShellScript,
-  pipewire,
-  python3,
-  runCommand,
-  libunity,
-  speechd-minimal,
   wayland,
-  branch,
-  withOpenASAR ? false,
+  speechd-minimal,
   openasar,
-  withVencord ? false,
   vencord,
-  withEquicord ? false,
   equicord,
-  withMoonlight ? false,
   moonlight,
-  withTTS ? true,
-  enableAutoscroll ? false,
-  # Disabling this would normally break Discord.
-  # The intended use-case for this is when SKIP_HOST_UPDATE is enabled via other means,
-  # for example if a settings.json is linked declaratively (e.g., with home-manager).
-  disableUpdates ? true,
-  commandLineArgs ? "",
-}:
+}@args:
 
 let
-  discordMods = [
-    withVencord
-    withEquicord
-    withMoonlight
-  ];
-  enabledDiscordModsCount = builtins.length (lib.filter (x: x) discordMods);
-
   inherit (source) version;
 
   src = fetchurl { inherit (source.distro) url hash; };
 
-  moduleSrcs = lib.mapAttrs (_: mod: fetchurl { inherit (mod) url hash; }) source.modules;
+  targetPkgs =
+    pkgs:
+    (lib.attrValues {
+      inherit (pkgs)
+        libcxx
+        systemdLibs
+        libpulseaudio
+        libdrm
+        libgbm
+        alsa-lib
+        atk
+        at-spi2-atk
+        at-spi2-core
+        cairo
+        cups
+        dbus
+        expat
+        fontconfig
+        freetype
+        gdk-pixbuf
+        glib
+        gtk3
+        libglvnd
+        libnotify
+        libx11
+        libxcomposite
+        libunity
+        libuuid
+        libva
+        libxcursor
+        libxdamage
+        libxext
+        libxfixes
+        libxi
+        libxrandr
+        libxrender
+        libxtst
+        nspr
+        libxcb
+        libxkbcommon
+        pango
+        pipewire
+        libxscrnsaver
+        libappindicator-gtk3
+        libdbusmenu
+        wayland
+        ;
 
-  moduleVersions = lib.mapAttrs (_: mod: mod.version) source.modules;
-
-  libPath = lib.makeLibraryPath (
-    [
-      libcxx
-      systemdLibs
-      libpulseaudio
-      libdrm
-      libgbm
-      stdenv.cc.cc
-      alsa-lib
-      atk
-      at-spi2-atk
-      at-spi2-core
-      cairo
-      cups
-      dbus
-      expat
-      fontconfig
-      freetype
-      gdk-pixbuf
-      glib
-      gtk3
-      libglvnd
-      libnotify
-      libx11
-      libxcomposite
-      libunity
-      libuuid
-      libva
-      libxcursor
-      libxdamage
-      libxext
-      libxfixes
-      libxi
-      libxrandr
-      libxrender
-      libxtst
-      nspr
-      # nss is intentionally NOT in libPath: it would leak via LD_LIBRARY_PATH
-      # to xdg-open and break Firefox children when versions diverge (#514859,
-      # PR #186603)
-      libxcb
-      libxkbcommon
-      pango
-      pipewire
-      libxscrnsaver
-      libappindicator-gtk3
-      libdbusmenu
-      wayland
-    ]
-    ++ lib.optionals withTTS [ speechd-minimal ]
-  );
-
-  # Symlink native modules from the nix store into the user config dir
-  # where Discord's JS moduleUpdater expects them.
-  stageModules = writeShellScript "discord-stage-modules" ''
-    store_modules="$1"
-    user_data_dir="''${DISCORD_USER_DATA_DIR-''${XDG_CONFIG_HOME:-$HOME/.config}}"
-    modules_dir="$user_data_dir''${user_data_dir:+/}${lib.toLower binaryName}/${version}/modules"
-    rm -rf "$modules_dir"
-    mkdir -p "$modules_dir"
-    for m in ${lib.concatStringsSep " " (lib.attrNames moduleSrcs)}; do
-      ln -sn "$store_modules/$m" "$modules_dir/$m"
-    done
-    echo '${builtins.toJSON (lib.mapAttrs (_: mod: { installedVersion = mod; }) moduleVersions)}' \
-      > "$modules_dir/installed.json"
-  '';
-
-  disableBreakingUpdates =
-    runCommand "disable-breaking-updates.py"
-      {
-        pythonInterpreter = "${python3.interpreter}";
-        configDirName = lib.toLower binaryName;
-        skipModuleUpdate = lib.boolToString withOpenASAR;
-        meta.mainProgram = "disable-breaking-updates.py";
-      }
-      ''
-        mkdir -p $out/bin
-        cp ${./disable-breaking-updates.py} $out/bin/disable-breaking-updates.py
-        substituteAllInPlace $out/bin/disable-breaking-updates.py
-        chmod +x $out/bin/disable-breaking-updates.py
-      '';
+      inherit (pkgs.stdenv.cc) cc;
+    })
+    ++ lib.optionals withTTS [ pkgs.speechd-minimal ]
+    # nss is intentionally NOT in libPath: it would leak via LD_LIBRARY_PATH
+    # to xdg-open and break Firefox children when versions diverge (#514859,
+    # PR #186603)
+    ++ lib.optionals useFHSEnv [ pkgs.nss ];
 in
-assert lib.assertMsg (
-  enabledDiscordModsCount <= 1
-) "discord: Only one of Vencord, Equicord or Moonlight can be enabled at the same time";
 stdenv.mkDerivation (finalAttrs: {
   inherit
-    pname
     version
     src
     meta
+    disableBreakingUpdates
+    stageModules
     ;
 
+  pname = if useFHSEnv then "${pname}-unwrapped" else pname;
+
+  libPath = if useFHSEnv then null else lib.makeLibraryPath (targetPkgs args);
+
   nativeBuildInputs = [
+    makeShellWrapper
+    brotli
+  ]
+  ++ lib.optionals (!useFHSEnv) [
     autoPatchelfHook
     cups
     libdrm
@@ -201,13 +176,9 @@ stdenv.mkDerivation (finalAttrs: {
     libxcb
     libxshmfence
     wrapGAppsHook3
-    makeShellWrapper
-    brotli
   ];
 
-  dontWrapGApps = true;
-
-  buildInputs = [
+  buildInputs = lib.optionals (!useFHSEnv) [
     alsa-lib
     libgbm
     nspr
@@ -223,9 +194,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   dontUnpack = true;
 
-  inherit libPath stageModules;
+  dontPatchELF = useFHSEnv;
+  dontStrip = useFHSEnv;
 
-  autoPatchelfIgnoreMissingDeps = [
+  autoPatchelfIgnoreMissingDeps = lib.optionals (!useFHSEnv) [
     "libssl.so.1.1"
     "libcrypto.so.1.1"
   ];
@@ -251,6 +223,8 @@ stdenv.mkDerivation (finalAttrs: {
       '') moduleSrcs
     )}
 
+    mkdir -p $out/opt/${binaryName}/modules/discord_krisp/KMS/logs
+
     wrapProgramShell $out/opt/${binaryName}/${binaryName} \
         "''${gappsWrapperArgs[@]}" \
         --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
@@ -260,10 +234,14 @@ stdenv.mkDerivation (finalAttrs: {
         ''} \
         ${lib.strings.optionalString enableAutoscroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} \
         --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
-        --prefix LD_LIBRARY_PATH : ${finalAttrs.libPath}:$out/opt/${binaryName}:${addDriverRunpath.driverLink}/lib \
+        ${
+          lib.strings.optionalString (!useFHSEnv)
+            "--prefix LD_LIBRARY_PATH : ${finalAttrs.libPath}:$out/opt/${binaryName}:${addDriverRunpath.driverLink}/lib"
+        } \
         --suffix VK_ADD_DRIVER_FILES : "${addDriverRunpath.driverLink}/share/vulkan/icd.d" \
-        ${lib.strings.optionalString disableUpdates "--run ${lib.getExe disableBreakingUpdates}"} \
+        ${lib.strings.optionalString disableUpdates "--run ${lib.getExe finalAttrs.disableBreakingUpdates}"} \
         --run "${finalAttrs.stageModules} $out/opt/${binaryName}/modules" \
+        --run '[ -t 1 ] || exec > /dev/null 2>&1' \
         --add-flags ${lib.escapeShellArg commandLineArgs}
 
     ln -s $out/opt/${binaryName}/${binaryName} $out/bin/
@@ -314,26 +292,7 @@ stdenv.mkDerivation (finalAttrs: {
     startupWMClass = "discord";
   };
 
-  passthru = {
-    # make it possible to run disableBreakingUpdates standalone
-    inherit disableBreakingUpdates;
-    # Exposed so reviewers can inspect which distro modules are pinned
-    inherit source moduleVersions;
-    updateScript = ./update.py;
-
-    tests = {
-      withVencord = self.override {
-        withVencord = true;
-      };
-      withEquicord = self.override {
-        withEquicord = true;
-      };
-      withMoonlight = self.override {
-        withMoonlight = true;
-      };
-      withOpenASAR = self.override {
-        withOpenASAR = true;
-      };
-    };
+  passthru = passthru // {
+    inherit targetPkgs;
   };
 })

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

@@ -0,0 +1,201 @@
+{
+  # Package metadata
+  pname,
+  source,
+  meta,
+  binaryName,
+  desktopName,
+  self,
+  branch,
+  # Feature flags (cross-platform)
+  withOpenASAR ? false,
+  withVencord ? false,
+  withEquicord ? false,
+  withMoonlight ? false,
+  # Disabling this would normally break Discord.
+  # The intended use-case for this is when SKIP_HOST_UPDATE is enabled via other means,
+  # for example if a settings.json is linked declaratively (e.g., with home-manager).
+  disableUpdates ? true,
+  # Feature flags (Linux exclusive)
+  withTTS ? true,
+  enableAutoscroll ? false,
+  # If true, the resulting derivation will be made using buildFHSEnv to wrap the inner
+  # Discord package. If false, the unwrappedDiscord package will be returned directly.
+  # Setting this value to false is not recommended, as Krisp will refuse to load due
+  # to the Discord binary being patched.
+  useFHSEnv ? stdenv.hostPlatform.isLinux,
+  # Package arguments
+  commandLineArgs ? "",
+  unwrappedDiscord ? null,
+  # Miscellaneous
+  lib,
+  stdenv,
+  buildFHSEnv,
+  writeShellScript,
+  runCommand,
+  callPackage,
+  fetchurl,
+  python3,
+  # Discord mods
+  openasar,
+  vencord,
+  equicord,
+  moonlight,
+}@args:
+
+let
+  inherit (stdenv.hostPlatform) isLinux;
+
+  pkgArgs = removeAttrs args [
+    "branch"
+    "self"
+    "unwrappedDiscord"
+    "buildFHSEnv"
+    "writeShellScript"
+    "runCommand"
+    "callPackage"
+    "python3"
+  ];
+
+  discordMods = [
+    withVencord
+    withEquicord
+    withMoonlight
+  ];
+  enabledDiscordModsCount = builtins.length (lib.filter (x: x) discordMods);
+
+  inherit (source) version;
+
+  moduleSrcs = lib.mapAttrs (_: mod: fetchurl { inherit (mod) url hash; }) source.modules;
+
+  moduleVersions = lib.mapAttrs (_: mod: mod.version) source.modules;
+
+  configDir =
+    if isLinux then
+      "\${DISCORD_USER_DATA_DIR-\${XDG_CONFIG_HOME:-$HOME/.config}}/${lib.toLower binaryName}"
+    else
+      let
+        configDirName = lib.replaceStrings [ " " ] [ "" ] (lib.toLower binaryName);
+      in
+      "\${DISCORD_USER_DATA_DIR-$HOME/Library/Application Support}/${configDirName}";
+
+  # Symlink native modules from the nix store into the user config dir
+  # where Discord's JS moduleUpdater expects them.
+  stageModules = writeShellScript "discord-stage-modules" ''
+    store_modules="$1"
+    modules_dir="${configDir}/${version}/modules"
+    rm -rf "$modules_dir"
+    mkdir -p "$modules_dir"
+    for m in ${lib.concatStringsSep " " (lib.attrNames moduleSrcs)}; do
+      ln -sn "$store_modules/$m" "$modules_dir/$m"
+    done
+    echo '${builtins.toJSON (lib.mapAttrs (_: mod: { installedVersion = mod; }) moduleVersions)}' \
+      > "$modules_dir/installed.json"
+  '';
+
+  disableBreakingUpdates =
+    runCommand "disable-breaking-updates.py"
+      {
+        pythonInterpreter = python3.interpreter;
+        configDirName = lib.toLower binaryName;
+        skipModuleUpdate = lib.boolToString withOpenASAR;
+        meta.mainProgram = "disable-breaking-updates.py";
+      }
+      ''
+        mkdir -p $out/bin
+        cp ${./disable-breaking-updates.py} $out/bin/disable-breaking-updates.py
+        substituteAllInPlace $out/bin/disable-breaking-updates.py
+        chmod +x $out/bin/disable-breaking-updates.py
+      '';
+
+  # Remove arguments not supported by the Darwin package.
+  platformPkgArgs =
+    if isLinux then
+      pkgArgs
+    else
+      removeAttrs pkgArgs [
+        "withTTS"
+        "enableAutoscroll"
+        "useFHSEnv"
+      ];
+  finalUnwrapped =
+    if unwrappedDiscord != null then
+      unwrappedDiscord
+    else
+      callPackage (if isLinux then ./linux.nix else ./darwin.nix) (
+        platformPkgArgs
+        // {
+          inherit
+            pname
+            passthru
+            disableBreakingUpdates
+            stageModules
+            moduleSrcs
+            ;
+        }
+      );
+
+  passthru = {
+    # make it possible to run disableBreakingUpdates and stageModules standalone
+    inherit disableBreakingUpdates stageModules;
+    # Exposed so reviewers can inspect which distro modules are pinned
+    inherit source moduleVersions;
+    updateScript = ./update.py;
+
+    unwrappedDiscord = finalUnwrapped;
+
+    tests = {
+      withVencord = self.override {
+        withVencord = true;
+      };
+      withEquicord = self.override {
+        withEquicord = true;
+      };
+      withMoonlight = self.override {
+        withMoonlight = true;
+      };
+      withOpenASAR = self.override {
+        withOpenASAR = true;
+      };
+      noFHSEnv = self.override {
+        useFHSEnv = false;
+      };
+    };
+  };
+
+in
+assert lib.assertMsg (
+  enabledDiscordModsCount <= 1
+) "discord: Only one of Vencord, Equicord, or Moonlight can be enabled at the same time";
+if useFHSEnv then
+  assert lib.assertMsg isLinux "discord: buildFHSEnv is only available on Linux";
+  buildFHSEnv {
+    inherit
+      source
+      pname
+      meta
+      version
+      passthru
+      stageModules
+      disableBreakingUpdates
+      ;
+
+    inherit (finalUnwrapped.passthru) targetPkgs;
+
+    src = fetchurl { inherit (source.distro) url hash; };
+
+    extraInstallCommands = ''
+      ln -s ${finalUnwrapped}/share $out/share
+
+      # Without || true the install would fail on case-insensitive filesystems
+      ln -s $out/bin/${binaryName} $out/bin/${lib.strings.toLower binaryName} || true
+    '';
+
+    executableName = binaryName;
+
+    runScript = "${finalUnwrapped}/bin/${binaryName}";
+  }
+else
+  finalUnwrapped.overrideAttrs (oldAttrs: {
+    passthru = (oldAttrs.passthru or { }) // passthru;
+  })

pkgs/build-support/build-openscad-package/default.nix

@@ -0,0 +1,71 @@
+{
+  lib,
+  stdenvNoCC,
+  buildPackages,
+}:
+
+lib.extendMkDerivation {
+  constructDrv = stdenvNoCC.mkDerivation;
+  extendDrvArgs =
+    finalAttrs:
+    {
+      pname,
+      version,
+      libName ? pname,
+      installTargets ? [ "." ],
+
+      ...
+    }@args:
+
+    {
+      inherit
+        pname
+        version
+        libName
+        installTargets
+        ;
+
+      __structuredAttrs = true;
+      name = "openscad-package-${finalAttrs.pname}-${finalAttrs.version}";
+
+      strictDeps = true;
+
+      # Use the interactive Bash shell (with readline support) for the compgen shell built-in.
+      realBuilder = lib.getExe buildPackages.bash;
+
+      installPhase =
+        args.installPhase or ''
+          runHook preInstall
+
+          installDir="$out/share/openscad/libraries/$libName"
+          mkdir -p "$installDir"
+
+          for _target in "''${installTargets[@]}"; do
+            _targetDirName="$(dirname "$_target")"
+            _targetBaseName="$(basename "$_target")"
+            # Support globs using Bash's compgen built-in.
+            (
+              if [[ "$_targetDirName" != "." ]]; then
+                if ! cd "$_targetDirName"; then
+                  echo "ERROR: $name: Fails to switch to the dirname of $_target -- $_targetDirName" >&2
+                  exit 1
+                fi
+              fi
+              if [[ "$_targetBaseName" == "." ]]; then
+                echo "$_targetBaseName"
+              else
+                if ! compgen -G "$_targetBaseName"; then
+                  echo "ERROR: $name: Glob $_target does not match any files or directories." >&2
+                  exit 1
+                fi
+              fi
+            # Keep the number of input files per batch under Bash's command length limitation.
+            ) | while read -r _line; do
+              printf "%s/%s\0" "$_targetDirName" "$_line"
+            done | xargs -0 cp -r -t "$installDir"
+          done
+
+          runHook postInstall
+        '';
+    };
+}

pkgs/build-support/openscad/tests/default.nix

@@ -0,0 +1,81 @@
+{
+  lib,
+  stdenv,
+  runCommand,
+  openscad,
+  openscadPackages,
+}:
+
+let
+  # We may add more libraries as they get added
+  dummySrc = runCommand "mock-chaotic-repo" { } ''
+    mkdir -p $out/modules \
+             $out/unwanted-clutter \
+             $out/utils \
+             $out/"folder with spaces" \
+             $out/empty-dir \
+             $out/glob-char-\* \
+             $out/dot-files
+
+    echo "module main_core() { sphere(10); }" > $out/core.scad
+    echo "module main_utils() { cube(5); }" > $out/utils.scad
+    echo "module nested_mod() { cylinder(10); }" > $out/modules/shapes.scad
+    echo "module math_helpers() { cube(2); }" > $out/utils/math.scad
+
+    echo "module spaced() { sphere(1); }" > $out/"my file.scad"
+
+    echo "module weird() { echo(\"weird\"); }" > $out/glob-char-\*/actual.scad
+
+    echo "secret config" > $out/modules/.hidden-config
+
+    echo "print('broken script')" > $out/unwanted-clutter/dont_copy_me.py
+    echo "unwanted markdown" > $out/README.md
+  '';
+
+  openscadPackagesOverridden = openscadPackages.overrideScope (
+    openscadFinal: openscadPrev: {
+      dummylib = openscadFinal.buildOpenSCADPackage {
+        pname = "dummylib";
+        version = "1.0.0";
+        libName = "dummylib";
+        src = dummySrc;
+        installTargets = [
+          "core.scad"
+          "modules"
+          "my file.scad"
+          "glob-char-*"
+          "utils/*.scad"
+        ];
+      };
+    }
+  );
+
+  wrappedOpenscad = openscad.override {
+    openscadPackages = openscadPackagesOverridden;
+  };
+in
+lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) {
+  withPackages-glob-test =
+    runCommand "openscad-withPackages-glob-test"
+      {
+        nativeBuildInputs = [
+          (wrappedOpenscad.withPackages (ps: [ ps.dummylib ]))
+        ];
+      }
+      ''
+        openscad -o test.3mf - <<EOF
+        use <dummylib/core.scad>
+        use <dummylib/modules/shapes.scad>
+        use <dummylib/my file.scad>
+        use <dummylib/glob-char-*/actual.scad>
+        use <dummylib/math.scad>
+
+        main_core();
+        nested_mod();
+        spaced();
+        weird();
+        math_helpers();
+        EOF
+        touch $out
+      '';
+}

pkgs/by-name/ag/agate/package.nix

@@ -14,7 +14,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "agate";
-  version = "3.3.23";
+  version = "3.3.24";
 
   __darwinAllowLocalNetworking = true;
 
@@ -22,10 +22,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "mbrubeck";
     repo = "agate";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6xF1iCAW4tCSoVU0rBSSfREIqPdOPF8Z1+ScMyEX4SQ=";
+    hash = "sha256-/BCX2vozZDpSINE6+s/k8GIwr7mt5Ai+vBIfdIq7clk=";
   };
 
-  cargoHash = "sha256-K6BUKaVULb/x3b9UQ/wJPI/kjBIOUdLnB63FyMJEXDE=";
+  cargoHash = "sha256-bumh4w8C4qZbvZwTpdwIDYmMvdFs0MCk2VnPxDepFk8=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ];

pkgs/by-name/ai/airwindows/package.nix

@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation {
   pname = "airwindows";
-  version = "0-unstable-2026-07-19";
+  version = "0-unstable-2026-08-02";
 
   src = fetchFromGitHub {
     owner = "airwindows";
     repo = "airwindows";
-    rev = "51a71636fe38bc51cee54861689318ffb7d2e434";
-    hash = "sha256-DsY1Tto4M1/+tNVtAxdk1NvrEFxMgzZsiylmprSZtTM=";
+    rev = "5c8aae0c97ad547561056738a7c1d4d579113ffb";
+    hash = "sha256-kVUhTTFWYTw5U1P/q6Ypk2PxOvpVDS0Ze4tyGF0ZjJI=";
   };
 
   # we patch helpers because honestly im spooked out by where those variables

pkgs/by-name/al/alpaca/package.nix

@@ -33,14 +33,14 @@ let
 in
 pythonPackages.buildPythonApplication rec {
   pname = "alpaca";
-  version = "9.2.4";
+  version = "9.2.5";
   pyproject = false; # Built with meson
 
   src = fetchFromGitHub {
     owner = "Jeffser";
     repo = "Alpaca";
     tag = version;
-    hash = "sha256-rZ1H4QfxkBo+fVFCDODaio+1NEwRVjIY388Q9sR8qO4=";
+    hash = "sha256-tKbxWDTGiblXBr4LOap0ZjojM2ommERRU/i/WpFykdE=";
   };
 
   postPatch = ''

pkgs/by-name/am/am2rlauncher/deps.json

@@ -1,53 +1,53 @@
 [
   {
     "pname": "AtkSharp",
-    "version": "3.24.24.34",
-    "hash": "sha256-GrOzO4YDMKJNHAnqLF+c44iGYlvazGTOuRLUnuLbwco="
+    "version": "3.24.24.95",
+    "hash": "sha256-NgdWbXToBHhEVbvPrFcwXeit5iaqbBmNPQiC0jPKlnQ="
   },
   {
     "pname": "CairoSharp",
-    "version": "3.24.24.34",
-    "hash": "sha256-/80xbYSPU8+6twoXRjES8PtV7dKB6fQoe6EqBmawzV8="
+    "version": "3.24.24.95",
+    "hash": "sha256-ycdgmQyQ1uSshI/9uMaqn5OBxRF8RADf4Tn/TptE2BU="
   },
   {
     "pname": "Eto.Forms",
-    "version": "2.7.1",
-    "hash": "sha256-OdGDlkKST1qlO4p/jIrX6qVfyywK7wqiY97+Yqtt68M="
+    "version": "2.11.0",
+    "hash": "sha256-VxNpNQEiO73A6IKvOk5AAr10PXNP7HZiunXGz3ze43A="
   },
   {
     "pname": "Eto.Platform.Gtk",
-    "version": "2.7.1",
-    "hash": "sha256-2msf/Dxo+rxVmJBl57ofWd9cON4YDH8eLl4icXRBPyY="
+    "version": "2.11.0",
+    "hash": "sha256-9ST2LKb2h2mbsszeul1Cwl8H0ijlGQJ+C9OtZ8JwFIM="
   },
   {
     "pname": "GdkSharp",
-    "version": "3.24.24.34",
-    "hash": "sha256-pQOp2jft19vVN+gSjD0tHfNGucss7ruy1xyys6IHHWQ="
+    "version": "3.24.24.95",
+    "hash": "sha256-NYjADgZG9TUQDIZiSSXDAxj5PyX/B7oKRo9f8Oyb4vI="
   },
   {
     "pname": "GioSharp",
-    "version": "3.24.24.34",
-    "hash": "sha256-/fZBfaKXlrdBuNh1/h0s1++5Ek4OnznXvzJx0uTbHQo="
+    "version": "3.24.24.95",
+    "hash": "sha256-5THx4af5PghPnQxXdnsC+wtVcoslh+0636WkB1FaPYg="
   },
   {
     "pname": "GLibSharp",
-    "version": "3.24.24.34",
-    "hash": "sha256-eAYUYNHF37nIJnk7aRffzBj8b/rluqXERYy358YAd08="
+    "version": "3.24.24.95",
+    "hash": "sha256-1pDRkKoUI9fLJBcTA2DBlpVccJl2GyAdL+VKjsFbttA="
   },
   {
     "pname": "GtkSharp",
-    "version": "3.24.24.34",
-    "hash": "sha256-i0XZfzUt9GNaZD1uXNd8x+pb1mPJqYrxQd15XOuHSAA="
+    "version": "3.24.24.95",
+    "hash": "sha256-sBvk5Ecf2i6c2fYVjMBVoXz0I6IlucOWeE2czZH9QHg="
   },
   {
     "pname": "LibGit2Sharp",
-    "version": "0.27.0",
-    "hash": "sha256-/4Vr5pXvq1J+5kb4jvd7JkFQ5aiUF1InOViSe53KDFk="
+    "version": "0.31.0",
+    "hash": "sha256-AvvsA3dsDbcGNjpxWXO5F1iw8bhrctaWQ0MD2oJSyJA="
   },
   {
     "pname": "LibGit2Sharp.NativeBinaries",
-    "version": "2.0.319",
-    "hash": "sha256-jvbiwXrsqzzqnMiUQa3oqGshXeDT1miIKFug4NG1pnY="
+    "version": "2.0.323",
+    "hash": "sha256-0qFqyNC0u05UF+DJ/LNvng5Sur1ryci+wIEGhVU/7rE="
   },
   {
     "pname": "log4net",
@@ -56,8 +56,8 @@
   },
   {
     "pname": "Microsoft.NETCore.Platforms",
-    "version": "2.0.0",
-    "hash": "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro="
+    "version": "1.1.0",
+    "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
   },
   {
     "pname": "Microsoft.NETCore.Platforms",
@@ -74,10 +74,25 @@
     "version": "6.0.0",
     "hash": "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="
   },
+  {
+    "pname": "NETStandard.Library",
+    "version": "2.0.3",
+    "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="
+  },
   {
     "pname": "PangoSharp",
-    "version": "3.24.24.34",
-    "hash": "sha256-/KdH3SA/11bkwPe/AXRph4v4a2cjbUjDvo4+OhkJEOQ="
+    "version": "3.24.24.95",
+    "hash": "sha256-YhltIz1jisJqR2ZxvbYy0ybi4oGw6qR2SkjF/2aWiBQ="
+  },
+  {
+    "pname": "System.Buffers",
+    "version": "4.4.0",
+    "hash": "sha256-KTxAhYawFG2V5VX1jw3pzx3IrQXRgn1TsvgjPgxAbqA="
+  },
+  {
+    "pname": "System.Buffers",
+    "version": "4.5.1",
+    "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="
   },
   {
     "pname": "System.ComponentModel.Annotations",
@@ -99,6 +114,31 @@
     "version": "6.0.0",
     "hash": "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="
   },
+  {
+    "pname": "System.Memory",
+    "version": "4.5.0",
+    "hash": "sha256-YOz1pCR4RpP1ywYoJsgXnVlzsWtC2uYKQJTg0NnFXtE="
+  },
+  {
+    "pname": "System.Memory",
+    "version": "4.5.4",
+    "hash": "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="
+  },
+  {
+    "pname": "System.Numerics.Vectors",
+    "version": "4.4.0",
+    "hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U="
+  },
+  {
+    "pname": "System.Runtime.CompilerServices.Unsafe",
+    "version": "4.5.0",
+    "hash": "sha256-g9jIdQtXSAhY+ezQtYNgHEUoQR3HzznHs3JMzD9bip4="
+  },
+  {
+    "pname": "System.Runtime.CompilerServices.Unsafe",
+    "version": "4.5.3",
+    "hash": "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak="
+  },
   {
     "pname": "System.Security.AccessControl",
     "version": "4.5.0",

pkgs/by-name/am/am2rlauncher/dotnet-8-upgrade.patch

@@ -1,52 +0,0 @@
-diff --git a/AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj b/AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj
-index e5e6191..ab9f228 100644
---- a/AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj
-+++ b/AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj
-@@ -2,7 +2,7 @@
- 	
-   <PropertyGroup>
-     <OutputType>WinExe</OutputType>
--    <TargetFramework>net6.0</TargetFramework>
-+    <TargetFramework>net8.0</TargetFramework>
-     <ApplicationIcon>icon64.ico</ApplicationIcon>
-     <RollForward>LatestMajor</RollForward>
-     <LangVersion>latest</LangVersion>
-diff --git a/AM2RLauncher/AM2RLauncher.Mac/AM2RLauncher.Mac.csproj b/AM2RLauncher/AM2RLauncher.Mac/AM2RLauncher.Mac.csproj
-index 2af5688..a91bb25 100644
---- a/AM2RLauncher/AM2RLauncher.Mac/AM2RLauncher.Mac.csproj
-+++ b/AM2RLauncher/AM2RLauncher.Mac/AM2RLauncher.Mac.csproj
-@@ -2,7 +2,7 @@
- 	
-   <PropertyGroup>
-     <OutputType>Exe</OutputType>
--    <TargetFramework>net6.0-macos</TargetFramework>
-+    <TargetFramework>net8.0-macos</TargetFramework>
-     <RuntimeIdentifiers>osx-x64;osx-arm64</RuntimeIdentifiers>
-     <SupportedOSPlatformVersion>10.14</SupportedOSPlatformVersion>
-     <RollForward>LatestMajor</RollForward>
-diff --git a/AM2RLauncher/AM2RLauncher/AM2RLauncher.csproj b/AM2RLauncher/AM2RLauncher/AM2RLauncher.csproj
-index be49446..34a842f 100644
---- a/AM2RLauncher/AM2RLauncher/AM2RLauncher.csproj
-+++ b/AM2RLauncher/AM2RLauncher/AM2RLauncher.csproj
-@@ -1,7 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk">
- 	
-   <PropertyGroup>
--    <TargetFramework>netstandard2.0</TargetFramework>
-+    <TargetFramework>net8.0</TargetFramework>
- 	<LangVersion>latest</LangVersion>
-     <ApplicationIcon>Resources\LauncherIcon.ico</ApplicationIcon>
-     <Authors>Lojemiru, Miepee</Authors>
-diff --git a/AM2RLauncher/AM2RLauncherLib/AM2RLauncherLib.csproj b/AM2RLauncher/AM2RLauncherLib/AM2RLauncherLib.csproj
-index 673ab7a..da3a019 100644
---- a/AM2RLauncher/AM2RLauncherLib/AM2RLauncherLib.csproj
-+++ b/AM2RLauncher/AM2RLauncherLib/AM2RLauncherLib.csproj
-@@ -1,7 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk">
- 
-   <PropertyGroup>
--    <TargetFramework>netstandard2.0</TargetFramework>
-+    <TargetFramework>net8.0</TargetFramework>
-     <LangVersion>default</LangVersion>
-     <Configurations>Debug;Release</Configurations>
-     <Platforms>AnyCPU</Platforms>

pkgs/by-name/am/am2rlauncher/package.nix

@@ -5,7 +5,7 @@
   glibc,
   gtk3,
   libappindicator,
-  # webkitgtk_4_0,
+  webkitgtk_4_1,
   e2fsprogs,
   libnotify,
   libgit2,
@@ -48,13 +48,13 @@ let
 in
 buildDotnetModule {
   pname = "am2rlauncher";
-  version = "2.3.0-unstable-2023-11-08";
+  version = "2.3.0-unstable-2026-07-22";
 
   src = fetchFromGitHub {
     owner = "AM2R-Community-Developers";
     repo = "AM2RLauncher";
-    rev = "5d8b7d9b3de68e6215c10b9fd223b7f1d5e40dea";
-    hash = "sha256-/nHqo8jh3sOUngbpqdfiQjUWO/8Uzpc5jtW7Ep4q6Wg=";
+    rev = "f9bd0a3e0b661648b0ce1b0531dc174d9ebcf7d9";
+    hash = "sha256-bXUBw8XN3iR3UL1vvTsBqnnnJGxMIxFCg1tVVyAxRPw=";
   };
 
   dotnet-sdk = dotnetCorePackages.sdk_8_0;
@@ -67,7 +67,7 @@ buildDotnetModule {
     glibc
     gtk3
     libappindicator
-    # webkitgtk_4_0
+    webkitgtk_4_1
     e2fsprogs
     libnotify
     libgit2
@@ -84,7 +84,6 @@ buildDotnetModule {
 
   patches = [
     ./am2r-run-binary.patch
-    ./dotnet-8-upgrade.patch
   ];
 
   dotnetFlags = [
@@ -116,8 +115,6 @@ buildDotnetModule {
   '';
 
   meta = {
-    # webkitgtk_4_0 was removed
-    broken = true;
     homepage = "https://github.com/AM2R-Community-Developers/AM2RLauncher";
     description = "Front-end for dealing with AM2R updates and mods";
     longDescription = ''

pkgs/by-name/an/ananicy-rules-cachyos/package.nix

@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "ananicy-rules-cachyos";
-  version = "0-unstable-2026-07-29";
+  version = "0-unstable-2026-08-05";
 
   src = fetchFromGitHub {
     owner = "CachyOS";
     repo = "ananicy-rules";
-    rev = "411f29641e4dd96da6a5c8a2ae09c0d708249364";
-    hash = "sha256-mmSyiNysVGV/fh1GopKozeE793S+3ikZD+PhMzQjyiA=";
+    rev = "489dd6c929d17e4f6a374746ebfce9fa7bd5a3d1";
+    hash = "sha256-FVN689V2b6lNu15Nx7TJsn+DqukhFZDL8ebtplFdYNs=";
   };
 
   dontConfigure = true;

pkgs/by-name/an/annot/package.nix

@@ -0,0 +1,129 @@
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  fetchFromGitHub,
+
+  jq,
+  moreutils,
+  pnpm_10,
+  fetchPnpmDeps,
+  pnpmConfigHook,
+  nodejs,
+  cargo-tauri,
+  pkg-config,
+  wrapGAppsHook3,
+  makeBinaryWrapper,
+  git,
+  jujutsu,
+
+  libsoup_3,
+  openssl,
+  webkitgtk_4_1,
+
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "annot";
+  version = "0.19.0";
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  src = fetchFromGitHub {
+    owner = "denolehov";
+    repo = "annot";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-T9CG5S0H90xYNP5QcbuINNEIEGLVCqR7HRX4XYNrgM4=";
+  };
+
+  pnpmDeps = fetchPnpmDeps {
+    inherit (finalAttrs) pname version src;
+    pnpm = pnpm_10;
+    fetcherVersion = 3;
+    hash = "sha256-OHsq/So4YhonxSnT4fByZnlPnpYvjcf0UuHHgBGVIf8=";
+  };
+
+  postPatch = ''
+    jq '.bundle.createUpdaterArtifacts = false' src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json
+  '';
+
+  cargoRoot = "src-tauri";
+  buildAndTestSubdir = finalAttrs.cargoRoot;
+
+  cargoHash = "sha256-F38w6rLm4VQ72p5DE/d92+vzy9ovX6P03r4Y+hGh7yc=";
+
+  nativeBuildInputs = [
+    jq
+    moreutils
+    pnpmConfigHook
+    pnpm_10
+    nodejs
+    cargo-tauri.hook
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    pkg-config
+    wrapGAppsHook3
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    makeBinaryWrapper
+  ];
+
+  nativeCheckInputs = [
+    git
+    jujutsu
+  ];
+
+  buildInputs =
+    lib.optionals stdenv.hostPlatform.isLinux [
+      libsoup_3
+      openssl
+      webkitgtk_4_1
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      openssl
+    ];
+
+  # pnpmConfigHook runs with --ignore-scripts, so the postinstall that copies
+  # Excalidraw fonts from node_modules into static/ must be run manually.
+  preBuild = ''
+    node scripts/copy-excalidraw-fonts.js
+  '';
+
+  # Disable automatic wrapper to handle it manually per platform
+  dontWrapGApps = stdenv.hostPlatform.isLinux;
+
+  postFixup =
+    lib.optionalString stdenv.hostPlatform.isLinux ''
+      wrapGApp "$out/bin/annot"
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      makeWrapper "$out/Applications/annot.app/Contents/MacOS/annot" "$out/bin/annot"
+    '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Human-in-the-loop annotation tool for AI workflows";
+    longDescription = ''
+      annot is an annotation tool for human-in-the-loop AI workflows. AI
+      agents work fast, but vague feedback is a lossy channel. When an agent
+      drafts a plan, proposes a refactor, or generates code, annot provides a
+      moment of structured review: it opens a native window, you annotate
+      specific lines with located, typed comments, then it closes and returns
+      structured output to the agent.
+
+      annot can be used as a standalone CLI (open a file, annotate, get
+      output) or as an MCP server, allowing AI agents to block on human
+      review mid-workflow. It supports reviewing files, diffs, and
+      agent-generated content, with optional exit modes so the human can
+      signal approval, rejection, or custom next steps.
+    '';
+    homepage = "https://github.com/denolehov/annot";
+    license = lib.licenses.agpl3Only;
+    mainProgram = "annot";
+    maintainers = with lib.maintainers; [ fraggerfox ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+  };
+})

pkgs/by-name/an/ansible-doctor/package.nix

@@ -9,14 +9,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "ansible-doctor";
-  version = "8.3.3";
+  version = "8.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "thegeeklab";
     repo = "ansible-doctor";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3xdMTuy6Rtb2VwfzN6SV73UZmp+9fmU9SfPySHCayJg=";
+    hash = "sha256-1O6F7MNNdt8WX+NAqJD1ZNToB6PrfWKtoweT5Pbl9l8=";
   };
 
   build-system = with python3Packages; [

pkgs/by-name/ap/apko/package.nix

@@ -11,13 +11,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "apko";
-  version = "1.2.30";
+  version = "1.2.35";
 
   src = fetchFromGitHub {
     owner = "chainguard-dev";
     repo = "apko";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-uNUzlPuk2HD7O4ENnQ01u9h2U0PbP3a4XiYYvVuksqo=";
+    hash = "sha256-A2rzKNIhcfsFFMU0My6Ak++T1D5WGBrdK4SW1XQoCyw=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
       find "$out" -name .git -print0 | xargs -0 rm -rf
     '';
   };
-  vendorHash = "sha256-HZrL3K1gbg5fXp0yrfXxgZ780qTGJJ2bpZ7Y//EhOqo=";
+  vendorHash = "sha256-sPLqpe7oKN30igq4OQAIh13vohuhnDoijCM0q3nHIZ0=";
 
   excludedPackages = [
     "internal/gen-jsonschema"

pkgs/by-name/as/asmc-linux/package.nix

@@ -2,15 +2,16 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  versionCheckHook,
 }:
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "asmc-linux";
-  version = "2.36.25";
+  version = "2.39.07";
   src = fetchFromGitHub {
     owner = "nidud";
     repo = "asmc_linux";
-    rev = "4ee70bde4439bdd9c772d08527dba6d50f2e5a88";
-    hash = "sha256-/yJC1OQGRgy9T/U2VB0MohSsD1ImLnHYM/8Y8fIWhVE=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-JtJsyaw4UqMf9epMLGH+iQA0FYYlE9k2NG1aPOu6pec=";
   };
 
   enableParallelBuilding = true;
@@ -23,12 +24,16 @@ stdenv.mkDerivation {
     runHook postInstall
   '';
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
   meta = {
     description = "MASM-compatible assembler";
     homepage = "https://github.com/nidud/asmc_linux";
+    changelog = "https://github.com/nidud/asmc/blob/v${lib.versions.majorMinor finalAttrs.version}/source/asmc/history.txt";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ ccicnce113424 ];
     platforms = with lib.systems.inspect; patternLogicalAnd patterns.isx86_64 patterns.isLinux;
     mainProgram = "asmc";
   };
-}
+})

pkgs/by-name/az/az-pim-cli/package.nix

@@ -10,13 +10,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "az-pim-cli";
-  version = "1.15.0";
+  version = "1.16.0";
 
   src = fetchFromGitHub {
     owner = "netr0m";
     repo = "az-pim-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Pqc8pWicVORcoTXg7oT8SX1BwDRSjLHuqyyBZ6q7eio=";
+    hash = "sha256-CQS3Grw30nmMpjys/RhGF59rvK8joNUG13f+VEkKTjU=";
   };
 
   patches = [
@@ -24,7 +24,7 @@ buildGoModule (finalAttrs: {
     ./version-build-info.patch
   ];
 
-  vendorHash = "sha256-K4tv3IlVygV/aDR9twh60FX8pe4f0sXxoGNIsIV2oUA=";
+  vendorHash = "sha256-+CV4Cbpgcp9zjBo9f8UjrOvp7hrEUS+r+lGVJ/uGdes=";
 
   nativeBuildInputs = [
     installShellFiles

pkgs/by-name/az/azimuth/package.nix

@@ -2,11 +2,12 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libGL,
   SDL2,
-  which,
   pkg-config,
-  installTool ? false,
+  libGL,
+  which,
+  makeBinaryWrapper,
+  icnsify,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -25,30 +26,63 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     pkg-config
+    makeBinaryWrapper
     which
+    SDL2
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    icnsify
   ];
 
   buildInputs = [
-    libGL
     SDL2
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libGL
   ];
 
-  env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=maybe-uninitialized" ];
-
-  makeFlags = [
-    "BUILDTYPE=release"
-    "PREFIX=${placeholder "out"}"
-    "INSTALLTOOL=${if installTool then "true" else "false"}"
-  ];
+  makeFlags = [ "BUILDTYPE=release" ];
 
   enableParallelBuilding = true;
 
+  postPatch = ''
+    patchShebangs src/azimuth/system/generate_blob_index.sh
+
+    # Remove over-erroring measures
+    substituteInPlace Makefile \
+      --replace-fail "-Werror" ""
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # iconutil is not available in the build sandbox
+    substituteInPlace Makefile \
+      --replace-fail \
+        'iconutil -c icns $(OUTDIR)/icon.iconset -o $@ 2> /dev/null' \
+        'icnsify $(OUTDIR)/icon.iconset/icon_128x128.png -o $@'
+  '';
+
   doCheck = true;
   checkTarget = "test";
 
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/bin
+    install -m755 out/release/host/bin/azimuth $out/bin/
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir -p $out/Applications
+    cp -R out/release/host/Azimuth.app $out/Applications/
+  ''
+  + ''
+    runHook postInstall
+  '';
+
+  postFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    makeBinaryWrapper "$out/Applications/Azimuth.app/Contents/MacOS/Azimuth" \
+      "$out/bin/azimuth"
+  '';
+
   meta = {
-    description = "Metroidvania game using only vectorial graphic";
-    mainProgram = "azimuth";
+    description = "Metroidvania game with vector graphics, inspired by Super Metroid and Star Control II";
     longDescription = ''
       Azimuth is a metroidvania game, and something of an homage to the previous
       greats of the genre (Super Metroid in particular). You will need to pilot
@@ -58,11 +92,15 @@ stdenv.mkDerivation (finalAttrs: {
       weapons and upgrades to find and use, and a wide variety of enemies and
       bosses to tangle with.
     '';
-
+    homepage = "https://mdsteele.games/azimuth/";
+    changelog = "https://github.com/mdsteele/azimuth/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl3Plus;
-    homepage = "https://mdsteele.games/azimuth/index.html";
-    maintainers = with lib.maintainers; [ marius851000 ];
-    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
+      philocalyst
+      marius851000
+    ];
+    mainProgram = "azimuth";
+    platforms = lib.platforms.unix;
   };
 
 })

pkgs/by-name/ba/bacula/package.nix

@@ -28,9 +28,9 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   # libtool.m4 only matches macOS 10.*
-  postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) ''
+  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
     substituteInPlace configure \
-      --replace "10.*)" "*)"
+      --replace-fail "10.*)" "*)"
   '';
 
   buildInputs = [

pkgs/by-name/bi/bichon/package.nix

@@ -13,17 +13,17 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "bichon";
-  version = "1.6.2";
+  version = "2.0.1";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "rustmailer";
     repo = "bichon";
     tag = finalAttrs.version;
-    hash = "sha256-a8BAO93eI2eiFwmvMqUsgL1KZ11X3qg/r/Iw6ckMSTs=";
+    hash = "sha256-pL/1W51x9ZqUHLLzdLUpb54crvhG8JhDqJu47CRZAd4=";
   };
 
-  cargoHash = "sha256-GC/2bswme76bAFRCsBHFi3lWnYx5x5H58emCmkiyKfE=";
+  cargoHash = "sha256-R2gegIZJDr2Xu8VjOiUlPIkG4JXnyFLjMoU1gcSNcEk=";
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;

pkgs/by-name/bo/bootmac/package.nix

@@ -15,7 +15,7 @@
   udevCheckHook,
 }:
 stdenv.mkDerivation (finalAttrs: {
-  name = "bootmac";
+  pname = "bootmac";
   version = "0.7.1";
   __structuredAttrs = true;
   strictDeps = true;

pkgs/by-name/br/browsers/package.nix

@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "browsers";
-  version = "0.7.3";
+  version = "0.7.4";
 
   src = fetchFromGitHub {
     owner = "Browsers-software";
     repo = "browsers";
     tag = finalAttrs.version;
-    hash = "sha256-QrIE9buG46JDxGFI6tjxzMizic82Az61MgMhKU854bY=";
+    hash = "sha256-0ITNw0xWG0BWQRRYKCRwiYhFUw6QkYukCCybt7Mdq7A=";
   };
 
-  cargoHash = "sha256-JZoc5EwOXgv50LblYjEW8tsD4roJ6uZYuCbVzXdaKSY=";
+  cargoHash = "sha256-OQbfGOd3lOd8/VxhdvkYMezNx/PO65PzRKcWlI7n/JU=";
 
   nativeBuildInputs = [
     pkg-config

pkgs/by-name/bu/buildkit/package.nix

@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "buildkit";
-  version = "0.32.0";
+  version = "0.32.2";
 
   src = fetchFromGitHub {
     owner = "moby";
     repo = "buildkit";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Kw3tTHpdB6hQmE9pfT3pBxzOxN6Lfv8uM/rLGPJrbI4=";
+    hash = "sha256-sRSFypb/CZiCISMumVTor9XI4KOCvBhY6UaNUk2Y4t8=";
   };
 
   vendorHash = null;

pkgs/by-name/bu/buildpack/package.nix

@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "pack";
-  version = "0.40.8";
+  version = "0.40.9";
 
   src = fetchFromGitHub {
     owner = "buildpacks";
     repo = "pack";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-mD32ZQ/PxiWnOvCdDFlNx1NIevhfgPcg9+ToUmfM6jo=";
+    hash = "sha256-RBDkPqlck64ChnXGFa1sa0WmC2T66ZBN6nQbstymSHU=";
   };
 
-  vendorHash = "sha256-0cyxhyEt4P+sd0FmN177rsTugWM0x2Ebk1LEHtX9wZE=";
+  vendorHash = "sha256-iJTEdnWJb1YyZ0mkamlKkCq/dJsMP6s0h+S8Bh3CnVM=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/by-name/cd/cdncheck/package.nix

@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "cdncheck";
-  version = "1.2.47";
+  version = "1.2.48";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "cdncheck";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JluCuvZl4CY+VtreWoljU2AOnw1HmhtFOpAmmNmIA4M=";
+    hash = "sha256-GTRKX1NlIt5oZZCariCLhU62hSp7vBu/KqNVyHAZk+U=";
   };
 
   vendorHash = "sha256-iJ1agL7sZ3ZKbW1wMA+qi8FgHdPa6gZLQ5BBPKJTNaQ=";

pkgs/by-name/ce/cel-go/package.nix

@@ -26,18 +26,18 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "cel-go";
-  version = "0.30.0";
+  version = "0.31.0";
 
   src = fetchFromGitHub {
     owner = "cel-expr";
     repo = "cel-go";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-D07O4eLNvOLecIRDylUC5Rrc8EfworHwEPIzTZV82IU=";
+    hash = "sha256-d2qteEY7aRKvzD+uF7uNibUv5dECaL61NogbZfd3cAQ=";
   };
 
   modRoot = "repl";
 
-  vendorHash = "sha256-AR1XxMJZEtfFgq/H/N07d/qpnI7K1/IHZCHqvqIfeC8=";
+  vendorHash = "sha256-SetkDfzfR/zqkNirGeGlczvV5h/CM9GiAPP2pKq6QDU=";
 
   subPackages = [
     "main"

pkgs/by-name/co/cockpit-files/package.nix

@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cockpit-files";
-  version = "42";
+  version = "43";
 
   src = fetchFromGitHub {
     owner = "cockpit-project";
     repo = "cockpit-files";
     tag = finalAttrs.version;
-    hash = "sha256-NfI6y60O5ctsPbwPcXgkwxpNYuZkF/2YXZOIcRZUc5c=";
+    hash = "sha256-ex15Bs8hFlNnksTEQC3rxhpiKDpK6bY3r3o5wX9ad44=";
 
     fetchSubmodules = true;
     postFetch = "cp $out/node_modules/.package-lock.json $out/package-lock.json";

pkgs/by-name/co/cockpit-machines/package.nix

@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cockpit-machines";
-  version = "354";
+  version = "355";
 
   src = fetchFromGitHub {
     owner = "cockpit-project";
     repo = "cockpit-machines";
     tag = finalAttrs.version;
-    hash = "sha256-r5gvs6/clRDV0VZKU1r6fjJSwHLuf9Pnhi0c60/9qkE=";
+    hash = "sha256-9NRpo9j0EDTWvJAPuAhr3H6Gigt7MdwYbdXZeGqHVGo=";
 
     fetchSubmodules = true;
     postFetch = "cp $out/node_modules/.package-lock.json $out/package-lock.json";

pkgs/by-name/co/cockpit-podman/package.nix

@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cockpit-podman";
-  version = "128";
+  version = "129";
 
   src = fetchFromGitHub {
     owner = "cockpit-project";
     repo = "cockpit-podman";
     tag = finalAttrs.version;
-    hash = "sha256-GlnIZGV5nk7o28EUs4H/IdZkgtHG0a9uwCTCS4rCP6c=";
+    hash = "sha256-NFEVwDrDgFQphSh7k56wjGsWJslkerJEQ6FFm5xJsfA=";
 
     fetchSubmodules = true;
     postFetch = "cp $out/node_modules/.package-lock.json $out/package-lock.json";

pkgs/by-name/co/codex-relay/package.nix

@@ -0,0 +1,39 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  nix-update-script,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "codex-relay";
+  version = "0.5.6";
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "MetaFARS";
+    repo = "codex-relay";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-JjrtQev2lujweV3dNiPC5ZV+LTPHX4BjWASfrI4/zy8=";
+  };
+
+  cargoHash = "sha256-Ihdm2GhUhxlZw61w01Nakod4ZIAdHeBv2rCCrMQrC7I=";
+
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = with lib; {
+    description = "Responses API ↔  Chat Completions translation bridge for Codex CLI";
+    longDescription = ''
+      A lightweight Rust proxy that translates the OpenAI Responses API
+      (used by Codex CLI) into the Chat Completions API, letting Codex work
+      with any OpenAI-compatible provider —  DeepSeek, Kimi, Qwen, Mistral,
+      Groq, xAI, OpenRouter, and more.
+    '';
+    homepage = "https://github.com/MetaFARS/codex-relay";
+    changelog = "https://github.com/MetaFARS/codex-relay/releases/tag/v${finalAttrs.version}";
+    license = licenses.mit;
+    mainProgram = "codex-relay";
+    maintainers = [ maintainers.andrewzah ];
+  };
+})

pkgs/by-name/co/comfyui/package.nix

@@ -74,7 +74,7 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "comfyui";
-  version = "0.30.2";
+  version = "0.31.1";
 
   strictDeps = true;
   __structuredAttrs = true;
@@ -83,7 +83,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     owner = "Comfy-Org";
     repo = "ComfyUI";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fLtgJpK8hEuYcfu1vKGDJtszPfED4mmyKHZYrrq/uiA=";
+    hash = "sha256-zo5XPU10liF5SvVQ4WpRDmx0QfuZ0CNh6EjCa60/9hc=";
   };
 
   nativeBuildInputs = [ makeBinaryWrapper ];

pkgs/by-name/co/couchbase-shell/package.nix

@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "couchbase-shell";
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "couchbaselabs";
     repo = "couchbase-shell";
     rev = "v${version}";
-    hash = "sha256-t4y0VxjRaJ5G/vpqq3/oLE/pIXSDAk+l+9fCcr9n6I4=";
+    hash = "sha256-eJWkqtDwLZsU3PlVud+PuXpg5kxLWe2IpbOXTzT40kA=";
   };
 
-  cargoHash = "sha256-f2WYczO2kr5BloXGLjjlnmyaKlr9+IH7i8cqGFUEcVA=";
+  cargoHash = "sha256-dcvbSndgMMVP6PO7CxlEUYNfx60dcKFBZ3U+/963LTk=";
 
   nativeBuildInputs = [
     pkg-config

pkgs/by-name/cs/csmith/package.nix

@@ -9,7 +9,7 @@
   perlPackages,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "csmith";
   version = "2.3.0-unstable-2026-03-01";
 
@@ -40,13 +40,13 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     substituteInPlace $out/bin/compiler_test.pl \
-      --replace '$CSMITH_HOME/runtime' $out/include/${pname}-${version} \
-      --replace ' ''${CSMITH_HOME}/runtime' " $out/include/${pname}-${version}" \
-      --replace '$CSMITH_HOME/src/csmith' $out/bin/csmith
+      --replace-fail '$CSMITH_HOME/runtime' $out/include/csmith-${finalAttrs.version} \
+      --replace-fail ' ''${CSMITH_HOME}/runtime' " $out/include/csmith-${finalAttrs.version}" \
+      --replace-fail '$CSMITH_HOME/src/csmith' $out/bin/csmith
 
     substituteInPlace $out/bin/launchn.pl \
-      --replace '../compiler_test.pl' $out/bin/compiler_test.pl \
-      --replace '../$CONFIG_FILE' '$CONFIG_FILE'
+      --replace-fail '../compiler_test.pl' $out/bin/compiler_test.pl \
+      --replace-fail '../$CONFIG_FILE' '$CONFIG_FILE'
 
     wrapProgram $out/bin/launchn.pl \
       --prefix PERL5LIB : "$PERL5LIB"
@@ -72,4 +72,4 @@ stdenv.mkDerivation rec {
     maintainers = [ ];
     platforms = lib.platforms.all;
   };
-}
+})

pkgs/by-name/db/dbmate/package.nix

@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "dbmate";
-  version = "2.34.1";
+  version = "2.35.0";
 
   src = fetchFromGitHub {
     owner = "amacneil";
     repo = "dbmate";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rDnXLNltUxtzJRw3kc1nQ0HnrWZYQKA+o1nup/WsD7E=";
+    hash = "sha256-aWouIk+EHuccJL0EXEdYgSPD0afAwO69S4lSehEDVKU=";
   };
 
-  vendorHash = "sha256-+P9K/uOLFhsSwOxWPvTVu5MBCkP+9rGAA9efmgw4R60=";
+  vendorHash = "sha256-BUqSBLc9MQpXht9sQ8HKt2sHGuf1OevKEZtN8nik+F4=";
 
   tags = [ "fts5" ];
 

pkgs/by-name/di/diesel-cli/package.nix

@@ -27,15 +27,15 @@ assert lib.assertMsg (lib.elem true [
 
 rustPlatform.buildRustPackage rec {
   pname = "diesel-cli";
-  version = "2.3.11";
+  version = "2.3.12";
 
   src = fetchCrate {
     inherit version;
     crateName = "diesel_cli";
-    hash = "sha256-zxlV3AbG5cBBGUk3hx9U3OR26lB3G2QQlcxTg00WJZQ=";
+    hash = "sha256-cWroMSZqNMTH1+Pbiu8WiU4by2OHnXTgBHKSKaM3NYI=";
   };
 
-  cargoHash = "sha256-GytJ0Eq4LkdSq1fosXFoC0nI7bY0VdM8oOV/tvyUSMg=";
+  cargoHash = "sha256-0JZcDAWsZ1ojZbUhghQt4rDmm+I/naQ5tllFRnTWCnM=";
 
   nativeBuildInputs = [
     installShellFiles

pkgs/by-name/di/direwolf/package.nix

@@ -3,16 +3,22 @@
   stdenv,
   fetchFromGitHub,
   fetchpatch,
-  cmake,
+  avahi,
+  avahiSupport ? true,
   alsa-lib,
+  cmake,
+  libgpiod,
+  libgpiodSupport ? false,
   gpsd,
   gpsdSupport ? false,
   hamlib_4,
   hamlib ? hamlib_4,
   hamlibSupport ? true,
+  hidapi,
   perl,
   portaudio,
   python3,
+  sndio,
   espeak,
   udev,
   udevCheckHook,
@@ -44,7 +50,13 @@ stdenv.mkDerivation (finalAttrs: {
       alsa-lib
       udev
     ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ portaudio ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      hidapi
+      portaudio
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isBSD) [ sndio ]
+    ++ lib.optionals avahiSupport [ avahi ]
+    ++ lib.optionals libgpiodSupport [ libgpiod ]
     ++ lib.optionals gpsdSupport [ gpsd ]
     ++ lib.optionals hamlibSupport [ hamlib ]
     ++ lib.optionals extraScripts [

pkgs/by-name/do/docker-credential-gcr/package.nix

@@ -9,20 +9,20 @@
 
 buildGoModule (finalAttrs: {
   pname = "docker-credential-gcr";
-  version = "2.1.32";
+  version = "2.2.1";
 
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "docker-credential-gcr";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xOiLrN8NLKzm7VDDzeq8gbAD6+WXYqcDaSoTpvOOvbw=";
+    hash = "sha256-6jvNF0L3vXyumfiNSLRwRqZeui8rgnO4h/rTmY7qVDA=";
   };
 
   postPatch = ''
     rm -rf ./test
   '';
 
-  vendorHash = "sha256-P8Mhk6jj7TlbP+rcqpYsWy8CIGJMetYAuKylXRBNKIc=";
+  vendorHash = "sha256-gghmzq1eBMh+d5m5Ez6t3jxAc58NbLHr9F8vcYdOYSk=";
 
   env.CGO_ENABLED = 0;
 

pkgs/by-name/do/doggo/package.nix

@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "doggo";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "mr-karan";
     repo = "doggo";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-xzwgNuvEedqC0DS0cMi472x2Tx0mWdk+22E9Bz1G9Tk=";
+    hash = "sha256-BU32Ewfpuao7UwveIenla2ZFEbqh3qoBP86ia3AWNTE=";
   };
 
-  vendorHash = "sha256-AJQQVhrYhgazCwI2Dnvorj4Y78iwVO7mhx1gzZUA9BI=";
+  vendorHash = "sha256-8lww9fzS5o25OGk9aI/E0FBNw1J7RQ7OGJaGqHmAKKg=";
   nativeBuildInputs = [ installShellFiles ];
   subPackages = [ "cmd/doggo" ];
 

pkgs/by-name/du/duperemove/package.nix

@@ -10,8 +10,8 @@
   linuxHeaders ? stdenv.cc.libc.linuxHeaders,
   sqlite,
   util-linux,
-  testers,
-  duperemove,
+  versionCheckHook,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -21,15 +21,24 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "markfasheh";
     repo = "duperemove";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-Y3HIqq61bLfZi4XR2RtSyuCPmcWrTxeWvqpTh+3hUjc=";
   };
 
+  outputs = [
+    "out"
+    "man"
+  ];
+
   postPatch = ''
-    substituteInPlace util.c --replace \
-      "lscpu" "${lib.getBin util-linux}/bin/lscpu"
+    substituteInPlace util.c --replace-fail \
+      "lscpu" "${lib.getExe' util-linux "lscpu"}"
   '';
 
+  __structuredAttrs = true;
+  strictDeps = true;
+  enableParallelBuilding = true;
+
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     libbsd
@@ -46,15 +55,19 @@ stdenv.mkDerivation (finalAttrs: {
     "VERSION=v${finalAttrs.version}"
   ];
 
-  passthru.tests.version = testers.testVersion {
-    package = duperemove;
-    command = "duperemove --version";
-    version = "v${finalAttrs.version}";
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { };
   };
 
   meta = {
     description = "Simple tool for finding duplicated extents and submitting them for deduplication";
     homepage = "https://github.com/markfasheh/duperemove";
+    changelog = "https://github.com/markfasheh/duperemove/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [
       thoughtpolice

pkgs/by-name/ea/easylpac/package.nix

@@ -1,11 +1,13 @@
 {
   lib,
+  stdenv,
   buildGoModule,
   fetchFromGitHub,
   pkg-config,
   wrapGAppsHook3,
   makeDesktopItem,
   copyDesktopItems,
+  desktopToDarwinBundle,
   gtk3,
   libglvnd,
   libxxf86vm,
@@ -35,6 +37,11 @@ buildGoModule rec {
     copyDesktopItems
     pkg-config
     wrapGAppsHook3
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Generate Applications/EasyLPAC.app from the desktop item, so the
+    # app shows up in Spotlight/Launchpad instead of being CLI-only.
+    desktopToDarwinBundle
   ];
 
   buildInputs = [

pkgs/by-name/ej/ejson/package.nix

@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "ejson";
-  version = "1.5.4";
+  version = "1.5.5";
 
   src = fetchFromGitHub {
     owner = "Shopify";
     repo = "ejson";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-s/VeBajNZI0XNs1PwWMpHAF0Wrh1/ZQUvUZBnUCoPBM=";
+    sha256 = "sha256-t0IjL+gB1bfHwS1eoMy/yKgayswECxpXyK8xq6iGMCg=";
   };
 
-  vendorHash = "sha256-JeZkiiqNmDsuQSA6hCboasApRlTmw/+fgTAp5WbgdDg=";
+  vendorHash = "sha256-vT9A4d+e+iOie5TNbu5EyPi5OZJ/m8Not3tCQc7Xwn8=";
 
   ldflags = [
     "-s"

pkgs/by-name/el/electron-fiddle/bump-yauzl.patch

@@ -1,61 +1,65 @@
 diff --git a/package.json b/package.json
-index 7e49e7a..ab5c306 100644
+index f69931cc..3963bbb6 100644
 --- a/package.json
 +++ b/package.json
-@@ -166,6 +166,7 @@
+@@ -156,6 +156,7 @@
      ]
    },
    "resolutions": {
 +    "yauzl": "^3.3.1",
-     "@electron-forge/maker-base": "7.8.1",
-     "@electron-forge/shared-types": "7.8.1"
-   }
+     "@electron-forge/maker-base": "8.0.0-alpha.9",
+     "@electron-forge/shared-types": "8.0.0-alpha.9",
+     "electron-windows-msix@npm:^2.0.4": "patch:electron-windows-msix@npm%3A2.0.4#~/.yarn/patches/electron-windows-msix-npm-2.0.4-954aec946e.patch"
 diff --git a/yarn.lock b/yarn.lock
-index a4d91bb..8ae6ff9 100644
+index 365f8b4d..b805b8af 100644
 --- a/yarn.lock
 +++ b/yarn.lock
-@@ -3653,11 +3653,6 @@ browserslist@^4.21.10:
-     node-releases "^2.0.18"
-     update-browserslist-db "^1.1.0"
+@@ -4146,13 +4146,6 @@ __metadata:
+   languageName: node
+   linkType: hard
  
--buffer-crc32@~0.2.3:
--  version "0.2.13"
--  resolved "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz"
--  integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==
+-"buffer-crc32@npm:~0.2.3":
+-  version: 0.2.13
+-  resolution: "buffer-crc32@npm:0.2.13"
+-  checksum: 10c0/cb0a8ddf5cf4f766466db63279e47761eb825693eeba6a5a95ee4ec8cb8f81ede70aa7f9d8aeec083e781d47154290eb5d4d26b3f7a465ec57fb9e7d59c47150
+-  languageName: node
+-  linkType: hard
 -
- buffer-from@^1.0.0:
-   version "1.1.2"
-   resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz"
-@@ -5746,13 +5741,6 @@ faye-websocket@^0.11.3:
-   dependencies:
-     websocket-driver ">=0.5.1"
+ "buffer-from@npm:^1.0.0":
+   version: 1.1.2
+   resolution: "buffer-from@npm:1.1.2"
+@@ -6442,15 +6435,6 @@ __metadata:
+   languageName: node
+   linkType: hard
  
--fd-slicer@~1.1.0:
--  version "1.1.0"
--  resolved "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz"
--  integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==
+-"fd-slicer@npm:~1.1.0":
+-  version: 1.1.0
+-  resolution: "fd-slicer@npm:1.1.0"
 -  dependencies:
--    pend "~1.2.0"
+-    pend: "npm:~1.2.0"
+-  checksum: 10c0/304dd70270298e3ffe3bcc05e6f7ade2511acc278bc52d025f8918b48b6aa3b77f10361bddfadfe2a28163f7af7adbdce96f4d22c31b2f648ba2901f0c5fc20e
+-  languageName: node
+-  linkType: hard
 -
- fdir@^6.4.4, fdir@^6.4.6:
-   version "6.4.6"
-   resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.4.6.tgz#2b268c0232697063111bbf3f64810a2a741ba281"
-@@ -12352,13 +12340,12 @@ yargs@^17.0.1:
-     y18n "^5.0.5"
-     yargs-parser "^21.1.1"
+ "fdir@npm:^6.5.0":
+   version: 6.5.0
+   resolution: "fdir@npm:6.5.0"
+@@ -13869,13 +13853,12 @@ __metadata:
+   languageName: node
+   linkType: hard
  
--yauzl@^2.10.0:
--  version "2.10.0"
--  resolved "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz"
--  integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==
-+yauzl@^2.10.0, yauzl@^3.3.1:
-+  version "3.4.0"
-+  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-3.4.0.tgz#88b2a21455f37ca7dccf2eeb33bacb4392322719"
-+  integrity sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==
+-"yauzl@npm:^2.10.0":
+-  version: 2.10.0
+-  resolution: "yauzl@npm:2.10.0"
++"yauzl@npm:^3.3.1":
++  version: 3.4.0
++  resolution: "yauzl@npm:3.4.0"
    dependencies:
--    buffer-crc32 "~0.2.3"
--    fd-slicer "~1.1.0"
-+    pend "~1.2.0"
+-    buffer-crc32: "npm:~0.2.3"
+-    fd-slicer: "npm:~1.1.0"
+-  checksum: 10c0/f265002af7541b9ec3589a27f5fb8f11cf348b53cc15e2751272e3c062cd73f3e715bc72d43257de71bbaecae446c3f1b14af7559e8ab0261625375541816422
++    pend: "npm:~1.2.0"
++  checksum: 10c0/17a98c42c0065e8af429eb8a61f7a0e4562181ed54080366b838f34f741b6829f167f804787c86b7646bb042707f35871739f053de0548285e405a2eae4da025
+   languageName: node
+   linkType: hard
  
- yocto-queue@^0.1.0:
-   version "0.1.0"

pkgs/by-name/el/electron-fiddle/missing-hashes.json

@@ -0,0 +1,56 @@
+{
+  "@esbuild/aix-ppc64@npm:0.25.8": "37fc14b17214c1f6bf41175029b62a43664a6a5a5b802614fe1d837bbf7abf5eaf2f6b735b6a446ebcfabb632e038c8ad9cccd87a259c45a1846689f8527874a",
+  "@esbuild/android-arm64@npm:0.25.8": "e367e989238292ccee72013511dde1aef2d2160d8d5d669a12272f693cf9a0970fac9d7835178b3c46ed6936a0c4b29d21d58ed11851a3697bf98b4320be4b74",
+  "@esbuild/android-arm@npm:0.25.8": "cbfa2c802d8931e5f4d06582f20573cb34774ab713b4712c37eb15bfab6f90b693878b661de2a3bb9c81eecf45b37e0ddf2e9c79ef4ff932bbc37da588c40183",
+  "@esbuild/android-x64@npm:0.25.8": "1d4b900dd2f43790415745d20ae6cadb53e9412911578aaf43462277169c22800eca1f49a9f8ce9c37236e1691279494f91967d28310720707911910ec765013",
+  "@esbuild/darwin-arm64@npm:0.25.8": "a8a50e303056e668e99370a88d1744de4a83e62e2f3f7fcf2ff611142346505229568b0ec5edda93ec96e33e842a585880a312790553202750f123d9636fa97d",
+  "@esbuild/darwin-x64@npm:0.25.8": "9806fe9d54f3228a01f535e7c51aea26bd1bab3c5d64d5f77f4606de44f361f049222776d32bfd262d45991b7aecca645ed576ea338edbf4f8044b22b3e331ad",
+  "@esbuild/freebsd-arm64@npm:0.25.8": "8e6cbdd45819390ecdb62a70a4f119a9269a90895f3e1237788b36a512248a756233ef59f55f9033658af372a196f0edc3567f078f1387e150238d2bd51f733b",
+  "@esbuild/freebsd-x64@npm:0.25.8": "3f920c686037f825859a2fe82104085f4b254b77821cc71a71db512ef0679dd01481c136c3f7057ba7250daff2458aa3ffd101cc28cb5fff2d55270ba5930ec8",
+  "@esbuild/linux-arm64@npm:0.25.8": "234edc9f815cdc74d21c6a90a3542c941deeaf3a24b408c74a4651616bd270383ba5a15eaef837ab347a374032c7028fc29e4f1da0becb33f0b8dd8f744934d7",
+  "@esbuild/linux-arm@npm:0.25.8": "dc6dc225ae278cb3383e11d9829d22f301e1b79f2ed4efde1a01896ae67e45efde98caa61f10cb425a809e9b61e9a4651b60d2b6a3e9ad6174519e8ce74bc02a",
+  "@esbuild/linux-ia32@npm:0.25.8": "1c780012035552e27adea34d11f959a3ddd4a4d576cddd03d320b1db18110e777c1adca2c6d10affd587a4454900d3ffcad9371956855e56739babdc2e4edcd3",
+  "@esbuild/linux-loong64@npm:0.25.8": "d3d39691d301d144c7d61f52163a2fe64caaf928f4117d906707dc1456f3d88d1a7a3b16fb988ccfc0b0bc203f4bcd56665a9c7405dc380b3165a26ab195b9ec",
+  "@esbuild/linux-mips64el@npm:0.25.8": "437e51b2be977cf7774114e04c141e3c0f1ceb7f12b961b7b3ac7f99c4e203afdd74c41e072ecdc4bab3cde4f14feedd78653727d1b2013ed3611bd89117ee8c",
+  "@esbuild/linux-ppc64@npm:0.25.8": "29d2e344b1c8b767518d25b23eb9e98d85deae1f2def2e01c1939536ac7d1fc9e92749a8d29b29277b3340d3613e4b0f96213c6aa2de7e06885a19d3d269870a",
+  "@esbuild/linux-riscv64@npm:0.25.8": "82b2ef7fd5a00b465da97bd797246269d7460ed710c0533517a1f8ad8e32527f405509b2ce27e29f8f3df1affa04e45cf5d1a71205f69dab5c1a27118cf10fb8",
+  "@esbuild/linux-s390x@npm:0.25.8": "74168a6e8927d12c883dba56006f5277f8888c7b1b5e4d132a3c235b8629c3015b4715968ba128a79ff55c9f08a23df84fe44047e8cda4366b9699c5c45f27a4",
+  "@esbuild/linux-x64@npm:0.25.8": "d531002ac2ead0bdb293ec1a4eceea687d37815e298196af2471107cdd4c1f76ef7d12417052b51852b80f66111abfb5ad8375c58b97da92306b975e9a8f0649",
+  "@esbuild/netbsd-arm64@npm:0.25.8": "55626924ae946a6225707062648aabb79c70d61e7e094b067338ea1adf72493b502e99e59440fe0d3abfe20eb36c33f78115815d63e72fa99f5e90146c2ee5d9",
+  "@esbuild/netbsd-x64@npm:0.25.8": "d03122aaa3e9a8bda686bc4120820805b5d9701099458a2c928ee1a292fabcc47df0cb178c8c428edb78a058e75cf7c0d80fa25b71fb91db43d73fe6e4062c41",
+  "@esbuild/openbsd-arm64@npm:0.25.8": "113ed8722788986b5b703c791bb9c954e80a861b92f453c66c79318d71cc6eac509c1dc79d20671b4af92165eee05a28eb7b3122537d8701447d30f58c428942",
+  "@esbuild/openbsd-x64@npm:0.25.8": "dfa68d80d68ae825de85aeccc118724ced6b232dcf25da6d862ba03abda2f55e75483dccbf8cb3a7338e7882a05e5425fcf5a902b7dced72c9f1a9c2650912bd",
+  "@esbuild/openharmony-arm64@npm:0.25.8": "8dab5710d93ad4a78a34a0016f6ea0bf2e16489845f9895ecaf354c1c3db209bed8f05a31309b95c358bfeaea53829605f4e315e9a53dae4d9fdb58e31ca4688",
+  "@esbuild/sunos-x64@npm:0.25.8": "ccc940bd687d1f6d320d2538ac594b7fe5e291e194380a8b392dd2348d738cf8d322f9f62bcea82b3809f98796a0a004cd02ba9c4d563e5e336665e1ec8e1e1d",
+  "@esbuild/win32-arm64@npm:0.25.8": "b0a9a86548d4a62e68b12a89e21aaadda3d6d3e96541a2714b74df370cc344e1a2d91604998a26951da28c2f932bd2ee033adc9346bb232622c3ac419107136a",
+  "@esbuild/win32-ia32@npm:0.25.8": "5880e933c8fb8dc1de1225128c171ea64f4b27fe52fc11ed9cfe6b0ca8ae091c2703d4cb629f08c06731810c46f48cf881516d0d54b3ac408dec34586ea84d27",
+  "@esbuild/win32-x64@npm:0.25.8": "9e98fe0e7eef7a0e774ab761c59d520ea1c997a7a6e4c7f9cbc967471a4a7ffb14bc27c60d2aa10796c4e945c3da2613fcc297054566fe3f5191e1250691d622",
+  "@rolldown/binding-android-arm64@npm:1.0.0-rc.12": "1fe38430414fef2eb817ad10c50744c757e74b105850f9bec12016312c3b9ce0a03c14eb65c04f79ec06795005d52bf97d3a6ca62446184f5ca0c41300256d15",
+  "@rolldown/binding-darwin-arm64@npm:1.0.0-rc.12": "39aa446385e9b0b3d4843478f440c452cabe4f826407986f085d0f6a73467d0e6642f3718facd4ea3c4f7687890ba0a9568e97b9f0ec816fbf5a271f2fdd56e0",
+  "@rolldown/binding-darwin-x64@npm:1.0.0-rc.12": "3cb24f9a29f0ddbfa9c7734f22786ee436129b0cea963b7b9a8e09e5ad3a37516591deacf5c952d01a582de6ba1a069e39b3d056c455986c89448ba57dc99c05",
+  "@rolldown/binding-freebsd-x64@npm:1.0.0-rc.12": "02033ccde0b7383adbe16d0df36dd74e20b3973bcd1c791822246c9314c2cbd52d2b0d37704de591e237d1db6a92108fb12c5d07afce07d9598b024576a66754",
+  "@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-rc.12": "4d5daa86125e95ec7c1da4804d1aa259715fff3f966e0f15aabbe8488fb46e6c69e2289119f4dd8ba5bcd1b1c94fcd2f2c5a1f59477253cea020ebdcc2c7c652",
+  "@rolldown/binding-linux-arm64-gnu@npm:1.0.0-rc.12": "87311abc5e88ebb12b1f17fd840b72d3dfad98d4a36d3c9215e75b0e4cc20d378372efb3c40a79176067764857b3def4eaafeae13b385a10866d383ca69b9168",
+  "@rolldown/binding-linux-arm64-musl@npm:1.0.0-rc.12": "e9fa1956b2f2afce1479a6e1a850dca09ffecffbb4f7f90680dfaef2503fdc0fcea2a13e0cce9303b72125f225d798ef7c5d1fc6d36466a36dece61cddb98848",
+  "@rolldown/binding-linux-ppc64-gnu@npm:1.0.0-rc.12": "e4c86e1145f0605c708c0facf1cb717ac7410010812c1bcb50cd55481a3ea4802fc610b9ef2ff9f65f05c5baed788bd7c0d015702b9b9056d62efdb209d6cd47",
+  "@rolldown/binding-linux-s390x-gnu@npm:1.0.0-rc.12": "52bb2a9c287fb59c394ed2194d47222fadb72f0516683f7d1ad19eb73e73c1e3a3917d0598e483c5bf2c7cc942eb010e8ebf091515369c90f45dcb4a375563c7",
+  "@rolldown/binding-linux-x64-gnu@npm:1.0.0-rc.12": "f1f604d49ad2d47a0f8d00152c045756016e422a5f93d8548e2a2388d1af43b597ae22a349ba30d94413352999a2526a5865ed65fe1045743759f5e4f6293cf2",
+  "@rolldown/binding-linux-x64-musl@npm:1.0.0-rc.12": "1db5ea4ae644892004e7bc00b3dd0515c8bbe196f0abe71ecbd5862c9bf72d2658f2c40ca6f637764c795ad3cc182d449b7239da1057837aa5a874b923cb7f51",
+  "@rolldown/binding-openharmony-arm64@npm:1.0.0-rc.12": "e2145fb3bfd2ab8ac1ecba1b70284b47a4bdb12559d6efb3146180a6e5b6827c78b613c5d23bf0afff2692b37a2019d0ae39d6554969508478d9e840520e3fc8",
+  "@rolldown/binding-wasm32-wasi@npm:1.0.0-rc.12": "3fec2099b45f6982dd5655ab5b45416413951d22f4cfd726e7ed3cb1a37ca499fc322b5b7b8b5258de49591cc1d1f6344a707f5541dc748591e2dbb38c200389",
+  "@rolldown/binding-win32-arm64-msvc@npm:1.0.0-rc.12": "de6e85e0826c1daed00b6020fbf8a61fe8842e48a56eee6b64bc33be514d084d2f3969428e871b7f66db60529ac601c6b0a37ac86c36e34af6454d70f95f98cd",
+  "@rolldown/binding-win32-x64-msvc@npm:1.0.0-rc.12": "7db443359da15f8b7947e585ff9a388e0a66e318d12ba96d435f0a436c6fe92c67620672c1c15b82645ab5bd1da9a1c20957a99a3d8bf5c122fdad03dfc0d117",
+  "electron-installer-debian@npm:3.2.0": "9ffb1fe15cf291ab23cd6ef51e20b30ebe003c58f745bc5373a3c0800f793f0cfccebfc01eec1cd6658672522a7dcb9733441cdcf9657624606333a5738538a1",
+  "electron-installer-redhat@npm:3.3.0": "82b49fc9447b658e8ee718d008b7785335608e110bde8d8e1c9baa69ff6d6ca0c7913e03fc58aee12ded7e5705f5787d08c7c993e14c0d7d0fb12909c632188c",
+  "lightningcss-android-arm64@npm:1.32.0": "1cb326ad39dcb02cf9f45025c167b6900e3a04b08f5149d3c5ee26054b00d08db3736fb69183a6c3ed1cb32dddd148608c784b6631b4777623f7dd0c032c392d",
+  "lightningcss-darwin-arm64@npm:1.32.0": "da954d0c215d0e95f15a92c8717f871017586e1332b98fd40e96196571d2fd3d51a727dc530768afee9f6a04da210510740574dd0c8dbf2ecced79e5996f1a06",
+  "lightningcss-darwin-x64@npm:1.32.0": "b1d298c9173f839e8447d1917ed8bc5ab098ed0fc4e4b419d36ac5afe8b27bf21cb47d00a35c3d2edadcac598086e9b4f26c992a809d79f9681d6865a230d79e",
+  "lightningcss-freebsd-x64@npm:1.32.0": "0eb59f6acf2fcdc944c921b0ac2a16ee803452b9438f573ad6bc41be00040b791ed698698ed5c06f98ef43a6fed0a54987ba3a88da204de9978db2fca96a4a65",
+  "lightningcss-linux-arm-gnueabihf@npm:1.32.0": "7d1ea43986d2370a90cefc920dac3e041e0d19445cc4fdaf244644b57b6937588d7c3a464c31440617231f55a6dad79744cf707912e05f3b46a1694abb5b4e00",
+  "lightningcss-linux-arm64-gnu@npm:1.32.0": "f01ede75f41480a164d18338fa46d9fccdb4a821717174ce848ff8b2aa4badba4f1d331deb3ebec3ee2f0eb95bfa2e35f54877f371427b04e6f36a4783aa1414",
+  "lightningcss-linux-arm64-musl@npm:1.32.0": "38d373f99768f1c5ab6a9c87e1c0ec45eccdb3fe4d216dd5cd06629648c4b0689570ad4e89285d490662cde1790cd36e6b3d176c14e5e31f6869c604aa2df820",
+  "lightningcss-linux-x64-gnu@npm:1.32.0": "0a1433d46a4a010f87b615c3fa43725a456bae259858a2c927899cbf93074f0ae40f49901bf6af6daa30a4d169c86f594f6341fd775bf7b59293b8d7947b81c5",
+  "lightningcss-linux-x64-musl@npm:1.32.0": "a6f48ccc30a73d30563c7b61856d1fd6a8812ce62b1bee797f227e06612df70aab4ccd1908552952f77ca7ff2a51019f62d14ae5310ca67311635eeec55d3a9e",
+  "lightningcss-win32-arm64-msvc@npm:1.32.0": "a919be7fb298c1102bccf18b6f83d54946adfac70ab2ac9c95e4ae38ded76d8f530215b0bcda4d38df4ffc40a70abe3afd91d01d35fd122e7d119ed0e46972d0",
+  "lightningcss-win32-x64-msvc@npm:1.32.0": "5b8d3431aadbdc40a0a7eae32f2415e4f28b547af1a1cd5b35a35d67f772a89492c7fa03e9fc88ce804b14f5f88e412e49fff40d1b0aad67177de815c434207e"
+}

pkgs/by-name/el/electron-fiddle/package.nix

@@ -9,20 +9,20 @@
   nodejs,
   stdenvNoCC,
   util-linux,
-  yarnBuildHook,
-  yarnConfigHook,
+  yarn-berry_4,
   zip,
 }:
 
 let
   pname = "electron-fiddle";
-  version = "0.37.2";
+  version = "0.40.1";
+  yarn-berry = yarn-berry_4;
 
   src = fetchFromGitHub {
     owner = "electron";
     repo = "fiddle";
     tag = "v${version}";
-    hash = "sha256-e9PLgkqWBNLBw7uuNpPluOQ6+aGLYQLyTzcLa+LMOzs=";
+    hash = "sha256-nmmj1PvW9LOoEdwwWRRXe9q9J8z6Fp45Tt038BjWD+k=";
   };
 
   patches = [
@@ -31,27 +31,39 @@ let
 
     # zip extraction fails on newer nodejs versions without this fix
     ./bump-yauzl.patch
+
+    # https://github.com/nixos/nixpkgs/issues/542343
+    ./yarn-metadata-version.patch
   ];
 
+  missingHashes = ./missing-hashes.json;
+
   unwrapped = stdenvNoCC.mkDerivation {
     pname = "${pname}-unwrapped";
-    inherit version src patches;
+    inherit
+      version
+      src
+      patches
+      missingHashes
+      ;
 
-    offlineCache = fetchYarnDeps {
-      inherit src patches;
-      hash = "sha256-5yUsjXQ3OHwEGFgMTUJAXAuTdAl4zkb8zxTs5OT6sw4=";
+    offlineCache = yarn-berry.fetchYarnBerryDeps {
+      inherit src patches missingHashes;
+      hash = "sha256-xxguRiyZDGdVt3eYh+KUI/odLZZ/LeScRBfexMxAOVI=";
     };
 
     nativeBuildInputs = [
       git
       nodejs
       util-linux
-      yarnBuildHook
-      yarnConfigHook
+      yarn-berry
+      yarn-berry.yarnBerryConfigHook
       zip
     ];
 
-    preBuild = ''
+    buildPhase = ''
+      runHook preBuild
+
       # electron files need to be writable on Darwin
       cp -r ${electron.dist} electron-dist
       chmod -R u+w electron-dist
@@ -65,13 +77,15 @@ let
       # force @electron/packager to use our electron instead of downloading it, even if it is a different version
       substituteInPlace node_modules/@electron/packager/dist/packager.js \
         --replace-fail 'await this.getElectronZipPath(downloadOpts)' '"electron.zip"'
+
+      node --run package
+
+      runHook postBuild
     '';
 
     # electron-forge's console output is squeezed into one narrow column if unset
     env.CI = "1";
 
-    yarnBuildScript = "package";
-
     installPhase = ''
       runHook preInstall
 

pkgs/by-name/el/electron-fiddle/yarn-metadata-version.patch

@@ -0,0 +1,13 @@
+diff --git a/yarn.lock b/yarn.lock
+index 365f8b4d..ffa89a3d 100644
+--- a/yarn.lock
++++ b/yarn.lock
+@@ -2,7 +2,7 @@
+ # Manual changes might be lost - proceed with caution!
+ 
+ __metadata:
+-  version: 8
++  version: 9
+   cacheKey: 10c0
+ 
+ "@aashutoshrathi/word-wrap@npm:^1.2.3":

pkgs/by-name/et/eternal-terminal/package.nix

@@ -9,17 +9,19 @@
   protobuf,
   zlib,
   catch2,
+  versionCheckHook,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "eternal-terminal";
-  version = "6.2.11";
+  version = "7.0.0";
 
   src = fetchFromGitHub {
     owner = "MisterTea";
     repo = "EternalTerminal";
     tag = "et-v${finalAttrs.version}";
-    hash = "sha256-d3mCZQO12NUQjGIOX1FWTLUq+adMTNb9QYCSU3ibZMY=";
+    hash = "sha256-uZnjtSubTljFlbIZEznfEmNRaUWsuZotRapn0wexkow=";
   };
 
   nativeBuildInputs = [
@@ -50,6 +52,14 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   doCheck = true;
+  doInstallCheck = true;
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  checkPhase = ''
+    ctest --output-on-failure -E 'et-test\.LargeInputNoDeadlock'
+  '';
+
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "Remote shell that automatically reconnects without interrupting the session";
@@ -58,7 +68,9 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       jshort
+      tomasrivera
     ];
+    mainProgram = "et";
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 })

pkgs/by-name/fl/flake-checker/package.nix

@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "flake-checker";
-  version = "0.2.13";
+  version = "0.2.14";
 
   src = fetchFromGitHub {
     owner = "DeterminateSystems";
     repo = "flake-checker";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-QE/Druzo/EDiuh7Vb+kipPgUxkIRPLsHFMSpSRMFIVw=";
+    hash = "sha256-MUbF2mOrcoODe26j0OaXHLk73yFhB+0/d2yPaeBEi6M=";
   };
 
-  cargoHash = "sha256-kKEHYKXtccXRsa1cON0oMHOWagi3mVdnf3pEgkoNn/k=";
+  cargoHash = "sha256-toC9qMq06Grh6NJZZUb7cbQdNeI7lwqDqbJO85a3zwk=";
 
   meta = {
     description = "Health checks for your Nix flakes";

pkgs/by-name/fl/fltk_1_3/package.nix

@@ -59,6 +59,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = ''
     patchShebangs documentation/make_*
+  ''
+  # https://github.com/fltk/fltk/commit/dd819a118cfaa889bec6563b6a8e1e969b91f7ee
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace CMake/setup.cmake \
+      --replace-fail 'set (FLTK_CONFIG_PATH FLTK.framework/Resources/CMake)' 'set (FLTK_CONFIG_PATH ''${FLTK_DATADIR}/fltk)'
   '';
 
   nativeBuildInputs = [
@@ -156,9 +161,6 @@ stdenv.mkDerivation (finalAttrs: {
       mv bin/{test,examples}/* $bin/bin/
     ''
     + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      mkdir -p $out/Library/Frameworks
-      mv $out{,/Library/Frameworks}/FLTK.framework
-
       moveAppBundles() {
         echo "Moving and symlinking $1"
         appname="$(basename "$1")"

pkgs/by-name/fo/fotowall/package.nix

@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation rec {
   pname = "fotowall";
-  version = "1.1.2";
+  version = "1.1.3";
   strictDeps = true;
   __structuredAttrs = true;
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     owner = "fotowall";
     repo = "fotowall";
     rev = "v${version}";
-    hash = "sha256-icZUT17vgpI65Vyx7/TuTP4ISDkb7mrXwuyVzDHcoNE=";
+    hash = "sha256-u3EV8UzfESbhaIDLYimYnjDXiP0j04VKoqqO/NglFLA=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/go/goeland/package.nix

@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "goeland";
-  version = "0.26.0";
+  version = "0.27.0";
 
   src = fetchFromGitHub {
     owner = "slurdge";
     repo = "goeland";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-8vhcAzpgYDPHRuvBzeboGO09n+UCSCxNaJuooPnLBjo=";
+    sha256 = "sha256-oELciX2ESLoMydx1E3Oo4U1wf/GN+dMRpvpBBVCxRK0=";
   };
 
-  vendorHash = "sha256-GOoeyh0ddtYiigavgjMNy8z6suTFtS9oswO9PAdagGE=";
+  vendorHash = "sha256-aITCLQoLIJEwlsZBQ9DuTqbnJYm8EGqNIX2dykq2QlU=";
 
   ldflags = [
     "-s"

pkgs/by-name/go/google-java-format/package.nix

@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "google-java-format";
-  version = "1.36.0";
+  version = "1.36.1";
   __structuredAttrs = true;
 
   src = fetchurl {
-    sha256 = "sha256-I2lt4F3SDYXBRJyN6fJBkDB5lQj1NWVw6Xn3+W5Z2NY=";
+    sha256 = "sha256-JbQA8AMInSPMUyDNrxoWyr7hm4qjQ00P8CGz2fQhVLQ=";
     url = "https://github.com/google/google-java-format/releases/download/v${finalAttrs.version}/google-java-format-${finalAttrs.version}-all-deps.jar";
   };
 

pkgs/by-name/he/helmfile/package.nix

@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "helmfile";
-  version = "1.7.2";
+  version = "1.7.3";
 
   src = fetchFromGitHub {
     owner = "helmfile";
     repo = "helmfile";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-B9peVIqI2DveyWzVo+oXtsW8WLq7COk/2RrUjf2XX0w=";
+    hash = "sha256-St7MTDWoc/Ue5meAMe6Krbi4Csp2Kz5KqfUuFmjanbE=";
   };
 
-  vendorHash = "sha256-LBp+UASFNctJ0iclgNk3OlIumifG5jV6sllExwCvp1g=";
+  vendorHash = "sha256-ngIAwWMicW4nqBqd0CIlOI3ocHfJPHbwnkIT0ADZzHk=";
 
   proxyVendor = true; # darwin/linux hash mismatch
 

pkgs/by-name/in/inconsolata/package.nix

@@ -2,6 +2,7 @@
   lib,
   stdenvNoCC,
   fetchFromGitHub,
+  installFonts,
 }:
 
 stdenvNoCC.mkDerivation {
@@ -16,11 +17,9 @@ stdenvNoCC.mkDerivation {
     rootDir = "ofl/inconsolata";
   };
 
-  installPhase = ''
-    runHook preInstall
-    install -m644 --target $out/share/fonts/truetype/inconsolata -D static/*.ttf *.ttf
-    runHook postInstall
-  '';
+  nativeBuildInputs = [
+    installFonts
+  ];
 
   meta = {
     homepage = "https://www.levien.com/type/myfonts/inconsolata.html";

pkgs/by-name/in/intel-gmmlib/package.nix

@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "intel-gmmlib";
-  version = "22.10.0";
+  version = "22.10.1";
 
   src = fetchFromGitHub {
     owner = "intel";
     repo = "gmmlib";
     tag = "intel-gmmlib-${finalAttrs.version}";
-    hash = "sha256-1JF9zb5aqvUkiPVyDxrmhEC90NwRi/AGQEamEub3gS4=";
+    hash = "sha256-BxFyCL3ny5pdhfnfjurSltgtoNEZ9gnWMKt6oW1i+gI=";
   };
 
   nativeBuildInputs = [ cmake ];

pkgs/by-name/jx/jx/package.nix

@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "jx";
-  version = "3.17.61";
+  version = "3.17.76";
 
   src = fetchFromGitHub {
     owner = "jenkins-x";
     repo = "jx";
     rev = "v${version}";
-    sha256 = "sha256-4iDzS4ONDbCzXun2cB+t2c276VmKzIyB6OdeXEb3E6M=";
+    sha256 = "sha256-ejm/U2EX9iU07k9mqzd9jOeo3hESx44mXWO7mvhNqqM=";
   };
 
   vendorHash = "sha256-Rupnzj1kw0den6O0RZ5Fg5pZWRsfLuor3ntAiQjfIn8=";

pkgs/by-name/ke/keymapp/package.nix

@@ -16,16 +16,15 @@ let
   pname = "keymapp";
   version = "1.3.7";
 
-  sources = rec {
+  sources = {
     aarch64-darwin = {
       url = "https://oryx.nyc3.cdn.digitaloceanspaces.com/keymapp/keymapp-${version}.dmg";
       hash = "sha256-H6xRau7pWuSF5Aa6lblwi/Lg5KxC+HM3rtUMjX+hEE8=";
     };
-    aarch64-linux = {
+    x86_64-linux = {
       url = "https://oryx.nyc3.cdn.digitaloceanspaces.com/keymapp/keymapp-${version}.tar.gz";
       hash = "sha256-qHvHCDzWRhuhDg2kuU8kmikQDXElQtVEmPAelHz4aPo=";
     };
-    x86_64-linux = aarch64-linux;
   };
   src = fetchurl {
     inherit (sources.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}")) url hash;
@@ -39,7 +38,7 @@ let
       jankaifer
       shawn8901
     ];
-    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    platforms = [ "x86_64-linux" ] ++ lib.platforms.darwin;
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
     license = lib.licenses.unfree;
   };

pkgs/by-name/ks/kstars/package.nix

@@ -24,11 +24,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kstars";
-  version = "3.8.3";
+  version = "3.8.4.1";
 
   src = fetchurl {
     url = "mirror://kde/stable/kstars/${finalAttrs.version}/kstars-${finalAttrs.version}.tar.xz";
-    hash = "sha256-xez++JWHcQIx5Mk+TUeBrhcnbQNE4tqX31T9bthqGdU=";
+    hash = "sha256-5YymHJ15Y4ku+a740LgviLfp6b56NbE37hqi2CAw6r0=";
   };
 
   nativeBuildInputs = with kdePackages; [

pkgs/by-name/la/layerx/package.nix

@@ -10,14 +10,14 @@
 
 buildGoModule (finalAttrs: {
   pname = "layerx";
-  version = "1.6.0";
+  version = "1.6.1";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "deveshctl";
     repo = "layerx";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6D/c2RDfvoVXikQ1TLq1dl6MJdxD0562tl6LgFOrSds=";
+    hash = "sha256-7GBJzcW/2SXx8Id+ke+ktLDFRv0nWgqLA/UrOl0Bn5k=";
   };
 
   vendorHash = "sha256-7wbyz6fKB3HMFhKJVIWrOIczLfqF4yInyszdh2Ky8WU=";

pkgs/by-name/li/libbluray-full/package.nix

@@ -1,6 +1,11 @@
-{ libbluray }:
+{
+  lib,
+  stdenv,
+  jdk21,
+  libbluray,
+}:
 libbluray.override {
   withAACS = true;
   withBDplus = true;
-  withJava = true;
+  withJava = lib.meta.availableOn stdenv.buildPlatform jdk21;
 }

pkgs/by-name/li/libcanberra/package.nix

@@ -5,7 +5,6 @@
   fetchpatch,
   pkg-config,
   libtool,
-  gtk2-x11,
   gtk3-x11,
   gtkSupport ? null,
   libpulseaudio,
@@ -43,7 +42,6 @@ stdenv.mkDerivation (finalAttrs: {
     gstreamer
     gst-plugins-base
   ])
-  ++ lib.optional (gtkSupport == "gtk2") gtk2-x11
   ++ lib.optional (gtkSupport == "gtk3") gtk3-x11
   ++ lib.optional stdenv.hostPlatform.isLinux libcap
   ++ lib.optional withSystemd systemdLibs

pkgs/by-name/li/libjson-rpc-cpp/package.nix

@@ -11,6 +11,7 @@
   hiredis,
   jsoncpp,
   libmicrohttpd,
+  patchelf,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -30,6 +31,9 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     cmake
     doxygen
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    patchelf
   ];
 
   buildInputs = [
@@ -70,32 +74,41 @@ stdenv.mkDerivation (finalAttrs: {
   configurePhase = ''
     runHook preConfigure
     cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd)/Install \
-             -DCMAKE_BUILD_TYPE=Release
+             -DCMAKE_INSTALL_LIBDIR=lib \
+             -DCMAKE_BUILD_TYPE=Release \
+             -DWITH_COVERAGE=OFF \
+             ${lib.optionalString stdenv.hostPlatform.isDarwin "-DCMAKE_INSTALL_NAME_DIR=$out/lib -DCMAKE_INSTALL_RPATH=$out/lib"}
     runHook postConfigure
   '';
 
-  preInstall = ''
-    function fixRunPath {
-      p=$(patchelf --print-rpath $1)
-      q="$p:${
-        lib.makeLibraryPath [
-          jsoncpp
-          argtable
-          libmicrohttpd
-          curl
-        ]
-      }:$out/lib"
-      patchelf --set-rpath $q $1
-    }
-
-    mkdir -p $out
-  '';
+  preInstall =
+    lib.optionalString stdenv.hostPlatform.isLinux ''
+      function fixRunPath {
+        p=$(patchelf --print-rpath $1)
+        q="$p:${
+          lib.makeLibraryPath [
+            jsoncpp
+            argtable
+            libmicrohttpd
+            curl
+          ]
+        }:$out/lib"
+        patchelf --set-rpath $q $1
+      }
+    ''
+    + ''
+      mkdir -p $out
+    '';
 
   postInstall = ''
-    sed -i -re "s#-([LI]).*/Build/Install(.*)#-\1$out\2#g" Install/lib64/pkgconfig/*.pc
-    for f in Install/lib64/*.so* $(find Install/bin -executable -type f); do
+    sed -i -re "s#-([LI]).*/Build/Install(.*)#-\1$out\2#g" Install/lib*/pkgconfig/*.pc
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    for f in Install/lib*/*.so* $(find Install/bin -executable -type f); do
       fixRunPath $f
     done
+  ''
+  + ''
     cp -r Install/* $out
   '';
 
@@ -110,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "jsonrpcstub";
     homepage = "https://github.com/cinemast/libjson-rpc-cpp";
     license = lib.licenses.mit;
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
     maintainers = with lib.maintainers; [ robertrichter ];
   };

pkgs/by-name/li/librenms/package.nix

@@ -24,16 +24,16 @@ let
 in
 phpPackage.buildComposerProject2 rec {
   pname = "librenms";
-  version = "26.6.1";
+  version = "26.7.0";
 
   src = fetchFromGitHub {
     owner = "librenms";
     repo = "librenms";
     tag = version;
-    hash = "sha256-RuKUdOopU8NDhsvYH1TIOdKzx5WMF9lfygZ7Ox8VM0E=";
+    hash = "sha256-BH5ucY+xd5K325mKdzw4vHu4f3v/R3iCsqlG/YZboWM=";
   };
 
-  vendorHash = "sha256-evJriHdnKSVD9sDZj0xWyLmUPD/LgM8X8p8U5NwXwqk=";
+  vendorHash = "sha256-vzEBZDe3tpLgl7f0kJniwv56r1MsJSSkPxeYW1zM0pI=";
 
   php = phpPackage;
 

pkgs/by-name/li/libresidfp/package.nix

@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libresidfp";
-  version = "1.1.2";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "libsidplayfp";
     repo = "libresidfp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pczQkgx7YedPzMVUKpvLi0qtn6zs14OEe/N48OSc06c=";
+    hash = "sha256-0XxQtXRHHEW7DNPKFu345ffiwo949uIDeL2oj2f8+jY=";
   };
 
   strictDeps = true;

pkgs/by-name/li/linux-firmware/package.nix

@@ -23,13 +23,13 @@ let
 in
 stdenvNoCC.mkDerivation rec {
   pname = "linux-firmware";
-  version = "20260622";
+  version = "20260810";
 
   src = fetchFromGitLab {
     owner = "kernel-firmware";
     repo = "linux-firmware";
     tag = version;
-    hash = "sha256-nSoJhgI4hAxtNmnj5M6ticzuBSt9uNAYcmc1VR/yXxE=";
+    hash = "sha256-P/fPpqaatp8Z2GV+I/OChiWGn6AhV+8w1RMFuX/LqHc=";
   };
 
   postUnpack = ''

pkgs/by-name/lo/lobster/package.nix

@@ -60,7 +60,6 @@ stdenv.mkDerivation (finalAttrs: {
   passthru.tests.can-run-hello-world = callPackage ./test-can-run-hello-world.nix { };
 
   meta = {
-    broken = stdenv.hostPlatform.isDarwin;
     homepage = "https://strlen.com/lobster/";
     description = "Lobster programming language";
     mainProgram = "lobster";

pkgs/by-name/lo/lon/package.nix

@@ -1,29 +1,39 @@
 {
   rustPlatform,
   lib,
+  stdenv,
   fetchFromGitHub,
   makeBinaryWrapper,
+  pkg-config,
+  openssl,
   nix-prefetch-git,
   gitMinimal,
+  nix,
   nix-update-script,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "lon";
-  version = "0.8.0";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "nikstur";
     repo = "lon";
     tag = finalAttrs.version;
-    hash = "sha256-bxu83mbdfAeDZYOnjZQYyjTs5WgZS8o6Q2irlzgbYs0=";
+    hash = "sha256-rNQ3RuTYu7gM/pmchuvb/xNeRo/m82M4iZq2g89r3UA=";
   };
 
   sourceRoot = "source/rust/lon";
 
-  cargoHash = "sha256-x+qxn0s64fPJpTG/d0PgzAdzMXegYdnsC1FFFuBpsaI=";
+  cargoHash = "sha256-mbGMStrC2GRMpL0+yr5WpLLZRT+vNDwjufymoRZwuIk=";
 
-  nativeBuildInputs = [ makeBinaryWrapper ];
+  nativeBuildInputs = [
+    makeBinaryWrapper
+    pkg-config
+  ];
+
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ];
 
   postInstall = ''
     wrapProgram $out/bin/lon --prefix PATH : ${
@@ -34,6 +44,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
     }
   '';
 
+  nativeCheckInputs = [
+    gitMinimal
+    nix-prefetch-git
+    nix
+  ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
   passthru = {
     updateScript = nix-update-script { };
   };

pkgs/by-name/ma/mautrix-meta/package.nix

@@ -18,7 +18,10 @@ buildGoModule rec {
   version = "26.07";
   tag = "v0.2607.0";
 
-  subPackages = [ "cmd/mautrix-meta" ];
+  subPackages = [
+    "cmd/mautrix-meta"
+    "cmd/mautrix-instagram"
+  ];
 
   src = fetchFromGitHub {
     owner = "mautrix";

pkgs/by-name/mc/mcat-unwrapped/package.nix

@@ -9,16 +9,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mcat-unwrapped";
-  version = "0.6.3";
+  version = "0.6.4";
 
   src = fetchFromGitHub {
     owner = "Skardyy";
     repo = "mcat";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-oaDJYskWG+zWUFLCaEDOr3oHVw2XPVRhUIBFISaptis=";
+    hash = "sha256-DeBQyOf0JjocsnbVp49Ue/M0VAE+97mfHHGEnL7cRjU=";
   };
 
-  cargoHash = "sha256-I/QA1FXFZIsz4W40bri47LtT9Uk4NoKe1aoV4QYHtAQ=";
+  cargoHash = "sha256-EQCtxI+K8CqMt2+SkX4yQiLmOrNpQsqIsff12OcbAuU=";
 
   nativeBuildInputs = [
     installShellFiles

pkgs/by-name/md/mdfried/package.nix

@@ -18,16 +18,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mdfried";
-  version = "0.22.4";
+  version = "0.22.5";
 
   src = fetchFromGitHub {
     owner = "benjajaja";
     repo = "mdfried";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Zcn1C8mXwljJ3HtYgYBPyU9cVHvoNBUn7qjqx45wMhE=";
+    hash = "sha256-BdcwU+9qY7gOIMgOfw7rpdh3KpBTLI1oGuNyOqO0AY8=";
   };
 
-  cargoHash = "sha256-Nt+oBl2HX/H/7j62VjaHrY29gpd2vouevBJO0W3AYAk=";
+  cargoHash = "sha256-Gi+mdABVs11TJSmOhXsC+Cc48QRbCUxODhW06y190w0=";
 
   buildFeatures = [ "pdf" ];
 

pkgs/by-name/me/melonds/package.nix

@@ -29,13 +29,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "melonds";
-  version = "1.1-unstable-2026-07-29";
+  version = "1.1-unstable-2026-07-31";
 
   src = fetchFromGitHub {
     owner = "melonDS-emu";
     repo = "melonDS";
-    rev = "b3dd9880768a5d36c8daf87229b0bc915b51c1ff";
-    hash = "sha256-wnfi43f2nUR4xh3BtlY8oKBsS8aFQ1xE7ZNp5cdkvb4=";
+    rev = "d3cd6164deb1f217d4b262d18af3ef9b97e536c8";
+    hash = "sha256-3epbcg/0Oq3Hndg/5VYKepPruUMHxEkL6LwIcdGm24g=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/mo/mongodb-compass/package.nix

@@ -52,7 +52,7 @@
 
 let
   pname = "mongodb-compass";
-  version = "1.49.12";
+  version = "1.49.14";
 
   selectSystem =
     attrs:
@@ -66,8 +66,8 @@ let
       }
     }";
     hash = selectSystem {
-      x86_64-linux = "sha256-syuoNZ2MmPHgTi55HioqkYQzS1LsbzcgdWoFeM+z2Rg=";
-      aarch64-darwin = "sha256-BY5EUWJdPg4OJ7+ehCb/H8dIAoJVYlJnNcSPp0r/XfA=";
+      x86_64-linux = "sha256-PrpL72+fbCa/C0JpbxGiEBtAEoEvvZhy9FIkJhq0g0g=";
+      aarch64-darwin = "sha256-dW99BE4w9uzGGTNb47h4RuVrGlMi0b0dklAsV/6MY3g=";
     };
   };
 

pkgs/by-name/mo/mozart-binary/package.nix

@@ -0,0 +1,92 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  makeWrapper,
+  boost,
+  gmp,
+  tcl-8_5,
+  tk-8_5,
+  emacs,
+}:
+
+stdenv.mkDerivation (
+  finalAttrs:
+  let
+    binaries = {
+      x86_64-linux = fetchurl {
+        url = "mirror://sourceforge/project/mozart-oz/v${finalAttrs.version}-alpha.0/mozart2-${finalAttrs.version}-alpha.0+build.4105.5c06ced-x86_64-linux.tar.gz";
+        hash = "sha256-v0D/TlNe9tajFAWsicvjUY0/aPOV/n/z5Qt3WaPMTmc=";
+      };
+    };
+  in
+  {
+    pname = "mozart-binary";
+    version = "2.0.0";
+
+    preferLocalBuild = true;
+
+    src =
+      binaries.${stdenv.hostPlatform.system}
+        or (throw "unsupported system: ${stdenv.hostPlatform.system}");
+
+    strictDeps = true;
+    __structuredAttrs = true;
+
+    libPath = lib.makeLibraryPath [
+      stdenv.cc.cc
+      boost
+      gmp
+      tcl-8_5
+      tk-8_5
+    ];
+
+    env.TK_LIBRARY = "${tk-8_5}/lib/tk8.5";
+
+    nativeBuildInputs = [ makeWrapper ];
+
+    buildCommand = ''
+      mkdir $out
+      tar xvf $src -C $out --strip-components=1
+
+      for exe in $out/bin/{ozemulator,ozwish} ; do
+        patchelf --set-interpreter $(< $NIX_CC/nix-support/dynamic-linker) \
+                 --set-rpath $libPath \
+                 $exe
+      done
+
+      wrapProgram $out/bin/ozwish \
+        --set OZHOME $out \
+        --set TK_LIBRARY $TK_LIBRARY
+
+      wrapProgram $out/bin/ozemulator --set OZHOME $out
+
+      ${lib.optionalString (emacs != null) ''
+        wrapProgram $out/bin/oz --suffix PATH ":" ${lib.makeBinPath [ emacs ]}
+      ''}
+
+      sed -i $out/share/applications/oz.desktop \
+          -e "s,Exec=oz %u,Exec=$out/bin/oz %u,"
+
+      gzip -9n $out/share/mozart/elisp"/"*.elc
+
+      patchShebangs $out
+    '';
+
+    meta = {
+      homepage = "https://www.mozart-oz.org/";
+      description = "Multiplatform implementation of the Oz programming language";
+      longDescription = ''
+        The Mozart Programming System combines ongoing research in
+        programming language design and implementation, constraint logic
+        programming, distributed computing, and human-computer
+        interfaces. Mozart implements the Oz language and provides both
+        expressive power and advanced functionality.
+      '';
+      sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+      license = lib.licenses.mit;
+      platforms = lib.attrNames binaries;
+      hydraPlatforms = [ ];
+    };
+  }
+)

pkgs/by-name/mo/mozart2/package.nix

@@ -8,32 +8,35 @@
   boost183,
   llvmPackages,
   gmp,
-  emacs,
-  jre_headless,
+  emacs-nox,
+  jre8_headless,
   tcl,
   tk,
 }:
 
 let
   stdenv = llvmPackages.stdenv;
-  pname = "mozart2";
-  version = "2.0.1";
 
   # This is a workaround to avoid using sbt.
   # I guess it is acceptable to fetch the bootstrapping compiler in binary form.
   bootcompiler = fetchurl {
     url = "https://github.com/layus/mozart2/releases/download/v2.0.0-beta.1/bootcompiler.jar";
-    sha256 = "1hgh1a8hgzgr6781as4c4rc52m2wbazdlw3646s57c719g5xphjz";
+    hash = "sha256-X8Lby0vhsFO0IWZw2r5aXFRRWCaMaBXQMfn9B5EK8ME=";
   };
+  emacs = emacs-nox;
 in
-stdenv.mkDerivation {
-  inherit pname version;
+stdenv.mkDerivation (finalAttrs: {
+  pname = "mozart2";
+  version = "2.0.1";
 
   src = fetchurl {
-    url = "https://github.com/mozart/mozart2/releases/download/v${version}/${pname}-${version}-Source.zip";
-    sha256 = "1mad9z5yzzix87cdb05lmif3960vngh180s2mb66cj5gwh5h9dll";
+    url = "https://github.com/mozart/mozart2/releases/download/v${finalAttrs.version}/mozart2-${finalAttrs.version}-Source.zip";
+    hash = "sha256-lLYEC+SvSGbMqkIDFOCzG5g0XKy0gNXYQT3+78tPTdU=";
   };
 
+  strictDeps = true;
+  __structuredAttrs = true;
+
   patches = [
     ./patch-limits.diff
     (fetchpatch {
@@ -51,6 +54,7 @@ stdenv.mkDerivation {
     cmake
     makeWrapper
     unzip
+    jre8_headless
   ];
 
   cmakeFlags = [
@@ -70,7 +74,6 @@ stdenv.mkDerivation {
     boost183
     gmp
     emacs
-    jre_headless
     tcl
     tk
   ];
@@ -99,4 +102,4 @@ stdenv.mkDerivation {
     broken = stdenv.hostPlatform.isDarwin;
   };
 
-}
+})

pkgs/by-name/mt/mtail/package.nix

@@ -8,18 +8,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "mtail";
-  version = "3.4.6";
+  version = "3.4.7";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "jaqx0r";
     repo = "mtail";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-xjakb+HpctC68FL8ct6aVfwzl0qA2F8sZ3/C1SkFTkY=";
+    hash = "sha256-R7WJsC4KyEyAS5X9ut9LDFQ8feYIq9Sz5TU175yz/QA=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-/11U9jTTiIZ8ixqWWMt9/ieXhPLT00SJIKViO3m9vsk=";
+  vendorHash = "sha256-UGIjGCk7rqjmqqRPMAaLkz7rBIUHFldBWPzrQdKbLWI=";
 
   nativeBuildInputs = [
     gotools # goyacc

pkgs/by-name/ne/nextdns/package.nix

@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "nextdns";
-  version = "1.47.3";
+  version = "1.48.0";
 
   src = fetchFromGitHub {
     owner = "nextdns";
     repo = "nextdns";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-oTxa/iZ13WSrHOxlmKL55veXhGq1m1Md9RZESdwsKJ0=";
+    sha256 = "sha256-iTo96BabjPJLe2E4iThDLJJ4VZ/XjUgKB6vqWA/VyWw=";
   };
 
-  vendorHash = "sha256-Q6gh9E6FzvQn+Lyv3Tr3uLAO/r8zlF8im6xAG2YnuoU=";
+  vendorHash = "sha256-K4KbV4Tg30bCMksVMV3xx2sseAB2ery6u+K1V2c0mxQ=";
 
   ldflags = [
     "-s"

pkgs/by-name/no/noctalia/package.nix

@@ -65,13 +65,13 @@ stdenv.mkDerivation (finalAttrs: {
   __structuredAttrs = true;
 
   pname = "noctalia";
-  version = "5.0.0-beta.7";
+  version = "5.0.0-beta.8";
 
   src = fetchFromGitHub {
     owner = "noctalia-dev";
     repo = "noctalia";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9RlJNIy2DFVm9SB2vwGEBsbHc1r3dIB+K+b+nd6Bdho=";
+    hash = "sha256-qy3Cheg/FQ9ZaBPTIgdq4IkmkNtC6XBpmtC8nT+wU/Y=";
   };
 
   strictDeps = true;
@@ -119,6 +119,10 @@ stdenv.mkDerivation (finalAttrs: {
     wireplumber
   ];
 
+  mesonFlags = [
+    (lib.mesonEnable "tests" false)
+  ];
+
   mesonBuildType = "release";
 
   # plugins are installed by cloning their repos

pkgs/by-name/no/nordic/package.nix

@@ -0,0 +1,163 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  jdupes,
+  kdePackages,
+}:
+
+stdenvNoCC.mkDerivation {
+  pname = "nordic";
+  version = "2.2.0-unstable-2025-05-05";
+
+  srcs = [
+    (fetchFromGitHub {
+      owner = "EliverLara";
+      repo = "nordic";
+      rev = "d9b5c42cebf9a165bcce7b6b8a019f5cfd5b789c";
+      hash = "sha256-OkXjwaoXyWfTgNkeU+ab+uv+U/5OaJ8oTt/G8YLz84o=";
+      name = "Nordic";
+    })
+
+    (fetchFromGitHub {
+      owner = "EliverLara";
+      repo = "nordic";
+      rev = "361f0d1d23177a1154d415f793ce52a2c09629d4";
+      hash = "sha256-0IBuCMbHxTL3YtIK35g9xiBEs1DZgA4MwMAVPIw3Omk=";
+      name = "Nordic-standard-buttons";
+    })
+
+    (fetchFromGitHub {
+      owner = "EliverLara";
+      repo = "nordic";
+      rev = "bf05d41c7c7cd03e391854739bcc843fc6053ced";
+      hash = "sha256-AjVvciUrm/X3U6Pmo52ZrucLRJdsRFPeEMRwSKyjwi4=";
+      name = "Nordic-darker";
+    })
+
+    (fetchFromGitHub {
+      owner = "EliverLara";
+      repo = "nordic";
+      rev = "98cdf88d77fa7f0535ff660148e0ccbabe47a579";
+      hash = "sha256-70l5+renDhniZroPoMrCHsPgT6Pg3cr5w86LjkaWchg=";
+      name = "Nordic-darker-standard-buttons";
+    })
+
+    (fetchFromGitHub {
+      owner = "EliverLara";
+      repo = "nordic";
+      rev = "f1e43cf9ba83602f73f71407a8a4ba768122b7f4";
+      hash = "sha256-yLE/M9PXfQv2JD+HTsBHFiFaKuY8vOkZiOlQLLON+HM=";
+      name = "Nordic-bluish-accent";
+    })
+
+    (fetchFromGitHub {
+      owner = "EliverLara";
+      repo = "nordic";
+      rev = "52a37ebce50f948129507e4804240d9e7788a7a2";
+      hash = "sha256-zwnCaS08vceHjFHn9ET2509Zat7a1gHEG1RDR+xrbhc=";
+      name = "Nordic-bluish-accent-standard-buttons";
+    })
+
+    (fetchFromGitHub {
+      owner = "EliverLara";
+      repo = "nordic-polar";
+      rev = "24dc0325c4a38508039f5fee9a5391c1d9d8d5d5";
+      hash = "sha256-Y3PFuIc7UPbRg9NZie4buKCUiMXzl5idg7LSrj/lsos=";
+      name = "Nordic-Polar";
+    })
+
+    (fetchFromGitHub {
+      owner = "EliverLara";
+      repo = "nordic-polar";
+      rev = "fe0d657613a1e6330fa8c41378c324af93a42c3a";
+      hash = "sha256-fusSDXawWttXWQfGloRkpkHWvfLPuljm1l0BpAKvNSg=";
+      name = "Nordic-Polar-standard-buttons";
+    })
+  ];
+
+  sourceRoot = ".";
+
+  outputs = [
+    "out"
+    "sddm"
+  ];
+
+  nativeBuildInputs = [ jdupes ];
+
+  dontWrapQtApps = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    # install theme files
+    mkdir -p $out/share/themes
+    cp -a Nordic* $out/share/themes
+
+    # remove uneeded files
+    rm -r $out/share/themes/*/.gitignore
+    rm -r $out/share/themes/*/Art
+    rm -r $out/share/themes/*/FUNDING.yml
+    rm -r $out/share/themes/*/LICENSE
+    rm -r $out/share/themes/*/README.md
+    rm -r $out/share/themes/*/{package.json,package-lock.json,Gulpfile.js}
+    rm -r $out/share/themes/*/src
+    rm -r $out/share/themes/*/cinnamon/*.scss
+    rm -r $out/share/themes/*/gnome-shell/{earlier-versions,extensions,*.scss}
+    rm -r $out/share/themes/*/gtk-2.0
+    rm -r $out/share/themes/*/gtk-3.0/{apps,widgets,*.scss}
+    rm -r $out/share/themes/*/gtk-4.0/{apps,widgets,*.scss}
+    rm -r $out/share/themes/*/xfwm4/{assets,render_assets.fish}
+
+    # move wallpapers to appropriate directory
+    mkdir -p $out/share/wallpapers/Nordic
+    mv -v $out/share/themes/Nordic/extras/wallpapers/* $out/share/wallpapers/Nordic/
+    rmdir $out/share/themes/Nordic/extras{/wallpapers,}
+
+    # move kde related contents to appropriate directories
+    mkdir -p $out/share/{aurorae/themes,color-schemes,Kvantum,plasma,icons}
+    mv -v $out/share/themes/Nordic/kde/aurorae/* $out/share/aurorae/themes/
+    mv -v $out/share/themes/Nordic/kde/colorschemes/* $out/share/color-schemes/
+    mv -v $out/share/themes/Nordic/kde/konsole $out/share/
+    mv -v $out/share/themes/Nordic/kde/kvantum/* $out/share/Kvantum/
+    cp -vr $out/share/themes/Nordic/kde/plasma/look-and-feel $out/share/plasma/look-and-feel/
+    mv -v $out/share/themes/Nordic/kde/plasma/look-and-feel $out/share/plasma/desktoptheme/
+    mv -v $out/share/themes/Nordic/kde/folders/* $out/share/icons/
+    mv -v $out/share/themes/Nordic/kde/cursors/*-cursors $out/share/icons/
+
+    rm -rf $out/share/plasma/look-and-feel/*/contents/{logout,osd,components}
+    rm -rf $out/share/plasma/desktoptheme/*/contents/{defaults,splash,previews}
+    rm -rf $out/share/Kvantum/*.tar.xz
+
+    mkdir -p $sddm/share/sddm/themes
+    mv -v $out/share/themes/Nordic/kde/sddm/* $sddm/share/sddm/themes/
+
+    rm -rf $out/share/themes/Nordic/kde
+
+    # Replace duplicate files with symbolic links to the first file in
+    # each set of duplicates, reducing the installed size in about 53%
+    jdupes --quiet --link-soft --recurse $out/share
+
+    # FIXME: https://github.com/EliverLara/Nordic/issues/331
+    echo "Removing broken symlinks ..."
+    find $out -xtype l -print -delete
+
+    runHook postInstall
+  '';
+
+  postFixup = ''
+    mkdir -p $sddm/nix-support
+
+    # avoid .dev outputs propagation
+    printWords ${kdePackages.breeze-icons.out} ${kdePackages.libplasma.out} ${kdePackages.plasma-workspace.out} \
+      >> $sddm/nix-support/propagated-build-inputs
+  '';
+
+  meta = {
+    description = "Gtk and KDE themes using the Nord color pallete";
+    homepage = "https://github.com/EliverLara/Nordic";
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ romildo ];
+  };
+}

pkgs/by-name/op/openfga-cli/package.nix

@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "openfga-cli";
-  version = "0.7.19";
+  version = "0.7.20";
 
   src = fetchFromGitHub {
     owner = "openfga";
     repo = "cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-/DhvUvcvopYGAdLCAqsLxTs09q0sqOd1BglxaM4as/0=";
+    hash = "sha256-9IBq5CThdc1Azmp0Vv+GzpXmIQAASpPay304X08+eG4=";
   };
 
-  vendorHash = "sha256-sIBD7Diqx16X7OHNpVCgD1XVByu8TGwFlIR6FIITTlc=";
+  vendorHash = "sha256-AUvbL/OjUcmRkzkcUuumwDsnpNWxsO6arnvM9M5hvgc=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/by-name/op/openscad/package.nix

@@ -30,9 +30,11 @@
   wayland-protocols,
   wrapGAppsHook3,
   cairo,
+  callPackage,
   openscad,
   runCommand,
   versionCheckHook,
+  openscadPackages,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -203,20 +205,27 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       bjornfor
       raskin
+      xoconoch
     ];
     mainProgram = "openscad";
   };
 
-  passthru.tests = {
-    lib3mf_support =
-      runCommand "${finalAttrs.pname}-lib3mf-support-test"
-        {
-          nativeBuildInputs = [ finalAttrs.finalPackage ];
-        }
-        ''
-          echo "cube([1, 1, 1]);" | openscad -o cube.3mf -
-          echo "import(\"cube.3mf\");" | openscad -o cube-import.3mf -
-          mv cube-import.3mf $out
-        '';
+  passthru = {
+    tests = lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) {
+      lib3mf_support =
+        runCommand "${finalAttrs.pname}-lib3mf-support-test"
+          {
+            nativeBuildInputs = [ finalAttrs.finalPackage ];
+          }
+          ''
+            echo "cube([1, 1, 1]);" | openscad -o cube.3mf -
+            echo "import(\"cube.3mf\");" | openscad -o cube-import.3mf -
+            mv cube-import.3mf $out
+          '';
+    };
+    withPackages = callPackage ./wrapper.nix {
+      openscad = finalAttrs.finalPackage;
+      inherit openscadPackages;
+    };
   };
 })

pkgs/by-name/op/openscad/wrapper.nix

@@ -0,0 +1,37 @@
+{
+  lib,
+  makeWrapper,
+  symlinkJoin,
+  buildEnv,
+  openscad,
+  openscadPackages,
+}:
+
+f:
+
+assert lib.assertMsg (lib.isFunction f)
+  "openscad.withPackages: Expected `f` to be callable (e.g., 'ps: [ ps.bosl2 ]'), but received a ${lib.typeOf f}.";
+
+let
+  selectedPackages = f openscadPackages;
+in
+
+symlinkJoin {
+  name = "${openscad.pname}-with-packages-${openscad.version}";
+  paths = [ openscad ];
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  postBuild = ''
+    rm $out/bin/openscad
+
+    # Add the OPENSCADPATH environment variable
+    makeWrapper ${openscad}/bin/openscad $out/bin/openscad \
+      --set OPENSCADPATH ${lib.makeSearchPath "share/openscad/libraries" selectedPackages}
+  '';
+
+  passthru = {
+    unwrapped = openscad;
+    withPackages = openscad.withPackages;
+  };
+}

pkgs/by-name/pe/perplexity-mcp/package.nix

@@ -7,13 +7,13 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "perplexity-mcp";
-  version = "0-unstable-2026-07-27";
+  version = "0-unstable-2026-07-30";
 
   src = fetchFromGitHub {
     owner = "perplexityai";
     repo = "modelcontextprotocol";
-    rev = "9f7dd0b1951c7421f930d1af8ff10e92473de0f9";
-    hash = "sha256-B3cv427UwR8il/604tW8tnzQ35V1sHF3h/Cn6cWjJY0=";
+    rev = "df5e29a5a17c694b5de144c7a3ac56d3377bc079";
+    hash = "sha256-U+nrAYQdENZ9Aw6H7/rU0cXXUj0+35Srj8wwgM7AcnE=";
   };
 
   npmDepsHash = "sha256-GHdBn7PA7+eV3+3sUX18f2dawK79X/o68IqzBv6SB0I=";