Commit graph

652 commits

Author SHA1 Message Date
Ben Siraphob b04fc593e7 treewide: cmake buildInputs to nativeBuildInputs, minor cleanups 2021-01-01 11:52:33 +07:00
ajs124 4e70a418c7 tzdata: 2020c -> 2020f 2020-12-29 21:41:01 +01:00
Peter Simons d8d2e94f97 all-cabal-hashes: update to Hackage at 2020-12-24T01:16:25Z 2020-12-25 20:42:36 +01:00
github-actions[bot] 6904262415
Merge master into staging-next 2020-12-19 00:42:26 +00:00
Peter Simons 365fc52cd1 all-cabal-hashes: update to Hackage at 2020-12-18T01:03:03Z 2020-12-18 20:49:03 +01:00
ajs124 11d6355308 cacert: 3.57 -> 3.60 2020-12-17 07:31:34 +01:00
Mario Rodas 9de26d2610
Merge pull request #106476 from r-ryantm/auto-update/osinfo-db
osinfo-db: 20201015 -> 20201119
2020-12-13 20:56:07 -05:00
R. RyanTM cc6e51138a osinfo-db: 20201015 -> 20201119 2020-12-09 19:24:27 +00:00
github-actions[bot] db90e75ade
Merge staging-next into staging 2020-12-08 00:39:07 +00:00
Daniël de Kok 18a5777c77
fedora-backgrounds: use stdenvNoCC (#106149)
No need for a C build environment when copying some backgrounds.
2020-12-07 13:49:58 -05:00
github-actions[bot] acbe77678e
Merge staging-next into staging 2020-12-05 00:38:04 +00:00
github-actions[bot] 4763e8b8fd
Merge master into staging-next 2020-12-05 00:38:01 +00:00
Peter Simons 9b7113f437 all-cabal-hashes: update to Hackage at 2020-12-04T10:00:55Z 2020-12-04 22:26:28 +01:00
Andreas Rammhold f17006459c
Merge pull request #105568 from lukegb/nixpkgs-cacert-blacklist
cacert: fix certificate denylist
2020-12-01 20:11:55 +01:00
Luke Granger-Brown 87f4676492 cacert: add lukegb as maintainer 2020-12-01 17:55:59 +00:00
Andreas Rammhold 17b1bde9c5
cacert: add myself as maintainer 2020-12-01 17:51:05 +01:00
Luke Granger-Brown b28436a7e9 cacert: remove broken includeEmail option
This doesn't do anything. Building with includeEmail = true produces
the same set as includeEmail = false, and the substitute rule removes
a random dictionary index operation.
2020-12-01 15:54:58 +00:00
Luke Granger-Brown b1f9e9c259 cacert: fix blacklist
It's broken under Python 3, ironically due to the patch we're carrying.
Fix it, and add a test to check it works.

Fixes #93230.
2020-12-01 15:54:58 +00:00
Frederik Rietdijk ff90abd5dd Merge staging-next into staging 2020-12-01 14:23:10 +01:00
R. RyanTM 418c88a4d5 spdx-license-list-data: 3.10 -> 3.11 2020-12-01 09:29:21 +00:00
Mario Rodas e91a1e91a6
Merge pull request #102638 from r-ryantm/auto-update/osinfo-db
osinfo-db: 20200804 -> 20201015
2020-11-28 20:32:11 -05:00
Timo Kaufmann e04721b289
Merge pull request #104083 from timokau/sage-maintainers-team
maintainers: create sage team
2020-11-19 19:20:49 +01:00
Daniël de Kok a0bbcb7632 fedora-backgrounds.f33: init at 33.0.7 2020-11-19 10:52:31 +08:00
Timo Kaufmann ff8338343b maintainers: create sage team
Maintaining all the packages whose updates might break some aspect of
sage.

For reference:
https://github.com/NixOS/nixpkgs/pull/103810#issuecomment-727536510
2020-11-18 21:27:37 +01:00
Andreas Rammhold 94448baf6d
cacert: decouple from NSS to reduce rebuild amount
In [#100765] @vcunat pointed out that we could decouple cacert from the
NSS package to make it more rebuild friendly. Just rebuilding packages
that depend on NSS seems to be about ~100. Rebuilding all the packages
that depend on cacert is >9k as of this writing. This makes it much more
feasible to upgrade high-profile packages that are (rightfully) pedantic
on their NSS version like firefox and thunderbird.

[#100765]: https://github.com/NixOS/nixpkgs/pull/100765
2020-11-18 20:13:22 +01:00
Frederik Rietdijk 8aaf2e60e5 Merge staging-next into staging 2020-11-09 14:49:10 +01:00
Frederik Rietdijk 20f001c01e Merge master into staging-next 2020-11-09 14:33:52 +01:00
Peter Simons 78bb20c424 all-cabal-hashes: update to Hackage at 2020-11-06T01:07:40Z 2020-11-06 21:37:06 +01:00
Robert Hensing d328ba130b tzdata: Revert to the "fat" "bloated" format
The timezone dumps have switched to a "slim" format since 2020b.
This has broken various packages, including
 - go 1.4 (used for bootstrapping)
 - haskellPackages.tz
 - libical

The "fat" format can still be generated, as this commit shows.
It seems to create files that are *mostly* the slim versions with
some more data attached.
2020-11-06 14:48:28 +01:00
R. RyanTM cc3d5f46e3 poppler_data: 0.4.9 -> 0.4.10 2020-11-04 17:51:12 +01:00
R. RyanTM 87246e474b osinfo-db: 20200804 -> 20201015 2020-11-03 15:02:56 +00:00
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 336bc8283b
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
This reverts commit c778945806.

I believe this is exactly what brings the staging branch into
the right shape after the last merge from master (through staging-next);
otherwise part of staging changes would be lost
(due to being already reachable from master but reverted).
2020-10-26 08:19:17 +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
Vladimír Čunát 17f5305b6c
Merge #101508: libraw: 0.20.0 -> 0.20.2 2020-10-25 09:28:53 +01:00
Peter Simons 7f7a12f20e all-cabal-hashes: update to Hackage at 2020-10-22T01:32:08Z 2020-10-23 21:00:26 +02:00
ajs124 8904ce243a tzdata: 2019c -> 2020c 2020-10-20 21:09:28 +02:00
Ben Siraphob 683a87dbeb treewide: remove periods from end of package descriptions 2020-10-17 08:22:31 -07:00
Peter Simons 582f5cea5f all-cabal-hashes: update to Hackage at 2020-10-01T23:28:17Z 2020-10-02 21:07:31 +02:00
Peter Simons ae183ba4f7 all-cabal-hashes: update to Hackage at 2020-09-25T08:31:15Z 2020-09-25 21:10:38 +02:00
R. RyanTM 37a3ebb725 cldr-emoji-annotation: 37.0_13.0_0_1 -> 37.0_13.0_0_2 2020-09-01 23:42:39 +02:00
Jan Tojnar 36cfca88a7 osinfo-db: 20200529 -> 20200804 2020-08-16 23:48:40 +02:00
R. RyanTM cf0c098e35 spdx-license-list-data: 3.9 -> 3.10 2020-08-11 14:29:58 +00:00
Frederik Rietdijk 67af42e35f Merge staging-next into staging 2020-08-01 19:37:45 +02:00
Jörg Thalheim 9cb6894241
iana-etc: 20200407 -> 20200729 2020-08-01 09:57:46 +01:00
Peter Simons 16bd71bf8e all-cabal-hashes: update to Hackage at 2020-07-30T22:14:54Z 2020-07-31 21:21:57 +02:00
Peter Simons 3b46d9a65e all-cabal-hashes: update to Hackage at 2020-07-24T00:16:27Z 2020-07-24 21:38:22 +02:00
R. RyanTM af34714c8d cldr-emoji-annotation: 36.12.120200305_0 -> 37.0_13.0_0_1 2020-07-06 04:19:34 +02:00
Maximilian Bosch 3897eb5836
Merge pull request #92234 from samuelgrf/update/nixos-wallpapers
nixos-artwork: add missing wallpapers
2020-07-04 19:27:15 +02:00
Samuel Gräfenstein 18b5737723
nixos-artwork: add missing wallpapers 2020-07-04 00:31:18 +02:00