JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
70,755 Commits 1 Branch 0 Tags 12 GiB
910479160b
Commit Graph

2859 Commits

Author SHA1 Message Date
Michael Alan Dorman
57c276110f haskell-ghcjs: use ghcjs compatible with new vector 
Closes https://github.com/NixOS/nixpkgs/issues/9328.
 2015-08-19 13:59:40 +02:00
William A. Kennington III
2ac70270e8 Merge branch 'master.upstream' into staging.upstream 2015-08-18 11:36:32 -07:00
Bjørn Forsman
836fa19651 cudatoolkit: fixup path to samples 
This is needed for cuda 6.5 or else nsight will not find them. In cuda 7.0 the
samples are already in $out/samples. Older versions do not build due to broken
dependency (python-minimal).
 2015-08-18 17:06:42 +02:00
Sophie Taylor
2e41646441 nixpkgs: llvm v3.5.0 -> v3.5.2 2015-08-18 02:18:04 -07:00
ro6
15ef1f3a7e urweb: 20150214 -> 20150520 2015-08-17 21:00:49 -03:00
Nikolay Amiantov
89a2f87011 elm: add the platform and helpful scripts 2015-08-17 21:32:30 +03:00
Peter Simons
c845fcfbb3 uhc: broken by recent uhc-util update 
https://github.com/UU-ComputerScience/uhc/issues/60
 2015-08-17 17:56:38 +02:00
Vladimír Čunát
a64cee8c78 ghc-7.4.2-binary: fix on i686 after 6c4364041 
I'm not sure what was the compatibility problem before that commit,
but ghc at least builds now on both x86 Linux platforms
(and this commit doesn't cause a rebuild on x86_64-linux).
 2015-08-17 10:36:36 +02:00
Vladimír Čunát
e46e461685 Revert "gfortran: disable parallel building" 
This reverts commit 3d6bd6a1fa.
The problem wasn't fortran-specific and should be fixed now. See #9212.
 2015-08-14 18:16:00 +02:00
Vladimír Čunát
0799ebf5b7 gcc: fix parallel building (fixes #9212) 
Tested building 5-times on an idle 8-core.
 2015-08-14 15:49:06 +02:00
William A. Kennington III
952def0e3c Merge branch 'master.upstream' into staging.upstream 2015-08-13 11:55:02 -07:00
Arseniy Seroka
47acbac546 Merge pull request #9229 from Xe/update/nim 
Update nim to version 0.11.2
 2015-08-13 17:27:36 +03:00
Christine Dodrill
01b455dd66 nim: 0.11 -> 0.11.2 2015-08-13 07:25:16 -07:00
Peter Simons
f741d426da ghc-nokinds: remove "nokinds" tag from derivation name 
The name of the GHC derivation must match the name and version tuple GHC
uses to identify itself, because the withPackages wrapper uses that name
to construct installation library paths etc., and those paths must match
those constructed by the compiler. If we add another tag to the name
that GHC itself doesn't use, then the paths assumed to exist by the
wrapper are wrong.
 2015-08-13 12:26:41 +02:00
Peter Simons
5a0f0bc0ca ghc: make sure the nokinds version is built with a deterministic version number 2015-08-12 13:16:27 +02:00
William A. Kennington III
6c43640410 ghc: Fix compatability with new versions of ncurses 2015-08-11 12:17:35 -07:00
Ricardo M. Correia
4af085c4d2 rustcMaster: 2015-07-28 -> 2015-08-09 2015-08-10 16:54:47 +02:00
William A. Kennington III
6e698f9c61 Merge branch 'master.upstream' into staging.upstream 2015-08-09 13:34:18 -07:00
Peter Simons
bfa187de68 ghc-head: bump version to current git HEAD 2015-08-09 20:16:19 +02:00
Peter Simons
eb5f4d3d36 ghc: make sure the HEAD version is built with a deterministic version number 2015-08-09 20:16:19 +02:00
Peter Simons
d3ac5c534d ghc: patch start scripts to add 'readelf' and 'cat' into $PATH 
Fixes https://github.com/NixOS/nixpkgs/issues/8192.
 2015-08-09 15:17:58 +02:00
Michael Raskin
a04b6f729a SBCL: 1.2.13 -> 1.2.14 2015-08-08 21:01:31 +03:00
Ricardo M. Correia
f49da34d82 rustc: 1.1.0 -> 1.2.0 2015-08-08 01:12:46 +02:00
Ricardo M. Correia
ad4adbdcb2 rustc: rename beta.patch to stable.patch 2015-08-08 01:12:46 +02:00
William A. Kennington III
0ecc61b4d7 Merge branch 'master.upstream' into staging.upstream 2015-08-05 16:24:57 -07:00
Michael Alan Dorman
297ca5ff21 Update ghcjs. 2015-08-05 21:36:19 +02:00
Michael Alan Dorman
700d365d16 Update ghcjs-shims 2015-08-05 21:36:19 +02:00
Michael Alan Dorman
e0826531e1 Update ghcjs-boot 2015-08-05 21:36:19 +02:00
Peter Simons
ebe412e8f7 ghc: update 7.10.2 to release version 2015-08-05 21:15:46 +02:00
William A. Kennington III
a2da9cfcaf Merge branch 'master.upstream' into staging.upstream 2015-08-03 14:27:14 -07:00
Michael Raskin
5210b4c7a8 ECL: Strip manual configure patching and regeneration as it doesn't work anyway 2015-08-03 08:38:00 +03:00
Jude Taylor
ebda45e6b9 add darwin gcc fixes to gcc 5 2015-08-02 14:38:25 -07:00
William A. Kennington III
09b4a7cc1b Merge branch 'master.upstream' into staging.upstream 2015-07-31 17:26:20 -07:00
Jude Taylor
cb7c053383 add fixes to gcc-4.8 2015-07-31 16:21:01 -07:00
Jude Taylor
46ab7db108 remove useless CFLAGS_FOR_BUILD from configure flags in gcc 2015-07-31 11:35:42 -07:00
Jude Taylor
4a495cfbab build gcc-4.9 on darwin 2015-07-31 11:35:42 -07:00
Tobias Geerinckx-Rice
6c6201a99b Remove unnecessary rec{s from "my" packages 2015-07-31 02:02:07 +02:00
William A. Kennington III
7ebe164ae0 Merge branch 'master.upstream' into staging.upstream 2015-07-30 15:03:10 -07:00
Thomas Tuegel
942e74bec8 Merge pull request #9007 from vbgl/julia-3.10 
julia: 0.3.9 -> 0.3.10
 2015-07-30 14:45:21 -05:00
William A. Kennington III
202c5be5c6 gcc5: Sync outputs changes with gcc4.9 2015-07-29 10:42:50 -07:00
William A. Kennington III
aaef42ab8c Merge branch 'master.upstream' into staging.upstream 2015-07-29 10:23:08 -07:00
Ricardo M. Correia
21579ef5d0 rustcMaster: 2015-07-01 -> 2015-07-28 2015-07-29 15:51:29 +02:00
Eric Seidel
eca6aa0e8d Merge pull request #8935 from acowley/smlnj-darwin 
smlnj: build on darwin
 2015-07-28 17:39:44 -07:00
Vladimír Čunát
0c4e4e6849 Merge branch 'master' into staging 
There was a mass-rebuild due to expat CVE.
 2015-07-28 13:09:43 +02:00
Kosyrev Serge
103613f766 ghcNokinds: 20150703 -> 20150718 2015-07-28 02:02:33 +03:00
Jude Taylor
fa6c8445c7 make libcxxStdenv work on both darwin and linux 2015-07-27 14:25:40 -07:00
Vincent Laporte
8a6c9f16bf julia: 0.3.9 -> 0.3.10 2015-07-26 22:06:34 +02:00
Benjamin Saunders
19f371d8d9 Fix libcxxStdenv on Linux 
This corrects linkage failures arising from missing -lc++abi and
resolves "unused argument" warnings arising due to -stdlib=libc++
serving no purpose when search paths are being supplied explicitly.
 2015-07-26 12:56:49 -07:00
Vladimír Čunát
b875ea5d29 Merge branch 'master' into staging 2015-07-26 17:57:46 +02:00
Eelco Dolstra
a951f11021 Move some more gtk-docs to the doc output 2015-07-26 13:43:49 +02:00
Vladimír Čunát
389c90aa86 llvmPackages*: refactor to use callPackage, etc. 
Also use recurseIntoAttrs only on the default version (instead of only on 3.4).

The "self" variants (stil) don't build and they're inconsistent
versions. /cc @shlevy (fea2266290).
 2015-07-25 09:13:52 +02:00
Anthony Cowley
9651f06a2d smlnj: build on darwin 2015-07-24 18:24:03 -04:00
Peter Simons
3d6bd6a1fa gfortran: disable parallel building to avoid weird build failures 
More details are at 784025c747 (commitcomment-12328357).
 2015-07-24 16:56:46 +02:00
Vladimír Čunát
a2f16fdcff Merge branch 'staging' 2015-07-24 15:12:28 +02:00
Vincent Laporte
8897299e8f mezzo: fix build with OCaml-4.02 2015-07-23 21:45:14 +02:00
Samuel Rivas
d1e6f055fe Fix haxe to compile with ocaml 4.02 
camlp4 is now a separate package
 2015-07-23 19:50:01 +02:00
Vladimír Čunát
2cacf77c13 Merge branch 'master' into staging 2015-07-22 22:33:55 +02:00
lethalman
cce3aa1e22 Merge pull request #8896 from dezgeg/pr-ovmf 
edk2, OVMF: Fix build on GCC 4.9
 2015-07-22 12:01:07 +02:00
Joachim Fasting
fe7114035f coreclr: disable i686 build 
The hydra build [1] fails with

  error: Detected non x86_64 target processor.  Not supported!

[1]: https://hydra.nixos.org/build/23871656
 2015-07-22 10:00:20 +02:00
Austin Seipp
0ca8ddc16e nixpkgs: fsharp 3.1.1.32 -> 3.1.2.5 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-07-21 18:51:56 -05:00
Austin Seipp
a594118f3d nixpkgs: mono 4.0.1 -> 4.0.2.5 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-07-21 18:50:23 -05:00
vbgl
72d46b8279 Merge pull request #8917 from spl/update-closure-compiler 
closure-compiler: 20150315 -> 20150609
 2015-07-21 21:56:05 +02:00
Luca Bruno
02b1c2727b go: rename default.nix to 1.0.nix 2015-07-21 11:41:20 +02:00
Luca Bruno
5317cf9ff4 go: 1.0 and 1.2 not supported on i686 (ZHF) 2015-07-21 11:41:19 +02:00
Sean Leather
b9f4c3b981 closure-compiler: 20150315 -> 20150609 2015-07-21 11:37:31 +02:00
Vladimír Čunát
855b3c48ab gcc: fix multilib build 
Fixes #8706, thanks to @cpages a lot.
Also ported to gcc5, without testing that one yet.
 2015-07-20 12:32:01 +02:00
Tuomas Tynkkynen
d2fe3405d3 edk2, OVMF: Fix build on GCC 4.9 
The toolchain must be correctly specified in the OVMF build or it fails
with 'Unsupported section alignment':

http://hydra.nixos.org/build/23859056
 2015-07-20 09:05:58 +03:00
William A. Kennington III
be48876349 openjdk: 8u40b27 -> 8u60b24 2015-07-17 18:00:49 -07:00
William A. Kennington III
711692f18e llvm: 3.6.1 -> 3.6.2 2015-07-17 14:12:49 -07:00
William A. Kennington III
cf8309ef34 gcc: 5.2.0-rc-20150707 -> 5.2.0 2015-07-16 14:12:00 -07:00
Vincent Laporte
475527adb7 compcert: 2.4 -> 2.5 
Also installs the Coq library as a separate output.
 2015-07-15 19:14:18 +02:00
William A. Kennington III
25e60feb72 Merge branch 'master.upstream' into staging.upstream 2015-07-15 02:02:46 -07:00
taku0
e7fe54e80c oraclejdk: 8u45 -> 8u51 2015-07-15 09:52:03 +09:00
William A. Kennington III
333f145d76 Merge branch 'master.upstream' into staging.upstream 2015-07-13 15:11:31 -07:00
Ricardo M. Correia
bb182c7944 rustcMaster: 2015-05-13 -> 2015-07-01 2015-07-12 17:33:05 +02:00
Jude Taylor
2767e93843 darwin purity: go-1.4 2015-07-11 16:05:04 -07:00
Robert Irelan
bf492548a2 rustc: 1.0.0 -> 1.1.0 2015-07-09 21:14:55 -07:00
William A. Kennington III
b477600cc0 gcc5: Use 5.2 snapshot to fix bugs noticed in syslinux and chromium with gcc5.1 2015-07-09 10:30:55 -07:00
Pascal Wittmann
6782a38364 sdcc: update from 3.4.0 to 3.5.0, fixes build (ZHF) 2015-07-09 14:09:10 +02:00
Luca Bruno
33da6ac765 go 1.3: fix build on i686 (ZHF) 2015-07-09 11:05:46 +02:00
William A. Kennington III
76674a3c07 gcc: 4.8.4 -> 4.8.5 2015-07-08 16:17:25 -07:00
William A. Kennington III
9da5943cac gcc: 4.9.2 -> 4.9.3 2015-07-07 01:50:02 -07:00
William A. Kennington III
ae28ff8b91 Merge branch 'master.upstream' into staging.upstream 2015-07-06 17:15:11 -07:00
Peter Simons
ca6ba3496c Merge pull request #8662 from deepfire/ghc-nokinds 
ghc:  add haskell.compiler.ghcNokinds, for Richard Eisenberg's `nokinds` branch
 2015-07-06 21:51:01 +02:00
Pascal Wittmann
6b17e009c4 scala: update from 2.11.6 to 2.11.7 2015-07-06 11:51:49 +02:00
Kosyrev Serge
5fee7af3ba ghc: add haskell.compiler.ghcNokinds, for Richard Eisenberg's 'nokinds' branch 2015-07-06 11:09:28 +03:00
William A. Kennington III
d605663ae2 Merge branch 'master.upstream' into staging.upstream 2015-07-05 13:06:02 -07:00
Mateusz Kowalczyk
2b833d5297 haskell-ghc: update head to 20150705 2015-07-05 21:01:37 +01:00
Peter Simons
df4fb819be ghc: add release candidate 2 for compiler version 7.10.2 2015-07-05 20:56:29 +02:00
William Casarin
d1590482cf cudatoolkit: generalize derivations, add cuda7 
There is not much different between the cudatoolkit
expressions:

  pkgs/development/compilers/cudatoolkit/5.5.nix
  pkgs/development/compilers/cudatoolkit/6.0.nix
  pkgs/development/compilers/cudatoolkit/6.5.nix

This commit removes those and replaces them with

  pkgs/development/compilers/cudatoolkit/generic.nix

and adds cudatoolkit version 7
 2015-07-04 17:05:50 -07:00
Michael Raskin
63a265a6dc SBCL: update 1.2.12 -> 1.2.13 2015-07-05 00:32:54 +03:00
William A. Kennington III
7eae48871f Merge branch 'master.upstream' into staging.upstream 2015-07-01 13:38:17 -07:00
Shea Levy
145768bf9b Unmaintain a bunch of packages 2015-07-01 08:11:05 -04:00
William A. Kennington III
612f0bdd67 Merge branch 'master.upstream' into staging.upstream 2015-06-30 23:58:07 -07:00
Tuomas Tynkkynen
d8b4cff390 dtc: Fix cross compilation 
Flex and Bison are need to be executable by the build system.
 2015-06-30 10:33:25 +03:00
Jude Taylor
b62baacbc1 Revert "Fix libcxxStdenv on Linux" 
This reverts commit 172ed10426.
 2015-06-29 13:55:12 -07:00
Shea Levy
291d203f80 Merge branch 'clang-stdenv' of https://github.com/Ralith/nixpkgs into staging 2015-06-28 15:54:06 -04:00
Tuomas Tynkkynen
b0ad2da4ed dtc: init at 1.4.1 
Compiling U-Boot for the Jetson TK1 board requires this.
 2015-06-28 22:40:35 +03:00
Benjamin Saunders
172ed10426 Fix libcxxStdenv on Linux 
This corrects linkage failures arising from missing -lc++abi and
resolves "unused argument" warnings arising due to -stdlib=libc++
serving no purpose when search paths are being supplied explicitly.
 2015-06-28 21:33:12 +02:00
William A. Kennington III
ef253212f4 Merge branch 'master.upstream' into staging.upstream 2015-06-26 17:25:49 -07:00
William A. Kennington III
fa1bdb8cbd Migrate all krb5 -> libkrb5 2015-06-26 17:21:49 -07:00
Jude Taylor
942cde614b darwin purity: rustc 2015-06-25 16:36:06 -07:00
Thomas Tuegel
a8c52d0958 Merge branch 'master' into staging 2015-06-25 09:15:05 -05:00
Vincent Laporte
d440059e7d OCaml-4.02: fix ocamlbuild 
This addresses the issue described at http://caml.inria.fr/mantis/view.php?id=6605
 2015-06-25 08:55:28 +02:00
lethalman
5988dda30f Merge pull request #8485 from obadz/coreclr 
dotnet: package coreclr (from git)
 2015-06-24 16:59:27 +02:00
obadz
30bd03a3e2 dotnet: package coreclr (from git) 2015-06-24 15:06:14 +01:00
William A. Kennington III
282d03befa Merge branch 'master.upstream' into staging.upstream 2015-06-22 10:57:36 -07:00
Eelco Dolstra
8def3d69c7 rustc: Install docs in a separator output 
This reduces rustc's size from 359 MiB to 186 MiB.

Maybe we should disable doc generation altogether, since it's very
slow and people who need docs will JFGI anyway. But for now I've left
it.
 2015-06-19 18:01:43 +02:00
Eelco Dolstra
ffb70f9c51 Don't use camelCase in file names 2015-06-19 14:29:09 +02:00
Eelco Dolstra
d8c9fa5043 Remove meta.license hack 2015-06-19 14:14:52 +02:00
Vladimír Čunát
61596bf405 Merge #8363: pure-darwin stdenv 2015-06-18 22:38:08 +02:00
Jude Taylor
fa9c81f694 pure darwin stdenv 2015-06-18 12:37:41 -07:00
Tobias Geerinckx-Rice
98b2d7b727 Separate nativeBuildInputs where maintainers |= nckx 2015-06-17 22:21:32 +02:00
William A. Kennington III
8e19ac8d7c Merge branch 'master.upstream' into staging.upstream 2015-06-17 11:57:40 -07:00
Charles Strahan
af21595eca ghcjs: fix/bump git refs 2015-06-16 21:26:11 -04:00
Peter Simons
8a8ed5fa1b ghcjs: unbreak syntax highlighting in Emacs 2015-06-16 13:02:28 +02:00
Peter Simons
fbe153989c ghcjs: mark broken 
The build has been failing for quite some time.
 2015-06-16 13:02:28 +02:00
Philipp Hausmann
d95fba3746
haskell-uhc: Use newer version with relaxed cabal constraints. 2015-06-15 10:47:53 +02:00
Luca Bruno
aa800fa0fe Merge branch 'master' into staging 2015-06-15 09:56:29 +02:00
Thomas Tuegel
5ee56b6424 julia03: fix evaluation on x86_64-darwin 2015-06-13 08:34:46 -05:00
William A. Kennington III
954801a9a8 Merge branch 'master.upstream' into staging.upstream 2015-06-12 13:47:46 -07:00
Thomas Tuegel
2a2448bcb7 Merge pull request #8182 from ttuegel/openblas 
Numerical computing overhaul
 2015-06-12 08:06:03 -05:00
Peter Simons
85ae0cb070 ghc: move gcc-clang-wrapper.sh script into the ghc directory tree since it's the only user of that script 2015-06-12 10:54:02 +02:00
Matthew Maurer
6a76633bb6 llvm-3.4: enable RTTI (close #8289) 2015-06-11 22:09:46 +02:00
Peter Simons
2f6c8127f5 uhc: update to version 1.1.9.1 2015-06-11 11:52:26 +02:00
Eelco Dolstra
4970574409 Merge remote-tracking branch 'origin/gcc-4.9' into staging 
Conflicts:
	pkgs/development/libraries/wayland/default.nix
 2015-06-11 00:23:03 +02:00
Pascal Wittmann
62d62b6588 Fixed some licenses 2015-06-10 13:00:42 +02:00
William A. Kennington III
240338638e openjdk7: Fix refernces to the bootstrap 2015-06-08 13:56:29 -07:00
Jude Taylor
b9de32de5b update GHC HEAD and configuration 2015-06-08 00:48:34 -07:00
William A. Kennington III
6e68e874b5 openjdk8: Fix refernces to the bootstrap 2015-06-08 00:00:12 -07:00
William A. Kennington III
a5ef488b11 opendjk: Make boostraps for each major version and update openjdk7 2015-06-07 21:02:02 -07:00
William A. Kennington III
a8d1010027 icedtea: Remove 2015-06-07 21:02:02 -07:00
William A. Kennington III
0cc68fa478 openjdk-make-bootstrap: Use openjdk8 2015-06-07 21:02:02 -07:00
William A. Kennington III
bdcb721546 java: Refactor top level and build ordering 2015-06-07 21:02:02 -07:00
obadz
d4681bf626 Lay down the foundation for packaging the .NET echosystem 
- fetchNuGet can fetch binaries from nuget servers
- buildDotnetPackage can build .NET packages using mono/xbuild
  - Places nuget & paket as they would clash with nix
  - Patch project files because F# targets are expected to be found in
    the mono directory (and we know that's not going to happen on nix)
  - Find DLLs that were copied from buildInputs and replace by symlink
    for sharing
  - Export produced DLL via the pkg-config mechanism
  - Create wrappers for produced EXEs
- Repackaged this new infrastructure: keepass, monodevelop
- Newly packaged: ExtCore, UnionArgParser, FSharp.Data, Paket, and a
  bunch more..

This is a combination of 73 commits.
 2015-06-06 09:06:22 -04:00
William A. Kennington III
ffd0539eba cacert: store ca-bundle.crt in $out/etc/ssl/certs instead of $out 2015-06-05 13:00:52 -07:00
Thomas Tuegel
6e3eac5c92 julia03: avoid opaque shell scripts 
The old expression used a shell script to set some repetitive
makeFlags. The makeFlags settings were spread out over different parts
of the expression. This deters new contributors. The new expression is
clearer, at the cost of being slightly repetitive.
 2015-06-04 17:42:04 -05:00
Thomas Tuegel
1a11b52ffa julia03: use system double_conversion (grisu) 2015-06-04 17:42:04 -05:00
Thomas Tuegel
6f3dfc0cf8 julia03: remove unused dependencies 2015-06-04 17:42:04 -05:00
Thomas Tuegel
b255f8df2e julia03: use system utf8proc 2015-06-04 17:42:04 -05:00
Thomas Tuegel
2b525f60c9 update julia-0.3.6 -> julia-0.3.9 
Includes a workaround for the test suite suggested by
upstream (b192bf0e2f (commitcomment-11139348))
for a buggy system wcwidth.
 2015-06-04 17:42:03 -05:00
Thomas Tuegel
bd280660f7 julia03: clean up LDFLAGS and LD_LIBRARY_PATH 
There were a few unused LDFLAGS and LD_LIBRARY_PATH settings. There was
also an incorrect setting; Julia prefers to be linked to threaded
FFTW. The libary names are now set correctly so that it's not necessary
to link system libraries into $out/lib/julia as if they were private
libraries. The LDFLAGS were also moved out of NIX_LDFLAGS so they will
affect only the Julia build itself, and not all the individual private
libraries.
 2015-06-04 17:42:03 -05:00
Thomas Tuegel
41cc06fd00 julia03: use system arpack 2015-06-04 17:42:03 -05:00
Thomas Tuegel
5c9750e5bb julia03: link shared libraries privately 2015-06-04 17:42:03 -05:00
Thomas Tuegel
e36b3ec0a5 suitesparse: build shared libraries 2015-06-04 17:42:03 -05:00
Thomas Tuegel
adcdec2e70 julia03: use system patchelf 2015-06-04 17:42:02 -05:00
Thomas Tuegel
77a454b866 julia03: refactor and build with openblas 
Compared to ATLAS, OpenBLAS offers better performance, faster builds,
and dynamic architecture detection.
 2015-06-04 17:42:02 -05:00
Thomas Tuegel
4f98287afa julia02: build with openblas 
Compared to ATLAS, OpenBLAS offers better performance, faster builds,
and dynamic architecture detection.
 2015-06-04 17:42:02 -05:00
Eelco Dolstra
1e6e52c2ac Revert "krb5: 1.13.1 -> 1.13.2" 
This reverts commit 85932bc5a9.
 2015-06-04 14:54:48 +02:00
Eelco Dolstra
553abf71ba Merge remote-tracking branch 'origin/staging' into gcc-4.9 
Conflicts:
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/libraries/wayland/default.nix
	pkgs/development/tools/build-managers/cmake/default.nix
	pkgs/top-level/all-packages.nix
 2015-06-01 20:08:43 +02:00