Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/languages-frameworks/python.section.md
Original file line number Diff line number Diff line change
Expand Up @@ -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-rfc-style`.
* The file is formatted with `nixfmt`.
* 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
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/editors/vscode/extensions/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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-rfc-style` formatter is being used to format the VSCode extensions.
* Currently `nixfmt` 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.

Expand Down
2 changes: 1 addition & 1 deletion pkgs/by-name/gr/gren/update.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p cabal2nix curl jq nix-update nixfmt-rfc-style
#!nix-shell -i bash -p cabal2nix curl jq nix-update nixfmt

set -euo pipefail

Expand Down
2 changes: 1 addition & 1 deletion pkgs/by-name/ni/nixfmt-tree/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ treefmtWithConfig.overrideAttrs {
You can achieve similar results by manually configuring `treefmt`:
```nix
pkgs.treefmt.withConfig {
runtimeInputs = [ pkgs.nixfmt-rfc-style ];
runtimeInputs = [ pkgs.nixfmt ];

settings = {
# Log level for files treefmt won't format
Expand Down
2 changes: 1 addition & 1 deletion pkgs/os-specific/linux/kernel/update-xanmod.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p bash nix-prefetch curl jq gawk gnused nixfmt-rfc-style
#!nix-shell -i bash -p bash nix-prefetch curl jq gawk gnused nixfmt

set -euo pipefail

Expand Down
2 changes: 1 addition & 1 deletion pkgs/servers/x11/xorg/update.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
#!nix-shell --pure --keep NIX_PATH -i python3 -p nix git nixfmt-rfc-style "python3.withPackages (ps: [ ps. packaging ps.beautifulsoup4 ps.requests ])"
#!nix-shell --pure --keep NIX_PATH -i python3 -p nix git nixfmt "python3.withPackages (ps: [ ps. packaging ps.beautifulsoup4 ps.requests ])"

# Usage: Run ./update.py from the directory containing tarballs.list. The script checks for the
# latest versions of all packages, updates the expressions if any update is found, and commits
Expand Down
Loading