Commit Graph

64317 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
Tuomas Tynkkynen
2c9b93b01c i2c-tools: New package at version 3.1.1 2015-06-15 17:49:35 +02:00
Tuomas Tynkkynen
7233ca0488 read-edid: New package at version 3.0.2 2015-06-15 17:49:35 +02:00
Tuomas Tynkkynen
5a5a5ade0f libx86: Add patch from debian to fix build on ARM
Without this, the build fails even with x86emu:

make LIBRARY=static static
make[1]: Entering directory '/tmp/nix-build-libx86-1.1.drv-0/libx86-1.1'
gcc -O2 -Wall -DDEBUG -g   -c -o x86-common.o x86-common.c
gcc -O2 -Wall -DDEBUG -g   -c -o thunk.o thunk.c
thunk.c: In function 'x_inb':
thunk.c:40:9: error: impossible constraint in 'asm'
         __asm__ __volatile__("in" #bwl " %w1, %" #bw "0" : "=a"(value) : "Nd"(port)); \
         ^
thunk.c:44:1: note: in expansion of macro '__BUILDIO'
 __BUILDIO(b,b,char)
 ^
<builtin>: recipe for target 'thunk.o' failed
make[1]: *** [thunk.o] Error 1
make[1]: Leaving directory '/tmp/nix-build-libx86-1.1.drv-0/libx86-1.1'
Makefile:17: recipe for target 'default' failed
make: *** [default] Error 2
2015-06-15 17:49:35 +02:00
Shea Levy
dbf1e0fb53 Merge branch 'update-gnupg-2.1.5' of https://github.com/DamienCassou/nixpkgs 2015-06-15 10:07:43 -04:00
Shea Levy
2d3933151b Merge remote-tracking branch 'origin/fix-CVE-2015-4171' 2015-06-15 09:56:14 -04:00
Damien Cassou
c2116191d3 gnupg 2.1.4 -> 2.1.5
According to someone on #gnupg, the patch is not necessary anymore.
2015-06-15 15:42:23 +02:00
koral
6c213c6e44 rmlint: 2.1.0 -> 2.2.0 (closes #8268) 2015-06-15 15:35:37 +02:00
Luca Bruno
b36629d821 gnome3: also pass self to overridePackages function 2015-06-15 11:52:26 +02:00
Luca Bruno
cc5663de0c gnome3: easier to override packages 2015-06-15 11:47:50 +02:00
Domen Kožar
e0100a0f8d Merge pull request #8297 from rycee/fonts-remove-builderDefsPackage
Remove use of builderDefsPackage in font packages.
2015-06-15 11:44:36 +02:00
Vladimír Čunát
6c382151fb imagemagick: remove mirrors that don't work
/cc #8302.
2015-06-15 11:30:28 +02:00
Pascal Wittmann
f4d7b23a68 tomcat-connectors: update from 1.2.40 to 1.2.41-dev, fixes CVE-2014-8111
Using the prerelease version, because there was no response on when a
new official release will happen, see
http://tomcat.10.x6.nabble.com/Release-of-tomcat-connectors-1-2-41-td5035487.html
2015-06-15 11:07:02 +02:00
Pascal Wittmann
5af468d0bc libmspack: update from 0.4alpha to 0.5alpha
fixes CVE-2014-9732, CVE-2015-4467, CVE-2015-4468, CVE-2015-4469,
CVE-2015-4470, CVE-2015-4471 and CVE-2015-4472.
2015-06-15 10:10:51 +02:00
Austin Seipp
2dfb657b94 nixpkgs: picosat 936 -> 960, add myself as a maintainer
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-06-14 19:48:12 -05:00
Austin Seipp
44ef5a3ab0 cvc4: regenerate ./configure on rebuild
Otherwise some absurd error from ./configure crops up.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-06-14 19:48:11 -05:00
Austin Seipp
da76434dbd nixpkgs: yices 2.2.1 -> 2.3.1, now with source
It's still under a non-commercial license, but the source build is waay
better than the binary build. Can probably work on OS X too now.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-06-14 19:48:11 -05:00
Austin Seipp
3d181a3175 nixpkgs: abc-verifier 20150406 -> 20150614
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-06-14 19:48:11 -05:00
Austin Seipp
6cfc2caaeb nixpkgs/cvc4: touchups, add myself as maintainer
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-06-14 19:48:11 -05:00
Henry Till
faa90fad3f mr: update from 1.20141024 to 1.20150503 2015-06-14 22:54:31 +02:00
Mateusz Kowalczyk
b32a78a97a Merge pull request #8326 from Chattered/master
Add Tales of Maj'eyal game.
2015-06-14 21:53:36 +01:00
Mateusz Kowalczyk
2cee7610ba Merge pull request #8333 from titanous/bump-makemkv
makemkv: 1.9.3 -> 1.9.4
2015-06-14 21:47:54 +01:00
Jonathan Rudenberg
853e87909f makemkv: 1.9.3 -> 1.9.4 2015-06-14 16:31:29 -04:00
Michael Raskin
d9354c6a2a Add xwinmosaic window switcher 2015-06-14 23:26:58 +03:00
Michael Raskin
649b0affe1 Adding Skippy-XD window switcher 2015-06-14 23:26:58 +03:00
Michael Raskin
a6d54b3fdd A comment about the license 2015-06-14 23:26:58 +03:00
Michael Raskin
14695867cb Add ratmen X11 menu generator 2015-06-14 23:26:58 +03:00
Pascal Wittmann
6a2fb8b856 Merge pull request #8330 from andrewrk/libebur128
add libebur128 package
2015-06-14 22:13:26 +02:00
Andrew Kelley
cf9e72369e add libebur128 package 2015-06-14 20:00:22 +00:00
Pascal Wittmann
4e0fb6578a strongswan: update from 5.2.1 to 5.3.2, fixes CVE-2015-4171 2015-06-14 21:44:18 +02:00
Jascha Geerds
a2841a6a2b Merge pull request #8279 from geerds/mailnag
Add mailnag package
2015-06-14 21:44:05 +02:00
Austin Seipp
1ee742b0ef nixpkgs: afl 1.80b -> 1.83b
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-06-14 14:28:00 -05:00
Pascal Wittmann
23393964bb intel-gpu-tools: update from 1.10 to 1.11 2015-06-14 21:24:24 +02:00
Vladimír Čunát
a9c3392836 bmon: fix build by including a proper header 2015-06-14 20:40:35 +02:00
Bjørn Forsman
903183d9e4 gtkglextmm: unbreak build
* Add missing build inputs: pangox_compat, libXmu
* Add patch from debian to fix build with newer gtk
2015-06-14 19:53:01 +02:00
Bjørn Forsman
74d5adcb4d nixos: move environment.{variables => sessionVariables}.MODULE_DIR
This solves the problem that modprobe does not know about $MODULE_DIR
when run via sudo, and instead wrongly tries to read /lib/modules/:

  $ sudo strace -efile modprobe foo |& grep modules
  open("/lib/modules/3.14.37/modules.softdep", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory)
  open("/lib/modules/3.14.37/modules.dep.bin", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory)
  open("/lib/modules/3.14.37/modules.dep.bin", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory)
  open("/lib/modules/3.14.37/modules.alias.bin", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory)

Without this patch, one would have to use sudo -E (preserves environment
vars). But that option is reserved for sudo users with extra rights
(SETENV), so it's not a solution.

environment.sessionVariables are set by PAM, so they are included in the
environment used by sudo.
2015-06-14 18:56:58 +02:00
Phil Scott
279c426f05 Add Tales of Maj'eyal game. 2015-06-14 17:44:38 +01:00
Jascha Geerds
8ae4d0b1e1 Add mailnag package 2015-06-14 18:31:48 +02:00
Arseniy Seroka
c72bbc5b8e teamviewer: add option to accept license 2015-06-14 18:29:19 +03:00
Domen Kožar
a2deb7a2c9 Merge pull request #8322 from unaizalakain/master
The user specified in the conf should run MPD
2015-06-14 11:41:36 +02:00
Michael Raskin
5d5bb71567 Update PostgreSQL to latest point-releases 2015-06-14 11:37:33 +03:00
Michael Raskin
14e7d5440b Update Sysdig, adding new dependencies 2015-06-14 11:23:56 +03:00
Michael Raskin
f39c3ebf04 Update GlusterFS, adding new dependencies 2015-06-14 11:23:42 +03:00
Michael Raskin
2b35cccc5b Update dd_rescue and switch to bzip2 releases 2015-06-14 11:23:18 +03:00
Michael Raskin
000162daed Update FreeIPMI 2015-06-14 11:22:56 +03:00
Michael Raskin
9c726f502d Update getmail 2015-06-14 11:22:40 +03:00
Michael Raskin
de7c3eef17 Update Asymptote 2015-06-14 11:22:32 +03:00
Michael Raskin
ed145cb07f Update Nginx unstable 2015-06-14 11:22:23 +03:00
Michael Raskin
59126fb3f8 Update golly 2015-06-14 11:22:07 +03:00