Dario Bertini
1c87fd82d4
Fix python-packages.nix conflict
...
Merge remote-tracking branch 'origin/master' into ansible-win
2015-06-15 19:41:30 +01:00
William A. Kennington III
046ba6b7db
linux-testing: 4.1-rc7 -> 4.1-rc8
2015-06-15 11:37:05 -07:00
William A. Kennington III
2fd74f43b5
kernel: 3.18.14 -> 3.18.16
2015-06-15 11:32:46 -07:00
William A. Kennington III
b325c1556a
kernel: 3.12.43 -> 3.12.44
2015-06-15 11:32:46 -07:00
Peter Simons
b667cb6163
Merge pull request #8298 from abbradar/r-updates
...
R updates
2015-06-15 20:31:57 +02:00
Peter Simons
953d867437
Merge pull request #8341 from phile314/master
...
haskell-uhc: Use newer version with relaxed cabal constraints.
2015-06-15 20:29:56 +02:00
Dario Bertini
99912bbf0e
Add (optional, but opted in by default) support for Windows in ansible
2015-06-15 19:24:02 +01:00
Tobias Geerinckx-Rice
553ce28bc2
geolite-legacy -> 2015-06-15
2015-06-15 19:58:20 +02:00
Tobias Geerinckx-Rice
a0473fde87
tzdata -> 2015e
2015-06-15 19:30:11 +02:00
Peter Simons
b311380227
hackage-packages.nix: update to 2c4a8914cb
with hackage2nix revision c519a8ee5f75311f8eaaca7eaf5af8f7ad26d33e
2015-06-15 19:26:56 +02:00
Joachim Fasting
18421542f9
electrum: 2.0.4 -> 2.3.2
2015-06-15 15:31:06 +02:00
Philipp Hausmann
d95fba3746
haskell-uhc: Use newer version with relaxed cabal constraints.
2015-06-15 10:47:53 +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
William A. Kennington III
fa5eb0a7da
rethinkdb: 2.0.0-1 -> 2.0.3
2015-06-14 20:00:21 -07:00
lethalman
e08bbc0bc1
Merge pull request #8159 from cransom/dd-agent
...
Allow custom tags to be set for datadog monitoring
2015-06-15 18:43:14 +02:00
Casey Ransom
d3212beff9
Allow custom tags to be set for datadog monitoring
2015-06-15 16:37:27 +00:00
Peter Simons
82fe884dc0
Merge pull request #8323 from ftrvxmtrx/mpg123-1.22.2
...
mpg123: 1.19.0 -> 1.22.2
2015-06-15 18:24:54 +02:00
Eelco Dolstra
6e6a96d42c
Some more type cleanup
2015-06-15 18:18:46 +02:00
Eelco Dolstra
c63bc92d4c
types.uniq types.str -> types.str
2015-06-15 18:12:32 +02:00
Eelco Dolstra
19ffa212af
types.uniq types.int -> types.int
...
types.int already implies uniqueness.
2015-06-15 18:11:32 +02:00
Eelco Dolstra
c738b309ee
types.uniq types.bool -> types.bool
2015-06-15 18:10:26 +02:00
Eelco Dolstra
9366af1b94
"types.uniq types.string" -> "types.str"
2015-06-15 18:08:49 +02:00
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
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
Eric Merritt
dcffd28527
ocp-build: upgrade to 1.99.9-beta
...
This also allows ocp-build to build for ocaml 4.02 and greater
2015-06-14 13:33:18 -07: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