mirror/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-29 23:52:55 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #321040 from anthonyroussel/bundler-2.5.13

Browse Source
This commit is contained in:
Sandro 2024-07-16 13:26:59 +02:00 committed by GitHub
commit ce68870f49
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/interpreters/ruby/default.nix
View File

@ -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";

17
pkgs/development/interpreters/ruby/rubygems/default.nix
View File

@ -1,12 +1,17 @@
{ stdenv, lib, fetchurl }:
{
fetchurl,
gitUpdater,
lib,
stdenv,
}:
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 = [
@ -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";

4
pkgs/development/ruby-modules/bundler/default.nix
View File

@ -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 = ''