JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46,693 Commits 2 Branches 0 Tags 13 GiB
8a7f3c3618
Commit Graph

1968 Commits

Author SHA1 Message Date
Vladimír Čunát
f2352f7ecf Merge recent master 2014-06-10 20:14:08 +02:00
Moritz Ulrich
717d9c39f9 leiningen: Update to 2.4.0. 2014-06-10 11:49:47 +02:00
Michael Raskin
99d59d8094 Update jq 2014-06-10 09:41:48 +04:00
Vladimír Čunát
5a98b9f514 Merge recent master into p/stdenv 
Merged just before the pypi update, as it seems to cause problems on Hydra.
 2014-06-09 19:07:31 +02:00
Peter Simons
164c81be84 haskell-hscolour: define the bootstap version of this package using 'extension' rather than by passing an additional parameter to it 2014-06-09 13:00:33 +02:00
John Wiegley
1986a10d41 cabal-db: new expression 2014-06-09 03:58:52 -05:00
Peter Simons
717fe5e3e4 haskell-threadscope: update to version 0.2.4 2014-06-09 10:27:00 +02:00
Peter Simons
3584bfe0fd haskell-cabal-dev: remove obsolete package 
All cabal-dev functionality has been merged into cabal-install.
 2014-06-09 10:26:58 +02:00
Peter Simons
8b07b3a6a1 haskell-codex: update to version 0.0.2.1 2014-06-09 10:26:58 +02:00
Oliver Charles
ed95e2d07e Merge pull request #2873 from tomberek/hdevtool_patch28 
hdevtools compiles
 2014-06-09 08:30:44 +01:00
Austin Seipp
678def6d30 Fix again, thx to @CodeBlock 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-06-09 01:29:53 -05:00
Austin Seipp
3f6197cafe arcanist: Fix this because how did it work 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-06-09 01:25:27 -05:00
Thomas Bereknyei
666478789f hdevtools compiles 2014-06-08 23:19:52 -04:00
Austin Seipp
4dd5496bd4 arcanist: build xhpast for 'arc liberate' 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-06-07 07:12:02 -05:00
Austin Seipp
17368bdf8e arcanist: update 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-06-06 23:01:13 -05:00
Peter Simons
7553a476f5 simple-build-tool: update to version 0.13.5 2014-06-05 12:36:39 +02:00
Luca Bruno
bc53b9ec4c opengrok: new package 
Source code search and cross reference engine

http://opengrok.github.io/OpenGrok/
 2014-06-04 14:29:54 +02:00
Austin Seipp
ec1eadf5a0 Merge pull request #2691 from joelteon/cdecl-osx 
Update cdecl to block-supporting version
 2014-06-03 20:37:30 -05:00
Peter Simons
7d1c124647 Merge pull request #2767 from jwiegley/hscolour 
Build Haddocks with source hyperlinks unless doHscolour is false
 2014-06-03 10:50:04 +02:00
Bjørn Forsman
8a4dc83793 sigrok-cli: new package 
This is the command-line frontend for the sigrok signal analysis
software suite.

http://sigrok.org/
 2014-05-31 15:49:13 +02:00
Bjørn Forsman
647173db26 libsigrokdecode: new package 
libsigrokdecode is a protocol decoding library for the sigrok signal
analysis software suite.

http://sigrok.org/
 2014-05-31 15:49:13 +02:00
Bjørn Forsman
7329ad6813 libsigrok: new package 
libsigrok is the core library of the sigrok signal analysis software
suite, which I'm about to package.

http://sigrok.org/
 2014-05-31 15:49:13 +02:00
Bjørn Forsman
3b3d1d075c avrdude: update 6.0.1 -> 6.1 2014-05-31 14:20:15 +02:00
Bjørn Forsman
c7c32e1d09 avrdude: add extra dependencies: libelf, libftdi1, readline 
They are strictly speaking optional, but they provide useful features...
 2014-05-31 14:20:04 +02:00
Bjørn Forsman
be524e925b avrdude: rewrite expression 
* Use stdenv.mkDerivation instead of composableDerivation.
  stdenv.mkDerivation is the current coding standard and is easier to
  read (IMHO).

* Remove the 'parportSupport' flag because it doesn't do anything.
  (Parallel port support is still enabled.)

* Remove unneeded --disable-dependency-tracking flag to ./configure; our
  default builder does that already.

* Fix documentation build. But it is still disabled (by default),
  because texLive is such a big dependency. There is always the man
  page.

* Update 'meta' attributes
 2014-05-31 14:11:59 +02:00
Austin Seipp
7b0736b7c0 arcanist: Fix php exec (needed for arc diff) 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-05-30 15:19:18 -05:00
Austin Seipp
90f01d6a68 arcanist: 20140521 -> 20140530 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-05-30 04:38:36 -05:00
John Wiegley
176797576c Build Haddocks with source hyperlinks unless doHscolour is false 2014-05-29 20:00:04 -05:00
Vladimír Čunát
872860e6de Merge #1187 into p/stdenv 
Tested building firefox, kdelibs, evince on x86_64-linux.
 2014-05-29 22:16:07 +02:00
Rob Vermaas
fdc78ad9e0 Merge pull request #2760 from offlinehacker/pkgs/grafana/add 
Add grafana, A Graphite & InfluxDB Dashboard and Graph Editor
 2014-05-28 08:33:43 +02:00
Michael Raskin
f769585c95 Updating SlimerJS to 0.9.1 2014-05-28 01:33:28 +04:00
Michael Raskin
97c61e9a44 Updating LuaRocks 2014-05-28 01:33:28 +04:00
Michael Raskin
700d332e7d Updating CL-Launch 2014-05-28 01:33:28 +04:00
Jaka Hudoklin
a8a9c78af8 Add grafana, A Graphite & InfluxDB Dashboard and Graph Editor 2014-05-27 21:02:55 +02:00
Luca Bruno
db3b440150 pkg-config: update to 0.28 (close #2769) 2014-05-27 11:48:08 +02:00
John Wiegley
cfb7884719 Add expression for the YUI compressor 2014-05-27 09:13:40 +00:00
wmertens
8ad1a0ceaf swig: enable on Darwin (close #2326) 
Verified on OS X 10.9.2 to build and check, dependents build fine too.

@vcunat enabled doCheck as it works for him on x86_64-linux;
also did style nitpick modification, and changed platforms to .all
according to the homepage http://www.swig.org/compat.html
 2014-05-26 21:50:27 +02:00
Bjørn Forsman
e1d2e0d380 srecord: update 1.62 -> 1.63 2014-05-25 13:44:31 +02:00
Peter Simons
3f0a45e88f haskell-codex: update to version 0.0.2 2014-05-23 17:58:48 +02:00
John Wiegley
a1df473db7 haskell-hobbes: add version 0.2.2 2014-05-23 17:39:16 +02:00
John Wiegley
47a8cd7008 haskell-codex: add version 0.0.1.6 2014-05-23 17:39:15 +02:00
Jaka Hudoklin
4d634e2bae Add apktool, tool for reverse engineering Android apk files 2014-05-22 15:43:50 +02:00
Austin Seipp
7685754f0f arcanist: Fix license 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-05-21 15:21:50 -05:00
Austin Seipp
79a0ae902f arcanist: version 20140521 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-05-21 15:17:52 -05:00
Moritz Ulrich
0e44d8e3e8 rebar: update from 2.2.0 to 2.3.0 2014-05-19 15:36:59 +02:00
Joel Taylor
1564af1d99 update constraints and maintainers 2014-05-18 20:51:08 -07:00
Joel Taylor
8be662f659 remove patches 2014-05-18 20:50:40 -07:00
Joel Taylor
dc6c1423cd build cdecl on darwin 2014-05-18 20:00:28 -07:00
Peter Simons
edeffd7c49 haskell-DrIFT: add version 2.4.2 2014-05-17 12:56:52 +02:00
Vladimír Čunát
137eae0b55 Merge #2630: add and use fetchpatch 
fetchpatch is fetchurl that determinizes the patch.
Some parts of generated patches change from time to time, e.g. see #1983 and
http://comments.gmane.org/gmane.linux.distributions.nixos/12815
Using fetchpatch should prevent the hash from changing.

Conflicts (auto-solved):
	pkgs/development/libraries/haskell/gitit/default.nix
 2014-05-17 07:31:03 +02:00
Peter Simons
d31052058e haskell-timeplot: update to version 1.0.25 2014-05-16 21:35:54 +02:00
Peter Simons
1d14076943 haskell-splot: update to version 0.3.12 2014-05-16 21:35:54 +02:00
Peter Simons
c44c96a2a0 haskell-hasktags: update to version 0.69.0 2014-05-16 18:51:37 +02:00
Peter Simons
2bc8175982 haskell-cake3: update to version 0.5.0.0 2014-05-16 18:51:37 +02:00
Rob Vermaas
1cf51eb3fc Merge pull request #2589 from linquize/cccc 
cccc: New package 3.1.4
 2014-05-16 09:16:25 +02:00
Ricardo M. Correia
2902c8f628 binutils: Add PaX patch 2014-05-15 13:25:49 +02:00
Linquize
8f5fea5ab0 cppcheck: Build the cfg files (close #2572) 2014-05-13 11:39:33 +02:00
Linquize
349d87d47c cccc: New package 3.1.4 2014-05-09 16:50:36 +02:00
Eelco Dolstra
46b77d3bb4 fetchurl_gnome -> fetchurlGnome 2014-05-08 15:30:17 +02:00
Peter Simons
0241caf153 Merge pull request #2517 from jwiegley/texinfo 
Disable Texinfo tests on Darwin

https://github.com/NixOS/nixpkgs/issues/2338
 2014-05-07 11:31:30 +02:00
Peter Simons
7b8cd6d788 haskell-cabal-bounds: update to version 0.5 2014-05-05 10:46:40 +02:00
John Wiegley
66f0275b41 Disable Texinfo tests on Darwin 2014-05-05 01:03:51 -05:00
Benno Fünfstück
d385835c38 haskell-profiteur: new expression 2014-05-04 23:02:46 +02:00
Peter Simons
208e7cae1a happy-1.19.3: patch code to build with ghc-head 
https://github.com/simonmar/happy/issues/20
 2014-05-03 20:22:12 +02:00
Peter Simons
1bfeca7a90 haddock-2.14.2: re-generate with cabal2nix 
Fixes <https://github.com/NixOS/nixpkgs/issues/2481>.
 2014-05-03 20:03:33 +02:00
Peter Simons
c0d742110f haskell-threadscope: update to version 0.2.3 2014-05-03 20:03:32 +02:00
Peter Simons
0cb0810c96 haskell-hslogger: update to version 1.2.4 2014-05-03 20:03:32 +02:00
Peter Simons
0e4d6747ee haskell-HaRe: update to version 0.7.2.3 2014-05-03 20:03:32 +02:00
Austin Seipp
59528d9f0e clang-analyzer: respect $NIX_CFLAGS_COMPILE 
When using scan-build, you're often going to want to use it in the
context of a Nix expression with buildInputs, and the default wrapper
scripts will put things like include locations for those inputs
$NIX_CFLAGS_COMPILE. Thus, scan-build also needs to pass them to the
analyzer - while the link flags aren't relevant, the include flags are.

This is because the analyzer executable that gets run by scan-build is
*not* clang-wrapper, but the actual clang executable, so it doesn't
implicitly add such arguments. The build is two-stage - it runs the real
clang wrapper once, and then the analyzer once.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-05-02 14:07:37 -05:00
Austin Seipp
f21d619558 nixpkgs: move frama-c to a more appropriate directory 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-05-01 19:14:08 -05:00
Peter Simons
baa1543dbc cabal-bounds: re-generate with cabal2nix 2014-05-01 23:38:20 +02:00
Peter Simons
979520396e Merge pull request #2311 from bennofs/haskell-cabal-bounds 
haskell-cabal-bounds: New expression
 2014-05-01 14:53:10 +02:00
Austin Seipp
628e914f2b frama-c: overhaul, upgrade to 20140301-Neon 
This massively upgrades the frama-c package to be far more useful,
including support for a lot more plugins, including Jessie.

Jessie unfortunately requires that its plugin is installed alongside
frama-c, so we install why2 (where it lives) along with frama-c now.
This increases the size, but makes it much more useful.

In the future, it may be possible to split out the build such that why2
is a separate expression and frama-c only installs the plugin, rather
than all of why2. However, right now this is fine.

Furthermore, why3 is now a dependency - the Jessie plugin can use
either, and defaults to Why3 now. Per the design, Frama-C can also go
from Why2->Why3 as well.

We also make Coq and Alt-Ergo dependencies, so that out-of-the-box users
get at least one SMT solver and a prover for support.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-05-01 02:42:34 -05:00
Austin Seipp
5f702d52f4 ocamlgraph: upgrade to 1.8.5 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-05-01 02:30:39 -05:00
Austin Seipp
3c3256e4a8 nixpkgs: clang-analyzer 3.4 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-04-29 19:36:43 -05:00
Austin Seipp
1d3b5874ad nixpkgs: cov-build 7.0.2 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-04-29 16:00:34 -05:00
Benno Fünfstück
3685bf378f haskell: new expression cabal-bounds 2014-04-29 19:19:10 +02:00
Peter Simons
1a06bcc109 haskell-packunused: update to version 0.1.1.2 2014-04-29 01:35:50 +02:00
Oliver Charles
5de0ca50d7 Merge pull request #2389 from bennofs/haskell-ghc-gc-tune 
haskell-ghc-gc-tune: new expression
 2014-04-25 12:12:57 +01:00
Benno Fünfstück
027319708e haskell-ghc-gc-tune: new expression 2014-04-25 12:33:07 +02:00
Oliver Charles
61d74e4c8c Merge pull request #2345 from vbmithr/master 
Updated OCaml package findlib
 2014-04-25 10:31:04 +01:00
Mathijs Kwik
d2edc329e1 neoload: upgrade to 4.1.4 and fix mem issues 2014-04-24 08:05:44 +02:00
Eelco Dolstra
dbd332d147 Fix meta.maintainer -> meta.maintainers 2014-04-23 14:26:32 +02:00
Peter Simons
0753d64478 haskell-hlint: update to version 1.8.61 2014-04-23 11:17:11 +02:00
Peter Simons
4d765a4565 haskell-cabal-meta: re-generate with cabal2nix 2014-04-23 11:17:07 +02:00
Vincent Bernardoff
ce422b4553 Updated OCaml package findlib 2014-04-21 23:06:35 +02:00
aszlig
625d7b9043
Merge pull request #1928 from 'cross-win-osx'. 
This includes a lot of fixes for cross-building to Windows and Mac OS X
and could possibly fix things even for non-cross-builds, like for
example OpenSSL on Windows.

The main reason for merging this in 14.04 already is that we already
have runInWindowsVM in master and it doesn't work until we actually
cross-build Cygwin's setup binary as the upstream version is a fast
moving target which gets _overwritten_ on every new release.

Conflicts:
	pkgs/top-level/all-packages.nix
 2014-04-21 10:00:35 +02:00
Vladimír Čunát
cb83796abb elfutils: update 0.155 -> 0.158 2014-04-20 18:24:11 +02:00
Vladimír Čunát
b4df087f14 elfutils: fix CVE-2014-0172 
Patch taken from upstream mailing-list.
 2014-04-20 18:24:11 +02:00
Matt Whiteley
552d66cd9e Add swig-3.x 2014-04-20 11:30:31 +01:00
Jaka Hudoklin
d0c0132fb0 node_webkit: fix hash for i686-linux 2014-04-19 10:45:03 +01:00
Domen Kožar
85992ec738 Merge pull request #1507 from offlinehacker/pkgs/node_webkit/add 
Add node-webkit, app runtime based on Chromium and node.js
 2014-04-19 05:35:20 +02:00
Peter Simons
d4097e4e0e Merge pull request #2273 from jwiegley/cabal-delete 
Add expression for cabal-delete
 2014-04-16 10:17:29 +02:00
Peter Simons
d510eea7b0 Merge pull request #2277 from jwiegley/flex 
Fix flex for building on darwin systems
 2014-04-16 10:16:04 +02:00
John Wiegley
bc08fa99f1 Fix flex for building on darwin systems 2014-04-15 05:04:27 -05:00
John Wiegley
f2690384c9 Three new Haskell tools: rehoo, una, cabal-meta 2014-04-15 04:32:06 -05:00
John Wiegley
00d5f3ab79 Add expression for cabal-delete 2014-04-15 04:16:55 -05:00
Bjørn Forsman
5c2d17780d uhd: update 3.5.4 -> 3.7.0 
Build tested (with gnuradio).
 2014-04-15 07:11:41 +02:00
Bjørn Forsman
9878bb47a4 buildbot{,slave}: bump 0.8.7p1 -> 0.8.8 
Build and run tested.
 2014-04-13 21:11:49 +02:00
Bjørn Forsman
6989b9a3f9 babeltrace: update from 1.1.1 to 1.2.1 2014-04-13 10:47:17 +02:00
Bjørn Forsman
d1f875c6af lttng project: update from 2.3.0 to 2.4.1 
(And update liburcu to 0.8.4 according to release notes for lttng 2.4.x.)

In addition to new features and bug fixes, version 2.4.x is needed to build
against Linux 3.12 (our new stable kernel).
 2014-04-13 10:47:16 +02:00
John Wiegley
010132e302 Change several package constraints from linux to unix 
They all build on Darwin.
 2014-04-12 16:01:16 -05:00
John Wiegley
b296895abe Allow lsof to build on darwin (fixes #2219) 
Closes #2219, closes #2223

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-04-12 11:14:18 -05:00
Peter Simons
f32be2da85 haddock: update to version 2.14.2 2014-04-11 22:33:11 +02:00
Peter Simons
f741be954c Offer consistently named attributes for the two available flex versions. 2014-04-11 10:06:18 +02:00
Aristid Breitkreuz
5d12cbf1c2 add back old version of flex for grub2 2014-04-09 20:42:08 +02:00
Peter Simons
fd9ea0f639 ltrace: fix build with latest gcc (by disabling -Werror) 2014-04-09 12:41:11 +02:00
Peter Simons
b7d0a9a614 ltrace: update from 0.5.3 to 0.7.3 2014-04-09 12:41:10 +02:00
Peter Simons
44e8fe67d0 flex: update from 2.5.35 to 2.5.39 2014-04-09 12:41:10 +02:00
Peter Simons
bdc3361515 haskell-keter: update to version 1.3.0 2014-04-07 17:06:37 +02:00
Peter Simons
6876e696b4 haskell-HaRe: update to version 0.7.2.2 2014-04-07 17:06:37 +02:00
Peter Simons
db1a390d9d haskell-hlint: update to version 1.8.60 2014-04-06 21:53:17 +02:00
Vladimír Čunát
10147beecf Merge branch vcunat@NixOS:p/stdenv (close #1840) 
This branch contains a collection of stdenv-changing updates.
There's glibc 2.18 -> .19 bump and many non-intrusive PRs.

The grsecurity branch #1187 got removed at Eelco's request,
see https://github.com/NixOS/nixpkgs/issues/1840#issuecomment-39327023
 2014-04-04 21:33:55 +02:00
Evgeny Egorochkin
bf8991175a global: update from 6.2.9 to 6.2.12 2014-04-03 10:22:59 +03:00
Vladimír Čunát
457fdb3842 texinfo: move ncurses support into texinfoInteractive 
This, for example, drops the stdenv dependency on ncurses.
 2014-04-02 19:05:56 +02:00
Vladimír Čunát
11d4c257c1 Merge branch glibc-2.19, see #1840 2014-04-02 19:03:49 +02:00
Peter Simons
1237886a91 haskell-cabal2nix: update to version 1.61 2014-04-02 18:17:02 +02:00
Vladimír Čunát
6445ac90ad Merge master into x-updates 2014-04-01 10:49:31 +02:00
Peter Simons
68409a0981 haskell-cake3: update to version 0.4.0.0 2014-03-31 21:39:27 +02:00
Peter Simons
c6da40c42f haskell-haddock: add version 2.14.1 2014-03-31 21:39:24 +02:00
Peter Simons
e825c6ac38 haskell-cake3: add version 0.3.0.1 2014-03-30 23:26:21 +02:00
Peter Simons
aaebdb7b1e haskell-keter: update to version 1.2.1 2014-03-27 23:23:20 +01:00
Vladimír Čunát
576e9289dd Merge master into x-updates 2014-03-27 21:34:06 +01:00
Peter Simons
ae2cb475c9 haskell-cpphs: update to version 1.18.4 2014-03-27 13:12:54 +01:00
Peter Simons
b692096f9d haskell-timeplot: update to version 1.0.24 2014-03-27 13:12:54 +01:00
Peter Simons
b27ddc3d05 haskell-HaRe: update to version 0.7.2.0 2014-03-27 13:12:54 +01:00
Mathijs Kwik
5943227a26 neoload: fix for the new jdk/jre location 2014-03-27 11:29:26 +01:00
Peter Simons
284ea5859b BNFC: fix build with GHC 7.8.1 2014-03-27 10:48:32 +01:00
Peter Simons
a5e408dbf8 haskell-HaRe: update to version 0.7.1.6 2014-03-22 09:04:45 +01:00
Peter Simons
357f61b3fa haskell-HaRe: update to version 0.7.1.5 2014-03-22 09:04:42 +01:00
Vladimír Čunát
65155c20d5 automake: update from 1.12.4 to 1.12.6 2014-03-21 10:34:20 +01:00
Lluís Batlle i Rossell
ae3a1519e4 gdb: adding a patch to handle well the edit cmd + SIGWINCH. 
It's reported to upstream since two years ago, through
their patches mailing list.
 2014-03-20 11:09:39 +01:00
Lluís Batlle i Rossell
d4bf329dde Updating gdb to 7.7. 2014-03-20 10:47:36 +01:00
Peter Simons
745a35c130 haskell-hlint: update to version 1.8.59 2014-03-17 18:33:55 +01:00
Cillian de Róiste
b57ee8c331 nixpkgs-lint: add the platforms meta attr for most of my packages 2014-03-16 12:08:26 +01:00
Shea Levy
80ed0ff85f Merge branch 'ocaml-oasis' of git://github.com/maggesi/nixpkgs 
Ocaml oasis
 2014-03-15 13:14:14 -04:00
Jaka Hudoklin
58e0383d93 Add node-webkit, app runtime based on Chromium and node.js 2014-03-15 09:43:56 +00:00
Corey O'Connor
4b6e67f6c4 add platform and license to package metadata. 2014-03-13 13:01:49 -07:00
Corey O'Connor
9b79d5b298 Add jenkins continuous integration server and user. 
By default the jenkins server is executed under the user "jenkins". Which can be configured using
users.jenkins.* options. If a different user is requested by changing services.jenkins.user then
none of the users.jenkins options apply.

This patch does not include jenkins slave configuration. Some config options will probably change
when this is implemented.

Aspects like the user and environment are typically identical between slave and master. The service
configs are different. The design is for users.jenkins to cover the shared aspects while
services.jenkins and services.jenkins-slave cover the master and slave specific aspects,
respectively.

Another option would be to place everything under services.jenkins and have a config that selects
master vs slave.
 2014-03-13 13:01:49 -07:00
Domen Kozar
059e8e179b set all licenses to be attributes (and wait for Nix 1.7) 2014-03-12 21:20:43 +01:00
Peter Simons
238a98fcbe Merge pull request #1927 from iyzsong/noweb 
noweb: some fixes
 2014-03-12 19:01:48 +01:00
宋文武
37e74d8cc0 noweb: some fixes 
install libs to $out/lib/noweb
don't sed on binaries, eg markup
 2014-03-12 18:54:50 +08:00
aszlig
c7bac81c66
Merge 'mingw-w64' and 'darwin' into cross-win-osx. 
Both branches have quite a lot in common, so it's time for a merge and
do the cleanups with respect to both implementations and also generalize
both implementations as much as possible.

This also closes #1876.

Conflicts:
	pkgs/development/interpreters/lua-5/5.2.nix
	pkgs/development/libraries/SDL/default.nix
	pkgs/development/libraries/glew/default.nix
	pkgs/top-level/all-packages.nix
 2014-03-12 10:16:51 +01:00
aszlig
5eb3dd8a1b
cmake: Add patch for fixing Darwin cross-builds. 
This is an upstream patch and will eventually get into the next release.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-03-12 10:00:49 +01:00
Peter Simons
d765d5ddbb haskell-keter: update to version 1.2.0 2014-03-11 13:50:50 +01:00
Peter Simons
2273294b50 haskell-HaRe: update to version 0.7.1.4 2014-03-11 13:50:50 +01:00
Michael Raskin
6cfbc75bc1 Fix CL-Launch source link 2014-03-09 12:47:33 +04:00
Bjørn Forsman
b9d7780ced saleae-logic: install udev rules 
So that they can easily be activated in NixOS:

  services.udev.packages = [ pkgs.saleae-logic ];
 2014-03-08 21:46:13 +01:00
Bjørn Forsman
12e00b5eeb openocd: install udev rules 
So that they can easily be activated in NixOS:

  services.udev.packages = [ pkgs.openocd ];
 2014-03-08 21:46:13 +01:00
Michael Raskin
4376d70c61 Update CL-Launch to 4.0.2.2 2014-03-08 21:13:00 +04:00