aszlig
a9edaf10ed
Merge pull request #207 from washort/mysql55
...
And sorry to @washort for bugging him too much with the syntax.
2012-12-07 18:48:40 +01:00
Allen Short
c6bf1f87f7
better syntax thanks to aszlig
2012-12-07 09:41:03 -08:00
Allen Short
b90b8f222b
only depend on perl on OSX
2012-12-07 09:31:10 -08:00
Shea Levy
5f8647e7ae
Merge branch 'redis' of https://github.com/washort/nixpkgs into upstream
...
fixes for redis on OSX
2012-12-07 12:28:58 -05:00
Allen Short
c47e911177
fixes for redis on OSX
2012-12-07 09:23:53 -08:00
Eelco Dolstra
1c24391251
nix: Update to 1.2
2012-12-07 13:46:07 +01:00
Eelco Dolstra
88ca46bfa0
linux: Update to 3.2
2012-12-07 13:24:40 +01:00
Florian Friesdorf
6278dabe5d
python: do not delete site.py for now as it breaks existing use cases
...
see #209 , thx shlevy for reporting this
2012-12-07 11:44:46 +01:00
Florian Friesdorf
c598df2645
duplicity-0.6.20
2012-12-06 15:59:02 +01:00
Florian Friesdorf
a551d61083
skype 4.1.0.20
2012-12-06 15:40:55 +01:00
Peter Simons
fb31bcf213
SDL_image: update to version 1.2.12
2012-12-06 12:02:17 +01:00
Peter Simons
af6d8784e3
haskell-uniplate: update to version 1.6.8
2012-12-06 11:55:12 +01:00
Peter Simons
4c9badf75e
haskell-time-compat: update to version 0.1.0.2
2012-12-06 11:55:12 +01:00
Peter Simons
6cb3783088
haskell-stylish-haskell: update to version 0.5.5.1
2012-12-06 11:55:12 +01:00
Peter Simons
872b49de05
haskell-pem: update to version 0.1.2
2012-12-06 11:55:12 +01:00
Peter Simons
f9e04cc5e7
haskell-parallel-io: update to version 0.3.2.2
2012-12-06 11:55:12 +01:00
Peter Simons
eb69a483f9
haskell-lifted-base: update to version 0.2.0.1
2012-12-06 11:55:12 +01:00
Peter Simons
61fb876e19
haskell-lens: update to version 3.6.0.3
2012-12-06 11:55:11 +01:00
Peter Simons
c7034c5ebd
haskell-hspec: update to version 1.4.3
2012-12-06 11:55:11 +01:00
Peter Simons
dd709c6bbb
haskell-cryptohash: update to version 0.7.10
2012-12-06 11:55:11 +01:00
Peter Simons
5e9d75b77f
haskell-cryptocipher: update to version 0.3.7
2012-12-06 11:55:11 +01:00
Peter Simons
d1ea6e9f24
haskell-cipher-aes: update to version 0.1.5
2012-12-06 11:55:11 +01:00
Peter Simons
96913b590a
haskell-blaze-markup: update to version 0.5.1.3
2012-12-06 11:55:11 +01:00
Peter Simons
a52f7a7c6c
haskell-blaze-html: update to version 0.5.1.2
2012-12-06 11:55:11 +01:00
Peter Simons
342382b217
haskell-hledger-web: jailbreak to fix build with recent versions of GHC
2012-12-06 11:52:50 +01:00
Peter Simons
7835055497
haskell-pandoc: add myself as a maintainer
2012-12-06 11:32:56 +01:00
Peter Simons
0aca58b570
haskell-tabular: jailbreak to fix build with recent versions of GHC
2012-12-06 11:31:25 +01:00
Peter Simons
1a8f9a46ef
haskell-mpppc: jailbreak to fix build with recent versions of GHC
2012-12-06 11:31:14 +01:00
Peter Simons
24d9f8b4e2
pkgs/top-level/all-packages.nix: implement 'mesaSupported' attribute on top of mesaPlatforms
...
Thanks to Florian Friesdorf for pointing out the inconsistency in these attributes.
2012-12-06 11:28:23 +01:00
Peter Simons
e979e478a4
pkgs/lib/platforms.nix: fix specification of mesaPlatforms
...
Mesa is supported on i686-linux, x86_64-linux, and x86_64-darwin.
2012-12-06 11:25:08 +01:00
Peter Simons
0dcbfcc975
Added Haskell packages kansas-lava 0.2.4, netlist-to-vhdl 0.3.1, netlist 0.3.1, and sized-types 0.3.4.0.
2012-12-06 10:55:00 +01:00
Florian Friesdorf
ea58608726
python: give coverage to coilmq and oauth2 - thx shea
2012-12-06 08:24:38 +01:00
David Guibert
83c550c267
Merge pull request #208 from jcumming/zfs.121204
...
ztest: fix hardcoded paths
2012-12-05 22:36:08 -08:00
aszlig
acafaf9b23
rxvt-unicode: Add path to terminfo file.
...
On NixOS, we have set TERMINFO_DIRS to the user environment, so urxvt and curses
programs running within urxvt are able to find the terminfo file. Unfortunately
this isn't the case if you're not using NixOS.
Of course we now no longer need the longDescription, which suggests to issue
export TERMINFO=~/.nix-profile/share/terminfo
... which to my eyes essentially is a workaround. So please correct me when I'm
wrong, but i think it's better if software is working as-is rather than
requiring additional configuration (except if it really makes sense or breaks
purity).
Thanks to Eelis in #nixos for reporting this.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-06 03:30:06 +01:00
Allen Short
843b9f332e
fixes for mysql on OSX 10.8
2012-12-05 15:43:34 -08:00
cillianderoiste
5b0cd954f1
Merge pull request #206 from chaoflow/python-merge
...
python pureness, cleanup, and enable pth loaders (setuptoolsSite, recursivePthLoader)
2012-12-05 14:28:09 -08:00
Mathijs Kwik
bc9efb67ef
spice: upgrade to 0.12.0
2012-12-05 20:22:49 +01:00
Mathijs Kwik
dac03f264e
spice-protocol: upgrade to 0.12.2
2012-12-05 20:22:49 +01:00
Shea Levy
d4fa316aff
pythonPackages.nose: Bump
2012-12-05 12:10:59 -05:00
Shea Levy
3a0b828a6d
coverage pythonPackage
2012-12-05 12:10:59 -05:00
Peter Simons
7d3be6b5f9
dlx: link with gcc instead of g++ -- there is no c++ code here
2012-12-05 16:44:04 +01:00
Peter Simons
c4038db19d
dlx: install both hp.m and new.m microcode
2012-12-05 16:43:49 +01:00
Peter Simons
0df00b7a1b
all-packages.nix: provide an alias from 'haskell-darcs-ghc7.4.2-2.8.3' to 'darcs-2.8.3'
2012-12-05 14:25:09 +01:00
aszlig
8fd4b80bc7
chromium: Don't use the config attrset anymore.
...
We can still use the config attribute set from within all-packages to pass it to
the package expression, which we do in case of PulseAudio. In order to override
other stuff you can now conveniently use chromium.override without passing a
fake config attribute set.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-05 14:05:18 +01:00
aszlig
5138c46432
all-packages: Add chromiumBeta and chromiumDev.
...
Now Hydra should pick up those versions as well, so users can easily switch
between different chromium channels without the need to wait up to several hours
in order to build Chromium (depending on hardware of course, nowadays it
shouldn't take more than one hour, I guess).
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-05 14:05:18 +01:00
aszlig
caabb8ee47
chromium: Allow package override on channels.
...
This allows for more flexible overrides instead of just passing a custom
configuration attrset like:
chromium.override { config.chromium.channel = "beta"; }
So you can now simply do:
chromium.override { channel = "beta"; }
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-05 14:05:18 +01:00
aszlig
e504299f94
chromium: Update channels to stable v23.0.1271.95.
...
This updates the beta channel as well:
stable: 23.0.1271.91 -> 23.0.1271.95
beta: 24.0.1312.25 -> 24.0.1312.27
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-05 14:05:17 +01:00
Peter Simons
496ecee2c9
haskell-warp: update to version 1.3.5.1
2012-12-05 14:03:48 +01:00
Peter Simons
9c72514f21
haskell-tls: update to version 1.0.3
2012-12-05 14:03:48 +01:00
Peter Simons
90605c2850
haskell-tls-extra: update to version 0.5.1
2012-12-05 14:03:48 +01:00
