Merge master into staging-next

ci/OWNERS

@@ -258,7 +258,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
 /pkgs/applications/editors/jetbrains @edwtjo @leona-ya @theCapypara
 
 # Licenses
-/lib/licenses.nix @alyssais @emilazy
+/lib/licenses.nix @alyssais @emilazy @jopejoe1
 
 # Qt
 /pkgs/development/libraries/qt-5 @K900 @NickCao @SuperSandro2000 @ttuegel

lib/licenses.nix

@@ -415,9 +415,8 @@ lib.mapAttrs mkLicense (
     };
 
     cc-sa-10 = {
-      shortName = "CC-SA-1.0";
+      spdxId = "CC-SA-1.0";
       fullName = "Creative Commons Share Alike 1.0";
-      url = "https://creativecommons.org/licenses/sa/1.0";
     };
 
     cddl = {
@@ -445,6 +444,11 @@ lib.mapAttrs mkLicense (
       fullName = "CeCILL-C Free Software License Agreement";
     };
 
+    classpathException20 = {
+      spdxId = "Classpath-exception-2.0";
+      fullName = "Classpath exception 2.0";
+    };
+
     cockroachdb-community-license = {
       fullName = "CockroachDB Community License Agreement";
       url = "https://www.cockroachlabs.com/cockroachdb-community-license/";
@@ -593,14 +597,14 @@ lib.mapAttrs mkLicense (
 
     fsl11Mit = {
       fullName = "Functional Source License, Version 1.1, MIT Future License";
-      url = "https://fsl.software/FSL-1.1-MIT.template.md";
+      spdxId = "FSL-1.1-MIT";
       free = false;
       redistributable = true;
     };
 
     fsl11Asl20 = {
       fullName = "Functional Source License, Version 1.1, Apache 2.0 Future License";
-      url = "https://fsl.software/FSL-1.1-Apache-2.0.template.md";
+      spdxId = "FSL-1.1-ALv2";
       free = false;
       redistributable = true;
     };
@@ -651,26 +655,6 @@ lib.mapAttrs mkLicense (
       fullName = "GNU General Public License v2.0 only";
     };
 
-    gpl2Classpath = {
-      spdxId = "GPL-2.0-with-classpath-exception";
-      fullName = "GNU General Public License v2.0 only (with Classpath exception)";
-    };
-
-    gpl2ClasspathPlus = {
-      fullName = "GNU General Public License v2.0 or later (with Classpath exception)";
-      url = "https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception";
-    };
-
-    gpl2UBDLPlus = {
-      fullName = "GNU General Public License v3.0 or later (with UBDL exception)";
-      url = "https://spdx.org/licenses/UBDL-exception.html";
-    };
-
-    gpl2Oss = {
-      fullName = "GNU General Public License version 2 only (with OSI approved licenses linking exception)";
-      url = "https://www.mysql.com/about/legal/licensing/foss-exception";
-    };
-
     gpl2Plus = {
       spdxId = "GPL-2.0-or-later";
       fullName = "GNU General Public License v2.0 or later";
@@ -686,11 +670,6 @@ lib.mapAttrs mkLicense (
       fullName = "GNU General Public License v3.0 or later";
     };
 
-    gpl3ClasspathPlus = {
-      fullName = "GNU General Public License v3.0 or later (with Classpath exception)";
-      url = "https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception";
-    };
-
     giftware = {
       spdxId = "Giftware";
       fullName = "Giftware License";
@@ -1245,9 +1224,8 @@ lib.mapAttrs mkLicense (
     };
 
     smail = {
-      shortName = "smail";
+      spdxId = "SMAIL-GPL";
       fullName = "SMAIL General Public License";
-      url = "https://sources.debian.org/copyright/license/debianutils/4.9.1/";
     };
 
     smlnj = {
@@ -1256,9 +1234,8 @@ lib.mapAttrs mkLicense (
     };
 
     sspl = {
-      shortName = "SSPL";
+      spdxId = "SSPL-1.0";
       fullName = "Server Side Public License";
-      url = "https://www.mongodb.com/licensing/server-side-public-license";
       free = false;
       # NOTE Debatable.
       # The license a slightly modified AGPL but still considered unfree by the
@@ -1279,9 +1256,8 @@ lib.mapAttrs mkLicense (
     };
 
     sustainableUse = {
-      shortName = "sustainable";
+      spdxId = "SUL-1.0";
       fullName = "Sustainable Use License";
-      url = "https://github.com/n8n-io/n8n/blob/master/LICENSE.md";
       free = false;
       redistributable = false; # only free to redistribute "for non-commercial purposes"
     };
@@ -1350,6 +1326,11 @@ lib.mapAttrs mkLicense (
       url = "https://github.com/PixarAnimationStudios/OpenUSD/blob/release/LICENSE.txt";
     };
 
+    ubdlException = {
+      spdxId = "UBDL-exception";
+      fullName = "Unmodified Binary Distribution exception";
+    };
+
     ucd = {
       fullName = "Unicode Character Database License";
       url = "https://fedoraproject.org/wiki/Licensing:UCD";
@@ -1458,8 +1439,8 @@ lib.mapAttrs mkLicense (
       fullName = "Do What The F*ck You Want To Public License";
     };
 
-    wxWindows = {
-      spdxId = "wxWindows";
+    wxWindowsException31 = {
+      spdxId = "WxWindows-exception-3.1";
       fullName = "wxWindows Library Licence, Version 3.1";
     };
 

maintainers/maintainer-list.nix

@@ -6263,6 +6263,12 @@
     githubId = 21953890;
     name = "Tim Digel";
   };
+  despsyched = {
+    email = "priyanshu.tripathi@deshaw.com";
+    github = "despsyched";
+    githubId = 196187334;
+    name = "Priyanshu Tripathi";
+  };
   desttinghim = {
     email = "opensource@louispearson.work";
     matrix = "@desttinghim:matrix.org";
@@ -7300,12 +7306,6 @@
     githubId = 20847625;
     name = "Elizabeth Paź";
   };
-  ehmry = {
-    email = "ehmry@posteo.net";
-    github = "ehmry";
-    githubId = 537775;
-    name = "Emery Hemingway";
-  };
   eigengrau = {
     email = "seb@schattenkopie.de";
     name = "Sebastian Reuße";
@@ -20993,7 +20993,7 @@
     email = "nix@dev.quantenzitrone.eu";
     github = "quantenzitrone";
     githubId = 74491719;
-    matrix = "@quantenzitrone:matrix.org";
+    matrix = "@zitrone:utwente.io";
     name = "quantenzitrone";
   };
   qubasa = {

maintainers/team-list.nix

@@ -326,6 +326,7 @@ with lib.maintainers;
     # Verify additions to this team with at least one already existing member of the team.
     members = [
       de11n
+      despsyched
       invokes-su
     ];
     scope = "Group registration for D. E. Shaw employees who collectively maintain packages.";
@@ -345,7 +346,6 @@ with lib.maintainers;
   dhall = {
     members = [
       Gabriella439
-      ehmry
     ];
     scope = "Maintain Dhall and related packages.";
     shortName = "Dhall";

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

@@ -92,6 +92,9 @@ Alongside many enhancements to NixOS modules and general system improvements, th
 
 - [Traccar](https://www.traccar.org/), a modern GPS Tracking Platform. Available as [services.traccar](#opt-services.traccar.enable).
 
+- [Memos](https://www.usememos.com/), a privacy-first, lightweight note-taking solution that allows you to effortlessly capture and share your ideas.
+  Available as [services.memos](#opt-services.memos.enable).
+
 - [Schroot](https://codeberg.org/shelter/reschroot), a lightweight virtualisation tool. Securely enter a chroot and run a command or login shell. Available as [programs.schroot](#opt-programs.schroot.enable).
 
 - [Firezone](https://firezone.dev), an enterprise-ready zero-trust access platform built on WireGuard. This includes the server stack as [services.firezone.server.enable](#opt-services.firezone.server.enable), a TURN/STUN relay service as [services.firezone.relay.enable](#opt-services.firezone.relay.enable), a gateway service as [services.firezone.gateway.enable](#opt-services.firezone.gateway.enable), a headless client as [services.firezone.headless-client.enable](#opt-services.firezone.headless-client.enable) and a GUI client as [services.firezone.gui-client.enable](#opt-services.firezone.gui-client.enable).

nixos/modules/module-list.nix

@@ -865,6 +865,7 @@
   ./services/misc/mame.nix
   ./services/misc/mbpfan.nix
   ./services/misc/mediatomb.nix
+  ./services/misc/memos.nix
   ./services/misc/metabase.nix
   ./services/misc/mollysocket.nix
   ./services/misc/moonraker.nix

nixos/modules/programs/nncp.nix

@@ -89,6 +89,4 @@ in
       '';
     };
   };
-
-  meta.maintainers = with lib.maintainers; [ ehmry ];
 }

nixos/modules/services/mail/postfix-tlspol.nix

@@ -94,16 +94,13 @@ in
 
           dns = {
             address = mkOption {
-              type = types.str;
-              default = if config.networking.resolvconf.useLocalResolver then "127.0.0.1:53" else null;
-              defaultText = literalExpression ''
-                if config.networking.resolvconf.useLocalResolver then
-                  "127.0.0.1:53"
-                else
-                  null
-              '';
+              type = with types; nullOr str;
+              default = null;
+              example = "127.0.0.1:53";
               description = ''
-                IP and port to your DNS resolver
+                IP and port to your DNS resolver.
+
+                Uses resolvers from /etc/resolv.conf if unset.
 
                 ::: {.note}
                 The configured DNS resolver must validate DNSSEC signatures.

nixos/modules/services/mail/public-inbox.nix

@@ -630,7 +630,7 @@ in
               ''
               + concatStrings (
                 mapAttrsToList (name: inbox: ''
-                  if [ ! -e ${stateDir}/inboxes/${escapeShellArg name} ]; then
+                  if [ ! -e ${escapeShellArg inbox.inboxdir} ]; then
                     # public-inbox-init creates an inbox and adds it to a config file.
                     # It tries to atomically write the config file by creating
                     # another file in the same directory, and renaming it.
@@ -643,7 +643,7 @@ in
                       ${escapeShellArgs (
                         [
                           name
-                          "${stateDir}/inboxes/${name}"
+                          inbox.inboxdir
                           inbox.url
                         ]
                         ++ inbox.address
@@ -653,9 +653,9 @@ in
                   fi
 
                   ln -sf ${inbox.description} \
-                    ${stateDir}/inboxes/${escapeShellArg name}/description
+                    ${escapeShellArg inbox.inboxdir}/description
 
-                  export GIT_DIR=${stateDir}/inboxes/${escapeShellArg name}/all.git
+                  export GIT_DIR=${escapeShellArg inbox.inboxdir}/all.git
                   if test -d "$GIT_DIR"; then
                     # Config is inherited by each epoch repository,
                     # so just needs to be set for all.git.

nixos/modules/services/misc/memos.nix

@@ -0,0 +1,199 @@
+{
+  config,
+  options,
+  pkgs,
+  lib,
+  ...
+}:
+let
+  cfg = config.services.memos;
+  opt = options.services.memos;
+  envFileFormat = pkgs.formats.keyValue { };
+in
+{
+  options.services.memos = {
+    enable = lib.mkEnableOption "Memos note-taking";
+    package = lib.mkPackageOption pkgs "Memos" {
+      default = "memos";
+    };
+
+    openFirewall = lib.mkEnableOption "opening the ports in the firewall";
+
+    user = lib.mkOption {
+      type = lib.types.str;
+      description = ''
+        The user to run Memos as.
+
+        ::: {.note}
+        If changing the default value, **you** are responsible of creating the corresponding user with [{option}`users.users`](#opt-users.users).
+        :::
+      '';
+      default = "memos";
+    };
+
+    group = lib.mkOption {
+      type = lib.types.str;
+      description = ''
+        The group to run Memos as.
+
+        ::: {.note}
+        If changing the default value, **you** are responsible of creating the corresponding group with [{option}`users.groups`](#opt-users.groups).
+        :::
+      '';
+      default = "memos";
+    };
+
+    dataDir = lib.mkOption {
+      default = "/var/lib/memos/";
+      type = lib.types.path;
+      description = ''
+        Specifies the directory where Memos will store its data.
+
+        ::: {.note}
+        It will be automatically created with the permissions of [{option}`services.memos.user`](#opt-services.memos.user) and [{option}`services.memos.group`](#opt-services.memos.group).
+        :::
+      '';
+    };
+
+    settings = lib.mkOption {
+      type = envFileFormat.type;
+      description = ''
+        The environment variables to configure Memos.
+
+        ::: {.note}
+        At time of writing, there is no clear documentation about possible values.
+        It's possible to convert CLI flags into these variables.
+        Example : CLI flag "--unix-sock" converts to {env}`MEMOS_UNIX_SOCK`.
+        :::
+      '';
+      default = {
+        MEMOS_MODE = "prod";
+        MEMOS_ADDR = "127.0.0.1";
+        MEMOS_PORT = "5230";
+        MEMOS_DATA = cfg.dataDir;
+        MEMOS_DRIVER = "sqlite";
+        MEMOS_INSTANCE_URL = "http://localhost:5230";
+      };
+      defaultText = lib.literalExpression ''
+        {
+          MEMOS_MODE = "prod";
+          MEMOS_ADDR = "127.0.0.1";
+          MEMOS_PORT = "5230";
+          MEMOS_DATA = config.${opt.dataDir};
+          MEMOS_DRIVER = "sqlite";
+          MEMOS_INSTANCE_URL = "http://localhost:5230";
+        }
+      '';
+    };
+
+    environmentFile = lib.mkOption {
+      type = lib.types.path;
+      description = ''
+        The environment file to use when starting Memos.
+
+        ::: {.note}
+        By default, generated from [](opt-${opt.settings}).
+        :::
+      '';
+      example = "/var/lib/memos/memos.env";
+      default = envFileFormat.generate "memos.env" cfg.settings;
+      defaultText = lib.literalMD ''
+        generated from {option}`${opt.settings}`
+      '';
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    users.users = lib.mkIf (cfg.user == "memos") {
+      ${cfg.user} = {
+        description = lib.mkDefault "Memos service user";
+        isSystemUser = true;
+        group = cfg.group;
+      };
+    };
+
+    users.groups = lib.mkIf (cfg.group == "memos") {
+      ${cfg.group} = { };
+    };
+
+    networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [
+      cfg.port
+    ];
+
+    systemd.tmpfiles.settings."10-memos" = {
+      "${cfg.dataDir}" = {
+        d = {
+          mode = "0750";
+          user = cfg.user;
+          group = cfg.group;
+        };
+      };
+    };
+
+    systemd.services.memos = {
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+      wants = [ "network.target" ];
+      description = "Memos, a privacy-first, lightweight note-taking solution";
+      serviceConfig = {
+        User = cfg.user;
+        Group = cfg.group;
+        Type = "simple";
+        RestartSec = 60;
+        LimitNOFILE = 65536;
+        NoNewPrivileges = true;
+        LockPersonality = true;
+        RemoveIPC = true;
+        ReadWritePaths = [
+          cfg.dataDir
+        ];
+        ProtectSystem = "strict";
+        PrivateUsers = true;
+        ProtectHome = true;
+        PrivateTmp = true;
+        PrivateDevices = true;
+        ProtectHostname = true;
+        ProtectClock = true;
+        UMask = "0077";
+        ProtectKernelTunables = true;
+        ProtectKernelModules = true;
+        ProtectControlGroups = true;
+        ProtectProc = "invisible";
+        SystemCallFilter = [
+          " " # This is needed to clear the SystemCallFilter existing definitions
+          "~@reboot"
+          "~@swap"
+          "~@obsolete"
+          "~@mount"
+          "~@module"
+          "~@debug"
+          "~@cpu-emulation"
+          "~@clock"
+          "~@raw-io"
+          "~@privileged"
+          "~@resources"
+        ];
+        CapabilityBoundingSet = [
+          " " # Reset all capabilities to an empty set
+        ];
+        RestrictAddressFamilies = [
+          " " # This is needed to clear the RestrictAddressFamilies existing definitions
+          "none" # Remove all addresses families
+          "AF_UNIX"
+          "AF_INET"
+          "AF_INET6"
+        ];
+        DevicePolicy = "closed";
+        ProtectKernelLogs = true;
+        SystemCallArchitectures = "native";
+        RestrictNamespaces = true;
+        RestrictRealtime = true;
+        RestrictSUIDSGID = true;
+        EnvironmentFile = cfg.environmentFile;
+        ExecStart = lib.getExe cfg.package;
+      };
+    };
+  };
+
+  meta.maintainers = [ lib.maintainers.m0ustach3 ];
+}

nixos/modules/services/network-filesystems/eris-server.nix

@@ -123,6 +123,4 @@ in
             };
       };
   };
-
-  meta.maintainers = with lib.maintainers; [ ehmry ];
 }

nixos/modules/services/network-filesystems/rsyncd.nix

@@ -141,8 +141,6 @@ in
 
   };
 
-  meta.maintainers = with lib.maintainers; [ ehmry ];
-
   # TODO: socket activated rsyncd
 
 }

nixos/modules/services/networking/yggdrasil.nix

@@ -264,7 +264,6 @@ in
     doc = ./yggdrasil.md;
     maintainers = with lib.maintainers; [
       gazally
-      ehmry
       nagy
     ];
   };

nixos/modules/virtualisation/parallels-guest.nix

@@ -81,44 +81,16 @@ in
       };
     };
 
-    systemd.user.services = {
-      prlcc = {
-        description = "Parallels Control Center";
-        wantedBy = [ "graphical-session.target" ];
-        path = [ prl-tools ];
-        serviceConfig = {
-          ExecStart = "${prl-tools}/bin/prlcc";
-          WorkingDirectory = "${prl-tools}/bin";
-        };
-      };
-      prldnd = {
-        description = "Parallels Drag And Drop Tool";
-        wantedBy = [ "graphical-session.target" ];
-        path = [ prl-tools ];
-        serviceConfig = {
-          ExecStart = "${prl-tools}/bin/prldnd";
-          WorkingDirectory = "${prl-tools}/bin";
-        };
-      };
-      prlcp = {
-        description = "Parallels Copy Paste Tool";
-        wantedBy = [ "graphical-session.target" ];
-        path = [ prl-tools ];
-        serviceConfig = {
-          ExecStart = "${prl-tools}/bin/prlcp";
-          Restart = "always";
-          WorkingDirectory = "${prl-tools}/bin";
-        };
-      };
-      prlshprof = {
-        description = "Parallels Shared Profile Tool";
-        wantedBy = [ "graphical-session.target" ];
-        path = [ prl-tools ];
-        serviceConfig = {
-          ExecStart = "${prl-tools}/bin/prlshprof";
-          WorkingDirectory = "${prl-tools}/bin";
-        };
+    systemd.user.services.prlcc = {
+      description = "Parallels Control Center";
+      wantedBy = [ "graphical-session.target" ];
+      path = [ prl-tools ];
+      serviceConfig = {
+        ExecStart = "${prl-tools}/bin/prlcc";
+        WorkingDirectory = "${prl-tools}/bin";
       };
     };
   };
+
+  meta.maintainers = with maintainers; [ codgician ];
 }

nixos/tests/ccache.nix

@@ -2,9 +2,6 @@ import ./make-test-python.nix (
   { pkgs, ... }:
   {
     name = "ccache";
-    meta = with pkgs.lib.maintainers; {
-      maintainers = [ ehmry ];
-    };
 
     nodes.machine =
       { ... }:

nixos/tests/cjdns.nix

@@ -21,9 +21,6 @@ in
 { pkgs, ... }:
 {
   name = "cjdns";
-  meta = with pkgs.lib.maintainers; {
-    maintainers = [ ehmry ];
-  };
 
   nodes = {
     # Alice finds peers over over ETHInterface.

nixos/tests/eris-server.nix

@@ -1,7 +1,6 @@
 { pkgs, lib, ... }:
 {
   name = "eris-server";
-  meta.maintainers = with lib.maintainers; [ ehmry ];
 
   nodes.server = {
     environment.systemPackages = [

nixos/tests/molly-brown.nix

@@ -6,9 +6,6 @@ in
 {
 
   name = "molly-brown";
-  meta = with pkgs.lib.maintainers; {
-    maintainers = [ ehmry ];
-  };
 
   nodes = {
 

nixos/tests/rsyncd.nix

@@ -1,7 +1,6 @@
 { pkgs, ... }:
 {
   name = "rsyncd";
-  meta.maintainers = with pkgs.lib.maintainers; [ ehmry ];
 
   nodes =
     let

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

@@ -20,8 +20,8 @@ let
     sha256Hash = "sha256-fLjCbB9Wwrx7siYQTmtWvce+8TdYTea+y6HTtSTYWAY=";
   };
   betaVersion = {
-    version = "2025.1.3.5"; # "Android Studio Narwhal 3 Feature Drop | 2025.1.3 RC 1"
-    sha256Hash = "sha256-3LkcpvuoUhY/kRpoqYnwfx1cdPvvdBMEFXtRLYmqTk4=";
+    version = "2025.1.3.6"; # "Android Studio Narwhal 3 Feature Drop | 2025.1.3 RC 2"
+    sha256Hash = "sha256-S8KK/EGev0v03fVywIkD6Ym3LrciGKXJVorzyZ1ljdQ=";
   };
   latestVersion = {
     version = "2025.1.4.3"; # "Android Studio Narwhal 4 Feature Drop | 2025.1.4 Canary 3"

pkgs/applications/editors/greenfoot/default.nix

@@ -55,7 +55,10 @@ stdenv.mkDerivation rec {
     description = "Simple integrated development environment for Java";
     homepage = "https://www.greenfoot.org/";
     sourceProvenance = with sourceTypes; [ binaryBytecode ];
-    license = licenses.gpl2ClasspathPlus;
+    license = with licenses; [
+      gpl2Plus
+      classpathException20
+    ];
     mainProgram = "greenfoot";
     maintainers = [ maintainers.chvp ];
     platforms = platforms.linux;

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

@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mame2003";
-  version = "0-unstable-2025-05-16";
+  version = "0-unstable-2025-08-26";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "mame2003-libretro";
-    rev = "c24237583afcadb1c3c1727532bd4a49ebc5eff1";
-    hash = "sha256-zj1mNpfwYCUQAHAeg8+hVUOZ/xvIFhn65AeljjqI1Ss=";
+    rev = "dfddf4db86a3acd5997ce9419c7afd00ff6587a0";
+    hash = "sha256-GJRawFdlHCfBRiErJJ3ZvZDF1gvYVkuQvKXV1qUCCRQ=";
   };
 
   # Fix build with GCC 14

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

@@ -6,13 +6,13 @@
 }:
 mkLibretroCore {
   core = "swanstation";
-  version = "0-unstable-2025-05-26";
+  version = "0-unstable-2025-08-02";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "swanstation";
-    rev = "05cee5f56c37eaa3a243e0906d2082b025598056";
-    hash = "sha256-Cwf6hZKl+rE00C0rFq7VhTj3qG4rszQ+8qZQMZ+H7e8=";
+    rev = "4d309c05fd7bdc503d91d267bd542edb8d192b09";
+    hash = "sha256-v51xgsyVtyipss0VWqMTI69MLTJ4Eb37hJfbQfid/0Q=";
   };
 
   extraNativeBuildInputs = [ cmake ];

pkgs/applications/misc/confclerk/default.nix

@@ -28,7 +28,6 @@ mkDerivation rec {
     mainProgram = "confclerk";
     homepage = "http://www.toastfreeware.priv.at/confclerk";
     license = lib.licenses.gpl2;
-    maintainers = with lib.maintainers; [ ehmry ];
     platforms = lib.platforms.linux;
   };
 }

pkgs/applications/misc/elf-dissector/default.nix

@@ -47,7 +47,6 @@ stdenv.mkDerivation {
     description = "Tools for inspecting, analyzing and optimizing ELF files";
     license = licenses.gpl2;
     maintainers = with maintainers; [
-      ehmry
       philiptaron
     ];
   };

pkgs/applications/networking/browsers/av-98/default.nix

@@ -28,7 +28,6 @@ python3Packages.buildPythonApplication {
     description = "Experimental console client for the Gemini protocol";
     mainProgram = "av98";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ehmry ];
 
     broken = true;
   };

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

@@ -9,10 +9,10 @@
 
 buildMozillaMach rec {
   pname = "firefox";
-  version = "142.0";
+  version = "142.0.1";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "b0c1c766083a30a92b77dcf16a584d9fb341cd811d21c3a34da4cd0d714fd6adc73b608092d66058697bc4562faacc44859153e49ffdeb6e14e059e59f2ea246";
+    sha512 = "fca1b9c67a0b2f216f1f11fd5e3a08920998921e3d61eb633f1dde7fe69cb40cdbb63a41a1dfc4f1022509da643e3791467d88e62e7ea30b293ebf69d87bb585";
   };
 
   meta = {

pkgs/applications/networking/browsers/kristall/default.nix

@@ -51,7 +51,6 @@ stdenv.mkDerivation rec {
     description = "Graphical small-internet client, supports gemini, http, https, gopher, finger";
     mainProgram = "kristall";
     homepage = "https://random-projects.net/projects/kristall.gemini";
-    maintainers = with maintainers; [ ehmry ];
     license = licenses.gpl3Only;
     inherit (qtmultimedia.meta) platforms;
   };

pkgs/applications/search/recoll/default.nix

@@ -209,7 +209,6 @@ mkDerivation rec {
     platforms = platforms.unix;
     maintainers = with maintainers; [
       jcumming
-      ehmry
     ];
 
     # `Makefile.am` assumes the ability to run the hostPlatform's python binary at build time

pkgs/build-support/rust/rustc-wrapper/default.nix

@@ -42,8 +42,8 @@ runCommand "${rustc-unwrapped.pname}-wrapper-${rustc-unwrapped.version}"
         src
         llvm
         llvmPackages
-        tier1TargetPlatforms
         targetPlatforms
+        targetPlatformsWithHostTools
         badTargetPlatforms
         ;
       unwrapped = rustc-unwrapped;

pkgs/by-name/_0/_010editor/package.nix

@@ -7,13 +7,14 @@
   makeWrapper,
   makeDesktopItem,
   cups,
-  qt5,
+  qt6,
   undmg,
+  xorg,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "010editor";
-  version = "16.0";
+  version = "16.0.1";
 
   src = finalAttrs.passthru.srcs.${stdenv.hostPlatform.system};
 
@@ -27,14 +28,15 @@ stdenv.mkDerivation (finalAttrs: {
     lib.optionals stdenv.hostPlatform.isLinux [
       autoPatchelfHook
       makeWrapper
-      qt5.wrapQtAppsHook
+      qt6.wrapQtAppsHook
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [ undmg ];
 
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     cups
-    qt5.qtbase
-    qt5.qtwayland
+    qt6.qtbase
+    qt6.qtwayland
+    xorg.xkeyboardconfig
   ];
 
   installPhase =
@@ -47,12 +49,12 @@ stdenv.mkDerivation (finalAttrs: {
       linuxInstall = ''
         mkdir -p $out/opt && cp -ar source/* $out/opt
 
-        # Use makeWrapper to clean environment and force xcb
+        # Wrap binary: clean env, fix XKB lookup
         makeWrapper $out/opt/010editor $out/bin/010editor \
           --unset QT_PLUGIN_PATH \
-          --set QT_QPA_PLATFORM xcb
+          --set XKB_CONFIG_ROOT ${xorg.xkeyboardconfig}/share/X11/xkb
 
-        # Copy the icon and generated desktop file
+        # Install icon + desktop entry
         install -D $out/opt/010_icon_128x128.png $out/share/icons/hicolor/128x128/apps/010.png
         install -D $desktopItem/share/applications/* -t $out/share/applications/
       '';
@@ -89,17 +91,17 @@ stdenv.mkDerivation (finalAttrs: {
   passthru.srcs = {
     x86_64-linux = fetchzip {
       url = "https://download.sweetscape.com/010EditorLinux64Installer${finalAttrs.version}.tar.gz";
-      hash = "sha256-DK+AIk90AC/KjZR0yBMHaRF7ajuX+UvT8rqDVdL678M=";
+      hash = "sha256-fPQCVA9VrpNBTA7PiOsHwIiaZLKKoK817PtWNX8uHBQ=";
     };
 
     x86_64-darwin = fetchurl {
       url = "https://download.sweetscape.com/010EditorMac64Installer${finalAttrs.version}.dmg";
-      hash = "sha256-TWatSVqm9a+bVLXtJjiWAtkcB7qZqoeJ7Gmr62XUVz4=";
+      hash = "sha256-q/lfe4IWYJbxoGVBQju+t/w13UI3XHaVNPdTjnIQFw8=";
     };
 
     aarch64-darwin = fetchurl {
       url = "https://download.sweetscape.com/010EditorMacARM64Installer${finalAttrs.version}.dmg";
-      hash = "sha256-CtExBuu6EL8ilq3+gtwjNwnMxXkKgPdrk34tYvjN2ps=";
+      hash = "sha256-kBrYSxTNz01pPaRfKZWE6dDoACgs5tlfb+M6A7R0Vo4=";
     };
   };
 

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

@@ -99,7 +99,6 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "alephone";
     homepage = "https://alephone.lhowon.org/";
     license = [ lib.licenses.gpl3 ];
-    maintainers = with lib.maintainers; [ ehmry ];
     platforms = lib.platforms.linux;
   };
 

pkgs/by-name/ar/argyllcms/package.nix

@@ -26,13 +26,13 @@
 
 stdenv.mkDerivation rec {
   pname = "argyllcms";
-  version = "3.4.0";
+  version = "3.4.1";
 
   src = fetchzip {
     # Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a
     # while on me. It might be good to find a mirror
     url = "https://www.argyllcms.com/Argyll_V${version}_src.zip";
-    hash = "sha256-jY6X9mQaP9NTIkbpW5QO31s+5Iv/mFEDgtwDgYXzIU4=";
+    hash = "sha256-QVugWtAk8xBn+/fRFqCoi072Q2q8OlB0LRhavrHC5MI=";
   };
 
   nativeBuildInputs = [

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

@@ -27,7 +27,6 @@
   python3,
   robin-map,
   SDL2,
-  spirv-headers,
   soundtouch,
   stdenv,
   vulkan-headers,
@@ -102,7 +101,6 @@ stdenv.mkDerivation (finalAttrs: {
     qt6.qttools
     soundtouch
     SDL2
-    spirv-headers
     vulkan-headers
     xbyak
 
@@ -146,6 +144,7 @@ stdenv.mkDerivation (finalAttrs: {
     (cmakeBool "DISABLE_SYSTEM_LODEPNG" true)
     (cmakeBool "DISABLE_SYSTEM_VMA" true)
     (cmakeBool "DISABLE_SYSTEM_ZSTD" true)
+    (cmakeBool "DISABLE_SYSTEM_SPIRV_HEADERS" true)
     (cmakeBool "ENABLE_QT_TRANSLATION" enableQtTranslations)
     (cmakeBool "ENABLE_CUBEB" enableCubeb)
     (cmakeBool "USE_DISCORD_PRESENCE" useDiscordRichPresence)

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

@@ -51,6 +51,5 @@ buildNimPackage (finalAttrs: {
     mainProgram = "balls";
     license = lib.licenses.mit;
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ ehmry ];
   };
 })

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

@@ -185,7 +185,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/baresip/baresip";
     maintainers = with lib.maintainers; [
       raskin
-      ehmry
       rnhmjoj
     ];
     mainProgram = "baresip";

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

@@ -17,6 +17,5 @@ buildNimPackage (finalAttrs: {
     description = "Base45 library for Nim";
     license = lib.licenses.unlicense;
     mainProgram = "base45";
-    maintainers = with lib.maintainers; [ ehmry ];
   };
 })

pkgs/by-name/bl/blackmagic-desktop-video/package.nix

@@ -1,17 +1,20 @@
 {
-  stdenv,
-  cacert,
-  curl,
-  runCommandLocal,
-  lib,
   autoPatchelfHook,
-  libcxx,
-  libGL,
+  cacert,
+  common-updater-scripts,
+  curl,
   gcc,
+  jq,
+  lib,
+  libGL,
+  libcxx,
+  runCommandLocal,
+  stdenv,
+  writeShellApplication,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "blackmagic-desktop-video";
-  version = "14.4.1a4";
+  version = "15.0";
 
   buildInputs = [
     autoPatchelfHook
@@ -23,27 +26,23 @@ stdenv.mkDerivation (finalAttrs: {
   # yes, the below download function is an absolute mess.
   # blame blackmagicdesign.
   src =
-    let
-      # from the URL the download page where you click the "only download" button is at
-      REFERID = "5baba0af3eda41ee9cd0ec7349660d74";
-      # from the URL that the POST happens to, see browser console
-      DOWNLOADID = "bc31044728f146859c6d9e0ccef868d8";
-    in
     runCommandLocal "${finalAttrs.pname}-${lib.versions.majorMinor finalAttrs.version}-src.tar.gz"
       {
         outputHashMode = "recursive";
         outputHashAlgo = "sha256";
-        outputHash = "sha256-qh305s7u1yurv58TZnlONgDmWT4RXG3fXTfun382HAs=";
+        outputHash = "sha256-+89enkB+Lxuzpkwwfy0y1NajNqx6QQfeVVrak4LgawQ=";
 
         impureEnvVars = lib.fetchers.proxyImpureEnvVars;
 
-        nativeBuildInputs = [ curl ];
+        nativeBuildInputs = [
+          curl
+          jq
+        ];
 
         # ENV VARS
         SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
 
-        inherit REFERID;
-        SITEURL = "https://www.blackmagicdesign.com/api/register/us/download/${DOWNLOADID}";
+        DOWNLOADSURL = "https://www.blackmagicdesign.com/api/support/us/downloads.json";
 
         USERAGENT = builtins.concatStringsSep " " [
           "User-Agent: Mozilla/5.0 (X11; Linux ${stdenv.hostPlatform.linuxArch})"
@@ -58,8 +57,24 @@ stdenv.mkDerivation (finalAttrs: {
           "platform" = "Linux";
           "policy" = true;
         };
+
+        PRODUCT = "Desktop Video";
+        VERSION = finalAttrs.version;
       }
       ''
+        DOWNLOADID=$(
+          curl --silent --compressed "$DOWNLOADSURL" \
+            | jq --raw-output '.downloads[] | .urls.Linux?[]? | select(.downloadTitle | test("^'"$PRODUCT $VERSION"'( Update)?$")) | .downloadId'
+        )
+        REFERID=$(
+          curl --silent --compressed "$DOWNLOADSURL" \
+            | jq --raw-output '.downloads[] | .urls.Linux?[]? | select(.downloadTitle | test("^'"$PRODUCT $VERSION"'( Update)?$")) | .releaseId'
+        )
+        echo "Download ID is $DOWNLOADID"
+        echo "Refer ID is $REFERID"
+        test -n "$REFERID"
+        test -n "$DOWNLOADID"
+        SITEURL="https://www.blackmagicdesign.com/api/register/us/download/$DOWNLOADID";
         RESOLVEURL=$(curl \
           -s \
           -H "$USERAGENT" \
@@ -75,13 +90,30 @@ stdenv.mkDerivation (finalAttrs: {
           > $out
       '';
 
+  passthru.updateScript = lib.getExe (writeShellApplication {
+    # mostly stolen from pkgs/by-name/da/davinci-resolve/package.nix :)
+    name = "update-blackmagic-desktop-video";
+    runtimeInputs = [
+      common-updater-scripts
+      curl
+      jq
+    ];
+    text = ''
+      set -o errexit
+      downloadsJSON="$(curl --fail --silent https://www.blackmagicdesign.com/api/support/us/downloads.json)"
+      latestLinuxVersion="$(echo "$downloadsJSON" | jq '[.downloads[] | select(.urls.Linux) | .urls.Linux[] | select(.downloadTitle | test("Desktop Video")) | .downloadTitle]' | grep -oP 'Desktop Video \K\d\d\.\d+(\.\d+)?' | sort | tail -n 1)"
+
+      update-source-version blackmagic-desktop-video "$latestLinuxVersion"
+    '';
+  });
+
   postUnpack =
     let
       arch = stdenv.hostPlatform.uname.processor;
     in
     ''
-      tar xf Blackmagic_Desktop_Video_Linux_${lib.head (lib.splitString "a" finalAttrs.version)}/other/${arch}/desktopvideo-${finalAttrs.version}-${arch}.tar.gz
-      unpacked=$NIX_BUILD_TOP/desktopvideo-${finalAttrs.version}-${stdenv.hostPlatform.uname.processor}
+      tar xf Blackmagic_Desktop_Video_Linux_${finalAttrs.version}/other/${arch}/desktopvideo-${finalAttrs.version}*-${arch}.tar.gz
+      unpacked=$NIX_BUILD_TOP/desktopvideo-${finalAttrs.version}*-${stdenv.hostPlatform.uname.processor}
     '';
 
   installPhase = ''

pkgs/by-name/bl/bluej/package.nix

@@ -59,7 +59,10 @@ stdenv.mkDerivation rec {
     description = "Simple integrated development environment for Java";
     homepage = "https://www.bluej.org/";
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
-    license = lib.licenses.gpl2ClasspathPlus;
+    license = with lib.licenses; [
+      gpl2Plus
+      classpathException20
+    ];
     mainProgram = "bluej";
     maintainers = with lib.maintainers; [ chvp ];
     platforms = lib.platforms.linux;

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

@@ -33,6 +33,5 @@ buildGoModule rec {
     mainProgram = "bombadillo";
     homepage = "https://bombadillo.colorfield.space/";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ ehmry ];
   };
 }

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

@@ -71,7 +71,6 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Easy to use, multi OS streaming tool";
     homepage = "https://danielnoethen.de/butt/";
     license = lib.licenses.gpl2;
-    maintainers = with lib.maintainers; [ ehmry ];
     mainProgram = "butt";
     platforms = lib.platforms.linux;
   };

pkgs/by-name/c2/c2nim/package.nix

@@ -17,6 +17,5 @@ buildNimPackage (finalAttrs: {
     description = "Tool to translate Ansi C code to Nim";
     mainProgram = "c2nim";
     license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.ehmry ];
   };
 })

pkgs/by-name/ca/caido/package.nix

@@ -15,14 +15,14 @@ let
     "cli"
     "desktop"
   ];
-  version = "0.50.1";
+  version = "0.51.0";
   cli = fetchurl {
     url = "https://caido.download/releases/v${version}/caido-cli-v${version}-linux-x86_64.tar.gz";
-    hash = "sha256-mHB0nyU0nQg7duPcQf3NNz5vcnIfZcPLkAc+LoWdH58=";
+    hash = "sha256-xMA7Q2VS73xG8/b3jAVz/HMmh8024nOxjcoh6bo/Cws=";
   };
   desktop = fetchurl {
     url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-linux-x86_64.AppImage";
-    hash = "sha256-mVK/valleYH3qZdxRBCbmC7MTEE/Cn6MJwZviMgHL08=";
+    hash = "sha256-kkwwaVqk2DGmnEM8ZQrCvhTSreT4HoiZ1rhheyqZfec=";
   };
   appimageContents = appimageTools.extractType2 {
     inherit pname version;
@@ -42,7 +42,8 @@ let
       install -m 444 -D ${appimageContents}/caido.png \
         $out/share/icons/hicolor/512x512/apps/caido.png
       wrapProgram $out/bin/caido \
-        --set WEBKIT_DISABLE_COMPOSITING_MODE 1
+        --set WEBKIT_DISABLE_COMPOSITING_MODE 1 \
+        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
     '';
   };
 

pkgs/by-name/cj/cjdns/package.nix

@@ -84,7 +84,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/cjdelisle/cjdns";
     description = "Encrypted networking for regular people";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ ehmry ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }

pkgs/by-name/co/collapseos-cvm/package.nix

@@ -29,7 +29,6 @@ stdenv.mkDerivation rec {
     downloadPage = "http://collapseos.org/files/";
     homepage = "http://collapseos.org/";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ ehmry ];
     mainProgram = "cos-serial";
   };
 }

pkgs/by-name/cu/curie/package.nix

@@ -9,7 +9,7 @@ stdenvNoCC.mkDerivation rec {
   version = "1.0";
 
   src = fetchurl {
-    url = "https://github.com/NerdyPepper/curie/releases/download/v${version}/curie-v${version}.tar.gz";
+    url = "https://github.com/oppiliappan/curie/releases/download/v${version}/curie-v${version}.tar.gz";
     hash = "sha256-B89GNbOmm3lY/cRWQJEFu/5morCM/WrRQb/m6covbt8=";
   };
 
@@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     description = "Upscaled version of scientifica";
-    homepage = "https://github.com/NerdyPepper/curie";
+    homepage = "https://github.com/oppiliappan/curie";
     license = licenses.ofl;
     platforms = platforms.all;
     maintainers = with maintainers; [ moni ];

pkgs/by-name/de/decent-sampler/package.nix

@@ -15,7 +15,7 @@
 
 let
   pname = "decent-sampler";
-  version = "1.13.5";
+  version = "1.13.10";
   rlkey = "orvjprslmwn0dkfs0ncx6nxnm";
 
   icon = fetchurl {
@@ -28,8 +28,8 @@ let
 
     src = fetchzip {
       # dropbox links: https://www.dropbox.com/sh/dwyry6xpy5uut07/AABBJ84bjTTSQWzXGG5TOQpfa\
-      url = "https://www.dropbox.com/scl/fo/a0i0udw7ggfwnjoi05hh3/AHWDqpqSKIsmfX6wyJdBhlU/Decent_Sampler-${version}-Linux-Static-x86_64.tar.gz?rlkey=${rlkey}&dl=0";
-      hash = "sha256-B7iw0NK74p1GXPS0wh+m3HyFsnqgODbt41rXZPo3/rE=";
+      url = "https://www.dropbox.com/scl/fo/a0i0udw7ggfwnjoi05hh3/ACdV5vrbMrsBIUbidqizaIk/Decent_Sampler-${version}-Linux-Static-x86_64.tar.gz?rlkey=${rlkey}&dl=0";
+      hash = "sha256-2LyBldjsD05bMyK/aI+Ivk3f3cErRiM7GJlwOGqT9VQ=";
     };
 
     nativeBuildInputs = [ copyDesktopItems ];

pkgs/by-name/de/deno/package.nix

@@ -29,17 +29,17 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "deno";
-  version = "2.4.4";
+  version = "2.4.5";
 
   src = fetchFromGitHub {
     owner = "denoland";
     repo = "deno";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true; # required for tests
-    hash = "sha256-Zeml0hubyNK3wU29xNKwiOPHjLzbGryNhZ2/geoCpXs=";
+    hash = "sha256-kzY/ZT5Ld6oQnl8vHBaMfdAgZljTcWCFafIbuRS21ro=";
   };
 
-  cargoHash = "sha256-oWbCv7uwqAeiDzCQ4fc3Yh+FxUJH/ar9A2y9qx95XjE=";
+  cargoHash = "sha256-A1LABL99mXson3gw8CaDbMH4afzyGMcaK0A8+aeK7T0=";
 
   patches = [
     # Patch out the remote upgrade (deno update) check.

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

@@ -32,7 +32,6 @@ buildGoModule rec {
   meta = src.meta // {
     description = "Extensive, fast, and accurate command-line image dithering tool";
     license = lib.licenses.gpl3;
-    maintainers = with lib.maintainers; [ ehmry ];
     mainProgram = "didder";
   };
 }

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

@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
   version = "0.2.7";
   buildInputs = [ ncurses ];
   src = fetchFromGitHub {
-    owner = "NerdyPepper";
+    owner = "oppiliappan";
     repo = "dijo";
     rev = "v${version}";
     sha256 = "sha256-g+A8BJxqoAvm9LTLrLnClVGtFJCQ2gT0mDGAov/6vXE=";
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
 
   meta = with lib; {
     description = "Scriptable, curses-based, digital habit tracker";
-    homepage = "https://github.com/NerdyPepper/dijo";
+    homepage = "https://github.com/oppiliappan/dijo";
     license = licenses.mit;
     maintainers = [ ];
     mainProgram = "dijo";

pkgs/by-name/dn/dnslink-std-go/package.nix

@@ -21,6 +21,5 @@ buildGoModule rec {
     homepage = "https://dnslink.org/";
     license = lib.licenses.mit;
     mainProgram = "dnslink";
-    maintainers = with lib.maintainers; [ ehmry ];
   };
 }

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

@@ -142,7 +142,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3;
     maintainers = with maintainers; [
       chuangzhu
-      ehmry
     ];
     platforms = platforms.linux;
   };

pkgs/by-name/er/eris-go/package.nix

@@ -41,7 +41,6 @@ buildGoModule rec {
     description = "Implementation of ERIS for Go";
     homepage = "https://codeberg.org/eris/eris-go";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ ehmry ];
     mainProgram = "eris-go";
   };
 }

pkgs/by-name/er/eriscmd/package.nix

@@ -35,7 +35,6 @@ buildNimPackage (
     meta = final.src.meta // {
       homepage = "https://codeberg.org/eris/nim-eris";
       license = lib.licenses.unlicense;
-      maintainers = with lib.maintainers; [ ehmry ];
       mainProgram = "eriscmd";
       badPlatforms = lib.platforms.darwin;
     };

pkgs/by-name/er/erofs-utils/package.nix

@@ -63,7 +63,6 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/tree/ChangeLog?h=v${finalAttrs.version}";
     license = with lib.licenses; [ gpl2Plus ];
     maintainers = with lib.maintainers; [
-      ehmry
       nikstur
       jmbaur
     ];

pkgs/by-name/eu/eurofurence/package.nix

@@ -55,7 +55,6 @@ stdenvNoCC.mkDerivation {
   meta = {
     homepage = "https://web.archive.org/web/20200131023120/http://eurofurence.net/eurofurence.html";
     description = "Family of geometric rounded sans serif fonts";
-    maintainers = with lib.maintainers; [ ehmry ];
     license = lib.licenses.free;
   };
 }

pkgs/by-name/ev/eva/package.nix

@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
 
   meta = with lib; {
     description = "Calculator REPL, similar to bc";
-    homepage = "https://github.com/NerdyPepper/eva";
+    homepage = "https://github.com/oppiliappan/eva";
     license = licenses.mit;
     maintainers = with maintainers; [
       ma27

pkgs/by-name/f2/f2fs-tools/package.nix

@@ -56,7 +56,6 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl2Only;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [
-      ehmry
       jagajaga
     ];
   };

pkgs/by-name/fi/figlet/package.nix

@@ -47,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Program for making large letters out of ordinary text";
     homepage = "http://www.figlet.org/";
     license = lib.licenses.afl21;
-    maintainers = with lib.maintainers; [ ehmry ];
     platforms = lib.platforms.unix;
     mainProgram = "figlet";
   };

pkgs/by-name/fj/fjo/package.nix

@@ -29,7 +29,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://codeberg.org/VoiDD/fjo";
     license = lib.licenses.agpl3Only;
     mainProgram = "berg";
-    maintainers = with lib.maintainers; [ ehmry ];
     broken = stdenv.hostPlatform.isDarwin;
   };
 }

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

@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "flashmq";
-  version = "1.22.0";
+  version = "1.23.0";
 
   src = fetchFromGitHub {
     owner = "halfgaar";
     repo = "FlashMQ";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-yFoyErmBvitBRQ2bNOPY62FaV6YJNAXx8dqkIw2ACm4=";
+    hash = "sha256-JIEJwtS9rtjX+8uqvjnhdAKwp8vk2rptpPYnEX385nk=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/fo/forgejo/lts.nix

@@ -1,8 +1,8 @@
 import ./generic.nix {
-  version = "11.0.3";
-  hash = "sha256-tHanxcxpxVYKd28onKJnuB/Qtee2gop3yKjXJ+i9X4o=";
+  version = "11.0.4";
+  hash = "sha256-RI6eCJx1QTDkzY1oFKwCQyOrRXMd0TFihWofC4ZCv44=";
   npmDepsHash = "sha256-wsjosyZ5J5mU7ixbWjXnbqkvgnOE0dGz81vVqaI61go=";
-  vendorHash = "sha256-5eaPdvU2NbCgbL+rcCqzphTESLHGbGZ3MgtXknCjrSc=";
+  vendorHash = "sha256-Zfjp6EKiO74wYgvc85AwtDg+3Nf7lEa1ZKQMMcYPM34=";
   lts = true;
   nixUpdateExtraArgs = [
     "--override-filename"

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

@@ -1,6 +1,6 @@
 import ./generic.nix {
-  version = "12.0.1";
-  hash = "sha256-MBk5QHjnyMXmQDIbMuehjcGN/PUN1ViRtIi1pJGHlW0=";
+  version = "12.0.2";
+  hash = "sha256-BkyzOrpwKkROKiZgSCr8Z7n8WO6qnkDyCBJ4HWO71Ws=";
   npmDepsHash = "sha256-kq2AV1D0xA4Csm8XUTU5D0iCmyuajcnwlLdPjJ/mj1g=";
   vendorHash = "sha256-B9menPCDUOYHPCS0B5KpxuE03FdFXmA8XqkiYEAxs5Y=";
   lts = false;

pkgs/by-name/fr/frida-tools/package.nix

@@ -35,6 +35,9 @@ python3Packages.buildPythonApplication rec {
     description = "Dynamic instrumentation toolkit for developers, reverse-engineers, and security researchers (client tools)";
     homepage = "https://www.frida.re/";
     maintainers = with lib.maintainers; [ s1341 ];
-    license = lib.licenses.wxWindows;
+    license = with lib.licenses; [
+      lgpl2Plus
+      wxWindowsException31
+    ];
   };
 }

pkgs/by-name/ge/getdns/package.nix

@@ -66,7 +66,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://getdnsapi.net";
     maintainers = with lib.maintainers; [
       leenaars
-      ehmry
     ];
     license = lib.licenses.bsd3;
     platforms = lib.platforms.all;

pkgs/by-name/gi/git-branchless/fix-esl01-indexedlog-for-rust-1_89.patch

@@ -0,0 +1,18 @@
+diff --git a/src/lock.rs b/src/lock.rs
+--- a/src/lock.rs
++++ b/src/lock.rs
+@@ -132,10 +132,10 @@ impl ScopedDirLock {
+ 
+         // Lock
+         match (opts.exclusive, opts.non_blocking) {
+-            (true, false) => file.lock_exclusive(),
+-            (true, true) => file.try_lock_exclusive(),
+-            (false, false) => file.lock_shared(),
+-            (false, true) => file.try_lock_shared(),
++            (true, false) => fs2::FileExt::lock_exclusive(&file),
++            (true, true) => fs2::FileExt::try_lock_exclusive(&file),
++            (false, false) => fs2::FileExt::lock_shared(&file),
++            (false, true) => fs2::FileExt::try_lock_shared(&file),
+         }
+         .context(&path, || {
+             format!(

pkgs/by-name/gi/git-branchless/package.nix

@@ -21,6 +21,20 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-8uv+sZRr06K42hmxgjrKk6FDEngUhN/9epixRYKwE3U=";
   };
 
+  # Patch the vendored esl01-indexedlog crate.
+  # This is necessary to fix the build for rust 1.89. See:
+  # - https://github.com/NixOS/nixpkgs/issues/437051
+  # - https://github.com/arxanas/git-branchless/issues/1585
+  # - https://github.com/facebook/sapling/issues/1119
+  # The patch is derived from:
+  # - https://github.com/facebook/sapling/commit/9e27acb84605079bf4e305afb637a4d6801831ac
+  postPatch = ''
+    (
+      cd ../git-branchless-*-vendor/esl01-indexedlog-*/
+      patch -p1 < ${./fix-esl01-indexedlog-for-rust-1_89.patch}
+    )
+  '';
+
   cargoHash = "sha256-i7KpTd4fX3PrhDjj3R9u98rdI0uHkpQCxSmEF+Gu7yk=";
 
   nativeBuildInputs = [ pkg-config ];

pkgs/by-name/gi/gitlab-runner/package.nix

@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "gitlab-runner";
-  version = "18.1.3";
+  version = "18.3.0";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-runner";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LqkHXmbGHXhIWqcJijBi1i5hYiBi9sv+/+7u2NW2e7Q=";
+    hash = "sha256-D40ecrGAu76WoV8B49/2eDqigpcXcSCc+1nOW7KxHcA=";
   };
 
-  vendorHash = "sha256-G9qZKWI//ECG88Tu8zb8nEDSwNRabVMsrp7aQzVsxCY=";
+  vendorHash = "sha256-vP/htZiUp5qL4TMw6AgNW/TVcvx+pl6rxp41SK5g4XM=";
 
   # For patchShebangs
   buildInputs = [ bash ];

pkgs/by-name/gn/gnaural/package.nix

@@ -44,7 +44,6 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Programmable auditory binaural-beat synthesizer";
     homepage = "https://gnaural.sourceforge.net/";
-    maintainers = with maintainers; [ ehmry ];
     license = with licenses; [ gpl2Only ];
     mainProgram = "gnaural";
   };

pkgs/by-name/gn/gnubg/package.nix

@@ -59,7 +59,6 @@ stdenv.mkDerivation rec {
     description = "World class backgammon application";
     homepage = "https://www.gnu.org/software/gnubg/";
     license = licenses.gpl3;
-    maintainers = [ maintainers.ehmry ];
     platforms = platforms.linux;
   };
 }

pkgs/by-name/gp/gptfdisk/package.nix

@@ -65,6 +65,5 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     homepage = "https://www.rodsbooks.com/gdisk/";
     platforms = platforms.all;
-    maintainers = [ maintainers.ehmry ];
   };
 }

pkgs/by-name/gu/gubbi-font/package.nix

@@ -29,6 +29,5 @@ stdenv.mkDerivation rec {
     description = "Kannada font";
     license = licenses.gpl3Plus;
     platforms = platforms.all;
-    maintainers = with maintainers; [ ehmry ];
   };
 }

pkgs/by-name/hd/hdapsd/package.nix

@@ -28,6 +28,5 @@ stdenv.mkDerivation rec {
     homepage = "http://hdaps.sf.net/";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
-    maintainers = [ maintainers.ehmry ];
   };
 }

pkgs/by-name/hj/hjson-go/package.nix

@@ -26,7 +26,6 @@ buildGoModule rec {
     description = "Utility to convert JSON to and from HJSON";
     homepage = "https://hjson.github.io/";
     changelog = "https://github.com/hjson/hjson-go/releases/tag/v${version}";
-    maintainers = with lib.maintainers; [ ehmry ];
     license = lib.licenses.mit;
     mainProgram = "hjson-cli";
   };

pkgs/by-name/ho/hottext/package.nix

@@ -37,7 +37,6 @@ buildNimPackage (finalAttrs: {
     description = "Simple RSVP speed-reading utility";
     license = lib.licenses.unlicense;
     homepage = "https://git.sr.ht/~ehmry/hottext";
-    maintainers = with lib.maintainers; [ ehmry ];
     mainProgram = "hottext";
   };
 })

pkgs/by-name/in/incus-ui-canonical/package.nix

@@ -20,14 +20,14 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "incus-ui-canonical";
-  version = "0.18.0";
+  version = "0.18.1";
 
   src = fetchFromGitHub {
     owner = "zabbly";
     repo = "incus-ui-canonical";
     # only use tags prefixed by incus- they are the tested fork versions
     tag = "incus-${version}";
-    hash = "sha256-dN/O3UmQfWZ85XQUGXFTF7dhXGW0CLoQ5+16AIDSAzc=";
+    hash = "sha256-D3k9LJZIj4EmE79X5u7MITEKhcQKpL0Eslm4FQTaHg4=";
   };
 
   offlineCache = fetchYarnDeps {

pkgs/by-name/ip/ipxe/package.nix

@@ -147,7 +147,7 @@ stdenv.mkDerivation (finalAttrs: {
       bsd2
       bsd3
       gpl2Only
-      gpl2UBDLPlus
+      ubdlException
       isc
       mit
       mpl11

pkgs/by-name/jo/jol/package.nix

@@ -47,7 +47,10 @@ maven.buildMavenPackage rec {
     '';
     homepage = "https://openjdk.org/projects/code-tools/jol/";
     changelog = "https://github.com/openjdk/jol/releases/tag/${version}";
-    license = lib.licenses.gpl2ClasspathPlus;
+    license = with lib.licenses; [
+      gpl2Plus
+      classpathException20
+    ];
     sourceProvenance = with lib.sourceTypes; [
       fromSource
       binaryBytecode

pkgs/by-name/ko/komga/package.nix

@@ -10,11 +10,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "komga";
-  version = "1.23.1";
+  version = "1.23.3";
 
   src = fetchurl {
     url = "https://github.com/gotson/${pname}/releases/download/${version}/${pname}-${version}.jar";
-    sha256 = "sha256-yDmkM4ayyAanX3NmjfHZdp6Ya1CAVVOonwfQa2XeGY8=";
+    sha256 = "sha256-Q52u284BqN6IktMKOAbiwdM77ZOPQrHIzOkExz91Xeo=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/la/lauti/frontend.nix

@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   offlineCache = fetchYarnDeps {
     yarnLock = "${finalAttrs.src}/yarn.lock";
-    hash = "sha256-uIDBE4ewdzrtJqOjFQTAei1TpAjQMRqls7CtG1h8KnA=";
+    hash = "sha256-8+bAqWg6sqWQcjEdhS/tDZ1farY6VQ++lvbAfpwOeRE=";
   };
 
   nativeBuildInputs = [

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

@@ -7,13 +7,13 @@
 }:
 
 let
-  version = "1.0.0";
+  version = "1.1.0";
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "Klasse-Methode";
     repo = "lauti";
     tag = "v${version}";
-    hash = "sha256-cO9rK7GAVRlv5x4WI/xbXNJ594QqB+KIPUteB3TifKM=";
+    hash = "sha256-eYIKVQG+Vj2qld/xKbxx0JpNqKhnGSjIOXXc7400BYo=";
   };
   frontend = callPackage ./frontend.nix { inherit src version; };
 in
@@ -22,7 +22,7 @@ buildGoModule rec {
   pname = "lauti";
   inherit version src;
 
-  vendorHash = "sha256-ushTvIpvRLZP3q6tLN6BA4tl2Xp/UImWugm2ZgTAm8k=";
+  vendorHash = "sha256-4LQ3PvwWAg+/KBQHroj2ZVQZst7jPq99XwLTHClDPCU=";
 
   ldflags = [
     "-s"

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

@@ -30,7 +30,6 @@ stdenv.mkDerivation (finalAttrs: {
   meta = with lib; {
     description = "C library for creating MusicBrainz DiscIDs from audio CDs";
     homepage = "https://musicbrainz.org/doc/libdiscid";
-    maintainers = with maintainers; [ ehmry ];
     license = licenses.lgpl21;
     platforms = platforms.all;
   };

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

@@ -41,7 +41,6 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     homepage = "https://xiph.org/ogg/";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ ehmry ];
     platforms = lib.platforms.all;
   };
 })

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

@@ -64,7 +64,6 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
       peterhoeg
-      ehmry
     ];
     platforms = lib.platforms.all;
   };

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

@@ -36,7 +36,6 @@ stdenv.mkDerivation rec {
     description = "Vorbis audio compression reference implementation";
     homepage = "https://xiph.org/vorbis/";
     license = licenses.bsd3;
-    maintainers = [ maintainers.ehmry ];
     platforms = platforms.all;
   };
 }

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

@@ -8,6 +8,7 @@
   gettext,
   ninja,
   audit,
+  linuxHeaders,
   libxcrypt,
   bash,
   bashNonInteractive,
@@ -23,7 +24,10 @@
   docbook_xsl_ns,
   nix-update-script,
   withLogind ? lib.meta.availableOn stdenv.hostPlatform systemdLibs,
-  withAudit ? lib.meta.availableOn stdenv.hostPlatform audit,
+  withAudit ?
+    lib.meta.availableOn stdenv.hostPlatform audit
+    # cross-compilation only works from platforms with linux headers
+    && lib.meta.availableOn stdenv.buildPlatform linuxHeaders,
 }:
 
 stdenv.mkDerivation (finalAttrs: {

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

@@ -54,6 +54,5 @@ stdenv.mkDerivation rec {
 
   meta = src.meta // {
     license = lib.licenses.free;
-    maintainers = with lib.maintainers; [ ehmry ];
   };
 }

pkgs/by-name/lz/lziprecover/package.nix

@@ -33,7 +33,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [
       vlaci
-      ehmry
     ];
     platforms = lib.platforms.all;
     mainProgram = "lziprecover";

pkgs/by-name/lz/lzlib/package.nix

@@ -42,6 +42,5 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Data compression library providing in-memory LZMA compression and decompression functions, including integrity checking of the decompressed data";
     license = lib.licenses.bsd2;
     platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ ehmry ];
   };
 })

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

@@ -43,7 +43,6 @@ stdenv.mkDerivation {
     description = "Minimalistic variant of the Acme editor";
     homepage = "http://call-with-current-continuation.org/ma/ma.html";
     mainProgram = "ma";
-    maintainers = with lib.maintainers; [ ehmry ];
     # Per the README:
     # > All of MA's source code is hereby placed in the public domain
     license = lib.licenses.publicDomain;

pkgs/by-name/ma/maiko/package.nix

@@ -32,7 +32,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://interlisp.org/";
     changelog = "https://github.com/Interlisp/maiko/releases";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ehmry ];
     inherit (xorg.libX11.meta) platforms;
   };
 })

pkgs/by-name/ma/makebootfat/package.nix

@@ -17,7 +17,6 @@ stdenv.mkDerivation rec {
     description = "Create bootable USB disks using the FAT filesystem and syslinux";
     homepage = "http://advancemame.sourceforge.net/boot-readme.html";
     license = licenses.gpl2Plus;
-    maintainers = [ maintainers.ehmry ];
     platforms = platforms.linux;
     mainProgram = "makebootfat";
   };

pkgs/by-name/ma/mawk/package.nix

@@ -38,7 +38,6 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Interpreter for the AWK Programming Language";
     license = lib.licenses.gpl2Only;
     mainProgram = "mawk";
-    maintainers = with lib.maintainers; [ ehmry ];
     platforms = lib.platforms.unix;
   };
 })

pkgs/by-name/mb/mbuffer/package.nix

@@ -36,7 +36,6 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Tool for buffering data streams with a large set of unique features";
     homepage = "https://www.maier-komor.de/mbuffer.html";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ ehmry ];
     platforms = lib.platforms.linux; # Maybe other non-darwin Unix
     mainProgram = "mbuffer";
   };

pkgs/by-name/me/melos/add-generic-main.patch

@@ -8,8 +8,13 @@ index 0db7013..218276f 100644
  import 'package:melos/src/command_runner.dart';
  
 -Future<void> main(List<String> arguments) async => launchExecutable(
--      arguments,
--      LaunchConfig(
+-  arguments,
+-  LaunchConfig(
+-    name: ExecutableName('melos'),
+-    launchFromSelf: false,
+-    entrypoint: melosEntryPoint,
+-  ),
+-);
 +Future<void> main(List<String> arguments) async {
 +  final melosYamlPath = findMelosYaml();
 +
@@ -24,13 +29,10 @@ index 0db7013..218276f 100644
 +    LaunchContext(
 +      directory: Directory.current,
 +      localInstallation: ExecutableInstallation(
-         name: ExecutableName('melos'),
--        launchFromSelf: false,
--        entrypoint: melosEntryPoint,
++        name: ExecutableName('melos'),
 +        isSelf: false,
 +        packageRoot: melosYamlPath,
-       ),
--    );
++      ),
 +    ),
 +  );
 +}

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

@@ -5,12 +5,12 @@
 }:
 let
   pname = "melos";
-  version = "6.3.2";
+  version = "7.1.0";
   src = fetchFromGitHub {
     owner = "invertase";
     repo = "melos";
     rev = "melos-v${version}";
-    hash = "sha256-hD4UlQPFugRqtOZecyT/6wV3vFocoQ6OO5w+SZsYdO0=";
+    hash = "sha256-caX59w0uxy5VW1p1hgds73m3sIjEutz5ZUuOzjdIr4Q=";
   };
 in
 buildDartApplication {

pkgs/by-name/mi/min/package.nix

@@ -39,7 +39,6 @@ buildNimPackage (finalAttrs: {
     changelog = "https://github.com/h3rald/min/releases/tag/${finalAttrs.src.rev}";
     license = lib.licenses.mit;
     mainProgram = "min";
-    maintainers = with lib.maintainers; [ ehmry ];
   };
 
 })

pkgs/by-name/mi/miniserve/package.nix

@@ -10,6 +10,7 @@
   curl,
   versionCheckHook,
   nix-update-script,
+  fetchpatch,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -23,6 +24,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-sSCS5jHhu0PBF/R3YqbR9krZghNNa2cPkLkK8kvWWd4=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "upload.patch";
+      url = "https://github.com/svenstaro/miniserve/commit/d41ade0d79e2c175515701350f763dd461c55964.patch";
+      hash = "sha256-2xQPcJFjlvrCeobuDXm+eVZzDsKoQoZL7OXEJxncX5k=";
+    })
+  ];
+
   cargoHash = "sha256-Gb1k4sd2/OV1GskFZBn7EapZTlhb9LK19lJHVP7uCK0=";
 
   nativeBuildInputs = [

pkgs/by-name/mo/molly-brown/package.nix

@@ -28,7 +28,6 @@ buildGoModule {
     description = "Full-featured Gemini server";
     mainProgram = "molly-brown";
     homepage = "https://tildegit.org/solderpunk/molly-brown";
-    maintainers = with maintainers; [ ehmry ];
     license = licenses.bsd2;
   };
 }