Merge master into staging-next

2025-03-23 00:16:59 +00:00
parent 870ae2b47b 297e738724
commit c385c5e7e8
92 changed files with 1285 additions and 2566 deletions
@@ -21006,6 +21006,13 @@
    githubId = 7309170;
    name = "Ryota Kameoka";
  };
+  rypervenche = {
+    email = "git@ryper.org";
+    github = "rypervenche";
+    githubId = 1411504;
+    name = "rypervenche";
+    keys = [ { fingerprint = "1198 7A9F 03AE 47F0 4919  E334 6A41 2C4A ECE1 66EF"; } ];
+  };
  rytone = {
    email = "max@ryt.one";
    github = "rastertail";
@@ -85,7 +85,6 @@ rec {
        (onFullSupported "nixos.tests.containers-imperative")
        (onFullSupported "nixos.tests.containers-ip")
        (onSystems [ "x86_64-linux" ] "nixos.tests.docker")
-        (onFullSupported "nixos.tests.ecryptfs")
        (onFullSupported "nixos.tests.env")

        # Way too many manual retries required on Hydra.
@@ -69,9 +69,9 @@ in rec {

  unstable = fetchurl rec {
    # NOTE: Don't forget to change the hash for staging as well.
-    version = "10.2";
+    version = "10.3";
    url = "https://dl.winehq.org/wine/source/10.x/wine-${version}.tar.xz";
-    hash = "sha256-nZDfts8QuBCntHifAGdxK0cw0+oqiLkfG+Jzsq0EJD8=";
+    hash = "sha256-3j2I/wBWuC/9/KhC8RGVkuSRT0jE6gI3aOBBnDZGfD4=";
    inherit (stable) patches;

    ## see http://wiki.winehq.org/Gecko
@@ -117,7 +117,7 @@ in rec {
  staging = fetchFromGitLab rec {
    # https://gitlab.winehq.org/wine/wine-staging
    inherit (unstable) version;
-    hash = "sha256-qWje1nJ5LIVFj5PmB6RRITYOWGovXzCLEVFTazmp30o=";
+    hash = "sha256-H52ZM+eA0bZPHFlP+uXew7JtOH29BZcXr8hvsqPDtig=";
    domain = "gitlab.winehq.org";
    owner = "wine";
    repo = "wine-staging";
@@ -1,7 +1,7 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    activesupport (8.0.1)
+    activesupport (8.0.2)
      base64
      benchmark (>= 0.3)
      bigdecimal
@@ -35,10 +35,11 @@ GEM
    ffi-compiler (1.3.2)
      ffi (>= 1.15.5)
      rake
-    google-cloud-env (2.2.1)
+    google-cloud-env (2.2.2)
+      base64 (~> 0.2)
      faraday (>= 1.0, < 3.a)
    google-logging-utils (0.1.0)
-    googleauth (1.13.1)
+    googleauth (1.14.0)
      faraday (>= 1.0, < 3.a)
      google-cloud-env (~> 2.2)
      google-logging-utils (~> 0.1)
@@ -58,12 +59,12 @@ GEM
    http-form_data (2.3.0)
    i18n (1.14.7)
      concurrent-ruby (~> 1.0)
-    json (2.10.1)
+    json (2.10.2)
    jsonpath (1.1.5)
      multi_json
    jwt (2.10.1)
      base64
-    krane (3.7.1)
+    krane (3.7.2)
      activesupport (>= 5.0)
      colorize (~> 0.8)
      concurrent-ruby (~> 1.1)
@@ -79,7 +80,7 @@ GEM
      jsonpath (~> 1.0)
      recursive-open-struct (~> 1.1, >= 1.1.1)
      rest-client (~> 2.0)
-    llhttp-ffi (0.5.0)
+    llhttp-ffi (0.5.1)
      ffi-compiler (~> 1.0)
      rake (~> 13.0)
    logger (1.6.6)
@@ -87,7 +88,7 @@ GEM
      logger
      mime-types-data (~> 3.2015)
    mime-types-data (3.2025.0304)
-    minitest (5.25.4)
+    minitest (5.25.5)
    multi_json (1.15.0)
    net-http (0.6.0)
      uri
@@ -122,4 +123,4 @@ DEPENDENCIES
  krane

 BUNDLED WITH
-   2.5.22
+   2.6.2
@@ -18,10 +18,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0drfj44a16r86clrrqz3vqmg93qri6bqghjm21ac6jn2853cfnzx";
+      sha256 = "0pm40y64wfc50a9sj87kxvil2102rmpdcbv82zf0r40vlgdwsrc5";
      type = "gem";
    };
-    version = "8.0.1";
+    version = "8.0.2";
  };
  addressable = {
    dependencies = [ "public_suffix" ];
@@ -175,15 +175,18 @@
    version = "1.3.2";
  };
  google-cloud-env = {
-    dependencies = [ "faraday" ];
+    dependencies = [
+      "base64"
+      "faraday"
+    ];
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1ks9yv21d8bl9cw0sz5gy6npll1ig3m2bq9w7yw67j5mw2p64q1w";
+      sha256 = "1rr1ksjxrh8468brxz32zjl0mad9zf4q7cqwrrl98zm60l7d9gll";
      type = "gem";
    };
-    version = "2.2.1";
+    version = "2.2.2";
  };
  google-logging-utils = {
    groups = [ "default" ];
@@ -209,10 +212,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "187c8y2arv0akkpmff0zf2qnf93ixvsbjpnvwsrzw2p4cbk8qi1k";
+      sha256 = "0jai8xv2rmhz8nb6vxg4whq6aldmkbyjsn3hvk9w740qg48xxrv2";
      type = "gem";
    };
-    version = "1.13.1";
+    version = "1.14.0";
  };
  http = {
    dependencies = [
@@ -278,10 +281,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1p4l5ycdxfsr8b51gnvlvhq6s21vmx9z4x617003zbqv3bcqmj6x";
+      sha256 = "01lbdaizhkxmrw4y8j3wpvsryvnvzmg0pfs56c52laq2jgdfmq1l";
      type = "gem";
    };
-    version = "2.10.1";
+    version = "2.10.2";
  };
  jsonpath = {
    dependencies = [ "multi_json" ];
@@ -322,10 +325,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1gkbrk08l8zdcnp62yc0r89kq9sv79v6v0ni1d6ghm4mil8apbm9";
+      sha256 = "0765hl9hl1dm0sxkgxbh3fl2hzxvcwigx5khmhpha6361w4za5ir";
      type = "gem";
    };
-    version = "3.7.1";
+    version = "3.7.2";
  };
  kubeclient = {
    dependencies = [
@@ -352,10 +355,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1yph78m8w8l6i9833fc7shy5krk4mnqjc7ys0bg9kgxw8jnl0vs9";
+      sha256 = "1g57iw0l3y7x50132x6a1jyssxa6pw7srh69g0d6j7ri37yaf9cs";
      type = "gem";
    };
-    version = "0.5.0";
+    version = "0.5.1";
  };
  logger = {
    groups = [ "default" ];
@@ -396,10 +399,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0izrg03wn2yj3gd76ck7ifbm9h2kgy8kpg4fk06ckpy4bbicmwlw";
+      sha256 = "0mn7q9yzrwinvfvkyjiz548a4rmcwbmz2fn9nyzh4j1snin6q6rr";
      type = "gem";
    };
-    version = "5.25.4";
+    version = "5.25.5";
  };
  multi_json = {
    groups = [ "default" ];
@@ -4,34 +4,34 @@
  rustPlatform,
  fetchFromGitHub,
  Security ? null,
+  versionCheckHook,
 }:

 rustPlatform.buildRustPackage rec {
  pname = "kubectl-view-allocations";
-  version = "0.18.1";
+  version = "0.20.5";

  src = fetchFromGitHub {
    owner = "davidB";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-BM0TLzoXQg3m5fdQEnO/tErW8xmuljo74GprwEgJN8o=";
+    repo = "kubectl-view-allocations";
+    tag = version;
+    hash = "sha256-Y+Yki0wTi/OTWbUvk+8EhTlhF7H51RrdFLFXk2VqF1M=";
  };

-  postPatch = ''
-    cp ${./Cargo.lock} Cargo.lock
-  '';
-
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-6sRpsXydzKB0ZaV1HeagINgb6ol9dj3XT0+pd53QOCw=";

  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ];

-  meta = with lib; {
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+
+  meta = {
    description = "kubectl plugin to list allocations (cpu, memory, gpu,... X utilization, requested, limit, allocatable,...)";
    homepage = "https://github.com/davidB/kubectl-view-allocations";
-    license = licenses.cc0;
-    maintainers = [ maintainers.mrene ];
-    platforms = platforms.unix;
+    license = lib.licenses.cc0;
+    maintainers = with lib.maintainers; [ mrene ];
+    platforms = lib.platforms.unix;
  };
 }
@@ -351,6 +351,7 @@ stdenv.mkDerivation (finalAttrs: {
    ]
    ++ lib.optionals (variant == "collabora") [
      ./fix-unpack-collabora.patch
+      ./skip-broken-sentence-breaking-rules.patch
    ];

  postPatch = ''
@@ -0,0 +1,48 @@
+This part caused build failures in Collabora.
+
+LibreOffice has just dropped the entire file some time ago.
+
+--- a/i18npool/source/breakiterator/data/sent.txt	1970-01-01 01:00:01.000000000 +0100
+--- b/i18npool/source/breakiterator/data/sent.txt	1970-01-01 01:00:01.000000000 +0100
+@@ -88,41 +88,3 @@
+ [[^$STerm $ATerm $Close $Sp $Sep $Format $Extend $Thai]{bof}] ($Extend | $Format | $Close | $Sp)* [^$Thai];
+ [[^$STerm $ATerm $Close $Sp $Sep $Format $Extend]{bof}] ($Extend | $Format | $Close | $Sp)* ([$Sep{eof}] | $CR $LF){100};
+ 
+-## -------------------------------------------------
+-
+-!!reverse;
+-
+-$SpEx_R       = ($Extend | $Format)* $Sp;
+-$ATermEx_R    = ($Extend | $Format)* $ATerm;
+-$STermEx_R    = ($Extend | $Format)* $STerm;
+-$CloseEx_R    = ($Extend | $Format)* $Close;
+-
+-#
+-#  Reverse rules.
+-#     For now, use the old style inexact reverse rules, which are easier
+-#     to write, but less efficient.
+-#     TODO:  exact reverse rules.  It appears that exact reverse rules
+-#            may require improving support for look-ahead breaks in the
+-#            builder.  Needs more investigation.
+-#
+-
+-[{bof}] (.? | $LF $CR) [^$Sep]* [$Sep {eof}] ($SpEx_R* $CloseEx_R* ($STermEx_R | $ATermEx_R))*;
+-#.*;
+-
+-# Explanation for this rule:
+-#
+-#    It needs to back over
+-#        The $Sep at which we probably begin
+-#        All of the non $Sep chars leading to the preceding $Sep
+-#        The preceding $Sep, which will be the second one that the rule matches.
+-#        Any immediately preceding STerm or ATerm sequences.  We need to see these
+-#              to get the correct rule status when moving forwards again.
+-#        
+-# [{bof}]           inhibit rule chaining.  Without this, rule would loop on itself and match
+-#                   the entire string.
+-#
+-# (.? | $LF $CR)    Match one $Sep instance.  Use .? rather than $Sep because position might be
+-#                   at the beginning of the string at this point, and we don't want to fail.
+-#                   Can only use {eof} once, and it is used later.
+-#
+-
@@ -63,3 +63,31 @@
 #if HAVE_MORE_FONTS
 #if !defined _WIN32 // TODO: Fails on jenkins but passes locally
     vcl::Font aFont(u"Source Han Sans"_ustr, u"Regular"_ustr, Size(0, 72));
+--- ./sd/qa/unit/tiledrendering/tiledrendering.cxx	2025-03-22 19:42:09.450877126 +0100
+++ ./sd/qa/unit/tiledrendering/tiledrendering.cxx	2025-03-22 19:47:05.663896648 +0100
+@@ -2496,6 +2496,7 @@
+ 
+ CPPUNIT_TEST_FIXTURE(SdTiledRenderingTest, testGetViewRenderState)
+ {
+    return ; // SD;Dark instead of S;Dark is the correct outcome elsewhere?
+     SdXImpressDocument* pXImpressDocument = createDoc("dummy.odp");
+     int nFirstViewId = SfxLokHelper::getView();
+     ViewCallback aView1;
+--- ./sc/qa/unit/subsequent_export_test2.cxx	2025-03-22 19:51:50.959915451 +0100
+++ ./sc/qa/unit/subsequent_export_test2.cxx	2025-03-22 19:51:54.691915697 +0100
+@@ -103,6 +103,7 @@
+ 
+ CPPUNIT_TEST_FIXTURE(ScExportTest2, testRefStringConfigXLSX)
+ {
+    return; // Apparently an issue with loading reference config
+     // this doc is configured with CalcA1 ref syntax
+     createScDoc("xlsx/empty.xlsx");
+ 
+@@ -140,6 +141,7 @@
+ 
+ CPPUNIT_TEST_FIXTURE(ScExportTest2, testRefStringUnspecified)
+ {
+    return; // Apparently an issue with loading reference config
+     createScDoc();
+ 
+     ScDocument* pDoc = getScDoc();
@@ -105,11 +105,11 @@
    md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz";
  }
  {
-    name = "curl-8.7.1.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/curl-8.7.1.tar.xz";
-    sha256 = "6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd";
+    name = "curl-8.11.0.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/curl-8.11.0.tar.xz";
+    sha256 = "db59cf0d671ca6e7f5c2c5ec177084a33a79e04c97e71cf183a5cdea235054eb";
    md5 = "";
-    md5name = "6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd-curl-8.7.1.tar.xz";
+    md5name = "db59cf0d671ca6e7f5c2c5ec177084a33a79e04c97e71cf183a5cdea235054eb-curl-8.11.0.tar.xz";
  }
  {
    name = "libe-book-0.1.3.tar.xz";
@@ -147,11 +147,11 @@
    md5name = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a-libetonyek-0.1.10.tar.xz";
  }
  {
-    name = "expat-2.6.2.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/expat-2.6.2.tar.xz";
-    sha256 = "ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364";
+    name = "expat-2.6.4.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/expat-2.6.4.tar.xz";
+    sha256 = "a695629dae047055b37d50a0ff4776d1d45d0a4c842cf4ccee158441f55ff7ee";
    md5 = "";
-    md5name = "ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364-expat-2.6.2.tar.xz";
+    md5name = "a695629dae047055b37d50a0ff4776d1d45d0a4c842cf4ccee158441f55ff7ee-expat-2.6.4.tar.xz";
  }
  {
    name = "Firebird-3.0.7.33374-0.tar.bz2";
@@ -196,11 +196,11 @@
    md5name = "1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip";
  }
  {
-    name = "karla.zip";
-    url = "https://dev-www.libreoffice.org/src/506757f768adb2331881d5186f7286bd-karla.zip";
-    sha256 = "0cba83e7d555ae792d98a657b847cff1ccb198ecf740117a610f76d66e48eaba";
-    md5 = "506757f768adb2331881d5186f7286bd";
-    md5name = "506757f768adb2331881d5186f7286bd-karla.zip";
+    name = "2024-09-19-karla-main.zip";
+    url = "https://dev-www.libreoffice.org/src/2024-09-19-karla-main.zip";
+    sha256 = "c64cdbc55389c1bfb320dcef41a19f156bad271a99bc9253be118564dbb738b5";
+    md5 = "";
+    md5name = "c64cdbc55389c1bfb320dcef41a19f156bad271a99bc9253be118564dbb738b5-2024-09-19-karla-main.zip";
  }
  {
    name = "liberation-narrow-fonts-ttf-1.07.6.tar.gz";
@@ -238,18 +238,18 @@
    md5name = "1b6880e4b8df09c3b9e246d6084bfd94bf32a0ffff60cf2dcffd3622d0e2d79f-NotoKufiArabic-v2.109.zip";
  }
  {
-    name = "NotoSans-v2.012.zip";
-    url = "https://dev-www.libreoffice.org/src/NotoSans-v2.012.zip";
-    sha256 = "efef2f66ed2c5e005472cba156bd2afb68063a51bb628c6ee14143edc019d293";
+    name = "NotoSans-v2.014.zip";
+    url = "https://dev-www.libreoffice.org/src/NotoSans-v2.014.zip";
+    sha256 = "1dffbaf31a0a699ee2c57dfb60c1a628010425301dd076cfb485adbe017352c1";
    md5 = "";
-    md5name = "efef2f66ed2c5e005472cba156bd2afb68063a51bb628c6ee14143edc019d293-NotoSans-v2.012.zip";
+    md5name = "1dffbaf31a0a699ee2c57dfb60c1a628010425301dd076cfb485adbe017352c1-NotoSans-v2.014.zip";
  }
  {
-    name = "NotoSerif-v2.012.zip";
-    url = "https://dev-www.libreoffice.org/src/NotoSerif-v2.012.zip";
-    sha256 = "3d4566a0e51e7fc14528f5a1eecc6f12e5ffbbec6484470d3da48b0d8ead345a";
+    name = "NotoSerif-v2.014.zip";
+    url = "https://dev-www.libreoffice.org/src/NotoSerif-v2.014.zip";
+    sha256 = "6abce0a80df4ef6d5a944d60c81099364481d6a7015b0721d87bc4c16acc1fd3";
    md5 = "";
-    md5name = "3d4566a0e51e7fc14528f5a1eecc6f12e5ffbbec6484470d3da48b0d8ead345a-NotoSerif-v2.012.zip";
+    md5name = "6abce0a80df4ef6d5a944d60c81099364481d6a7015b0721d87bc4c16acc1fd3-NotoSerif-v2.014.zip";
  }
  {
    name = "NotoSerifHebrew-v2.004.zip";
@@ -763,11 +763,11 @@
    md5name = "4003c56b3d356d21b1db7775318540fad6bfedaf5f117e8f7c010811219be3cf-xmlsec1-1.3.2.tar.gz";
  }
  {
-    name = "libxml2-2.12.8.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/libxml2-2.12.8.tar.xz";
-    sha256 = "43ad877b018bc63deb2468d71f95219c2fac196876ef36d1bee51d226173ec93";
+    name = "libxml2-2.12.9.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/libxml2-2.12.9.tar.xz";
+    sha256 = "59912db536ab56a3996489ea0299768c7bcffe57169f0235e7f962a91f483590";
    md5 = "";
-    md5name = "43ad877b018bc63deb2468d71f95219c2fac196876ef36d1bee51d226173ec93-libxml2-2.12.8.tar.xz";
+    md5name = "59912db536ab56a3996489ea0299768c7bcffe57169f0235e7f962a91f483590-libxml2-2.12.9.tar.xz";
  }
  {
    name = "libxslt-1.1.39.tar.xz";
@@ -791,11 +791,11 @@
    md5name = "2455cfaeb7ac70338b3257f41e21f0724f4b5b0c0e7702da67ee6c3640835b67-lxml-4.9.2.tgz";
  }
  {
-    name = "mariadb-connector-c-3.3.8-src.tar.gz";
-    url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.8-src.tar.gz";
-    sha256 = "f9f076b4aa9fb22cc94b24f82c80f9ef063805ecd6533a2eb5d5060cf93833e8";
+    name = "mariadb-connector-c-3.3.11-src.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.11-src.tar.gz";
+    sha256 = "f7ba02f70aa2ae2b13e9ee5acc78423f6bede38998afb91326a62be46cf5956a";
    md5 = "";
-    md5name = "f9f076b4aa9fb22cc94b24f82c80f9ef063805ecd6533a2eb5d5060cf93833e8-mariadb-connector-c-3.3.8-src.tar.gz";
+    md5name = "f7ba02f70aa2ae2b13e9ee5acc78423f6bede38998afb91326a62be46cf5956a-mariadb-connector-c-3.3.11-src.tar.gz";
  }
  {
    name = "mdds-2.1.1.tar.xz";
@@ -833,11 +833,11 @@
    md5name = "19279f70707bbe5ffa619f2dc319f888cec0c4a8d339dc0a21330517bd6f521d-mythes-1.2.5.tar.xz";
  }
  {
-    name = "nss-3.99-with-nspr-4.35.tar.gz";
-    url = "https://dev-www.libreoffice.org/src/nss-3.99-with-nspr-4.35.tar.gz";
-    sha256 = "5f29fea64b3234b33a615b6df40469e239a4168ac0909106bd00e6490b274c31";
+    name = "nss-3.101.2-with-nspr-4.35.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/nss-3.101.2-with-nspr-4.35.tar.gz";
+    sha256 = "ff602c1fa86a4f841b27109918dfff60f41582e1caf6dbd651cfa72bdc8a64aa";
    md5 = "";
-    md5name = "5f29fea64b3234b33a615b6df40469e239a4168ac0909106bd00e6490b274c31-nss-3.99-with-nspr-4.35.tar.gz";
+    md5name = "ff602c1fa86a4f841b27109918dfff60f41582e1caf6dbd651cfa72bdc8a64aa-nss-3.101.2-with-nspr-4.35.tar.gz";
  }
  {
    name = "libodfgen-0.1.8.tar.xz";
@@ -875,11 +875,11 @@
    md5name = "cd775f625c944ed78a3da18a03b03b08eea73c8aabc97b41bb336e9a10954930-openldap-2.6.7.tgz";
  }
  {
-    name = "openssl-3.0.14.tar.gz";
-    url = "https://dev-www.libreoffice.org/src/openssl-3.0.14.tar.gz";
-    sha256 = "eeca035d4dd4e84fc25846d952da6297484afa0650a6f84c682e39df3a4123ca";
+    name = "openssl-3.0.16.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/openssl-3.0.16.tar.gz";
+    sha256 = "57e03c50feab5d31b152af2b764f10379aecd8ee92f16c985983ce4a99f7ef86";
    md5 = "";
-    md5name = "eeca035d4dd4e84fc25846d952da6297484afa0650a6f84c682e39df3a4123ca-openssl-3.0.14.tar.gz";
+    md5name = "57e03c50feab5d31b152af2b764f10379aecd8ee92f16c985983ce4a99f7ef86-openssl-3.0.16.tar.gz";
  }
  {
    name = "liborcus-0.19.2.tar.xz";
@@ -910,25 +910,25 @@
    md5name = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e-pixman-0.42.2.tar.gz";
  }
  {
-    name = "libpng-1.6.43.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/libpng-1.6.43.tar.xz";
-    sha256 = "6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c";
+    name = "libpng-1.6.44.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/libpng-1.6.44.tar.xz";
+    sha256 = "60c4da1d5b7f0aa8d158da48e8f8afa9773c1c8baa5d21974df61f1886b8ce8e";
    md5 = "";
-    md5name = "6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c-libpng-1.6.43.tar.xz";
+    md5name = "60c4da1d5b7f0aa8d158da48e8f8afa9773c1c8baa5d21974df61f1886b8ce8e-libpng-1.6.44.tar.xz";
  }
  {
-    name = "tiff-4.6.0.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/tiff-4.6.0.tar.xz";
-    sha256 = "e178649607d1e22b51cf361dd20a3753f244f022eefab1f2f218fc62ebaf87d2";
+    name = "tiff-4.7.0.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/tiff-4.7.0.tar.xz";
+    sha256 = "273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017";
    md5 = "";
-    md5name = "e178649607d1e22b51cf361dd20a3753f244f022eefab1f2f218fc62ebaf87d2-tiff-4.6.0.tar.xz";
+    md5name = "273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017-tiff-4.7.0.tar.xz";
  }
  {
-    name = "poppler-23.09.0.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/poppler-23.09.0.tar.xz";
-    sha256 = "80d1d44dd8bdf4ac1a47d56c5065075eb9991790974b1ed7d14b972acde88e55";
+    name = "poppler-25.01.0.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/poppler-25.01.0.tar.xz";
+    sha256 = "7eefc122207bbbd72a303c5e0743f4941e8ae861e24dcf0501e18ce1d1414112";
    md5 = "";
-    md5name = "80d1d44dd8bdf4ac1a47d56c5065075eb9991790974b1ed7d14b972acde88e55-poppler-23.09.0.tar.xz";
+    md5name = "7eefc122207bbbd72a303c5e0743f4941e8ae861e24dcf0501e18ce1d1414112-poppler-25.01.0.tar.xz";
  }
  {
    name = "poppler-data-0.4.12.tar.gz";
@@ -938,18 +938,18 @@
    md5name = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74-poppler-data-0.4.12.tar.gz";
  }
  {
-    name = "postgresql-13.14.tar.bz2";
-    url = "https://dev-www.libreoffice.org/src/postgresql-13.14.tar.bz2";
-    sha256 = "b8df078551898960bd500dc5d38a177e9905376df81fe7f2b660a1407fa6a5ed";
+    name = "postgresql-13.16.tar.bz2";
+    url = "https://dev-www.libreoffice.org/src/postgresql-13.16.tar.bz2";
+    sha256 = "c9cbbb6129f02328204828066bb3785c00a85c8ca8fd329c2a8a53c1f5cd8865";
    md5 = "";
-    md5name = "b8df078551898960bd500dc5d38a177e9905376df81fe7f2b660a1407fa6a5ed-postgresql-13.14.tar.bz2";
+    md5name = "c9cbbb6129f02328204828066bb3785c00a85c8ca8fd329c2a8a53c1f5cd8865-postgresql-13.16.tar.bz2";
  }
  {
-    name = "Python-3.8.19.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/Python-3.8.19.tar.xz";
-    sha256 = "d2807ac69f69b84fd46a0b93bbd02a4fa48d3e70f4b2835ff0f72a2885040076";
+    name = "Python-3.9.21.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/Python-3.9.21.tar.xz";
+    sha256 = "3126f59592c9b0d798584755f2bf7b081fa1ca35ce7a6fea980108d752a05bb1";
    md5 = "";
-    md5name = "d2807ac69f69b84fd46a0b93bbd02a4fa48d3e70f4b2835ff0f72a2885040076-Python-3.8.19.tar.xz";
+    md5name = "3126f59592c9b0d798584755f2bf7b081fa1ca35ce7a6fea980108d752a05bb1-Python-3.9.21.tar.xz";
  }
  {
    name = "libqxp-0.0.2.tar.xz";
@@ -959,11 +959,11 @@
    md5name = "e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c-libqxp-0.0.2.tar.xz";
  }
  {
-    name = "raptor2-2.0.15.tar.gz";
-    url = "https://dev-www.libreoffice.org/src/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz";
-    sha256 = "ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed";
-    md5 = "a39f6c07ddb20d7dd2ff1f95fa21e2cd";
-    md5name = "a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz";
+    name = "raptor2-2.0.16.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/raptor2-2.0.16.tar.gz";
+    sha256 = "089db78d7ac982354bdbf39d973baf09581e6904ac4c92a98c5caadb3de44680";
+    md5 = "";
+    md5name = "089db78d7ac982354bdbf39d973baf09581e6904ac4c92a98c5caadb3de44680-raptor2-2.0.16.tar.gz";
  }
  {
    name = "rasqal-0.9.33.tar.gz";
@@ -1022,11 +1022,11 @@
    md5name = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6-twaindsm_2.4.1.orig.tar.gz";
  }
  {
-    name = "libvisio-0.1.7.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz";
-    sha256 = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c";
+    name = "libvisio-0.1.8.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/libvisio-0.1.8.tar.xz";
+    sha256 = "b4098ffbf4dcb9e71213fa0acddbd928f27bed30db2d80234813b15d53d0405b";
    md5 = "";
-    md5name = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c-libvisio-0.1.7.tar.xz";
+    md5name = "b4098ffbf4dcb9e71213fa0acddbd928f27bed30db2d80234813b15d53d0405b-libvisio-0.1.8.tar.xz";
  }
  {
    name = "libwpd-0.10.3.tar.xz";
@@ -1,6 +1,6 @@
 { fetchgit, ... }:
 fetchgit {
  url = "https://gerrit.libreoffice.org/help";
-  rev = "27f62cdb52fe23f6090a3249fcd1433777b2598d";
+  rev = "refs/tags/cp-24.04.13-2";
  hash = "sha256-lyBuj7FI1jwVLLBkB6JJcmQVtm1FKExYWvRUoGqRbJ0=";
 }
@@ -1,7 +1,7 @@
 { fetchgit, ... }:
 fetchgit {
  url = "https://gerrit.libreoffice.org/core";
-  rev = "refs/tags/cp-24.04.5-4";
-  hash = "sha256-OJ3R8qs8/R8QnXGCRgn/ZJK7Nn8cWwYbZxjEWg0VpBc=";
+  rev = "refs/tags/cp-24.04.13-2";
+  hash = "sha256-m+kNUxpHwr7dfWsmvM9FSzR2YvTWYpeawOr8YH3b700=";
  fetchSubmodules = false;
 }
@@ -1,6 +1,6 @@
 { fetchgit, ... }:
 fetchgit {
  url = "https://gerrit.libreoffice.org/translations";
-  rev = "5fd34a953e6861cb8e392363c0a3500059ed6b01";
-  hash = "sha256-1j0kTvPbytsCWszXz+xFE+n53zPkR8gNgVaawn+rjfI=";
+  rev = "refs/tags/cp-24.04.13-2";
+  hash = "sha256-BlV36hcR5mvwlnGNvCE/semLQPFTcL6HLqVK2cP357Y=";
 }
@@ -1 +1 @@
-"24.04.5-4"
+"24.04.13-2"
@@ -18,6 +18,12 @@ stdenv.mkDerivation {
    hash = "sha256-XuPcubt1lvnQio+km6MhmDu41NXNVXKKpzGd/Y1XzLo=";
  };

+  # Compatibility with logs 0.8.0
+  postPatch = ''
+    substituteInPlace src/utils/dune \
+      --replace-warn 'logs mtime' 'logs logs.fmt mtime'
+  '';
+
  strictDeps = true;

  nativeBuildInputs = with ocamlPackages; [
@@ -5,7 +5,7 @@
 }:

 let
-  version = "6.1.5";
+  version = "6.1.6";
 in
 stdenvNoCC.mkDerivation {
  pname = "activemq";
@@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation {

  src = fetchurl {
    url = "mirror://apache/activemq/${version}/apache-activemq-${version}-bin.tar.gz";
-    hash = "sha256-JrLLSm6+Be1vSBTTryRcZfbiGK0PrmJ/pM2uYnGuN9E=";
+    hash = "sha256-MqxpLaSG1+goGVht08VmG7u11tQlmYMqSUeXBYYI8KQ=";
  };

  installPhase = ''
@@ -0,0 +1,49 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+  stdenv,
+}:
+buildGoModule (finalAttrs: {
+  pname = "anubis";
+  version = "1.14.2";
+
+  src = fetchFromGitHub {
+    owner = "TecharoHQ";
+    repo = "anubis";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-K4VXTO8F3GTOA9jOrI0OF6CYTRaDUlUT9/HujYmnHpM=";
+  };
+
+  vendorHash = "sha256-t+E3sILEwXGkTaBtKLO2kFEntivY9fVK8o86arvMaOU=";
+
+  subPackages = [
+    "cmd/anubis"
+  ];
+
+  ldflags =
+    [
+      "-s"
+      "-w"
+      "-X=github.com/TecharoHQ/anubis.Version=v${finalAttrs.version}"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      "-extldflags=-static"
+    ];
+
+  preCheck = ''
+    export DONT_USE_NETWORK=1
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Weighs the soul of incoming HTTP requests using proof-of-work to stop AI crawlers";
+    homepage = "https://github.com/TecharoHQ/anubis/";
+    changelog = "https://github.com/TecharoHQ/anubis/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ knightpp ];
+    mainProgram = "anubis";
+  };
+})
@@ -34,6 +34,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
    libudev-zero
  ];

+  postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
+    mkdir -p $out/lib/systemd/user
+    substitute bitbox-bridge/release/linux/bitbox-bridge.service $out/lib/systemd/user/bitbox-bridge.service \
+      --replace-fail /opt/bitbox-bridge/bin/bitbox-bridge $out/bin/bitbox-bridge
+    install -Dm644 bitbox-bridge/release/linux/hid-digitalbitbox.rules $out/lib/udev/rules.d/50-hid-digitalbitbox.rules
+  '';
+
  meta = {
    description = "A bridge service that connects web wallets like Rabby to BitBox02";
    homepage = "https://github.com/BitBoxSwiss/bitbox-bridge";
@@ -3,6 +3,7 @@
  stdenv,
  fetchFromGitHub,
  premake4,
+  zlib,
 }:

 stdenv.mkDerivation {
@@ -16,12 +17,18 @@ stdenv.mkDerivation {
    sha256 = "1njdj6nvmwf7j2fwqbyvd1cf5l52797vk2wnsliylqdzqcjmfpij";
  };

+  enableParallelBuilding = true;
+
  # Avoid guessing where files end up. Just use current directory.
  postPatch = ''
    substituteInPlace projects/premake4.lua \
-      --replace 'location ( os.get() .. "/" .. _ACTION )' 'location ( ".." )'
+      --replace-fail 'location ( os.get() .. "/" .. _ACTION )' 'location ( ".." )'
    substituteInPlace projects/bootil.lua \
-      --replace 'targetdir ( "../lib/" .. os.get() .. "/" .. _ACTION )' 'targetdir ( ".." )'
+      --replace-fail 'targetdir ( "../lib/" .. os.get() .. "/" .. _ACTION )' 'targetdir ( ".." )'
+
+    rm src/3rdParty/zlib -rf
+    mkdir src/3rdParty/zlib
+    cp -r ${zlib.dev}/include/z{conf,lib}.h src/3rdParty/zlib
  '';

  nativeBuildInputs = [ premake4 ];
@@ -1,5 +1,6 @@
 {
  fetchFromGitLab,
+  fetchpatch2,
  inih,
  lib,
  libdrm,
@@ -15,17 +16,25 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "buffybox";
-  version = "3.2.0-unstable-2025-03-12";
+  version = "3.2.0-unstable-2025-03-16";

  src = fetchFromGitLab {
    domain = "gitlab.postmarketos.org";
    owner = "postmarketOS";
    repo = "buffybox";
    fetchSubmodules = true; # to use its vendored lvgl
-    rev = "3196e47d519c78b56a8d4b75ad7a280c92c91d23";
-    hash = "sha256-Zl/QmOJbY/lxoCYD6SpUHiiTTDOStUSn3+6xOuiGGBo=";
+    rev = "56a9867e90ece88596e330774da64cf277069b59";
+    hash = "sha256-4lSgswcvvV6W1KN6QhsjeHY8MMXXC4fRYBmPE/hb0vA=";
  };

+  patches = [
+    (fetchpatch2 {
+      # https://gitlab.postmarketos.org/postmarketOS/buffybox/-/merge_requests/42
+      url = "https://gitlab.postmarketos.org/postmarketOS/buffybox/-/commit/1f0c30e88dc61b8b508696cd890393c3b7911b58.patch?full_index=1";
+      hash = "sha256-hQ6Hjfyj059j2cRfrFz9Se6xRowIGW1HVHULLYtHcS8=";
+    })
+  ];
+
  depsBuildBuild = [
    pkg-config
  ];
@@ -0,0 +1 @@
+{ python3Packages }: with python3Packages; toPythonApplication bump-my-version
@@ -0,0 +1,33 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+}:
+
+stdenvNoCC.mkDerivation rec {
+  pname = "cns11643-kai";
+  version = "0-unstable-2025-01-13";
+
+  src = fetchFromGitHub {
+    owner = "rypervenche";
+    repo = "cns11643-fonts";
+    rev = "refs/tags/${version}";
+    hash = "sha256-A/4iwNvyzOYEpBzxKeq1xM/6aU6EOCATAr0lQlyckKQ=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm644 TW-Kai*.ttf -t $out/share/fonts/truetype/
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Chinese TrueType Kai font by Ministry of Education of Taiwan government";
+    homepage = "https://www.cns11643.gov.tw/";
+    license = lib.licenses.ofl;
+    maintainers = [ lib.maintainers.rypervenche ];
+    platforms = lib.platforms.all;
+  };
+}
@@ -3,102 +3,85 @@
  stdenv,
  rustPlatform,
  fetchFromGitHub,
-  makeBinaryWrapper,
-  pixman,
+  libcosmicAppHook,
  pkg-config,
-  libinput,
-  libglvnd,
-  libxkbcommon,
+  libdisplay-info,
  libgbm,
+  libinput,
+  pixman,
  seatd,
  udev,
-  xwayland,
-  wayland,
-  xorg,
-  useXWayland ? true,
  systemd,
+  xwayland,
+  nix-update-script,
+
+  useXWayland ? true,
  useSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
 }:

-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cosmic-comp";
-  version = "1.0.0-alpha.2";
+  version = "1.0.0-alpha.6";

  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "cosmic-comp";
-    rev = "epoch-${version}";
-    hash = "sha256-IbGMp+4nRg4v5yRvp3ujGx7+nJ6wJmly6dZBXbQAnr8=";
+    tag = "epoch-${finalAttrs.version}";
+    hash = "sha256-CygtVtzO8JJQv+G3yx/OCCy8BlPqyNqcmf3Mv1gFuT4=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-4ahdQ0lQbG+lifGlsJE0yci4j8pR7tYVsMww9LyYyAA=";
+  cargoHash = "sha256-bfVsfrxGi0Lq/YRddCVhfqXL8kPGL9p4bqSNPsmjx0o=";

  separateDebugInfo = true;

  nativeBuildInputs = [
-    makeBinaryWrapper
+    libcosmicAppHook
    pkg-config
  ];
+
  buildInputs = [
-    libglvnd
-    libinput
-    libxkbcommon
+    libdisplay-info
    libgbm
+    libinput
    pixman
    seatd
    udev
-    wayland
  ] ++ lib.optional useSystemd systemd;

  # Only default feature is systemd
  buildNoDefaultFeatures = !useSystemd;

-  # 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"
-  ];
-
  makeFlags = [
-    "prefix=$(out)"
+    "prefix=${placeholder "out"}"
    "CARGO_TARGET_DIR=target/${stdenv.hostPlatform.rust.cargoShortTarget}"
  ];

  dontCargoInstall = true;

-  # These libraries are only used by the X11 backend, which will not
-  # be the common case, so just make them available, don't link them.
-  postInstall =
-    ''
-      wrapProgramArgs=(--prefix LD_LIBRARY_PATH : ${
-        lib.makeLibraryPath [
-          xorg.libX11
-          xorg.libXcursor
-          xorg.libXi
-        ]
-      })
-    ''
-    + lib.optionalString useXWayland ''
-      wrapProgramArgs+=(--prefix PATH : ${lib.makeBinPath [ xwayland ]})
-    ''
-    + ''
-      wrapProgram $out/bin/cosmic-comp "''${wrapProgramArgs[@]}"
-    '';
+  preFixup = lib.optionalString useXWayland ''
+    libcosmicAppWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ xwayland ]})
+  '';

-  meta = with lib; {
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version"
+      "unstable"
+      "--version-regex"
+      "epoch-(.*)"
+    ];
+  };
+
+  meta = {
    homepage = "https://github.com/pop-os/cosmic-comp";
    description = "Compositor for the COSMIC Desktop Environment";
    mainProgram = "cosmic-comp";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [
      qyliss
      nyabinary
+      HeitorAugustoLN
    ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
  };
-}
+})
@@ -1,24 +1,22 @@
 {
  lib,
  stdenv,
-  fetchFromGitHub,
-  just,
-  pkg-config,
  rustPlatform,
-  libglvnd,
-  libxkbcommon,
-  wayland,
+  fetchFromGitHub,
+  libcosmicAppHook,
+  just,
+  nix-update-script,
 }:

-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cosmic-panel";
-  version = "1.0.0-alpha.5.1";
+  version = "1.0.0-alpha.6";

  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "cosmic-panel";
-    tag = "epoch-${version}";
-    hash = "sha256-nO7Y1SpwvfHhL0OSy7Ti+e8NPzfknW2SGs7IYoF1Jow=";
+    tag = "epoch-${finalAttrs.version}";
+    hash = "sha256-6lt9Rig1pM37B7+nRrR+eYke8umSfYlg8aLB45Q1X+4=";
  };

  useFetchCargoVendor = true;
@@ -26,15 +24,11 @@ rustPlatform.buildRustPackage rec {

  nativeBuildInputs = [
    just
-    pkg-config
-  ];
-  buildInputs = [
-    libglvnd
-    libxkbcommon
-    wayland
+    libcosmicAppHook
  ];

  dontUseJustBuild = true;
+  dontUseJustCheck = true;

  justFlags = [
    "--set"
@@ -45,24 +39,25 @@ rustPlatform.buildRustPackage rec {
    "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-panel"
  ];

-  # Force linking to libEGL, which is always dlopen()ed.
-  "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" =
-    map (a: "-C link-arg=${a}")
-      [
-        "-Wl,--push-state,--no-as-needed"
-        "-lEGL"
-        "-Wl,--pop-state"
-      ];
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version"
+      "unstable"
+      "--version-regex"
+      "epoch-(.*)"
+    ];
+  };

-  meta = with lib; {
+  meta = {
    homepage = "https://github.com/pop-os/cosmic-panel";
    description = "Panel for the COSMIC Desktop Environment";
    mainProgram = "cosmic-panel";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [
      qyliss
      nyabinary
+      HeitorAugustoLN
    ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
  };
-}
+})
@@ -15,7 +15,7 @@

 stdenv.mkDerivation rec {
  pname = "egl-wayland";
-  version = "1.1.17";
+  version = "1.1.18";

  outputs = [ "out" "dev" ];

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
    owner = "Nvidia";
    repo = "egl-wayland";
    rev = version;
-    hash = "sha256-/lj52qCbv07NDYDdF8SEjCIWWPAMcwXNvYXiU8IoC/A=";
+    hash = "sha256-Vu0XPcFKQJ+nypNMX1tw17whVWceZ0YlqvEEmEbTQaU=";
  };

  postPatch = ''
@@ -4,19 +4,19 @@
  fetchFromGitHub,
 }:

-rustPlatform.buildRustPackage {
+rustPlatform.buildRustPackage (finalAttrs: {
  pname = "elfx86exts";
-  version = "unstable-2023-04-20";
+  version = "0.6.2";

  src = fetchFromGitHub {
    owner = "pkgw";
    repo = "elfx86exts";
-    rev = "26bf98cf1fc773196e594c48bfe808d7151076f6";
-    hash = "sha256-xNmaKGbMN92CPIQQRbdmeePk5Wt9XcIsB/2vbk5NJzg=";
+    tag = "elfx86exts@${finalAttrs.version}";
+    hash = "sha256-lqaOnZxuiip1HPDpQraXlpUBYeJuBCRTaNARZVEV5UY=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-FB2mEI1ZXR0f1+eRcEc8hzlTQZNygU4R5L6qyEl6tLw=";
+  cargoHash = "sha256-7FVcLvbZQK5M90ofoBpK2V/1+vWlBI/Z2x3ydbCwVbM=";

  meta = with lib; {
    description = "Decode x86 binaries and print out which instruction set extensions they use";
@@ -30,4 +30,4 @@ rustPlatform.buildRustPackage {
    license = with licenses; [ mit ];
    mainProgram = "elfx86exts";
  };
-}
+})
@@ -2,6 +2,8 @@
  lib,
  buildGoModule,
  fetchFromGitHub,
+  makeWrapper,
+  go,
 }:

 buildGoModule rec {
@@ -16,16 +18,19 @@ buildGoModule rec {
    hash = "sha256-yUkdZSe/GV0w1qK8aQjcFE4tNKYC8f4JeFgPiv8GlQc=";
  };

+  allowGoReference = true;
+  doCheck = false;
+
+  vendorHash = "sha256-+jhCNi7bGkRdI1Ywfe3q4i+zcm3UJ0kbQalsDD3WkS4=";
+
+  nativeBuildInputs = [ makeWrapper ];
+
  postPatch = ''
    # The gopls folder contains a Go submodule which causes a build failure
    # and lives in its own package named gopls.
    rm -r gopls
  '';

-  vendorHash = "sha256-+jhCNi7bGkRdI1Ywfe3q4i+zcm3UJ0kbQalsDD3WkS4=";
-
-  doCheck = false;
-
  # Set GOTOOLDIR for derivations adding this to buildInputs
  postInstall = ''
    mkdir -p $out/nix-support
@@ -33,6 +38,11 @@ buildGoModule rec {
      --subst-var-by bin $out
  '';

+  postFixup = ''
+    wrapProgram $out/bin/goimports \
+      --suffix PATH : ${lib.makeBinPath [ go ]}
+  '';
+
  meta = with lib; {
    description = "Additional tools for Go development";
    longDescription = ''
@@ -29,14 +29,14 @@

 python3Packages.buildPythonApplication rec {
  pname = "gpu-viewer";
-  version = "3.10";
+  version = "3.12";
  pyproject = false;

  src = fetchFromGitHub {
    owner = "arunsivaramanneo";
    repo = "gpu-viewer";
    tag = "v${version}";
-    hash = "sha256-0rbg3T9OXnSZ5+2cjgfNitAv1LgdO0N90wWJifzHcsg=";
+    hash = "sha256-wVgAAKqlf5mtj2u+DsRPvYeVta7wAr+eCXVM1c/l6bo=";
  };

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

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "grimblast";
-  version = "0.1-unstable-2025-03-11";
+  version = "0.1-unstable-2025-03-17";

  src = fetchFromGitHub {
    owner = "hyprwm";
    repo = "contrib";
-    rev = "e14d9c5e9aea4a84c3677e0a7c73268153b15327";
-    hash = "sha256-SJrLVyoaQUg29fq3nNdRmYrLgiu9dtgcIVqpl8j/Teo=";
+    rev = "bd81329944be53b0ffb99e05864804b95f1d7c65";
+    hash = "sha256-I8JVdQRu8eWvY5W8XWYZkdd5pojDHkxeqQV7mMIsbhs=";
  };

  strictDeps = true;
@@ -10,13 +10,13 @@

 stdenv.mkDerivation rec {
  pname = "intel-gmmlib";
-  version = "22.7.0";
+  version = "22.7.1";

  src = fetchFromGitHub {
    owner = "intel";
    repo = "gmmlib";
    tag = "intel-gmmlib-${version}";
-    hash = "sha256-SR66UaoPQYGz4Nda99ASZEfTtNlLQTqtZgDM5hlV/1w=";
+    hash = "sha256-Wm9bHe65ak7ERSEgrSO9x9hUV6ypRbODoY4eodebOVE=";
  };

  nativeBuildInputs = [ cmake ];
@@ -42,16 +42,26 @@ stdenv.mkDerivation (finalAttrs: {
    })
  ];

-  postPatch = ''
-    substituteInPlace cmake/tools/version_files.py \
-      --replace-fail "args.git_version" '"${finalAttrs.version}"' \
-      --replace-fail "args.git_hash" '"${finalAttrs.src.rev}"' \
-      --replace-fail "args.git_date" '"1970-01-01"'
-  '';
+  postPatch =
+    ''
+      substituteInPlace cmake/tools/version_files.py \
+        --replace-fail "args.git_version" '"${finalAttrs.version}"' \
+        --replace-fail "args.git_hash" '"${finalAttrs.src.rev}"' \
+        --replace-fail "args.git_date" '"1970-01-01"'
+
+    ''
+    + lib.optionalString (!stdenv.hostPlatform.avxSupport) ''
+      substituteInPlace cmake/modules/Compiler/GNU.cmake \
+        --replace-fail "-mavx" ""
+
+       substituteInPlace src/core/decoder/src/common/simd.c \
+        --replace-fail "((_xgetbv(kControlRegister) & kOSXSaveMask) == kOSXSaveMask)" "false"
+    '';

  env = {
    includedir = "${placeholder "dev"}/include";
    libdir = "${placeholder "out"}/lib";
+    NIX_CFLAGS_COMPILE = "-Wno-error=unused-variable";
  };

  pkgconfigItems = [
@@ -95,6 +105,9 @@ stdenv.mkDerivation (finalAttrs: {
    (lib.cmakeFeature "VN_SDK_FFMPEG_LIBS_PACKAGE" "")
    (lib.cmakeBool "VN_SDK_UNIT_TESTS" false)
    (lib.cmakeBool "VN_SDK_SAMPLE_SOURCE" false)
+    (lib.cmakeBool "VN_CORE_AVX2" stdenv.hostPlatform.avx2Support)
+    # Requires avx for checking on runtime
+    (lib.cmakeBool "VN_CORE_SSE" stdenv.hostPlatform.avxSupport)
  ];

  passthru = {
@@ -9,13 +9,13 @@

 stdenv.mkDerivation rec {
  pname = "libharu";
-  version = "2.4.4";
+  version = "2.4.5";

  src = fetchFromGitHub {
    owner = "libharu";
    repo = "libharu";
    rev = "v${version}";
-    hash = "sha256-tw/E79Cg/8kIei6NUu1W+mP0sUDCm8KTB7ZjzxsqpeM=";
+    hash = "sha256-v2vudB95OdYPiLxS9Al5lsAInsvmharhPWdnUmCl+Bs=";
  };

  nativeBuildInputs = [ cmake ];
@@ -7,13 +7,13 @@

 stdenv.mkDerivation rec {
  pname = "lout";
-  version = "3.43";
+  version = "3.43.1";

  src = fetchFromGitHub {
    owner = "william8000";
    repo = "lout";
    rev = version;
-    hash = "sha256-YUFrlM7BnDlG1rUV90yBvWG6lOKW5qKxs/xdq6I/kI0=";
+    hash = "sha256-bXLhkJqhv8pftDZYv6vn9ycy5u3vde+m3gCPvWJz2M8=";
  };

  buildInputs = [ ghostscript ];
@@ -12,13 +12,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "ndpi";
-  version = "4.12";
+  version = "4.10";

  src = fetchFromGitHub {
    owner = "ntop";
    repo = "nDPI";
    tag = finalAttrs.version;
-    hash = "sha256-jdyKvM/Tb9pRWQPxpB/UQOOKamWrTS24Ofc3M5M1Zso=";
+    hash = "sha256-iXqvDMJsOXcg9YkqKFgInLLfH6j/HEp4bEaIl6dpVtc=";
  };

  nativeBuildInputs = [
@@ -8,6 +8,7 @@
 , inotify-tools
 , kdePackages
 , libcloudproviders
+, libp11
 , librsvg
 , libsecret
 , openssl
@@ -21,7 +22,7 @@

 stdenv.mkDerivation rec {
  pname = "nextcloud-client";
-  version = "3.15.3";
+  version = "3.16.2";

  outputs = [ "out" "dev" ];

@@ -29,7 +30,7 @@ stdenv.mkDerivation rec {
    owner = "nextcloud-releases";
    repo = "desktop";
    tag = "v${version}";
-    hash = "sha256-48iqLd1S84ZElibdgwEXl3LZeYruo9r34LPn7BzYpdk=";
+    hash = "sha256-CBGvASIPN5xB2kgSDXg2vWpnsFBD3c3wudUAL6u64U8=";
  };

  patches = [
@@ -56,6 +57,7 @@ stdenv.mkDerivation rec {
    inotify-tools
    kdePackages.kio
    libcloudproviders
+    libp11
    libsecret
    openssl
    pcre
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
  src = passthru.mkSource sources.npins;

  useFetchCargoVendor = true;
-  cargoHash = "sha256-RUtWpZYaydXzF7gcROiIr04K7+Usq9iHAQwnv3ELqLI=";
+  cargoHash = "sha256-HnX7dkWLxa3DARXG8y9OVBRwvwgxwRIs4mWK3VNblG0=";

  buildInputs = lib.optional stdenv.hostPlatform.isDarwin (
    with darwin.apple_sdk.frameworks;
@@ -9,11 +9,13 @@
      },
      "pre_releases": false,
      "version_upper_bound": null,
-      "version": "0.2.4",
-      "revision": "181da464f7edb5e675dd96cc25d611760796a739",
-      "url": "https://api.github.com/repos/andir/npins/tarball/0.2.4",
-      "hash": "04155dr6i1gy2zgy49v8zm75sn1akm83l4x8h6cxvxyk1l2abn4q"
+      "release_prefix": null,
+      "submodules": false,
+      "version": "0.3.0",
+      "revision": "6cc1930e703698487bd703258126435a536ca492",
+      "url": "https://api.github.com/repos/andir/npins/tarball/0.3.0",
+      "hash": "1450ddp5gm3n5jvg64v9rc2jvf9za79fv4dmac5m8d47l0iblfcx"
    }
  },
-  "version": 3
+  "version": 5
 }
@@ -103,7 +103,6 @@ py.pkgs.buildPythonApplication rec {
      upl
    ];
    maintainers = with maintainers; [
-      adamcstephens
      ilian
      FKouhai
    ];
@@ -6,14 +6,14 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "prowler";
-  version = "5.4.0";
+  version = "5.4.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "prowler-cloud";
    repo = "prowler";
    tag = version;
-    hash = "sha256-D+GifYxAqB5/Y7+x5CRdG2tF99MBWQF5meD1TIUI0ZE=";
+    hash = "sha256-byZjb208AHpzKHRp+wJeT3Brt3p5MLWSYZ+7go7Ciw4=";
  };

  pythonRelaxDeps = true;
@@ -12,7 +12,7 @@
  makeWrapper,
  nix-update-script,
  pkg-config,
-  python3Full,
+  python3,
  SDL2,
  stdenv,
  versionCheckHook,
@@ -21,17 +21,17 @@
 }:

 let
-  python = python3Full;
+  python = python3;
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "renpy";
-  version = "8.3.6.25022803";
+  version = "8.3.7.25031702";

  src = fetchFromGitHub {
    owner = "renpy";
    repo = "renpy";
    tag = finalAttrs.version;
-    hash = "sha256-ibWbYf+e8PZ8ZxLHVPLzHBS0qf+eLzJasJJFHxXlCfk=";
+    hash = "sha256-QY6MMiagPVV+pCDM0FRD++r2fY3tD8qWmHj7fJKIxUQ=";
  };

  nativeBuildInputs = [
@@ -0,0 +1,35 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  versionCheckHook,
+  nix-update-script,
+}:
+rustPlatform.buildRustPackage {
+  pname = "rust-stakeholder";
+  version = "0-unstable-2025-03-15";
+
+  src = fetchFromGitHub {
+    owner = "giacomo-b";
+    repo = "rust-stakeholder";
+    rev = "aacdccbed72be34e0231e6d15cecb6d87a9a5ef6";
+    hash = "sha256-YnXqvZlItCoAUEYUpRVQLM4fuLaf9Wd+OFY9ItSg25U=";
+  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-NxO+7Wh8Ff6RPFtmbEa3EJszfDaZDXGWZDAoXPEAnpI=";
+
+  nativeInstallCheck = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Generate impressive-looking terminal output to look busy when stakeholders walk by";
+    homepage = "https://github.com/giacomo-b/rust-stakeholder";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.awwpotato ];
+    mainProgram = "rust-stakeholder";
+  };
+}
@@ -8,11 +8,11 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "stats";
-  version = "2.11.32";
+  version = "2.11.35";

  src = fetchurl {
    url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg";
-    hash = "sha256-3ObXD4DiJGlZhr+ItoBsF6cXuvecoyfKUDHXtAlBGks=";
+    hash = "sha256-A033eMKoQQ7Zz7P/UmndTqWQ8HjUhkW0ysb2M7px6RM=";
  };

  sourceRoot = ".";
@@ -10,13 +10,13 @@

 stdenv.mkDerivation rec {
  pname = "tail-tray";
-  version = "0.2.17";
+  version = "0.2.18";

  src = fetchFromGitHub {
    owner = "SneWs";
    repo = "tail-tray";
    tag = "v${version}";
-    sha256 = "sha256-Mobbh1c7f3aTxn0BEIm2A+DgS2TBSZTYiDlHxyaQEjk=";
+    sha256 = "sha256-Q+kethk9JpJCdMnt4qDpzuf8RUq3vpwTq1N8dLTpcpI=";
  };

  nativeBuildInputs = with kdePackages; [
@@ -11,8 +11,12 @@
  libX11,
  libdrm,
  libgbm,
+  nativeContextSupport ? stdenv.hostPlatform.isLinux,
  vaapiSupport ? !stdenv.hostPlatform.isDarwin,
  libva,
+  vulkanSupport ? stdenv.hostPlatform.isLinux,
+  vulkan-headers,
+  vulkan-loader,
  gitUpdater,
 }:

@@ -32,6 +36,10 @@ stdenv.mkDerivation rec {
      libepoxy
    ]
    ++ lib.optionals vaapiSupport [ libva ]
+    ++ lib.optionals vulkanSupport [
+      vulkan-headers
+      vulkan-loader
+    ]
    ++ lib.optionals stdenv.hostPlatform.isLinux [
      libGLU
      libX11
@@ -46,9 +54,14 @@ stdenv.mkDerivation rec {
    python3
  ];

-  mesonFlags = [
-    (lib.mesonBool "video" vaapiSupport)
-  ];
+  mesonFlags =
+    [
+      (lib.mesonBool "video" vaapiSupport)
+      (lib.mesonBool "venus" vulkanSupport)
+    ]
+    ++ lib.optionals nativeContextSupport [
+      (lib.mesonOption "drm-renderers" "amdgpu-experimental,msm")
+    ];

  passthru = {
    updateScript = gitUpdater {
@@ -3,6 +3,7 @@
  stdenv,
  buildPackages,
  fetchurl,
+  fetchpatch,
  autoreconfHook,
  gettext,
  pkg-config,
@@ -29,6 +30,12 @@ stdenv.mkDerivation rec {
      url = "https://lore.kernel.org/linux-xfs/20250212081649.3502717-1-hi@alyssa.is/raw";
      hash = "sha256-Z7BW0B+/5eHWXdHre++wRtdbU/P6XZqudYx6EK5msIU=";
    })
+    # Backport which fixes pkgsCross.armv7l-hf-multiplatform.xfsprogs
+    (fetchpatch {
+      name = "32-bit.patch";
+      url = "https://web.git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/patch/mkfs/proto.c?id=a5466cee9874412cfdd187f07c5276e1d4ef0fea";
+      hash = "sha256-svC7pSbblWfO5Khots2kWWfDMBXUrU35fk5wsdYuPQI=";
+    })
  ];

  outputs = [
@@ -11,11 +11,11 @@

 stdenv.mkDerivation rec {
  pname = "xmedcon";
-  version = "0.25.0";
+  version = "0.25.1";

  src = fetchurl {
    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-UKM68H2AGfe4+keW/0ZxQwPsF2tTAZQCEZT9var+MHs=";
+    sha256 = "sha256-WKyX65LQe/UbaE6jQi36kTgi4IXjgY1ZkE1aPQ+o0Tk=";
  };

  buildInputs = [
@@ -14,11 +14,11 @@

 stdenv.mkDerivation rec {
  pname = "zile";
-  version = "2.6.2";
+  version = "2.6.3";

  src = fetchurl {
    url = "mirror://gnu/zile/${pname}-${version}.tar.gz";
-    hash = "sha256-d+t9r/PJi9yI2qGsBA3MynK4HcMvwxZuB53Xpj5Cx0E=";
+    hash = "sha256-ZnILBiwVCiqW+igx9Vz5XfohycLWwEh/qSpaHkB0AG8=";
  };

  buildInputs = [
@@ -90,7 +90,7 @@
  withKvazaar ? withFullDeps, # HEVC encoding
  withLadspa ? withFullDeps, # LADSPA audio filtering
  withLc3 ? withFullDeps && lib.versionAtLeast version "7.1", # LC3 de/encoding
-  withLcevcdec ? false && lib.versionAtLeast version "7.1", # LCEVC decoding # FIXME currently makes ffmpeg crash in any operation on non-AVX CPUs
+  withLcevcdec ? withFullDeps && lib.versionAtLeast version "7.1", # LCEVC decoding
  withLcms2 ? withFullDeps, # ICC profile support via lcms2
  withLzma ? withHeadlessDeps, # xz-utils
  withMetal ? false, # Unfree and requires manual downloading of files
@@ -23,6 +23,10 @@ let
  };
 in
 {
+  icu77 = make-icu {
+    version = "77.1";
+    hash = "sha256-WI5DH3cyfDkDH/u4hDwOO8EiwhE3RIX6h9xfP6/yQGE=";
+  };
  icu76 = make-icu {
    version = "76.1";
    hash = "sha256-36y0a/5HR0EEcs4+EUS/KKEC/uqk44dbrJtMbPMPTz4=";
@@ -24,7 +24,9 @@ let

  release = lib.replaceStrings [ "." ] [ "-" ] version;
  # To test rc versions of ICU replace the line above with the line below.
-  #release = lib.replaceStrings [ "." ] [ "-" ] (if lib.hasSuffix "rc" version then lib.replaceStrings [ "1" ] [ "" ] version else version);
+  #release = lib.replaceStrings [ "." ] [ "-" ] (
+  #  if lib.hasSuffix "rc" version then lib.replaceStrings [ "1" ] [ "" ] version else version
+  #);

  baseAttrs = {
    src = fetchurl {
@@ -10,14 +10,14 @@

 buildDunePackage rec {
  pname = "fileutils";
-  version = "0.6.4";
+  version = "0.6.6";

  src = fetchurl {
    url = "https://github.com/gildor478/ocaml-fileutils/releases/download/v${version}/fileutils-${version}.tbz";
-    hash = "sha256-enu2vGo2tuvawrTkap6bENNmxaLUQXpfHWih+7oKRF8=";
+    hash = "sha256-eW1XkeK/ezv/IAz1BXp6GHhDnrzXTtDxCIz4Z1bVK+Y=";
  };

-  minimalOCamlVersion = "4.03";
+  minimalOCamlVersion = "4.14";

  propagatedBuildInputs = [
    seq
@@ -27,6 +27,11 @@ buildDunePackage rec {
    hash = "sha256-k4iDUJik7UTuztBw7YaFXASd8SqYMR1JgLm3JOyriGA=";
  };

+  # Compatibility with logs 0.8.0
+  postPatch = ''
+    substituteInPlace test/unix/dune --replace-warn logs.fmt 'logs.fmt logs.threaded'
+  '';
+
  minimalOCamlVersion = "4.08";

  buildInputs = [
@@ -11,7 +11,7 @@
  cmdliner,
  fmt,
  fmtSupport ? lib.versionAtLeast ocaml.version "4.08",
-  js_of_ocaml,
+  js_of_ocaml-compiler,
  jsooSupport ? true,
  lwtSupport ? true,
  cmdlinerSupport ? true,
@@ -22,8 +22,8 @@ let

  optional_deps = [
    {
-      pkg = js_of_ocaml;
-      enable_flag = "--with-js_of_ocaml";
+      pkg = js_of_ocaml-compiler;
+      enable_flag = "--with-js_of_ocaml-compiler";
      enabled = jsooSupport;
    }
    {
@@ -55,11 +55,11 @@ else

  stdenv.mkDerivation rec {
    name = "ocaml${ocaml.version}-${pname}-${version}";
-    version = "0.7.0";
+    version = "0.8.0";

    src = fetchurl {
      url = "${webpage}/releases/${pname}-${version}.tbz";
-      sha256 = "1jnmd675wmsmdwyb5mx5b0ac66g4c6gpv5s4mrx2j6pb0wla1x46";
+      hash = "sha256-mmFRQJX6QvMBIzJiO2yNYF1Ce+qQS2oNF3+OwziCNtg=";
    };

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

 buildPythonPackage rec {
  pname = "ailment";
-  version = "9.2.146";
+  version = "9.2.147";
  pyproject = true;

  disabled = pythonOlder "3.11";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
    owner = "angr";
    repo = "ailment";
    tag = "v${version}";
-    hash = "sha256-lTodIm5p9ptEg+rEPqoGNbVRxV18wiC++qJTIaYu3EM=";
+    hash = "sha256-WrqkTNFhttpLG1dG05+nnqzoPUQPZUG15JooChBIKEA=";
  };

  build-system = [ setuptools ];
@@ -38,7 +38,7 @@

 buildPythonPackage rec {
  pname = "angr";
-  version = "9.2.146";
+  version = "9.2.147";
  pyproject = true;

  disabled = pythonOlder "3.11";
@@ -47,7 +47,7 @@ buildPythonPackage rec {
    owner = "angr";
    repo = "angr";
    tag = "v${version}";
-    hash = "sha256-bBjD+rhS8VS7JKXJyqwlxl6hmi34grO9HCuZ06SFLh0=";
+    hash = "sha256-ndD0NnaJtxzvb33O7/UaKi2xRuC8VRArndynZp8zCr4=";
  };

  pythonRelaxDeps = [ "capstone" ];
@@ -0,0 +1,57 @@
+{
+  lib,
+  buildPythonPackage,
+  cython,
+  fetchFromGitHub,
+  poetry-core,
+  propcache,
+  pytest-asyncio,
+  pytest-codspeed,
+  pytest-cov-stub,
+  pytestCheckHook,
+  pyyaml,
+  setuptools,
+  voluptuous,
+}:
+
+buildPythonPackage rec {
+  pname = "annotatedyaml";
+  version = "0.4.4";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "home-assistant-libs";
+    repo = "annotatedyaml";
+    tag = "v${version}";
+    hash = "sha256-SKimMMqmA8twoojDncIAuUdB6DyoJsciuEneiVfTUg4=";
+  };
+
+  build-system = [
+    cython
+    poetry-core
+    setuptools
+  ];
+
+  dependencies = [
+    propcache
+    pyyaml
+    voluptuous
+  ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytest-codspeed
+    pytest-cov-stub
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "annotatedyaml" ];
+
+  meta = {
+    description = "Annotated YAML that supports secrets for Python";
+    homepage = "https://github.com/home-assistant-libs/annotatedyaml";
+    changelog = "https://github.com/home-assistant-libs/annotatedyaml/blob/${src.rev}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
@@ -11,7 +11,7 @@

 buildPythonPackage rec {
  pname = "archinfo";
-  version = "9.2.146";
+  version = "9.2.147";
  pyproject = true;

  disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
    owner = "angr";
    repo = "archinfo";
    tag = "v${version}";
-    hash = "sha256-8JlIhLqVPNm3P2ruJh5i7VxnnBXfubLzhtFnWF3RWf8=";
+    hash = "sha256-YDELaSIK4Bx0E6lxQsTd1zqyTsFrB9qxT6awuwUREXE=";
  };

  build-system = [ setuptools ];
@@ -11,7 +11,7 @@

 buildPythonPackage rec {
  pname = "bitstring";
-  version = "4.3.0";
+  version = "4.3.1";
  pyproject = true;

  disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
    owner = "scott-griffiths";
    repo = pname;
    tag = "bitstring-${version}";
-    hash = "sha256-0AaOVjroVb/maFBaB55ahwWyRHHnofja4pgSgjQMsT8=";
+    hash = "sha256-ZABAd42h+BqcpKTFV5PxcBN3F8FKV6Qw3rhP13eX57k=";
  };

  pythonRelaxDeps = [ "bitarray" ];
@@ -0,0 +1,99 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build system
+  hatchling,
+  hatch-vcs,
+
+  # dependencies
+  click,
+  httpx,
+  pydantic,
+  pydantic-settings,
+  questionary,
+  rich-click,
+  rich,
+  tomlkit,
+  wcmatch,
+
+  # test
+  gitMinimal,
+  freezegun,
+  pre-commit,
+  pytest-cov,
+  pytest-localserver,
+  pytest-mock,
+  pytestCheckHook,
+  versionCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "bump-my-version";
+  version = "1.0.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "callowayproject";
+    repo = "bump-my-version";
+    tag = version;
+    hash = "sha256-V5eFh2ne7ivtTH46QAxG0YPE0JN/W7Dt2fbf085hBVM=";
+  };
+
+  build-system = [
+    hatchling
+    hatch-vcs
+  ];
+
+  dependencies = [
+    click
+    httpx
+    pydantic
+    pydantic-settings
+    questionary
+    rich-click
+    rich
+    tomlkit
+    wcmatch
+  ];
+
+  env = {
+    GIT_AUTHOR_NAME = "test";
+    GIT_COMMITTER_NAME = "test";
+    GIT_AUTHOR_EMAIL = "test@example.com";
+    GIT_COMMITTER_EMAIL = "test@example.com";
+  };
+
+  nativeCheckInputs = [
+    gitMinimal
+    freezegun
+    pre-commit
+    pytest-cov
+    pytest-localserver
+    pytest-mock
+    pytestCheckHook
+    versionCheckHook
+  ];
+
+  versionCheckProgramArg = "--version";
+
+  __darwinAllowLocalNetworking = true;
+
+  pythonImportsCheck = [ "bumpversion" ];
+
+  meta = {
+    description = "Small command line tool to update version";
+    longDescription = ''
+      This is a maintained refactor of the bump2version fork of the
+      excellent bumpversion project. This is a small command line tool to
+      simplify releasing software by updating all version strings in your source code
+      by the correct increment and optionally commit and tag the changes.
+    '';
+    homepage = "https://github.com/callowayproject/bump-my-version";
+    changelog = "https://github.com/callowayproject/bump-my-version/tag/${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ daspk04 ];
+    mainProgram = "bump-my-version";
+  };
+}
@@ -1,32 +1,37 @@
 {
-  lib,
  buildPythonPackage,
  fetchFromGitHub,
+  lib,
  python,
+  setuptools,
 }:

 buildPythonPackage {
  pname = "chevron";
-  version = "0.13.1";
-  format = "setuptools";
+  version = "0.14.0-unstable-2021-03-21";
+  pyproject = true;

  # No tests available in the PyPI tarball
  src = fetchFromGitHub {
    owner = "noahmorrison";
    repo = "chevron";
-    rev = "0.13.1";
-    sha256 = "0l1ik8dvi6bgyb3ym0w4ii9dh25nzy0x4yawf4zbcyvvcb6af470";
+    rev = "5e1c12827b7fc3db30cb3b24cae9a7ee3092822b";
+    hash = "sha256-44cxkliJJ+IozmhS4ekbb+pCa7tcUuX9tRNYTK0mC+w=";
  };

+  build-system = [
+    setuptools
+  ];
+
  checkPhase = ''
    ${python.interpreter} test_spec.py
  '';

-  meta = with lib; {
+  meta = {
    homepage = "https://github.com/noahmorrison/chevron";
    description = "Python implementation of the mustache templating language";
    mainProgram = "chevron";
-    license = licenses.mit;
-    maintainers = with maintainers; [ dhkl ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dhkl ];
  };
 }
@@ -15,7 +15,7 @@

 buildPythonPackage rec {
  pname = "claripy";
-  version = "9.2.146";
+  version = "9.2.147";
  pyproject = true;

  disabled = pythonOlder "3.11";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
    owner = "angr";
    repo = "claripy";
    tag = "v${version}";
-    hash = "sha256-ZGagpKzbJBuBo3E7qYNQCBid0S/JB9fenikwksdM99Y=";
+    hash = "sha256-Ml7BPlx4TT/jPXE0TRp2GeghB68AsanitsjD7lmEphk=";
  };

  # z3 does not provide a dist-info, so python-runtime-deps-check will fail
@@ -17,14 +17,14 @@

 let
  # The binaries are following the argr projects release cycle
-  version = "9.2.146";
+  version = "9.2.147";

  # Binary files from https://github.com/angr/binaries (only used for testing and only here)
  binaries = fetchFromGitHub {
    owner = "angr";
    repo = "binaries";
    rev = "refs/tags/v${version}";
-    hash = "sha256-VhUFGSCV8ldv42BKsYi40fz1VAqQrS6rsrrjLNY4VcU=";
+    hash = "sha256-Hj56jvyKceDCqYg+JdItxTKuE66ykhhSbYSUWCL5ux4=";
  };
 in
 buildPythonPackage rec {
@@ -38,7 +38,7 @@ buildPythonPackage rec {
    owner = "angr";
    repo = "cle";
    rev = "refs/tags/v${version}";
-    hash = "sha256-zlgZm7ULEzrW40MZhZRMLshO7giutW+pUJpbTTom3t0=";
+    hash = "sha256-f4N97MFx/rfz1epFTbIQpPBGK+ioFRLZ99bINIbhktk=";
  };

  build-system = [ setuptools ];
@@ -82,7 +82,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Python loader for many binary formats";
    homepage = "https://github.com/angr/cle";
-    license = with licenses; [ bsd2 ];
+    license = licenses.bsd2;
    maintainers = with maintainers; [ fab ];
  };
 }
@@ -0,0 +1,48 @@
+{
+  lib,
+  buildPythonPackage,
+  cmake,
+  fetchFromGitHub,
+  gitpython,
+  ninja,
+  setuptools,
+  setuptools-scm,
+}:
+
+buildPythonPackage rec {
+  pname = "cmake-build-extension";
+  version = "0.6.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "diegoferigo";
+    repo = "cmake-build-extension";
+    tag = "v${version}";
+    hash = "sha256-taAwxa7Sv+xc8xJRnNM6V7WPcL+TWZOkngwuqjAslzc=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    cmake
+    ninja
+    gitpython
+  ];
+
+  dontUseCmakeConfigure = true;
+
+  pythonImportsCheck = [ "cmake_build_extension" ];
+
+  doPythonRuntimeDepsCheck = false;
+
+  meta = {
+    description = "Setuptools extension to build and package CMake projects";
+    homepage = "https://github.com/diegoferigo/cmake-build-extension";
+    changelog = "https://github.com/diegoferigo/cmake-build-extension/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ scoder12 ];
+  };
+}
@@ -0,0 +1,43 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  jfx-bridge,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "ghidra-bridge";
+  version = "1.0.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "justfoxing";
+    repo = "ghidra_bridge";
+    tag = version;
+    hash = "sha256-VcAl1tamsuHvZRtBP0+DCl2A9d7E6aoj2AbJhEcBNMM=";
+  };
+
+  patches = [ ./no-invoke-git.patch ];
+
+  postPatch = ''
+    substituteInPlace ./setup.py --subst-var-by version ${version}
+  '';
+
+  build-system = [ setuptools ];
+
+  dependencies = [ jfx-bridge ];
+
+  # Tests require a running server instance
+  doCheck = false;
+
+  pythonImportsCheck = [ "ghidra_bridge" ];
+
+  meta = {
+    description = "Python bridge to Ghidra's Python scripting";
+    homepage = "https://github.com/justfoxing/ghidra_bridge";
+    changelog = "https://github.com/justfoxing/ghidra_bridge/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ scoder12 ];
+  };
+}
@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index 9a2abe0..75ce109 100644
+--- a/setup.py
+++ b/setup.py
+@@ -6,7 +6,7 @@ with open("README.md", "r") as fh:
+ 
+ # determine the version, then write it out into the bridge.py file
+ version = (
+-    subprocess.check_output("git describe --tags", shell=True).decode("utf-8").strip()
+    "@version@"
+ )
+ # check if this is a non-tag release and remark it as a dev release
+ if "-" in version:
@@ -0,0 +1,52 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytestCheckHook,
+  python,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "jfx-bridge";
+  version = "1.0.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "justfoxing";
+    repo = "jfx_bridge";
+    tag = version;
+    hash = "sha256-fpUrKNGqTpthhTfohCbwO1GBDAP/YnLWeapVhZftldg=";
+  };
+
+  patches = [ ./no-invoke-git.patch ];
+
+  postPatch = ''
+    substituteInPlace ./setup.py --subst-var-by version ${version}
+  '';
+
+  build-system = [ setuptools ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  preCheck = ''
+    ${python.interpreter} test_bridge_server.py &
+  '';
+
+  disabledTests = [
+    # known to cause timeout with newer python (acknowledged in test comment)
+    "test_nonreturn_marker_local"
+    # the mechanisms that hook into the python import machinery seem broken on newer python
+    "TestBridgeHookImport"
+  ];
+
+  pythonImportsCheck = [ "jfx_bridge" ];
+
+  meta = {
+    description = "Base Python RPC bridge used for ghidra_bridge";
+    homepage = "https://github.com/justfoxing/jfx_bridge";
+    changelog = "https://github.com/justfoxing/jfx_bridge/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ scoder12 ];
+  };
+}
@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index 079cb01..c5e71b8 100644
+--- a/setup.py
+++ b/setup.py
+@@ -6,7 +6,7 @@ with open("README.md", "r") as fh:
+     long_description = fh.read()
+ 
+ # determine the version, then write it out into the bridge.py file
+-version = subprocess.check_output("git describe --tags", shell=True).decode("utf-8").strip()
+version = "@version@"
+ # check if this is a non-tag release and remark it as a dev release
+ if "-" in version:
+     ver, commits, hash = version.split("-")
@@ -0,0 +1,69 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  filelock,
+  ghidra-bridge,
+  jfx-bridge,
+  networkx,
+  platformdirs,
+  prompt-toolkit,
+  psutil,
+  pycparser,
+  pyhidra,
+  pytestCheckHook,
+  setuptools,
+  toml,
+  tqdm,
+  writableTmpDirAsHomeHook,
+}:
+
+buildPythonPackage rec {
+  pname = "libbs";
+  version = "2.11.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "binsync";
+    repo = "libbs";
+    tag = "v${version}";
+    hash = "sha256-hYRRmnxA6K7O6suaP1eGRnY89gok3JNNsL70XRGWYBU=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    filelock
+    ghidra-bridge
+    jfx-bridge
+    networkx
+    platformdirs
+    prompt-toolkit
+    psutil
+    pycparser
+    pyhidra
+    toml
+    tqdm
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    writableTmpDirAsHomeHook
+  ];
+
+  pythonImportsCheck = [ "libbs" ];
+
+  disabledTests = [
+    "test_change_watcher_plugin_cli"
+    "test_ghidra_artifact_watchers"
+    "TestHeadlessInterfaces"
+  ];
+
+  meta = {
+    description = "Library for writing plugins in any decompiler: includes API lifting, common data formatting, and GUI abstraction";
+    homepage = "https://github.com/binsync/libbs";
+    changelog = "https://github.com/binsync/libbs/releases/tag/${src.tag}";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ scoder12 ];
+  };
+}
@@ -53,7 +53,6 @@ buildPythonPackage rec {
      upl
    ];
    maintainers = with lib.maintainers; [
-      adamcstephens
      ilian
    ];
  };
@@ -1,45 +1,45 @@
 {
  lib,
-  fetchPypi,
  buildPythonPackage,
-  logutils,
-  mako,
-  webob,
-  webtest,
-  pythonOlder,
-  pytestCheckHook,
+  fetchPypi,
  genshi,
  gunicorn,
  jinja2,
+  mako,
+  pytestCheckHook,
+  pythonOlder,
+  setuptools,
  sqlalchemy,
  virtualenv,
-  setuptools,
+  webob,
+  webtest,
 }:

 buildPythonPackage rec {
  pname = "pecan";
-  version = "1.5.1";
-  format = "setuptools";
+  version = "1.6.0";
+  pyproject = true;

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

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-YGMnLV+GB3P7tLSyrhsJ2oyVQGLvhxFQwGz9sjkdk1U=";
+    hash = "sha256-X9RGlYPu0t7Te00QpHDhGl3j88lj3IeYTncuJcVv7T4=";
  };

-  propagatedBuildInputs = [
-    logutils
+  build-system = [ setuptools ];
+
+  dependencies = [
    mako
-    webob
    setuptools
+    webob
  ];

  nativeCheckInputs = [
-    pytestCheckHook
    genshi
    gunicorn
    jinja2
+    pytestCheckHook
    sqlalchemy
    virtualenv
    webtest
@@ -50,9 +50,9 @@ buildPythonPackage rec {
  pythonImportsCheck = [ "pecan" ];

  meta = with lib; {
-    changelog = "https://pecan.readthedocs.io/en/latest/changes.html";
    description = "WSGI object-dispatching web framework";
    homepage = "https://www.pecanpy.org/";
+    changelog = "https://github.com/pecan/pecan/releases/tag/${version}";
    license = licenses.bsd3;
    maintainers = with maintainers; [ applePrincess ];
  };
@@ -21,9 +21,9 @@ dependencies = [

 [[package]]
 name = "async-trait"
-version = "0.1.87"
+version = "0.1.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d556ec1359574147ec0c4fc5eb525f3f23263a592b1a9c07e0a75b427de55c97"
+checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -162,9 +162,9 @@ dependencies = [

 [[package]]
 name = "libc"
-version = "0.2.170"
+version = "0.2.171"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828"
+checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"

 [[package]]
 name = "lock_api"
@@ -199,9 +199,9 @@ dependencies = [

 [[package]]
 name = "once_cell"
-version = "1.20.3"
+version = "1.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
+checksum = "d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc"

 [[package]]
 name = "parking"
@@ -245,7 +245,7 @@ dependencies = [

 [[package]]
 name = "pycrdt"
-version = "0.12.9"
+version = "0.12.10"
 dependencies = [
 "pyo3",
 "yrs",
@@ -316,9 +316,9 @@ dependencies = [

 [[package]]
 name = "quote"
-version = "1.0.39"
+version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1f1914ce909e1658d9907913b4b91947430c7d9be598b15a1912935b8c04801"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
 dependencies = [
 "proc-macro2",
 ]
@@ -569,9 +569,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"

 [[package]]
 name = "yrs"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34419a20030ca6e452431d317d4d22b797507dfc380953a4f4fc01ee8491516b"
+checksum = "0189b51d8ab1283e7c1f1f515c610875262e629cf258bec530da5cd4aa115d59"
 dependencies = [
 "arc-swap",
 "async-lock",
@@ -19,14 +19,14 @@

 buildPythonPackage rec {
  pname = "pycrdt";
-  version = "0.12.9";
+  version = "0.12.10";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "jupyter-server";
    repo = "pycrdt";
    tag = version;
-    hash = "sha256-6wIY1Wb82C0E8BA9kIrmdLPxNw4O18DPP3vrVZgSotI=";
+    hash = "sha256-1zW7uR5M8CfdKW5QooNi9WMjJQiLcSQI/7EUL7BJ65w=";
  };

  postPatch = ''
@@ -15,14 +15,14 @@

 buildPythonPackage rec {
  pname = "pygame-sdl2";
-  version = "8.3.5.25022704";
+  version = "8.3.7.25031702";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "renpy";
    repo = "pygame_sdl2";
    tag = "renpy-${version}";
-    hash = "sha256-MA6c29UbZIBCIxUDfSiqxgdhrd9Ys5Yf/zKeXvI1iJ0=";
+    hash = "sha256-7MoQpCkBd20qck7eycs/MX0sjj4XRIrZmYPkKhuct6w=";
  };

  build-system = [
@@ -0,0 +1,57 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  jpype1,
+  pytest-datadir,
+  pytestCheckHook,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "pyhidra";
+  version = "1.3.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "dod-cyber-crime-center";
+    repo = "pyhidra";
+    tag = version;
+    hash = "sha256-8xouU+S7Apy1ySIlvOLPerTApqKy/MNdl9vuBdt+9Vk=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ jpype1 ];
+
+  nativeCheckInputs = [
+    pytest-datadir
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "pyhidra" ];
+
+  disabledTests = [
+    # Tests require a running Ghidra instance
+    "test_invalid_jpype_keyword_arg"
+    "test_invalid_vm_arg_succeed"
+    "test_run_script"
+    "test_open_program"
+    "test_no_compiler"
+    "test_no_language_with_compiler"
+    "test_loader"
+    "test_invalid_loader_type"
+    "test_no_project"
+    "test_no_program"
+    "test_import_script"
+    "test_import_ghidra_base_java_packages"
+  ];
+
+  meta = {
+    description = "Provides direct access to the Ghidra API within a native CPython interpreter using jpype";
+    homepage = "https://github.com/dod-cyber-crime-center/pyhidra";
+    changelog = "https://github.com/dod-cyber-crime-center/pyhidra/blob/${src.tag}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ scoder12 ];
+  };
+}
@@ -0,0 +1,80 @@
+{
+  lib,
+  buildPythonPackage,
+  cmake-build-extension,
+  fetchFromGitHub,
+  pythonRelaxDepsHook,
+  pyside6,
+  qt6,
+  setuptools,
+  setuptools-scm,
+  shiboken6,
+}:
+
+buildPythonPackage rec {
+  pname = "pyside6-qtads";
+  version = "4.3.1.4";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "mborgerson";
+    repo = "pyside6_qtads";
+    tag = "v${version}";
+    hash = "sha256-02YUeD9PfcaYkvz9JX5FucsbG9Idk7OH24U+RXXEmvo=";
+    fetchSubmodules = true;
+  };
+
+  # bypass the broken parts of their bespoke python script cmake plugin
+  patches = [ ./find-nix-deps.patch ];
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace-fail @shiboken6@ ${shiboken6} \
+      --replace-fail @pyside6@ ${pyside6}
+
+    # can't use pythonRelaxDepsHook because it runs postBuild but the dependency check
+    #  happens during build.
+    # -Essentials is a smaller version of PySide6, but the name mismatch breaks build
+    # _generator is also a virtual package with the same issue
+    substituteInPlace pyproject.toml \
+      --replace-warn 'PySide6-Essentials' "" \
+      --replace-warn 'shiboken6_generator' "" \
+      --replace-quiet '"",' "" \
+      --replace-quiet '""' ""
+  '';
+
+  buildInputs = [
+    qt6.qtbase
+    qt6.qtquick3d
+  ];
+
+  build-system = [
+    cmake-build-extension
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    pyside6
+    shiboken6
+  ];
+
+  nativeBuildInputs = [ pythonRelaxDepsHook ];
+
+  # cmake-build-extension will configure
+  dontUseCmakeConfigure = true;
+
+  dontWrapQtApps = true;
+  # runtime deps check fails on the pyside6-essentials virtual package
+  dontCheckRuntimeDeps = true;
+
+  pythonImportsCheck = [ "PySide6QtAds" ];
+
+  meta = {
+    description = "Python bindings to Qt Advanced Docking System for PySide6";
+    homepage = "https://github.com/mborgerson/pyside6_qtads";
+    changelog = "https://github.com/mborgerson/pyside6_qtads/releases/tag/";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ scoder12 ];
+  };
+}
@@ -0,0 +1,43 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0c0568a..f12d50e 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -105,15 +105,17 @@ macro(pyside_config option output_var)
+ endmacro()
+ 
+ # Query for the shiboken generator path, Python path, include paths and linker flags.
+find_package(Shiboken6 REQUIRED)
+find_package(PySide6 REQUIRED)
+ pyside_config(--shiboken-module-path shiboken_module_path)
+-pyside_config(--shiboken-generator-path shiboken_generator_path)
+-pyside_config(--pyside-path pyside_path)
+-pyside_config(--pyside-include-path pyside_include_dir 1)
+set(shiboken_generator_path "" CACHE PATH "Path where shiboken6 executable can be found")
+set(pyside_path "" CACHE PATH "pyside share path, where typesystems dir can be found")
+get_target_property(pyside_include_dir PySide6::pyside6 INTERFACE_INCLUDE_DIRECTORIES)
+ pyside_config(--python-include-path python_include_dir)
+-pyside_config(--shiboken-generator-include-path shiboken_include_dir 1)
+-pyside_config(--shiboken-module-shared-libraries-cmake shiboken_shared_libraries 0)
+get_target_property(shiboken_include_dir Shiboken6::libshiboken INTERFACE_INCLUDE_DIRECTORIES)
+get_target_property(shiboken_shared_libraries Shiboken6::libshiboken IMPORTED_LOCATION_RELEASE)
+ pyside_config(--python-link-flags-cmake python_linking_data 0)
+-pyside_config(--pyside-shared-libraries-cmake pyside_shared_libraries 0)
+get_target_property(pyside_shared_libraries PySide6::pyside6 IMPORTED_LOCATION_RELEASE)
+ 
+ set(shiboken_path "${shiboken_generator_path}/shiboken6${CMAKE_EXECUTABLE_SUFFIX}")
+ if(NOT EXISTS ${shiboken_path})
+diff --git a/setup.py b/setup.py
+index 802821b..f522818 100644
+--- a/setup.py
+++ b/setup.py
+@@ -88,7 +88,9 @@ setuptools.setup(
+                 "-DBUILD_STATIC:BOOL=ON",
+                 "-DADS_VERSION=4.3.0",
+                 f"-DPython3_ROOT_DIR={Path(sys.prefix)}",
+-                f"-DPython_EXECUTABLE={Path(sys.executable)}"
+                f"-DPython_EXECUTABLE={Path(sys.executable)}",
+                "-Dshiboken_generator_path=@shiboken6@/bin",
+                "-Dpyside_path=@pyside6@/share/PySide6"
+             ],
+             py_limited_api=True
+         ),
@@ -13,14 +13,14 @@

 buildPythonPackage rec {
  pname = "pyvex";
-  version = "9.2.146";
+  version = "9.2.147";
  pyproject = true;

  disabled = pythonOlder "3.11";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-JfKT7epFi9g/kfum7MrGOT2c2OaLkVj3b4hFZiQTDJE=";
+    hash = "sha256-TC7jmGibYJ/FfTb4Btmv10O4Dt741f3SrcTWmw6d7ho=";
  };

  build-system = [ setuptools ];
@@ -2,6 +2,7 @@
  lib,
  aiodns,
  aiohttp,
+  aiosqlite,
  boto3,
  buildPythonPackage,
  fetchFromGitHub,
@@ -14,30 +15,27 @@
  sqlalchemy,
  websocket-client,
  websockets,
+  writableTmpDirAsHomeHook,
 }:

 buildPythonPackage rec {
  pname = "slack-sdk";
-  version = "3.34.0";
+  version = "3.35.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "slackapi";
    repo = "python-slack-sdk";
    tag = "v${version}";
-    hash = "sha256-aL8XOlvnAxT9cgPf8EvJT80FmlgL2Vhu7JxDRHkUoSM=";
+    hash = "sha256-yjYpALyHSTLQSuwd6xth7nqfi3m1C9tqnWrrVRmI220=";
  };

-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail ', "pytest-runner"' ""
-  '';
-
  build-system = [ setuptools ];

  dependencies = [
    aiodns
    aiohttp
+    aiosqlite
    boto3
    sqlalchemy
    websocket-client
@@ -54,10 +52,6 @@ buildPythonPackage rec {
    pytestCheckHook
  ];

-  preCheck = ''
-    export HOME=$(mktemp -d)
-  '';
-
  disabledTests = [
    # Requires internet access (to slack API)
    "test_start_raises_an_error_if_rtm_ws_url_is_not_returned"
@@ -65,6 +59,12 @@ buildPythonPackage rec {
    "test_send_message_while_disconnection"
  ];

+  disabledTestPaths = [
+    # Event loop issues
+    "tests/slack_sdk/oauth/installation_store/test_file.py"
+    "tests/slack_sdk/oauth/state_store/test_file.py"
+  ];
+
  __darwinAllowLocalNetworking = true;

  meta = {
@@ -33,12 +33,12 @@

 buildPythonPackage rec {
  pname = "tempest";
-  version = "42.0.0";
+  version = "43.0.0";
  pyproject = true;

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-nW6cSOhC56YkyUQiXcJTqaojRseIf9q8YGSe4skhTA4=";
+    hash = "sha256-Py8SwyBYO35t+xv8oaxLv58owEUX/T9uhp3XM5wjsAI=";
  };

  pythonRelaxDeps = [ "defusedxml" ];
@@ -58,14 +58,14 @@

 buildPythonPackage rec {
  pname = "transformers";
-  version = "4.49.0";
+  version = "4.50.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "huggingface";
    repo = "transformers";
    tag = "v${version}";
-    hash = "sha256-drq7RWoRaRejiQjCUHIYuzaKa9rA4eQZI2do74scp1c=";
+    hash = "sha256-/scrMPUY43n+XAMbwWCtmiJKXscXGLrklyDg9XZTaqw=";
  };

  build-system = [ setuptools ];
@@ -8,13 +8,13 @@
 }:
 buildPythonPackage rec {
  pname = "typecode-libmagic";
-  version = "21.4.4";
+  version = "21.5.31";

  src = fetchFromGitHub {
-    owner = "nexB";
+    owner = "aboutcode-org";
    repo = "scancode-plugins";
-    rev = "v${version}";
-    sha256 = "xnUGDMS34iMVMGo/nZwRarGzzbj3X4Rt+YHvvKpmy6A=";
+    tag = "v${version}";
+    hash = "sha256-nGgFjp1N1IM/Sm4xLJw5WiZncc369/LqNcwFJBS1EQs=";
  };

  sourceRoot = "${src.name}/builtins/typecode_libmagic-linux";
@@ -39,7 +39,7 @@ buildPythonPackage rec {

  meta = with lib; {
    description = "ScanCode Toolkit plugin to provide pre-built binary libraries and utilities and their locations";
-    homepage = "https://github.com/nexB/scancode-plugins/tree/main/builtins/typecode_libmagic-linux";
+    homepage = "https://github.com/aboutcode-org/scancode-plugins/tree/main/builtins/typecode_libmagic-linux";
    license = licenses.asl20;
    maintainers = [ ];
    platforms = platforms.linux;
@@ -8,7 +8,7 @@

 buildPythonPackage rec {
  pname = "types-awscrt";
-  version = "0.24.1";
+  version = "0.24.2";
  pyproject = true;

  disabled = pythonOlder "3.8";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "types_awscrt";
    inherit version;
-    hash = "sha256-/G6uVvjcWj+MyTzCx8My+oKQn4KE++JeAUxXV1evOX0=";
+    hash = "sha256-WCa69prV0px2vkn8ffACIigfoxsU+Z6ftEktceyY/qU=";
  };

  build-system = [ setuptools ];
@@ -117,11 +117,14 @@ stdenv.mkDerivation rec {

  env.NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral";

-  configurePlatforms = [
-    "build"
-    "host"
-    "target"
-  ];
+  # Workaround for Apple Silicon, configurePlatforms must be disabled
+  configurePlatforms =
+    lib.optionals (!(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64))
+      [
+        "build"
+        "host"
+        "target"
+      ];

  preConfigure = ''
    # remove precompiled docs, required for man gdbinit to mention /etc/gdb/gdbinit
@@ -170,7 +173,11 @@ stdenv.mkDerivation rec {
    ++ lib.optional stdenv.hostPlatform.isMusl "--disable-nls"
    ++ lib.optional stdenv.hostPlatform.isStatic "--disable-inprocess-agent"
    ++ lib.optional enableDebuginfod "--with-debuginfod=yes"
-    ++ lib.optional (!enableSim) "--disable-sim";
+    ++ lib.optional (!enableSim) "--disable-sim"
+    # Workaround for Apple Silicon, "--target" must be "faked", see eg: https://github.com/Homebrew/homebrew-core/pull/209753
+    ++ lib.optional (
+      stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64
+    ) "--target=x86_64-apple-darwin";

  postInstall = ''
    # Remove Info files already provided by Binutils and other packages.
@@ -210,9 +217,6 @@ stdenv.mkDerivation rec {
    license = lib.licenses.gpl3Plus;

    platforms = with lib.platforms; linux ++ cygwin ++ freebsd ++ darwin;
-    # upstream does not support targeting aarch64-darwin;
-    # see https://inbox.sourceware.org/gdb/3185c3b8-8a91-4beb-a5d5-9db6afb93713@Spark/
-    badPlatforms = lib.optionals (stdenv.targetPlatform.system == "aarch64-darwin") meta.platforms;
    maintainers = with lib.maintainers; [
      pierron
      globin
@@ -16,8 +16,8 @@ let
      hash = "sha256-z4anrXZEBjldQoam0J1zBxFyCsxtk+nc6ax6xNxKKKc=";
    };
    "10" = {
-      version = "10.6.3";
-      hash = "sha256-vB7+ku5NQLGnpkTlyp4YVcXF6vxrFRL5AXsxuSRUGds=";
+      version = "10.6.5";
+      hash = "sha256-R8i8pCtLSFNLWxso1XPFBnc5N7AvaOUpkvvYJpExxcg=";
    };
  };

@@ -1,6 +1,7 @@
 {
  lib,
  stdenvNoCC,
+  writeScript,
  callPackages,
  fetchurl,
  installShellFiles,
@@ -10,7 +11,9 @@
  version,
  hash,
 }:
-
+let
+  majorVersion = lib.versions.major version;
+in
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "pnpm";
  inherit version;
@@ -71,10 +74,32 @@ stdenvNoCC.mkDerivation (finalAttrs: {
    in
    {
      inherit (fetchDepsAttrs) fetchDeps configHook;
+      inherit majorVersion;

      tests.version = lib.optionalAttrs withNode (
        testers.testVersion { package = finalAttrs.finalPackage; }
      );
+      updateScript = writeScript "pnpm-update-script" ''
+        #!/usr/bin/env nix-shell
+        #!nix-shell -i bash -p curl jq common-updater-scripts
+        set -eou pipefail
+
+        curl_github() {
+            curl -L ''${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "$@"
+        }
+
+        latestTag=$(curl_github https://api.github.com/repos/pnpm/pnpm/releases?per_page=100 | jq -r --arg major "v${majorVersion}" '[.[].tag_name | select(startswith($major))][0]')
+
+        # Exit if there is no tag with this major version
+        if [ "$latestTag" = "null" ]; then
+          echo "No releases starting with v${majorVersion}"
+          exit 0
+        fi
+
+        latestVersion="''${latestTag#v}"
+
+        update-source-version pnpm_${majorVersion} "$latestVersion" --file=./pkgs/development/tools/pnpm/default.nix
+      '';
    };

  meta = {
@@ -231,7 +231,7 @@ partition.
 .It Cm build-image
 Build a disk-image variant, pre-configured for the given platform/provider.
 Select a variant with the
-.Fl --image-variant
+.Fl -image-variant
 option or run without any options to get a list of available variants.

 .Bd -literal -offset indent
@@ -76,27 +76,31 @@ stdenv.mkDerivation {
    installShellFiles
    pkg-config
  ];
-  buildInputs = [
-    luajit
-    ncurses
-    openssl
-    curl
-    jq
-    gcc
-    elfutils
-    tbb
-    re2
-    protobuf
-    grpc
-    yaml-cpp
-    jsoncpp
-    nlohmann_json
-    zstd
-    uthash
-    clang
-    libbpf
-    bpftools
-  ] ++ lib.optionals (kernel != null) kernel.moduleBuildDependencies;
+  buildInputs =
+    [
+      luajit
+      ncurses
+      openssl
+      curl
+      jq
+      tbb
+      re2
+      protobuf
+      grpc
+      yaml-cpp
+      jsoncpp
+      nlohmann_json
+      zstd
+      uthash
+    ]
+    ++ lib.optionals stdenv.isLinux [
+      bpftools
+      elfutils
+      libbpf
+      clang
+      gcc
+    ]
+    ++ lib.optionals (kernel != null) kernel.moduleBuildDependencies;

  hardeningDisable = [
    "pic"
@@ -158,7 +162,7 @@ stdenv.mkDerivation {
    '';

  postInstall =
-    ''
+    lib.optionalString stdenv.isLinux ''
      # Fix the bash completion location
      installShellCompletion --bash $out/etc/bash_completion.d/sysdig
      rm $out/etc/bash_completion.d/sysdig
@@ -11,13 +11,13 @@

 postgresqlBuildExtension rec {
  pname = "citus";
-  version = "13.0.2";
+  version = "13.0.3";

  src = fetchFromGitHub {
    owner = "citusdata";
    repo = "citus";
    tag = "v${version}";
-    hash = "sha256-SuJs6OCHKO7efQagsATgn/V9rgMyuXQIHGCEP9ME7tQ=";
+    hash = "sha256-tQ2YkMUeziz+dhfXtfuK0x8PWH3vfoJiVbE+YvQ/Gzc=";
  };

  patches = [
@@ -8,13 +8,13 @@

 postgresqlBuildExtension rec {
  pname = "pg_ivm";
-  version = "1.9";
+  version = "1.10";

  src = fetchFromGitHub {
    owner = "sraoss";
    repo = "pg_ivm";
    tag = "v${version}";
-    hash = "sha256-Qcie7sbXcMbQkMoFIYBfttmvlYooESdSk2DyebHKPlk=";
+    hash = "sha256-4/ftJkm2ZInm9lkjJG7y4ZULwlyVC19lP0wGXu56SGw=";
  };

  meta = {
@@ -9149,6 +9149,7 @@ with pkgs;
    icu74
    icu75
    icu76
+    icu77
  ;

  icu = icu76;
@@ -636,6 +636,8 @@ self: super: with self; {

  annotated-types = callPackage ../development/python-modules/annotated-types { };

+  annotatedyaml = callPackage ../development/python-modules/annotatedyaml { };
+
  annoy = callPackage ../development/python-modules/annoy { };

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

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

+  bump-my-version = callPackage ../development/python-modules/bump-my-version { };
+
  bumpfontversion = callPackage ../development/python-modules/bumpfontversion { };

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

  cmake = callPackage ../development/python-modules/cmake { inherit (pkgs) cmake; };

+  cmake-build-extension = callPackage ../development/python-modules/cmake-build-extension { };
+
  cmarkgfm = callPackage ../development/python-modules/cmarkgfm { };

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

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

+  ghidra-bridge = callPackage ../development/python-modules/ghidra-bridge { };
+
  ghome-foyer-api = callPackage ../development/python-modules/ghome-foyer-api { };

  ghp-import = callPackage ../development/python-modules/ghp-import { };
@@ -6800,6 +6808,8 @@ self: super: with self; {

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

+  jfx-bridge = callPackage ../development/python-modules/jfx-bridge { };
+
  jianpu-ly = callPackage ../development/python-modules/jianpu-ly { };

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

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

+  libbs = callPackage ../development/python-modules/libbs { };
+
  pa-ringbuffer = callPackage ../development/python-modules/pa-ringbuffer { };

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

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

+  pyhidra = callPackage ../development/python-modules/pyhidra { };
+
  pyhive-integration = callPackage ../development/python-modules/pyhive-integration { };

  pyhumps = callPackage ../development/python-modules/pyhumps { };
@@ -12999,6 +13013,8 @@ self: super: with self; {
    inherit (pkgs) cmake ninja;
  });

+  pyside6-qtads = callPackage ../development/python-modules/pyside6-qtads { };
+
  pysigma = callPackage ../development/python-modules/pysigma { };

  pysigma-backend-elasticsearch = callPackage ../development/python-modules/pysigma-backend-elasticsearch { };
				`@@ -0,0 +1 @@`
				`{ python3Packages }: with python3Packages; toPythonApplication bump-my-version`