Merge master into staging-next

2025-11-19 08:46:58 +00:00
parent e4fd781d80 0f1670e901
commit 842954598f
12 changed files with 44 additions and 26 deletions
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
  mktplcRef = {
    name = "claude-code";
    publisher = "anthropic";
-    version = "2.0.44";
-    hash = "sha256-XsmHGsAlUWuLd9WqeWA4bW40gy62h7TCffiG9zOndPA=";
+    version = "2.0.46";
+    hash = "sha256-fa6/yU2JZChTzOc0oFfjb61fTvbJBAtvea1XWL2dqrM=";
  };

  meta = {
@@ -1,12 +1,12 @@
 {
  "name": "@anthropic-ai/claude-code",
-  "version": "2.0.44",
+  "version": "2.0.46",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@anthropic-ai/claude-code",
-      "version": "2.0.44",
+      "version": "2.0.46",
      "license": "SEE LICENSE IN README.md",
      "bin": {
        "claude": "cli.js"
@@ -7,14 +7,14 @@
 }:
 buildNpmPackage (finalAttrs: {
  pname = "claude-code";
-  version = "2.0.44";
+  version = "2.0.46";

  src = fetchzip {
    url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
-    hash = "sha256-4MRaH/Dbm9z0xvnfRMdi8u39eeHaTMh6y7h5AtLYNXs=";
+    hash = "sha256-VwnR+bGSjuACdb+lTWbPnfG7HBagbWJ0Fe0pjPaQ/cM=";
  };

-  npmDepsHash = "sha256-nI5xv1VJKcssGHO5IrFBHELREePiYFWAuE/mebIgp0Q=";
+  npmDepsHash = "sha256-VT6dta8IrsqrvKWlOcNamxuZaBj+TSJpzlSqw8S81iA=";

  postPatch = ''
    cp ${./package-lock.json} package-lock.json
@@ -15,11 +15,11 @@

 stdenv.mkDerivation rec {
  pname = "ddcutil";
-  version = "2.2.2";
+  version = "2.2.3";

  src = fetchurl {
    url = "https://www.ddcutil.com/tarballs/ddcutil-${version}.tar.gz";
-    hash = "sha256-KTChTw80jARrghtbJAcksC5H0ElOTrkICBkexVW+K3M=";
+    hash = "sha256-4XvAUqYvnqhS2eOLpPHtfnNmVnoOGdvhpDnuca2+BqA=";
  };

  nativeBuildInputs = [
@@ -12,11 +12,11 @@

 stdenv.mkDerivation (finalAttrs: {
  name = "eigenwallet";
-  version = "3.1.3";
+  version = "3.3.6";

  src = fetchurl {
    url = "https://github.com/eigenwallet/core/releases/download/${finalAttrs.version}/eigenwallet_${finalAttrs.version}_amd64.deb";
-    hash = "sha256-HQqkoyzKqy4eaCfEwwkRUjgex834kkt2OR3Ib16bE0Y=";
+    hash = "sha256-4Z7tfhpX6E7i1dov8j0czG+aDDrhUN1EtxOq2SOqILQ=";
  };

  nativeBuildInputs = [
@@ -13,16 +13,16 @@

 buildNpmPackage (finalAttrs: {
  pname = "gemini-cli";
-  version = "0.15.3";
+  version = "0.16.0";

  src = fetchFromGitHub {
    owner = "google-gemini";
    repo = "gemini-cli";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-a3zigpALuuqD42n2X+5G+ol1XdSbHwLalS3ArA/cQH8=";
+    hash = "sha256-EOiG7Ov+tY6UPci4A67kKcCItkTrrENOm1mSaWxKE94=";
  };

-  npmDepsHash = "sha256-KkMnxZ0G8PzIdksChVZoH5jMz8qeyGirN7URq08sz48=";
+  npmDepsHash = "sha256-JvzrbyiJHbKNRHoGll7eSH4dD6Hj5qnrh4F/upHPntI=";

  nativeBuildInputs = [
    jq
@@ -51,12 +51,13 @@ stdenvNoCC.mkDerivation rec {
  # Firmware blobs do not need fixing and should not be modified
  dontFixup = true;

-  meta = with lib; {
+  meta = {
    description = "Binary firmware collection packaged by kernel.org";
    homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
-    license = licenses.unfreeRedistributableFirmware;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ fpletz ];
+    license = lib.licenses.unfreeRedistributableFirmware;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ fpletz ];
    priority = 6; # give precedence to kernel firmware
+    sourceProvenance = with lib.sourceTypes; [ binaryFirmware ];
  };
 }
@@ -6,16 +6,16 @@

 buildNpmPackage rec {
  pname = "markdownlint-cli";
-  version = "0.45.0";
+  version = "0.46.0";

  src = fetchFromGitHub {
    owner = "igorshubovych";
    repo = "markdownlint-cli";
    rev = "v${version}";
-    hash = "sha256-H6vK0ZJarNK9h3T/304SO8HNiZUGdrAA72wA6XPZbPQ=";
+    hash = "sha256-8yzTdgwKM2xSNJvqpQM/WSFVDVUDdFgpcIxr13thIYQ=";
  };

-  npmDepsHash = "sha256-puRm56VO711HC/CXCfUfODfy7ZVwEhucjwIikiHCf5E=";
+  npmDepsHash = "sha256-FQKjIAVvaAz4OsCZ1gKNLdHWhANdUKbFsD9HMksVu+U=";

  dontNpmBuild = true;

@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "plutovg";
-  version = "1.3.1";
+  version = "1.3.2";

  src = fetchFromGitHub {
    owner = "sammycage";
    repo = "plutovg";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-6UW+laVxTYvg+5qC12yA6U6gPKdFQeb7sdDunZ6gcd4=";
+    hash = "sha256-4TvbNsElDL7WX3yXLDM5nwHFCHQdUclk6HQ5MbPUEZE=";
  };

  cmakeFlags = [
@@ -57,7 +57,7 @@
  bootstrap_cmds,
  xcbuild,
  writeScriptBin,
-  ffmpeg ? null,
+  ffmpeg_7 ? null,
  lib,
  stdenv,
  version ? null,
@@ -354,7 +354,7 @@ qtModule (
      icu

      libevent
-      ffmpeg
+      ffmpeg_7
    ]
    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
      dbus
@@ -4,6 +4,7 @@
  python,
  buildPythonPackage,
  fetchFromGitHub,
+  fetchurl,
  setuptools,
  boost,
  cgal,
@@ -19,6 +20,16 @@
  withLAS ? false, # unfree
 }:

+let
+  # Use CGAL 6.0.1 for compatibility with cgal-swig-bindings
+  cgal_6_0_1 = cgal.overrideAttrs (oldAttrs: {
+    version = "6.0.1";
+    src = fetchurl {
+      url = "https://github.com/CGAL/cgal/releases/download/v6.0.1/CGAL-6.0.1.tar.xz";
+      hash = "sha256-Cs378xfFVmMN1SbzJTeA8ptuyXE+6SkD6Btck8D1m38=";
+    };
+  });
+in
 buildPythonPackage rec {
  pname = "cgal";
  version = "6.0.1.post202410241521";
@@ -40,7 +51,7 @@ buildPythonPackage rec {
  ];

  buildInputs = [
-    cgal
+    cgal_6_0_1
    gmp
    mpfr
    boost
@@ -1,10 +1,16 @@
 {
  mkKdeDerivation,
+  breeze,
  qtsvg,
 }:
 mkKdeDerivation {
  pname = "plasma-welcome";

+  postPatch = ''
+    substituteInPlace src/qml/mock/Mock{Activities,Card,Overview}.qml \
+      --replace-fail 'file:" + Private.App.installPrefix + "/share/wallpapers/Next/contents/images' "file://${breeze}/share/wallpapers/Next/contents/images"
+  '';
+
  extraBuildInputs = [ qtsvg ];
  meta.mainProgram = "plasma-welcome";
 }