1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 13:41:26 +00:00
Commit graph

463 commits

Author SHA1 Message Date
Nicolas B. Pierron 6d15e32536 Issue #6161 - Add tests for NixOS modules. 2015-02-09 00:07:44 +01:00
Ben Ford b34a1cc248 Add a kafka package 2015-02-03 08:46:25 +00:00
Shea Levy c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00
Renzo Carbonara 886575ec1a New packages: Hunspell dictionaries for Spanish, Italian and French.
These aren't readily picked up by Hunspell-compatible software such as
Firefox or LibreOffice just yet, as they need to be setup to look for
the dictionaries at the proper paths. Nevertheless, one can point
Hunspell-compatible tools to, say, $HOME/.nix-profile/share/hunspell and
they will find the dictionaries:

  % echo "bonjor" | hunspell -d fr-classique
  Can't open affix or dictionary files for dictionary named "fr-classique".

  % export DICPATH=$HOME/.nix-profile/share/hunspell
  % echo "bonjor" | hunspell -d fr-classique
  Hunspell 1.3.3
  & bonjor 1 0: bonjour

The full list of packages added:

hunspellDicts.es-any         hunspell-dict-es-any-rediris-0.7
hunspellDicts.es-ar          hunspell-dict-es-ar-rediris-0.7
hunspellDicts.es-bo          hunspell-dict-es-bo-rediris-0.7
hunspellDicts.es-cl          hunspell-dict-es-cl-rediris-0.7
hunspellDicts.es-co          hunspell-dict-es-co-rediris-0.7
hunspellDicts.es-cr          hunspell-dict-es-cr-rediris-0.7
hunspellDicts.es-cu          hunspell-dict-es-cu-rediris-0.7
hunspellDicts.es-do          hunspell-dict-es-do-rediris-0.7
hunspellDicts.es-ec          hunspell-dict-es-ec-rediris-0.7
hunspellDicts.es-es          hunspell-dict-es-es-rediris-0.7
hunspellDicts.es-gt          hunspell-dict-es-gt-rediris-0.7
hunspellDicts.es-hn          hunspell-dict-es-hn-rediris-0.7
hunspellDicts.es-mx          hunspell-dict-es-mx-rediris-0.7
hunspellDicts.es-ni          hunspell-dict-es-ni-rediris-0.7
hunspellDicts.es-pa          hunspell-dict-es-pa-rediris-0.7
hunspellDicts.es-pe          hunspell-dict-es-pe-rediris-0.7
hunspellDicts.es-pr          hunspell-dict-es-pr-rediris-0.7
hunspellDicts.es-py          hunspell-dict-es-py-rediris-0.7
hunspellDicts.es-sv          hunspell-dict-es-sv-rediris-0.7
hunspellDicts.es-uy          hunspell-dict-es-uy-rediris-0.7
hunspellDicts.es-ve          hunspell-dict-es-ve-rediris-0.7
hunspellDicts.fr-any         hunspell-dict-fr-any-dicollecte-5.2
hunspellDicts.fr-classique   hunspell-dict-fr-classique-dicollecte-5.2
hunspellDicts.fr-moderne     hunspell-dict-fr-moderne-dicollecte-5.2
hunspellDicts.fr-reforme1990 hunspell-dict-fr-reforme1990-dicollecte-5.2
hunspellDicts.it-it          hunspell-dict-it-it-linguistico-2.4
hunspellDicts.en-us      hunspell-dict-en-us-wordlist-2014.11.17
hunspellDicts.en-ca      hunspell-dict-en-ca-wordlist-2014.11.17
hunspellDicts.en-gb-ise  hunspell-dict-en-gb-ise-wordlist-2014.11.17
hunspellDicts.en-gb-ize  hunspell-dict-en-gb-ize-wordlist-2014.11.17

Added myself to maintainers.nix
2015-02-01 15:00:49 +01:00
lethalman 1335946d61 Merge pull request #6039 from np/filter_audio
Add filter_audio
2015-01-30 15:47:57 +01:00
Ragnar Dahlén 85ba5c7bc9 Maintainers: Add Ragnar Dahlen 2015-01-30 09:33:55 +00:00
Nicolas Pouillard 7707d35a08 Add filter_audio 2015-01-28 23:39:57 +01:00
Paho Lurie-Gregg f504d12b29 add xflux 2015-01-28 12:33:00 +01:00
Thomas Tuegel 8fb5401c5b add GFDL-1.2 license 2015-01-26 20:59:49 -06:00
Edward Tjörnhammar 35af8c6105 Merge pull request #5935 from malyn/ccze
Add ccze
2015-01-25 10:22:21 +01:00
Edward Tjörnhammar 0691a2c915 Merge pull request #5919 from pjones/feature/pwsafe
New package: pwsafe (Password Safe)
2015-01-25 10:21:42 +01:00
Peter Jones 4f189f04ca New package: Password Safe (pwsafe) 2015-01-24 16:01:32 -07:00
Michael Alyn Miller 6cd01d1d6f Add ccze 2015-01-24 15:00:55 -08:00
Venkateswara Rao Mandela 01fc3e0525 grabserial: add package
[Bjørn:
 * buildInputs -> propagatedBuildInputs, so pyserial is found at
   runtime
 * whitespace fix (add missing whitespace inside curly bracket)
]
2015-01-22 20:58:30 +01:00
Moritz Kiefer 1af7967007 Add cocreature as maintainer of openjdk8 2015-01-20 19:07:54 +01:00
Peter Simons ec6b82a0c2 Merge branch 'master' into staging. 2015-01-19 18:41:17 +01:00
Vladimír Čunát 88089559b9 Merge #5676: gcc-wrapper -> cc-wrapper and related 2015-01-17 08:43:04 +01:00
Pascal Wittmann e01d24bd72 Merge pull request #5773 from matthiasbeyer/add-cortex
Add cortex in applications/misc
2015-01-15 18:32:48 +01:00
Matthias Beyer 12795b9735 Add myself as maintainer 2015-01-15 17:13:39 +01:00
j-keck 4e21ef88fb add kpcli: KeePass Command Line Interface 2015-01-14 14:12:29 +01:00
Vladimír Čunát 1575bc652e Merge branch 'master' into staging
Conflicts (simple):
	pkgs/os-specific/linux/util-linux/default.nix

It seems this merge creates a new stdenv hash,
because we had changes on both branches :-/
2015-01-13 18:07:11 +01:00
Vladimír Čunát 309b956215 lib/licenses: add IJG (Independent JPEG...) 2015-01-13 16:55:11 +01:00
Shea Levy 8921a8f53b Revert "Revert "mkOverridable: Use functors to allow overridable functions""
Original commit was reverted due to using features from a newer nix than
hydra had, hydra has since been updated

This reverts commit 07e726c85c.
2015-01-13 08:39:54 -05:00
Rob Vermaas 07e726c85c Revert "mkOverridable: Use functors to allow overridable functions"
This reverts commit 4ee556cfe9.
2015-01-13 13:53:11 +01:00
Shea Levy 4ee556cfe9 mkOverridable: Use functors to allow overridable functions 2015-01-09 13:26:34 -05:00
Domen Kožar 79a51b0cf3 Add Type information into manual and manpages, fixes #4600 2015-01-04 15:41:32 +01:00
John Wiegley e37328fd93 Add Eric Seidel as a maintainer 2015-01-03 07:29:35 -05:00
Nicolas B. Pierron 816229593a Merge pull request #5441 from nbp/mkAlias
modules: Extract mkAliasDefinition from the rename.nix NixOS module.
2015-01-01 06:59:42 -08:00
Benjamin Staffin 4dd93dbf25 lib: Fix matchAttrs by importing builtins.length
Before:

    nix-repl> :l <nixpkgs>
    nix-repl> lib.matchAttrs { foo = "bar"; } { bar = "bas"; }
    error: undefined variable ‘length’ at "/home/benley/nix/nixpkgs/lib/attrsets.nix":317:10

After:

    nix-repl> :l <nixpkgs>
    nix-repl> lib.matchAttrs { foo = "bar"; } { bar = "bas"; }
    false

Change-Id: I548d69d50cffe1c63a6f39f76fd09d1835d8d9a2
2014-12-30 15:07:29 -08:00
Eduard Bachmakov 5e4a8d9fd8 Add photoqt-1.1.0.1
Also, add myself to maintainers.
2014-12-27 22:13:41 +01:00
Brandon Dimcheff 0669f7c97b add bdimcheff as maintainer 2014-12-23 12:31:45 -05:00
Nicolas B. Pierron d7f29acd48 modules: Extract mkAliasDefinition from the rename.nix NixOS module. 2014-12-22 22:38:38 +01:00
Nicolas B. Pierron c184d7e7e0 Merge pull request #5421 from nbp/mkSink
modules: Add mkSinkUndeclaredOptions.
2014-12-22 11:59:42 -08:00
Nicolas B. Pierron 2f365923d6 modules: Add mkSinkUndeclaredOptions. 2014-12-21 14:50:46 +01:00
Daniel Bergey 4c064b5478 add LaTeX Project Public License v1.3c for Gyre
use lib.maintainers
2014-12-19 20:07:53 +00:00
lethalman 70bede51a2 Merge pull request #5370 from KoviRobi/master
Added package 'fatsort'.
2014-12-19 10:23:13 +01:00
aszlig ebf216bd56
Merge pull request #5389 from devhell/mediainfo.
Introduces a video/audio information utility, both CLI and GUI.

Thanks to @devhell.

* devhell-mediainfo:
  libzen: Add --enable-shared to configureFlags.
  mediainfo-gui: Add package
  mediainfo: Add myself to meta.maintainers.
  mediainfo: Add package and dependencies
2014-12-19 00:17:21 +01:00
devhell 858b5e54c7 mediainfo: Add myself to meta.maintainers. 2014-12-18 21:23:21 +01:00
Peter Simons f698fbecd2 Merge pull request #5376 from Zert/master
Add poker-eval library
2014-12-18 14:10:40 +01:00
Vladimír Čunát ec5e916f6f attic: add maintainer and platforms
CC #5374.
2014-12-18 13:36:35 +01:00
Maxim Treskin 51277882d0 Add mtreskin to maintainers list 2014-12-18 01:04:25 +01:00
Kovacsics Robert (rmk35) 6f608967f4 Added package 'fatsort'.
Fatsort sorts partition table on FAT12/16/32 partitions for devices that
don't sort the files for themselves (e.g. some media players).
2014-12-17 13:54:13 +00:00
Carlo Nucera aaf63768a9 Added maintainer meditans
I'm adding myself as a maintainer in a separate commit because this simplifies my work in packaging haskell
stuff.
2014-12-16 12:08:45 +01:00
Michael Raskin cb0fa1d4f7 Fix spdx syntax for GPL1 2014-12-07 19:04:07 +03:00
Pavan Rikhi b79bf417f0 Add the Clearlooks-Phenix GTK3 Theme 2014-12-05 05:13:17 -05:00
Max Gonzih f0fa7254ee Add myself to mainteiners list 2014-12-04 19:42:37 +01:00
Erik Timan c0e7497484 Add olcai to maintainers
Takes maintainership of pythonPackages.icalendar as well
2014-12-04 09:05:36 +00:00
muflax 856e5839e1 ccl: 1.8 -> 1.10 (reapply after false revert) 2014-11-27 22:48:07 +00:00
Arseniy Seroka 52ea3bb61f Revert "ccl: 1.8 -> 1.10" 2014-11-28 01:34:54 +03:00
muflax 3c7ac9db06 ccl: 1.8 -> 1.10 2014-11-27 22:33:21 +00:00
Spencer Whitt fdbd5e1323 New package: git-extras 2014-11-25 20:24:43 -05:00
Bart Brouns 9dff67eed7 lib/licenses: add gpl1 (close #5103)
@vcunat changed format to spdx.
2014-11-24 10:37:49 +01:00
Peter Simons 9b75a2d265 Revert "added myself" 2014-11-24 08:28:29 +01:00
Peter Simons 8728c5902f Merge pull request #5102 from magnetophon/magnetophon
added myself
2014-11-24 08:27:36 +01:00
Bart Brouns 3e714701e5 remove unused stuff
leave only faust itself, it's libraries, and cpp architecture files that
can be used as examples.
2014-11-24 08:07:27 +01:00
Bart Brouns 7893b6c597 added myself 2014-11-24 03:10:09 +01:00
Tobias Geerinckx-Rice d72f6c85e4 Add eid-viewer: Java reader for Belgian eID identity cards 2014-11-23 00:42:52 +01:00
Andreas Herrmann 8a17536757 maintainers: Add aherrmann 2014-11-21 11:49:34 +01:00
jz ba930acc44 add vimus and myself as maintainer
add vimus to all-packages.nix

should be in haskell-packages.nix not all-packages.nix

i don't think this can be both a library and an executable
2014-11-20 16:12:38 -07:00
Jean-Philippe Bernardy 98a06ff71f add myself as maintainer for parsek. 2014-11-17 15:52:00 +01:00
Daniel Austin 5d56bda1fb Development tools: added atom-shell 2014-11-14 04:53:20 +01:00
Ricardo M. Correia 1fea5866ae Add unique list function
It removes duplicate elements from a list.
2014-11-12 22:31:49 +01:00
Joachim Fasting 216ed76821 dnscrypt-proxy: new expression 2014-11-11 22:46:49 +01:00
Brian McKenna a6bacd4d81 Add "light" package and setuid wrapper 2014-11-09 19:45:43 -07:00
Michael Raskin 6d0518fbdf Merge pull request #4282 from sztupi/crashplan
Crashplan

OK, it is an external service with unfree client, so let's declare that ensuring usability of the service is not our headache.
2014-11-09 18:09:33 +03:00
Eike Kettner e96df6c6f9 html2text: new package
Closes #4864
2014-11-07 23:19:49 +00:00
Peter Simons f811f1fc65 maintainers.nix: fix broken entry for 'sjmackenzie' 2014-11-07 18:10:54 +01:00
cillianderoiste a55228c833 Merge pull request #4875 from sjmackenzie/new-maintainer-fix
semi-colon in maintainers
2014-11-07 17:52:38 +01:00
Stewart Mackenzie dbf05940dc semi-colon in maintainers 2014-11-08 00:49:05 +08:00
Austin Seipp 5c08871626 Merge pull request #4874 from sjmackenzie/new-maintainer
new maintainer: sjmackenzie
2014-11-07 10:19:22 -06:00
stewart 9042b9b9fc new maintainer: sjmackenzie 2014-11-08 00:17:33 +08:00
Alexey Levan 3fb4af7f75 pasystray: add meta attributes 2014-11-07 17:19:50 +02:00
David Rusu 1628cee892 hasklig: new font
Closes #4847

Signed-off-by: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
2014-11-07 01:14:48 +00: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
Eelco Dolstra 4e7a5aca2b Provide more SPDX IDs 2014-11-05 15:33:11 +01:00
Eelco Dolstra d43846a0d8 Make the license shortName attribute equal to the license attribute name
I.e. lib.licenses.<foo>.shortName == "<foo>". The SPDX identifier (if
known) is kept in lib.licenses.<license>.spdxId.
2014-11-05 15:26:45 +01:00
Eelco Dolstra af0557cf82 Allow marking licenses as unfree
This allows licenses like the Amazon Software License to be identified
properly while still preventing packages with those licenses from
being distributed in the Nixpkgs/NixOS channels.
2014-11-05 15:15:00 +01:00
Eelco Dolstra 858cfbc993 licenses.publicDomain: Fix typo 2014-11-05 14:52:05 +01:00
Vladimir Kirillov e10a8b7318 ec2-ami-tools -> 1.5.6, updated license & homepage 2014-11-05 15:28:52 +02:00
Arseniy Seroka a20e2d8f93 Merge pull request #4779 from gavinrogers/master
frostwire: initial working package
2014-11-04 23:03:52 +03:00
Gavin Rogers cb68376fcd frostwire: initial working package
This installs from the official frostwire tarball. Similar to the
jdiskreport package. Everything works fine on the systems I've tried.

I've made myself the maintainer.
Also upgraded it to 6.0.0 as it was released stable.
2014-11-04 18:57:01 +00:00
Henry Till 36d55bcfb0 Add henrytill to maintainers 2014-11-03 10:32:18 -05:00
Jonathan Rudenberg dc599494c1 Add titanous to maintainers list 2014-11-02 15:15:02 -05:00
Luca Bruno 350fa1f775 nixos: Try to show an helpful message when the user sets config. or options.
Feel free to improve or remove :-)
2014-11-01 23:33:24 +01:00
Igor Pashev ccfc8b8ca1 Added Igor Pashev <pashev.igor@gmail.com> 2014-11-01 18:59:19 +01:00
James ‘Twey’ Kay dc1965b9f7 New Haskell package: gloss-banana 2014-10-30 19:47:53 +00:00
Scott Christopher 36308f6bbc IDEA Editor: Adds PHPStorm support. 2014-10-30 22:25:28 +11:00
Mateusz Kowalczyk b102f09c00 Merge pull request #4674 from balajisivaraman/meslo-lg
Add Meslo LG & Meslo LG DZ fonts
2014-10-29 16:34:25 +00:00
Jiri Marsik b4b3368c8d Added the CECILL 2.0 license 2014-10-28 14:06:04 +01:00
Jiri Marsik 569ef7d3f0 Add jirkamarsik to maintainers 2014-10-28 14:00:28 +01:00
Balaji Sivaraman 6ed23f7b17 Add balajisivaraman to maintainers 2014-10-26 19:14:00 +05:30
Valérian Galliat e55df0f4a3 Add the Unlicense 2014-10-22 18:43:34 +02:00
Georges Dubus 1ef52d5db1 Merge pull request #4574 from fpletz/package/ncmpcppBeta
New package: ncmpcppBeta
2014-10-21 13:42:53 +02:00
Luca Bruno 492dd14e78 Add overrideDerivation to makeOverridable. Closes #4017 2014-10-18 18:02:43 +02:00
Franz Pletz b9a3b4642d Add fpletz to maintainers 2014-10-18 05:14:35 +02:00
cillianderoiste d34a989442 Merge pull request #4516 from kragniz/master
Add simulator for autonomous sailing boats
2014-10-14 13:11:41 +02:00
Louis Taylor 7034163832 Add simulator for autonomous sailing boats 2014-10-14 12:00:42 +01:00
Alastair Pharo d147759af7 Add pure-gsl package 2014-10-14 21:21:36 +11:00
Michael Raskin dfae2a0e4b Merge pull request #4503 from vbgl/tagaini
Adds Tagaini Jisho
2014-10-13 17:52:55 +04:00
Peter Simons d5570b082d Merge pull request #4408 from christopherpoole/dlib
Added the dlib machine learning library.
2014-10-13 12:52:26 +02:00
Vincent Laporte f132f9c6c9 Adds the CC-BY-SA-3.0 license 2014-10-13 01:23:18 +01:00
Mateusz Kowalczyk b0258a5d17 Merge pull request #4462 from VShell/discount
discount: new package
2014-10-12 12:37:50 +01:00
Arseniy Seroka b8252a4494 apulse: add pkg
Closes #4488
2014-10-12 12:21:09 +01:00
Shell Turner 0b649538b2 discount: Added shell as maintainer 2014-10-12 12:09:07 +01:00
Christopher Poole f3b8324fc5 Added Christopher Poole to the list of dlib package maintainers. 2014-10-10 10:18:42 +11:00
codyopel 2986ca34d6 rtorrent-git: new package 2014-10-09 20:47:27 +02:00
Oliver Hunt 6f64a7cf43 Added granite
Added meta details, changed hash to sha256, and added versions for granite

Changed name to use versions

Fixed license

Yet another typo fix

Added myself as maintainer and fixed typo

Fixed maintainers

Added pantheon terminal

woops
2014-10-09 01:55:27 +02:00
Aristid Breitkreuz 596b4b42ed Merge pull request #4378 from abbradar/deadbeef-fix
fix "Open..." menu items in "deadbeef"
2014-10-05 14:53:44 +02:00
Eelco Dolstra ce61353a9f Eliminate some optionals/optionalAttrs calls on the hot path 2014-10-05 01:59:24 +02:00
Eelco Dolstra 97220c973f Replace hasAttr/getAttr calls with the ? and . operators
For NixOS evaluation, this gives a ~21% reduction in the number of
values allocated and a ~4% speedup. It's also more readable.
2014-10-05 01:11:06 +02:00
Eelco Dolstra 0e120dc68f Use new primops 2014-10-05 01:10:52 +02:00
Eelco Dolstra eeac1e70aa Remove obsolete checks for missing primops 2014-10-05 01:10:37 +02:00
Eelco Dolstra 6c2bf141cf lib: Use arithmetic operators rather than builtins.add etc. 2014-10-05 01:10:06 +02:00
Peter Simons ae32accc47 lib/licenses.nix: cosmetic 2014-10-04 21:15:36 +02:00
Nikolay Amiantov 213511c316 abbradar: update e-mail 2014-10-04 01:51:00 +04:00
Nikita Mikhailov cb18839669 python-linode: add myself as maintainer, fix meta 2014-10-03 12:18:50 +02:00
Mateusz Kowalczyk ce4ae2aa1e Merge pull request #4305 from vbgl/coq-containers
Working with Coq
2014-09-30 15:04:30 +01:00
Dmitry V 3eef950762 seturgent: new package
Closes #4329
2014-09-30 09:53:52 +01:00
Vincent Laporte 181139fe09 Adds license CeCILL-B 2014-09-28 14:03:14 +01:00
Attila Sztupak de7da7c4fe crashplan: added myself as maintainer 2014-09-27 13:05:04 +01:00
Raffael Mancini f80e897add Merge branch 'master' of github.com:NixOS/nixpkgs 2014-09-27 12:09:48 +02:00
Vladimír Čunát 7323d5e128 lib/platforms: add "armv6l-linux" to all platforms
It was only in mesaPlatforms, which caused nix appear unsupported in there.
2014-09-27 11:23:03 +02:00
Raffael Mancini 87dc6a2be6 Added Freewheeling
a live looping instrument for jack with MIDI support
revision r100 from subversion
2014-09-26 17:20:02 +02:00
Mateusz Kowalczyk fe86a03a1c libpng: use spdx licensing method 2014-09-21 18:53:20 +01:00
(cdep)illabout 7a5be25ba0 Add myself to the maintainers of roxterm. 2014-09-21 15:09:25 +02:00
Vincent Laporte d5f938d800 Adds myself to the maintainers list 2014-09-21 10:20:13 +01:00
Ellis Whitehead 8ea7e926cc Add myself to the maintainers list 2014-09-21 02:13:28 +01:00
Mateusz Kowalczyk 96bf2fdecf Add missing semi-colon in maintainers 2014-09-21 02:12:53 +01:00
Michel Kuhlmann 6d56666905 LASzip: michelk as maintainer; adjust description; remove blank-lines; using sha256 2014-09-21 01:50:31 +01:00
wyvie a3effead90 Added myself as maintainer 2014-09-21 00:45:31 +01:00
Nikolay Amiantov 185220feb8 Add me as a maintainer 2014-09-20 13:38:52 +02:00
Dmitry Malikov 7ad0646dc0 haskellPackages.cabalg: 0.2.9 2014-09-20 13:32:43 +04:00
Luca Bruno fc265a85aa Fix evaluation 2014-09-18 10:47:01 +02:00
Longrin Wischnewski 960fdf0f2e clamav: add myself to lib.maintainers 2014-09-18 08:15:16 +02:00
Peter Simons 55d5747a90 Merge pull request #4102 from ftrvxmtrx/alock
added alock package
2014-09-17 23:42:49 +02:00
Rob Vermaas f7f9580545 Merge pull request #4092 from ts468/pam_mount
New packages: pam_mount and libHX
2014-09-17 13:15:22 +02:00
Edward Tjörnhammar 2bbd01485a init list helper 2014-09-16 18:12:39 +02:00
Siarhei Zirukin b8848c070c added alock package 2014-09-16 09:25:47 +02:00
koral ce0dd9e335 Added bashmount package. 2014-09-15 18:29:47 +02:00
Thomas Strobel 7e4c24af7a Fix description in pam_mount and libHX. Add tstrobel as maintainer. 2014-09-15 12:30:19 +02:00
Robert Helgesson 9241dd5671 Add myself to maintainers.nix. 2014-09-13 10:14:26 +02:00
Pascal Wittmann 3c6eceb5fb Merge pull request #4008 from dbohdan/master
Add Jim Tcl interpreter
2014-09-12 21:36:58 +02:00
Danyil Bohdan 2a89610d9a jimtcl: add dbohdan as maintainer 2014-09-12 22:23:59 +03:00
cillianderoiste 56f6952f0d Merge pull request #4049 from vandenoever/musescore
Add MuseScore 1.3.
2014-09-12 18:53:14 +02:00
Jos van den Oever 8a4ce8cf34 Add MuseScore 1.3. 2014-09-12 16:52:44 +02:00
Vladimír Čunát 963b5e820c lib/licenses: add cc-by-40 (fixes #4035) 2014-09-11 20:03:03 +02:00
Eelco Dolstra 585983bc95 Merge remote-tracking branch 'origin/staging'
Conflicts:
	pkgs/applications/version-management/subversion/default.nix
2014-09-08 11:42:09 +02:00
Nicolas Pierron 4ff1ab5a56 Remove types.functionTo. 2014-09-07 19:41:45 +02:00
Nicolas Pierron b5f0cc3cda Merge options having the submodule type.
Now we should be able to have multiple declaration of the same option as
long as all declarations have the same type.  If the type has a sub module,
then it is merged with the submodules of other declarations, as done with
option sets.

In addition, the file of the option declaration is passed into the
submodule, such as the documentation can display it correctly.
2014-09-07 19:03:20 +02:00
Nicolas Pierron bb944b4dc8 Annotate option-set options with the file in which they are declared.
This modification improves NixOS manual by listing in which file, each
submodule option is declared.  This solve the issue that files are not
reported when looking at options such as fileSystems.<name?>.neededForBoot
2014-09-07 19:03:20 +02:00