Loading .git-blame-ignore-revs +3 −0 Original line number Diff line number Diff line Loading @@ -310,3 +310,6 @@ c283f32d296564fd649ef3ed268c1f1f7b199c49 # !autorebase nix-shell --run treefmt # treewide: clean up 'meta = with' pattern 567e8dfd8eddc5468e6380fc563ab8a27422ab1d # nixfmt 1.2.0 28096cc5e3d8334fbe1845925f000f8c8c5e0aac # !autorebase nix-shell --run treefmt ci/OWNERS +1 −1 Original line number Diff line number Diff line Loading @@ -434,7 +434,7 @@ pkgs/by-name/fo/forgejo/ @adamcstephens @bendlas @emilylange # Node.js /pkgs/build-support/node/build-npm-package @winterqt /pkgs/build-support/node/fetch-npm-deps @winterqt /pkgs/build-support/node/prefetch-npm-deps @winterqt /doc/languages-frameworks/javascript.section.md @winterqt /pkgs/development/tools/pnpm @Scrumplex @gepbird /pkgs/build-support/node/fetch-pnpm-deps @Scrumplex @gepbird Loading ci/default.nix +19 −11 Original line number Diff line number Diff line Loading @@ -87,22 +87,30 @@ let "pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml" ]; programs.nixf-diagnose.enable = true; settings.formatter.nixf-diagnose = { # Ensure nixfmt cleans up after nixf-diagnose. priority = -1; options = [ "--auto-fix" programs.nixf-diagnose = { enable = true; ignore = [ # Rule names can currently be looked up here: # https://github.com/nix-community/nixd/blob/main/libnixf/src/Basic/diagnostic.py # TODO: Remove the following and fix things. "--ignore=sema-unused-def-lambda-noarg-formal" "--ignore=sema-unused-def-lambda-witharg-arg" "--ignore=sema-unused-def-lambda-witharg-formal" "--ignore=sema-unused-def-let" "sema-unused-def-lambda-noarg-formal" "sema-unused-def-lambda-witharg-arg" "sema-unused-def-lambda-witharg-formal" "sema-unused-def-let" # Keep this rule, because we have `lib.or`. "--ignore=or-identifier" "or-identifier" # TODO: remove after outstanding prelude diagnostics issues are fixed: # https://github.com/nix-community/nixd/issues/761 # https://github.com/nix-community/nixd/issues/762 "sema-primop-removed-prefix" "sema-primop-overridden" "sema-constant-overridden" "sema-primop-unknown" ]; }; settings.formatter.nixf-diagnose = { # Ensure nixfmt cleans up after nixf-diagnose. priority = -1; excludes = [ # Auto-generated; violates sema-extra-with # Can only sensibly be removed when --auto-fix supports multiple fixes at once: Loading ci/pinned.json +6 −6 Original line number Diff line number Diff line Loading @@ -9,9 +9,9 @@ }, "branch": "nixpkgs-unstable", "submodules": false, "revision": "ee09932cedcef15aaf476f9343d1dea2cb77e261", "url": "https://github.com/NixOS/nixpkgs/archive/ee09932cedcef15aaf476f9343d1dea2cb77e261.tar.gz", "hash": "1xz5pa6la2fyj5b1cfigmg3nmml11fyf9ah0rnr4zfgmnwimn2gn" "revision": "bde09022887110deb780067364a0818e89258968", "url": "https://github.com/NixOS/nixpkgs/archive/bde09022887110deb780067364a0818e89258968.tar.gz", "hash": "13mi187zpa4rw680qbwp7pmykjia8cra3nwvjqmsjba3qhlzif5l" }, "treefmt-nix": { "type": "Git", Loading @@ -22,9 +22,9 @@ }, "branch": "main", "submodules": false, "revision": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4", "url": "https://github.com/numtide/treefmt-nix/archive/5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4.tar.gz", "hash": "0cr6aj9bk7n3y09lwmfjr7xg1f069332xf4q99z3kj1c1mp0wl82" "revision": "e96d59dff5c0d7fddb9d113ba108f03c3ef99eca", "url": "https://github.com/numtide/treefmt-nix/archive/e96d59dff5c0d7fddb9d113ba108f03c3ef99eca.tar.gz", "hash": "02gqyxila3ghw8gifq3mns639x86jcq079kvfvjm42mibx7z5fzb" } }, "version": 5 Loading lib/fileset/default.nix +9 −9 Original line number Diff line number Diff line Loading @@ -191,7 +191,7 @@ in if isStringLike path then throw ''lib.fileset.maybeMissing: Argument ("${toString path}") is a string-like value, but it should be a path instead.'' else throw ''lib.fileset.maybeMissing: Argument is of type ${typeOf path}, but it should be a path instead.'' throw "lib.fileset.maybeMissing: Argument is of type ${typeOf path}, but it should be a path instead." else if !pathExists path then _emptyWithoutBase else Loading Loading @@ -443,7 +443,7 @@ in lib.fileset.toSource: `root` (${toString root}) is a string-like value, but it should be a path instead. Paths in strings are not supported by `lib.fileset`, use `lib.sources` or derivations instead.'' else throw ''lib.fileset.toSource: `root` is of type ${typeOf root}, but it should be a path instead.'' throw "lib.fileset.toSource: `root` is of type ${typeOf root}, but it should be a path instead." # Currently all Nix paths have the same filesystem root, but this could change in the future. # See also ../path/README.md else if !fileset._internalIsEmptyWithoutBase && rootFilesystemRoot != filesetFilesystemRoot then Loading @@ -453,7 +453,7 @@ in `fileset`: Filesystem root is "${toString filesetFilesystemRoot}" Different filesystem roots are not supported.'' else if !pathExists root then throw ''lib.fileset.toSource: `root` (${toString root}) is a path that does not exist.'' throw "lib.fileset.toSource: `root` (${toString root}) is a path that does not exist." else if pathType root != "directory" then throw '' lib.fileset.toSource: `root` (${toString root}) is a file, but it should be a directory instead. Potential solutions: Loading Loading @@ -619,7 +619,7 @@ in unions = filesets: if !isList filesets then throw ''lib.fileset.unions: Argument is of type ${typeOf filesets}, but it should be a list instead.'' throw "lib.fileset.unions: Argument is of type ${typeOf filesets}, but it should be a list instead." else pipe filesets [ # Annotate the elements with context, used by _coerceMany for better errors Loading Loading @@ -808,16 +808,16 @@ in fileFilter = predicate: path: if !isFunction predicate then throw ''lib.fileset.fileFilter: First argument is of type ${typeOf predicate}, but it should be a function instead.'' throw "lib.fileset.fileFilter: First argument is of type ${typeOf predicate}, but it should be a function instead." else if !isPath path then if path._type or "" == "fileset" then throw '' lib.fileset.fileFilter: Second argument is a file set, but it should be a path instead. If you need to filter files in a file set, use `intersection fileset (fileFilter pred ./.)` instead.'' else throw ''lib.fileset.fileFilter: Second argument is of type ${typeOf path}, but it should be a path instead.'' throw "lib.fileset.fileFilter: Second argument is of type ${typeOf path}, but it should be a path instead." else if !pathExists path then throw ''lib.fileset.fileFilter: Second argument (${toString path}) is a path that does not exist.'' throw "lib.fileset.fileFilter: Second argument (${toString path}) is a path that does not exist." else _fileFilter predicate path; Loading Loading @@ -896,9 +896,9 @@ in lib.fileset.fromSource: The source origin of the argument is a string-like value ("${toString path}"), but it should be a path instead. Sources created from paths in strings cannot be turned into file sets, use `lib.sources` or derivations instead.'' else throw ''lib.fileset.fromSource: The source origin of the argument is of type ${typeOf path}, but it should be a path instead.'' throw "lib.fileset.fromSource: The source origin of the argument is of type ${typeOf path}, but it should be a path instead." else if !pathExists path then throw ''lib.fileset.fromSource: The source origin (${toString path}) of the argument is a path that does not exist.'' throw "lib.fileset.fromSource: The source origin (${toString path}) of the argument is a path that does not exist." else if isFiltered then _fromSourceFilter path source.filter else Loading Loading
.git-blame-ignore-revs +3 −0 Original line number Diff line number Diff line Loading @@ -310,3 +310,6 @@ c283f32d296564fd649ef3ed268c1f1f7b199c49 # !autorebase nix-shell --run treefmt # treewide: clean up 'meta = with' pattern 567e8dfd8eddc5468e6380fc563ab8a27422ab1d # nixfmt 1.2.0 28096cc5e3d8334fbe1845925f000f8c8c5e0aac # !autorebase nix-shell --run treefmt
ci/OWNERS +1 −1 Original line number Diff line number Diff line Loading @@ -434,7 +434,7 @@ pkgs/by-name/fo/forgejo/ @adamcstephens @bendlas @emilylange # Node.js /pkgs/build-support/node/build-npm-package @winterqt /pkgs/build-support/node/fetch-npm-deps @winterqt /pkgs/build-support/node/prefetch-npm-deps @winterqt /doc/languages-frameworks/javascript.section.md @winterqt /pkgs/development/tools/pnpm @Scrumplex @gepbird /pkgs/build-support/node/fetch-pnpm-deps @Scrumplex @gepbird Loading
ci/default.nix +19 −11 Original line number Diff line number Diff line Loading @@ -87,22 +87,30 @@ let "pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml" ]; programs.nixf-diagnose.enable = true; settings.formatter.nixf-diagnose = { # Ensure nixfmt cleans up after nixf-diagnose. priority = -1; options = [ "--auto-fix" programs.nixf-diagnose = { enable = true; ignore = [ # Rule names can currently be looked up here: # https://github.com/nix-community/nixd/blob/main/libnixf/src/Basic/diagnostic.py # TODO: Remove the following and fix things. "--ignore=sema-unused-def-lambda-noarg-formal" "--ignore=sema-unused-def-lambda-witharg-arg" "--ignore=sema-unused-def-lambda-witharg-formal" "--ignore=sema-unused-def-let" "sema-unused-def-lambda-noarg-formal" "sema-unused-def-lambda-witharg-arg" "sema-unused-def-lambda-witharg-formal" "sema-unused-def-let" # Keep this rule, because we have `lib.or`. "--ignore=or-identifier" "or-identifier" # TODO: remove after outstanding prelude diagnostics issues are fixed: # https://github.com/nix-community/nixd/issues/761 # https://github.com/nix-community/nixd/issues/762 "sema-primop-removed-prefix" "sema-primop-overridden" "sema-constant-overridden" "sema-primop-unknown" ]; }; settings.formatter.nixf-diagnose = { # Ensure nixfmt cleans up after nixf-diagnose. priority = -1; excludes = [ # Auto-generated; violates sema-extra-with # Can only sensibly be removed when --auto-fix supports multiple fixes at once: Loading
ci/pinned.json +6 −6 Original line number Diff line number Diff line Loading @@ -9,9 +9,9 @@ }, "branch": "nixpkgs-unstable", "submodules": false, "revision": "ee09932cedcef15aaf476f9343d1dea2cb77e261", "url": "https://github.com/NixOS/nixpkgs/archive/ee09932cedcef15aaf476f9343d1dea2cb77e261.tar.gz", "hash": "1xz5pa6la2fyj5b1cfigmg3nmml11fyf9ah0rnr4zfgmnwimn2gn" "revision": "bde09022887110deb780067364a0818e89258968", "url": "https://github.com/NixOS/nixpkgs/archive/bde09022887110deb780067364a0818e89258968.tar.gz", "hash": "13mi187zpa4rw680qbwp7pmykjia8cra3nwvjqmsjba3qhlzif5l" }, "treefmt-nix": { "type": "Git", Loading @@ -22,9 +22,9 @@ }, "branch": "main", "submodules": false, "revision": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4", "url": "https://github.com/numtide/treefmt-nix/archive/5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4.tar.gz", "hash": "0cr6aj9bk7n3y09lwmfjr7xg1f069332xf4q99z3kj1c1mp0wl82" "revision": "e96d59dff5c0d7fddb9d113ba108f03c3ef99eca", "url": "https://github.com/numtide/treefmt-nix/archive/e96d59dff5c0d7fddb9d113ba108f03c3ef99eca.tar.gz", "hash": "02gqyxila3ghw8gifq3mns639x86jcq079kvfvjm42mibx7z5fzb" } }, "version": 5 Loading
lib/fileset/default.nix +9 −9 Original line number Diff line number Diff line Loading @@ -191,7 +191,7 @@ in if isStringLike path then throw ''lib.fileset.maybeMissing: Argument ("${toString path}") is a string-like value, but it should be a path instead.'' else throw ''lib.fileset.maybeMissing: Argument is of type ${typeOf path}, but it should be a path instead.'' throw "lib.fileset.maybeMissing: Argument is of type ${typeOf path}, but it should be a path instead." else if !pathExists path then _emptyWithoutBase else Loading Loading @@ -443,7 +443,7 @@ in lib.fileset.toSource: `root` (${toString root}) is a string-like value, but it should be a path instead. Paths in strings are not supported by `lib.fileset`, use `lib.sources` or derivations instead.'' else throw ''lib.fileset.toSource: `root` is of type ${typeOf root}, but it should be a path instead.'' throw "lib.fileset.toSource: `root` is of type ${typeOf root}, but it should be a path instead." # Currently all Nix paths have the same filesystem root, but this could change in the future. # See also ../path/README.md else if !fileset._internalIsEmptyWithoutBase && rootFilesystemRoot != filesetFilesystemRoot then Loading @@ -453,7 +453,7 @@ in `fileset`: Filesystem root is "${toString filesetFilesystemRoot}" Different filesystem roots are not supported.'' else if !pathExists root then throw ''lib.fileset.toSource: `root` (${toString root}) is a path that does not exist.'' throw "lib.fileset.toSource: `root` (${toString root}) is a path that does not exist." else if pathType root != "directory" then throw '' lib.fileset.toSource: `root` (${toString root}) is a file, but it should be a directory instead. Potential solutions: Loading Loading @@ -619,7 +619,7 @@ in unions = filesets: if !isList filesets then throw ''lib.fileset.unions: Argument is of type ${typeOf filesets}, but it should be a list instead.'' throw "lib.fileset.unions: Argument is of type ${typeOf filesets}, but it should be a list instead." else pipe filesets [ # Annotate the elements with context, used by _coerceMany for better errors Loading Loading @@ -808,16 +808,16 @@ in fileFilter = predicate: path: if !isFunction predicate then throw ''lib.fileset.fileFilter: First argument is of type ${typeOf predicate}, but it should be a function instead.'' throw "lib.fileset.fileFilter: First argument is of type ${typeOf predicate}, but it should be a function instead." else if !isPath path then if path._type or "" == "fileset" then throw '' lib.fileset.fileFilter: Second argument is a file set, but it should be a path instead. If you need to filter files in a file set, use `intersection fileset (fileFilter pred ./.)` instead.'' else throw ''lib.fileset.fileFilter: Second argument is of type ${typeOf path}, but it should be a path instead.'' throw "lib.fileset.fileFilter: Second argument is of type ${typeOf path}, but it should be a path instead." else if !pathExists path then throw ''lib.fileset.fileFilter: Second argument (${toString path}) is a path that does not exist.'' throw "lib.fileset.fileFilter: Second argument (${toString path}) is a path that does not exist." else _fileFilter predicate path; Loading Loading @@ -896,9 +896,9 @@ in lib.fileset.fromSource: The source origin of the argument is a string-like value ("${toString path}"), but it should be a path instead. Sources created from paths in strings cannot be turned into file sets, use `lib.sources` or derivations instead.'' else throw ''lib.fileset.fromSource: The source origin of the argument is of type ${typeOf path}, but it should be a path instead.'' throw "lib.fileset.fromSource: The source origin of the argument is of type ${typeOf path}, but it should be a path instead." else if !pathExists path then throw ''lib.fileset.fromSource: The source origin (${toString path}) of the argument is a path that does not exist.'' throw "lib.fileset.fromSource: The source origin (${toString path}) of the argument is a path that does not exist." else if isFiltered then _fromSourceFilter path source.filter else Loading
![nixpkgs-ci[bot]'s avatar](https://secure.gravatar.com/avatar/21d9e4256a026824783d9069d7622ceb22d44398fd318ddfee596c72e5556369?s=48&d=identicon "nixpkgs-ci[bot]")