Merge pull request #415 from kachick/bump-nixpkgs

Bump dependencies with new nixpath

.envrc

@@ -1,4 +1,3 @@
 #!/bin/bash
 
-nix_direnv_watch_file .ruby-version
 use flake

.github/workflows/ci-nix.yml

@@ -6,15 +6,11 @@ on:
       - '.github/workflows/ci-nix.yml'
       - '**.nix'
       - 'flake.*'
-      - '.ruby-version'
-      - 'dprint.json'
   pull_request:
     paths:
       - '.github/workflows/ci-nix.yml'
       - '**.nix'
       - 'flake.*'
-      - '.ruby-version'
-      - 'dprint.json'
   schedule:
     # Every 10:42 JST
     # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#schedule
@@ -34,7 +30,7 @@ jobs:
       - run: nix run .#console
       - run: nix develop --command bundle install
       - name: Log current versions
-        run: nix develop --command bundle exec rake inspect_dependencies
+        run: nix develop --command bundle exec rake deps
       - name: Test with external dependencies
         run: nix develop --command bundle exec rake check_non_ruby
       - name: Test with Ruby

.github/workflows/lint.yml

@@ -26,13 +26,19 @@ jobs:
       - uses: actions/checkout@v3
       - uses: dprint/check@v2.2
         with:
-          # Keep same version as *.nix
-          dprint-version: '0.36.1'
+          # Keep same version as used in *.nix
+          dprint-version: '0.40.2'
 
   typos:
     timeout-minutes: 15
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      # Keep same version as *.nix
-      - uses: crate-ci/typos@v1.14.10
+      # Keep same version as used in *.nix
+      - uses: crate-ci/typos@v1.16.8
+        with:
+          # https://github.com/crate-ci/typos/issues/779
+          files: |
+            .
+            .github
+            .vscode

.vscode/extensions.json

@@ -3,7 +3,6 @@
     "editorconfig.editorconfig",
     "github.vscode-github-actions",
     "tekumara.typos-vscode",
-    "koichisasada.vscode-rdbg",
     "soutaro.steep-vscode",
     "soutaro.rbs-syntax",
     "dprint.dprint",

Rakefile

@@ -130,7 +130,7 @@ task(:update) do
 end
 
 desc 'Print dependencies'
-task :inspect_dependencies do
+task :deps do
   sh('ruby --version')
   sh('dprint --version')
   sh('tree --version')
@@ -141,7 +141,7 @@ end
 desc 'Tests except ruby'
 task :check_non_ruby do
   Rake::Task['dprint'].invoke
-  sh('typos')
+  sh('typos . .github .vscode')
   sh('actionlint')
   sh('nixpkgs-fmt --check ./*.nix')
 end

dprint.json

@@ -7,7 +7,6 @@
     "printWidth": 120,
     "singleQuote": true
   },
-  "includes": ["**/*.{json,md,yml,html,css}"],
   "excludes": [
     ".git",
     "**/*lock.json",
@@ -18,7 +17,7 @@
   ],
   "plugins": [
     "https://plugins.dprint.dev/json-0.17.4.wasm",
-    "https://plugins.dprint.dev/markdown-0.15.3.wasm",
-    "https://plugins.dprint.dev/prettier-0.26.6.json@0118376786f37496e41bb19dbcfd1e7214e2dc859a55035c5e54d1107b4c9c57"
+    "https://plugins.dprint.dev/markdown-0.16.0.wasm",
+    "https://plugins.dprint.dev/prettier-0.27.0.json@3557a62b4507c55a47d8cde0683195b14d13c41dda66d0f0b0e111aed107e2fe"
   ]
 }

flake.nix

@@ -1,25 +1,27 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
-    nixpkgs-ruby.url = "github:bobvanderlinden/nixpkgs-ruby";
-    nixpkgs-ruby.inputs.nixpkgs.follows = "nixpkgs";
+    # 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.url = "github:NixOS/nixpkgs/nixos-unstable";
     flake-utils.url = "github:numtide/flake-utils";
   };
 
-  outputs = { self, nixpkgs, nixpkgs-ruby, flake-utils }:
+  outputs = { self, nixpkgs, flake-utils }:
     flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = nixpkgs.legacyPackages.${system};
-        ruby = nixpkgs-ruby.lib.packageFromRubyVersionFile {
-          file = ./.ruby-version;
-          inherit system;
-        };
       in
       rec {
         devShells.default = with pkgs;
           mkShell {
             buildInputs = [
-              ruby
+              # https://github.com/NixOS/nix/issues/730#issuecomment-162323824
+              bashInteractive
+
+              ruby_3_2
               dprint
               tree
               nil
@@ -42,10 +44,10 @@
               cp -rf ./lib $out
               install -t $out/bin bin/pure-console.rb
               makeWrapper $out/bin/pure-console.rb $out/bin/console \
-                --prefix PATH : ${nixpkgs.lib.makeBinPath [ ruby ]}
+                --prefix PATH : ${nixpkgs.lib.makeBinPath [ pkgs.ruby ]}
             '';
             runtimeDependencies = [
-              ruby
+              pkgs.ruby
             ];
           };