Merge branch 'staging-next' into staging

2026-01-12 18:03:20 -05:00
parent 446370ea5d 19e820ecf3
commit 4f3be6e36f
1095 changed files with 2330 additions and 2078 deletions
@@ -6997,13 +6997,6 @@
    githubId = 974130;
    name = "David Pätzel";
  };
-  dpausp = {
-    email = "dpausp@posteo.de";
-    github = "dpausp";
-    githubId = 1965950;
-    name = "Tobias Stenzel";
-    keys = [ { fingerprint = "4749 0887 CF3B 85A1 6355  C671 78C7 DD40 DF23 FB16"; } ];
-  };
  dpc = {
    email = "dpc@dpc.pw";
    github = "dpc";
@@ -9409,13 +9402,6 @@
    githubId = 34658064;
    name = "Grace Dinh";
  };
-  genericnerdyusername = {
-    name = "GenericNerdyUsername";
-    email = "genericnerdyusername@proton.me";
-    github = "GenericNerdyUsername";
-    githubId = 111183546;
-    keys = [ { fingerprint = "58CE D4BE 6B10 149E DA80  A990 2F48 6356 A4CB 30F3"; } ];
-  };
  genga898 = {
    email = "genga898@gmail.com";
    github = "genga898";
@@ -9847,12 +9833,6 @@
    githubId = 10908649;
    name = "Graham Bennett";
  };
-  grahamc = {
-    email = "graham@grahamc.com";
-    github = "grahamc";
-    githubId = 76716;
-    name = "Graham Christensen";
-  };
  grahamnorris = {
    email = "oss@grahamjnorris.com";
    github = "grahamnorris";
@@ -22699,12 +22679,6 @@
    githubId = 53882428;
    name = "Erik Rodriguez";
  };
-  roelvandijk = {
-    email = "roel@lambdacube.nl";
-    github = "roelvandijk";
-    githubId = 710906;
-    name = "Roel van Dijk";
-  };
  rogarb = {
    email = "rogarb@rgarbage.fr";
    github = "rogarb";
@@ -141,12 +141,6 @@ with lib.maintainers;
    enableFeatureFreezePing = true;
  };

-  clevercloud = {
-    members = [ floriansanderscc ];
-    scope = "Maintain Clever Cloud related packages.";
-    shortName = "CleverCloud";
-  };
-
  cloudposse = {
    members = [ dudymas ];
    scope = "Maintain atmos and applications made by the Cloud Posse team.";
@@ -235,16 +229,6 @@ with lib.maintainers;
    shortName = "D. E. Shaw employees";
  };

-  determinatesystems = {
-    # Verify additions to this team with at least one already existing member of the team.
-    members = [
-      cole-h
-      grahamc
-    ];
-    scope = "Group registration for packages maintained by Determinate Systems.";
-    shortName = "Determinate Systems employees";
-  };
-
  dhall = {
    members = [
      Gabriella439
@@ -318,19 +302,6 @@ with lib.maintainers;
    github = "flutter";
  };

-  flyingcircus = {
-    # Verify additions by approval of an already existing member of the team.
-    members = [
-      theuni
-      dpausp
-      frlan
-      leona
-      osnyx
-    ];
-    scope = "Team for Flying Circus employees who collectively maintain packages.";
-    shortName = "Flying Circus employees";
-  };
-
  forgejo = {
    members = [
      adamcstephens
@@ -560,16 +531,6 @@ with lib.maintainers;
    enableFeatureFreezePing = true;
  };

-  lumiguide = {
-    # Verify additions by approval of an already existing member of the team.
-    members = [
-      roelvandijk
-      lucus16
-    ];
-    scope = "Group registration for LumiGuide employees who collectively maintain packages.";
-    shortName = "Lumiguide employees";
-  };
-
  lumina = {
    github = "lumina";
    enableFeatureFreezePing = true;
@@ -5,7 +5,6 @@
  ...
 }:
 {
-  meta.maintainers = with lib.maintainers; [ grahamc ];
  options = {

    hardware.mcelog = {
@@ -177,8 +177,4 @@ in
      };
    };
  };
-
-  meta = {
-    maintainers = with lib.maintainers; [ roelvandijk ];
-  };
 }
@@ -102,5 +102,8 @@ in
    ) instances;
  };

-  meta.maintainers = lib.teams.flyingcircus.members;
+  meta.maintainers = [
+    lib.maintainers.leona
+    lib.maintainers.osnyx
+  ];
 }
@@ -30,7 +30,6 @@ in
 {
  meta.maintainers = with lib.maintainers; [
    cole-h
-    grahamc
  ];

  options = {
@@ -33,8 +33,9 @@ in
 {
  meta.maintainers = [
    lib.maintainers.vcunat # upstream developer
-  ]
-  ++ lib.teams.flyingcircus.members;
+    lib.maintainers.leona
+    lib.maintainers.osnyx
+  ];

  ###### interface
  options.services.knot-resolver = {
@@ -721,12 +721,6 @@ in
      else
        listToAttrs (map (i: nameValuePair "wpa_supplicant-${i}" (mkUnit i)) cfg.interfaces);

-    # Restart wpa_supplicant after resuming from sleep
-    powerManagement.resumeCommands = concatStringsSep "\n" (
-      optional (cfg.interfaces == [ ]) "${systemctl} try-restart wpa_supplicant"
-      ++ map (i: "${systemctl} try-restart wpa_supplicant-${i}") cfg.interfaces
-    );
-
    # Restart wpa_supplicant when a wlan device appears or disappears. This is
    # only needed when an interface hasn't been specified by the user.
    services.udev.extraRules = optionalString (cfg.interfaces == [ ]) ''
@@ -14,7 +14,6 @@ in
  meta = {
    maintainers = with maintainers; [
      cole-h
-      grahamc
      raitobezarius
    ];
    doc = ./external.md;
@@ -14,7 +14,6 @@ in
  name = "gocd-agent";
  meta = with pkgs.lib.maintainers; {
    maintainers = [
-      grahamc
      swarren83
    ];

@@ -2,9 +2,6 @@
 { pkgs, ... }:
 {
  name = "hound";
-  meta = with pkgs.lib.maintainers; {
-    maintainers = [ grahamc ];
-  };
  nodes.machine =
    { pkgs, ... }:
    {
@@ -1,7 +1,10 @@
 { lib, ... }:
 {
  name = "mailpit";
-  meta.maintainers = lib.teams.flyingcircus.members;
+  meta.maintainers = [
+    lib.maintainers.leona
+    lib.maintainers.osnyx
+  ];

  nodes.machine =
    { pkgs, ... }:
@@ -46,13 +46,12 @@
      machine.wait_for_unit("phpfpm-matomo.service")
  '';

-  meta.maintainers =
-    with lib.maintainers;
-    [
-      florianjacob
-      mmilata
-      twey
-      boozedog
-    ]
-    ++ lib.teams.flyingcircus.members;
+  meta.maintainers = with lib.maintainers; [
+    florianjacob
+    mmilata
+    twey
+    boozedog
+    leona
+    osnyx
+  ];
 }
@@ -73,7 +73,11 @@ let
    type:
    makeTest {
      name = "oci-containers-podman-rootless-${type}";
-      meta.maintainers = lib.teams.flyingcircus.members ++ [ lib.maintainers.ma27 ];
+      meta.maintainers = [
+        lib.maintainers.leona
+        lib.maintainers.ma27
+        lib.maintainers.osnyx
+      ];
      nodes = {
        podman =
          { pkgs, ... }:
@@ -11,7 +11,10 @@ let
    package:
    makeTest {
      name = "postgresql_anonymizer-${package.name}";
-      meta.maintainers = lib.teams.flyingcircus.members;
+      meta.maintainers = [
+        lib.maintainers.leona
+        lib.maintainers.osnyx
+      ];

      nodes.machine =
        { pkgs, ... }:
@@ -7,7 +7,6 @@
  name = "wireguard-generated";
  meta.maintainers = with lib.maintainers; [
    ma27
-    grahamc
  ];

  nodes = {
@@ -5,7 +5,6 @@ rec {
  meta = with lib.maintainers; {
    maintainers = [
      flokli
-      grahamc # under duress!
      mmilata
    ];
  };
@@ -53,7 +53,6 @@ in
    description = "Free Python IDE from JetBrains (built from source)";
    longDescription = "Python IDE with complete set of tools for productive development with Python programming language. In addition, the IDE provides high-class capabilities for professional Web development with Django framework and Google App Engine. It has powerful coding assistance, navigation, a lot of refactoring features, tight integration with various Version Control Systems, Unit testing, powerful all-singing all-dancing Debugger and entire customization. PyCharm is developer driven IDE. It was developed with the aim of providing you almost everything you need for your comfortable and productive development!";
    maintainers = with lib.maintainers; [
-      genericnerdyusername
      tymscar
    ];
    license = lib.licenses.asl20;
@@ -60,7 +60,6 @@ in
      It has powerful coding assistance, navigation, a lot of refactoring features, tight integration with various Version Control Systems, Unit testing and powerful Debugger.
    '';
    maintainers = with lib.maintainers; [
-      genericnerdyusername
      tymscar
    ];
    license = lib.licenses.asl20;
@@ -60,7 +60,6 @@ in
      It has powerful coding assistance, navigation, a lot of refactoring features, tight integration with various Version Control Systems, Unit testing and powerful Debugger.
    '';
    maintainers = with lib.maintainers; [
-      genericnerdyusername
      tymscar
    ];
    license = lib.licenses.unfree;
@@ -68,7 +68,7 @@ in
    homepage = "https://www.jetbrains.com/rust/";
    description = "Rust IDE from JetBrains";
    longDescription = "Rust IDE from JetBrains";
-    maintainers = with lib.maintainers; [ genericnerdyusername ];
+    maintainers = [ ];
    license = lib.licenses.unfree;
    sourceProvenance =
      if stdenv.hostPlatform.isDarwin then
@@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec {
  pname = "manuskript";
  version = "0.17.0";

-  format = "other";
+  pyproject = false;

  src = fetchFromGitHub {
    repo = "manuskript";
@@ -2611,8 +2611,8 @@ let
        mktplcRef = {
          name = "language-julia";
          publisher = "julialang";
-          version = "1.170.2";
-          hash = "sha256-1Qu7d3Acrb/+uvAQMID3daH7UJcxt/Lr4yG0sVSlsYU=";
+          version = "1.171.2";
+          hash = "sha256-XELIrqcyd6DEpJjbSlE17noiYa8CZvDwnodA1QALewM=";
        };
        meta = {
          changelog = "https://marketplace.visualstudio.com/items/julialang.language-julia/changelog";
@@ -3015,8 +3015,8 @@ let
        mktplcRef = {
          publisher = "mesonbuild";
          name = "mesonbuild";
-          version = "1.28.0";
-          hash = "sha256-mvW0u0Tpc1JqoFJYyRirdcLDCHfm72XvTs8sFvvw490=";
+          version = "1.28.1";
+          hash = "sha256-Cu2sBg8wTjGLOMF4bCOG8noXZXZB2j5wSXZS2VxxNoA=";
        };
        meta = {
          changelog = "https://marketplace.visualstudio.com/items/mesonbuild.mesonbuild/changelog";
@@ -3411,8 +3411,8 @@ let
        mktplcRef = {
          name = "remote-containers";
          publisher = "ms-vscode-remote";
-          version = "0.434.0";
-          hash = "sha256-XhD/5+YcYPD1b2lMsTfIVIU8wbCWrgP+2dgrt7mDV/I=";
+          version = "0.437.0";
+          hash = "sha256-shEBOvwJokLOXIr4oEsSsvsxQ2WAThjlLJ4dCSfONgI=";
        };
        meta = {
          description = "Open any folder or repository inside a Docker container";
@@ -5212,8 +5212,8 @@ let
        mktplcRef = {
          name = "csharp-ls";
          publisher = "vytautassurvila";
-          version = "0.0.28";
-          hash = "sha256-gbYaZWPMmfCltPSr30aLglWMiYaRHZuDWp6CIW6caMI=";
+          version = "0.0.29";
+          hash = "sha256-0gh7q/F69OD/soRuZHHxC9PRtOXJmjZjei6IbV82Rgs=";
        };
        meta = {
          changelog = "https://github.com/vytautassurvila/vscode-csharp-ls/blob/master/CHANGELOG.md";
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
  mktplcRef = {
    publisher = "ms-pyright";
    name = "pyright";
-    version = "1.1.407";
-    hash = "sha256-x236ExuITXKqDoRgjDhnq9WnBbI1DvIIW/PXEYx2oVA=";
+    version = "1.1.408";
+    hash = "sha256-IxfqzPBKqslpKaEP2eD+DS0BdSUDfo2w4u1FK0Uzvwo=";
  };

  meta = {
@@ -18,7 +18,7 @@ buildPythonApplication rec {

  propagatedBuildInputs = [ pybluez ];

-  format = "other";
+  pyproject = false;

  installPhase = ''
    mkdir -p $out/bin
@@ -10,7 +10,7 @@
 buildPythonApplication {
  pname = "cambrinary";
  version = "unstable-2023-07-16";
-  format = "pyproject";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "xueyuanl";
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
  pname = "dupeguru";
  version = "4.3.1";

-  format = "other";
+  pyproject = false;

  src = fetchFromGitHub {
    owner = "arsenetar";
@@ -19,7 +19,7 @@
 python3Packages.buildPythonApplication rec {
  pname = "polychromatic";
  version = "0.9.3";
-  format = "other";
+  pyproject = false;

  src = fetchFromGitHub {
    owner = "polychromatic";
@@ -100,7 +100,7 @@ in

      pname = "sway-${lname}";

-      format = "other";
+      pyproject = false;
      dontBuild = true;
      dontConfigure = true;

@@ -9,11 +9,11 @@

 buildMozillaMach rec {
  pname = "firefox";
-  version = "140.6.0esr";
+  version = "140.7.0esr";
  applicationName = "Firefox ESR";
  src = fetchurl {
    url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "ed66657bd4b2d94791892261d7c0c0d950b4f630d12ab28a777d93393427451a9aa125e5a01ee15f2ac0ff378d0be074a08583dcffd35609112ba4e6f9ada798";
+    sha512 = "7781b1e203130c1cdf2a0c2ecb05a9cfa824c75d467e7faca78b66bd5568c821324112aecb774883d9f447af7fa4ade36488ff1017255af5510c8f641990e472";
  };

  meta = {
@@ -9,10 +9,10 @@

 buildMozillaMach rec {
  pname = "firefox";
-  version = "146.0.1";
+  version = "147.0";
  src = fetchurl {
    url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "ae95b86e483febf8dfec8347748dd9048ed7d7f845250e07aa8048e2b351da61f6f3c5f83bb0d0c72e1a75ec61b60e59bbe69639f0f33532910ff8bf5ca07394";
+    sha512 = "ac9017b1a2da7b2f139392c394c36341fd3476e3d4ea1a3c7e5e7bf100dc30d185132ef9256be7e6b0f9dbfc69234ac571ea1fc6db9d84543b15772f4ec85161";
  };

  meta = {
@@ -959,13 +959,13 @@
    "vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0="
  },
  "newrelic_newrelic": {
-    "hash": "sha256-60TKPphUfqGJ6FJHEJl7ZSz7FUahDZElSSeHfeDeIOw=",
+    "hash": "sha256-P0lxCwEBhkShLE3xJX7V1wxI+xjpgjepuTWYiXbRYBE=",
    "homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
    "owner": "newrelic",
    "repo": "terraform-provider-newrelic",
-    "rev": "v3.76.6",
+    "rev": "v3.76.7",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-XkwWyL+1fC5NYiNagCNK15E+QjKU7y2HHbx3feTKxAY="
+    "vendorHash": "sha256-xTlalKIWvU2MDBvwNjl3cWFVH26EyDthwrnXVmbK+rc="
  },
  "ns1-terraform_ns1": {
    "hash": "sha256-vSq6502jHjEQEgKmgMpUrid88jhsENOVF+3MA6Zm8lg=",
@@ -1031,13 +1031,13 @@
    "vendorHash": "sha256-ofzbDmivXgH1i1Gjhpyp0bk3FDs5SnxwoRuNAWyMqyI="
  },
  "opentelekomcloud_opentelekomcloud": {
-    "hash": "sha256-X57BUi6LN01+zJPFwZyDXwDRuIMLKEC+QH0WjYP1dRA=",
+    "hash": "sha256-68JyLHSHyse7znn7egPLMz4DeyHaWAGfa0TLCHQJd4k=",
    "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",
    "owner": "opentelekomcloud",
    "repo": "terraform-provider-opentelekomcloud",
-    "rev": "v1.36.55",
+    "rev": "v1.36.56",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-P2d+naXmiTmX3dahOegW+24UVKePi8lauTpEpugVTGk="
+    "vendorHash": "sha256-ESu1guITtquRqdGI3KdMhOf24gjtii45i5TkVrqJ18U="
  },
  "opsgenie_opsgenie": {
    "hash": "sha256-Y67kcg/ovvZc22l1CBz0Mqu7DAIit5F0jQNfQrl2EGI=",
@@ -53,7 +53,7 @@ python3.pkgs.buildPythonApplication rec {
    hash = "sha256-Mvi69FI2zRefcCnLsurdVNMxYaqKsUCKgeFxOh6vg/o=";
  };

-  format = "pyproject";
+  pyproject = true;

  buildInputs = [
    gtk4
@@ -27,7 +27,7 @@ buildPythonApplication rec {
    hash = "sha256-eNgnjErPi5q9yA/2iEg3+CoN2xbopmFOpbgU/7GhoAQ=";
  };

-  format = "pyproject";
+  pyproject = true;

  postPatch = ''
    # Dependencies already bundled with Python
@@ -70,7 +70,7 @@ buildPythonPackage {
  dontBuild = true;
  doCheck = false;

-  format = "other";
+  pyproject = false;

  installPhase = ''
    mkdir -p $out/share $out/bin
@@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec {
    sha256 = "sha256-zjwajl+0ix4wnW0bf4MAuO9Lr9F8sBv87TIL5Ghmlxg=";
  };

-  format = "pyproject";
+  pyproject = true;

  propagatedBuildInputs = [
    beancount
@@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec {
    sha256 = "sha256-BW2KEC0pmervT71FBixPcQciEuGcElCd2wW7BZL1xUg=";
  };

-  format = "pyproject";
+  pyproject = true;

  propagatedBuildInputs = [
    beancount
@@ -18,7 +18,7 @@
 buildPythonPackage rec {
  pname = "openpaperwork-core";
  inherit (callPackage ./src.nix { }) version src;
-  format = "pyproject";
+  pyproject = true;

  sourceRoot = "${src.name}/openpaperwork-core";

@@ -18,7 +18,7 @@
 buildPythonPackage rec {
  pname = "openpaperwork-gtk";
  inherit (callPackage ./src.nix { }) version src;
-  format = "pyproject";
+  pyproject = true;

  sourceRoot = "${src.name}/openpaperwork-gtk";

@@ -29,7 +29,7 @@
 buildPythonPackage rec {
  pname = "paperwork-backend";
  inherit (callPackage ./src.nix { }) version src;
-  format = "pyproject";
+  pyproject = true;

  sourceRoot = "${src.name}/paperwork-backend";

@@ -38,7 +38,7 @@ in
 python3Packages.buildPythonApplication rec {
  inherit src version;
  pname = "paperwork";
-  format = "pyproject";
+  pyproject = true;

  sample_docs = sample_documents // {
    # a trick for the update script
@@ -22,7 +22,7 @@
 buildPythonPackage rec {
  pname = "paperwork-shell";
  inherit (callPackage ./src.nix { }) version src;
-  format = "pyproject";
+  pyproject = true;

  sourceRoot = "${src.name}/paperwork-shell";

@@ -2,7 +2,7 @@

 python3Packages.buildPythonApplication {
  inherit (easycrypt) src version;
-  format = "other";
+  pyproject = false;

  pname = "easycrypt-runtest";

@@ -36,7 +36,6 @@ stdenv.mkDerivation {
  meta = {
    description = "Obs-studio plugin that allows you to screen capture on wlroots based wayland compositors";
    homepage = "https://hg.sr.ht/~scoopta/wlrobs";
-    maintainers = with lib.maintainers; [ grahamc ];
    license = lib.licenses.gpl3Plus;
    platforms = lib.platforms.linux;
  };
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
  meta = {
    homepage = "https://github.com/riscv/sail-riscv";
    description = "Formal specification of the RISC-V architecture, written in Sail";
-    maintainers = with lib.maintainers; [ genericnerdyusername ];
+    maintainers = [ ];
    license = lib.licenses.bsd2;
  };
 }
@@ -12,7 +12,7 @@
 buildPythonPackage rec {
  pname = "hyprshade";
  version = "4.0.1";
-  format = "pyproject";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "loqusion";
@@ -12,7 +12,7 @@ buildPythonApplication {
  pname = "i3-swallow";
  version = "unstable-2022-02-19";

-  format = "pyproject";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "jamesofarrell";
@@ -7,7 +7,7 @@
 python3Packages.buildPythonApplication {
  pname = "i3-wk-switch";
  version = "2020-03-18";
-  format = "other";
+  pyproject = false;

  src = fetchFromGitHub {
    owner = "tmfink";
@@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec {
  pname = "20kly";
  version = "1.5.0";

-  format = "other";
+  pyproject = false;

  src = fetchFromGitHub {
    owner = "20kly";
@@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
    mainProgram = "abaddon";
    homepage = "https://github.com/uowuo/abaddon";
    license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ genericnerdyusername ];
+    maintainers = [ ];
    platforms = lib.platforms.linux;
  };
 }
@@ -7,7 +7,7 @@
 python3Packages.buildPythonApplication {
  pname = "accelergy";
  version = "unstable-2022-05-03";
-  format = "pyproject";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "Accelergy-Project";
@@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec {
  pname = "accerciser";
  version = "3.48.0";

-  format = "other";
+  pyproject = false;

  src = fetchurl {
    url = "mirror://gnome/sources/accerciser/${lib.versions.majorMinor version}/accerciser-${version}.tar.xz";
@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonApplication rec {
  pname = "adafruit-ampy";
  version = "1.1.0";
-  format = "pyproject";
+  pyproject = true;

  src = fetchPypi {
    inherit pname version;
@@ -8,7 +8,7 @@
 python3.pkgs.buildPythonApplication {
  pname = "adcskiller";
  version = "0-unstable-2024-05-19";
-  format = "other";
+  pyproject = false;

  src = fetchFromGitHub {
    owner = "grimlockx";
@@ -7,7 +7,7 @@
 python3Packages.buildPythonApplication rec {
  pname = "addic7ed-cli";
  version = "1.4.6";
-  format = "pyproject";
+  pyproject = true;

  src = fetchPypi {
    inherit pname version;
@@ -8,7 +8,7 @@
 python3.pkgs.buildPythonApplication {
  pname = "adenum";
  version = "0-unstable-2022-04-01";
-  format = "other";
+  pyproject = false;

  src = fetchFromGitHub {
    owner = "SecuProject";
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
  pname = "adwsteamgtk";
  version = "0.8.0";
  # built with meson, not a python format
-  format = "other";
+  pyproject = false;

  src = fetchFromGitHub {
    owner = "Foldex";
@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonApplication rec {
  pname = "aiodnsbrute";
  version = "0.3.3";
-  format = "pyproject";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "blark";
@@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec {
    hash = "sha256-U3shnQ1GlDvOQFfjYVfAhCVRVQpTyLwEzHqKIbBChas=";
  };

-  format = "other";
+  pyproject = false;

  nativeBuildInputs = [
    autoconf
@@ -8,7 +8,7 @@
 python3.pkgs.buildPythonApplication rec {
  pname = "almonds";
  version = "1.25b";
-  format = "pyproject";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "Tenchi2xh";
@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonApplication rec {
  pname = "amoco";
  version = "2.9.8";
-  format = "pyproject";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "bdcht";
@@ -13,7 +13,7 @@ let
  description = "Advanced typing practice program";
 in
 python3Packages.buildPythonApplication {
-  format = "pyproject";
+  pyproject = true;
  inherit pname version;

  src = fetchFromGitLab {
@@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec {
  pname = "analyze-build";
  inherit (clang-unwrapped) version;

-  format = "other";
+  pyproject = false;

  src = clang-unwrapped + "/bin";

@@ -100,7 +100,7 @@ let
 in

 python3Packages.buildPythonApplication rec {
-  format = "other";
+  pyproject = false;
  inherit pname version;

  outputs = [
@@ -8,7 +8,7 @@
 python3.pkgs.buildPythonApplication rec {
  pname = "annextimelog";
  version = "0.15.0";
-  format = "pyproject";
+  pyproject = true;

  src = fetchFromGitLab {
    owner = "nobodyinperson";
@@ -7,7 +7,7 @@
 python3Packages.buildPythonApplication {
  pname = "antfs-cli";
  version = "0-unstable-2017-02-11";
-  format = "pyproject";
+  pyproject = true;

  meta = {
    homepage = "https://github.com/Tigge/antfs-cli";
@@ -11,7 +11,7 @@
 python3Packages.buildPythonApplication rec {
  pname = "apkg";
  version = "1.0.0";
-  format = "pyproject";
+  pyproject = true;

  src = fetchFromGitLab {
    domain = "gitlab.nic.cz";
@@ -11,7 +11,7 @@
 python3.pkgs.buildPythonApplication rec {
  pname = "apksigcopier";
  version = "1.1.1";
-  format = "pyproject";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "obfusk";
@@ -36,7 +36,7 @@ python3Packages.buildPythonApplication {
    sed -i Makefile -e "/\<vim\>/d"
  '');

-  format = "other";
+  pyproject = false;
  strictDeps = true;

  doCheck = true;
@@ -18,7 +18,7 @@ let
  };
 in
 python3Packages.buildPythonApplication {
-  format = "pyproject";
+  pyproject = true;
  inherit pname version src;

  nativeBuildInputs = [ installShellFiles ];
@@ -25,7 +25,7 @@ in
 py.pkgs.buildPythonApplication rec {
  pname = "archivy";
  version = "1.7.7";
-  format = "pyproject";
+  pyproject = true;

  src = fetchPypi {
    inherit pname version;
@@ -8,13 +8,13 @@

 buildGoModule rec {
  pname = "arkade";
-  version = "0.11.60";
+  version = "0.11.62";

  src = fetchFromGitHub {
    owner = "alexellis";
    repo = "arkade";
    tag = version;
-    hash = "sha256-2VabFPcvTgkjoGXQDUdDh1BdUB+tS3QsfGDSGerd95Q=";
+    hash = "sha256-Ost93sMmlbZI3l5duy0VDaWByREUIzWFtuVRGilZYFo=";
  };

  env.CGO_ENABLED = 0;
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication {
    hash = "sha256-1pv88OClskQOPtJaP7g0duXMe/X3M6Tk+ituZ9UxoIE=";
  };

-  format = "other";
+  pyproject = false;

  nativeBuildInputs = [
    python3Packages.wrapPython
@@ -7,7 +7,7 @@
 python3Packages.buildPythonApplication rec {
  pname = "arxiv-latex-cleaner";
  version = "1.0.8";
-  format = "pyproject";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "google-research";
@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonApplication rec {
  pname = "asn1editor";
  version = "0.8.0";
-  format = "pyproject";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "Futsch1";
@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonApplication rec {
  pname = "atomic-operator";
  version = "0.8.5";
-  format = "pyproject";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "swimlane";
@@ -14,7 +14,7 @@
 python3Packages.buildPythonApplication rec {
  pname = "autokey";
  version = "0.96.0";
-  format = "pyproject";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "autokey";
@@ -7,16 +7,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "automatic-timezoned";
-  version = "2.0.105";
+  version = "2.0.106";

  src = fetchFromGitHub {
    owner = "maxbrunet";
    repo = "automatic-timezoned";
    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-CMdVYk1Mn0uenhPuaSG2Ruisfps8wAug0PC/GGfesYU=";
+    sha256 = "sha256-djvRfp1LhkHuDmjDuOErzcD9KXH6fiRrUR73ncldzUc=";
  };

-  cargoHash = "sha256-fXorWbazWWBoXjTIT1t6kWRW065pTM+u+S36X7zhoj8=";
+  cargoHash = "sha256-T8PY/mFvcdXPZeQKEUekBan+0qBQnmsZ5O96EYcxkcI=";

  nativeInstallCheckInputs = [ versionCheckHook ];

@@ -12,7 +12,7 @@
 python3.pkgs.buildPythonApplication rec {
  pname = "autorandr";
  version = "1.15";
-  format = "other";
+  pyproject = false;

  src = fetchFromGitHub {
    owner = "phillipberndt";
@@ -10,16 +10,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "avbroot";
-  version = "3.23.3";
+  version = "3.24.0";

  src = fetchFromGitHub {
    owner = "chenxiaolong";
    repo = "avbroot";
    tag = "v${version}";
-    hash = "sha256-Bdr9oEBIbRyEBhUbY3lIqhtE0l+MklWkwJ1vViYloiM=";
+    hash = "sha256-SmoYlBG5GcTqPdAm9snZsPhFX3MEZdC59whqVnmAwes=";
  };

-  cargoHash = "sha256-nT1mKRc9UTeday0ZiJEXTRckKSWpX/tYdcV6Izqwg60=";
+  cargoHash = "sha256-UZwJLiOPVBgZztRhp65Qs66OfnL4RTcRlTrpW1a6Ae8=";

  nativeBuildInputs = [
    pkg-config
@@ -57,7 +57,6 @@ buildGoModule rec {
    homepage = "https://github.com/ekristen/aws-nuke";
    changelog = "https://github.com/ekristen/aws-nuke/releases/tag/${src.tag}";
    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ grahamc ];
    mainProgram = "aws-nuke";
    # fork/exec exe/mockgen: exec format error
    # resources/autoscaling_mock_test.go:1: running "../mocks/generate_mocks.sh": exit status 1
@@ -20,7 +20,7 @@
 python3Packages.buildPythonApplication rec {
  pname = "ayatana-webmail";
  version = "24.5.17";
-  format = "pyproject";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "AyatanaIndicators";
@@ -10,13 +10,13 @@
 }:
 buildGoModule (finalAttrs: {
  pname = "az-pim-cli";
-  version = "1.10.0";
+  version = "1.11.0";

  src = fetchFromGitHub {
    owner = "netr0m";
    repo = "az-pim-cli";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-1MJVU1YhjIpY4C3cpmXKVTg/vFdCEgQZoOALLQW/7LM=";
+    hash = "sha256-93nafWcPjfRX2pGe27UVxERH7H7rhkLAvUiY2x6CvY0=";
  };

  patches = [
@@ -197,7 +197,7 @@ let
        pname = "azure-mgmt-resource-all";
        inherit version;

-        format = "other"; # we're not building from sdist/wheel
+        pyproject = false; # we're not building from sdist/wheel

        src = py.pkgs.azure-mgmt-resource.src;

@@ -21,7 +21,7 @@
 python3Packages.buildPythonApplication rec {
  pname = "bada-bib";
  version = "0.8.1";
-  format = "other";
+  pyproject = false;

  src = fetchFromGitHub {
    owner = "RogerCrocker";
@@ -10,7 +10,7 @@ let
 in
 python3Packages.buildPythonApplication {
  inherit pname version;
-  format = "pyproject";
+  pyproject = true;

  src = fetchPypi {
    inherit version;
@@ -8,7 +8,7 @@
 python3Packages.buildPythonApplication {
  pname = "bashplotlib";
  version = "0.6.5-unstable-2021-03-31";
-  format = "pyproject";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "glamp";
@@ -28,7 +28,7 @@ in
 bepastyPython.pkgs.buildPythonPackage rec {
  pname = "bepasty";
  version = "1.2.2";
-  format = "pyproject";
+  pyproject = true;

  propagatedBuildInputs = with bepastyPython.pkgs; [
    flask
@@ -9,7 +9,7 @@
 python3.pkgs.buildPythonApplication rec {
  pname = "bitbake-language-server";
  version = "0.0.15";
-  format = "pyproject";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "Freed-Wu";
@@ -6,13 +6,13 @@
 }:
 buildGoModule rec {
  pname = "bitrise";
-  version = "2.36.0";
+  version = "2.36.1";

  src = fetchFromGitHub {
    owner = "bitrise-io";
    repo = "bitrise";
    rev = "v${version}";
-    hash = "sha256-Sr/xpPLrlAaNv4r4fZ1/QFbamvGWFMfsOKSbaWdlAI0=";
+    hash = "sha256-U5885dS5C+AOF7DbiALy42rVcvr+2T3yE6E1mXrC49Y=";
  };

  # many tests rely on writable $HOME/.bitrise and require network access
@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonApplication rec {
  pname = "bkyml";
  version = "1.4.3";
-  format = "pyproject";
+  pyproject = true;

  src = fetchPypi {
    inherit pname version;
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
  pname = "bleachbit";
  version = "5.0.0";

-  format = "other";
+  pyproject = false;

  src = fetchurl {
    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
@@ -22,7 +22,7 @@
 python3.pkgs.buildPythonApplication rec {
  pname = "blivet-gui";
  version = "2.6.0";
-  format = "pyproject";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "storaged-project";
@@ -16,7 +16,7 @@
 python3Packages.buildPythonApplication rec {
  pname = "blueberry";
  version = "1.4.8";
-  format = "other";
+  pyproject = false;

  src = fetchFromGitHub {
    owner = "linuxmint";
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
    description = "Implementation of RFC-0125's datatype and synthesis tooling";
    homepage = "https://github.com/DeterminateSystems/bootspec";
    license = lib.licenses.mit;
-    teams = [ lib.teams.determinatesystems ];
+    maintainers = [ lib.maintainers.cole-h ];
    platforms = lib.platforms.unix;
  };
 }
@@ -16,7 +16,7 @@
 python3Packages.buildPythonApplication rec {
  pname = "borgmatic";
  version = "2.0.13";
-  format = "pyproject";
+  pyproject = true;

  src = fetchPypi {
    inherit pname version;
@@ -115,7 +115,7 @@ python3Packages.buildPythonApplication rec {
      procps
    ];

-  format = "other";
+  pyproject = false;
  dontWrapGApps = true; # prevent double wrapping

  preFixup = ''
@@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec {
    sha256 = "sha256-fqhi4K8Ceh8Rs0ExteCfAuVfEamFjMCjCFm6DRAJDmI=";
  };

-  format = "other";
+  pyproject = false;

  propagatedBuildInputs = with python3Packages; [
    broadlink
@@ -8,7 +8,7 @@
 python3Packages.buildPythonApplication rec {
  pname = "brotab";
  version = "1.4.2";
-  format = "pyproject";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "balta2ar";
--- a/Show More
+++ b/Show More