Unverified Commit e7221c7c authored by Jeremy Fleischman's avatar Jeremy Fleischman
Browse files

Revert "treewide: drop usage of nixfmt-rfc-style alias"

This reverts commit c19b2c3c.

As per the discussion
[here](https://github.com/NixOS/nixpkgs/pull/433100#issuecomment-3184482777),
it's too early to drop usage of the alias in documentation.

Removing the references is tracked by
<https://github.com/NixOS/nixpkgs/issues/425583>, which a member of the
Nix Formatting team will do when the time is right.
parent 039f7e16
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -2121,7 +2121,7 @@ The following rules are desired to be respected:
* `pythonImportsCheck` is set. This is still a good smoke test even if `pytestCheckHook` is set.
* `meta.platforms` takes the default value in many cases.
  It does not need to be set explicitly unless the package requires a specific platform.
* The file is formatted with `nixfmt`.
* The file is formatted with `nixfmt-rfc-style`.
* Commit names of Python libraries must reflect that they are Python
  libraries (e.g. `python313Packages.numpy: 1.11 -> 1.12` rather than `numpy: 1.11 -> 1.12`).
* The current default version of python should be included
+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@

* When adding a new extension, place its definition in a `default.nix` file in a directory with the extension's ID (e.g. `publisher.extension-name/default.nix`) and refer to it in `./default.nix`, e.g. `publisher.extension-name = callPackage ./publisher.extension-name { };`.

* Currently `nixfmt` formatter is being used to format the VSCode extensions.
* Currently `nixfmt-rfc-style` formatter is being used to format the VSCode extensions.

* Respect `alphabetical order` whenever adding extensions. On disorder, please, kindly open a PR re-establishing the order.

+1 −1
Original line number Diff line number Diff line
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p cabal2nix curl jq nix-update nixfmt
#!nix-shell -i bash -p cabal2nix curl jq nix-update nixfmt-rfc-style

set -euo pipefail

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ treefmtWithConfig.overrideAttrs {
      You can achieve similar results by manually configuring `treefmt`:
      ```nix
      pkgs.treefmt.withConfig {
        runtimeInputs = [ pkgs.nixfmt ];
        runtimeInputs = [ pkgs.nixfmt-rfc-style ];

        settings = {
          # Log level for files treefmt won't format
+1 −1
Original line number Diff line number Diff line
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p bash nix-prefetch curl jq gawk gnused nixfmt
#!nix-shell -i bash -p bash nix-prefetch curl jq gawk gnused nixfmt-rfc-style

set -euo pipefail

Loading