diff --git a/pkgs/applications/version-management/darcs-to-git/default.nix b/pkgs/applications/version-management/darcs-to-git/default.nix index 14348921054b2..5a17c939652c7 100644 --- a/pkgs/applications/version-management/darcs-to-git/default.nix +++ b/pkgs/applications/version-management/darcs-to-git/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, ruby, gnugrep, diffutils, git, darcs }: +{ lib, stdenv, fetchFromGitHub, ruby, gnugrep, diffutils, git, darcs, unstableGitUpdater }: stdenv.mkDerivation { pname = "darcs-to-git"; - version = "2015-06-04"; + version = "unstable-2024-02-20"; src = fetchFromGitHub { owner = "purcell"; repo = "darcs-to-git"; - rev = "e5fee32495908fe0f7d700644c7b37347b7a0a5b"; - sha256 = "sha256-UQI3av+0zj1SNwEonwuk5n2RjZN3+tSJFJuFCjrorFM="; + rev = "2a31a95726658fef1b48e1f0010928fc2a69d5bf"; + hash = "sha256-ep36lAYUnO3kX0ff3PxrBHog5CIGsJaERiNN5DmmAQI="; }; patchPhase = let @@ -72,6 +72,8 @@ stdenv.mkDerivation { rm -rf "$darcs_repos" "$git_repos" "$test_home" ''; + passthru.updateScript = unstableGitUpdater { }; + meta = { description = "Converts a Darcs repository into a Git repository"; homepage = "http://www.sanityinc.com/articles/converting-darcs-repositories-to-git"; diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index c14cb4648e35a..c40949d822727 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -100,18 +100,11 @@ let # make: *** [uncommon.mk:373: do-install-all] Error 1 enableParallelInstalling = false; - patches = op (lib.versionOlder ver.majMin "3.1") ./do-not-regenerate-revision.h.patch - ++ op useBaseRuby ( + patches = + op useBaseRuby ( if atLeast32 then ./do-not-update-gems-baseruby-3.2.patch else ./do-not-update-gems-baseruby.patch ) - ++ ops (ver.majMin == "3.0") [ - # Ruby 3.0 adds `-fdeclspec` to $CC instead of $CFLAGS. Fixed in later versions. - (fetchpatch { - url = "https://github.com/ruby/ruby/commit/0acc05caf7518cd0d63ab02bfa036455add02346.patch"; - hash = "sha256-43hI9L6bXfeujgmgKFVmiWhg7OXvshPCCtQ4TxqK1zk="; - }) - ] ++ ops atLeast31 [ # When using a baseruby, ruby always sets "libdir" to the build # directory, which nix rejects due to a reference in to /build/ in diff --git a/pkgs/development/interpreters/ruby/do-not-regenerate-revision.h.patch b/pkgs/development/interpreters/ruby/do-not-regenerate-revision.h.patch deleted file mode 100644 index ddeb368ee8aeb..0000000000000 --- a/pkgs/development/interpreters/ruby/do-not-regenerate-revision.h.patch +++ /dev/null @@ -1,23 +0,0 @@ -Do not regenerate revision.h - -Ruby's makefile compares the shipped version with the git revision to regenerate -revision.h [1], but since we don't include git in buildInputs, this comparison -fails and it can't find $(REVISION_H). - -[1] https://github.com/ruby/ruby/commit/97a5af62a318fcd93a4e5e4428d576c0280ddbae - -diff -Naur ruby.old/defs/gmake.mk ruby.new/defs/gmake.mk ---- ruby.old/defs/gmake.mk -+++ ruby.new/defs/gmake.mk -@@ -325,11 +325,9 @@ - - REVISION_IN_HEADER := $(shell sed -n 's/^\#define RUBY_FULL_REVISION "\(.*\)"/\1/p' $(srcdir)/revision.h 2>/dev/null) - REVISION_LATEST := $(shell $(CHDIR) $(srcdir) && git log -1 --format=%H 2>/dev/null) --ifneq ($(REVISION_IN_HEADER),$(REVISION_LATEST)) - # GNU make treat the target as unmodified when its dependents get - # updated but it is not updated, while others may not. - $(srcdir)/revision.h: $(REVISION_H) --endif - - # Query on the generated rdoc - # diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bbef460b03a55..e5233b47dfa78 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17917,8 +17917,8 @@ with pkgs; ruby_3_2 ruby_3_3; - ruby = ruby_3_1; - rubyPackages = rubyPackages_3_1; + ruby = ruby_3_2; + rubyPackages = rubyPackages_3_2; rubyPackages_3_1 = recurseIntoAttrs ruby_3_1.gems; rubyPackages_3_2 = recurseIntoAttrs ruby_3_2.gems;