Commit graph

218 commits

Author SHA1 Message Date
Tobias Geerinckx-Rice 0f479e3016
geolite-legacy: 2016-04-19 -> 2016-04-25 2016-04-25 13:32:05 +02:00
Tobias Geerinckx-Rice de56b74775
geolite-legacy 2016-02-29 -> 2016-04-19
Should fix the bug of Kansas farmers getting SWATted.

http://fusion.net/story/287592/internet-mapping-glitch-kansas-farm/
2016-04-19 12:30:12 +02:00
Tobias Geerinckx-Rice 5a5012a7cd
tzdata: 2016c -> 2016d 2016-04-18 19:12:34 +02:00
Vladimír Čunát 056b5a1a5f tzdata: fixup after merging master
also rename lib output to dev - it contains a header and a static lib.
2016-04-02 16:26:32 +02:00
Vladimír Čunát ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Arseniy Seroka fba952024f tzdata: 2016a -> 2016b 2016-03-19 00:23:45 +03:00
Tobias Geerinckx-Rice 1c9d5306fb tzdata: 2015g -> 2016a 2016-03-16 21:10:20 +01:00
Vladimír Čunát 09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Tobias Geerinckx-Rice b82c8e3cd4 geolite-legacy 2016-02-25 -> 2016-02-29 2016-02-29 21:15:25 +01:00
Tobias Geerinckx-Rice 2179b1d491 geolite-legacy 2016-02-08 -> 2016-02-25 2016-02-25 20:54:39 +01:00
Vladimír Čunát d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Tobias Geerinckx-Rice 2671d4ffdb wireless-regdb: 2015-12-14 -> 2016-02-08 2016-02-12 00:14:01 +01:00
Eelco Dolstra aea262f654 Fix misspelled meta.maintainers attributes 2016-02-10 14:59:50 +01:00
Tobias Geerinckx-Rice e5b143a964 geolite-legacy 2016-02-02 -> 2016-02-08 2016-02-08 19:15:41 +01:00
Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Tobias Geerinckx-Rice 133ad6d722 geolite-legacy 2016-02-01 -> 2016-02-02 2016-02-02 21:22:42 +01:00
Tobias Geerinckx-Rice 8ba0fe2866 geolite-legacy 2016-01-25 -> 2016-02-01 2016-02-01 19:39:18 +01:00
Tobias Geerinckx-Rice ac33b4724a More version attribute tidying where maintainers |= nckx 2016-01-25 20:08:34 +01:00
Tobias Geerinckx-Rice 9fb8020e4e Add version attribute where maintainers |= nckx
This will probably be mandatory soon, and is a step in the right
direction. Removes the deprecated meta.version, and move some meta
sections to the end of the file where I should have put them in
the first place.
2016-01-25 17:35:21 +01:00
Tobias Geerinckx-Rice 7b6454cbb9 geolite-legacy 2016-01-18 -> 2016-01-25 2016-01-25 16:37:13 +01:00
Vladimír Čunát 716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Tobias Geerinckx-Rice 5cf03589a4 geolite-legacy 2016-01-11 -> 2016-01-18 2016-01-18 15:22:40 +01:00
Tobias Geerinckx-Rice 15f6633210 geolite-legacy 2016-01-06 -> 2016-01-11 2016-01-11 14:22:32 +01:00
Mathijs Kwik c90be3dd3a geolite-legacy 2015-11-23 -> 2016-01-06 2016-01-06 11:59:54 +01:00
Vladimír Čunát f9f6f41bff Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Tobias Geerinckx-Rice 624b3a34c0 wireless-regdb: change homepage to more accessible wiki 2015-12-31 05:04:05 +01:00
Tobias Geerinckx-Rice f50a719a4d wireless-regdb: licenses.{free -> isc}, apparently 2015-12-27 21:43:26 +01:00
Tobias Geerinckx-Rice b88abaaf5e wireless-regdb: init at 2015-12-14 2015-12-27 19:00:42 +01:00
Luca Bruno a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Tobias Geerinckx-Rice 71e3811cde geolite-legacy 2015-11-17 -> 2015-11-23 2015-11-24 01:40:41 +01:00
Vladimír Čunát 333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Tobias Geerinckx-Rice 8d33c88c4f geolite-legacy 2015-11-04 -> 2015-11-17 2015-11-17 19:15:11 +01:00
William A. Kennington III 4251612faa Merge branch 'master.upstream' into staging.upstream 2015-11-04 01:00:48 -08:00
Tobias Geerinckx-Rice 8fb1ee3c2a geolite-legacy 2015-11-02 -> 2015-11-04 2015-11-04 03:05:14 +01:00
Tobias Geerinckx-Rice 4435e317e9 geolite-legacy 2015-10-27 -> 2015-11-02 2015-11-02 01:47:07 +01:00
William A. Kennington III dd2de66d61 Merge branch 'master.upstream' into staging.upstream 2015-10-30 17:16:07 -07:00
Tobias Geerinckx-Rice d5ea5f0a5d geolite-legacy 2015-10-19 -> 2015-10-27 2015-10-28 00:57:37 +01:00
Vladimír Čunát 4917a4f8b3 Merge master into staging 2015-10-23 01:57:14 +02:00
Tobias Geerinckx-Rice a6626bef1a geolite-legacy 2015-10-13 -> 2015-10-19 2015-10-19 19:03:05 +02:00
William A. Kennington III 8a44a36ca4 Merge branch 'master.upstream' into staging.upstream 2015-10-15 10:22:28 -07:00
Tobias Geerinckx-Rice 7d8602e78e geolite-legacy 2015-10-09 -> 2015-10-13 2015-10-13 20:07:17 +02:00
Tobias Geerinckx-Rice 2cd4e12f6c geolite-legacy 2015-10-08 -> 2015-10-09
Jeez.
2015-10-09 10:09:03 +02:00
Tobias Geerinckx-Rice 9108533d4e geolite-legacy 2015-10-06 -> 2015-10-08 2015-10-08 01:43:08 +02:00
Tobias Geerinckx-Rice 883cca5f36 geolite-legacy 2015-10-05 -> 2015-10-06 (bis)
Previous patch was incomplete.
2015-10-06 20:11:54 +02:00
Tobias Geerinckx-Rice 056c3b8bc6 geolite-legacy 2015-10-05 -> 2015-10-06 2015-10-06 20:06:51 +02:00
Tobias Geerinckx-Rice 1f3bb8ba8c geolite-legacy: update 2015-09-29 -> 2015-10-05 2015-10-05 12:28:08 +02:00
Vladimír Čunát b2e73c81d9 media-player-info: fix build missing udev
I don't know what it actually needs, but it's satisfied by systemd.
2015-10-04 11:59:15 +02:00
Vladimír Čunát 5227fb1dd5 Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Tobias Geerinckx-Rice 0e5458edac tzdata: 2015f -> 2015g
(cherry picked from commit 18b3295970)
2015-10-02 14:17:22 +02:00
Tobias Geerinckx-Rice d1047f7c12 shared-mime-info: 1.3 -> 1.5 2015-10-02 05:31:41 +02:00