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

23184 commits

Author SHA1 Message Date
Peter Simons 5238bfb73f r-modules: fix evaluation errors 2015-03-21 23:33:50 +01:00
Peter Simons 701251e435 r-modules: update from CRAN state at 2015-03-21T20:01:16+0100) 2015-03-21 23:33:50 +01:00
Russell O'Connor e2e4c1182e Update OpenSSL dependency of bitcoin to be the latest OpenSSL.
Purge OpenSSL version 1.0.1j.
2015-03-21 17:49:42 -04:00
Peter Simons d242b5220a haskell-bytestring-arbitrary: fix build by passing an older LLVM version 2015-03-21 19:47:53 +01:00
Peter Simons fddc2fa8bc haskell-hydrogen-syntax does not compile. 2015-03-21 19:44:12 +01:00
Peter Simons 16b9fd71f9 haskell-ansi-wl-pprint: fix the build with ghc-7.10.x 2015-03-21 19:44:12 +01:00
Peter Simons 61b1ef496f haskell-bindings-GLFW has been fixed upstream. 2015-03-21 19:44:12 +01:00
Peter Simons 446f301078 hackage-packages: re-generate from Hackage 2015-03-20T11:29:46+0100 2015-03-21 19:44:12 +01:00
Peter Simons 5c268bca2e haskell-locators test suite is broken. 2015-03-21 19:44:12 +01:00
Michael Raskin c64b5270fe update luarocks 2015-03-21 21:29:39 +03:00
Michael Raskin 0d2a00fdee update lush 2015-03-21 21:29:38 +03:00
Thomas Tuegel 0451646382 Merge branch 'cmake32'
Packages that use CMake and depend on OpenSSL should use CMake 3.2 or later.
2015-03-21 12:34:48 -05:00
Thomas Tuegel a17535822a kf57: use cmake-3.2
Build was broken by openssl update because older cmake could not parse
openssl's version correctly.
2015-03-21 12:33:31 -05:00
Thomas Tuegel 7e21c519ba add cmake-3.2.1
Earlier versions of CMake have a bug in their OpenSSL version detection code.
2015-03-21 12:32:38 -05:00
Thomas Tuegel 19a4fc2b46 add jsoncpp-1.6.0
dependency of cmake-3.2
2015-03-21 12:32:12 -05:00
Jaka Hudoklin f953d77be2 Revert "Reverts a bunch of commits as a try to fix GC errors."
This reverts commit 1e4ba025c2.

Conflicts:
	pkgs/development/web/nodejs/build-node-package.nix
2015-03-21 17:49:37 +01:00
Arseniy Seroka 37c95d6a48 Merge pull request #6909 from johbo/libatopic_ops
libatomic_ops: Allow on all unix platforms
2015-03-21 13:48:19 +03:00
Vincent Laporte 0f2509a52d ocaml-batteries: update from 2.2.0 to 2.3.1 2015-03-21 10:04:15 +01:00
Vincent Laporte 4c8681fea1 Adds ocaml-qtest-2.0.1
Inline test extraction utility for OCaml, originally developed
internally for Batteries

Homepage: https://github.com/vincent-hugot/iTeML
2015-03-21 10:04:14 +01:00
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
Johannes Bornhold c30b11c776 libatomic_ops: Allow on all unix platforms 2015-03-20 14:31:54 +01: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
Austin Seipp 9b41cf0281 nixpkgs: arcanist 20150118 -> 20150318
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-03-19 17:46:24 -05:00
Vladimír Čunát cd97c58110 openssl_1_0_1j: fix after updating the main version 2015-03-19 20:28:35 +01:00
Vincent Laporte 20b150b26c Adds ocaml-dolog-1.0
dolog is a minimalistic lazy logger in OCaml

Homepage: https://github.com/UnixJunkie/dolog
2015-03-19 19:14:18 +01:00
Vincent Laporte d52b6f1d3e ocaml-re: update from 1.3.0 to 1.3.1 2015-03-19 19:14:15 +01:00
Peter Simons afb0874e06 hackage-packages.nix: re-generate from Hackage 2015-03-19T13:39:37+0100 2015-03-19 17:55:19 +01:00
Eelco Dolstra 2fe351c7e3 openssl: Update to 1.0.1m
Fixes various "Moderate" / "Low" CVEs:
http://openssl.org/news/secadv_20150319.txt
2015-03-19 15:57:17 +01:00
Joachim Fasting 0e52c562b5 RAppArmor: use AppArmor 2.9 2015-03-19 14:14:28 +01:00
Peter Simons 5a2fd23b8a Merge pull request #6896 from NixOS/revert-6886-fix/vlc
Revert "VLC wants a newer version of libdvdnav".
2015-03-19 13:34:35 +01:00
Mateusz Kowalczyk d56831a9af ghc: update link and version of 7.10 RC3 2015-03-19 12:33:11 +00:00
Peter Simons f30743b86b Revert "VLC wants a newer version of libdvdnav" 2015-03-19 13:19:17 +01:00
Robin Bate Boerop 91004a3485 Merge branch 'Sqitch' into sqitch-pg 2015-03-19 08:11:31 -03:00
lethalman 515bd937f9 Merge pull request #6868 from lancelotsix/add_checkbashisms
Add checkbashisms package
2015-03-19 10:42:00 +01:00
Peter Jones 05d6d77c8e VLC wants a newer version of libdvdnav
* Updated libdvdnav/libdvdread to latest versions

  * Removed libdvdnav patches since they have been incorporated into the
    latest release

  * Added `--enable-dvdnav` configure flag to VLC to ensure that if this
    happens again VLC will fail to build
2015-03-18 14:37:12 -06:00
Lancelot SIX 7bf0458cb6 Add checkbashisms package 2015-03-18 21:03:30 +01:00
Vladimír Čunát 105f933f64 ffmpeg: add new branch 2.6.1 (no switching yet)
/cc maintainers @codyopel, @fuuzetsu.

Release notes don't indicate any new options or dependencies.
http://git.videolan.org/?p=ffmpeg.git;a=blob;f=RELEASE_NOTES;hb=release/2.6
APIchanges looks like we should be able to replace 2.5 by 2.6
without anything breaking (belongs to staging and needs some testing).
2015-03-18 18:10:26 +01:00
Robin Bate Boerop a3a98d7242 Improved builder for Sqitch 2015-03-18 10:32:46 -03:00
Jaka Hudoklin b5298683aa Add chef-dk 2015-03-18 14:17:25 +01:00
Jaka Hudoklin 17b9405685 bundlerEnv: add support for additional build inputs 2015-03-18 14:15:50 +01:00
Peter Simons 3f45fe100a haskell-bindings-GLFW is broken (and has been for quite a while). 2015-03-18 13:31:33 +01:00
Peter Simons 5cdd855938 haskell-lens: update to 4.8 2015-03-18 13:31:33 +01:00
Peter Simons 25f4f78c92 haskell-mysql: fix build 2015-03-18 12:13:43 +01:00
Peter Simons fe8d65c9a6 Add required overrrides for haskell-hosc and haskell-tidal-midi.
Fixes https://github.com/NixOS/nixpkgs/issues/6864.
2015-03-18 12:13:43 +01:00
Peter Simons 53fa11398c hackage-packages.nix: re-generate from Hackage 2015-03-17T11:52:35+0100 2015-03-18 12:13:43 +01:00
Domen Kožar e61f23d89f Fix a bad revert at 1e4ba025c2 2015-03-18 11:50:19 +01: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
lethalman 59e3226d27 Merge pull request #6866 from benley/iojs
iojs: Fix update script, update iojs
2015-03-18 10:42:40 +01:00