Merge staging-next into staging

2025-02-20 02:55:39 +00:00 · 2025-01-02 18:04:58 +00:00 · 2025-01-02 18:04:58 +00:00 · 5d88e3a361
commit 5d88e3a361
parent 936f4e016d ceffd51bbd
97 changed files with 1148 additions and 1070 deletions
--- a/.mailmap
+++ b/.mailmap
@ -10,6 +10,9 @@ Fiona Behrens <me@kloenk.dev>
 Fiona Behrens <me@kloenk.dev> <me@kloenk.de>
 goatastronaut0212 <goatastronaut0212@outlook.com> <goatastronaut0212@proton.me>
 Janne Heß <janne@hess.ooo> <dasJ@users.noreply.github.com>
+jopejoe1 <nixpkgs@missing.ninja>
+jopejoe1 <nixpkgs@missing.ninja> <johannes@joens.email>
+jopejoe1 <nixpkgs@missing.ninja> <34899572+jopejoe1@users.noreply.github.com>
 Jörg Thalheim <joerg@thalheim.io> <Mic92@users.noreply.github.com>
 Lin Jian <me@linj.tech> <linj.dev@outlook.com>
 Lin Jian <me@linj.tech> <75130626+jian-lin@users.noreply.github.com>
--- a/doc/languages-frameworks/index.md
+++ b/doc/languages-frameworks/index.md
@ -95,6 +95,5 @@ scheme.section.md
 swift.section.md
 tcl.section.md
 texlive.section.md
-titanium.section.md
 vim.section.md
 ```
--- a/doc/languages-frameworks/titanium.section.md
+++ b/doc/languages-frameworks/titanium.section.md
@ -1,110 +0,0 @@
-# Titanium {#titanium}
-
-The Nixpkgs repository contains facilities to deploy a variety of versions of
-the [Titanium SDK](https://www.appcelerator.com) versions, a cross-platform
-mobile app development framework using JavaScript as an implementation language,
-and includes a function abstraction making it possible to build Titanium
-applications for Android and iOS devices from source code.
-
-Not all Titanium features supported -- currently, it can only be used to build
-Android and iOS apps.
-
-## Building a Titanium app {#building-a-titanium-app}
-
-We can build a Titanium app from source for Android or iOS and for debugging or
-release purposes by invoking the `titaniumenv.buildApp {}` function:
-
-```nix
-titaniumenv.buildApp {
-  name = "myapp";
-  src = ./myappsource;
-
-  preBuild = "";
-  target = "android"; # or 'iphone'
-  tiVersion = "7.1.0.GA";
-  release = true;
-
-  androidsdkArgs = {
-    platformVersions = [ "25" "26" ];
-  };
-  androidKeyStore = ./keystore;
-  androidKeyAlias = "myfirstapp";
-  androidKeyStorePassword = "secret";
-
-  xcodeBaseDir = "/Applications/Xcode.app";
-  xcodewrapperArgs = {
-    version = "9.3";
-  };
-  iosMobileProvisioningProfile = ./myprovisioning.profile;
-  iosCertificateName = "My Company";
-  iosCertificate = ./mycertificate.p12;
-  iosCertificatePassword = "secret";
-  iosVersion = "11.3";
-  iosBuildStore = false;
-
-  enableWirelessDistribution = true;
-  installURL = "/installipa.php";
-}
-```
-
-The `titaniumenv.buildApp {}` function takes the following parameters:
-
-* The `name` parameter refers to the name in the Nix store.
-* The `src` parameter refers to the source code location of the app that needs
-  to be built.
-* `preRebuild` contains optional build instructions that are carried out before
-  the build starts.
-* `target` indicates for which device the app must be built. Currently only
-  'android' and 'iphone' (for iOS) are supported.
-* `tiVersion` can be used to optionally override the requested Titanium version
-  in `tiapp.xml`. If not specified, it will use the version in `tiapp.xml`.
-* `release` should be set to true when building an app for submission to the
-  Google Playstore or Apple Appstore. Otherwise, it should be false.
-
-When the `target` has been set to `android`, we can configure the following
-parameters:
-
-* The `androidSdkArgs` parameter refers to an attribute set that propagates all
-  parameters to the `androidenv.composeAndroidPackages {}` function. This can
-  be used to install all relevant Android plugins that may be needed to perform
-  the Android build. If no parameters are given, it will deploy the platform
-  SDKs for API-levels 25 and 26 by default.
-
-When the `release` parameter has been set to true, you need to provide
-parameters to sign the app:
-
-* `androidKeyStore` is the path to the keystore file
-* `androidKeyAlias` is the key alias
-* `androidKeyStorePassword` refers to the password to open the keystore file.
-
-When the `target` has been set to `iphone`, we can configure the following
-parameters:
-
-* The `xcodeBaseDir` parameter refers to the location where Xcode has been
-  installed. When none value is given, the above value is the default.
-* The `xcodewrapperArgs` parameter passes arbitrary parameters to the
-  `xcodeenv.composeXcodeWrapper {}` function. This can, for example, be used
-  to adjust the default version of Xcode.
-
-When `release` has been set to true, you also need to provide the following
-parameters:
-
-* `iosMobileProvisioningProfile` refers to a mobile provisioning profile needed
-  for signing.
-* `iosCertificateName` refers to the company name in the P12 certificate.
-* `iosCertificate` refers to the path to the P12 file.
-* `iosCertificatePassword` contains the password to open the P12 file.
-* `iosVersion` refers to the iOS SDK version to use. It defaults to the latest
-  version.
-* `iosBuildStore` should be set to `true` when building for the Apple Appstore
-  submission. For enterprise or ad-hoc builds it should be set to `false`.
-
-When `enableWirelessDistribution` has been enabled, you must also provide the
-path of the PHP script (`installURL`) (that is included with the iOS build
-environment) to enable wireless ad-hoc installations.
-
-## Emulating or simulating the app {#emulating-or-simulating-the-app}
-
-It is also possible to simulate the correspond iOS simulator build by using
-`xcodeenv.simulateApp {}` and emulate an Android APK by using
-`androidenv.emulateApp {}`.
--- a/doc/manual.md.in
+++ b/doc/manual.md.in
@ -14,3 +14,7 @@ development.md
 contributing.md
 interoperability.md
 ```
+
+```{=include=} appendix html:into-file=//release-notes.html
+release-notes/release-notes.md
+```
--- a/doc/redirects.json
+++ b/doc/redirects.json
@ -1,4 +1,7 @@
 {
+  "chap-release-notes": [
+    "release-notes.html#chap-release-notes"
+  ],
  "nixpkgs-manual": [
    "index.html#nixpkgs-manual"
  ],
@ -50,6 +53,24 @@
  "chap-overlays": [
    "index.html#chap-overlays"
  ],
+  "sec-nixpkgs-release-25.05": [
+    "release-notes.html#sec-nixpkgs-release-25.05"
+  ],
+  "sec-nixpkgs-release-25.05-incompatibilities": [
+    "release-notes.html#sec-nixpkgs-release-25.05-incompatibilities"
+  ],
+  "sec-nixpkgs-release-25.05-incompatibilities-titanium-removed": [
+    "release-notes.html#sec-nixpkgs-release-25.05-incompatibilities-titanium-removed",
+    "index.html#titanium",
+    "index.html#building-a-titanium-app",
+    "index.html#emulating-or-simulating-the-app"
+  ],
+  "sec-nixpkgs-release-25.05-lib": [
+    "release-notes.html#sec-nixpkgs-release-25.05-lib"
+  ],
+  "sec-nixpkgs-release-25.05-lib-breaking": [
+    "release-notes.html#sec-nixpkgs-release-25.05-lib-breaking"
+  ],
  "sec-overlays-install": [
    "index.html#sec-overlays-install"
  ],
@ -3736,15 +3757,6 @@
  "sec-language-texlive-lualatex-font-cache": [
    "index.html#sec-language-texlive-lualatex-font-cache"
  ],
-  "titanium": [
-    "index.html#titanium"
-  ],
-  "building-a-titanium-app": [
-    "index.html#building-a-titanium-app"
-  ],
-  "emulating-or-simulating-the-app": [
-    "index.html#emulating-or-simulating-the-app"
-  ],
  "vim": [
    "index.html#vim"
  ],
--- a/doc/release-notes/release-notes.md
+++ b/doc/release-notes/release-notes.md
@ -0,0 +1,7 @@
+# Release Notes {#chap-release-notes}
+
+This section lists the release notes for each stable version of Nixpkgs and current unstable revision.
+
+```{=include=} sections
+rl-2505.section.md
+```
--- a/doc/release-notes/rl-2505.section.md
+++ b/doc/release-notes/rl-2505.section.md
@ -0,0 +1,19 @@
+# Nixpkgs 25.05 (2025.05/??) {#sec-nixpkgs-release-25.05}
+
+## Backward Incompatibilities {#sec-nixpkgs-release-25.05-incompatibilities}
+
+<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
+
+<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
+
+### Titanium removed {#sec-nixpkgs-release-25.05-incompatibilities-titanium-removed}
+
+- `titaniumenv`, `titanium`, and `titanium-alloy` have been removed due to lack of maintenance in Nixpkgs.
+
+## Nixpkgs Library {#sec-nixpkgs-release-25.05-lib}
+
+### Breaking changes {#sec-nixpkgs-release-25.05-lib-breaking}
+
+- Structure of the `functor` of some types has changed. `functor` is an implementation detail and should not be relied upon. If you did rely on it let us know in this [PR](https://github.com/NixOS/nixpkgs/pull/363565).
+  - [`lib.types.enum`](https://nixos.org/manual/nixos/unstable/#sec-option-types-basic): Previously the `functor.payload` was the list of enum values directly. Now it is an attribute set containing the values in the `values` attribute.
+  - [`lib.types.separatedString`](https://nixos.org/manual/nixos/unstable/#sec-option-types-string): Previously the `functor.payload` was the seperator directly. Now it is an attribute set containing the seperator in the `sep` attribute.
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -11135,11 +11135,11 @@
    githubId = 13179;
  };
  jopejoe1 = {
-    email = "johannes@joens.email";
+    email = "nixpkgs@missing.ninja";
    matrix = "@jopejoe1:matrix.org";
    github = "jopejoe1";
    githubId = 34899572;
-    name = "Johannes Jöns";
+    name = "jopejoe1";
  };
  jordanisaacs = {
    name = "Jordan Isaacs";
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@ -79,6 +79,8 @@ let
  prepareManualFromMD = ''
    cp -r --no-preserve=all $inputs/* .

+    cp -r ${../../../doc/release-notes} ./release-notes-nixpkgs
+
    substituteInPlace ./manual.md \
      --replace-fail '@NIXOS_VERSION@' "${version}"
    substituteInPlace ./configuration/configuration.md \
--- a/nixos/doc/manual/redirects.json
+++ b/nixos/doc/manual/redirects.json
@ -1886,11 +1886,23 @@
  "sec-release-25.05-notable-changes": [
    "release-notes.html#sec-release-25.05-notable-changes"
  ],
-  "sec-release-25.05-lib": [
-    "release-notes.html#sec-release-25.05-lib"
+  "sec-nixpkgs-release-25.05": [
+    "release-notes.html#sec-nixpkgs-release-25.05"
  ],
-  "sec-release-25.05-lib-breaking": [
-    "release-notes.html#sec-release-25.05-lib-breaking"
+  "sec-nixpkgs-release-25.05-incompatibilities": [
+    "release-notes.html#sec-nixpkgs-release-25.05-incompatibilities"
+  ],
+  "sec-nixpkgs-release-25.05-incompatibilities-titanium-removed": [
+    "release-notes.html#sec-nixpkgs-release-25.05-incompatibilities-titanium-removed",
+    "index.html#titanium",
+    "index.html#building-a-titanium-app",
+    "index.html#emulating-or-simulating-the-app"
+  ],
+  "sec-nixpkgs-release-25.05-lib": [
+    "release-notes.html#sec-nixpkgs-release-25.05-lib"
+  ],
+  "sec-nixpkgs-release-25.05-lib-breaking": [
+    "release-notes.html#sec-nixpkgs-release-25.05-lib-breaking"
  ],
  "sec-release-24.11": [
    "release-notes.html#sec-release-24.11"
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@ -340,10 +340,6 @@

 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

-## Nixpkgs Library {#sec-release-25.05-lib}
-
-### Breaking changes {#sec-release-25.05-lib-breaking}
-
- Structure of the `functor` of some types has changed. `functor` is an implementation detail and should not be relied upon. If you did rely on it let us know in this [PR](https://github.com/NixOS/nixpkgs/pull/363565).
-  - [`lib.types.enum`](https://nixos.org/manual/nixos/unstable/#sec-option-types-basic): Previously the `functor.payload` was the list of enum values directly. Now it is an attribute set containing the values in the `values` attribute.
-  - [`lib.types.separatedString`](https://nixos.org/manual/nixos/unstable/#sec-option-types-string): Previously the `functor.payload` was the seperator directly. Now it is an attribute set containing the seperator in the `sep` attribute.
+```{=include=} sections
+../release-notes-nixpkgs/rl-2505.section.md
+```
--- a/nixos/lib/eval-config.nix
+++ b/nixos/lib/eval-config.nix
@ -65,6 +65,14 @@ let
  withWarnings = x:
    lib.warnIf (evalConfigArgs?extraArgs) "The extraArgs argument to eval-config.nix is deprecated. Please set config._module.args instead."
    lib.warnIf (evalConfigArgs?check) "The check argument to eval-config.nix is deprecated. Please set config._module.check instead."
+    lib.warnIf (specialArgs?pkgs) ''
+      You have set specialArgs.pkgs, which means that options like nixpkgs.config
+      and nixpkgs.overlays will be ignored. If you wish to reuse an already created
+      pkgs, which you know is configured correctly for this NixOS configuration,
+      please import the `nixosModules.pkgsReadOnly` module from the nixpkgs flake or
+      `(modulesPath + "/misc/nixpkgs/read-only.nix"), and set `{ nixpkgs.pkgs = <your pkgs>; }`.
+      This properly disables the ignored options to prevent future surprises.
+    ''
    x;

  legacyModules =
--- a/nixos/modules/services/misc/pykms.nix
+++ b/nixos/modules/services/misc/pykms.nix
@ -24,9 +24,12 @@ in
        description = "Whether to enable the PyKMS service.";
      };

+      package = lib.mkPackageOption pkgs "pykms" { };
+
      listenAddress = lib.mkOption {
        type = lib.types.str;
        default = "0.0.0.0";
+        example = "::";
        description = "The IP address on which to listen.";
      };

@ -78,13 +81,13 @@ in
      wantedBy = [ "multi-user.target" ];
      # python programs with DynamicUser = true require HOME to be set
      environment.HOME = libDir;
-      serviceConfig = with pkgs; {
+      serviceConfig = {
        DynamicUser = true;
        StateDirectory = baseNameOf libDir;
-        ExecStartPre = "${lib.getBin pykms}/libexec/create_pykms_db.sh ${libDir}/clients.db";
+        ExecStartPre = "${lib.getBin cfg.package}/libexec/create_pykms_db.sh ${libDir}/clients.db";
        ExecStart = lib.concatStringsSep " " (
          [
-            "${lib.getBin pykms}/bin/server"
+            "${lib.getBin cfg.package}/bin/server"
            "--logfile=STDOUT"
            "--loglevel=${cfg.logLevel}"
            "--sqlite=${libDir}/clients.db"
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@ -13,7 +13,12 @@ let
  '';
  qemuConfigFile = pkgs.writeText "qemu.conf" ''
    ${optionalString cfg.qemu.ovmf.enable ''
-      nvram = [ "/run/libvirt/nix-ovmf/AAVMF_CODE.fd:/run/libvirt/nix-ovmf/AAVMF_VARS.fd", "/run/libvirt/nix-ovmf/OVMF_CODE.fd:/run/libvirt/nix-ovmf/OVMF_VARS.fd" ]
+      nvram = [
+        "/run/libvirt/nix-ovmf/AAVMF_CODE.fd:/run/libvirt/nix-ovmf/AAVMF_VARS.fd",
+        "/run/libvirt/nix-ovmf/AAVMF_CODE.ms.fd:/run/libvirt/nix-ovmf/AAVMF_VARS.ms.fd",
+        "/run/libvirt/nix-ovmf/OVMF_CODE.fd:/run/libvirt/nix-ovmf/OVMF_VARS.fd",
+        "/run/libvirt/nix-ovmf/OVMF_CODE.ms.fd:/run/libvirt/nix-ovmf/OVMF_VARS.ms.fd"
+      ]
    ''}
    ${optionalString (!cfg.qemu.runAsRoot) ''
      user = "qemu-libvirtd"
@ -451,10 +456,10 @@ in
          };
        in
          ''
-          ln -s --force ${ovmfpackage}/FV/AAVMF_CODE.fd /run/${dirName}/nix-ovmf/
-          ln -s --force ${ovmfpackage}/FV/OVMF_CODE.fd /run/${dirName}/nix-ovmf/
-          ln -s --force ${ovmfpackage}/FV/AAVMF_VARS.fd /run/${dirName}/nix-ovmf/
-          ln -s --force ${ovmfpackage}/FV/OVMF_VARS.fd /run/${dirName}/nix-ovmf/
+          ln -s --force ${ovmfpackage}/FV/AAVMF_CODE{,.ms}.fd /run/${dirName}/nix-ovmf/
+          ln -s --force ${ovmfpackage}/FV/OVMF_CODE{,.ms}.fd /run/${dirName}/nix-ovmf/
+          ln -s --force ${ovmfpackage}/FV/AAVMF_VARS{,.ms}.fd /run/${dirName}/nix-ovmf/
+          ln -s --force ${ovmfpackage}/FV/OVMF_VARS{,.ms}.fd /run/${dirName}/nix-ovmf/
        '')}

        # Symlink hooks to /var/lib/libvirt
--- a/pkgs/applications/audio/ft2-clone/default.nix
+++ b/pkgs/applications/audio/ft2-clone/default.nix
@ -13,13 +13,13 @@

 stdenv.mkDerivation rec {
  pname = "ft2-clone";
-  version = "1.89";
+  version = "1.93";

  src = fetchFromGitHub {
    owner = "8bitbubsy";
    repo = "ft2-clone";
    rev = "v${version}";
-    hash = "sha256-s2HMzHJB85kLe3TuKH3oFloWUirmbSYDwh298dZlP6M=";
+    hash = "sha256-B91kLShg3nvOyOlBkLSpTydhUs5yHa+C/OWe8N+MB9c=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@ -1672,6 +1672,22 @@ let
        };
      };

+      egirlcatnip.adwaita-github-theme = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "adwaita-github-theme";
+          publisher = "egirlcatnip";
+          version = "1.0.5";
+          hash = "sha256-OvonS6137ICRUV5Tx4gD3we8nrza6ZgnRSs2SxFiCjU=";
+        };
+        meta = {
+          description = "Adwaita VS Code theme with Github syntax highlighting";
+          downloadPage = "https://marketplace.visualstudio.com/items?itemName=egirlcatnip.adwaita-github-theme";
+          homepage = "https://github.com/egirlcatnip/adwaita-github-theme";
+          license = lib.licenses.gpl3;
+          maintainers = with lib.maintainers; [ thtrf ];
+        };
+      };
+
      elixir-lsp.vscode-elixir-ls = buildVscodeMarketplaceExtension {
        mktplcRef = {
          name = "elixir-ls";
@ -4271,6 +4287,8 @@ let
        };
      };

+      saoudrizwan.claude-dev = callPackage ./saoudrizwan.claude-dev { };
+
      sainnhe.gruvbox-material = buildVscodeMarketplaceExtension {
        mktplcRef = {
          name = "gruvbox-material";
--- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
    name = "tinymist";
    publisher = "myriad-dreamin";
    inherit (tinymist) version;
-    hash = "sha256-nMuK51ktoJQTgJEfFivOjDmnMUx/lWNsIPZ7ZmreqYo=";
+    hash = "sha256-8QwUZfR0eTjXE6IgjpYx9TcWf8WrrVWA0VfTUX+WVCc=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
@ -0,0 +1,21 @@
+{
+  lib,
+  vscode-utils,
+}:
+
+vscode-utils.buildVscodeMarketplaceExtension {
+  mktplcRef = {
+    name = "claude-dev";
+    publisher = "saoudrizwan";
+    version = "3.0.12";
+    hash = "sha256-GlBo4MIoIazKEYHv4yXpRGLVElOnjYgD9gB6rMQxeGg=";
+  };
+
+  meta = {
+    description = "A VSCode extension providing an autonomous coding agent right in your IDE, capable of creating/editing files, executing commands, using the browser, and more with your permission every step of the way";
+    downloadPage = "https://github.com/cline/cline";
+    homepage = "https://github.com/cline/cline";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.drupol ];
+  };
+}
--- a/pkgs/applications/science/misc/gplates/default.nix
+++ b/pkgs/applications/science/misc/gplates/default.nix
@ -7,7 +7,7 @@
  doxygen,
  graphviz,
  boost,
-  cgal_5,
+  cgal,
  gdal,
  glew,
  gmp,
@ -32,7 +32,7 @@ let
    enablePython = true;
    inherit python;
  };
-  cgal = cgal_5.override {
+  cgal' = cgal.override {
    boost = boost';
  };
 in
@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {

  buildInputs = [
    boost'
-    cgal
+    cgal'
    gdal
    glew
    gmp
--- a/pkgs/by-name/ar/arpack/package.nix
+++ b/pkgs/by-name/ar/arpack/package.nix
@ -1,14 +1,16 @@
-{ lib, stdenv, fetchFromGitHub, cmake
+{ lib, stdenv, fetchFromGitHub, cmake, ninja
 , gfortran, blas, lapack, eigen
 , useMpi ? false
 , mpi
 , openssh
 , igraph
+, useAccel ? false #use Accelerate framework on darwin
 }:

 # MPI version can only be built with LP64 interface.
 # See https://github.com/opencollab/arpack-ng#readme
 assert useMpi -> !blas.isILP64;
+assert useAccel -> stdenv.hostPlatform.isDarwin;

 stdenv.mkDerivation rec {
  pname = "arpack";
@ -21,35 +23,39 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-HCvapLba8oLqx9I5+KDAU0s/dTmdWOEilS75i4gyfC0=";
  };

-  nativeBuildInputs = [ cmake gfortran ];
-  buildInputs = assert (blas.isILP64 == lapack.isILP64); [
-    blas
-    lapack
+  nativeBuildInputs = [ cmake gfortran ninja ];
+  buildInputs = [
    eigen
-  ] ++ lib.optional useMpi mpi;
+  ] ++ lib.optionals (!useAccel) (assert (blas.isILP64 == lapack.isILP64); [
+    blas lapack
+  ]) ++ lib.optional useMpi mpi;

  nativeCheckInputs = lib.optional useMpi openssh;

+  # a couple tests fail when run in parallel
  doCheck = true;
+  enableParallelChecking = false;
+
+  env = lib.optionalAttrs useAccel {
+    # Without these flags some tests will fail / segfault when using Accelerate
+    # framework. They were pulled from the CI Workflow
+    # https://github.com/opencollab/arpack-ng/blob/804fa3149a0f773064198a8e883bd021832157ca/.github/workflows/jobs.yml#L184-L192
+    FFLAGS = "-ff2c -fno-second-underscore";
+  };

  cmakeFlags = [
-    "-DBUILD_SHARED_LIBS=ON"
-    "-DINTERFACE64=${if blas.isILP64 then "1" else "0"}"
-    "-DMPI=${if useMpi then "ON" else "OFF"}"
-    "-DICB=ON"
+    (lib.cmakeBool "BUILD_SHARED_LIBS" stdenv.hostPlatform.hasSharedLibraries)
+    (lib.cmakeBool "EIGEN" true)
+    (lib.cmakeBool "EXAMPLES" true)
+    (lib.cmakeBool "ICB" true)
+    (lib.cmakeBool "INTERFACE64" (!useAccel && blas.isILP64))
+    (lib.cmakeBool "MPI" useMpi)
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "-DBLA_VENDOR=${if useAccel then "Apple" else "Generic"}"
  ];

-  preCheck = ''
-    # Prevent tests from using all cores
-    export OMP_NUM_THREADS=2
-  '';
-
-  postFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    install_name_tool -change libblas.dylib ${blas}/lib/libblas.dylib $out/lib/libarpack.dylib
-  '';
-
  passthru = {
-    inherit (blas) isILP64;
+    isILP64 = !useAccel && blas.isILP64;
    tests = {
      inherit igraph;
    };
--- a/pkgs/by-name/ba/bacon/package.nix
+++ b/pkgs/by-name/ba/bacon/package.nix
@ -9,16 +9,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "bacon";
-  version = "3.6.0";
+  version = "3.7.0";

  src = fetchFromGitHub {
    owner = "Canop";
    repo = "bacon";
    rev = "refs/tags/v${version}";
-    hash = "sha256-L+LVD7ceKUQ+nVyepusrv9Zz4BSGjXucnimsf+abM2k=";
+    hash = "sha256-pw+EfmpDvMCKSHOeHiv06x13/tRuf053Zcj8z0eWnPs=";
  };

-  cargoHash = "sha256-NUCy3DZ1uV1iPanHGbK/TSY6oS3zSQxVpmnw7Aon+pw=";
+  cargoHash = "sha256-W1bDZSUBjPmb/7bOnE+E5byA0clJZ+qGJ4XYASAjfeU=";

  nativeInstallCheckInputs = [ versionCheckHook ];
  versionCheckProgramArg = [ "--version" ];
--- a/pkgs/by-name/bl/bloat/package.nix
+++ b/pkgs/by-name/bl/bloat/package.nix
@ -7,12 +7,12 @@

 buildGoModule {
  pname = "bloat";
-  version = "0-unstable-2024-10-28";
+  version = "0-unstable-2024-12-27";

  src = fetchgit {
    url = "git://git.freesoftwareextremist.com/bloat";
-    rev = "68d7acc2f7266c47001445229ff235546c8c71b4";
-    hash = "sha256-VLyL1tnb3/qsDFp8s84XTj1Ohl/ajD+tn7V8iBp3ppY=";
+    rev = "d171b6c2d50500cdfd2f3308bf82a5f79e22cd8b";
+    hash = "sha256-a9nL6NvZLQZLOuoqdDbZTH9dVtQ6guKopkAHughINcg=";
  };

  vendorHash = null;
--- a/pkgs/by-name/ck/ckan/package.nix
+++ b/pkgs/by-name/ck/ckan/package.nix
@ -6,6 +6,9 @@
  mono,
  gtk2,
  curl,
+  imagemagick,
+  copyDesktopItems,
+  makeDesktopItem,
 }:

 stdenv.mkDerivation rec {
@ -17,9 +20,19 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-SK2eKdH/bm+W+qU8XUHRD9uffmfp5bR4dBvBEUKCm8E=";
  };

+  icon = fetchurl {
+    url = "https://raw.githubusercontent.com/KSP-CKAN/CKAN/450e2f960e1a3fee4ab7cf74ad56bddc5296fc7e/assets/ckan-256.png";
+    hash = "sha256-BJvuOz8NWmzpYzzhveeq6rcuqXIxQqxtBIcRvobx+TY=";
+  };
+
  dontUnpack = true;

-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [
+    copyDesktopItems
+    imagemagick
+    makeWrapper
+  ];
+
  buildInputs = [ mono ];

  libraries = lib.makeLibraryPath [
@ -30,12 +43,38 @@ stdenv.mkDerivation rec {
  dontBuild = true;

  installPhase = ''
+    runHook preInstall
+    for size in 16 24 48 64 96 128 256; do
+      mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
+      magick -background none ${icon} -resize "$size"x"$size" $out/share/icons/hicolor/"$size"x"$size"/apps/${pname}.png
+    done
    install -m 644 -D $src $out/bin/ckan.exe
    makeWrapper ${mono}/bin/mono $out/bin/ckan \
      --add-flags $out/bin/ckan.exe \
      --set LD_LIBRARY_PATH $libraries
+    runHook postInstall
  '';

+  desktopItems = [
+    (makeDesktopItem {
+      name = "ckan";
+      comment = "The Comprehensive Kerbal Archive Network Client";
+      desktopName = "CKAN";
+      categories = [
+        "Game"
+        "PackageManager"
+      ];
+      exec = "ckan";
+      icon = "ckan";
+      keywords = [
+        "Kerbal Space Program"
+        "KSP"
+        "Mod"
+      ];
+      extraConfig.X-GNOME-SingleWindow = "true";
+    })
+  ];
+
  meta = with lib; {
    description = "Mod manager for Kerbal Space Program";
    mainProgram = "ckan";
--- a/pkgs/by-name/fa/factoriolab/package.nix
+++ b/pkgs/by-name/fa/factoriolab/package.nix
@ -10,13 +10,13 @@
 }:
 buildNpmPackage rec {
  pname = "factoriolab";
-  version = "3.8.9";
+  version = "3.8.10";

  src = fetchFromGitHub {
    owner = "factoriolab";
    repo = "factoriolab";
    rev = "refs/tags/v${version}";
-    hash = "sha256-H+l/eDdTc/IMqE85Xh4IAo2ZWZRYKKUnH3rXkON2L1s=";
+    hash = "sha256-vwcqUsqlggmqqlQ3fyn+s3NKQ0oNcVztfjTpJPW1mFs=";
  };
  buildInputs = [ vips ];
  nativeBuildInputs = [
--- a/pkgs/by-name/fl/flyctl/package.nix
+++ b/pkgs/by-name/fl/flyctl/package.nix
@ -9,16 +9,16 @@

 buildGoModule rec {
  pname = "flyctl";
-  version = "0.3.53";
+  version = "0.3.56";

  src = fetchFromGitHub {
    owner = "superfly";
    repo = "flyctl";
    rev = "v${version}";
-    hash = "sha256-B6Qku84vUy2KtAWQ3mpbOd1G14xAw0FFuB02fDvFE84=";
+    hash = "sha256-l413128FjVflVKHAYJspK63UP8IomNimIeJi3xyYmxw=";
  };

-  vendorHash = "sha256-B7COrPKxTBDdFehBcNKt47I1ZslBHjWc+ibPiCpIocU=";
+  vendorHash = "sha256-/YP9qx6OS2OcPSF1BgEZ4l+nSwg+T5rKOHjdDHlNy+k=";

  subPackages = [ "." ];

--- a/pkgs/by-name/fo/formatjson5/package.nix
+++ b/pkgs/by-name/fo/formatjson5/package.nix
@ -5,6 +5,7 @@
  stdenv,
  darwin,
  nix-update-script,
+  fetchpatch,
 }:

 rustPlatform.buildRustPackage rec {
@ -19,6 +20,13 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-Lredw/Fez+2U2++ShZcKTFCv8Qpai9YUvqvpGjG5W0o=";
  };

+  patches = [
+    (fetchpatch {
+      url = "https://github.com/google/json5format/commit/32914546e7088b3d9173ae9a2f307effa87917bf.patch";
+      hash = "sha256-kAbRUL/FuhnxkC9Xo4J2bXt9nkMOLeJvgMmOoKnSxKc=";
+    })
+  ];
+
  cargoHash = "sha256-zPgaZPDyNVPmBXz6QwOYnmh/sbJ8aPST8znLMfIWejk=";

  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ];
--- a/pkgs/by-name/go/go-callvis/package.nix
+++ b/pkgs/by-name/go/go-callvis/package.nix
@ -6,16 +6,16 @@

 buildGoModule rec {
  pname = "go-callvis";
-  version = "0.7.0";
+  version = "0.7.1";

  src = fetchFromGitHub {
    owner = "ofabry";
    repo = "go-callvis";
    rev = "v${version}";
-    hash = "sha256-PIzmnqlK+uFtzZW4H0xpP5c+X30hFvOjQydvreJn4xM=";
+    hash = "sha256-gCQjxJH03QAg6MZx5NJUJR6tKP02ThIa5BGN6A/0ejM=";
  };

-  vendorHash = "sha256-AfbUxA5C5dH70+vqC+1RGaTt7S0FL9CBcxel0ifmHKs=";
+  vendorHash = "sha256-IS8lkDBy7Y/qAaDxmWRfrVQEF9OFo7VofqSNgNTEQQw=";

  ldflags = [
    "-s"
--- a/pkgs/by-name/ju/jujutsu/package.nix
+++ b/pkgs/by-name/ju/jujutsu/package.nix
@ -21,7 +21,7 @@
 }:

 let
-  version = "0.24.0";
+  version = "0.25.0";
 in

 rustPlatform.buildRustPackage {
@ -32,10 +32,10 @@ rustPlatform.buildRustPackage {
    owner = "jj-vcs";
    repo = "jj";
    tag = "v${version}";
-    hash = "sha256-XsD4P2UygZFcnlV2o3E/hRRgsGjwKw1r9zniEeAk758";
+    hash = "sha256-5J1ZfPNyniUK5D3Pt1aKuJ+/8vad3JPxCztBRY591N8=";
  };

-  cargoHash = "sha256-9JwRdeHo8JkwRQwPA+UsIEWar4gYQS4SIM/uj1TU2yg";
+  cargoHash = "sha256-kuZ1zvb6H5QWjJSUYMq5tEywsQMC6187YJPUT1r4S5o=";

  nativeBuildInputs = [
    installShellFiles
--- a/pkgs/by-name/k6/k6/package.nix
+++ b/pkgs/by-name/k6/k6/package.nix
@ -8,13 +8,13 @@

 buildGoModule rec {
  pname = "k6";
-  version = "0.55.1";
+  version = "0.55.2";

  src = fetchFromGitHub {
    owner = "grafana";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-29lb8vCMe6BcGeSlfMQm3w+UsD9n3FCljRiT51QNiLU=";
+    hash = "sha256-BuZsz5+vp4obL/Gj/gJSgA0xxdYmqd+MKggS62Jo+bM=";
  };

  subPackages = [ "./" ];
--- a/pkgs/by-name/ko/koreader/package.nix
+++ b/pkgs/by-name/ko/koreader/package.nix
@ -24,11 +24,11 @@ stdenv.mkDerivation rec {
    {
      aarch64-linux = fetchurl {
        url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-arm64.deb";
-        hash = "sha256-FwwB9slKOiYQ3eud2tiqov6yGNxmIicIe6nFpsH28Vk=";
+        hash = "sha256-uy+4+pNyz10xrGM0QF9q0y6UpQK1B9PGNqrcK6nENQY=";
      };
      armv7l-linux = fetchurl {
        url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-armhf.deb";
-        hash = "sha256-LgeWQcHm5Qq/7MUuidjily0WsOFZAWGWeO52jNHWKMw=";
+        hash = "sha256-lTc12qmoe0kGUhrStlGfDRw+cNJnX7F09/jKKc/1U9g=";
      };
      x86_64-linux = fetchurl {
        url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb";
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
    owner = "koreader";
    rev = "v${version}";
    fetchSubmodules = true;
-    sha256 = "sha256-gHn1xqBc7M9wkek1Ja1gry8TKIuUxQP8T45x3z2S4uc=";
+    sha256 = "sha256-EI8UOQuwhJqcAp8QnLYhI0K+uV/7ZqxdHNk8mPkDWA0=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/lc/lcalc/package.nix
+++ b/pkgs/by-name/lc/lcalc/package.nix
@ -19,6 +19,14 @@ stdenv.mkDerivation rec {
    hash = "sha256-RxWZ7T0I9zV7jUVnL6jV/PxEoU32KY7Q1UsOL5Lonuc=";
  };

+  # workaround for vendored GCC 3.5 <complex>
+  # https://gitlab.com/sagemath/lcalc/-/issues/16
+  env.NIX_CFLAGS_COMPILE = toString [
+    "-D_GLIBCXX_COMPLEX"
+    "-D_LIBCPP_COMPLEX"
+    "-D_LIBCPP___FWD_COMPLEX_H"
+  ];
+
  nativeBuildInputs = [
    autoreconfHook
    gengetopt
--- a/pkgs/by-name/me/mesen/deps.json
+++ b/pkgs/by-name/me/mesen/deps.json
@ -0,0 +1,272 @@
+[
+  {
+    "pname": "Avalonia",
+    "version": "11.2.0",
+    "hash": "sha256-kG3tnsLdodlvIjYd5feBZ0quGd2FsvV8FIy7uD5UZ5Q="
+  },
+  {
+    "pname": "Avalonia.Angle.Windows.Natives",
+    "version": "2.1.22045.20230930",
+    "hash": "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc="
+  },
+  {
+    "pname": "Avalonia.AvaloniaEdit",
+    "version": "11.1.0",
+    "hash": "sha256-K9+hK+4aK93dyuGytYvVU25daz605+KN54hmwQYXFF8="
+  },
+  {
+    "pname": "Avalonia.BuildServices",
+    "version": "0.0.29",
+    "hash": "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY="
+  },
+  {
+    "pname": "Avalonia.Controls.ColorPicker",
+    "version": "11.2.0",
+    "hash": "sha256-x6IdcSo3e2Pq/En9/N80HpPblEXSAv51VRlBrF8wlVM="
+  },
+  {
+    "pname": "Avalonia.Controls.DataGrid",
+    "version": "11.2.0",
+    "hash": "sha256-pd/cD82onMZ0iMLl9TOCl35PEvAPbyX2lUj49lrBpOA="
+  },
+  {
+    "pname": "Avalonia.Controls.ProportionalStackPanel",
+    "version": "11.2.0",
+    "hash": "sha256-Y8tX7dBzSl69NOSNdpNGzGetc6wQtKnFy/KRnV0SKhQ="
+  },
+  {
+    "pname": "Avalonia.Controls.Recycling",
+    "version": "11.2.0",
+    "hash": "sha256-ylsPhtILO0pk+5uPZKB5L1o7X8JTiOe48czPPLYLyVs="
+  },
+  {
+    "pname": "Avalonia.Controls.Recycling.Model",
+    "version": "11.2.0",
+    "hash": "sha256-zAleY6ryWIexJAzz4BpT/Xd3iDgNL624YW5sIBJ0Sv8="
+  },
+  {
+    "pname": "Avalonia.Desktop",
+    "version": "11.2.0",
+    "hash": "sha256-+5ISi6WXe8AIjClVo3UqZHgzZpFbMgFk13YvHHhx9MM="
+  },
+  {
+    "pname": "Avalonia.Diagnostics",
+    "version": "11.2.0",
+    "hash": "sha256-k60HGDKnsXiDOnxSH+Hx2ihyqmxSSeWIBJx2XD1ELW0="
+  },
+  {
+    "pname": "Avalonia.FreeDesktop",
+    "version": "11.2.0",
+    "hash": "sha256-u4CQvG6EdsyaHSWa+Y704sDiWZlqbArB0g4gcoCFwQo="
+  },
+  {
+    "pname": "Avalonia.MarkupExtension",
+    "version": "11.2.0",
+    "hash": "sha256-BUEMX+YThWmxh9X50bGsFtclLFVSIITMlAf0iq2vApk="
+  },
+  {
+    "pname": "Avalonia.Native",
+    "version": "11.2.0",
+    "hash": "sha256-fMikurP2RAnOahZkORxuGOKGn5iQ0saZCEYsvoFiFQI="
+  },
+  {
+    "pname": "Avalonia.ReactiveUI",
+    "version": "11.2.0",
+    "hash": "sha256-6GXX1ZA6gS9CpkQnGepx1PFNoKiwcHQyLSK5qOGmjYo="
+  },
+  {
+    "pname": "Avalonia.Remote.Protocol",
+    "version": "11.2.0",
+    "hash": "sha256-QwYY3bpShJ1ayHUx+mjnwaEhCPDzTk+YeasCifAtGzM="
+  },
+  {
+    "pname": "Avalonia.Skia",
+    "version": "11.2.0",
+    "hash": "sha256-rNR+l+vLtlzTU+F51FpOi4Ujy7nR5+lbTc3NQte8s/o="
+  },
+  {
+    "pname": "Avalonia.Themes.Fluent",
+    "version": "11.2.0",
+    "hash": "sha256-Ate6KC61pwXmTAk5h1uh7rjwAViuiO/qgAVMl3F1BA8="
+  },
+  {
+    "pname": "Avalonia.Themes.Simple",
+    "version": "11.2.0",
+    "hash": "sha256-l88ZX50Nao8wjtRnyZxNFFgRpJ/yxxNki6NY48dyTUg="
+  },
+  {
+    "pname": "Avalonia.Win32",
+    "version": "11.2.0",
+    "hash": "sha256-A9PB6Bt61jLdQlMOkchWy/3BwROgxS9BP8FObs/KFiU="
+  },
+  {
+    "pname": "Avalonia.X11",
+    "version": "11.2.0",
+    "hash": "sha256-EP9cCqriEh8d+Wwyv27QGK/CY6w2LcCjtcIv79PZqkM="
+  },
+  {
+    "pname": "CommunityToolkit.Mvvm",
+    "version": "8.0.0",
+    "hash": "sha256-G+PXrc2sr2pdy+JCr3t/Ge6nTDtuoWf1Eypu5HufAxw="
+  },
+  {
+    "pname": "Dock.Avalonia",
+    "version": "11.2.0",
+    "hash": "sha256-Q8YUsH+hfnL9VDMPTJSAms7xb+hr42p7scWqu2c2eD4="
+  },
+  {
+    "pname": "Dock.Model",
+    "version": "11.2.0",
+    "hash": "sha256-+PSgjxvHIJBQRn8naGgSfYyArImVLwy6ftm9FoQc+lA="
+  },
+  {
+    "pname": "Dock.Model.Mvvm",
+    "version": "11.2.0",
+    "hash": "sha256-iO67eWHoxsB51Wx5KIK4dwVkU9qwrja7pYsQWTs/8sA="
+  },
+  {
+    "pname": "Dock.Settings",
+    "version": "11.2.0",
+    "hash": "sha256-esCRl7Trdv2bu2ayLw5kXVtCskXLar1asykkfWnqhug="
+  },
+  {
+    "pname": "DotNet.Bundle",
+    "version": "0.9.13",
+    "hash": "sha256-VA7wFPC2V4JudQ+edk6lFkklDPIHZYVWql8/KMzcnys="
+  },
+  {
+    "pname": "DynamicData",
+    "version": "8.3.27",
+    "hash": "sha256-iPZfL1x36PLf5Lq96zRFvR5OLcoRn7OdJIao98X8wac="
+  },
+  {
+    "pname": "DynamicData",
+    "version": "8.4.1",
+    "hash": "sha256-r+haH5VlmZFJTEJ3UedsYybw+oddn/CSvfm6x7PrrQ4="
+  },
+  {
+    "pname": "ELFSharp",
+    "version": "2.17.3",
+    "hash": "sha256-8OaAkLxpa5rIhxbmDSnKLeY06jS7nV66LjBjXxHnOb0="
+  },
+  {
+    "pname": "Fody",
+    "version": "6.8.0",
+    "hash": "sha256-2laYscz0i0LalGTAup7dsh6XlYRZSojYpp8XOwZJJfg="
+  },
+  {
+    "pname": "HarfBuzzSharp",
+    "version": "7.3.0.2",
+    "hash": "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.Linux",
+    "version": "7.3.0.2",
+    "hash": "sha256-SSfyuyBaduGobJW+reqyioWHhFWsQ+FXa2Gn7TiWxrU="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.macOS",
+    "version": "7.3.0.2",
+    "hash": "sha256-dmEqR9MmpCwK8AuscfC7xUlnKIY7+Nvi06V0u5Jff08="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.WebAssembly",
+    "version": "7.3.0.3-preview.2.2",
+    "hash": "sha256-1NlcTnXrWUYZ2r2/N3SPxNIjNcyIpiiv3g7h8XxpNkM="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.Win32",
+    "version": "7.3.0.2",
+    "hash": "sha256-x4iM3NHs9VyweG57xA74yd4uLuXly147ooe0mvNQ8zo="
+  },
+  {
+    "pname": "MicroCom.Runtime",
+    "version": "0.11.0",
+    "hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="
+  },
+  {
+    "pname": "ReactiveUI",
+    "version": "19.5.41",
+    "hash": "sha256-FsdD1lBZyegqOVzJhZHAz1owCLh7GbVUYXiORbo5euk="
+  },
+  {
+    "pname": "ReactiveUI",
+    "version": "20.1.1",
+    "hash": "sha256-p9l2GMzBRchKb4gW9pQ3DIKhs2O9fX3t/V7jDDztBqE="
+  },
+  {
+    "pname": "ReactiveUI.Fody",
+    "version": "19.5.41",
+    "hash": "sha256-LfKELxAfApQLL0fDd7UJCsZML5C4MFN+Gc5ECaBXmUM="
+  },
+  {
+    "pname": "SkiaSharp",
+    "version": "2.88.8",
+    "hash": "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.Linux",
+    "version": "2.88.8",
+    "hash": "sha256-fOmNbbjuTazIasOvPkd2NPmuQHVCWPnow7AxllRGl7Y="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.macOS",
+    "version": "2.88.8",
+    "hash": "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.WebAssembly",
+    "version": "2.88.8",
+    "hash": "sha256-GWWsE98f869LiOlqZuXMc9+yuuIhey2LeftGNk3/z3w="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.Win32",
+    "version": "2.88.8",
+    "hash": "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM="
+  },
+  {
+    "pname": "Splat",
+    "version": "14.8.12",
+    "hash": "sha256-9KTsYPHVN/wiL8/Yy1KQafrFRy7x8VCEHdzgB+9+8SU="
+  },
+  {
+    "pname": "Splat",
+    "version": "15.1.1",
+    "hash": "sha256-WipAVaUx2HrYNQ9LcYm496LndmSpVbuzJxzP9FA6Ohg="
+  },
+  {
+    "pname": "System.ComponentModel.Annotations",
+    "version": "5.0.0",
+    "hash": "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg="
+  },
+  {
+    "pname": "System.IO.Pipelines",
+    "version": "8.0.0",
+    "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="
+  },
+  {
+    "pname": "System.Reactive",
+    "version": "6.0.0",
+    "hash": "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y="
+  },
+  {
+    "pname": "System.Reactive",
+    "version": "6.0.1",
+    "hash": "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q="
+  },
+  {
+    "pname": "System.Text.Encodings.Web",
+    "version": "8.0.0",
+    "hash": "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE="
+  },
+  {
+    "pname": "System.Text.Json",
+    "version": "8.0.0",
+    "hash": "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow="
+  },
+  {
+    "pname": "Tmds.DBus.Protocol",
+    "version": "0.20.0",
+    "hash": "sha256-CRW/tkgsuBiBJfRwou12ozRQsWhHDooeP88E5wWpWJw="
+  }
+]
--- a/pkgs/by-name/me/mesen/dont-use-alternative-restore-sources.patch
+++ b/pkgs/by-name/me/mesen/dont-use-alternative-restore-sources.patch
@ -0,0 +1,16 @@
+diff --git a/UI/UI.csproj b/UI/UI.csproj
+index 2a0eb78..74751bc 100644
+--- a/UI/UI.csproj
+++ b/UI/UI.csproj
+@@ -90,11 +90,6 @@
+ 	  <None Remove="Styles\StartupStyles.xaml" />
+ 	  <None Remove="Utilities\DipSwitchDefinitions.xml" />
+ 	</ItemGroup>
+-	<PropertyGroup>
+-		<RestoreSources>
+-			https://nuget-feed-nightly.avaloniaui.net/v3/index.json;https://api.nuget.org/v3/index.json
+-		</RestoreSources>
+-	</PropertyGroup>
+ 	<ItemGroup>
+ 		<TrimmerRootAssembly Include="Mesen" />
+ 		<TrimmerRootAssembly Include="AvaloniaEdit" />
--- a/pkgs/by-name/me/mesen/dont-zip-libraries.patch
+++ b/pkgs/by-name/me/mesen/dont-zip-libraries.patch
@ -0,0 +1,74 @@
+diff --git a/UI/Config/ConfigManager.cs b/UI/Config/ConfigManager.cs
+index 56c1ff1..ed5fe8a 100644
+--- a/UI/Config/ConfigManager.cs
+++ b/UI/Config/ConfigManager.cs
+@@ -51,7 +51,6 @@ namespace Mesen.Config
+ 			} else {
+ 				homeFolder = DefaultDocumentsFolder;
+ 			}
+-			Program.ExtractNativeDependencies(homeFolder);
+ 			_homeFolder = homeFolder;
+ 			Config.Save();
+ 		}
+diff --git a/UI/Program.cs b/UI/Program.cs
+index dfc4ba3..632cef2 100644
+--- a/UI/Program.cs
+++ b/UI/Program.cs
+@@ -54,8 +54,6 @@ namespace Mesen
+ 			Environment.CurrentDirectory = ConfigManager.HomeFolder;
+ 
+ 			if(!File.Exists(ConfigManager.GetConfigFile())) {
+-				//Could not find configuration file, show wizard
+-				ExtractNativeDependencies(ConfigManager.HomeFolder);
+ 				App.ShowConfigWindow = true;
+ 				BuildAvaloniaApp().StartWithClassicDesktopLifetime(args, ShutdownMode.OnMainWindowClose);
+ 				if(File.Exists(ConfigManager.GetConfigFile())) {
+@@ -68,9 +66,6 @@ namespace Mesen
+ 			//Start loading config file in a separate thread
+ 			Task.Run(() => ConfigManager.LoadConfig());
+ 
+-			//Extract core dll & other native dependencies
+-			ExtractNativeDependencies(ConfigManager.HomeFolder);
+-
+ 			if(CommandLineHelper.IsTestRunner(args)) {
+ 				return TestRunner.Run(args);
+ 			}
+@@ -147,7 +142,7 @@ namespace Mesen
+ 						libraryName = libraryName + ".dylib";
+ 					}
+ 				}
+-				return NativeLibrary.Load(Path.Combine(ConfigManager.HomeFolder, libraryName));
+				return NativeLibrary.Load(Path.Combine(AppContext.BaseDirectory, libraryName));
+ 			}
+ 			return IntPtr.Zero;
+ 		}
+diff --git a/UI/UI.csproj b/UI/UI.csproj
+index 053d495..2a0eb78 100644
+--- a/UI/UI.csproj
+++ b/UI/UI.csproj
+@@ -634,7 +634,6 @@
+     <EmbeddedResource Include="Debugger\Utilities\LuaScripts\NtscSafeArea.lua" />
+     <EmbeddedResource Include="Debugger\Utilities\LuaScripts\NesPianoRoll.lua" />
+     <EmbeddedResource Include="Debugger\Utilities\LuaScripts\ReverseMode.lua" />
+-    <EmbeddedResource Include="Dependencies.zip" />
+     <EmbeddedResource Include="Localization\resources.en.xml" WithCulture="false" Type="Non-Resx" />
+     <EmbeddedResource Include="Utilities\DipSwitchDefinitions.xml" />
+   </ItemGroup>
+@@ -644,16 +643,5 @@
+     </AvaloniaXaml>
+   </ItemGroup>
+ 
+-  <Target Name="PreBuildWindows" BeforeTargets="PreBuildEvent" Condition="'$(RuntimeIdentifier)'=='win-x64'">
+-    <Exec Command="cd $(OutDir)&#xD;&#xA;rd Dependencies /s /q&#xD;&#xA;md Dependencies&#xD;&#xA;xcopy /s $(ProjectDir)Dependencies\* Dependencies&#xD;&#xA;copy libHarfBuzzSharp.dll Dependencies&#xD;&#xA;copy libSkiaSharp.dll Dependencies&#xD;&#xA;copy MesenCore.dll Dependencies&#xD;&#xA;cd Dependencies&#xD;&#xA;del ..\Dependencies.zip&#xD;&#xA;powershell Compress-Archive -Path * -DestinationPath '..\Dependencies.zip' -Force&#xD;&#xA;copy ..\Dependencies.zip $(ProjectDir)" />
+-  </Target>
+-
+-	<Target Name="PreBuildLinux" BeforeTargets="PreBuildEvent" Condition="'$(RuntimeIdentifier)'=='linux-x64'">
+-    <Exec Command="cd $(OutDir)&#xD;&#xA;rm -rf Dependencies&#xD;&#xA;mkdir Dependencies&#xD;&#xA;cp -R $(ProjectDir)/Dependencies/* Dependencies&#xD;&#xA;cp libHarfBuzzSharp.so Dependencies&#xD;&#xA;cp libSkiaSharp.so Dependencies&#xD;&#xA;cp MesenCore.so Dependencies&#xD;&#xA;cd Dependencies&#xD;&#xA;rm ../Dependencies.zip&#xD;&#xA;zip -r ../Dependencies.zip *&#xD;&#xA;cp ../Dependencies.zip $(ProjectDir)" />
+-  </Target>
+-  
+-	<Target Name="PreBuildOsx" BeforeTargets="PreBuildEvent" Condition="'$(RuntimeIdentifier)'=='osx-x64' Or '$(RuntimeIdentifier)'=='osx-arm64'">
+-    <Exec Command="cp ./Assets/MesenIcon.icns $(OutDir)&#xD;&#xA;cd $(OutDir)&#xD;&#xA;rm -R Dependencies&#xD;&#xA;mkdir Dependencies&#xD;&#xA;cp -R $(ProjectDir)/Dependencies/* Dependencies&#xD;&#xA;cp libHarfBuzzSharp.dylib Dependencies&#xD;&#xA;cp libSkiaSharp.dylib Dependencies&#xD;&#xA;cp MesenCore.dylib Dependencies&#xD;&#xA;cd Dependencies&#xD;&#xA;rm ../Dependencies.zip&#xD;&#xA;zip -r ../Dependencies.zip *&#xD;&#xA;cp ../Dependencies.zip $(ProjectDir)" />
+-  </Target>
+ 
+ </Project>
+
--- a/pkgs/by-name/me/mesen/package.nix
+++ b/pkgs/by-name/me/mesen/package.nix
@ -0,0 +1,82 @@
+{
+  lib,
+  clangStdenv,
+  buildDotnetModule,
+  dotnetCorePackages,
+  fetchFromGitHub,
+  wrapGAppsHook3,
+  gtk3,
+  SDL2,
+}:
+
+buildDotnetModule rec {
+  pname = "mesen";
+  version = "2.0.0-unstable-2024-12-25";
+
+  src = fetchFromGitHub {
+    owner = "SourMesen";
+    repo = "Mesen2";
+    rev = "6820db37933002089a04d356d8469481e915a359";
+    hash = "sha256-TzGMZr351XvVj/wARWJxRisRb5JlkyzdjCVYbwydBVE=";
+  };
+
+  patches = [
+    # the nightly avalonia repository url is still queried, which errors out
+    # even if we don't actually need any nightly versions
+    ./dont-use-alternative-restore-sources.patch
+    # upstream has a weird library loading mechanism, which we override with a more sane alternative
+    ./dont-zip-libraries.patch
+  ];
+
+  dotnet-sdk = dotnetCorePackages.sdk_8_0;
+  dotnet-runtime = dotnetCorePackages.runtime_8_0;
+
+  projectFile = [ "UI/UI.csproj" ];
+
+  dotnetFlags = [
+    "-p:RuntimeIdentifier=${dotnetCorePackages.systemToDotnetRid clangStdenv.hostPlatform.system}"
+  ];
+
+  executables = [ "Mesen" ];
+
+  nugetDeps = ./deps.json;
+
+  nativeBuildInputs = [ wrapGAppsHook3 ];
+
+  runtimeDeps = [ gtk3 ];
+
+  postInstall = ''
+    ln -s ${passthru.core}/lib/MesenCore.* $out/lib/mesen
+  '';
+
+  # according to upstream, compiling with clang creates a faster binary
+  passthru.core = clangStdenv.mkDerivation {
+    pname = "mesen-core";
+    inherit version src;
+
+    enableParallelBuilding = true;
+
+    strictDeps = true;
+
+    nativeBuildInputs = [ SDL2 ];
+
+    buildInputs = [ SDL2 ];
+
+    makeFlags = [ "core" ];
+
+    installPhase = ''
+      runHook preInstall
+      install -Dm755 InteropDLL/obj.*/MesenCore.* -t $out/lib
+      runHook postInstall
+    '';
+  };
+
+  meta = {
+    badPlatforms = [ "aarch64-linux" ]; # not sure what the issue is
+    description = "Multi-system emulator that supports NES, SNES, Game Boy (Color) and PC Engine games";
+    homepage = "https://www.mesen.ca";
+    license = lib.licenses.gpl3Plus;
+    mainProgram = "Mesen";
+    maintainers = with lib.maintainers; [ tomasajt ];
+  };
+}
--- a/pkgs/by-name/mi/mill/package.nix
+++ b/pkgs/by-name/mi/mill/package.nix
@ -8,11 +8,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "mill";
-  version = "0.12.4";
+  version = "0.12.5";

  src = fetchurl {
    url = "https://github.com/com-lihaoyi/mill/releases/download/${finalAttrs.version}/${finalAttrs.version}-assembly";
-    hash = "sha256-WlykyNyXUitR6FHbhZXOeJKtMCrvoJK1gruh+G/hkb8=";
+    hash = "sha256-DHslQS/uzwbZVdATQY3pqQgM51W+26x2AckQnDPVoFc=";
  };

  nativeBuildInputs = [ makeWrapper ];
--- a/pkgs/by-name/no/notmuch-mailmover/package.nix
+++ b/pkgs/by-name/no/notmuch-mailmover/package.nix
@ -10,16 +10,16 @@
 }:
 rustPlatform.buildRustPackage rec {
  pname = "notmuch-mailmover";
-  version = "0.5.0";
+  version = "0.6.0";

  src = fetchFromGitHub {
    owner = "michaeladler";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-ionqR60mI/oHnqVqtdIeIU1HeCbXfLGIHqaHDYEZONk=";
+    hash = "sha256-v70R6CgN4RzG6L8LUg3ZvW895+G4eU8HZ0TI+jRxZ10=";
  };

-  cargoHash = "sha256-tUhdfmYAdDlDMez03+ObX9PEU0CML12c5D8N95xiErI=";
+  cargoHash = "sha256-ys8fupS78yxgFBPCCB2JbGADNSEefrEEEGBgzWcLCnI=";

  nativeBuildInputs = [
    installShellFiles
--- a/pkgs/by-name/nu/numbat/package.nix
+++ b/pkgs/by-name/nu/numbat/package.nix
@ -1,30 +1,24 @@
 {
  lib,
-  stdenv,
-  testers,
  fetchFromGitHub,
  rustPlatform,
-  darwin,
-  numbat,
  tzdata,
+  versionCheckHook,
+  nix-update-script,
 }:

 rustPlatform.buildRustPackage rec {
  pname = "numbat";
-  version = "1.14.0";
+  version = "1.15.0";

  src = fetchFromGitHub {
    owner = "sharkdp";
    repo = "numbat";
-    rev = "v${version}";
-    hash = "sha256-TmzM541S2W5Cy8zHEWKRE2Zj2bSgrM4vbsWw3zbi3LQ=";
+    tag = "v${version}";
+    hash = "sha256-5XsrOAvBrmCG6k7YRwGZZtBP/o1jVVtBBTrwIT5CDX8=";
  };

-  cargoHash = "sha256-exvJJsGIj6KhmMcwhPjXMELvisuUtl17BAO6XEJSJmI=";
-
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    darwin.apple_sdk.frameworks.Security
-  ];
+  cargoHash = "sha256-RMON7JThY6Ad1QHQFiNbTb2PUsfviR2t+55k1ZtlOd8=";

  env.NUMBAT_SYSTEM_MODULE_PATH = "${placeholder "out"}/share/numbat/modules";

@ -40,11 +34,13 @@ rustPlatform.buildRustPackage rec {
    export TZDIR=${tzdata}/share/zoneinfo
  '';

-  passthru.tests.version = testers.testVersion {
-    package = numbat;
-  };
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+  versionCheckProgramArg = [ "--version" ];

-  meta = with lib; {
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
    description = "High precision scientific calculator with full support for physical units";
    longDescription = ''
      A statically typed programming language for scientific computations
@ -52,14 +48,14 @@ rustPlatform.buildRustPackage rec {
    '';
    homepage = "https://numbat.dev";
    changelog = "https://github.com/sharkdp/numbat/releases/tag/v${version}";
-    license = with licenses; [
+    license = with lib.licenses; [
      asl20
      mit
    ];
-    mainProgram = "numbat";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
      giomf
      atemu
    ];
+    mainProgram = "numbat";
  };
 }
--- a/pkgs/by-name/op/openscad-unstable/package.nix
+++ b/pkgs/by-name/op/openscad-unstable/package.nix
@ -9,7 +9,7 @@
  bison,
  boost,
  cairo,
-  cgal_5,
+  cgal,
  clipper2,
  double-conversion,
  eigen,
@ -83,7 +83,7 @@ clangStdenv.mkDerivation rec {
      mimalloc
      boost
      cairo
-      cgal_5
+      cgal
      double-conversion
      eigen
      fontconfig
--- a/pkgs/by-name/pr/prism/package.nix
+++ b/pkgs/by-name/pr/prism/package.nix
@ -2,6 +2,7 @@
  lib,
  buildGoModule,
  fetchFromGitHub,
+  nix-update-script,
 }:

 buildGoModule rec {
@ -10,18 +11,21 @@ buildGoModule rec {

  src = fetchFromGitHub {
    owner = "muesli";
-    repo = pname;
-    rev = "v${version}";
+    repo = "prism";
+    tag = "v${version}";
    hash = "sha256-IRR7Gu+wGUUYyFfhc003QVlEaWCJPmi6XYVUN6Q6+GA=";
  };

  vendorHash = "sha256-uKtVifw4dxJdVvHxytL+9qjXHEdTyiz8U8n/95MObdY=";

-  meta = with lib; {
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
    description = "RTMP stream recaster/splitter";
    homepage = "https://github.com/muesli/prism";
-    license = licenses.mit;
-    maintainers = with maintainers; [ paperdigits ];
+    changelog = "https://github.com/muesli/prism/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ paperdigits ];
    mainProgram = "prism";
  };
 }
--- a/pkgs/by-name/py/pyenv/package.nix
+++ b/pkgs/by-name/py/pyenv/package.nix
@ -6,13 +6,13 @@

 stdenv.mkDerivation rec {
  pname = "pyenv";
-  version = "2.4.23";
+  version = "2.5.0";

  src = fetchFromGitHub {
    owner = "pyenv";
    repo = "pyenv";
    rev = "refs/tags/v${version}";
-    hash = "sha256-4IqHJpnGQKo/1U/Zkzg0mzm4xFbDC28F9ixgw+C0hAc=";
+    hash = "sha256-2khf1yGq+SXyOC7NAcjfzvscGg9Kay/8fMM7b0WMh8A=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/py/pykms/package.nix
+++ b/pkgs/by-name/py/pykms/package.nix
@ -36,13 +36,13 @@ let
 in
 pypkgs.buildPythonApplication rec {
  pname = "pykms";
-  version = "unstable-2021-01-25";
+  version = "0-unstable-2024-07-06";

  src = fetchFromGitHub {
    owner = "Py-KMS-Organization";
    repo = "py-kms";
-    rev = "1435c86fe4f11aa7fd42d77fa61715ca3015eeab";
-    hash = "sha256-9KiMbS0uKTbWSZVIv5ziIeR9c8+EKfKd20yPmjCX7GQ=";
+    rev = "465f4d14c728819d4eb00e3419bd1cb98af7f81c";
+    hash = "sha256-/XbMbcBcZPO7joHyaprJ29Cq4gNpuuzTzj2x1XDIyj8=";
  };

  sourceRoot = "${src.name}/py-kms";
--- a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
+++ b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
@ -7,13 +7,13 @@

 stdenvNoCC.mkDerivation {
  pname = "roddhjav-apparmor-rules";
-  version = "0-unstable-2024-12-13";
+  version = "0-unstable-2024-12-25";

  src = fetchFromGitHub {
    owner = "roddhjav";
    repo = "apparmor.d";
-    rev = "edaa45067abd5f18fa702ca3f08897d93425bbc5";
-    hash = "sha256-um00IUuYmDh9lilaUxklrgbFgJVBojSDMov3q5y4FkY=";
+    rev = "2560e9645ff11d4fd24c69ef8145adf9bc8f817c";
+    hash = "sha256-pPA9/QF3ftCjW7TZKWBHOvEE49XtcBSl7X5IugumCEg=";
  };

  dontConfigure = true;
--- a/pkgs/by-name/ru/ruff/package.nix
+++ b/pkgs/by-name/ru/ruff/package.nix
@ -17,17 +17,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "ruff";
-  version = "0.8.4";
+  version = "0.8.5";

  src = fetchFromGitHub {
    owner = "astral-sh";
    repo = "ruff";
    tag = version;
-    hash = "sha256-c5d2XaoEjCHWMdjTLD6CnwP8rpSXTUrmKSs0QWQ6UG0=";
+    hash = "sha256-Y6J7hW+VYePhKH+5YXfuGuVB0WjYjUg8mM3kQBUnv/U=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-jbUjsIJRpkKYc+qHN8tkcZrcjPTFJfdCsatezzdX4Ss=";
+  cargoHash = "sha256-nEpVAdo/awRxwBvYd8EpTzXdWho3+yuItCp8km+s2uM=";

  nativeBuildInputs = [ installShellFiles ];

--- a/pkgs/by-name/ru/rustmission/package.nix
+++ b/pkgs/by-name/ru/rustmission/package.nix
@ -10,16 +10,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "rustmission";
-  version = "0.5.0";
+  version = "0.5.1";

  src = fetchFromGitHub {
    owner = "intuis";
    repo = "rustmission";
    rev = "v${version}";
-    hash = "sha256-V9sy3rkoI3mKpeZjXT4D3Bs4NVETJ8h43iwOoDx1MKU=";
+    hash = "sha256-vQ6MBbzmOBgD1kcF62NmQys737QEN9isvFN7L7mP8mk=";
  };

-  cargoHash = "sha256-KYg+SVAvlQn77kI1gyzXlzhKgPECYPZKICnmkcEnuh8=";
+  cargoHash = "sha256-yelDzx/5SxZ+DT9Rvx3tuSp/yDLfVOYmexa9ZqeUT88=";

  nativeBuildInputs = [ pkg-config ];

--- a/pkgs/by-name/sa/satty/package.nix
+++ b/pkgs/by-name/sa/satty/package.nix
@ -17,16 +17,16 @@
 rustPlatform.buildRustPackage rec {

  pname = "satty";
-  version = "0.15.0";
+  version = "0.16.0";

  src = fetchFromGitHub {
    owner = "gabm";
    repo = "Satty";
    rev = "v${version}";
-    hash = "sha256-SfZgvCtociQ0JbUTDVlXZPLHbyG0oxSSUqNXBHMDYNU=";
+    hash = "sha256-81WX9GAZ0mPai1/4FrqDGDu6k4OVYrKSJSC/FkPkZmE=";
  };

-  cargoHash = "sha256-OP19bIwRCqZdQUAvc6pTf0oTL7Jy+OUuVdnddrbxrys=";
+  cargoHash = "sha256-ZMtOo7AgEza1OptBXAUZ590xf6znN6ZNrC9bhk4nR94=";

  nativeBuildInputs = [
    copyDesktopItems
--- a/pkgs/by-name/ti/tinymist/package.nix
+++ b/pkgs/by-name/ti/tinymist/package.nix
@ -18,17 +18,17 @@ rustPlatform.buildRustPackage rec {
  pname = "tinymist";
  # Please update the corresponding vscode extension when updating
  # this derivation.
-  version = "0.12.14";
+  version = "0.12.16";

  src = fetchFromGitHub {
    owner = "Myriad-Dreamin";
    repo = "tinymist";
    tag = "v${version}";
-    hash = "sha256-F6nJH3JU8NxyxFevYMaQnPDTIcjcqM779CP4M1zp1rU=";
+    hash = "sha256-DwekAk1LkpK/48yzKc6Ry5GZ3oR/uH7+xpvT0LlSF00=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-+Ce9qIETGFZXG4RX5GP8tpmH4fkpbPkDS1FX64NQ6/4=";
+  cargoHash = "sha256-LlZD/amKO/4dOo6xB5kz51igTDrkHbVQDquRpkMujVU=";

  nativeBuildInputs = [
    installShellFiles
--- a/pkgs/by-name/ti/titanium-alloy/package.nix
+++ b/pkgs/by-name/ti/titanium-alloy/package.nix
@ -1,29 +0,0 @@
-{ lib
-, buildNpmPackage
-, fetchFromGitHub
-}:
-
-buildNpmPackage rec {
-  pname = "alloy";
-  version = "2.0.2";
-
-  src = fetchFromGitHub {
-    owner = "tidev";
-    repo = "alloy";
-    rev = version;
-    hash = "sha256-s1hAbbUy7k/GacBIk8OMD48/1IUcRcpV3LnrCCZim1A=";
-  };
-
-  npmDepsHash = "sha256-YNyFrO6+oFluyk3TlUf/0vdHrgTJ3l5DN801wnpBa6s=";
-
-  dontNpmBuild = true;
-
-  meta = {
-    changelog = "https://github.com/tidev/alloy/blob/${src.rev}/CHANGELOG.md";
-    description = "MVC framework for the Appcelerator Titanium SDK";
-    homepage = "https://github.com/tidev/alloy";
-    license = lib.licenses.asl20;
-    mainProgram = "alloy";
-    maintainers = [ ];
-  };
-}
--- a/pkgs/by-name/ti/titanium/package.nix
+++ b/pkgs/by-name/ti/titanium/package.nix
@ -1,29 +0,0 @@
-{ lib
-, buildNpmPackage
-, fetchFromGitHub
-}:
-
-buildNpmPackage rec {
-  pname = "titanium";
-  version = "6.1.1";
-
-  src = fetchFromGitHub {
-    owner = "tidev";
-    repo = "titanium-cli";
-    rev = "v${version}";
-    hash = "sha256-eJHf4vbapCaIVk0Xc0sml14jkFCsS/Gv7ftaFakB5rI=";
-  };
-
-  npmDepsHash = "sha256-60r+zqUCSDvQgrjg5SGfZiv87AoGx1XcnbW1ki1sbCM=";
-
-  dontNpmBuild = true;
-
-  meta = {
-    changelog = "https://github.com/tidev/titanium-cli/blob/${src.rev}/CHANGELOG.md";
-    description = "Command Line Tool for creating and building Titanium Mobile applications and modules";
-    homepage = "https://github.com/tidev/titanium-cli";
-    license = lib.licenses.asl20;
-    mainProgram = "titanium";
-    maintainers = [ ];
-  };
-}
--- a/pkgs/by-name/tl/tlsclient/package.nix
+++ b/pkgs/by-name/tl/tlsclient/package.nix
@ -9,13 +9,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "tlsclient";
-  version = "1.6.5";
+  version = "1.6.6";

  src = fetchFromSourcehut {
    owner = "~moody";
    repo = "tlsclient";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-Ff41LZ5jbrqni2ptsUlI3L17SCHnGo4utg8etFubRNI=";
+    hash = "sha256-nUvOmEwdMKuPM9KaMGxmW0Lvo3968wjDc95pLB17YnM=";
  };

  strictDeps = true;
--- a/pkgs/by-name/xz/xzoom/package.nix
+++ b/pkgs/by-name/xz/xzoom/package.nix
@ -26,6 +26,10 @@ stdenv.mkDerivation rec {
    })
  ];

+  postPatch = ''
+    sed -i 1i'#include <unistd.h>' xzoom.c
+  '';
+
  nativeBuildInputs = [
    imake
    gccmakedep
--- a/pkgs/development/tools/yarn-berry/default.nix
+++ b/pkgs/development/tools/yarn-berry/default.nix
--- a/pkgs/development/tools/yarn-berry/update.sh
+++ b/pkgs/development/tools/yarn-berry/update.sh
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@ -56,16 +56,16 @@ assert (extraParameters != null) -> set != null;

 buildNpmPackage rec {
  pname = "Iosevka${toString set}";
-  version = "32.2.1";
+  version = "32.3.1";

  src = fetchFromGitHub {
    owner = "be5invis";
    repo = "iosevka";
    rev = "v${version}";
-    hash = "sha256-z0S38X2A0rfGFNTr/Ym0VHfOhzdz/q42QL3tVf+m5FQ=";
+    hash = "sha256-WoRBDLCqLglTXeXtC8ZVELgDOv18dsCDvToUq3iPoDU=";
  };

-  npmDepsHash = "sha256-dFVhoBf4v0K1mqbiysZNk4yCt4Ars0Pgnr63xIsavDo=";
+  npmDepsHash = "sha256-gmaFzcTbocx3RYW4G4Lw/08f3c71draxRwzV0BA2/KY=";

  nativeBuildInputs =
    [
--- a/pkgs/data/fonts/nerd-fonts/default.nix
+++ b/pkgs/data/fonts/nerd-fonts/default.nix
@ -9,19 +9,17 @@ let
  fontsInfo = lib.trivial.importJSON ./manifests/fonts.json;
  checksums = lib.trivial.importJSON ./manifests/checksums.json;

+  releaseVersion = lib.removePrefix "v" releaseInfo.tag_name;
+
  convertAttrName =
    name:
    let
      lowerName = lib.strings.toLower name;
    in
-    if builtins.match "[[:digit:]].*" lowerName != null then "_" + lowerName else lowerName;
+    if builtins.match "^[[:digit:]].*" lowerName != null then "_" + lowerName else lowerName;

  convertVersion =
-    version: date:
-    if builtins.match "[[:digit:]].*" version != null then
-      version
-    else
-      "0-unstable-" + builtins.head (lib.strings.splitString "T" date);
+    version: if builtins.match "^[[:digit:]].*" version != null then "+" + version else "";

  convertLicense = import ./convert-license.nix lib;

@ -36,8 +34,8 @@ let
      ...
    }:
    stdenvNoCC.mkDerivation {
-      pname = lib.strings.toLower caskName;
-      version = convertVersion version releaseInfo.published_at;
+      pname = "nerd-fonts-" + lib.strings.toLower caskName;
+      version = releaseVersion + convertVersion version;

      src =
        let
@ -67,14 +65,25 @@ let
          runHook postInstall
        '';

-      passthru.updateScript = {
-        command = ./update.py;
-        supportedFeatures = [ "commit" ];
+      passthru = {
+        inherit releaseVersion;
+        updateScript = {
+          command = ./update.py;
+          supportedFeatures = [ "commit" ];
+        };
      };

      meta = {
        description = "Nerd Fonts: " + description;
-        license = convertLicense licenseId;
+        license = lib.unique (
+          (with lib.licenses; [
+            # > Nerd Fonts source fonts, patched fonts, and folders with explict OFL SIL files
+            ofl
+            # > Nerd Fonts original source code files (such as `.sh`, `.py`, `font-patcher` and others)
+            mit
+          ])
+          ++ lib.toList (convertLicense licenseId)
+        );
        homepage = "https://nerdfonts.com/";
        changelog = "https://github.com/ryanoasis/nerd-fonts/blob/${releaseInfo.tag_name}/changelog.md";
        platforms = lib.platforms.all;
@ -86,7 +95,7 @@ let
    };

  nerdFonts = lib.trivial.pipe fontsInfo [
-    (map (font: lib.attrsets.nameValuePair (convertAttrName font.caskName) (makeNerdFont font)))
+    (map (font: lib.nameValuePair (convertAttrName font.caskName) (makeNerdFont font)))
    builtins.listToAttrs
  ];
 in
--- a/pkgs/data/fonts/nerd-fonts/manifests/release.json
+++ b/pkgs/data/fonts/nerd-fonts/manifests/release.json
@ -1,4 +1,3 @@
 {
-  "tag_name": "v3.3.0",
-  "published_at": "2024-11-18T12:43:12Z"
+  "tag_name": "v3.3.0"
 }
--- a/pkgs/data/fonts/nerd-fonts/update.py
+++ b/pkgs/data/fonts/nerd-fonts/update.py
@ -40,7 +40,7 @@ os.chdir(os.path.join(os.path.dirname(os.path.abspath(__file__)), "manifests"))

 release_info = slicedict(
    fetchjson(RELEASE_INFO_URL),
-    ["tag_name", "published_at"]
+    ["tag_name"]
 )

 tag_name = release_info["tag_name"]
--- a/pkgs/development/beam-modules/ex_doc/default.nix
+++ b/pkgs/development/beam-modules/ex_doc/default.nix
@ -1,4 +1,4 @@
-{ lib, elixir, fetchFromGitHub, fetchMixDeps, mixRelease, nix-update-script }:
+{ lib, elixir, fetchFromGitHub, fetchMixDeps, mixRelease }:
 # Based on ../elixir-ls/default.nix

 let
@ -51,5 +51,4 @@ mixRelease {
    mainProgram = "ex_doc";
    maintainers = with maintainers; [chiroptical];
  };
-  passthru.updateScript = nix-update-script { };
 }
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@ -183,7 +183,6 @@ stdenv.mkDerivation (finalAttrs: {
      "--with-lapack=lapack"
      (if use64BitIdx then "--enable-64" else "--disable-64")
    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--enable-link-all-dependencies" ]
    ++ lib.optionals enableReadline [ "--enable-readline" ]
    ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--with-x=no" ]
    ++ lib.optionals enableQt [ "--with-qt=5" ];
--- a/pkgs/development/interpreters/tcl/generic.nix
+++ b/pkgs/development/interpreters/tcl/generic.nix
@ -62,6 +62,10 @@ let
        # Don't install tzdata because NixOS already has a more up-to-date copy.
        "--with-tzdata=no"
      ]
+      ++ lib.optionals (lib.versionOlder version "8.6") [
+        # configure check broke due to GCC 14
+        "ac_cv_header_stdc=yes"
+      ]
      ++ lib.optionals (lib.versionAtLeast version "9.0") [
        # By default, tcl libraries get zipped and embedded into libtcl*.so,
        # which gets `zipfs mount`ed at runtime. This is fragile (for example
--- a/pkgs/development/libraries/CGAL/4.nix
+++ b/pkgs/development/libraries/CGAL/4.nix
@ -1,61 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  fetchpatch,
-  cmake,
-  boost,
-  gmp,
-  mpfr,
-}:
-
-stdenv.mkDerivation rec {
-  version = "4.14.3";
-  pname = "cgal";
-
-  src = fetchurl {
-    url = "https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-${version}/CGAL-${version}.tar.xz";
-    hash = "sha256-W6/nq+hDW+yhehCCBi02M2jsHj8NZYG7DaiwEPs4n+Q=";
-  };
-
-  patches = [
-    ./cgal_path.patch
-
-    # Pull upstream fix for c++17 (gcc-12):
-    #  https://github.com/CGAL/cgal/pull/6109
-    (fetchpatch {
-      name = "gcc-12-prereq.patch";
-      url = "https://github.com/CGAL/cgal/commit/4581f1b7a8e97d1a136830e64b77cdae3546c4bf.patch";
-      relative = "CGAL_Core"; # Upstream slightly reordered directory structure since.
-      sha256 = "sha256-4+7mzGSBwAv5RHBQPAecPPKNN/LQBgvYq5mq+fHAteo=";
-    })
-    (fetchpatch {
-      name = "gcc-12.patch";
-      url = "https://github.com/CGAL/cgal/commit/6680a6e6f994b2c5b9f068eb3014d12ee1134d53.patch";
-      relative = "CGAL_Core"; # Upstream slightly reordered directory structure since.
-      sha256 = "sha256-8kxJDT47jXI9kQNFI/ARWl9JBNS4AfU57/D0tYlgW0M=";
-    })
-  ];
-
-  # note: optional component libCGAL_ImageIO would need zlib and opengl;
-  #   there are also libCGAL_Qt{3,4} omitted ATM
-  buildInputs = [
-    boost
-    gmp
-    mpfr
-  ];
-  nativeBuildInputs = [ cmake ];
-
-  doCheck = false;
-
-  meta = with lib; {
-    description = "Computational Geometry Algorithms Library";
-    homepage = "http://cgal.org";
-    license = with licenses; [
-      gpl3Plus
-      lgpl3Plus
-    ];
-    platforms = platforms.all;
-    maintainers = [ maintainers.raskin ];
-  };
-}
--- a/pkgs/development/mobile/titaniumenv/build-app.nix
+++ b/pkgs/development/mobile/titaniumenv/build-app.nix
@ -1,186 +0,0 @@
-{stdenv, lib, composeAndroidPackages, composeXcodeWrapper, titaniumsdk, titanium, alloy, jdk, python, nodejs, which, file}:
-{ name, src, preBuild ? "", target, tiVersion ? null
-, release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null
-, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "12.1", iosBuildStore ? false
-, enableWirelessDistribution ? false, installURL ? null
-, xcodeBaseDir ? "/Applications/Xcode.app"
-, androidsdkArgs ? {}
-, xcodewrapperArgs ? {}
-, ...
-}@args:
-
-assert (release && target == "android") -> androidKeyStore != null && androidKeyAlias != null && androidKeyStorePassword != null;
-assert (release && target == "iphone") -> iosMobileProvisioningProfile != null && iosCertificateName != null && iosCertificate != null && iosCertificatePassword != null;
-assert enableWirelessDistribution -> installURL != null;
-
-let
-  realAndroidsdkArgs = {
-    platformVersions = [ "28" ];
-  } // androidsdkArgs;
-
-  androidsdk = (composeAndroidPackages realAndroidsdkArgs).androidsdk;
-
-  xcodewrapper = composeXcodeWrapper xcodewrapperArgs;
-
-  deleteKeychain = ''
-    if [ -f $HOME/lock-keychain ]
-    then
-        security default-keychain -s login.keychain
-        security delete-keychain $keychainName
-        rm -f $HOME/lock-keychain
-    fi
-  '';
-
-  extraArgs = removeAttrs args [ "name" "preRebuild" "androidsdkArgs" "xcodewrapperArgs" ];
-in
-stdenv.mkDerivation ({
-  name = lib.replaceStrings [" "] [""] name;
-
-  buildInputs = [ nodejs titanium alloy python which file jdk ];
-
-  buildPhase = ''
-    ${preBuild}
-
-    ${lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # Hack that provides a writable alloy package on macOS. Without it the build fails because of a file permission error.
-      alloy=$(dirname $(type -p alloy))/..
-      cp -rv $alloy/* alloy
-      chmod -R u+w alloy
-      export PATH=$(pwd)/alloy/bin:$PATH
-    ''}
-
-    export HOME=${if target == "iphone" then "/Users/$(whoami)" else "$TMPDIR"}
-
-    ${lib.optionalString (tiVersion != null) ''
-      # Replace titanium version by the provided one
-      sed -i -e "s|<sdk-version>[0-9a-zA-Z\.]*</sdk-version>|<sdk-version>${tiVersion}</sdk-version>|" tiapp.xml
-    ''}
-
-    # Simulate a login
-    mkdir -p $HOME/.titanium
-    cat > $HOME/.titanium/auth_session.json <<EOF
-    { "loggedIn": true }
-    EOF
-
-    # Configure the paths to the Titanium SDK and modules
-    echo "{}" > $TMPDIR/config.json
-    titanium --config-file $TMPDIR/config.json --no-colors config sdk.defaultInstallLocation ${titaniumsdk}
-    titanium --config-file $TMPDIR/config.json --no-colors config paths.modules ${titaniumsdk}
-
-    mkdir -p $out
-
-    ${if target == "android" then ''
-      titanium config --config-file $TMPDIR/config.json --no-colors android.sdkPath ${androidsdk}/libexec/android-sdk
-
-      export PATH=${androidsdk}/libexec/android-sdk/tools:$(echo ${androidsdk}/libexec/android-sdk/build-tools/android-*):$PATH
-      export GRADLE_USER_HOME=$TMPDIR/gradle
-
-      ${if release then ''
-        ${lib.optionalString stdenv.hostPlatform.isDarwin ''
-          # Signing the app does not work with OpenJDK on macOS, use host SDK instead
-          export JAVA_HOME="$(/usr/libexec/java_home -v 1.8)"
-        ''}
-        titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target dist-playstore --keystore ${androidKeyStore} --alias "${androidKeyAlias}" --store-password "${androidKeyStorePassword}" --output-dir $out
-      '' else ''
-        titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target emulator --build-only -B foo --output $out
-      ''}
-    ''
-    else if target == "iphone" then ''
-      # Be sure that the Xcode wrapper has priority over everything else.
-      # When using buildInputs this does not seem to be the case.
-      export PATH=${xcodewrapper}/bin:$PATH
-
-      # Configure the path to Xcode
-      titanium --config-file $TMPDIR/config.json --no-colors config paths.xcode ${xcodeBaseDir}
-
-      # Link the modules folder
-      if [ ! -e modules ]
-      then
-          ln -s ${titaniumsdk}/modules modules
-          createdModulesSymlink=1
-      fi
-
-      ${if release then ''
-        # Create a keychain with the component hash name (should always be unique)
-        export keychainName=$(basename $out)
-
-        security create-keychain -p "" $keychainName
-        security default-keychain -s $keychainName
-        security unlock-keychain -p "" $keychainName
-        security import ${iosCertificate} -k $keychainName -P "${iosCertificatePassword}" -A
-        security set-key-partition-list -S apple-tool:,apple: -s -k "" $keychainName
-        provisioningId=$(grep UUID -A1 -a ${iosMobileProvisioningProfile} | grep -o "[-A-Za-z0-9]\{36\}")
-
-        # Ensure that the requested provisioning profile can be found
-
-        if [ ! -f "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" ]
-        then
-            mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles"
-            cp ${iosMobileProvisioningProfile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision"
-        fi
-
-        # Take precautions to prevent concurrent builds blocking the keychain
-        while [ -f $HOME/lock-keychain ]
-        do
-            echo "Keychain locked, waiting for a couple of seconds, or remove $HOME/lock-keychain to unblock..."
-            sleep 3
-        done
-
-        touch $HOME/lock-keychain
-
-        security default-keychain -s $keychainName
-
-        # Do the actual build
-        titanium build --config-file $TMPDIR/config.json --force --no-colors --platform ios --target ${if iosBuildStore then "dist-appstore" else "dist-adhoc"} --pp-uuid $provisioningId --distribution-name "${iosCertificateName}" --keychain $HOME/Library/Keychains/$keychainName-db --device-family universal --ios-version ${iosVersion} --output-dir $out
-
-        # Remove our generated keychain
-        ${deleteKeychain}
-      '' else ''
-        # Copy all sources to the output store directory.
-        # Why? Debug application include *.js files, which are symlinked into their
-        # sources. If they are not copied, we have dangling references to the
-        # temp folder.
-
-        cp -av * $out
-        cd $out
-
-        # Execute the build
-        titanium build --config-file $TMPDIR/config.json --force --no-colors --platform ios --target simulator --build-only --device-family universal --ios-version ${iosVersion} --output-dir $out
-
-        # Remove the modules symlink
-        if [ "$createdModulesSymlink" = "1" ]
-        then
-            rm $out/modules
-        fi
-      ''}
-    '' else throw "Target: ${target} is not supported!"}
-  '';
-
-  installPhase = ''
-    ${if target == "android" then ''
-      ${lib.optionalString (!release) ''
-        cp "$(ls build/android/bin/*.apk | grep -v '\-unsigned.apk')" $out
-      ''}
-
-      mkdir -p $out/nix-support
-      echo "file binary-dist \"$(ls $out/*.apk)\"" > $out/nix-support/hydra-build-products
-    ''
-    else if target == "iphone" then
-      lib.optionalString release ''
-        mkdir -p $out/nix-support
-        echo "file binary-dist \"$(echo $out/*.ipa)\"" > $out/nix-support/hydra-build-products
-
-        ${lib.optionalString enableWirelessDistribution ''
-          appname="$(basename $out/*.ipa .ipa)"
-          bundleId=$(grep '<id>[a-zA-Z0-9.]*</id>' tiapp.xml | sed -e 's|<id>||' -e 's|</id>||' -e 's/ //g')
-          version=$(grep '<version>[a-zA-Z0-9.]*</version>' tiapp.xml | sed -e 's|<version>||' -e 's|</version>||' -e 's/ //g')
-
-          sed -e "s|@INSTALL_URL@|${installURL}?bundleId=$bundleId\&amp;version=$version\&amp;title=$appname|" ${../xcodeenv/install.html.template} > "$out/$appname.html"
-          echo "doc install \"$out/$appname.html\"" >> $out/nix-support/hydra-build-products
-        ''}
-      ''
-    else throw "Target: ${target} is not supported!"}
-  '';
-
-  failureHook = lib.optionalString (release && target == "iphone") deleteKeychain;
-} // extraArgs)
--- a/pkgs/development/mobile/titaniumenv/default.nix
+++ b/pkgs/development/mobile/titaniumenv/default.nix
@ -1,20 +0,0 @@
-{pkgs, androidenv, xcodeenv, tiVersion ? "8.3.2.GA"}:
-
-rec {
-  titaniumsdk = let
-    titaniumSdkFile = if tiVersion == "8.2.1.GA" then ./titaniumsdk-8.2.nix
-      else if tiVersion == "8.3.2.GA" then ./titaniumsdk-8.3.nix
-      else throw "Titanium version not supported: "+tiVersion;
-    in
-    import titaniumSdkFile {
-      inherit (pkgs) stdenv lib fetchurl unzip makeWrapper;
-    };
-
-  buildApp = import ./build-app.nix {
-    inherit (pkgs) stdenv lib python which file jdk nodejs titanium;
-    alloy = pkgs.titanium-alloy;
-    inherit (androidenv) composeAndroidPackages;
-    inherit (xcodeenv) composeXcodeWrapper;
-    inherit titaniumsdk;
-  };
-}
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix
@ -1,113 +0,0 @@
-{ stdenv, lib, fetchurl, unzip, makeWrapper }:
-
-let
-  # Gradle is a build system that bootstraps itself. This is what it actually
-  # downloads in the bootstrap phase.
-  gradleAllZip = fetchurl {
-    url = "http://services.gradle.org/distributions/gradle-4.1-all.zip";
-    sha256 = "1rcrh263vq7a0is800y5z36jj97p67c6zpqzzfcbr7r0qaxb61sw";
-  };
-
-  # A Titanium-Android build requires proguard plugins. We create a fake
-  # repository so that Gradle does not attempt to download them in the builder.
-  # Since there are only 3 plugins required, this is still (sort of) manageable
-  # without a generator.
-  proguardVersion = "5.3.3";
-
-  proguardGradlePOM = fetchurl {
-    url = "mirror://maven/net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.pom";
-    sha256 = "03v9zm3ykfkyb5cs5ald07ph103fh68d5c33rv070r29p71dwszj";
-  };
-  proguardGradleJAR = fetchurl {
-    url = "mirror://maven/net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.jar";
-    sha256 = "0shhpsjfc5gam15jnv1hk718v5c7vi7dwdc3gvmnid6dc85kljzk";
-  };
-  proguardParentPOM = fetchurl {
-    url = "mirror://maven/net/sf/proguard/proguard-parent/${proguardVersion}/proguard-parent-${proguardVersion}.pom";
-    sha256 = "0mv0zbwyw8xa4mkc5kw69y5xqashkz9gp123akfvh9f6152l3202";
-  };
-  proguardBasePOM = fetchurl {
-    url = "mirror://maven/net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.pom";
-    sha256 = "1jnr6zsxfimb8wglqlwa6rrdc3g3nqf1dyw0k2dq9cj0q4pgn7p5";
-  };
-  proguardBaseJAR = fetchurl {
-    url = "mirror://maven/net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.jar";
-    sha256 = "11nwdb9y84cghcx319nsjjf9m035s4s1184zrhzpvaxq2wvqhbhx";
-  };
-
-  # Put the downloaded plugins in a fake Maven repository
-  fakeMavenRepo = stdenv.mkDerivation {
-    name = "fake-maven-repo";
-    buildCommand = ''
-      mkdir -p $out
-      cd $out
-      mkdir -p net/sf/proguard/proguard-gradle/${proguardVersion}
-      cp ${proguardGradlePOM} net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.pom
-      cp ${proguardGradleJAR} net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.jar
-      mkdir -p net/sf/proguard/proguard-parent/${proguardVersion}
-      cp ${proguardParentPOM} net/sf/proguard/proguard-parent/${proguardVersion}/proguard-parent-${proguardVersion}.pom
-      mkdir -p net/sf/proguard/proguard-base/${proguardVersion}
-      cp ${proguardBasePOM} net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.pom
-      cp ${proguardBaseJAR} net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.jar
-    '';
-  };
-in
-stdenv.mkDerivation {
-  pname = "mobilesdk";
-  version = "8.2.1.GA";
-
-  src =
-    if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then
-      fetchurl {
-        url = "https://builds.appcelerator.com/mobile/8_2_X/mobilesdk-8.2.1.v20191025070136-linux.zip";
-        sha256 = "1nvcmm6cby6bmwdiacq46n5y4zjpz9qlipakvglw27j3p4rbmkwl";
-      }
-    else if stdenv.system == "x86_64-darwin" then
-      fetchurl {
-        url = "https://builds.appcelerator.com/mobile/8_2_X/mobilesdk-8.2.1.v20191025070136-osx.zip";
-        sha256 = "1nxwmyw3vqc5wghj38kpksisy0i808x0x3pa8w3p290w709g311l";
-      }
-    else throw "Platform: ${stdenv.system} not supported!";
-
-  nativeBuildInputs = [ makeWrapper unzip ];
-
-  buildCommand = ''
-    mkdir -p $out
-    cd $out
-    (yes y | unzip $src) || true
-
-    # Rename ugly version number
-    cd mobilesdk/*
-    mv * 8.2.1.GA
-    cd *
-
-    # Patch bundled gradle build infrastructure to make shebangs work
-    patchShebangs android/templates/gradle
-
-    # Substitute the gradle-all zip URL by a local file to prevent downloads from happening while building an Android app
-    sed -i -e "s|distributionUrl=|#distributionUrl=|" android/templates/gradle/gradle/wrapper/gradle-wrapper.properties
-    cp ${gradleAllZip} android/templates/gradle/gradle/wrapper/gradle-4.1-all.zip
-    echo "distributionUrl=gradle-4.1-all.zip" >> android/templates/gradle/gradle/wrapper/gradle-wrapper.properties
-
-    # Patch maven central repository with our own local directory. This prevents the builder from downloading Maven artifacts
-    sed -i -e 's|mavenCentral()|maven { url "${fakeMavenRepo}" }|' android/templates/build/proguard.gradle
-
-    ${lib.optionalString (stdenv.system == "x86_64-darwin") ''
-      # Patch the strip frameworks script in the iPhone build template to not let
-      # it skip the strip phase. This is caused by an assumption on the file
-      # permissions in which Nix deviates from the standard.
-      sed -i -e "s|-perm +111|-perm /111|" iphone/templates/build/strip-frameworks.sh
-    ''}
-
-    # Patch some executables
-
-    ${if stdenv.system == "i686-linux" then
-      ''
-        patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 android/titanium_prep.linux32
-      ''
-      else lib.optionalString (stdenv.system == "x86_64-linux") ''
-        patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 android/titanium_prep.linux64
-      ''
-    }
-  '';
-}
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix
@ -1,102 +0,0 @@
-{ stdenv, lib, fetchurl, unzip, makeWrapper }:
-
-let
-  # Gradle is a build system that bootstraps itself. This is what it actually
-  # downloads in the bootstrap phase.
-  gradleAllZip = fetchurl {
-    url = "http://services.gradle.org/distributions/gradle-4.1-all.zip";
-    sha256 = "1rcrh263vq7a0is800y5z36jj97p67c6zpqzzfcbr7r0qaxb61sw";
-  };
-
-  # A Titanium-Android build requires proguard plugins. We create a fake
-  # repository so that Gradle does not attempt to download them in the builder.
-  # Since there are only 3 plugins required, this is still (sort of) manageable
-  # without a generator.
-  proguardVersion = "5.3.3";
-
-  proguardGradlePOM = fetchurl {
-    url = "mirror://maven/net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.pom";
-    sha256 = "03v9zm3ykfkyb5cs5ald07ph103fh68d5c33rv070r29p71dwszj";
-  };
-  proguardGradleJAR = fetchurl {
-    url = "mirror://maven/net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.jar";
-    sha256 = "0shhpsjfc5gam15jnv1hk718v5c7vi7dwdc3gvmnid6dc85kljzk";
-  };
-  proguardParentPOM = fetchurl {
-    url = "mirror://maven/net/sf/proguard/proguard-parent/${proguardVersion}/proguard-parent-${proguardVersion}.pom";
-    sha256 = "0mv0zbwyw8xa4mkc5kw69y5xqashkz9gp123akfvh9f6152l3202";
-  };
-  proguardBasePOM = fetchurl {
-    url = "mirror://maven/net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.pom";
-    sha256 = "1jnr6zsxfimb8wglqlwa6rrdc3g3nqf1dyw0k2dq9cj0q4pgn7p5";
-  };
-  proguardBaseJAR = fetchurl {
-    url = "mirror://maven/net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.jar";
-    sha256 = "11nwdb9y84cghcx319nsjjf9m035s4s1184zrhzpvaxq2wvqhbhx";
-  };
-
-  # Put the downloaded plugins in a fake Maven repository
-  fakeMavenRepo = stdenv.mkDerivation {
-    name = "fake-maven-repo";
-    buildCommand = ''
-      mkdir -p $out
-      cd $out
-      mkdir -p net/sf/proguard/proguard-gradle/${proguardVersion}
-      cp ${proguardGradlePOM} net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.pom
-      cp ${proguardGradleJAR} net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.jar
-      mkdir -p net/sf/proguard/proguard-parent/${proguardVersion}
-      cp ${proguardParentPOM} net/sf/proguard/proguard-parent/${proguardVersion}/proguard-parent-${proguardVersion}.pom
-      mkdir -p net/sf/proguard/proguard-base/${proguardVersion}
-      cp ${proguardBasePOM} net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.pom
-      cp ${proguardBaseJAR} net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.jar
-    '';
-  };
-in
-stdenv.mkDerivation {
-  pname = "mobilesdk";
-  version = "8.3.2.GA";
-
-  src =
-    if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then
-      fetchurl {
-        url = "https://builds.appcelerator.com/mobile/8_3_X/mobilesdk-8.3.2.v20200117111803-linux.zip";
-        sha256 = "04pfw21jrx9w259lphynwykqjk4c9hm0zix4d40s7mf8mmh3xdx9";
-      }
-    else if stdenv.system == "x86_64-darwin" then
-      fetchurl {
-        url = "https://builds.appcelerator.com/mobile/8_3_X/mobilesdk-8.3.2.v20200117111803-osx.zip";
-        sha256 = "1zflq5hc96lrriw71ya623kkskkisi9yayg8qs03zimi0gksizxw";
-      }
-    else throw "Platform: ${stdenv.system} not supported!";
-
-  nativeBuildInputs = [ makeWrapper unzip ];
-
-  buildCommand = ''
-    mkdir -p $out
-    cd $out
-    unzip $src
-
-    # Rename ugly version number
-    cd mobilesdk/*
-    mv * 8.3.2.GA
-    cd *
-
-    # Patch bundled gradle build infrastructure to make shebangs work
-    patchShebangs android/templates/gradle
-
-    # Substitute the gradle-all zip URL by a local file to prevent downloads from happening while building an Android app
-    sed -i -e "s|distributionUrl=|#distributionUrl=|" android/templates/gradle/gradle/wrapper/gradle-wrapper.properties
-    cp ${gradleAllZip} android/templates/gradle/gradle/wrapper/gradle-4.1-all.zip
-    echo "distributionUrl=gradle-4.1-all.zip" >> android/templates/gradle/gradle/wrapper/gradle-wrapper.properties
-
-    # Patch maven central repository with our own local directory. This prevents the builder from downloading Maven artifacts
-    sed -i -e 's|mavenCentral()|maven { url "${fakeMavenRepo}" }|' android/templates/build/proguard.gradle
-
-    ${lib.optionalString (stdenv.system == "x86_64-darwin") ''
-      # Patch the strip frameworks script in the iPhone build template to not let
-      # it skip the strip phase. This is caused by an assumption on the file
-      # permissions in which Nix deviates from the standard.
-      sed -i -e "s|-perm +111|-perm /111|" iphone/templates/build/strip-frameworks.sh
-    ''}
-  '';
-}
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@ -53,7 +53,6 @@ mapAliases {
  "@vue/language-server" = pkgs.vue-language-server; # added 2024-06-15
  "@withgraphite/graphite-cli" = pkgs.graphite-cli; # added 2024-01-25
  "@zwave-js/server" = pkgs.zwave-js-server; # Added 2023-09-09
-  alloy = pkgs.titanium-alloy; # added 2023-08-17
  antennas = pkgs.antennas; # added 2023-07-30
  inherit (pkgs) autoprefixer; # added 2024-06-25
  inherit (pkgs) asar; # added 2023-08-26
@ -202,7 +201,6 @@ mapAliases {
  inherit (pkgs) textlint-rule-write-good; # Added 2024-05-16
  thelounge = pkgs.thelounge; # Added 2023-05-22
  three = throw "three was removed because it was no longer needed"; # Added 2023-09-08
-  inherit (pkgs) titanium; # added 2023-08-17
  triton = pkgs.triton; # Added 2023-05-06
  typescript = pkgs.typescript; # Added 2023-06-21
  inherit (pkgs) typescript-language-server; # added 2024-02-27
--- a/pkgs/development/python-modules/cheetah3/default.nix
+++ b/pkgs/development/python-modules/cheetah3/default.nix
@ -7,7 +7,7 @@

 buildPythonPackage rec {
  pname = "cheetah3";
-  version = "3.3.3.post1";
+  version = "3.4.0";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
    owner = "CheetahTemplate3";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-0NVKie/6Fp8T1O1fvrVorycybLrEXMY1yXZBDyxjpbE=";
+    hash = "sha256-yIdswcCuoDR3R/Subl22fKB55pgw/sDkrPy+vwNgaxI=";
  };

  doCheck = false; # Circular dependency
--- a/pkgs/development/python-modules/craft-cli/default.nix
+++ b/pkgs/development/python-modules/craft-cli/default.nix
@ -13,7 +13,7 @@

 buildPythonPackage rec {
  pname = "craft-cli";
-  version = "2.12.0";
+  version = "2.13.0";

  pyproject = true;

@ -21,7 +21,7 @@ buildPythonPackage rec {
    owner = "canonical";
    repo = "craft-cli";
    rev = "refs/tags/${version}";
-    hash = "sha256-edN0eEXBaYDUqSc7Xv22MpG9wkHqI6x1HtRkQ468yH8=";
+    hash = "sha256-IqK+eU2z63yDMJrHAhETHWoTz5lWK1er9bwYH9Oml18=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/craft-store/default.nix
+++ b/pkgs/development/python-modules/craft-store/default.nix
@ -6,55 +6,67 @@
  setuptools,
  setuptools-scm,
  pytest-check,
+  pytest-httpx,
  pytest-mock,
-  pydantic,
  pyyaml,
  pytestCheckHook,
-  keyring_24,
+  annotated-types,
+  httpx,
+  jaraco-classes,
+  keyring,
  macaroonbakery,
  overrides,
+  pydantic,
  pyxdg,
  requests,
  requests-toolbelt,
+  typing-extensions,
 }:

 buildPythonPackage rec {
  pname = "craft-store";
-  version = "3.0.2";
+  version = "3.1.0";

  pyproject = true;

  src = fetchFromGitHub {
    owner = "canonical";
    repo = "craft-store";
-    rev = "refs/tags/${version}";
-    hash = "sha256-l8WnuaMJN4/nZRkWoU6omgbd4hKR2m7YC+YVcvAqzcA=";
+    tag = version;
+    hash = "sha256-pTG0JJRoHjmcLg+lAgg53rvC+7d3TLlTLe+Rxhy8wqg=";
  };

  postPatch = ''
    substituteInPlace pyproject.toml \
-      --replace-fail "setuptools==" "setuptools>="
+      --replace-fail "setuptools==75.6.0" "setuptools"
  '';

-  build-system = [ setuptools-scm ];
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  pythonRelaxDeps = [ "httpx" ];

  dependencies = [
-    keyring_24
+    annotated-types
+    httpx
+    jaraco-classes
+    keyring
    macaroonbakery
    overrides
    pydantic
    pyxdg
    requests
    requests-toolbelt
+    typing-extensions
  ];

-  pythonRelaxDeps = [ "macaroonbakery" ];
-
  pythonImportsCheck = [ "craft_store" ];

  nativeCheckInputs = [
-    pydantic
    pytest-check
+    pytest-httpx
    pytest-mock
    pytestCheckHook
    pyyaml
--- a/pkgs/development/python-modules/deepdish/default.nix
+++ b/pkgs/development/python-modules/deepdish/default.nix
@ -1,7 +1,12 @@
 {
  lib,
-  fetchPypi,
  buildPythonPackage,
+  fetchPypi,
+
+  # build-system
+  setuptools,
+
+  # dependencies
  numpy,
  scipy,
  tables,
@ -10,14 +15,23 @@
 buildPythonPackage rec {
  pname = "deepdish";
  version = "0.3.7";
-  format = "setuptools";
+  pyproject = true;

  src = fetchPypi {
    inherit pname version;
-    sha256 = "1wqzwh3y0mjdyba5kfbvlamn561d3afz50zi712c7klkysz3mzva";
+    hash = "sha256-av86vvaTzsNEOPGD8p0aLZhiq6J7uVnU8k1W4AfkH/M=";
  };

-  propagatedBuildInputs = [
+  postPatch = ''
+    substituteInPlace deepdish/core.py \
+      --replace-fail "np.ComplexWarning" "np.exceptions.ComplexWarning"
+  '';
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
    numpy
    scipy
    tables
@ -32,11 +46,11 @@ buildPythonPackage rec {
  # The tests are broken: `ModuleNotFoundError: No module named 'deepdish.six.conf'`
  doCheck = false;

-  meta = with lib; {
+  meta = {
    description = "Flexible HDF5 saving/loading and other data science tools from the University of Chicago";
    mainProgram = "ddls";
    homepage = "https://github.com/uchicago-cs/deepdish";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ ndl ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ ndl ];
  };
 }
--- a/pkgs/development/python-modules/greatfet/default.nix
+++ b/pkgs/development/python-modules/greatfet/default.nix
@ -17,7 +17,7 @@

 buildPythonPackage rec {
  pname = "greatfet";
-  version = "2024.0.3";
+  version = "2024.0.4";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -25,8 +25,8 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "greatscottgadgets";
    repo = "greatfet";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-jdOTEOotLiIxA9TxmFGOjP8IZ/8xo7mzXSJRg3A5Ri4=";
+    tag = "v${version}";
+    hash = "sha256-3ClM4UzVIDEkVBrFwzvLokbxUHXqdQWyNVqcFtiXCOQ=";
  };

  sourceRoot = "${src.name}/host";
--- a/pkgs/development/python-modules/hahomematic/default.nix
+++ b/pkgs/development/python-modules/hahomematic/default.nix
@ -7,6 +7,7 @@
  orjson,
  pydevccu,
  pytest-aiohttp,
+  pytest-socket,
  pytestCheckHook,
  python-slugify,
  pythonOlder,
@ -16,16 +17,16 @@

 buildPythonPackage rec {
  pname = "hahomematic";
-  version = "2024.12.5";
+  version = "2024.12.13";
  pyproject = true;

  disabled = pythonOlder "3.12";

  src = fetchFromGitHub {
-    owner = "danielperna84";
+    owner = "SukramJ";
    repo = "hahomematic";
-    rev = "refs/tags/${version}";
-    hash = "sha256-jC9IXkl80pspqc9m0U6mspp5QSGG6u9Y6ANMK8WAG5s=";
+    tag = version;
+    hash = "sha256-qHB47S5bU+353deoq4B8XwPYfUoU940Y3hl8u3gGrNs=";
  };

  __darwinAllowLocalNetworking = true;
@ -48,6 +49,7 @@ buildPythonPackage rec {
    freezegun
    pydevccu
    pytest-aiohttp
+    pytest-socket
    pytestCheckHook
  ];

@ -55,8 +57,8 @@ buildPythonPackage rec {

  meta = with lib; {
    description = "Python module to interact with HomeMatic devices";
-    homepage = "https://github.com/danielperna84/hahomematic";
-    changelog = "https://github.com/danielperna84/hahomematic/blob/${src.rev}/changelog.md";
+    homepage = "https://github.com/SukramJ/hahomematic";
+    changelog = "https://github.com/SukramJ/hahomematic/blob/${src.tag}/changelog.md";
    license = licenses.mit;
    maintainers = with maintainers; [
      dotlambda
--- a/pkgs/development/python-modules/keyring_24/default.nix
+++ b/pkgs/development/python-modules/keyring_24/default.nix
@ -1,81 +0,0 @@
-{
-  lib,
-  stdenv,
-  buildPythonPackage,
-  fetchPypi,
-  pythonOlder,
-  installShellFiles,
-  setuptools,
-  setuptools-scm,
-  shtab,
-  importlib-metadata,
-  jaraco-classes,
-  jaraco-context,
-  jaraco-functools,
-  jeepney,
-  secretstorage,
-  pytestCheckHook,
-}:
-
-buildPythonPackage rec {
-  pname = "keyring_24";
-  # nixpkgs-update: no auto update
-  version = "24.3.1";
-  pyproject = true;
-  disabled = pythonOlder "3.8";
-
-  src = fetchPypi {
-    inherit version;
-    pname = "keyring";
-    hash = "sha256-wzJ7b/r8DovvvbWXys20ko/+XBIS92RfGG5tmVeomNs=";
-  };
-
-  nativeBuildInputs = [
-    installShellFiles
-    shtab
-  ];
-
-  build-system = [
-    setuptools
-    setuptools-scm
-  ];
-
-  dependencies =
-    [
-      jaraco-classes
-      jaraco-context
-      jaraco-functools
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      jeepney
-      secretstorage
-    ]
-    ++ lib.optionals (pythonOlder "3.12") [ importlib-metadata ];
-
-  postInstall = ''
-    installShellCompletion --cmd keyring \
-      --bash <($out/bin/keyring --print-completion bash) \
-      --zsh <($out/bin/keyring --print-completion zsh)
-  '';
-
-  pythonImportsCheck = [
-    "keyring"
-    "keyring.backend"
-  ];
-
-  nativeCheckInputs = [ pytestCheckHook ];
-
-  disabledTestPaths =
-    [ "tests/backends/test_macOS.py" ]
-    # These tests fail when sandboxing is enabled because they are unable to get a password from keychain.
-    ++ lib.optional stdenv.hostPlatform.isDarwin "tests/test_multiprocess.py";
-
-  meta = with lib; {
-    description = "Store and access your passwords safely";
-    homepage = "https://github.com/jaraco/keyring";
-    changelog = "https://github.com/jaraco/keyring/blob/v${version}/NEWS.rst";
-    license = licenses.mit;
-    mainProgram = "keyring";
-    maintainers = with maintainers; [ jnsgruk ];
-  };
-}
--- a/pkgs/development/python-modules/macaroonbakery/default.nix
+++ b/pkgs/development/python-modules/macaroonbakery/default.nix
@ -24,13 +24,19 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "go-macaroon-bakery";
    repo = "py-macaroon-bakery";
-    rev = "refs/tags/${version}";
+    tag = version;
    hash = "sha256-NEhr8zkrHceeLbAyuUvc7U6dyQxkpkj0m5LlnBMafA0=";
  };

-  nativeBuildInputs = [ setuptools ];
+  # fix version string
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace-fail "VERSION = (1, 3, 3)" "VERSION = (1, 3, 4)"
+  '';

-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
    protobuf
    pymacaroons
    pynacl
--- a/pkgs/development/python-modules/marimo/default.nix
+++ b/pkgs/development/python-modules/marimo/default.nix
@ -30,13 +30,13 @@

 buildPythonPackage rec {
  pname = "marimo";
-  version = "0.10.5";
+  version = "0.10.9";
  pyproject = true;

  # The github archive does not include the static assets
  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-KJKnGVOM0ahZOWDXHyS5meRS1xXypKzgo3X9RvD1tJs=";
+    hash = "sha256-WoMfybvKlD8Gy2sc3/EhQZVN9WPh8eEVPlG5ksyjjGc=";
  };

  build-system = [ hatchling ];
--- a/pkgs/development/python-modules/mmcv/default.nix
+++ b/pkgs/development/python-modules/mmcv/default.nix
@ -2,82 +2,56 @@
  lib,
  buildPythonPackage,
  fetchFromGitHub,
-  pytestCheckHook,
-  pythonOlder,
-  torch,
-  torchvision,
-  opencv4,
-  yapf,
-  packaging,
-  pillow,
-  addict,
+
+  # nativeBuildInputs
  ninja,
  which,
+
+  # buildInputs
  pybind11,
+  torch,
+
+  # dependencies
+  addict,
+  mmengine,
+  numpy,
+  packaging,
+  pillow,
+  pyyaml,
+  yapf,
+
+  # tests
+  lmdb,
  onnx,
  onnxruntime,
-  scipy,
+  pytestCheckHook,
  pyturbojpeg,
+  scipy,
  tifffile,
-  lmdb,
-  mmengine,
+  torchvision,
 }:

 let
  inherit (torch) cudaCapabilities cudaPackages cudaSupport;
  inherit (cudaPackages) backendStdenv;
-
 in
 buildPythonPackage rec {
  pname = "mmcv";
  version = "2.2.0";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "open-mmlab";
    repo = "mmcv";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
    hash = "sha256-NNF9sLJWV1q6uBE73LUW4UWwYm4TBMTBJjJkFArBmsc=";
  };

-  env.CUDA_HOME = lib.optionalString cudaSupport (lib.getDev cudaPackages.cuda_nvcc);
-
-  preConfigure =
-    ''
-      export MMCV_WITH_OPS=1
-    ''
-    + lib.optionalString cudaSupport ''
-      export CC=${backendStdenv.cc}/bin/cc
-      export CXX=${backendStdenv.cc}/bin/c++
-      export TORCH_CUDA_ARCH_LIST="${lib.concatStringsSep ";" cudaCapabilities}"
-      export FORCE_CUDA=1
-    '';
-
  postPatch = ''
-    substituteInPlace setup.py --replace-fail "cpu_use = 4" "cpu_use = $NIX_BUILD_CORES"
+    substituteInPlace setup.py \
+      --replace-fail "cpu_use = 4" "cpu_use = $NIX_BUILD_CORES"
  '';

-  preCheck = ''
-    # remove the conflicting source directory
-    rm -rf mmcv
-  '';
-
-  # test_cnn test_ops really requires gpus to be useful.
-  # some of the tests take exceedingly long time.
-  # the rest of the tests are disabled due to sandbox env.
-  disabledTests = [
-    "test_cnn"
-    "test_ops"
-    "test_fileclient"
-    "test_load_model_zoo"
-    "test_processing"
-    "test_checkpoint"
-    "test_hub"
-    "test_reader"
-  ];
-
  nativeBuildInputs = [
    ninja
    which
@ -99,34 +73,69 @@ buildPythonPackage rec {
      ]
    );

-  nativeCheckInputs = [
-    pytestCheckHook
-    torchvision
-    lmdb
-    onnx
-    onnxruntime
-    scipy
-    pyturbojpeg
-    tifffile
-  ];
-
-  propagatedBuildInputs = [
+  dependencies = [
+    addict
    mmengine
-    torch
-    opencv4
-    yapf
+    numpy
    packaging
    pillow
-    addict
+    pyyaml
+    yapf
+
+    # opencv4
+    # torch
  ];

+  env.CUDA_HOME = lib.optionalString cudaSupport (lib.getDev cudaPackages.cuda_nvcc);
+
+  preConfigure =
+    ''
+      export MMCV_WITH_OPS=1
+    ''
+    + lib.optionalString cudaSupport ''
+      export CC=${lib.getExe' backendStdenv.cc "cc"}
+      export CXX=${lib.getExe' backendStdenv.cc "c++"}
+      export TORCH_CUDA_ARCH_LIST="${lib.concatStringsSep ";" cudaCapabilities}"
+      export FORCE_CUDA=1
+    '';
+
  pythonImportsCheck = [ "mmcv" ];

-  meta = with lib; {
+  nativeCheckInputs = [
+    lmdb
+    onnx
+    onnxruntime
+    pytestCheckHook
+    pyturbojpeg
+    scipy
+    tifffile
+    torchvision
+  ];
+
+  # remove the conflicting source directory
+  preCheck = ''
+    rm -rf mmcv
+  '';
+
+  # test_cnn test_ops really requires gpus to be useful.
+  # some of the tests take exceedingly long time.
+  # the rest of the tests are disabled due to sandbox env.
+  disabledTests = [
+    "test_cnn"
+    "test_ops"
+    "test_fileclient"
+    "test_load_model_zoo"
+    "test_processing"
+    "test_checkpoint"
+    "test_hub"
+    "test_reader"
+  ];
+
+  meta = {
    description = "Foundational Library for Computer Vision Research";
    homepage = "https://github.com/open-mmlab/mmcv";
    changelog = "https://github.com/open-mmlab/mmcv/releases/tag/v${version}";
-    license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [ rxiao ];
+    license = with lib.licenses; [ asl20 ];
+    maintainers = with lib.maintainers; [ rxiao ];
  };
 }
--- a/pkgs/development/python-modules/netcdf4/default.nix
+++ b/pkgs/development/python-modules/netcdf4/default.nix
@ -5,7 +5,7 @@
  cftime,
  curl,
  cython,
-  fetchPypi,
+  fetchFromGitHub,
  hdf5,
  isPyPy,
  libjpeg,
@ -20,16 +20,23 @@
  zlib,
 }:

-buildPythonPackage rec {
+let
+  version = "1.7.2";
+  suffix = lib.optionalString (lib.match ''.*\.post[0-9]+'' version == null) "rel";
+  tag = "v${version}${suffix}";
+in
+buildPythonPackage {
  pname = "netcdf4";
-  version = "1.7.1.post2";
+  inherit version;
  pyproject = true;

  disabled = isPyPy || pythonOlder "3.8";

-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-N9VX42ZUiJ1wIBkr+1b51fk4lMsymX64N65YbFOP17Y=";
+  src = fetchFromGitHub {
+    owner = "Unidata";
+    repo = "netcdf4-python";
+    inherit tag;
+    hash = "sha256-orwCHKOSam+2eRY/yAduFYWREOkJlWIJGIZPZwQZ/RI=";
  };

  build-system = [
@ -39,20 +46,27 @@ buildPythonPackage rec {
    wheel
  ];

-  propagatedBuildInputs = [
+  dependencies = [
    certifi
    cftime
+    numpy
+  ];
+
+  buildInputs = [
    curl
    hdf5
    libjpeg
    netcdf
-    numpy
    zlib
  ];

  checkPhase = ''
+    runHook preCheck
+
    pushd test/
    NO_NET=1 NO_CDL=1 ${python.interpreter} run_all.py
+
+    runHook postCheck
  '';

  env = {
@ -69,7 +83,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Interface to netCDF library (versions 3 and 4)";
    homepage = "https://github.com/Unidata/netcdf4-python";
-    changelog = "https://github.com/Unidata/netcdf4-python/raw/v${version}/Changelog";
+    changelog = "https://github.com/Unidata/netcdf4-python/raw/${tag}/Changelog";
    maintainers = [ ];
    license = licenses.mit;
  };
--- a/pkgs/development/python-modules/ntc-templates/default.nix
+++ b/pkgs/development/python-modules/ntc-templates/default.nix
@ -14,19 +14,19 @@

 buildPythonPackage rec {
  pname = "ntc-templates";
-  version = "6.0.0";
-  format = "pyproject";
+  version = "7.5.0";
+  pyproject = true;

-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";

  src = fetchFromGitHub {
    owner = "networktocode";
-    repo = pname;
-    rev = "refs/tags/v${version}";
-    hash = "sha256-E8n4ZcCH8xxU5XXVxQUl8844RnRpnbHy/LnjHlz7Eeg=";
+    repo = "ntc-templates";
+    tag = "v${version}";
+    hash = "sha256-VRkWjhl/7qDwXTWQ5ZhIS7JMuxJWlWkqwjoSo1DXOQE=";
  };

-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];

  propagatedBuildInputs = [ textfsm ];

--- a/pkgs/development/python-modules/open-interpreter/default.nix
+++ b/pkgs/development/python-modules/open-interpreter/default.nix
@ -53,6 +53,7 @@ buildPythonPackage rec {
    "google-generativeai"
    "psutil"
    "pynput"
+    "tiktoken"
    "yaspin"
  ];

--- a/pkgs/development/python-modules/plotnine/default.nix
+++ b/pkgs/development/python-modules/plotnine/default.nix
@ -22,14 +22,14 @@

 buildPythonPackage rec {
  pname = "plotnine";
-  version = "0.14.4";
+  version = "0.14.5";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "has2k1";
    repo = "plotnine";
    tag = "v${version}";
-    hash = "sha256-pNbnbzmY3WMCfmuvaVa0JRuyadlvnVCIx5jtni/VcVI=";
+    hash = "sha256-3ImNLmZ8RhhqRGv/FtdjbHmdOtgQC7hjUsViEQYE8Ao=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/pydevccu/default.nix
+++ b/pkgs/development/python-modules/pydevccu/default.nix
@ -8,18 +8,23 @@

 buildPythonPackage rec {
  pname = "pydevccu";
-  version = "0.1.8";
+  version = "0.1.9";
  pyproject = true;

-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.12";

  src = fetchFromGitHub {
-    owner = "danielperna84";
+    owner = "SukramJ";
    repo = "pydevccu";
-    rev = "refs/tags/${version}";
-    hash = "sha256-WguSTtWxkiDs5nK5eiaarfD0CBxzIxQR9fxjuW3wMGc=";
+    tag = version;
+    hash = "sha256-s1u9+w0sPpXuqAET4k5VPWP+VoPqB08dZa9oY4UFXc8=";
  };

+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools==75.6.0" setuptools
+  '';
+
  build-system = [ setuptools ];

  # Module has no tests
@ -29,8 +34,8 @@ buildPythonPackage rec {

  meta = {
    description = "HomeMatic CCU XML-RPC Server with fake devices";
-    homepage = "https://github.com/danielperna84/pydevccu";
-    changelog = "https://github.com/danielperna84/pydevccu/releases/tag/${version}";
+    homepage = "https://github.com/SukramJ/pydevccu";
+    changelog = "https://github.com/SukramJ/pydevccu/releases/tag/${src.tag}";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ fab ];
  };
--- a/pkgs/development/python-modules/pyedflib/default.nix
+++ b/pkgs/development/python-modules/pyedflib/default.nix
@ -0,0 +1,55 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  cython,
+  numpy,
+  setuptools,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "pyedflib";
+  version = "0.1.38";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "holgern";
+    repo = "pyedflib";
+    tag = "v${version}";
+    hash = "sha256-sj2O5ISAy12u4GdtucLaRfOeSA6o6FJpZWTyiLq5B3U=";
+  };
+
+  build-system = [
+    cython
+    numpy
+    setuptools
+  ];
+
+  pythonImportsCheck = [
+    "pyedflib"
+  ];
+
+  # Otherwise, the module is imported from source and lacks the compiled artifacts
+  # By moving to the pyedflib directory, python imports the installed package instead of the module
+  # from the local files
+  preCheck = ''
+    cd pyedflib
+  '';
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    description = "Python library to read/write EDF+/BDF+ files based on EDFlib";
+    homepage = "https://github.com/holgern/pyedflib";
+    changelog = "https://github.com/holgern/pyedflib/releases/tag/v${version}";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
--- a/pkgs/development/python-modules/pyseries/default.nix
+++ b/pkgs/development/python-modules/pyseries/default.nix
@ -0,0 +1,63 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  deepdish,
+  matplotlib,
+  numpy,
+  obspy,
+  pandas,
+  pyedflib,
+  scikit-learn,
+  scipy,
+  seaborn,
+  tabulate,
+}:
+
+buildPythonPackage rec {
+  pname = "pyseries";
+  version = "1.0.26";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-Cq+DXt0/6Ncae8OO+kaPuTCxouh0cFPHP+T8tGVXxXo=";
+  };
+
+  build-system = [ setuptools ];
+
+  pythonRemoveDeps = [
+    # sklearn is the old name of the scikit-learn package
+    "sklearn"
+  ];
+
+  dependencies = [
+    deepdish
+    matplotlib
+    numpy
+    obspy
+    pandas
+    pyedflib
+    scikit-learn
+    scipy
+    seaborn
+    tabulate
+  ];
+
+  pythonImportsCheck = [ "pyseries" ];
+
+  # no tests in the pypi archive
+  doCheck = false;
+
+  meta = {
+    description = "Package for statistical analysis of time-series data";
+    homepage = "https://pypi.org/project/pyseries/";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
--- a/pkgs/development/python-modules/pyspark/default.nix
+++ b/pkgs/development/python-modules/pyspark/default.nix
@ -11,14 +11,14 @@

 buildPythonPackage rec {
  pname = "pyspark";
-  version = "3.5.3";
+  version = "3.5.4";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-aLfMDAxXCn2GRPSfQNLahwmwHTDJEmzIz5O0+E89l0c=";
+    hash = "sha256-HCkm1jAgkCFj9YIiRmrfb4AW9sQ8HzGbjnpx26oF/FE=";
  };

  # pypandoc is broken with pandoc2, so we just lose docs.
--- a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix
+++ b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix
@ -5,16 +5,16 @@

 buildGoModule rec {
  pname = "tflint-ruleset-aws";
-  version = "0.36.0";
+  version = "0.37.0";

  src = fetchFromGitHub {
    owner = "terraform-linters";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-cGtxxSHdl7xtBdhQ591Xt6udUwwO6uAtudt1Hj4LzZQ=";
+    hash = "sha256-7xS1V7Ec3eWiVjMB/4MLeKlGxNKRYeHVFc61dpoBU/8=";
  };

-  vendorHash = "sha256-1T50kynzbL1p/9N8lmkxFmTHujDNTaTRcWnJVrWVslQ=";
+  vendorHash = "sha256-XUGcRky0GMV2RSahUk6k/KWkWvxdCLi/7TpXn2MdNoM=";

  # upstream Makefile also does a  go test $(go list ./... | grep -v integration)
  preCheck = ''
--- a/pkgs/games/sgt-puzzles/default.nix
+++ b/pkgs/games/sgt-puzzles/default.nix
@ -18,11 +18,11 @@

 stdenv.mkDerivation rec {
  pname = "sgt-puzzles";
-  version = "20241223.5eea14c";
+  version = "20241230.79be403";

  src = fetchurl {
    url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz";
-    hash = "sha256-c9cPPxjU7O+uAp6jzCkfv8ZJeVrcLmEfD+lUK0l+X9w=";
+    hash = "sha256-gWt328Ic0+ctcptnhnTprAEmMpcpfAAyTEqRuKF0gVY=";
  };

  sgt-puzzles-menu = fetchurl {
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@ -1,11 +1,11 @@
 {
    "testing": {
-        "version": "6.13-rc4",
-        "hash": "sha256:0ca986ycx3k69j1km1j4fyjh0d1wvxnyx1fzlb52g930r1jymp39"
+        "version": "6.13-rc5",
+        "hash": "sha256:02rasg3dyzq0cfqj74rn98xm2amhw3djd4dd0nvf5syha91l81rr"
    },
    "6.1": {
-        "version": "6.1.122",
-        "hash": "sha256:0l3frvlzpl23f9j1vjm2y29d1ppv0ynq40h695i7w2qhh2rw14p8"
+        "version": "6.1.123",
+        "hash": "sha256:1g5k9q113nyid3a347abb36v2xfv5vf74ic88af7kf04kzbsr9rk"
    },
    "5.15": {
        "version": "5.15.175",
@ -20,15 +20,15 @@
        "hash": "sha256:1zhsb6gwhb6cvijzh7s8rnm4b06klyhb2mxb06gcyfvj0givlvw7"
    },
    "6.6": {
-        "version": "6.6.68",
-        "hash": "sha256:1qj0b2n4ck9qrgpqcgmhkl2jc4rh4000rqqs2vnwwlpkwc8g8gr8"
+        "version": "6.6.69",
+        "hash": "sha256:0d2gilgh8myavzfdjnx7az4dbwvkk7irvsz6rla9bnbmgdb0aqww"
    },
    "6.11": {
        "version": "6.11.11",
        "hash": "sha256:1z2913y38clnlmhvwj49h7p4pic24s4d8np7nmd4lk7m2xz8w532"
    },
    "6.12": {
-        "version": "6.12.7",
-        "hash": "sha256:1kx0kmc8xlx5kpvfplawk05wjqpdnsj2hcmv8flnc2qfi9jgp1gp"
+        "version": "6.12.8",
+        "hash": "sha256:0y992b484rkkaqdkz5mw2is1l0izxhm3cl7fi5f72jx0bh3dm492"
    }
 }
--- a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
@ -7,15 +7,15 @@
 }:

 buildHomeAssistantComponent rec {
-  owner = "danielperna84";
+  owner = "SukramJ";
  domain = "homematicip_local";
-  version = "1.75.0";
+  version = "1.76.1";

  src = fetchFromGitHub {
-    owner = "danielperna84";
+    owner = "SukramJ";
    repo = "custom_homematic";
-    rev = "refs/tags/${version}";
-    hash = "sha256-H5Gf09C9/s2JYVTjgiYNe28mV18mqTiJ0ZDR6rnuojo=";
+    tag = version;
+    hash = "sha256-dBNZFYoi6tA9waV/yPCkgLu+ADxq09UKsOBHWOOBRJY=";
  };

  postPatch = ''
@ -30,9 +30,9 @@ buildHomeAssistantComponent rec {
  ];

  meta = {
-    changelog = "https://github.com/danielperna84/custom_homematic/blob/${version}/changelog.md";
+    changelog = "https://github.com/SukramJ/custom_homematic/blob/${src.tag}/changelog.md";
    description = "Custom Home Assistant Component for HomeMatic";
-    homepage = "https://github.com/danielperna84/custom_homematic";
+    homepage = "https://github.com/SukramJ/custom_homematic";
    maintainers = with lib.maintainers; [ dotlambda ];
    license = lib.licenses.mit;
  };
--- a/pkgs/tools/archivers/7zz/default.nix
+++ b/pkgs/tools/archivers/7zz/default.nix
@ -25,13 +25,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "7zz";
-  version = "24.08";
+  version = "24.09";

  src = fetchzip {
    url = "https://7-zip.org/a/7z${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}-src.tar.xz";
    hash = {
-      free = "sha256-2lv2Z4rrjmawD6aI8TmrACgo62StD720WQWOa0/u7KE=";
-      unfree = "sha256-f6hibHeTlF6RRnFiC7tOZ/A+IQdjhIrxYq6JrDVhnYI=";
+      free = "sha256-iQJ2m2OZrdkzf2sDIbKuyu0wIUktfvySTpsGFSLDZOM=";
+      unfree = "sha256-HVSu5GvdCY3lVXLUkHxaXco22WO52J2ldkGgfsyMVVg=";
    }.${if enableUnfree then "unfree" else "free"};
    stripRoot = false;
    # remove the unRAR related code from the src drv
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@ -3,6 +3,7 @@
  callPackage,
  fetchFromGitHub,
  python3Packages,
+  fetchpatch,
 }:
 /*
  ** To customize the enabled beets plugins, use the pluginOverrides input to the
@ -17,11 +18,22 @@
  **   alternatives = { enable = true; propagatedBuildInputs = [ beetsPackages.alternatives ]; };
  ** }; }
 */
+let
+  extraPatches = [
+    # Bash completion fix for Nix
+    ./patches/bash-completion-always-print.patch
+    # Remove after next release.
+    (fetchpatch {
+      url = "https://github.com/beetbox/beets/commit/bcc79a5b09225050ce7c88f63dfa56f49f8782a8.patch?full_index=1";
+      hash = "sha256-Y2Q5Co3UlDGKuzfxUvdUY3rSMNpsBoDW03ZWZOfzp3Y=";
+    })
+  ];
+in
 lib.makeExtensible (self: {
  beets = self.beets-stable;

  beets-stable = callPackage ./common.nix rec {
-    inherit python3Packages;
+    inherit python3Packages extraPatches;
    version = "2.2.0";
    src = fetchFromGitHub {
      owner = "beetbox";
@ -29,16 +41,12 @@ lib.makeExtensible (self: {
      rev = "v${version}";
      hash = "sha256-jhwXRgUUQJgQ/PLwvY1UfHCJ9UC8DcdBpE/janao0RM=";
    };
-    extraPatches = [
-      # Bash completion fix for Nix
-      ./patches/bash-completion-always-print.patch
-    ];
  };

  beets-minimal = self.beets.override { disableAllPlugins = true; };

  beets-unstable = callPackage ./common.nix {
-    inherit python3Packages;
+    inherit python3Packages extraPatches;
    version = "2.2.0-unstable-2024-12-02";
    src = fetchFromGitHub {
      owner = "beetbox";
@ -46,10 +54,6 @@ lib.makeExtensible (self: {
      rev = "f92c0ec8b14fbd59e58374fd123563123aef197b";
      hash = "sha256-jhwXRgUUQJgQ/PLwvY1UfHCJ9UC8DcdBpE/janao0RM=";
    };
-    extraPatches = [
-      # Bash completion fix for Nix
-      ./patches/bash-completion-always-print.patch
-    ];
  };

  alternatives = callPackage ./plugins/alternatives.nix { beets = self.beets-minimal; };
--- a/pkgs/tools/misc/iay/default.nix
+++ b/pkgs/tools/misc/iay/default.nix
@ -13,16 +13,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "iay";
-  version = "0.4.2";
+  version = "0.4.3";

  src = fetchFromGitHub {
    owner = "aaqaishtyaq";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-vk+1RbAmzRf2bbvbSpO+upVW4VrtYWM+5iiH73N+dsc=";
+    sha256 = "sha256-oNUK2ROcocKoIlAuNZcJczDYtSchzpB1qaYbSYsjN50=";
  };

-  cargoHash = "sha256-+PpmxVPyRx/xF7jQGy/07xqALmdNp2uL3HZVOeRicqY=";
+  cargoHash = "sha256-bcMi8967dsJ3fL28XiUXfHz6CPB/RKSKsRvwMJtxEUA=";

  nativeBuildInputs = [ pkg-config ];

--- a/pkgs/tools/security/gotrue/supabase.nix
+++ b/pkgs/tools/security/gotrue/supabase.nix
@ -8,13 +8,13 @@

 buildGoModule rec {
  pname = "auth";
-  version = "2.166.0";
+  version = "2.167.0";

  src = fetchFromGitHub {
    owner = "supabase";
    repo = "auth";
    rev = "v${version}";
-    hash = "sha256-e4PLop+enPt0IkPYRNH0UyZwiBhQKsk0mTFXokGcLug=";
+    hash = "sha256-L5yhrlbZk5R1f21rLpaskg/CW1ITt51sfgXu0DdSD3M=";
  };

  vendorHash = "sha256-em1dBnNHsVPI7owd2gjERcJnrQbiVtZGtIqnFyker6M=";
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@ -201,6 +201,8 @@ mapAliases {
  cargo-espflash = espflash;
  cawbird = throw "cawbird has been abandoned upstream and is broken anyways due to Twitter closing its API";
  certmgr-selfsigned = certmgr; # Added 2023-11-30
+  cgal_4 = throw "cgal_4 has been removed as it is obsolete use cgal instead"; # Added 2024-12-30
+  cgal_5 = cgal; # Added 2024-12-30
  challenger = taler-challenger; # Added 2024-09-04
  check_smartmon = nagiosPlugins.check_smartmon; # Added 2024-05-03
  check_systemd = nagiosPlugins.check_systemd; # Added 2024-05-03
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -1913,8 +1913,6 @@ with pkgs;

  gomobile = callPackage ../development/mobile/gomobile { };

-  titaniumenv = callPackage ../development/mobile/titaniumenv { };
-
  adb-sync = callPackage ../development/mobile/adb-sync {
    inherit (androidenv.androidPkgs) platform-tools;
  };
@ -5650,8 +5648,6 @@ with pkgs;

  yapf = with python3Packages; toPythonApplication yapf;

-  yarn-berry = callPackage ../development/tools/yarn-berry { };
-
  yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea { pkgs = pkgs.__splicedPackages; };

  inherit (yarn2nix-moretea)
@ -8756,10 +8752,7 @@ with pkgs;
    certbot-dns-route53
  ]);

-  # CGAL 5 has API changes
-  cgal_4 = callPackage ../development/libraries/CGAL/4.nix { };
-  cgal_5 = callPackage ../development/libraries/CGAL { };
-  cgal = cgal_5;
+  cgal = callPackage ../development/libraries/CGAL { };

  check = callPackage ../development/libraries/check {
    inherit (darwin.apple_sdk.frameworks) CoreServices;
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@ -319,6 +319,7 @@ mapAliases ({
  Kajiki = kajiki; # added 2023-02-19
  keepkey_agent = keepkey-agent; # added 2024-01-06
  Keras = keras; # added 2021-11-25
+  keyring_24 = throw "keyring_24 has been removed, use keyring instead"; # added 2025-01-01
  ldap = python-ldap; # added 2022-09-16
  lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04
  langchainplus-sdk = langsmith; # added 2023-08-01
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -6948,8 +6948,6 @@ self: super: with self; {

  keyring = callPackage ../development/python-modules/keyring { };

-  keyring_24 = callPackage ../development/python-modules/keyring_24 { };
-
  keyring-pass = callPackage ../development/python-modules/keyring-pass { };

  keyrings-cryptfile = callPackage ../development/python-modules/keyrings-cryptfile { };
@ -10647,6 +10645,8 @@ self: super: with self; {

  pysequoia = callPackage ../development/python-modules/pysequoia { };

+  pyseries = callPackage ../development/python-modules/pyseries { };
+
  pyschemes = callPackage ../development/python-modules/pyschemes { };

  pyschlage = callPackage ../development/python-modules/pyschlage { };
@ -11617,6 +11617,8 @@ self: super: with self; {

  pyecowitt = callPackage ../development/python-modules/pyecowitt { };

+  pyedflib = callPackage ../development/python-modules/pyedflib { };
+
  pyedimax = callPackage ../development/python-modules/pyedimax { };

  pyee = callPackage ../development/python-modules/pyee { };
--- a/pkgs/top-level/ruby-packages.nix
+++ b/pkgs/top-level/ruby-packages.nix
@ -2753,10 +2753,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0pgxgng905jbhp0pr54w4w2pr4nqcq80ijj48204bj4x4nigj8ji";
+      sha256 = "sRYggpgxsct+bJtGyB/4puNsyz+IjxZEhetzUfOGJzo=";
      type = "gem";
    };
-    version = "0.24.0";
+    version = "1.3.0";
  };
  pry = {
    dependencies = ["coderay" "method_source"];