Commit Graph

579 Commits

Author SHA1 Message Date
Eelco Dolstra
e212e07cf6 Make types.bool complain on conflicting definitions
Previously, conflicting definitions would merge to "true". Now they
give an error, e.g.

  error: The option `hardware.enableAllFirmware' has conflicting definitions, in `/etc/nixos/configurations/misc/eelco/stuff.nix' and `/etc/nixos/configurations/misc/eelco/mandark.nix'.
2015-06-15 18:07:48 +02:00
Eelco Dolstra
a4925bcfa8 Remove obsolete stuff 2015-06-15 18:07:44 +02:00
Arseniy Seroka
2e5f4a0152 Merge pull request #8255 from adevress/master
New expression for the davix toolkit
2015-06-12 00:52:37 +02:00
Adrien Devresse
f12a466730 New expression for the davix toolkit 2015-06-11 22:57:13 +02:00
Vladimír Čunát
95def7e4f0 lib/maintainers: recommend to re-use github usernames 2015-06-11 22:19:20 +02:00
Daniel Peebles
6e73884c31 Merge pull request #8204 from copumpkin/modulesPath
An importable modulesPath, once again
2015-06-10 12:32:04 -04:00
lethalman
f37c81323e Merge pull request #8180 from froozen/master
Add the tewi font
2015-06-08 14:27:57 +02:00
lethalman
850f775a98 Merge pull request #8213 from robbinch/pkg-wavegain
wavegain: show correct maintainer
2015-06-08 14:26:36 +02:00
Anders Papitto
50e9fa5719 dirt: include sound samples (close #8179)
also add self as maintainer
2015-06-08 10:16:03 +02:00
Robbin C
757942ddbf wavegain: show correct maintainer 2015-06-08 10:31:30 +08:00
Dan Peebles
b13cb54614 Bring an importable modulesPath back from the dead, in the only way I know 2015-06-08 01:55:49 +00:00
fro_ozen
4ae0815d3b Add the tewi font 2015-06-07 19:05:05 +02:00
Eelco Dolstra
3096d03435 Revert "Refactor mkFlag / shouldUsePkg into the nixpkgs libraries"
This reverts commit 25a148fa19.
2015-06-04 14:54:48 +02:00
lethalman
ea83ebff86 Merge pull request #8115 from Havvy/iojs
Update io.js to v.2.2.1
2015-06-01 16:52:04 +02:00
_1126
98e698fad2 maintainers: change of nickname. 2015-06-01 11:00:57 +02:00
Ryan Scheel (Havvy)
b49026ee98 Added: Havvy as maintainer for iojs/nodejs. 2015-06-01 05:17:59 +02:00
Tobias Geerinckx-Rice
87fd373aac lib/licenses: add CC-BY-SA-2.5 2015-05-27 22:00:04 +02:00
lethalman
af4d6468b2 Merge pull request #7959 from ikervagyok/darkice
New Package: Darkice
2015-05-27 10:51:59 +02:00
Tobias Geerinckx-Rice
48b7e40f0c licenses: add Vim licence 2015-05-27 00:13:19 +02:00
vbgl
2857d5d7a8 Merge pull request #7823 from ericbmerritt/ocaml-enhancements
Ocaml enhancements
2015-05-26 23:52:32 +02:00
Lengyel Balázs
aa1ce46281 Inital commit for Darkice 2015-05-26 15:20:53 +02:00
Alexander Flatter
be71c0871c Add meta information to heroku toolbelt 2015-05-26 13:06:34 +02:00
Eric Merritt
9cc8b80c96 add jwilberding as a maintainer 2015-05-25 13:40:32 -07:00
William A. Kennington III
384d8a79d0 Merge pull request #7717 from stephenmw/gcloud
Add the google-cloud-sdk package
2015-05-23 22:14:47 -07:00
Stephen Weinberg
da2aef3685 Add the google-cloud-sdk package 2015-05-24 06:20:45 +02:00
William A. Kennington III
25a148fa19 Refactor mkFlag / shouldUsePkg into the nixpkgs libraries 2015-05-22 13:26:55 -07:00
Eric Merritt
ae0e3c8974 add ericbmerritt to the maintainers list 2015-05-22 10:12:21 -07:00
Ozan Sener
97160a8644 Add Thrust 0.7.6 2015-05-20 20:58:03 +02:00
lethalman
efed756e67 Merge pull request #7849 from mschristiansen/mongo-tools-2
MongoDB Tools and Go dependencies
2015-05-18 10:52:49 +02:00
Mikkel Christiansen
734bc9f2e5 Add MongoDB tools and build dependencies. 2015-05-18 10:29:22 +02:00
Jascha Geerds
a84775e8f6 Merge pull request #7862 from C0DEHERO/fix/supertuxkart-update
supertuxkart: update 0.8.1 -> 0.9
2015-05-17 21:33:54 +02:00
C0DEHERO
e505663051 supertuxkart: update 0.8.1 -> 0.9 2015-05-17 14:36:49 -04:00
Arseniy Seroka
78b2afadff Merge pull request #7811 from pmiddend/fcppt
Add fcppt package
2015-05-16 22:37:14 +03:00
Paulus Esterhazy
89a58c9e05 Add Jekyll maintainer 2015-05-16 20:11:41 +02:00
Philipp Middendorf
7f2262e9a8 fcppt: initial import into nixpkgs 2015-05-14 23:54:57 +02:00
lethalman
1103392dd9 Merge pull request #7794 from womfoo/kbdlight
Add kbdlight package and setuid wrapper
2015-05-14 17:09:28 +02:00
Arseniy Seroka
c0727fb751 Merge pull request #7788 from Lassulus/charybdis
add charybdis nixos module
2015-05-11 12:57:58 +03:00
Kranium Gikos Mendoza
6f634e3c3a Add kbdlight package and setuid wrapper
update nixos/modules/programs/kbdlight.nix to use mkEnableOption
2015-05-11 13:23:01 +08:00
lassulus
5927faa138 add Lassulus to maintainers.nix 2015-05-10 14:10:22 +02:00
Aistis Raulinaitis
a5a740a17a z3 opt 2015-05-08 23:45:07 -07:00
Philip Potter
2216728979 add support for pam_u2f to nixos pam module
This adds support for authenticating using a U2F device such as a
yubikey neo.
2015-05-03 19:22:00 +01:00
Bram Duvigneau
70241a53d0 Added Bram Duvigneau to maintainers 2015-04-29 23:30:18 +02:00
Linus Arver
e216a63c7d Add package: pcg-c
Also, add myself as maintainer.
2015-04-26 14:50:45 -07:00
Edward Tjörnhammar
ca9d049654 removing cocreature as maintainer, as per request #6305 2015-04-25 00:29:51 +02:00
Hendrik Bunke
a96c076743 vimPlugins: added vim-jinja 2015-04-23 17:40:16 +02:00
Remy Goldschmidt
de02110903 Added K Framework package.
Closes https://github.com/NixOS/nixpkgs/pull/7419.
2015-04-17 16:05:00 +02:00
Luca Bruno
9abde81f8f Improve the list of archs made by commit 1299c020e9 2015-04-17 15:25:54 +02:00
Jaka Hudoklin
1299c020e9 Add a list of platforms organized by architecture 2015-04-17 15:24:59 +02:00
Arseniy Seroka
f029ccadc9 Merge pull request #7385 from Forkk/screencloud
Add package for Screencloud 1.2.0
2015-04-16 06:28:00 +03:00
Forkk
78eb702d35 qxt: init at 0.6.2 2015-04-15 22:04:33 -05:00
Tuomas Tynkkynen
3600de6791 maintainers: Add dezgeg (Tuomas Tynkkynen) 2015-04-12 17:51:39 +03:00
Arseniy Seroka
e52e160190 Merge pull request #7215 from cwoac/btsync2
Add support for btsync 2.x branch
2015-04-06 18:50:05 +03:00
Oliver Matthews
0539ed4771 Add support for btsync 2.x branch 2015-04-06 15:31:40 +00:00
cillianderoiste
174d924b6e Merge pull request #6951 from nix-faust/faust-redux
Faust redux
2015-04-04 14:15:51 +02:00
Nicolas B. Pierron
6de931a0f8 Merge rename.nix changes. 2015-04-03 23:12:12 +02:00
Joel Moberg
243ec61c4f i2p: initial 2015-04-01 18:15:54 +02:00
Christian Theune
b15078b579 Provide a basic package for sensu.
The server currently starts without error messages (on OS X) if you also
install redis and rabbitmq-server and start their processes without any
further configuration:

$ redis-server
$ rabbitmq-server
$ sensu-server

Haven't tried much more yet, but will in a bit.

(Amended: fix whitespace and string literal formatting issues, and
superfluous dependencies created by the generator script.
Thanks the-kenny!)
2015-03-30 23:56:15 +02:00
Andreas Baldeau
f079de2dbf Added WebStorm IDE 2015-03-29 16:27:37 +02:00
Arseniy Seroka
a639c710ae Merge pull request #6968 from oxij/unquestionably-good
Easy to check to be unquestionably good changes
2015-03-28 13:16:13 +03:00
Domen Kožar
ba5134c8e0 Merge pull request #7021 from taktoa/master
Added package for willie
2015-03-27 09:39:55 +01:00
Remy Goldschmidt
1697b2a228 Added Eiffel Forum License v1 and v2 to lib/licenses.nix 2015-03-26 21:12:10 -04:00
William A. Kennington III
611a4bfc0d licenses: Add mpl-1.0 2015-03-26 17:22:11 -07:00
Jan Malakhovski
5990cce95f lib: cleanup a little bit, add traceIf 2015-03-26 12:43:42 +00:00
Patrick Mahoney
04c96957ca faust: refactored derivation 2015-03-23 12:01:53 -05:00
William Casarin
ea2baa8abf spectrwm window manager 2015-03-21 11:02:44 -07:00
Jaka Hudoklin
f953d77be2 Revert "Reverts a bunch of commits as a try to fix GC errors."
This reverts commit 1e4ba025c2.

Conflicts:
	pkgs/development/web/nodejs/build-node-package.nix
2015-03-21 17:49:37 +01:00
Eelco Dolstra
0461f35894 Rename scrubDrv -> hydraJob and make it more effective
It now strictly evaluates all remaining attributes, preventing
unevaluated thunks that cannot be garbage-collected. It's also applied
to all jobs in Nixpkgs' release.nix.

This reduces hydra-eval-jobs' memory consumption on the 14.12
release-combined jobset from 5.1 GB to 2.0 GB.
2015-03-20 19:46:18 +01:00
Eelco Dolstra
ef0e4d56f5 Use builtin seq/deepSeq 2015-03-20 19:29:21 +01:00
Luca Bruno
cb45b7ec3e Revert "nixos: Multiple service instances, apply to nginx. See #6784"
This reverts commit 7ef59c4fe2.

Wrong push! Sorry!
2015-03-18 14:09:24 +00:00
Luca Bruno
7ef59c4fe2 nixos: Multiple service instances, apply to nginx. See #6784 2015-03-18 14:07:29 +00:00
lethalman
66d119c55c Merge pull request #6862 from hmuehlhans/master
p2pvc: new package
2015-03-18 10:10:30 +01:00
hmuehlhans
ec9f528961 p2pvc: new package
Added myself to maintainers
2015-03-17 21:04:05 +01:00
lukasepple
f7f0fd0dfe
Added CC-BY-SA 4.0 License 2015-03-17 20:54:05 +01:00
Domen Kožar
1e4ba025c2 Reverts a bunch of commits as a try to fix GC errors.
Commits

- 694f01db2d
- 829479d1dd
- bd81885f70
- b2fdcf801c
2015-03-17 08:55:03 +01:00
Nicolas B. Pierron
7f1a782d91 Add tests for the new module system improvements. 2015-03-16 22:38:41 +01:00
Vladimír Čunát
51a8a43dfc Merge #6472: add ddccontrol 2015-03-16 21:52:59 +01:00
Nicolas B. Pierron
05e8a48fb4 Document and rename internal option of modules. 2015-03-15 14:45:42 +01:00
Nicolas B. Pierron
ed91474e9b Share common code for merging option definitions.
This move idioms which were used in `evalOptionValue` and in the `merge`
functions of `listOf` and `attrsOf` types, such that we can use a names such
as `isDefined` and `optionalValue` instead or repeating identical
comparisons of `defsFinal == []`.
2015-03-12 23:42:58 +01:00
Nicolas B. Pierron
dd4f5f6b78 Rename mergeDefinitions internal steps to functions which are independent of each others. 2015-03-12 23:42:58 +01:00
Nicolas B. Pierron
83dc60456e Expose submodule arguments to builtins.functionArgs before applying the arguments.
The current implementation of the ApplyIfFunction is looking at the
arguments of a module to decide which arguments should be given to each
module.  This patch make sure that we do not wrap a submodule function in
order to keep functionArgs working as expected.
2015-03-12 23:42:58 +01:00
Shea Levy
772b8869d2 Add comment about limitation on __internal.check 2015-03-12 23:42:57 +01:00
Shea Levy
0a0a29fd0b Add comments about the module system interface
Ideally the module system could be configured pretty much completely by
the contents of the modules themselves, so add comments about avoiding
complicating it further and possibly removing now-redundant
configurability from the existing interface.
2015-03-12 23:42:57 +01:00
Shea Levy
e3eff53037 evalModules: Add internal option for the check argument 2015-03-12 23:42:57 +01:00
Shea Levy
e4a06f35b1 nixos: Don't evaluate twice to get the value of config.nixpkgs 2015-03-12 23:42:57 +01:00
Shea Levy
1d62ad4746 modules.nix: Generate the extra argument set from the configuration
This allows for module arguments to be handled modularly, in particular
allowing the nixpkgs module to handle the nixpkgs import internally.
This creates the __internal option namespace, which should only be added
to by the module system itself.
2015-03-12 23:42:57 +01:00
Shea Levy
4f5c6330c9 types.loaOf: Update check function
This symplifies typechecking and allows properties to be used inside the
function body. It also makes possible checking the type of the result.
2015-03-12 23:42:57 +01:00
Shea Levy
8737d1783f types.attrsOf: Use mergeDefinitions to handle each element
This simplifes typechecking and allows properties to be used inside of
the attribute sets.

This fixes the empty synergy-client and synergy-server services
previously generated on systems with synergy disabled.
2015-03-12 23:42:57 +01:00
Shea Levy
e4bc2592f3 types.listOf: Use mergeDefinitions to handle each element
This simplifies typechecking and allows properties to be used inside the lists
2015-03-12 23:42:57 +01:00
Shea Levy
9255c48a06 Move property processing, type checking, and merge code into a function
This makes the relationship between property types clearer, and more
importantly will let option types parameterized by other option types
reuse the code for delegated type checking and merging.
2015-03-12 23:42:57 +01:00
Luis G. Torres
92eaff008e Added derivation for google ceres-solver optimization library for C++ 2015-03-12 16:04:04 -04:00
Gabriel Ebner
fde4a0d442 Add ibus-anthy. 2015-03-11 21:54:04 +01:00
Robin Gloster
282530454a add myself as php and rustc maintainer 2015-03-11 11:24:55 +01:00
Jim Garrison
df9daf16aa Package vmtouch 2015-03-10 19:05:02 -07:00
Peter Simons
8196130a1d Merge pull request #6711 from phile314/dev
haskell: Add uhc compiler
2015-03-10 11:22:15 +01:00
Philipp Hausmann
1ce75368f1
Add uhc haskell compiler 2015-03-09 13:38:28 +01:00
lethalman
9867f4bdef Merge pull request #6720 from nslqqq/nmhooks
New NetworkManager Dispatcher scripts options
2015-03-09 10:36:10 +01:00
obadz
e5d4624420 PAM/eCryptfs now able to mount ecryptfs'd home directories on login 2015-03-08 16:03:51 -07:00
Domen Kožar
17a44e5013 Merge pull request #6717 from sjagoe/package-python-grin
Add grin package
2015-03-08 21:58:23 +01:00
Simon Jagoe
456750c1ad Add sjagoe as maintainer of grin package 2015-03-08 20:46:23 +00:00
Nikita Mikhailov
63ae447a0f Add 'fixedWidthString' and 'fixedWidthNumber' formatting functions 2015-03-08 19:02:32 +01:00
Eelco Dolstra
694f01db2d intersect -> intersectLists, subtract -> subtractLists 2015-03-04 22:15:46 +01:00
Eelco Dolstra
829479d1dd substract -> subtract 2015-03-04 22:15:45 +01:00
lethalman
186765e0e3 Merge pull request #6590 from iand675/noip2
Add noip package
2015-03-01 12:30:37 +01:00
Jaka Hudoklin
ea13e2aa87 lib/lists: add intersect and substract functions 2015-02-28 04:02:15 +01:00
Ian Duncan
5f218eaf92 Add meta info for noip package 2015-02-27 15:04:06 +00:00
Nicolas B. Pierron
7699f34c52 Merge pull request #6242 from nbp/issue-6161
Issue #6161 - Add tests for NixOS modules.
2015-02-23 12:12:01 -08:00
Arseniy Seroka
2550304bb6 Merge pull request #6524 from fkz/master
add edbrowse to all packages
2015-02-23 19:43:39 +03:00
Fabian Schmitthenner
8a74fa7723 add edbrowse to all packages 2015-02-22 23:11:01 +00:00
Ben Darwin
63d61cee7f teyjus: 2.0-b2 2015-02-21 19:55:24 -05:00
Fedor Pakhomov
b85beb6984 Added a maintainer 2015-02-20 16:57:10 +03:00
rushmorem
74b40e9a43 Add marathon mesos framework 2015-02-19 13:30:00 +02:00
bstrik
929335e32f Add myself to the maintainers 2015-02-17 22:06:59 +01:00
Antoine R. Dumont
172d78923b Add microscheme derivation
(A Scheme subset for Atmel microcontrollers.)

Use of the actual git HEAD because the actual tarball compiles but
segfault at runtime.

Upload the BLINK.ms sample on arduino board (/dev/ttyACM0):

```sh
$ sudo ./result/bin/microscheme -m UNO -d /dev/ttyACM0 -auc ~/repo/perso/microscheme/examples/BLINK.ms
Microscheme 0.8, (C) Ryan Suchocki
>> Treeshaker: After 4 rounds: 84 globals purged! 22 bytes will be
reserved.
>> 18 lines compiled OK
>> Assembling...
>> Uploading...

avrdude: AVR device initialized and ready to accept instructions

Reading | ################################################## | 100%
0.00s

avrdude: Device signature = 0x1e950f
avrdude: reading input file
"/home/tony/repo/perso/microscheme/examples/BLINK.hex"
avrdude: writing flash (2080 bytes):

Writing | ################################################## | 100%
0.35s

avrdude: 2080 bytes of flash written

avrdude: safemode: Fuses OK (E:00, H:00, L:00)

avrdude done.  Thank you.

>> Cleaning Up...
>> Finished.
```
2015-02-16 23:09:48 +01:00
Eelco Dolstra
5d7000df68 Automatically set nix.nrBuildUsers to at least nix.maxJobs 2015-02-16 12:02:49 +01:00
Benjamin Staffin
ea446390fa New package: xbindkeys-config
The patch is borrowed verbatim from Debian. It is under the same
license as the rest of the package, and is necessary for the app to
work.

There does not seem to be a canonical upstream homepage for this app
other than Debian itself.

Change-Id: I4f0bec32a95778fb12a48bfb280386b65a0d0f9a
2015-02-09 01:36:01 -08:00
Nicolas B. Pierron
de0f122b01 Issue #6161 - Register lib tests as release blockers. 2015-02-09 00:07:44 +01:00
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