cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2
155475 commits 1 branch 0 tags 3.7 GiB
Commit graph

446 commits

Author SHA1 Message Date
Peter Simons
68fd23fbb2 hackage: update database snapshot to latest version 2018-03-06 21:24:50 +01:00
Peter Simons
18055971cb hackage: update database snapshot to latest version 2018-03-05 16:45:07 +01:00
Tuomas Tynkkynen
1e107443ad Merge commit '618ac29687a650d854c8bea7efd4490387589ce2' into staging 2018-03-03 22:40:32 +02:00
Peter Simons
e05c99cfda hackage: update database snapshot to latest version 2018-03-01 21:58:31 +01:00
Shea Levy
942855c8bd
tzdata: Fix cross-compilation 2018-02-28 15:01:33 -05:00
Tuomas Tynkkynen
34f95d92a2 Merge remote-tracking branch 'upstream/master' into staging 
Conflicts:
	pkgs/applications/misc/pytrainer/default.nix
	pkgs/development/tools/pew/default.nix
	pkgs/tools/misc/you-get/default.nix
 2018-02-28 20:52:49 +02:00
Ryan Mulligan
f3ed511b44
media-player-info: 22 -> 23 
Semi-automatic update. These checks were performed:

- built on NixOS
- found 23 with grep in /nix/store/fwi1kp97s2smbwf5ir9jrykf6427i4n6-media-player-info-23
- found 23 in filename of file in /nix/store/fwi1kp97s2smbwf5ir9jrykf6427i4n6-media-player-info-23
 2018-02-27 23:54:09 +01:00
Vladimír Čunát
e2243a5ac9
Revert "Revert "Merge staging at '8d490ca9934d0' into master"" 
This reverts commit f5ce8f86df.
 2018-02-26 22:54:48 +01:00
Vladimír Čunát
f5ce8f86df
Revert "Merge staging at '8d490ca9934d0' into master" 
This reverts commit fc23242220, reversing
changes made to 754816b84b.
We don't have many binaries yet.  Comment on the original merge commit.
 2018-02-26 22:53:18 +01:00
Peter Simons
0f7a7cb3d8 hackage: update db snapshot 2018-02-26 14:28:40 +01:00
Frederik Rietdijk
fc23242220 Merge staging at '8d490ca9934d0c01e1e9ade455657e54e2e843c0' into master 2018-02-26 13:05:32 +01:00
xeji
c9a1639e20 cacert: add output "unbundled" 
which contains all certs, each in a separate file.
This output is not installed by default.
 2018-02-25 23:48:54 +01:00
Tuomas Tynkkynen
ae9d4faff9 Merge remote-tracking branch 'upstream/master' into staging 2018-02-24 02:05:30 +02:00
Peter Simons
51c6ca0643 hackage: update database snapshot to latest version 2018-02-23 17:59:06 +01:00
Nikolay Amiantov
a984be41ab Merge branch 'master' into staging 2018-02-23 18:51:08 +03:00
volth
e28cf0cbfb
data/mime-types: make derivation fixed-output 2018-02-22 17:14:43 +00:00
Vladimír Čunát
2dd10ea013
Merge #34541: poppler: 0.56.0 -> 0.62.0 2018-02-22 00:49:59 +01:00
George Wilson
85701a15ae hackage: update all-cabal-hashes snapshot to Hackage at 2018-02-12T02:28:56Z 2018-02-12 13:40:55 +10:00
Jan Tojnar
a711891a83
poppler_data: 0.4.7 → 0.4.8 2018-02-03 01:01:44 +01:00
Michael Raskin
00cafb4c8d scowl: support installing just words.txt 
The expression now supports having `words.txt` in some place without tens
and tens of megabytes of all the wordlist and spelling dictionaries. Set
`singleWordlist` parameter to the string of region and size settings. For
example:
```
scowl.override{singleWordlist = "en-gb-ise 60";}
```

Should be useful for #34486
 2018-02-02 21:54:13 +01:00
Franz Pletz
cc98976b47
wireless-regdb: 2017.03.07 -> 2017.12.23 2018-01-28 18:52:23 +01:00
Peter Simons
809a09eb5e hackage: update all-cabal-hashes snapshot to Hackage at 2018-01-18T14:32:45Z 2018-01-18 17:01:33 +01:00
Tuomas Tynkkynen
67c73b4e64 Merge commit '2e56ba' from staging into master 2018-01-17 12:50:46 +02:00
Tobias Geerinckx-Rice
0f84673f3d
Remove nckx as a maintainer for all packages 
Goodbye, and thanks for all the Nix...
 2018-01-16 23:00:49 +01:00
Jörg Thalheim
efc17cbd21 iana-etc: 20171106 -> 20180108 2018-01-13 09:45:51 +00:00
Daiderd Jordan
6c39c9cbfa
tzdata: use addEnvHooks 2018-01-07 21:26:22 +01:00
Daiderd Jordan
406e162884
cacert: use addEnvHooks 2018-01-07 21:25:48 +01:00
Daiderd Jordan
5a02143c20
Merge pull request #33010 from LnL7/cacert-hook 
cacert: add hook that sets SSL_CERT_FILE
 2018-01-07 09:55:15 +01:00
Orivej Desh
679dbd0667
Merge pull request #32987 from romildo/upd.adapta-backgrounds 
adapta-backgrounds: 0.5.1.1 -> 0.5.2.3
 2018-01-06 02:27:00 +00:00
José Romildo Malaquias
bcf7218fde adapta-backgrounds: 0.5.1.1 -> 0.5.2.3 2018-01-01 07:15:17 -02:00
Daiderd Jordan
bfccf8e42c
cacert: add hook that sets SSL_CERT_FILE 
Fixes #32981
 2017-12-27 21:03:29 +01:00
Michael Raskin
428708feba scowl: init at 2017.08.24 2017-12-23 20:26:48 +01:00
Jan Tojnar
7f18bbb642
osinfo-db: init at 20170813 2017-12-19 17:25:53 +01:00
José Romildo Malaquias
19723a6143
adapta-backgrounds: 0.4.0.6 -> 0.5.1.1 2017-12-06 11:23:10 +01:00
Orivej Desh
d7bab852b0 geolite-legacy: 2017-10-25 -> 2017-12-02 2017-12-04 06:23:47 +00:00
Orivej Desh
c13de40f04 tzdata: export TZDIR for dependent packages 
https://github.com/NixOS/nix/issues/1709
 2017-12-01 17:17:30 +00:00
Orivej Desh
9d2bd32b79 tzdata: avoid symlink loop "./posix" -> ".." 
Fixes #31560
 2017-11-23 05:12:03 +00:00
Vladimír Čunát
d16b298d19
dns-root-data: use a stable URL that I maintain anyway 
Close #31855.
 2017-11-21 13:58:19 +01:00
Peter Hoeg
1b594f05a2 mime-types: init at 9 2017-11-19 20:29:13 +08:00
Vladimír Čunát
304259bdb1
Merge branch 'master' into staging 
Mass rebuild, mainly on Darwin.
 2017-11-09 22:37:01 +01:00
Joerg Thalheim
109de2b869 iana-etc: 20170512 -> 20171106 2017-11-08 15:25:25 +00:00
Peter Simons
c7203efb7d
Merge pull request #31333 from ElvishJerricco/unextracted-all-cabal-hashes 
Unextracted all cabal hashes
 2017-11-08 16:25:16 +01:00
Will Fancher
a38a3e2129 Extract files one at a time from all-cabal-hashes 2017-11-06 16:49:09 -05:00
Will Fancher
8caf9f13a6 Revert "Merge branch 'all-cabal-hashes-components'" 
This reverts commit ad6b8f438d, reversing
changes made to 2d44e72801.
 2017-11-06 16:47:29 -05:00
Vincent Laporte
f35f995fff
dns-root-data: 2017-08-29 -> 2017-10-24 2017-11-06 19:22:38 +00:00
Vaibhav Sagar
4b9e73c6cf all-cabal-hashes: 2017-10-08T03:25:59Z -> 2017-11-04T17:56:01Z 2017-11-06 13:24:38 +08:00
Franz Pletz
bfd57788b6
tzdata; 2016j -> 2017c 
Notable recent changes:

 - Northern Cyprus resumed EU rules starting 2017-10-29.
 - Namibia will switch from +01 with DST to +02 all year, affecting
   UT offsets starting 2018-04-01.
 - Sudan will switch from +03 to +02 on 2017-11-01.
 - Tonga will not observe DST on 2017-11-05.
 - Turks & Caicos will switch from -04 all year to -05 with US DST,
   affecting UT offset starting 2018-11-04.
 2017-11-01 23:03:35 +01:00
Rickard Nilsson
d788545172 geolite-legacy: 2017-09-17 -> 2017-10-25 2017-10-25 13:55:00 +02:00
Shea Levy
3ef3fc43a2
partition-all-cabal-hashes: cross-compile safe 2017-10-14 08:03:53 -04:00
Shea Levy
843e0992ca
Partition all-cabal-hashes into case-insensitive-safe components. 
OS X by default has a case-insensitive filesystem, and fetching
all-cabal-hashes there fails due to a hash mismatch caused by package
pairs like compactable and Compactable. This partitions the package set
such that each partition contains no equivalent-up-to-case pairs.
 2017-10-12 14:57:21 -04:00
Peter Simons
582ce63fa2 Merge pull request #30210 from vaibhavsagar/update-all-cabal-hashes 
hackage: update snapshot of 'all-cabal-hashes' repo for callHackage
 2017-10-08 16:28:05 +02:00
Vaibhav Sagar
c45c4a711a hackage: update snapshot of 'all-cabal-hashes' repo for callHackage 2017-10-08 12:24:46 +08:00
Orivej Desh
f137004179 Merge branch 'master' into staging 
* master: (81 commits)
  Add NixOS 17.09 AMIs
  gradle: 4.2 -> 4.2.1
  maintainers.nix: use my GitHub handle as maintainer name
  fcitx-engines.rime: init at 0.3.2
  brise: init at 2017-09-16
  librime: init at 1.2.9
  marisa: init at 0.2.4
  opencc: build shared library and programs
  josm: 12712 -> 12914
  exa: 0.7.0 -> 0.8.0
  krb5: add deprecation date for old configuration
  rustRegistry: 2017-09-10 -> 2017-10-03
  go-ethereum: Fix libusb segmentation faults on Darwin
  tor-browser-bundle-bin: 7.0.5 -> 7.0.6
  libsodium: 1.0.13 -> 1.0.15
  tor-browser-bundle: geoip support
  tor-browser-bundle: support transports obfs2,obfs3
  tor-browser-bundle: bump https-everywhere to 2017.9.12
  tint2: limit platforms to Linux since macOS is not supported and fails the tests
  eclipse-plugin-vrapper: init at 0.72.0
  ...
 2017-10-03 17:46:39 +00:00
mingchuan
d6b8ac6ca8 maintainers.nix: use my GitHub handle as maintainer name 2017-10-03 14:27:10 +00:00
mingchuan
906f73fd0b brise: init at 2017-09-16 2017-10-03 14:27:10 +00:00
mimadrid
72a25bf38c
shared-mime-info: 1.8 -> 1.9 2017-09-30 19:59:38 +02:00
Franz Pletz
c7ed26b6a9
geolite-legacy: 2017-05-26 -> 2017-09-17 2017-09-18 21:55:41 +02:00
Chris Burr
0b356dfb75 dns-root-data: 2017-07-26 -> 2017-08-29 2017-09-04 10:50:32 +01:00
Peter Simons
49cda48b83 hackage: update snapshot of 'all-cabal-hashes' repo for callHackage 2017-09-03 17:18:41 +02:00
Franz Pletz
7d48dc39f6
wireless-regdb: 2016-06-16 -> 2017.03.07 2017-08-28 00:54:43 +02:00
Frederik Rietdijk
6bbc3a0b24 Merge commit '3b29468313bc8604fe8f85c8d9316fd276d3985c' into HEAD 2017-08-21 04:44:40 +02:00
Matthew Bauer
3fcbc66a4b poppler: use https for homepage 2017-08-17 15:04:38 -07:00
Frederik Rietdijk
8f2ea38f8f Merge remote-tracking branch 'upstream/master' into HEAD 2017-08-17 18:34:17 +02:00
Jan Malakhovski
afc8405a7a dns-root-data: use https 2017-08-17 12:11:49 +00:00
Yann Hodique
2a0c6c7bee dns-root-data: 2017-07-11 -> 2017-07-26 2017-08-14 16:54:25 +02:00
Frederik Rietdijk
62dac1bdd9 Merge remote-tracking branch 'upstream/master' into HEAD 2017-08-14 09:34:10 +02:00
Frederik Rietdijk
13bbaee21d Merge pull request #27881 from mimadrid/fix/http-https 
Update homepage attributes: http -> https
 2017-08-13 21:53:20 +02:00
Tuomas Tynkkynen
9158944b44 tzdata: Fix man directory 2017-08-11 21:32:54 +03:00
Franz Pletz
2d5c1226c6
cacert: really fix utf-8 certname blacklists 
See #27576.
 2017-08-09 19:54:00 +02:00
mimadrid
09e0cc7cc7
Update homepage attributes: http -> https 
Homepage link "http://.../" is a permanent redirect to "https://.../" and should be updated
https://repology.org/repository/nix_stable/problems
 2017-08-03 11:56:15 +02:00
Silvan Mosberger
f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809) 
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
 2017-08-01 22:03:30 +02:00
Frederik Rietdijk
7e4a6dfd08 Merge pull request #27848 from mimadrid/update/shared-mime-info-1.8 
shared-mime-info: 1.7 -> 1.8
 2017-08-01 21:51:36 +02:00
mimadrid
2063f8ac8c
shared-mime-info: 1.7 -> 1.8 2017-08-01 20:53:10 +02:00
Franz Pletz
55742a2044
cacert: fix unicode names in blacklist 
Fixes #27576.
 2017-07-31 12:26:23 +02:00
Frederik Rietdijk
20b8e4b4cf Merge remote-tracking branch 'upstream/master' into HEAD 2017-07-30 08:09:11 +02:00
Silvan Mosberger
eccca05e2c
nixos-artwork: Fix URL to gnome-dark 2017-07-29 06:36:55 +02:00
Frederik Rietdijk
3eceecb90d Merge remote-tracking branch 'upstream/master' into HEAD 2017-07-17 13:52:01 +02:00
Graham Christensen
6b879ef36e Merge pull request #23964 from benley/nixos-manual-launcher 
nixos: nix snowflake logo for the nixos manual launcher
 2017-07-16 16:28:30 -04:00
Vladimír Čunát
e2b7b09960
Merge branch 'master' into staging 2017-07-15 12:15:56 +02:00
Vladimír Čunát
338a195204
dns-root-data: improve determinism, clear key status 
Nitpicks:
- The timestamps there were useless.
- The generator now switched the two keys; I don't know why.

I intentionally remove the comments like "state=1 [ ADDPEND ]".
The problem is that keys e.g. in ADDPEND state are *not* immediately
usable for validation - see RFC5011 for details.  I verified that Unbound
does disregard this on the format we and Debian use ATM, presumably due
to removing parts of the comments, but it would be confusing nevertheless.
 2017-07-15 10:38:01 +02:00
Franz Pletz
3bb9954a6b
dns-root-data: init at 2017-06-16 2017-07-12 09:45:25 +02:00
Peter Simons
dd27e21b2a data: update hackage snapshot some more 2017-07-11 14:41:13 +02:00
Peter Simons
8fd63939d0 data: update hackage snapshot for 'callCabal' 2017-07-11 13:24:43 +02:00
volth
13a8fa8801 nixos-artwork: do not leak nix hashes to filenames in /share/artwork/gnome/ (#26566) 
* nixos-artwork: do not leak nix hashes to filenames /share/artwork/gnome/

* simplify
 2017-06-14 17:46:13 +02:00
romildo
aa8018103c nixos-artwork: add more wallpapers 
Restructure the nixos-artwork to make it easy to selectively
incorporate other components from upstream without needing to download
the full package.

Until now only the Gnome_Dark wallpaper was included. Add other
wallpapers available in the package repository.
 2017-06-07 18:00:58 -03:00
Franz Pletz
45372b1cdc
geolite-legacy: 2016-07-08 -> 2017-05-26 2017-05-26 13:09:45 +02:00
Peter Simons
cb838cad5c all-cabal-hashes: update to latest version of Hackage 2017-05-23 10:38:12 +02:00
Jörg Thalheim
f016fa3ce3
iana-etc: 20170417 -> 20170512 2017-05-13 07:21:06 +01:00
Jörg Thalheim
024cbbd520
iana-etc: 20170328 -> 20170417 2017-04-19 08:29:31 +02:00
Michael Raskin
7a46312f1c xorg-rgb: init at 1.0.6 2017-03-30 22:55:26 +02:00
Jörg Thalheim
50527dbd0e
iana-etc: 2.30 -> 20170328 2017-03-28 22:35:15 +02:00
Vladimír Čunát
96d41e393d
treewide: purge maintainers.urkud 
It's sad, but he's been inactive for the last five years.
Keeping such people in meta.maintainers is counter-productive.
 2017-03-27 19:52:29 +02:00
Benjamin Staffin
c2b0cb5db6 nixos: nix snowflake logo for the nixos manual launcher 2017-03-16 17:48:09 -04:00
Renaud
56a4640b0c iana-etc: fixed source URL and homepage (#23167) 
The homepage has moved years ago.
 2017-02-25 13:58:32 +01:00
Peter Simons
34584b2c3c hackage: update snapshot to 2017-02-12T15:49:03Z 2017-02-16 11:48:10 +01:00
Peter Simons
3b26c2f465 callHackage: update Hackage snapshot to a current version 2017-01-31 22:50:18 +01:00
Peter Simons
b4fcbf4095 callHackage: update database to current version 2017-01-12 10:00:22 +01:00
Vladimír Čunát
5ac7da9376
tzdata: 2016f -> 2016j 2016-12-28 19:15:18 +01:00
romildo
629b979227 adapta-backgrounds: init at 0.4.0.6 2016-12-02 23:01:23 -02:00
Peter Simons
fac1168816 callHackage: make 'all-cabal-hashes' repository overridable 
This commit changes callHackage to use a deterministic version of the Hackage
checkout from https://github.com/commercialhaskell/all-cabal-hashes by default.
This means that packages uploaded to Hackage after today will be available to
callHackage only after "pkgs/data/misc/hackage/default.nix" has been updated.

People who want the previous behavior where we always had the latest version of
Hackage available -- at the cost of frequent downloads from Github --, can add
the following override to their "~/.nixpkgs/config.nix" file:

  {
    packageOverrides = super: {
      all-cabal-hashes = builtins.fetchTarball "https://github.com/commercialhaskell/all-cabal-hashes/archive/hackage.tar.gz";
    };
  }
 2016-11-01 18:35:19 +01:00
Franz Pletz
0d59fc1169
cacerts: refactor, add blacklist option 
Previously, the list of CA certificates was generated with a perl script
which is included in curl. As this script is not very flexible, this commit
refactors the expression to use the python script that Debian uses to
generate their CA certificates from Mozilla's trust store in NSS.

Additionally, an option was added to the cacerts derivation and the
`security.pki` module to blacklist specific CAs.
 2016-10-09 02:00:18 +02:00
Kirill Boltaev
bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
mimadrid
478c63d469
shared-mime-info: 1.5 -> 1.7 2016-09-07 20:49:12 +02:00
Nikolay Amiantov
7ce717a56c poppler_data: install pkgconfig files 2016-08-18 16:09:34 +03:00
Kranium Gikos Mendoza
9d8262bd92 wireless-regdb: 2016-05-02 -> 2016-06-10 (#17706) 2016-08-14 11:45:01 +00:00
rexim
b9a6ba4e8f tzdata: 2016e -> 2016f 2016-08-08 23:44:28 +06:00
Tuomas Tynkkynen
21f17d69f6 treewide: Add lots of meta.platforms 
Build-tested on x86_64 Linux & Mac.
 2016-08-02 21:42:43 +03:00
Tobias Geerinckx-Rice
df029f6517
geolite-legacy: 2016-07-04 -> 2016-07-08 2016-07-08 20:15:02 +02:00
Tobias Geerinckx-Rice
17de009046
geolite-legacy: 2016-06-30 -> 2016-07-04 2016-07-04 22:16:43 +02:00
Tobias Geerinckx-Rice
d6871a2c7a
geolite-legacy: 2016-06-20 -> 2016-06-30 2016-06-30 15:36:42 +02:00
Tobias Geerinckx-Rice
5dd3dbdec4
geolite-legacy: 2016-06-13 -> 2016-06-20 2016-06-20 15:58:56 +02:00
Tobias Geerinckx-Rice
9f996d6406
tzdata: 2016d -> 2016e 2016-06-14 18:27:57 +02:00
Tobias Geerinckx-Rice
156a14d153
geolite-legacy: 2016-06-08 -> 2016-06-13 2016-06-14 18:27:56 +02:00
Robert Helgesson
96fc1e19b8 cacert: remove dependency on LWP 
The `mk-ca-bundle.pl` script manages quite well using only curl but
fails without LWP being present due to a `use` statement. This removes
the Perl import of the LWP library and adds curl as a build input.
 2016-06-13 22:18:59 +02:00
Tobias Geerinckx-Rice
1201cc569c
geolite-legacy: 2016-06-06 -> 2016-06-08 2016-06-08 19:53:48 +02:00
Tobias Geerinckx-Rice
894b011381
geolite-legacy: 2016-05-31 -> 2016-06-06 2016-06-06 16:18:53 +02:00
Tuomas Tynkkynen
bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Tobias Geerinckx-Rice
fb1d4dfabd
geolite-legacy: 2016-05-23 -> 2016-05-31 2016-05-31 15:17:47 +02:00
Tobias Geerinckx-Rice
03f76c136d
geolite-legacy: 2016-05-16 -> 2016-05-23 2016-05-23 14:36:30 +02:00
Tobias Geerinckx-Rice
a13b69bb61
geolite-legacy: 2016-05-09 -> 2016-05-16 2016-05-16 20:27:31 +02:00
Franz Pletz
4e61adbeca mobile-broadband-provider-info: 20120614 -> 20151214 2016-05-12 01:50:04 +02:00
Tobias Geerinckx-Rice
baac4e88e1
geolite-legacy: 2016-05-03 -> 2016-05-09 2016-05-10 01:22:53 +02:00
Tobias Geerinckx-Rice
db3ee01ab6
geolite-legacy: 2016-05-02 -> 2016-05-03 2016-05-03 23:42:08 +02:00
Tobias Geerinckx-Rice
69ef7566a8
wireless-regdb: 2016-02-08 -> 2016-05-02 2016-05-03 02:01:12 +02:00
Tobias Geerinckx-Rice
6cff7111d0
geolite-legacy: 2016-04-29 -> 2016-05-02 2016-05-02 13:53:32 +02:00
Tobias Geerinckx-Rice
fd94ec4984
geolite-legacy: fix 2016-04-29 16:29:54 +02:00
Tobias Geerinckx-Rice
f95ba43e8b
geolite-legacy: 2016-04-28 -> 2016-04-29 2016-04-29 15:37:23 +02:00
Tobias Geerinckx-Rice
0798ebbfc5
geolite-legacy: 2016-04-25 -> 2016-04-28 2016-04-28 23:48:36 +02:00
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