From 870974b0260f95004d485847367391d8e24178ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Chocholat=C3=BD?= <chocholaty.david@protonmail.com>
Date: Mon, 23 Dec 2024 10:45:50 +0100
Subject: [PATCH 01/21] ack: 3.7.0 -> 3.8.0

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index e3e73cc3abc3..f3947577ea49 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -91,11 +91,11 @@ with self; {
 
   ack = buildPerlPackage rec {
     pname = "ack";
-    version = "3.7.0";
+    version = "3.8.0";
 
     src = fetchurl {
       url = "mirror://cpan/authors/id/P/PE/PETDANCE/ack-v${version}.tar.gz";
-      hash = "sha256-6nyqFPdX3ggzEO0suimGYd3Mpd7gbsjxgEPqYlp53yA=";
+      hash = "sha256-ZAsaGzbKFaTR0XkvKkTmmurlg5HPDSH6iilmWoiV9xg=";
     };
 
     outputs = [ "out" "man" ];

From 37409b3b1a8d1a5f807dbd35c3e28cc32fa47a0e Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Sun, 8 Dec 2024 19:55:56 -0800
Subject: [PATCH 02/21] llvmPackages_git: 20.0.0-unstable-2024-11-26 ->
 20.0.0-unstable-2024-12-17

---
 pkgs/development/compilers/llvm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 606cb70dc3cc..e019f7d3c899 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -31,9 +31,9 @@ let
     "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE=";
     "19.1.5".officialRelease.sha256 = "sha256-QxQL4QwUH6e5HWpBvI8yIbZYBNwqqRsZqPH0w/JSiHQ=";
     "20.0.0-git".gitRelease = {
-      rev = "eb5cda480d2ad81230b2aa3e134e2b603ff90a1c";
-      rev-version = "20.0.0-unstable-2024-11-26";
-      sha256 = "sha256-8VbQINEZZqAIF4egMaNPd3/W3E3QmOXMl7WToftrebg=";
+      rev = "1ef5b987a464611a60e873650726b5e02fda0feb";
+      rev-version = "20.0.0-unstable-2024-12-17";
+      sha256 = "sha256-QCY9z9h3z5gPvwq6bNzAB5xFFStwOCfKh4VnWInhxU4=";
     };
   } // llvmVersions;
 

From f72b341556cf9438ecdc64de2973892387485531 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Sun, 8 Dec 2024 19:56:12 -0800
Subject: [PATCH 03/21] llvmPackages_git.libc: init

---
 .../compilers/llvm/common/default.nix         | 243 +++++++++---------
 .../compilers/llvm/common/libc/default.nix    |  95 +++++++
 .../compilers/llvm/common/libc/libc-shim.so   |   1 +
 pkgs/top-level/all-packages.nix               |   3 +
 4 files changed, 227 insertions(+), 115 deletions(-)
 create mode 100644 pkgs/development/compilers/llvm/common/libc/default.nix
 create mode 100644 pkgs/development/compilers/llvm/common/libc/libc-shim.so

diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix
index 102a43161e3d..383bc9cf1e20 100644
--- a/pkgs/development/compilers/llvm/common/default.nix
+++ b/pkgs/development/compilers/llvm/common/default.nix
@@ -1049,135 +1049,148 @@ let
           relative = "compiler-rt";
         });
     in
-    {
-      compiler-rt-libc = callPackage ./compiler-rt (
-        let
-          # temp rename to avoid infinite recursion
+    (
+      {
+        compiler-rt-libc = callPackage ./compiler-rt (
+          let
+            # temp rename to avoid infinite recursion
+            stdenv =
+              # Darwin needs to use a bootstrap stdenv to avoid an infinite recursion when cross-compiling.
+              if args.stdenv.hostPlatform.isDarwin then
+                overrideCC darwin.bootstrapStdenv buildLlvmTools.clangWithLibcAndBasicRtAndLibcxx
+              else if args.stdenv.hostPlatform.useLLVM or false then
+                overrideCC args.stdenv buildLlvmTools.clangWithLibcAndBasicRtAndLibcxx
+              else
+                args.stdenv;
+          in
+          {
+            patches = compiler-rtPatches;
+            inherit stdenv;
+          }
+          // lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+            libxcrypt = (libxcrypt.override { inherit stdenv; }).overrideAttrs (old: {
+              configureFlags = old.configureFlags ++ [ "--disable-symvers" ];
+            });
+          }
+        );
+
+        compiler-rt-no-libc = callPackage ./compiler-rt {
+          patches = compiler-rtPatches;
+          doFakeLibgcc = stdenv.hostPlatform.useLLVM or false;
           stdenv =
             # Darwin needs to use a bootstrap stdenv to avoid an infinite recursion when cross-compiling.
-            if args.stdenv.hostPlatform.isDarwin then
-              overrideCC darwin.bootstrapStdenv buildLlvmTools.clangWithLibcAndBasicRtAndLibcxx
-            else if args.stdenv.hostPlatform.useLLVM or false then
-              overrideCC args.stdenv buildLlvmTools.clangWithLibcAndBasicRtAndLibcxx
+            if stdenv.hostPlatform.isDarwin then
+              overrideCC darwin.bootstrapStdenv buildLlvmTools.clangNoLibcNoRt
             else
-              args.stdenv;
-        in
-        {
-          patches = compiler-rtPatches;
-          inherit stdenv;
-        }
-        // lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
-          libxcrypt = (libxcrypt.override { inherit stdenv; }).overrideAttrs (old: {
-            configureFlags = old.configureFlags ++ [ "--disable-symvers" ];
-          });
-        }
-      );
+              overrideCC stdenv buildLlvmTools.clangNoLibcNoRt;
+        };
 
-      compiler-rt-no-libc = callPackage ./compiler-rt {
-        patches = compiler-rtPatches;
-        doFakeLibgcc = stdenv.hostPlatform.useLLVM or false;
-        stdenv =
-          # Darwin needs to use a bootstrap stdenv to avoid an infinite recursion when cross-compiling.
-          if stdenv.hostPlatform.isDarwin then
-            overrideCC darwin.bootstrapStdenv buildLlvmTools.clangNoLibcNoRt
+        compiler-rt =
+          if
+            stdenv.hostPlatform.libc == null
+            # Building the with-libc compiler-rt and WASM doesn't yet work,
+            # because wasilibc doesn't provide some expected things. See
+            # compiler-rt's file for further details.
+            || stdenv.hostPlatform.isWasm
+            # Failing `#include <term.h>` in
+            # `lib/sanitizer_common/sanitizer_platform_limits_freebsd.cpp`
+            # sanitizers, not sure where to get it.
+            || stdenv.hostPlatform.isFreeBSD
+          then
+            libraries.compiler-rt-no-libc
           else
-            overrideCC stdenv buildLlvmTools.clangNoLibcNoRt;
-      };
+            libraries.compiler-rt-libc;
 
-      compiler-rt =
-        if
-          stdenv.hostPlatform.libc == null
-          # Building the with-libc compiler-rt and WASM doesn't yet work,
-          # because wasilibc doesn't provide some expected things. See
-          # compiler-rt's file for further details.
-          || stdenv.hostPlatform.isWasm
-          # Failing `#include <term.h>` in
-          # `lib/sanitizer_common/sanitizer_platform_limits_freebsd.cpp`
-          # sanitizers, not sure where to get it.
-          || stdenv.hostPlatform.isFreeBSD
-        then
-          libraries.compiler-rt-no-libc
-        else
-          libraries.compiler-rt-libc;
+        stdenv = overrideCC stdenv buildLlvmTools.clang;
 
-      stdenv = overrideCC stdenv buildLlvmTools.clang;
+        libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
 
-      libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
-
-      libcxx = callPackage ./libcxx (
-        {
-          patches = lib.optionals (lib.versionOlder metadata.release_version "16") (
-            lib.optional (lib.versions.major metadata.release_version == "15")
-              # See:
-              #   - https://reviews.llvm.org/D133566
-              #   - https://github.com/NixOS/nixpkgs/issues/214524#issuecomment-1429146432
-              # !!! Drop in LLVM 16+
-              (
-                fetchpatch {
-                  url = "https://github.com/llvm/llvm-project/commit/57c7bb3ec89565c68f858d316504668f9d214d59.patch";
-                  hash = "sha256-B07vHmSjy5BhhkGSj3e1E0XmMv5/9+mvC/k70Z29VwY=";
-                }
-              )
-            ++ [
-              (substitute {
-                src = ./libcxxabi/wasm.patch;
+        libcxx = callPackage ./libcxx (
+          {
+            patches = lib.optionals (lib.versionOlder metadata.release_version "16") (
+              lib.optional (lib.versions.major metadata.release_version == "15")
+                # See:
+                #   - https://reviews.llvm.org/D133566
+                #   - https://github.com/NixOS/nixpkgs/issues/214524#issuecomment-1429146432
+                # !!! Drop in LLVM 16+
+                (
+                  fetchpatch {
+                    url = "https://github.com/llvm/llvm-project/commit/57c7bb3ec89565c68f858d316504668f9d214d59.patch";
+                    hash = "sha256-B07vHmSjy5BhhkGSj3e1E0XmMv5/9+mvC/k70Z29VwY=";
+                  }
+                )
+              ++ [
+                (substitute {
+                  src = ./libcxxabi/wasm.patch;
+                  substitutions = [
+                    "--replace-fail"
+                    "/cmake/"
+                    "/llvm/cmake/"
+                  ];
+                })
+              ]
+              ++ lib.optional stdenv.hostPlatform.isMusl (substitute {
+                src = ./libcxx/libcxx-0001-musl-hacks.patch;
                 substitutions = [
                   "--replace-fail"
-                  "/cmake/"
-                  "/llvm/cmake/"
+                  "/include/"
+                  "/libcxx/include/"
                 ];
               })
-            ]
-            ++ lib.optional stdenv.hostPlatform.isMusl (substitute {
-              src = ./libcxx/libcxx-0001-musl-hacks.patch;
-              substitutions = [
-                "--replace-fail"
-                "/include/"
-                "/libcxx/include/"
-              ];
-            })
-          );
-          stdenv =
-            if stdenv.hostPlatform.isDarwin then
-              overrideCC darwin.bootstrapStdenv buildLlvmTools.clangWithLibcAndBasicRt
-            else
-              overrideCC stdenv buildLlvmTools.clangWithLibcAndBasicRt;
-        }
-        // lib.optionalAttrs (lib.versionOlder metadata.release_version "14") {
-          # TODO: remove this, causes LLVM 13 packages rebuild.
-          inherit (metadata) monorepoSrc; # Preserve bug during #307211 refactor.
-        }
-      );
-
-      libunwind = callPackage ./libunwind {
-        patches = lib.optional (lib.versionOlder metadata.release_version "17") (
-          metadata.getVersionFile "libunwind/gnu-install-dirs.patch"
+            );
+            stdenv =
+              if stdenv.hostPlatform.isDarwin then
+                overrideCC darwin.bootstrapStdenv buildLlvmTools.clangWithLibcAndBasicRt
+              else
+                overrideCC stdenv buildLlvmTools.clangWithLibcAndBasicRt;
+          }
+          // lib.optionalAttrs (lib.versionOlder metadata.release_version "14") {
+            # TODO: remove this, causes LLVM 13 packages rebuild.
+            inherit (metadata) monorepoSrc; # Preserve bug during #307211 refactor.
+          }
         );
-        stdenv = overrideCC stdenv buildLlvmTools.clangWithLibcAndBasicRt;
-      };
 
-      openmp = callPackage ./openmp {
-        patches =
-          lib.optional (
-            lib.versionAtLeast metadata.release_version "15" && lib.versionOlder metadata.release_version "19"
-          ) (metadata.getVersionFile "openmp/fix-find-tool.patch")
-          ++ lib.optional (
-            lib.versionAtLeast metadata.release_version "14" && lib.versionOlder metadata.release_version "18"
-          ) (metadata.getVersionFile "openmp/gnu-install-dirs.patch")
-          ++ lib.optional (lib.versionAtLeast metadata.release_version "14") (
-            metadata.getVersionFile "openmp/run-lit-directly.patch"
-          )
-          ++
-            lib.optional (lib.versionOlder metadata.release_version "14")
-              # Fix cross.
-              (
-                fetchpatch {
-                  url = "https://github.com/llvm/llvm-project/commit/5e2358c781b85a18d1463fd924d2741d4ae5e42e.patch";
-                  hash = "sha256-UxIlAifXnexF/MaraPW0Ut6q+sf3e7y1fMdEv1q103A=";
-                }
-              );
-      };
-    }
+        libunwind = callPackage ./libunwind {
+          patches = lib.optional (lib.versionOlder metadata.release_version "17") (
+            metadata.getVersionFile "libunwind/gnu-install-dirs.patch"
+          );
+          stdenv = overrideCC stdenv buildLlvmTools.clangWithLibcAndBasicRt;
+        };
+
+        openmp = callPackage ./openmp {
+          patches =
+            lib.optional (
+              lib.versionAtLeast metadata.release_version "15" && lib.versionOlder metadata.release_version "19"
+            ) (metadata.getVersionFile "openmp/fix-find-tool.patch")
+            ++ lib.optional (
+              lib.versionAtLeast metadata.release_version "14" && lib.versionOlder metadata.release_version "18"
+            ) (metadata.getVersionFile "openmp/gnu-install-dirs.patch")
+            ++ lib.optional (lib.versionAtLeast metadata.release_version "14") (
+              metadata.getVersionFile "openmp/run-lit-directly.patch"
+            )
+            ++
+              lib.optional (lib.versionOlder metadata.release_version "14")
+                # Fix cross.
+                (
+                  fetchpatch {
+                    url = "https://github.com/llvm/llvm-project/commit/5e2358c781b85a18d1463fd924d2741d4ae5e42e.patch";
+                    hash = "sha256-UxIlAifXnexF/MaraPW0Ut6q+sf3e7y1fMdEv1q103A=";
+                  }
+                );
+        };
+      }
+      // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "20") {
+        libc-overlay = callPackage ./libc {
+          isFullBuild = false;
+        };
+
+        libc-full = callPackage ./libc {
+          isFullBuild = true;
+        };
+
+        libc = if stdenv.targetPlatform.libc == "llvm" then libraries.libc-full else libraries.libc-overlay;
+      }
+    )
   );
 
   noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ];
diff --git a/pkgs/development/compilers/llvm/common/libc/default.nix b/pkgs/development/compilers/llvm/common/libc/default.nix
new file mode 100644
index 000000000000..eecae81bb433
--- /dev/null
+++ b/pkgs/development/compilers/llvm/common/libc/default.nix
@@ -0,0 +1,95 @@
+{
+  lib,
+  stdenv,
+  llvm_meta,
+  src ? null,
+  monorepoSrc ? null,
+  version,
+  release_version,
+  runCommand,
+  python3,
+  python3Packages,
+  patches ? [ ],
+  cmake,
+  ninja,
+  isFullBuild ? true,
+  linuxHeaders,
+}:
+let
+  pname = "libc";
+
+  src' = runCommand "${pname}-src-${version}" { } (''
+    mkdir -p "$out"
+    cp -r ${monorepoSrc}/cmake "$out"
+    cp -r ${monorepoSrc}/runtimes "$out"
+    cp -r ${monorepoSrc}/llvm "$out"
+    cp -r ${monorepoSrc}/${pname} "$out"
+  '');
+
+  stdenv' =
+    if stdenv.cc.isClang then
+      stdenv.override {
+        cc = stdenv.cc.override {
+          nixSupport = stdenv.cc.nixSupport // {
+            cc-cflags = lib.remove "-lunwind" stdenv.cc.nixSupport.cc-cflags;
+          };
+        };
+      }
+    else
+      stdenv;
+in
+stdenv'.mkDerivation (finalAttrs: {
+  inherit pname version patches;
+
+  src = src';
+
+  sourceRoot = "${finalAttrs.src.name}/runtimes";
+
+  nativeBuildInputs =
+    [
+      cmake
+      python3
+    ]
+    ++ (lib.optional (lib.versionAtLeast release_version "15") ninja)
+    ++ (lib.optional isFullBuild python3Packages.pyyaml);
+
+  buildInputs = lib.optional isFullBuild linuxHeaders;
+
+  outputs = [ "out" ] ++ (lib.optional isFullBuild "dev");
+
+  postUnpack = lib.optionalString isFullBuild ''
+    patchShebangs $sourceRoot/../$pname/hdrgen/yaml_to_classes.py
+    chmod +x $sourceRoot/../$pname/hdrgen/yaml_to_classes.py
+  '';
+
+  prePatch = ''
+    cd ../${finalAttrs.pname}
+    chmod -R u+w ../
+  '';
+
+  postPatch = ''
+    cd ../runtimes
+  '';
+
+  postInstall = lib.optionalString (!isFullBuild) ''
+    substituteAll ${./libc-shim.so} $out/lib/libc.so
+  '';
+
+  libc = if (!isFullBuild) then stdenv.cc.libc else null;
+
+  cmakeFlags = [
+    (lib.cmakeBool "LLVM_LIBC_FULL_BUILD" isFullBuild)
+    (lib.cmakeFeature "LLVM_ENABLE_RUNTIMES" "libc")
+  ];
+
+  # For the update script:
+  passthru = {
+    monorepoSrc = monorepoSrc;
+    inherit isFullBuild;
+  };
+
+  meta = llvm_meta // {
+    homepage = "https://libc.llvm.org/";
+    description = "Standard C library for LLVM";
+  };
+})
diff --git a/pkgs/development/compilers/llvm/common/libc/libc-shim.so b/pkgs/development/compilers/llvm/common/libc/libc-shim.so
new file mode 100644
index 000000000000..f3beea87680d
--- /dev/null
+++ b/pkgs/development/compilers/llvm/common/libc/libc-shim.so
@@ -0,0 +1 @@
+GROUP (@libc@ @out@/lib/libllvmlibc.a)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a694f39b4b93..7751d432be15 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9163,6 +9163,9 @@ with pkgs;
     else if name == "nblibc" then targetPackages.netbsd.libc or netbsd.libc
     else if name == "wasilibc" then targetPackages.wasilibc or wasilibc
     else if name == "relibc" then targetPackages.relibc or relibc
+    else if name == "llvm" then
+      # Use llvmPackages_git until LLVM 20 is the default.
+      targetPackages.llvmPackages_git.libc or llvmPackages_git.libc
     else throw "Unknown libc ${name}";
 
   libcCross =

From 5ba5cf99817b6079fab6dddcab1712051230d53d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= <git@viraptor.info>
Date: Tue, 7 Jan 2025 21:30:07 +1100
Subject: [PATCH 04/21] cubicsdr: fix Darwin build

---
 pkgs/applications/radio/cubicsdr/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/radio/cubicsdr/default.nix b/pkgs/applications/radio/cubicsdr/default.nix
index 2fe9dffa6f8b..a6608f926967 100644
--- a/pkgs/applications/radio/cubicsdr/default.nix
+++ b/pkgs/applications/radio/cubicsdr/default.nix
@@ -62,6 +62,10 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DUSE_HAMLIB=ON" ] ++ lib.optional enableDigitalLab "-DENABLE_DIGITAL_LAB=ON";
 
+  postFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    install_name_tool -change libliquid.dylib ${lib.getLib liquid-dsp}/lib/libliquid.dylib ''${out}/bin/CubicSDR
+  '';
+
   meta = with lib; {
     homepage = "https://cubicsdr.com";
     description = "Software Defined Radio application";

From 41b14024d24bd7488b58d7a252f8f16b194d57f9 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Wed, 25 Dec 2024 11:22:29 -0800
Subject: [PATCH 05/21] pkgs/top-level/stage.nix: add pkgsLLVMLibc

---
 lib/systems/default.nix                       |  1 +
 lib/systems/inspect.nix                       |  1 +
 lib/systems/parse.nix                         |  3 +++
 pkgs/top-level/release-attrpaths-superset.nix |  1 +
 pkgs/top-level/release.nix                    |  1 +
 pkgs/top-level/stage.nix                      | 17 +++++++++++++++++
 6 files changed, 24 insertions(+)

diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index 00f7f3523aa4..ec0106a13dac 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -102,6 +102,7 @@ let
         else if final.isMusl                  then "musl"
         else if final.isUClibc                then "uclibc"
         else if final.isAndroid               then "bionic"
+        else if final.isLLVMLibc              then "llvm"
         else if final.isLinux  /* default */  then "glibc"
         else if final.isFreeBSD               then "fblibc"
         else if final.isOpenBSD               then "oblibc"
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index ebc7ab366876..de4df13cd811 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -113,6 +113,7 @@ rec {
     isGnu          = with abis; map (a: { abi = a; }) [ gnuabi64 gnuabin32 gnu gnueabi gnueabihf gnuabielfv1 gnuabielfv2 ];
     isMusl         = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf muslabin32 muslabi64 ];
     isUClibc       = with abis; map (a: { abi = a; }) [ uclibc uclibceabi uclibceabihf ];
+    isLLVMLibc     = [ { abi = abis.llvm; } ];
 
     isEfi = [
       { cpu = { family = "arm"; version = "6"; }; }
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index fa3cc02647ae..e3e6ef16c6b0 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -416,6 +416,9 @@ rec {
     uclibceabihf = { float = "hard"; };
     uclibc       = {};
 
+    # LLVM libc
+    llvm         = {};
+
     unknown = {};
   };
 
diff --git a/pkgs/top-level/release-attrpaths-superset.nix b/pkgs/top-level/release-attrpaths-superset.nix
index 9a89062bd174..c306a64be585 100644
--- a/pkgs/top-level/release-attrpaths-superset.nix
+++ b/pkgs/top-level/release-attrpaths-superset.nix
@@ -50,6 +50,7 @@ let
 
     # cross packagesets
     pkgsLLVM = true;
+    pkgsLLVMLibc = true;
     pkgsMusl = true;
     pkgsStatic = true;
     pkgsCross = true;
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 0140f0bd9d6a..167e546654b5 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -341,6 +341,7 @@ let
       agdaPackages = packagePlatforms pkgs.agdaPackages;
 
       pkgsLLVM.stdenv = [ "x86_64-linux" "aarch64-linux" ];
+      pkgsLLVMLibc.stdenv = [ "x86_64-linux" "aarch64-linux" ];
       pkgsArocc.stdenv = [ "x86_64-linux" "aarch64-linux" ];
       pkgsZig.stdenv = [ "x86_64-linux" "aarch64-linux" ];
       pkgsMusl.stdenv = [ "x86_64-linux" "aarch64-linux" ];
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index 1cedd8dd1845..64bc2308f6da 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -98,6 +98,10 @@ let
           or lib.systems.parse.abis.musl;
       });
 
+  makeLLVMParsedPlatform = parsed:
+    (parsed // {
+      abi = lib.systems.parse.abis.llvm;
+    });
 
   stdenvAdapters = self: super:
     let
@@ -207,6 +211,19 @@ let
       };
     };
 
+    pkgsLLVMLibc = nixpkgsFun {
+      overlays = [ (self': super': {
+        pkgsLLVMLibc = super';
+      })] ++ overlays;
+      # Bootstrap a cross stdenv using LLVM libc.
+      # This is currently not possible when compiling natively,
+      # so we don't need to check hostPlatform != buildPlatform.
+      crossSystem = stdenv.hostPlatform // {
+        config = lib.systems.parse.tripleFromSystem (makeLLVMParsedPlatform stdenv.hostPlatform.parsed);
+        libc = "llvm";
+      };
+    };
+
     pkgsArocc = nixpkgsFun {
       overlays = [
         (self': super': {

From 2ea0fa877dcf8cf07492ac662ddc194b50c9d66e Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Sun, 12 Jan 2025 14:33:33 +0100
Subject: [PATCH 06/21] calibre: 7.22.0 -> 7.24.0

---
 pkgs/by-name/ca/calibre/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ca/calibre/package.nix b/pkgs/by-name/ca/calibre/package.nix
index e1abe756d198..2d1ca03a1177 100644
--- a/pkgs/by-name/ca/calibre/package.nix
+++ b/pkgs/by-name/ca/calibre/package.nix
@@ -35,11 +35,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "calibre";
-  version = "7.22.0";
+  version = "7.24.0";
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz";
-    hash = "sha256-RmCte6tok0F/ts5cacAFBksNYfnLylY4JCmTyb+6IUk=";
+    hash = "sha256-ftqi6ANY/w4CdcMUAzRn9GOpNbSz36mnNcGHv8ffKbQ=";
   };
 
   patches = [

From 9ae82639dd42751909324b7d6090fb957a800ad3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jan 2025 11:02:51 +0000
Subject: [PATCH 07/21] immich-public-proxy: 1.5.6 -> 1.6.2

---
 pkgs/by-name/im/immich-public-proxy/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/im/immich-public-proxy/package.nix b/pkgs/by-name/im/immich-public-proxy/package.nix
index 8493dc1c4304..3eab12672646 100644
--- a/pkgs/by-name/im/immich-public-proxy/package.nix
+++ b/pkgs/by-name/im/immich-public-proxy/package.nix
@@ -8,17 +8,17 @@
 }:
 buildNpmPackage rec {
   pname = "immich-public-proxy";
-  version = "1.5.6";
+  version = "1.6.2";
   src = fetchFromGitHub {
     owner = "alangrainger";
     repo = "immich-public-proxy";
     tag = "v${version}";
-    hash = "sha256-nAXSlzMJNx7QjdHr/Ax8RAcWVcsMgBLbBO0CqpWCsvA=";
+    hash = "sha256-R2w11AdOgcV1R1eIzDgt+yexWwystDNJiJ+14MH6WtU=";
   };
 
   sourceRoot = "${src.name}/app";
 
-  npmDepsHash = "sha256-rtDd8Gadi3OrnM34Sr2FG6htYeh2G0cYDcv/hKk1TIw=";
+  npmDepsHash = "sha256-VXCJ0VaAKOlz342saRAnb1MLZGgIZwPpy/2oS/Gvsj8=";
 
   # patch in absolute nix store paths so the process doesn't need to cwd in $out
   postPatch = ''

From 30538082b29abfe58c060e646169f48d9279cbb0 Mon Sep 17 00:00:00 2001
From: a-kenji <aks.kenji@protonmail.com>
Date: Wed, 15 Jan 2025 13:47:03 +0100
Subject: [PATCH 08/21] cosmic-workspaces-epoch: 1.0.0-alpha.2 ->
 1.0.0-alpha.5.1

---
 pkgs/by-name/co/cosmic-workspaces-epoch/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
index e487328a1f2f..d750cff7e77f 100644
--- a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
+++ b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
@@ -13,17 +13,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cosmic-workspaces-epoch";
-  version = "1.0.0-alpha.2";
+  version = "1.0.0-alpha.5.1";
 
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-workspaces-epoch";
     rev = "epoch-${version}";
-    hash = "sha256-z3xQ6Vgqkm8hYLo2550NbFRkTMRQ0F9zn85iobnykH5=";
+    hash = "sha256-lAK7DZWwNMr30u6Uopew9O/6FIG6e2SgcdA+cD/K5Ok=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-QRBgFTXPWQ0RCSfCA2WpBs+vKTFD7Xfz60cIDtbYb5Y=";
+  cargoHash = "sha256-w1lQdzy2mJ5NfqngvOLqFCxyhWgvIySDDXCCtCCtTjg=";
 
   separateDebugInfo = true;
 

From 765478f52fca03e545e3021d55e4d53dc0347c4d Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Tue, 14 Jan 2025 17:01:07 -0700
Subject: [PATCH 09/21] cosmic-player: init at unstable-2025-01-14

---
 pkgs/by-name/co/cosmic-player/package.nix | 110 ++++++++++++++++++++++
 1 file changed, 110 insertions(+)
 create mode 100644 pkgs/by-name/co/cosmic-player/package.nix

diff --git a/pkgs/by-name/co/cosmic-player/package.nix b/pkgs/by-name/co/cosmic-player/package.nix
new file mode 100644
index 000000000000..a0b387249ea0
--- /dev/null
+++ b/pkgs/by-name/co/cosmic-player/package.nix
@@ -0,0 +1,110 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  alsa-lib,
+  ffmpeg,
+  glib,
+  gst_all_1,
+  just,
+  pkg-config,
+  libxkbcommon,
+  stdenv,
+  cosmic-icons,
+  libglvnd,
+  libgbm,
+  wayland,
+  xorg,
+  vulkan-loader,
+  makeBinaryWrapper,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "cosmic-player";
+  version = "1.0.0-alpha.5.1";
+
+  src = fetchFromGitHub {
+    owner = "pop-os";
+    repo = pname;
+    rev = "epoch-${version}";
+    hash = "sha256-IgMFKtuMAfRtbxunwrwRzFi/0PcSMWhx33uJcxiAHhI=";
+  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-VSUv4yV54fzWPhxZV/EjBrkx7tTLo6vfSHNiluWnn9A=";
+
+  postPatch = ''
+    substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)"
+  '';
+
+  nativeBuildInputs = [
+    just
+    pkg-config
+    makeBinaryWrapper
+  ];
+
+  # Largely based on lilyinstarlight's work linked below
+  # https://github.com/lilyinstarlight/nixos-cosmic/blob/main/pkgs/cosmic-player/package.nix
+
+  buildInputs = [
+    alsa-lib
+    ffmpeg
+    glib
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
+    gst_all_1.gst-plugins-bad
+    libxkbcommon
+    libgbm
+    wayland
+    vulkan-loader
+    xorg.libX11
+    libglvnd
+  ];
+
+  dontUseJustBuild = true;
+
+  justFlags = [
+    "--set"
+    "prefix"
+    (placeholder "out")
+    "--set"
+    "bin-src"
+    "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-player"
+  ];
+
+  # Force linking to libEGL, which is always dlopen()ed, and to
+  # libwayland-client, which is always dlopen()ed except by the
+  # obscure winit backend.
+  RUSTFLAGS = map (a: "-C link-arg=${a}") [
+    "-Wl,--push-state,--no-as-needed"
+    "-lEGL"
+    "-lwayland-client"
+    "-Wl,--pop-state"
+  ];
+
+  # LD_LIBRARY_PATH can be removed once tiny-xlib is bumped above 0.2.2
+  postInstall = ''
+    wrapProgram "$out/bin/cosmic-player" \
+      --suffix XDG_DATA_DIRS : "${cosmic-icons}/share" \
+      --prefix LD_LIBRARY_PATH : ${
+        lib.makeLibraryPath [
+          xorg.libX11
+          xorg.libXcursor
+          xorg.libXi
+          vulkan-loader
+          libxkbcommon
+          wayland
+        ]
+      }
+  '';
+
+  meta = {
+    homepage = "https://github.com/pop-os/cosmic-player";
+    description = "Media player for the COSMIC Desktop Environment";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ ahoneybun ];
+    platforms = lib.platforms.linux;
+    mainProgram = "cosmic-player";
+  };
+}

From 666e3267850998efd257c660d67a156c41c8ab10 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Thu, 16 Jan 2025 21:19:32 -0800
Subject: [PATCH 10/21] alsa-lib: fix building with llvm

---
 pkgs/by-name/al/alsa-lib/package.nix | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/al/alsa-lib/package.nix b/pkgs/by-name/al/alsa-lib/package.nix
index 21234c648375..f21d216a63bb 100644
--- a/pkgs/by-name/al/alsa-lib/package.nix
+++ b/pkgs/by-name/al/alsa-lib/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
   alsa-topology-conf,
   alsa-ucm-conf,
   testers,
@@ -16,13 +17,24 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-jE/zdVPL6JYY4Yfkx3n3GpuyqLJ7kfh+1AmHzJIz2PY=";
   };
 
-  patches = [
-    # Add a "libs" field to the syntax recognized in the /etc/asound.conf file.
-    # The nixos modules for pulseaudio, jack, and pipewire are leveraging this
-    # "libs" field to declare locations for both native and 32bit plugins, in
-    # order to support apps with 32bit sound running on x86_64 architecture.
-    ./alsa-plugin-conf-multilib.patch
-  ];
+  patches =
+    [
+      # Add a "libs" field to the syntax recognized in the /etc/asound.conf file.
+      # The nixos modules for pulseaudio, jack, and pipewire are leveraging this
+      # "libs" field to declare locations for both native and 32bit plugins, in
+      # order to support apps with 32bit sound running on x86_64 architecture.
+      ./alsa-plugin-conf-multilib.patch
+    ]
+    ++ lib.optional (stdenv.hostPlatform.useLLVM or false)
+      # Fixes version script under LLVM, should be fixed in the next update.
+      # Check if "pkgsLLVM.alsa-lib" builds on next version bump and remove this
+      # if it succeeds.
+      (
+        fetchurl {
+          url = "https://github.com/alsa-project/alsa-lib/commit/76edab4e595bd5f3f4c636cccc8d7976d3c519d6.patch";
+          hash = "sha256-WCOXfe0/PPZRMXdNa29Jn28S2r0PQ7iTsabsxZVSwnk=";
+        }
+      );
 
   enableParallelBuilding = true;
 

From 4924685d4abef488aded8d51cfc301c400ba4f44 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Jan 2025 00:46:16 +0000
Subject: [PATCH 11/21] dillo: 3.1.1 -> 3.2.0

---
 pkgs/by-name/di/dillo/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/di/dillo/package.nix b/pkgs/by-name/di/dillo/package.nix
index 2574e362fd7b..7b65c4fc9c1d 100644
--- a/pkgs/by-name/di/dillo/package.nix
+++ b/pkgs/by-name/di/dillo/package.nix
@@ -31,13 +31,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "dillo";
-  version = "3.1.1";
+  version = "3.2.0";
 
   src = fetchFromGitHub {
     owner = "dillo-browser";
     repo = "dillo";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-bGIOYONMtIN4IhSobOeSLiRDR13mo4W/DBX4kQ2S+hg=";
+    hash = "sha256-9nJq20iW8/UI3GgXWje+46WDSu3/omd1PN/uTlYCOac=";
   };
 
   nativeBuildInputs = [

From b96bce0598349bcf6210db7a5c9275400861843b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 7 Jan 2025 14:03:36 -0800
Subject: [PATCH 12/21] immich: 1.123.0 -> 1.124.2

Diff: https://github.com/immich-app/immich/compare/refs/tags/v1.123.0...v1.124.2

Changelog: https://github.com/immich-app/immich/releases/tag/v1.124.0
           https://github.com/immich-app/immich/releases/tag/v1.124.1
           https://github.com/immich-app/immich/releases/tag/v1.124.2
---
 pkgs/by-name/im/immich/package.nix  | 18 ++++++++++++------
 pkgs/by-name/im/immich/sources.json | 24 ++++++++++++------------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix
index a2c1f6a55864..759925c0e451 100644
--- a/pkgs/by-name/im/immich/package.nix
+++ b/pkgs/by-name/im/immich/package.nix
@@ -5,7 +5,7 @@
   fetchFromGitHub,
   fetchpatch2,
   python3,
-  nodejs_20,
+  nodejs,
   node-gyp,
   runCommand,
   nixosTests,
@@ -27,7 +27,6 @@
   vips,
 }:
 let
-  nodejs = nodejs_20;
   buildNpmPackage' = buildNpmPackage.override { inherit nodejs; };
   sources = lib.importJSON ./sources.json;
   inherit (sources) version;
@@ -132,12 +131,12 @@ let
 
   node-addon-api = stdenvNoCC.mkDerivation rec {
     pname = "node-addon-api";
-    version = "8.0.0";
+    version = "8.3.0";
     src = fetchFromGitHub {
       owner = "nodejs";
       repo = "node-addon-api";
       tag = "v${version}";
-      hash = "sha256-k3v8lK7uaEJvcaj1sucTjFZ6+i5A6w/0Uj9rYlPhjCE=";
+      hash = "sha256-7KkJkMNX352XnWTOC6mJB+IcFrda20UENcNwoXWDm+s=";
     };
     installPhase = ''
       mkdir $out
@@ -181,7 +180,15 @@ buildNpmPackage' {
   # Required because vips tries to write to the cache dir
   makeCacheWritable = true;
 
+  # we manually build sharp from source later on
+  # FIXME figure out why otherwise it fails with
+  #     error: 'NewOrCopy' is not a member of 'Napi::Buffer<char>'
+  env.SHARP_IGNORE_GLOBAL_LIBVIPS = 1;
+
   preBuild = ''
+    unset SHARP_IGNORE_GLOBAL_LIBVIPS
+    export SHARP_FORCE_GLOBAL_LIBVIPS=1
+
     pushd node_modules/sharp
 
     mkdir node_modules
@@ -205,8 +212,7 @@ buildNpmPackage' {
     npm prune --omit=dev
 
     # remove build artifacts that bloat the closure
-    rm -r node_modules/bcrypt/{build-tmp-napi-v3,node_modules/node-addon-api,src,test}
-    rm -r node_modules/msgpackr-extract/build
+    rm -r node_modules/**/{*.target.mk,binding.Makefile,config.gypi,Makefile,Release/.deps}
 
     mkdir -p $out/build
     mv package.json package-lock.json node_modules dist resources $out/
diff --git a/pkgs/by-name/im/immich/sources.json b/pkgs/by-name/im/immich/sources.json
index e21f0c0c1cb7..27ea111b151d 100644
--- a/pkgs/by-name/im/immich/sources.json
+++ b/pkgs/by-name/im/immich/sources.json
@@ -1,26 +1,26 @@
 {
-  "version": "1.123.0",
-  "hash": "sha256-qzNujf8zRtml57EmyPu0qY0dbswcLhPSHOuGRkSXtVY=",
+  "version": "1.124.2",
+  "hash": "sha256-EIp1KH2sNvEiB3wl6m0IiAUyDwBETgKlSXCrIsw73Oo=",
   "components": {
     "cli": {
-      "npmDepsHash": "sha256-L94vKYmNWO3IcJh+ZtJ2EBz6h3G9jeyqyw44tto8bQ0=",
-      "version": "2.2.37"
+      "npmDepsHash": "sha256-k3sA4OcjlvzMMI2GsUYks2fIj7LG89H3OX4vTZOCIOo=",
+      "version": "2.2.40"
     },
     "server": {
-      "npmDepsHash": "sha256-JUFeaaT4uqyff48nDMrlvC8maU+BjwNU3xcOOR1f8F4=",
-      "version": "1.123.0"
+      "npmDepsHash": "sha256-O0XqMOUYy7VdumDDbSenMy22lgZLCDy/GpaSVNs+k4I=",
+      "version": "1.124.2"
     },
     "web": {
-      "npmDepsHash": "sha256-eq+VJVBZGVoMgAjdp/F+bu24cHSneAoTWpeft59Gig8=",
-      "version": "1.123.0"
+      "npmDepsHash": "sha256-f3p0HT7l3hXFEo+8AvKEn8QvH6KOTMGZOvaOAPxv3Kc=",
+      "version": "1.124.2"
     },
     "open-api/typescript-sdk": {
-      "npmDepsHash": "sha256-n5B0fKRhDTrobT7SGUAMqsWSkHW4pEYRVzlMqAyfJwk=",
-      "version": "1.123.0"
+      "npmDepsHash": "sha256-uk4Gfs10TIsbD4VdHt7a9Fub8PcT6R8ksfvnOLFs/Zo=",
+      "version": "1.124.2"
     },
     "geonames": {
-      "timestamp": "20241217171200",
-      "hash": "sha256-A21TooXLWSmCW4NaYq+2juaNlAmzTT76ZwtF5NcJcLU="
+      "timestamp": "20250108222614",
+      "hash": "sha256-gCi0iFQplv4XizDi9DYEVekFFe46DM4X2YiPSe7ugR4="
     }
   }
 }

From 168e0b20e2cc44aeede1d2ed248f3822b8a5164f Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Sun, 19 Jan 2025 11:43:24 +0100
Subject: [PATCH 13/21] keep-sorted: 0.5.1 -> 0.6.0

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/by-name/ke/keep-sorted/package.nix | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ke/keep-sorted/package.nix b/pkgs/by-name/ke/keep-sorted/package.nix
index 66feb489e9ec..419d863bd54a 100644
--- a/pkgs/by-name/ke/keep-sorted/package.nix
+++ b/pkgs/by-name/ke/keep-sorted/package.nix
@@ -1,23 +1,30 @@
 {
   lib,
-  buildGo123Module,
+  buildGoModule,
   fetchFromGitHub,
   nix-update-script,
+  versionCheckHook,
 }:
 
-buildGo123Module rec {
+buildGoModule rec {
   pname = "keep-sorted";
-  version = "0.5.1";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "keep-sorted";
-    rev = "v${version}";
-    hash = "sha256-xvSEREEOiwft3fPN+xtdMCh+z3PknjJ962Nb+pw715U=";
+    tag = "v${version}";
+    hash = "sha256-ROvj7w8YMq6+ntx0SWi+HfN4sO6d7RjKWwlb/9gfz8w=";
   };
 
   vendorHash = "sha256-HTE9vfjRmi5GpMue7lUfd0jmssPgSOljbfPbya4uGsc=";
 
+  # Inject version string instead of reading version from buildinfo.
+  postPatch = ''
+    substituteInPlace main.go \
+      --replace-fail 'readVersion())' '"v${version}")'
+  '';
+
   env.CGO_ENABLED = "0";
 
   ldflags = [ "-s" ];
@@ -27,6 +34,10 @@ buildGo123Module rec {
     rm goldens/*_test.go
   '';
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  doInstallCheck = true;
+
   passthru.updateScript = nix-update-script { };
 
   meta = {

From 51fcd2759e918214f3aa04d5f0970ce60a9650b2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Jan 2025 12:39:28 +0000
Subject: [PATCH 14/21] doublecmd: 1.1.21 -> 1.1.22

---
 pkgs/by-name/do/doublecmd/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/do/doublecmd/package.nix b/pkgs/by-name/do/doublecmd/package.nix
index 59ed74b6422a..3740c3968bf6 100644
--- a/pkgs/by-name/do/doublecmd/package.nix
+++ b/pkgs/by-name/do/doublecmd/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "doublecmd";
-  version = "1.1.21";
+  version = "1.1.22";
 
   src = fetchFromGitHub {
     owner = "doublecmd";
     repo = "doublecmd";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-NsjsjCSPbo7zwejmOjFRuQpcMyGZEY67hyStjtMrIGk=";
+    hash = "sha256-PyAmGYWA7QZcD7SN2utHacwqm8PQy8VxuVxAXlR7tj4=";
   };
 
   nativeBuildInputs = [

From 286f86ce466ad48632309340c26423eaa83e1dc1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Jan 2025 14:52:21 +0000
Subject: [PATCH 15/21] responsively-app: 1.15.0 -> 1.16.0

---
 pkgs/by-name/re/responsively-app/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/re/responsively-app/package.nix b/pkgs/by-name/re/responsively-app/package.nix
index bcceee1f6f71..f7fbe7c8dc9c 100644
--- a/pkgs/by-name/re/responsively-app/package.nix
+++ b/pkgs/by-name/re/responsively-app/package.nix
@@ -6,11 +6,11 @@
 
 appimageTools.wrapType2 rec {
   pname = "responsively-app";
-  version = "1.15.0";
+  version = "1.16.0";
 
   src = fetchurl {
     url = "https://github.com/responsively-org/responsively-app-releases/releases/download/v${version}/ResponsivelyApp-${version}.AppImage";
-    hash = "sha256-BkljY8Il45A2JbsLgQbjsxCy0lnFZvtpc5HzvI1nwWk=";
+    hash = "sha256-r0wznN+7zZXKNFNFUV4hm2e4gd84M6hVcun4OfNEeSw=";
   };
 
   appimageContents = appimageTools.extract {

From 24750d9cadba28f89767aa28ada3a41a7bcb63ae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Jan 2025 17:42:38 +0000
Subject: [PATCH 16/21] dbeaver-bin: 24.3.2 -> 24.3.3

---
 pkgs/by-name/db/dbeaver-bin/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix
index 5a53d5cf6d12..64866f90bf5b 100644
--- a/pkgs/by-name/db/dbeaver-bin/package.nix
+++ b/pkgs/by-name/db/dbeaver-bin/package.nix
@@ -17,7 +17,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "dbeaver-bin";
-  version = "24.3.2";
+  version = "24.3.3";
 
   src =
     let
@@ -30,10 +30,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
         aarch64-darwin = "macos-aarch64.dmg";
       };
       hash = selectSystem {
-        x86_64-linux = "sha256-kbpdAA/ZmH1f+MEfozyjr8HTKLhWEhswAGc7iSpy9rE=";
-        aarch64-linux = "sha256-SiNriPbyiMeHZSHab3JwyedURogPjI9McXwJqjpZXiA=";
-        x86_64-darwin = "sha256-cBJvElGfuCbyFRXzqcuQRa4GA6nXmEDxtse388FuH30=";
-        aarch64-darwin = "sha256-kzJeKY7V8CBcdsoDZDI9eBrr1hEWh3vyHI3wgos/s/M=";
+        x86_64-linux = "sha256-vj9C12bGJbWjmcjp2jVyvLmLHYdLjbEU0SVvevhkd4A=";
+        aarch64-linux = "sha256-vQArRJZvf38JEfDBNE4GfemddM4M1ar7RojXNTb6YaU=";
+        x86_64-darwin = "sha256-r+CLBy4zetjPXDzm6abQqY8IvE0UfROg5Ga0nIrb9oc=";
+        aarch64-darwin = "sha256-W8NAs5Z8Ogl1uv2zngi4A4viBL51izsv7ksS7gygh9I=";
       };
     in
     fetchurl {

From ebc7c892719b1684563f116c304d08b8c6ed385d Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Sun, 19 Jan 2025 15:13:27 -0500
Subject: [PATCH 17/21] doc: Fix typo in python docs (extras_requires ->
 extras_require)

---
 doc/languages-frameworks/python.section.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index 8cb52ba29861..207401dd13de 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -212,7 +212,7 @@ because their behaviour is different:
 * `dependencies ? []`: Aside from propagating dependencies,
   `buildPythonPackage` also injects code into and wraps executables with the
   paths included in this list. Items listed in `install_requires` go here.
-* `optional-dependencies ? { }`: Optional feature flagged dependencies.  Items listed in `extras_requires` go here.
+* `optional-dependencies ? { }`: Optional feature flagged dependencies.  Items listed in `extras_require` go here.
 
 
 ##### Overriding Python packages {#overriding-python-packages}

From 52d376906d285583fca72b80573d30b758963237 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Jan 2025 22:49:58 +0000
Subject: [PATCH 18/21] uxn: 1.0-unstable-2025-01-04 -> 1.0-unstable-2025-01-19

---
 pkgs/by-name/ux/uxn/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ux/uxn/package.nix b/pkgs/by-name/ux/uxn/package.nix
index 9937e3d2cb37..71c8870d12c6 100644
--- a/pkgs/by-name/ux/uxn/package.nix
+++ b/pkgs/by-name/ux/uxn/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "uxn";
-  version = "1.0-unstable-2025-01-04";
+  version = "1.0-unstable-2025-01-19";
 
   src = fetchFromSourcehut {
     owner = "~rabbits";
     repo = "uxn";
-    rev = "b2d09ce518742de16add4d5f5b96f320e274e5a2";
-    hash = "sha256-BNI2226vWo/XcIRrTWdoHmkckQ0U9yWawqlPamTu0PI=";
+    rev = "e2ab8811f85d8420e580dec08c53fe588ba96f05";
+    hash = "sha256-/1I//qyz8VbLPSuJbVYNeVKQjwMHKK/ojO57F6qrIAY=";
   };
 
   outputs = [

From 18e0dfbfe93c2d7d5ac4f53e9271aafb91705e7a Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 20 Jan 2025 09:25:03 +0800
Subject: [PATCH 19/21] mint-artwork: Run {pre,post}Install hooks

Fixes building cinnamon-gsettings-overrides (because
of the glibPreFixupPhase -> glibPostInstallHook change).

https://hydra.nixos.org/build/286038354/nixlog/1
---
 pkgs/by-name/mi/mint-artwork/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/mi/mint-artwork/package.nix b/pkgs/by-name/mi/mint-artwork/package.nix
index 61e5f7f005d7..8f5c843cf17c 100644
--- a/pkgs/by-name/mi/mint-artwork/package.nix
+++ b/pkgs/by-name/mi/mint-artwork/package.nix
@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
   ];
 
   installPhase = ''
+    runHook preInstall
+
     mkdir $out
 
     # note: we fuck up a bunch of stuff but idc
@@ -37,6 +39,8 @@ stdenv.mkDerivation rec {
 
     mv etc $out/etc
     mv usr/share $out/share
+
+    runHook postInstall
   '';
 
   meta = with lib; {

From a8da7b01f116ae3543a499487eabe8022ddf693f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Jan 2025 03:13:37 +0000
Subject: [PATCH 20/21] python312Packages.python-linkplay: 0.1.2 -> 0.1.3

---
 pkgs/development/python-modules/python-linkplay/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-linkplay/default.nix b/pkgs/development/python-modules/python-linkplay/default.nix
index fc732afe83b0..0c39ddbab055 100644
--- a/pkgs/development/python-modules/python-linkplay/default.nix
+++ b/pkgs/development/python-modules/python-linkplay/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "python-linkplay";
-  version = "0.1.2";
+  version = "0.1.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Velleman";
     repo = "python-linkplay";
     tag = "v${version}";
-    hash = "sha256-HXsE2DzCyTF9UPZvM3YrwclTzUor+XRuz5UFlixLmRA=";
+    hash = "sha256-iS4JWnHt3m0i+K/OqEOxBU4fNHRsy7h5HmdwkMRpI80=";
   };
 
   build-system = [ setuptools ];

From 459806aea2653e6a879fca7d9bc56c08635ceb36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sun, 19 Jan 2025 20:42:59 -0800
Subject: [PATCH 21/21] nextcloud-notify_push: 0.7.0 -> 1.0.0

Diff: https://github.com/nextcloud/notify_push/compare/v0.7.0...v1.0.0

Changelog: https://github.com/nextcloud/notify_push/releases/tag/v0.7.0
---
 pkgs/servers/nextcloud/notify_push.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/nextcloud/notify_push.nix b/pkgs/servers/nextcloud/notify_push.nix
index b6f1058af18f..b4996cfb7fde 100644
--- a/pkgs/servers/nextcloud/notify_push.nix
+++ b/pkgs/servers/nextcloud/notify_push.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "notify_push";
-  version = "0.7.0";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "nextcloud";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-QHVWiH6qkwQay0wffoyDUyVxgxzNp10ieYIsdqoEdCM=";
+    repo = "notify_push";
+    tag = "v${version}";
+    hash = "sha256-Y71o+ARi/YB2BRDfEyORbrA9HPvsUlWdh5UjM8hzmcA=";
   };
 
-  cargoHash = "sha256-HwE/ql8rJcGIINy+hNnpaTFEJqbmuUDrIvVI8kCpfQ8=";
+  cargoHash = "sha256-Mk+0LKP55Um5YiCx2O49rUZPwaXtKFnWtRC+WPGBadE=";
 
   passthru = rec {
     test_client = rustPlatform.buildRustPackage {
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
 
       buildAndTestSubdir = "test_client";
 
-      cargoHash = "sha256-KybnPzCM9mLF55s5eZ3qr5GRcaaYFpEdNklWEo/72Ts=";
+      cargoHash = "sha256-SBEuFOTgqNjPtKx0PFDA5Gkiksn3cZEmYcs2shAo2Po=";
 
       meta = meta // {
         mainProgram = "test_client";