From af6690a77161745a59d5c94719113d9b3ddf9505 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Wed, 19 Jun 2024 16:30:46 +0200 Subject: [PATCH 1/3] bundler: 2.5.11 -> 2.5.15 https://github.com/rubygems/rubygems/releases/tag/bundler-v2.5.12 https://github.com/rubygems/rubygems/releases/tag/bundler-v2.5.13 https://github.com/rubygems/rubygems/releases/tag/bundler-v2.5.14 https://github.com/rubygems/rubygems/releases/tag/bundler-v2.5.15 https://github.com/rubygems/rubygems/compare/bundler-v2.5.11...bundler-v2.5.15 --- pkgs/development/ruby-modules/bundler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index 581c2544a220..de08320066e6 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "2.5.11"; - source.sha256 = "sha256-3XhL/lODSzmlbmQtvG4eyhmi5kVOTVOZTLcpgAWsTC4="; + version = "2.5.15"; + source.sha256 = "sha256-YUKA8DH/jZrewERrXK/aAQOiSGUg1Vb5/BTRh2LEhhM="; dontPatchShebangs = true; postFixup = '' From edb4e41b4b0d5f2e36e53718ed00bc86c517d8e0 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Wed, 19 Jun 2024 16:32:07 +0200 Subject: [PATCH 2/3] ruby.rubygems: 3.5.11 -> 3.5.15 https://github.com/rubygems/rubygems/compare/v3.5.11...v3.5.15 --- pkgs/development/interpreters/ruby/rubygems/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix index 9ad7a04eab06..f2d0c84223f0 100644 --- a/pkgs/development/interpreters/ruby/rubygems/default.nix +++ b/pkgs/development/interpreters/ruby/rubygems/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rubygems"; - version = "3.5.11"; + version = "3.5.15"; src = fetchurl { url = "https://rubygems.org/rubygems/rubygems-${version}.tgz"; - hash = "sha256-RSG1L4Q2IKn8XKdBRSa3RjsJiVZMOugLJraPvRMEyBg="; + hash = "sha256-0Ibhw2j9PL4Eyg8QhFnQFC0NV0E66eHS/0siDryOa4c="; }; patches = [ From a1d6c177ecbaa6464cc515aae2a848fb405fe93f Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Fri, 12 Jul 2024 18:27:25 +0200 Subject: [PATCH 3/3] ruby.rubygems: add passthru.updateScript --- pkgs/development/interpreters/ruby/default.nix | 4 +++- .../interpreters/ruby/rubygems/default.nix | 13 ++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 10906bd67be1..a47e8cdf73ce 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -6,6 +6,7 @@ , makeBinaryWrapper, buildRubyGem, defaultGemConfig, removeReferencesTo , openssl , linuxPackages, libsystemtap +, gitUpdater } @ args: let @@ -13,7 +14,7 @@ let ops = lib.optionals; opString = lib.optionalString; config = import ./config.nix { inherit fetchFromSavannah; }; - rubygems = import ./rubygems { inherit stdenv lib fetchurl; }; + rubygems = import ./rubygems { inherit stdenv lib fetchurl gitUpdater; }; # Contains the ruby version heuristics rubyVersion = import ./ruby-version.nix { inherit lib; }; @@ -57,6 +58,7 @@ let rubygemsSupport = false; } , useBaseRuby ? stdenv.hostPlatform != stdenv.buildPlatform + , gitUpdater }: stdenv.mkDerivation ( finalAttrs: { pname = "ruby"; diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix index f2d0c84223f0..b7b3f8814252 100644 --- a/pkgs/development/interpreters/ruby/rubygems/default.nix +++ b/pkgs/development/interpreters/ruby/rubygems/default.nix @@ -1,4 +1,9 @@ -{ stdenv, lib, fetchurl }: +{ + fetchurl, + gitUpdater, + lib, + stdenv, +}: stdenv.mkDerivation rec { pname = "rubygems"; @@ -21,6 +26,12 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = gitUpdater { + url = "https://github.com/rubygems/rubygems.git"; + rev-prefix = "v"; + ignoredVersions = "(pre|alpha|beta|rc|bundler).*"; + }; + meta = with lib; { description = "Package management framework for Ruby"; changelog = "https://github.com/rubygems/rubygems/blob/v${version}/CHANGELOG.md";