Merge staging-next into staging

maintainers/maintainer-list.nix

@@ -1982,6 +1982,13 @@
     githubId = 11493130;
     name = "Asbjørn Olling";
   };
+  ascii17 = {
+    name = "Allen Conlon";
+    email = "software@conlon.dev";
+    github = "a1994sc";
+    githubId = 1966320;
+    keys = [ { fingerprint = "E1F3 9B80 47A5 1EB9 01F8 C385 7FE3 F668 49737 F37"; } ];
+  };
   asciimoth = {
     name = "Andrew";
     email = "ascii@moth.contact";
@@ -15126,6 +15133,12 @@
     githubId = 92527083;
     name = "Morten Munk";
   };
+  morxemplum = {
+    email = "morxemplum@outlook.com";
+    github = "Morxemplum";
+    githubId = 44561540;
+    name = "Synth Morxemplum";
+  };
   MostAwesomeDude = {
     email = "cds@corbinsimpson.com";
     github = "MostAwesomeDude";

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

@@ -35,6 +35,8 @@
 
 - [MaryTTS](https://github.com/marytts/marytts), an open-source, multilingual text-to-speech synthesis system written in pure Java. Available as [services.marytts](options.html#opt-services.marytts).
 
+- [Conduwuit](https://conduwuit.puppyirl.gay/), a federated chat server implementing the Matrix protocol, forked from Conduit. Available as [services.conduwuit](#opt-services.conduwuit.enable).
+
 - [Traccar](https://www.traccar.org/), a modern GPS Tracking Platform. Available as [services.traccar](#opt-services.traccar.enable).
 
 - [crab-hole](https://github.com/LuckyTurtleDev/crab-hole), a cross platform Pi-hole clone written in Rust using hickory-dns/trust-dns. Available as [services.crab-hole](#opt-services.crab-hole.enable).
@@ -91,6 +93,8 @@
 
 - `racket_7_9` has been removed, as it is insecure. It is recommended to use Racket 8 instead.
 
+- `ente-auth` now uses the name `enteauth` for its binary. The previous name was `ente_auth`.
+
 - `fluxus` has been removed, as it depends on `racket_7_9` and had no updates in 9 years.
 
 - `renovate` was updated to v39. See the [upstream release notes](https://docs.renovatebot.com/release-notes-for-major-versions/#version-39) for breaking changes.

nixos/modules/module-list.nix

@@ -716,6 +716,7 @@
   ./services/matrix/appservice-discord.nix
   ./services/matrix/appservice-irc.nix
   ./services/matrix/conduit.nix
+  ./services/matrix/conduwuit.nix
   ./services/matrix/dendrite.nix
   ./services/matrix/hebbot.nix
   ./services/matrix/hookshot.nix

nixos/modules/services/matrix/conduwuit.nix

@@ -0,0 +1,279 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.services.conduwuit;
+  defaultUser = "conduwuit";
+  defaultGroup = "conduwuit";
+
+  format = pkgs.formats.toml { };
+  configFile = format.generate "conduwuit.toml" cfg.settings;
+in
+{
+  meta.maintainers = with lib.maintainers; [ niklaskorz ];
+  options.services.conduwuit = {
+    enable = lib.mkEnableOption "conduwuit";
+
+    user = lib.mkOption {
+      type = lib.types.nonEmptyStr;
+      description = ''
+        The user {command}`conduwuit` is run as.
+      '';
+      default = defaultUser;
+    };
+
+    group = lib.mkOption {
+      type = lib.types.nonEmptyStr;
+      description = ''
+        The group {command}`conduwuit` is run as.
+      '';
+      default = defaultGroup;
+    };
+
+    extraEnvironment = lib.mkOption {
+      type = lib.types.attrsOf lib.types.str;
+      description = "Extra Environment variables to pass to the conduwuit server.";
+      default = { };
+      example = {
+        RUST_BACKTRACE = "yes";
+      };
+    };
+
+    package = lib.mkPackageOption pkgs "conduwuit" { };
+
+    settings = lib.mkOption {
+      type = lib.types.submodule {
+        freeformType = format.type;
+        options = {
+          global.server_name = lib.mkOption {
+            type = lib.types.nonEmptyStr;
+            example = "example.com";
+            description = "The server_name is the name of this server. It is used as a suffix for user and room ids.";
+          };
+          global.address = lib.mkOption {
+            type = lib.types.nullOr (lib.types.listOf lib.types.nonEmptyStr);
+            default = null;
+            example = [
+              "127.0.0.1"
+              "::1"
+            ];
+            description = ''
+              Addresses (IPv4 or IPv6) to listen on for connections by the reverse proxy/tls terminator.
+              If set to `null`, conduwuit will listen on IPv4 and IPv6 localhost.
+              Must be `null` if `unix_socket_path` is set.
+            '';
+          };
+          global.port = lib.mkOption {
+            type = lib.types.listOf lib.types.port;
+            default = [ 6167 ];
+            description = ''
+              The port(s) conduwuit will be running on.
+              You need to set up a reverse proxy in your web server (e.g. apache or nginx),
+              so all requests to /_matrix on port 443 and 8448 will be forwarded to the conduwuit
+              instance running on this port.
+            '';
+          };
+          global.unix_socket_path = lib.mkOption {
+            type = lib.types.nullOr lib.types.path;
+            default = null;
+            description = ''
+              Listen on a UNIX socket at the specified path. If listening on a UNIX socket,
+              listening on an address will be disabled. The `address` option must be set to
+              `null` (the default value). The option {option}`services.conduwuit.group` must
+              be set to a group your reverse proxy is part of.
+
+              This will automatically add a system user "conduwuit" to your system if
+              {option}`services.conduwuit.user` is left at the default, and a "conduwuit"
+              group if {option}`services.conduwuit.group` is left at the default.
+            '';
+          };
+          global.unix_socket_perms = lib.mkOption {
+            type = lib.types.ints.positive;
+            default = 660;
+            description = "The default permissions (in octal) to create the UNIX socket with.";
+          };
+          global.max_request_size = lib.mkOption {
+            type = lib.types.ints.positive;
+            default = 20000000;
+            description = "Max request size in bytes. Don't forget to also change it in the proxy.";
+          };
+          global.allow_registration = lib.mkOption {
+            type = lib.types.bool;
+            default = false;
+            description = ''
+              Whether new users can register on this server.
+
+              Registration with token requires `registration_token` or `registration_token_file` to be set.
+
+              If set to true without a token configured, and
+              `yes_i_am_very_very_sure_i_want_an_open_registration_server_prone_to_abuse`
+              is set to true, users can freely register.
+            '';
+          };
+          global.allow_encryption = lib.mkOption {
+            type = lib.types.bool;
+            default = true;
+            description = "Whether new encrypted rooms can be created. Note: existing rooms will continue to work.";
+          };
+          global.allow_federation = lib.mkOption {
+            type = lib.types.bool;
+            default = true;
+            description = ''
+              Whether this server federates with other servers.
+            '';
+          };
+          global.trusted_servers = lib.mkOption {
+            type = lib.types.listOf lib.types.nonEmptyStr;
+            default = [ "matrix.org" ];
+            description = ''
+              Servers listed here will be used to gather public keys of other servers
+              (notary trusted key servers).
+
+              Currently, conduwuit doesn't support inbound batched key requests, so
+              this list should only contain other Synapse servers.
+
+              Example: `[ "matrix.org" "constellatory.net" "tchncs.de" ]`
+            '';
+          };
+          global.database_path = lib.mkOption {
+            readOnly = true;
+            type = lib.types.path;
+            default = "/var/lib/conduwuit/";
+            description = ''
+              Path to the conduwuit database, the directory where conduwuit will save its data.
+              Note that database_path cannot be edited because of the service's reliance on systemd StateDir.
+            '';
+          };
+          global.allow_check_for_updates = lib.mkOption {
+            type = lib.types.bool;
+            default = false;
+            description = ''
+              If enabled, conduwuit will send a simple GET request periodically to
+              <https://pupbrain.dev/check-for-updates/stable> for any new announcements made.
+              Despite the name, this is not an update check endpoint, it is simply an announcement check endpoint.
+
+              Disabled by default.
+            '';
+          };
+        };
+      };
+      default = { };
+      # TOML does not allow null values, so we use null to omit those fields
+      apply = lib.filterAttrsRecursive (_: v: v != null);
+      description = ''
+        Generates the conduwuit.toml configuration file. Refer to
+        <https://conduwuit.puppyirl.gay/configuration.html>
+        for details on supported values.
+      '';
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    assertions = [
+      {
+        assertion = !(cfg.settings ? global.unix_socket_path) || !(cfg.settings ? global.address);
+        message = ''
+          In `services.conduwuit.settings.global`, `unix_socket_path` and `address` cannot be set at the
+          same time.
+          Leave one of the two options unset or explicitly set them to `null`.
+        '';
+      }
+      {
+        assertion = cfg.user != defaultUser -> config ? users.users.${cfg.user};
+        message = "If `services.conduwuit.user` is changed, the configured user must already exist.";
+      }
+      {
+        assertion = cfg.group != defaultGroup -> config ? users.groups.${cfg.group};
+        message = "If `services.conduwuit.group` is changed, the configured group must already exist.";
+      }
+    ];
+
+    users.users = lib.mkIf (cfg.user == defaultUser) {
+      ${defaultUser} = {
+        group = cfg.group;
+        home = cfg.settings.global.database_path;
+        isSystemUser = true;
+      };
+    };
+
+    users.groups = lib.mkIf (cfg.group == defaultGroup) {
+      ${defaultGroup} = { };
+    };
+
+    systemd.services.conduwuit = {
+      description = "Conduwuit Matrix Server";
+      documentation = [ "https://conduwuit.puppyirl.gay/" ];
+      wantedBy = [ "multi-user.target" ];
+      wants = [ "network-online.target" ];
+      after = [ "network-online.target" ];
+      environment = lib.mkMerge ([
+        { CONDUWUIT_CONFIG = configFile; }
+        cfg.extraEnvironment
+      ]);
+      startLimitBurst = 5;
+      startLimitIntervalSec = 60;
+      serviceConfig = {
+        DynamicUser = true;
+        User = cfg.user;
+        Group = cfg.group;
+
+        DevicePolicy = "closed";
+        LockPersonality = true;
+        MemoryDenyWriteExecute = true;
+        NoNewPrivileges = true;
+        ProtectClock = true;
+        ProtectControlGroups = true;
+        ProtectHome = true;
+        ProtectHostname = true;
+        ProtectKernelLogs = true;
+        ProtectKernelModules = true;
+        ProtectKernelTunables = true;
+        PrivateDevices = true;
+        PrivateMounts = true;
+        PrivateTmp = true;
+        PrivateUsers = true;
+        PrivateIPC = true;
+        RemoveIPC = true;
+        RestrictAddressFamilies = [
+          "AF_INET"
+          "AF_INET6"
+          "AF_UNIX"
+        ];
+        RestrictNamespaces = true;
+        RestrictRealtime = true;
+        SystemCallArchitectures = "native";
+        SystemCallFilter = [
+          "@system-service"
+          "@resources"
+          "~@clock"
+          "@debug"
+          "@module"
+          "@mount"
+          "@reboot"
+          "@swap"
+          "@cpu-emulation"
+          "@obsolete"
+          "@timer"
+          "@chown"
+          "@setuid"
+          "@privileged"
+          "@keyring"
+          "@ipc"
+        ];
+        SystemCallErrorNumber = "EPERM";
+
+        StateDirectory = "conduwuit";
+        StateDirectoryMode = "0700";
+        RuntimeDirectory = "conduwuit";
+        RuntimeDirectoryMode = "0750";
+
+        ExecStart = lib.getExe cfg.package;
+        Restart = "on-failure";
+        RestartSec = 10;
+      };
+    };
+  };
+}

nixos/tests/all-tests.nix

@@ -217,6 +217,7 @@ in {
   coder = handleTest ./coder.nix {};
   collectd = handleTest ./collectd.nix {};
   commafeed = handleTest ./commafeed.nix {};
+  conduwuit = runTest ./matrix/conduwuit.nix;
   connman = handleTest ./connman.nix {};
   consul = handleTest ./consul.nix {};
   consul-template = handleTest ./consul-template.nix {};

nixos/tests/matrix/conduwuit.nix

@@ -0,0 +1,103 @@
+{ lib, ... }:
+let
+  name = "conduwuit";
+in
+{
+  inherit name;
+
+  nodes = {
+    conduwuit = {
+      services.conduwuit = {
+        enable = true;
+        settings.global = {
+          server_name = name;
+          address = [ "0.0.0.0" ];
+          allow_registration = true;
+          yes_i_am_very_very_sure_i_want_an_open_registration_server_prone_to_abuse = true;
+        };
+        extraEnvironment.RUST_BACKTRACE = "yes";
+      };
+      networking.firewall.allowedTCPPorts = [ 6167 ];
+    };
+    client =
+      { pkgs, ... }:
+      {
+        environment.systemPackages = [
+          (pkgs.writers.writePython3Bin "do_test" { libraries = [ pkgs.python3Packages.matrix-nio ]; } ''
+            import asyncio
+            import nio
+
+
+            async def main() -> None:
+                # Connect to conduwuit
+                client = nio.AsyncClient("http://conduwuit:6167", "alice")
+
+                # Register as user alice
+                response = await client.register("alice", "my-secret-password")
+
+                # Log in as user alice
+                response = await client.login("my-secret-password")
+
+                # Create a new room
+                response = await client.room_create(federate=False)
+                print("Matrix room create response:", response)
+                assert isinstance(response, nio.RoomCreateResponse)
+                room_id = response.room_id
+
+                # Join the room
+                response = await client.join(room_id)
+                print("Matrix join response:", response)
+                assert isinstance(response, nio.JoinResponse)
+
+                # Send a message to the room
+                response = await client.room_send(
+                    room_id=room_id,
+                    message_type="m.room.message",
+                    content={
+                        "msgtype": "m.text",
+                        "body": "Hello conduwuit!"
+                    }
+                )
+                print("Matrix room send response:", response)
+                assert isinstance(response, nio.RoomSendResponse)
+
+                # Sync responses
+                response = await client.sync(timeout=30000)
+                print("Matrix sync response:", response)
+                assert isinstance(response, nio.SyncResponse)
+
+                # Check the message was received by conduwuit
+                last_message = response.rooms.join[room_id].timeline.events[-1].body
+                assert last_message == "Hello conduwuit!"
+
+                # Leave the room
+                response = await client.room_leave(room_id)
+                print("Matrix room leave response:", response)
+                assert isinstance(response, nio.RoomLeaveResponse)
+
+                # Close the client
+                await client.close()
+
+
+            if __name__ == "__main__":
+                asyncio.run(main())
+          '')
+        ];
+      };
+  };
+
+  testScript = ''
+    start_all()
+
+    with subtest("start conduwuit"):
+          conduwuit.wait_for_unit("conduwuit.service")
+          conduwuit.wait_for_open_port(6167)
+
+    with subtest("ensure messages can be exchanged"):
+          client.succeed("do_test >&2")
+  '';
+
+  meta.maintainers = with lib.maintainers; [
+    niklaskorz
+  ];
+}

pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix

@@ -7,8 +7,8 @@ buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "vscode-wakatime";
     publisher = "WakaTime";
-    version = "24.2.0";
-    hash = "sha256-1AAerJsgmXJGiEOlxQRRo00JxYBm1Y8xI4rMQUcdv6k=";
+    version = "24.7.2";
+    hash = "sha256-WOhJraXU2J+5votnxH17kjilVh1CVbCZEEaUvCVuCZ0=";
   };
 
   meta = {

pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix

@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "vscode-pylance";
     publisher = "MS-python";
-    version = "2024.11.3";
-    hash = "sha256-EVZSIALg6e1BdJNriGznJ3zxMKwU0QEbPiNPMmxeLbU=";
+    version = "2024.12.1";
+    hash = "sha256-LpHbXthVHvrVZ1xqBTDfF1RjzgEilQVVHfy0tlum/BU=";
   };
 
   buildInputs = [ pyright ];

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

@@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "sourcery";
     publisher = "sourcery";
-    version = "1.24.0";
-    hash = "sha256-T2AbGxBytHXWP/ZKBhglRRbvPZ6px90XnSadwZTe/BM=";
+    version = "1.25.0";
+    hash = "sha256-oIKJsoGI2MqRZAnfroHbEiYObeATkFaw2ONC9WDFSDc=";
   };
 
   postPatch = ''

pkgs/applications/graphics/meshlab/default.nix

@@ -91,6 +91,12 @@ mkDerivation rec {
     patchelf --add-needed $out/lib/meshlab/libmeshlab-common.so $out/bin/.meshlab-wrapped
   '';
 
+  # display a black screen on wayland, so force XWayland for now.
+  # Might be fixed when upstream will be ready for Qt6.
+  qtWrapperArgs = [
+    "--set QT_QPA_PLATFORM xcb"
+  ];
+
   meta = {
     description = "System for processing and editing 3D triangular meshes";
     mainProgram = "meshlab";

pkgs/applications/networking/cluster/helm/plugins/default.nix

@@ -5,6 +5,8 @@
 
   helm-diff = callPackage ./helm-diff.nix { };
 
+  helm-dt = callPackage ./helm-dt.nix { };
+
   helm-git = callPackage ./helm-git.nix { };
 
   helm-mapkubeapis = callPackage ./helm-mapkubeapis.nix { };

pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix

@@ -0,0 +1,48 @@
+{
+  buildGoModule,
+  fetchFromGitHub,
+  lib,
+}:
+buildGoModule rec {
+  pname = "helm-dt";
+  version = "0.4.1";
+
+  src = fetchFromGitHub {
+    owner = "vmware-labs";
+    repo = "distribution-tooling-for-helm";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-KrQAlB0ORNzKIG2vxych3gVBytTh3Hhnjsyn1ia1ZQM=";
+  };
+
+  vendorHash = "sha256-T8Kk+9NAhYOvSq94HOEE53BT7Xh9tU1gJ420o/tiVEo=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X 'main.BuildDate=1970-01-01 00:00:00 UTC'"
+    "-X 'main.Commit=v${version}'"
+  ];
+
+  # NOTE: Remove the install and upgrade hooks.
+  postPatch = ''
+    sed -i '/^hooks:/,+2 d' plugin.yaml
+  '';
+
+  # require network/login
+  doCheck = false;
+  CGO_ENABLED = 1;
+
+  postInstall = ''
+    install -dm755 $out/helm-dt/bin
+    mv $out/bin/dt $out/helm-dt/bin/dt
+    rmdir $out/bin
+    install -m644 -Dt $out/helm-dt plugin.yaml
+  '';
+
+  meta = {
+    description = "Helm Distribution plugin is is a set of utilities and Helm Plugin for making offline work with Helm Charts easier";
+    homepage = "https://github.com/vmware-labs/distribution-tooling-for-helm";
+    maintainers = with lib.maintainers; [ ascii17 ];
+    license = lib.licenses.mit;
+  };
+}

pkgs/applications/networking/protonvpn-gui/default.nix

@@ -21,14 +21,14 @@
 
 buildPythonApplication rec {
   pname = "protonvpn-gui";
-  version = "4.8.0";
+  version = "4.8.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ProtonVPN";
     repo = "proton-vpn-gtk-app";
     rev = "refs/tags/v${version}";
-    hash = "sha256-KNMlDjL4SosHZ6ol2jpC1K7F6VuCa1O2EkQtl8uwnig=";
+    hash = "sha256-+UnMsjIJ0M1YiF+BcY7RObUoCeDZGtE0ul6KBaODzeY=";
   };
 
   nativeBuildInputs = [

pkgs/applications/radio/sdrangel/default.nix

@@ -53,13 +53,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sdrangel";
-  version = "7.22.4";
+  version = "7.22.5";
 
   src = fetchFromGitHub {
     owner = "f4exb";
     repo = "sdrangel";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-+7s2VFxqyk9zLxztpYqV9eqGWA7clphKq8JVwIUPb4c=";
+    hash = "sha256-1jZcKx3kvWcaU9Y6StMATsZ05e7qZqA1H3i/ZvWDoKg=";
   };
 
   nativeBuildInputs = [

pkgs/applications/science/math/mpsolve/default.nix

@@ -1,23 +1,32 @@
 { lib
 , stdenv
-, fetchurl
+, fetchFromGitHub
+, autoreconfHook
+, bison
+, flex
+, gitUpdater
 , gmp
+, gtk3
 , pkg-config
 , qtbase
 , wrapQtAppsHook
-, gtk3
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mpsolve";
   version = "3.2.1";
 
-  src = fetchurl {
-    url = "https://numpi.dm.unipi.it/_media/software/mpsolve/mpsolve-${finalAttrs.version}.tar.gz";
-    hash = "sha256-PRFCiumrLgIPJMq/vNnk2bIuxXLPcK8NRP6Nrh1R544=";
+  src = fetchFromGitHub {
+    owner = "robol";
+    repo = "MPSolve";
+    rev = finalAttrs.version;
+    hash = "sha256-7lYwInodKj02G76xqhp/6e9MCzPY80gsAW3vTMNsfdA=";
   };
 
   nativeBuildInputs = [
+    autoreconfHook
+    bison
+    flex
     pkg-config
     wrapQtAppsHook
   ];
@@ -28,6 +37,8 @@ stdenv.mkDerivation (finalAttrs: {
     qtbase
   ];
 
+  passthru.updateScript = gitUpdater { };
+
   meta = {
     homepage = "https://numpi.dm.unipi.it/scientific-computing-libraries/mpsolve/";
     description = "Multiprecision Polynomial Solver";

pkgs/applications/video/go2tv/default.nix

@@ -15,16 +15,16 @@
 
 buildGoModule rec {
   pname = "go2tv" + lib.optionalString (!withGui) "-lite";
-  version = "1.17.0";
+  version = "1.17.1";
 
   src = fetchFromGitHub {
     owner = "alexballas";
     repo = "go2tv";
     rev = "refs/tags/v${version}";
-    hash = "sha256-h0q2VhnU7CPCD0Co9rLPmGh4BK4eP5QUMep7AaJ3weY=";
+    hash = "sha256-NCfr6FXxHFFTe9l7K68MkKU71Hu/vWQFZcJXFAB94q8=";
   };
 
-  vendorHash = "sha256-+sASY+HosTMMVHHPwVw8nO+/72s2A1EpuTMHJXhHtnc=";
+  vendorHash = "sha256-5XiY3tSgd6lmQMbkUxt8IylSNXXW4fsmquy3SIMMsWw=";
 
   nativeBuildInputs = [ pkg-config ];
 

pkgs/applications/video/vdr/softhddevice/default.nix

@@ -15,12 +15,12 @@
 }:
 stdenv.mkDerivation rec {
   pname = "vdr-softhddevice";
-  version = "2.3.8";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "ua0lnj";
     repo = "vdr-plugin-softhddevice";
-    sha256 = "sha256-/eNPhkrLpxXeX/5EitMJUgZCPy1Ked3oKuMdD6OuEYc=";
+    sha256 = "sha256-ZqZqgrDAEYlDZ3tmZ4WzbxAdLde6kcUbLAplCNLGHEc=";
     rev = "v${version}";
   };
 

pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix

@@ -1,6 +1,6 @@
 {
   lib,
-  stdenv,
+  gcc14Stdenv,
   fetchFromGitHub,
   cmake,
   makeWrapper,
@@ -18,22 +18,22 @@
   qtbase,
   qttools,
   qtwayland,
-  sdbus-cpp,
+  sdbus-cpp_2,
   slurp,
   systemd,
   wayland,
   wayland-protocols,
   wayland-scanner,
 }:
-stdenv.mkDerivation (finalAttrs: {
+gcc14Stdenv.mkDerivation (finalAttrs: {
   pname = "xdg-desktop-portal-hyprland";
-  version = "1.3.6";
+  version = "1.3.8";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "xdg-desktop-portal-hyprland";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-1DGktDtSWIJpnDbVoj/qpvJSH5zg6JbOfuh6xqZMap0=";
+    hash = "sha256-V+CvM2UBJ6KjXD+B7T6vy8EYwLvLX88tZb8KP73MPSo=";
   };
 
   depsBuildBuild = [
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
     qtbase
     qttools
     qtwayland
-    sdbus-cpp
+    sdbus-cpp_2
     systemd
     wayland
     wayland-protocols

pkgs/build-support/appimage/default.nix

@@ -204,7 +204,6 @@ rec {
       # libraries not on the upstream include list, but nevertheless expected
       # by at least one appimage
       libtool.lib # for Synfigstudio
-      xorg.libxshmfence # for apple-music-electron
       at-spi2-core
       pciutils # for FreeCAD
       pipewire # immersed-vr wayland support

pkgs/build-support/node/fetch-npm-deps/src/util.rs

@@ -1,3 +1,4 @@
+use anyhow::bail;
 use backoff::{retry, ExponentialBackoff};
 use data_encoding::BASE64;
 use digest::Digest;
@@ -5,6 +6,7 @@ use isahc::{
     config::{CaCertificate, Configurable, RedirectPolicy, SslOption},
     Body, Request, RequestExt,
 };
+use log::info;
 use nix_nar::{Encoder, NarError};
 use serde_json::{Map, Value};
 use sha2::Sha256;
@@ -15,7 +17,7 @@ use std::{
 };
 use url::Url;
 
-pub fn get_url(url: &Url) -> Result<Body, isahc::Error> {
+pub fn get_url(url: &Url) -> Result<Body, anyhow::Error> {
     let mut request = Request::get(url.as_str()).redirect_policy(RedirectPolicy::Limit(10));
 
     // Respect SSL_CERT_FILE if environment variable exists
@@ -37,16 +39,27 @@ pub fn get_url(url: &Url) -> Result<Body, isahc::Error> {
         if let Ok(npm_tokens) = env::var("NIX_NPM_TOKENS") {
             if let Ok(tokens) = serde_json::from_str::<Map<String, Value>>(&npm_tokens) {
                 if let Some(token) = tokens.get(host).and_then(serde_json::Value::as_str) {
+                    info!("Found NPM token for {}. Adding authorization header to request.", host);
                     request = request.header("Authorization", format!("Bearer {token}"));
                 }
             }
         }
     }
 
-    Ok(request.body(())?.send()?.into_body())
+    let res = request.body(())?.send()?;
+    if !res.status().is_success() {
+        if res.status().is_client_error() {
+            bail!("Client error: {}", res.status());
+        }
+        if res.status().is_server_error() {
+            bail!("Server error: {}", res.status());
+        }
+        bail!("{}", res.status());
+    }
+    Ok(res.into_body())
 }
 
-pub fn get_url_body_with_retry(url: &Url) -> Result<Vec<u8>, isahc::Error> {
+pub fn get_url_body_with_retry(url: &Url) -> Result<Vec<u8>, anyhow::Error> {
     retry(ExponentialBackoff::default(), || {
         get_url(url)
             .and_then(|mut body| {
@@ -56,12 +69,15 @@ pub fn get_url_body_with_retry(url: &Url) -> Result<Vec<u8>, isahc::Error> {
 
                 Ok(buf)
             })
-            .map_err(|err| {
-                if err.is_network() || err.is_timeout() {
-                    backoff::Error::transient(err)
-                } else {
-                    backoff::Error::permanent(err)
+            .map_err(|err| match err.downcast_ref::<isahc::Error>() {
+                Some(isahc_err) => {
+                    if isahc_err.is_network() || isahc_err.is_timeout() {
+                        backoff::Error::transient(err)
+                    } else {
+                        backoff::Error::permanent(err)
+                    }
                 }
+                None => backoff::Error::permanent(err),
             })
     })
     .map_err(|backoff_err| match backoff_err {

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

@@ -10,24 +10,23 @@
   glib,
   gtk3,
   pango,
-  stdenv,
   wayland,
   gtk-layer-shell,
-  unstableGitUpdater,
+  nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
   pname = "anyrun";
-  version = "0-unstable-2023-12-01";
+  version = "0-unstable-2024-11-08";
 
   src = fetchFromGitHub {
     owner = "kirottu";
     repo = "anyrun";
-    rev = "e14da6c37337ffa3ee1bc66965d58ef64c1590e5";
-    hash = "sha256-hI9+KBShsSfvWX7bmRa/1VI20WGat3lDXmbceMZzMS4=";
+    rev = "d2017f224b2bfd7e33573c7070e7c3e2960c7dcc";
+    hash = "sha256-L1hLXf4IDZ0KoXbFiSNNZJ7IrReEr/J+CLt6Rl4Ea3M=";
   };
 
-  cargoHash = "sha256-apOQc9Z6YANoaeKcbNxBfAv7mmGFB+CagrYRPgC5wLY=";
+  cargoHash = "sha256-DgUNSRr2Hs+GeYeR2ex8WiwotmT12G1cjSvQVK2py3c=";
 
   strictDeps = true;
   enableParallelBuilding = true;
@@ -59,7 +58,7 @@ rustPlatform.buildRustPackage rec {
     install -Dm444 anyrun/res/style.css examples/config.ron -t $out/share/doc/anyrun/examples/
   '';
 
-  passthru.updateScript = unstableGitUpdater { };
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
 
   meta = {
     description = "Wayland-native, highly customizable runner";

pkgs/by-name/ba/bash-env-json/package.nix

@@ -1,7 +1,6 @@
 {
   stdenvNoCC,
   lib,
-  makeWrapper,
   fetchFromGitHub,
   coreutils,
   gnused,
@@ -11,19 +10,15 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "bash-env-json";
-  version = "0.9.1";
+  version = "0.9.2";
 
   src = fetchFromGitHub {
     owner = "tesujimath";
     repo = "bash-env-json";
     rev = finalAttrs.version;
-    hash = "sha256-cZEkYOr9z6yLPA4PSo6+hogaqb1vhWaYi/rp4asfsbM=";
+    hash = "sha256-EYro4pMILnQFpXpFjdzSDuudhqC2EvysYMUmIOvesgo=";
   };
 
-  nativeBuildInputs = [
-    makeWrapper
-  ];
-
   installPhase = ''
     runHook preInstall
 
@@ -33,13 +28,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   '';
 
   postFixup = ''
-    wrapProgram $out/bin/bash-env-json --prefix PATH : ${
-      lib.makeBinPath [
-        coreutils
-        gnused
-        jq
-      ]
-    }
+    substituteInPlace $out/bin/bash-env-json --replace-fail " env " " ${lib.getExe' coreutils "env"} "
+    substituteInPlace $out/bin/bash-env-json --replace-fail " jq " " ${lib.getExe jq} "
+    substituteInPlace $out/bin/bash-env-json --replace-fail " mktemp " " ${lib.getExe' coreutils "mktemp"} "
+    substituteInPlace $out/bin/bash-env-json --replace-fail " rm " " ${lib.getExe' coreutils "rm"} "
+    substituteInPlace $out/bin/bash-env-json --replace-fail " sed " " ${lib.getExe gnused} "
+    substituteInPlace $out/bin/bash-env-json --replace-fail " touch " " ${lib.getExe' coreutils "touch"} "
   '';
 
   passthru.updateScript = nix-update-script { };

pkgs/by-name/bu/buildkite-agent-metrics/package.nix

@@ -5,7 +5,7 @@
 }:
 buildGoModule rec {
   pname = "buildkite-agent-metrics";
-  version = "5.9.10";
+  version = "5.9.11";
 
   outputs = [
     "out"
@@ -16,7 +16,7 @@ buildGoModule rec {
     owner = "buildkite";
     repo = "buildkite-agent-metrics";
     rev = "v${version}";
-    hash = "sha256-2nN4Odx1GytI7WVnZHqepQsJKzfvj2ctkreWz3AgpR8=";
+    hash = "sha256-eAV/2ZflCtgeP5/7RTVBEFuHWYWNiWXzGxBO1fiCdRo=";
   };
 
   vendorHash = "sha256-YefdOc56TBKQZ6Ra4SpQwLTJYTZ2KuxRhRslaXIpucQ=";

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

@@ -15,14 +15,14 @@ let
     "cli"
     "desktop"
   ];
-  version = "0.43.1";
+  version = "0.44.1";
   cli = fetchurl {
     url = "https://caido.download/releases/v${version}/caido-cli-v${version}-linux-x86_64.tar.gz";
-    hash = "sha256-6thdJf6UCzeKOgjPTkK4FsgbQ2u6Eu+tnHihXJPMEUQ=";
+    hash = "sha256-h8pqR74UcFp9eYiDB6+xck4uUs8qh/yE3LBuoUzmchs=";
   };
   desktop = fetchurl {
     url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-linux-x86_64.AppImage";
-    hash = "sha256-HEx+RFWF+qfFut5n1ZxKQHjSTGq5EbXAupPJ+5H5LQ0=";
+    hash = "sha256-GKhjTTPXtZ7jMFdKKDUsT1pZsj2+Kmn3Au++sAsV6U8=";
   };
   appimageContents = appimageTools.extractType2 {
     inherit pname version;

pkgs/by-name/ca/cargo-modules/package.nix

@@ -2,26 +2,20 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
-  stdenv,
-  darwin,
+  versionCheckHook,
 }:
-
 rustPlatform.buildRustPackage rec {
   pname = "cargo-modules";
-  version = "0.20.2";
+  version = "0.21.1";
 
   src = fetchFromGitHub {
     owner = "regexident";
     repo = "cargo-modules";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-GrkAEblelLWIGYdOlbRWNBibNnb+/eA3e8aM5+L7Z7g=";
+    tag = "v${version}";
+    hash = "sha256-QVG/N+t6fify6I9uvLAqWLagmEnhd5i5Iz9HWdysmzk=";
   };
 
-  cargoHash = "sha256-/CQWVrXwkg0xVFAC2nYHtGlWYxU2TIkCLb6+NgmarDw=";
-
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    darwin.apple_sdk.frameworks.CoreServices
-  ];
+  cargoHash = "sha256-9SzM9jkAcnRctNedImoH+32hVAtPAkXLzxgmOo3Dcxc=";
 
   checkFlags = [
     "--skip=cfg_test::with_tests::smoke"
@@ -45,12 +39,17 @@ rustPlatform.buildRustPackage rec {
     "--skip=selection::no_modules::smoke"
     "--skip=selection::no_traits::smoke"
     "--skip=selection::no_types::smoke"
+    "--skip=selection::no_owns::smoke"
   ];
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+  versionCheckProgramArg = [ "--version" ];
+
   meta = {
     description = "Cargo plugin for showing a tree-like overview of a crate's modules";
     homepage = "https://github.com/regexident/cargo-modules";
-    changelog = "https://github.com/regexident/cargo-modules/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/regexident/cargo-modules/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [
       figsoda

pkgs/by-name/cg/cgt-calc/package.nix

@@ -0,0 +1,48 @@
+{
+  lib,
+  fetchFromGitHub,
+  python3Packages,
+  withTeXLive ? true,
+  texliveSmall,
+}:
+python3Packages.buildPythonApplication rec {
+  pname = "cgt-calc";
+  version = "1.13.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "KapJI";
+    repo = "capital-gains-calculator";
+    rev = "v${version}";
+    hash = "sha256-y/Y05wG89nccXyxfjqazyPJhd8dOkfwRJre+Rzx97Hw=";
+  };
+
+  build-system = with python3Packages; [
+    poetry-core
+  ];
+
+  dependencies = with python3Packages; [
+    defusedxml
+    jinja2
+    pandas
+    requests
+    types-requests
+    yfinance
+  ];
+
+  makeWrapperArgs = lib.optionals withTeXLive [
+    "--prefix"
+    "PATH"
+    ":"
+    "${lib.getBin texliveSmall}/bin"
+  ];
+
+  meta = with lib; {
+    description = "UK capital gains tax calculator";
+    homepage = "https://github.com/KapJI/capital-gains-calculator";
+    license = licenses.mit;
+    mainProgram = "cgt-calc";
+    maintainers = with maintainers; [ ambroisie ];
+    platforms = platforms.unix;
+  };
+}

pkgs/by-name/cl/clusterctl/package.nix

@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "clusterctl";
-  version = "1.8.5";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "kubernetes-sigs";
     repo = "cluster-api";
     rev = "v${version}";
-    hash = "sha256-Twh8wIXc1bLljTUCxMV/b5qP65FG14hheoMFTnGrO/c=";
+    hash = "sha256-ENbNgstu+YsNESJ2RsJri3B4zO8UI3Dt60/8AFgsxn8=";
   };
 
-  vendorHash = "sha256-0VVaD1vGIGezgkVCvIhNHmZqVFxFu4UcUUh0wuX2viw=";
+  vendorHash = "sha256-rjo8fwUAnVDM7XvY31I5z6RMRSrNSur6wH7NfGTIdcc=";
 
   subPackages = [ "cmd/clusterctl" ];
 

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

@@ -17,6 +17,7 @@
   rust-jemalloc-sys,
   enableLiburing ? stdenv.hostPlatform.isLinux,
   liburing,
+  nixosTests,
 }:
 let
   rust-jemalloc-sys' = rust-jemalloc-sys.override {
@@ -84,10 +85,16 @@ rustPlatform.buildRustPackage rec {
 
   passthru = {
     updateScript = nix-update-script { };
-    tests.version = testers.testVersion {
-      package = conduwuit;
-      version = "${version}";
-    };
+    tests =
+      {
+        version = testers.testVersion {
+          inherit version;
+          package = conduwuit;
+        };
+      }
+      // lib.optionalAttrs stdenv.hostPlatform.isLinux {
+        inherit (nixosTests) conduwuit;
+      };
   };
 
   meta = {

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

@@ -7,7 +7,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "copier";
-  version = "9.2.0";
+  version = "9.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec {
     postFetch = ''
       rm $out/tests/demo/doc/ma*ana.txt
     '';
-    hash = "sha256-fjZ2ieyyFvm5LdCoKLhOffWZusYbZEGebR8o7PDF8wc=";
+    hash = "sha256-bNz3xFYksgdN9iXbkZIHWsHpRa9aICxBZmzy/t0+3z0=";
   };
 
   POETRY_DYNAMIC_VERSIONING_BYPASS = version;

pkgs/by-name/co/cosmic-settings-daemon/package.nix

@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cosmic-settings-daemon";
-  version = "1.0.0-alpha.2";
+  version = "1.0.0-alpha.4";
 
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-settings-daemon";
     rev = "epoch-${version}";
-    hash = "sha256-mtnMqG3aUSgtN3+Blj3w90UsX8NUu/QlzYgr64KPE9s=";
+    hash = "sha256-wwrbZJ/FA6qjeo9M/gIlzVyygiLT3R5OTLhTwr/QSSw=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-bjbEfVskUsTFQ7Y+zn2UEO+ASf0M2h3/4aQ3N/lWIyM=";
+  cargoHash = "sha256-zAVBkH6ADs8uXqHD1gHQJl1e5l+g6NdnhEJa5fSvHDE=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [

pkgs/by-name/dp/dpdk/package.nix

@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation rec {
   pname = "dpdk";
-  version = "23.11";
+  version = "24.07";
 
   src = fetchurl {
     url = "https://fast.dpdk.org/rel/dpdk-${version}.tar.xz";
-    sha256 = "sha256-ZPpY/fyelRDo5BTjvt0WW9PUykZaIxsoAyP4PNU/2GU=";
+    sha256 = "sha256-mUT35fJo56ybQZPizVTvbZj24dfd3JZ8d65PZhbW+70=";
   };
 
   nativeBuildInputs = [

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

@@ -6,15 +6,15 @@
 
 buildGoModule rec {
   pname = "easyjson";
-  version = "0.7.7";
+  version = "0.9";
 
   src = fetchFromGitHub {
     owner = "mailru";
     repo = "easyjson";
     rev = "v${version}";
-    sha256 = "0clifkvvy8f45rv3cdyv58dglzagyvfcqb63wl6rij30c5j2pzc1";
+    sha256 = "sha256-m2WZwi6TM6hiBlCQOe+rxF5z3vvnYqtHQX8d7y5NLgI=";
   };
-  vendorHash = "sha256-L8u7QQPE2SnskcRrSIwQ4KhsX9xncqDWXJ75ytjxLJ4=";
+  vendorHash = "sha256-BsksTYmfPQezbWfIWX0NhuMbH4VvktrEx06C2Nb/FYE=";
 
   subPackages = [ "easyjson" ];
 

pkgs/by-name/ec/ecapture/package.nix

@@ -21,13 +21,13 @@
 
 buildGoModule rec {
   pname = "ecapture";
-  version = "0.8.10";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "gojue";
     repo = "ecapture";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-vaksl9Bt7Yu62MDGtgkFB4nhH0zdZ29JhE0ypQkuv74=";
+    tag = "v${version}";
+    hash = "sha256-ugUoeIrAElwnGcoX4ojnz/W4kmxgYMmjr1oqSoMyYng=";
     fetchSubmodules = true;
   };
 
@@ -59,9 +59,7 @@ buildGoModule rec {
     "zerocallusedregs"
   ];
 
-  patchPhase = ''
-    runHook prePatch
-
+  postPatch = ''
     substituteInPlace user/config/config_gnutls_linux.go \
       --replace-fail 'return errors.New("cant found Gnutls so load path")' 'gc.Gnutls = "${lib.getLib gnutls}/lib/libgnutls.so.30"' \
       --replace-fail '"errors"' ' '
@@ -87,8 +85,6 @@ buildGoModule rec {
     substituteInPlace user/config/config_openssl_linux.go \
       --replace-fail 'return errors.New("cant found openssl so load path")' 'oc.Openssl = "${lib.getLib openssl}/lib/libssl.so.3"' \
       --replace-fail '"errors"' ' '
-
-    runHook postPatch
   '';
 
   postConfigure = ''
@@ -102,7 +98,15 @@ buildGoModule rec {
     go-bindata -pkg assets -o "assets/ebpf_probe.go" $(find user/bytecode -name "*.o" -printf "./%p ")
   '';
 
-  vendorHash = "sha256-j5AXZqup0nPUlGWvb4PCLKJFoQx/c4I3PxZB99TTTWA=";
+  checkFlags =
+    let
+      skippedTests = [
+        "TestCheckLatest"
+      ];
+    in
+    [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
+
+  vendorHash = "sha256-A+0ASVHMzNcuLsP9F55hvGjflLg68p0ckj6kPbjdg4E=";
 
   passthru.updateScript = nix-update-script { };
 

pkgs/by-name/en/ente-auth/0001-disable-updates.patch

@@ -0,0 +1,15 @@
+diff --git a/auth/lib/services/update_service.dart b/auth/lib/services/update_service.dart
+index 716d553f1b..3946d87a7d 100644
+--- a/lib/services/update_service.dart
++++ b/lib/services/update_service.dart
+@@ -134,9 +134,7 @@ class UpdateService {
+   }
+ 
+   bool isIndependent() {
+-    return flavor == "independent" ||
+-        _packageInfo.packageName.endsWith("independent") ||
+-        PlatformUtil.isDesktop();
++    return false;
+   }
+ }
+ 

pkgs/by-name/en/ente-auth/package.nix

@@ -7,31 +7,36 @@
   libayatana-appindicator,
   makeDesktopItem,
   copyDesktopItems,
-  imagemagick,
   makeWrapper,
 }:
 let
   # fetch simple-icons directly to avoid cloning with submodules,
   # which would also clone a whole copy of flutter
   simple-icons = fetchFromGitHub (lib.importJSON ./simple-icons.json);
+  desktopId = "io.ente.auth";
 in
 flutter324.buildFlutterApplication rec {
   pname = "ente-auth";
-  version = "4.0.2";
+  version = "4.1.6";
 
   src = fetchFromGitHub {
     owner = "ente-io";
     repo = "ente";
     sparseCheckout = [ "auth" ];
-    rev = "auth-v${version}";
-    hash = "sha256-me+fT79vwqBBNsRWWo58GdzBf58LNB4Mk+pmCLvn/ik=";
+    tag = "auth-v${version}";
+    hash = "sha256-6LsHKK+IvMgxgih0u04dbpzesyQgwLvkGK0a1NcgpTg=";
   };
 
   sourceRoot = "${src.name}/auth";
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
 
-  patchPhase = ''
+  patches = [
+    # Disable update notifications and auto-update functionality
+    ./0001-disable-updates.patch
+  ];
+
+  postPatch = ''
     rmdir assets/simple-icons
     ln -s ${simple-icons} assets/simple-icons
   '';
@@ -41,12 +46,11 @@ flutter324.buildFlutterApplication rec {
     ente_crypto_dart = "sha256-XBzQ268E0cYljJH6gDS5O0Pmie/GwuhMDlQPfopSqJM=";
     flutter_local_authentication = "sha256-r50jr+81ho+7q2PWHLf4VnvNJmhiARZ3s4HUpThCgc0=";
     flutter_secure_storage_linux = "sha256-x45jrJ7pvVyhZlpqRSy3CbwT4Lna6yi/b2IyAilWckg=";
-    sqflite = "sha256-TdvCtEO7KL1R2oOSwGWllmS5kGCIU5CkvvUqUJf3tUc=";
+    sqflite = "sha256-+XTVtkFJ94VifwnutvUuAqqiyWwrcEiZ3Uz0H4D9zWA=";
   };
 
   nativeBuildInputs = [
     copyDesktopItems
-    imagemagick
     makeWrapper
   ];
 
@@ -57,12 +61,12 @@ flutter324.buildFlutterApplication rec {
   ];
 
   # Based on https://github.com/ente-io/ente/blob/main/auth/linux/packaging/rpm/make_config.yaml
-  # and https://github.com/ente-io/ente/blob/main/auth/linux/packaging/ente_auth.appdata.xml
+  # and https://github.com/ente-io/ente/blob/main/auth/linux/packaging/enteauth.appdata.xml
   desktopItems = [
     (makeDesktopItem {
-      name = "ente_auth";
-      exec = "ente_auth";
-      icon = "ente-auth";
+      name = desktopId;
+      exec = "enteauth";
+      icon = "enteauth";
       desktopName = "Ente Auth";
       genericName = "Ente Authentication";
       comment = "Open source 2FA authenticator, with end-to-end encrypted backups";
@@ -77,17 +81,16 @@ flutter324.buildFlutterApplication rec {
   ];
 
   postInstall = ''
-    FAV=$out/app/ente-auth/data/flutter_assets/assets/icons/auth-icon.png
-    ICO=$out/share/icons
+    mkdir -p $out/share/pixmaps
+    ln -s $out/app/ente-auth/data/flutter_assets/assets/icons/auth-icon.png $out/share/pixmaps/enteauth.png
 
-    install -D $FAV $ICO/ente-auth.png
-    for size in 24 32 42 64 128 256 512; do
-      D=$ICO/hicolor/''${size}x''${size}/apps
-      mkdir -p $D
-      magick $FAV -resize ''${size}x''${size} $D/ente-auth.png
-    done
+    install -Dm444 linux/packaging/enteauth.appdata.xml $out/share/metainfo/${desktopId}.metainfo.xml
+    substituteInPlace $out/share/metainfo/${desktopId}.metainfo.xml \
+      --replace-fail '<id>enteauth</id>' '<id>${desktopId}</id>' \
+      --replace-fail 'enteauth.desktop' '${desktopId}.desktop'
 
-    install -Dm444 linux/packaging/ente_auth.appdata.xml -t $out/share/metainfo
+    # For backwards compatibility
+    ln -s $out/bin/enteauth $out/bin/ente_auth
   '';
 
   passthru.updateScript = ./update.sh;
@@ -106,7 +109,7 @@ flutter324.buildFlutterApplication rec {
       zi3m5f
       gepbird
     ];
-    mainProgram = "ente_auth";
+    mainProgram = "enteauth";
     platforms = [
       "x86_64-linux"
       "aarch64-linux"

pkgs/by-name/en/ente-auth/pubspec.lock.json

@@ -4,11 +4,17 @@
       "dependency": "transitive",
       "description": {
         "name": "_fe_analyzer_shared",
-        "sha256": "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7",
+        "sha256": "f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "67.0.0"
+      "version": "72.0.0"
+    },
+    "_macros": {
+      "dependency": "transitive",
+      "description": "dart",
+      "source": "sdk",
+      "version": "0.3.2"
     },
     "adaptive_theme": {
       "dependency": "direct main",
@@ -24,31 +30,31 @@
       "dependency": "transitive",
       "description": {
         "name": "analyzer",
-        "sha256": "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d",
+        "sha256": "b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.4.1"
+      "version": "6.7.0"
     },
     "ansicolor": {
       "dependency": "transitive",
       "description": {
         "name": "ansicolor",
-        "sha256": "8bf17a8ff6ea17499e40a2d2542c2f481cd7615760c6d34065cb22bfd22e6880",
+        "sha256": "50e982d500bc863e1d703448afdbf9e5a72eb48840a4f766fa361ffd6877055f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.2"
+      "version": "2.0.3"
     },
     "app_links": {
       "dependency": "direct main",
       "description": {
         "name": "app_links",
-        "sha256": "f04c3ca96426baba784c736a201926bd4145524c36a1b38942a351b033305e21",
+        "sha256": "ad1a6d598e7e39b46a34f746f9a8b011ee147e4c275d407fa457e7a62f84dd99",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.2.1"
+      "version": "6.3.2"
     },
     "app_links_linux": {
       "dependency": "transitive",
@@ -204,21 +210,21 @@
       "dependency": "direct dev",
       "description": {
         "name": "build_runner",
-        "sha256": "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7",
+        "sha256": "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.11"
+      "version": "2.4.13"
     },
     "build_runner_core": {
       "dependency": "transitive",
       "description": {
         "name": "build_runner_core",
-        "sha256": "e3c79f69a64bdfcd8a776a3c28db4eb6e3fb5356d013ae5eb2e52007706d5dbe",
+        "sha256": "f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.3.1"
+      "version": "7.3.2"
     },
     "built_collection": {
       "dependency": "transitive",
@@ -314,11 +320,11 @@
       "dependency": "direct main",
       "description": {
         "name": "confetti",
-        "sha256": "979aafde2428c53947892c95eb244466c109c129b7eee9011f0a66caaca52267",
+        "sha256": "79376a99648efbc3f23582f5784ced0fe239922bd1a0fb41f582051eba750751",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.0"
+      "version": "0.8.0"
     },
     "connectivity_plus": {
       "dependency": "direct main",
@@ -364,11 +370,11 @@
       "dependency": "transitive",
       "description": {
         "name": "crypto",
-        "sha256": "ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab",
+        "sha256": "ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.3"
+      "version": "3.0.5"
     },
     "csslib": {
       "dependency": "transitive",
@@ -384,11 +390,11 @@
       "dependency": "transitive",
       "description": {
         "name": "dart_style",
-        "sha256": "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9",
+        "sha256": "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.6"
+      "version": "2.3.7"
     },
     "dbus": {
       "dependency": "transitive",
@@ -400,17 +406,6 @@
       "source": "hosted",
       "version": "0.7.10"
     },
-    "desktop_webview_window": {
-      "dependency": "direct main",
-      "description": {
-        "path": "packages/desktop_webview_window",
-        "ref": "main",
-        "resolved-ref": "726d8281a244d56ab36e843f0427c48de6d9cc56",
-        "url": "https://github.com/MixinNetwork/flutter-plugins"
-      },
-      "source": "git",
-      "version": "0.2.4"
-    },
     "device_info_plus": {
       "dependency": "direct main",
       "description": {
@@ -425,21 +420,31 @@
       "dependency": "transitive",
       "description": {
         "name": "device_info_plus_platform_interface",
-        "sha256": "d3b01d5868b50ae571cd1dc6e502fc94d956b665756180f7b16ead09e836fd64",
+        "sha256": "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.0.0"
+      "version": "7.0.1"
     },
     "dio": {
       "dependency": "direct main",
       "description": {
         "name": "dio",
-        "sha256": "11e40df547d418cc0c4900a9318b26304e665da6fa4755399a9ff9efd09034b5",
+        "sha256": "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.4.3+1"
+      "version": "5.7.0"
+    },
+    "dio_web_adapter": {
+      "dependency": "transitive",
+      "description": {
+        "name": "dio_web_adapter",
+        "sha256": "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.0"
     },
     "dotted_border": {
       "dependency": "direct main",
@@ -486,11 +491,11 @@
       "dependency": "direct main",
       "description": {
         "name": "event_bus",
-        "sha256": "44baa799834f4c803921873e7446a2add0f3efa45e101a054b1f0ab9b95f8edc",
+        "sha256": "1a55e97923769c286d295240048fc180e7b0768902c3c2e869fe059aafa15304",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.0"
+      "version": "2.0.1"
     },
     "expandable": {
       "dependency": "direct main",
@@ -526,11 +531,11 @@
       "dependency": "direct main",
       "description": {
         "name": "ffi",
-        "sha256": "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21",
+        "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.2"
+      "version": "2.1.3"
     },
     "file": {
       "dependency": "transitive",
@@ -556,11 +561,11 @@
       "dependency": "direct main",
       "description": {
         "name": "file_saver",
-        "sha256": "bdebc720e17b3e01aba59da69b6d47020a7e5ba7d5c75bd9194f9618d5f16ef4",
+        "sha256": "017a127de686af2d2fbbd64afea97052d95f2a0f87d19d25b87e097407bf9c1e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.12"
+      "version": "0.2.14"
     },
     "fixnum": {
       "dependency": "direct main",
@@ -642,21 +647,21 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_inappwebview",
-        "sha256": "3e9a443a18ecef966fb930c3a76ca5ab6a7aafc0c7b5e14a4a850cf107b09959",
+        "sha256": "93cfcca02bdda4b26cd700cf70d9ddba09d8348e3e8f2857638c23ed23a4fcb4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.0.0"
+      "version": "6.1.4"
     },
     "flutter_inappwebview_android": {
       "dependency": "transitive",
       "description": {
         "name": "flutter_inappwebview_android",
-        "sha256": "d247f6ed417f1f8c364612fa05a2ecba7f775c8d0c044c1d3b9ee33a6515c421",
+        "sha256": "62557c15a5c2db5d195cb3892aab74fcaec266d7b86d59a6f0027abd672cddba",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.13"
+      "version": "1.1.3"
     },
     "flutter_inappwebview_internal_annotations": {
       "dependency": "transitive",
@@ -672,51 +677,61 @@
       "dependency": "transitive",
       "description": {
         "name": "flutter_inappwebview_ios",
-        "sha256": "f363577208b97b10b319cd0c428555cd8493e88b468019a8c5635a0e4312bd0f",
+        "sha256": "5818cf9b26cf0cbb0f62ff50772217d41ea8d3d9cc00279c45f8aabaa1b4025d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.13"
+      "version": "1.1.2"
     },
     "flutter_inappwebview_macos": {
       "dependency": "transitive",
       "description": {
         "name": "flutter_inappwebview_macos",
-        "sha256": "b55b9e506c549ce88e26580351d2c71d54f4825901666bd6cfa4be9415bb2636",
+        "sha256": "c1fbb86af1a3738e3541364d7d1866315ffb0468a1a77e34198c9be571287da1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.11"
+      "version": "1.1.2"
     },
     "flutter_inappwebview_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "flutter_inappwebview_platform_interface",
-        "sha256": "545fd4c25a07d2775f7d5af05a979b2cac4fbf79393b0a7f5d33ba39ba4f6187",
+        "sha256": "cf5323e194096b6ede7a1ca808c3e0a078e4b33cc3f6338977d75b4024ba2500",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.10"
+      "version": "1.3.0+1"
     },
     "flutter_inappwebview_web": {
       "dependency": "transitive",
       "description": {
         "name": "flutter_inappwebview_web",
-        "sha256": "d8c680abfb6fec71609a700199635d38a744df0febd5544c5a020bd73de8ee07",
+        "sha256": "55f89c83b0a0d3b7893306b3bb545ba4770a4df018204917148ebb42dc14a598",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.8"
+      "version": "1.1.2"
+    },
+    "flutter_inappwebview_windows": {
+      "dependency": "transitive",
+      "description": {
+        "name": "flutter_inappwebview_windows",
+        "sha256": "95ebc65aecfa63b2084c822aec6ba0545f0a0afaa3899f2c752ec96c09108db5",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.5.0+2"
     },
     "flutter_launcher_icons": {
       "dependency": "direct main",
       "description": {
         "name": "flutter_launcher_icons",
-        "sha256": "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea",
+        "sha256": "619817c4b65b322b5104b6bb6dfe6cda62d9729bd7ad4303ecc8b4e690a67a77",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.13.1"
+      "version": "0.14.1"
     },
     "flutter_local_authentication": {
       "dependency": "direct main",
@@ -733,11 +748,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_local_notifications",
-        "sha256": "c500d5d9e7e553f06b61877ca6b9c8b92c570a4c8db371038702e8ce57f8a50f",
+        "sha256": "49eeef364fddb71515bc78d5a8c51435a68bccd6e4d68e25a942c5e47761ae71",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "17.2.2"
+      "version": "17.2.3"
     },
     "flutter_local_notifications_linux": {
       "dependency": "transitive",
@@ -769,21 +784,21 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_native_splash",
-        "sha256": "edf39bcf4d74aca1eb2c1e43c3e445fd9f494013df7f0da752fefe72020eedc0",
+        "sha256": "aa06fec78de2190f3db4319dd60fdc8d12b2626e93ef9828633928c2dcaea840",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.0"
+      "version": "2.4.1"
     },
     "flutter_plugin_android_lifecycle": {
       "dependency": "transitive",
       "description": {
         "name": "flutter_plugin_android_lifecycle",
-        "sha256": "c6b0b4c05c458e1c01ad9bcc14041dd7b1f6783d487be4386f793f47a8a4d03e",
+        "sha256": "9ee02950848f61c4129af3d6ec84a1cfc0e47931abc746b03e7a3bc3e8ff6eda",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.20"
+      "version": "2.0.22"
     },
     "flutter_secure_storage": {
       "dependency": "direct main",
@@ -800,7 +815,7 @@
       "description": {
         "path": "flutter_secure_storage_linux",
         "ref": "develop",
-        "resolved-ref": "cb30953edc029dc4059b72700270b4cd3a3afade",
+        "resolved-ref": "5a5692b609b3886cdd49b2ed06b9c079ecdff996",
         "url": "https://github.com/mogol/flutter_secure_storage.git"
       },
       "source": "git",
@@ -850,11 +865,11 @@
       "dependency": "transitive",
       "description": {
         "name": "flutter_shaders",
-        "sha256": "02750b545c01ff4d8e9bbe8f27a7731aa3778402506c67daa1de7f5fc3f4befe",
+        "sha256": "34794acadd8275d971e02df03afee3dee0f98dbfb8c4837082ad0034f612a3e2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.1.2"
+      "version": "0.1.3"
     },
     "flutter_speed_dial": {
       "dependency": "direct main",
@@ -880,11 +895,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_svg",
-        "sha256": "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2",
+        "sha256": "54900a1a1243f3c4a5506d853a2b5c2dbc38d5f27e52a52618a8054401431123",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.10+1"
+      "version": "2.0.16"
     },
     "flutter_test": {
       "dependency": "direct dev",
@@ -912,11 +927,11 @@
       "dependency": "transitive",
       "description": {
         "name": "freezed_annotation",
-        "sha256": "c3fd9336eb55a38cc1bbd79ab17573113a8deccd0ecbbf926cca3c62803b5c2d",
+        "sha256": "c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.1"
+      "version": "2.4.4"
     },
     "frontend_server_client": {
       "dependency": "transitive",
@@ -962,11 +977,11 @@
       "dependency": "transitive",
       "description": {
         "name": "graphs",
-        "sha256": "aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19",
+        "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.1"
+      "version": "2.3.2"
     },
     "gtk": {
       "dependency": "transitive",
@@ -982,21 +997,21 @@
       "dependency": "transitive",
       "description": {
         "name": "hashlib",
-        "sha256": "67e640e19cc33070113acab3125cd48ebe480a0300e15554dec089b8878a729f",
+        "sha256": "f572f2abce09fc7aee53f15927052b9732ea1053e540af8cae211111ee0b99b1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.16.0"
+      "version": "1.21.0"
     },
     "hashlib_codecs": {
       "dependency": "transitive",
       "description": {
         "name": "hashlib_codecs",
-        "sha256": "a1c7b5d89ff29e81fd8e8c0b35966db4c935e149fc4ebe1ebf71e358c15863ab",
+        "sha256": "8cea9ccafcfeaa7324d2ae52c61c69f7ff71f4237507a018caab31b9e416e3b1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.0"
+      "version": "2.6.0"
     },
     "hex": {
       "dependency": "transitive",
@@ -1069,7 +1084,7 @@
       "version": "0.19.0"
     },
     "io": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "io",
         "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e",
@@ -1142,11 +1157,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "lints",
-        "sha256": "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235",
+        "sha256": "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.0"
+      "version": "5.0.0"
     },
     "local_auth": {
       "dependency": "direct main",
@@ -1162,21 +1177,21 @@
       "dependency": "direct main",
       "description": {
         "name": "local_auth_android",
-        "sha256": "48dfb2d954da8ef6a77adfc93a29998f7729e9308eaa817e91dea4500317b2c8",
+        "sha256": "5351c7eea8823de28e37d8b7b3e386d944b80f2a77edb91a5707fb97a41fc1b1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.39"
+      "version": "1.0.45"
     },
     "local_auth_darwin": {
       "dependency": "direct main",
       "description": {
         "name": "local_auth_darwin",
-        "sha256": "7ba5738c874ca2b910d72385d00d2bebad9d4e807612936cf5e32bc01a048c71",
+        "sha256": "6d2950da311d26d492a89aeb247c72b4653ddc93601ea36a84924a396806d49c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.4.0"
+      "version": "1.4.1"
     },
     "local_auth_platform_interface": {
       "dependency": "transitive",
@@ -1192,11 +1207,11 @@
       "dependency": "transitive",
       "description": {
         "name": "local_auth_windows",
-        "sha256": "505ba3367ca781efb1c50d3132e44a2446bccc4163427bc203b9b4d8994d97ea",
+        "sha256": "bc4e66a29b0fdf751aafbec923b5bed7ad6ed3614875d8151afe2578520b2ab5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.10"
+      "version": "1.0.11"
     },
     "logging": {
       "dependency": "direct main",
@@ -1208,6 +1223,16 @@
       "source": "hosted",
       "version": "1.2.0"
     },
+    "macros": {
+      "dependency": "transitive",
+      "description": {
+        "name": "macros",
+        "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.1.2-main.4"
+    },
     "matcher": {
       "dependency": "transitive",
       "description": {
@@ -1252,11 +1277,11 @@
       "dependency": "transitive",
       "description": {
         "name": "mime",
-        "sha256": "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2",
+        "sha256": "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.5"
+      "version": "1.0.6"
     },
     "mocktail": {
       "dependency": "direct dev",
@@ -1392,21 +1417,21 @@
       "dependency": "direct main",
       "description": {
         "name": "path_provider",
-        "sha256": "c9e7d3a4cd1410877472158bee69963a4579f78b68c65a2b7d40d1a7a88bb161",
+        "sha256": "fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.3"
+      "version": "2.1.4"
     },
     "path_provider_android": {
       "dependency": "transitive",
       "description": {
         "name": "path_provider_android",
-        "sha256": "9c96da072b421e98183f9ea7464898428e764bc0ce5567f27ec8693442e72514",
+        "sha256": "6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.5"
+      "version": "2.2.10"
     },
     "path_provider_foundation": {
       "dependency": "transitive",
@@ -1442,11 +1467,11 @@
       "dependency": "transitive",
       "description": {
         "name": "path_provider_windows",
-        "sha256": "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170",
+        "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.1"
+      "version": "2.3.0"
     },
     "petitparser": {
       "dependency": "transitive",
@@ -1562,11 +1587,11 @@
       "dependency": "transitive",
       "description": {
         "name": "qr",
-        "sha256": "64957a3930367bf97cc211a5af99551d630f2f4625e38af10edd6b19131b64b3",
+        "sha256": "5a1d2586170e172b8a8c8470bbbffd5eb0cd38a66c0d77155ea138d3af3a4445",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.1"
+      "version": "3.0.2"
     },
     "qr_code_scanner": {
       "dependency": "direct main",
@@ -1602,21 +1627,21 @@
       "dependency": "direct main",
       "description": {
         "name": "sentry",
-        "sha256": "0f787e27ff617e4f88f7074977240406a9c5509444bac64a4dfa5b3200fb5632",
+        "sha256": "033287044a6644a93498969449d57c37907e56f5cedb17b88a3ff20a882261dd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.7.0"
+      "version": "8.9.0"
     },
     "sentry_flutter": {
       "dependency": "direct main",
       "description": {
         "name": "sentry_flutter",
-        "sha256": "fbbb47d72ccca48be25bf3c2ced6ab6e872991af3a0ba78e54be8d138f2e053f",
+        "sha256": "3780b5a0bb6afd476857cfbc6c7444d969c29a4d9bd1aa5b6960aa76c65b737a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.7.0"
+      "version": "8.9.0"
     },
     "share_plus": {
       "dependency": "direct main",
@@ -1642,71 +1667,71 @@
       "dependency": "direct main",
       "description": {
         "name": "shared_preferences",
-        "sha256": "d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180",
+        "sha256": "746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.3"
+      "version": "2.3.2"
     },
     "shared_preferences_android": {
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_android",
-        "sha256": "93d0ec9dd902d85f326068e6a899487d1f65ffcd5798721a95330b26c8131577",
+        "sha256": "480ba4345773f56acda9abf5f50bd966f581dac5d514e5fc4a18c62976bbba7e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.3"
+      "version": "2.3.2"
     },
     "shared_preferences_foundation": {
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_foundation",
-        "sha256": "0a8a893bf4fd1152f93fec03a415d11c27c74454d96e2318a7ac38dd18683ab7",
+        "sha256": "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.0"
+      "version": "2.5.3"
     },
     "shared_preferences_linux": {
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_linux",
-        "sha256": "9f2cbcf46d4270ea8be39fa156d86379077c8a5228d9dfdb1164ae0bb93f1faa",
+        "sha256": "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.2"
+      "version": "2.4.1"
     },
     "shared_preferences_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_platform_interface",
-        "sha256": "22e2ecac9419b4246d7c22bfbbda589e3acf5c0351137d87dd2939d984d37c3b",
+        "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.2"
+      "version": "2.4.1"
     },
     "shared_preferences_web": {
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_web",
-        "sha256": "d762709c2bbe80626ecc819143013cc820fa49ca5e363620ee20a8b15a3e3daf",
+        "sha256": "d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.1"
+      "version": "2.4.2"
     },
     "shared_preferences_windows": {
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_windows",
-        "sha256": "841ad54f3c8381c480d0c9b508b89a34036f512482c407e6df7a9c4aa2ef8f59",
+        "sha256": "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.2"
+      "version": "2.4.1"
     },
     "shelf": {
       "dependency": "transitive",
@@ -1758,11 +1783,11 @@
       "dependency": "transitive",
       "description": {
         "name": "sodium_libs",
-        "sha256": "441444f6f433032bae3444c2ef5ed2cf5bc0def77f104abdff20aedcf79a7c7a",
+        "sha256": "aa764acd6ccc6113e119c2d99471aeeb4637a9a501639549b297d3a143ff49b3",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.1+5"
+      "version": "2.2.1+6"
     },
     "source_gen": {
       "dependency": "transitive",
@@ -1809,31 +1834,31 @@
       "description": {
         "path": "sqflite",
         "ref": "HEAD",
-        "resolved-ref": "3309d399dd7d695bbfa7c05f643bb16765cef4ee",
+        "resolved-ref": "699aaafa282d823b89ca568aac7a68d2c29ddab6",
         "url": "https://github.com/tekartik/sqflite"
       },
       "source": "git",
-      "version": "2.3.3+1"
+      "version": "2.3.3+2"
     },
     "sqflite_common": {
       "dependency": "transitive",
       "description": {
         "name": "sqflite_common",
-        "sha256": "3da423ce7baf868be70e2c0976c28a1bb2f73644268b7ffa7d2e08eab71f16a4",
+        "sha256": "2d8e607db72e9cb7748c9c6e739e2c9618320a5517de693d5a24609c4671b1a4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.4"
+      "version": "2.5.4+4"
     },
     "sqflite_common_ffi": {
       "dependency": "direct main",
       "description": {
         "name": "sqflite_common_ffi",
-        "sha256": "4d6137c29e930d6e4a8ff373989dd9de7bac12e3bc87bce950f6e844e8ad3bb5",
+        "sha256": "a6057d4c87e9260ba1ec436ebac24760a110589b9c0a859e128842eb69a7ef04",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.3"
+      "version": "2.3.3+1"
     },
     "sqlite3": {
       "dependency": "direct main",
@@ -1859,11 +1884,11 @@
       "dependency": "direct main",
       "description": {
         "name": "steam_totp",
-        "sha256": "3c09143c983f6bb05bb53e9232f9d40bbcc01c596ba0273c3e6bb246729abfa1",
+        "sha256": "f47163df9be533024cecb97ca9bb1f29bb5575409a22fe4acdd9d70288d38d0d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.0.1"
+      "version": "0.0.2"
     },
     "step_progress_indicator": {
       "dependency": "direct main",
@@ -1919,11 +1944,11 @@
       "dependency": "transitive",
       "description": {
         "name": "synchronized",
-        "sha256": "539ef412b170d65ecdafd780f924e5be3f60032a1128df156adad6c5b373d558",
+        "sha256": "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.0+1"
+      "version": "3.3.0+3"
     },
     "term_glyph": {
       "dependency": "transitive",
@@ -1949,11 +1974,11 @@
       "dependency": "transitive",
       "description": {
         "name": "timezone",
-        "sha256": "a6ccda4a69a442098b602c44e61a1e2b4bf6f5516e875bbf0f427d5df14745d5",
+        "sha256": "2236ec079a174ce07434e89fcd3fcda430025eb7692244139a9cf54fdcf1fc7d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.3"
+      "version": "0.9.4"
     },
     "timing": {
       "dependency": "transitive",
@@ -1969,11 +1994,11 @@
       "dependency": "direct main",
       "description": {
         "name": "tray_manager",
-        "sha256": "c9a63fd88bd3546287a7eb8ccc978d707eef82c775397af17dda3a4f4c039e64",
+        "sha256": "bdc3ac6c36f3d12d871459e4a9822705ce5a1165a17fa837103bc842719bf3f7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.3"
+      "version": "0.2.4"
     },
     "tuple": {
       "dependency": "direct main",
@@ -2029,41 +2054,41 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_android",
-        "sha256": "ceb2625f0c24ade6ef6778d1de0b2e44f2db71fded235eb52295247feba8c5cf",
+        "sha256": "a4e5f34f2fadf1fa7b4e69db89189056e313c9c98e8ad420e6b53677b6abc334",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.3"
+      "version": "6.3.11"
     },
     "url_launcher_ios": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_ios",
-        "sha256": "7068716403343f6ba4969b4173cbf3b84fc768042124bc2c011e5d782b24fe89",
+        "sha256": "e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.0"
+      "version": "6.3.1"
     },
     "url_launcher_linux": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_linux",
-        "sha256": "ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811",
+        "sha256": "e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.1"
+      "version": "3.2.0"
     },
     "url_launcher_macos": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_macos",
-        "sha256": "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de",
+        "sha256": "769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.0"
+      "version": "3.2.1"
     },
     "url_launcher_platform_interface": {
       "dependency": "transitive",
@@ -2099,21 +2124,21 @@
       "dependency": "direct main",
       "description": {
         "name": "uuid",
-        "sha256": "814e9e88f21a176ae1359149021870e87f7cddaf633ab678a5d2b0bff7fd1ba8",
+        "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.4.0"
+      "version": "4.5.1"
     },
     "vector_graphics": {
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics",
-        "sha256": "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3",
+        "sha256": "27d5fefe86fb9aace4a9f8375b56b3c292b64d8c04510df230f849850d912cb7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.11+1"
+      "version": "1.1.15"
     },
     "vector_graphics_codec": {
       "dependency": "transitive",
@@ -2129,11 +2154,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics_compiler",
-        "sha256": "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81",
+        "sha256": "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.11+1"
+      "version": "1.1.16"
     },
     "vector_math": {
       "dependency": "transitive",
@@ -2169,11 +2194,11 @@
       "dependency": "transitive",
       "description": {
         "name": "web",
-        "sha256": "d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062",
+        "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.0"
+      "version": "1.1.0"
     },
     "web_socket": {
       "dependency": "transitive",
@@ -2199,21 +2224,21 @@
       "dependency": "direct main",
       "description": {
         "name": "win32",
-        "sha256": "a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4",
+        "sha256": "4d45dc9069dba4619dc0ebd93c7cec5e66d8482cb625a370ac806dcc8165f2ec",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.5.1"
+      "version": "5.5.5"
     },
     "win32_registry": {
       "dependency": "transitive",
       "description": {
         "name": "win32_registry",
-        "sha256": "10589e0d7f4e053f2c61023a31c9ce01146656a70b7b7f0828c0b46d7da2a9bb",
+        "sha256": "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.3"
+      "version": "1.1.5"
     },
     "window_manager": {
       "dependency": "direct main",
@@ -2226,14 +2251,14 @@
       "version": "0.4.2"
     },
     "xdg_directories": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "xdg_directories",
-        "sha256": "faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d",
+        "sha256": "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.4"
+      "version": "1.1.0"
     },
     "xml": {
       "dependency": "transitive",
@@ -2267,7 +2292,7 @@
     }
   },
   "sdks": {
-    "dart": ">=3.4.0 <4.0.0",
-    "flutter": ">=3.22.0"
+    "dart": ">=3.5.0 <4.0.0",
+    "flutter": ">=3.24.0"
   }
 }

pkgs/by-name/en/ente-auth/simple-icons.json

@@ -1,6 +1,6 @@
 {
     "owner": "simple-icons",
     "repo": "simple-icons",
-    "rev": "bffc992b7d1365ee44b1683f8397e9f7a44d0c2c",
-    "hash": "sha256-aqX6X/UsXXprWYU0xYK+wM9vWULYI8enCbVFebEM0yw="
+    "rev": "954790ce652942533e9e59bfb9c8cc7e99962f88",
+    "hash": "sha256-mNqiWA/wvJxAMwzzeWXb/77JAFvJL707ktEdRHJctO4="
 }

pkgs/by-name/en/enzyme/package.nix

@@ -7,13 +7,13 @@
 }:
 llvmPackages.stdenv.mkDerivation rec {
   pname = "enzyme";
-  version = "0.0.165";
+  version = "0.0.168";
 
   src = fetchFromGitHub {
     owner = "EnzymeAD";
     repo = "Enzyme";
     rev = "v${version}";
-    hash = "sha256-EyIpbcCJHj09Aa/NMr9BqOHvaWvaRqetCQRy2oxiJKE=";
+    hash = "sha256-Pnx+eC2JSs0BSN6cXD44hjY9LM9EmUf7bZNfiJOIRJU=";
   };
 
   postPatch = ''

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

@@ -4,7 +4,6 @@
   autoPatchelfHook,
   makeWrapper,
   lib,
-  copyDesktopItems,
   libnotify,
   libX11,
   libXScrnSaver,
@@ -71,11 +70,17 @@ stdenv.mkDerivation (finalAttrs: {
     mkdir -p $out
     cp -r usr/* $out/
 
-    makeWrapper $out/share/eusoft-eudic/eudic $out/bin/eudic
+    makeWrapper $out/share/eusoft-eudic/eudic $out/bin/eudic \
+      --inherit-argv0
 
     runHook postInstall
   '';
 
+  postFixup = ''
+    substituteInPlace $out/share/applications/eusoft-eudic.desktop \
+      --replace-fail '/usr/share/eusoft-eudic/AppRun' 'eudic'
+  '';
+
   meta = {
     description = "Authoritative English Dictionary Software Essential Tools for English Learners";
     homepage = "https://www.eudic.net/v4/en/app/eudic";

pkgs/by-name/ew/eww/package.nix

@@ -2,6 +2,7 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
+  installShellFiles,
   pkg-config,
   wrapGAppsHook3,
   gtk3,
@@ -31,6 +32,7 @@ rustPlatform.buildRustPackage rec {
   cargoHash = "sha256-55lmQl5pJwrEj5RlSG8b0PqtZVrASxTmX4Qdk090DZo=";
 
   nativeBuildInputs = [
+    installShellFiles
     pkg-config
     wrapGAppsHook3
   ];
@@ -52,6 +54,13 @@ rustPlatform.buildRustPackage rec {
   # requires unstable rust features
   RUSTC_BOOTSTRAP = 1;
 
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd eww \
+      --bash <($out/bin/eww shell-completions --shell bash) \
+      --fish <($out/bin/eww shell-completions --shell fish) \
+      --zsh <($out/bin/eww shell-completions --shell zsh)
+  '';
+
   passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
 
   meta = {

pkgs/by-name/fs/fsarchiver/package.nix

@@ -17,7 +17,7 @@
 }:
 
 let
-  version = "0.8.7";
+  version = "0.8.8";
 
 in
 stdenv.mkDerivation {
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
     owner = "fdupoux";
     repo = "fsarchiver";
     rev = version;
-    sha256 = "sha256-1ZIqFgB05gV1L7P/AIL4qfYT4cNMp75QElEM64BXyO8=";
+    sha256 = "sha256-bEwNqPQRpjfOVTUog9wsZfS5yQ7Z21pHolPRLlbzHAA=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/fy/fyne/package.nix

@@ -17,16 +17,16 @@
 
 buildGoModule rec {
   pname = "fyne";
-  version = "2.5.2";
+  version = "2.5.3";
 
   src = fetchFromGitHub {
     owner = "fyne-io";
     repo = "fyne";
     rev = "refs/tags/v${version}";
-    hash = "sha256-XaD7t1hSv5plDa6QHDTyoWgzvSFMRezvHl47YphXoig=";
+    hash = "sha256-DSJZMsvAs1hB1nv5B36yjSSSdw/VaextWw8lchCQ38E=";
   };
 
-  vendorHash = "sha256-uV+pbGxAV/uuHV0xl2vPZpgGYRj9/E0rhFtLfCV5rnE=";
+  vendorHash = "sha256-X6K7IV+yjKXw/1A5HikS0T8rtrn7gLZM2d0VoyIdOT4=";
 
   nativeBuildInputs = [ pkg-config ];
 

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

@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "go-dnscollector";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "dmachard";
     repo = "go-dnscollector";
     rev = "v${version}";
-    sha256 = "sha256-at5tTJAmBypdCDCnqRY9zCjMxWD80Ry1bDZZkJeKzGY=";
+    sha256 = "sha256-kpVPQOeWlzJ2u04jHgLimZJcl/XkD+Tiok9LEcFywdU=";
   };
 
-  vendorHash = "sha256-AqG1CkGVq95S5BFWeB3O7sjvtC09UjzWVfWkB0nxYFg=";
+  vendorHash = "sha256-qAybkMVHxzNJalm1203Ox082PIRnveypzaKoibm7zlY=";
 
   subPackages = [ "." ];
 

pkgs/by-name/hy/hyprcursor/package.nix

@@ -1,6 +1,6 @@
 {
   lib,
-  stdenv,
+  gcc14Stdenv,
   fetchFromGitHub,
   cmake,
   pkg-config,
@@ -11,8 +11,9 @@
   xcur2png,
   tomlplusplus,
   nix-update-script,
+  fetchpatch,
 }:
-stdenv.mkDerivation (finalAttrs: {
+gcc14Stdenv.mkDerivation (finalAttrs: {
   pname = "hyprcursor";
   version = "0.1.10";
 
@@ -43,6 +44,14 @@ stdenv.mkDerivation (finalAttrs: {
     "lib"
   ];
 
+  patches = [
+    # NOTE: remove after next release
+    (fetchpatch {
+      name = "001-add-fstream-include";
+      url = "https://github.com/hyprwm/hyprcursor/commit/c18572a92eb39e4921b4f4c2bca8521b6f701b58.patch";
+      hash = "sha256-iHRRd/18xEAgvJgmZeSzMp53s+zdIpuaP/sayRfcft4=";
+    })
+  ];
   passthru.updateScript = nix-update-script { };
 
   meta = {

pkgs/by-name/hy/hyprgraphics/package.nix

@@ -0,0 +1,58 @@
+{
+  lib,
+  gcc14Stdenv,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  cairo,
+  file,
+  hyprutils,
+  libjpeg,
+  libjxl,
+  libwebp,
+  pixman,
+}:
+
+gcc14Stdenv.mkDerivation (finalAttrs: {
+  pname = "hyprgraphics";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner = "hyprwm";
+    repo = "hyprgraphics";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-FFLJzFTyNhS7tBEEECx0B8Ye/bpmxhFVEKlECgMLc6c=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
+  buildInputs = [
+    cairo
+    file
+    hyprutils
+    libjpeg
+    libjxl
+    libwebp
+    pixman
+  ];
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  doCheck = true;
+
+  meta = {
+    homepage = "https://github.com/hyprwm/hyprlang";
+    description = "Official implementation library for the hypr config language";
+    license = lib.licenses.lgpl3Only;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [
+      khaneliman
+    ];
+  };
+})

pkgs/by-name/hy/hypridle/package.nix

@@ -1,6 +1,6 @@
 {
   lib,
-  stdenv,
+  gcc14Stdenv,
   fetchFromGitHub,
   pkg-config,
   cmake,
@@ -14,7 +14,7 @@
   nix-update-script,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+gcc14Stdenv.mkDerivation (finalAttrs: {
   pname = "hypridle";
   version = "0.1.5";
 

pkgs/by-name/hy/hyprlang/package.nix

@@ -1,23 +1,30 @@
 {
   lib,
-  stdenv,
+  gcc14Stdenv,
   fetchFromGitHub,
   cmake,
+  pkg-config,
+  hyprutils,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+gcc14Stdenv.mkDerivation (finalAttrs: {
   pname = "hyprlang";
-  version = "0.5.2";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hyprlang";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Jq9hHYFL5nMHArWgJIcrDHGnzs/MjDi95cyB7cUZIJ4=";
+    hash = "sha256-oj8V4kvzor5AOStzj4/B4W1ZIObAPxT9K4NfXx7dyKE=";
   };
 
   nativeBuildInputs = [
     cmake
+    pkg-config
+  ];
+
+  buildInputs = [
+    hyprutils
   ];
 
   outputs = [

pkgs/by-name/hy/hyprlock/package.nix

@@ -1,6 +1,6 @@
 {
   lib,
-  stdenv,
+  gcc14Stdenv,
   fetchFromGitHub,
   cmake,
   pkg-config,
@@ -24,7 +24,7 @@
   nix-update-script,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+gcc14Stdenv.mkDerivation (finalAttrs: {
   pname = "hyprlock";
   version = "0.5.0";
 

pkgs/by-name/hy/hyprpaper/package.nix

@@ -1,8 +1,7 @@
 {
   lib,
-  stdenv,
+  gcc14Stdenv,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
   cairo,
   expat,
@@ -12,6 +11,7 @@
   libdatrie,
   libGL,
   libjpeg,
+  libjxl,
   libselinux,
   libsepol,
   libthai,
@@ -27,27 +27,20 @@
   wayland-scanner,
   hyprwayland-scanner,
   hyprutils,
+  hyprgraphics,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+gcc14Stdenv.mkDerivation (finalAttrs: {
   pname = "hyprpaper";
-  version = "0.7.1";
+  version = "0.7.2";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hyprpaper";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-HIK7XJWQCM0BAnwW5uC7P0e7DAkVTy5jlxQ0NwoSy4M=";
+    hash = "sha256-bXWLq/0Ji13CM4uX4tnBgWpvRysh4H3N1OC1t6d1Sfc=";
   };
 
-  patches = [
-    # CMakeLists: look for wayland.xml protocol in wayland-scanner pkgdata
-    (fetchpatch {
-      url = "https://github.com/hyprwm/hyprpaper/commit/6c6e54faa84d2de94d2321eda43a8a669ebf3312.patch";
-      hash = "sha256-Ns7HlUPVgBDIocZRGR6kIW58Mt92kJPQRMSKTvp6Vik=";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -64,6 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
     libdatrie
     libGL
     libjpeg
+    libjxl
     libselinux
     libsepol
     libthai
@@ -76,11 +70,12 @@ stdenv.mkDerivation (finalAttrs: {
     wayland
     wayland-protocols
     hyprutils
+    hyprgraphics
   ];
 
   prePatch = ''
     substituteInPlace src/main.cpp \
-      --replace GIT_COMMIT_HASH '"${finalAttrs.src.rev}"'
+      --replace-fail GIT_COMMIT_HASH '"${finalAttrs.src.rev}"'
   '';
 
   meta = with lib; {
@@ -93,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: {
       wozeparrot
     ];
     inherit (wayland.meta) platforms;
-    broken = stdenv.hostPlatform.isDarwin;
+    broken = gcc14Stdenv.hostPlatform.isDarwin;
     mainProgram = "hyprpaper";
   };
 })

pkgs/by-name/ke/keyboard-layout-editor/deps.json

@@ -0,0 +1,112 @@
+{
+ "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
+ "!version": 1,
+ "https://plugins.gradle.org/m2": {
+  "com/google/code/findbugs#jsr305/3.0.2": {
+   "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=",
+   "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4="
+  },
+  "com/google/gradle#osdetector-gradle-plugin/1.7.3": {
+   "jar": "sha256-a0aS+ROiGx+2Axae54uo8+SrKvnXYq+cqIt5EmwcCtE=",
+   "pom": "sha256-hGDJUBJ8o1mHZhYeOLT/jWO01p+4MQoW4As1E1ABDBE="
+  },
+  "kr/motd/maven#os-maven-plugin/1.7.1": {
+   "jar": "sha256-9Hru+Ggh5SsrGHWJeL0EXwPXIikuMudHCCEixiKJUuA=",
+   "pom": "sha256-S3WABEIrljPdMY8p54Tx0YC9ilkgzVCvGTCGH21qVHY="
+  },
+  "org/openjfx#javafx-plugin/0.1.0": {
+   "jar": "sha256-Xq7sB5m0QGRrDKTP2iGaMttr4rpXktAyoNpKOlw4j6s=",
+   "module": "sha256-rf+3RA0kntF8BJOD1nBp+UU7F3gncMAFtoKkNBbYNmE=",
+   "pom": "sha256-NMjfVSfrWjXl8AmjzeH3oInEzkoOclgC8uy+UDu9PLY="
+  },
+  "org/openjfx/javafxplugin#org.openjfx.javafxplugin.gradle.plugin/0.1.0": {
+   "pom": "sha256-1tASf/Q2PQAXPDV6mByec+/wPDCl0Ohq2CtgVPrvqEE="
+  },
+  "org/sonatype/oss#oss-parent/7": {
+   "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
+  },
+  "org/sonatype/oss#oss-parent/9": {
+   "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno="
+  }
+ },
+ "https://repo.maven.apache.org/maven2": {
+  "com/google/code/gson#gson-parent/2.8.5": {
+   "pom": "sha256-jx/scrkaceo57Dn193jE0RJLawl8bVWzpQtVSlIjeyc="
+  },
+  "com/google/code/gson#gson/2.8.5": {
+   "jar": "sha256-IzoBSfw2XJ9u29aDz+JmsZvcdzvpjqva9rPJJLSOfYE=",
+   "pom": "sha256-uDCFV6f8zJLZ/nyM0FmSWLNhKF0uzedontqYhDJVoJI="
+  },
+  "commons-io#commons-io/2.6": {
+   "jar": "sha256-+HfTBGYKwqFC84ZbrfyXHex+1zx0fH+NXS9ROcpzZRM=",
+   "pom": "sha256-DCOGOJOiKR9aev29jRWSOzlIr9h+Vj+jQc3Pbq4zimA="
+  },
+  "junit#junit/4.12": {
+   "jar": "sha256-WXIfCAXiI9hLkGd4h9n/Vn3FNNfFAsqQPAwrF/BcEWo=",
+   "pom": "sha256-kPFj944/+28cetl96efrpO6iWAcUG4XW0SvmfKJUScQ="
+  },
+  "org/apache#apache/15": {
+   "pom": "sha256-NsLy+XmsZ7RQwMtIDk6br2tA86aB8iupaSKH0ROa1JQ="
+  },
+  "org/apache#apache/18": {
+   "pom": "sha256-eDEwcoX9R1u8NrIK4454gvEcMVOx1ZMPhS1E7ajzPBc="
+  },
+  "org/apache#apache/19": {
+   "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8="
+  },
+  "org/apache/commons#commons-exec/1.3": {
+   "jar": "sha256-y0mBLcG/sOpPIPOYvK4aiMZAbiE+Z/dST7ENT4rZNHs=",
+   "pom": "sha256-goJ/YBnA9xvXT7qIarM3/22ikfY9+XIzeaIJ1q07RPg="
+  },
+  "org/apache/commons#commons-lang3/3.8.1": {
+   "jar": "sha256-2sgH9lsHaY/zmxsHv+89h64/1G2Ru/iivAKyqDFhb2g=",
+   "pom": "sha256-7I4J91QRaFIFvQ2deHLMNiLmfHbfRKCiJ7J4vqBEWNU="
+  },
+  "org/apache/commons#commons-parent/35": {
+   "pom": "sha256-cJihq4M27NTJ3CHLvKyGn4LGb2S4rE95iNQbT8tE5Jo="
+  },
+  "org/apache/commons#commons-parent/42": {
+   "pom": "sha256-zTE0lMZwtIPsJWlyrxaYszDlmPgHACNU63ZUefYEsJw="
+  },
+  "org/apache/commons#commons-parent/47": {
+   "pom": "sha256-io7LVwVTv58f+uIRqNTKnuYwwXr+WSkzaPunvZtC/Lc="
+  },
+  "org/hamcrest#hamcrest-core/1.3": {
+   "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=",
+   "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM="
+  },
+  "org/hamcrest#hamcrest-parent/1.3": {
+   "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps="
+  },
+  "org/openjfx#javafx-base/17": {
+   "pom": "sha256-uLgDYSRg1flc6XS9XYRx1G4/aOzteCfdjUSRwDAi9yU="
+  },
+  "org/openjfx#javafx-base/17/linux": {
+   "jar": "sha256-JDzahjaTFMNLsQvgAj88mFaCNcpN7UpZ4Hgd1kC8SWI="
+  },
+  "org/openjfx#javafx-controls/17": {
+   "pom": "sha256-6UfbVFcEn1pKxmiSa2QUtLCRglYerVymiyNSTg4cwD8="
+  },
+  "org/openjfx#javafx-controls/17/linux": {
+   "jar": "sha256-pa085GMw/aiPjx4/ue8E1kR2O6C2mpXkl66JTjWdrQg="
+  },
+  "org/openjfx#javafx-fxml/17": {
+   "pom": "sha256-5+IA5aFv3qbIDne2IhWyVMt9thHEy9K9jGtVeLt39oE="
+  },
+  "org/openjfx#javafx-fxml/17/linux": {
+   "jar": "sha256-pkXtb3SSd3px+3c/IPO1OuIh9U0Fnl3p0dD2cmyam68="
+  },
+  "org/openjfx#javafx-graphics/17": {
+   "pom": "sha256-3RVlTvq6FiyolcdAxqA7vUEu8XNwyMcOq9j6PTUer+I="
+  },
+  "org/openjfx#javafx-graphics/17/linux": {
+   "jar": "sha256-YIAnF9iwTwE25rLNS5BGiQBSVml3328MF/dT+0eJ/aY="
+  },
+  "org/openjfx#javafx/17": {
+   "pom": "sha256-Mc+sHCBGlsqDJZzWCcK2kks3dBR+MOM9vEX+kKHnuww="
+  },
+  "org/sonatype/oss#oss-parent/7": {
+   "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
+  }
+ }
+}

pkgs/by-name/ke/keyboard-layout-editor/fix-build-gradle.patch

@@ -0,0 +1,95 @@
+diff --git a/build.gradle b/build.gradle
+index b411200..a558065 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -1,5 +1,17 @@
++buildscript {
++    repositories {
++        maven {
++            url "https://plugins.gradle.org/m2/"
++        }
++    }
++    dependencies {
++        classpath 'org.openjfx:javafx-plugin:0.1.0'
++    }
++}
++
+ plugins {
+     id 'java'
++    id 'org.openjfx.javafxplugin' version '0.1.0'
+ }
+ 
+ group 'cz.gresak'
+@@ -12,22 +24,26 @@ repositories {
+ }
+ 
+ dependencies {
+-    compile group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
+-    compile group: 'org.apache.commons', name: 'commons-exec', version: '1.3'
+-    compile group: 'commons-io', name: 'commons-io', version: '2.6'
+-    compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.8.1'
++    implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
++    implementation group: 'org.apache.commons', name: 'commons-exec', version: '1.3'
++    implementation group: 'commons-io', name: 'commons-io', version: '2.6'
++    implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.8.1'
+ 
+-    testCompile group: 'junit', name: 'junit', version: '4.12'
++    testImplementation group: 'junit', name: 'junit', version: '4.12'
+ }
+ 
+ compileJava {
+     options.encoding = 'UTF-8'
+ }
+ 
++javafx {
++    modules = [ 'javafx.base', 'javafx.graphics', 'javafx.fxml' ]
++}
++
+ jar {
+     manifest {
+         attributes(
+-                'Class-Path': configurations.compile.collect { it.getName() }.join(' '),
++                'Class-Path': configurations.runtimeClasspath.collect { it.getName() }.join(' '),
+                 'Main-Class': 'cz.gresak.keyboardeditor.Main'
+         )
+     }
+@@ -40,7 +56,8 @@ task fatJar(type: Jar) {
+                 'Implementation-Version': version,
+                 'Main-Class': 'cz.gresak.keyboardeditor.Main'
+     }
+-    baseName = project.name + '-all'
+-    from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
++    archiveBaseName = project.name + '-all'
++    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
++    from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
+     with jar
+ }
+\ No newline at end of file
+diff --git a/src/main/java/cz/gresak/keyboardeditor/component/Key.java b/src/main/java/cz/gresak/keyboardeditor/component/Key.java
+index d81d66d..9530faf 100644
+--- a/src/main/java/cz/gresak/keyboardeditor/component/Key.java
++++ b/src/main/java/cz/gresak/keyboardeditor/component/Key.java
+@@ -170,8 +170,8 @@ public class Key extends Pane {
+         bottomLeftChar.setLayoutY(bottomLine);
+         bottomRightChar.setLayoutY(bottomLine);
+         // horizontal alignment (needed only for the right column)
+-        double topLeftWidth = fontLoader.computeStringWidth(topLeftChar.getText(), topLeftChar.getFont());
+-        double bottomLeftWidth = fontLoader.computeStringWidth(bottomLeftChar.getText(), bottomLeftChar.getFont());
++        double topLeftWidth = 0.0; // fontLoader.computeStringWidth(topLeftChar.getText(), topLeftChar.getFont());
++        double bottomLeftWidth = 0.0; // fontLoader.computeStringWidth(bottomLeftChar.getText(), bottomLeftChar.getFont());
+         double maxLeftColumnLayoutX = Math.max(topLeftChar.getLayoutX(), bottomLeftChar.getLayoutX());
+         double xOffset = Math.max(
+                 (getWidth() / 2 - HPADDING) + KEY_COLUMN_SPACE, // center of the key
+diff --git a/src/main/java/cz/gresak/keyboardeditor/service/impl/FontProviderImpl.java b/src/main/java/cz/gresak/keyboardeditor/service/impl/FontProviderImpl.java
+index 4804505..a91ef5c 100644
+--- a/src/main/java/cz/gresak/keyboardeditor/service/impl/FontProviderImpl.java
++++ b/src/main/java/cz/gresak/keyboardeditor/service/impl/FontProviderImpl.java
+@@ -81,7 +81,7 @@ public class FontProviderImpl implements FontProvider {
+     @Override
+     public double getFontSize(String text, Font font, double widthToFit, double heightToFit) {
+         FontLoader fontLoader = Toolkit.getToolkit().getFontLoader();
+-        double sampleWidth = fontLoader.computeStringWidth(text, font);
++        double sampleWidth = 0.0; // fontLoader.computeStringWidth(text, font);
+         double fontSizeWidth = (widthToFit / sampleWidth) * font.getSize();
+ 
+         FontMetrics fontMetrics = fontLoader.getFontMetrics(font);

pkgs/by-name/ke/keyboard-layout-editor/package.nix

@@ -0,0 +1,73 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  gradle_8,
+  makeBinaryWrapper,
+  openjdk,
+  wrapGAppsHook3,
+  xorg,
+}:
+
+let
+  jdk = openjdk.override {
+    enableJavaFX = true;
+  };
+
+in
+stdenv.mkDerivation rec {
+  pname = "keyboard-layout-editor";
+  version = "0-unstable-2019-05-14";
+
+  src = fetchFromGitHub {
+    owner = "vgresak";
+    repo = "keyboard-layout-editor";
+    rev = "308c62ac4bb9ad25429f4d09c0aaa9f72d4194c9";
+    hash = "sha256-ieXHgXAdC1xVJWXwpf9sQ9FaSLeaJfd+Rr7uD8blwHE=";
+  };
+
+  patches = [ ./fix-build-gradle.patch ];
+
+  nativeBuildInputs = [
+    gradle_8
+    makeBinaryWrapper
+    wrapGAppsHook3
+  ];
+
+  mitmCache = gradle_8.fetchDeps {
+    inherit pname;
+    data = ./deps.json;
+  };
+
+  __darwinAllowLocalNetworking = true;
+
+  gradleBuildTask = "fatJar";
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/java
+    cp build/libs/keyboard-layout-editor-all-1.0-SNAPSHOT.jar $out/share/java/keyboard-layout-editor.jar
+    mkdir -p $out/bin
+    makeWrapper ${lib.getExe jdk} $out/bin/keyboard-layout-editor \
+      --prefix PATH : ${lib.makeBinPath [ xorg.xkbcomp ]} \
+      --add-flags "--add-opens=javafx.graphics/com.sun.prism=ALL-UNNAMED" \
+      --add-flags "--add-opens=javafx.graphics/com.sun.javafx.font=ALL-UNNAMED" \
+      --add-flags "--add-opens=javafx.graphics/com.sun.javafx.tk=ALL-UNNAMED" \
+      --add-flags "-cp $out/share/java/keyboard-layout-editor.jar cz.gresak.keyboardeditor.Main" \
+      ''${gappsWrapperArgs[@]}
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Keyboard layout editor for XKB";
+    homepage = "https://github.com/vgresak/keyboard-layout-editor";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fliegendewurst ];
+    mainProgram = "keyboard-layout-editor";
+    platforms = jdk.meta.platforms;
+    # gradle resolves platform-specific dependencies
+    broken = stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isDarwin;
+  };
+}

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

@@ -29,13 +29,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "labwc";
-  version = "0.8.1";
+  version = "0.8.2";
 
   src = fetchFromGitHub {
     owner = "labwc";
     repo = "labwc";
     rev = "refs/tags/${finalAttrs.version}";
-    hash = "sha256-TXxdjMkzZQoCqkZBqus5eCBEhA/nvxNNXaNHUTGFQDQ=";
+    hash = "sha256-dveV+3Rw9BMzevyIKzde98TsHsAJrQGAcvmc74nZTsg=";
   };
 
   outputs = [

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

@@ -0,0 +1,44 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  autoreconfHook,
+  libxcrypt,
+  libnsl,
+  libtirpc,
+  pkg-config,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "libnss_nis";
+  version = "3.2";
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
+
+  buildInputs = [
+    libxcrypt
+    libnsl
+    libtirpc
+  ];
+
+  src = fetchFromGitHub {
+    owner = "thkukuk";
+    repo = "libnss_nis";
+    rev = "v${version}";
+    hash = "sha256-dt5wL+v98Heg6395BOwNssXLXmoOKFnRXGqlOknYYPs=";
+  };
+
+  outputs = [ "out" ];
+
+  meta = {
+    description = "NSS module for glibc, to provide NIS support for glibc";
+    changelog = "https://github.com/thkukuk/libnss_nis/blob/master/NEWS";
+    homepage = "https://github.com/thkukuk/libnss_nis";
+    license = lib.licenses.lgpl21Plus;
+    maintainers = with lib.maintainers; [ BarrOff ];
+    platforms = lib.platforms.linux;
+  };
+}

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

@@ -14,6 +14,13 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-wJAkIUGK7Ud6n2p1275vNkSx/W7LlgKWXQaDevetPko=";
   };
 
+  postPatch = ''
+    # this field is not present on Darwin, ensure it is zero everywhere
+    substituteInPlace src/thread_signal.cpp \
+      --replace-fail 'sigac.sa_restorer = nullptr;' "" \
+      --replace-fail 'struct sigaction sigac;' 'struct sigaction sigac = {0};'
+  '';
+
   outputs = [
     "out"
     "dev"

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

@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "limo";
-  version = "1.0.8.2";
+  version = "1.0.9";
 
   src = fetchFromGitHub {
     owner = "limo-app";
     repo = "limo";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-6rv1IjWb/nrymd57CtrlAjX2KfMYlYNnfiodiRAJ1Ok=";
+    hash = "sha256-ytSlR6JhR7qYT/jCbTthHWc+YOX4AbJs9a4GRdgHj5c=";
   };
 
   patches = lib.optionals (!withUnrar) [

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

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   pname = "lowdown${
     lib.optionalString (stdenv.hostPlatform.isDarwin && !enableDarwinSandbox) "-unsandboxed"
   }";
-  version = "1.3.1";
+  version = "1.3.2";
 
   outputs = [
     "out"
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz";
-    hash = "sha512-hzkQE+i39HNQF0Vn/RfoVaipt8XYCSy5XVD7i7b21WfPLmY4t/2k+yXQ7btZkmAav3t5iuWrV79xpCooZTnsaQ==";
+    hash = "sha512-IQmgPm2zE+B82Zdg+ldjtU/XI+qab9YRAzwzRMYv32KKjql0YLDEgc/m6DbgyCiNBkulD0dVExCtrTM+nBFHzw==";
   };
 
   nativeBuildInputs = [

pkgs/by-name/mc/mcpelauncher-client/dont_download_glfw_client.patch

@@ -0,0 +1,25 @@
+diff --git a/ext/glfw.cmake b/ext/glfw.cmake
+index 5487f32..feeb89f 100644
+--- a/ext/glfw.cmake
++++ b/ext/glfw.cmake
+@@ -1,18 +1,2 @@
+-include(FetchContent)
+-
+-set(GLFW_BUILD_DOCS OFF CACHE BOOL "" FORCE)
+-set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE)
+-set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
+-set(GLFW_INSTALL OFF CACHE BOOL "" FORCE)
+-
+-FetchContent_Declare(
+-        glfw3_ext
+-        URL "https://github.com/minecraft-linux/glfw/archive/fce9121962bc0a21c39e2d6f8e08bad30c566c72.zip"
+-)
+-
+-FetchContent_GetProperties(glfw3_ext)
+-if(NOT glfw3_ext_POPULATED)
+-  FetchContent_Populate(glfw3_ext)
+-  add_subdirectory(${glfw3_ext_SOURCE_DIR} ${glfw3_ext_BINARY_DIR})
+-endif()
++find_package(glfw3 REQUIRED)
+ add_library(glfw3 ALIAS glfw)
+\ No newline at end of file

pkgs/by-name/mc/mcpelauncher-client/package.nix

@@ -0,0 +1,125 @@
+{
+  lib,
+  clangStdenv,
+  fetchFromGitHub,
+  fetchpatch,
+  cmake,
+  pkg-config,
+  openssl,
+  zlib,
+  libpng,
+  libglvnd,
+  xorg,
+  libevdev,
+  curl,
+  pulseaudio,
+  qt6,
+  glfw,
+  withQtWebview ? true,
+  withQtErrorWindow ? true,
+  fetchzip,
+}:
+
+# gcc doesn't support __has_feature
+clangStdenv.mkDerivation (finalAttrs: {
+  pname = "mcpelauncher-client";
+  version = "1.1.2-qt6";
+
+  # NOTE: check mcpelauncher-ui-qt when updating
+  src = fetchFromGitHub {
+    owner = "minecraft-linux";
+    repo = "mcpelauncher-manifest";
+    tag = "v${finalAttrs.version}";
+    fetchSubmodules = true;
+    hash = "sha256-PmCq6Zgtp17UV0kIbNouFwj/DMiTqwE31+tTb2LUp5o=";
+  };
+
+  patches = [
+    ./dont_download_glfw_client.patch
+    # These are upcoming changes that have been merged upstream. Once these get in a release, remove these patches.
+    (fetchpatch {
+      url = "https://github.com/minecraft-linux/game-window/commit/feea8c0e0720eea7093ed95745c17f36d6c40671.diff";
+      hash = "sha256-u4uveoKwwklEooT+i+M9kZ0PshjL1IfWhlltmulsQJo=";
+      stripLen = 1;
+      extraPrefix = "game-window/";
+    })
+    (fetchpatch {
+      url = "https://github.com/minecraft-linux/mcpelauncher-client/commit/db9c31e46d7367867c85a0d0aba42c8144cdf795.diff";
+      hash = "sha256-za/9oZYwKCYyZ1BXQ/zeEjRy81B1NpTlPHEfWAOtzHk=";
+      stripLen = 1;
+      extraPrefix = "mcpelauncher-client/";
+    })
+  ];
+
+  # FORTIFY_SOURCE breaks libc_shim and the project will fail to compile
+  hardeningDisable = [ "fortify" ];
+
+  nativeBuildInputs =
+    [
+      cmake
+      pkg-config
+    ]
+    ++ lib.optionals (withQtWebview || withQtErrorWindow) [
+      qt6.wrapQtAppsHook
+    ];
+
+  buildInputs =
+    [
+      openssl
+      zlib
+      libpng
+      libglvnd
+      xorg.libX11
+      xorg.libXi
+      xorg.libXtst
+      libevdev
+      curl
+      pulseaudio
+      glfw
+    ]
+    ++ lib.optionals (withQtWebview || withQtErrorWindow) [
+      qt6.qtbase
+      qt6.qttools
+      qt6.qtwayland
+    ]
+    ++ lib.optionals withQtWebview [
+      qt6.qtwebengine
+    ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true)
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_NLOHMANN_JSON_EXT" (
+      toString (fetchzip {
+        url = "https://github.com/nlohmann/json/releases/download/v3.7.3/include.zip";
+        hash = "sha256-h8czZ4f5vZqvHkDVQawrQdUeQnWxewu4OONisqlrmmM=";
+        stripRoot = false;
+      })
+    ))
+    (lib.cmakeBool "USE_OWN_CURL" false)
+    (lib.cmakeBool "ENABLE_DEV_PATHS" false)
+    (lib.cmakeFeature "GAMEWINDOW_SYSTEM" "GLFW")
+    (lib.cmakeBool "USE_SDL3_AUDIO" false)
+    (lib.cmakeBool "BUILD_WEBVIEW" withQtWebview)
+    (lib.cmakeBool "XAL_WEBVIEW_USE_CLI" (!withQtWebview))
+    (lib.cmakeBool "XAL_WEBVIEW_USE_QT" withQtWebview)
+    (lib.cmakeBool "ENABLE_QT_ERROR_UI" withQtErrorWindow)
+  ];
+
+  meta = {
+    description = "Unofficial Minecraft Bedrock Edition launcher with CLI";
+    homepage = "https://minecraft-linux.github.io";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
+      aleksana
+      morxemplum
+    ];
+    mainProgram = "mcpelauncher-client";
+    platforms = lib.platforms.unix;
+    # Minecraft Bedrock Edition is raising minimal OpenGL version to OpenGL ES 3.1
+    # which is currently not supported on macOS.
+    # https://github.com/minecraft-linux/mcpelauncher-manifest/issues/1042
+    # https://help.minecraft.net/hc/en-us/articles/30298767427597-Upcoming-OS-Sunset-Announcements-in-Minecraft
+    # The program is also not tested on darwin. Any help from darwin users are welcomed.
+    badPlatforms = lib.platforms.darwin;
+  };
+})

pkgs/by-name/mc/mcpelauncher-ui-qt/dont_download_glfw_ui.patch

@@ -0,0 +1,24 @@
+diff -urB mcpelauncher-ui/mcpelauncher-ui-qt/ext/glfw.cmake mcpelauncher-ui-b/mcpelauncher-ui-qt/ext/glfw.cmake
+--- mcpelauncher-ui/mcpelauncher-ui-qt/ext/glfw.cmake	2024-11-28 21:12:36.794926431 -0700
++++ mcpelauncher-ui-b/mcpelauncher-ui-qt/ext/glfw.cmake	2024-12-03 15:04:28.466197081 -0700
+@@ -1,19 +1,2 @@
+-include(FetchContent)
+-
+-set(GLFW_BUILD_DOCS OFF CACHE BOOL "" FORCE)
+-set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE)
+-set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
+-set(GLFW_INSTALL OFF CACHE BOOL "" FORCE)
+-set(GLFW_BUILD_WAYLAND OFF CACHE BOOL "" FORCE)
+-
+-FetchContent_Declare(
+-        glfw3_ext
+-        URL "https://github.com/glfw/glfw/archive/master.zip"
+-)
+-
+-FetchContent_GetProperties(glfw3_ext)
+-if(NOT glfw3_ext_POPULATED)
+-  FetchContent_Populate(glfw3_ext)
+-  add_subdirectory(${glfw3_ext_SOURCE_DIR} ${glfw3_ext_BINARY_DIR})
+-endif()
++find_package(glfw3 REQUIRED)
+ add_library(glfw3 ALIAS glfw)

pkgs/by-name/mc/mcpelauncher-ui-qt/package.nix

@@ -0,0 +1,62 @@
+{
+  lib,
+  stdenv,
+  mcpelauncher-client,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  zlib,
+  libzip,
+  curl,
+  protobuf,
+  qt6,
+  glfw,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "mcpelauncher-ui-qt";
+  inherit (mcpelauncher-client) version;
+
+  src = fetchFromGitHub {
+    owner = "minecraft-linux";
+    repo = "mcpelauncher-ui-manifest";
+    tag = "v${finalAttrs.version}";
+    fetchSubmodules = true;
+    hash = "sha256-R9wE1lS7x1IIPgVahXjF5Yg2ca+GsiQuF41pWf2edXY=";
+  };
+
+  patches = [
+    ./dont_download_glfw_ui.patch
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    qt6.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    zlib
+    libzip
+    curl
+    protobuf
+    qt6.qtwebengine
+    qt6.qtsvg
+    qt6.qtwayland
+    glfw
+  ];
+
+  # the program refuses to start when QT_STYLE_OVERRIDE is set
+  # https://github.com/minecraft-linux/mcpelauncher-ui-qt/issues/25
+  preFixup = ''
+    qtWrapperArgs+=(
+      --prefix PATH : ${lib.makeBinPath [ mcpelauncher-client ]}
+      --unset QT_STYLE_OVERRIDE
+    )
+  '';
+
+  meta = mcpelauncher-client.meta // {
+    description = "Unofficial Minecraft Bedrock Edition launcher with GUI";
+    mainProgram = "mcpelauncher-ui-qt";
+  };
+})

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

@@ -4,26 +4,27 @@
   fetchFromGitHub,
 }:
 
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "montserrat";
-  version = "7.222";
+  version = "9.000";
 
   src = fetchFromGitHub {
     owner = "JulietaUla";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-eVCRn2OtNI5NuYZBQy06HKnMMXhPPnFxI8m8kguZjg0=";
+    repo = "montserrat";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-fKgq3eUxrYBZtJuw2gs0K0wpW4BNqX5cDErF3IQ2ft4=";
   };
 
+  dontBuild = true;
+
   installPhase = ''
     runHook preInstall
 
-    mkdir -p $out/share/fonts/{otf,ttf,woff,woff2}
+    mkdir -p $out/share/fonts/
 
-    mv fonts/otf/*.otf $out/share/fonts/otf
-    mv fonts/ttf/*.ttf $out/share/fonts/ttf
-    mv fonts/webfonts/*.woff $out/share/fonts/woff
-    mv fonts/webfonts/*.woff2 $out/share/fonts/woff2
+    mv fonts/otf $out/share/fonts/otf
+    mv fonts/ttf $out/share/fonts/ttf
+    mv fonts/webfonts $out/share/fonts/woff2
 
     runHook postInstall
   '';
@@ -38,4 +39,4 @@ stdenvNoCC.mkDerivation rec {
       jk
     ];
   };
-}
+})

pkgs/by-name/ne/nezha-theme-admin/package.nix

@@ -0,0 +1,44 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+buildNpmPackage rec {
+  pname = "nezha-theme-admin";
+  version = "1.2.0";
+
+  src = fetchFromGitHub {
+    owner = "nezhahq";
+    repo = "admin-frontend";
+    tag = "v${version}";
+    hash = "sha256-BnpcCkI6lIno5W3ZemQQf1UVa6bpwmIJ5KXg6BQ5Ur0=";
+  };
+
+  # TODO: Switch to the bun build function once available in nixpkgs
+  npmDepsHash = "sha256-iXSks0LOTdbrSJdnSvzXW53wZanWjyDnL9ODcaBqpHI=";
+
+  npmPackFlags = [ "--ignore-scripts" ];
+
+  npmBuildScript = "build-ignore-error";
+
+  dontNpmInstall = true;
+  installPhase = ''
+    runHook preInstall
+
+    cp -r dist $out
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Nezha monitoring admin frontend";
+    homepage = "https://github.com/nezhahq/admin-frontend";
+    changelog = "https://github.com/nezhahq/admin-frontend/releases/tag/v${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ moraxyc ];
+  };
+}

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

@@ -0,0 +1,162 @@
+{
+  fetchurl,
+  lib,
+  stdenv,
+  squashfsTools,
+  xorg,
+  alsa-lib,
+  freetype,
+  glib,
+  pango,
+  cairo,
+  atk,
+  gdk-pixbuf,
+  gtk3,
+  cups,
+  nspr,
+  nss_latest,
+  libpng,
+  libnotify,
+  libgcrypt,
+  systemd,
+  fontconfig,
+  dbus,
+  expat,
+  curlWithGnuTls,
+  zlib,
+  at-spi2-atk,
+  at-spi2-core,
+  libdrm,
+  mesa,
+  libxkbcommon,
+  harfbuzz,
+  libsecret,
+  buildFHSEnv,
+}:
+
+let
+  # determine these versions from
+  # curl -H 'Snap-Device-Series: 16' http://api.snapcraft.io/v2/snaps/info/nordpass
+  version = "5.23.13";
+  snapVersion = "192";
+  snapId = "00CQ2MvSr0Ex7zwdGhCYTa0ZLMw3H6hf";
+  snapBaseUrl = "https://api.snapcraft.io/api/v1/snaps/download/";
+
+  deps = [
+    alsa-lib
+    at-spi2-atk
+    at-spi2-core
+    atk
+    cairo
+    cups
+    curlWithGnuTls
+    dbus
+    expat
+    fontconfig
+    freetype
+    gdk-pixbuf
+    glib
+    gtk3
+    harfbuzz
+    libdrm
+    libgcrypt
+    libnotify
+    libpng
+    libsecret
+    libxkbcommon
+    mesa
+    nspr
+    nss_latest
+    pango
+    stdenv.cc.cc
+    systemd
+    xorg.libICE
+    xorg.libSM
+    xorg.libX11
+    xorg.libxcb
+    xorg.libXcomposite
+    xorg.libXcursor
+    xorg.libXdamage
+    xorg.libXext
+    xorg.libXfixes
+    xorg.libXi
+    xorg.libXrandr
+    xorg.libXrender
+    xorg.libXScrnSaver
+    xorg.libxshmfence
+    xorg.libXtst
+    zlib
+  ];
+
+  thisPackage = stdenv.mkDerivation {
+    pname = "nordpass";
+
+    inherit version;
+
+    src = fetchurl {
+      url = "${snapBaseUrl}${snapId}_${snapVersion}.snap";
+      hash = "sha256-teqeeLzqLVL/l5WsTXlRj3GM0YMHm+Z2MWy4GE8s7k8=";
+    };
+
+    nativeBuildInputs = [ squashfsTools ];
+
+    dontStrip = true;
+    dontPatchELF = true;
+
+    unpackPhase = ''
+      runHook preUnpack
+      unsquashfs "$src"
+      cd squashfs-root
+      runHook postUnpack
+    '';
+
+    # Prevent double wrapping
+    dontWrapGApps = true;
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p "$out/opt/nordpass"
+      cp -r . "$out/opt/nordpass/"
+
+      mkdir -p $out/bin
+      ln -s "$out/opt/nordpass/nordpass" "$out/bin/nordpass"
+
+      # Desktop file
+      mkdir -p "$out/share/applications/"
+      cp "$out/opt/nordpass/meta/gui/nordpass.desktop" "$out/share/applications/"
+      # Icon
+      mkdir -p "$out/share/icons/hicolor/512x512/apps"
+      cp "$out/opt/nordpass/meta/gui/icon.png" \
+        "$out/share/icons/hicolor/512x512/apps/nordpass.png"
+
+      sed -i -e "s#^Icon=.*\$#Icon=$out/share/icons/hicolor/512x512/apps/nordpass.png#" \
+        "$out/share/applications/nordpass.desktop"
+
+      runHook postInstall
+    '';
+
+    meta = with lib; {
+      homepage = "https://nordpass.com/";
+      description = "Secure and simple password manager for a stress-free online experience";
+      license = licenses.unfree;
+      mainProgram = "nordpass";
+      maintainers = with maintainers; [ coconnor ];
+      platforms = [ "x86_64-linux" ];
+      sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    };
+  };
+in
+
+buildFHSEnv {
+  name = "nordpass";
+  targetPkgs = _: deps ++ [ thisPackage ];
+  runScript = "nordpass";
+
+  extraInstallCommands = ''
+    mkdir -p "$out/share"
+    cp -r ${thisPackage}/share/* "$out/share/"
+  '';
+
+  inherit (thisPackage) meta;
+}

pkgs/by-name/nt/ntfs2btrfs/package.nix

@@ -2,10 +2,13 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  nix-update-script,
+
   cmake,
+  pkg-config,
+
   fmt,
   lzo,
-  pkg-config,
   zlib,
   zstd,
 }:
@@ -33,6 +36,8 @@ stdenv.mkDerivation rec {
     zstd
   ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "CLI tool which does in-place conversion of Microsoft's NTFS filesystem to the open-source filesystem Btrfs";
     homepage = "https://github.com/maharmstone/ntfs2btrfs";

pkgs/by-name/oa/oauth2l/package.nix

@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "oauth2l";
-  version = "1.3.1";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "oauth2l";
     rev = "v${version}";
-    hash = "sha256-DLZNsvM9tTfzKv6FOnsNKrDIge7yhUE7+8883E4rvQ4=";
+    hash = "sha256-kZbsXGNZTF945qe6W0YbU8Ee0aV6P6LL/OCOX9+6pb4=";
   };
 
   vendorHash = null;

pkgs/by-name/pi/pik/package.nix

@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "pik";
-  version = "0.10.0";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "jacek-kurlit";
     repo = "pik";
     rev = version;
-    hash = "sha256-q1nNQC9qGa7nUNIaDdqW3wIrfzH7JKS/yZAe9KNmX3k=";
+    hash = "sha256-h+mkO4LSsbo/wKY/TUt1yH06ZeeLBiI7C1eN07Y+LfI=";
   };
 
-  cargoHash = "sha256-gqzt3cFOS4uzIstIvmPS0n18aFUt0YnoTRz7EVTV7sA=";
+  cargoHash = "sha256-iCEjVz5hM4N+6w4qwW/c15fQtXRr8Hqu7taebuBmfH8=";
 
   passthru.tests.version = testers.testVersion { package = pik; };
 

pkgs/by-name/pl/plasma-plugin-blurredwallpaper/package.nix

@@ -6,7 +6,7 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "plasma-plugin-blurredwallpaper";
-  version = "3.2.0";
+  version = "3.2.1";
 
   src = fetchFromGitHub {
     owner = "bouteillerAlan";

pkgs/by-name/pl/plymouth-vortex-ubuntu-theme/package.nix

@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "plymouth-vortex-ubuntu-theme";
-  version = "0-unstable-2024-05-05";
+  version = "0-unstable-2024-11-20";
 
   src = fetchFromGitHub {
     owner = "emanuele-scarsella";
     repo = "vortex-ubuntu-plymouth-theme";
-    rev = "331a201918a3b026dd200659403c1cf779c718f0";
-    hash = "sha256-RSWfuKCdsuFA2e5kb0OXnxW+QV7b2iHVvZEKVHoLgMw=";
+    rev = "5b3c88102fd8f322626c01514deedd7ba8e7ebdd";
+    hash = "sha256-AuYLjyOfpmwE4pFhKDQdR1uC+6Rr5FWUC5h9yWesXRE=";
   };
 
   dontBuild = true;

pkgs/by-name/pr/prism-model-checker/package.nix

@@ -0,0 +1,101 @@
+{
+  lib,
+  stdenv,
+  gccStdenv,
+  coreutils,
+  fetchFromGitHub,
+  openjdk,
+  jre,
+  cctools,
+  copyDesktopItems,
+  makeDesktopItem,
+  makeWrapper,
+}:
+let
+  stdenv' = if stdenv.hostPlatform.isDarwin then gccStdenv else stdenv;
+in
+stdenv'.mkDerivation (finalAttrs: {
+  pname = "prism-model-checker";
+  version = "4.8.1";
+
+  src = fetchFromGitHub {
+    owner = "prismmodelchecker";
+    repo = "prism";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-igFRIjPfx0BFpQjaW/vgMEnH2HLC06aL3IMHh+ELB6U=";
+  };
+
+  nativeBuildInputs = [
+    openjdk
+    copyDesktopItems
+    makeWrapper
+  ] ++ lib.optionals stdenv'.hostPlatform.isDarwin [ cctools ];
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "prism-model-checker-xprism";
+      desktopName = "XPrism";
+      type = "Application";
+      icon = "prism-model-checker";
+      terminal = false;
+      categories = [
+        "Science"
+        "Math"
+      ];
+      exec = "xprism";
+      comment = "Probabalistic Symbolic Model Checker";
+    })
+  ];
+
+  postPatch = ''
+    substituteInPlace prism/install.sh --replace-fail "/bin/mv" "mv"
+  '';
+
+  makeFlags = [
+    "JAVA_DIR=${openjdk}"
+    "release_config"
+    "clean_all"
+    "all"
+    "binary"
+  ];
+  preBuild = ''
+    cd prism
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir --parents $out/share/
+    cp -r bin/ $out/
+    cp -r lib/ $out/
+    cp -r etc/{scripts,syntax-highlighters,prism{.css,.tex,-eclipse-formatter.xml}} -t $out/share
+    for size in 16 24 32 48 64 128 256; do
+        mkdir --parents $out/share/icons/hicolor/''${size}x''${size}/apps
+        cp etc/icons/p''${size}.png $out/share/icons/hicolor/''${size}x''${size}/apps/prism-model-checker.png
+    done
+
+    mv install.sh $out/
+    cd $out
+    ./install.sh
+    rm install.sh
+
+    for f in $out/bin/*; do
+      wrapProgram $f \
+          --set JAVA_HOME ${jre.home} \
+          --set PRISM_JAVA ${lib.getExe jre} \
+          --prefix PATH: ${lib.makeBinPath [ jre ]}
+    done
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Probabalistic Symbolic Model Checker";
+
+    homepage = "https://www.prismmodelchecker.org";
+    license = lib.licenses.gpl2Plus;
+    maintainers = [ lib.maintainers.astrobeastie ];
+    platforms = lib.platforms.unix;
+    mainProgram = "prism";
+  };
+})

pkgs/by-name/pr/proton-ge-bin/package.nix

@@ -6,11 +6,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "proton-ge-bin";
-  version = "GE-Proton9-20";
+  version = "GE-Proton9-21";
 
   src = fetchzip {
     url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz";
-    hash = "sha256-1twCv81KO1fcRcIb4H7VtAjtcKrX+DymsYdf885eOWo=";
+    hash = "sha256-WNOl0pu3xcEObxSK054u4e3hTWtA/51mH25uQih0+a0=";
   };
 
   outputs = [

pkgs/by-name/pr/proton-pass/package.nix

@@ -9,11 +9,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "proton-pass";
-  version = "1.25.0";
+  version = "1.26.0";
 
   src = fetchurl {
     url = "https://proton.me/download/pass/linux/x64/proton-pass_${finalAttrs.version}_amd64.deb";
-    hash = "sha256-gilHkk9vVxnYJKy79lDrlMd8uWys50TEUbGaHVr958o=";
+    hash = "sha256:1qmc2yj9vyccl0s0i5fvq1pgg0aba87pzfrp1hbs9hvx0nwx9n5m";
   };
 
   dontConfigure = true;

pkgs/by-name/py/pyenv/package.nix

@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pyenv";
-  version = "2.4.14";
+  version = "2.4.22";
 
   src = fetchFromGitHub {
     owner = "pyenv";
     repo = "pyenv";
     rev = "refs/tags/v${version}";
-    hash = "sha256-SOCXr/btqub4affamyBH04rIXFb0oh3Hizpn1pFjfTA=";
+    hash = "sha256-TrsSihCXovToTFygs6WB67sQIbtx4EJjyMbBDCK0pR4=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/py/pyfa/package.nix

@@ -8,7 +8,7 @@
   gdk-pixbuf,
 }:
 let
-  version = "2.61.0";
+  version = "2.61.3";
 in
 python3Packages.buildPythonApplication rec {
   inherit version;
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec {
     owner = "pyfa-org";
     repo = "Pyfa";
     rev = "refs/tags/v${version}";
-    hash = "sha256-VSuRQugUODc+LbhKbzsA09pnqPEIAt0pQS2An/p7r9A=";
+    hash = "sha256-i8NcRTn817gqwQP6j0RPUJkq09eTI4nfe3EVqYnWRpo=";
   };
 
   build-system = [ python3Packages.setuptools ];

pkgs/by-name/ra/raffi/package.nix

@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "raffi";
-  version = "0.6.0";
+  version = "0.8.2";
 
   src = fetchFromGitHub {
     owner = "chmouel";
     repo = "raffi";
     rev = "v${version}";
-    hash = "sha256-VwB5hYEGF+w7KUBVB306VCneJxRwlZG5KVdrmhYqlYk=";
+    hash = "sha256-97gZZp2taX800Izhya4mYzS4PtCNCBbRnrn6cm1w8zY=";
   };
 
-  cargoHash = "sha256-AQhGutsMhVjKi2kenvKatN91B7Oi9n64+RDj/ODwfno=";
+  cargoHash = "sha256-5QMRdyu6TUKLO8qvIJiABkvhUWHHOnGlKu5BGluM6PI=";
 
   nativeBuildInputs = [
     makeBinaryWrapper

pkgs/by-name/rc/rclip/package.nix

@@ -2,6 +2,7 @@
   lib,
   python3Packages,
   fetchFromGitHub,
+  versionCheckHook,
 }:
 python3Packages.buildPythonApplication rec {
   pname = "rclip";
@@ -11,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "yurijmikhalevich";
     repo = "rclip";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-bu9kz0CCq78lp+d2uPoApzZnVybwyWD/fwgnXYG52dk=";
   };
 
@@ -32,13 +33,17 @@ python3Packages.buildPythonApplication rec {
 
   pythonRelaxDeps = [
     "pillow"
+    "rawpy"
     "torch"
     "torchvision"
   ];
 
   pythonImportsCheck = [ "rclip" ];
 
-  nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
+  nativeCheckInputs = [
+    versionCheckHook
+  ] ++ (with python3Packages; [ pytestCheckHook ]);
+  versionCheckProgramArg = [ "--version" ];
 
   disabledTestPaths = [
     # requires network
@@ -55,7 +60,7 @@ python3Packages.buildPythonApplication rec {
   meta = {
     description = "AI-Powered Command-Line Photo Search Tool";
     homepage = "https://github.com/yurijmikhalevich/rclip";
-    changelog = "https://github.com/yurijmikhalevich/rclip/releases/tag/v${version}";
+    changelog = "https://github.com/yurijmikhalevich/rclip/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ iynaix ];
     mainProgram = "rclip";

pkgs/by-name/re/renovate/package.nix

@@ -21,13 +21,13 @@ let
 in
 stdenv'.mkDerivation (finalAttrs: {
   pname = "renovate";
-  version = "39.42.4";
+  version = "39.65.2";
 
   src = fetchFromGitHub {
     owner = "renovatebot";
     repo = "renovate";
     tag = finalAttrs.version;
-    hash = "sha256-M1QzvYMrs39ELc2tkazwDPbCPHqfqzde2hbMvg34m0A=";
+    hash = "sha256-SDPyhyZtAw9jPqBGlRm3n8AkL2Y70Kf0AeXqMKCokDM=";
   };
 
   postPatch = ''
@@ -45,7 +45,7 @@ stdenv'.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-14E1v2HLFdbkxFnSPQnuwb+zyPXaczAp1Ab0EC65luc=";
+    hash = "sha256-PwUmFy/RBptKsNSoV8rthJILVQqzPIJemnn0qO4ZQJA=";
   };
 
   env.COREPACK_ENABLE_STRICT = 0;

pkgs/by-name/re/rewatch/package.nix

@@ -0,0 +1,39 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  nix-update-script,
+  apple-sdk_11,
+  stdenv,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "rewatch";
+  version = "1.0.9";
+
+  src = fetchFromGitHub {
+    owner = "rescript-lang";
+    repo = "rewatch";
+    tag = "v${version}";
+    hash = "sha256-y+0tBwGa7Fjrnd3O7CwZjapgXJojfgXBZyqAW3cz1Zk=";
+  };
+
+  cargoHash = "sha256-cZTA50gm7o+vBaRNjpZI0LQkXaHIukVTBXoYMUubZgw=";
+
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
+    apple-sdk_11
+  ];
+
+  doCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Alternative build system for the Rescript Compiler";
+    homepage = "https://github.com/rescript-lang/rewatch";
+    changelog = "https://github.com/rescript-lang/rewatch/releases/tag/v${version}";
+    mainProgram = "rewatch";
+    maintainers = with lib.maintainers; [ r17x ];
+    license = lib.licenses.mit;
+  };
+}

pkgs/by-name/rm/rman/package.nix

@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types";
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
 
   doCheck = false; # "check" target is probably meant to do "installcheck" or something
 

pkgs/by-name/sl/sla2pdf/package.nix

@@ -0,0 +1,36 @@
+{
+  lib,
+  python3,
+  fetchFromGitHub,
+  scribus,
+}:
+
+python3.pkgs.buildPythonApplication {
+  pname = "sla2pdf";
+  version = "0.0.1-unstable-2023-05-17";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "sla2pdf-team";
+    repo = "sla2pdf";
+    rev = "1524e6ca490da71eb201ff13bf32ef7206b0e4ef";
+    hash = "sha256-mvZ6Es8TLJmNwdacRJ3Gw5z0nI6xW1igz50yjIFBUds=";
+  };
+
+  build-system = [ python3.pkgs.setuptools ];
+
+  makeWrapperArgs = [
+    "--prefix PATH : ${lib.makeBinPath [ scribus ]}"
+  ];
+
+  meta = {
+    description = "Convert Scribus SLA files to PDF from the command line";
+    homepage = "https://github.com/sla2pdf-team/sla2pdf";
+    license = with lib.licenses; [
+      cc-by-40
+      mpl20
+    ];
+    maintainers = with lib.maintainers; [ ob7 ];
+    mainProgram = "sla2pdf";
+  };
+}

pkgs/by-name/sq/sqlcmd/package.nix

@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "sqlcmd";
-  version = "1.8.1";
+  version = "1.8.2";
 
   src = fetchFromGitHub {
     repo = "go-sqlcmd";
     owner = "microsoft";
     rev = "v${version}";
-    sha256 = "sha256-XV6sPlTBBUMFzWVaLbbtbb/FLYlOkp8htBnVZdaVLQs=";
+    sha256 = "sha256-LHNH/Jybtv+P/mRby3/nn8XjDHYWDTtgefb8z35J2VM=";
   };
 
-  vendorHash = "sha256-gc/pOFtQMCLjHbW9z8r08Q+1QnOe5WllSuhIeiz9Huo=";
+  vendorHash = "sha256-UeeCs3lm7jFO7QRtEhHG2JFLNd3CJB26PwF0dKrZQ78=";
   proxyVendor = true;
 
   ldflags = [

pkgs/by-name/st/stgit/package.nix

@@ -19,15 +19,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "stgit";
-  version = "2.4.12";
+  version = "2.4.13";
 
   src = fetchFromGitHub {
     owner = "stacked-git";
     repo = "stgit";
     rev = "v${version}";
-    hash = "sha256-fNQLdW5KFpYUBBmaUYYOmDym7OweXsDfD+uFl688zcY=";
+    hash = "sha256-Qb4pn/8SK36lUdbURY67592YWrmG7c5PJi19Ly+u2X4=";
   };
-  cargoHash = "sha256-s3PFNc1rn01X6tauRXp5B4cg3AIVSishqDFy0lP/8g8=";
+  cargoHash = "sha256-7loyQj/mtgzt80XN6ckjojxeddXYRCmdl6U7Y9t95aY=";
 
   nativeBuildInputs = [
     pkg-config

pkgs/by-name/st/stripe-cli/package.nix

@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "stripe-cli";
-  version = "1.21.10";
+  version = "1.22.0";
 
   src = fetchFromGitHub {
     owner = "stripe";
-    repo = pname;
+    repo = "stripe-cli";
     rev = "v${version}";
-    hash = "sha256-L2ydkrm2foSIh67LsMYNvV53Hdj9TdV7C4tKeHe+AK0=";
+    hash = "sha256-h5Q9+WoMJ5swmyL4GIiWZ9HDnr/w23iBVtp4EQ1yYn0=";
   };
   vendorHash = "sha256-TuxYJ3u4/5PJYRoRgom+M1au9XerZ+vj9X3jUWTPM58=";
 

pkgs/by-name/ta/taterclient-ddnet/package.nix

@@ -27,6 +27,7 @@
   glslang,
   spirv-tools,
   gtest,
+  glew,
   apple-sdk_11,
 }:
 let
@@ -34,18 +35,18 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "taterclient-ddnet";
-  version = "9.0.1";
+  version = "9.0.2";
 
   src = fetchFromGitHub {
     owner = "sjrc6";
     repo = "taterclient-ddnet";
     rev = "refs/tags/V${finalAttrs.version}";
-    hash = "sha256-s+GIY29WYbVETtJSLBfP87pakRfxgGcw3Dk3p6HHoYA=";
+    hash = "sha256-hGbeIhtAZcgaPCsDUmZqq8mLGi1yVvauha4wGMBbmBc=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit (finalAttrs) pname src version;
-    hash = "sha256-u+IhlJYVEYeWnmFzRmcVqJfM3zBy70k9yp0AjRTovwg=";
+    hash = "sha256-iykFbo1zSeG9r9cIr8CGjd9GtCGcQ6vH73xpEl8J3i8=";
   };
 
   nativeBuildInputs = [
@@ -55,34 +56,34 @@ stdenv.mkDerivation (finalAttrs: {
     rustc
     cargo
     rustPlatform.cargoSetupHook
+    glslang # for glslangValidator
+    python3
   ];
 
   nativeCheckInputs = [ gtest ];
+  checkInputs = [ gtest ];
 
-  buildInputs =
-    [
-      curl
-      libnotify
-      pcre
-      python3
-      sqlite
-      freetype
-      libGLU
-      libogg
-      opusfile
-      SDL2
-      wavpack
-      ffmpeg
-      x264
-      vulkan-loader
-      vulkan-headers
-      glslang
-      spirv-tools
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
-    ];
+  buildInputs = [
+    curl
+    libnotify
+    pcre
+    sqlite
+    freetype
+    libGLU
+    libogg
+    opusfile
+    SDL2
+    wavpack
+    ffmpeg
+    x264
+    vulkan-loader
+    vulkan-headers
+    glslang
+    spirv-tools
+    glew
+  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 ];
+
+  strictDeps = true;
 
   postPatch = ''
     substituteInPlace src/engine/shared/storage.cpp \
@@ -90,17 +91,18 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   cmakeFlags = [
-    "-DAUTOUPDATE=OFF"
-    "-DCLIENT=ON"
-    "-DSERVER=OFF"
-    "-DTOOLS=OFF"
-    "-DCLIENT_EXECUTABLE=${clientExecutable}"
+    (lib.cmakeBool "AUTOUPDATE" false)
+    (lib.cmakeBool "CLIENT" true)
+    (lib.cmakeBool "SERVER" false)
+    (lib.cmakeBool "TOOLS" false)
+    (lib.cmakeFeature "CLIENT_EXECUTABLE" clientExecutable)
   ];
 
-  # Tests loop forever on Darwin for some reason
-  doCheck = !stdenv.hostPlatform.isDarwin;
+  doCheck = true;
   checkTarget = "run_tests";
 
+  __darwinAllowLocalNetworking = true; # for tests
+
   preFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
     # Upstream links against <prefix>/lib while it installs this library in <prefix>/lib/ddnet
     install_name_tool -change "$out/lib/libsteam_api.dylib" "$out/lib/ddnet/libsteam_api.dylib" "$out/bin/${clientExecutable}"

pkgs/by-name/te/tenv/package.nix

@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "tenv";
-  version = "3.2.10";
+  version = "3.2.11";
 
   src = fetchFromGitHub {
     owner = "tofuutils";
     repo = "tenv";
     rev = "v${version}";
-    hash = "sha256-EiWajXUQTK8xJoehpq+LWdjy84+lB7oilFM1v59F/30=";
+    hash = "sha256-9xQsfgQrLBhanwr9rgFkt8Ej2Mvt6L7iViTK4duBIRg=";
   };
 
-  vendorHash = "sha256-YC6LCrrxw9gZMc/ow628lL9KbePM8RhiAjLZ7HG2FY8=";
+  vendorHash = "sha256-zx3VQu4LsvQ3OgjM9n000wBzWjwZo5MtctppnVx7fYM=";
 
   # Tests disabled for requiring network access to release.hashicorp.com
   doCheck = false;

pkgs/by-name/to/totp-cli/package.nix

@@ -6,7 +6,7 @@
 }:
 let
   pname = "totp-cli";
-  version = "1.8.7";
+  version = "1.8.8";
 in
 buildGoModule {
   inherit pname version;
@@ -15,10 +15,10 @@ buildGoModule {
     owner = "yitsushi";
     repo = "totp-cli";
     rev = "refs/tags/v${version}";
-    hash = "sha256-WCPDrKGIRrYJFeozXtf8YPgHJ8m6DAsMBD8Xgjvclvc=";
+    hash = "sha256-aYTOtel7ZPDNF8/3mpk/dchBHzoA3ZDnViidQ/N9+As=";
   };
 
-  vendorHash = "sha256-VTlSnw3TyVOQPU+nMDhRtyUrBID2zesGeG2CgDyjwWY=";
+  vendorHash = "sha256-yicJjDFdvQ9EEF37pn3wHuLTVzpmBC8DwexgX7lGmh0=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/by-name/wl/wlock/package.nix

@@ -0,0 +1,54 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitea,
+  libxcrypt,
+  pkg-config,
+  wayland,
+  wayland-protocols,
+  libxkbcommon,
+  wayland-scanner,
+}:
+stdenv.mkDerivation rec {
+  pname = "wlock";
+  version = "0-unstable-2024-09-13";
+
+  src = fetchFromGitea {
+    domain = "codeberg.org";
+    owner = "sewn";
+    repo = "wlock";
+    rev = "be975445fa0da7252f8e13b610c518dd472652d0";
+    hash = "sha256-Xt7Q51RhFG+UXYukxfORIhc4Df86nxtpDhAhaSmI38A=";
+  };
+
+  postPatch = ''
+    substituteInPlace Makefile --replace-fail 'chmod 4755' 'chmod 755'
+  '';
+
+  buildInputs = [
+    libxcrypt
+    wayland
+    wayland-protocols
+    libxkbcommon
+  ];
+
+  strictDeps = true;
+
+  makeFlags = [
+    "PREFIX=$(out)"
+    ("WAYLAND_SCANNER=" + lib.getExe wayland-scanner)
+  ];
+
+  nativeBuildInputs = [
+    pkg-config
+    wayland-scanner
+  ];
+
+  meta = {
+    description = "Sessionlocker for Wayland compositors that support the ext-session-lock-v1 protocol";
+    license = lib.licenses.gpl3;
+    homepage = "https://codeberg.org/sewn/wlock";
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ fliegendewurst ];
+  };
+}

pkgs/by-name/ws/wstunnel/package.nix

@@ -10,7 +10,7 @@
 }:
 
 let
-  version = "10.1.7";
+  version = "10.1.8";
 in
 
 rustPlatform.buildRustPackage {
@@ -21,11 +21,11 @@ rustPlatform.buildRustPackage {
     owner = "erebe";
     repo = "wstunnel";
     rev = "v${version}";
-    hash = "sha256-WqTHU4W/MUzmJ/totr8vfSDlNXirJE5KfgNglOen65w=";
+    hash = "sha256-A2c4DAHne0N96bJnjvpaI6vd2pAb4Edi45vbDWayZpo=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-Cs6zSHvqItqwGh3FMn7Iv7SyMk72sp6cH9Wn09UYMsk=";
+  cargoHash = "sha256-iKGt+CjshkUE5w68ZJ9x2+3mAYQJO/oDMs/M8ARL5Po=";
 
   nativeBuildInputs = [ versionCheckHook ];
 

pkgs/by-name/wu/wush/package.nix

@@ -4,7 +4,7 @@
   lib,
 }:
 let
-  version = "0.3.0";
+  version = "0.4.0";
 in
 buildGoModule {
   pname = "wush";
@@ -14,10 +14,10 @@ buildGoModule {
     owner = "coder";
     repo = "wush";
     rev = "v${version}";
-    hash = "sha256-2mFe1p15HRyy86pw5LoBtiW9lKrw/N9V81/jkiT4jo4=";
+    hash = "sha256-0yICcexo5OZ7iNuZaKzWcWjZ34dY24GPosXIz9WlbK8=";
   };
 
-  vendorHash = "sha256-Po1DDKP9ekScRDGMjCXZr9HUUwFenQx3bzIZrNI+ctY=";
+  vendorHash = "sha256-LVqj27e2OcF+XBb6glTV5Zrw3W/vbtG7D7TmjcMQcnw=";
 
   ldflags = [
     "-s -w -X main.version=${version}"

pkgs/by-name/ze/zenoh-backend-filesystem/package.nix

@@ -0,0 +1,50 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  bzip2,
+  zstd,
+  rocksdb_8_11,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "zenoh-backend-filesystem";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "eclipse-zenoh";
+    repo = "zenoh-backend-filesystem";
+    tag = version;
+    hash = "sha256-HZp0kR7vCXRg04aiRbefbTMprgOH3Chy7X2x8X9urTk=";
+  };
+
+  cargoHash = "sha256-HXxlgAszm2HbuKRhoWjluu/U9PMRHxs4/TRxEsl0Cgg=";
+
+  nativeBuildInputs = [
+    pkg-config
+    rustPlatform.bindgenHook
+  ];
+
+  buildInputs = [
+    bzip2
+    zstd
+  ];
+
+  env = {
+    ROCKSDB_INCLUDE_DIR = "${rocksdb_8_11}/include";
+    ROCKSDB_LIB_DIR = "${rocksdb_8_11}/lib";
+    ZSTD_SYS_USE_PKG_CONFIG = true;
+  };
+
+  meta = {
+    description = "Backend and Storages for zenoh using the file system";
+    homepage = "https://github.com/eclipse-zenoh/zenoh-backend-filesystem";
+    license = with lib.licenses; [
+      epl20
+      asl20
+    ];
+    maintainers = with lib.maintainers; [ markuskowa ];
+    platforms = lib.platforms.linux;
+  };
+}

pkgs/by-name/ze/zenoh-backend-influxdb/package.nix

@@ -0,0 +1,30 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "zenoh-backend-influxdb";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "eclipse-zenoh";
+    repo = "zenoh-backend-influxdb";
+    tag = version;
+    hash = "sha256-VQoJO+9DYDkIKTTqLy/i2uBeFPuXO2Y0NnYrJTa1tvc=";
+  };
+
+  cargoHash = "sha256-kaaOcRDqqZvVNfCuIKYJAPK+KLUE41/1R/Cih4cpVjw=";
+
+  meta = {
+    description = "Backend and Storages for zenoh using InfluxDB";
+    homepage = "https://github.com/eclipse-zenoh/zenoh-backend-influxdb";
+    license = with lib.licenses; [
+      epl20
+      asl20
+    ];
+    maintainers = with lib.maintainers; [ markuskowa ];
+    platforms = lib.platforms.linux;
+  };
+}

pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix

@@ -0,0 +1,50 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  bzip2,
+  zstd,
+  rocksdb_8_11,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "zenoh-backend-rocksdb";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "eclipse-zenoh";
+    repo = "zenoh-backend-rocksdb";
+    tag = version;
+    hash = "sha256-QCUS3jiWa2gbD/X/Va8s5WX4+3RKFOizh8FB/nsqWGM=";
+  };
+
+  cargoHash = "sha256-k7u4P3ropwgzaqN/bom4mfOsXvNHmn3VQc7NUakgusA=";
+
+  nativeBuildInputs = [
+    pkg-config
+    rustPlatform.bindgenHook
+  ];
+
+  buildInputs = [
+    bzip2
+    zstd
+  ];
+
+  env = {
+    ROCKSDB_INCLUDE_DIR = "${rocksdb_8_11}/include";
+    ROCKSDB_LIB_DIR = "${rocksdb_8_11}/lib";
+    ZSTD_SYS_USE_PKG_CONFIG = true;
+  };
+
+  meta = {
+    description = "Backend and Storages for zenoh using RocksDB";
+    homepage = "https://github.com/eclipse-zenoh/zenoh-backend-rocksdb";
+    license = with lib.licenses; [
+      epl20
+      asl20
+    ];
+    maintainers = with lib.maintainers; [ markuskowa ];
+    platforms = lib.platforms.linux;
+  };
+}

pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix

@@ -0,0 +1,31 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "zenoh-plugin-mqtt";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "eclipse-zenoh";
+    repo = "zenoh-plugin-mqtt";
+    tag = version;
+    hash = "sha256-GsYT46mBsvvSW3BG2stVpERvelbRIiUaWTco39IY6/A=";
+  };
+
+  cargoHash = "sha256-8q8pMUMciB8cPSpkeu9sjGJm6DxXicd0k/NJ+1uz4VU=";
+
+  meta = {
+    description = "A Zenoh plug-in that allows to integrate and/or route MQTT pub/sub with Eclipse Zenoh";
+    homepage = "https://github.com/eclipse-zenoh/zenoh-plugin-mqtt";
+    license = with lib.licenses; [
+      epl20
+      asl20
+    ];
+    maintainers = with lib.maintainers; [ markuskowa ];
+    platforms = lib.platforms.linux;
+    mainProgram = "zenoh-bridge-mqtt";
+  };
+}

pkgs/by-name/ze/zenoh-plugin-webserver/package.nix

@@ -0,0 +1,30 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "zenoh-plugin-webserver";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "eclipse-zenoh";
+    repo = "zenoh-plugin-webserver";
+    tag = version;
+    hash = "sha256-fdnag/IcGMZUti62y3rLMZ3lt42cd3SSa8kZFXVn6BQ=";
+  };
+
+  cargoHash = "sha256-YckyHArQG/mYmDdA2qt4Wmw7Agx/CItjIgajJD0O5WA=";
+
+  meta = {
+    description = "Implements an HTTP server mapping URLs to zenoh paths";
+    homepage = "https://github.com/eclipse-zenoh/zenoh-plugin-webserver";
+    license = with lib.licenses; [
+      epl20
+      asl20
+    ];
+    maintainers = with lib.maintainers; [ markuskowa ];
+    platforms = lib.platforms.linux;
+  };
+}

pkgs/development/compilers/mlton/20210117-binary.nix

@@ -4,6 +4,7 @@
   fetchpatch,
   fetchurl,
   patchelf,
+  bash,
   gmp,
 }:
 let
@@ -41,8 +42,12 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  buildInputs = [ gmp ];
+  buildInputs = [
+    bash
+    gmp
+  ];
   nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux patchelf;
+  strictDeps = true;
 
   buildPhase = ''
     make update \

pkgs/development/compilers/mlton/from-git-source.nix

@@ -18,13 +18,15 @@ stdenv.mkDerivation {
     inherit url rev sha256;
   };
 
-  nativeBuildInputs = [ which ];
-
-  buildInputs = [
+  nativeBuildInputs = [
+    which
     mltonBootstrap
-    gmp
   ];
 
+  buildInputs = [ gmp ];
+
+  strictDeps = true;
+
   # build fails otherwise
   enableParallelBuilding = false;
 

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

@@ -167,6 +167,10 @@ in
     stdlib
   ];
 
+  preConfigure = ''
+    make elpi/dune || true
+  '';
+
   meta = {
     description = "Coq plugin embedding ELPI";
     maintainers = [ lib.maintainers.cohencyril ];

pkgs/development/libraries/gegl/default.nix

@@ -1,49 +1,55 @@
-{ lib
-, stdenv
-, fetchurl
-, pkg-config
-, vala
-, gi-docgen
-, gobject-introspection
-, glib
-, babl
-, libpng
-, llvmPackages
-, cairo
-, libjpeg
-, librsvg
-, lensfun
-, libspiro
-, maxflow
-, netsurf
-, pango
-, poly2tri-c
-, poppler
-, bzip2
-, json-glib
-, gettext
-, meson
-, ninja
-, libraw
-, gexiv2
-, libwebp
-, luajit
-, openexr
-, OpenCL
-, suitesparse
-, withLuaJIT ? lib.meta.availableOn stdenv.hostPlatform luajit
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  vala,
+  gi-docgen,
+  gobject-introspection,
+  glib,
+  babl,
+  libpng,
+  llvmPackages,
+  cairo,
+  libjpeg,
+  librsvg,
+  lensfun,
+  libspiro,
+  maxflow,
+  netsurf,
+  pango,
+  poly2tri-c,
+  poppler,
+  bzip2,
+  json-glib,
+  gettext,
+  meson,
+  ninja,
+  libraw,
+  gexiv2,
+  libwebp,
+  luajit,
+  openexr,
+  OpenCL,
+  suitesparse,
+  withLuaJIT ? lib.meta.availableOn stdenv.hostPlatform luajit,
+  gimp,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "gegl";
-  version = "0.4.48";
+  version = "0.4.50";
 
-  outputs = [ "out" "dev" "devdoc" ];
+  outputs = [
+    "out"
+    "dev"
+    "devdoc"
+  ];
   outputBin = "dev";
 
   src = fetchurl {
-    url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/gegl-${version}.tar.xz";
-    hash = "sha256-QYwm2UvogF19mPbeDGglyia9dPystsGI2kdTPZ7igkc=";
+    url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor finalAttrs.version}/gegl-${finalAttrs.version}.tar.xz";
+    hash = "sha256-YISWmwbuhspxFCEzdz8n4T8C5aaiLCz85FLsqt23kME=";
   };
 
   nativeBuildInputs = [
@@ -56,31 +62,35 @@ stdenv.mkDerivation rec {
     gi-docgen
   ];
 
-  buildInputs = [
-    libpng
-    cairo
-    libjpeg
-    librsvg
-    lensfun
-    libspiro
-    maxflow
-    netsurf.libnsgif
-    pango
-    poly2tri-c
-    poppler
-    bzip2
-    libraw
-    libwebp
-    gexiv2
-    openexr
-    suitesparse
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    OpenCL
-  ] ++ lib.optionals stdenv.cc.isClang [
-    llvmPackages.openmp
-  ] ++ lib.optionals withLuaJIT [
-    luajit
-  ];
+  buildInputs =
+    [
+      libpng
+      cairo
+      libjpeg
+      librsvg
+      lensfun
+      libspiro
+      maxflow
+      netsurf.libnsgif
+      pango
+      poly2tri-c
+      poppler
+      bzip2
+      libraw
+      libwebp
+      gexiv2
+      openexr
+      suitesparse
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      OpenCL
+    ]
+    ++ lib.optionals stdenv.cc.isClang [
+      llvmPackages.openmp
+    ]
+    ++ lib.optionals withLuaJIT [
+      luajit
+    ];
 
   # for gegl-4.0.pc
   propagatedBuildInputs = [
@@ -89,19 +99,21 @@ stdenv.mkDerivation rec {
     babl
   ];
 
-  mesonFlags = [
-    "-Dmrg=disabled" # not sure what that is
-    "-Dsdl2=disabled"
-    "-Dpygobject=disabled"
-    "-Dlibav=disabled"
-    "-Dlibv4l=disabled"
-    "-Dlibv4l2=disabled"
-    # Disabled due to multiple vulnerabilities, see
-    # https://github.com/NixOS/nixpkgs/pull/73586
-    "-Djasper=disabled"
-  ] ++ lib.optionals (!withLuaJIT) [
-    "-Dlua=disabled"
-  ];
+  mesonFlags =
+    [
+      "-Dmrg=disabled" # not sure what that is
+      "-Dsdl2=disabled"
+      "-Dpygobject=disabled"
+      "-Dlibav=disabled"
+      "-Dlibv4l=disabled"
+      "-Dlibv4l2=disabled"
+      # Disabled due to multiple vulnerabilities, see
+      # https://github.com/NixOS/nixpkgs/pull/73586
+      "-Djasper=disabled"
+    ]
+    ++ lib.optionals (!withLuaJIT) [
+      "-Dlua=disabled"
+    ];
 
   postPatch = ''
     chmod +x tests/opencl/opencl_test.sh
@@ -116,6 +128,10 @@ stdenv.mkDerivation rec {
   # tests fail to connect to the com.apple.fonts daemon in sandboxed mode
   doCheck = !stdenv.hostPlatform.isDarwin;
 
+  passthru = {
+    inherit gimp;
+  };
+
   meta = with lib; {
     description = "Graph-based image processing framework";
     homepage = "https://www.gegl.org";
@@ -123,4 +139,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ jtojnar ];
     platforms = platforms.unix;
   };
-}
+})

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

@@ -8,7 +8,7 @@
 , ppxlib, ppx_deriving
 , ppxlib_0_15, ppx_deriving_0_15
 , coqPackages
-, version ? if lib.versionAtLeast ocaml.version "4.13" then "2.0.5"
+, version ? if lib.versionAtLeast ocaml.version "4.13" then "2.0.6"
     else if lib.versionAtLeast ocaml.version "4.08" then "1.20.0"
     else "1.15.2"
 }:
@@ -17,6 +17,7 @@ let p5 = camlp5; in
 let camlp5 = p5.override { legacy = true; }; in
 
 let fetched = coqPackages.metaFetch ({
+    release."2.0.6".sha256 = "sha256-tRUYXQZ0VXrjIZBZ1skdzieUsww4rSNEe5ik+iKpk3U=";
     release."2.0.5".sha256 = "sha256-cHgERFqrfSg5WtUX3UxR6L+QkzS7+t6n4V+wweiEacc=";
     release."1.20.0".sha256 = "sha256-lctZAIQgOg5d+LfILtWsBVcsemV3zTZYfJfDlCxHtcA=";
     release."1.19.2".sha256 = "sha256-dBj5Ek7PWq/8Btq/dggJUqa8cUtfvbi6EWo/lJEDOU4=";

pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix

@@ -5,7 +5,7 @@
 stdenv.mkDerivation rec {
  pname = "ocsigen-toolkit";
  name = "ocaml${ocaml.version}-${pname}-${version}";
- version = "3.3.4";
+ version = "4.1.0";
 
  propagatedBuildInputs = [ calendar js_of_ocaml-ppx_deriving_json eliom ];
  nativeBuildInputs = [ ocaml findlib opaline eliom ];
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     owner = "ocsigen";
     repo = pname;
     rev = version;
-    hash = "sha256-6ccu8WJxUwpR5YyB4j1jQPWba8GhQDxuw+IDHswQpSA=";
+    hash = "sha256-1kw2HANajHDdMmjuYNB79ZDqy2Ml02nc5s+cJzIoxQ8=";
   };
 
   meta = {