1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 07:00:43 +00:00
Commit graph

256 commits

Author SHA1 Message Date
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
Tobias Geerinckx-Rice 18b3295970 tzdata: 2015f -> 2015g 2015-10-02 05:31:41 +02:00
Tobias Geerinckx-Rice 9515611009 geolite-legacy: update 2015-09-22 -> 2015-09-29 2015-09-29 13:48:31 +02:00
Tobias Geerinckx-Rice ceb94adffe geolite-legacy: update 2015-09-14 -> 2015-09-22 2015-09-22 03:47:09 +02:00
Tobias Geerinckx-Rice 6dc2a827c0 geolite-legacy: update 2015-09-08 -> 2015-09-14 2015-09-14 23:53:20 +02:00
Tobias Geerinckx-Rice b313fb0997 geolite-legacy: update 2015-09-03 -> 2015-09-08 2015-09-08 01:07:24 +02:00
Tobias Geerinckx-Rice a9b1c91285 geolite-legacy: update 2015-08-31 -> 2015-09-03 2015-09-03 01:17:28 +02:00
Tobias Geerinckx-Rice 2245e09218 geolite-legacy: update 2015-08-24 -> 2015-08-31 2015-08-31 17:17:33 +02:00
Domen Kožar e4644a5b58 Merge branch 'staging' 2015-08-25 14:14:54 +02:00
Tobias Geerinckx-Rice 5920d9e80e geolite-legacy: update 2015-08-17 -> 2015-08-24 2015-08-24 13:52:28 +02:00
William A. Kennington III 2ac70270e8 Merge branch 'master.upstream' into staging.upstream 2015-08-18 11:36:32 -07:00
Tobias Geerinckx-Rice 7a854e3ed5 sound-theme-freedesktop: init at 0.8 2015-08-17 23:26:52 +02:00
Tobias Geerinckx-Rice adca30f24b geolite-legacy: update 2015-08-11 -> 2015-08-17 2015-08-17 23:26:51 +02:00
William A. Kennington III 952def0e3c Merge branch 'master.upstream' into staging.upstream 2015-08-13 11:55:02 -07:00
Tobias Geerinckx-Rice 6783f1b440 tzdata: 2015e -> 2015f 2015-08-12 00:59:02 +02:00
Tobias Geerinckx-Rice ea3cd87383 geolite-legacy: 2015-08-05 -> 2015-08-11 2015-08-11 21:08:44 +02:00
Tobias Geerinckx-Rice 5c90fed5d7 geolite-legacy: support all platforms; it's just data 2015-08-06 16:21:57 +02:00
Tobias Geerinckx-Rice 588412857f geolite-legacy: 2015-08-03 -> 2015-08-05 2015-08-05 12:17:12 +02:00
Tobias Geerinckx-Rice bae1e6a0e9 geolite-legacy: 2015-07-30 -> 2015-08-03 2015-08-03 14:33:55 +02:00
Eelco Dolstra 0edfda814e Fix random ugliness 2015-07-31 01:36:41 +02:00
Tobias Geerinckx-Rice f628a70f9e geolite-legacy: 2015-07-25 -> 2015-07-30 2015-07-30 16:18:57 +02:00
Tobias Geerinckx-Rice 61b3816ff2 geolite-legacy: 2015-07-24 -> 2015-07-25 2015-07-25 05:21:21 +02:00
Tobias Geerinckx-Rice 6b0452768c geolite-legacy: 2015-07-08 -> 2015-07-24 2015-07-24 21:40:26 +02:00
Tobias Geerinckx-Rice dfeaaa8909 geolite-legacy: use correct local naming scheme
Following http://dev.maxmind.com/geoip/legacy/install/city/:

  "Then rename the *.dat file to GeoIP.dat, GeoIPRegion.dat, or
   GeoIPCity.dat, for the GeoIP Country, Region or City databases,
   respectively."

Using the default "GeoLiteCity*.dat" name caused ipv6calc to miss it
(verified using `ipv6calc -vv`).
2015-07-23 04:09:15 +02:00
Tobias Geerinckx-Rice 1f23880449 geolite-legacy: 2015-06-15 -> 2015-07-08 2015-07-08 17:13:24 +02:00
Tobias Geerinckx-Rice 553ce28bc2 geolite-legacy -> 2015-06-15 2015-06-15 19:58:20 +02:00
Tobias Geerinckx-Rice a0473fde87 tzdata -> 2015e 2015-06-15 19:30:11 +02:00
Luca Bruno 248a1b4d51 nixos-artwork: only download the necessary artwork 2015-06-12 11:45:58 +02:00
William A. Kennington III 48381b7621 nixos-artwork: Make into a derivation and use fetchfromgithub 2015-06-08 18:32:32 -07:00
William A. Kennington III ffd0539eba cacert: store ca-bundle.crt in $out/etc/ssl/certs instead of $out 2015-06-05 13:00:52 -07:00
Eelco Dolstra 6c878e0d05 Fix cacert 2015-06-04 14:54:52 +02:00
Tobias Geerinckx-Rice 142cf0de0d geolite-legacy: GeoLiteCity -> 2015-06-03
The update of this file seems to have been delayed.
2015-06-03 22:24:40 +02:00
Tobias Geerinckx-Rice bcc8eeca48 geolite-legacy -> 2015-06-03 2015-06-03 13:38:46 +02:00
Tobias Geerinckx-Rice 7cd8874aed geolite-legacy -> 2015-06-02 2015-06-02 01:38:15 +02:00
William A. Kennington III d6cbb061e3 cacert: Build directly from nss instead of our own tarball 2015-05-29 13:52:07 -07:00
Tobias Geerinckx-Rice 158e1cfdd0 Don't use "with licenses;" for single licences
And don't use square brackets on such lines.
2015-05-28 19:20:29 +02:00
Tobias Geerinckx-Rice 8a53e1a312 geolite-legacy -> 2015-05-20 2015-05-20 16:42:38 +02:00
William A. Kennington III 074c4a7f78 Merge remote-tracking branch 'upstream/master' into staging 2015-05-07 01:44:49 -07:00
Tobias Geerinckx-Rice 10bb715c07 geolite-legacy -> 2015-05-07 2015-05-07 10:10:51 +02:00
Tobias Geerinckx-Rice aea86f6182 geolite-legacy -> 2015-05-05 2015-05-05 19:44:49 +02:00
Vladimír Čunát f074e5957d tzdata: go back to using a single output
The *.{a,h} files are very tiny together,
and I didn't see why a cyclic referrence was being created.
2015-05-05 11:52:07 +02:00
Tobias Geerinckx-Rice 7931799a0f tzdata 2015c -> 2015d 2015-05-04 17:30:56 +02:00
Tobias Geerinckx-Rice 5204bdfba6 geolite-legacy: support XZ-compressed databases 2015-04-30 13:11:30 +02:00
Tobias Geerinckx-Rice 13749c5e92 geolite-legacy 2015-04-16 -> 2015-04-21 2015-04-21 01:48:28 +02:00
Tobias Geerinckx-Rice 4679104133 tzdata 2015a -> 2015c 2015-04-17 00:46:20 +02:00
Tobias Geerinckx-Rice 13f6f9046d geolite-legacy: 2015-03-26 -> 2015-04-16
Clean up: use a helper function to fetch database files.
2015-04-16 05:44:23 +02:00
Tobias Geerinckx-Rice 1a77b59a85 Add geolite-legacy 2015-03-26
The geoip package only installs a GeoIP _library_ which is useless
without a GeoIP _database_.

The only package to currently install such a database is ntopng, which
manually downloads Maxmind's GeoLite Legacy files to a private location.

Provide these as a separate package so other packages can use them as
well.
2015-03-31 16:36:15 +02:00
Christian Theune 6daa2462c6 Enable syncthing for Mac OS X.
Also requires enabling iana-etc. I'm shooting for "unix" platforms which
seems reasonable. Not sure why this was restricted to linux originally --
the history doesn't tell.
2015-03-30 22:07:02 +02:00
Eelco Dolstra 2ed5c2bd6b Set some meta.platforms
Also fix meta.platform -> meta.platforms in a few places.
2015-03-20 20:04:42 +01:00
Vladimír Čunát 51a8a43dfc Merge #6472: add ddccontrol 2015-03-16 21:52:59 +01:00
Vladimír Čunát f41f7a0bb9 ddccontrol*: cleanup
- remove doubled file for ddccontrol-db
- adding stdenv to buildInputs is pointless
- fix doubled http://
- whitespace, etc.
2015-03-16 21:47:06 +01:00
Fedor Pakhomov eb8105ad01 Separated DDCcontrol-DB declaration from DDCcontrol declaration 2015-03-07 01:10:46 +03:00
Thomas Tuegel 07d0dd3be0 Merge branch 'kde5' 2015-02-25 15:09:44 -06:00
Thomas Tuegel ad06db5ddc media-player-info: patch extra shebangs to fix chroot build 2015-02-25 12:07:37 -06:00
Eelco Dolstra 586b9d9525 tzdata: Update to 2015a 2015-02-25 15:24:53 +01:00
Thomas Tuegel 95b13b1155 add media-player-info 2015-02-21 11:39:19 -06:00
Eelco Dolstra 52b743add4 tzdata: Update to 2014j 2014-11-25 00:42:22 +01:00
Mateusz Kowalczyk 007f80c1d0 Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
2014-11-06 00:48:16 +00:00
Domen Kožar 6f9a111186 tzdata: set platforms to build on hydra 2014-10-27 18:41:42 +01:00
Vladimír Čunát e76772d1fd tzdata: update 2014-10-25 21:37:24 +02:00
Aristid Breitkreuz 8303601d2c poppler_data: update from 0.4.6 to 0.4.7 2014-10-07 23:22:09 +02:00
Mateusz Kowalczyk 5409201b64 Revert "Revert "tzdata: bump to 2014g.""
This reverts commit 0b4c22edaa.

This should now work according to #4243
2014-09-24 20:50:34 +01:00
Domen Kožar 0b4c22edaa Revert "tzdata: bump to 2014g."
This reverts commit 4dce30e510.

Breaks all go packages.
2014-09-19 20:40:54 +02:00