commit e5b96de0f61042ffdc73467b27baf0423e5b58a9
parent 4ac006085b555420262ca60a0b0565508727690b
Author: Dan Callaghan <djc@djc.id.au>
Date: Mon, 6 Apr 2026 09:19:24 +1000
contrib/nix: bump nixpkgs
This is to get ruby_4_0.
ruby_3_1 and ruby_3_2 have been dropped, so pin these to their current
nixpkgs commit.
This also brings in gpgme 2.0.0, which broke ruby-gpgme. Bump ruby-gpgme
to 2.0.26 to get the fixes:
https://github.com/ueno/ruby-gpgme/pull/203
Diffstat:
11 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/Manifest.txt b/Manifest.txt
@@ -43,7 +43,11 @@ contrib/nix/ruby2.7-shell.nix
contrib/nix/ruby3.0-Gemfile.lock
contrib/nix/ruby3.0-gemset.nix
contrib/nix/ruby3.0-shell.nix
+contrib/nix/ruby3.1-Gemfile.lock
+contrib/nix/ruby3.1-gemset.nix
contrib/nix/ruby3.1-shell.nix
+contrib/nix/ruby3.2-Gemfile.lock
+contrib/nix/ruby3.2-gemset.nix
contrib/nix/ruby3.2-shell.nix
contrib/nix/ruby3.3-shell.nix
contrib/nix/ruby3.4-shell.nix
diff --git a/contrib/nix/Gemfile.lock b/contrib/nix/Gemfile.lock
@@ -6,7 +6,7 @@ GEM
chronic (0.10.2)
coderay (1.1.3)
fiddle (1.1.6)
- gpgme (2.0.24)
+ gpgme (2.0.26)
mini_portile2 (~> 2.7)
highline (3.1.2)
reline
@@ -98,4 +98,4 @@ DEPENDENCIES
xapian-ruby (~> 1.2)
BUNDLED WITH
- 2.5.22
+ 2.7.2
diff --git a/contrib/nix/gemset.nix b/contrib/nix/gemset.nix
@@ -55,10 +55,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0r1vmql7w7ka5xzj1aqf8pk2a4sv0znwj2zkg1fgvd5b89qcvv2k";
+ sha256 = "1amb4f0hgwdlz9dzblfpsidays3mb4cg65plwr0m6x1vp0pgvsqs";
type = "gem";
};
- version = "2.0.24";
+ version = "2.0.26";
};
highline = {
dependencies = ["reline"];
diff --git a/contrib/nix/Gemfile.lock b/contrib/nix/ruby3.1-Gemfile.lock
diff --git a/contrib/nix/gemset.nix b/contrib/nix/ruby3.1-gemset.nix
diff --git a/contrib/nix/ruby3.1-shell.nix b/contrib/nix/ruby3.1-shell.nix
@@ -8,7 +8,7 @@ let
name = "ruby3.1-gems-for-sup";
ruby = pkgs.ruby_3_1;
gemfile = ./Gemfile;
- lockfile = ./Gemfile.lock;
- gemset = ./gemset.nix;
+ lockfile = ./ruby3.1-Gemfile.lock;
+ gemset = ./ruby3.1-gemset.nix;
};
in pkgs.mkShell { packages = [ gems gems.wrappedRuby pkgs.pandoc ]; }
diff --git a/contrib/nix/Gemfile.lock b/contrib/nix/ruby3.2-Gemfile.lock
diff --git a/contrib/nix/gemset.nix b/contrib/nix/ruby3.2-gemset.nix
diff --git a/contrib/nix/ruby3.2-shell.nix b/contrib/nix/ruby3.2-shell.nix
@@ -8,7 +8,7 @@ let
name = "ruby3.2-gems-for-sup";
ruby = pkgs.ruby_3_2;
gemfile = ./Gemfile;
- lockfile = ./Gemfile.lock;
- gemset = ./gemset.nix;
+ lockfile = ./ruby3.2-Gemfile.lock;
+ gemset = ./ruby3.2-gemset.nix;
};
in pkgs.mkShell { packages = [ gems gems.wrappedRuby pkgs.pandoc ]; }
diff --git a/contrib/nix/ruby3.3-shell.nix b/contrib/nix/ruby3.3-shell.nix
@@ -2,7 +2,7 @@ let
pkgs = import (builtins.fetchGit {
url = "https://github.com/NixOS/nixpkgs";
ref = "refs/heads/master";
- rev = "5d0ebea1934d80948ff7b84f3b06e4ec9d99ee49";
+ rev = "6de3b4b649253e8e0c7229edc3726d8a717b93fe";
}) {};
gems = pkgs.bundlerEnv {
name = "ruby3.3-gems-for-sup";
diff --git a/contrib/nix/ruby3.4-shell.nix b/contrib/nix/ruby3.4-shell.nix
@@ -2,7 +2,7 @@ let
pkgs = import (builtins.fetchGit {
url = "https://github.com/NixOS/nixpkgs";
ref = "refs/heads/master";
- rev = "5d0ebea1934d80948ff7b84f3b06e4ec9d99ee49";
+ rev = "6de3b4b649253e8e0c7229edc3726d8a717b93fe";
}) {};
gems = pkgs.bundlerEnv {
name = "ruby3.4-gems-for-sup";