3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

90 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
TredwellGit 71164865ce harfbuzz: 2.7.1 -> 2.7.2
https://github.com/harfbuzz/harfbuzz/releases/tag/2.7.2
2020-10-11 02:52:06 +00:00
sternenseemann c9a7fdfcfb harfbuzz: 2.6.7 → 2.7.1
* Upstream changed from freedesktop.org to GitHub,
  so updateWalker is disabled and fetchFromGitHub used
* Build system now based on meson/ninja
* python3 instead of python
* postInstall hook moved to postFixup since it depends on
  some files being moved around in fixupPhase
* Build developer manual using gtk-doc
2020-08-24 11:57:46 +02:00
(cdep)illabout 847fc1c80d
harfbuzz: enable support for gobject-introspection 2020-07-25 16:47:14 +09:00
R. RyanTM 858acc3ee5 harfbuzz: 2.6.4 -> 2.6.7 2020-06-13 10:54:40 +02:00
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
R. RyanTM cfc2cc8291 harfbuzz: 2.6.2 -> 2.6.4 2019-11-03 10:31:50 +01:00
R. RyanTM 2c33c2b9f0 harfbuzz: 2.6.1 -> 2.6.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/harfbuzz/versions
2019-10-22 09:23:12 +02:00
Will Dietz 94aa75c2c9 harfbuzz: 2.6.0 -> 2.6.1
https://github.com/harfbuzz/harfbuzz/releases/tag/2.6.1
2019-09-06 19:33:08 +02:00
R. RyanTM 2bcba7336f harfbuzz: 2.5.3 -> 2.6.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/harfbuzz/versions
2019-08-31 12:34:42 +02:00
R. RyanTM e64663cfbe harfbuzz: 2.5.1 -> 2.5.3
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/harfbuzz/versions
2019-07-20 09:40:56 +02:00
Will Dietz 137a63f9f6
harfbuzz: 2.5.0 -> 2.5.1
https://github.com/harfbuzz/harfbuzz/releases/tag/2.5.1
2019-06-04 15:23:32 -05:00
Will Dietz 98bdeb049d
harfbuzz: 2.3.1 -> 2.5.0
https://github.com/harfbuzz/harfbuzz/releases/tag/2.5.0
2019-05-28 20:15:07 -05:00
Frederik Rietdijk 488fb5829a Revert "harfbuzz: 2.3.1 -> 2.4.0"
This reverts commit bcbbbf97b3.

The hash has changed several times. We should look into fetching
from git instead.
2019-04-17 09:47:01 +02:00
Will Dietz bcbbbf97b3 harfbuzz: 2.3.1 -> 2.4.0
https://github.com/harfbuzz/harfbuzz/releases/tag/2.4.0
https://lists.freedesktop.org/archives/harfbuzz/2019-March/007277.html
2019-04-16 18:57:21 +02:00
Matthew Bauer ad2585e350 harfbuzz-icu: disable error for cast-align 2019-02-23 23:26:54 -05:00
Will Dietz c2bb029133 harfbuzz: 2.3.0 -> 2.3.1
https://github.com/harfbuzz/harfbuzz/releases/tag/2.3.1
2019-01-31 14:16:27 -06:00
Will Dietz cbce67fd0a harfbuzz: 2.2.0 -> 2.3.0
https://github.com/harfbuzz/harfbuzz/releases/tag/2.3.0
2018-12-29 13:52:55 -06:00
R. RyanTM 15bd127949 harfbuzz: 2.1.0 -> 2.2.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/harfbuzz/versions
2018-12-19 09:11:29 +01:00
Will Dietz e4f28df8bc harfbuzz: 2.0.0 -> 2.1.0
https://github.com/harfbuzz/harfbuzz/releases/tag/2.1.0
2018-11-01 11:09:13 -05:00
Will Dietz 55fff70a98 harfbuzz: 1.9.0 -> 2.0.0
https://github.com/harfbuzz/harfbuzz/releases/tag/2.0.0
2018-10-21 08:40:41 +02:00
Frederik Rietdijk 6f5142e48e Merge master into staging 2018-10-13 09:48:20 +02:00
Benjamin Hipple 3ec3116fae harfbuzz: add license 2018-10-09 21:27:05 -04:00
R. RyanTM b85cb53c4d harfbuzz: 1.8.8 -> 1.9.0 (#47049)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/harfbuzz/versions
2018-10-03 00:40:39 +02:00
Daiderd Jordan 10267bfc90
harfbuzz: avoid rebuilds 2018-08-21 21:01:34 +02:00
Daiderd Jordan c93660a7a4
harfbuzz: add CoreText support 2018-08-21 21:01:21 +02:00
Vladimír Čunát 65af43026a
Merge #45224: harfbuzz: 1.8.2 -> 1.8.8
It builds, NEWS seem safe enough.
2018-08-18 12:53:27 +02:00
R. RyanTM 7cb57d7530 harfbuzz: 1.8.2 -> 1.8.8
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/harfbuzz/versions.
2018-08-17 02:28:29 -07:00
Jan Malakhovski 9808244aae harfbuzz: fix tests, also cleanup 2018-08-10 12:56:35 +00:00
R. RyanTM 4488d3deb3 harfbuzz-icu: 1.8.1 -> 1.8.2
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/harfbuzz-icu/versions.
2018-07-11 04:22:54 -07:00
R. RyanTM b30a745d21 harfbuzz-icu: 1.8.0 -> 1.8.1
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/harfbuzz-icu/versions.

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 1.8.1 with grep in /nix/store/419wp0z2096xs6kp9zlj20hys61clnay-harfbuzz-icu-1.8.1
- directory tree listing: https://gist.github.com/e7c8b4aebf0715a6aee75d6fe6d3e8e1
- du listing: https://gist.github.com/ff39237157e9c975f8c6d8a66326c6b7
2018-07-04 00:22:11 -07:00
Silvan Mosberger 57bccb3cb8 treewide: http -> https sources (#42676)
* treewide: http -> https sources

This updates the source urls of all top-level packages from http to
https where possible.

* buildtorrent: fix url and tab -> spaces
2018-06-28 20:43:35 +02:00
R. RyanTM f9733df3e8 harfbuzz: 1.7.6 -> 1.8.0
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/harfbuzz/versions.

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 1.8.0 with grep in /nix/store/zdzpback8gi0b28l4qmjk1895wz221df-harfbuzz-1.8.0
- directory tree listing: https://gist.github.com/dfbf59c0a3dd43f2ec145351a6dea823
- du listing: https://gist.github.com/1127d0067d13c892c5ebdb8fe032fba7
2018-06-08 08:23:41 -07:00
Jörg Thalheim 9ac7fa77df
Merge pull request #38555 from r-ryantm/auto-update/harfbuzz
harfbuzz: 1.7.5 -> 1.7.6
2018-04-08 12:23:53 +01:00
R. RyanTM 1a59c8d09c harfbuzz: 1.7.5 -> 1.7.6
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/harfbuzz/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.7.6 with grep in /nix/store/q29jj339iyq46gh6dx7zrpbgx07b7826-harfbuzz-1.7.6
- directory tree listing: https://gist.github.com/ea2a4f299a574853f5fa5137ff8505ca
2018-04-07 08:53:21 -07:00
Matthew Bauer ed2a9cf65f treewide: remove libintl hacks 2018-03-22 16:50:11 -05:00
Vladimír Čunát e571f14d39
harfbuzz: 1.7.1 -> 1.7.5 2018-02-24 22:30:23 +01:00
Vladimír Čunát b800aa18fe
harfbuzz: 1.5.1 -> 1.7.1 2017-11-27 15:10:06 +01:00
Vladimír Čunát b4be1cb8e0
harfbuzz: 1.4.8 -> 1.5.1 2017-09-24 11:28:31 +02:00
Vladimír Čunát cbfb89f996
harfbuzz: 1.4.6 -> 1.4.8 2017-08-13 16:29:14 +02:00
Vladimír Čunát d3d036d864
harfbuzz: 1.4.5 -> 1.4.6 2017-06-11 15:05:32 +02:00
Vladimír Čunát 148f4996b5
harfbuzz: bugfix 1.4.4 -> 1.4.5 2017-04-18 18:41:53 +02:00
Michael Raskin eaf8cf2f75 harfbuzz: 1.4.2 -> 1.4.4 2017-03-09 18:59:31 +01:00
Michael Raskin 426dddd83d harfbuzz: 1.4.1 -> 1.4.2 2017-02-03 13:14:39 +01:00
Vladimír Čunát 9a9912a3e4
harfbuzz: 1.3.4 -> 1.4.1 2017-01-06 21:35:56 +01:00
Michael Raskin 1461981190 harfbuzz: 1.3.3 -> 1.3.4 2016-12-08 16:15:18 +01:00
Vladimír Čunát 8f89fe65a2
harfbuzz: 1.3.2 -> 1.3.3 2016-12-03 12:12:18 +01:00
Michael Raskin 1e753d1fbc harfbuzz: 1.3.1 -> 1.3.2 2016-10-04 09:59:04 +02:00
Michael Raskin b2c386cf7c harfbuzz: 1.2.7 -> 1.3.1 2016-09-26 15:49:30 +02:00