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 .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,5 @@ jobs:
- uses: denoland/setup-deno@v1
with:
# Keep same version as used in *.nix
deno-version: '1.35.1'
deno-version: '1.36.0'
- run: deno lint
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ jobs:
- uses: dprint/check@v2.2
with:
# Keep same version as used in *.nix
dprint-version: '0.37.1'
dprint-version: '0.40.2'

typos:
timeout-minutes: 15
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
# Keep same version as used in *.nix
- uses: crate-ci/typos@v1.16.1
- uses: crate-ci/typos@v1.16.8
with:
files: |
.
Expand Down
7 changes: 3 additions & 4 deletions dprint.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,12 @@
"printWidth": 120,
"singleQuote": true
},
"includes": ["**/*.{ts,tsx,js,jsx,cjs,mjs,json,jsonc,md,yml,toml}"],
"excludes": ["**/node_modules", "**/*-lock.json", "lib/**", "dist/**"],
"plugins": [
"https://plugins.dprint.dev/typescript-0.85.1.wasm",
"https://plugins.dprint.dev/typescript-0.86.2.wasm",
"https://plugins.dprint.dev/json-0.17.4.wasm",
"https://plugins.dprint.dev/markdown-0.15.3.wasm",
"https://plugins.dprint.dev/markdown-0.16.0.wasm",
"https://plugins.dprint.dev/toml-0.5.4.wasm",
"https://plugins.dprint.dev/prettier-0.26.6.json@0118376786f37496e41bb19dbcfd1e7214e2dc859a55035c5e54d1107b4c9c57"
"https://plugins.dprint.dev/prettier-0.27.0.json@3557a62b4507c55a47d8cde0683195b14d13c41dda66d0f0b0e111aed107e2fe"
]
}
35 changes: 26 additions & 9 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 18 additions & 6 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -1,27 +1,37 @@
{
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/21061e4e4a0f46a6f487c7583be916e4e031ee4e";
# Candidate channels
# - https://github.com/kachick/anylang-template/issues/17
# - https://discourse.nixos.org/t/differences-between-nix-channels/13998
# How to update the revision
# - `nix flake update --commit-lock-file` # https://nixos.org/manual/nix/stable/command-ref/new-cli/nix3-flake-update.html
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs-stable.url = "github:NixOS/nixpkgs/release-23.05";
flake-utils.url = "github:numtide/flake-utils";
};

outputs = { self, nixpkgs, flake-utils }:
outputs = { self, nixpkgs-unstable, nixpkgs-stable, flake-utils }:
flake-utils.lib.eachDefaultSystem (system:
let
# https://discourse.nixos.org/t/mark-a-devshell-dependency-as-insecure/24354/3
pkgs = import nixpkgs
unstable-pkgs = import nixpkgs-unstable
{
inherit system;
config = {
permittedInsecurePackages = [
"nodejs-16.20.1"
"nodejs-16.20.2"
];
};
};
stable-pkgs = nixpkgs-stable.legacyPackages.${system};
in
{
devShells.default = with pkgs;
devShells.default = with unstable-pkgs;
mkShell {
buildInputs = [
# https://github.com/NixOS/nix/issues/730#issuecomment-162323824
bashInteractive

nodejs-16_x
deno
dprint
Expand All @@ -30,7 +40,9 @@
nixpkgs-fmt
typos
actionlint
hadolint
# Avoided broken hadolint in latest
# https://github.com/NixOS/nixpkgs/pull/240387#issuecomment-1686601267
stable-pkgs.hadolint
];
};
});
Expand Down