Age | Commit message (Collapse) | Author |
|
|
|
|
|
see #123718
Signed-off-by: Arthur Gautier <baloo@superbaloo.net>
|
|
|
|
It's been at least a year since I kept up to date with Ruby, and I
don't think I really have anything left to offer Nixpkgs in terms of
Ruby expertise.
|
|
I made a mistake merge. Reverting it in c778945806b 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: 4effe769e2b
- `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 (803ca85c209)
- fortunately no other commits have been pushed to staging-next yet
- applying a diff on staging-next to get it into that state
|
|
I'm sorry; I didn't notice it contained staging commits.
This reverts commit 17f5305b6c20df795c365368d2d868266519599e, reversing
changes made to a8a018ddc0a8b5c3d4fa94c94b672c37356bc075.
|
|
|
|
|
|
This fixes the rubyMinimal package.
|
|
Changelog: https://blog.rubygems.org/2019/12/20/3.1.2-released.html
|
|
|
|
* treewide: remove unused variables
* making ofborg happy
|
|
I think it makes more sense to keep the patches in-tree than on
zimbatm's RubyGems fork.
|