From faa9c222a2f64c4cc928b31c32f7f24963494d8b Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Sat, 28 Dec 2024 19:09:03 +0900 Subject: [PATCH] Bump ruby to 3.4 era GH-1006 including https://github.com/NixOS/nixpkgs/commit/7ff2d4855a66dbd8c5ddf8206aab40a2f5766b25 --- flake.nix | 2 +- home-manager/git.nix | 2 +- home-manager/packages.nix | 2 +- pkgs/envs/package.nix | 2 +- .../package.nix | 2 +- pkgs/ir/package.nix | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index 0ac6ba3b..3650de69 100644 --- a/flake.nix +++ b/flake.nix @@ -130,7 +130,7 @@ trivy markdownlint-cli2 - (ruby_3_3.withPackages (ps: with ps; [ rubocop ])) + (ruby_3_4.withPackages (ps: with ps; [ rubocop ])) ]) ++ (with pkgs.unstable; [ # https://github.com/NixOS/nixpkgs/pull/362139 diff --git a/home-manager/git.nix b/home-manager/git.nix index 5fca80bf..25ce13c6 100644 --- a/home-manager/git.nix +++ b/home-manager/git.nix @@ -46,7 +46,7 @@ in reset-main = '' !git fetch origin && \ git switch main && \ - git branch -m "backup-main-$(${lib.getBin pkgs.ruby_3_3}/bin/ruby -r 'securerandom' -e 'puts SecureRandom.uuid')" && \ + git branch -m "backup-main-$(${lib.getBin pkgs.ruby_3_4}/bin/ruby -r 'securerandom' -e 'puts SecureRandom.uuid')" && \ git checkout origin/main && \ git checkout -b main ''; diff --git a/home-manager/packages.nix b/home-manager/packages.nix index c9180f89..5313130d 100644 --- a/home-manager/packages.nix +++ b/home-manager/packages.nix @@ -82,7 +82,7 @@ gnumake go-task # Installing for enabling shell completion easy gitleaks - ruby_3_3 + ruby_3_4 _7zz # `7zz` - 7zip. Command is not 7zip. pastel diff --git a/pkgs/envs/package.nix b/pkgs/envs/package.nix index 530bf86f..3920d332 100644 --- a/pkgs/envs/package.nix +++ b/pkgs/envs/package.nix @@ -4,7 +4,7 @@ pkgs.writeShellApplication rec { text = builtins.readFile ./${name}.bash; runtimeInputs = with pkgs; [ fzf - ruby_3_3 # pkgs.writers.writeRuby and writeRubyBin does not fit + ruby_3_4 # pkgs.writers.writeRuby and writeRubyBin does not fit ]; runtimeEnv = { RUBY_SCRIPT_PATH = "${./${name}.rb}"; diff --git a/pkgs/fzf-bind-posix-shell-history-to-git-commit-message/package.nix b/pkgs/fzf-bind-posix-shell-history-to-git-commit-message/package.nix index 0abe28f9..64b626c4 100644 --- a/pkgs/fzf-bind-posix-shell-history-to-git-commit-message/package.nix +++ b/pkgs/fzf-bind-posix-shell-history-to-git-commit-message/package.nix @@ -6,7 +6,7 @@ pkgs.writeShellApplication rec { my.safe_quote_backtik git fzf - ruby_3_3 + ruby_3_4 ]; meta = { description = "Used in git alias"; diff --git a/pkgs/ir/package.nix b/pkgs/ir/package.nix index 520f5cdd..eef2fde6 100644 --- a/pkgs/ir/package.nix +++ b/pkgs/ir/package.nix @@ -9,7 +9,7 @@ pkgs.writeShellApplication rec { # - sed: Always forgot how to use # - sd: Inactive # - sad: Too much for filter - ruby_3_3 + ruby_3_4 findutils # xargs gnugrep