Charles Strahan
fb59151109
purify ghcjs
2014-12-11 20:56:41 -05:00
Ryan Trinkle
a2d4a415d3
Bump the version of ghcjs-dom to support newer version of text
2014-12-10 11:42:38 -05:00
ryantrinkle
85a4f28375
Merge pull request #5 from basvandijk/update
...
Merge upstream master
2014-12-05 14:12:01 -05:00
Bas van Dijk
3b25e233ab
Use lens-4.6.0.1 instead of lens-4.4
...
lens-4.4 doesn't build because it requires an old version of text.
2014-12-05 07:55:27 +01:00
Bas van Dijk
6fa969839a
Merge branch 'master' of https://github.com/NixOS/nixpkgs into update
...
Conflicts:
pkgs/development/libraries/haskell/text-binary/default.nix
pkgs/top-level/haskell-defaults.nix
pkgs/top-level/haskell-packages.nix
2014-12-05 07:54:48 +01:00
Peter Simons
e51ece3a65
Merge pull request #5225 from jkarni/jkarni/monadIO
...
Add haskell monadIO package.
2014-12-04 22:36:49 +01:00
Peter Simons
c236b70140
Merge pull request #5228 from mstarzyk/git-annex-fix
...
haskell-git-annex: Add maintainer, was removed by mistake.
2014-12-04 22:36:39 +01:00
William A. Kennington III
6ad032ed93
nixos/installer: Fix swap device override
2014-12-04 13:34:35 -08:00
Maciek Starzyk
dcad10c8e6
haskell-git-annex: Add maintainer, was removed by mistake.
2014-12-04 21:49:15 +01:00
John Wiegley
e5d92d45b7
coqPackages.coqeal: new expression
2014-12-04 14:15:30 -06:00
Julian K. Arni
1c55e474b9
Add haskell monadIO package.
2014-12-04 20:16:09 +01:00
Peter Simons
730286ddfd
Merge pull request #5223 from Gonzih/master
...
Add mopidy-mopify package
2014-12-04 20:02:11 +01:00
Peter Simons
a3e2e6d820
Merge pull request #5224 from jkarni/jkarni/parsecExtra
...
Add haskell library parsec-extra.
2014-12-04 20:01:52 +01:00
Julian K. Arni
f840b05fa1
Add haskell library parsec-extra.
2014-12-04 19:51:17 +01:00
Max Gonzih
f0fa7254ee
Add myself to mainteiners list
2014-12-04 19:42:37 +01:00
Max Gonzih
0dd9d5d7d2
Add mopidy-mopify package to list of top-level packages
2014-12-04 18:46:40 +01:00
Max Gonzih
a9d276c539
Add mopidy-mopify package
2014-12-04 18:20:28 +01:00
lethalman
1b67655f07
Merge pull request #5220 from DamienCassou/pharo-vm-update
...
Update pharo vm
2014-12-04 16:53:29 +01:00
Damien Cassou
4be8f537b6
Update pharo vm
2014-12-04 16:41:20 +01:00
Thomas Tuegel
5c9de38488
zotero: use private firefox and xulrunner
...
Zotero breaks every time firefox is updated (about every six weeks). It
is always fixed with the next zotero update, but that can take weeks.
Sometimes, upstream even skips firefox releases. This will stop zotero
breaking every time.
2014-12-04 09:40:57 -06:00
Peter Simons
0377be182c
cinelerra: fix download url
2014-12-04 15:57:16 +01:00
Peter Simons
1f49c1cef7
Mark R packages h2o, jvmr, and qtbase as broken.
...
This also breaks dependent packages qtutils, qtpaint, and bamboo.
2014-12-04 15:00:54 +01:00
Maciek Starzyk
81cb2c144c
haskell-git-annex: update to version 5.20141203
2014-12-04 14:45:54 +01:00
Peter Simons
7ee70a1644
R-defaults: add obsolete package temporarily
2014-12-04 14:45:09 +01:00
Mateusz Kowalczyk
65bdddb430
tibia: update to 10.64
2014-12-04 13:44:30 +00:00
Pascal Wittmann
00444ab724
logstalgia: fix build with new glm version
2014-12-04 14:31:28 +01:00
Pascal Wittmann
5e04917e65
gource: fix build with new glm version
2014-12-04 14:31:28 +01:00
Domen Kožar
fd500f1a92
fix eval
2014-12-04 14:30:18 +01:00
Domen Kožar
bd85d3ea7d
qt-gstreamer1: fix build
2014-12-04 14:27:09 +01:00
Domen Kožar
8105a94e2b
eaglemode: fix build
2014-12-04 14:21:11 +01:00
Domen Kožar
683740466a
Merge pull request #5217 from geerds/tox
...
Tox: Update libtoxcore, qtox, utox and toxic
2014-12-04 14:12:49 +01:00
Georges Dubus
e019249936
Merge pull request #5169 from AndersonTorres/altcoins
...
Altcoins
2014-12-04 13:58:00 +01:00
Luca Bruno
51992d82a1
Merge "Ipxe" PR #5208
...
Fixed some indentation issues
2014-12-04 12:04:08 +01:00
Emery Hemingway
e69f876cca
nixos: iPXE client for GRUB
...
fix bug in grub/install-grub.pl that would replace @bootRoot@ with an invalid string
2014-12-04 12:03:10 +01:00
Jascha Geerds
c81575eae1
qtox: Fix installPhase
2014-12-04 11:26:00 +01:00
Emery Hemingway
3faacca044
nixpkgs: iPXE initial package
2014-12-04 11:03:56 +01:00
Jascha Geerds
459fd43988
tox-prpl: Update to the newest dev version
...
This update is necessary due to API changes in libtoxcore.
2014-12-04 11:02:27 +01:00
cillianderoiste
24c0b84bea
Merge pull request #5218 from olcai/icalendar
...
Add pythonPackages.icalendar
2014-12-04 09:14:40 +00:00
Erik Timan
c0e7497484
Add olcai to maintainers
...
Takes maintainership of pythonPackages.icalendar as well
2014-12-04 09:05:36 +00:00
Evgeny Egorochkin
4672aadce2
KDE4: fix kdepim build
2014-12-04 10:22:27 +02:00
Bjørn Forsman
f595a7eb58
srecord: update 1.63 -> 1.64
...
libgcrypt was an optional dependency in previous versions too, but in
this version the build fails unless libgcrypt is there, or
--without-gcrypt is passed to configure.
Since libgcrypt only increases the closure size from 131 MiB to 136 MiB,
I'm adding it as a dependency.
[1]: http://srecord.sourceforge.net/change_log.txt
2014-12-04 08:57:38 +01:00
Erik Timan
d41ae7ee90
Add pythonPackages.icalendar
2014-12-04 07:56:53 +00:00
John Wiegley
aefdaaa098
haskellPackages.unboundGenerics: new expression
2014-12-04 00:19:29 -06:00
John Wiegley
cded93d25d
haskellPackages.hoopl: new expression 3.10.0.1
2014-12-03 22:33:13 -06:00
Shea Levy
b02d059f5d
nix-exec: bump
2014-12-03 22:23:47 -05:00
Shea Levy
fcaf268d54
nixUnstable: bump
2014-12-03 22:22:18 -05:00
Jascha Geerds
d5dc5eaff0
utox: Update to the newest dev version
...
This update is necessary due to API changes in libtoxcore.
2014-12-04 02:53:48 +01:00
Jascha Geerds
44dd2ed9ec
toxic: Update to the newest dev version
...
This update is necessary due to API changes in libtoxcore. Sad to say that
the recent stable version doesn't work with our libtoxcore. We need to
update to the recent dev version.
2014-12-04 02:47:32 +01:00
Jascha Geerds
c57a4c2f78
Update libtoxcore and qtox to the newest dev version
...
As from now qtox depends on openalSoft instead of openal. This is due to
incompatibilities between those to two implementations. Anyway, this
should be okay because their official debian package depends on
openalSoft as well.
2014-12-04 02:29:56 +01:00
Austin Seipp
25d883a46d
nixpkgs: afl 0.79b -> 0.85b
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-03 18:53:20 -06:00