60972 Commits

Author SHA1 Message Date
Cray Elliott
e30f14b791 update doomseeker to v0.12.2b 2015-03-13 22:25:24 -07:00
James Cook
8c87695f60 Merge pull request #6776 from giogadi/add-ceres-solver
Add derivation for google ceres-solver library
2015-03-13 20:54:58 -07:00
William A. Kennington III
feb4629fde Merge pull request #6782 from bobvanderlinden/fix-mysql-python
pythonPackages: MySQL_python: added openssl as buildInput
2015-03-13 17:32:26 -07:00
Peter Jones
cbc648f462 New package: AtomicParsley 2015-03-13 16:06:37 -06:00
vbgl
5dcedbb6e4 Merge pull request #6791 from romildo/xml-light
Add ocaml-xml-light
2015-03-13 22:52:58 +01:00
Thomas Tuegel
f4146b7f2d kf57: fix evaluation 2015-03-13 16:27:04 -05:00
Vincent Laporte
d38c414d94 Adds Qarte
Qarte allows you to browse into the archives of arte+7 & arteLiveWeb sites
and to record your preferred videos.

Homepage: https://launchpad.net/qarte
2015-03-13 22:17:32 +01:00
Vincent Laporte
9402dbe25d tagainijisho: update from 1.0.2 to 1.0.3 2015-03-13 22:17:32 +01:00
Vincent Laporte
48c6daf491 jedit: update from 5.1.0 to 5.2.0 2015-03-13 22:17:32 +01:00
Sander van der Burg
9be119bb0e disnix: bump to version 0.3 2015-03-13 21:07:46 +00:00
José Romildo Malaquias
7f07b33e4d Add ocaml-xml-light 2015-03-13 15:30:31 -03:00
Thomas Strobel
628594fd79 Fix URL for emacs evil package 2015-03-13 19:27:30 +01:00
Thomas Tuegel
fe8072ee7f kf57: add meta.branch to fix monitor 2015-03-13 13:17:38 -05:00
Edward Tjörnhammar
699508227f Merge pull request #6788 from shdpl/phpstorm
IDEA-PhpStorm version bump
2015-03-13 19:06:53 +01:00
Mariusz `shd` Gliwiński
75d3a321d6 IDEA-PhpStorm version bump to 8.0.3 2015-03-13 18:53:00 +01:00
Shea Levy
e729dfbd3f gcc-4.9: Set isGNU
Fixes #6787
2015-03-13 12:47:17 -04:00
Arseniy Seroka
9122346e33 Merge pull request #6781 from mdorman/master
haskell: aeson-schema missing test suite
2015-03-13 19:06:24 +03:00
Pascal Wittmann
8eb7034766 calibre: update from 2.20.0 to 2.21.0 2015-03-13 16:12:51 +01:00
lethalman
a918bd0151 Merge pull request #6777 from ardumont/add-sqldeveloper-derivation
[new] sqldeveloper derivation
2015-03-13 15:09:40 +01:00
Jascha Geerds
328651bfac pycharm: Update to 4.0.5 2015-03-13 14:55:08 +01:00
Joachim Schiele
d74ea7d34f zef hemels' wordpress.nix adapted to extraSubservices 2015-03-13 14:19:48 +01:00
Antoine R. Dumont
86062d7a95 Adapt code according to @lethalman's review
- Use ${bash}/bin/bash
- We cannot use oraclejre7 because sqldeveloper wants a jdk.
2015-03-13 13:49:26 +01:00
Pascal Wittmann
c6a0565cfe Merge pull request #6648 from svenkeidel/eclipse-442
eclipse: update to 4.4.2
2015-03-13 11:31:54 +00:00
Bob van der Linden
75ba60aded pythonPackages: MySQL_python: added openssl as buildInput 2015-03-13 12:23:05 +01:00
Michael Alan Dorman
53663772f3 haskell: aeson-schema missing test suite
For some reason the .tar.gz on hackage is missing most of the files for
the test suite.  I've opened an issue on
it (https://github.com/timjb/aeson-schema/issues/9), but it's not yet
been acted on.  In the meantime, simply disabling the test suite seems
most sensible.

@peti, could you merge this?
2015-03-13 07:09:28 -04:00
lethalman
f72d1abb79 Merge pull request #5846 from arno01/nginx
nginx service improvements
2015-03-13 11:41:27 +01:00
Damien Cassou
459e942ea4 Merge pull request #6780 from DamienCassou/syncthing-gtk
Add syncthing-gtk
2015-03-13 11:28:39 +01:00
Damien Cassou
db42c89325 Add syncthing-gtk 2015-03-13 11:13:33 +01:00
lethalman
06ee4c62d3 Merge pull request #6779 from DamienCassou/update-syncthing-0.10.26
syncthing 0.10.23 -> 0.10.26
2015-03-13 10:05:46 +01:00
Peter Simons
fdd821f1ef configuration-ghc-7.8.x.nix: remove amazonka-related overrides
These overrides allow us to build amazonka packages, but we have no way to
actually use those build results within Nix, because the replaced GHC core
libraries collide with the real ones when we try to compose a ghc-with-packages
environment.

Closes https://github.com/NixOS/nixpkgs/issues/6584.
2015-03-13 10:01:29 +01:00
Peter Simons
14e5333e3c hackage-packages: re-generate from Hackage 2015-03-12T12:28:02+0100
Resolves https://github.com/peti/jailbreak-cabal/issues/5.
2015-03-13 10:01:29 +01:00
Damien Cassou
8b2f21a667 syncthing 0.10.25 -> 0.10.26 2015-03-13 09:32:32 +01:00
William A. Kennington III
e07ea5cf77 samba4: Fix linking and absolute paths 2015-03-12 17:34:59 -07: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
Nicolas B. Pierron
9f2865515d Fix infinite loop in fontconfig-ultimate.nix
With the new evaluation of arguments, pkgs is now defined by the
configuration, which implies that option declaration with pkgs.lib
will cause an infinite loop.
2015-03-12 23:42:58 +01:00
Shea Levy
3177d37652 Fix import using module args 2015-03-12 23:42:57 +01:00
Shea Levy
772b8869d2 Add comment about limitation on __internal.check 2015-03-12 23:42:57 +01:00
Shea Levy
f69ce50529 Move most extra args out of eval-config.nix 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
Bob van der Linden
decf15fd57 grub: make sure grub builds again (close #6774) 2015-03-12 23:05:54 +01:00
Vladimír Čunát
208d1f24db xfce: more update fallout
- forgotten mousepad update, including some wrapping magic
- dealing with panel plugins (either fix or mark as broken)
	CC maintainer @AndersonTorres.
- remove some libxfcegui4 occurrences, as it's being phased out
- minor stuff
2015-03-12 23:02:15 +01:00