Commit graph

1716 commits

Author SHA1 Message Date
Peter Simons a7bd862f0b haskell-idris: update to version 0.9.10.1 2013-12-03 22:23:21 +01:00
Peter Simons dc662dcaa2 ghc-head: update to today's git snapshot and arbitrarily dub it version 7.7.20131202 2013-12-03 22:23:20 +01:00
Vladimír Čunát d09b722f77 Merge master into x-updates 2013-12-02 21:41:16 +01:00
Peter Simons 1d191dd56f haskell-idris: update to version 0.9.10 2013-12-02 16:25:34 +01:00
Moritz Ulrich 31cdbe4a31 Chicken: Fix build on OS X.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-11-29 11:47:00 +01:00
Moritz Ulrich 78cb479f73 Chicken: Set PLATFORM for all supported platforms.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-11-28 23:23:40 +01:00
Moritz Ulrich 32fbf27bc3 Chicken: Downgrade to latest stable release & add pkgs.chicken-dev.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-11-28 22:08:30 +01:00
Michael Raskin a4701db302 Updating SBCL to 1.1.13 2013-11-25 10:59:36 +04:00
Vladimír Čunát b5fba47147 Merge branch master into x-updates
Conflicts (not used, deleted):
	pkgs/desktops/xfce/common.nix
2013-11-23 10:22:26 +01:00
Bjørn Forsman fed248c78e sdcc: bump 3.2.0 -> 3.3.0
SDCC 3.3.0 Feature List:

 * Many small improvements in code generation for the z80-related ports - merged smallopts branch
 * lospre (currently enabled for z80-related and hc08-related ports only) - merged lospre branch
 * More efficient initialization of globals in z80, z180, r2k and r3ka ports.
 * Inclusion of tests from the gcc test suite into the sdcc regression test suite led to many bugs being found and fixed.
 * Split sdas390 from sdas8051
 * Merged big parts of ASxxxx v5 into sdas
 * New pic devices (synchronization with MPLABX 1.60). (Except for very old MCU-s.)
 * New script which disassembles those hex files, in which MCS51 code there is. (mcs51-disasm.pl)
 * Added the PIC16F1788 and PIC16F1789 devices.
 * C11 _Alignof operator.
 * C11 _Alignas alignment specifier.
 * C11 _Static_Assert static assertion.

Numerous feature requests and bug fixes are included as well.
2013-11-21 23:22:06 +01:00
zimbatm 8677a22dd5 Fixes go 1.1.2 compilation on OSX Maverick
Apparently Apple thinks that faking gcc wiht a clang stub but not providing a
compatile libgcc.a is not going to cause any issues. They really do hate GPL.
2013-11-17 13:51:37 +00:00
Vladimír Čunát 68430cf3d7 Merge branch master into x-updates
Conflicts (trivial, minor update on master, major here):
	pkgs/development/libraries/mesa/default.nix
2013-11-16 20:32:44 +01:00
Petr Rockai 2c9f0e059a clang: Do not try to build clang-tblgen in LLVM's build path. 2013-11-16 13:53:48 +01:00
Peter Simons b1f7180d6c Merge pull request #1188 from peti/reimplement-ghcWithPackagesOld-by-wrapping-ghcWithPackages
Re-implement ghcWithPackagesOld as a variant of ghcWithPackages that ignores collisions.
2013-11-11 05:00:11 -08:00
Karn Kallio 1e80c57274 scala: add expression for scala 2.10.x branch. 2013-11-11 12:11:00 +01:00
Peter Simons e4d841eef4 Re-implement ghcWithPackagesOld as a variant of ghcWithPackages that ignores collisions.
This change is intended to fix <https://github.com/NixOS/nixpkgs/issues/1161>
and to address some of the concerns that come up during the discussion of
<d64917ad17>.
2013-11-09 20:41:52 +01:00
Peter Simons 981c287355 ghc: several enhancements to the new "with-packages" wrapper
1) The wrapper erroneously used the ghc-pkg flag "--package-db" instead of
    "--global-package-db". The result was that packages installed locally in
    ~/.ghc and ~/.cabal were invisible to GHC. This has been fixed.

 2) The wrapper now deals gracefully with an empty package set: if no package
    is requested to be included in the wrapped environment, the wrapper just
    installs a pristine GHC.

 3) Correctly configure the "docdir" path returned by ghc-paths.

 4) Added some comments that describe the idea behind our ghc-paths patches and
    gives users same sample shell code that can be used to import our special
    environment variables into the currently running shell, so that programs
    outside of the wrapped environment can use them, too.
2013-11-09 20:36:25 +01:00
Peter Simons f92a5cbfc6 pkgs/development/compilers/ghc/with-packages.nix: add 'ignoreCollisions' parameter
The ghcWithPackage expression now has an argument 'ignoreCollisions' that
allows users to disable the path collision check like so:

  (pkgs.haskellPackages.ghcWithPackages (pkgs: with pkgs; [ haskellPlatform ])).override { ignoreCollisions = true; };

See d64917ad17
for a long and detailed discussion of why these path collisions may occur.
2013-11-07 12:14:19 +01:00
Peter Simons 89c566fcfd pkgs/development/compilers/ghc/with-packages.nix: improve recognition of Haskell packages
Haskell packages -- i.e. packages built by our Cabal builder -- invariably have
the attributes 'pname' and 'version'. We use the absence of these attributes to
recognize non-Haskell packages and filter them from the closed package set
generated by closePropagation. We do this so that the generated Haskell
environment won't contain paths like "/lib/libz.a", which are part of the
closure but have nothing to do with Haskell.

The previous scheme used the attribute 'ghc' to accomplish the same thing, but
unfortunately other packages to contain a 'ghc' attribute, too, like the
old-style ghc-wrapper. Including the ghc-wrapper in this environment is
pointless, obviously. The new approach filters the ghc-wrapper successfully.
2013-11-07 12:14:19 +01:00
Eelco Dolstra 77dc219127 gcc: Support FreeBSD 2013-11-06 10:41:02 +01:00
Eelco Dolstra da426c7df5 Fix some meta.platforms attributes to build more stuff on Darwin 2013-11-05 10:46:59 +01:00
Peter Simons 0e831bd525 Resurrect the old ghcWithPackages wrapper under the attribute name 'ghcWithPackagesOld'. 2013-11-04 19:42:49 +01:00
Peter Simons 40a31df497 haskell-Elm: update to version 0.10.0.2 2013-11-01 14:20:11 +01:00
Mathijs Kwik f4903d890e Merge branch 'master' into x-updates 2013-11-01 08:35:16 +01:00
Mathijs Kwik 609f8dc04b Merge branch 'master' into stdenv-updates
Conflicts:
	pkgs/top-level/all-packages.nix
2013-11-01 08:31:54 +01:00
Peter Simons 094edba311 ghc-with-packages.nix: make sure that GHC itself is included in the environment 2013-10-28 17:54:28 +01:00
Peter Simons 19cfd3da63 haskell-Elm: update to version 0.10.0.1 2013-10-27 19:07:14 +01:00
Peter Simons 9eea6c64fb Merge branch 'origin/master' into stdenv-updates. 2013-10-27 10:58:24 +01:00
Peter Simons f5e8f1ccc1 ghc: update HEAD version to 7.7.20130828 2013-10-27 10:22:21 +01:00
Peter Simons d64917ad17 Back-port Haskell-related improvements from stdenv-updates.
* There now is full support for building Haskell packages as shared libraries
   for GHC versions 7.4.2 or later. The Cabal builder recognizes the following
   attributes:

    - enableSharedLibraries configures Cabal to build of shared libraries in
      addition to static ones. This option requires that all dependencies of
      the package have been compiled for use in shared libraries, too.

    - enableSharedExecutables configures Cabal to prefer shared libraries when
      linking executables.

   The default values for these attributes are arguments to the haskellPackages
   expression.

 * Haskell builds now run in a LANG="en_US.UTF-8" environment to avoid plenty
   of build and test suite errors. Without this setting, GHC seems unable to
   deal with the UTF-8 character encoding that's generally considered standard
   in the Haskell world.

 * The Cabal builder supports a new attribute 'testTarget' to specify the exact
   set of tests to be run during the check phase.

 * The ghc-wrapper attribute ghcVersion has been removed. Instead, we use the
   ghc.version attribute, which exists in unwrapped GHC derivations, too.
2013-10-27 10:09:36 +01:00
Peter Simons 91f2c362de Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/top-level/all-packages.nix
2013-10-26 18:28:05 +02:00
Bjørn Forsman 200d629733 Fix evaluation error caused by the "ats" expression 2013-10-26 12:43:12 +02:00
Shea Levy 665c4882e8 Add ats
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-10-25 13:33:32 -04:00
Peter Simons cf08417baa haskell-Elm: update to version 0.10 2013-10-24 23:29:54 +02:00
Song Wenwu b23741da34 Add smlnj-110.76
Based on patch by Marc Weber:
http://lists.science.uu.nl/pipermail/nix-dev/2010-December/005625.html

Close #1058.
2013-10-21 21:46:55 +03:00
Peter Simons fae8fd8ef1 ghc-wrapper: rename 'ghcVersion' attribute to 'version' for consistency 2013-10-20 15:40:36 +02:00
Malcolm Matalka ab744d2053 Add Ocaml 4.01.0.
Close #1065.
2013-10-19 18:07:20 +03:00
Peter Simons 3ec00b51f8 gcc: update to 4.8.x branch to 4.8.2 2013-10-19 15:10:27 +02:00
Peter Simons 6be8ad3392 Merge branch 'origin/master' into stdenv-updates.
There was a minor conflict in 'stumpwm'. The package needs texinfo
version 4.x. At least is used to, I'm not sure whether it still does.
2013-10-18 18:57:24 +02:00
Peter Simons e9163ad4c9 ghc: configure RPATH that allows ghc's shared libraries to find each other
Prior to this patch, libHSrts.so didn't know how to load libffi.so.
See issue #1081 for further details.
2013-10-18 18:39:04 +02:00
Peter Simons b258b45a4f haskell-idris: update to version 0.9.9.3 2013-10-18 12:52:27 +02:00
Michael Raskin 75bb099867 Update Julia 2013-10-14 11:55:59 +04:00
Michael Raskin 6be28d142f Update SBCL to 1.1.12 2013-10-13 10:34:55 +04:00
Shea Levy 74d72d89ea Update edk2 and OVMF
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-10-09 10:30:44 -04:00
Rob Vermaas 2066508131 Add argument to oraclejdk to allow installation of Java Cryptography Extension with unlimited strength. User needs to download these themselves, and need to accept a license agreement (Java SE BCL License Agreement) 2013-10-08 11:31:12 +02:00
Domen Kožar 49f8e371a1 Merge pull request #1049 from bjornfor/description-fixes
More description fixes
2013-10-06 07:05:20 -07:00
Bjørn Forsman 083d0890f5 More description fixes
* Remove package name
* Start with upper case letter
* Remove trailing period

Also reword some descriptions and move some long descriptions to
longDescription.

I'm not touching generated packages.
2013-10-06 12:01:38 +02:00
Peter Simons 2e60cd53b7 Merge pull request #1046 from DriesVanDaele/master
add tabling to yap
2013-10-06 02:58:53 -07:00
Vladimír Čunát 4bcdeb49a1 mesa: update 9.1.6 -> 9.2.1, enable R600 LLVM stuff 2013-10-05 21:18:35 +02:00
Dries Van Daele 89964dd241 add tabling to yap 2013-10-05 20:59:34 +02:00
Bjørn Forsman 28ac782583 Some description fixes
There are many more packages to fix, this is just a start.

Rules:
 * Don't repeat the package name (not always that easy...)
 * Start with capital letter
 * Don't end with full stop
 * Don't start with "The ..." or "A ..."

I've also added descriptions to some packages and rewritten others.
2013-10-05 19:36:23 +02:00
Peter Simons ac5d5297dd Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-10-02 22:44:12 +02:00
Moritz Ulrich 36fca94805
Fix some issues in my packages reported by nixpkgs-lint.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-09-26 20:03:57 +00:00
Peter Simons a71c1ca748 haskell-idris: update to version 0.9.9.2 2013-09-25 18:25:00 +02:00
Vladimír Čunát 0adae9f822 llvm: add support for R600
It will be useful for mesa >= 9.2.*
Also, I want to restart the build on Hydra, as it succeeds for me.
2013-09-24 23:10:48 +02:00
Peter Simons 9407832de4 Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/development/libraries/gettext/default.nix
2013-09-23 10:59:44 +02:00
Peter Simons 900a35738c haskell-idris: update to version 0.9.9.1 2013-09-22 13:25:08 +02:00
Peter Simons f998111d2c ghc-7.6.3: undo commit 7c8ba75
The change was supposed to trigger a re-build to fix a broken GHC binary
on the Hydra build farm, but now it turns out that the cause for the
errors we're seeing isn't GHC: all kinds of (non-Haskell) packages are
broken.
2013-09-21 09:51:35 +02:00
Peter Simons 7c8ba7557c ghc-7.6.3: cosmetic change to force a re-build 2013-09-20 19:27:22 +02:00
Lluís Batlle i Rossell 41e95c68b3 go: adding an option to remove external references in godoc
godoc pages point to googleapis and google plus URLs, for every visit in
your local godoc. I added an option to disable that (the hard way, it
takes out the references). I don't think it removes any feature of
godoc.
2013-09-15 11:57:52 +02:00
Peter Simons 24366adf19 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-09-14 15:28:40 +02:00
Zef Hemel 8d001c1a08 Darwin support for Go 1.1 (close #952) 2013-09-14 15:13:26 +02:00
Peter Simons da6b1e6d81 idris: re-generate with cabal2nix 2013-09-11 20:45:18 +02:00
Peter Simons 39043ce87e yap: add 'zlib' and 'gmp' build inputs to enable additional features 2013-09-11 20:43:04 +02:00
Dries Van Daele 412b970479 Update YAP to version 6.2.2 2013-09-11 19:40:10 +02:00
Dries Van Daele 3d5e7a99f4 Update SWI-Prolog to version 6.4.1 2013-09-11 19:00:31 +02:00
Peter Simons 3d2caf1180 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-09-08 22:54:35 +02:00
Vladimír Čunát b1be46e932 Merge branch 'master' into x-updates 2013-09-07 16:19:46 +02:00
Ricardo M. Correia 6039f2effe go: update to 1.1.2
Also fix impurity in src/pkg/net/lookup_unix.go.
2013-09-07 05:10:50 +02:00
Evgeny Egorochkin bf82983581 Merge pull request #926 from grwlf/urweb-2013
Ur/Web: Version bump
2013-09-06 15:51:24 -07:00
Sergey Mironov 190dcbbc7a Ur/Web: Version bump 2013-09-07 00:36:40 +04:00
Vladimír Čunát 9475e4d50a llvm (merge amend): fix evaluation
Regular binutils now include gold.
2013-09-02 15:45:29 +02:00
Vladimír Čunát 74488e2b58 Merge branch 'x-updates' into stdenv-updates
Conflicts (simple):
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/mesa/default.nix
2013-09-02 15:44:57 +02:00
Peter Simons 98fcc2f746 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-08-30 10:45:11 +02:00
Vladimír Čunát 2fda1165da Merge branch 'master' into x-updates 2013-08-28 10:37:41 +02:00
Bjørn Forsman a74ab8c0a1 cudatoolkit: fix missing dependencies
Some of the java tools failed to run (notably nsight) because of missing
libraries. This fixes it.
2013-08-27 14:11:23 +02:00
Justin Bedo 6c2985e8d7 Update CUDA Toolkit to 5.5 2013-08-27 13:44:56 +02:00
Peter Simons 95491128cf gprolog: update to version 1.4.4, clean up installation layout, update license information 2013-08-27 13:21:29 +02:00
Vladimír Čunát c1e62e7e91 Merge branch 'master' into x-updates 2013-08-22 19:29:09 +02:00
Petr Rockai 8bc805a211 llvm: Build the LLVMgold.so plugin for ld.gold &c.
Conflicts (simple):
	pkgs/development/compilers/llvm/default.nix
2013-08-18 21:35:17 +02:00
Peter Simons 0d7118814b Merge branch 'origin/master' into stdenv. 2013-08-17 10:00:16 +02:00
Peter Simons 898348a80d ghc-head: update to version 7.7.20130816 2013-08-16 23:47:59 +02:00
Ludovic Courtès 2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
Peter Simons 76244ac2e2 Merge branch 'master' into stdenv-updates
Conflicts:
	pkgs/development/compilers/ghc/with-packages.nix
2013-08-16 22:51:13 +02:00
Moritz Ulrich f15af7c8e6 avra-1.3.0: Assember for the Atmel AVR microcontroller family
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-08-14 23:37:17 +02:00
Peter Simons 7147de66c6 haskell-Elm: update to version 0.9.0.2 2013-08-14 11:53:06 +02:00
Peter Simons dff0f73d25 haskell-elm-server: update to version 0.9.0.2 2013-08-14 11:53:06 +02:00
Alexander Foremny 219e45b5f5 Disable tests in Elm
Elm does not serve any tests besides a test that always fails.
2013-08-14 10:02:05 +02:00
Peter Simons bb312b77b5 ghc-head: update to version 7.7.20130811 2013-08-11 23:50:05 +02:00
Gergely Risko de35a6dbb9 Export ghci config files for ghc-vis and ghc-heap-view 2013-08-11 23:50:04 +02:00
Peter Simons 8a09380383 haskell-Elm: update to version 0.9.0.1 2013-08-11 23:50:03 +02:00
Peter Simons b5b53e250b haskell-elm-server: update to version 0.9 2013-08-11 23:50:03 +02:00
Domen Kožar 94105045b4 typo 2013-08-11 17:13:46 +02:00
Bjørn Forsman 078213e892 orc: add a comment about the license 2013-08-11 14:50:55 +02:00
Song Wenwu 5f4fc730b1 add myself to maintainers list, keep it sorted
orc: add myself as a maintainer
2013-08-11 15:14:12 +08:00
Song Wenwu 8e023d078c orc: add missing license (bsd3) 2013-08-11 12:07:57 +08:00
Song Wenwu 094ffb2b08 add orc 0.4.17 2013-08-11 11:00:45 +08:00
Peter Simons 0c331a4a42 haskell-idris: revert update to version 0.9.9
This reverts commit 61c880d558. The new
Idris version depends on a version of LLVM that we don't have in master
yet: it's only in x-updates.
2013-08-03 12:10:39 +02:00
Peter Simons 61c880d558 haskell-idris: update to version 0.9.9 2013-08-03 12:08:22 +02:00
Vladimír Čunát 98f3716650 clean some include flags that weren't really needed
Tested the builds still work (x86_64-linux).
2013-08-03 10:45:13 +02:00
Vladimír Čunát 625f40151b Merge branch 'master' into x-updates
Conflicts (a little tricky, I did some cleanup of interacting changes):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/libpng/default.nix
	pkgs/tools/package-management/nixops/default.nix
	pkgs/top-level/all-packages.nix
2013-08-02 18:30:53 +02:00
Mathijs Kwik 114b961b8c idris: upgrade to 0.9.9 2013-08-02 11:47:38 +02:00
Peter Simons 522acfd2f4 Merge remote-tracking branch 'master' into stdenv-updates.
Conflicts:
	pkgs/applications/version-management/git-and-tools/git/default.nix
	pkgs/top-level/all-packages.nix
2013-07-30 11:29:30 +02:00
Peter Simons b253eb0d59 haskell-elm-server: re-generate expression with cabal2nix 2013-07-29 11:27:01 +02:00
Alexander Foremny 828b1de8f4 Add jailbreak to Elm server 2013-07-27 10:22:07 +02:00
Karn Kallio c067505c7d aldor: fix the build 2013-07-25 10:11:19 +02:00
Peter Simons 58c08fdefb aldor: fix the sha256 hash (plus minor cosmetic changes) 2013-07-24 10:51:01 +02:00
Lluís Batlle i Rossell b1db03ece6 Updating go to 1.1.1 2013-07-22 22:18:51 +02:00
Peter Simons 0685198b53 Merge pull request #770 from aforemny/haskell-elm
Add Elm and elm-server
2013-07-21 06:41:26 -07:00
Karn Kallio bc4c9312a5 Add aldor. 2013-07-17 18:51:51 +02:00
Evgeny Egorochkin b084b29d26 Even more mirror:// fixes 2013-07-14 04:17:07 +03:00
Evgeny Egorochkin d0b4c8bfaa gktspell: version bump to 2.0.16 because the old one has disappeared 2013-07-14 03:09:34 +03:00
Evgeny Egorochkin d078f07f4c strategoxt.java-front: fix version to match tarball 2013-07-14 02:08:54 +03:00
Evgeny Egorochkin 7e5e50a084 strategoxt.dryad: fix version to match tarball 2013-07-14 02:08:48 +03:00
Vladimír Čunát 8ba92b8895 Merge master into stdenv-updates
Conflicts (simple):
	pkgs/development/tools/misc/binutils/default.nix
	pkgs/tools/package-management/disnix/default.nix
	pkgs/top-level/all-packages.nix
2013-07-08 10:48:05 +02:00
James Cook 5be89ac733 openjdk: Don't statically link C++ runtime, close #730.
This fixes a build error (https://github.com/NixOS/nixpkgs/issues/707).
Thanks to
http://mail.openjdk.java.net/pipermail/build-dev/2012-January/005349.html
2013-07-08 09:15:33 +02:00
Peter Simons e2874236d3 llvm: fix meta.license attribute 2013-07-04 17:53:57 +02:00
Jason "Don" O'Conal 3b490b7ccb llvm: re-disabling tests
accidentally re-enabled doCheck, which isn't working yet
2013-07-04 19:02:40 +10:00
Jason "Don" O'Conal 67e5eb909b llvm: fix build on darwin
* add DYLD_LIBRARY_PATH
* don't build with shared libs
2013-07-04 08:48:55 +10:00
Rickard Nilsson 00df29c471 New package: lessc, version 1.4.0
Compiles LESS to CSS
2013-07-01 15:39:39 +02:00
Rickard Nilsson cb534f1baa New package: Google Closure compiler version 20130603.
A JavaScript optimizing compiler.
2013-07-01 14:52:57 +02:00
Vladimír Čunát 73183e5c70 gcc44: minor update 4.4.6 -> .7 2013-06-30 22:28:17 +02:00
Vladimír Čunát 38477f5b0b gcc43: minor update 4.3.4 -> .6 2013-06-30 18:48:06 +02:00
Eelco Dolstra acba9240cd nixos.org/tarballs -> tarballs.nixos.org
It's currently the same machine, but tarballs.nixos.org should become
an S3/CloudFront site eventually.
2013-06-25 14:12:16 +02:00
Shea Levy 6425ad2847 clang: Update to 3.3
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-06-21 19:50:56 -04:00
Shea Levy 9b502a9ae1 llvm: Update to 3.3
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-06-21 19:18:52 -04:00
Vladimír Čunát 842420c3e1 Merge branch 'master' into stdenv-updates
Conflicts (relatively simple):
	pkgs/development/interpreters/python/2.7/default.nix
	pkgs/development/libraries/dbus/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/common.nix
2013-06-20 19:21:25 +02:00
Vladimír Čunát 3adf8e6429 vala, libusb1, deps of libjpeg: attempt to fix on non-Linux 2013-06-18 17:52:09 +02:00
Peter Simons 12b29fadcb Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-06-17 10:14:45 +02:00
Michael Raskin 19530856ed Merge remote-tracking branch 'upstream/master' into x-updates
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/misc/ghostscript/default.nix
	pkgs/top-level/all-packages.nix
2013-06-13 17:12:43 +04:00
Michael Raskin ed51d54610 Merge pull request #606 from fignuts/master
Add keepass password manager and update mono DLLMap.
2013-06-13 05:42:53 -07:00
Alexander Foremny bb53645b0f Add Elm and elm-server 2013-06-12 13:27:22 +02:00
Michael Raskin 1a45886454 Merge branch 'master' into x-updates 2013-06-11 15:46:10 +04:00
Michael Raskin 55249de924 Update Julia to today's revision 2013-06-11 15:44:56 +04:00
Peter Simons 6b1ebeccf2 Merge branch 'master' into stdenv-updates.
There were conflicts in pkgs/development/interpreters/ruby/ruby-19.nix,
which I resolved to the best of my knowledge. I'd appreciate if some of
the ruby gurus could have a look at the outcome of my merge, though.
2013-06-11 12:11:25 +02:00
Andrew Morsillo e1bd332758 Added keepass password manager. Updated mono DLLMap to allow mono to run WinForms applications (keepass). 2013-06-09 23:17:09 +02:00
Vladimír Čunát 7db886fdb9 Merge remote-tracking branch 'hydra/master' into x-updates
Conflicts (taken from @7c6f434c):
	pkgs/development/libraries/libgphoto2/default.nix
2013-06-08 15:41:39 +00:00
Domen Kozar 4213b4aacb fix eval 2013-06-07 11:18:33 +02:00
Evgeny Egorochkin 9c6f7cc9c1 Add package versions to some of the packages or fix existing ones to conform to nixpkgs conventions. 2013-06-07 03:15:45 +03:00
Mathijs Kwik 35d3e38d54 add idris wrapper 2013-06-05 23:36:20 +02:00
Mathijs Kwik 3f9723e02e add idris wrapper 2013-06-05 23:30:38 +02:00
Vladimír Čunát 7af694700c Merge branch 'master' into x-updates
Silently merged badly the firefox 20/21 things. I got that, hopefully
there aren't more (my nixos-rebuild dry-run finds no more errors).
2013-06-05 12:59:47 +02:00
Mathijs Kwik 187670c7da add haskell/idris 2013-06-05 12:17:35 +02:00
Michael Raskin f0276491f9 ECL update 2013-06-04 11:30:32 +04:00
Michael Raskin 0cc921120a SBCL update 2013-06-04 11:30:26 +04:00
Michael Raskin d82d86eb64 ECL update 2013-06-04 11:29:34 +04:00
Michael Raskin 40a250fc6f SBCL update 2013-06-04 11:10:06 +04:00
Vladimír Čunát 14f36162d2 llvm: switch back to cmake build, so now clang builds 2013-06-01 23:36:38 +02:00
Peter Simons d4bcbbaba6 gcc: update from 4.8.0 to 4.8.1 2013-06-01 12:41:34 +02:00
Peter Simons 5718931dd3 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-06-01 11:48:21 +02:00