Merge master into staging-next

2024-09-04 18:04:23 +00:00 · 2024-09-04 18:04:23 +00:00 · 563bb0fbc2
commit 563bb0fbc2
parent 5a3f7821df b662684973
61 changed files with 702 additions and 332 deletions
--- a/doc/build-helpers/images/dockertools.section.md
+++ b/doc/build-helpers/images/dockertools.section.md
@ -50,6 +50,10 @@ Similarly, if you encounter errors similar to `Error_Protocol ("certificate has
  If specified, the layer created by `buildImage` will be appended to the layers defined in the base image, resulting in an image with at least two layers (one or more layers from the base image, and the layer created by `buildImage`).
  Otherwise, the resulting image with contain the single layer created by `buildImage`.

+  :::{.note}
+  Only **Env** configuration is inherited from the base image.
+  :::
+
  _Default value:_ `null`.

 `fromImageName` (String or Null; _optional_)
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@ -452,6 +452,10 @@

 - The hooks `yarnConfigHook` and `yarnBuildHook` were added. These should replace `yarn2nix.mkYarnPackage` and other `yarn2nix` related tools. The motivation to get rid of `yarn2nix` tools is the fact that they are too complex and hard to maintain, and they rely upon too much Nix evaluation which is problematic if import-from-derivation is not allowed (see more details at [#296856](https://github.com/NixOS/nixpkgs/issues/296856). The transition from `mkYarnPackage` to `yarn{Config,Build}Hook` is tracked at [#324246](https://github.com/NixOS/nixpkgs/issues/324246).

+- `services.timesyncd.servers` now defaults to `null`, allowing systemd-timesyncd to use NTP servers advertised by DHCP.
+
+- `services.timesyncd.fallbackServers` was added and defaults to `networking.timeServers`.
+
 - Cinnamon has been updated to 6.2, please check [upstream announcement](https://www.linuxmint.com/rel_wilma_whatsnew.php) for more details.
  Following Mint 22 defaults, the Cinnamon module no longer ships geary and hexchat by default.

--- a/nixos/modules/config/i18n.nix
+++ b/nixos/modules/config/i18n.nix
@ -13,7 +13,7 @@
        };
        defaultText = lib.literalExpression ''
          pkgs.glibcLocales.override {
-            allLocales = any (x: x == "all") config.i18n.supportedLocales;
+            allLocales = lib.any (x: x == "all") config.i18n.supportedLocales;
            locales = config.i18n.supportedLocales;
          }
        '';
--- a/nixos/modules/config/resolvconf.nix
+++ b/nixos/modules/config/resolvconf.nix
@ -35,7 +35,7 @@ in
    (lib.mkRenamedOptionModule [ "networking" "dnsExtensionMechanism" ] [ "networking" "resolvconf" "dnsExtensionMechanism" ])
    (lib.mkRenamedOptionModule [ "networking" "extraResolvconfConf" ] [ "networking" "resolvconf" "extraConfig" ])
    (lib.mkRenamedOptionModule [ "networking" "resolvconfOptions" ] [ "networking" "resolvconf" "extraOptions" ])
-    (lib.mkRemovedOptionModule [ "networking" "resolvconf" "useHostResolvConf" ] "This option was never used for lib.anything lib.anyways")
+    (lib.mkRemovedOptionModule [ "networking" "resolvconf" "useHostResolvConf" ] "This option was never used for anything anyways")
  ];

  options = {
--- a/nixos/modules/services/continuous-integration/github-runner/service.nix
+++ b/nixos/modules/services/continuous-integration/github-runner/service.nix
@ -151,9 +151,10 @@ with lib;
                # Always clean workDir
                find -H "$WORK_DIRECTORY" -mindepth 1 -delete
              '';
-              configureRunner = writeScript "configure" ''
+              configureRunner = writeScript "configure" /*bash*/''
                if [[ -e "${newConfigTokenPath}" ]]; then
                  echo "Configuring GitHub Actions Runner"
+                  # shellcheck disable=SC2054  # don't complain about commas in --labels
                  args=(
                    --unattended
                    --disableupdate
--- a/nixos/modules/services/continuous-integration/jenkins/default.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/default.nix
@ -205,13 +205,13 @@ in {
      preStart =
        let replacePlugins =
              lib.optionalString (cfg.plugins != null) (
-                let pluginCmds = lib.attrsets.lib.mapAttrsToList
+                let pluginCmds = lib.mapAttrsToList
                      (n: v: "cp ${v} ${cfg.home}/plugins/${n}.jpi")
                      cfg.plugins;
                in ''
                  rm -r ${cfg.home}/plugins || true
                  mkdir -p ${cfg.home}/plugins
-                  ${lib.strings.lib.concatStringsSep "\n" pluginCmds}
+                  ${lib.concatStringsSep "\n" pluginCmds}
                '');
        in ''
          rm -rf ${cfg.home}/war
--- a/nixos/modules/services/networking/firewall-iptables.nix
+++ b/nixos/modules/services/networking/firewall-iptables.nix
@ -123,9 +123,6 @@ let
      # Allows this host to act as a DHCP4 client without first having to use APIPA
      iptables -t mangle -A nixos-fw-rpfilter -p udp --sport 67 --dport 68 -j RETURN

-      # Allows decrypted packets from an IPsec VPN
-      ip46tables -t mangle -A nixos-fw-rpfilter -m policy --dir in --pol ipsec -j RETURN
-
      # Allows this host to act as a DHCPv4 server
      iptables -t mangle -A nixos-fw-rpfilter -s 0.0.0.0 -d 255.255.255.255 -p udp --sport 68 --dport 67 -j RETURN

--- a/nixos/modules/services/networking/firewall-nftables.nix
+++ b/nixos/modules/services/networking/firewall-nftables.nix
@ -82,11 +82,6 @@ in
      }
    ];

-    networking.nftables.preCheckRuleset = ''
-      # can't validate IPsec rules
-      sed '/meta ipsec/d' -i ruleset.conf
-    '';
-
    networking.nftables.tables."nixos-fw".family = "inet";
    networking.nftables.tables."nixos-fw".content = ''
        ${optionalString (cfg.checkReversePath != false) ''
@ -94,7 +89,6 @@ in
            type filter hook prerouting priority mangle + 10; policy drop;

            meta nfproto ipv4 udp sport . udp dport { 67 . 68, 68 . 67 } accept comment "DHCPv4 client/server"
-            meta ipsec exists accept comment "decrypted packets from an IPsec VPN"
            fib saddr . mark ${optionalString (cfg.checkReversePath != "loose") ". iif"} oif exists accept

            jump rpfilter-allow
--- a/nixos/modules/system/boot/timesyncd.nix
+++ b/nixos/modules/system/boot/timesyncd.nix
@ -2,33 +2,52 @@

 with lib;

+let
+  cfg = config.services.timesyncd;
+in
 {

  options = {

-    services.timesyncd = {
+    services.timesyncd = with types; {
      enable = mkOption {
        default = !config.boot.isContainer;
        defaultText = literalExpression "!config.boot.isContainer";
-        type = types.bool;
+        type = bool;
        description = ''
          Enables the systemd NTP client daemon.
        '';
      };
      servers = mkOption {
-        default = config.networking.timeServers;
-        defaultText = literalExpression "config.networking.timeServers";
-        type = types.listOf types.str;
+        default = null;
+        type = nullOr (listOf str);
        description = ''
          The set of NTP servers from which to synchronise.
-          Note if this is set to an empty list, the defaults systemd itself is
-          compiled with ({0..4}.nixos.pool.ntp.org) apply,
-          In case you want to disable timesyncd altogether, use the `enable` option.
+
+          Setting this option to an empty list will write `NTP=` to the
+          `timesyncd.conf` file as opposed to setting this option to null which
+          will remove `NTP=` entirely.
+
+          See man:timesyncd.conf(5) for details.
+        '';
+      };
+      fallbackServers = mkOption {
+        default = config.networking.timeServers;
+        defaultText = literalExpression "config.networking.timeServers";
+        type = nullOr (listOf str);
+        description = ''
+          The set of fallback NTP servers from which to synchronise.
+
+          Setting this option to an empty list will write `FallbackNTP=` to the
+          `timesyncd.conf` file as opposed to setting this option to null which
+          will remove `FallbackNTP=` entirely.
+
+          See man:timesyncd.conf(5) for details.
        '';
      };
      extraConfig = mkOption {
        default = "";
-        type = types.lines;
+        type = lines;
        example = ''
          PollIntervalMaxSec=180
        '';
@ -41,7 +60,7 @@ with lib;
    };
  };

-  config = mkIf config.services.timesyncd.enable {
+  config = mkIf cfg.enable {

    systemd.additionalUpstreamSystemUnits = [ "systemd-timesyncd.service" ];

@ -82,9 +101,14 @@ with lib;

    environment.etc."systemd/timesyncd.conf".text = ''
      [Time]
-      NTP=${concatStringsSep " " config.services.timesyncd.servers}
-      ${config.services.timesyncd.extraConfig}
-    '';
+    ''
+    + optionalString (cfg.servers != null) ''
+      NTP=${concatStringsSep " " cfg.servers}
+    ''
+    + optionalString (cfg.fallbackServers != null) ''
+      FallbackNTP=${concatStringsSep " " cfg.fallbackServers}
+    ''
+    + cfg.extraConfig;

    users.users.systemd-timesync = {
      uid = config.ids.uids.systemd-timesync;
--- a/nixos/tests/ec2.nix
+++ b/nixos/tests/ec2.nix
@ -22,6 +22,8 @@ let
          ln -s vda1 /dev/xvda1
        '';

+        amazonImage.format = "qcow2";
+
        # In a NixOS test the serial console is occupied by the "backdoor"
        # (see testing/test-instrumentation.nix) and is incompatible with
        # the configuration in virtualisation/amazon-image.nix.
@ -53,7 +55,7 @@ let
      }
    ];
  }).config;
-  image = "${imageCfg.system.build.amazonImage}/${imageCfg.amazonImage.name}.vhd";
+  image = "${imageCfg.system.build.amazonImage}/${imageCfg.amazonImage.name}.qcow2";

  sshKeys = import ./ssh-keys.nix pkgs;
  snakeOilPrivateKey = sshKeys.snakeOilPrivateKey.text;
@ -63,6 +65,7 @@ let
 in {
  boot-ec2-nixops = makeEc2Test {
    name         = "nixops-userdata";
+    meta.timeout = 600;
    inherit image;
    sshPublicKey = snakeOilPublicKey; # That's right folks! My user's key is also the host key!

@ -95,7 +98,7 @@ in {
      machine.succeed(
          "echo localhost,127.0.0.1 ${snakeOilPublicKey} > ~/.ssh/known_hosts"
      )
-      machine.succeed("ssh -o BatchMode=yes localhost exit")
+      machine.succeed("ssh -o BatchMode=yes localhost exit", timeout=120)

      # Test whether the root disk was resized.
      blocks, block_size = map(int, machine.succeed("stat -c %b:%S -f /").split(":"))
--- a/pkgs/applications/blockchains/polkadot/Cargo.lock
+++ b/pkgs/applications/blockchains/polkadot/Cargo.lock
@ -3654,7 +3654,7 @@ dependencies = [

 [[package]]
 name = "cumulus-client-consensus-aura"
-version = "0.17.0"
+version = "0.17.1"
 dependencies = [
 "async-trait",
 "cumulus-client-collator",
@ -11507,7 +11507,7 @@ dependencies = [

 [[package]]
 name = "pallet-timestamp"
-version = "36.0.0"
+version = "36.0.1"
 dependencies = [
 "docify",
 "frame-benchmarking",
@ -12833,7 +12833,7 @@ dependencies = [

 [[package]]
 name = "polkadot-dispute-distribution"
-version = "17.0.0"
+version = "17.0.1"
 dependencies = [
 "assert_matches",
 "async-channel",
@ -13862,7 +13862,7 @@ dependencies = [

 [[package]]
 name = "polkadot-runtime-parachains"
-version = "16.0.1"
+version = "16.0.2"
 dependencies = [
 "assert_matches",
 "bitflags 1.3.2",
--- a/pkgs/applications/blockchains/polkadot/default.nix
+++ b/pkgs/applications/blockchains/polkadot/default.nix
@ -17,13 +17,13 @@ let
 in
 rustPlatform.buildRustPackage rec {
  pname = "polkadot";
-  version = "stable2407-1";
+  version = "stable2407-2";

  src = fetchFromGitHub {
    owner = "paritytech";
    repo = "polkadot-sdk";
    rev = "polkadot-${version}";
-    hash = "sha256-IYRkXmFBjRAYSROL37EgEjC7wM1N97HabuSHtcSUxdg=";
+    hash = "sha256-4WOoFjihzErc6lIgiWvLg6fqDOxs1A+A0ERvu/D8btw=";

    # the build process of polkadot requires a .git folder in order to determine
    # the git commit hash that is being built and add it to the version string.
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@ -2934,6 +2934,78 @@ final: prev:
    meta.homepage = "https://github.com/nvimdev/dashboard-nvim/";
  };

+  ddc-filter-matcher_head = buildVimPlugin {
+    pname = "ddc-filter-matcher_head";
+    version = "2024-08-02";
+    src = fetchFromGitHub {
+      owner = "Shougo";
+      repo = "ddc-filter-matcher_head";
+      rev = "28f60903e1a9f1010ec01575cb99c64e76683466";
+      sha256 = "155yp27p3j982cchgjijci7f1vci1idrv7hp6imz5kxxrcdvfcz4";
+    };
+    meta.homepage = "https://github.com/Shougo/ddc-filter-matcher_head/";
+  };
+
+  ddc-filter-sorter_rank = buildVimPlugin {
+    pname = "ddc-filter-sorter_rank";
+    version = "2024-08-02";
+    src = fetchFromGitHub {
+      owner = "Shougo";
+      repo = "ddc-filter-sorter_rank";
+      rev = "539584150b922acb549203730d427dd2fd85fe86";
+      sha256 = "16d8jx7bq3602wd9a019zh93ifv1bxdnrrjhsa8d8g8zm2wmv47x";
+    };
+    meta.homepage = "https://github.com/Shougo/ddc-filter-sorter_rank/";
+  };
+
+  ddc-source-lsp = buildVimPlugin {
+    pname = "ddc-source-lsp";
+    version = "2024-08-16";
+    src = fetchFromGitHub {
+      owner = "Shougo";
+      repo = "ddc-source-lsp";
+      rev = "7511be6f82cab3dd9fd1592a9076c19f4273570d";
+      sha256 = "0kbm1w89rc3kmh4zi1fn8wskj785a0gq1lr5d1ijrb0i2z237rcy";
+    };
+    meta.homepage = "https://github.com/Shougo/ddc-source-lsp/";
+  };
+
+  ddc-ui-native = buildVimPlugin {
+    pname = "ddc-ui-native";
+    version = "2024-07-29";
+    src = fetchFromGitHub {
+      owner = "Shougo";
+      repo = "ddc-ui-native";
+      rev = "2567067b60419a9be265aae5fa480dc51e4ba1c3";
+      sha256 = "1lr039vnr1yw0nccr3f20a19f4mnxm12kkr8rlzix4r6j3z6vz0h";
+    };
+    meta.homepage = "https://github.com/Shougo/ddc-ui-native/";
+  };
+
+  ddc-ui-pum = buildVimPlugin {
+    pname = "ddc-ui-pum";
+    version = "2024-08-01";
+    src = fetchFromGitHub {
+      owner = "Shougo";
+      repo = "ddc-ui-pum";
+      rev = "989b3f0acb0d35bfcd0a3b0ec9239ad2a838e478";
+      sha256 = "14ysvz1gp2ha6143f60v3nq2s2yybx7b916q8bs845jzk5q7qlwd";
+    };
+    meta.homepage = "https://github.com/Shougo/ddc-ui-pum/";
+  };
+
+  ddc-vim = buildVimPlugin {
+    pname = "ddc.vim";
+    version = "2024-08-21";
+    src = fetchFromGitHub {
+      owner = "Shougo";
+      repo = "ddc.vim";
+      rev = "09f2f778f2da1c2c96965669e9791665455c12eb";
+      sha256 = "1ipzlxxlwbzz076cp9ggln2qspgvmnzaqbbq1m1c5rr756d6k7k3";
+    };
+    meta.homepage = "https://github.com/Shougo/ddc.vim/";
+  };
+
  debugprint-nvim = buildVimPlugin {
    pname = "debugprint.nvim";
    version = "2024-07-28";
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@ -662,6 +662,30 @@
    '';
  };

+  ddc-filter-matcher_head = super.ddc-filter-matcher_head.overrideAttrs {
+    dependencies = with self; [ ddc-vim ];
+  };
+
+  ddc-source-lsp = super.ddc-source-lsp.overrideAttrs {
+    dependencies = with self; [ ddc-vim ];
+  };
+
+  ddc-vim = super.ddc-vim.overrideAttrs {
+    dependencies = with self; [ denops-vim ];
+  };
+
+  ddc-filter-sorter_rank = super.ddc-filter-sorter_rank.overrideAttrs {
+    dependencies = with self; [ ddc-vim ];
+  };
+
+  ddc-ui-native = super.ddc-ui-native.overrideAttrs {
+    dependencies = with self; [ ddc-vim ];
+  };
+
+  ddc-ui-pum = super.ddc-ui-pum.overrideAttrs {
+    dependencies = with self; [ ddc-vim pum-vim ];
+  };
+
  defx-nvim = super.defx-nvim.overrideAttrs {
    dependencies = with self; [ nvim-yarp ];
  };
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@ -244,6 +244,12 @@ https://github.com/ptdewey/darkearth-nvim/,HEAD,
 https://github.com/dart-lang/dart-vim-plugin/,,
 https://github.com/rizzatti/dash.vim/,HEAD,
 https://github.com/glepnir/dashboard-nvim/,,
+https://github.com/Shougo/ddc-filter-matcher_head/,HEAD,
+https://github.com/Shougo/ddc-filter-sorter_rank/,HEAD,
+https://github.com/Shougo/ddc-source-lsp/,HEAD,
+https://github.com/Shougo/ddc-ui-native/,HEAD,
+https://github.com/Shougo/ddc-ui-pum/,HEAD,
+https://github.com/Shougo/ddc.vim/,HEAD,
 https://github.com/andrewferrier/debugprint.nvim/,HEAD,
 https://github.com/Verf/deepwhite.nvim/,,
 https://github.com/kristijanhusak/defx-git/,,
--- a/pkgs/applications/misc/mkgmap/default.nix
+++ b/pkgs/applications/misc/mkgmap/default.nix
@ -16,12 +16,12 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "mkgmap";
-  version = "4921";
+  version = "4922";

  src = fetchsvn {
    url = "https://svn.mkgmap.org.uk/mkgmap/mkgmap/trunk";
    rev = version;
-    sha256 = "sha256-s7EKHXh3UNMDzBmWUTZaLR1P21e27cWJNYRlFcpJu50=";
+    sha256 = "sha256-LgGdV6l9tjRR4BpGTDTm0MeAq2uiOe7Pv0qv87nbbWw=";
  };

  patches = [
--- a/pkgs/applications/networking/cluster/bosh-cli/default.nix
+++ b/pkgs/applications/networking/cluster/bosh-cli/default.nix
@ -8,13 +8,13 @@
 buildGoModule rec {
  pname = "bosh-cli";

-  version = "7.7.0";
+  version = "7.7.1";

  src = fetchFromGitHub {
    owner = "cloudfoundry";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-z3nC9h8kSQYukIVrcdtUiGyHIUl5W6r43RC7l40Vlwo=";
+    sha256 = "sha256-Bs7bKB9P6TzlH4ztXFsQ1Q81nxNR5n6cuZ6Ap23nLUw=";
  };
  vendorHash = null;

--- a/pkgs/applications/networking/cluster/prow/default.nix
+++ b/pkgs/applications/networking/cluster/prow/default.nix
@ -1,68 +0,0 @@
-{ buildGoModule, fetchFromGitHub, lib }:
-
-buildGoModule rec {
-  pname = "prow-unstable";
-  version = "2020-04-01";
-  rev = "32e3b5ce7695fb622381421653db436cb57b47c5";
-
-  src = fetchFromGitHub {
-    inherit rev;
-
-    owner = "kubernetes";
-    repo = "test-infra";
-    hash = "sha256-ZNa7iAcN1qlBFT/UfziivW4q+9hjIt9WbHEOt6r1g1U=";
-  };
-
-  vendorHash = "sha256-FJO8KVCZLehaN1Eku6uQpj/vgwOyO+Irqs0qJHJhzZk=";
-
-  doCheck = false;
-
-  subPackages = [
-    "prow/cmd/admission"
-    "prow/cmd/branchprotector"
-    "prow/cmd/checkconfig"
-    "prow/cmd/clonerefs"
-    "prow/cmd/cm2kc"
-    "prow/cmd/config-bootstrapper"
-    "prow/cmd/crier"
-    "prow/cmd/deck"
-    "prow/cmd/entrypoint"
-    "prow/cmd/exporter"
-    "prow/cmd/gcsupload"
-    "prow/cmd/gerrit"
-    "prow/cmd/hook"
-    "prow/cmd/horologium"
-    "prow/cmd/initupload"
-    "prow/cmd/jenkins-operator"
-    "prow/cmd/mkbuild-cluster"
-    "prow/cmd/mkpj"
-    "prow/cmd/mkpod"
-    "prow/cmd/peribolos"
-    "prow/cmd/phaino"
-    "prow/cmd/phony"
-    "prow/cmd/pipeline"
-    "prow/cmd/plank"
-    "prow/cmd/sidecar"
-    "prow/cmd/sinker"
-    "prow/cmd/status-reconciler"
-    "prow/cmd/sub"
-    "prow/cmd/tackle"
-    "prow/cmd/tide"
-    "prow/cmd/tot"
-  ];
-
-  meta = with lib; {
-    description = "Kubernetes based CI/CD system";
-    longDescription = ''
-      Prow is a Kubernetes based CI/CD system. Jobs can be triggered by various
-      types of events and report their status to many different services. In
-      addition to job execution, Prow provides GitHub automation in the form of
-      policy enforcement, chat-ops via /foo style commands, and automatic PR
-      merging.
-    '';
-    homepage = "https://github.com/kubernetes/test-infra/tree/master/prow";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ kalbasit ];
-    platforms = platforms.linux ++ platforms.darwin;
-  };
-}
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@ -58,7 +58,7 @@ let
   "8.19.0".sha256   = "sha256-ixsYCvCXpBHqJ71hLQklphlwoOO3i/6w2PJjllKqf9k=";
   "8.19.1".sha256   = "sha256-kmZ8Uk8jpzjOd67aAPp3C+vU2oNaBw9pr7+Uixcgg94=";
   "8.19.2".sha256   = "sha256-q+i07JsMZp83Gqav6v1jxsgPLN7sPvp5/oszVnavmz0=";
-   "8.20+rc1".sha256 = "sha256-OLGPMvvA3hc42zdgWSOnOkN0/WwzBpneUcUVRNcNVms=";
+   "8.20.0".sha256   = "sha256-WFpZlA6CzFVAruPhWcHQI7VOBVhrGLdFzWrHW0DTSl0=";
  };
  releaseRev = v: "V${v}";
  fetched = import ../../../../build-support/coq/meta-fetch/default.nix
--- a/pkgs/by-name/ar/artalk/package.nix
+++ b/pkgs/by-name/ar/artalk/package.nix
@ -21,7 +21,7 @@ buildGoModule rec {
  };
  web = fetchurl {
    url = "https://github.com/${src.owner}/${src.repo}/releases/download/v${version}/artalk_ui.tar.gz";
-    hash = "sha256-3Rg5mCFigLkZ+X8Fxe6A16THd9j6hcTYMEAKU1SrLMw=";
+    hash = "sha256-Cx3fDpnl52kwILzH9BBLfsWe5qEbIl/ecJd1wJEB/Hc=";
  };

  CGO_ENABLED = 1;
--- a/pkgs/by-name/bc/bcc/package.nix
+++ b/pkgs/by-name/bc/bcc/package.nix
@ -13,12 +13,12 @@
 , makeWrapper
 , netperf
 , nixosTests
-, python3
+, python3Packages
 , stdenv
 , zip
 }:

-python3.pkgs.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
  pname = "bcc";
  version = "0.31.0";

@ -44,14 +44,14 @@ python3.pkgs.buildPythonApplication rec {
    ./fix-deadlock-detector-import.patch
  ];

-  propagatedBuildInputs = [ python3.pkgs.netaddr ];
+  propagatedBuildInputs = [ python3Packages.netaddr ];
  nativeBuildInputs = [
    bison
    cmake
    flex
    llvmPackages.llvm.dev
    makeWrapper
-    python3.pkgs.setuptools
+    python3Packages.setuptools
    zip
  ];

@ -82,7 +82,7 @@ python3.pkgs.buildPythonApplication rec {

  preInstall = ''
    # required for setuptool during install
-    export PYTHONPATH=$out/${python3.sitePackages}:$PYTHONPATH
+    export PYTHONPATH=$out/${python3Packages.python.sitePackages}:$PYTHONPATH
  '';
  postInstall = ''
    mkdir -p $out/bin $out/share
--- a/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix
+++ b/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix
@ -7,16 +7,16 @@
 }:
 buildGoModule rec {
  pname = "cloudflare-dynamic-dns";
-  version = "4.3.0";
+  version = "4.3.2";

  src = fetchFromGitHub {
    owner = "zebradil";
    repo = "cloudflare-dynamic-dns";
    rev = "refs/tags/${version}";
-    hash = "sha256-3sE4iaSkCAAMJ6FtZgXXkjb0aO73ehluY3WMQlOgxwc=";
+    hash = "sha256-SuDiR/saqxgfnEku31tjAtahWNg+5wFriD0F2FPkEEo=";
  };

-  vendorHash = "sha256-/UaTOCbE8ieCtME6AudbXE5ntCptPFoESYrdn7qK0MU=";
+  vendorHash = "sha256-vHlBZOeJ0oZZ4zjy4UycbdiMGzEpGRqT7v3q0hDz28M=";

  subPackages = ".";

--- a/pkgs/by-name/dm/dms/package.nix
+++ b/pkgs/by-name/dm/dms/package.nix
@ -0,0 +1,28 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule rec {
+  pname = "dms";
+  version = "1.6.0";
+
+  src = fetchFromGitHub {
+    owner = "anacrolix";
+    repo = "dms";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-QwRLNCXDu/dKh2o17AyASlVQPIEOX6e4kTINa2ZzZkU=";
+  };
+
+  vendorHash = "sha256-Z0DoVmL0zJ4l9hrO+zGp6FcExvhbiPu5+N3Mfyxi5DE=";
+
+  meta = {
+    homepage = "https://github.com/anacrolix/dms";
+    description = "UPnP DLNA Digital Media Server with basic video transcoding";
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.claes ];
+    platforms = lib.platforms.linux;
+    mainProgram = "dms";
+  };
+}
--- a/pkgs/by-name/ek/eksctl/package.nix
+++ b/pkgs/by-name/ek/eksctl/package.nix
@ -6,16 +6,16 @@

 buildGoModule rec {
  pname = "eksctl";
-  version = "0.189.0";
+  version = "0.190.0";

  src = fetchFromGitHub {
    owner = "weaveworks";
    repo = pname;
    rev = version;
-    hash = "sha256-YG1p7T2K1b3LO2MiTkCC88ZpgCpVTSCBUoCEcJK+V7I=";
+    hash = "sha256-IEe0NDl8Z1XBvfy/2cwL+O/RYGFS6VXd2ZUpyhEdaGs=";
  };

-  vendorHash = "sha256-W7tAdImEsPWSQkK8FnXgx5ADZ2JOdVc2xNBkNM11FOw=";
+  vendorHash = "sha256-mdGkdiYjcmsmYnM6fbyUeTC4Zb/Q1+geZrqJELv5i+4=";

  doCheck = false;

--- a/pkgs/by-name/fl/flake-edit/package.nix
+++ b/pkgs/by-name/fl/flake-edit/package.nix
@ -0,0 +1,57 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  openssl,
+  stdenv,
+  installShellFiles,
+  darwin,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "flake-edit";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "a-kenji";
+    repo = "flake-edit";
+    rev = "v${version}";
+    hash = "sha256-dNTvAYBVZLeDlC1bsaonwojE7+1CD16/sCxtQVvT9WE=";
+  };
+
+  cargoHash = "sha256-ipLjbfnNqrUUD40awRnE8URX5pHhG4SwUM9JedoBM8Y=";
+
+  nativeBuildInputs = [
+    installShellFiles
+    pkg-config
+  ];
+
+  buildInputs =
+    [
+      openssl
+    ]
+    ++ lib.optionals stdenv.isDarwin [
+      darwin.apple_sdk.frameworks.Security
+      darwin.apple_sdk.frameworks.SystemConfiguration
+    ];
+
+  env.ASSET_DIR = "target/assets";
+
+  postInstall = ''
+    installManPage target/assets/flake-edit.1
+
+    installShellCompletion --bash --name flake-edit.bash target/assets/flake-edit.bash
+    installShellCompletion --fish --name flake-edit.fish target/assets/flake-edit.fish
+    installShellCompletion --zsh --name _flake-edit target/assets/_flake-edit
+  '';
+
+  meta = {
+    description = "Edit your flake inputs with ease";
+    homepage = "https://github.com/a-kenji/flake-edit";
+    changelog = "https://github.com/a-kenji/flake-edit/blob/${src.rev}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ a-kenji ];
+    mainProgram = "flake-edit";
+  };
+}
--- a/pkgs/by-name/fr/fragments/package.nix
+++ b/pkgs/by-name/fr/fragments/package.nix
@ -1,41 +1,42 @@
-{ lib
-, stdenv
-, fetchFromGitLab
-, appstream-glib
-, cargo
-, dbus
-, desktop-file-utils
-, git
-, glib
-, gtk4
-, libadwaita
-, meson
-, ninja
-, openssl
-, pkg-config
-, rustPlatform
-, rustc
-, sqlite
-, transmission_4
-, wrapGAppsHook4
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  appstream-glib,
+  cargo,
+  dbus,
+  desktop-file-utils,
+  git,
+  glib,
+  gtk4,
+  libadwaita,
+  meson,
+  ninja,
+  openssl,
+  pkg-config,
+  rustPlatform,
+  rustc,
+  sqlite,
+  transmission_4,
+  wrapGAppsHook4,
 }:

 stdenv.mkDerivation rec {
  pname = "fragments";
-  version = "3.0.0";
+  version = "3.0.1";

  src = fetchFromGitLab {
    domain = "gitlab.gnome.org";
    owner = "World";
    repo = "Fragments";
    rev = version;
-    hash = "sha256-HtulyB1XYBsA595ghJN0EmyJT7DjGUbtJKaMGM3f0I8=";
+    hash = "sha256-lTOO6ZQWImaFqYZ3qerYYHWj/eOLYU/2k2Wh/ju9Njw=";
  };

  cargoDeps = rustPlatform.fetchCargoTarball {
    inherit src;
    name = "${pname}-${version}";
-    hash = "sha256-EUE+Qc+MqsKPqHMYJflZQ6zm3ErW+KLuJq/7HEBf8VM=";
+    hash = "sha256-7TIjd1ewazJGY8uG6f1B97ol+7+uLjnZVGC2/2DlUdQ=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/gi/gitu/package.nix
+++ b/pkgs/by-name/gi/gitu/package.nix
@ -12,16 +12,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "gitu";
-  version = "0.24.0";
+  version = "0.25.0";

  src = fetchFromGitHub {
    owner = "altsem";
    repo = "gitu";
    rev = "v${version}";
-    hash = "sha256-ERowsPJujsN27uKD0yW1kPADV9YOKH7KR3/4r1iISvc=";
+    hash = "sha256-DqJ/O87LdNXmJNmoBCdAvLod8uDRHlNuMzAv+kEew1w=";
  };

-  cargoHash = "sha256-VhcCFh1seqanecRT3lER0ZSYFRoKn9V5sbGYlNg49DQ=";
+  cargoHash = "sha256-rfj2rDqO/sMaghpou2TCTfqrUmPxh0qooR6hhqlS4PM=";

  nativeBuildInputs = [
    pkg-config
--- a/pkgs/by-name/ha/havoc/package.nix
+++ b/pkgs/by-name/ha/havoc/package.nix
@ -10,13 +10,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "havoc";
-  version = "0.5.0";
+  version = "0.6.0";

  src = fetchFromGitHub {
    owner = "ii8";
    repo = "havoc";
    rev = finalAttrs.version;
-    hash = "sha256-jvGm2gFdMS61otETF7gOEpYn6IuLfqI95IpEVfIv+C4=";
+    hash = "sha256-YCZdAlIDptVLMUko40gfp2BCAbhGNsYyVTDB14VTNSE=";
  };

  depsBuildBuild = [
--- a/pkgs/by-name/pi/picocrypt/package.nix
+++ b/pkgs/by-name/pi/picocrypt/package.nix
@ -15,13 +15,13 @@

 buildGoModule rec {
  pname = "picocrypt";
-  version = "1.41";
+  version = "1.42";

  src = fetchFromGitHub {
    owner = "Picocrypt";
    repo = "Picocrypt";
    rev = "refs/tags/${version}";
-    hash = "sha256-jbZW9JqRVEH48RmGSQzSKaoTRSnA85N7iDHIQqTF6JQ=";
+    hash = "sha256-Ehsjt3zCtJFBJ0l707uRtEfDC3M99mb9HFcNlH1btVE=";
  };

  sourceRoot = "${src.name}/src";
--- a/pkgs/by-name/po/portfolio/package.nix
+++ b/pkgs/by-name/po/portfolio/package.nix
@ -35,11 +35,11 @@ let
 in
 stdenvNoCC.mkDerivation rec {
  pname = "PortfolioPerformance";
-  version = "0.70.3";
+  version = "0.70.4";

  src = fetchurl {
    url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
-    hash = "sha256-mT8cIoWTVzXyEktuybkC9sTtwlNCftiaMeyHYcyHV8A=";
+    hash = "sha256-4L2hoWUFAmxyUCbQFWoIQlIhbdyncN0fGFmahPMk0FU=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/pr/prow/package.nix
+++ b/pkgs/by-name/pr/prow/package.nix
@ -0,0 +1,81 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  git,
+}:
+
+buildGoModule rec {
+  pname = "prow";
+  version = "0-unstable-2024-08-27";
+  rev = "195f38540f39dd3ec95ca2d7086487ec19922e61";
+
+  src = fetchFromGitHub {
+    inherit rev;
+
+    owner = "kubernetes-sigs";
+    repo = "prow";
+    hash = "sha256-/OhlJdxPa4rTuT7XIklx8vxprbENfasJYwiJxD4CeXY=";
+  };
+
+  vendorHash = "sha256-bJ0P/rHp+0zB/Dtp3F3n4AN3xF/A5qoq3lCQVBK+L4w=";
+
+  # doCheck = false;
+
+  subPackages = [
+    "cmd/admission"
+    "cmd/branchprotector"
+    "cmd/checkconfig"
+    "cmd/clonerefs"
+    "cmd/cm2kc"
+    "cmd/config-bootstrapper"
+    "cmd/crier"
+    "cmd/deck"
+    "cmd/entrypoint"
+    "cmd/exporter"
+    "cmd/external-plugins"
+    "cmd/gangway"
+    "cmd/gcsupload"
+    "cmd/generic-autobumper"
+    "cmd/gerrit"
+    "cmd/ghproxy"
+    "cmd/hmac"
+    "cmd/hook"
+    "cmd/horologium"
+    "cmd/initupload"
+    "cmd/invitations-accepter"
+    "cmd/jenkins-operator"
+    "cmd/mkpj"
+    "cmd/mkpod"
+    "cmd/moonraker"
+    "cmd/peribolos"
+    "cmd/phony"
+    "cmd/pipeline"
+    "cmd/prow-controller-manager"
+    "cmd/sidecar"
+    "cmd/sinker"
+    "cmd/status-reconciler"
+    "cmd/sub"
+    "cmd/tackle"
+    "cmd/tide"
+    "cmd/tot"
+    "cmd/webhook-server"
+  ];
+
+  nativeCheckInputs = [ git ];
+
+  meta = {
+    description = "Kubernetes based CI/CD system developed to serve the Kubernetes community";
+    longDescription = ''
+      Prow is a Kubernetes based CI/CD system. Jobs can be triggered by various
+      types of events and report their status to many different services. In
+      addition to job execution, Prow provides GitHub automation in the form of
+      policy enforcement, chat-ops via /foo style commands, and automatic PR
+      merging.
+    '';
+    homepage = "https://github.com/kubernetes-sigs/prow";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ kalbasit ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+  };
+}
--- a/pkgs/tools/networking/qrcp/default.nix
+++ b/pkgs/tools/networking/qrcp/default.nix
@ -1,4 +1,5 @@
 { lib
+, stdenv
 , buildGoModule
 , fetchFromGitHub
 , installShellFiles
@ -6,32 +7,34 @@

 buildGoModule rec {
  pname = "qrcp";
-  version = "0.11.2";
+  version = "0.11.3";

  src = fetchFromGitHub {
    owner = "claudiodangelis";
    repo = "qrcp";
    rev = version;
-    hash = "sha256-BuZn+7gTjsHTUDu33JXTrntb5LUzcq3ZsmgFg+6ivZg=";
+    hash = "sha256-MmWBcDtZUDX5IV7XXifBp7KfeRh+0qU4vdfCoMv/UNk=";
  };

  vendorHash = "sha256-lqGPPyoSO12MyeYIuYcqDVHukj7oR3zmHgsS6SxY3yo=";

  subPackages = [ "." ];

+  ldflags = [ "-s" "-w" "-X github.com/claudiodangelis/qrcp/version.version=${version}" ];
+
  nativeBuildInputs = [
    installShellFiles
  ];

-  postInstall = ''
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
    installShellCompletion --cmd qrcp \
      --bash <($out/bin/qrcp completion bash) \
      --fish <($out/bin/qrcp completion fish) \
      --zsh <($out/bin/qrcp completion zsh)
  '';

-  meta = with lib; {
-    homepage = "https://claudiodangelis.com/qrcp/";
+  meta = {
+    homepage = "https://qrcp.sh/";
    description = "Transfer files over wifi by scanning a QR code from your terminal";
    longDescription = ''
      qrcp binds a web server to the address of your Wi-Fi network
@ -39,8 +42,8 @@ buildGoModule rec {
      handler serves the content and exits the program when the transfer is
      complete.
    '';
-    license = licenses.mit;
-    maintainers = with maintainers; [ fgaz ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fgaz ];
    mainProgram = "qrcp";
  };
 }
--- a/pkgs/by-name/ra/radicle-node/package.nix
+++ b/pkgs/by-name/ra/radicle-node/package.nix
@ -18,15 +18,15 @@
 , xdg-utils
 }: rustPlatform.buildRustPackage rec {
  pname = "radicle-node";
-  version = "1.0.0-rc.14";
+  version = "1.0.0-rc.17";
  env.RADICLE_VERSION = version;

  src = fetchgit {
    url = "https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git";
    rev = "refs/namespaces/z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT/refs/tags/v${version}";
-    hash = "sha256-vqLDutaLeRuqRu8R9+0x2sDKxBrDeJ1RgKAiedkTvAw=";
+    hash = "sha256-sb0GroWfZWC9YCGby88eiPnhFCdDA9EUhVpoyuAA+Mk=";
  };
-  cargoHash = "sha256-Qipt1IstoFGo1qQn/ZSwm3d1jrqj4mwIJep/A+/21WY=";
+  cargoHash = "sha256-5xqoWW3pPU/vQs1ewPb24/fv/oKBF+ZZzbsYhC7LopM=";

  nativeBuildInputs = [ asciidoctor installShellFiles makeWrapper ];
  nativeCheckInputs = [ git ];
--- a/pkgs/by-name/ws/wstunnel/package.nix
+++ b/pkgs/by-name/ws/wstunnel/package.nix
@ -8,7 +8,7 @@
 }:

 let
-  version = "10.1.0";
+  version = "10.1.1";
 in

 rustPlatform.buildRustPackage {
@ -19,10 +19,10 @@ rustPlatform.buildRustPackage {
    owner = "erebe";
    repo = "wstunnel";
    rev = "v${version}";
-    hash = "sha256-nOks9OMA0z7e1nYnKxkSmEj5GXP00385E+jr67lzS5c=";
+    hash = "sha256-qEWIyQkLRrmTH40S96hj8JXFz/VJChIbg8qEQc938nI=";
  };

-  cargoHash = "sha256-QJ5Fb1M5CLDd2bZPy2p9zqh2A9KIoHp7PA1fxX2RDjI=";
+  cargoHash = "sha256-3b+pX/qQuhOY1OYr+CfT5wtiJcEJ8CJJsQZ4QOcYv74=";

  nativeBuildInputs = [ versionCheckHook ];

--- a/pkgs/data/themes/alacritty-theme/default.nix
+++ b/pkgs/data/themes/alacritty-theme/default.nix
@ -6,13 +6,13 @@

 stdenvNoCC.mkDerivation (self: {
  pname = "alacritty-theme";
-  version = "0-unstable-2024-07-31";
+  version = "0-unstable-2024-09-03";

  src = fetchFromGitHub {
    owner = "alacritty";
    repo = "alacritty-theme";
-    rev = "4091fddff8da892d5594e94116927c7445620867";
-    hash = "sha256-1tt4GL3KNa3S4dEFiRZf4B1+CM6e7/gO3Q34847lYkI=";
+    rev = "e759dafb8e2e00abb428592979ce006da7fba4a7";
+    hash = "sha256-cZ+ziE+VbQFpJ+iDS7X9Q2YC1Ziu+JITzDmX79BCcRY=";
  };

  dontConfigure = true;
--- a/pkgs/development/compilers/go/binary.nix
+++ b/pkgs/development/compilers/go/binary.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchurl, version, hashes }:
+{ lib, stdenv, fetchurl, version, hashes }:
 let
  toGoKernel = platform:
    if platform.isDarwin then "darwin"
@ -18,7 +18,7 @@ let

  platform = toGoPlatform stdenv.hostPlatform;
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  name = "go-${version}-${platform}-bootstrap";

  src = fetchurl {
@ -36,4 +36,14 @@ stdenv.mkDerivation rec {
    ln -s $out/share/go/bin/go $out/bin/go
    runHook postInstall
  '';
+
+  meta = {
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    changelog = "https://go.dev/doc/devel/release#go${lib.versions.majorMinor version}";
+    description = "The Go Programming language";
+    homepage = "https://go.dev/";
+    license = lib.licenses.bsd3;
+    maintainers = lib.teams.golang.members;
+    platforms = lib.platforms.darwin ++ lib.platforms.linux;
+  };
 }
--- a/pkgs/development/libraries/botan/2.0.nix
+++ b/pkgs/development/libraries/botan/2.0.nix
@ -1,7 +0,0 @@
-{ callPackage, ... } @ args:
-
-callPackage ./generic.nix (args // {
-  baseVersion = "2.19";
-  revision = "5";
-  hash = "sha256-3+6g4KbybWckxK8B2pp7iEh62y2Bunxy/K9S21IsmtQ=";
-})
--- a/pkgs/development/libraries/botan/3.0.nix
+++ b/pkgs/development/libraries/botan/3.0.nix
@ -1,9 +0,0 @@
-{ callPackage, stdenv, lib, ... } @ args:
-
-callPackage ./generic.nix (args // {
-  baseVersion = "3.5";
-  revision = "0";
-  hash = "sha256-Z+ja4cokaNkN5OYByH1fMf9JKzjoq4vL0C3fcQTtip8=";
-  # this patch fixes build errors on MacOS with SDK 10.12, recheck to remove this again
-  extraPatches = lib.optionals stdenv.hostPlatform.isDarwin [ ./botan3-macos.patch ];
-})
--- a/pkgs/development/libraries/botan/default.nix
+++ b/pkgs/development/libraries/botan/default.nix
@ -0,0 +1,130 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  python3,
+  docutils,
+  bzip2,
+  zlib,
+  darwin,
+  static ? stdenv.hostPlatform.isStatic, # generates static libraries *only*
+}:
+
+let
+  common =
+    {
+      version,
+      hash,
+      patches ? [ ],
+    }:
+    stdenv.mkDerivation (finalAttrs: {
+      pname = "botan";
+      inherit version;
+
+      __structuredAttrs = true;
+      enableParallelBuilding = true;
+      strictDeps = true;
+
+      outputs = [
+        "bin"
+        "out"
+        "dev"
+        "doc"
+        "man"
+      ];
+
+      src = fetchurl {
+        url = "http://botan.randombit.net/releases/Botan-${finalAttrs.version}.tar.xz";
+        inherit hash;
+      };
+
+      inherit patches;
+
+      nativeBuildInputs = [
+        python3
+        docutils
+      ];
+
+      buildInputs =
+        [
+          bzip2
+          zlib
+        ]
+        ++ lib.optionals stdenv.isDarwin (
+          with darwin.apple_sdk.frameworks;
+          [
+            CoreServices
+            Security
+          ]
+        );
+
+      buildTargets =
+        [ "cli" ]
+        ++ lib.optionals finalAttrs.doCheck [ "tests" ]
+        ++ lib.optionals static [ "static" ]
+        ++ lib.optionals (!static) [ "shared" ];
+
+      botanConfigureFlags =
+        [
+          "--prefix=${placeholder "out"}"
+          "--bindir=${placeholder "bin"}/bin"
+          "--docdir=${placeholder "doc"}/share/doc"
+          "--mandir=${placeholder "man"}/share/man"
+          "--no-install-python-module"
+          "--build-targets=${lib.concatStringsSep "," finalAttrs.buildTargets}"
+          "--with-bzip2"
+          "--with-zlib"
+          "--with-rst2man"
+        ]
+        ++ lib.optionals stdenv.cc.isClang [
+          "--cc=clang"
+        ]
+        ++ lib.optionals stdenv.hostPlatform.isAarch64 [
+          "--cpu=aarch64"
+        ];
+
+      configurePhase = ''
+        runHook preConfigure
+        python configure.py ''${botanConfigureFlags[@]}
+        runHook postConfigure
+      '';
+
+      preInstall = ''
+        if [ -d src/scripts ]; then
+          patchShebangs src/scripts
+        fi
+      '';
+
+      postInstall = ''
+        cd "$out"/lib/pkgconfig
+        ln -s botan-*.pc botan.pc || true
+      '';
+
+      doCheck = true;
+
+      meta = with lib; {
+        description = "Cryptographic algorithms library";
+        homepage = "https://botan.randombit.net";
+        mainProgram = "botan";
+        maintainers = with maintainers; [
+          raskin
+          thillux
+        ];
+        platforms = platforms.unix;
+        license = licenses.bsd2;
+      };
+    });
+in
+{
+  botan3 = common {
+    version = "3.5.0";
+    hash = "sha256-Z+ja4cokaNkN5OYByH1fMf9JKzjoq4vL0C3fcQTtip8=";
+    # this patch fixes build errors on MacOS with SDK 10.12, recheck to remove this again
+    patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./botan3-macos.patch ];
+  };
+
+  botan2 = common {
+    version = "2.19.5";
+    hash = "sha256-3+6g4KbybWckxK8B2pp7iEh62y2Bunxy/K9S21IsmtQ=";
+  };
+}
--- a/pkgs/development/libraries/botan/generic.nix
+++ b/pkgs/development/libraries/botan/generic.nix
@ -1,83 +0,0 @@
-{ lib, stdenv, fetchurl, python3, bzip2, zlib, gmp, boost
-# Passed by version specific builders
-, baseVersion, revision, hash
-, sourceExtension ? "tar.xz"
-, extraConfigureFlags ? ""
-, extraPatches ? [ ]
-, badPlatforms ? [ ]
-, postPatch ? null
-, knownVulnerabilities ? [ ]
-, CoreServices ? null
-, Security ? null
-, static ? stdenv.hostPlatform.isStatic # generates static libraries *only*
-, ...
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "botan";
-  version = "${baseVersion}.${revision}";
-
-  __structuredAttrs = true;
-
-  outputs = [ "out" "dev" ];
-
-  src = fetchurl {
-    name = "Botan-${finalAttrs.version}.${sourceExtension}";
-    urls = [
-       "http://files.randombit.net/botan/v${baseVersion}/Botan-${finalAttrs.version}.${sourceExtension}"
-       "http://botan.randombit.net/releases/Botan-${finalAttrs.version}.${sourceExtension}"
-    ];
-    inherit hash;
-  };
-  patches = extraPatches;
-  inherit postPatch;
-
-  nativeBuildInputs = [ python3 ];
-  buildInputs = [ bzip2 zlib gmp boost ]
-    ++ lib.optionals stdenv.isDarwin [ CoreServices Security ];
-
-  botanConfigureFlags = [
-    "--prefix=${placeholder "out"}"
-    "--with-bzip2"
-    "--with-zlib"
-  ] ++ lib.optionals stdenv.cc.isClang [
-    "--cc=clang"
-  ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [
-    "--cpu=aarch64"
-  ] ++ lib.optionals static [
-    "--enable-static-library"
-    "--disable-shared-library"
-  ];
-
-  configurePhase = ''
-    runHook preConfigure
-    python configure.py ''${botanConfigureFlags[@]} ${extraConfigureFlags}
-    runHook postConfigure
-  '';
-
-  enableParallelBuilding = true;
-
-  preInstall = ''
-    if [ -d src/scripts ]; then
-      patchShebangs src/scripts
-    fi
-  '';
-
-  postInstall = ''
-    cd "$out"/lib/pkgconfig
-    ln -s botan-*.pc botan.pc || true
-  '';
-
-  doCheck = true;
-
-  meta = with lib; {
-    description = "Cryptographic algorithms library";
-    mainProgram = "botan";
-    maintainers = with maintainers; [ raskin thillux ];
-    platforms = platforms.unix;
-    license = licenses.bsd2;
-    inherit badPlatforms;
-    inherit knownVulnerabilities;
-  };
-  passthru.updateInfo.downloadPage = "http://files.randombit.net/botan/";
-})
--- a/pkgs/development/libraries/libplctag/default.nix
+++ b/pkgs/development/libraries/libplctag/default.nix
@ -6,13 +6,13 @@

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

  src = fetchFromGitHub {
    owner = "libplctag";
    repo = "libplctag";
    rev = "v${version}";
-    sha256 = "sha256-V0YTW7+YbyW6Fh9b1IntIxCXabPUJj7QoDvYYyc/Y6k=";
+    sha256 = "sha256-HUog7Tlm4jiqYXk22dziumCA/68c35+OwnTNYu9mV5E=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/development/python-modules/aioesphomeapi/default.nix
+++ b/pkgs/development/python-modules/aioesphomeapi/default.nix
@ -26,7 +26,7 @@

 buildPythonPackage rec {
  pname = "aioesphomeapi";
-  version = "25.3.1";
+  version = "25.3.2";
  pyproject = true;

  disabled = pythonOlder "3.9";
@ -35,7 +35,7 @@ buildPythonPackage rec {
    owner = "esphome";
    repo = "aioesphomeapi";
    rev = "refs/tags/v${version}";
-    hash = "sha256-3srw745rEDS8G4270kHPGjOr4Tnbrt5EMO/B/cb03Vs=";
+    hash = "sha256-ITNXPwQTKOyH0TXYr8v/VI5rPNCvKGb/zIE1q+Ja8j0=";
  };

  build-system = [
--- a/pkgs/development/python-modules/clarifai/default.nix
+++ b/pkgs/development/python-modules/clarifai/default.nix
@ -20,7 +20,7 @@

 buildPythonPackage rec {
  pname = "clarifai";
-  version = "10.7.0";
+  version = "10.8.0";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -29,7 +29,7 @@ buildPythonPackage rec {
    owner = "Clarifai";
    repo = "clarifai-python";
    rev = "refs/tags/${version}";
-    hash = "sha256-a/twKAwlvn017fqUsDBOcDxoZ63W0p6whQf53wlXFRU=";
+    hash = "sha256-dRhFZACfdMW0cIBDVUOSGDl5fai0gFXDPyfDil+itwQ=";
  };

  pythonRelaxDeps = [
--- a/pkgs/development/python-modules/google-cloud-dlp/default.nix
+++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix
@ -15,19 +15,20 @@

 buildPythonPackage rec {
  pname = "google-cloud-dlp";
-  version = "3.18.1";
+  version = "3.22.0";
  pyproject = true;

  disabled = pythonOlder "3.7";

  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-KYqhwSa9Z+1s41Ve+GGbnR0BfSZE5UwAqgmqEWfxOC0=";
+    pname = "google_cloud_dlp";
+    inherit version;
+    hash = "sha256-SabiX00pD91acxz83PdkDnPynLp5L9MAqKGY/IIUDAU=";
  };

-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];

-  propagatedBuildInputs = [
+  dependencies = [
    google-api-core
    proto-plus
    protobuf
@ -41,7 +42,7 @@ buildPythonPackage rec {
  ];

  disabledTests = [
-    # Test requires credentials
+    # Tests require credentials
    "test_inspect_content"
    "test_list_dlp_jobs"
  ];
--- a/pkgs/development/python-modules/google-cloud-translate/default.nix
+++ b/pkgs/development/python-modules/google-cloud-translate/default.nix
@ -5,6 +5,7 @@
  google-api-core,
  google-cloud-core,
  google-cloud-testutils,
+  grpc-google-iam-v1,
  mock,
  proto-plus,
  protobuf,
@ -16,21 +17,23 @@

 buildPythonPackage rec {
  pname = "google-cloud-translate";
-  version = "3.15.4";
+  version = "3.16.0";
  pyproject = true;

  disabled = pythonOlder "3.7";

  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-nZ3YzyJe+fsGdahvkuecrDKVoo0JpEeeEj7wy+VHSWs=";
+    pname = "google_cloud_translate";
+    inherit version;
+    hash = "sha256-B5fZVMT26gcyKelQASugg6TMl1K0MdwGJOJZTih0ae8=";
  };

-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];

-  propagatedBuildInputs = [
+  dependencies = [
    google-api-core
    google-cloud-core
+    grpc-google-iam-v1
    proto-plus
    protobuf
  ] ++ google-api-core.optional-dependencies.grpc;
--- a/pkgs/development/python-modules/google-cloud-vision/default.nix
+++ b/pkgs/development/python-modules/google-cloud-vision/default.nix
@ -14,19 +14,20 @@

 buildPythonPackage rec {
  pname = "google-cloud-vision";
-  version = "3.7.3";
+  version = "3.7.4";
  pyproject = true;

  disabled = pythonOlder "3.7";

  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-7kjEjoIMfgmTJmOYaXD+9FbcD0XHr3KdRvHz3ZfB37Y=";
+    pname = "google_cloud_vision";
+    inherit version;
+    hash = "sha256-gLZ/Ci3Fh6MddILT0mkqdz8l+9CUaP2d5F0AtnGq2Zk=";
  };

-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];

-  propagatedBuildInputs = [
+  dependencies = [
    google-api-core
    proto-plus
    protobuf
--- a/pkgs/development/python-modules/pycontrol4/default.nix
+++ b/pkgs/development/python-modules/pycontrol4/default.nix
@ -12,7 +12,7 @@

 buildPythonPackage rec {
  pname = "pycontrol4";
-  version = "1.2.0";
+  version = "1.2.1";

  disabled = pythonOlder "3.6";

@ -22,7 +22,7 @@ buildPythonPackage rec {
    owner = "lawtancool";
    repo = "pyControl4";
    rev = "refs/tags/v${version}";
-    hash = "sha256-1gZebYseuEBI0dlXlD72f/uozNuoxHPqVsc8AWJV148=";
+    hash = "sha256-0ZuztqHbrd+kMDGv3xyUYoTF/Ho+oHkycjSrKz8JABM=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/python-troveclient/default.nix
+++ b/pkgs/development/python-modules/python-troveclient/default.nix
@ -0,0 +1,87 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  httplib2,
+  keystoneauth1,
+  openstackdocstheme,
+  osc-lib,
+  oslo-i18n,
+  oslo-utils,
+  pbr,
+  prettytable,
+  python-mistralclient,
+  python-openstackclient,
+  python-swiftclient,
+  pythonOlder,
+  requests-mock,
+  requests,
+  setuptools,
+  sphinxcontrib-apidoc,
+  sphinxHook,
+  stestr,
+}:
+
+buildPythonPackage rec {
+  pname = "python-troveclient";
+  version = "8.5.0";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "openstack";
+    repo = "python-troveclient";
+    rev = "refs/tags/${version}";
+    hash = "sha256-lfnAmQ/IxEdc+XxC0dYxK2FgY7csNewGPuQuq0dNffM=";
+  };
+
+  env.PBR_VERSION = version;
+
+  nativeBuildInputs = [
+    openstackdocstheme
+    sphinxHook
+    sphinxcontrib-apidoc
+  ];
+
+  sphinxBuilders = [ "man" ];
+
+  build-system = [
+    pbr
+    setuptools
+  ];
+
+  dependencies = [
+    keystoneauth1
+    osc-lib
+    oslo-i18n
+    oslo-utils
+    prettytable
+    python-mistralclient
+    python-openstackclient
+    python-swiftclient
+    requests
+  ];
+
+  nativeCheckInputs = [
+    httplib2
+    requests-mock
+    stestr
+  ];
+
+  checkPhase = ''
+    runHook preCheck
+    stestr run
+    runHook postCheck
+  '';
+
+  pythonImportsCheck = [ "troveclient" ];
+
+  meta = {
+    homepage = "https://github.com/openstack/python-troveclient";
+    description = "Client library for OpenStack Trove API";
+    license = lib.licenses.asl20;
+    mainProgram = "trove";
+    maintainers = lib.teams.openstack.members;
+  };
+}
--- a/pkgs/development/python-modules/solarlog-cli/default.nix
+++ b/pkgs/development/python-modules/solarlog-cli/default.nix
@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "solarlog-cli";
-  version = "0.2.0";
+  version = "0.2.2";
  pyproject = true;

  disabled = pythonOlder "3.12";
@ -23,7 +23,7 @@ buildPythonPackage rec {
    owner = "dontinelli";
    repo = "solarlog_cli";
    rev = "refs/tags/v${version}";
-    hash = "sha256-x9MovIKFImu60Ns2sJTy71S22cR9Az/yNMWzGM50y7Y=";
+    hash = "sha256-RibfHggpuJAtvENOToSp7eFuvfkTRHdSq0Eg9kk05vc=";
  };

  build-system = [ hatchling ];
--- a/pkgs/development/tools/ctlptl/default.nix
+++ b/pkgs/development/tools/ctlptl/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "ctlptl";
-  version = "0.8.32";
+  version = "0.8.33";

  src = fetchFromGitHub {
    owner = "tilt-dev";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-ydwPnR5tazLeeHqsIMyZKeO0vvxtCSa5ulCw2/Hv8TA=";
+    hash = "sha256-S3OK9qPnI8E1v5h9Tzx9cOZJVwPpYL4qs9JN0Uj6jzQ=";
  };

-  vendorHash = "sha256-BjZYHLwXyagm9JJv+f83RkrpLBTIZvXGUXZhSxhhlfc=";
+  vendorHash = "sha256-EYe1hjxlaqVbie4yOsnlzWxQDyxmj8+cbhCUdR9ObeQ=";

  nativeBuildInputs = [ installShellFiles ];

--- a/pkgs/development/tools/pscale/default.nix
+++ b/pkgs/development/tools/pscale/default.nix
@ -8,13 +8,13 @@

 buildGoModule rec {
  pname = "pscale";
-  version = "0.208.0";
+  version = "0.209.0";

  src = fetchFromGitHub {
    owner = "planetscale";
    repo = "cli";
    rev = "v${version}";
-    sha256 = "sha256-q7rVTazlUmCOCv6W92uAg9/Jgkdxnl2eSxU3NSBsFZQ=";
+    sha256 = "sha256-XbGxFpkAVPhOShZWE6W/Z26NSOumB+1oh/o0zVVswL8=";
  };

  vendorHash = "sha256-5Uul5c8Lwu6SJ7DlLU8+k2Pxa3V/DhqdvK5xY2g6S40=";
--- a/pkgs/development/tools/sqldef/default.nix
+++ b/pkgs/development/tools/sqldef/default.nix
@ -2,18 +2,18 @@

 buildGoModule rec {
  pname = "sqldef";
-  version = "0.17.17";
+  version = "0.17.18";

  src = fetchFromGitHub {
    owner = "k0kubun";
    repo = "sqldef";
    rev = "v${version}";
-    hash = "sha256-J3qFafiMVjnJUa9bsYOxBqe3Hrsc/XDUI4p/GGO9Kmg=";
+    hash = "sha256-mFQ8E56qlS6UDaXZFsWQBy71Q8DOIMo1Qcmyg1vde5M=";
  };

  proxyVendor = true;

-  vendorHash = "sha256-cMRzDqsnQwZTSjroaXOgN4uOFCxVb2x7FT57VfN9qhk=";
+  vendorHash = "sha256-Bvo+1o4eTJi9zjF/NQ6zBfoAFFlq4egi2nRE8BtaOfM=";

  ldflags = [ "-s" "-w" "-X main.version=${version}" ];

--- a/pkgs/development/tools/viceroy/default.nix
+++ b/pkgs/development/tools/viceroy/default.nix
@ -2,18 +2,18 @@

 rustPlatform.buildRustPackage rec {
  pname = "viceroy";
-  version = "0.11.0";
+  version = "0.12.0";

  src = fetchFromGitHub {
    owner = "fastly";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-8Vfi/lHkaUvp6szSrqHaewXUWZ9Rb0oQdc8tuBFlvLI=";
+    hash = "sha256-0jED0Ju7ojqDxfEjZKmWuCfGR830/gJF5p+QtcVajIY=";
  };

  buildInputs = lib.optional stdenv.isDarwin Security;

-  cargoHash = "sha256-3HhNFcNo/TNnAOLARtVnN/Moh2/8cdW7cn7MTahR18g=";
+  cargoHash = "sha256-rSZe/MrJlbB0oaAsKg38mEnS3pqe9Rk4/aoRuLlOUFc=";

  cargoTestFlags = [
    "--package viceroy-lib"
--- a/pkgs/os-specific/darwin/raycast/default.nix
+++ b/pkgs/os-specific/darwin/raycast/default.nix
@ -11,12 +11,12 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "raycast";
-  version = "1.81.2";
+  version = "1.82.0";

  src = fetchurl {
    name = "Raycast.dmg";
    url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal";
-    hash = "sha256-Yz4H71doc5QC+AX5iSmOwewuKjU9dnK5ijVzYoOedYc=";
+    hash = "sha256-+USKcwmjapDH+zet7lHSWS6vT1GZ0ch+yPBRD2BrLS0=";
  };

  dontPatch = true;
--- a/pkgs/servers/monitoring/net-snmp/default.nix
+++ b/pkgs/servers/monitoring/net-snmp/default.nix
@ -1,6 +1,8 @@
 { lib, stdenv, fetchurl
 , file, openssl, perl, nettools
-, withPerlTools ? false }: let
+, autoreconfHook
+, withPerlTools ? false
+, darwin }: let

  perlWithPkgs = perl.withPackages (ps: with ps; [
    JSON
@ -52,9 +54,15 @@ in stdenv.mkDerivation rec {
      -e "/NETSNMP_CONFIGURE_OPTIONS/ s|$NIX_STORE/[a-z0-9]\{32\}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g"
  '';

-  nativeBuildInputs = [ nettools file ];
+  nativeBuildInputs = [ nettools file autoreconfHook ];
  buildInputs = [ openssl ]
-    ++ lib.optional withPerlTools perlWithPkgs;
+    ++ lib.optional withPerlTools perlWithPkgs
+    ++ lib.optionals stdenv.isDarwin [
+      darwin.apple_sdk.frameworks.ApplicationServices
+      darwin.apple_sdk.frameworks.CoreServices
+      darwin.apple_sdk.frameworks.IOKit
+      darwin.apple_sdk.frameworks.DiskArbitration
+    ];

  enableParallelBuilding = true;
  # Missing dependencies during relinking:
@ -74,6 +82,6 @@ in stdenv.mkDerivation rec {
    description = "Clients and server for the SNMP network monitoring protocol";
    homepage = "http://www.net-snmp.org/";
    license = licenses.bsd3;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
  };
 }
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@ -5,14 +5,14 @@
 , git, nix, nixfmt-classic, jq, coreutils, gnused, curl, cacert, bash }:

 stdenv.mkDerivation rec {
-  version = "2024-08-27";
+  version = "2024-09-01";
  pname = "oh-my-zsh";

  src = fetchFromGitHub {
    owner = "ohmyzsh";
    repo = "ohmyzsh";
-    rev = "efe21261d031b4836f64112a899706322acd26b0";
-    sha256 = "sha256-ICHdwxySSzX64q+mfPKOQqOrLrc/RKiyvPioseNt4hE=";
+    rev = "b8c69d265257fae88fe504ea43cbcf2728bc1308";
+    sha256 = "sha256-Q0SjYWkWY5/haoPunp5yusYoXIXzmB2tces/9gOZgJM=";
  };

  strictDeps = true;
--- a/pkgs/shells/zsh/zsh-autocomplete/default.nix
+++ b/pkgs/shells/zsh/zsh-autocomplete/default.nix
@ -2,13 +2,13 @@

 stdenvNoCC.mkDerivation rec {
  pname = "zsh-autocomplete";
-  version = "23.07.13";
+  version = "24.09.04";

  src = fetchFromGitHub {
    owner = "marlonrichert";
    repo = "zsh-autocomplete";
    rev = version;
-    sha256 = "sha256-0NW0TI//qFpUA2Hdx6NaYdQIIUpRSd0Y4NhwBbdssCs=";
+    sha256 = "sha256-o8IQszQ4/PLX1FlUvJpowR2Tev59N8lI20VymZ+Hp4w=";
  };

  strictDeps = true;
--- a/pkgs/tools/networking/speedtest-go/default.nix
+++ b/pkgs/tools/networking/speedtest-go/default.nix
@ -5,13 +5,13 @@
 }:
 buildGoModule rec {
  pname = "speedtest-go";
-  version = "1.7.8";
+  version = "1.7.9";

  src = fetchFromGitHub {
    owner = "showwin";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-ggctB1zZ3YFArWhKCvXho8mVcDe0R3Br3uq2zU6sEYc=";
+    hash = "sha256-SFdUl06lCf+ObPZanEwvD2rSzPM0ia2J/XSuel5XGqg=";
  };

  vendorHash = "sha256-wQqAX7YuxxTiMWmV9LRoXunGMMzs12UyHbf4VvbQF1E=";
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -11870,8 +11870,6 @@ with pkgs;

  qprint = callPackage ../tools/text/qprint { };

-  qrcp = callPackage ../tools/networking/qrcp { };
-
  qrscan = callPackage ../tools/misc/qrscan { };

  qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { };
@ -14789,7 +14787,7 @@ with pkgs;
    ocamlPackages = ocaml-ng.ocamlPackages_4_14;
  };

-  inherit (coqPackages) compcert;
+  inherit (coqPackages_8_19) compcert;

  computecpp-unwrapped = callPackage ../development/compilers/computecpp { };
  computecpp = wrapCCWith rec {
@ -19485,13 +19483,10 @@ with pkgs;

  bosh-cli = callPackage ../applications/networking/cluster/bosh-cli { };

-  botan2 = callPackage ../development/libraries/botan/2.0.nix {
-    inherit (darwin.apple_sdk.frameworks) CoreServices Security;
-  };
-
-  botan3 = callPackage ../development/libraries/botan/3.0.nix {
-    inherit (darwin.apple_sdk.frameworks) CoreServices Security;
-  };
+  inherit (callPackages ../development/libraries/botan { })
+    botan2
+    botan3
+    ;

  box2d = callPackage ../development/libraries/box2d {
    inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel OpenGL;
@ -22948,6 +22943,7 @@ with pkgs;
  manilaclient = with python311Packages; toPythonApplication python-manilaclient;
  mistralclient = with python311Packages; toPythonApplication python-mistralclient;
  swiftclient = with python311Packages; toPythonApplication python-swiftclient;
+  troveclient = with python311Packages; toPythonApplication python-troveclient;

  openvdb = callPackage ../development/libraries/openvdb { };

@ -38870,8 +38866,6 @@ with pkgs;

  jx = callPackage ../applications/networking/cluster/jx { };

-  prow = callPackage ../applications/networking/cluster/prow { };
-
  pv-migrate = callPackage ../applications/networking/cluster/pv-migrate { };

  tagref = callPackage ../tools/misc/tagref { };
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@ -232,6 +232,6 @@ in rec {
  coqPackages_8_19 = mkCoqPackages coq_8_19;
  coqPackages_8_20 = mkCoqPackages coq_8_20;

-  coqPackages = recurseIntoAttrs coqPackages_8_19;
+  coqPackages = recurseIntoAttrs coqPackages_8_20;
  coq = coqPackages.coq;
 }
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -1487,6 +1487,8 @@ self: super: with self; {

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

+  bcc = toPythonModule (pkgs.bcc.override { python3Packages = self; });
+
  bc-detect-secrets = callPackage ../development/python-modules/bc-detect-secrets { };

  bc-jsonpath-ng = callPackage ../development/python-modules/bc-jsonpath-ng { };
@ -10264,6 +10266,8 @@ self: super: with self; {

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

+  python-troveclient = callPackage ../development/python-modules/python-troveclient { };
+
  python-idzip = callPackage ../development/python-modules/python-idzip { };

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