Skip to content

Commit afe89ba

Browse files
authored
Merge pull request #408 from cachix/bump
bump deps
2 parents 844ae66 + 99c274e commit afe89ba

File tree

3 files changed

+17
-21
lines changed

3 files changed

+17
-21
lines changed

README.md

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ nix develop
9090
# override a package with a different version
9191
ormolu.enable = true;
9292
ormolu.package = pkgs.haskellPackages.ormolu;
93+
ormolu.settings.defaultExtensions = [ "lhs" "hs" ];
9394
9495
# some hooks have more than one package, like clippy:
9596
clippy.enable = true;
@@ -98,14 +99,6 @@ nix develop
9899
# some hooks provide settings
99100
clippy.settings.allFeatures = true;
100101
};
101-
102-
# Set the pkgs to get the tools for the hooks from.
103-
# tools = pkgs;
104-
105-
# Some hooks offer custom settings that affect how they execute
106-
settings = {
107-
ormolu.defaultExtensions = [ "lhs" "hs" ];
108-
};
109102
};
110103
}
111104
```

flake.lock

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nix/tools.nix

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,11 +159,14 @@ in
159159
inherit (nodePackages) eslint markdownlint-cli prettier pyright cspell;
160160
inherit (ocamlPackages) ocp-indent;
161161
inherit (python3Packages) autoflake black flake8 flynt isort mkdocs-linkcheck mypy pylint pyupgrade;
162-
inherit (php82Packages) php-cs-fixer phpcbf phpcs psalm;
162+
inherit (php82Packages) php-cs-fixer psalm;
163163
# FIXME: workaround build failure
164164
phpstan = php82Packages.phpstan.overrideAttrs (old: {
165165
composerStrictValidation = false;
166166
});
167+
# these two are for backwards compatibility
168+
phpcbf = php82Packages.php-codesniffer or php82Packages.phpcbf;
169+
phpcs = php82Packages.php-codesniffer or php82Packages.phpcs;
167170
lua-language-server = lua-language-server;
168171
purs-tidy = nodePackages.purs-tidy or null;
169172
cabal2nix-dir = callPackage ./cabal2nix-dir { };

0 commit comments

Comments
 (0)