about summary refs log tree commit diff
path: root/pkgs/development/libraries/harfbuzz
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2020-10-25 22:17:24 +0100
committerVladimír Čunát <v@cunat.cz>2020-10-26 09:01:04 +0100
commit89023c38fcef79ad135bf6070563be611c4c8d39 (patch)
tree48453a80001a7907890520f458b7c50aec598da8 /pkgs/development/libraries/harfbuzz
parent4bd836b381c474893747f9051cfac93d94d13786 (diff)
Recover the complicated situation after my bad merge
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
Diffstat (limited to 'pkgs/development/libraries/harfbuzz')
-rw-r--r--pkgs/development/libraries/harfbuzz/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index 8110f13d14cad..6c5703f521d72 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -11,7 +11,7 @@
 }:
 
 let
-  version = "2.7.1";
+  version = "2.7.2";
   inherit (stdenv.lib) optional optionals optionalString;
   mesonFeatureFlag = opt: b:
     "-D${opt}=${if b then "enabled" else "disabled"}";
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
     owner  = "harfbuzz";
     repo   = "harfbuzz";
     rev    = version;
-    sha256 = "172jmwp666xbs6yy1pc2495gnkz8xw11b8zkz3j19jxlvvp4mxcs";
+    sha256 = "0vfyxr3lvzp80j1347nrwpr1ndv265p15rj2q8rj31lb26nyz4dm";
   };
 
   postPatch = ''