Commit graph

35476 commits

Author SHA1 Message Date
cillianderoiste
ddc809d6da Merge pull request #1146 from Chaddai/master
Adding KVIrc : a IRC Client for Qt and KDE. in kde4.kvirc
2013-10-30 07:15:34 -07:00
Eelco Dolstra
e3e3666e24 smartd.nix: Fix broken option type 2013-10-30 14:57:43 +01:00
Eelco Dolstra
800f9c2037 Show correct position info for errors in submodules
E.g.

  The unique option `fileSystems./.device' is defined multiple times, in `/etc/nixos/configuration.nix' and `/etc/nixos/foo.nix'.

This requires passing file/value tuples to the merge functions.
2013-10-30 14:57:43 +01:00
Eelco Dolstra
4680af6a93 Add some option types 2013-10-30 14:57:42 +01:00
Eelco Dolstra
c7f7ceefd6 Export only the files of the active definitions 2013-10-30 14:57:42 +01:00
Eelco Dolstra
ac68d326b9 Manual: Fix -I flag 2013-10-30 14:57:42 +01:00
Eelco Dolstra
862e3dd977 Substitute "types.uniq types.string" -> "types.str" 2013-10-30 14:57:42 +01:00
Arvin Moezzi
162b874469 calibre: upgrade 1.5.0 -> 1.8.0
from #1144
2013-10-30 15:44:03 +02:00
Jason "Don" O'Conal
5a2011e0c3 googleMusicmanager: add expression
close #1056
2013-10-30 14:40:08 +02:00
Jason \"Don\" O'Conal
a590790656 pythonPackages.faker, pythonPackages.fake_factory: add expressions
close #1125
2013-10-30 14:17:42 +02:00
Domen Kožar
09fa7304ae ninka: update to 1.1 and refactor 2013-10-30 11:47:12 +01:00
Domen Kožar
d63f5de7db Merge pull request #1149 from offlinehacker/pkgs/gitAndTools.gitflow/add
Add gitflow
2013-10-30 03:44:33 -07:00
Domen Kožar
c3f43f3dce Merge pull request #1142 from lovek323/sympy
pythonPackages.sympy: add expression
2013-10-30 03:43:35 -07:00
Domen Kožar
60256b973c Merge pull request #1139 from offlinehacker/pkgs/pnquant/add
Add pngquant, it converts 24/32-bit RGBA PNGs to 8-bit palette with alpha channel preserved.
2013-10-30 03:42:52 -07:00
Jaka Hudoklin
11fd5db060 Add gitflow
A collection of Git extensions to provide high-level repository operations for Vincent Driessen's branching model
2013-10-30 11:37:57 +01:00
Jaka Hudoklin
24f0eccaa8 Add pngquant, it converts 24/32-bit RGBA PNGs to 8-bit palette with alpha channel preserved. 2013-10-30 11:30:49 +01:00
Chaddaï Fouché
5fe82bafac Ooops licences replaced by licenses 2013-10-30 10:55:40 +01:00
Chaddaï Fouché
1d9632cac8 Adjust kvirc/default.nix to better use stdenv.lib 2013-10-30 10:53:34 +01:00
Michael Raskin
52d5290118 Update SlimerJS 2013-10-30 13:03:47 +04:00
Eelco Dolstra
8150f1a362 firefox: Update to 25.0 2013-10-29 23:47:09 +01:00
Chaddaï Fouché
4c9349a2c1 Adding KVIrc : a IRC Client for Qt and KDE. in kde4.kvirc 2013-10-29 23:35:29 +01:00
Eelco Dolstra
972d9974c6 Decrease verbosity of VirtualBox image generation 2013-10-29 21:15:11 +01:00
Domen Kožar
9726dded27 openssh: build on unix platforms 2013-10-29 17:47:38 +01:00
Eelco Dolstra
1d104c792b Remove the dhclient module
It's no longer used by NixOS (replaced by dhcpcd).
2013-10-29 17:39:32 +01:00
Eelco Dolstra
0695b68c8c Manual: Render multi-line strings properly 2013-10-29 17:39:31 +01:00
Eelco Dolstra
bfaa6b7352 Manual: Escape $ 2013-10-29 17:39:31 +01:00
Eelco Dolstra
60c4c468f1 Manual: Render strings containing special characters as indented strings 2013-10-29 17:39:31 +01:00
Eelco Dolstra
b64f43cdbd Manual: Don't show "Default: none" 2013-10-29 17:39:31 +01:00
Rok Garbas
b040814679 changes in: redshift, geoclue, libsoup
- added support for geoclue for redshift
 - package geoclue 2.0.0 (as geoclue2)
 - package libsoup 2.44.1 (as libsoup_2_40)
2013-10-29 16:25:31 +01:00
Eelco Dolstra
89b1dd8dde Fix environment.checkConfigurationOptions
This requires delaying the declaredness check until later, otherwise
we get an infinite recursion querying
environment.checkConfigurationOptions.
2013-10-29 16:18:23 +01:00
Eelco Dolstra
c407db6316 Manual: Render null values 2013-10-29 16:18:23 +01:00
Rok Garbas
562b453b93 nixos: haproxy module 2013-10-29 15:55:25 +01:00
Jason \"Don\" O'Conal
db5c6917f3 vimPlugins.ipython: add expression
close #1141
2013-10-29 15:45:46 +02:00
Eelco Dolstra
85b69834e7 fixMergeModules shouldn't check whether options are declared 2013-10-29 14:34:39 +01:00
Eelco Dolstra
be33a68177 Add fixMergeModules back in
NixOps uses it.
2013-10-29 14:23:10 +01:00
Eelco Dolstra
9143910139 Support module keys that are paths 2013-10-29 14:15:33 +01:00
Eelco Dolstra
985f1f2d8a Give types to the Apache httpd options 2013-10-29 14:03:39 +01:00
Eelco Dolstra
0afdb1e933 Add option type "str" for unique strings
An annoying and dangerous property of "types.string" is that it merges
multiple definitions by concatenating them, which almost never
produces a sensible result.  (Those options for which it does make
sense typically should use "types.lines" instead, and things only work
because the option definitions already end in a newline.)  Of course,
you can use "types.uniq types.string", but that's rather verbose, and
inconsistent with other basic types like "types.int".

Changing the behaviour of "types.string" to be unique by default is
not an option, given the large number of options that use it.  So
instead, we now have "types.str", which is equivalent to "types.uniq
types.string".
2013-10-29 13:45:30 +01:00
Ricardo M. Correia
57e9fd8bcf grsecurity: Update to 2.9.1-3.2.52-201310271550 2013-10-29 13:32:53 +01:00
Ricardo M. Correia
69513d1480 linux: Update to 3.2.52 2013-10-29 13:32:53 +01:00
Eelco Dolstra
473a870a64 nixos-rebuild build-vm: Ignore the user's LUKS devices 2013-10-29 13:31:01 +01:00
Eelco Dolstra
976355f63d Drop the EFI installer tests from the release-critical builds for now
They fail randomly due to a hard-coded 30-second timeout in udev
waiting for /dev/sda1 to appear:

  systemd-udevd[1151]: worker [1168] /devices/pci0000:00/0000:00:04.0/host2/target2:0:0/2:0:0:0/block/sda/sda1 timeout; kill it
  systemd-udevd[1151]: seq 1059 '/devices/pci0000:00/0000:00:04.0/host2/target2:0:0/2:0:0:0/block/sda/sda1' killed

Hopefully we can use virtio in the future for the EFI tests.

http://hydra.nixos.org/build/6695897
2013-10-29 13:14:30 +01:00
Eelco Dolstra
adc1b38b85 Add a priority level for overrides in VM tests
Now that overriding fileSystems in qemu-vm.nix works again, it's
important that the VM tests that add additional file systems use the
same override priority.  Instead of using the same magic constant
everywhere, they can now use mkVMOverride.

http://hydra.nixos.org/build/6695561
2013-10-29 13:14:30 +01:00
Eelco Dolstra
f0b7b0af12 wpa_supplicant.nix: Add option types 2013-10-29 13:14:30 +01:00
Rok Garbas
38df1d24c4 nixos: zope2 service: adding clientHome option 2013-10-29 12:53:08 +01:00
Eelco Dolstra
60f1afe199 nix: Update to 1.6.1 2013-10-29 11:30:36 +01:00
Domen Kožar
3ad84542bf pythonPackages.substanced: specify sha256 2013-10-29 09:35:25 +01:00
Domen Kožar
789af5fb08 libedit: 20100424-3.0 -> 20130712-3.1 2013-10-29 09:35:25 +01:00
Michael Raskin
3bda40c150 A few hooks for easier library handling when CFFI is used 2013-10-29 11:29:46 +04:00
Michael Raskin
4ae50cbc1d Adding upstream tracker for quantum minigolf 2013-10-29 10:56:54 +04:00