Merge master into staging-next

2024-11-20 00:14:58 +00:00
parent 85254f32ee 1cbb18a94a
commit 29d91d2c04
85 changed files with 887 additions and 14103 deletions
@@ -264,6 +264,7 @@
  ./programs/openvpn3.nix
  ./programs/obs-studio.nix
  ./programs/partition-manager.nix
+  ./programs/pay-respects.nix
  ./programs/plotinus.nix
  ./programs/pqos-wrapper.nix
  ./programs/projecteur.nix
@@ -11,6 +11,7 @@ let
    mkEnableOption
    mkIf
    mkOption
+    optionalString
    types
    ;
  inherit (types) str;
@@ -48,8 +49,8 @@ in

    programs = {
      bash.interactiveShellInit = initScript "bash";
-      fish.interactiveShellInit = mkIf config.programs.fish.enable initScript "fish";
-      zsh.interactiveShellInit = mkIf config.programs.zsh.enable initScript "zsh";
+      fish.interactiveShellInit = optionalString config.programs.fish.enable (initScript "fish");
+      zsh.interactiveShellInit = optionalString config.programs.zsh.enable (initScript "zsh");
    };
  };
  meta.maintainers = with maintainers; [ sigmasquadron ];
@@ -1,35 +1,27 @@
 { config, lib, pkgs, ... }:
-let

+let
  cfg = config.services.opendkim;

  defaultSock = "local:/run/opendkim/opendkim.sock";

-  keyFile = "${cfg.keyPath}/${cfg.selector}.private";
-
  args = [ "-f" "-l"
           "-p" cfg.socket
           "-d" cfg.domains
-           "-k" keyFile
+           "-k" "${cfg.keyPath}/${cfg.selector}.private"
           "-s" cfg.selector
         ] ++ lib.optionals (cfg.configFile != null) [ "-x" cfg.configFile ];

+  configFile = pkgs.writeText "opendkim.conf"
+    (lib.concatStringsSep "\n" (lib.mapAttrsToList (name: value: "${name} ${value}") cfg.settings));
 in {
  imports = [
    (lib.mkRenamedOptionModule [ "services" "opendkim" "keyFile" ] [ "services" "opendkim" "keyPath" ])
  ];

-  ###### interface
-
  options = {
-
    services.opendkim = {
-
-      enable = lib.mkOption {
-        type = lib.types.bool;
-        default = false;
-        description = "Whether to enable the OpenDKIM sender authentication system.";
-      };
+      enable = lib.mkEnableOption "OpenDKIM sender authentication system";

      socket = lib.mkOption {
        type = lib.types.str;
@@ -74,21 +66,24 @@ in {
        description = "Selector to use when signing.";
      };

+      # TODO: deprecate this?
      configFile = lib.mkOption {
        type = lib.types.nullOr lib.types.path;
        default = null;
-        description = "Additional opendkim configuration.";
+        description = "Additional opendkim configuration as a file.";
      };

+      settings = lib.mkOption {
+        type = with lib.types; submodule {
+          freeformType = attrsOf str;
+        };
+        default = { };
+        description = "Additional opendkim configuration";
+      };
    };
-
  };

-
-  ###### implementation
-
  config = lib.mkIf cfg.enable {
-
    users.users = lib.optionalAttrs (cfg.user == "opendkim") {
      opendkim = {
        group = cfg.group;
@@ -100,7 +95,14 @@ in {
      opendkim.gid = config.ids.gids.opendkim;
    };

-    environment.systemPackages = [ pkgs.opendkim ];
+    environment = {
+      etc = lib.mkIf (cfg.settings != { }) {
+        "opendkim/opendkim.conf".source = configFile;
+      };
+      systemPackages = [ pkgs.opendkim ];
+    };
+
+    services.opendkim.configFile = lib.mkIf (cfg.settings != { }) configFile;

    systemd.tmpfiles.rules = [
      "d '${cfg.keyPath}' - ${cfg.user} ${cfg.group} - -"
@@ -159,6 +161,5 @@ in {
        UMask = "0077";
      };
    };
-
  };
 }
@@ -154,8 +154,8 @@ let
            (l: warn "setting this option with a list is deprecated"
              listToAttrs (map (p: nameValuePair (p.name or (throw "${p} does not have a name")) p) l))
            (attrsOf path);
-          default = { inherit (pkgs.wordpressPackages.themes) twentytwentyfour; };
-          defaultText = literalExpression "{ inherit (pkgs.wordpressPackages.themes) twentytwentyfour; }";
+          default = { inherit (pkgs.wordpressPackages.themes) twentytwentyfive; };
+          defaultText = literalExpression "{ inherit (pkgs.wordpressPackages.themes) twentytwentyfive; }";
          description = ''
            Path(s) to respective theme(s) which are copied from the 'theme' directory.

@@ -67,7 +67,7 @@ rec {
      networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ];
    };
  }) {} [
-    "6_6"
+    "6_7"
  ];

  testScript = ''
@@ -1,10 +1,10 @@
 {
  traefik-crd = {
-    url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-25.0.3+up25.0.0.tgz";
-    sha256 = "1z693i4kd3jyf26ccnb0sxjyxadipl6k13n7jyg5v4y93fv1rpdw";
+    url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-27.0.201+up27.0.2.tgz";
+    sha256 = "0vwprcb60y15sc4lmi58gl1zr3yhsq43jlbsfm7gs20ci90frv16";
  };
  traefik = {
-    url = "https://k3s.io/k3s-charts/assets/traefik/traefik-25.0.3+up25.0.0.tgz";
-    sha256 = "1a24qlp7c6iri72ka1i37l1lzn13xibrd26dy295z2wzr55gg7if";
+    url = "https://k3s.io/k3s-charts/assets/traefik/traefik-27.0.201+up27.0.2.tgz";
+    sha256 = "12dp1r82qfzqfzs4sfxc54rnw8kv42a3w4gpk5v3qkhqm6fkrnn1";
  };
 }
@@ -1,18 +1,18 @@
 {
  "airgap-images-amd64": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.14%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "0rydihys7r9sscl7bv2ixbs3b25jjxr9rsgzz5nwgz6ncsr6nn7v"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.15%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "0p14llji8m1pfi289w29smx6sbad6qhgxk9drwlyrfdywrhd04ly"
  },
  "airgap-images-arm": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.14%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "036inn29k2c0wdbkxxh4fl6gs2g2wckv7856n7dhy791j33v8v0f"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.15%2Bk3s1/k3s-airgap-images-arm.tar.zst",
+    "sha256": "054apgl2al8822f399ir81jbid9mfs27d4by7xkkpdbqr3fywbr6"
  },
  "airgap-images-arm64": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.14%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "107s3imimc3gg8hmahihqc8930yzqcgxly7rhjia1z76vskswhpx"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.15%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "19hzamg68zc1k90a9m6p2jnpy2p7v437kvgqsw198bhy796f6asb"
  },
  "images-list": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.14%2Bk3s1/k3s-images.txt",
-    "sha256": "1l71xhcj2z9fz3mn89iyyxznrgk59qgng549iq3zc8w3l0hl0qry"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.15%2Bk3s1/k3s-images.txt",
+    "sha256": "05229bfg174pvy525dcy7rvmgv9i9v1nnz5ngq80n7zkxj9cp8m8"
  }
 }
@@ -1,15 +1,15 @@
 {
-  k3sVersion = "1.28.14+k3s1";
-  k3sCommit = "3ef2bdb1e5ba667b735a65cbfa43229fd49230ef";
-  k3sRepoSha256 = "146xxpldp7bffn8sigfp9xjj8hw793ybp1xrfyb9s0bd85yxiw4x";
-  k3sVendorHash = "sha256-Y5s5lPP2bVGPHQPma3DJYYP91I3HQQoi+KbjEZpTr6w=";
+  k3sVersion = "1.28.15+k3s1";
+  k3sCommit = "869dd4d62626f5ba4afe3a923d77b2047c565a43";
+  k3sRepoSha256 = "1nijdii01004v2cgpaw0xnzyrljd4iw00wca1lg6szhqmj28gcfv";
+  k3sVendorHash = "sha256-zWBMZrpRJzzc4yAIWAnWnmVE7qr7bscJjHrHdDD0Ilg=";
  chartVersions = import ./chart-versions.nix;
  imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
  k3sRootVersion = "0.14.0";
  k3sRootSha256 = "15cs9faw3jishsb5nhgmb5ldjc47hkwf7hz2126fp8ahf80m0fcl";
  k3sCNIVersion = "1.5.1-k3s1";
  k3sCNISha256 = "1bkz78p77aiw64hdvmlgc5zir9x8zha8qprfaab48jxbcsj3dfi7";
-  containerdVersion = "1.7.21-k3s2.28";
-  containerdSha256 = "00gdmd617mxf246m3mfz8if8snaciib4zdb7fm12mdhf52w031a6";
+  containerdVersion = "1.7.22-k3s1.28";
+  containerdSha256 = "0jpq03n5q8aydw4y14w9fl4fqixpdcw42gwvmsp3z3qplbvwkfkl";
  criCtlVersion = "1.26.0-rc.0-k3s1";
 }
@@ -1,10 +1,10 @@
 {
  traefik-crd = {
-    url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-25.0.3+up25.0.0.tgz";
-    sha256 = "1z693i4kd3jyf26ccnb0sxjyxadipl6k13n7jyg5v4y93fv1rpdw";
+    url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-27.0.201+up27.0.2.tgz";
+    sha256 = "0vwprcb60y15sc4lmi58gl1zr3yhsq43jlbsfm7gs20ci90frv16";
  };
  traefik = {
-    url = "https://k3s.io/k3s-charts/assets/traefik/traefik-25.0.3+up25.0.0.tgz";
-    sha256 = "1a24qlp7c6iri72ka1i37l1lzn13xibrd26dy295z2wzr55gg7if";
+    url = "https://k3s.io/k3s-charts/assets/traefik/traefik-27.0.201+up27.0.2.tgz";
+    sha256 = "12dp1r82qfzqfzs4sfxc54rnw8kv42a3w4gpk5v3qkhqm6fkrnn1";
  };
 }
@@ -1,18 +1,18 @@
 {
  "airgap-images-amd64": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.9%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "0z3k4pc5cg75krk391d9h74ankv20mfcswrhwhhfv208rcndd9w9"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.10%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "0vyanank5iaflhxjiz7wqq52swfdf5i0ca40bigq8ynjh39l9rh9"
  },
  "airgap-images-arm": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.9%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "0iy0xz8ypmgn48jh3b4hbnwl8iszdb35c2f6an115z86lnl7a9a3"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.10%2Bk3s1/k3s-airgap-images-arm.tar.zst",
+    "sha256": "1lsfnifh5krb7jc4jr7kfrj2a8snrv58c90qq72pkl4akdbg4l2r"
  },
  "airgap-images-arm64": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.9%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "1bjfd63jd7a1yhh796nmdh7jvw9mabsw5gajcx8ssqcxd4wwrdxb"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.10%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "03y6pnr3yxa60vnz1r3k51f9fr2vrb1jffkjla1p4j8w3bs5gaqq"
  },
  "images-list": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.9%2Bk3s1/k3s-images.txt",
-    "sha256": "1l71xhcj2z9fz3mn89iyyxznrgk59qgng549iq3zc8w3l0hl0qry"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.10%2Bk3s1/k3s-images.txt",
+    "sha256": "05229bfg174pvy525dcy7rvmgv9i9v1nnz5ngq80n7zkxj9cp8m8"
  }
 }
@@ -1,15 +1,15 @@
 {
-  k3sVersion = "1.29.9+k3s1";
-  k3sCommit = "e92d3b3ba7a4810e82e38a3d5c6091a3e18caad5";
-  k3sRepoSha256 = "1i4881nv41dpvxmh20qy121d45431xbhkzlywx1rfwqla8wq6bwh";
-  k3sVendorHash = "sha256-JeX9SJw6U1/FMbv9fVQeQvAZKq+Z99ZrLC2bAy1vUkA=";
+  k3sVersion = "1.29.10+k3s1";
+  k3sCommit = "ae4df3117e4860c986f81361a8e5825e6418f9ee";
+  k3sRepoSha256 = "17c5y00y7f3zadpqkjpbw9ylscs7m7bqcym7y3ddgsm4cg6bz5g7";
+  k3sVendorHash = "sha256-X2Js9DxEmjCQc/w6M5+6NS9y3znutFmH7j95fDETqDI=";
  chartVersions = import ./chart-versions.nix;
  imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
  k3sRootVersion = "0.14.0";
  k3sRootSha256 = "15cs9faw3jishsb5nhgmb5ldjc47hkwf7hz2126fp8ahf80m0fcl";
  k3sCNIVersion = "1.5.1-k3s1";
  k3sCNISha256 = "1bkz78p77aiw64hdvmlgc5zir9x8zha8qprfaab48jxbcsj3dfi7";
-  containerdVersion = "1.7.21-k3s2";
-  containerdSha256 = "0kp93fhmw2kiy46hw3ag05z8xwhw7kqp4wcbhsxshsdf0929g539";
+  containerdVersion = "1.7.22-k3s1";
+  containerdSha256 = "031rapiynpm7zlzn42l8z4m125lww2vyspw02irs4q3qb6mpx3px";
  criCtlVersion = "1.29.0-k3s1";
 }
@@ -11,29 +11,22 @@

 rustPlatform.buildRustPackage rec {
  pname = "gurk-rs";
-  version = "0.5.1";
+  version = "0.5.2";

  src = fetchFromGitHub {
    owner = "boxdot";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-g0V6FPkCpIEWx+/kDG9+0NtlCVj6jc1gbkkzOSl/lAo=";
+    repo = "gurk-rs";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-ZVpI60pZZCLRnKdC80P8f63gE0+Vi1lelhyFPAhpHyU=";
  };

  postPatch = ''
    rm .cargo/config.toml
  '';

-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "libsignal-protocol-0.1.0" = "sha256-4aHINlpVAqVTtm7npwXQRutZUmIxYgkhXhApg7jSM4M=";
-      "libsignal-service-0.1.0" = "sha256-AOGw76A9R2qH3hc7B+MBE3okzW8b5LTZdepzUDOv9lM=";
-      "curve25519-dalek-4.1.3" = "sha256-bPh7eEgcZnq9C3wmSnnYv0C4aAP+7pnwk9Io29GrI4A=";
-      "presage-0.6.2" = "sha256-t9t8ecPtefI/jYlk+Ul8WdgH26VJIkfMptbKxprekS0=";
-      "qr2term-0.3.1" = "sha256-U8YLouVZTtDwsvzZiO6YB4Pe75RXGkZXOxHCQcCOyT8=";
-    };
-  };
+  useFetchCargoVendor = true;
+
+  cargoHash = "sha256-jTZ2wJPXj3nU7GVTfne64eSra+JuKhNryCtRZMKOE44=";

  nativeBuildInputs = [ protobuf pkg-config ];

@@ -17,13 +17,13 @@ in
 buildKodiAddon rec {
  pname = "jellyfin";
  namespace = "plugin.video.jellyfin";
-  version = "1.0.5";
+  version = "1.0.6";

  src = fetchFromGitHub {
    owner = "jellyfin";
    repo = "jellyfin-kodi";
    rev = "v${version}";
-    sha256 = "sha256-MPRyMeJuuiG62ahNKfXyb3Q4LDm0yXkNgCeYxfpT1io=";
+    sha256 = "sha256-bGdTMe45zHhTBHp4k1l4N4ksSL+MJdKh3hDBS6TDtPI=";
  };

  nativeBuildInputs = [ python ];
@@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "docker-compose";
-  version = "2.30.0";
+  version = "2.30.3";

  src = fetchFromGitHub {
    owner = "docker";
    repo = "compose";
    rev = "v${version}";
-    hash = "sha256-L31O/Hzn0jbu5VqVB18PZUSJPGfqU+73Jx3e1njxGiI=";
+    hash = "sha256-L+RDO31LnQbWA22bkCrnU2QDF6+eCPwbPpzZxHGrZ1Q=";
  };

  postPatch = ''
@@ -16,7 +16,7 @@ buildGoModule rec {
    rm -rf e2e/
  '';

-  vendorHash = "sha256-j9gV1PNTqVRctbhnYRydGwJvBpb9uQCxcdBrQCdbBrg=";
+  vendorHash = "sha256-IbDr2cTGmJZM8G2cj35CwfEX+DWVD0L4pUxHBvu9EfI=";

  ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];

@@ -1,9 +1,9 @@
 {
  "owner": "advplyr",
  "repo": "audiobookshelf",
-  "rev": "e05cb0ef4de000eb20e46b6557a35fa12cc6b9a0",
-  "hash": "sha256-wbcXyHtlpCZ5lmFmYxMB5Z+ObVq0P8LFAQ1AoQpWbt8=",
-  "version": "2.16.2",
-  "depsHash": "sha256-/A+XyN2nfpj8bSJgfNey7DOKB7QeeuZGCy2yKi46HwQ=",
-  "clientDepsHash": "sha256-vpn455/DJopb2TIiIKXjuS3CxI1pXRH3TU3QfZtbMi8="
+  "rev": "22f85d3af9815f4946eeeb2218d532cf5f543da8",
+  "hash": "sha256-GAHl9QKs6O01wtt5ajSKwkIOc1VdM76cpw2MRdaC17M=",
+  "version": "2.17.1",
+  "depsHash": "sha256-ijFY/sp0P3Ya1076ZfIA8g+3tz0jvXBwKWGGr7Bw2+M=",
+  "clientDepsHash": "sha256-by2LpKAfyyteBywTWiWZFufKerb39Jqzz+zsjl3f/bk="
 }
@@ -3,24 +3,24 @@

 let
  pname = "brave";
-  version = "1.71.123";
+  version = "1.73.89";

  allArchives = {
    aarch64-linux = {
      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-u3fme771Q5F00fYiLez9mhGQR2mORYdSabXovr0+OYE=";
+      hash = "sha256-qpWKu0hmFs8LXkSrrcSOpS9BsgkO1WPOItpPc/InBLY=";
    };
    x86_64-linux = {
      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-fJczTAra+j8+veicz4lIyKSNJyxJK4q9gpZoAyQwkxQ=";
+      hash = "sha256-9e0zMS5kcTMdxkvvq248kZDQpBz/Hf4OMUdZ4lgmDV8=";
    };
    aarch64-darwin = {
      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-kDiZ6NKQ+v1jBEUexItKTCKFsbnOtSzPmGEVWI5JoXI=";
+      hash = "sha256-LOSm4IbdmrpxzDf9yzbKhkBlp8452R9tInYOP4dMfzo=";
    };
    x86_64-darwin = {
      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-/yl4k/XvmL7oBW1XU4wVNHfa07Z+XMHYTkkufhDCXUc=";
+      hash = "sha256-VWobettpSvMCCENg/b9VkH+cwNOrYF/n6d3Ebdq00Lc=";
    };
  };

@@ -48,7 +48,6 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) (
  archive
  // {
    inherit pname version;
-    platform = stdenv.system;
  }
 )
 EOF
@@ -2,7 +2,6 @@
  lib,
  stdenv,
  fetchFromGitHub,
-  fetchpatch2,
  pkgsBuildHost,
  glslang,
  meson,
@@ -38,29 +37,16 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "dxvk";
-  version = "2.5";
+  version = "2.5.1";

  src = fetchFromGitHub {
    owner = "doitsujin";
    repo = "dxvk";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-JwEKmzYnoDhad0VKadQYEqraMogXn7BFI9kmT9F+Ts0=";
+    hash = "sha256-wmn3ErYl3hhInrDQeY3OZK76yzwW2OJc1f+unMBzJQE=";
    fetchSubmodules = true; # Needed for the DirectX headers and libdisplay-info
  };

-  patches = [
-    # Fixes `ERROR: Index 2 out of bounds of array of size 2` error on native builds.
-    (fetchpatch2 {
-      url = "https://github.com/doitsujin/dxvk/commit/e6209d28cd9c51ad371605db4c0de27547c0d28c.patch?full_index=1";
-      hash = "sha256-zKO6YXOUKBnwcijzCldDzmDqXSkf+wWe9KmUlhsaTyM=";
-    })
-    # Fixes missing symbol error when building with GLFW support enabled.
-    (fetchpatch2 {
-      url = "https://github.com/doitsujin/dxvk/commit/62ef4854a6accf2b042f25f44db667abadc0b3fd.patch?full_index=1";
-      hash = "sha256-oXybFqoD68gTLHO1kDHll4XCfpU+s9E+PmaXQFqEy/g=";
-    })
-  ];
-
  postPatch =
    ''
      substituteInPlace meson.build \
@@ -1,24 +1,25 @@
-{ lib
-, stdenv
-, fetchurl
-, fetchpatch
-, fetchDebianPatch
-, copyDesktopItems
-, pkg-config
-, wrapGAppsHook3
-, unzip
-, curl
-, glib
-, gtk3
-, libssh2
-, openssl
-, wxGTK32
-, makeDesktopItem
+{
+  lib,
+  stdenv,
+  fetchurl,
+  fetchpatch,
+  fetchDebianPatch,
+  copyDesktopItems,
+  pkg-config,
+  wrapGAppsHook3,
+  unzip,
+  curl,
+  glib,
+  gtk3,
+  libssh2,
+  openssl,
+  wxGTK32,
+  makeDesktopItem,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "freefilesync";
-  version = "13.7";
+  version = "13.8";

  src = fetchurl {
    url = "https://freefilesync.org/download/FreeFileSync_${finalAttrs.version}_Source.zip";
@@ -27,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
      rm -f $out
      tryDownload "$url"
    '';
-    hash = "sha256-bS3J0uevtZH/yjoOtqSMYVHRaNegW6NMOZv7ctW5oRc=";
+    hash = "sha256-nciunM5qDY8bxR09mv98CO5TU1BWmeFnByKHo7qqRc4=";
  };

  sourceRoot = ".";
@@ -116,7 +117,10 @@ stdenv.mkDerivation (finalAttrs: {
      genericName = "Folder Comparison and Synchronization";
      icon = name;
      exec = name;
-      categories = [ "Utility" "FileTools" ];
+      categories = [
+        "Utility"
+        "FileTools"
+      ];
    })
    (makeDesktopItem rec {
      name = "RealTimeSync";
@@ -124,14 +128,22 @@ stdenv.mkDerivation (finalAttrs: {
      genericName = "Automated Synchronization";
      icon = name;
      exec = name;
-      categories = [ "Utility" "FileTools" ];
+      categories = [
+        "Utility"
+        "FileTools"
+      ];
    })
  ];

  meta = with lib; {
    description = "Open Source File Synchronization & Backup Software";
    homepage = "https://freefilesync.org";
-    license = [ licenses.gpl3Only licenses.openssl licenses.curl licenses.bsd3 ];
+    license = [
+      licenses.gpl3Only
+      licenses.openssl
+      licenses.curl
+      licenses.bsd3
+    ];
    maintainers = with maintainers; [ wegank ];
    platforms = platforms.linux;
  };
@@ -38,7 +38,6 @@ in stdenv.mkDerivation rec {
    license = lib.licenses.gpl2Plus;
    homepage = "http://projects.gnome.org/gnumeric/";
    platforms = platforms.unix;
-    broken = with stdenv; isDarwin && isAarch64;
    maintainers = [ maintainers.vcunat ];
  };
 }
@@ -9,13 +9,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "JankyBorders";
-  version = "1.6.0";
+  version = "1.7.0";

  src = fetchFromGitHub {
    owner = "FelixKratz";
    repo = "JankyBorders";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-DX1d228UCOI+JU+RxenhiGyn3AiqpsGe0aCtr091szs=";
+    hash = "sha256-PUyq3m244QyY7e8+/YeAMOxMcAz3gsyM1Mg/kgjGVgU=";
  };

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

 python3.pkgs.buildPythonApplication rec {
  pname = "komikku";
-  version = "1.62.0";
+  version = "1.63.0";

  format = "other";

@@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec {
    owner = "valos";
    repo = "Komikku";
    rev = "v${version}";
-    hash = "sha256-lU+AyslvuWr0BmhLvfqenOiWpBeC7q3Gtvek/q3o0ok=";
+    hash = "sha256-+p5iTB98jpCqodvSEZ9Y8SM9W3M57Lpoh9jAzN3OmRs=";
  };

  nativeBuildInputs = [
@@ -12,7 +12,7 @@
 }:
 let
  pname = "obsidian";
-  version = "1.7.6";
+  version = "1.7.7";
  appname = "Obsidian";
  meta = with lib; {
    description = "Powerful knowledge base that works on top of a local folder of plain text Markdown files";
@@ -26,7 +26,7 @@ let
  filename = if stdenv.hostPlatform.isDarwin then "Obsidian-${version}.dmg" else "obsidian-${version}.tar.gz";
  src = fetchurl {
    url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}";
-    hash = if stdenv.hostPlatform.isDarwin then "sha256-K7NLFbsTVNNH2VEXLiBM1KaG3fEWwaUkvxYh3vtKGvc=" else "sha256-5xkhm87eN36NmwG+t7SYnn20zT+ZELC7g2x+6/UGrHE=";
+    hash = if stdenv.hostPlatform.isDarwin then "sha256-vzYMTH1yaKxw1AwJOXVdzvKyQTkCMmx7NPPP/99xgMQ=" else "sha256-6IHqBvZx2yxQAvADi3Ok5Le3ip2/c6qafQ3FSpPT0po=";
  };

  icon = fetchurl {
@@ -1,10 +1,12 @@
-{ lib
-, stdenv
-, fetchurl
-, cmake
-, unzip
-, gmp
-, scalp
+{
+  lib,
+  stdenv,
+  fetchurl,
+  fetchpatch,
+  cmake,
+  unzip,
+  gmp,
+  scalp,
 }:

 stdenv.mkDerivation rec {
@@ -12,11 +14,21 @@ stdenv.mkDerivation rec {
  version = "1.80";

  src = fetchurl {
-    url = "https://gitlab.com/kumm/pagsuite/-/raw/master/releases/pagsuite_${lib.replaceStrings ["."] ["_"] version}.zip";
+    url = "https://gitlab.com/kumm/pagsuite/-/raw/master/releases/pagsuite_${
+      lib.replaceStrings [ "." ] [ "_" ] version
+    }.zip";
    hash = "sha256-TYd+dleVPWEWU9Cb3XExd7ixJZyiUAp9QLtorYJSIbQ=";
  };

-  sourceRoot = "pagsuite_${lib.replaceStrings ["."] ["_"] version}";
+  patches = [
+    # Fix issue with latest ScaLP update
+    (fetchpatch {
+      url = "https://gitlab.com/kumm/pagsuite/-/commit/cae9f78bec93a7f197461358f2f796f6b5778781.patch";
+      hash = "sha256-12IisS6oGYLRicORTemHB7bw9EB9cuQjxG8f6X0WMrU=";
+    })
+  ];
+
+  sourceRoot = "pagsuite_${lib.replaceStrings [ "." ] [ "_" ] version}";

  nativeBuildInputs = [
    cmake
@@ -1,5 +1,4 @@
 {
-  darwin,
  fetchFromGitHub,
  file,
  lib,
@@ -12,7 +11,7 @@

 let
  pname = "qsv";
-  version = "0.131.1";
+  version = "0.138.0";
 in
 rustPlatform.buildRustPackage {
  inherit pname version;
@@ -21,37 +20,17 @@ rustPlatform.buildRustPackage {
    owner = "jqnatividad";
    repo = "qsv";
    rev = version;
-    hash = "sha256-erXMDZBkOPnZdhhjnUTiS0eCuFo1v5sNhLn8o7QN/5g=";
+    hash = "sha256-27oSk8fnTvl1zJ8xYkZHkWVTq+AVDn4Zi1s56T49T1Q=";
  };

-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "calamine-0.25.0" = "sha256-LFQahQ+SfGWhp5Kfs7AJCj4zyxWiz099pwVuQucCF00=";
-      "dynfmt-0.1.5" = "sha256-/SrNOOQJW3XFZOPL/mzdOBppVCaJNNyGBuJumQGx6sA=";
-      "grex-1.4.5" = "sha256-4Tr5L87HuiUW8tJdqr4oT1yQXviU7XtDrKY7iYNcwbo=";
-      "local-encoding-0.2.0" = "sha256-ThXYKr3u/n2kvINcyobB2Ayex2sNbJEOyyjZH993Z4U=";
-      "polars-0.41.3" = "sha256-8xkcJgfKo7BzeBnR6XVdbcH9ZY9Kh4dcGFMmyA5LuQg=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-tu9HCFAxmmYVgmJyHunBtGSqKGzwbX2vi6ju4cv33wc=";

-  buildInputs =
-    [
-      file
-      sqlite
-      zstd
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin (
-      with darwin.apple_sdk.frameworks;
-      [
-        AppKit
-        CoreFoundation
-        CoreGraphics
-        IOKit
-        Security
-        SystemConfiguration
-      ]
-    );
+  buildInputs = [
+    file
+    sqlite
+    zstd
+  ];

  nativeBuildInputs = [
    pkg-config
@@ -75,27 +54,40 @@ rustPlatform.buildRustPackage {
    "geocode"
  ];

-  checkFlags = [
-    # Skip tests that require network access.
-    "--skip test_fetch"
-    "--skip test_geocode"
-    "--skip cmd::validate::test_load_json_via_url"
-    "--skip test_describegpt::describegpt_invalid_api_key"
-    "--skip test_sample::sample_seed_url"
-    "--skip test_snappy::snappy_decompress_url"
-    "--skip test_sniff::sniff_justmime_remote"
-    "--skip test_sniff::sniff_url_notcsv"
-    "--skip test_sniff::sniff_url_snappy"
-    "--skip test_sniff::sniff_url_snappy_noinfer"
-    "--skip test_validate::validate_adur_public_toilets_dataset_with_json_schema_url"
-    # Skip test that uses sh.
-    "--skip test_foreach::foreach_multiple_commands_with_shell_script"
-    # Skip features that aren't enabled.
-    "--skip test_luau"
-    # Skip tests that return the wrong datetime in CI.
-    "--skip test_stats::stats_cache_negative_threshold"
-    "--skip test_stats::stats_cache_negative_threshold_five"
-  ];
+  checkFlags =
+    [
+      # Skip tests that require network access.
+      "--skip test_fetch"
+      "--skip test_geocode"
+      "--skip cmd::validate::test_load_json_via_url"
+      "--skip cmd::validate::test_dyn_enum_validator"
+      "--skip cmd::validate::test_validate_currency_email_dynamicenum_validator"
+      "--skip test_describegpt::describegpt_invalid_api_key"
+      "--skip test_sample::sample_seed_url"
+      "--skip test_snappy::snappy_decompress_url"
+      "--skip test_sniff::sniff_justmime_remote"
+      "--skip test_sniff::sniff_url_notcsv"
+      "--skip test_sniff::sniff_url_snappy"
+      "--skip test_sniff::sniff_url_snappy_noinfer"
+      "--skip test_validate::validate_adur_public_toilets_dataset_with_json_schema_url"
+      "--skip test_schema::generate_schema_with_const_and_enum_constraints"
+      "--skip test_schema::generate_schema_with_defaults_and_validate_trim_with_no_errors"
+      "--skip test_schema::generate_schema_with_optional_flags_notrim_and_validate_with_errors"
+      "--skip test_schema::generate_schema_with_optional_flags_trim_and_validate_with_errors"
+      "--skip test_validate::validate_adur_public_toilets_dataset_with_json_schema"
+      "--skip test_validate::validate_adur_public_toilets_dataset_with_json_schema_valid_output"
+      # Skip test that uses sh.
+      "--skip test_foreach::foreach_multiple_commands_with_shell_script"
+      # Skip features that aren't enabled.
+      "--skip test_luau"
+      # Skip tests that return the wrong datetime in CI.
+      "--skip test_stats::stats_cache_negative_threshold"
+      "--skip test_stats::stats_cache_negative_threshold_five"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      # uses X11 based clipboard library
+      "--skip test_clipboard::clipboard_success"
+    ];

  env = {
    ZSTD_SYS_USE_PKG_CONFIG = true;
@@ -15,11 +15,11 @@

 tcl.mkTclDerivation rec {
  pname = "remind";
-  version = "05.00.07";
+  version = "05.01.01";

  src = fetchurl {
    url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz";
-    hash = "sha256-id3yVyKHRSJWhm8r4Zmc/k61AZUt1wa3lArQktDbt9w=";
+    hash = "sha256-906V9QdFHKJ1+uXv9zrFz9swfeVr/kxgkgKkGsscUY0=";
  };

  propagatedBuildInputs = lib.optionals withGui [
@@ -1,59 +1,80 @@
-{ lib
-, stdenv
-, fetchgit
-, cmake
-, withGurobi ? false
-, gurobi
-, withCplex ? false
-, cplex
-, withLpsolve ? true
-, lp_solve
+{
+  lib,
+  stdenv,
+  fetchgit,
+  cmake,
+  withGurobi ? false,
+  gurobi,
+  withCplex ? false,
+  cplex,
+  withLpsolve ? true,
+  lp_solve,
+  unstableGitUpdater,
 }:

 stdenv.mkDerivation rec {
  pname = "scalp";
-  version = "unstable-2022-03-15";
+  version = "0-unstable-2024-08-28";

  src = fetchgit {
    url = "https://digidev.digi.e-technik.uni-kassel.de/git/scalp.git";
    # mirrored at https://git.sr.ht/~weijia/scalp
-    rev = "185b84e4ff967f42cf2de5db4db4e6fa0cc18fb8";
-    hash = "sha256-NyMZdJwdD3FR6uweYCclJjfcf3Y24Bns1ViwsmJ5izg=";
+    rev = "4a8e8b850a57328d9377ea7955c27c437394ebd3";
+    hash = "sha256-6OEf3yWFBmTKgeTMojRMRf/t9Ec1i851Lx3mQjCeOuw=";
  };

+  postPatch =
+    ''
+      substituteInPlace CMakeLists.txt \
+        --replace-fail "\''$ORIGIN" "\''${CMAKE_INSTALL_PREFIX}/lib" \
+        --replace-fail "-m64" ""
+      substituteInPlace src/tests/CMakeLists.txt \
+        --replace-fail "src/tests/" ""
+    ''
+    + lib.optionalString withGurobi ''
+      substituteInPlace CMakeExtensions/FindGurobi.cmake \
+        --replace-fail "\''${GUROBI_VERSION}" '"${lib.versions.major gurobi.version}${lib.versions.minor gurobi.version}"'
+    '';
+
  nativeBuildInputs = [
    cmake
  ];

-  buildInputs = lib.optionals withGurobi [
-    gurobi
-  ] ++ lib.optionals withCplex [
-    cplex
-  ] ++ lib.optionals withLpsolve [
-    lp_solve
-  ];
+  buildInputs =
+    lib.optionals withGurobi [
+      gurobi
+    ]
+    ++ lib.optionals withCplex [
+      cplex
+    ]
+    ++ lib.optionals withLpsolve [
+      lp_solve
+    ];

-  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    substituteInPlace CMakeLists.txt \
-      --replace "\''$ORIGIN" "\''${CMAKE_INSTALL_PREFIX}/lib"
-  '';
-
-  cmakeFlags = [
-    "-DBUILD_TESTS=${lib.boolToString doCheck}"
-  ] ++ lib.optionals withGurobi [
-    "-DGUROBI_DIR=${gurobi}"
-  ] ++ lib.optionals withCplex [
-    "-DCPLEX_DIR=${cplex}"
-  ];
+  cmakeFlags =
+    [
+      (lib.cmakeBool "BUILD_TESTS" doCheck)
+    ]
+    ++ lib.optionals withGurobi [
+      (lib.cmakeFeature "GUROBI_ROOT_DIR" "${gurobi}")
+    ]
+    ++ lib.optionals withCplex [
+      (lib.cmakeFeature "CPLEX_ROOT_DIR" "${cplex}")
+    ]
+    ++ lib.optionals withLpsolve [
+      (lib.cmakeFeature "LPSOLVE_ROOT_DIR" "${lp_solve}")
+    ];

  doCheck = true;

-  meta = with lib; {
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = {
    description = "Scalable Linear Programming Library";
    mainProgram = "scalp";
    homepage = "https://digidev.digi.e-technik.uni-kassel.de/scalp/";
-    license = licenses.lgpl3;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ wegank ];
+    license = lib.licenses.lgpl3Only;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ wegank ];
  };
 }
@@ -19,13 +19,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "sketchybar";
-  version = "2.21.0";
+  version = "2.22.0";

  src = fetchFromGitHub {
    owner = "FelixKratz";
    repo = "SketchyBar";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-hTfQQjx6ai83zYFfccsz/KaoZUIj5Dfz4ENe59gS02E=";
+    hash = "sha256-0082rRSfIKJFTAzmJ65ItEdLSwjFks5ZkTlVZqaWKEw=";
  };

  buildInputs = [
@@ -16,13 +16,14 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "surelog";
-  version = "1.83";
+  version = "1.84-unstable-2024-11-09";

  src = fetchFromGitHub {
    owner = "chipsalliance";
    repo = "surelog";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-V4LmW4ca6KfugOu0XnGwutRqWR/9K6ESokHOB2yAVag=";
+    # Once we're back on a stable tag, use "v$(finalAttrs.version}" below.
+    rev = "da88163a02dbc16f1af3514f281b93941d371ad9";
+    hash = "sha256-TIwXIMcDImZjCIiXwvT2MhukArgrWCgOf2AOvkG/55g=";
    fetchSubmodules = false;  # we use all dependencies from nix
  };

@@ -69,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
    homepage = "https://github.com/chipsalliance/Surelog";
    license = lib.licenses.asl20;
    mainProgram = "surelog";
-    maintainers = with lib.maintainers; [ matthuszagh ];
+    maintainers = with lib.maintainers; [ matthuszagh hzeller ];
    platforms = lib.platforms.all;
  };
 })
@@ -10,11 +10,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "tart";
-  version = "2.19.3";
+  version = "2.20.2";

  src = fetchurl {
      url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart-arm64.tar.gz";
-      hash = "sha256-WigjqOu36bkNsTk6WpLwpyaauk4RtwShw1wWBHdxTFI=";
+      hash = "sha256-caHuBTRpbmFbmTlDRnxZyGM6F95iKjMhKbPTez5Hecc=";
  };
  sourceRoot = ".";

@@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "tootik";
-  version = "0.12.6";
+  version = "0.13.0";

  src = fetchFromGitHub {
    owner = "dimkr";
    repo = "tootik";
    rev = version;
-    hash = "sha256-v7+WDxGUWCrZMhm0TXMIZTQZTzHYNauX2LIOV3zz+9A=";
+    hash = "sha256-YVfxyfPYaGbfGdWtcoJhrMBV+1FI0x7m5OA1oOdPFDo=";
  };

-  vendorHash = "sha256-wmyaTZX181w4Kiiw1sZ4NeIDY63PwW+ayvtwrLSiF24=";
+  vendorHash = "sha256-8GHyMF/WfoQOnoF0qHHC3aMTuNeB8eVynmXJf6CD+Es=";

  nativeBuildInputs = [ openssl ];

@@ -10,13 +10,14 @@
 stdenv.mkDerivation (finalAttrs: {
  pname = "UHDM";
  # When updating this package, also consider updating science/logic/surelog
-  version = "1.83";
+  version = "1.84-unstable-2024-10-06";

  src = fetchFromGitHub {
    owner = "chipsalliance";
    repo = "UHDM";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-va8qAzsg589C6rLmG1uIMDr4X30qpBgRO1ZVKdEs5ok=";
+    # After we're back on a stable tag, use v${finalAttrs.version}
+    rev = "857f68de3ce5b6f919f3a0f489c93072751b1578";
+    hash = "sha256-qHcRncsvMiSJji+JLOlfQ87+pfKg+zvlqMTXKpImvTM=";
    fetchSubmodules = false;  # we use all dependencies from nix
  };

@@ -42,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
    description = "Universal Hardware Data Model";
    homepage = "https://github.com/chipsalliance/UHDM";
    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ matthuszagh ];
+    maintainers = with lib.maintainers; [ matthuszagh hzeller ];
    platforms = lib.platforms.all;
  };
 })
@@ -1,28 +1,32 @@
-{ lib
-, stdenv
-, fetchzip
+{
+  lib,
+  stdenv,
+  fetchzip,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "unrar";
-  version = "7.0.9";
+  version = "7.1.1";

  src = fetchzip {
    url = "https://www.rarlab.com/rar/unrarsrc-${finalAttrs.version}.tar.gz";
    stripRoot = false;
-    hash = "sha256-lHh02uqHdX2Q9yyaGiHlkdBjlQE1tQyB44d39yDE4ls=";
+    hash = "sha256-dGF5xCZRHnaMVj/OGIIFbytN7Jnj39gq7ym6hq/EZsk=";
  };

  sourceRoot = finalAttrs.src.name;

  postPatch = ''
    substituteInPlace unrar/makefile \
-      --replace "CXX=" "#CXX=" \
-      --replace "STRIP=" "#STRIP=" \
-      --replace "AR=" "#AR="
+      --replace-fail "CXX=" "#CXX=" \
+      --replace-fail "STRIP=" "#STRIP=" \
+      --replace-fail "AR=" "#AR="
  '';

-  outputs = [ "out" "dev" ];
+  outputs = [
+    "out"
+    "dev"
+  ];

  # `make {unrar,lib}` call `make clean` implicitly
  # separate build into different dirs to avoid deleting them
@@ -9,7 +9,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "vvenc";
-  version = "1.12.0";
+  version = "1.12.1";

  outputs = [
    "out"
@@ -21,9 +21,16 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "fraunhoferhhi";
    repo = "vvenc";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-C7ApayhubunkXBqJ/EqntaFPn6zk8rZ9fUqg7kbhvAk=";
+    hash = "sha256-Et/JmF/2hh6A1EsOzvgzruMN47rd5cPgRke3uPvz298=";
  };

+  env.NIX_CFLAGS_COMPILE = toString (
+    lib.optionals stdenv.cc.isGNU [
+      "-Wno-maybe-uninitialized"
+      "-Wno-uninitialized"
+    ]
+  );
+
  nativeBuildInputs = [ cmake ];

  cmakeFlags = [
@@ -12,16 +12,16 @@

 buildGoModule rec {
  pname = "walker";
-  version = "0.7.7";
+  version = "0.8.12";

  src = fetchFromGitHub {
    owner = "abenz1267";
    repo = "walker";
    rev = "v${version}";
-    hash = "sha256-UJxLVnKfMLPkzec3XwNHcHE1x5kPFMoyqed0VNgFJ4w=";
+    hash = "sha256-K65bzaUcTBqsqngxbxwEEsTVZA2s8lX6+HEhu03Nywk=";
  };

-  vendorHash = "sha256-xLhpHrggOGq5VLjQO7OvH/Ei5YivJJhTsy2ek2AudRs=";
+  vendorHash = "sha256-nc/WKBhUxhs1aNUg/GM7vhrKd7FrUdl2uKp7MX2VCdE=";
  subPackages = [ "cmd/walker.go" ];

  passthru.updateScript = nix-update-script { };
@@ -8,6 +8,7 @@ mkCoqDerivation {
  repo = "coq-dpdgraph";
  inherit version;
  defaultVersion = lib.switch coq.coq-version [
+    { case = "8.20"; out = "1.0+8.20"; }
    { case = "8.19"; out = "1.0+8.19"; }
    { case = "8.18"; out = "1.0+8.18"; }
    { case = "8.17"; out = "1.0+8.17"; }
@@ -23,6 +24,7 @@ mkCoqDerivation {
    { case = "8.7";  out = "0.6.2"; }
  ] null;

+  release."1.0+8.20".sha256 = "sha256-szfH/OksCH3SCbcFjwEvLwHE5avmHp1vYiJM6KAXFqs=";
  release."1.0+8.19".sha256 = "sha256-L1vjEydYiwDFTXES3sgfdaO/D50AbTJKBXUKUCgbpto=";
  release."1.0+8.18".sha256 = "sha256-z14MI1VSYzPqmF1PqDXzymXWRMYoTlQAfR/P3Pdf7fI=";
  release."1.0+8.17".sha256 = "sha256-gcvL3vseLKEF9xinT0579jXBBaA5E3rJ5KaU8RfKtm4=";
@@ -15,6 +15,12 @@ buildDunePackage rec {
    sha256 = "sha256-dp9qCIYqSdROIAQ+Jw73F3vMe7hnkDe8BgZWImNMVsA=";
  };

+  patches = [
+    # backport of patch to fix incompatible pointer type. remove next update
+    # https://github.com/aantron/luv/commit/ad7f953fccb8732fe4eb9018556e8d4f82abf8f2
+    ./incompatible-pointer-type-fix.diff
+  ];
+
  postConfigure = ''
    for f in src/c/vendor/configure/{ltmain.sh,configure}; do
      substituteInPlace "$f" --replace /usr/bin/file file
@@ -0,0 +1,87 @@
+addapted from https://github.com/aantron/luv/commit/ad7f953fccb8732fe4eb9018556e8d4f82abf8f2
+diff --git a/src/c/helpers.c b/src/c/helpers.c
+index 7fcd8b6..bc1b926 100755
+--- a/src/c/helpers.c
+++ b/src/c/helpers.c
+@@ -175,7 +175,8 @@ static void luv_getaddrinfo_trampoline(
+ }
+ 
+ static void luv_getnameinfo_trampoline(
+-    uv_getnameinfo_t *c_request, int status, char *hostname, char *service)
+    uv_getnameinfo_t *c_request, int status, const char *hostname,
+    const char *service)
+ {
+     caml_acquire_runtime_system();
+     value callback;
+@@ -407,7 +408,7 @@ uv_getaddrinfo_cb luv_get_getaddrinfo_trampoline()
+     return luv_getaddrinfo_trampoline;
+ }
+ 
+-luv_getnameinfo_cb luv_get_getnameinfo_trampoline()
+uv_getnameinfo_cb luv_get_getnameinfo_trampoline()
+ {
+     return luv_getnameinfo_trampoline;
+ }
+@@ -613,15 +614,6 @@ int luv_fs_poll_start(
+     return uv_fs_poll_start(handle, (uv_fs_poll_cb)poll_cb, path, interval);
+ }
+ 
+-int luv_getnameinfo(
+-    uv_loop_t *loop, uv_getnameinfo_t *req, luv_getnameinfo_cb getnameinfo_cb,
+-    const struct sockaddr *addr, int flags)
+-{
+-    return
+-        uv_getnameinfo(
+-            loop, req, (uv_getnameinfo_cb)getnameinfo_cb, addr, flags);
+-}
+-
+ int luv_read_start(
+     uv_stream_t *stream, uv_alloc_cb alloc_cb, luv_read_cb read_cb)
+ {
+diff --git a/src/c/helpers.h b/src/c/helpers.h
+index f73e32f..2cc1200 100755
+--- a/src/c/helpers.h
+++ b/src/c/helpers.h
+@@ -55,9 +55,6 @@ typedef void (*luv_fs_event_cb)(
+ typedef void (*luv_fs_poll_cb)(
+     uv_fs_poll_t *handle, int status, uv_stat_t *prev, uv_stat_t *curr);
+ 
+-typedef void (*luv_getnameinfo_cb)(
+-    uv_getnameinfo_t *req, int status, char *hostname, char *service);
+-
+ typedef void (*luv_read_cb)(uv_stream_t *stream, ssize_t nread, uv_buf_t *buf);
+ 
+ typedef void (*luv_udp_recv_cb)(
+@@ -78,7 +75,7 @@ uv_fs_cb luv_null_fs_callback_pointer();
+ luv_fs_event_cb luv_get_fs_event_trampoline();
+ luv_fs_poll_cb luv_get_fs_poll_trampoline();
+ uv_getaddrinfo_cb luv_get_getaddrinfo_trampoline();
+-luv_getnameinfo_cb luv_get_getnameinfo_trampoline();
+uv_getnameinfo_cb luv_get_getnameinfo_trampoline();
+ uv_idle_cb luv_get_idle_trampoline();
+ luv_once_cb luv_get_once_trampoline();
+ uv_poll_cb luv_get_poll_trampoline();
+@@ -173,10 +170,6 @@ int luv_fs_poll_start(
+     uv_fs_poll_t *handle, luv_fs_poll_cb poll_cb, const char *path,
+     unsigned int interval);
+ 
+-int luv_getnameinfo(
+-    uv_loop_t *loop, uv_getnameinfo_t *req, luv_getnameinfo_cb getnameinfo_cb,
+-    const struct sockaddr *addr, int flags);
+-
+ int luv_read_start(
+     uv_stream_t *stream, uv_alloc_cb alloc_cb, luv_read_cb read_cb);
+ 
+diff --git a/src/c/luv_c_function_descriptions.ml b/src/c/luv_c_function_descriptions.ml
+index 684a46b..7ac1421 100755
+--- a/src/c/luv_c_function_descriptions.ml
+++ b/src/c/luv_c_function_descriptions.ml
+@@ -1336,7 +1336,7 @@ struct
+           (void @-> returning trampoline)
+ 
+       let getnameinfo =
+-        foreign "luv_getnameinfo"
+        foreign "uv_getnameinfo"
+           (ptr Loop.t @->
+            ptr t @->
+            trampoline @->
@@ -0,0 +1,131 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  django,
+  pytestCheckHook,
+  setuptools,
+  celery,
+  django-taggit,
+  feedgen,
+  reportlab,
+  jsonschema,
+  wand,
+  django-filter,
+  django-treebeard,
+  djangorestframework,
+  pikepdf,
+  pypdf,
+  pycryptodome,
+  python-poppler,
+  zipstream-ng,
+  django-json-widget,
+  factory-boy,
+  pytest-django,
+  camelot,
+  pytesseract,
+  pytest-factoryboy,
+  poppler_utils,
+  pytest-playwright,
+  playwright-driver,
+  pnpm,
+  nodejs,
+}:
+
+buildPythonPackage rec {
+  pname = "django-filingcabinet";
+  version = "0-unstable-2024-11-15";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "okfde";
+    repo = "django-filingcabinet";
+    # No release tagged yet on GitHub
+    # https://github.com/okfde/django-filingcabinet/issues/69
+    rev = "33c88e1ca9fccd0ea70f8b609580eeec486bda5c";
+    hash = "sha256-p7VJUiO7dhTR+S3/4QrmrQeJO6xGj7D7I8W3CBF+jo8=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "zipstream" "zipstream-ng"
+  '';
+
+  build-system = [ setuptools ];
+
+  nativeBuildInputs = [
+    nodejs
+    pnpm.configHook
+  ];
+
+  dependencies = [
+    celery
+    django
+    django-filter
+    django-json-widget
+    django-taggit
+    django-treebeard
+    djangorestframework
+    feedgen
+    jsonschema
+    pikepdf
+    pycryptodome
+    pypdf
+    python-poppler
+    reportlab
+    wand
+    zipstream-ng
+  ];
+
+  optional-dependencies = {
+    tabledetection = [ camelot ];
+    ocr = [ pytesseract ];
+    # Dependencies not yet packaged
+    #webp = [ webp ];
+    #annotate = [ fcdocs-annotate ];
+  };
+
+  pnpmDeps = pnpm.fetchDeps {
+    inherit pname version src;
+    hash = "sha256-32kOhB2+37DD4hKXKep08iDxhXpasKPfcv9fkwISxeU=";
+  };
+
+  postBuild = ''
+    pnpm run build
+  '';
+
+  postInstall = ''
+    cp -r build $out/
+  '';
+
+  nativeCheckInputs = [
+    poppler_utils
+    pytest-django
+    pytest-factoryboy
+    pytest-playwright
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    # AssertionError: Locator expected to be visible
+    "test_keyboard_scroll"
+    "test_number_input_scroll"
+    # playwright._impl._errors.TimeoutError: Locator.click: Timeout 30000ms exceeded
+    "test_sidebar_hide"
+    "test_show_search_bar"
+  ];
+
+  preCheck = ''
+    export DJANGO_SETTINGS_MODULE="test_project.settings"
+    export PLAYWRIGHT_BROWSERS_PATH="${playwright-driver.browsers}"
+  '';
+
+  pythonImportCheck = [ "filingcabinet" ];
+
+  meta = {
+    description = "Django app that manages documents with pages, annotations and collections";
+    homepage = "https://github.com/okfde/django-filingcabinet";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.onny ];
+  };
+}
@@ -28,14 +28,14 @@

 buildPythonPackage rec {
  pname = "sentence-transformers";
-  version = "3.3.0";
+  version = "3.3.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "UKPLab";
    repo = "sentence-transformers";
    rev = "refs/tags/v${version}";
-    hash = "sha256-nF1E0w1OApajeo1bNNPufVC86KQRY0oTSI3pgKnOWrQ=";
+    hash = "sha256-D8LHzEVHRuayod084B05cL3OvZiO1ByDZLxROGxTD0I=";
  };

  build-system = [ setuptools ];
@@ -100,7 +100,7 @@ buildPythonPackage rec {
  meta = {
    description = "Multilingual Sentence & Image Embeddings with BERT";
    homepage = "https://github.com/UKPLab/sentence-transformers";
-    changelog = "https://github.com/UKPLab/sentence-transformers/releases/tag/${version}";
+    changelog = "https://github.com/UKPLab/sentence-transformers/releases/tag/v${version}";
    license = lib.licenses.asl20;
    maintainers = with lib.maintainers; [ dit7ya ];
    # Segmentation fault at import
@@ -33,12 +33,14 @@ let
      erlang
      getconf # for getting memory limits
      socat
-      procps
      gnused
      coreutils # used by helper scripts
    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ systemd ]
-  ); # for systemd unit activation check
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      procps # the built-in macOS version has extra entitlements to read rss
+      systemd # for systemd unit activation check
+    ]
+  );
 in

 stdenv.mkDerivation rec {
@@ -21,15 +21,15 @@ let
  }.${stdenv.hostPlatform.system} or unsupported;

  hash = {
-    aarch64-darwin = "sha256-n9WGbxxackZ2FRexvy7lFVUTjcydhSzSkXO78wsywi8=";
-    aarch64-linux = "sha256-CS3T9beQZo/WllZo2mRMUMYvgM0x6H//tTqByx3ikQw=";
-    x86_64-darwin = "sha256-p3sPwSKE0761R7DlmO55FhmjGDWbGl8X9UcQBjaUXQs=";
-    x86_64-linux = "sha256-wfucjWxTpYsrRRLoQDgy66HZHdRILCKrFEnZyaoQ560=";
+    aarch64-darwin = "sha256-Okp/+glgeIKzHIcW/9AJAmBEcXPm7ANM23iU/Q4jhf8=";
+    aarch64-linux = "sha256-x0hQ/EZGM8XjIqpPGMzxTsL7oUg4YMvc/xNfvmU/sJE=";
+    x86_64-darwin = "sha256-Y7N8flvk3HpaSYjg6RJlCfN6eMsM8AuqIJ+oef85+8s=";
+    x86_64-linux = "sha256-Egp+U/I9i1PQc/MruGRaOpJtDQUQAyRmu4nC71e8fWM=";
  }.${stdenv.hostPlatform.system} or unsupported;

 in stdenv.mkDerivation rec {
  inherit pname;
-  version = "1.24.3.4754";
+  version = "1.25.4.4818";

  src = fetchurl {
    url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.master.${version}.${os}-core-${arch}.tar.gz";
@@ -3,8 +3,7 @@
  lib,
  rustPlatform,
  fetchFromGitHub,
-  Security,
-  SystemConfiguration,
+  apple-sdk_11,
  nixosTests,
  nix-update-script,
 }:
@@ -39,10 +38,7 @@ rustPlatform.buildRustPackage {

  nativeBuildInputs = [ rustPlatform.bindgenHook ];

-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    Security
-    SystemConfiguration
-  ];
+  buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;

  passthru = {
    updateScript = nix-update-script { };
@@ -60,70 +60,88 @@
  lib,
  stdenv,
  postgresql,
+  nix-update-script,
 }:

 args:

 let
-  buildPostgresqlExtension = finalAttrs: prevAttrs: {
-    buildInputs = [ postgresql ] ++ prevAttrs.buildInputs or [ ];
+  buildPostgresqlExtension =
+    finalAttrs:
+    {
+      enableUpdateScript ? true,
+      ...
+    }@prevAttrs:
+    {
+      passthru =
+        prevAttrs.passthru or { }
+        // lib.optionalAttrs enableUpdateScript {
+          updateScript =
+            prevAttrs.passthru.updateScript or (nix-update-script (
+              lib.optionalAttrs (lib.hasInfix "unstable" prevAttrs.version) {
+                extraArgs = [ "--version=branch" ];
+              }
+            ));
+        };

-    installFlags = [
-      "DESTDIR=${placeholder "out"}"
-    ] ++ prevAttrs.installFlags or [ ];
+      buildInputs = [ postgresql ] ++ prevAttrs.buildInputs or [ ];

-    postInstall =
-      ''
-        # DESTDIR + pg_config install the files into
-        # /nix/store/<extension>/nix/store/<postgresql>/...
-        # We'll now remove the /nix/store/<postgresql> part:
-        if [[ -d "$out${postgresql}" ]]; then
-            cp -alt "$out" "$out${postgresql}"/*
-            rm -r "$out${postgresql}"
-        fi
+      installFlags = [
+        "DESTDIR=${placeholder "out"}"
+      ] ++ prevAttrs.installFlags or [ ];

-        if [[ -d "$out${postgresql.dev}" ]]; then
-            mkdir -p "''${dev:-$out}"
-            cp -alt "''${dev:-$out}" "$out${postgresql.dev}"/*
-            rm -r "$out${postgresql.dev}"
-        fi
+      postInstall =
+        ''
+          # DESTDIR + pg_config install the files into
+          # /nix/store/<extension>/nix/store/<postgresql>/...
+          # We'll now remove the /nix/store/<postgresql> part:
+          if [[ -d "$out${postgresql}" ]]; then
+              cp -alt "$out" "$out${postgresql}"/*
+              rm -r "$out${postgresql}"
+          fi

-        if [[ -d "$out${postgresql.lib}" ]]; then
-            mkdir -p "''${lib:-$out}"
-            cp -alt "''${lib:-$out}" "$out${postgresql.lib}"/*
-            rm -r "$out${postgresql.lib}"
-        fi
+          if [[ -d "$out${postgresql.dev}" ]]; then
+              mkdir -p "''${dev:-$out}"
+              cp -alt "''${dev:-$out}" "$out${postgresql.dev}"/*
+              rm -r "$out${postgresql.dev}"
+          fi

-        if [[ -d "$out${postgresql.doc}" ]]; then
-            mkdir -p "''${doc:-$out}"
-            cp -alt "''${doc:-$out}" "$out${postgresql.doc}"/*
-            rm -r "$out${postgresql.doc}"
-        fi
+          if [[ -d "$out${postgresql.lib}" ]]; then
+              mkdir -p "''${lib:-$out}"
+              cp -alt "''${lib:-$out}" "$out${postgresql.lib}"/*
+              rm -r "$out${postgresql.lib}"
+          fi

-        if [[ -d "$out${postgresql.man}" ]]; then
-            mkdir -p "''${man:-$out}"
-            cp -alt "''${man:-$out}" "$out${postgresql.man}"/*
-            rm -r "$out${postgresql.man}"
-        fi
+          if [[ -d "$out${postgresql.doc}" ]]; then
+              mkdir -p "''${doc:-$out}"
+              cp -alt "''${doc:-$out}" "$out${postgresql.doc}"/*
+              rm -r "$out${postgresql.doc}"
+          fi

-        # In some cases (postgis) parts of the install script
-        # actually work "OK", before we add DESTDIR, so some
-        # files end up in
-        # /nix/store/<extension>/nix/store/<extension>/...
-        if [[ -d "$out$out" ]]; then
-            cp -alt "$out" "$out$out"/*
-            rm -r "$out$out"
-        fi
+          if [[ -d "$out${postgresql.man}" ]]; then
+              mkdir -p "''${man:-$out}"
+              cp -alt "''${man:-$out}" "$out${postgresql.man}"/*
+              rm -r "$out${postgresql.man}"
+          fi

-        if [[ -d "$out/nix/store" ]]; then
-            if ! rmdir "$out/nix/store" "$out/nix"; then
-              find "$out/nix"
-              nixErrorLog 'Found left-overs in $out/nix/store, make sure to move them into $out properly.'
-              exit 1
-            fi
-        fi
-      ''
-      + prevAttrs.postInstall or "";
-  };
+          # In some cases (postgis) parts of the install script
+          # actually work "OK", before we add DESTDIR, so some
+          # files end up in
+          # /nix/store/<extension>/nix/store/<extension>/...
+          if [[ -d "$out$out" ]]; then
+              cp -alt "$out" "$out$out"/*
+              rm -r "$out$out"
+          fi
+
+          if [[ -d "$out/nix/store" ]]; then
+              if ! rmdir "$out/nix/store" "$out/nix"; then
+                find "$out/nix"
+                nixErrorLog 'Found left-overs in $out/nix/store, make sure to move them into $out properly.'
+                exit 1
+              fi
+          fi
+        ''
+        + prevAttrs.postInstall or "";
+    };
 in
 stdenv.mkDerivation (lib.extends buildPostgresqlExtension (lib.toFunction args))
@@ -28,6 +28,7 @@ buildPostgresqlExtension rec {
    "PERL=${perl}/bin/perl"
  ];

+  enableUpdateScript = false;
  passthru.tests = stdenv.mkDerivation {
    inherit version src;

@@ -36,6 +36,7 @@ buildPostgresqlExtension (finalAttrs: {
    runHook postPatch
  '';

+  enableUpdateScript = false;
  passthru.tests.extension = postgresqlTestExtension {
    inherit (finalAttrs) finalPackage;
    sql = ''
@@ -9,13 +9,13 @@

 buildPostgresqlExtension rec {
  pname = "citus";
-  version = "12.1.2";
+  version = "12.1.6";

  src = fetchFromGitHub {
    owner = "citusdata";
    repo = "citus";
    rev = "v${version}";
-    hash = "sha256-0uYNMLAYigtGlDRvOEkQeC5i58QfXcdSVjTQwWVFX+8=";
+    hash = "sha256-PYABH4e5Wp5hMvEQMRHjPL7gDVu8Wud6d+BzrBBMjIQ=";
  };

  buildInputs = [
@@ -30,7 +30,7 @@ buildPostgresqlExtension rec {
    broken = versionOlder postgresql.version "14" ||
      # PostgreSQL 17 support issue upstream: https://github.com/citusdata/citus/issues/7708
      # Check after next package update.
-      (versionAtLeast postgresql.version "17" && version == "12.1.2");
+      (versionAtLeast postgresql.version "17" && version == "12.1.6");
    description = "Distributed PostgreSQL as an extension";
    homepage = "https://www.citusdata.com/";
    changelog = "https://github.com/citusdata/citus/blob/${src.rev}/CHANGELOG.md";
@@ -2,7 +2,7 @@

 buildPostgresqlExtension rec {
  pname = "cstore_fdw";
-  version = "unstable-2022-03-08";
+  version = "1.7.0-unstable-2021-03-08";

  nativeBuildInputs = [ protobufc ];

@@ -10,21 +10,24 @@

 buildPostgresqlExtension (finalAttrs: {
  pname = "h3-pg";
-  version = "4.1.3";
+  version = "4.1.4";

  src = fetchFromGitHub {
    owner = "zachasme";
    repo = "h3-pg";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-nkaDZ+JuMtsGUJVx70DD2coLrmc/T8/cNov7pfNF1Eg=";
+    hash = "sha256-uZ4XI/VXRr636CI1r24D6ykPQqO5qZNxNQLUQKmoPtg=";
  };

  postPatch = ''
    substituteInPlace CMakeLists.txt \
-      --replace "add_subdirectory(cmake/h3)" "include_directories(${lib.getDev h3_4}/include/h3)"
+      --replace-fail "add_subdirectory(cmake/h3)" "include_directories(${lib.getDev h3_4}/include/h3)"
  '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
    substituteInPlace cmake/AddPostgreSQLExtension.cmake \
-      --replace "INTERPROCEDURAL_OPTIMIZATION TRUE" ""
+      --replace-fail "INTERPROCEDURAL_OPTIMIZATION TRUE" ""
+    # Commented upstream: https://github.com/zachasme/h3-pg/pull/141/files#r1844970927
+    substituteInPlace cmake/FindPostgreSQL.cmake \
+      --replace-fail 'list(APPEND PostgreSQL_INCLUDE_DIRS "/usr/local/include")' ""
  '';

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

 buildPostgresqlExtension rec {
  pname = "jsonb_deep_sum";
-  version = "unstable-2021-12-24";
+  version = "0-unstable-2021-12-24";

  src = fetchFromGitHub {
    owner = "furstenheim";
@@ -10,13 +10,13 @@

 buildPostgresqlExtension (finalAttrs: {
  pname = "postgresql-lantern";
-  version = "0.4.1";
+  version = "0.5.0";

  src = fetchFromGitHub {
    owner = "lanterndata";
    repo = "lantern";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-V8W61hELXeaVvNZgRUcckFlCMWis7NENlRKySxsK/L8=";
+    hash = "sha256-IsDD/um5pVvbzin8onf45DQVszl+Id/pJSQ2iijgHmg=";
    fetchSubmodules = true;
  };

@@ -2,13 +2,13 @@

 buildPostgresqlExtension rec {
  pname = "periods";
-  version = "1.2.2";
+  version = "1.2.3";

  src = fetchFromGitHub {
    owner = "xocolatl";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-ezt+MtDqPM8OmJCD6oQTS644l+XHZoxuivq0PUIXOY8=";
+    sha256 = "sha256-97v6+WNDcYb/KivlE/JBlRIZ3gYHj68AlK0fylp1cPo=";
  };

  meta = with lib; {
@@ -2,23 +2,15 @@

 buildPostgresqlExtension rec {
  pname = "pg_bigm";
-  version = "1.2-20200228";
+  version = "1.2-20240606";

  src = fetchFromGitHub {
    owner = "pgbigm";
    repo = "pg_bigm";
    rev = "v${version}";
-    hash = "sha256-3lspEglVWzEUTiRIWqW0DpQe8gDn9R/RxsWuI9znYc8=";
+    hash = "sha256-5Uy1DmGZR4WdtRUvNdZ5b9zBHJUb9idcEzW20rkreBs=";
  };

-  patches = [
-    # Fix compatibility with PostgreSQL 16. Remove with the next release.
-    (fetchpatch {
-      url = "https://github.com/pgbigm/pg_bigm/commit/2a9d783c52a1d7a2eb414da6f091f6035da76edf.patch";
-      hash = "sha256-LuMpSUPnT8cPChQfA9sJEKP4aGpsbN5crfTKLnDzMN8=";
-    })
-  ];
-
  makeFlags = [ "USE_PGXS=1" ];

  meta = with lib; {
@@ -44,6 +44,8 @@ buildPostgresqlExtension {
    substituteInPlace Makefile --replace "LDFLAGS+=-Wl,--build-id" ""
  '';

+  enableUpdateScript = false;
+
  meta = with lib; {
    description = "Extension to tweak PostgreSQL execution plans using so-called 'hints' in SQL comments";
    homepage = "https://github.com/ossc-db/pg_hint_plan";
@@ -2,7 +2,7 @@

 buildPostgresqlExtension rec {
  pname = "pg_net";
-  version = "0.8.0";
+  version = "0.13.0";

  buildInputs = [ curl ];

@@ -10,7 +10,7 @@ buildPostgresqlExtension rec {
    owner  = "supabase";
    repo   = pname;
    rev    = "refs/tags/v${version}";
-    hash   = "sha256-ZPsRPWV1G3lMM2mT+H139Wvgoy8QnmeUbzEnGeDJmZA=";
+    hash   = "sha256-FRaTZPCJQPYAFmsJg22hYJJ0+gH1tMdDQoCQgiqEnaA=";
  };

  env.NIX_CFLAGS_COMPILE = "-Wno-error";
@@ -9,7 +9,7 @@

 buildPostgresqlExtension (finalAttrs: {
  pname = "pg_repack";
-  version = "1.5.0";
+  version = "1.5.1";

  buildInputs = postgresql.buildInputs;

@@ -17,7 +17,7 @@ buildPostgresqlExtension (finalAttrs: {
    owner = "reorg";
    repo = "pg_repack";
    rev = "ver_${finalAttrs.version}";
-    sha256 = "sha256-do80phyMxwcRIkYyUt9z02z7byNQhK+pbSaCUmzG+4c=";
+    sha256 = "sha256-wJwy4qIt6/kgWqT6HbckUVqDayDkixqHpYiC1liLERw=";
  };

  passthru.tests = {
@@ -1,8 +1,8 @@
-{ stdenv, lib, fetchFromGitHub, fetchpatch, postgresql, unstableGitUpdater, buildPostgresqlExtension }:
+{ stdenv, lib, fetchFromGitHub, fetchpatch, postgresql, buildPostgresqlExtension }:

 buildPostgresqlExtension {
  pname = "pg_similarity";
-  version = "1.0-unstable-2021-01-12";
+  version = "pg_similarity_1_0-unstable-2021-01-12";

  src = fetchFromGitHub {
    owner = "eulerto";
@@ -23,8 +23,6 @@ buildPostgresqlExtension {

  makeFlags = [ "USE_PGXS=1" ];

-  passthru.updateScript = unstableGitUpdater {};
-
  meta = {
    description = "Extension to support similarity queries on PostgreSQL";
    longDescription = ''
@@ -1,16 +1,17 @@
-{ lib, stdenv, fetchFromGitHub, postgresql, postgresqlTestExtension, buildPostgresqlExtension }:
+{ lib, stdenv, fetchFromGitHub, postgresql, postgresqlTestExtension, buildPostgresqlExtension, nix-update-script }:

 buildPostgresqlExtension (finalAttrs: {
  pname = "pg_squeeze";
-  version = "1.7.0";
+  version = "${builtins.replaceStrings ["_"] ["."] (lib.strings.removePrefix "REL" finalAttrs.src.rev)}";

  src = fetchFromGitHub {
    owner = "cybertec-postgresql";
    repo = "pg_squeeze";
-    rev = "REL${builtins.replaceStrings ["."] ["_"] finalAttrs.version}";
+    rev = "REL1_7_0";
    hash = "sha256-Kh1wSOvV5Rd1CG/na3yzbWzvaR8SJ6wmTZOnM+lbgik=";
  };

+  passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=REL(.*)" ]; };
  passthru.tests.extension = postgresqlTestExtension {
    inherit (finalAttrs) finalPackage;
    postgresqlExtraSettings = ''
@@ -7,13 +7,13 @@

 buildPostgresqlExtension rec {
  pname = "pg_uuidv7";
-  version = "1.5.0";
+  version = "1.6.0";

  src = fetchFromGitHub {
    owner = "fboulnois";
    repo = "pg_uuidv7";
    rev = "v${version}";
-    hash = "sha256-oVyRtjl3KsD3j96qvQb8bFLMhoWO81OudOL4wVXrjzI=";
+    hash = "sha256-lG6dCnbLALnfQc4uclqXXXfYjK/WXLV0lo5I8l1E5p4=";
  };

  meta = with lib; {
@@ -43,6 +43,8 @@ buildPostgresqlExtension {

  makeFlags = [ "USE_PGXS=1" ];

+  enableUpdateScript = false;
+
  meta = with lib; {
    description = "Open Source PostgreSQL Audit Logging";
    homepage = "https://github.com/pgaudit/pgaudit";
@@ -8,13 +8,13 @@

 buildPostgresqlExtension rec {
  pname = "pgmq";
-  version = "1.4.4";
+  version = "1.4.5";

  src = fetchFromGitHub {
    owner = "tembo-io";
    repo = "pgmq";
    rev = "v${version}";
-    hash = "sha256-z+8/BqIlHwlMnuIzMz6eylmYbSmhtsNt7TJf/CxbdVw=";
+    hash = "sha256-ynco5t/z7+IPEynuY1wtSaoVloMr6z7UYn4byZecOhg=";
  };

  sourceRoot = "${src.name}/pgmq-extension";
@@ -1,18 +1,21 @@
-{ lib, stdenv, fetchurl, pkg-config, postgresql, msgpack-c, groonga, buildPostgresqlExtension }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, postgresql, msgpack-c, groonga, buildPostgresqlExtension, xxHash }:

 buildPostgresqlExtension rec {
  pname = "pgroonga";
-  version = "3.2.3";
+  version = "3.2.4";

-  src = fetchurl {
-    url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz";
-    hash = "sha256-k9+DgiLzU2cA3jvw3pMF7/FmDGxsCYtAOaUtf2LMTnw=";
+  src = fetchFromGitHub {
+    owner = "pgroonga";
+    repo = "pgroonga";
+    rev = "${version}";
+    hash = "sha256-ZHACMsQ+hneU68Y2jOpz16Mo0jzgXKaVSCZ/qAqCDdI=";
  };

  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ msgpack-c groonga ];
+  buildInputs = [ msgpack-c groonga xxHash ];

  makeFlags = [
+    "HAVE_XXHASH=1"
    "HAVE_MSGPACK=1"
    "MSGPACK_PACKAGE_NAME=msgpack-c"
  ];
@@ -2,7 +2,7 @@

 buildPostgresqlExtension rec {
  pname = "pgrouting";
-  version = "3.6.3";
+  version = "3.7.0";

  nativeBuildInputs = [ cmake perl ];
  buildInputs = [ boost ];
@@ -11,7 +11,7 @@ buildPostgresqlExtension rec {
    owner  = "pgRouting";
    repo   = "pgrouting";
    rev    = "v${version}";
-    hash   = "sha256-VCoapUM7Vh4W1DUE/gWQ9YIRLbw63XlOWsgajJW+XNU=";
+    hash   = "sha256-IwH8bEdyJyPMFYtCfWLRr+jVmS5sOr5QFOhGykGPYh4=";
  };

  meta = with lib; {
@@ -2,13 +2,13 @@

 buildPostgresqlExtension rec {
  pname = "pgsql-http";
-  version = "1.6.0";
+  version = "1.6.1";

  src = fetchFromGitHub {
    owner = "pramsey";
    repo = "pgsql-http";
    rev = "v${version}";
-    hash = "sha256-CPHfx7vhWfxkXsoKTzyFuTt47BPMvzi/pi1leGcuD60=";
+    hash = "sha256-C8eqi0q1dnshUAZjIsZFwa5FTYc7vmATF3vv2CReWPM=";
  };

  buildInputs = [ curl ];
@@ -2,13 +2,13 @@

 buildPostgresqlExtension rec {
  pname = "pgvector";
-  version = "0.6.2";
+  version = "0.8.0";

  src = fetchFromGitHub {
    owner = "pgvector";
    repo = "pgvector";
    rev = "v${version}";
-    hash = "sha256-r+TpFJg6WrMn0L2B7RpmSRvw3XxpHzMRtpFWDCzLvgs=";
+    hash = "sha256-JsZV+I4eRMypXTjGmjCtMBXDVpqTIPHQa28ogXncE/Q=";
  };

  meta = with lib; {
@@ -2,13 +2,13 @@

 buildPostgresqlExtension (finalAttrs: {
  pname = "plpgsql-check";
-  version = "2.7.5";
+  version = "2.7.12";

  src = fetchFromGitHub {
    owner = "okbob";
    repo = "plpgsql_check";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-CD/G/wX6o+mC6gowlpFe1DdJWyh3cB9wxSsW2GXrENE=";
+    hash = "sha256-sLakN4595z+Smt7oaK7IPIJZp/JIGwL5UB4OXQek7JU=";
  };

  passthru.tests.extension = postgresqlTestExtension {
@@ -2,12 +2,12 @@

 buildPostgresqlExtension rec {
  pname = "plr";
-  version = "8.4.7";
+  version = "${builtins.replaceStrings ["_"] ["."] (lib.strings.removePrefix "REL" src.rev)}";

  src = fetchFromGitHub {
    owner = "postgres-plr";
    repo = "plr";
-    rev = "REL${builtins.replaceStrings ["."] ["_"] version}";
+    rev = "REL8_4_7";
    sha256 = "sha256-PdvFEmtKfLT/xfaf6obomPR5hKC9F+wqpfi1heBphRk=";
  };

@@ -1,5 +1,5 @@
 {
-  fetchurl,
+  fetchFromGitHub,
  lib,
  stdenv,
  perl,
@@ -22,6 +22,10 @@
  jitSupport,
  llvm,
  buildPostgresqlExtension,
+  autoconf,
+  automake,
+  libtool,
+  which,
 }:

 let
@@ -36,9 +40,11 @@ buildPostgresqlExtension (finalAttrs: {
    "doc"
  ];

-  src = fetchurl {
-    url = "https://download.osgeo.org/postgis/source/postgis-${finalAttrs.version}.tar.gz";
-    hash = "sha256-ymmKIswrKzRnrE4GO0OihBPzAE3dUFvczddMVqZH9RA=";
+  src = fetchFromGitHub {
+    owner = "postgis";
+    repo = "postgis";
+    rev = "${finalAttrs.version}";
+    hash = "sha256-wh7Lav2vnKzGWuSvvMFvAaGV7ynD+KgPsFUgujdtzlA=";
  };

  buildInputs = [
@@ -51,8 +57,12 @@ buildPostgresqlExtension (finalAttrs: {
    pcre2.dev
  ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv;
  nativeBuildInputs = [
+    autoconf
+    automake
+    libtool
    perl
    pkg-config
+    which
  ] ++ lib.optional jitSupport llvm;
  dontDisableStatic = true;

@@ -70,7 +80,7 @@ buildPostgresqlExtension (finalAttrs: {

  setOutputFlags = false;
  preConfigure = ''
-    sed -i 's@/usr/bin/file@${file}/bin/file@' configure
+    ./autogen.sh
  '';

  configureFlags = [
@@ -10,13 +10,13 @@

 buildPostgresqlExtension rec {
  pname = "repmgr";
-  version = "5.4.1";
+  version = "5.5.0";

  src = fetchFromGitHub {
    owner = "EnterpriseDB";
    repo = "repmgr";
    rev = "v${version}";
-    sha256 = "sha256-OaEoP1BajVW9dt8On9Ppf8IXmAk47HHv8zKw3WlsLHw=";
+    sha256 = "sha256-8G2CzzkWTKEglpUt1Gr7d/DuHJvCIEjsbYDMl3Zt3cs=";
  };

  nativeBuildInputs = [ flex ];
@@ -29,9 +29,6 @@ buildPostgresqlExtension rec {
    license = licenses.postgresql;
    platforms = postgresql.meta.platforms;
    maintainers = with maintainers; [ zimbatm ];
-    # PostgreSQL 17 support issue upstream: https://github.com/EnterpriseDB/repmgr/issues/856
-    # Check after next package update.
-    broken = versionAtLeast postgresql.version "17" && version == "5.4.1";
  };
 }

@@ -8,12 +8,14 @@

 buildPostgresqlExtension rec {
  pname = "wal2json";
-  version = "2.6";
+  version = "${builtins.replaceStrings [ "_" ] [ "." ] (
+    lib.strings.removePrefix "wal2json_" src.rev
+  )}";

  src = fetchFromGitHub {
    owner = "eulerto";
    repo = "wal2json";
-    rev = "wal2json_${builtins.replaceStrings [ "." ] [ "_" ] version}";
+    rev = "wal2json_2_6";
    sha256 = "sha256-+QoACPCKiFfuT2lJfSUmgfzC5MXf75KpSoc2PzPxKyM=";
  };

@@ -24,7 +26,7 @@ buildPostgresqlExtension rec {
  meta = with lib; {
    description = "PostgreSQL JSON output plugin for changeset extraction";
    homepage = "https://github.com/eulerto/wal2json";
-    changelog = "https://github.com/eulerto/wal2json/releases/tag/wal2json_${version}";
+    changelog = "https://github.com/eulerto/wal2json/releases/tag/${src.rev}";
    maintainers = with maintainers; [ euank ];
    platforms = postgresql.meta.platforms;
    license = licenses.bsd3;
@@ -1,7 +1,7 @@
 { callPackage }: builtins.mapAttrs (_: callPackage ./generic.nix) rec {
-  wordpress = wordpress_6_6;
-  wordpress_6_6 = {
-    version = "6.6.2";
-    hash = "sha256-JpemjLPc9IP0/OiASSVpjHRmQBs2n8Mt4nB6WcTCB9Y=";
+  wordpress = wordpress_6_7;
+  wordpress_6_7 = {
+    version = "6.7";
+    hash = "sha256-UDcayx3Leen0HHPcORZ+5cmvfod4BLOWB1HKd6j5rqM=";
  };
 }
@@ -1,21 +1,21 @@
 {
  "add-widget-after-content": {
-    "path": "add-widget-after-content/tags/2.4.6",
-    "rev": "3003516",
-    "sha256": "1nqhx66fy82mwcnfg0r9v2mb6q2nnmhxy9j2451rphxhlxxjf1bf",
-    "version": "2.4.6"
+    "path": "add-widget-after-content/tags/2.5.2",
+    "rev": "3172493",
+    "sha256": "0mw51q59wlr0y43la9fchimsp41gzgcapn7f9fdzvr42d3kwm3la",
+    "version": "2.5.2"
  },
  "akismet": {
    "path": "akismet/tags/5.3.3",
-    "rev": "3131091",
-    "sha256": "0bjsln3ybnrwmiqz9j363d7bzas3h1znjlxbclqkm38h91x7vbc7",
+    "rev": "3186042",
+    "sha256": "1rxzy5qm55q7q1m7x73hxy5wx6cz5g4rsii228icbi5giyaldk6b",
    "version": "5.3.3"
  },
  "antispam-bee": {
-    "path": "antispam-bee/tags/2.11.6",
-    "rev": "3051694",
-    "sha256": "1nbfg7ksyh2mrlbk9p7czk6gv64gzxjd2lnsi5nyn90j2m8kw2kc",
-    "version": "2.11.6"
+    "path": "antispam-bee/tags/2.11.7",
+    "rev": "3186018",
+    "sha256": "1scq6mqbalqvjb82cl55w9i8mzqr60rw4r7yfrln9plxi9bpmzgb",
+    "version": "2.11.7"
  },
  "async-javascript": {
    "path": "async-javascript/tags/2.21.08.31",
@@ -24,16 +24,16 @@
    "version": "2.21.08.31"
  },
  "breeze": {
-    "path": "breeze/tags/2.1.14",
-    "rev": "3150652",
-    "sha256": "1xnha9fm0wmyfr1wcwai9hhrdpxinls3b8g1s156zzvzgf7ir73p",
-    "version": "2.1.14"
+    "path": "breeze/tags/2.1.19",
+    "rev": "3188500",
+    "sha256": "0y9xaxdglsdh4724szpgn76pv46k0l159739jgapx9cc9s319cp5",
+    "version": "2.1.19"
  },
  "co-authors-plus": {
-    "path": "co-authors-plus/tags/3.6.1",
-    "rev": "3077160",
-    "sha256": "10733qibrcrshm3c9zjxhwqar2fg60na70npam1z2lz6gnwmwdqn",
-    "version": "3.6.1"
+    "path": "co-authors-plus/tags/3.6.3",
+    "rev": "3177076",
+    "sha256": "1ri2ibzr1da8sp7wclm1vyxb4k8661jiavvjn19pgkxwb5hycnan",
+    "version": "3.6.3"
  },
  "code-syntax-block": {
    "path": "code-syntax-block/tags/3.2.1",
@@ -60,16 +60,16 @@
    "version": "1.4.0"
  },
  "gutenberg": {
-    "path": "gutenberg/tags/19.3.0",
-    "rev": "3157241",
-    "sha256": "0zgrvyg502i66r63ikfa21rpdss0xy2kc0g3xyqndhcb6cz4qmjg",
-    "version": "19.3.0"
+    "path": "gutenberg/tags/19.6.2",
+    "rev": "3188877",
+    "sha256": "1i8p2rdjh8vc4qgynlpzh652ciz1sicbr10a9zpamca30j9gsvn3",
+    "version": "19.6.2"
  },
  "hcaptcha-for-forms-and-more": {
-    "path": "hcaptcha-for-forms-and-more/tags/4.5.0",
-    "rev": "3143189",
-    "sha256": "13fa34pk5jwm14746sk5lkfcqcaprb426alsp26mmza72il6ai7y",
-    "version": "4.5.0"
+    "path": "hcaptcha-for-forms-and-more/tags/4.7.1",
+    "rev": "3189857",
+    "sha256": "0kr1270af0visl2w4270pjf0063rswqpjly440hd801bkd9bdqfg",
+    "version": "4.7.1"
  },
  "hello-dolly": {
    "path": "hello-dolly/tags/1.7.2",
@@ -84,10 +84,10 @@
    "version": "3.0.2"
  },
  "jetpack": {
-    "path": "jetpack/tags/13.8.1",
-    "rev": "3149545",
-    "sha256": "0q1zns1i9f5r2zwgd2zdrl85pqbjz2w1rg36f6g5djyr2fk9qqss",
-    "version": "13.8.1"
+    "path": "jetpack/tags/14.0",
+    "rev": "3183818",
+    "sha256": "0rybckv1qi0skh9pg9r98zi0p36w2yqpqv1dn2wmpc9c03xpra4p",
+    "version": "14.0"
  },
  "jetpack-lite": {
    "path": "jetpack-lite/tags/3.0.3",
@@ -96,22 +96,22 @@
    "version": "3.0.3"
  },
  "lightbox-photoswipe": {
-    "path": "lightbox-photoswipe/tags/5.4.0",
-    "rev": "3133682",
-    "sha256": "0igbq8s67id7403yrcg1b0bfwrils9fws0d3w6mr1jq3n8mi9wns",
-    "version": "5.4.0"
+    "path": "lightbox-photoswipe/tags/5.5.1",
+    "rev": "3186048",
+    "sha256": "0a47hccpq9b6cya8bccm3impxj0k5s2g8mga9jgrr1dysbr0gx31",
+    "version": "5.5.1"
  },
  "login-lockdown": {
    "path": "login-lockdown/tags/2.11",
-    "rev": "3114570",
-    "sha256": "11zr6k57rmbmz078ns37w81mvy15kniyr7jakajl23n3qnr0hivy",
+    "rev": "3187149",
+    "sha256": "0cihpih0rxz7da8s6rjlz9lha1hljfcg1bh5pn9a76j9pbqm23pp",
    "version": "2.11"
  },
  "mailpoet": {
-    "path": "mailpoet/tags/5.2.2",
-    "rev": "3156795",
-    "sha256": "1lhigi3nh52qi5m3qd7xvj0sv2ny7ixzr78nn4hk0lis0iryzzxc",
-    "version": "5.2.2"
+    "path": "mailpoet/tags/5.3.7",
+    "rev": "3186516",
+    "sha256": "00xajzf3hvvhv0jvg6fagi0h64rsq60ccraj0xfxah6cs6zf5kr5",
+    "version": "5.3.7"
  },
  "merge-minify-refresh": {
    "path": "merge-minify-refresh/trunk",
@@ -121,8 +121,8 @@
  },
  "opengraph": {
    "path": "opengraph/tags/1.12.1",
-    "rev": "3120032",
-    "sha256": "12gq0dvnlng759bnkmqw83dp3ygy4zk0l5prpgbjpzw2z6dy1jq3",
+    "rev": "3173888",
+    "sha256": "0g0avalaijazwgny7ncdj94ghinvhn5n6xbwd2cvjqzv8rzcry7n",
    "version": "1.12.1"
  },
  "simple-login-captcha": {
@@ -132,15 +132,15 @@
    "version": "1.3.6"
  },
  "simple-mastodon-verification": {
-    "path": "simple-mastodon-verification/tags/1.1.3",
-    "rev": "3044168",
-    "sha256": "1r0jfcy7qmrcclnhfqja6rixs3w3ipadblpgk54s36b11gnkfs9q",
-    "version": "1.1.3"
+    "path": "simple-mastodon-verification/tags/2.0.3",
+    "rev": "3169544",
+    "sha256": "12gh5ih4rkbdcrzdjml9rrlipbp2ymwhwxvr8y7lawmrflsas3r5",
+    "version": "2.0.3"
  },
  "so-clean-up-wp-seo": {
    "path": "so-clean-up-wp-seo/tags/4.0.2",
-    "rev": "3068954",
-    "sha256": "1ypvbpzaxgfgpk29b8snfvsmbb166irpb739rzyfs3b3857nnrvn",
+    "rev": "3114751",
+    "sha256": "1kqgmmaw99b164v554siygrxa3z7lxqhn0bwg7s01cm5fdg6i3dl",
    "version": "4.0.2"
  },
  "static-mail-sender-configurator": {
@@ -162,10 +162,10 @@
    "version": "1.2.3"
  },
  "webp-converter-for-media": {
-    "path": "webp-converter-for-media/tags/6.1.0",
-    "rev": "3151571",
-    "sha256": "1s32hnq9ycb0x70m6l29sx6bhlyn9kq5sygrywb8pyq686zrhvwk",
-    "version": "6.1.0"
+    "path": "webp-converter-for-media/tags/6.1.2",
+    "rev": "3175897",
+    "sha256": "06zaxd6lrngmivvgyw5pb5sd53gzvmr54pyavnia74gd0n3lkzyi",
+    "version": "6.1.2"
  },
  "webp-express": {
    "path": "webp-express/tags/0.25.9",
@@ -174,10 +174,10 @@
    "version": "0.25.9"
  },
  "wordpress-seo": {
-    "path": "wordpress-seo/tags/23.5",
-    "rev": "3156663",
-    "sha256": "1fh9wlisil8g08na6i9p3p5xn95cizf6q1g0srq2cqrivh0vkhhj",
-    "version": "23.5"
+    "path": "wordpress-seo/tags/23.8",
+    "rev": "3182123",
+    "sha256": "1i2j998wggpj5bapkzvwqpry1nji94qg1d19h39wmq1fyw0yiyka",
+    "version": "23.8"
  },
  "worker": {
    "path": "worker/tags/4.9.20",
@@ -186,16 +186,16 @@
    "version": "4.9.20"
  },
  "wp-change-email-sender": {
-    "path": "wp-change-email-sender/tags/2.0",
-    "rev": "3055794",
-    "sha256": "06rq7axcyw5jrar5gzma61liwq0h0cc2c9b0zxcg3gyz9n1aj5zx",
-    "version": "2.0"
+    "path": "wp-change-email-sender/tags/3.0",
+    "rev": "3163024",
+    "sha256": "12r17xxwrnci5v18x71y44289z5dvvrj8xr3sfl1ipvlrvzggbfh",
+    "version": "3.0"
  },
  "wp-fastest-cache": {
-    "path": "wp-fastest-cache/tags/1.3.1",
-    "rev": "3156327",
-    "sha256": "18dm6pmj0y2a40c1vn7v6iq90nv5549cmwp9z37dvrrgdanb68ck",
-    "version": "1.3.1"
+    "path": "wp-fastest-cache/tags/1.3.2",
+    "rev": "3181365",
+    "sha256": "0yh0vabig7yfyq98awb4nccp786rl1jcv9981s3shirr43ys4ylw",
+    "version": "1.3.2"
  },
  "wp-gdpr-compliance": {
    "path": "wp-gdpr-compliance/tags/2.0.22",
@@ -204,28 +204,28 @@
    "version": "2.0.22"
  },
  "wp-import-export-lite": {
-    "path": "wp-import-export-lite/trunk",
-    "rev": "3051446",
-    "sha256": "1dpb930kx09jhqzdkg683vy237pnq4hfls4hlszm5spnyfsq1z46",
+    "path": "wp-import-export-lite/tags/3.9.27",
+    "rev": "3189188",
+    "sha256": "001ncghhvggbvgxm5c3c14yhkg07c16caz79kb5dx8sa2k56zk2l",
    "version": "3.9.27"
  },
  "wp-mail-smtp": {
-    "path": "wp-mail-smtp/tags/4.1.1",
-    "rev": "3136142",
-    "sha256": "1a4qv43fyxkvjhskgbszmi75i67ymsl02qg1da73d75px3kkmxjw",
-    "version": "4.1.1"
+    "path": "wp-mail-smtp/tags/4.2.0",
+    "rev": "3183227",
+    "sha256": "0f54pmap43f65wpvd7abp867bfk2wzf9kp5n13iq47mxjdickj80",
+    "version": "4.2.0"
  },
  "wp-statistics": {
-    "path": "wp-statistics/tags/14.10.1",
-    "rev": "3150122",
-    "sha256": "0mh3h71bp15zimy980hi681n608is536p1r4sbna5i65lwh8qq32",
-    "version": "14.10.1"
+    "path": "wp-statistics/tags/14.11.2",
+    "rev": "3182553",
+    "sha256": "1vpxa6kk6jlanhva5px46pg7kxrfaj33cs3z95bj18hr155v8vbv",
+    "version": "14.11.2"
  },
  "wp-swiper": {
-    "path": "wp-swiper/tags/1.1.13",
-    "rev": "3148131",
-    "sha256": "1vqhd42wb2v72ynsr38i8vzsfz2bkh7vhswpdz5miykwrqp3sr8a",
-    "version": "1.1.13"
+    "path": "wp-swiper/trunk",
+    "rev": "3179903",
+    "sha256": "016qb2ydh43wsdzba4wg57qm0q30kyrrx06qfssdv71269n8dfqr",
+    "version": "1.2.13"
  },
  "wp-user-avatars": {
    "path": "wp-user-avatars/trunk",
@@ -234,9 +234,9 @@
    "version": "1.4.1"
  },
  "wpforms-lite": {
-    "path": "wpforms-lite/tags/1.9.1.2",
-    "rev": "3158924",
-    "sha256": "00mbg73zplhdj7r8691lbfhwd6fcybk5mgps5cfhbib0iqwhmqg0",
-    "version": "1.9.1.2"
+    "path": "wpforms-lite/tags/1.9.2.1",
+    "rev": "3183825",
+    "sha256": "17h2p200vb0m3sw9xnslj9kj2p6asg04azrrki4kafigw7fgl66y",
+    "version": "1.9.2.1"
  }
 }
@@ -1,38 +1,44 @@
 {
  "twentynineteen": {
-    "path": "twentynineteen/2.9",
-    "rev": "235020",
-    "sha256": "0980471ha06dj5kcwij7rmrg2dr0cj53r72qym4sqzyfj0aj1lkx",
-    "version": "2.9"
+    "path": "twentynineteen/3.0",
+    "rev": "248593",
+    "sha256": "0sjpkb3h7109svnfpvxha1xv3ga4plrhqr0xi28j8fp55fry2bl1",
+    "version": "3.0"
  },
  "twentytwenty": {
-    "path": "twentytwenty/2.7",
-    "rev": "235021",
-    "sha256": "0y9r1jhlbr4bxhv0a73kgkg6klgg05l6iy3shhkp130s3hlkhfg1",
-    "version": "2.7"
+    "path": "twentytwenty/2.8",
+    "rev": "248599",
+    "sha256": "1qk4yhw3hcgb4nr8dpmb0ssvvq176xwqpnr8ad8xzhkz4qbaqcz3",
+    "version": "2.8"
+  },
+  "twentytwentyfive": {
+    "path": "twentytwentyfive/1.0",
+    "rev": "248589",
+    "sha256": "00360gxmnzq4z5z2b7z1wpziwfb6x8nz74qv3c9fpri2d9k4356f",
+    "version": "1.0"
  },
  "twentytwentyfour": {
-    "path": "twentytwentyfour/1.2",
-    "rev": "235025",
-    "sha256": "16d7sgpcw9hkih5ji9h5wc9pv5nw0rv0q5glv6iq8k9mbms3295w",
-    "version": "1.2"
+    "path": "twentytwentyfour/1.3",
+    "rev": "248600",
+    "sha256": "12zfb83s1zgbs3r8an17hdwzn7s01hfwhxd5ak5x6106cy61nshq",
+    "version": "1.3"
  },
  "twentytwentyone": {
-    "path": "twentytwentyone/2.3",
-    "rev": "235022",
-    "sha256": "0nxrlim9mcdn7db5v93shlq1yxani909gwccvsly2wjv777dbakx",
-    "version": "2.3"
+    "path": "twentytwentyone/2.4",
+    "rev": "248601",
+    "sha256": "06sx6nx8v1bpc9csd718560fi9j7iazw1fb4kwfgckiq79kp8s7g",
+    "version": "2.4"
  },
  "twentytwentythree": {
-    "path": "twentytwentythree/1.5",
-    "rev": "235024",
-    "sha256": "09xaxqrrzgmmjlbbpm9jfhajfc90am4qp2dihcx4bbkczb5ahgc3",
-    "version": "1.5"
+    "path": "twentytwentythree/1.6",
+    "rev": "248602",
+    "sha256": "0q8qz75a2yaf4lqj84w4hfcizjj7fvgbq0rinag4abk7ivdys537",
+    "version": "1.6"
  },
  "twentytwentytwo": {
-    "path": "twentytwentytwo/1.8",
-    "rev": "235023",
-    "sha256": "0m35rl6gxjl4idsfaqhjqzgmhspn55iy7zxa8qn5mbl0ls6b5m8q",
-    "version": "1.8"
+    "path": "twentytwentytwo/1.9",
+    "rev": "248603",
+    "sha256": "0c7rx47n7kd5khrd7im4y9hf8bnwlwxhnrgcqhmwvcry60wzc7y2",
+    "version": "1.9"
  }
 }
@@ -4,5 +4,6 @@
  "twentytwentyone": "gpl2Plus",
  "twentytwentytwo": "gpl2Plus",
  "twentytwentythree": "gpl2Plus",
-  "twentytwentyfour": "gpl2Plus"
+  "twentytwentyfour": "gpl2Plus",
+  "twentytwentyfive": "gpl2Plus"
 }
@@ -62,6 +62,8 @@ lib.makeScope newScope (self: with self; {

  sdkman-for-fish = callPackage ./sdkman-for-fish.nix { };

+  spark = callPackage ./spark.nix { };
+
  sponge = callPackage ./sponge.nix { };

  tide = callPackage ./tide.nix { };
@@ -0,0 +1,26 @@
+{
+  lib,
+  buildFishPlugin,
+  fetchFromGitHub,
+}:
+let
+  self = buildFishPlugin {
+    pname = "spark";
+    version = "1.2.0";
+
+    src = fetchFromGitHub {
+      owner = "jorgebucaran";
+      repo = "spark.fish";
+      rev = "refs/tags/${self.version}";
+      hash = "sha256-AIFj7lz+QnqXGMBCfLucVwoBR3dcT0sLNPrQxA5qTuU=";
+    };
+
+    meta = {
+      description = "Sparklines for Fish";
+      homepage = "https://github.com/jorgebucaran/spark.fish";
+      license = lib.licenses.mit;
+      maintainers = with lib.maintainers; [ theobori ];
+    };
+  };
+in
+self
@@ -1,20 +1,21 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, fetchpatch
-, makeWrapper
-, stripJavaArchivesHook
-, ant
-, attr
-, boost
-, cmake
-, file
-, fuse
-, jdk8
-, openssl
-, python3
-, valgrind
-, which
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  fetchpatch,
+  makeWrapper,
+  stripJavaArchivesHook,
+  ant,
+  attr,
+  boost,
+  cmake,
+  file,
+  fuse,
+  jdk8,
+  openssl,
+  python3,
+  valgrind,
+  which,
 }:

 stdenv.mkDerivation {
@@ -29,8 +30,15 @@ stdenv.mkDerivation {
    sha256 = "1hjmd32pla27zf98ghzz6r5ml8ry86m9dsryv1z01kxv5l95b3m0";
  };

-  nativeBuildInputs = [ makeWrapper python3 stripJavaArchivesHook ];
-  buildInputs = [ which attr ];
+  nativeBuildInputs = [
+    makeWrapper
+    python3
+    stripJavaArchivesHook
+    which
+  ];
+  buildInputs = [
+    attr
+  ];

  patches = [
    (fetchpatch {
@@ -74,8 +82,8 @@ stdenv.mkDerivation {
    substituteInPlace cpp/CMakeLists.txt \
      --replace '"/lib64" "/usr/lib64"' '"${attr.out}/lib" "${lib.getLib fuse}/lib"'

-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${fuse}/include"
-    export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -L${fuse}/lib"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${lib.getDev fuse}/include"
+    export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -L${lib.getLib fuse}/lib"

    export DESTDIR=$out

@@ -107,7 +115,10 @@ stdenv.mkDerivation {

  meta = {
    description = "Distributed filesystem";
-    maintainers = with lib.maintainers; [ raskin matejc ];
+    maintainers = with lib.maintainers; [
+      raskin
+      matejc
+    ];
    platforms = lib.platforms.linux;
    license = lib.licenses.bsd3;
  };
@@ -215,6 +215,7 @@ python.pkgs.buildPythonApplication rec {
        ghc
        ghostscriptX
        giflib
+        gnumeric
        gnupg
        hdf5
        imagemagick
@@ -246,8 +247,6 @@ python.pkgs.buildPythonApplication rec {
      ])
      # oggvideotools is broken on Darwin, please put it back when it will be fixed?
      ++ lib.optionals stdenv.hostPlatform.isLinux [ oggvideotools ]
-      # This doesn't work on aarch64-darwin
-      ++ lib.optionals (stdenv.hostPlatform.system != "aarch64-darwin") [ gnumeric ]
    )
  );

@@ -1,5 +1,6 @@
 { lib
 , fetchFromGitHub
+, git
 , grype
 , nix
 , nix-visualize
@@ -9,6 +10,7 @@
  beautifulsoup4
 , colorlog
 , dfdiskcache
+, filelock
 , graphviz
 , numpy
 , packageurl-python
@@ -26,14 +28,14 @@

 python.pkgs.buildPythonApplication rec {
  pname = "sbomnix";
-  version = "1.6.1";
+  version = "1.7.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "tiiuae";
    repo = "sbomnix";
    rev = "refs/tags/v${version}";
-    hash = "sha256-kPjCK9NEs3D0qFsSSVX6MYGKbwqeij0svTfzz5JC4qM=";
+    hash = "sha256-n5nK9fqgAC10jU9BcO+EEVrSD0YEr/hp6XDcTqVrvP8=";

    # Remove documentation as it contains references to nix store
    postFetch = ''
@@ -42,18 +44,16 @@ python.pkgs.buildPythonApplication rec {
    '';
  };

-  postInstall = ''
-    wrapProgram $out/bin/sbomnix \
-      --prefix PATH : ${lib.makeBinPath [nix graphviz]}
-    wrapProgram $out/bin/nixgraph \
-      --prefix PATH : ${lib.makeBinPath [nix graphviz]}
-    wrapProgram $out/bin/vulnxscan \
-      --prefix PATH : ${lib.makeBinPath [grype nix vulnix]}
-    wrapProgram $out/bin/nix_outdated \
-      --prefix PATH : ${lib.makeBinPath [nix-visualize]}
-    wrapProgram $out/bin/provenance \
-      --prefix PATH : ${lib.makeBinPath [nix]}
-  '';
+  makeWrapperArgs = [
+    "--prefix PATH : ${lib.makeBinPath [
+      git
+      nix
+      graphviz
+      nix-visualize
+      vulnix
+      grype
+    ]}"
+  ];

  nativeBuildInputs = [ setuptools ];

@@ -62,6 +62,7 @@ python.pkgs.buildPythonApplication rec {
    colorlog
    dfdiskcache
    graphviz
+    filelock
    numpy
    packageurl-python
    packaging
@@ -1313,6 +1313,7 @@ mapAliases {
  wordpress6_4 = throw "'wordpress6_4' has been removed in favor of the latest version"; # Added 2024-08-03
  wordpress6_5 = wordpress_6_5; # Added 2024-08-03
  wordpress_6_5 = throw "'wordpress_6_5' has been removed in favor of the latest version"; # Added 2024-11-11
+  wordpress_6_6 = throw "'wordpress_6_6' has been removed in favor of the latest version"; # Added 2024-11-17
  wormhole-rs = magic-wormhole-rs; # Added 2022-05-30. preserve, reason: Arch package name, main binary name
  wpa_supplicant_ro_ssids = lib.trivial.warn "Deprecated package: Please use wpa_supplicant instead. Read-only SSID patches are now upstream!" wpa_supplicant;
  wrapLisp_old = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
@@ -4246,9 +4246,7 @@ with pkgs;
    hdf5 = hdf5.override { usev110Api = true; };
  };

-  meilisearch = callPackage ../servers/search/meilisearch {
-    inherit (darwin.apple_sdk_11_0.frameworks) Security SystemConfiguration;
-  };
+  meilisearch = callPackage ../servers/search/meilisearch { };

  mhonarc = perlPackages.MHonArc;

@@ -18926,7 +18924,7 @@ with pkgs;
  });

  inherit (callPackage ../servers/web-apps/wordpress {})
-    wordpress wordpress_6_6;
+    wordpress wordpress_6_7;

  wordpressPackages = ( callPackage ../servers/web-apps/wordpress/packages {
    plugins = lib.importJSON ../servers/web-apps/wordpress/packages/plugins.json;
@@ -12528,10 +12528,10 @@ with self; {

  Imager = buildPerlPackage {
    pname = "Imager";
-    version = "1.019";
+    version = "1.025";
    src = fetchurl {
-      url = "mirror://cpan/authors/id/T/TO/TONYC/Imager-1.019.tar.gz";
-      hash = "sha256-dNRNcBwfFPxLmE+toelVcmtQTC2LBtJl56hh+llDy0g=";
+      url = "mirror://cpan/authors/id/T/TO/TONYC/Imager-1.025.tar.gz";
+      hash = "sha256-TwJ1y7HgEdfz/sYE3GtgwaxvAt78KYs9A31ur3vqcFg=";
    };
    buildInputs = [ pkgs.freetype pkgs.fontconfig pkgs.libjpeg pkgs.libpng ];
    makeMakerFlags = [ "--incpath ${pkgs.libjpeg.dev}/include" "--libpath ${pkgs.libjpeg.out}/lib" "--incpath" "${pkgs.libpng.dev}/include" "--libpath" "${pkgs.libpng.out}/lib" ];
@@ -3433,6 +3433,8 @@ self: super: with self; {

  django-filer = callPackage ../development/python-modules/django-filer { };

+  django-filingcabinet = callPackage ../development/python-modules/django-filingcabinet { };
+
  django-filter = callPackage ../development/python-modules/django-filter { };

  django-formtools = callPackage ../development/python-modules/django-formtools { };