Commit graph

9 commits

Author SHA1 Message Date
Vladimír Čunát 89023c38fc
Recover the complicated situation after my bad merge
I made a mistake merge.  Reverting it in c778945806 undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.

I reconstructed the "desired" state of staging-next tree by:
 - checking out the last commit of the problematic range: 4effe769e2
 - `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
   merge commit and its revert from that range (while keeping
   reapplication from 4effe769e2)
 - merging the last unaffected staging-next commit (803ca85c20)
 - fortunately no other commits have been pushed to staging-next yet
 - applying a diff on staging-next to get it into that state
2020-10-26 09:01:04 +01:00
Vladimír Čunát c778945806
Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
I'm sorry; I didn't notice it contained staging commits.

This reverts commit 17f5305b6c, reversing
changes made to a8a018ddc0.
2020-10-25 09:41:51 +01:00
Jonathan del Strother f0431e22c1 rubygems: 3.1.2 -> 3.1.3 2020-10-20 21:10:43 +02:00
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Alyssa Ross a08e5665fa rubygems: fix for Ruby with no openssl
This fixes the rubyMinimal package.
2019-12-30 16:11:23 +01:00
Mario Rodas 298010982b ruby: rubygems 3.0.6 -> 3.1.2
Changelog: https://blog.rubygems.org/2019/12/20/3.1.2-released.html
2019-12-25 14:24:03 +00:00
Milan Pässler 48ca6ed3f4
ruby: rubygems 3.0.3 -> 3.0.6 2019-08-31 11:48:04 +00:00
volth f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Alyssa Ross 0ffedefb15
ruby: rubygems 2.7.7 -> 3.0.3
I think it makes more sense to keep the patches in-tree than on
zimbatm's RubyGems fork.
2019-04-29 12:37:22 +00:00
Renamed from pkgs/development/interpreters/ruby/rubygems.nix (Browse further)