From eebd7f57765ac6a054f2e8eeff9ef3c7d0d44ca0 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Sun, 6 Aug 2023 20:50:32 +0900 Subject: [PATCH 1/3] Bump nixpkgs with nixos-unstable --- .github/workflows/lint.yml | 4 ++-- flake.lock | 15 ++++++++++----- flake.nix | 4 +--- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index d43b2f95..5448a09c 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -14,7 +14,7 @@ jobs: - uses: dprint/check@v2.2 with: # Keep same version as used in *.nix - dprint-version: '0.39.1' + dprint-version: '0.40.0' typos: timeout-minutes: 15 @@ -22,7 +22,7 @@ jobs: 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.2 with: # https://github.com/crate-ci/typos/issues/779#issuecomment-1635761199 files: | diff --git a/flake.lock b/flake.lock index 847f47f2..f98665d0 100644 --- a/flake.lock +++ b/flake.lock @@ -20,13 +20,18 @@ }, "nixpkgs": { "locked": { - "narHash": "sha256-BXtO36CWk7WnRJVsKBV0uZQ9VWfduKbfrutkYUxQGmg=", - "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-23.11pre509044.3acb5c4264c4/nixexprs.tar.xz" + "lastModified": 1691313029, + "narHash": "sha256-JCdafAmmuOkcRGFEUkXckRZ3Q/PBBtcm1Mq0GBA3XEY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0bab81e6319eb418e1509fe4b88401a022f3bf99", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-23.11pre509044.3acb5c4264c4/nixexprs.tar.xz" + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" } }, "root": { diff --git a/flake.nix b/flake.nix index 128fd240..fa689f8a 100644 --- a/flake.nix +++ b/flake.nix @@ -5,9 +5,7 @@ # - 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 - # TODO: Refer a popular channel in another issues - # nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - nixpkgs.url = "https://releases.nixos.org/nixpkgs/nixpkgs-23.11pre509044.3acb5c4264c4/nixexprs.tar.xz"; + nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; flake-utils.url = "github:numtide/flake-utils"; }; From 837f1a28ab87acf5f98e490d137508606581d7d8 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Sun, 6 Aug 2023 20:51:09 +0900 Subject: [PATCH 2/3] Bump dprint plugins version with rtx ```bash rtx exec dprint@0.39.1 -- dprint config update --yes rtx exec dprint@0.40.0 -- dprint check ``` https://github.com/dprint/dprint-plugin-prettier/issues/56 --- dprint.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dprint.json b/dprint.json index 778fc5c4..f410ee77 100644 --- a/dprint.json +++ b/dprint.json @@ -18,6 +18,6 @@ "https://plugins.dprint.dev/json-0.17.4.wasm", "https://plugins.dprint.dev/markdown-0.15.3.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" ] } From 9ec996abc51182f7a32f18027e6dc991be5e41a7 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Sun, 6 Aug 2023 20:52:54 +0900 Subject: [PATCH 3/3] Remove outdated includes definition from dprint https://github.com/dprint/dprint/issues/728 `dprint output-file-paths | wc -l` changed from 17 to 18 --- dprint.json | 1 - home/.stack/config.yaml | 9 ++++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dprint.json b/dprint.json index f410ee77..c0cc4097 100644 --- a/dprint.json +++ b/dprint.json @@ -9,7 +9,6 @@ "printWidth": 120, "singleQuote": true }, - "includes": ["**/*.{json,md,yml,toml}"], "excludes": [ ".git", "**/*-lock.json" diff --git a/home/.stack/config.yaml b/home/.stack/config.yaml index 201d7c33..30fc646b 100644 --- a/home/.stack/config.yaml +++ b/home/.stack/config.yaml @@ -8,11 +8,10 @@ # See https://docs.haskellstack.org/en/stable/yaml_configuration/#templates templates: params: - author-name: Kenichi Kamiya - author-email: kachick1@gmail.com - copyright: 'Copyright (c) 2023 Kenichi Kamiya' - github-username: kachick - + author-name: Kenichi Kamiya + author-email: kachick1@gmail.com + copyright: 'Copyright (c) 2023 Kenichi Kamiya' + github-username: kachick # The following parameter specifies stack's output styles; STYLES is a # colon-delimited sequence of key=value, where 'key' is a style name and # 'value' is a semicolon-delimited list of 'ANSI' SGR (Select Graphic