Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

.editorconfig: various #88431

Merged
merged 1 commit into from May 30, 2020
Merged

.editorconfig: various #88431

merged 1 commit into from May 30, 2020

Conversation

@zowoq
Copy link
Contributor

zowoq commented May 20, 2020

Draft until we decide to keep the editorconfig CI check.

@@ -34,3 +34,9 @@ indent_size = 2
# Match perl/python/shell scripts, set indent width of four
[*.{pl,py,sh}]
indent_size = 4

# Disable for auto-generated hackage2nix file
[pkgs/development/haskell-modules/hackage-packages.nix]

This comment has been minimized.

Copy link
@Mic92

Mic92 May 20, 2020

Contributor

While you are at it, maybe also check if we need to add pkgs/development/node-packages/node-packages-v*.nix

This comment has been minimized.

Copy link
@zowoq

zowoq May 20, 2020

Author Contributor

Apart from not having final newlines they seem fine.

Some of the generated json files (node-packages-*.json, recipes-archive-melpa.json) will probably need to be excluded if we end up adding json.

This comment has been minimized.

Copy link
@zowoq

zowoq May 22, 2020

Author Contributor

Added node-packages-v*.nix and gemset.nix (#88564).

I guess we're probably going to end up doing this for a lot of the generated files.

@zowoq
Copy link
Contributor Author

zowoq commented May 20, 2020

@Mic92 There is about 50 *.upstream files scattered around the repo, are they still in use or could they be removed?

I'm going through the repo by file type and size now looking for other outliers.

@Mic92
Copy link
Contributor

Mic92 commented May 20, 2020

I think mainly @7c6f434c uses them. I don't know what tool he uses it for.
I personally just use https://github.com/Mic92/nix-update/ which does not need extra meta information.

@zowoq
Copy link
Contributor Author

zowoq commented May 20, 2020

I personally just use https://github.com/Mic92/nix-update/ ...

I've been using as well. What do you think about adding it here? I send a PR it if you agree?

@Mic92
Copy link
Contributor

Mic92 commented May 20, 2020

I personally just use Mic92/nix-update ...

I've been using as well. What do you think about adding it here? I send a PR it if you agree?

Feel free to add it with me as a maintainer.

@7c6f434c
Copy link
Member

7c6f434c commented May 20, 2020

.upstream files are usable with update-walker script which is inside Nixpkgs, and I do not always get around to updating based on them (but sometimes use them for updating).

@zowoq zowoq mentioned this pull request May 22, 2020
3 of 10 tasks complete
@zowoq zowoq closed this May 22, 2020
@zowoq zowoq deleted the zowoq:editorconfig-fixes branch May 22, 2020
@Mic92
Copy link
Contributor

Mic92 commented May 22, 2020

I think we can still merge this one.
It does not depend on the github ci check.

@zowoq zowoq restored the zowoq:editorconfig-fixes branch May 22, 2020
@zowoq
Copy link
Contributor Author

zowoq commented May 22, 2020

I guess we should still try and get all of generated files listed and add some of the more common file types.

@zowoq zowoq reopened this May 22, 2020
@zowoq zowoq force-pushed the zowoq:editorconfig-fixes branch 3 times, most recently from d2a3c4e to 6b14f21 May 22, 2020
insert_final_newline = unset

# Disable for auto-generated perl-packages file
[pkgs/top-level/perl-packages.nix]

This comment has been minimized.

Copy link
@Mic92

Mic92 May 23, 2020

Contributor

Some of the stuff might be automatic. Some of it is manual. But there might be a lot of errors still though given its size.

@zowoq zowoq force-pushed the zowoq:editorconfig-fixes branch from 6b14f21 to fcad32c May 26, 2020
@zowoq zowoq force-pushed the zowoq:editorconfig-fixes branch 2 times, most recently from 6c27f65 to 1d3cb1b May 26, 2020
@ofborg ofborg bot requested a review from veprbl May 26, 2020
add Gemfile, .json, .lock, .md, .pm

disable for some files or file types that are auto-generated
or require significant changes
@zowoq zowoq force-pushed the zowoq:editorconfig-fixes branch from bc14242 to 54f4bb4 May 29, 2020
@zowoq
Copy link
Contributor Author

zowoq commented May 29, 2020

I wanted to set a treewide default and require that files opt-out but there are too many miscellaneous files checked in for a default to be enforced without it becoming tedious.

@zowoq zowoq marked this pull request as ready for review May 29, 2020
@Mic92 Mic92 merged commit 19d44fc into NixOS:master May 30, 2020
13 checks passed
13 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="54f4bb4"; rev="54f4bb44427d95dad1822e0553185c07e408a977"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="54f4bb4"; rev="54f4bb44427d95dad1822e0553185c07e408a977"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="54f4bb4"; rev="54f4bb44427d95dad1822e0553185c07e408a977"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="54f4bb4"; rev="54f4bb44427d95dad1822e0553185c07e408a977"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="54f4bb4"; rev="54f4bb44427d95dad1822e0553185c07e408a977"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="54f4bb4"; rev="54f4bb44427d95dad1822e0553185c07e408a977"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="54f4bb4"; rev="54f4bb44427d95dad1822e0553185c07e408a977"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@zowoq zowoq deleted the zowoq:editorconfig-fixes branch May 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.