Merge master into staging-next

2026-09-17 12:50:04 +00:00 · 2025-01-07 12:05:41 +00:00
parent f808ba8a2c fb74d2e522
commit 67eb5fcba7
61 changed files with 1578 additions and 1111 deletions
--- a/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix
@@ -9,12 +9,12 @@
  replaceVars,
 }:
 let
-  version = "0.9.2";
+  version = "0.9.3";
  src = fetchFromGitHub {
    owner = "Saghen";
    repo = "blink.cmp";
    tag = "v${version}";
-    hash = "sha256-uvMB3oU6uxERfkXiweeFS0cCIOgO/ogy7GoYAlXUPDs=";
+    hash = "sha256-j6hBURbIZbvNE69l4AyCtCwfeOi3oNxVtooFK7/WUuA=";
  };
  libExt = if stdenv.hostPlatform.isDarwin then "dylib" else "so";
  blink-fuzzy-lib = rustPlatform.buildRustPackage {
--- a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
  mktplcRef = {
    name = "claude-dev";
    publisher = "saoudrizwan";
-    version = "3.0.12";
-    hash = "sha256-GlBo4MIoIazKEYHv4yXpRGLVElOnjYgD9gB6rMQxeGg=";
+    version = "3.1.1";
+    hash = "sha256-xpVb+5neAvMv8ebQlObjVE/lNd7Gn/KLbQAZ9AvQRFI=";
  };

  meta = {
--- a/pkgs/applications/emulators/wine/sources.nix
+++ b/pkgs/applications/emulators/wine/sources.nix
@@ -69,9 +69,9 @@ in rec {

  unstable = fetchurl rec {
    # NOTE: Don't forget to change the hash for staging as well.
-    version = "9.22";
-    url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz";
-    hash = "sha256-4VDSl0KqVPdo7z6XbthhqqT59IVC5Am+qQLQ9Js1loM=";
+    version = "10.0-rc4";
+    url = "https://dl.winehq.org/wine/source/10.0/wine-${version}.tar.xz";
+    hash = "sha256-/oos3wn91MNBpew0ascvCyJN4L3Qp64J+RGwLpyvEAg=";
    inherit (stable) patches;

    ## see http://wiki.winehq.org/Gecko
@@ -88,9 +88,9 @@ in rec {

    ## see http://wiki.winehq.org/Mono
    mono = fetchurl rec {
-      version = "9.3.0";
+      version = "9.4.0";
      url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";
-      hash = "sha256-bKLArtCW/57CD69et2xrfX3oLZqIdax92fB5O/nD/TA=";
+      hash = "sha256-z2FzrpS3np3hPZp0zbJWCohvw9Jx+Uiayxz9vZYcrLI=";
    };

    updateScript = writeShellScript "update-wine-unstable" ''
@@ -117,7 +117,7 @@ in rec {
  staging = fetchFromGitLab rec {
    # https://gitlab.winehq.org/wine/wine-staging
    inherit (unstable) version;
-    hash = "sha256-8bWr8HTl6y9t6TBQr5843FoxxwFJ0z7H/3Zx0gHZO+k=";
+    hash = "sha256-Hfpsi/XJOa7KmW1tEz8wibkM5SnskKMldNqjigRmmMs=";
    domain = "gitlab.winehq.org";
    owner = "wine";
    repo = "wine-staging";
--- a/pkgs/applications/misc/syncthingtray/default.nix
+++ b/pkgs/applications/misc/syncthingtray/default.nix
@@ -38,14 +38,14 @@
 }:

 stdenv.mkDerivation (finalAttrs: {
-  version = "1.6.4";
+  version = "1.7.0";
  pname = "syncthingtray";

  src = fetchFromGitHub {
    owner = "Martchus";
    repo = "syncthingtray";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-xLgkBBh4OMHZYlIiRemJ1aYEwRp+b/Q3dPKm9zpxNjo=";
+    hash = "sha256-YKOqgUMK+FYYemxDcxfDV42z/1qSSja6M7NAt+UaFEo=";
  };

  buildInputs =
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -100,14 +100,14 @@ let
 in
 assert lib.all (p: p.enabled -> !(builtins.elem null p.buildInputs)) plugins;
 stdenv.mkDerivation rec {
-  version = "4.4.4";
+  version = "4.5.1";
  pname = "weechat";

  hardeningEnable = [ "pie" ];

  src = fetchurl {
    url = "https://weechat.org/files/src/weechat-${version}.tar.xz";
-    hash = "sha256-qPS7dow9asPqHrTm3Hp7su4ZtzSnLMWOBjR22ujz0Hc=";
+    hash = "sha256-Z8FDx7xw5om56obfZ0yan/PPRMzJzf8hvmpWHV6vxSg=";
  };

  # Why is this needed? https://github.com/weechat/weechat/issues/2031
--- a/pkgs/applications/terminal-emulators/mlterm/default.nix
+++ b/pkgs/applications/terminal-emulators/mlterm/default.nix
@@ -2,6 +2,7 @@
  stdenv,
  lib,
  fetchFromGitHub,
+  fetchpatch,
  pkg-config,
  autoconf,
  makeDesktopItem,
@@ -110,6 +111,25 @@ stdenv.mkDerivation (finalAttrs: {
    sha256 = "sha256-gfs5cdwUUwSBWwJJSaxrQGWJvLkI27RMlk5QvDALEDg=";
  };

+  patches = [
+    (fetchpatch {
+      name = "mlterm-configure-implicit-function-declaration.patch";
+      url = "https://github.com/arakiken/mlterm/commit/1a9ee97e4574c5892bf12090b812b0538dcdf8f2.patch";
+      hash = "sha256-Kk+x5LAq+beZWE8yj5WfdS82ConLSgxNquzQd5mvOA4=";
+    })
+
+    (fetchpatch {
+      name = "mlterm-wayland-implicit-function-declaration.patch";
+      url = "https://github.com/arakiken/mlterm/commit/20ab931d5055dc5835154a75ca672fade478549f.patch";
+      hash = "sha256-rDmQ0e3dQD7UAGTX4ljOrDqTTddBqvnnRFnqDjRLAss=";
+    })
+
+    (fetchpatch {
+      url = "https://salsa.debian.org/debian/mlterm/-/raw/d9b1555e9220985e0c89a6ff5a0d58f7b18cc123/debian/patches/fix-incompat-pointer-types.patch";
+      hash = "sha256-EcI15FjQfcN8pcE1MqsBfaHQ4j+gyoeesN/WoHb7WnU=";
+    })
+  ];
+
  nativeBuildInputs =
    [
      pkg-config
--- a/pkgs/by-name/al/aliae/package.nix
+++ b/pkgs/by-name/al/aliae/package.nix
@@ -8,13 +8,13 @@

 buildGoModule rec {
  pname = "aliae";
-  version = "0.24.1";
+  version = "0.26.4";

  src = fetchFromGitHub {
    owner = "jandedobbeleer";
    repo = "aliae";
    tag = "v${version}";
-    hash = "sha256-HccUA4+es9M7PZUTqWvIb3xNxmOeyI2iw5bG316RgLE=";
+    hash = "sha256-Xyj/CEvYnVz8bX0vMsFAyRY7Hp6heHFjvq+VeCYWXow=";
  };

  vendorHash = "sha256-wNcn7ATUumuki8IQIrs7f8cf3uD7sMFlaS6BhgpEMVM=";
--- a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
+++ b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
@@ -7,13 +7,13 @@

 stdenvNoCC.mkDerivation {
  pname = "ananicy-rules-cachyos";
-  version = "0-unstable-2024-12-27";
+  version = "0-unstable-2025-01-03";

  src = fetchFromGitHub {
    owner = "CachyOS";
    repo = "ananicy-rules";
-    rev = "8e8452c210f005e409f6b1eddbb2907e8db0a6d3";
-    hash = "sha256-73MltJrKlTvj+ijjhbNQsxGl05KGx+jioSrFGA6IdxE=";
+    rev = "45d223fe8bda37d4ab3f8a931e65ce90bd1ffa88";
+    hash = "sha256-BQM9AmF2w3cl5I0D/Bw9ndvnGVwABWDSsKTEIvVSdTg=";
  };

  dontConfigure = true;
--- a/pkgs/by-name/at/atlas/package.nix
+++ b/pkgs/by-name/at/atlas/package.nix
@@ -9,19 +9,19 @@

 buildGoModule rec {
  pname = "atlas";
-  version = "0.29.1";
+  version = "0.30.0";

  src = fetchFromGitHub {
    owner = "ariga";
    repo = "atlas";
    rev = "v${version}";
-    hash = "sha256-riXtXiMhViAca6Dw32MOquLYWZPuepTS/M0rgkXdap0=";
+    hash = "sha256-Pq4h+/hFu5ujZLv0HUbyrDbuScfQuVEXs7m7mYYZ2yA=";
  };

  modRoot = "cmd/atlas";

  proxyVendor = true;
-  vendorHash = "sha256-U5QGX2M2STHZ5GDZ905yw6v5+ox57y5pqqfD3Bo/WpI=";
+  vendorHash = "sha256-Le5PVOnn4Ma9ZrL4311kedOZYU80kLzbh3VAbu0xXow=";

  nativeBuildInputs = [ installShellFiles ];

--- a/pkgs/by-name/bu/bulky/package.nix
+++ b/pkgs/by-name/bu/bulky/package.nix
@@ -14,13 +14,13 @@

 stdenv.mkDerivation rec {
  pname = "bulky";
-  version = "3.5";
+  version = "3.6";

  src = fetchFromGitHub {
    owner = "linuxmint";
    repo = "bulky";
    rev = version;
-    hash = "sha256-yGW2vEYGmd0FawbgB0lJoi5sId8MG9gNQa71wF1XupQ=";
+    hash = "sha256-+mA8b1PEfp151hks4T/I+dMYlJa6yYz1wWnafe+w9y8=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/cp/cpp-utilities/package.nix
+++ b/pkgs/by-name/cp/cpp-utilities/package.nix
@@ -9,13 +9,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "cpp-utilities";
-  version = "5.27.0";
+  version = "5.27.1";

  src = fetchFromGitHub {
    owner = "Martchus";
    repo = "cpp-utilities";
    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-pjEWTNcZwcrKUsXXHia8aLSCw7R8aEr6GBvD7yiYFXo=";
+    sha256 = "sha256-C/kUWFL305JJ3MGCVc1SQdHdZcuaF01/feQd5AdKQFM=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/by-name/dr/dropbear/package.nix
+++ b/pkgs/by-name/dr/dropbear/package.nix
@@ -20,11 +20,11 @@ in

 stdenv.mkDerivation rec {
  pname = "dropbear";
-  version = "2022.83";
+  version = "2024.86";

  src = fetchurl {
    url = "https://matt.ucc.asn.au/dropbear/releases/dropbear-${version}.tar.bz2";
-    sha256 = "sha256-vFoSH/vJS1FxrV6+Ab5CdG1Qqnl8lUmkY5iUoWdJRDs=";
+    sha256 = "sha256-54k23/w5Xy4NsJkyHWvmWRkJZrmXErVcUw3QoYIuCl4=";
  };

  CFLAGS = lib.pipe (lib.attrNames dflags) [
--- a/pkgs/by-name/dr/dropbear/pass-path.patch
+++ b/pkgs/by-name/dr/dropbear/pass-path.patch
@@ -1,7 +1,7 @@
-diff --git a/svr-chansession.c b/svr-chansession.c
+diff --git a/src/svr-chansession.c b/src/svr-chansession.c
 index 9ae2e60..2db7598 100644
--- a/svr-chansession.c
-+++ b/svr-chansession.c
+--- a/src/svr-chansession.c
+++ b/src/svr-chansession.c
@@ -948,6 +948,8 @@ static void addchildpid(struct ChanSess *chansess, pid_t pid) {
 static void execchild(const void *user_data) {
 	const struct ChanSess *chansess = user_data;
--- a/pkgs/by-name/ga/gama-tui/package.nix
+++ b/pkgs/by-name/ga/gama-tui/package.nix
@@ -6,16 +6,16 @@

 buildGoModule rec {
  pname = "gama-tui";
-  version = "1.1.4";
+  version = "1.2.0";

  src = fetchFromGitHub {
    owner = "termkit";
    repo = "gama";
    tag = "v${version}";
-    hash = "sha256-laE3lW2MX3vYxsF5iHl0sLKCAPRAIZGQs72+vdbX4t0=";
+    hash = "sha256-ZMM+Nt/9Bqmx7kzlhZM8I++BYZhwilRjNXSTAmOrxk4=";
  };

-  vendorHash = "sha256-rx18df0iiYqQToydXcA6Kqsn3lePIL1RNMSvD+a4WrI=";
+  vendorHash = "sha256-PTyrSXLMr244+ZTvjBBUc1gmwYXBAs0bXZS2t3aSWFQ=";

  ldflags = [
    "-s"
--- a/pkgs/by-name/gi/git-credential-oauth/package.nix
+++ b/pkgs/by-name/gi/git-credential-oauth/package.nix
@@ -7,13 +7,13 @@

 buildGoModule rec {
  pname = "git-credential-oauth";
-  version = "0.13.4";
+  version = "0.14.0";

  src = fetchFromGitHub {
    owner = "hickford";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-ki5efsB9p5jCz9Z16n0/uqN0dh6vUn+aKkiEYzLsCBs=";
+    hash = "sha256-QHsSN5mG82jlDFUK0wL2yFSgr+xftTLtZj8dtrRZ9sc=";
  };

  nativeBuildInputs = [ installShellFiles ];
--- a/pkgs/by-name/gn/gnome-online-accounts-gtk/package.nix
+++ b/pkgs/by-name/gn/gnome-online-accounts-gtk/package.nix
@@ -15,13 +15,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "gnome-online-accounts-gtk";
-  version = "3.50.5";
+  version = "3.50.6";

  src = fetchFromGitHub {
    owner = "xapp-project";
    repo = "gnome-online-accounts-gtk";
    rev = finalAttrs.version;
-    hash = "sha256-E4gZsPLOCK15xG5MiwN5sNQs/3KEkzC57I5moqcGy20=";
+    hash = "sha256-/d6ezujW/yeZV95zv/12ttUEUliZARtEGFoCXe6Dp/I=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/js/json2cdn/deps.json
+++ b/pkgs/by-name/js/json2cdn/deps.json
@@ -0,0 +1,196 @@
+{
+  "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
+  "!version": 1,
+  "https://plugins.gradle.org/m2": {
+    "com/fasterxml#oss-parent/38": {
+      "pom": "sha256-yD+PRd/cqNC2s2YcYLP4R4D2cbEuBvka1dHBodH5Zug="
+    },
+    "com/fasterxml#oss-parent/50": {
+      "pom": "sha256-9dpV3XuI+xcMRoAdF3dKZS+y9FgftbHQpfyGqhgrhXc="
+    },
+    "com/fasterxml#oss-parent/58": {
+      "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA="
+    },
+    "com/fasterxml/jackson#jackson-bom/2.17.2": {
+      "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI="
+    },
+    "com/fasterxml/jackson#jackson-parent/2.17": {
+      "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0="
+    },
+    "com/fasterxml/woodstox#woodstox-core/6.5.1": {
+      "jar": "sha256-ySjWBmXGQV+xw5d1z5XPxE9/RYDPWrAbHDgOv/12iH8=",
+      "pom": "sha256-SDllThaxcU509Rq8s3jYNWgUq49NUnPR3S8c6KOQrdw="
+    },
+    "com/gradleup/shadow#com.gradleup.shadow.gradle.plugin/8.3.5": {
+      "pom": "sha256-bc9S5Y+1rG4aD6CVCbfashy3iqlLV3opZThgchAXjKY="
+    },
+    "com/gradleup/shadow#shadow-gradle-plugin/8.3.5": {
+      "jar": "sha256-VOCN0gqCd14zF6RyWhpeTsixscDzRt5wKknZ7UgVtzU=",
+      "module": "sha256-+kwoQEsU00woznA078s3q513u//7O6xbyLf7BGqtliI=",
+      "pom": "sha256-cIF5r4UBl3extKmnI2gPYIX67YERrJFJYeZ1S0lEG6k="
+    },
+    "commons-io#commons-io/2.17.0": {
+      "jar": "sha256-SqTKSPPf0wt4Igt4gdjLk+rECT7JQ2G2vvqUh5mKVQs=",
+      "pom": "sha256-SEqTn/9TELjLXGuQKcLc8VXT+TuLjWKF8/VrsroJ/Ek="
+    },
+    "jakarta/platform#jakarta.jakartaee-bom/9.1.0": {
+      "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ="
+    },
+    "jakarta/platform#jakartaee-api-parent/9.1.0": {
+      "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA="
+    },
+    "org/apache#apache/31": {
+      "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw="
+    },
+    "org/apache#apache/33": {
+      "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU="
+    },
+    "org/apache/ant#ant-launcher/1.10.15": {
+      "jar": "sha256-XIVRmQMHoDIzbZjdrtVJo5ponwfU1Ma5UGAb8is9ahs=",
+      "pom": "sha256-ea+EKil53F/gAivAc8SYgQ7q2DvGKD7t803E3+MNrJU="
+    },
+    "org/apache/ant#ant-parent/1.10.15": {
+      "pom": "sha256-SYhPGHPFEHzCN/QoXER3R5uwgEvwc3OUgBsI114rvrA="
+    },
+    "org/apache/ant#ant/1.10.15": {
+      "jar": "sha256-djrNpKaViMnqiBepUoUf8ML8S/+h0IHCVl3EB/KdV5Q=",
+      "pom": "sha256-R4DmHoeBbu4fIdGE7Jl7Zfk9tfS5BCwXitsp4j50JdY="
+    },
+    "org/apache/commons#commons-parent/74": {
+      "pom": "sha256-gOthsMh/3YJqBpMTsotnLaPxiFgy2kR7Uebophl+fss="
+    },
+    "org/apache/groovy#groovy-bom/4.0.22": {
+      "module": "sha256-Ul0/SGvArfFvN+YAL9RlqygCpb2l9MZWf778copo5mY=",
+      "pom": "sha256-Hh9rQiKue/1jMgA+33AgGDWZDb1GEGsWzduopT4832U="
+    },
+    "org/apache/logging#logging-parent/11.3.0": {
+      "pom": "sha256-pcmFtW/hxYQzOTtQkabznlufeFGN2PySE0aQWZtk19A="
+    },
+    "org/apache/logging/log4j#log4j-api/2.24.1": {
+      "jar": "sha256-bne7Ip/I3K8JA4vutekDCyLp4BtRtFiwGDzmaevMku8=",
+      "pom": "sha256-IzAaISnUEAiZJfSvQa7LUlhKPcxFJoI+EyNOyst+c+M="
+    },
+    "org/apache/logging/log4j#log4j-bom/2.24.1": {
+      "pom": "sha256-vGPPsrS5bbS9cwyWLoJPtpKMuEkCwUFuR3q1y3KwsNM="
+    },
+    "org/apache/logging/log4j#log4j-core/2.24.1": {
+      "jar": "sha256-ALzziEcsqApocBQYF2O2bXdxd/Isu/F5/WDhsaybybA=",
+      "pom": "sha256-JyQstBek3xl47t/GlYtFyJgg+WzH9NFtH0gr/CN24M0="
+    },
+    "org/apache/logging/log4j#log4j/2.24.1": {
+      "pom": "sha256-+NcAm1Rl2KhT0QuEG8Bve3JnXwza71OoDprNFDMkfto="
+    },
+    "org/apache/maven#maven-api-meta/4.0.0-alpha-9": {
+      "jar": "sha256-MsT1yturaAw0lS+ctXBFehODzOxMmlewOSYH1xkcaUk=",
+      "pom": "sha256-2ePDXW/aysuNGLn2QoYJDH/65yjWbLJq9aJmgZUNvnk="
+    },
+    "org/apache/maven#maven-api-xml/4.0.0-alpha-9": {
+      "jar": "sha256-KbJijQ8CgRlxWRaEnBnu1FsyzcZ+sTVReYxzr6SqI9Y=",
+      "pom": "sha256-N2bjAzOTTJIvUlj6M0uHXyi7ABJ/8D3vANl/KlOnrps="
+    },
+    "org/apache/maven#maven-api/4.0.0-alpha-9": {
+      "pom": "sha256-ZYvglXcymzX5TemWdb8O/HI26ZYbXHhfMyqkfyKUcfA="
+    },
+    "org/apache/maven#maven-bom/4.0.0-alpha-9": {
+      "pom": "sha256-4EfSnTUI/yd6Wsk1u5J/NUkQLMbTec5a4p4pYzeE0Rw="
+    },
+    "org/apache/maven#maven-parent/41": {
+      "pom": "sha256-di/N1M6GIcX6Ciz2SVrSaXKoCT60Mqo+QCvC1OJQDFM="
+    },
+    "org/apache/maven#maven-xml-impl/4.0.0-alpha-9": {
+      "jar": "sha256-JucCuIHVeuTuiNAsAJQLpkBjcF7mkgWuiVi/g5qLBrE=",
+      "pom": "sha256-us0USYVzbUMmuuRChHM78eMTKX3NolNGTkYpsddoGPc="
+    },
+    "org/apache/maven#maven/4.0.0-alpha-9": {
+      "pom": "sha256-5QzZ/zefQ3H3/ywsrFF5YfPS9n7fgJCHU8e9UGuRPX4="
+    },
+    "org/codehaus/plexus#plexus-utils/4.0.2": {
+      "jar": "sha256-iVcnTnX+LCeLFCjdFqDa7uHdOBUstu/4Fhd6wo/Mtpc=",
+      "pom": "sha256-UVHBO918w6VWlYOn9CZzkvAT/9MRXquNtfht5CCjZq8="
+    },
+    "org/codehaus/plexus#plexus-xml/4.0.4": {
+      "jar": "sha256-Bp54tTcQjcYSSmcHP8mYJkeR9rZJnpVaOOcrs+T+Gt8=",
+      "pom": "sha256-Ohb3yn7CRzFFtGHgpylREI1H4SThjIRMCFsaY3jGEVE="
+    },
+    "org/codehaus/plexus#plexus/18": {
+      "pom": "sha256-tD7onIiQueW8SNB5/LTETwgrUTklM1bcRVgGozw92P0="
+    },
+    "org/codehaus/woodstox#stax2-api/4.2.1": {
+      "jar": "sha256-Z4Vn5ItRpCxlxpnyZlOa09Z21LGlsK19iezoudV3JXk=",
+      "pom": "sha256-edpBDIwPRqP46K2zDWwkzNYGW272v96HvZfpiB6gouc="
+    },
+    "org/eclipse/ee4j#project/1.0.7": {
+      "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU="
+    },
+    "org/jdom#jdom2/2.0.6.1": {
+      "jar": "sha256-CyD0XjoP2PDRLNxTFrBndukCsTZdsAEYh2+RdcYPMCw=",
+      "pom": "sha256-VXleEBi4rmR7k3lnz4EKmbCFgsI3TnhzwShzTIyRS/M="
+    },
+    "org/junit#junit-bom/5.10.1": {
+      "module": "sha256-IbCvz//i7LN3D16wCuehn+rulOdx+jkYFzhQ2ueAZ7c=",
+      "pom": "sha256-IcSwKG9LIAaVd/9LIJeKhcEArIpGtvHIZy+6qzN7w/I="
+    },
+    "org/junit#junit-bom/5.10.2": {
+      "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=",
+      "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg="
+    },
+    "org/junit#junit-bom/5.10.3": {
+      "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=",
+      "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw="
+    },
+    "org/junit#junit-bom/5.11.0": {
+      "module": "sha256-9+2+Z/IgQnCMQQq8VHQI5cR29An1ViNqEXkiEnSi7S0=",
+      "pom": "sha256-5nRZ1IgkJKxjdPQNscj0ouiJRrNAugcsgL6TKivkZE0="
+    },
+    "org/mockito#mockito-bom/4.11.0": {
+      "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo="
+    },
+    "org/mockito#mockito-bom/5.7.0": {
+      "pom": "sha256-dlcAW89JAw1nzF1S3rxm3xj0jVTbs+1GZ/1yWwZ5+6A="
+    },
+    "org/ow2#ow2/1.5.1": {
+      "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU="
+    },
+    "org/ow2/asm#asm-commons/9.7.1": {
+      "jar": "sha256-mlebVNKSrZvhcdQxP9RznGNVksK1rDpFm70QSc3exqA=",
+      "pom": "sha256-C/HTHaDJ+djtwvJ9u/279z8acVtyzS+ijz8ZWZTXStE="
+    },
+    "org/ow2/asm#asm-tree/9.7.1": {
+      "jar": "sha256-mSmIH1nra4QOhtVFcMd7Wc5yHRBObf16QJeJkcLTtB8=",
+      "pom": "sha256-E7kF9l5/1DynZ09Azao3Z5ukhYxsnZ+48Xp6/ZuqvJ4="
+    },
+    "org/ow2/asm#asm/9.7.1": {
+      "jar": "sha256-jK3UOsXrbQneBfrsyji5F6BAu5E5x+3rTMgcdAtxMoE=",
+      "pom": "sha256-cimwOzCnPukQCActnkVppR2FR/roxQ9SeEGu9MGwuqg="
+    },
+    "org/springframework#spring-framework-bom/5.3.39": {
+      "module": "sha256-+ItA4qUDM7QLQvGB7uJyt17HXdhmbLFFvZCxW5fhg+M=",
+      "pom": "sha256-9tSBCT51dny6Gsfh2zj49pLL4+OHRGkzcada6yHGFIs="
+    },
+    "org/vafer#jdependency/2.11": {
+      "jar": "sha256-zdoDAD+pVRMVpMw/wWPxhJXxkbSaj3CjquIy8Emn/dA=",
+      "pom": "sha256-2mymcCFlPxUMHVNDLKxApzkH0tkqjzR65eRAHk+iJ+c="
+    }
+  },
+  "https://repo.maven.apache.org/maven2": {
+    "net/dzikoysk#cdn/1.14.5": {
+      "jar": "sha256-b6UUnYLuivwmm7smUNf640+AlL9lqwAICy/9/2jPVSQ=",
+      "module": "sha256-UsikplDNlyOU1/kC+he0WhKRygBXeXbdV54TzyuYEdE=",
+      "pom": "sha256-5A7plAKWPAECL6CzHPirlqCFF90zbQyDnT8QIkqUcWM="
+    },
+    "org/jetbrains#annotations/24.0.0": {
+      "jar": "sha256-/xEvVM6HS4romc/WjwMV2WyfQGozi47KgMdtEOLlovc=",
+      "pom": "sha256-q4eN2sP6teB48NqVHqvWf77d09KvFzn+t/lHFgJ1Xws="
+    },
+    "org/panda-lang#expressible/1.3.0": {
+      "jar": "sha256-gTSJ4Qw1ZLhKDz7/9PFquzQEvm4Q57sNV0VR4x17zy8=",
+      "module": "sha256-A0rSBhKjKa4hZwBB4XGvrA7CW9TIe7AM9PC2PQr9wYU=",
+      "pom": "sha256-esOPx5+wqc/E4fC8crQokrZY9xGBiBIz8D5xlxLqlQA="
+    },
+    "org/panda-lang#panda-utilities/0.5.3-alpha": {
+      "jar": "sha256-cFc+CXSX74ATKBCJWK6Y/+FjoxsztrtluF1yoRQ9wBk=",
+      "module": "sha256-jurn7hW9iI+bP4zjiVolcYEdufYA5OVm3aqe0o4OPBI=",
+      "pom": "sha256-LwKg1mw25wyVN2y/JwxGyDNLvedgarSOtuRAJdKjJVc="
+    }
+  }
+}
--- a/pkgs/by-name/js/json2cdn/package.nix
+++ b/pkgs/by-name/js/json2cdn/package.nix
@@ -0,0 +1,62 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  gradle_8,
+  jre_headless,
+  makeBinaryWrapper,
+  tests,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "json2cdn";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "uku3lig";
+    repo = "json2cdn";
+    tag = finalAttrs.version;
+    hash = "sha256-pHmzeZHZyr3FyfkXwrdPk+lcHQKH6t4pnDD9ImMgSV8=";
+  };
+
+  nativeBuildInputs = [
+    gradle_8
+    makeBinaryWrapper
+  ];
+
+  mitmCache = gradle_8.fetchDeps {
+    inherit (finalAttrs) pname;
+    data = ./deps.json;
+  };
+
+  # this is required for using mitm-cache on Darwin
+  __darwinAllowLocalNetworking = true;
+
+  gradleBuildTask = "shadowJar";
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm644 build/libs/json2cdn-${finalAttrs.version}-all.jar $out/lib/json2cdn.jar
+
+    makeWrapper ${lib.getExe jre_headless} $out/bin/json2cdn --add-flags "-jar $out/lib/json2cdn.jar"
+
+    runHook postInstall
+  '';
+
+  passthru = {
+    tests.formats-cdn = tests.pkgs-lib.formats.passthru.entries.pass-cdnAtoms;
+  };
+
+  meta = {
+    description = "Converts a JSON file to dzikoysk's CDN format";
+    homepage = "https://github.com/uku3lig/json2cdn";
+    sourceProvenance = with lib.sourceTypes; [
+      fromSource
+      binaryBytecode
+    ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ uku3lig ];
+    inherit (jre_headless.meta) platforms;
+    mainProgram = "json2cdn";
+  };
+})
--- a/pkgs/by-name/li/lightdm-slick-greeter/package.nix
+++ b/pkgs/by-name/li/lightdm-slick-greeter/package.nix
@@ -23,13 +23,13 @@

 stdenv.mkDerivation rec {
  pname = "lightdm-slick-greeter";
-  version = "2.0.8";
+  version = "2.0.9";

  src = fetchFromGitHub {
    owner = "linuxmint";
    repo = "slick-greeter";
    rev = version;
-    sha256 = "sha256-NkQ2oPtTN/x5uCGubcBOwOXZCwzW1RRbBwdmeytqaF4=";
+    sha256 = "sha256-YSSAFH6azXVk527CmZ6RM2hBdzziTdXeOmYZKusF/DQ=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/li/linux-wallpaperengine/package.nix
+++ b/pkgs/by-name/li/linux-wallpaperengine/package.nix
@@ -54,7 +54,6 @@
  systemd,
  libdecor,
  autoPatchelfHook,
-  makeWrapper,
 }:
 let
  rpath = lib.makeLibraryPath [
@@ -112,8 +111,7 @@ let
    installPhase = ''
      runHook preInstall

-      cp -r . $out
-      chmod +w -R $out
+      cp --recursive --no-preserve=mode . $out
      patchelf $out/${buildType}/libcef.so --set-rpath "${rpath}" --add-needed libudev.so
      patchelf $out/${buildType}/libGLESv2.so --set-rpath "${rpath}" --add-needed libGL.so.1
      patchelf $out/${buildType}/chrome-sandbox --set-interpreter $(cat $NIX_BINTOOLS/nix-support/dynamic-linker)
@@ -131,6 +129,7 @@ let
        "x86_64-linux"
        "aarch64-linux"
      ];
+      hydraPlatforms = [ "x86_64-linux" ]; # Hydra "aarch64-linux" fails with "Output limit exceeded"
    };
  };
 in
@@ -149,7 +148,6 @@ stdenv.mkDerivation rec {
    cmake
    pkg-config
    autoPatchelfHook
-    makeWrapper
  ];

  buildInputs = [
@@ -180,14 +178,14 @@ stdenv.mkDerivation rec {
  cmakeFlags = [
    "-DCMAKE_BUILD_TYPE=${buildType}"
    "-DCEF_ROOT=${cef-bin}"
-    "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/linux-wallpaperengine"
+    "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/app/linux-wallpaperengine"
  ];

  preFixup = ''
-    patchelf --set-rpath "${lib.makeLibraryPath buildInputs}:${cef-bin}" $out/linux-wallpaperengine/linux-wallpaperengine
-    chmod 755 $out/linux-wallpaperengine/linux-wallpaperengine
+    patchelf --set-rpath "${lib.makeLibraryPath buildInputs}:${cef-bin}" $out/app/linux-wallpaperengine/linux-wallpaperengine
+    chmod 755 $out/app/linux-wallpaperengine/linux-wallpaperengine
    mkdir $out/bin
-    makeWrapper $out/linux-wallpaperengine/linux-wallpaperengine $out/bin/linux-wallpaperengine
+    ln -s $out/app/linux-wallpaperengine/linux-wallpaperengine $out/bin/linux-wallpaperengine
  '';

  meta = {
@@ -200,5 +198,6 @@ stdenv.mkDerivation rec {
      "x86_64-linux"
      "aarch64-linux"
    ];
+    hydraPlatforms = [ "x86_64-linux" ]; # Hydra "aarch64-linux" fails with "Output limit exceeded"
  };
 }
--- a/pkgs/by-name/ma/mattermost/package.nix
+++ b/pkgs/by-name/ma/mattermost/package.nix
@@ -1,9 +1,14 @@
-{ lib
-, buildGoModule
-, fetchFromGitHub
-, nix-update-script
-, fetchurl
-, nixosTests
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  buildNpmPackage,
+  nix-update-script,
+  npm-lockfile-fix,
+  fetchNpmDeps,
+  diffutils,
+  jq,
+  nixosTests,
 }:

 buildGoModule rec {
@@ -18,28 +23,82 @@ buildGoModule rec {
    owner = "mattermost";
    repo = "mattermost";
    rev = "v${version}";
-    hash = "sha256-5nUzUnVWVBnQErbMJeSe2ZxCcdcHSmT34JXjFlRMW/s=";
+    hash = "sha256-G9RYktnnVXdhNWp8q+bNbdlHB9ZOGtnESnZVOA7lDvE=";
+    postFetch = ''
+      cd $out/webapp
+
+      # Remove "+..." suffixes on versions.
+      ${lib.getExe jq} '
+        def desuffix(version): version | gsub("^(?<prefix>[^\\+]+)\\+.*$"; "\(.prefix)");
+        .packages |= map_values(if has("version") then .version = desuffix(.version) else . end)
+      ' < package-lock.json > package-lock.fixed.json
+      ${lib.getExe npm-lockfile-fix} package-lock.fixed.json
+
+      rm -f package-lock.json
+      mv package-lock.fixed.json package-lock.json
+    '';
  };

  # Needed because buildGoModule does not support go workspaces yet.
  # We use go 1.22's workspace vendor command, which is not yet available
  # in the default version of go used in nixpkgs, nor is it used by upstream:
  # https://github.com/mattermost/mattermost/issues/26221#issuecomment-1945351597
-  overrideModAttrs = (_: {
-    buildPhase = ''
-      make setup-go-work
-      go work vendor -e
-    '';
-  });
+  overrideModAttrs = (
+    _: {
+      buildPhase = ''
+        make setup-go-work
+        go work vendor -e
+      '';
+    }
+  );

-  webapp = fetchurl {
-    url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz";
-    hash = "sha256-yG5GDeuCHv95e+b2xi/UYiCGkV+I3aqj13Qh/YbyOWQ=";
+  npmDeps = fetchNpmDeps {
+    inherit src;
+    sourceRoot = "${src.name}/webapp";
+    hash = "sha256-ysz38ywGxJ5DXrrcDmcmezKbc5Y7aug9jOWUzHRAs/0=";
+    makeCacheWritable = true;
+    forceGitDeps = true;
  };

-  # Makes nix-update-script pick up the fetchurl for the webapp.
-  # https://github.com/Mic92/nix-update/blob/1.3.1/nix_update/eval.py#L179
-  offlineCache = webapp;
+  webapp = buildNpmPackage rec {
+    pname = "mattermost-webapp";
+    inherit version src;
+
+    sourceRoot = "${src.name}/webapp";
+
+    # Remove deprecated image-webpack-loader causing build failures
+    # See: https://github.com/tcoopman/image-webpack-loader#deprecated
+    postPatch = ''
+      substituteInPlace channels/webpack.config.js \
+        --replace-fail 'options: {}' 'options: { disable: true }'
+    '';
+
+    npmDepsHash = npmDeps.hash;
+    makeCacheWritable = true;
+    forceGitDeps = true;
+
+    npmRebuildFlags = [ "--ignore-scripts" ];
+
+    buildPhase = ''
+      runHook preBuild
+
+      npm run build --workspace=platform/types
+      npm run build --workspace=platform/client
+      npm run build --workspace=platform/components
+      npm run build --workspace=channels
+
+      runHook postBuild
+    '';
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out
+      cp -r channels/dist/* $out
+
+      runHook postInstall
+    '';
+  };

  vendorHash = "sha256-Gwv6clnq7ihoFC8ox8iEM5xp/us9jWUrcmqA9/XbxBE=";

@@ -64,16 +123,21 @@ buildGoModule rec {
  ];

  postInstall = ''
-    tar --strip 1 --directory $out -xf $webapp \
-      mattermost/{client,i18n,fonts,templates,config}
-
-    # For some reason a bunch of these files are executable
-    find $out/{client,i18n,fonts,templates,config} -type f -exec chmod -x {} \;
+    mkdir -p $out/{client,i18n,fonts,templates,config}
+    cp -r ${webapp}/* $out/client/
+    cp -r ${src}/server/i18n/* $out/i18n/
+    cp -r ${src}/server/fonts/* $out/fonts/
+    cp -r ${src}/server/templates/* $out/templates/
+    OUTPUT_CONFIG=$out/config/config.json \
+      go run -tags production ./scripts/config_generator
  '';

  passthru = {
    updateScript = nix-update-script {
-      extraArgs = [ "--version-regex" "^v(9\\.11\\.[0-9]+)$" ];
+      extraArgs = [
+        "--version-regex"
+        "^v(9\.11\.[0-9]+)$"
+      ];
    };
    tests.mattermost = nixosTests.mattermost;
  };
@@ -81,8 +145,17 @@ buildGoModule rec {
  meta = with lib; {
    description = "Mattermost is an open source platform for secure collaboration across the entire software development lifecycle";
    homepage = "https://www.mattermost.org";
-    license = with licenses; [ agpl3Only asl20 ];
-    maintainers = with maintainers; [ ryantm numinit kranzes mgdelacroix ];
+    license = with licenses; [
+      agpl3Only
+      asl20
+    ];
+    maintainers = with maintainers; [
+      ryantm
+      numinit
+      kranzes
+      mgdelacroix
+      fsagbuya
+    ];
    mainProgram = "mattermost";
  };
 }
--- a/pkgs/by-name/my/mypaint/package.nix
+++ b/pkgs/by-name/my/mypaint/package.nix
@@ -35,7 +35,7 @@ buildPythonApplication rec {
  src = fetchFromGitHub {
    owner = "mypaint";
    repo = "mypaint";
-    rev = "v${version}";
+    tag = "v${version}";
    hash = "sha256-rVKcxzWZRLcuxK8xRyRgvitXAh4uOEyqHswLeTdA2Mk=";
    fetchSubmodules = true;
  };
@@ -130,6 +130,10 @@ buildPythonApplication rec {
    runHook postInstall
  '';

+  # tests require unmaintained and removed nose, it should switch to pytest
+  # https://github.com/mypaint/mypaint/issues/1191
+  doCheck = false;
+
  checkPhase = ''
    runHook preCheck

@@ -138,11 +142,11 @@ buildPythonApplication rec {
    runHook postCheck
  '';

-  meta = with lib; {
+  meta = {
    description = "Graphics application for digital painters";
    homepage = "http://mypaint.org/";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ jtojnar ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ jtojnar ];
  };
 }
--- a/pkgs/by-name/op/openscad-unstable/package.nix
+++ b/pkgs/by-name/op/openscad-unstable/package.nix
@@ -44,12 +44,12 @@
 # clang consume much less RAM than GCC
 clangStdenv.mkDerivation rec {
  pname = "openscad-unstable";
-  version = "2024-12-21";
+  version = "2025-01-05";
  src = fetchFromGitHub {
    owner = "openscad";
    repo = "openscad";
-    rev = "30cbdf6c7214be7cc00b4cca2cef8396e1d69498";
-    hash = "sha256-wpw4JStAWNcHU6PoHGcIKAeVjtlTJsS4ZFMkTpj6xRk=";
+    rev = "92a13b4f06221ef26c901130c0c52658976cdfb2";
+    hash = "sha256-803pDT/yq7eBk4J3E1JwKdhurnupPdB4A9xroLRg3+0=";
    # Unfortunately, we can't selectively fetch submodules. It would be good
    # to see that we don't accidentally depend on it.
    fetchSubmodules = true; # Only really need sanitizers-cmake and MCAD
--- a/pkgs/by-name/os/osmium-tool/package.nix
+++ b/pkgs/by-name/os/osmium-tool/package.nix
@@ -2,6 +2,7 @@
  lib,
  stdenv,
  fetchFromGitHub,
+  fetchpatch,
  cmake,
  installShellFiles,
  pandoc,
@@ -25,6 +26,19 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-DObqbzdPA4RlrlcZhqA0MQtWBE+D6GRD1pd9U4DARIk=";
  };

+  patches = [
+    # Work around https://github.com/osmcode/osmium-tool/issues/276
+    # by applying changes from https://github.com/Tencent/rapidjson/pull/719
+    (fetchpatch {
+      url = "https://github.com/Tencent/rapidjson/commit/3b2441b87f99ab65f37b141a7b548ebadb607b96.patch";
+      hash = "sha256-Edmq+hdJQFQ4hT3Oz1cv5gX95qQxPLD4aY8QMTonDe8=";
+    })
+    (fetchpatch {
+      url = "https://github.com/Tencent/rapidjson/commit/862c39be371278a45a88d4d1d75164be57bb7e2d.patch";
+      hash = "sha256-V5zbq/THUY75p1RdEPKJK2NVnxbZs07MMwJBAH7nAMg=";
+    })
+  ];
+
  nativeBuildInputs = [
    cmake
    installShellFiles
--- a/pkgs/by-name/sl/slimerjs/package.nix
+++ b/pkgs/by-name/sl/slimerjs/package.nix
@@ -1,53 +0,0 @@
-{
-  lib,
-  bash,
-  fetchFromGitHub,
-  firefox,
-  strip-nondeterminism,
-  stdenv,
-  unzip,
-  zip,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "slimerjs";
-  version = "1.0.0";
-
-  src = fetchFromGitHub {
-    owner = "laurentj";
-    repo = "slimerjs";
-    sha256 = "sha256-RHd9PqcSkO9FYi5x+09TN7c4fKGf5pCPXjoCUXZ2mvA=";
-    rev = version;
-  };
-
-  buildInputs = [ zip ];
-  nativeBuildInputs = [
-    strip-nondeterminism
-    unzip
-  ];
-
-  preConfigure = ''
-    test -d src && cd src
-    test -f omni.ja || zip omni.ja -r */
-  '';
-
-  installPhase = ''
-    strip-nondeterminism --type zip omni.ja
-    mkdir -p "$out"/{bin,share/doc/slimerjs,lib/slimerjs}
-    cp LICENSE README* "$out/share/doc/slimerjs"
-    cp -r * "$out/lib/slimerjs"
-    echo '#!${bash}/bin/bash' >>  "$out/bin/slimerjs"
-    echo 'export SLIMERJSLAUNCHER=${firefox}/bin/firefox' >>  "$out/bin/slimerjs"
-    echo "'$out/lib/slimerjs/slimerjs' \"\$@\"" >> "$out/bin/slimerjs"
-    chmod a+x "$out/bin/slimerjs"
-    sed -e 's@MaxVersion=[3456][0-9][.]@MaxVersion=99.@' -i "$out/lib/slimerjs/application.ini"
-  '';
-
-  meta = with lib; {
-    description = "Gecko-based programmatically-driven browser";
-    mainProgram = "slimerjs";
-    license = licenses.mpl20;
-    maintainers = with maintainers; [ raskin ];
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/by-name/sq/squid/package.nix
+++ b/pkgs/by-name/sq/squid/package.nix
@@ -18,11 +18,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "squid";
-  version = "6.10";
+  version = "6.12";

  src = fetchurl {
    url = "http://www.squid-cache.org/Versions/v6/squid-${finalAttrs.version}.tar.xz";
-    hash = "sha256-Cwexh+cj8Edw3SW+uJrsEgMKFYaWqoiS2HyLJoU0CKc=";
+    hash = "sha256-8986uyYDpRMmbySl1Gmanw12ufVU0YSLZ/nFHNOzy1A=";
  };

  nativeBuildInputs = [ pkg-config ];
--- a/pkgs/by-name/sw/swt/package.nix
+++ b/pkgs/by-name/sw/swt/package.nix
@@ -11,16 +11,16 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "swt";
-  version = "4.33";
-  fullVersion = "${finalAttrs.version}-202409030240";
+  version = "4.34";
+  fullVersion = "${finalAttrs.version}-202411201800";

  hardeningDisable = [ "format" ];

  passthru.srcMetadataByPlatform = {
    x86_64-linux.platform = "gtk-linux-x86_64";
-    x86_64-linux.hash = "sha256-0OUr+jpwTx5/eoA6Uo2E9/SBAtf+IMMiSVRhOfaWFhE=";
+    x86_64-linux.hash = "sha256-lKAB2aCI3dZdt3pE7uSvSfxc8vc3oMSTCx5R+71Aqdk=";
    x86_64-darwin.platform = "cocoa-macosx-x86_64";
-    x86_64-darwin.hash = "sha256-n948C/YPF55WPYvub3re/wARLP1Wk+XhJiIuI0YQH5c=";
+    x86_64-darwin.hash = "sha256-Uns3fMoetbZAIrL/N0eVd42/3uygXakDdxpaxf5SWDI=";
  };
  passthru.srcMetadata =
    finalAttrs.passthru.srcMetadataByPlatform.${stdenv.hostPlatform.system} or null;
@@ -63,8 +63,8 @@ stdenv.mkDerivation (finalAttrs: {
  AWT_LIB_PATH = "${jdk}/lib/openjdk/lib";
  # Used by the makefile which is responsible for the shared objects only
  OUTPUT_DIR = "${placeholder "out"}/lib";
-  # GTK4 is not supported yet. Waiting for:
-  # https://github.com/eclipse-platform/eclipse.platform.swt/pull/1482
+  # GTK4 is not supported yet. See:
+  # https://github.com/eclipse-platform/eclipse.platform.swt/issues/652
  makeFlags = "gtk3";
  preBuild = ''
    cd library
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -17,17 +17,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "uv";
-  version = "0.5.14";
+  version = "0.5.15";

  src = fetchFromGitHub {
    owner = "astral-sh";
    repo = "uv";
    tag = version;
-    hash = "sha256-/IUVdOcQwBKfuNlQozdaVe3TzdXptpADXGk27XLF+xc=";
+    hash = "sha256-U/ccrbtOEpUp3+QKRdb1cqLmVSZ5dDuuC2FYCraghbE=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-dkVyLfihJIfhGrETY0BAHrB4h6JiwL+kfsyP2nwqLN4=";
+  cargoHash = "sha256-rS4fdO3Q1YmDT/ln3PLUuOXddzsFeAUsbypK+UVRIRE=";

  nativeBuildInputs = [
    cmake
--- a/pkgs/by-name/xv/xviewer/package.nix
+++ b/pkgs/by-name/xv/xviewer/package.nix
@@ -28,13 +28,13 @@

 stdenv.mkDerivation rec {
  pname = "xviewer";
-  version = "3.4.7";
+  version = "3.4.8";

  src = fetchFromGitHub {
    owner = "linuxmint";
    repo = pname;
    rev = version;
-    hash = "sha256-hRX+vSotjhoQ/fyFdCelr9IHZGUM8xaYHNfX2vD3nq0=";
+    hash = "sha256-Wn1a/tGNIJNGbgDKoMMMo/oCXrqCXDM1nTUgCZt0O/U=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -93,13 +93,13 @@ let
 in
 rustPlatform.buildRustPackage rec {
  pname = "zed-editor";
-  version = "0.167.1";
+  version = "0.167.2";

  src = fetchFromGitHub {
    owner = "zed-industries";
    repo = "zed";
    tag = "v${version}";
-    hash = "sha256-6UwsWOthQHL4+kPogS5DZIg44VPJBT29uIgcxIQJwtU=";
+    hash = "sha256-2Cgh3dv+3CSZoj2bY1SdNA4xicn03hSvfAl0GyKYF/A=";
  };

  patches = [
@@ -119,7 +119,7 @@ rustPlatform.buildRustPackage rec {
  '';

  useFetchCargoVendor = true;
-  cargoHash = "sha256-MT4Ik5m8K1IljnCa1XYrEluz8zHhbEve7cg7Vje8WA4=";
+  cargoHash = "sha256-PAwgPQEvaU/9fTlsYQPalv9M7oRLafdnNoidtwpGI5Q=";

  nativeBuildInputs =
    [
--- a/pkgs/desktops/gnome/extensions/extensions.json
+++ b/pkgs/desktops/gnome/extensions/extensions.json
--- a/pkgs/development/compilers/ecl/default.nix
+++ b/pkgs/development/compilers/ecl/default.nix
@@ -13,11 +13,15 @@
  makeWrapper,
  noUnicode ? false,
  gcc,
+  clang,
  threadSupport ? true,
  useBoehmgc ? false,
  boehmgc,
 }:

+let
+  cc = if stdenv.cc.isClang then clang else gcc;
+in
 stdenv.mkDerivation rec {
  pname = "ecl";
  version = "24.5.10";
@@ -39,7 +43,7 @@ stdenv.mkDerivation rec {
      libffi
      gmp
      mpfr
-      gcc
+      cc
      # replaces ecl's own gc which other packages can depend on, thus propagated
    ]
    ++ lib.optionals useBoehmgc [
@@ -80,8 +84,8 @@ stdenv.mkDerivation rec {
    sed -e 's/@[-a-zA-Z_]*@//g' -i $out/bin/ecl-config
    wrapProgram "$out/bin/ecl" --prefix PATH ':' "${
      lib.makeBinPath [
-        gcc # for the C compiler
-        gcc.bintools.bintools # for ar
+        cc # for the C compiler
+        cc.bintools.bintools # for ar
      ]
    }"
  '';
--- a/pkgs/development/interpreters/clisp/default.nix
+++ b/pkgs/development/interpreters/clisp/default.nix
@@ -9,6 +9,7 @@
  fetchFromGitLab,
  autoconf269,
  automake,
+  bash,
  libtool,
  libsigsegv,
  gettext,
@@ -77,7 +78,10 @@ stdenv.mkDerivation {
    libtool
  ];
  buildInputs =
-    [ libsigsegv ]
+    [
+      bash
+      libsigsegv
+    ]
    ++ lib.optional (gettext != null) gettext
    ++ lib.optional (ncurses != null) ncurses
    ++ lib.optional (pcre != null) pcre
@@ -141,10 +145,15 @@ stdenv.mkDerivation {
    cd builddir
  '';

+  # ;; Loading file ../src/defmacro.lisp ...
+  # *** - handle_fault error2 ! address = 0x8 not in [0x1000000c0000,0x1000000c0000) !
+  # SIGSEGV cannot be cured. Fault address = 0x8.
+  hardeningDisable = [ "pie" ];
+
  doCheck = true;

  postInstall = lib.optionalString (withModules != [ ]) (
-    ''./clisp-link add "$out"/lib/clisp*/base "$(dirname "$out"/lib/clisp*/base)"/full''
+    ''bash ./clisp-link add "$out"/lib/clisp*/base "$(dirname "$out"/lib/clisp*/base)"/full''
    + lib.concatMapStrings (x: " " + x) withModules
  );

--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -139,71 +139,67 @@ in {
    sourceVersion = {
      major = "7";
      minor = "3";
-      patch = "12";
+      patch = "17";
    };

-    hash = "sha256-3WHYjaJ0ws4s7HdmfUo9+aZSvMUOJvkJkdTdCvZrzPQ=";
+    hash = "sha256-UOBoQPS73pFEgICkEYBoqJuPvK4l/42h4rsUAtyaA0Y=";
    pythonVersion = "2.7";
    db = db.override { dbmSupport = !stdenv.hostPlatform.isDarwin; };
    python = __splicedPackages.pythonInterpreters.pypy27_prebuilt;
    inherit passthruFun;
  };

-  pypy39 = callPackage ./pypy {
-    self = __splicedPackages.pypy39;
+  pypy310 = callPackage ./pypy {
+    self = __splicedPackages.pypy310;
    sourceVersion = {
      major = "7";
      minor = "3";
-      patch = "12";
+      patch = "17";
    };

-    hash = "sha256-56IEbH5sJfw4aru1Ey6Sp8wkkeOTVpmpRstdy7NCwqo=";
-    pythonVersion = "3.9";
+    hash = "sha256-atdLxXjpxtOoocUVAzEwWOPFjDXfhvdIVFPEvmqyS/c=";
+    pythonVersion = "3.10";
    db = db.override { dbmSupport = !stdenv.hostPlatform.isDarwin; };
    python = __splicedPackages.pypy27;
    inherit passthruFun;
  };

-  pypy310 = __splicedPackages.pypy39.override {
-    self = __splicedPackages.pythonInterpreters.pypy310;
-    pythonVersion = "3.10";
-    hash = "sha256-huTk6sw2BGxhgvQwGHllN/4zpg4dKizGuOf5Gl3LPkI=";
-  };
-
  pypy27_prebuilt = callPackage ./pypy/prebuilt_2_7.nix {
    # Not included at top-level
    self = __splicedPackages.pythonInterpreters.pypy27_prebuilt;
    sourceVersion = {
      major = "7";
      minor = "3";
-      patch = "12";
+      patch = "17";
    };

    hash = {
-      aarch64-linux = "sha256-4E3LYoantHJOw/DlDTzBuoWDMB3RZYwG1/N1meQgHFk=";
-      x86_64-linux = "sha256-GmGiV0t5Rm9gYBDymZormVvZbNCF+Rp46909XCxA6B0=";
-      aarch64-darwin = "sha256-a3R6oHauhZfklgPF3sTKWTWhoKEy10BKVZvpaiYNm/c=";
-      x86_64-darwin = "sha256-bon/3RVTfOT/zjFFtl7lfC6clSiSvZW5NAEtLwCfUDs=";
+      aarch64-linux = "sha256-DUzvpmBoUk4qyyxPn1EQSqcnIc0YvPRi7HyLo5Ekqa4=";
+      x86_64-linux = "sha256-nzSX+HszctF+RHNp4AFqS+yZprTSpZq6d0olv+Q1NHQ=";
+      aarch64-darwin = "sha256-gCJIc5sqzIwb5tlH8Zsy/A44wI4xKzXAXMf7IvEHCeQ=";
+      x86_64-darwin = "sha256-gtRgQhRmyBraSh2Z3y3xuLNTQbOXyF///lGkwwItCDM=";
    }.${stdenv.system};
    pythonVersion = "2.7";
    inherit passthruFun;
  };

-  pypy39_prebuilt = callPackage ./pypy/prebuilt.nix {
+  pypy39_prebuilt = throw "pypy 3.9 has been removed, use pypy 3.10 instead"; # Added 2025-01-03
+
+  pypy310_prebuilt = callPackage ./pypy/prebuilt.nix {
    # Not included at top-level
-    self = __splicedPackages.pythonInterpreters.pypy39_prebuilt;
+    self = __splicedPackages.pythonInterpreters.pypy310_prebuilt;
    sourceVersion = {
      major = "7";
      minor = "3";
-      patch = "12";
+      patch = "17";
    };
    hash = {
-      aarch64-linux = "sha256-6TJ/ue2vKtkZNdW4Vj7F/yQZO92xdcGsqvdywCWvGCQ=";
-      x86_64-linux = "sha256-hMiblm+rK1j0UaSC7jDKf+wzUENb0LlhRhXGHcbaI5A=";
-      aarch64-darwin = "sha256-DooaNGi5eQxzSsaY9bAMwD/BaJnMxs6HZGX6wLg5gOM=";
-      x86_64-darwin = "sha256-ZPAI/6BwxAfl70bIJWsuAU3nGW6l2Fg4WGElTnlZ9Os=";
+      aarch64-linux = "sha256-v79JVJirwv53G2C/ZOXDwHLgr7z8pprHKCxP9Dd/9BY=";
+      x86_64-linux = "sha256-NA2kGWYGsiRQmhuLMa/SAYE/CCYB3xicE46QXB1g4K8=";
+      aarch64-darwin = "sha256-KPKf/JxcyQbo6QgT/BRPA34js4TwUuGE4kIzL3tgqwY=";
+      x86_64-darwin = "sha256-I/8mS3PlvFt8OhufrHdosj35bH1mDLZBLxxSNSGjNL8=";
    }.${stdenv.system};
-    pythonVersion = "3.9";
+    pythonVersion = "3.10";
    inherit passthruFun;
  };
 })
--- a/pkgs/development/interpreters/tcl/8.5.nix
+++ b/pkgs/development/interpreters/tcl/8.5.nix
@@ -12,5 +12,9 @@ callPackage ./generic.nix (
      url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz";
      sha256 = "066vlr9k5f44w9gl9382hlxnryq00d5p6c7w5vq1fgc7v9b49w6k";
    };
+
+    extraPatch = ''
+      substituteInPlace 'generic/tclInt.h' --replace-fail 'typedef int ptrdiff_t;' ""
+    '';
  }
 )
--- a/pkgs/development/interpreters/tcl/generic.nix
+++ b/pkgs/development/interpreters/tcl/generic.nix
@@ -12,6 +12,7 @@
  release,
  version,
  src,
+  extraPatch ? "",
  ...
 }:

@@ -27,13 +28,15 @@ let

    setOutputFlags = false;

-    postPatch = ''
-      substituteInPlace library/clock.tcl \
-        --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" \
-        --replace "/usr/share/lib/zoneinfo" "" \
-        --replace "/usr/lib/zoneinfo" "" \
-        --replace "/usr/local/etc/zoneinfo" ""
-    '';
+    postPatch =
+      ''
+        substituteInPlace library/clock.tcl \
+          --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" \
+          --replace "/usr/share/lib/zoneinfo" "" \
+          --replace "/usr/lib/zoneinfo" "" \
+          --replace "/usr/local/etc/zoneinfo" ""
+      ''
+      + extraPatch;

    nativeBuildInputs = lib.optionals (lib.versionAtLeast version "9.0") [
      # Only used to detect the presence of zlib. Could be replaced with a stub.
--- a/pkgs/development/libraries/qtutilities/default.nix
+++ b/pkgs/development/libraries/qtutilities/default.nix
@@ -10,13 +10,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "qtutilities";
-  version = "6.14.4";
+  version = "6.14.5";

  src = fetchFromGitHub {
    owner = "Martchus";
    repo = "qtutilities";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-98njVyEK4cFe7QqCg++74t0YTv5zp80QKpTz4JlV+LY=";
+    hash = "sha256-jjrmagznL0N9vCtLN6tMeierIjI9Q5JGJLYIimQO3ts=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/cerberus/default.nix
+++ b/pkgs/development/python-modules/cerberus/default.nix
@@ -10,8 +10,8 @@

 buildPythonPackage rec {
  pname = "cerberus";
-  version = "1.3.5";
-  format = "pyproject";
+  version = "1.3.6";
+  pyproject = true;

  disabled = pythonOlder "3.9";

@@ -19,10 +19,10 @@ buildPythonPackage rec {
    owner = "pyeve";
    repo = "cerberus";
    tag = version;
-    hash = "sha256-4sVNM4zHc9nsrntmJVdE9nm47CSF0UOJPPI9z3Z2YDc=";
+    hash = "sha256-puQcU8USYtylW5XN0VQzG/dizQR24s7+YgrOxIwaDKQ=";
  };

-  propagatedBuildInputs = [
+  build-system = [
    poetry-core
    setuptools
  ];
--- a/pkgs/development/python-modules/datalad-next/default.nix
+++ b/pkgs/development/python-modules/datalad-next/default.nix
@@ -4,15 +4,16 @@
  datalad,
  datasalad,
  fetchFromGitHub,
-  git,
  git-annex,
+  git,
  humanize,
  lib,
  more-itertools,
+  openssh,
  psutil,
  pytestCheckHook,
+  pythonAtLeast,
  setuptools,
-  openssh,
  unzip,
  versioneer,
  webdavclient3,
@@ -64,45 +65,51 @@ buildPythonPackage rec {
    unzip
  ];

-  disabledTests = [
-    # remotes available after datalad-next install (through `console_scripts`), but not yet in $PATH during test
-    "test_uncurl_addurl_unredirected"
-    "test_uncurl"
-    "test_uncurl_ria_access"
-    "test_uncurl_store"
-    "test_uncurl_remove"
-    "test_uncurl_testremote"
-    "test_replace_add_archive_content"
-    "test_annex_remote"
-    "test_export_remote"
-    "test_annex_remote_autorepush"
-    "test_export_remote_autorepush"
-    "test_typeweb_annex"
-    "test_typeweb_annex_uncompressed"
-    "test_typeweb_export"
-    "test_submodule_url"
-    "test_uncurl_progress_reporting_to_annex"
-    "test_archivist_retrieval"
-    "test_archivist_retrieval_legacy"
+  disabledTests =
+    [
+      # remotes available after datalad-next install (through `console_scripts`), but not yet in $PATH during test
+      "test_uncurl_addurl_unredirected"
+      "test_uncurl"
+      "test_uncurl_ria_access"
+      "test_uncurl_store"
+      "test_uncurl_remove"
+      "test_uncurl_testremote"
+      "test_replace_add_archive_content"
+      "test_annex_remote"
+      "test_export_remote"
+      "test_annex_remote_autorepush"
+      "test_export_remote_autorepush"
+      "test_typeweb_annex"
+      "test_typeweb_annex_uncompressed"
+      "test_typeweb_export"
+      "test_submodule_url"
+      "test_uncurl_progress_reporting_to_annex"
+      "test_archivist_retrieval"
+      "test_archivist_retrieval_legacy"

-    # hardcoded /bin path
-    "test_auto_if_wanted_data_transfer_path_restriction"
+      # hardcoded /bin path
+      "test_auto_if_wanted_data_transfer_path_restriction"

-    # requires internet access
-    "test_push_wanted"
-    "test_auto_data_transfer"
-    "test_http_url_operations"
-    "test_transparent_decompression"
-    "test_compressed_file_stay_compressed"
-    "test_ls_file_collection_tarfile"
-    "test_iter_tar"
-  ];
+      # requires internet access
+      "test_push_wanted"
+      "test_auto_data_transfer"
+      "test_http_url_operations"
+      "test_transparent_decompression"
+      "test_compressed_file_stay_compressed"
+      "test_ls_file_collection_tarfile"
+      "test_iter_tar"
+    ]
+    ++ lib.optionals (pythonAtLeast "3.13") [
+      # RuntimeError
+      "test_tree_with_broken_symlinks"
+    ];

  disabledTestPaths = [
    # requires internet access
    "datalad_next/commands/tests/test_download.py"
    "datalad_next/archive_operations/tests/test_tarfile.py"
  ];
+
  pythonImportsCheck = [ "datalad_next" ];

  meta = {
--- a/pkgs/development/python-modules/dominate/default.nix
+++ b/pkgs/development/python-modules/dominate/default.nix
@@ -4,6 +4,7 @@
  fetchPypi,
  setuptools,
  pytestCheckHook,
+  pythonAtLeast,
  pythonOlder,
 }:

@@ -12,19 +13,24 @@ buildPythonPackage rec {
  version = "2.9.1";
  pyproject = true;

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

  src = fetchPypi {
    inherit pname version;
    hash = "sha256-VYKEaH2biq4ZBOPWBRrRMt1KjAz1UbN+pOfkKjHRncQ=";
  };

-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];

  nativeCheckInputs = [ pytestCheckHook ];

  pythonImportsCheck = [ "dominate" ];

+  disabledTestPaths = lib.optionals (pythonAtLeast "3.13") [
+    # Tests are failing, https://github.com/Knio/dominate/issues/213
+    "tests/test_svg.py"
+  ];
+
  meta = with lib; {
    description = "Library for creating and manipulating HTML documents using an elegant DOM API";
    homepage = "https://github.com/Knio/dominate/";
--- a/pkgs/development/python-modules/drf-extra-fields/default.nix
+++ b/pkgs/development/python-modules/drf-extra-fields/default.nix
@@ -1,15 +1,16 @@
 {
  lib,
  buildPythonPackage,
-  fetchFromGitHub,
-  setuptools,
  django,
  djangorestframework,
+  fetchFromGitHub,
  filetype,
  pillow,
  psycopg2,
-  pytestCheckHook,
  pytest-django,
+  pytestCheckHook,
+  pythonAtLeast,
+  setuptools,
 }:

 buildPythonPackage rec {
@@ -20,7 +21,7 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "hipo";
    repo = "drf-extra-fields";
-    rev = "v${version}";
+    tag = "v${version}";
    hash = "sha256-Ym4vnZ/t0ZdSxU53BC0ducJl1YiTygRSWql/35PNbOU";
  };

@@ -45,6 +46,11 @@ buildPythonPackage rec {

  pythonImportsCheck = [ "drf_extra_fields" ];

+  disabledTests = lib.optionals (pythonAtLeast "3.13") [
+    # https://github.com/Hipo/drf-extra-fields/issues/210
+    "test_read_source_with_context"
+  ];
+
  meta = {
    description = "Extra Fields for Django Rest Framework";
    homepage = "https://github.com/Hipo/drf-extra-fields";
--- a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix
+++ b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix
@@ -11,7 +11,7 @@

 buildPythonPackage rec {
  pname = "faraday-agent-parameters-types";
-  version = "1.7.2";
+  version = "1.7.3";
  pyproject = true;

  disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "faraday_agent_parameters_types";
    inherit version;
-    hash = "sha256-9+scGbRITK25XLJOMsMzPj/y5Wi05mB0dcXDhon9Cf4=";
+    hash = "sha256-dpMxmCFo7e+/VA1SdpdSYRKR9rvr7zQWTri4pJt/4PY=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/faraday-plugins/default.nix
+++ b/pkgs/development/python-modules/faraday-plugins/default.nix
@@ -20,7 +20,7 @@

 buildPythonPackage rec {
  pname = "faraday-plugins";
-  version = "1.20.0";
+  version = "1.21.0";
  pyproject = true;

  disabled = pythonOlder "3.7";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
    owner = "infobyte";
    repo = "faraday_plugins";
    tag = version;
-    hash = "sha256-e1VrZf0WNUZ5gU5e4uBkW8PgfQrqGgqqDb0n56nm1Xg=";
+    hash = "sha256-8q+uGFeMR0OqZuI35iGugQH8pHv14El+NAurX7S9Exo=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/mkdocstrings-python/default.nix
+++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix
@@ -1,8 +1,11 @@
 {
  lib,
+  beautifulsoup4,
  buildPythonPackage,
  fetchFromGitHub,
  griffe,
+  inline-snapshot,
+  mkdocs-autorefs,
  mkdocs-material,
  mkdocstrings,
  pdm-backend,
@@ -12,7 +15,7 @@

 buildPythonPackage rec {
  pname = "mkdocstrings-python";
-  version = "1.12.2";
+  version = "1.13.0";
  pyproject = true;

  disabled = pythonOlder "3.8";
@@ -21,17 +24,20 @@ buildPythonPackage rec {
    owner = "mkdocstrings";
    repo = "python";
    tag = version;
-    hash = "sha256-dc9RXbrwZS/7eAF0BrGS2kJxG62rB5RLxf3yNZ6+g4Q=";
+    hash = "sha256-NgVCKV3AWk4pRT7/+6YGXmKSZETL4ZOWDWGeb/qjdng=";
  };

  build-system = [ pdm-backend ];

  dependencies = [
    griffe
+    mkdocs-autorefs
    mkdocstrings
  ];

  nativeCheckInputs = [
+    beautifulsoup4
+    inline-snapshot
    mkdocs-material
    pytestCheckHook
  ];
@@ -41,6 +47,8 @@ buildPythonPackage rec {
  disabledTests = [
    # Tests fails with AssertionError
    "test_windows_root_conversion"
+    # TypeError
+    "test_format_code"
  ];

  meta = with lib; {
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
--- a/pkgs/development/python-modules/netbox-plugin-prometheus-sd/default.nix
+++ b/pkgs/development/python-modules/netbox-plugin-prometheus-sd/default.nix
@@ -1,9 +1,12 @@
 {
  lib,
  buildPythonPackage,
+  django,
  fetchFromGitHub,
-  poetry-core,
+  netaddr,
  netbox,
+  poetry-core,
+  pythonOlder,
 }:

 buildPythonPackage rec {
@@ -11,20 +14,30 @@ buildPythonPackage rec {
  version = "1.1.1";
  pyproject = true;

+  disabled = pythonOlder "3.8";
+
  src = fetchFromGitHub {
    owner = "FlxPeters";
    repo = "netbox-plugin-prometheus-sd";
-    rev = "v${version}";
+    tag = "v${version}";
    hash = "sha256-UtvSkqs2PN3uxCB78hJjh0lZ1WbZGjDpwlKyeAGpiEM=";
  };

-  nativeBuildInputs = [
-    poetry-core
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail 'version = "0.0.0"' 'version = "${version}"'
+    substituteInPlace netbox_prometheus_sd/__init__.py \
+      --replace-fail "from extras.plugins import PluginConfig" "from netbox.plugins import PluginConfig"
+  '';
+
+  build-system = [ poetry-core ];
+
+  dependencies = [
+    django
+    netaddr
  ];

-  nativeCheckInputs = [
-    netbox
-  ];
+  nativeCheckInputs = [ netbox ];

  preFixup = ''
    export PYTHONPATH=${netbox}/opt/netbox/netbox:$PYTHONPATH
@@ -34,7 +47,8 @@ buildPythonPackage rec {

  meta = with lib; {
    description = "Netbox plugin to provide Netbox entires to Prometheus HTTP service discovery";
-    homepage = "https://pypi.org/project/netbox-plugin-prometheus-sd/";
+    homepage = "https://github.com/FlxPeters/netbox-plugin-prometheus-sd";
+    changelog = "https://github.com/FlxPeters/netbox-plugin-prometheus-sd/releases/tag/v${version}";
    license = licenses.mit;
    maintainers = with maintainers; [ xanderio ];
  };
--- a/pkgs/development/python-modules/numpyro/default.nix
+++ b/pkgs/development/python-modules/numpyro/default.nix
@@ -73,6 +73,10 @@ buildPythonPackage rec {
  ];

  disabledTests = [
+    # jax.errors.UnexpectedTracerError: Encountered an unexpected tracer
+    "test_haiku_state_dropout_smoke"
+    "test_flax_state_dropout_smoke"
+
    # AssertionError due to tolerance issues
    "test_beta_binomial_log_prob"
    "test_collapse_beta"
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -11,14 +11,14 @@

 buildPythonPackage rec {
  pname = "publicsuffixlist";
-  version = "1.0.2.20241225";
+  version = "1.0.2.20250107";
  pyproject = true;

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-zqXSmeOjvSBifDmmHNwR7uYiegry9K8dfO6IuCP9krg=";
+    hash = "sha256-GvJVQooR09RXTebkrq5QlhlgxRktJp1D2RUgGEwpLHk=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/pyaussiebb/default.nix
+++ b/pkgs/development/python-modules/pyaussiebb/default.nix
@@ -12,7 +12,7 @@

 buildPythonPackage rec {
  pname = "pyaussiebb";
-  version = "0.1.4";
+  version = "0.1.5";
  pyproject = true;

  disabled = pythonOlder "3.9";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
    owner = "yaleman";
    repo = "aussiebb";
    tag = "v${version}";
-    hash = "sha256-IW2HraJbgvf0G1eRXNpnsPMWlLXi2P9DTyk+tG5Hc2U=";
+    hash = "sha256-ejaHweoRNrJJq6XGeTrENco8SPwwu6rSpGzksu0CsCY=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/pyexploitdb/default.nix
+++ b/pkgs/development/python-modules/pyexploitdb/default.nix
@@ -10,7 +10,7 @@

 buildPythonPackage rec {
  pname = "pyexploitdb";
-  version = "0.2.61";
+  version = "0.2.62";
  pyproject = true;

  disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "pyExploitDb";
    inherit version;
-    hash = "sha256-NbC9NUB4fgbR5nnBZHBA87dAqFn8CtAP2FMcFPJC76g=";
+    hash = "sha256-lXmhRMyb7yB9qq/CmR/pnY0ttpiINhhPHPZfcfNjqpg=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/pymsteams/default.nix
+++ b/pkgs/development/python-modules/pymsteams/default.nix
@@ -9,7 +9,7 @@

 buildPythonPackage rec {
  pname = "pymsteams";
-  version = "0.2.3";
+  version = "0.2.4";
  pyproject = true;

  disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
    owner = "rveachkc";
    repo = "pymsteams";
    tag = version;
-    hash = "sha256-suPCAzjQp46+kKFiCtm65lxBbsn78Owq4dVmWCdhIpA=";
+    hash = "sha256-SXFJrhT/5Jf3OVUnVfayNk4BvQ2YFZ6SDTADDQOo3Go=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/requirements-detector/default.nix
+++ b/pkgs/development/python-modules/requirements-detector/default.nix
@@ -3,34 +3,42 @@
  astroid,
  buildPythonPackage,
  fetchFromGitHub,
+  fetchpatch,
  packaging,
  poetry-core,
  semver,
  pytestCheckHook,
  pythonOlder,
-  toml,
 }:

 buildPythonPackage rec {
  pname = "requirements-detector";
-  version = "1.2.2";
+  version = "1.3.2";
  pyproject = true;

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

  src = fetchFromGitHub {
    owner = "landscapeio";
    repo = "requirements-detector";
    tag = version;
-    hash = "sha256-qmrHFQRypBJOI1N6W/Dtc5ss9JGqoPhFlbqrLHcb6vc=";
+    hash = "sha256-IWVIYDE/5/9sFgOFftRE4nmY0IDJ0oOvvaGMODkozQg=";
  };

+  patches = [
+    # Remove duplicate import, https://github.com/prospector-dev/requirements-detector/pull/53
+    (fetchpatch {
+      name = "remove-import.patch";
+      url = "https://github.com/prospector-dev/requirements-detector/commit/be412669f53a78b3376cac712c84f158fbb1374a.patch";
+      hash = "sha256-IskSs3BZ1pTeqjtCUksC8wL+3fOYqAi7nw/QD0zsie4=";
+    })
+  ];
+
  build-system = [ poetry-core ];

  dependencies = [
    astroid
    packaging
-    toml
    semver
  ];

@@ -45,7 +53,5 @@ buildPythonPackage rec {
    license = licenses.mit;
    maintainers = with maintainers; [ kamadorueda ];
    mainProgram = "detect-requirements";
-    # https://github.com/landscapeio/requirements-detector/issues/48
-    broken = versionAtLeast astroid.version "3";
  };
 }
--- a/pkgs/development/python-modules/tesla-fleet-api/default.nix
+++ b/pkgs/development/python-modules/tesla-fleet-api/default.nix
@@ -13,7 +13,7 @@

 buildPythonPackage rec {
  pname = "tesla-fleet-api";
-  version = "0.9.2";
+  version = "0.9.4";
  pyproject = true;

  disabled = pythonOlder "3.10";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
    owner = "Teslemetry";
    repo = "python-tesla-fleet-api";
    tag = "v${version}";
-    hash = "sha256-pNW9eiJ8wIdzKOlq6nNUgBwUT898qsKvc5evePYWOOQ=";
+    hash = "sha256-BfVpFTWF6s3tyW0tnfvqkS3+w72vv1YHYpYNj3cC0LA=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/webdavclient3/default.nix
+++ b/pkgs/development/python-modules/webdavclient3/default.nix
@@ -1,44 +1,55 @@
 {
-  buildPythonPackage,
-  fetchPypi,
-  isPy27,
  lib,
-  python-dateutil,
+  buildPythonPackage,
+  fetchFromGitHub,
  lxml,
+  python-dateutil,
+  pythonOlder,
  requests,
+  setuptools,
  pytestCheckHook,
 }:

 buildPythonPackage rec {
  pname = "webdavclient3";
  version = "3.14.6";
-  format = "setuptools";
+  pyproject = true;

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

-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "bcd22586bb0d58abc26ca56054fd04228e704bd36073c3080f4597c1556c880d";
+  src = fetchFromGitHub {
+    owner = "ezhov-evgeny";
+    repo = "webdav-client-python-3";
+    tag = "v${version}";
+    hash = "sha256-vtZTBfq3PVrapv3ivYc18+71y7SPpJ+Mwk5qGe/DdTM=";
  };

-  propagatedBuildInputs = [
-    python-dateutil
+  build-system = [ setuptools ];
+
+  dependencies = [
    lxml
+    python-dateutil
    requests
  ];

  nativeCheckInputs = [ pytestCheckHook ];

-  # disable tests completely, as most of them fail due to urllib3 not being able to establish a http connection
-  doCheck = false;
-
  pythonImportsCheck = [ "webdav3.client" ];

+  disabledTestPaths = [
+    # Tests require a local WebDAV instance
+    "tests/test_client_it.py"
+    "tests/test_client_resource_it.py"
+    "tests/test_cyrilic_client_it.py"
+    "tests/test_multi_client_it.py"
+    "tests/test_tailing_slash_client_it.py"
+  ];
+
  meta = with lib; {
    description = "Easy to use WebDAV Client for Python 3.x";
-    mainProgram = "wdc";
    homepage = "https://github.com/ezhov-evgeny/webdav-client-python-3";
    license = licenses.mit;
    maintainers = with maintainers; [ dmrauh ];
+    mainProgram = "wdc";
  };
 }
--- a/pkgs/pkgs-lib/formats.nix
+++ b/pkgs/pkgs-lib/formats.nix
@@ -310,6 +310,39 @@ rec {

  };

+  /* dzikoysk's CDN format, see https://github.com/dzikoysk/cdn
+
+    The result is almost identical to YAML when there are no nested properties,
+    but differs enough in the other case to warrant a separate format.
+    (see https://github.com/dzikoysk/cdn#supported-formats)
+
+    Currently used by Panda, Reposilite, and FunnyGuilds (as per the repo's readme).
+  */
+  cdn = {}: json {} // {
+    type = let
+      valueType = nullOr (oneOf [
+        bool
+        int
+        float
+        str
+        path
+        (attrsOf valueType)
+        (listOf valueType)
+      ]) // {
+        description = "CDN value";
+      };
+    in valueType;
+
+    generate = name: value: pkgs.callPackage ({ runCommand, json2cdn }: runCommand name {
+      nativeBuildInputs = [ json2cdn ];
+      value = builtins.toJSON value;
+      passAsFile = [ "value" ];
+      preferLocalBuild = true;
+    } ''
+      json2cdn "$valuePath" > $out
+    '') {};
+  };
+
  /* For configurations of Elixir project, like config.exs or runtime.exs

    Most Elixir project are configured using the [Config] Elixir DSL
--- a/pkgs/pkgs-lib/tests/formats.nix
+++ b/pkgs/pkgs-lib/tests/formats.nix
@@ -533,6 +533,40 @@ in runBuildTests {
    '';
  };

+  cdnAtoms = shouldPass {
+    format = formats.cdn { };
+    input = {
+      null = null;
+      false = false;
+      true = true;
+      int = 10;
+      float = 3.141;
+      str = "foo";
+      attrs.foo = null;
+      list = [
+        1
+        null
+      ];
+      path = ./formats.nix;
+    };
+    expected = ''
+      attrs {
+        "foo": null
+      }
+      "false": false
+      "float": 3.141
+      "int": 10
+      list [
+        1,
+        null
+      ]
+      "null": null
+      "path": "${./formats.nix}"
+      "str": "foo"
+      "true": true
+    '';
+  };
+
  # This test is responsible for
  #   1. testing type coercions
  #   2. providing a more readable example test
--- a/pkgs/tools/inputmethods/uim/data-hook.patch
+++ b/pkgs/tools/inputmethods/uim/data-hook.patch
@@ -1,38 +1,40 @@
--- a/gtk2/immodule/Makefile.in	2015-11-24 16:21:08.967087208 +0900
-+++ b/gtk2/immodule/Makefile.in	2015-11-24 16:22:53.316095150 +0900
-@@ -928,7 +928,6 @@
+diff --git a/gtk2/immodule/Makefile.am b/gtk2/immodule/Makefile.am
+index d219a5a4b0..331e127122 100644
+--- a/gtk2/immodule/Makefile.am
+++ b/gtk2/immodule/Makefile.am
+@@ -37,6 +37,7 @@
+ GTK_RC_GET_IMMODULE_FILE = $(top_builddir)/gtk2/immodule/gtk-rc-get-immodule-file
+ QUERY_COMMAND = gtk-query-immodules-2.0
 
- install-data-am: install-moduleLTLIBRARIES
- 	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
- install-dvi: install-dvi-am
+if FALSE
+ install-data-hook: gtk-rc-get-immodule-file
+ 	if test -z $(DESTDIR); then \
+ 	  if test $(libdir) = $(GTK_LIBDIR); then \
+@@ -82,6 +83,7 @@
+ 	    fi \
+ 	  fi \
+ 	fi
+endif
+ else
+ install-data-hook:
 
- install-dvi-am:
-@@ -993,7 +992,7 @@
- 	distclean-compile distclean-generic distclean-libtool \
- 	distclean-tags distdir dvi dvi-am html html-am info info-am \
- 	install install-am install-data install-data-am \
-	install-data-hook install-dvi install-dvi-am install-exec \
-+	install-dvi install-dvi-am install-exec \
- 	install-exec-am install-html install-html-am install-info \
- 	install-info-am install-man install-moduleLTLIBRARIES \
- 	install-pdf install-pdf-am install-ps install-ps-am \
--- a/gtk3/immodule/Makefile.in	2015-11-24 16:21:08.971087209 +0900
-+++ b/gtk3/immodule/Makefile.in	2015-11-24 16:23:28.251097832 +0900
-@@ -896,7 +896,6 @@
+diff --git a/gtk3/immodule/Makefile.am b/gtk3/immodule/Makefile.am
+index de58b88916..d519b03b1d 100644
+--- a/gtk3/immodule/Makefile.am
+++ b/gtk3/immodule/Makefile.am
+@@ -39,6 +39,7 @@
 
- install-data-am: install-moduleLTLIBRARIES
- 	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
- install-dvi: install-dvi-am
+ QUERY_COMMAND = gtk-query-immodules-3.0
+ 
+if FALSE
+ install-data-hook:
+ 	if test -z $(DESTDIR); then \
+ 	  if test $(libdir) = $(GTK3_LIBDIR); then \
+@@ -74,6 +75,7 @@
+ 	    fi \
+ 	  fi \
+ 	fi
+endif
+ else
+ install-data-hook:
 
- install-dvi-am:
-@@ -959,7 +958,7 @@
- 	cscopelist-am ctags ctags-am distclean distclean-compile \
- 	distclean-generic distclean-libtool distclean-tags distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-data-hook install-dvi \
-+	install-data install-data-am install-dvi \
- 	install-dvi-am install-exec install-exec-am install-html \
- 	install-html-am install-info install-info-am install-man \
- 	install-moduleLTLIBRARIES install-pdf install-pdf-am \
--- a/pkgs/tools/inputmethods/uim/default.nix
+++ b/pkgs/tools/inputmethods/uim/default.nix
@@ -2,7 +2,6 @@
  lib,
  stdenv,
  fetchFromGitHub,
-  fetchpatch,
  shared-mime-info,
  autoconf,
  automake,
@@ -53,16 +52,18 @@ assert withNetworking -> curl != null && openssl != null;
 assert withFFI -> libffi != null;
 assert withMisc -> libeb != null;

-stdenv.mkDerivation rec {
-  version = "1.8.8";
+stdenv.mkDerivation (finalAttrs: {
+  # Includes multiple GCC 14 related fixes, and other bugs. Last 1.8.9 release
+  # was in August 2022 - too long ago.
+  version = "1.8.9-unstable-2024-12-09";
  pname = "uim";

  src = fetchFromGitHub {
    owner = "uim";
    repo = "uim";
-    rev = "2c0958c9c505a87e70e344c2192e2e5123c71ea5";
+    rev = "b6803aa7ea433f92855284ec832aeff957c63904";
    fetchSubmodules = true;
-    sha256 = "1hkjxi5r49gcna37m3jvykny5hz9ram4y8a3q7lw4qzr52mz9pdp";
+    hash = "sha256-7Ng9IPF6xN1Zb9uEacq7SUhpJc1jWzneVSbbjyqL6g4=";
  };

  nativeBuildInputs =
@@ -104,13 +105,14 @@ stdenv.mkDerivation rec {
    ++ lib.optional withFFI libffi
    ++ lib.optional withMisc libeb;

-  prePatch = ''
+  postPatch = ''
    patchShebangs *.sh */*.sh */*/*.sh

    # configure sigscheme in maintainer mode or else some function tables won't get autogenerated
    substituteInPlace configure.ac \
-      --replace "--with-master-pkg=uim --enable-conf=uim" \
-                "--enable-maintainer-mode --with-master-pkg=uim --enable-conf=uim"
+      --replace-fail \
+        "--with-master-pkg=uim --enable-conf=uim" \
+        "--enable-maintainer-mode --with-master-pkg=uim --enable-conf=uim"

    # generate ./configure files
    (cd sigscheme/libgcroots; ./autogen.sh)
@@ -120,18 +122,6 @@ stdenv.mkDerivation rec {

  patches = [
    ./data-hook.patch
-
-    # Pull upstream fix for -fno-common toolchains
-    #   https://github.com/uim/libgcroots/pull/4
-    (fetchpatch {
-      name = "libgcroots-fno-common.patch";
-      url = "https://github.com/uim/libgcroots/commit/7e39241344ad0663409e836560ae6b5eb231e1fc.patch";
-      sha256 = "0iifcl5lk8bvl0cflm47gkymg88aiwzj0gxh2aj3mqlyhvyx78nz";
-      # Patch comes from git submodule. Relocate as:
-      # a/include/private/gc_priv.h -> a/sigscheme/libgcroots/include/private/gc_priv.h
-      stripLen = 1;
-      extraPrefix = "sigscheme/libgcroots/";
-    })
  ];

  configureFlags =
@@ -178,14 +168,14 @@ stdenv.mkDerivation rec {

  dontUseCmakeConfigure = true;

-  meta = with lib; {
-    homepage = src.meta.homepage;
+  meta = {
+    inherit (finalAttrs.src.meta) homepage;
    description = "Multilingual input method framework";
-    license = licenses.bsd3;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [
      ericsagnes
      oxij
    ];
  };
-}
+})
--- a/pkgs/tools/security/trufflehog/default.nix
+++ b/pkgs/tools/security/trufflehog/default.nix
@@ -8,16 +8,16 @@

 buildGoModule rec {
  pname = "trufflehog";
-  version = "3.88.0";
+  version = "3.88.1";

  src = fetchFromGitHub {
    owner = "trufflesecurity";
    repo = "trufflehog";
    tag = "v${version}";
-    hash = "sha256-IAvVdq59epg/zQ8lLHlewIDBxZD5FmAYCt1xrJlghzM=";
+    hash = "sha256-peZGCJ3g/u4gAznYM9wzgaqsEYGk0SSzI23g/xglngE=";
  };

-  vendorHash = "sha256-/wuv72PZGdEiTFuurBQJ+K4lunnkR51CrkyHaVb+/kY=";
+  vendorHash = "sha256-YsUAu2gEXzpjM/jg4VJ7KTvf1/cLTO04hLOLmUDeYk0=";

  nativeBuildInputs = [ makeWrapper ];

--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1119,6 +1119,7 @@ mapAliases {
  python-swiftclient = throw "'python-swiftclient' has been renamed to/replaced by 'swiftclient'"; # Converted to throw 2024-10-17
  pythonFull = python2Full; # Added 2022-01-11
  pythonPackages = python.pkgs; # Added 2022-01-11
+  pypy39 = throw "pypy 3.9 has been removed, use pypy 3.10 instead"; # Added 2025-01-03

  ### Q ###

@@ -1214,6 +1215,7 @@ mapAliases {
  sky = throw "'sky' has been removed because its upstream website disappeared"; # Added 2024-07-21
  SkypeExport = skypeexport; # Added 2024-06-12
  slack-dark = throw "'slack-dark' has been renamed to/replaced by 'slack'"; # Converted to throw 2024-10-17
+  slimerjs = throw "slimerjs does not work with any version of Firefox newer than 59; upstream ended the project in 2021. <https://slimerjs.org/faq.html#end-of-development>"; # added 2025-01-06
  slurm-llnl = slurm; # renamed July 2017
  sm64ex-coop = throw "'sm64ex-coop' was removed as it was archived upstream. Consider migrating to 'sm64coopdx'"; # added 2024-11-23
  snapTools = throw "snapTools was removed because makeSnap produced broken snaps and it was the only function in snapTools. See https://github.com/NixOS/nixpkgs/issues/100618 for more details."; # 2024-03-04;
@@ -1282,6 +1284,7 @@ mapAliases {
  swig4 = swig; # Added 2024-09-12
  swigWithJava = throw "swigWithJava has been removed as the main swig package has supported Java since 2009"; # Added 2024-09-12
  swtpm-tpm2 = throw "'swtpm-tpm2' has been renamed to/replaced by 'swtpm'"; # Converted to throw 2024-10-17
+  swt_jdk8 = throw "'swt_jdk8' has been removed due to being unused and broken for a long time"; # Added 2025-01-07
  Sylk = sylk; # Added 2024-06-12
  symbiyosys = sby; # Added 2024-08-18
  sync = taler-sync; # Added 2024-09-04
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7278,7 +7278,7 @@ with pkgs;

  pypy = pypy2;
  pypy2 = pypy27;
-  pypy3 = pypy39;
+  pypy3 = pypy310;

  # Python interpreter that is build with all modules, including tkinter.
  # These are for compatibility and should not be used inside Nixpkgs.
@@ -7346,7 +7346,7 @@ with pkgs;
  };

  pythonInterpreters = callPackage ./../development/interpreters/python { };
-  inherit (pythonInterpreters) python27 python39 python310 python311 python312 python313 python314 python3Minimal pypy27 pypy310 pypy39;
+  inherit (pythonInterpreters) python27 python39 python310 python311 python312 python313 python314 python3Minimal pypy27 pypy310;

  # List of extensions with overrides to apply to all Python package sets.
  pythonPackagesExtensions = [ ];
@@ -7363,7 +7363,6 @@ with pkgs;
  pypy2Packages = pypy2.pkgs;
  pypy27Packages = pypy27.pkgs;
  pypy3Packages = pypy3.pkgs;
-  pypy39Packages = pypy39.pkgs;
  pypy310Packages = pypy310.pkgs;

  pythonManylinuxPackages = callPackage ./../development/interpreters/python/manylinux { };
@@ -11054,10 +11053,6 @@ with pkgs;
    saxon_11-he
    saxon_12-he;

-  swt_jdk8 = callPackage ../by-name/sw/swt/package.nix {
-    jdk = jdk8;
-  };
-
  ### DEVELOPMENT / LIBRARIES / JAVASCRIPT

  ### DEVELOPMENT / BOWER MODULES (JAVASCRIPT)