Commit graph

26 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
freezeboy 347696a30b
brotli: 1.0.7 -> 1.0.9 (PR #100436)
Fixes CVE-2020-8927.
2020-10-17 10:46:14 +02:00
mlvzk 492b9af995 brotli: fix patch URL 2020-09-24 23:36:46 +02:00
Matthew Bauer 7ebd5999bd
brotli: add staticOnly option 2019-09-29 11:19:56 +02:00
volth 46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Will Dietz edfffe0adf brotli: 1.0.6 -> 1.0.7 (#48874) 2018-10-23 19:40:42 +02:00
Matthew Bauer a5de0ca963 treewide: preserve hashes
avoid mass rebuild from the last commits
2018-10-16 23:19:34 -05:00
Matthew Bauer 51e5f8af42 treewide: don’t set CMAKE_SYSTEM_NAME 2018-10-16 21:52:38 -05:00
Matthew Bauer 3bc7ad9364
Merge pull request #46773 from mcmtroffaes/feature/fix-brotli-mingw
brotli: ensure CMAKE_SYSTEM_NAME=Windows on mingw cross builds
2018-09-22 17:12:10 -05:00
Will Dietz 6e9cc8871f brotli: 1.0.5 -> 1.0.6 (#46903) 2018-09-20 00:10:47 +02:00
Matthias C. M. Troffaes e4f1968100 brotli: ensure CMAKE_SYSTEM_NAME=Windows on mingw cross builds
CMAKE passes the flag -rdynamic otherwise (which is not recognized by mingw).
Setting the appropriate flag avoids this problem and allows the build
to succeed.
2018-09-17 09:37:32 +01:00
Will Dietz 6f9a53c13c brotli: 1.0.4 -> 1.0.5 (#42702)
Release notes:
https://github.com/google/brotli/releases/tag/v1.0.5

Commits:
https://github.com/google/brotli/compare/v1.0.4...v1.0.5
2018-06-28 13:03:21 +02:00
R. RyanTM 59b75e06a6 brotli: 1.0.3 -> 1.0.4
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/7izjihjc6qc7z96hqvbh6y56rs7q63nd-brotli-1.0.4/bin/brotli -h’ got 0 exit code
- ran ‘/nix/store/7izjihjc6qc7z96hqvbh6y56rs7q63nd-brotli-1.0.4/bin/brotli --help’ got 0 exit code
- ran ‘/nix/store/7izjihjc6qc7z96hqvbh6y56rs7q63nd-brotli-1.0.4/bin/brotli -V’ and found version 1.0.4
- ran ‘/nix/store/7izjihjc6qc7z96hqvbh6y56rs7q63nd-brotli-1.0.4/bin/brotli --version’ and found version 1.0.4
- directory tree listing: https://gist.github.com/8f1f6ce7cb6e005fe8d7cb00a4f50222
2018-04-12 09:16:59 -07:00
Will Dietz c1c502e93b brotli: 1.0.2 -> 1.0.3
https://github.com/google/brotli/releases/tag/v1.0.3
2018-03-05 17:41:11 -06:00
Will Dietz c403410845 brotli: install man pages 2018-01-23 06:46:23 -06:00
Will Dietz 4c36d7e521 brotli: run tests 2018-01-23 06:46:23 -06:00
Daiderd Jordan dc2ae3aef6
brotli: remove darwin cmake fix 2018-01-07 09:45:56 +01:00
Daiderd Jordan 9d33aa50fe
brotli: fix darwin build 2018-01-03 20:40:56 +01:00
Eelco Dolstra e4beb97b9c
brotli: Use multiple outputs 2018-01-02 12:00:39 +01:00
Will Dietz 9064293f31 brotli: 1.0.1 -> 1.0.2 2017-12-29 17:11:33 -06:00
Orivej Desh 2a0e757fb8 brotli: 0.6.0 -> 1.0.1 2017-11-29 00:59:46 +00:00
Miguel Madrid cb19bc8a45 brotli: 0.5.2 -> 0.6.0 (#25812) 2017-05-20 14:04:33 +01:00
Dan Peebles 6f0a2af5bc brotli: fix on Darwin 2017-04-06 21:17:32 -04:00
Lluís Batlle i Rossell 0cee46dd21 brotli: update to 0.5.2
From 0.3.0
2017-02-16 21:34:44 +01:00
Vladimír Čunát 313faf07ba brotli: init at 0.3.0 2016-01-20 22:50:26 +01:00