Commit graph

1121 commits

Author SHA1 Message Date
Eelco Dolstra
b056948c00 Improve types.listOf error message
If an option value is not a list, you now get

  The option value `bla' in `file.nix' is not a list.

rather than

  value is a string while a list was expected, at .../nixpkgs/lib/lists.nix:49:56
2016-05-25 11:39:17 +02:00
obadz
47950b5353 modules/misc/version.nix: populate nixosRevision based on <nixpkgs/.git> when possible (#15624)
Example:

$ nixos-option system.nixosLabel
Value:
"16.09.git.4643ca1"
2016-05-24 23:34:28 +01:00
Vladimír Čunát
0b192a0976 Merge branch 'master' into staging
That's to get mesa rebuild from master, as it's nontrivial.
2016-05-23 09:02:10 +02:00
Vladimír Čunát
c4661e9643 Merge: make dev output references explicit
This is a rebase of most commits from #14766,
resolving conflicts and a few other evaluation problems.
2016-05-22 12:09:23 +02:00
NikolaMandic
9bc61f92ff adding me to maintainers 2016-05-20 19:46:20 +00:00
Charles Strahan
5d54038771
maintainers: update cstrahan's email address 2016-05-19 15:51:04 -04:00
Vladimír Čunát
da2788c3d7 Merge #15354: add tracefilegen and tracefilesim 2016-05-19 10:29:28 +02:00
Tuomas Tynkkynen
e28e010b36 treewide: Make explicit that 'dev' output of curl is used 2016-05-19 10:00:29 +02:00
Roger Qiu
83e9c5caaf Added cmcdragonkai to the list of maintainers 2016-05-19 18:00:14 +10:00
Nikolay Amiantov
cdff1f61f0 lib: revert my bogus comment fix
See 5445e521b6 (commitcomment-17531945)
2016-05-19 01:26:04 +03:00
Nikolay Amiantov
5445e521b6 firefox: restore gstreamer support for older firefox releases 2016-05-19 00:28:49 +03:00
Domen Kožar
b49bf121b8 rename iElectric to domenkozar to match GitHub 2016-05-17 13:00:47 +01:00
Peter Simons
b4f60add6a lib/maintainers.nix: alphabetize the list of user names 2016-05-16 22:49:55 +02:00
Peter Simons
8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
obadz
abd64abdb5 maintainers: fix my email address 2016-05-16 20:09:45 +01:00
Sebastian Jordan
8484328a34 guile-sdl2: init at 0.1.0 2016-05-15 19:04:48 +02:00
Julien Dehos
6400283c09 cpputest: init at 3.7.2 2016-05-15 14:54:19 +02:00
Vladimír Čunát
3e387c3e00 Merge branch 'staging'
Darwin isn't in a perfect state, in particular its bootstrap tools won't
build which will block nixpkgs channel. But on the whole it seems
acceptable.
2016-05-13 10:14:53 +02:00
Frederik Rietdijk
53ffb3fcf1 Merge pull request #15414 from teh/dask
distributed: init at 1.10.0 (+init and update dependencies)
2016-05-12 18:06:34 +02:00
Tom Hunger
dacbeea15b locket: init at 0.2.0 2016-05-12 17:04:40 +01:00
Vladimír Čunát
6c2fbfbd77 Merge branch 'master' into staging 2016-05-12 04:53:38 +02:00
Andrew Abbott
90201710a2 cava: update to 0.4.1 2016-05-11 20:40:03 +10:00
Martijn Vermaat
3ada292a67 lesspipe: init at 1.82
lesspipe.sh is a preprocessor for less.
2016-05-10 22:21:42 +02:00
Vladimír Čunát
1dc36904d8 Merge #14920: windows improvements, mainly mingw 2016-05-05 08:30:19 +02:00
zimbatm
0bc713f817 Merge pull request #15135 from gpyh/asciidoctor
asciidoctor: Init at 1.5.4
2016-05-04 20:42:26 +01:00
Tuomas Tynkkynen
aadaa91379 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/applications/networking/browsers/vivaldi/default.nix
	pkgs/misc/emulators/wine/base.nix
2016-05-03 23:12:48 +03:00
Nikolay Amiantov
7fec04cd7f Merge pull request #15129 from rardiol/openra
openra: 20141029 -> 20151224
2016-05-02 16:28:20 +04:00
Joachim Fasting
ae59e8c644 Merge pull request #15062 from holidaycheck/node-6.0.0
nodejs-6_x : init at 6.0.0
2016-05-02 09:53:18 +02:00
Tobias Pflug
822abc49ad nodejs-6_x : init at 6.0.0 2016-05-02 08:58:50 +02:00
ryneeverett
1e84b0c070 you-get: init at 0.4.390 2016-05-02 06:21:42 +00:00
Ricardo Ardissone
42cce6ab11 openra: my maintainership 2016-05-01 19:03:07 -03:00
Yacine Hmito
a5a98ce5a3 Added gpyh to the list of maintainers 2016-05-01 15:55:39 +02:00
Nathan Moos
6dac18a8be imatix_gsl: init at 4.1 2016-04-28 18:26:10 -04:00
Tuomas Tynkkynen
4ff8f377af Merge remote-tracking branch 'upstream/master' into staging 2016-04-28 00:13:53 +03:00
Allen Nelson
d7f032e805 Add new package "lsi" (#12780) 2016-04-26 12:24:25 +02:00
Nikolay Amiantov
5f19542581 Merge commit 'refs/pull/14694/head' of git://github.com/NixOS/nixpkgs into staging 2016-04-25 18:02:23 +03:00
Nikolay Amiantov
5ff40ddedf add get* helper functions and mass-replace manual outputs search with them 2016-04-25 13:24:39 +03:00
Nikolay Amiantov
c779e30d53 make*Path: implement via makeSearchPathOutput 2016-04-25 13:24:39 +03:00
Nikolay Amiantov
ab0a0c004e makeSearchPathOutputs: refactor to makeSearchPathOutput 2016-04-25 13:24:39 +03:00
Nikolay Amiantov
7d3e75827b getOutput function: init 2016-04-25 13:22:41 +03:00
Nikolay Amiantov
5f3987f44f Revert "tryAttrs: init function"
This reverts commit 338340f993.
2016-04-25 13:22:41 +03:00
Rafał Łasocha
bea31c31f2 pws: Init at 1.0.6 2016-04-25 01:55:07 +02:00
obadz
5b5ce8dcff fix my email address 2016-04-22 17:16:10 -05:00
Nikolay Amiantov
b2426adf1c Merge pull request #14870 from retrry/rust-updates
Rust Updates
2016-04-22 14:29:14 +04:00
Andrew Burkett
0ddf8c7f6f scrapy: init at 1.0.5 2016-04-21 16:09:18 -07:00
zimbatm
898d9d9e83 Merge pull request #14815 from choochootrain/add-xbanish
xbanish: init at 1.4
2016-04-20 11:36:20 +01:00
Tadas Barzdzius
fe901d1372 maintainers: add retrry to maintainers list 2016-04-20 12:39:14 +03:00
Hurshal Patel
9023722e77
xbanish: init at 1.4 👻 2016-04-19 23:33:38 -07:00
Alexey Shmalko
0ebe901035
avro-c++: Init at 1.7.5 2016-04-19 16:57:02 +03:00
Rahul Gopinath
29f895426c vis: init vis at 0.2x (nightly)
Vis editor is a vim like editor.
This commit provides the initial package for vis (nightly)
2016-04-15 19:44:25 -05:00
Christian Lask
10b2ba56d3 maintainers: update mail address. 2016-04-15 23:07:07 +02:00
Myrl Hex
c73d14a39f profont: init 2016-04-14 14:27:25 +03:00
Nikolay Amiantov
9b9fea305f makeSearchPath (and derivatives): check outputUnspecified 2016-04-13 22:09:41 +03:00
Nikolay Amiantov
e26119619f makePerlPath: try to guess outputs 2016-04-13 22:05:45 +03:00
Nikolay Amiantov
2a3b3d6f8b makeSearchPathOutputs: init function 2016-04-13 22:05:45 +03:00
Nikolay Amiantov
338340f993 tryAttrs: init function 2016-04-13 22:05:45 +03:00
Nikolay Amiantov
5ef56700b9 makeBinPath: guess outputs 2016-04-13 22:05:45 +03:00
zimbatm
04267ed630 Merge pull request #14647 from MostAwesomeDude/tahoe
Tahoe-LAFS improvements
2016-04-13 16:39:53 +01:00
Vladimír Čunát
39ebb01d6e Merge branch 'staging', containing closure-size #7701 2016-04-13 09:25:28 +02:00
Corbin
4c85efbda1 tahoe-lafs: 1.10.2 -> 1.11.0
Also add myself to maintainers, as I *do* care about this package.
2016-04-12 18:44:26 -07:00
joachifm
860aa01782 Merge pull request #14618 from moretea/update_mcrl2
Update mcrl2
2016-04-12 23:42:45 +02:00
joachifm
b0d2c0cade Merge pull request #14613 from cransom/jp
Jp
2016-04-12 22:33:48 +02:00
Maarten Hoogendoorn
ec098aad41 mcrl2: 2009.01 -> 2014.09 2016-04-12 22:16:30 +02:00
Casey Ransom
800367ee37 Add @cransom as a maintainer 2016-04-11 23:51:34 -04:00
Tobias Geerinckx-Rice
57ef1712e3
Substite new GitHub username ‘timbertson’ for ‘gfxmonk’ 2016-04-11 16:35:18 +02:00
Vladimír Čunát
30f14243c3 Merge branch 'master' into closure-size
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
joachifm
ddef34387d Merge pull request #14518 from CrystalGamma/master
lombok: init at 1.16.8
2016-04-09 17:47:15 +02:00
Frederik Rietdijk
dddafe61eb Merge pull request #14498 from expipiplus1/python-cgkit
pythonPackages.cgkit: init at 2.0.0
2016-04-09 11:51:15 +02:00
Jona Stubbe (CrystalGamma)
8430db7e17 lombok: init at 1.16.8 2016-04-09 10:00:08 +02:00
Vladimír Čunát
710573ce6d Merge #12653: rework default outputs 2016-04-07 16:00:09 +02:00
Vladimír Čunát
d1df28f8e5 Merge 'staging' into closure-size
This is mainly to get the update of bootstrap tools.
Otherwise there were mysterious segfaults:
https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
2016-04-07 14:40:51 +02:00
Joe Hermaszewski
2be0505b8d pythonPackages.cgkit: Add maintenance information
Add @expipiplus as a maintainer.
2016-04-07 11:34:53 +01:00
ldesgoui
f2a88f89c6 discord: init at 0.0.1 2016-04-05 13:17:43 +02:00
Eelco Dolstra
fd2273e419 Stronger warning against usage of splitString 2016-04-01 13:52:54 +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
Ben Booth
449d908b88 xe-guest-utilities: init at 6.2.0
use mkEnableOption

use sha256

add xe-guest-utilities to module-list.nix
2016-03-30 09:27:40 -07:00
zimbatm
4908973b08 Merge pull request #14186 from LatitudeEngineering/latitude/topic/qgroundcontrol
qgroundcontrol: init at 2.9.4
2016-03-25 20:45:24 +00:00
Brad Ediger
cdca9d64b4 dvdbackup: init at 0.4.2 2016-03-24 23:16:14 -05:00
Patrick Callahan
f30e40df69 qgroundcontrol: init at 2.9.4 2016-03-24 20:06:31 -07:00
Arseniy Seroka
2358582976 Merge pull request #14045 from otwieracz/master
znapzend: added
2016-03-24 23:10:40 +03:00
Slawomir Gonet
cb81a3fd2a znapzend: init at 0.15.3 2016-03-24 20:57:16 +01:00
Svintsov Dmitry
64fe4ad82d mxu11x0: init at 1.3.11 2016-03-24 20:19:22 +05:00
joachifm
4f29a8c03e Merge pull request #14023 from Adjective-Object/add/ansifilter
ansifilter: add @ 1.15
2016-03-22 00:44:49 +00:00
Maxwell
5c740539a8 ansifilter: init at 1.15 2016-03-21 09:42:32 -04:00
Peter Hoeg
c6a717d212 dynamic-colors: 2013-12-28 -> 0.2.1 2016-03-19 23:45:28 +00:00
aszlig
009fd5ef77
lib/types: Revert handling submodules for "either"
This reverts commit 0f0805b, because @nbp had concerns about whether
this would be a good idea and pointed out problems with this.

We currently do not have a case where "either" is used in conjunction
with submodules, but I'm reverting it anyway to prevent people from
adding options using that type in that way.

This is now being reviewed in #14053.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-03-19 19:11:31 +01:00
aszlig
0f0805b51a
lib/types: Handle submodules for type "either"
So far the "either" type only handled "flat" types, so you couldn't do
something like:

type = either int (submodule {
  options = ...;
});

Not only caused this the submodule's options not being checked but also
not show up in the documentation.

This was something we stumbled on with #13916.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @edolstra
2016-03-19 17:22:39 +01:00
Ryan Artecona
9da0403527 yamdi: init at 1.9 2016-03-16 11:39:43 -04:00
Eelco Dolstra
27af419541 Merge pull request #13896 from nbp/import-top-level
Replace references to all-packages.nix, by references to the top-level
2016-03-14 13:49:42 +01:00
Vladimír Čunát
d6b46ecb30 Merge branch 'closure-size' into p/default-outputs 2016-03-14 11:27:15 +01:00
zimbatm
94774a717b Merge pull request #13889 from frlan/Update/Geany/1.27
geany: 1.26 -> 1.27
2016-03-13 18:29:18 +00:00
Nicolas B. Pierron
6313a5698a Replace references to all-packages.nix, by references to the top-level of nixpkgs repository. 2016-03-13 18:25:52 +00:00
Frank Lanitz
9d34f2054d geany: 1.26 -> 1.27
Also adding myself as list of maintainers
2016-03-13 18:41:08 +01:00
宋文武
93feb5d115 drop my maintainership (close #13881) 2016-03-13 18:39:01 +01:00
joachifm
25148e8621 Merge pull request #13884 from sheenobu/maintainers/sheenobu
Added sheenobu as maintainer
2016-03-13 12:37:53 +00:00
Sheena Artrip
15f46547d9 Added sheenobu as maintainer 2016-03-13 08:20:16 -04:00
Markus Hauck
c97c667610 lib.maintainers: add markus1189 2016-03-11 19:32:10 +01:00
Domen Kožar
721462634f Merge pull request #13546 from zimbatm/document-stdlib
Document stdlib
2016-03-10 12:31:33 +00:00
zimbatm
7883ca774b lib/strings: document all the functions 2016-03-10 12:31:06 +00:00
zimbatm
c71e2d4235 lib/lists: document all functions 2016-03-10 12:31:05 +00:00
joachifm
d30b6f6a7b Merge pull request #13781 from romildo/new.epson_201207w
epson_201207w: init at 1.0.0
2016-03-10 11:29:10 +00:00
zimbatm
523e328318 lib/attrsets: document all the functions 2016-03-09 19:59:57 +00:00
zimbatm
a086858ef5 Remove lib.deepSeqList and lib.deepSeqAttrs
Both functions are broken and unused in the repo.
2016-03-09 19:59:57 +00:00
José Romildo Malaquias
e57f1eb6d0 epson_201207w: init at 1.0.0 2016-03-09 15:25:53 -03:00
Matthew Bauer
f0e5910c24 rgbds: init at 0.2.4 2016-03-09 00:44:01 -06: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
Sergiu Ivanov
7a31227573 oh-my-zsh-git: init at 2016-02-27 2016-03-07 19:42:26 +01:00
Nikolay Amiantov
234c5dce67 Merge commit 'refs/pull/13667/head' of git://github.com/NixOS/nixpkgs 2016-03-06 20:39:27 +03:00
Jakub Skrzypnik
d80811d881 ahoviewer: init at 1.4.6 2016-03-06 18:36:16 +01:00
Mathieu Boespflug
73878e1c10 keyfuzz: init at 0.2. 2016-03-05 19:41:33 +01:00
Adam Boseley
5b83791207 spice-vdagentd service : initial at 0.16.0 2016-03-05 07:56:47 +10:00
zimbatm
d3ee8298c4 Merge pull request #13642 from artuuge/epson-escpr-meta
epson-escpr: update the package meta
2016-03-03 14:58:51 +00:00
artuuge
edfb2e7ccb update epson-escpr meta 2016-03-03 14:59:40 +01:00
Raymond Gauthier
5f57d2dc50 maintainers: add a maintainer to the set 2016-03-03 01:03:31 -05:00
michael bishop
a855ef85ea
multimc: fix building under chroot 2016-03-02 13:48:27 -04:00
Nikolay Amiantov
23dd97ee88 Merge commit 'refs/pull/13412/head' of git://github.com/NixOS/nixpkgs 2016-03-02 18:56:24 +03:00
Alex Franchuk
69d8cb4a6b libreswan: add package and service to nixos 2016-03-02 09:44:30 -05:00
Eelco Dolstra
f3d94cfc23 Revert "Add the tool "nixos-typecheck" that can check an option declaration to:"
This reverts commit cad8957eab. It
breaks NixOps, but more importantly, such major changes to the module
system really need to be reviewed.
2016-03-01 20:52:06 +01:00
zimbatm
22d7c08dc5 lib.trivial: add a new importJSON function
This is meant to be used by packages who often re-generate their inputs.

Producing valid JSON is easier than nix, and also garantees it's purity.
2016-02-29 11:21:56 +00:00
Thomas Strobel
bc52fa0508 update maintainer's email address 2016-02-29 01:51:41 +01:00
Thomas Strobel
cad8957eab Add the tool "nixos-typecheck" that can check an option declaration to:
- Enforce that an option declaration has a "defaultText" if and only if the
   type of the option derives from "package", "packageSet" or "nixpkgsConfig"
   and if a "default" attribute is defined.

 - Enforce that the value of the "example" attribute is wrapped with "literalExample"
   if the type of the option derives from "package", "packageSet" or "nixpkgsConfig".

 - Warn if a "defaultText" is defined in an option declaration if the type of
   the option does not derive from "package", "packageSet" or "nixpkgsConfig".

 - Warn if no "type" is defined in an option declaration.
2016-02-29 01:09:00 +01:00
leenaars
6c916515d6 lib.maintainers: add Michiel Leenaars (close #13516)
As suggested in https://github.com/NixOS/nixpkgs/pull/13504 by @hrdinka.
2016-02-27 22:13:11 +01:00
Eelco Dolstra
6d111b353f Make explicit that maintainers should use a real name 2016-02-27 00:18:07 +01:00
zimbatm
07b1f78b94 lib: alphabetize things 2016-02-26 22:15:41 +00:00
zimbatm
6e5a748224 lib.platforms: alphabetize 2016-02-26 22:15:40 +00:00
zimbatm
dea3279593 lib.maintainers: alphabetize 2016-02-26 22:13:58 +00:00
Franz Pletz
db2b0c8406 Merge pull request #13430 from nico202/yarp
yarp (+ libace): init at 2.3.64
2016-02-26 09:29:21 +01:00
=
a5ed58445f yarp (+ libace): init at 2.3.64 2016-02-24 22:08:29 +01:00
Arseniy Seroka
fbca8ede65 Merge pull request #13358 from aespinosa/dpic-preprocessor
dpic: init at 2016.01.12
2016-02-22 23:08:46 +03:00
Robin Gloster
06546b0ec1 Merge pull request #13143 from onlinemediagroup/ios_cross_compiler
ios-cross-compile: init at Feb 16, 2016
2016-02-22 19:17:22 +00:00
Edgar Aroutiounian
058c768892 ios-cross-compile: init at 9.2 2016-02-22 11:16:11 -08:00
Pascal Wittmann
2d2efceecb Merge pull request #13367 from bzizou/nco
nco: init at 4.5.5
2016-02-22 16:26:23 +01:00
Bruno Bzeznik Bruno.Bzeznik@imag.fr
2960ea5292 nco: init at 4.5.5 2016-02-22 15:14:34 +01:00
Allan Espinosa
2dd51275eb dpic: init at 2016.01.12 2016-02-22 07:42:53 -06:00
mingchuan
9e0b5358e2 pcmanx-gtk2: init at 1.3 2016-02-20 19:49:13 +08:00
aszlig
98faa0c8f3
lib/types: Set name of types.package to "package"
Nobody seems to have noticed this (except @Profpatsch) that options with
a "package" type do not get included in the manual.

So debugging this was a bit more involving because while generating the
manual there is an optionList' attribute built from the collected
attributes of all the option declarations.

Up to that point everything is fine except if it comes to
builtins.toXML, where attributes with { type = "derivation" } won't get
included, for example see here:

nix-repl> builtins.toXML { type = "derivation"; foo = "bar"; }
"<?xml version='1.0' encoding='utf-8'?>\n<expr>\n  <derivation>
 <repeated />\n  </derivation>\n</expr>\n"

nix-repl> builtins.toXML { type = "somethingelse"; foo = "bar"; }
"<?xml version='1.0' encoding='utf-8'?>\n<expr>\n  <attrs>
     <attr name=\"foo\">\n      <string value=\"bar\" />\n    </attr>
     <attr name=\"type\">\n      <string value=\"somethingelse\" />
     </attr>\n </attrs>\n</expr>\n"

The following function in libexpr/eval.cc (Nix) is responsible for toXML
dropping the attributes:

bool EvalState::isDerivation(Value & v)
{
    if (v.type != tAttrs) return false;
    Bindings::iterator i = v.attrs->find(sType);
    if (i == v.attrs->end()) return false;
    forceValue(*i->value);
    if (i->value->type != tString) return false;
    return strcmp(i->value->string.s, "derivation") == 0;
}

So I've renamed this now to "package" which is not only more consistent
with the option type but also shouldn't cause similar issues anymore.

Tested this on base of b60ceea, because building the dependencies on
recent libc/staging changes on master took too long.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Reported-by: Profpatsch <mail@profpatsch.de>
2016-02-17 21:12:24 +01:00
zimbatm
078e85e0e5 Merge pull request #12922 from igsha/dirac
dirac: init at 1.0.2
2016-02-17 10:17:59 +00:00
Nikolay Amiantov
1c8a21dfad Merge branch 'pdnsd-service' of https://github.com/nfjinjing/nixpkgs
Closes #12932
2016-02-16 20:35:01 +03:00
Ricardo M. Correia
957ed2c08c Merge pull request #13015 from ehegnes/exa
exa: init at git 2016-02-15
2016-02-16 18:11:42 +01:00
Eric Hegnes
23ab6bf6b2 exa: init at git 2016-02-15 2016-02-16 11:02:38 -05:00
Arseniy Seroka
6b205a9eba Merge pull request #12988 from colemickens/cfdyndns
cfdyndns: init at 0.0.1
2016-02-16 00:24:32 +03:00
Cole Mickens
c7571611dc cfdyndns: init at 0.0.1 2016-02-15 12:54:04 -08:00
Arseniy Seroka
cf73c7a91c Merge pull request #12997 from ryantm/minecraft
minecraft: add desktop entry; add ryantm as maintainer
2016-02-15 22:14:24 +03:00
Arseniy Seroka
a13f9a708b Merge pull request #12992 from lukasepple/master
intel2200BGFirmware: init at 3.1
2016-02-15 22:10:49 +03:00
lukasepple
0b72e7e247 intel2200BGFirmware: init at 3.1
This commit adds the firmware for the Intel 2200BG wireless cards for
the ipw2200 kernel module. Also it changes the
networking.enableIntel2200BGFirmware option to set it as
hardware.firmware since firmware-linux-nonfree does not contain the
appropiate firmware anymore. Also hardware.enableAllFirmware does enable
the intel2200BGFirmware now.
2016-02-15 19:53:07 +01:00
Christoph-Simon Senjak
50bd1a0e8f bluez-tools: init 2015-09-10 (close #12936)
vcunat only fixed whitespace and changed the authorship e-mail
from dummy address you@example.com to the one recorded in maintainers.nix.
(Now github should recognize the commit as yours.)
2016-02-15 17:23:36 +01:00
Tomas Hlavaty
af64bedaca add armv7l-linux to mesaPlatforms 2016-02-14 23:45:32 +01:00
Arseniy Seroka
5a63bf15e0 Merge pull request #12964 from sleexyz/spectrojack
spectrojack: init at 0.4
2016-02-14 22:34:14 +03:00
Ryan Mulligan
ad50cbe8bb minecraft: add desktop entry; add ryantm as maintainer 2016-02-14 10:24:46 -08:00
Vladimír Čunát
d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Igor Sharonov
2656baef0c dirac: init at 1.0.2 2016-02-13 21:22:17 +03:00
Sean Lee
47282a0ee6 spectrojack: init at 0.4
spectrojack - moved in all-packages

spectrojack: init at 0.4

updated

spectrojack: init at 0.4
2016-02-13 11:19:53 -05:00
Jinjing Wang
73b9a9662d pdnsd service: init 2016-02-12 19:53:41 +08:00
Franz Pletz
bb55126965 Merge pull request #12933 from mayflower/pkgs_upstream/nntp-proxy
nntp-proxy: init at 2014-01-06 (0358e7a)
2016-02-12 08:26:29 +01:00
Tristan Helmich
f8d0ba7447 nntp-proxy: init at 2014-01-06 (0358e7a) 2016-02-11 16:24:48 +01:00
Arseniy Seroka
6a44d3fb9d Merge pull request #12884 from elitak/sunxi-tools_packages
sunxi-tools: (new)
2016-02-11 16:52:50 +03:00
Eric Litak
0d1d91efdd sunxi-tools: init at 1.3 2016-02-10 10:48:08 -08:00
Nikolay Amiantov
6a2cbbb24a Merge pull request #12888 from vanzef/qtscrob
Qtscrob
2016-02-09 17:20:56 +03:00
Ivan Solyankin
d4dcfa9a76 maintainers: add vanzef 2016-02-09 16:43:37 +03:00
Robin Gloster
a538959ca0 lib.maintainers.globin: use my normal mail address 2016-02-07 11:31:19 +00:00
Pascal Wittmann
98b365386a Merge pull request #12808 from kevincox/b2
backblaze-b2: init at version 0.3.10
2016-02-04 13:22:02 +01:00
Pascal Wittmann
1b998d97a9 Merge pull request #12810 from aneeshusa/add-as31
as31: init at 2.3.1
2016-02-04 08:35:45 +01:00
Aneesh Agrawal
b4c449635a as31: init at 2.3.1 2016-02-04 01:37:28 -05:00
Kevin Cox
47c863f9ef backblaze-b2: init at version 0.3.10 2016-02-03 18:45:01 -05: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
Vladimír Čunát
889351af8b Revert "Merge #12357: nixos docs: show references to packages"
The PR wasn't good enough yet.
This reverts commit b2a37ceeea, reversing
changes made to 7fa9a1abce.
2016-02-03 12:16:33 +01:00
Vladimír Čunát
b2a37ceeea Merge #12357: nixos docs: show references to packages 2016-02-03 10:07:27 +01:00
Octavian Cerna
3c011d0f1c quagga: init at 0.99.24.1 2016-02-02 11:56:30 +02:00
Luca Bruno
eeb3600e55 Merge pull request #12562 from tvestelind/vassal
vassal: new package
2016-02-01 23:56:12 +01:00
Tomas Vestelind
beabacf8c7 tvestelind in maintainers 2016-02-01 09:40:50 +01:00
Vladimír Čunát
ab8a691d05 nixos systemPackages: rework default outputs
- Now `pkg.outputUnspecified = true` but this attribute is missing in
  every output, so we can recognize whether the user chose or not.
  If (s)he didn't choose, we put `pkg.bin or pkg.out or pkg` into
  `systemPackages`.
- `outputsToLink` is replaced by `extraOutputsToLink`.
  We add extra outputs *regardless* of whether the user chose anything.
  It's mainly meant for outputs with docs and debug symbols.
- Note that as a result, some libraries will disappear from system path.
2016-01-28 11:24:18 +01:00
Arseniy Seroka
10f7070bf0 Merge pull request #12221 from spinus/solaar
solaar: init at 0.9.2
2016-01-24 23:16:12 +03:00
Aaron Schif
9aac99ccb0 homesick: init at 1.1.3 (close #12465) 2016-01-24 17:22:13 +01:00
Tomasz Czyż
2bdd64d6dc solaar: init at 0.9.2 2016-01-24 02:26:19 +00:00
Nikolay Amiantov
29785c5b7a Merge pull request #12309 from zohl/chromiumos-kernel
Add ChromiumOS kernels
2016-01-23 13:13:59 +03:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Franz Pletz
501f9166b1 Merge pull request #12407 from jgillich/chats
xmpp-client, ricochet
2016-01-18 15:15:59 +01:00
Domen Kožar
f69743b4b4 Merge pull request #11401 from zagy/add/shortuuid
pythonPackage shortuuid: init at 0.4.2
2016-01-17 13:01:16 +01:00
Svein Ove Aas
6987f87832 maintainers: Add Baughn 2016-01-15 09:33:37 +01:00
Tobias Geerinckx-Rice
a8265ea458 maintainers: remove roelof
Inactive since April 2014. Vanished from GitHub. Unreachable.
2016-01-14 23:55:47 +01:00
codsl
5acaa993f3 maintainers: add myself 2016-01-14 16:54:57 +01:00
Al Zohali
d28eeb8ad4 maintainers: add zohl 2016-01-13 22:43:19 +03:00
Vladimír Čunát
b9f6dfe8c5 nixos manuals: allow displaying package references
The manuals are now evaluated with each derivation in `pkgs` (recursively)
replaced by a fake with path "\${pkgs.path.to.the.attribute}".
It isn't perfect, but it seems to cover a vast majority of use cases.
Caveat: even if the package is reached by a different means,
the path above will be shown and not e.g. `${config.services.foo.package}`.

As before, defaults created by `mkDefault` aren't displayed,
but documentation shouldn't (mostly) be a reason to use that anymore.

Note: t wouldn't be enough to just use `lib.mapAttrsRecursive`,
because derivations are also (special) attribute sets.
2016-01-13 12:03:18 +01:00
Peter Simons
7ca8e13918 lib.getVersion: extend the function to cope with strings as well as derivations 2016-01-05 20:09:39 +01:00
Radvendii
2371acdeb2 tldr: init at 1.0
added tldr to all-packages.nix

cleaned up style

added metadata

semicolons

didn't test on mac. removed platform

wrong types

fixed duplication of version
2016-01-03 17:51:34 -05:00
Philipp Hausmann
b574af31f4 maintainers: Make attrname match my github account 2016-01-03 10:27:30 +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
Reno Reckling
a1e0894cb4 ding: init at 1.8 (close #11989)
vcunat improved meta.
2015-12-29 21:03:19 +01:00
Jascha Geerds
d623916494 maintainers: Change my email address 2015-12-26 14:08:56 +01:00
Hoang Xuan Phu
b8bc82a459 archiveopteryx: init at 3.2.0 2015-12-24 15:22:44 +08:00
Tim Williams
e2a25433b2 copyq: init at 2.5.0, fixed #11887 2015-12-23 01:58:59 +01:00
Derek Gonyeo
9671674959 acbuild: 0.1.1 -> 0.2.2 and moved to own default.nix, fixes #11889 2015-12-23 01:33:37 +01:00
Charles Strahan
defe78e553 licenses: add non-commercial Creative Commons 2015-12-22 02:25:43 +01:00
Gaëtan André
ff58a9831b matter-compiler: initial expression, fixes #11780 2015-12-18 15:49:57 +01:00
Pascal Wittmann
21522ede83 Merge pull request #11753 from nlewo/master
Add devpi-client and its dependencies
2015-12-17 16:21:46 +01:00
Thomas Tuegel
8baebb55d4 lib/strings: add readPathsFromFile 2015-12-16 15:00:34 -06:00
Antoine Eiche
19f9e46d57 pythonPackages.check-manifest: init at 0.30 2015-12-16 15:54:17 +01:00
Eelco Dolstra
064ceef792 Merge pull request #11455 from zagy/add/hasAttrByPath
add helper to lib/attrsets: hasAttrByPath
2015-12-16 15:46:12 +01:00
Arseniy Seroka
2542e92ca0 Merge pull request #11684 from Profpatsch/cutegram
Cutegram
2015-12-16 10:47:48 +03:00
Profpatsch
9c5cd49903 cutegram: init at 2.7.0-stable 2015-12-16 02:08:49 +01:00
Peter Simons
82c673d4c9 Merge pull request #11651 from gleber/add-erlang-modules
Add erlang modules
2015-12-15 17:55:25 +01:00
Christian Zagrodnick
42b586e5df pythonPackage shortuuid: init at 0.4.2 2015-12-15 16:07:27 +01:00
Rickard Nilsson
46905425cf Merge pull request #11477 from jgillich/mopidy-gmusic
mopidy-gmusic: init at 1.0.0
2015-12-15 10:15:51 +01:00
Gleb Peregud
bcc4ca029a Add rebar3 package 2015-12-15 01:02:52 +01:00
Jakob Gillich
872d0be1a0 mopidy-gmusic: init at 1.0.0 2015-12-14 14:38:58 +01:00
Domen Kožar
59e33d42e4 Merge pull request #11699 from luispedro/add_mahotas
Add mahotas & imread
2015-12-14 11:29:43 +01:00
Luis Pedro Coelho
5ff41b047a python.imread: init at 0.5.1
This is a package to read image files into numpy arrays.
2015-12-14 11:19:11 +01:00
Echo Nolan
f01c56f109 Remove Echo Nolan from maintainers
I'm not using Nix anymore.
2015-12-12 22:59:11 -08:00
Luca Bruno
5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Domen Kožar
66c90e6e1f add makeBinPath function for abstracting away pkg/bin:pkg2/bin.. 2015-12-10 12:47:32 +01:00
Michael Raskin
30bf5a01ad Fix maintainer list format and improve vanity.sh reliability 2015-12-08 19:12:26 +01:00
Christian Zagrodnick
ce96057588 add helper to lib/attrsets: hasAttrByPath 2015-12-07 11:04:14 +01:00
Emery Hemingway
2b6dcdfcd0 Rename 'emery' maintainer handle to 'ehmry', fixes #11493
Communication happens on Github so names should be consistent.
2015-12-05 23:06:20 +01:00
Arseniy Seroka
1764a05710 Merge pull request #11473 from NeQuissimus/master
Add Kotlin
2015-12-06 00:30:19 +03:00
Tim Steinbach
a356c3fa47 kotlin: init at 1.0.0-beta-3594 2015-12-05 21:23:22 +00:00
Niclas Thall
5bd92c0197 ums: init at 5.3.1, fixes #11485 2015-12-05 20:30:43 +01:00
Jan Malakhovski
30954fc155 lib: add myself to maintainers 2015-12-05 20:18:02 +01:00
Vladimír Čunát
263fd55d4b Merge recent staging built on Hydra
http://hydra.nixos.org/eval/1231884
Only Darwin jobs seem to be queued now,
but we can't afford to wait for that single build slave.
2015-12-05 11:11:51 +01:00
Eelco Dolstra
0b12e12843 Merge pull request #11272 from ebzzry/minver2
Expose minimum required Nix version (2)
2015-12-04 17:21:37 +01:00
Igor Pashev
b078ae9c16 Use x == null instead of builtins.isNull x 2015-12-04 07:22:57 +03:00
Igor Pashev
363e6978ce Allow enum of integers (and any other type)
Closes #9826.
2015-12-04 07:15:14 +03:00
Pascal Wittmann
119e0a7bdb Merge pull request #11354 from mrVanDalo/aj-snapshot
aj-snapshot: init 0.9.6
2015-11-30 22:38:41 +01:00
Ingolf Wagner
90f3c390f0 aj-snapshot: init (0.9.6) 2015-11-30 17:15:49 +01:00
Luca Bruno
920b1d3591 Merge branch 'master' into closure-size 2015-11-29 16:50:26 +01:00
Markus Wotringer
cb58cf57d6 radamsa: init at 0.4 2015-11-28 23:51:17 +01:00
Matthias C. M. Troffaes
b5e06b04a7 wolfssl: init at 3.7.0
Picked from #11287.
2015-11-27 11:00:40 +01:00
Rommel M. Martinez
31a20f38ac Expose minimum required Nix version. 2015-11-26 23:11:11 +08:00
Vladimír Čunát
70d7cfdb8c Merge #11275: lisp: adding maintainer, small updates 2015-11-26 09:17:52 +01:00
Eric Sagnes
6874221403 libchewing: init at 0.4.0 2015-11-26 16:12:25 +08:00
Tomas Hlavaty
2b6bd6f036 add myself as a maintainer 2015-11-26 08:24:02 +01:00
Luca Bruno
a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Peter Simons
89a5717c7a lib/trivial.nix: improve spelling 2015-11-25 11:30:43 +01:00
Christian Zagrodnick
1cdacc6aa2 lib/strings: add a toInt helper (close #11242)
While the function itself is pretty easy, it's not straitforward to find a way to convert string to int with nix.
2015-11-25 08:50:02 +01:00
Rickard Nilsson
38196171e8 Merge pull request #10773 from rvl/longview
Linode Longview package and module
2015-11-24 13:16:30 +01:00
Peter Simons
405fda497a lib: document fix and add fix', extends functions
These functions used to live in pkgs/development/haskell-modules/default.nix,
but they are generic, really, and should be easily accessible to everyone.
2015-11-24 12:48:03 +01:00
Vladimír Čunát
13eca6f79a Merge #11067: SmartOS updates
I amended some commits slightly.
2015-11-23 14:45:44 +01:00
Rodney Lorrimar
a754e7b8a6 Add self to maintainers 2015-11-22 12:37:00 +00:00
Pascal Wittmann
5dfceebaba Merge pull request #11039 from Phlogistique/sonic-pi
sonic-pi: init at 2.8.0
2015-11-22 10:13:07 +01:00
Noé Rubinstein
01a81506a6 sonic-pi: init at 2.8.0 2015-11-21 20:41:30 +01:00
goibhniu
c199019290 Merge pull request #11109 from ForNeVeR/pash
pash: init at git-2015-11-06
2015-11-21 10:44:00 +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
Jude Taylor
7039b24cdc cherry-pick lib.sandbox into master 2015-11-19 11:33:21 -08:00
Friedrich von Never
1c3b6a2812 pash: init at git-2015-11-06 2015-11-19 23:00:56 +06:00
Pascal Wittmann
d1d5f9c9c1 Merge pull request #11121 from manveru/google-fonts
google-fonts: new package
2015-11-18 12:36:20 +01:00
Michael Fellinger
08c6a2cd92 google-fonts: init at 2015-11-18 2015-11-18 12:19:37 +01:00
Danny Wilson
fdb534f06e GCC 4.8 compiles on Illumos.
- Disable profiled bootstrap.
- Add illumos meta platform.
2015-11-16 17:20:11 +01:00
Peter Simons
084e37ec7b Merge pull request #11025 from rick68/patch-1
Update deprecated.nix
2015-11-15 09:04:07 +01:00
William A. Kennington III
6602f49495 Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
This reverts commit 741bf840da.

This reverts the fallout from reverting the major changes.
2015-11-14 12:32:51 -08:00
Wei-Ming Yang
8b78f17f5f Update deprecated.nix
fix a typo
2015-11-15 03:41:39 +08:00
William A. Kennington III
9579c9ec7f Merge commit 'cb21b77' into master.upstream
This is a partial merge of staging for builds which are working
2015-11-13 15:53:10 -08:00
Domen Kožar
69c6aa5c1b Merge pull request #10989 from rnhmjoj/maintainer
add myself as a maintainer
2015-11-12 20:52:50 +01:00
rnhmjoj
d9274215e7 add myself as a maintainer 2015-11-12 19:25:15 +01:00
Robert Glossop
a911a4f4c5 clfswm: add maintainer 2015-11-11 00:57:09 -05:00
Stéphane Jourdois
ca23c1a29a Add myself as maintainer 2015-11-09 00:43:33 +01:00
William A. Kennington III
a26c8e9b83 Merge branch 'master.upstream' into staging.upstream 2015-11-07 15:51:51 -08:00
Nikolay Amiantov
75259cbf87 Merge pull request #10849 from lolwat97/imgur-screenshot
Add imgur-screenshot package
2015-11-06 23:58:39 +03:00
Sergey Sofeychuk
76e33c3602 maintainers: add lw 2015-11-06 23:48:32 +03:00
William A. Kennington III
1e7aa4f17d Merge branch 'master.upstream' into staging.upstream 2015-11-05 18:30:11 -08:00
Matthew O'Gorman
f761f06988 gnuradio-nacl: init at 2015-11-05 2015-11-05 21:17:39 +01:00
William A. Kennington III
4251612faa Merge branch 'master.upstream' into staging.upstream 2015-11-04 01:00:48 -08:00
Domen Kožar
fc36317c9b Merge pull request #10791 from msteen/master
Added msteen to the list of maintainers.
2015-11-02 14:40:50 +01:00
Matthijs Steen
b44df493d3 Added msteen to the list of maintainers. 2015-11-02 14:38:34 +01:00
Daniel Frank
bcc7f58c1f mbuffer: new package 2015-10-31 13:45:21 +01:00
William A. Kennington III
dd2de66d61 Merge branch 'master.upstream' into staging.upstream 2015-10-30 17:16:07 -07:00
Aaron Bull Schaefer
4140c0de65 Add elasticdog as a maintainer 2015-10-25 23:22:21 +00:00
Arseniy Seroka
70f9d81688 Merge pull request #10566 from spencerjanssen/cockatrice
cockatrice: init at 2015-09-24
2015-10-25 04:24:19 +03:00
Stefan Junker
8e8a985c4c rkt: bump to v0.10.0
* bump stage1 base image to v794.1.0 according to upstream release
* make use of BUILDDIR environment variable to control output path
* make use of the configure option for the stage1 image path and the stage1 base image path
* fix homepage URL

* add myself to the list of maintianers
2015-10-25 02:13:01 +02:00
Wout Mertens
5c34563cda Merge pull request #10517 from demin-dmitriy/sublime3
sublime3: make sublime text work with pkexec and gksudo
2015-10-24 19:16:34 +02:00
Demin Dmitriy
8a1e5d9a27 sublime3: add myself as a maintainer 2015-10-24 18:15:59 +03:00
goibhniu
0b09ae45fa Merge pull request #10563 from wedens/kbdd
kbdd: init
2015-10-24 13:21:53 +02:00
wedens
1b0ba9525d kbdd: init 2015-10-24 17:15:15 +06:00
goibhniu
f8af597f0c Merge pull request #10504 from brandonedens/meson-build
Meson build package
2015-10-24 12:40:14 +02:00
Spencer Janssen
c65cfc8b66 Add myself as a maintainer 2015-10-23 14:32:02 -05:00
Eelco Dolstra
45c7dd7d98 Add stdenv bootstrap tools generation to release.nix 2015-10-23 13:05:36 +02:00
Vladimír Čunát
4917a4f8b3 Merge master into staging 2015-10-23 01:57:14 +02:00
Brandon Edens
7c4064a0c4 Add maintainer. 2015-10-20 22:15:42 -07:00
Perry Barnoy
7df323125f Merge branch 'master' of https://github.com/NixOS/nixpkgs into xfce4-whiskermenu-plugin
Pull from nixpkgs/master to resolve Travis CI build conflicts.
2015-10-19 14:10:40 -04:00
Louis Taylor
057964e8db Update email address to currently preferred one 2015-10-17 19:01:46 +01:00
William A. Kennington III
8a44a36ca4 Merge branch 'master.upstream' into staging.upstream 2015-10-15 10:22:28 -07:00
Perry Barnoy
3d087ed3b1 Merge remote-tracking branch 'upstream/master' into xfce4-whiskermenu-plugin
Merge upstream.
2015-10-14 16:26:40 -04:00
Perry Barnoy
79321fbecd - Added myself as a maintainer
- Boilerplate whiskermenu expression
2015-10-14 16:25:54 -04:00
Eelco Dolstra
5f077e2296 Factor out option renaming
Option aliases/deprecations can now be declared in any NixOS module,
not just in nixos/modules/rename.nix. This is more modular (since it
allows for example grub-related aliases to be declared in the grub
module), and allows aliases outside of NixOS (e.g. in NixOps modules).

The syntax is a bit funky. Ideally we'd have something like:

  options = {
    foo.bar.newOption = mkOption { ... };
    foo.bar.oldOption = mkAliasOption [ "foo" "bar" "newOption" ];
  };

but that's not possible because options cannot define values in
*other* options - you need to have a "config" for that. So instead we
have functions that return a *module*: mkRemovedOptionModule,
mkRenamedOptionModule and mkAliasOptionModule. These can be used via
"imports", e.g.

  imports = [
    (mkAliasOptionModule [ "foo" "bar" "oldOption" ] [ "foo" "bar" "newOption" ]);
  ];

As an added bonus, deprecation warnings now show the file name of the
offending module.

Fixes #10385.
2015-10-14 18:18:47 +02:00
Desmond O. Chang
b41742414e git-crypt: update maintainer 2015-10-14 21:46:27 +08:00
Florian Paul Schmidt
24b375ac06 alsa-tools: update maintainer 2015-10-13 12:48:03 +02:00
Arseniy Seroka
124bca6dc1 Merge pull request #10345 from javaguirre/package-phpcs
phpcs: init at 2.3.4
2015-10-12 16:39:05 +03:00
Javier Aguirre
9522afae2c phpcs: init at 2.3.4
Adding javaguirre to maintainers
2015-10-12 12:11:54 +02:00
=
74a958fec7 non: init at 2015-10-6 2015-10-11 18:37:21 +02:00
Luke Gorrie
42e753f8b3 maintainers.nix: Add lukego 2015-10-08 10:11:06 +00:00
Eelco Dolstra
741bf840da Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
This reverts commit f61176c539, reversing
changes made to a27ca029ee.

Conflicts:
	pkgs/development/libraries/ncurses/default.nix
2015-10-06 15:24:20 +02:00
Echo Nolan
89931277de flashplayer: add myself to maintainers 2015-10-03 20:54:38 -07:00
Vladimír Čunát
f361938b21 Merge staging into closure-size
This makes gcc5 the default builder, etc.
2015-10-03 15:23:13 +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
Arnold Krille
bb7eb9829d jackmix: init at version 0.5.2
Add jackmix to the nix pkgs.
2015-10-02 14:56:59 +02:00
lethalman
e9d554580c Merge pull request #10066 from michaelpj/p/heatseeker
heatseeker: init at 1.3.0
2015-10-02 11:36:07 +02:00
Thomas Tuegel
e92cbb73e4 lib.licenses: add fdl13 2015-09-27 09:45:35 -05:00
Thomas Tuegel
f9e5745efa lib: add makeScope 2015-09-27 09:45:23 -05:00
Michael Peyton Jones
ef8e002bf0 heatseeker: init at 1.3.0 2015-09-25 16:27:43 +01:00
Vladimír Čunát
0be672ced1 kdevplatform: maintained by @ambrop72, /cc #9981. 2015-09-22 08:44:23 +02:00
David Kleuker
6fc40fada1 add myself to maintainers 2015-09-20 21:16:22 +02:00
Arseniy Seroka
8862188761 Merge pull request #9924 from erikryb/master
perseus: init at 4-beta
2015-09-19 13:21:53 +03:00