Commit graph

14 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
R. RyanTM e548338dbc enchant: 2.2.11 -> 2.2.12 2020-10-18 03:54:17 +00:00
Jan Tojnar 1510876ee9
enchant: 2.2.10 → 2.2.11
https://github.com/AbiWord/enchant/releases/tag/v2.2.11
2020-09-12 15:08:04 +02:00
R. RyanTM 27b1dd93c9 enchant: 2.2.9 -> 2.2.10 2020-09-04 16:19:05 +02:00
R. RyanTM c9e9856c52 enchant: 2.2.8 -> 2.2.9 2020-08-25 15:49:07 +02:00
R. RyanTM e68418d000 enchant: 2.2.7 -> 2.2.8 2020-02-28 13:57:41 +00:00
R. RyanTM 98653a1976 enchant: 2.2.5 -> 2.2.7
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/enchant/versions
2019-10-21 09:27:01 -07:00
Jan Tojnar eca6a1371f
enchant: 2.2.4 → 2.2.5
https://github.com/AbiWord/enchant/blob/v2.2.5/NEWS#L1-L4
2019-09-02 11:28:08 +02:00
Jan Tojnar c1069b51ec
enchant: enable tests
We need to enable relocatability as per https://github.com/AbiWord/enchant/issues/219 for tests to work.
2019-09-02 11:27:49 +02:00
Jan Tojnar afb4fbb9ce
enchant: format with nixpkgs-fmt 2019-09-02 11:23:16 +02:00
Jan Tojnar 3c72fa7dda
enchant: 2.2.3 -> 2.2.4
Clean up the expression and prepare for tests. Unfortunately, I could not get them pass.
2019-08-06 12:04:16 +02:00
Jan Malakhovski 7438083a4d tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00:00
Jan Tojnar 4f338f0eee
enchant2: init at 2.2.3 2018-03-22 07:46:48 +01:00