Merge master into staging-next

2024-08-23 12:05:14 +00:00
parent b71b5324ee 5b36ae93b0
commit ceef45b437
88 changed files with 1375 additions and 1180 deletions
@@ -73,6 +73,9 @@ OK_MISSING_BY_PACKAGE = {
    "kwin": {
        "display-info",  # newer versions identify as libdisplay-info
    },
+    "libksysguard": {
+        "Libcap",  # used to call setcap at build time and nothing else
+    },
    "mlt": {
        "Qt5",  # intentionally disabled
        "SWIG",
@@ -88,6 +91,9 @@ OK_MISSING_BY_PACKAGE = {
    "powerdevil": {
        "DDCUtil",  # cursed, intentionally disabled
    },
+    "print-manager": {
+        "PackageKitQt6",  # used for auto-installing drivers which does not work for obvious reasons
+    },
    "pulseaudio-qt": {
        "Qt6Qml",  # tests only
        "Qt6Quick",
@@ -104,6 +104,7 @@ luv,,,,1.48.0-2,,
 lush.nvim,,,https://luarocks.org/dev,,,teto
 lyaml,,,,,,lblasc
 lz.n,,,,,,mrcjkb
+lzn-auto-require,,,,,,mrcjkb
 magick,,,,,5.1,donovanglover
 markdown,,,,,,
 mediator_lua,,,,,,
@@ -402,9 +402,6 @@
 - `nix.channel.enable = false` no longer implies `nix.settings.nix-path = []`.
  Since Nix 2.13, a `nix-path` set in `nix.conf` cannot be overriden by the `NIX_PATH` configuration variable.

- Buildkite Agents are now each running in their own private `/tmp`.
-  To return to the old behaviour, set `systemd.services.buildkite-agent-${name}.serviceConfig.PrivateTmp = false;`.
-
 ## Detailed migration information {#sec-release-24.11-migration}

 ### `sound` options removal {#sec-release-24.11-migration-sound}
@@ -205,8 +205,6 @@ in
      serviceConfig = {
        ExecStart = "${cfg.package}/bin/buildkite-agent start --config ${cfg.dataDir}/buildkite-agent.cfg";
        User = "buildkite-agent-${name}";
-        # Workaround https://github.com/buildkite/agent/issues/2916
-        PrivateTmp = lib.mkDefault true;
        RestartSec = 5;
        Restart = "on-failure";
        TimeoutSec = 10;
@@ -62,7 +62,7 @@ let
                # NOTE: what featureGates are useful for testing might change in
                # the future, see link below to find new ones
                # https://kubernetes.io/docs/reference/command-line-tools-reference/feature-gates/
-                featureGates = {CPUManager = true; AppArmor= false;};
+                featureGates = {AnonymousAuthConfigurableEndpoints = true; ConsistentListFromCache = false;};
                masterAddress = "${masterName}.${config.networking.domain}";
              };
            }
@@ -2417,6 +2417,18 @@ final: prev:
    meta.homepage = "https://github.com/numtostr/comment.nvim/";
  };

+  comment-box-nvim = buildVimPlugin {
+    pname = "comment-box.nvim";
+    version = "v1.0.2";
+    src = fetchFromGitHub {
+      owner = "LudoPinelli";
+      repo = "comment-box.nvim";
+      rev = "e04635ed2b423448b87ddb2f35c26d1a7b7b3f1c";
+      sha256 = "sha256-2P8Zyd5ucOvihZdjgSmr7YlV0yuCn+LyHkCj9gPx/CY=";
+    };
+    meta.homepage = "https://github.com/LudoPinelli/comment-box.nvim/";
+  };
+
  committia-vim = buildVimPlugin {
    pname = "committia.vim";
    version = "2023-11-25";
@@ -4690,6 +4702,19 @@ final: prev:
    meta.homepage = "https://github.com/rebelot/heirline.nvim/";
  };

+  helpview-nvim = buildVimPlugin {
+    pname = "helpview.nvim";
+    version = "2024-08-12";
+    src = fetchFromGitHub {
+      owner = "OXY2DEV";
+      repo = "helpview.nvim";
+      rev = "49398d628d74283c5a389a6ced40bd8d2daaf56c";
+      sha256 = "0b1z3gz1jpqzf71kjpkw9q3fxbjcdykxi65an6npci0acia49ga2";
+      fetchSubmodules = true;
+    };
+    meta.homepage = "https://github.com/OXY2DEV/helpview.nvim/";
+  };
+
  hex-nvim = buildVimPlugin {
    pname = "hex.nvim";
    version = "2024-03-03";
@@ -9653,6 +9678,18 @@ final: prev:
    meta.homepage = "https://github.com/winston0410/range-highlight.nvim/";
  };

+  ranger-nvim = buildVimPlugin {
+    pname = "ranger.nvim";
+    version = "2024-02-09";
+    src = fetchFromGitHub {
+      owner = "kelly-lin";
+      repo = "ranger.nvim";
+      rev = "d3b032feee6b3b0cf923222f260523e2bd7f3ad3";
+      sha256 = "07c0rri7v0z9hjdj3vqsqjms43y2a9kqqac2s5is7ksz2hqi5yzj";
+    };
+    meta.homepage = "https://github.com/kelly-lin/ranger.nvim/";
+  };
+
  ranger-vim = buildVimPlugin {
    pname = "ranger.vim";
    version = "2021-12-13";
@@ -10459,6 +10496,18 @@ final: prev:
    meta.homepage = "https://github.com/luukvbaal/statuscol.nvim/";
  };

+  stay-centered-nvim = buildVimPlugin {
+    pname = "stay-centered.nvim";
+    version = "2024-04-13";
+    src = fetchFromGitHub {
+      owner = "arnamak";
+      repo = "stay-centered.nvim";
+      rev = "91113bd82ac34f25c53d53e7c1545cb5c022ade8";
+      sha256 = "030xikkr06lslp77z1i1xn6pgndnc12z3q2i8xd9vv8jmzylaf0c";
+    };
+    meta.homepage = "https://github.com/arnamak/stay-centered.nvim/";
+  };
+
  styler-nvim = buildVimPlugin {
    pname = "styler.nvim";
    version = "2024-07-22";
@@ -17756,5 +17805,17 @@ final: prev:
    meta.homepage = "https://github.com/jhradilek/vim-snippets/";
  };

+  nvim-dap-rr = buildVimPlugin {
+    pname = "nvim-dap-rr";
+    version = "2024-07-10";
+    src = fetchFromGitHub {
+      owner = "jonboh";
+      repo = "nvim-dap-rr";
+      rev = "1682c13a2096a4a6394c803e14f009f121400acf";
+      sha256 = "sha256-QtOY6gg2grsxF6KTn75hZ+BZGWK2ahzVu9k2SIIFeJU=";
+    };
+    meta.homepage = "https://github.com/jonboh/nvim-dap-rr/";
+  };
+

 }
@@ -40,6 +40,7 @@
 , pandoc
 , parinfer-rust
 , phpactor
+, ranger
 , ripgrep
 , skim
 , sqlite
@@ -1004,6 +1005,8 @@

  lz-n = neovimUtils.buildNeovimPlugin { luaAttr = "lz-n"; };

+  lzn-auto-require = neovimUtils.buildNeovimPlugin { luaAttr = "lzn-auto-require"; };
+
  magma-nvim-goose = buildVimPlugin {
    pname = "magma-nvim-goose";
    version = "2023-03-13";
@@ -1189,6 +1192,10 @@
    nvimRequireCheck = "dapui";
  };

+  nvim-dap-rr = super.nvim-dap-rr.overrideAttrs {
+    dependencies = [ self.nvim-dap ];
+  };
+
  nvim-genghis = super.nvim-genghis.overrideAttrs {
    dependencies = [ self.dressing-nvim ];

@@ -1381,6 +1388,14 @@
    dependencies = with self; [ cmd-parser-nvim ];
  };

+  ranger-nvim = super.ranger-nvim.overrideAttrs {
+    patches = [ ./patches/ranger.nvim/fix-paths.patch ];
+
+    postPatch = ''
+      substituteInPlace lua/ranger-nvim.lua --replace '@ranger@' ${ranger}
+    '';
+  };
+
  refactoring-nvim = super.refactoring-nvim.overrideAttrs {
    dependencies = with self; [ nvim-treesitter plenary-nvim ];
  };
@@ -1401,6 +1416,8 @@
    dependencies = with self; [ nvim-lspconfig ];
  };

+  rtp-nvim = neovimUtils.buildNeovimPlugin { luaAttr = "rtp-nvim"; };
+
  rustaceanvim = neovimUtils.buildNeovimPlugin { luaAttr = "rustaceanvim"; };

  sg-nvim = super.sg-nvim.overrideAttrs (old:
@@ -0,0 +1,22 @@
+diff --git a/lua/ranger-nvim.lua b/lua/ranger-nvim.lua
+index 3b18880..78eb9db 100644
+--- a/lua/ranger-nvim.lua
+++ b/lua/ranger-nvim.lua
+@@ -109,7 +109,7 @@ local function build_ranger_cmd(select_current_file)
+ 	end
+ 	local selectfile_flag = select_current_file and " --selectfile=" .. selected_file or ""
+ 	return string.format(
+-		"ranger --choosefiles=%s %s %s",
+		"@ranger@ --choosefiles=%s %s %s",
+ 		SELECTED_FILEPATH,
+ 		selectfile_flag,
+ 		create_ranger_cmd_flags(create_cmd_values(opts.keybinds))
+@@ -182,7 +182,7 @@ end
+ ---Opens ranger and open selected files on exit.
+ ---@param select_current_file boolean|nil open ranger and select the current file. Defaults to true.
+ function M.open(select_current_file)
+-	if vim.fn.executable("ranger") ~= 1 then
+	if vim.fn.executable("@ranger@") ~= 1 then
+ 		vim.api.nvim_err_write(
+ 			"ranger executable not found, please check that ranger is installed and is in your path\n"
+ 		)
@@ -201,6 +201,7 @@ https://github.com/lilydjwg/colorizer/,,
 https://github.com/Domeee/com.cloudedmountain.ide.neovim/,HEAD,
 https://github.com/wincent/command-t/,,
 https://github.com/numtostr/comment.nvim/,,
+https://github.com/LudoPinelli/comment-box.nvim/,HEAD,
 https://github.com/rhysd/committia.vim/,,
 https://github.com/hrsh7th/compe-conjure/,,
 https://github.com/GoldsteinE/compe-latex-symbols/,,
@@ -392,6 +393,7 @@ https://github.com/wenzel-hoffman/haskell-with-unicode.vim/,HEAD,
 https://github.com/travitch/hasksyn/,,
 https://github.com/lukas-reineke/headlines.nvim/,HEAD,
 https://github.com/rebelot/heirline.nvim/,,
+https://github.com/OXY2DEV/helpview.nvim/,HEAD,
 https://github.com/RaafatTurki/hex.nvim/,HEAD,
 https://github.com/Yggdroot/hiPairs/,,
 https://github.com/tzachar/highlight-undo.nvim/,HEAD,
@@ -661,6 +663,7 @@ https://github.com/yamatsum/nvim-cursorline/,,
 https://github.com/mfussenegger/nvim-dap/,,
 https://github.com/leoluz/nvim-dap-go/,HEAD,
 https://github.com/mfussenegger/nvim-dap-python/,HEAD,
+https://github.com/jonboh/nvim-dap-rr/,HEAD,
 https://github.com/rcarriga/nvim-dap-ui/,,
 https://github.com/theHamsta/nvim-dap-virtual-text/,,
 https://github.com/kndndrj/nvim-dbee/,HEAD,
@@ -811,6 +814,7 @@ https://gitlab.com/HiPhish/rainbow-delimiters.nvim,HEAD,
 https://github.com/kien/rainbow_parentheses.vim/,,
 https://github.com/vim-scripts/random.vim/,,
 https://github.com/winston0410/range-highlight.nvim/,,
+https://github.com/kelly-lin/ranger.nvim/,,
 https://github.com/rafaqz/ranger.vim/,,
 https://github.com/vim-scripts/rcshell.vim/,,
 https://github.com/ryvnf/readline.vim/,,
@@ -879,6 +883,7 @@ https://github.com/josegamez82/starrynight/,HEAD,
 https://github.com/darfink/starsearch.vim/,,
 https://github.com/startup-nvim/startup.nvim/,HEAD,
 https://github.com/luukvbaal/statuscol.nvim/,,
+https://github.com/arnamak/stay-centered.nvim/,HEAD,
 https://github.com/folke/styler.nvim/,,
 https://github.com/teto/stylish.nvim/,HEAD,
 https://github.com/gbprod/substitute.nvim/,HEAD,
@@ -6,17 +6,17 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ])
    if stdenv.isAarch64 then
      rec {
        pname = "brave";
-        version = "1.68.141";
+        version = "1.69.153";
        url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-        hash = "sha256-3Zd1H67rFDar/68ilcxPuAQOllh8SMm//9+h+m1MKes=";
+        hash = "sha256-4j5Byts8mawq3Z7pgVhtujE+RR/uOb5MIC4iip0GtEw=";
        platform = "aarch64-linux";
      }
    else if stdenv.isx86_64 then
      rec {
        pname = "brave";
-        version = "1.68.141";
+        version = "1.69.153";
        url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-        hash = "sha256-soSwRj8acXA2KDgCpcFZh2AFEVX43ZI7IpmvXKv5mFo=";
+        hash = "sha256-a5Hg7DoasbTQ7NOcx6XZ9zQosT5Y+TgQW5XCyYmIZDw=";
        platform = "x86_64-linux";
      }
    else
@@ -15,8 +15,10 @@ rec {

  extraPostPatch = ''
    while read patch_name; do
-      echo "applying LibreWolf patch: $patch_name"
-      patch -p1 < ${source}/$patch_name
+      if ! sed -n '/nvidia-wayland-backported-fixes-.*-Bug-1898476/p'; then
+        echo "applying LibreWolf patch: $patch_name"
+        patch -p1 < ${source}/$patch_name
+      fi
    done <${source}/assets/patches.txt

    cp -r ${source}/themes/browser .
@@ -30,8 +32,9 @@ rec {
  extraPoliciesFiles = [ "${src.settings}/distribution/policies.json" ];

  extraPassthru = {
-    librewolf = { inherit src extraPatches; };
+    librewolf = {
+      inherit src extraPatches;
+    };
    inherit extraPrefsFiles extraPoliciesFiles;
  };
 }
-
@@ -20,13 +20,13 @@

 buildGoModule rec {
  pname = "kubernetes";
-  version = "1.30.2";
+  version = "1.31.0";

  src = fetchFromGitHub {
    owner = "kubernetes";
    repo = "kubernetes";
    rev = "v${version}";
-    hash = "sha256-cxWltHCwb01QsIRSieXwYtImrSfvJLBhN3VIJkxOzX8=";
+    hash = "sha256-Oy638nIuz2xWVvMGWHUeI4T7eycXIfT+XHp0U7h8G9w=";
  };

  vendorHash = null;
@@ -1,38 +0,0 @@
-{ lib, mkFranzDerivation, fetchurl, xorg, xdg-utils, buildEnv, writeShellScriptBin }:
-
-let
-  mkFranzDerivation' = mkFranzDerivation.override {
-    xdg-utils = buildEnv {
-      name = "xdg-utils-for-ferdi";
-      paths = [
-        xdg-utils
-        (lib.hiPrio (writeShellScriptBin "xdg-open" ''
-          unset GDK_BACKEND
-          exec ${xdg-utils}/bin/xdg-open "$@"
-        ''))
-      ];
-    };
-  };
-in
-mkFranzDerivation' rec {
-  pname = "ferdi";
-  name = "Ferdi";
-  version = "5.8.1";
-  src = fetchurl {
-    url = "https://master.dl.sourceforge.net/project/ferdi.mirror/v${version}/ferdi_${version}_amd64.deb";
-    sha256 = "sha256-Bl7bM5iDQlfPSZxksqlg7GbuwWlm53QkOf/TQEg3/n0=";
-  };
-  extraBuildInputs = [ xorg.libxshmfence ];
-  meta = with lib; {
-    description = "Combine your favorite messaging services into one application";
-    homepage = "https://getferdi.com/";
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    license = licenses.asl20;
-    maintainers = with maintainers; [ davidtwco ];
-    platforms = [ "x86_64-linux" ];
-    hydraPlatforms = [ ];
-    knownVulnerabilities = [
-      "CVE-2022-32320"
-    ];
-  };
-}
@@ -3,16 +3,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "elan";
-  version = "3.1.1";
+  version = "3.1.1-unstable-2024-08-02";

  src = fetchFromGitHub {
    owner = "leanprover";
    repo = "elan";
-    rev = "v${version}";
-    hash = "sha256-/g5bO3UQcg0XYm62KdoWcVQqOV3SIedWUYLufEcblmE=";
+    # commit "chore: update to build with rust 1.80 (leanprover/elan#134)"
+    rev = "97ce78e0e6aecdf3e8d35dbf42b0614302efb250";
+    hash = "sha256-7cwpHMyhpTxYXjZM4xbDK+epvA2kBf7jelvMaPGP1kU=";
  };

-  cargoHash = "sha256-f8YVUTxHX1FY2p73DlnLDtCJaG/0JImUtJFraV6ErNM=";
+  cargoHash = "sha256-ON5d7ryMKEhkx6dV760msr+y/+4hIwssXUE5Ocaq2W0=";

  nativeBuildInputs = [ pkg-config makeWrapper ];

@@ -38,26 +38,17 @@ stdenv.mkDerivation (finalAttrs: {
    "icons"
  ];
  pname = "alephone";
-  version = "1.8.1";
+  version = "1.10";

  src = fetchurl {
    url =
      let
-        date = "20240513";
+        date = "20240822";
      in
      "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${date}/AlephOne-${date}.tar.bz2";
-    sha256 = "sha256-IUvMfG4jtN/QXq4DQIDuI0+Bl3MSSwDGKOyjfcRWgvE=";
+    hash = "sha256-Es2Uo0RIJHYeO/60XiHVLJe9Eoan8DREtAI2KGjuLaM=";
  };

-  patches = [
-    # Fix build with miniupnpc 2.2.8
-    # https://github.com/Aleph-One-Marathon/alephone/pull/503
-    (fetchpatch2 {
-      url = "https://github.com/Aleph-One-Marathon/alephone/commit/e25c4bc1ac02619e811b8f19bf4c2f617550e124.patch?full_index=1";
-      hash = "sha256-BFLLSTjNl/+/kVb+t6EyW1jhAlKN/G+Q99TICV9VHOY=";
-    })
-  ];
-
  nativeBuildInputs = [
    pkg-config
    icoutils
@@ -230,6 +230,7 @@ dependencies = [
 "async-stream",
 "base64 0.22.1",
 "bytes",
+ "cc",
 "cxx",
 "cxx-build",
 "digest",
@@ -250,6 +251,7 @@ dependencies = [
 "tempfile",
 "tokio",
 "tokio-test",
+ "version-compare",
 "wildmatch",
 "xdg",
 ]
@@ -1050,13 +1052,13 @@ dependencies = [

 [[package]]
 name = "cc"
-version = "1.0.98"
+version = "1.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f"
+checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48"
 dependencies = [
 "jobserver",
 "libc",
- "once_cell",
+ "shlex",
 ]

 [[package]]
@@ -3960,6 +3962,12 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde"

+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
 [[package]]
 name = "signal-hook-registry"
 version = "1.4.2"
@@ -4891,6 +4899,12 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"

+[[package]]
+name = "version-compare"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b"
+
 [[package]]
 name = "version_check"
 version = "0.9.4"
@@ -11,13 +11,13 @@
 }:
 rustPlatform.buildRustPackage {
  pname = "attic";
-  version = "0-unstable-2024-08-01";
+  version = "0-unstable-2024-08-19";

  src = fetchFromGitHub {
    owner = "zhaofengli";
    repo = "attic";
-    rev = "e127acbf9a71ebc0c26bc8e28346822e0a6e16ba";
-    hash = "sha256-GJIz4M5HDB948Ex/8cPvbkrNzl/eKUE7/c21JBu4lb8=";
+    rev = "acf3c351f8de47c6857f31948ab253f9c7ce2a6f";
+    hash = "sha256-jcY81r8PdMQ9dCGhT0YLZzxPj3kQJXyWCmvQLXbR1EI=";
  };

  nativeBuildInputs = [
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage {
  };
  cargoBuildFlags = lib.concatMapStrings (c: "-p ${c} ") crates;

-  ATTIC_DISTRIBUTOR = "attic";
+  ATTIC_DISTRIBUTOR = "nixpkgs";
  NIX_INCLUDE_PATH = "${lib.getDev nix}/include";

  # Attic interacts with Nix directly and its tests require trusted-user access
@@ -13,16 +13,16 @@
 }:
 buildGoModule rec {
  pname = "buildkite-agent";
-  version = "3.76.2";
+  version = "3.77.0";

  src = fetchFromGitHub {
    owner = "buildkite";
    repo = "agent";
    rev = "v${version}";
-    sha256 = "sha256-XAMrc8HEdCGeI0l6u4n81xhiGkI39b7Poly5CP/b0R8=";
+    sha256 = "sha256-QsSCIAy0ekkZiqO/cFcPNNkXa3FLL3Z1LJoKsjzB6jw=";
  };

-  vendorHash = "sha256-0P6EXqQa6WxhjNJ4X6THvjJRK/UQvqXTv+7IJViFAQs=";
+  vendorHash = "sha256-xp836ZT2x20ZbkTEubhiZlLmK9n2F8mCSWZTHmAuu6A=";

  postPatch = ''
    substituteInPlace clicommand/agent_start.go --replace /bin/bash ${bash}/bin/bash
@@ -164,11 +164,11 @@ let

  linux = stdenv.mkDerivation (finalAttrs: {
    inherit pname meta passthru;
-    version = "127.0.6533.119";
+    version = "128.0.6613.84";

    src = fetchurl {
      url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-k9rsELAtOFdLSi1dOTV4Lr7E2Uu5sR1/GOL9BWDqZl4=";
+      hash = "sha256-4hABtHDq/8lIP6YbpU1VJdmgZNmLN2qb0VMPYw3dsBg=";
    };

    # With strictDeps on, some shebangs were not being patched correctly
@@ -256,11 +256,11 @@ let

  darwin = stdenvNoCC.mkDerivation (finalAttrs: {
    inherit pname meta passthru;
-    version = "127.0.6533.120";
+    version = "128.0.6613.85";

    src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/adqui4t7hzlljw2m2mmu2dvb6tmq_127.0.6533.120/GoogleChrome-127.0.6533.120.dmg";
-      hash = "sha256-kfUCTu8BIGcZTMaby0iylOCFxI+pLXcq9fKo2ow6HrM=";
+      url = "http://dl.google.com/release2/chrome/adnfqet5f4kxrux64zb25vwits5a_128.0.6613.85/GoogleChrome-128.0.6613.85.dmg";
+      hash = "sha256-mWTNwfMfCLPV+w1VCMUdv7lFtYSEVr4mnDgKURlDV3Q=";
    };

    dontPatch = true;
@@ -32,28 +32,19 @@

 stdenv.mkDerivation rec {
  pname = "deepin-movie-reborn";
-  version = "6.0.5";
+  version = "6.0.10";

  src = fetchFromGitHub {
    owner = "linuxdeepin";
    repo = pname;
    rev = version;
-    hash = "sha256-dWN2IVVpwYwzEuLtT3JvhzKiBwaBq4lzmaEhA9S1hjE=";
+    hash = "sha256-1UbrNufetedla8TMFPze1hP/R2cZN7SEYEtrK4/5/RQ=";
  };

  patches = [
    ./dont_use_libPath.diff
  ];

-  postPatch = ''
-    # https://github.com/linuxdeepin/deepin-movie-reborn/pull/198
-    substituteInPlace src/common/diskcheckthread.cpp \
-      --replace "/usr/include/linux/cdrom.h" "linux/cdrom.h"
-    # https://github.com/linuxdeepin/deepin-movie-reborn/pull/337
-    substituteInPlace src/libdmr/playlist_model.cpp \
-      --replace "DGuiApplicationHelper" "Dtk::Gui::DGuiApplicationHelper"
-  '';
-
  outputs = [ "out" "dev" ];

  nativeBuildInputs = [
@@ -1,24 +1,24 @@
-let version = "3.4.4"; in
+let version = "3.5.1"; in
 { fetchurl }: {
  versionUsed = version;
  "${version}-x86_64-darwin" = fetchurl {
    url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-x64-release.zip";
-    sha256 = "1j7rh2kh8r67ywr4259zqwpkbj3g2isbf6piyh8j6fpgjsqbx9zx";
+    sha256 = "18v73dr61033g0x27vb0fdjwyzc1d04fifmwwnv4157nfpb68ijc";
  };
  "${version}-aarch64-darwin" = fetchurl {
    url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip";
-    sha256 = "05y3gfgcplnwsg1m3vgjhk0hg8sk7i92zch7zg08h3zywca04xfa";
+    sha256 = "1vjsnwlkvsb0xvap45fdd81vdsjkpl2yxr8xh39v77dxbpybi0qh";
  };
  "${version}-aarch64-linux" = fetchurl {
    url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip";
-    sha256 = "0ih3yx0bjigfbv5dfc262rw3y4ps5pzdilps4k1scb1xhs8y9kml";
+    sha256 = "0lwnvky3p37d81ib6qwxra7lxn19l5x30c7aycixd9yaslq1bc0v";
  };
  "${version}-x86_64-linux" = fetchurl {
    url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip";
-    sha256 = "1nv7vvqcf6qsp4faqk2pqffr9kv6d5gic813k9zk20i8w6gcqs0r";
+    sha256 = "0zn2mw8awii0hrvyh146hb5604li0jgxxgavpi19zcdpnzdg6z7c";
  };
  "${version}-i686-linux" = fetchurl {
    url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-ia32-release.zip";
-    sha256 = "00prc4fry3kh42lz9w34phdn07v1dm1qkkp52nph3jakg5y5dkm2";
+    sha256 = "11x7yyif51hyn8yi2lqbkfm3lfalkvh54v5pi851mfdnf14hsjpw";
  };
 }
@@ -1,20 +1,20 @@
-{ rustPlatform, rustfmt, fetchFromGitHub, Security, lib, stdenv }:
+{ lib, rustPlatform, cmake, rustfmt, fetchFromGitHub, Security, stdenv }:

 rustPlatform.buildRustPackage rec {
  pname = "wasmtime";
-  version = "23.0.1";
+  version = "24.0.0";

  src = fetchFromGitHub {
    owner = "bytecodealliance";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-3PvxMwsFnX2f9sosp93ZHBZDJUUbwLb8lHgaMVqJf6E=";
+    hash = "sha256-pR6yjJf0szjB73+vqXT4d8P9WD+SIOkEOe4Wl6EgIqQ=";
    fetchSubmodules = true;
  };

  # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
  auditable = false;
-  cargoHash = "sha256-ABDjdkHXSu80yUnXBNsUmpbtl9F3CYxy2GvYGN2fEuY=";
+  cargoHash = "sha256-bZtBEmzmu63wNlGhYvN0gYKkLPxzBHZ1iO16BMPD3tE=";
  cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ];

  outputs = [ "out" "dev" ];
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
  #   warning: cranelift-codegen@0.108.0:
  #   Failed to run `rustfmt` on ISLE-generated code: Os
  #   { code: 2, kind: NotFound, message: "No such file or directory" }
-  nativeBuildInputs = [ rustfmt ];
+  nativeBuildInputs = [ cmake rustfmt ];

  doCheck = with stdenv.buildPlatform;
    # SIMD tests are only executed on platforms that support all
@@ -25,6 +25,11 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-kqVZeCTp+Z6BtB6nzkwmtkJ4wtmjlSQBg05lD02cVvQ=";
  };

+  patches = [
+    # fix generated pkg-config files
+    ./pkgconfig.patch
+  ];
+
  nativeBuildInputs = [
    cmake
  ];
@@ -0,0 +1,28 @@
+diff --git a/libvncclient.pc.cmakein b/libvncclient.pc.cmakein
+index ceeda39d..2516e643 100644
+--- a/libvncclient.pc.cmakein
+++ b/libvncclient.pc.cmakein
+@@ -1,7 +1,7 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
+-includedir=@CMAKE_INSTALL_PREFIX@/include
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+ 
+ Name: LibVNCClient
+ Description: A library for easy implementation of a VNC client.
+diff --git a/libvncserver.pc.cmakein b/libvncserver.pc.cmakein
+index 33ec6685..57244742 100644
+--- a/libvncserver.pc.cmakein
+++ b/libvncserver.pc.cmakein
+@@ -1,7 +1,7 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
+-includedir=@CMAKE_INSTALL_PREFIX@/include
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+ 
+ Name: LibVNCServer
+ Description: A library for easy implementation of a VNC server.
@@ -2089,14 +2089,14 @@ buildLuarocksPackage {
 luarocks-build-treesitter-parser-cpp = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, luafilesystem }:
 buildLuarocksPackage {
  pname = "luarocks-build-treesitter-parser-cpp";
-  version = "2.0.0-1";
+  version = "2.0.3-1";
  knownRockspec = (fetchurl {
-    url    = "mirror://luarocks/luarocks-build-treesitter-parser-cpp-2.0.0-1.rockspec";
-    sha256 = "13jwyg9y5n3zh55pisyms6kh8n59gwh9q9nslxkbdrb149y5wlr4";
+    url    = "mirror://luarocks/luarocks-build-treesitter-parser-cpp-2.0.3-1.rockspec";
+    sha256 = "1pn8kn1kf9ak4b7hba1nd358dh146sr993gf8r10s3ywcnihmnw0";
  }).outPath;
  src = fetchzip {
-    url    = "https://github.com/nvim-neorocks/luarocks-build-treesitter-parser-cpp/archive/v2.0.0.zip";
-    sha256 = "1rldmmimz3bhhh5yrx15wsdiymfmjyl3j8y71xz4mi4m16in470d";
+    url    = "https://github.com/nvim-neorocks/luarocks-build-treesitter-parser-cpp/archive/v2.0.3.zip";
+    sha256 = "1dcjy1vy76vszm9r1ck42w8a1xw0ls0vs9xg5wzh3wnk2d1y54m3";
  };

  disabled = luaOlder "5.1";
@@ -2489,6 +2489,30 @@ buildLuarocksPackage {
  };
 }) {};

+lzn-auto-require = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, lz-n }:
+buildLuarocksPackage {
+  pname = "lzn-auto-require";
+  version = "0.1.0-1";
+  knownRockspec = (fetchurl {
+    url    = "mirror://luarocks/lzn-auto-require-0.1.0-1.rockspec";
+    sha256 = "01yx40yvj6msh42cyj3vbmi3phdpiqafr0qv12yfj7garhxjidd3";
+  }).outPath;
+  src = fetchzip {
+    url    = "https://github.com/horriblename/lzn-auto-require/archive/v0.1.0.zip";
+    sha256 = "0hkpyqw1cybrwarvxanf2drz2cbxkh77yz2qq4akhzyvidmn7ny0";
+  };
+
+  disabled = luaOlder "5.1";
+  propagatedBuildInputs = [ lz-n ];
+
+  meta = {
+    homepage = "https://github.com/horriblename/lzn-auto-require";
+    description = "Auto load optional plugins via lua modules with lz.n";
+    maintainers = with lib.maintainers; [ mrcjkb ];
+    license.fullName = "GPL-2.0";
+  };
+}) {};
+
 magick = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, lua }:
 buildLuarocksPackage {
  pname = "magick";
@@ -3002,14 +3026,14 @@ buildLuarocksPackage {
 rtp-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
 buildLuarocksPackage {
  pname = "rtp.nvim";
-  version = "1.0.0-1";
+  version = "1.1.0-1";
  knownRockspec = (fetchurl {
-    url    = "mirror://luarocks/rtp.nvim-1.0.0-1.rockspec";
-    sha256 = "0ddlwhk62g3yx1ysddsmlggfqv0hj7dljgczfwij1ijbz7qyp3hy";
+    url    = "mirror://luarocks/rtp.nvim-1.1.0-1.rockspec";
+    sha256 = "1wmg2rqw8jph4ymmc33j8r47p2ni7fdd3dmiiwp19symslcw71js";
  }).outPath;
  src = fetchzip {
-    url    = "https://github.com/nvim-neorocks/rtp.nvim/archive/v1.0.0.zip";
-    sha256 = "1kx7qzdz8rpwsjcp63wwn619nrkxn6xd0nr5pfm3g0z4072nnpzn";
+    url    = "https://github.com/nvim-neorocks/rtp.nvim/archive/v1.1.0.zip";
+    sha256 = "0n3ydd1n0mbc0m81rdbs73gpdr3m6qj735sjqdf36qv52gjcisj8";
  };

  disabled = luaOlder "5.1";
@@ -3333,20 +3357,20 @@ buildLuarocksPackage {
  };
 }) {};

-tree-sitter-norg = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luarocks-build-treesitter-parser }:
+tree-sitter-norg = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luarocks-build-treesitter-parser-cpp }:
 buildLuarocksPackage {
  pname = "tree-sitter-norg";
-  version = "0.2.4-1";
+  version = "0.2.5-1";
  knownRockspec = (fetchurl {
-    url    = "mirror://luarocks/tree-sitter-norg-0.2.4-1.rockspec";
-    sha256 = "00mgn1kmhhrink64s1yjnz78lc7qbv0f021dsvr6z3b44srhcxb9";
+    url    = "mirror://luarocks/tree-sitter-norg-0.2.5-1.rockspec";
+    sha256 = "1w3hns9n92ygc7x3wxq3pd2kjs2nfp1arxq9zda75h2alwapjink";
  }).outPath;
  src = fetchzip {
-    url    = "https://github.com/nvim-neorg/tree-sitter-norg/archive/v0.2.4.zip";
-    sha256 = "08bsk3v61r0xhracanjv25jccqv80ahipx0mv5a1slzhcyymv8kd";
+    url    = "https://github.com/nvim-neorg/tree-sitter-norg/archive/1aab69c95bd9d5e7c0e172ecbe5d29bcf5834612.zip";
+    sha256 = "12s4lvs2iw3v9hwfcql0phi8gxgpwfj3i6443f0mss5zn7f6w50g";
  };

-  nativeBuildInputs = [ luarocks-build-treesitter-parser ];
+  nativeBuildInputs = [ luarocks-build-treesitter-parser-cpp ];

  meta = {
    homepage = "https://github.com/nvim-neorg/tree-sitter-norg";
@@ -744,6 +744,17 @@ in
    };
  })) {};

+  rtp-nvim  = prev.rtp-nvim.overrideAttrs(oa: {
+    doCheck = lua.luaversion == "5.1";
+    nativeCheckInputs = [ final.nlua final.busted ];
+    checkPhase = ''
+      runHook preCheck
+      export HOME=$(mktemp -d)
+      busted --lua=nlua
+      runHook postCheck
+      '';
+  });
+
  rustaceanvim  = prev.rustaceanvim.overrideAttrs(oa: {
    doCheck = lua.luaversion == "5.1";
    nativeCheckInputs = [ final.nlua final.busted ];
@@ -819,17 +830,13 @@ in
  });

  tree-sitter-norg = prev.tree-sitter-norg.overrideAttrs (oa: {
-    nativeBuildInputs = let
-      # HACK: luarocks-nix doesn't pick up rockspec build dependencies,
-      # so we have to pass the correct package in here.
+    propagatedBuildInputs = let
+      # HACK: luarocks-nix puts rockspec build dependencies in the nativeBuildInputs,
+      # but that doesn't seem to work
      lua = lib.head oa.propagatedBuildInputs;
-    in oa.nativeBuildInputs ++ [
-      lua.pkgs.luarocks-build-treesitter-parser
-    ] ++ (lib.optionals stdenv.isDarwin [
-      clang
-      tree-sitter
-    ]);
-    meta.broken = (luaOlder "5.1" || stdenv.isDarwin);
+    in oa.propagatedBuildInputs ++ [
+      lua.pkgs.luarocks-build-treesitter-parser-cpp
+    ];
  });

  vstruct = prev.vstruct.overrideAttrs (_: {
@@ -6,16 +6,16 @@

 php.buildComposerProject (finalAttrs: {
  pname = "phive";
-  version = "0.15.2";
+  version = "0.15.3";

  src = fetchFromGitHub {
    owner = "phar-io";
    repo = "phive";
    rev = finalAttrs.version;
-    hash = "sha256-K/YZOGANcefjfdFY1XYEQknm0bPRorlRnNGC7dEegZ0=";
+    hash = "sha256-6vNhmIDE3kwZGMrDnGNGVV6/lb32Yb3ooWDYOC7SUcs=";
  };

-  vendorHash = "sha256-0fJ+SyicvVONJ4FkOFTkBTekDAOjBfaLo0dZ2DYlGJU=";
+  vendorHash = "sha256-iBNH4n4AVE47CYmwO6s6WBAuRe7JzzvoNruYfVbxPck=";

  meta = {
    changelog = "https://github.com/phar-io/phive/releases/tag/${finalAttrs.version}";
@@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "asana";
-  version = "5.0.8";
+  version = "5.0.9";
  pyproject = true;

  disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
    owner = "asana";
    repo = "python-asana";
    rev = "refs/tags/v${version}";
-    hash = "sha256-JC7t8im5OlvQlln9mUJHWMRJ1cRyAwfbIVQ0U3Q1KsU=";
+    hash = "sha256-7qJdPIk2xSF909chvjwT9zdSQ6NA6cgwefJGaBw1BQY=";
  };

  build-system = [ setuptools ];
@@ -1,7 +1,7 @@
 {
  lib,
  buildPythonPackage,
-  fetchFromGitHub,
+  fetchPypi,
  cython,
  pexpect,
  python,
@@ -11,16 +11,14 @@

 buildPythonPackage rec {
  pname = "cpyparsing";
-  version = "2.4.7.2.3.3";
+  version = "2.4.7.2.4.0";
  pyproject = true;

  disabled = pythonOlder "3.7";

-  src = fetchFromGitHub {
-    owner = "evhub";
-    repo = "cpyparsing";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-Ob3aSxJXM/J1KQ2dwxew9fH3g2WVU2KI6lynDz31r+Y=";
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-7j0vJicSrSUqZAExaH0bJZhRJ6XZui4SAPMBcWXy7n0=";
  };

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

 buildPythonPackage rec {
  pname = "microsoft-kiota-authentication-azure";
-  version = "1.0.0";
+  version = "1.1.0";
  pyproject = true;

  disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
    owner = "microsoft";
    repo = "kiota-authentication-azure-python";
    rev = "refs/tags/v${version}";
-    hash = "sha256-RA0BbIwDs3cXiH4tQsvCGUO1OAg+DWjEeWd7MEVIC8E=";
+    hash = "sha256-JoR7qjAPNqtcV35AGwbyjhIro6AnFUZXXLHLOj7InY8=";
  };

  build-system = [ flit-core ];
@@ -49,7 +49,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Kiota Azure authentication provider";
    homepage = "https://github.com/microsoft/kiota-authentication-azure-python";
-    changelog = "https://github.com/microsoft/kiota-authentication-azure-python/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/microsoft/kiota-authentication-azure-python/blob/v${version}/CHANGELOG.md";
    license = licenses.mit;
    maintainers = with maintainers; [ fab ];
  };
@@ -1,33 +1,41 @@
 {
  lib,
-  anyio,
  buildPythonPackage,
-  cached-property,
-  dirty-equals,
-  distro,
  fetchFromGitHub,
-  hatch-fancy-pypi-readme,
-  hatchling,
-  jiter,
-  httpx,
-  numpy,
-  pandas,
-  pandas-stubs,
-  pydantic,
-  inline-snapshot,
-  pytest-asyncio,
-  pytest-mock,
-  pytestCheckHook,
  pythonOlder,
-  respx,
+
+  # build-system
+  hatchling,
+  hatch-fancy-pypi-readme,
+
+  # dependencies
+  anyio,
+  cached-property,
+  distro,
+  httpx,
+  jiter,
+  pydantic,
  sniffio,
  tqdm,
  typing-extensions,
+
+  numpy,
+  pandas,
+  pandas-stubs,
+
+  # check deps
+  pytestCheckHook,
+  dirty-equals,
+  inline-snapshot,
+  pytest-asyncio,
+  pytest-mock,
+  respx,
+
 }:

 buildPythonPackage rec {
  pname = "openai";
-  version = "1.40.8";
+  version = "1.42.0";
  pyproject = true;

  disabled = pythonOlder "3.7.1";
@@ -36,7 +44,7 @@ buildPythonPackage rec {
    owner = "openai";
    repo = "openai-python";
    rev = "refs/tags/v${version}";
-    hash = "sha256-T9TdZWPC8exIY7FoLQkz+QfzWFT5BxCBHxP9SXQeT0I=";
+    hash = "sha256-Pj4MmylUB6JGTlueOgtAd9RgOxn3QoPe2Xf1hYnOZ9c=";
  };

  build-system = [
@@ -45,14 +53,14 @@ buildPythonPackage rec {
  ];

  dependencies = [
-    jiter
-    httpx
-    pydantic
-    typing-extensions
    anyio
    distro
+    httpx
+    jiter
+    pydantic
    sniffio
    tqdm
+    typing-extensions
  ] ++ lib.optionals (pythonOlder "3.8") [ cached-property ];

  passthru.optional-dependencies = {
@@ -66,12 +74,12 @@ buildPythonPackage rec {
  pythonImportsCheck = [ "openai" ];

  nativeCheckInputs = [
-    inline-snapshot
    pytestCheckHook
+    dirty-equals
+    inline-snapshot
    pytest-asyncio
    pytest-mock
    respx
-    dirty-equals
  ];

  pytestFlagsArray = [
@@ -81,10 +89,7 @@ buildPythonPackage rec {

  disabledTests = [
    # Tests make network requests
-    "test_streaming_response"
    "test_copy_build_request"
-
-    # Test fails with pytest>=8
    "test_basic_attribute_access_works"
  ];

@@ -9,7 +9,7 @@

 buildPythonPackage rec {
  pname = "pynmeagps";
-  version = "1.0.38";
+  version = "1.0.39";
  pyproject = true;

  disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
    owner = "semuconsulting";
    repo = "pynmeagps";
    rev = "refs/tags/v${version}";
-    hash = "sha256-sD33fcYqTGsLLSsz6ULM5FsHHen4uROJzaWGCDrIsFI=";
+    hash = "sha256-aBNvrqGDCUOn3wiTwqmanUQzBuiPNDSguZhlznYXUkY=";
  };

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

 buildPythonPackage rec {
  pname = "pyswitchbot";
-  version = "0.48.1";
+  version = "0.48.2";
  pyproject = true;

  disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
    owner = "Danielhiversen";
    repo = "pySwitchbot";
    rev = "refs/tags/${version}";
-    hash = "sha256-zJzNVwrG5R2cLN7mJY9kjji2p1jP/b3b0qU7CMOPXCE=";
+    hash = "sha256-5hoV7tM02dLrGvZ47ReVITayLFf2ceRVXOKbNa2t9iM=";
  };

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

 buildPythonPackage rec {
  pname = "yfinance";
-  version = "0.2.41";
+  version = "0.2.42";
  pyproject = true;

  disabled = pythonOlder "3.7";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
    owner = "ranaroussi";
    repo = "yfinance";
    rev = "refs/tags/${version}";
-    hash = "sha256-9Vp/z0u/Mfil1xWHvHPRFa62sLvEJMjHLBYweLfz42o=";
+    hash = "sha256-2iS//v5KKxoY6FQTyZ4A4hm7yR31Y5BqTRauUElxOd0=";
  };

  build-system = [ setuptools ];
@@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "golangci-lint";
-  version = "1.60.2";
+  version = "1.60.3";

  src = fetchFromGitHub {
    owner = "golangci";
    repo = "golangci-lint";
    rev = "v${version}";
-    hash = "sha256-ANKKfHINYUftubBL1MKtb3RMpxWAzgmQDxKdGIt19KU=";
+    hash = "sha256-0ScdJ5td2N8WF1dwHQ3dBSjyr1kqgrzCfBzbRg9cRrw=";
  };

-  vendorHash = "sha256-z3vAtxg68KdkqtwrQPk+dnOwTBgBnlfwsw+t6rf3NGs=";
+  vendorHash = "sha256-ixeswsfx36D0Tg103swbBD8UXXLNYbxSMYDE+JOm+uw=";

  subPackages = [ "cmd/golangci-lint" ];

@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, cmake }:
+{ stdenv, lib, fetchurl, cmake, asLibrary ? false }:

 stdenv.mkDerivation rec {
  pname = "astyle";
@@ -11,6 +11,17 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [ cmake ];

+  # upstream repo includes a build/ directory
+  cmakeBuildDir = "_build";
+
+  cmakeFlags = lib.optional asLibrary [
+    "-DBUILD_SHARED_LIBS=ON"
+  ];
+
+  postInstall = lib.optionalString asLibrary ''
+    install -Dm444 ../src/astyle.h $out/include/astyle.h
+  '';
+
  meta = with lib; {
    description = "Source code indenter, formatter, and beautifier for C, C++, C# and Java";
    mainProgram = "astyle";
@@ -18,13 +18,13 @@

 buildGoModule rec {
  pname = "skopeo";
-  version = "1.16.0";
+  version = "1.16.1";

  src = fetchFromGitHub {
    rev = "v${version}";
    owner = "containers";
    repo = "skopeo";
-    hash = "sha256-M9BRsW3mNIRAr+yXSmoPNNoEY/XrCFNt+m2PtTuJUO4=";
+    hash = "sha256-RsFfShru4ujB+x0hju8Xju43JJk/+PAevIPjjDC5YbQ=";
  };

  outputs = [ "out" "man" ];
@@ -22,13 +22,13 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "dxx-rebirth";
-  version = "0-unstable-2024-01-13";
+  version = "0.60.0-beta2-unstable-2024-08-11";

  src = fetchFromGitHub {
    owner = "dxx-rebirth";
    repo = "dxx-rebirth";
-    rev = "5c710857a9312e1b2f3249c51c12b55f9390a2b1";
-    hash = "sha256-nEPMJiTeePAmourAksUNqyy5whs+8+qy/qrycfNw2lo=";
+    rev = "bd3c033bdf1faa4606086dcae0436531fb2e7e5c";
+    hash = "sha256-imNHJ55Wp3YueMsNVvb7Z51EyESZnPdtzAOp2TWfdqc=";
  };

  nativeBuildInputs = [ pkg-config scons ];
@@ -55,13 +55,10 @@
      plasma-wayland-protocols = libsForQt5.plasma-wayland-protocols;

      selenium-webdriver-at-spi = null; # Used for integration tests that we don't run, stub
-      # Not ported to Qt6 yet
-      kdevelop-pg-qt = null;
-      okteta = null;
-      libmediawiki = null;

      alpaka = self.callPackage ./misc/alpaka {};
      kdiagram = self.callPackage ./misc/kdiagram {};
+      kdevelop-pg-qt = self.callPackage ./misc/kdevelop-pg-qt {};
      kdsoap-ws-discovery-client = self.callPackage ./misc/kdsoap-ws-discovery-client {};
      kirigami-addons = self.callPackage ./misc/kirigami-addons {};
      kio-extras-kf5 = self.callPackage ./misc/kio-extras-kf5 {};
@@ -69,7 +66,6 @@
      ktextaddons = self.callPackage ./misc/ktextaddons {};
      kunifiedpush = self.callPackage ./misc/kunifiedpush {};
      kup = self.callPackage ./misc/kup {};
-      kweathercore = self.callPackage ./misc/kweathercore {};
      marknote = self.callPackage ./misc/marknote {};
      mpvqt = self.callPackage ./misc/mpvqt {};
      oxygen-icons = self.callPackage ./misc/oxygen-icons {};
@@ -7,7 +7,7 @@
  cargo,
  rustc,
  # provided as callPackage input to enable easier overrides through overlays
-  cargoHash ? "sha256-po8ykNdP0+8gVUcebxqpo+p3Jm4DzZlskmgfBwzVc5s=",
+  cargoHash ? "sha256-XZ40qGBPRz7xyem3EP4+hzTliryxxDyGtvfjbNNVDQo=",
 }:
 mkKdeDerivation rec {
  pname = "akonadi-search";
@@ -8,7 +8,7 @@
  cargo,
  rustc,
  # provided as callPackage input to enable easier overrides through overlays
-  cargoHash ? "sha256-GHXZKP4K5+ii2RyG9phllRSms4gRAl7kbFUyTUO59s0=",
+  cargoHash ? "sha256-y7iJGN3ATK3IT8ko64puGlFXBM9OZw9u8JenrOBDuFA=",
  qcoro,
 }:
 mkKdeDerivation rec {
@@ -1,21 +1,11 @@
 {
  mkKdeDerivation,
-  fetchpatch,
  libarchive,
  libzip,
 }:
 mkKdeDerivation {
  pname = "ark";

-  # Backport fix to clean up temporary folders with Qt 6.7
-  # FIXME: remove in next update
-  patches = [
-    (fetchpatch {
-      url = "https://invent.kde.org/utilities/ark/-/commit/85c5e26f581cf011638a53e62b92e1da8fd55fcd.patch";
-      hash = "sha256-ZjVdKgFoGE0Jme8JhGVn7+PODJqdwHQhglrHzsxePf8=";
-    })
-  ];
-
  extraBuildInputs = [libarchive libzip];
  meta.mainProgram = "ark";
 }
@@ -105,6 +105,7 @@
  kget = callPackage ./kget {};
  kgoldrunner = callPackage ./kgoldrunner {};
  kgpg = callPackage ./kgpg {};
+  kgraphviewer = callPackage ./kgraphviewer {};
  khangman = callPackage ./khangman {};
  khealthcertificate = callPackage ./khealthcertificate {};
  khelpcenter = callPackage ./khelpcenter {};
@@ -118,7 +119,6 @@
  kio-extras = callPackage ./kio-extras {};
  kio-gdrive = callPackage ./kio-gdrive {};
  kio-zeroconf = callPackage ./kio-zeroconf {};
-  kipi-plugins = callPackage ./kipi-plugins {};
  kirigami-gallery = callPackage ./kirigami-gallery {};
  kiriki = callPackage ./kiriki {};
  kiten = callPackage ./kiten {};
@@ -145,7 +145,6 @@
  knavalbattle = callPackage ./knavalbattle {};
  knetwalk = callPackage ./knetwalk {};
  knights = callPackage ./knights {};
-  knotes = callPackage ./knotes {};
  koko = callPackage ./koko {};
  kolf = callPackage ./kolf {};
  kollision = callPackage ./kollision {};
@@ -195,6 +194,7 @@
  kwalletmanager = callPackage ./kwalletmanager {};
  kwave = callPackage ./kwave {};
  kweather = callPackage ./kweather {};
+  kweathercore = callPackage ./kweathercore {};
  kwordquiz = callPackage ./kwordquiz {};
  libgravatar = callPackage ./libgravatar {};
  libkcddb = callPackage ./libkcddb {};
@@ -205,7 +205,6 @@
  libkeduvocdocument = callPackage ./libkeduvocdocument {};
  libkexiv2 = callPackage ./libkexiv2 {};
  libkgapi = callPackage ./libkgapi {};
-  libkipi = callPackage ./libkipi {};
  libkleo = callPackage ./libkleo {};
  libkmahjongg = callPackage ./libkmahjongg {};
  libkomparediff2 = callPackage ./libkomparediff2 {};
@@ -218,6 +217,7 @@
  mailimporter = callPackage ./mailimporter {};
  marble = callPackage ./marble {};
  markdownpart = callPackage ./markdownpart {};
+  massif-visualizer = callPackage ./massif-visualizer {};
  mbox-importer = callPackage ./mbox-importer {};
  merkuro = callPackage ./merkuro {};
  messagelib = callPackage ./messagelib {};
@@ -1,20 +1,10 @@
 {
  mkKdeDerivation,
-  fetchpatch,
  qtsvg,
  knotifications,
 }:
 mkKdeDerivation {
  pname = "francis";

-  patches = [
-    # Fix linking issue
-    # FIXME: remove in next update
-    (fetchpatch {
-      url = "https://invent.kde.org/utilities/francis/-/commit/4d5407a42e4871d66f4de4522fbbf83c35604550.patch";
-      hash = "sha256-p9DVc92e8QBDHwZybVLNzSH8dr0XmRzrnIT45YD9t/Q=";
-    })
-  ];
-
  extraBuildInputs = [qtsvg knotifications];
 }
@@ -1,9 +1,10 @@
 {
  mkKdeDerivation,
  libcanberra,
+  libvlc,
 }:
 mkKdeDerivation {
  pname = "kalarm";

-  extraBuildInputs = [libcanberra];
+  extraBuildInputs = [libcanberra libvlc];
 }
@@ -19,10 +19,6 @@ mkKdeDerivation {
      src = ./hardcode-sshfs-path.patch;
      sshfs = lib.getExe sshfs;
    })
-    # We build OpenSSH without ssh-dss support, so sshfs explodes at runtime.
-    # See: https://github.com/NixOS/nixpkgs/commit/6ee4b8c8bf815567f7d0fa131576d2b8c0a18167
-    # FIXME: upstream?
-    ./remove-ssh-dss.patch
  ];

  # Hardcoded as a QString, which is UTF-16 so Nix can't pick it up automatically
@@ -1,13 +0,0 @@
-diff --git a/plugins/sftp/mounter.cpp b/plugins/sftp/mounter.cpp
-index 29e94f3b..0f300c63 100644
--- a/plugins/sftp/mounter.cpp
-+++ b/plugins/sftp/mounter.cpp
-@@ -122,7 +122,7 @@ void Mounter::onPacketReceived(const NetworkPacket &np)
-                       << QStringLiteral("-o") << QStringLiteral("IdentityFile=") + KdeConnectConfig::instance().privateKeyPath()
-                       << QStringLiteral("-o") << QStringLiteral("StrictHostKeyChecking=no") // Do not ask for confirmation because it is not a known host
-                       << QStringLiteral("-o") << QStringLiteral("UserKnownHostsFile=/dev/null") // Prevent storing as a known host
-                      << QStringLiteral("-o") << QStringLiteral("HostKeyAlgorithms=+ssh-dss\\,ssh-rsa") // https://bugs.kde.org/show_bug.cgi?id=351725
-+                      << QStringLiteral("-o") << QStringLiteral("HostKeyAlgorithms=+ssh-rsa") // https://bugs.kde.org/show_bug.cgi?id=351725
-                       << QStringLiteral("-o") << QStringLiteral("PubkeyAcceptedKeyTypes=+ssh-rsa") // https://bugs.kde.org/show_bug.cgi?id=443155
-                       << QStringLiteral("-o") << QStringLiteral("uid=") + QString::number(getuid())
-                       << QStringLiteral("-o") << QStringLiteral("gid=") + QString::number(getgid())
@@ -8,7 +8,7 @@
  corrosion,
  alpaka,
  # provided as callPackage input to enable easier overrides through overlays
-  cargoHash ? "sha256-NygCWuhwODsmUxwsMZNChVYUMI7Ryu+0MxBIsZaelC8=",
+  cargoHash ? "sha256-ZKLoX6sMKc6o7cnmxPYXL0d+Lmh8+n6Ko6VR/CzfZGs=",
 }:
 mkKdeDerivation rec {
  pname = "kdepim-addons";
@@ -1,4 +1,9 @@
-{mkKdeDerivation}:
+{
+  mkKdeDerivation,
+  perl,
+}:
 mkKdeDerivation {
  pname = "kdesdk-kio";
+
+  extraNativeBuildInputs = [perl];
 }
@@ -1,6 +1,9 @@
-{mkKdeDerivation}:
+{
+  mkKdeDerivation,
+  kdevelop-pg-qt,
+}:
 mkKdeDerivation {
  pname = "kdev-php";
-  # FIXME(qt5)
-  meta.broken = true;
+
+  extraNativeBuildInputs = [kdevelop-pg-qt];
 }
@@ -1,6 +1,4 @@
 {mkKdeDerivation}:
 mkKdeDerivation {
  pname = "kdev-python";
-  # FIXME(qt5)
-  meta.broken = true;
 }
@@ -1,11 +1,46 @@
 {
+  lib,
  mkKdeDerivation,
-  extra-cmake-modules,
+  qtwebengine,
+  qttools,
+  kdevelop-pg-qt,
+  pkg-config,
+  shared-mime-info,
+  apr,
+  aprutil,
+  boost,
+  libastyle,
+  libclang,
+  libllvm,
+  subversion,
 }:
 mkKdeDerivation {
  pname = "kdevelop";

-  extraBuildInputs = [extra-cmake-modules];
-  # FIXME(qt5)
-  meta.broken = true;
+  extraNativeBuildInputs = [
+    kdevelop-pg-qt
+    pkg-config
+    shared-mime-info
+  ];
+
+  extraPropagatedBuildInputs = [
+    qtwebengine
+  ];
+
+  extraBuildInputs = [
+    qttools
+    apr
+    aprutil
+    boost
+    libastyle
+    libclang
+    libllvm
+    subversion
+  ];
+
+  extraCmakeFlags = [
+    "-DCLANG_BUILTIN_DIR=${libclang.lib}/lib/clang/${lib.versions.major libclang.version}/include"
+    "-DAPR_CONFIG_PATH=${apr.dev}/bin"
+    "-DAPU_CONFIG_PATH=${aprutil.dev}/bin"
+  ];
 }
@@ -0,0 +1,14 @@
+{
+  mkKdeDerivation,
+  pkg-config,
+  qt5compat,
+  qtsvg,
+  boost,
+  graphviz,
+}:
+mkKdeDerivation {
+  pname = "kgraphviewer";
+
+  extraNativeBuildInputs = [ pkg-config ];
+  extraBuildInputs = [ qt5compat qtsvg boost graphviz ];
+}
@@ -19,7 +19,7 @@
 mkKdeDerivation {
  pname = "kio-extras";

-  extraNativeBuildInputs = [pkg-config shared-mime-info];
+  extraNativeBuildInputs = [pkg-config gperf shared-mime-info];
  extraBuildInputs = [
    qt5compat
    qtsvg
@@ -1,6 +0,0 @@
-{mkKdeDerivation}:
-mkKdeDerivation {
-  pname = "kipi-plugins";
-  # FIXME(qt5)
-  meta.broken = true;
-}
@@ -1,11 +1,10 @@
 {
  mkKdeDerivation,
  qtsvg,
+  qttools,
 }:
 mkKdeDerivation {
  pname = "kirigami-gallery";

-  extraBuildInputs = [qtsvg];
-  # FIXME(qt5)
-  meta.broken = true;
+  extraNativeBuildInputs = [qtsvg qttools];
 }
@@ -1,9 +1,11 @@
 {
  mkKdeDerivation,
+  qttools,
  ki18n,
 }:
 mkKdeDerivation {
  pname = "kmime";

+  extraNativeBuildInputs = [qttools];
  extraBuildInputs = [ki18n];
 }
@@ -1,9 +0,0 @@
-{
-  mkKdeDerivation,
-  libxslt,
-}:
-mkKdeDerivation {
-  pname = "knotes";
-
-  extraNativeBuildInputs = [libxslt];
-}
@@ -1,8 +1,5 @@
 {mkKdeDerivation}:
 mkKdeDerivation {
  pname = "kompare";
-  meta = {
-    mainProgram = "kompare";
-    broken = true; # Qt5
-  };
+  meta.mainProgram = "kompare";
 }
@@ -6,7 +6,8 @@
 mkKdeDerivation {
  pname = "konqueror";

-  extraBuildInputs = [qtwebengine hunspell];
+  extraNativeBuildInputs = [hunspell];
+  extraBuildInputs = [qtwebengine];

  extraCmakeFlags = [
    "-DWebEngineDictConverter_EXECUTABLE=${qtwebengine}/libexec/qwebengine_convert_dict"
@@ -4,7 +4,6 @@
  akregator,
  kaddressbook,
  kmail,
-  knotes,
  korganizer,
  zanshin,
 }:
@@ -16,7 +15,6 @@ mkKdeDerivation {
    akregator
    kaddressbook
    kmail
-    knotes
    korganizer
    zanshin
  ];
@@ -2,9 +2,11 @@
  mkKdeDerivation,
  bison,
  flex,
+  recastnavigation,
 }:
 mkKdeDerivation {
  pname = "kosmindoormap";

  extraNativeBuildInputs = [bison flex];
+  extraBuildInputs = [recastnavigation];
 }
@@ -1,5 +1,7 @@
 {
  mkKdeDerivation,
+  pkg-config,
+  qtwayland,
  libssh,
  libvncserver,
  freerdp,
@@ -7,6 +9,8 @@
 mkKdeDerivation {
  pname = "krdc";

-  extraBuildInputs = [libssh libvncserver freerdp];
+  extraNativeBuildInputs = [pkg-config];
+  extraBuildInputs = [qtwayland libssh libvncserver freerdp];
+
  meta.mainProgram = "krdc";
 }
@@ -0,0 +1,9 @@
+{
+  mkKdeDerivation,
+  qtpositioning,
+}:
+mkKdeDerivation {
+  pname = "kweathercore";
+
+  extraBuildInputs = [ qtpositioning ];
+}
@@ -1,6 +0,0 @@
-{mkKdeDerivation}:
-mkKdeDerivation {
-  pname = "libkipi";
-  # FIXME(qt5)
-  meta.broken = true;
-}
@@ -6,6 +6,4 @@ mkKdeDerivation {
  pname = "libkomparediff2";

  extraBuildInputs = [qt5compat];
-
-  meta.broken = true; # Qt5
 }
@@ -1,6 +1,11 @@
-{mkKdeDerivation}:
+{
+  mkKdeDerivation,
+  pkg-config,
+  hunspell,
+}:
 mkKdeDerivation {
  pname = "lokalize";
-  # FIXME(qt5)
-  meta.broken = true;
+
+  extraNativeBuildInputs = [pkg-config];
+  extraBuildInputs = [hunspell];
 }
@@ -0,0 +1,12 @@
+{
+  mkKdeDerivation,
+  shared-mime-info,
+  qt5compat,
+  qtsvg,
+}:
+mkKdeDerivation {
+  pname = "massif-visualizer";
+
+  extraBuildInputs = [ qt5compat qtsvg ];
+  extraNativeBuildInputs = [ shared-mime-info ];
+}
@@ -1,6 +1,4 @@
 {mkKdeDerivation}:
 mkKdeDerivation {
  pname = "poxml";
-  # FIXME(qt5)
-  meta.broken = true;
 }
@@ -618,10 +618,6 @@
    "croutons": [
      "extra-cmake-modules"
    ],
-    "crow-translate": [
-      "extra-cmake-modules",
-      "kwayland"
-    ],
    "daykountdown": [
      "extra-cmake-modules",
      "kcoreaddons",
@@ -6238,5 +6234,5 @@
      "kwindowsystem"
    ]
  },
-  "version": "65b48b30"
+  "version": "55fdd899"
 }
@@ -110,6 +110,7 @@
    "GPL-2.0-or-later"
  ],
  "angelfish": [
+    "BSD-2-Clause",
    "BSD-3-Clause",
    "CC0-1.0",
    "GPL-2.0-only",
@@ -343,7 +344,8 @@
    "LGPL-2.1-only",
    "LGPL-3.0-only",
    "LicenseRef-KDE-Accepted-GPL",
-    "LicenseRef-KDE-Accepted-LGPL"
+    "LicenseRef-KDE-Accepted-LGPL",
+    "MIT"
  ],
  "dolphin-plugins": [
    "CC0-1.0",
@@ -398,7 +400,8 @@
    "MIT"
  ],
  "falkon": [
-    "CC0-1.0"
+    "CC0-1.0",
+    "GPL-3.0-or-later"
  ],
  "ffmpegthumbs": [
    "BSD-3-Clause",
@@ -409,7 +412,10 @@
    "CC0-1.0",
    "GPL-2.0-only",
    "GPL-3.0-only",
-    "LicenseRef-KDE-Accepted-GPL"
+    "LGPL-2.1-only",
+    "LGPL-3.0-only",
+    "LicenseRef-KDE-Accepted-GPL",
+    "LicenseRef-KDE-Accepted-LGPL"
  ],
  "flatpak-kcm": [
    "BSD-2-Clause",
@@ -524,6 +530,7 @@
  "kaddressbook": [
    "BSD-3-Clause",
    "CC0-1.0",
+    "GPL-2.0-only",
    "GPL-2.0-or-later",
    "LGPL-2.0-or-later",
    "Qt-Commercial-exception-1.0"
@@ -676,7 +683,8 @@
  "kcalc": [
    "BSD-3-Clause",
    "CC0-1.0",
-    "GPL-2.0-or-later"
+    "GPL-2.0-or-later",
+    "MIT"
  ],
  "kcalendarcore": [
    "BSD-3-Clause",
@@ -909,7 +917,6 @@
    "GPL-2.0-only",
    "GPL-3.0-only",
    "GPL-3.0-or-later",
-    "LGPL-2.1-only",
    "LGPL-3.0-only",
    "LicenseRef-KDE-Accepted-GPL",
    "LicenseRef-KDE-Accepted-LGPL",
@@ -987,7 +994,8 @@
    "GPL-3.0-only",
    "LGPL-2.0-only",
    "LGPL-2.0-or-later",
-    "LicenseRef-KDE-Accepted-GPL"
+    "LicenseRef-KDE-Accepted-GPL",
+    "MIT"
  ],
  "kdev-python": [
    "CC0-1.0",
@@ -1050,10 +1058,15 @@
    "LicenseRef-KDE-Accepted-LGPL"
  ],
  "keditbookmarks": [
+    "BSD-2-Clause",
    "BSD-3-Clause",
    "CC0-1.0",
+    "GPL-2.0-only",
+    "GPL-2.0-or-later",
+    "GPL-3.0-only",
    "LGPL-2.0-only",
-    "LGPL-2.0-or-later"
+    "LGPL-2.0-or-later",
+    "LicenseRef-KDE-Accepted-GPL"
  ],
  "keysmith": [
    "BSD-2-Clause",
@@ -1118,6 +1131,9 @@
    "GPL-3.0-only",
    "LicenseRef-KDE-Accepted-GPL"
  ],
+  "kgraphviewer": [
+    "CC0-1.0"
+  ],
  "kguiaddons": [
    "BSD-2-Clause",
    "CC0-1.0",
@@ -1163,6 +1179,7 @@
  ],
  "ki18n": [
    "BSD-3-Clause",
+    "BSD-3-clause",
    "CC0-1.0",
    "LGPL-2.0-or-later",
    "LGPL-2.1-only",
@@ -1309,9 +1326,6 @@
    "GPL-2.0-or-later",
    "LGPL-2.0-only"
  ],
-  "kipi-plugins": [
-    "CC0-1.0"
-  ],
  "kirigami": [
    "BSD-2-Clause",
    "BSD-3-Clause",
@@ -1328,7 +1342,8 @@
  "kirigami-gallery": [
    "BSD-3-Clause",
    "CC0-1.0",
-    "LGPL-2.0"
+    "LGPL-2.0",
+    "LGPL-2.0-or-later"
  ],
  "kiriki": [
    "BSD-3-Clause",
@@ -1343,7 +1358,6 @@
  "kitemviews": [
    "CC0-1.0",
    "GPL-2.0-or-later",
-    "LGPL-2.0-only",
    "LGPL-2.0-or-later"
  ],
  "kiten": [
@@ -1380,6 +1394,9 @@
    "BSD-3-Clause",
    "CC0-1.0",
    "LGPL-2.0-or-later",
+    "LGPL-2.1-only",
+    "LGPL-3.0-only",
+    "LicenseRef-KDE-Accepted-LGPL",
    "MIT"
  ],
  "kleopatra": [
@@ -1514,17 +1531,6 @@
    "GPL-3.0-only",
    "LicenseRef-KDE-Accepted-GPL"
  ],
-  "knotes": [
-    "BSD-3-Clause",
-    "CC0-1.0",
-    "GPL-2.0-or-later",
-    "LGPL-2.0-only",
-    "LGPL-2.0-or-later",
-    "LGPL-2.1-only",
-    "LGPL-3.0-only",
-    "LicenseRef-KDE-Accepted-LGPL",
-    "Qt-Commercial-exception-1.0"
-  ],
  "knotifications": [
    "BSD-3-Clause",
    "CC0-1.0",
@@ -1572,7 +1578,8 @@
    "BSD-3-Clause",
    "CC-BY-SA-4.0",
    "CC0-1.0",
-    "GPL-3.0-or-later"
+    "GPL-3.0-or-later",
+    "LGPL-3.0-or-later"
  ],
  "konqueror": [
    "BSD-2-Clause",
@@ -1646,6 +1653,7 @@
  "korganizer": [
    "BSD-3-Clause",
    "CC0-1.0",
+    "GPL-2.0-only",
    "GPL-2.0-or-later",
    "LGPL-2.0-only",
    "LGPL-2.0-or-later",
@@ -1753,7 +1761,10 @@
  "krdc": [
    "BSD-3-Clause",
    "CC0-1.0",
-    "GPL-2.0-or-later"
+    "GPL-2.0-or-later",
+    "LGPL-2.1-only",
+    "LGPL-3.0-only",
+    "LicenseRef-KDE-Accepted-LGPL"
  ],
  "krdp": [
    "BSD-2-Clause",
@@ -2026,6 +2037,10 @@
    "GPL-2.0-or-later",
    "LGPL-2.1-or-later"
  ],
+  "kweathercore": [
+    "CC0-1.0",
+    "LGPL-2.0-or-later"
+  ],
  "kwidgetsaddons": [
    "CC0-1.0",
    "GPL-2.0-or-later",
@@ -2141,11 +2156,6 @@
    "LGPL-3.0-only",
    "LicenseRef-KDE-Accepted-LGPL"
  ],
-  "libkipi": [
-    "BSD-3-Clause",
-    "CC0-1.0",
-    "GPL-2.0-or-later"
-  ],
  "libkleo": [
    "BSD-3-Clause",
    "CC0-1.0",
@@ -2276,6 +2286,9 @@
    "CC0-1.0",
    "LGPL-2.1-or-later"
  ],
+  "massif-visualizer": [
+    "CC0-1.0"
+  ],
  "mbox-importer": [
    "BSD-3-Clause",
    "CC0-1.0",
@@ -2334,6 +2347,7 @@
    "LGPL-2.0-only",
    "LGPL-2.0-or-later",
    "LGPL-2.1-only",
+    "LGPL-2.1-or-later",
    "LGPL-3.0-only",
    "LicenseRef-KDE-Accepted-GPL",
    "LicenseRef-KDE-Accepted-LGPL"
@@ -2456,11 +2470,8 @@
  "pimcommon": [
    "BSD-3-Clause",
    "CC0-1.0",
-    "GPL-2.0-only",
    "GPL-2.0-or-later",
-    "GPL-3.0-only",
-    "LGPL-2.0-or-later",
-    "LicenseRef-KDE-Accepted-GPL"
+    "LGPL-2.0-or-later"
  ],
  "plasma-activities": [
    "CC0-1.0",
@@ -2736,6 +2747,7 @@
    "LGPL-2.1-only",
    "LGPL-2.1-or-later",
    "LGPL-3.0-only",
+    "LicenseRef-KDE-Accepted-GPL",
    "LicenseRef-KDE-Accepted-LGPL",
    "LicenseRef-KFQF-Accepted-GPL",
    "LicenseRef-Qt-Commercial",
@@ -2838,6 +2850,7 @@
    "BSD-3-Clause",
    "CC0-1.0",
    "GPL-2.0-only",
+    "LGPL",
    "LGPL-2.0-or-later",
    "MIT"
  ],
@@ -764,7 +764,7 @@
  "crow-translate": {
    "description": "Application that allows you to translate and speak text",
    "name": "crow-translate",
-    "project_path": "playground/office/crow-translate",
+    "project_path": "kde/office/crow-translate",
    "repo_path": "office/crow-translate"
  },
  "cutehmi": {
@@ -46,11 +46,14 @@ self: {
        fullName = "W3C Software Notice and Document License (2015-05-13)";
      };

+      "LGPL" = lib.licenses.lgpl2Plus;
+
      # Technically not exact
      "bzip2-1.0.6" = lib.licenses.bsdOriginal;

      # FIXME: typo lol
      "ICS" = lib.licenses.isc;
+      "BSD-3-clause" = lib.licenses.bsd3;

      # These are only relevant to Qt commercial users
      "Qt-Commercial-exception-1.0" = null;
@@ -0,0 +1,30 @@
+{
+  lib,
+  mkKdeDerivation,
+  fetchurl,
+  bison,
+  flex,
+}:
+mkKdeDerivation rec {
+  pname = "kdevelop-pg-qt";
+  version = "2.3.0";
+
+  # Breaks with split -dev
+  outputs = ["out"];
+
+  src = fetchurl {
+    url = "mirror://kde/stable/kdevelop-pg-qt/${version}/src/kdevelop-pg-qt-${version}.tar.xz";
+    hash = "sha256-PT7zyzlelnDmDDmepthlzHluAOUsNV7tlD++yn2nEg0=";
+  };
+
+  extraNativeBuildInputs = [ bison flex ];
+
+  meta.license = with lib.licenses; [
+    bsd3
+    gpl2Plus
+    gpl3Plus
+    lgpl2Only
+    lgpl2Plus
+    mit
+  ];
+}
@@ -1,19 +0,0 @@
-{
-  lib,
-  mkKdeDerivation,
-  fetchurl,
-  qtpositioning,
-}:
-mkKdeDerivation rec {
-  pname = "kweathercore";
-  version = "0.8.0";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/kweathercore/${version}/kweathercore-${version}.tar.xz";
-    hash = "sha256-m8rBPa+YcF4vDVsGshoahpSWIHj84b9iDbvDZIc6Dv4=";
-  };
-
-  extraBuildInputs = [qtpositioning];
-
-  meta.license = with lib.licenses; [cc-by-40 cc0 lgpl2Plus];
-}
@@ -12,13 +12,13 @@
 buildHomeAssistantComponent rec {
  owner = "music-assistant";
  domain = "mass";
-  version = "2024.6.2";
+  version = "2024.8.1";

  src = fetchFromGitHub {
    owner = "music-assistant";
    repo = "hass-music-assistant";
    rev = version;
-    hash = "sha256-Wvc+vUYkUJmS4U34Sh/sDCVXmQA0AtEqIT8MNXd++3M=";
+    hash = "sha256-lrJx2wsVY0aJ+iVBxbZryC6QRvaXdxjBsTma/4ptl4o=";
  };

  postPatch = ''
@@ -11,13 +11,14 @@
  pytest-asyncio,
  pytest-socket,
  requests-mock,
+  respx,
  syrupy,
  pytestCheckHook,
 }:

 buildPythonPackage rec {
  pname = "pytest-homeassistant-custom-component";
-  version = "0.13.147";
+  version = "0.13.154";
  pyproject = true;

  disabled = pythonOlder "3.12";
@@ -26,7 +27,7 @@ buildPythonPackage rec {
    owner = "MatthewFlamm";
    repo = "pytest-homeassistant-custom-component";
    rev = "refs/tags/${version}";
-    hash = "sha256-FivgP0tKmu9QKPSVU9c/3SNduyKoSeAquHysdHSs11E=";
+    hash = "sha256-BmZ12amsa4BzesaxGMdQ2VY2FM5ZfgU32plAl4mG+tE=";
  };

  build-system = [ setuptools ];
@@ -41,6 +42,7 @@ buildPythonPackage rec {
    pytest-asyncio
    pytest-socket
    requests-mock
+    respx
    syrupy
  ];

@@ -42,14 +42,14 @@ let
  };
 in {
  nextcloud28 = generic {
-    version = "28.0.8";
-    hash = "sha256-VaL3RfzI8BtYFrIzM/HjAU0gQKZnlOEy3dDSGaN75To=";
+    version = "28.0.9";
+    hash = "sha256-DZd3NkDn+A6gqTP7+L0pe/JB2ghy+hzFQ1D/F5Nmmxs=";
    packages = nextcloud28Packages;
  };

  nextcloud29 = generic {
-    version = "29.0.4";
-    hash = "sha256-GcRp4mSzHugEAPg5ZGCFRUZWnojbTBX8CFThkvlgJ+s=";
+    version = "29.0.5";
+    hash = "sha256-x/6cYeXsMKXlmejxUqGCXfaE0w6JnbDKqIaMjWe1Oiw=";
    packages = nextcloud29Packages;
  };

@@ -1,8 +1,8 @@
 {
  "bookmarks": {
-    "hash": "sha256-hqmX64arwllviwG7ySvdwA8IYzWoLjP2MyhT389UZXw=",
-    "url": "https://github.com/nextcloud/bookmarks/releases/download/v14.2.2/bookmarks-14.2.2.tar.gz",
-    "version": "14.2.2",
+    "hash": "sha256-jByO7cJ9oQ4lQopzXCii11wqhg9tIlm/AFFViH+P3O0=",
+    "url": "https://github.com/nextcloud/bookmarks/releases/download/v14.2.4/bookmarks-14.2.4.tar.gz",
+    "version": "14.2.4",
    "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- ☠ Find broken links and duplicates\n- 📲 Synchronize with all your browsers and devices\n- 📔 Store archived versions of your links in case they are depublished\n- 🔍 Full-text search on site contents\n- 👪 Share bookmarks with other users and via public links\n- ⚛ Generate RSS feeds of your collections\n- 📈 Stats on how often you access which links\n- 🔒 Automatic backups of your bookmarks collection\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n   - intl: *\n   - mbstring: *\n - when using MySQL, use at least v8.0",
    "homepage": "https://github.com/nextcloud/bookmarks",
    "licenses": [
@@ -10,9 +10,9 @@
    ]
  },
  "calendar": {
-    "hash": "sha256-qToUgtGGwr8h5me95TxxCk3o/rsYD0yasqV4Kz/pbCA=",
-    "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.7.14/calendar-v4.7.14.tar.gz",
-    "version": "4.7.14",
+    "hash": "sha256-AcPONkfFTDRd7CQC5d0C7Fr3pKRsQXl8+GhaNlqpgiY=",
+    "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.7.15/calendar-v4.7.15.tar.gz",
+    "version": "4.7.15",
    "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.",
    "homepage": "https://github.com/nextcloud/calendar/",
    "licenses": [
@@ -90,9 +90,9 @@
    ]
  },
  "groupfolders": {
-    "hash": "sha256-a22KP20fE+cpOuv2erl3qUu4glWArx5oISFlI8vxAQc=",
-    "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v16.0.7/groupfolders-v16.0.7.tar.gz",
-    "version": "16.0.7",
+    "hash": "sha256-AMhhpzznCMW6vHc5vHkP4/wWY+NcqSvB/ZTVj2U6peM=",
+    "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v16.0.8/groupfolders-v16.0.8.tar.gz",
+    "version": "16.0.8",
    "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.",
    "homepage": "https://github.com/nextcloud/groupfolders",
    "licenses": [
@@ -130,9 +130,9 @@
    ]
  },
  "mail": {
-    "hash": "sha256-tK3RkfREo9bwocO5xfeRGfeOSdXrZzINZEgHjsWe044=",
-    "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.6/mail-v3.7.6.tar.gz",
-    "version": "3.7.6",
+    "hash": "sha256-oXdwApzy67tCsUNsPTdsE3HIs89g46I2W+cCVCPkRow=",
+    "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.7/mail-v3.7.7.tar.gz",
+    "version": "3.7.7",
    "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
    "homepage": "https://github.com/nextcloud/mail#readme",
    "licenses": [
@@ -140,8 +140,8 @@
    ]
  },
  "maps": {
-    "hash": "sha256-BmXs6Oepwnm+Cviy4awm3S8P9AiJTt1BnAQNb4TxVYE=",
-    "url": "https://github.com/nextcloud/maps/releases/download/v1.4.0/maps-1.4.0.tar.gz",
+    "hash": "sha256-FmRhpPRpMnCHkJFaVvQuR6Y7Pd7vpP+tUVih919g/fQ=",
+    "url": "https://github.com/nextcloud/maps/releases/download/v1.4.0-1-nightly/maps-1.4.0-1-nightly.tar.gz",
    "version": "1.4.0",
    "description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.",
    "homepage": "https://github.com/nextcloud/maps",
@@ -210,9 +210,9 @@
    ]
  },
  "polls": {
-    "hash": "sha256-Lya2mkgOIG68owLws561/tdR3WWrj0RI5ZP5FTX7FdI=",
-    "url": "https://github.com/nextcloud/polls/releases/download/v7.1.4/polls.tar.gz",
-    "version": "7.1.4",
+    "hash": "sha256-6vYcZvI0F+imCMRO1XwBcyLmNJR+1miOkR2mpPpYAJE=",
+    "url": "https://github.com/nextcloud/polls/releases/download/v7.2.0/polls.tar.gz",
+    "version": "7.2.0",
    "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).",
    "homepage": "https://github.com/nextcloud/polls",
    "licenses": [
@@ -270,9 +270,9 @@
    ]
  },
  "tasks": {
-    "hash": "sha256-HitYQcdURUHujRNMF0jKQzvSO93bItisI0emq0yw8p4=",
-    "url": "https://github.com/nextcloud/tasks/releases/download/v0.16.0/tasks.tar.gz",
-    "version": "0.16.0",
+    "hash": "sha256-Upa3dl+b97UV3KXLlcxeS6OzFBTIW+e3U/T9QJT6Pmw=",
+    "url": "https://github.com/nextcloud/tasks/releases/download/v0.16.1/tasks.tar.gz",
+    "version": "0.16.1",
    "description": "Once enabled, a new Tasks menu will appear in your Nextcloud apps menu. From there you can add and delete tasks, edit their title, description, start and due dates and mark them as important. Tasks can be shared between users. Tasks can be synchronized using CalDav (each task list is linked to an Nextcloud calendar, to sync it to your local client: Thunderbird, Evolution, KDE Kontact, iCal … - just add the calendar as a remote calendar in your client). You can download your tasks as ICS files using the download button for each calendar.",
    "homepage": "https://github.com/nextcloud/tasks/",
    "licenses": [
@@ -280,9 +280,9 @@
    ]
  },
  "twofactor_nextcloud_notification": {
-    "hash": "sha256-P1yomRZJV0p01qXlSbiA9TvV7OuIUNVw/fHNWAdkfTg=",
-    "url": "https://github.com/nextcloud-releases/twofactor_nextcloud_notification/releases/download/v3.10.0/twofactor_nextcloud_notification-v3.10.0.tar.gz",
-    "version": "3.10.0",
+    "hash": "sha256-4fXWgDeiup5/Gm9hdZDj/u07rp/Nzwly53aLUT/d0IU=",
+    "url": "https://github.com/nextcloud-releases/twofactor_nextcloud_notification/releases/download/v3.9.0/twofactor_nextcloud_notification-v3.9.0.tar.gz",
+    "version": "3.9.0",
    "description": "Allows using any of your logged in devices as second factor",
    "homepage": "https://github.com/nextcloud/twofactor_nextcloud_notification",
    "licenses": [
@@ -1,8 +1,8 @@
 {
  "bookmarks": {
-    "hash": "sha256-hqmX64arwllviwG7ySvdwA8IYzWoLjP2MyhT389UZXw=",
-    "url": "https://github.com/nextcloud/bookmarks/releases/download/v14.2.2/bookmarks-14.2.2.tar.gz",
-    "version": "14.2.2",
+    "hash": "sha256-jByO7cJ9oQ4lQopzXCii11wqhg9tIlm/AFFViH+P3O0=",
+    "url": "https://github.com/nextcloud/bookmarks/releases/download/v14.2.4/bookmarks-14.2.4.tar.gz",
+    "version": "14.2.4",
    "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- ☠ Find broken links and duplicates\n- 📲 Synchronize with all your browsers and devices\n- 📔 Store archived versions of your links in case they are depublished\n- 🔍 Full-text search on site contents\n- 👪 Share bookmarks with other users and via public links\n- ⚛ Generate RSS feeds of your collections\n- 📈 Stats on how often you access which links\n- 🔒 Automatic backups of your bookmarks collection\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n   - intl: *\n   - mbstring: *\n - when using MySQL, use at least v8.0",
    "homepage": "https://github.com/nextcloud/bookmarks",
    "licenses": [
@@ -10,9 +10,9 @@
    ]
  },
  "calendar": {
-    "hash": "sha256-qToUgtGGwr8h5me95TxxCk3o/rsYD0yasqV4Kz/pbCA=",
-    "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.7.14/calendar-v4.7.14.tar.gz",
-    "version": "4.7.14",
+    "hash": "sha256-AcPONkfFTDRd7CQC5d0C7Fr3pKRsQXl8+GhaNlqpgiY=",
+    "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.7.15/calendar-v4.7.15.tar.gz",
+    "version": "4.7.15",
    "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.",
    "homepage": "https://github.com/nextcloud/calendar/",
    "licenses": [
@@ -90,9 +90,9 @@
    ]
  },
  "groupfolders": {
-    "hash": "sha256-x9T/JoNJl6LxaPzF9IpKaGrz321nbMSAN3gfZbSapGE=",
-    "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v17.0.1/groupfolders-v17.0.1.tar.gz",
-    "version": "17.0.1",
+    "hash": "sha256-cWWlvuUTO4B89CDZzfJLN8MRmQwPMwj0OwFqhIUxAsQ=",
+    "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v17.0.2/groupfolders-v17.0.2.tar.gz",
+    "version": "17.0.2",
    "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.",
    "homepage": "https://github.com/nextcloud/groupfolders",
    "licenses": [
@@ -130,9 +130,9 @@
    ]
  },
  "mail": {
-    "hash": "sha256-tK3RkfREo9bwocO5xfeRGfeOSdXrZzINZEgHjsWe044=",
-    "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.6/mail-v3.7.6.tar.gz",
-    "version": "3.7.6",
+    "hash": "sha256-oXdwApzy67tCsUNsPTdsE3HIs89g46I2W+cCVCPkRow=",
+    "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.7/mail-v3.7.7.tar.gz",
+    "version": "3.7.7",
    "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
    "homepage": "https://github.com/nextcloud/mail#readme",
    "licenses": [
@@ -210,9 +210,9 @@
    ]
  },
  "polls": {
-    "hash": "sha256-Lya2mkgOIG68owLws561/tdR3WWrj0RI5ZP5FTX7FdI=",
-    "url": "https://github.com/nextcloud/polls/releases/download/v7.1.4/polls.tar.gz",
-    "version": "7.1.4",
+    "hash": "sha256-6vYcZvI0F+imCMRO1XwBcyLmNJR+1miOkR2mpPpYAJE=",
+    "url": "https://github.com/nextcloud/polls/releases/download/v7.2.0/polls.tar.gz",
+    "version": "7.2.0",
    "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).",
    "homepage": "https://github.com/nextcloud/polls",
    "licenses": [
@@ -270,9 +270,9 @@
    ]
  },
  "tasks": {
-    "hash": "sha256-HitYQcdURUHujRNMF0jKQzvSO93bItisI0emq0yw8p4=",
-    "url": "https://github.com/nextcloud/tasks/releases/download/v0.16.0/tasks.tar.gz",
-    "version": "0.16.0",
+    "hash": "sha256-Upa3dl+b97UV3KXLlcxeS6OzFBTIW+e3U/T9QJT6Pmw=",
+    "url": "https://github.com/nextcloud/tasks/releases/download/v0.16.1/tasks.tar.gz",
+    "version": "0.16.1",
    "description": "Once enabled, a new Tasks menu will appear in your Nextcloud apps menu. From there you can add and delete tasks, edit their title, description, start and due dates and mark them as important. Tasks can be shared between users. Tasks can be synchronized using CalDav (each task list is linked to an Nextcloud calendar, to sync it to your local client: Thunderbird, Evolution, KDE Kontact, iCal … - just add the calendar as a remote calendar in your client). You can download your tasks as ICS files using the download button for each calendar.",
    "homepage": "https://github.com/nextcloud/tasks/",
    "licenses": [
@@ -280,9 +280,9 @@
    ]
  },
  "twofactor_nextcloud_notification": {
-    "hash": "sha256-P1yomRZJV0p01qXlSbiA9TvV7OuIUNVw/fHNWAdkfTg=",
-    "url": "https://github.com/nextcloud-releases/twofactor_nextcloud_notification/releases/download/v3.10.0/twofactor_nextcloud_notification-v3.10.0.tar.gz",
-    "version": "3.10.0",
+    "hash": "sha256-4fXWgDeiup5/Gm9hdZDj/u07rp/Nzwly53aLUT/d0IU=",
+    "url": "https://github.com/nextcloud-releases/twofactor_nextcloud_notification/releases/download/v3.9.0/twofactor_nextcloud_notification-v3.9.0.tar.gz",
+    "version": "3.9.0",
    "description": "Allows using any of your logged in devices as second factor",
    "homepage": "https://github.com/nextcloud/twofactor_nextcloud_notification",
    "licenses": [
@@ -19,16 +19,16 @@ let
  };
 in buildNpmPackage' rec {
  pname = "balena-cli";
-  version = "18.2.34";
+  version = "19.0.0";

  src = fetchFromGitHub {
    owner = "balena-io";
    repo = "balena-cli";
    rev = "v${version}";
-    hash = "sha256-0ypcpbM0rNHbGW8GQb0HZwpc6xi6huzG1s11LkYTQR8=";
+    hash = "sha256-f5ZTiO0OXia7VbjQCTxMK3YPHoxCNaZraaTDiR9wEEE=";
  };

-  npmDepsHash = "sha256-dzbtUAwGw+DCtZTScQr8NyPOlyFcIMSFtK8/Sww4TBo=";
+  npmDepsHash = "sha256-PG3GDOP9sI67K6SsLvzRlH3b+SQ9XRfGLtvPXTADFPM=";

  postPatch = ''
    ln -s npm-shrinkwrap.json package-lock.json
@@ -73,8 +73,7 @@ in
 , sqlite
 , util-linuxMinimal
 , xz
-
-, enableDocumentation ? !atLeast24 || stdenv.hostPlatform == stdenv.buildPlatform
+, enableDocumentation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform
 , enableStatic ? stdenv.hostPlatform.isStatic
 , withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp
 , withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp, libseccomp
@@ -105,6 +104,8 @@ self = stdenv.mkDerivation {
    "shadowstack"
  ] ++ lib.optional stdenv.hostPlatform.isMusl "fortify";

+  nativeInstallCheckInputs = lib.optional atLeast221 git ++ lib.optional atLeast219 man;
+
  nativeBuildInputs = [
    pkg-config
    autoconf-archive
@@ -155,11 +156,6 @@ self = stdenv.mkDerivation {
    aws-sdk-cpp
  ];

-  installCheckInputs = lib.optionals atLeast221 [
-    git
-  ] ++ lib.optionals atLeast219 [
-    man
-  ];

  propagatedBuildInputs = [
    boehmgc
@@ -246,6 +242,9 @@ self = stdenv.mkDerivation {
  # See https://github.com/NixOS/nix/issues/5687
  + lib.optionalString (atLeast25 && stdenv.isDarwin) ''
    echo "exit 99" > tests/gc-non-blocking.sh
+  '' + ''
+    # nixStatic otherwise does not find its man pages in tests.
+    export MANPATH=$man/share/man:$MANPATH
  '';

  separateDebugInfo = stdenv.isLinux && (atLeast24 -> !enableStatic);
@@ -8,7 +8,6 @@
 , boost
 , autoreconfHook
 , autoconf-archive
-, nlohmann_json
 , xz
 , Security
 , meson
@@ -18,6 +17,7 @@

 let
  atLeast223 = lib.versionAtLeast nix.version "2.23";
+  atLeast224 = lib.versionAtLeast nix.version "2.24";

  mkConfigureOption = { mesonOption, autoconfOption, value }:
    let
@@ -30,7 +30,14 @@ in stdenv.mkDerivation (finalAttrs: {
  pname = "nix-perl";
  inherit (nix) version src;

-  postUnpack = "sourceRoot=$sourceRoot/perl";
+  postUnpack = "sourceRoot=$sourceRoot/${lib.optionalString atLeast224 "src"}/perl";
+
+  # TODO: Remove this once the nix build also uses meson
+  postPatch = lib.optionalString atLeast224 ''
+    substituteInPlace lib/Nix/Store.xs \
+      --replace-fail 'config-util.hh' 'nix/config.h' \
+      --replace-fail 'config-store.hh' 'nix/config.h'
+  '';

  buildInputs = [
    boost
@@ -8,16 +8,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "please";
-  version = "0.5.4";
+  version = "0.5.5";

  src = fetchFromGitLab {
    owner = "edneville";
    repo = "please";
    rev = "v${version}";
-    hash = "sha256-GW2t3pTX06mqEwFTpiLe3mlzFTmb5Fep5R0yHooRmig=";
+    hash = "sha256-bQ91uCDA2HKuiBmHZ9QP4V6tM6c7hRvECqXzfC6EEnI=";
  };

-  cargoHash = "sha256-bd3Pc8QPyPjE+xVcwASDILTXvMCioId/n6dXSr/KDOQ=";
+  cargoHash = "sha256-PheqGFkXd5lQLMfrmH+TS0jfHdGPym/pTSh5Y2ZIHqw=";

  nativeBuildInputs = [ installShellFiles ];

@@ -7,16 +7,16 @@

 buildGoModule rec {
  pname = "nats-top";
-  version = "0.6.1";
+  version = "0.6.2";

  src = fetchFromGitHub {
    owner = "nats-io";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-YQNIEhs/KNJp7184zBk0NZyXRWLQDaySZBJWe11vI9E=";
+    hash = "sha256-zOo+f4NVFvx9deV1QY7mCi6Q0EJRMRwPu12maFDlnCU=";
  };

-  vendorHash = "sha256-IhaeM/stU9O48reT/mUadSkZDz0JXKCXjSRw8TMesTY=";
+  vendorHash = "sha256-oPapBYm3gJtPpVP0lmsVijAdjK6M8/kOx/7QIeInOlM=";

  ldflags = [
    "-s"
@@ -445,6 +445,7 @@ mapAliases ({
  fastnlo_toolkit = fastnlo-toolkit; # Added 2024-01-03
  fcitx5-catppuccin = catppuccin-fcitx5; # Added 2024-06-19
  inherit (luaPackages) fennel; # Added 2022-09-24
+  ferdi = throw "'ferdi' has been removed, upstream does not exist anymore and the package is insecure"; # Added 2024-08-22
  fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H"; # preserve
  ffmpeg_5 = throw "ffmpeg_5 has been removed, please use a newer version or ffmpeg_4 for compatibility"; # Added 2024-07-12
  ffmpeg_5-headless = throw "ffmpeg_5-headless has been removed, please use a newer version or ffmpeg_4-headless for compatibility"; # Added 2024-07-12
@@ -7898,10 +7898,6 @@ with pkgs;

  fprintd-tod = callPackage ../tools/security/fprintd/tod.nix { };

-  ferdi = callPackage ../applications/networking/instant-messengers/ferdi {
-    mkFranzDerivation = callPackage ../applications/networking/instant-messengers/franz/generic.nix { };
-  };
-
  ferdium = callPackage ../applications/networking/instant-messengers/ferdium {
    mkFranzDerivation = callPackage ../applications/networking/instant-messengers/franz/generic.nix { };
  };
@@ -17420,6 +17416,7 @@ with pkgs;
  asn2quickder = python3Packages.callPackage ../development/tools/asn2quickder { };

  astyle = callPackage ../development/tools/misc/astyle { };
+  libastyle = astyle.override { asLibrary = true; };

  automaticcomponenttoolkit = callPackage ../development/tools/misc/automaticcomponenttoolkit { };