Commit graph

22692 commits

Author SHA1 Message Date
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
Peter Simons
354c261db6 haskell-test-framework: update to version 0.7.0 2012-12-05 14:03:47 +01:00
Peter Simons
d666015591 haskell-test-framework-quickcheck2: update to version 0.3.0 2012-12-05 14:03:47 +01:00
Peter Simons
7e71c1ec12 haskell-test-framework-quickcheck: update to version 0.3.0 2012-12-05 14:03:47 +01:00
Peter Simons
7269ebfa55 haskell-test-framework-hunit: update to version 0.3.0 2012-12-05 14:03:47 +01:00
Peter Simons
ba5b6b3a79 haskell-stylish-haskell: update to version 0.5.5.0 2012-12-05 14:03:47 +01:00
Peter Simons
c2443a8172 haskell-silently: update to version 1.2.4.1 2012-12-05 14:03:47 +01:00
Peter Simons
dfd90e33e2 haskell-repa-examples: update to version 3.2.3.1 2012-12-05 14:03:46 +01:00
Peter Simons
fa0160d575 haskell-project-template: update to version 0.1.1 2012-12-05 14:03:46 +01:00
Peter Simons
5c74cfb12f haskell-persistent-postgresql: update to version 1.1.1 2012-12-05 14:03:46 +01:00
Peter Simons
7220eb17f3 haskell-parseargs: update to version 0.1.3.4 2012-12-05 14:03:46 +01:00
Peter Simons
ae249a4b19 haskell-network-conduit: update to version 0.6.2 2012-12-05 14:03:46 +01:00
Peter Simons
fd037a2c09 haskell-lens: update to version 3.6.0.2 2012-12-05 14:03:46 +01:00
Peter Simons
4e2d9aaf4a haskell-http-conduit: update to version 1.8.5 2012-12-05 14:03:45 +01:00
Peter Simons
1245b6d617 haskell-hspec: update to version 1.4.2.3 2012-12-05 14:03:45 +01:00
Peter Simons
b920a3c5ad haskell-hamlet: update to version 1.1.2 2012-12-05 14:03:45 +01:00
Peter Simons
045b354777 haskell-ansi-terminal: update to version 0.5.5.1 2012-12-05 14:03:45 +01:00
Peter Simons
53995e2049 haskell-base64-conduit: add version 0.5.0 2012-12-05 14:03:45 +01:00
Florian Friesdorf
5c7c82f635 missed two failing tests 2012-12-05 11:31:28 +01:00
Florian Friesdorf
c17ae4bbf7 checkPhase after installPhase fixed some more tests 2012-12-05 11:31:28 +01:00
Florian Friesdorf
c7113470b8 python2.6 fixes 2012-12-05 11:31:28 +01:00
Florian Friesdorf
78be948175 change order of phases for python modules: checkPhase after installPhase
at least pycrypto it helps
2012-12-05 11:31:28 +01:00
Florian Friesdorf
3cf96816b0 pycrypto for python26 and 27 2012-12-05 11:31:28 +01:00
Florian Friesdorf
6dc414d6ae python2.6 fixes 2012-12-05 11:31:27 +01:00
Florian Friesdorf
cd905b16af pil uses buildPythonPackage and is now actually also built for 2.6 2012-12-05 11:31:27 +01:00
Evgeny Egorochkin
f2ca98c098 TOR: version bump 2012-12-05 06:16:45 +02:00
Evgeny Egorochkin
0eecd67d14 Package Samsung unified printer driver. i686 only but apparently can be improved to support x86_64. Based on patch by James Cook <james.cook[NOSPAM]@utoronto.ca> 2012-12-05 05:43:19 +02:00
Jack Cummings
462b2b5d7f ztest: fix hardcoded paths 2012-12-04 14:08:34 -08:00
Eelco Dolstra
e8ff7d627a Merge branch 'master' of github.com:NixOS/nixpkgs 2012-12-04 20:08:02 +01:00
Eelco Dolstra
7f115621ca Add Ubuntu 12.10 2012-12-04 20:06:07 +01:00
Eelco Dolstra
85650db656 Update Debian Squeeze to 6.0.6 2012-12-04 19:58:21 +01:00
Eelco Dolstra
b29d424115 Get deb-closure.pl to work with the latest dpkg 2012-12-04 19:56:31 +01:00
Eelco Dolstra
6751fac418 dpkg: Fix caching of architecture name
Our deb-closure script would causes zillions of invocations of "dpkg
--print-architecture", which is rather slow.
2012-12-04 19:54:44 +01:00
Michael Raskin
8a6b0087a9 Update GlusterFS 2012-12-04 21:54:20 +04:00
Eelco Dolstra
5e256ccc88 Merge remote-tracking branch 'origin/master' into stdenv-updates 2012-12-04 17:12:35 +01:00
Eelco Dolstra
c138356805 Fix evaluation 2012-12-04 17:08:58 +01:00
Peter Simons
50e7ddbdca Add DLX simulator. Upstream provides no version number. 2012-12-04 14:29:48 +01:00
Michael Raskin
138e9e0212 Oops. Fix LincityNG source search 2012-12-04 17:09:31 +04:00
Michael Raskin
f54b40f80e 4store: fix build 2012-12-04 17:09:31 +04:00
Eelco Dolstra
f4ec141869 Use "or" in a few places 2012-12-04 12:58:23 +01:00
Eelco Dolstra
3bdf95e05b Get rid of some error contexts that don't provide useful info 2012-12-04 12:58:22 +01:00
Eelco Dolstra
9a92f3fc35 Remove mkThenElse and mkAlways 2012-12-04 12:58:22 +01:00
Mathijs Kwik
2b4fba3d03 neoload: upgrade to 4.1.1 2012-12-04 12:02:36 +01:00
Mathijs Kwik
fe070086fb linux-3.6: upgrade to 3.6.9 2012-12-04 12:02:36 +01:00
Mathijs Kwik
38740214cb linux-3.4: upgrade to 3.4.21 2012-12-04 12:02:36 +01:00
Mathijs Kwik
47362f67ea linux-3.0: upgrade to 3.0.54 2012-12-04 12:02:36 +01:00
Michael Raskin
51bf29de63 Upstream tracking files for asymptote and fbterm 2012-12-04 14:55:19 +04:00
Michael Raskin
680ca19789 Xmoto: remove obsolete patch 2012-12-04 14:50:50 +04:00
Michael Raskin
38323efd03 Fix cfdg build 2012-12-04 14:46:59 +04:00
Michael Raskin
2ab2b27e93 Update FBTerm to current URL of tarball 2012-12-04 11:47:40 +04:00
Michael Raskin
20b15673f4 Update Asymptote 2012-12-04 10:33:37 +04:00
Michael Raskin
bb99b88e9b Update Monit 2012-12-04 10:21:36 +04:00
Michael Raskin
e2b68cb9dc Update GVPE 2012-12-04 10:21:11 +04:00
Michael Raskin
df44d8cbeb Update gnokii 2012-12-04 10:20:42 +04:00
Michael Raskin
95f5a898d9 Update cfdg 2012-12-04 10:20:02 +04:00
Michael Raskin
d7bbb34d64 Update CouchDB 2012-12-04 10:17:06 +04:00
Michael Raskin
46c57d105c Update 4store 2012-12-04 10:16:41 +04:00
Michael Raskin
60d26455b9 Update libev 2012-12-04 10:14:14 +04:00
Michael Raskin
3bfecac4af Update DirectFB 2012-12-04 10:13:38 +04:00
Michael Raskin
56f1c1ec24 Update veracity 2012-12-04 10:12:38 +04:00
Michael Raskin
8a1f312621 Update golly 2012-12-04 10:10:28 +04:00
Michael Raskin
8976915c6d Update xmoto 2012-12-04 10:09:18 +04:00
Michael Raskin
0918928cdb Currently advertised Lincity-NG download URL 2012-12-04 09:59:09 +04:00
Michael Raskin
2ace67c2bc Update SBCL to 1.1.2 2012-12-04 09:57:38 +04:00
Michael Raskin
363b1f9dc2 Fixing a typo and making steps more explicit 2012-12-04 09:56:38 +04:00
Eelco Dolstra
abd06b220d Remove unused function ‘selectDeclsAndDefs’ 2012-12-03 20:48:52 +01:00
Lluís Batlle i Rossell
6655cf6d23 firefox: update to 17.0.1
I feel lucky.
2012-12-03 17:19:56 +01:00
Ludovic Courtès
89beb9cf72 hwloc: update to 1.6 2012-12-03 16:21:15 +01:00
Peter Simons
158388b521 haskell-cpphs: update to version 1.15 2012-12-03 16:12:12 +01:00
Peter Simons
b690d7a20b haskell-hlint: update to version 1.8.37 2012-12-03 16:12:12 +01:00
Peter Simons
e9fc18f1e1 haskell-yesod: update to version 1.1.5 2012-12-03 16:12:11 +01:00
Peter Simons
7bc986c7b6 haskell-yesod-test: update to version 0.3.2 2012-12-03 16:12:11 +01:00
Peter Simons
99783182a2 haskell-yesod-persistent: update to version 1.1.0.1 2012-12-03 16:12:11 +01:00
Peter Simons
006afee7be haskell-yesod-form: update to version 1.2.0.2 2012-12-03 16:12:11 +01:00
Peter Simons
5bd47fd5b5 haskell-yesod-core: update to version 1.1.6.1 2012-12-03 16:12:10 +01:00
Peter Simons
ac3e804728 haskell-yesod-auth: update to version 1.1.2.1 2012-12-03 16:12:10 +01:00
Peter Simons
2b4569f528 haskell-wai-extra: update to version 1.3.0.5 2012-12-03 16:12:10 +01:00
Peter Simons
f78de0a623 haskell-void: update to version 0.5.10 2012-12-03 16:12:10 +01:00
Peter Simons
87c3707b5c haskell-unix-time: update to version 0.1.4 2012-12-03 16:12:10 +01:00
Peter Simons
b672dd4532 haskell-test-framework-th: update to version 0.2.4 2012-12-03 16:12:10 +01:00
Peter Simons
f742cae66e haskell-repa: update to version 3.2.3.1 2012-12-03 16:12:10 +01:00
Peter Simons
0806c798a2 haskell-repa-io: update to version 3.2.3.1 2012-12-03 16:12:09 +01:00
Peter Simons
05f1fcd269 haskell-repa-examples: update to version 3.2.3.1 2012-12-03 16:12:09 +01:00
Peter Simons
a4e47942c9 haskell-repa-algorithms: update to version 3.2.3.1 2012-12-03 16:12:09 +01:00
Peter Simons
e724fe3dc5 haskell-pool-conduit: update to version 0.1.1 2012-12-03 16:12:09 +01:00
Peter Simons
b18524091a haskell-persistent: update to version 1.1.0 2012-12-03 16:12:08 +01:00
Peter Simons
2ff122935a haskell-persistent-template: update to version 1.1.0 2012-12-03 16:12:08 +01:00
Peter Simons
090f151ae7 haskell-persistent-sqlite: update to version 1.1.0 2012-12-03 16:12:08 +01:00
Peter Simons
8b25a6ed59 haskell-persistent-postgresql: update to version 1.1.0 2012-12-03 16:12:08 +01:00
Peter Simons
d4b3e7c447 haskell-monad-logger: update to version 0.2.3.1 2012-12-03 16:12:08 +01:00
Peter Simons
4e77a0899f haskell-http-conduit: update to version 1.8.4.5 2012-12-03 16:12:08 +01:00
Peter Simons
2ea2715c45 haskell-hspec: update to version 1.4.2.2 2012-12-03 16:12:07 +01:00
Peter Simons
d7daa9c5ee haskell-hjsmin: update to version 0.1.4 2012-12-03 16:12:07 +01:00
Peter Simons
498cfc52ea haskell-happstack-server: update to version 7.1.1 2012-12-03 16:12:07 +01:00
Peter Simons
a69fbde5b3 haskell-hakyll: update to version 3.5.2.0 2012-12-03 16:12:07 +01:00
Peter Simons
7d8de45636 haskell-ghc-paths: update to version 0.1.0.9 2012-12-03 16:12:06 +01:00
Peter Simons
6413bb1533 haskell-diagrams-core: update to version 0.5.0.1 2012-12-03 16:12:06 +01:00
Peter Simons
8afc31a740 haskell-cprng-aes: update to version 0.3.0 2012-12-03 16:12:06 +01:00
Peter Simons
57631b141e haskell-conduit: update to version 0.5.5 2012-12-03 16:12:06 +01:00
Peter Simons
0444c4cc34 haskell-cipher-aes: update to version 0.1.4 2012-12-03 16:12:05 +01:00
Peter Simons
4e3daebfba haskell-MemoTrie: update to version 0.6.1 2012-12-03 16:12:05 +01:00
Peter Simons
401a5f682e haskell-HDBC: update to version 2.3.1.2 2012-12-03 16:12:05 +01:00