1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 06:01:15 +00:00
Commit graph

2462 commits

Author SHA1 Message Date
Eelco Dolstra 2ed5c2bd6b Set some meta.platforms
Also fix meta.platform -> meta.platforms in a few places.
2015-03-20 20:04:42 +01:00
Shea Levy 19cd9f16a0 Merge branch 'staging' 2015-03-20 09:53:34 -04:00
aszlig 3bb0e6df8a
haxe: Add package for the hxcpp runtime library.
I'm not adding this to pkgs/development/libraries because it somewhat is
strongly tied to Haxe itself, because otherwise you can't compile to C++
and in the event that someone is going to create something like
"haxePackages" someday it is easier to notice when it's residing in the
Haxe folder.

In theory it would also work by using imperative haxelib, but you'll get
precompiled libraries which need to be patched on NixOS systems. That's
the main reason I was packaging this, among from the fact that even when
patching the libraries, it still leads to occasional library hell and
instabilities.

The package has two outputs: One with the library itself, needed for
compile time ($out) and another one ($lib) which is needed at runtime,
so after compiling, the $out path can be safely garbage collected.

Right now, I've set meta.platforms to Linux only, because that's where
I've tested it. In order to get it running on other platforms the
targetArch attribute has to be set accordingly.

We also build everything completely from scratch, even though there are
binaries within the source ZIP file. The main reason is to make smaller
library dependencies by avoiding bundled libraries and using the ones we
already ship with nixpkgs.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-03-20 08:47:11 +01:00
aszlig d68e9b855c
haxe: Add setup-hook and patch to add haxlib path.
Introduces a new environment variable called HAXELIB_PATH and the patch
for haxelib is trying to search that environment variable for other
libraries. If the haxelib path for a particular library isn't found, it
reverts to the normal behaviour of searching the user's home directory
for a file called .haxelib, which in turn points to a repsitory path and
that in turn has .current/.dev files to point it to the right version
number.

This avoids workarounds like this when using Nix to build Haxe projects:

configurePhase = ''
  export HOME="$(pwd)"
  echo "$(pwd)" > .haxelib

  mkdir dependency1
  echo dev > dependency1/.current
  echo "${dependency1}" > dependency1/.dev

  mkdir dependency2
  echo dev > dependency2/.current
  echo "${dependency2}" > dependency2/.dev
'';

Now every haxelib is expected to be in $out/lib/haxe/$name and whenever
it is listed in buildInputs of another Haxe derivation, HAXELIB_PATH
gets automatically set in the build environment.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-03-20 08:39:21 +01:00
Mateusz Kowalczyk d56831a9af ghc: update link and version of 7.10 RC3 2015-03-19 12:33:11 +00:00
Austin Seipp 1ef6f44e5d nixpkgs: hhvm 3.3.0 -> 3.6.0
- We need {perl,git,krb5,libvpx,etc} as a dependency
  - Drop upstream patches.
  - Simplify build (uses cmake configuration)
  - Simplify install (uses cmake generated installer)

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-03-18 05:11:31 -05:00
Vladimír Čunát e924f05cc3 Merge branch 'master' into staging 2015-03-17 13:35:05 +01:00
Peter Simons 04611ab692 ghc: update 7.10.1 to rc3 2015-03-17 11:40:51 +01:00
Ricardo M. Correia 01d1ec25f7 rustc: Fix test failure due to hardcoded path to /home 2015-03-16 21:02:35 +01:00
Ricardo M. Correia 5f3a2cb0d1 rustc: Re-enable parallel building 2015-03-16 21:02:35 +01:00
Artyom Shalkhakov 82ee506f43 Bump to ATS-0.2.12 2015-03-16 15:50:48 +01:00
Peter Simons 3f712f8448 ghc-6.10.4: cosmetic clean up 2015-03-15 11:00:11 +01:00
Peter Simons 26223831dc ghc-6.12.3: cosmetic clean up 2015-03-15 11:00:11 +01:00
Shea Levy e729dfbd3f gcc-4.9: Set isGNU
Fixes #6787
2015-03-13 12:47:17 -04:00
Robin Gloster 282530454a add myself as php and rustc maintainer 2015-03-11 11:24:55 +01:00
Peter Simons 6694ef42a9 Merge branch 'master' into staging.
Conflicts:
      pkgs/development/libraries/gtk+/2.x.nix
      pkgs/tools/security/gnupg/21.nix
      pkgs/top-level/all-packages.nix
2015-03-10 12:09:43 +01:00
Peter Simons 8196130a1d Merge pull request #6711 from phile314/dev
haskell: Add uhc compiler
2015-03-10 11:22:15 +01:00
Philipp Hausmann 2eacaa856b
haskell-uhc: Remove explicit dependency on binary 2015-03-10 00:19:10 +01:00
Arseniy Seroka b172b9fb37 Merge pull request #6731 from globin/update-rust
Update rust to new nightly (2015-03-09)
2015-03-09 21:59:03 +03:00
Robin Gloster 3a32dae799 update rust to new nightly (2015-03-09) 2015-03-09 18:37:30 +01:00
Peter Simons e2b033cad9 ghc: re-instate code that configures statically linked builds by default
The compiler should not expect to have dynamic versions of all libraries
available, because that configuration doesn't play along nicely with statically
linked libraries.

Fixes https://github.com/NixOS/nixpkgs/issues/6399.
2015-03-09 15:55:24 +01:00
Eduard Bachmakov 4731485ca2 llvm-3.5: enable RTTI to support mesa
Extracted from #6367.
2015-03-09 15:55:23 +01:00
Philipp Hausmann 1ce75368f1
Add uhc haskell compiler 2015-03-09 13:38:28 +01:00
William A. Kennington III c9ec23d55c Merge pull request #6673 from taku0/oraclejdk-8u40
oraclejdk: bump to 8u40
2015-03-08 19:16:44 -07:00
William A. Kennington III 2e6e6f9178 Merge pull request #6684 from j-keck/update-scala
update scala to 2.10.5 and 2.11.6
2015-03-08 16:08:40 -07:00
Michael Raskin a36c914020 update sbcl 2015-03-09 01:03:01 +03:00
Michael Raskin 3d4f7be9a3 Update ECL 2015-03-09 01:03:01 +03:00
Shea Levy e57e44f867 llvm-3.6 packages: Build everything (except clang and llvm) with clang 2015-03-07 13:08:34 +00:00
Shea Levy b37fd11351 llvm-3.6 packages: Rearrange directory structure 2015-03-07 12:51:06 +00:00
Shea Levy 3ed077a69b lldb-3.5 is broken, bug in the cmake
lldb-3.6 is working (just waiting on a staging fix to merge), so let's just
mark this broken until we decide to nuke 3.5 all together.

Fixes #6636 refs #6668
2015-03-06 16:16:20 -05:00
Shea Levy c62b5456f5 Merge branch 'llvm-3.6' of git://github.com/Ralith/nixpkgs into llvm-3.6-merge
LLVM, clang, and lldb 3.6iLLVM, clang, and lldb 3.6

Conflicts:
	pkgs/top-level/all-packages.nix
2015-03-06 19:10:10 +00:00
Shea Levy 6b53021205 Merge branch 'master' into staging 2015-03-06 19:02:36 +00:00
Shea Levy 55cf015142 clang-3.6: provide path to gcc on Linux
gcc contains core runtime bits that aren't available elsewhere for Linux.

Refs #6449
2015-03-06 13:49:49 +00:00
Shea Levy 494ae5fbeb clang: provide path to gcc on Linux
gcc contains core runtime bits that aren't available elsewhere for Linux.

Fixes #6449 refs #6668
2015-03-06 08:36:42 -05:00
Shea Levy c08a0d240c ats2: bump 2015-03-05 18:21:56 -05:00
j-keck 7da51f9eb7 scala: update to 2.11.6 2015-03-05 20:49:28 +01:00
j-keck a1a585078a scala_2_10: update to 2.10.5 2015-03-05 20:49:28 +01:00
Moritz Kiefer 4f3f301807 openjdk8: update to jdk8u40-b25 2015-03-05 18:04:21 +01:00
taku0 137f281849 oraclejdk: bump to 8u40 2015-03-05 23:01:21 +09:00
Peter Simons 1d953779b0 Merge remote-tracking branch 'origin/master' into staging. 2015-03-05 12:24:57 +01:00
Benjamin Saunders f1b7e4d127 LLVM, clang, and lldb 3.6 2015-03-05 06:44:09 +01:00
Eelco Dolstra 6f33aa8465 orig-gcc -> orig-cc 2015-03-04 22:15:46 +01:00
Eelco Dolstra 97fcb33ac2 cudatoolkit: Fix gcc -> cc
Urgh, we shouldn't have renamed gcc to cc...
2015-03-04 22:15:46 +01:00
William Roe 7dcde14809 go: Update to version 1.4.2 2015-03-04 11:55:47 +00:00
Peter Simons 38c67a358e yap: mark 32 bit Linux build broken 2015-03-04 11:14:58 +01:00
Dan Peebles 57250fc2cc Enable cgo on darwin 2015-03-03 20:03:48 -05:00
William A. Kennington III adbba6eded Merge pull request #6528 from codyopel/stdenv-fixes
remove stdenv.isBSD
2015-03-02 20:10:07 -08:00
Bjørn Forsman c47a3b0663 microscheme: update to latest release (0.9.2)
* Don't "externalize url/rev/sha256 to permit easier override".
  Just override 'src' itself. Then you can get the source from anywhere,
  not just git. I needed to touch this anyway, because I want to use
  fetchzip instead of fetchgit for releases (no need to clone repo).
* Latest release has "make install" improvements, simplifying our
  install.
2015-03-02 21:55:55 +01:00
Georges Dubus 9e59c9ad84 Merge pull request #6623 from woehr/master
Upgrade Rust compiler
2015-03-02 21:38:29 +01:00
Peter Simons 5341196f01 Merge branch 'master' into staging. 2015-03-02 21:10:36 +01:00