Commit Graph
37780 Commits
Author SHA1 Message Date
Thomas Tuegel b692340441 openblas: fix build on i686 2015-02-26 06:44:03 -06:00
Peter Simons cec683b791 hackage-packages: re-generate from Hackage 2015-02-25T21:27:32+0100 2015-02-26 11:34:14 +01:00
Vincent Laporte de3924a1a8 Adds ocaml-asn1-combinators
An OCaml library of combinators for expressing ASN.1 grammars.

Homepage: https://github.com/mirleft/ocaml-asn1-combinators
2015-02-26 08:35:05 +01:00
Adam Vogt f8d0a412d6 update cran packages 2015-02-25 17:50:42 -05:00
Adam Vogt 8365753a43 let generate-cran-packages.R read checksums from cran-packages.nix
this lets "Rscript generate-cran-packages.R > cran-packages.nix"
complete much quicker, because we only have to download packages
with new versions.
2015-02-25 17:43:43 -05:00
Peter Simons fffcb14e06 haskell-highlighting-kate: make build work without patching 2015-02-25 20:40:11 +01:00
Peter Simons d6c295e469 Merge remote-tracking branch 'origin/master' into staging. 2015-02-25 20:18:28 +01:00
Peter Simons 3021f2f529 haskell-generic-builder: update and jailbreak cabal files before patchPhase is run
The updated and jailbroken Cabal file must be in place before the
'patchPhase' hook is run, otherwise we cannot use that hook to patch the
Cabal file! Resolves https://github.com/NixOS/nixpkgs/issues/5922.

As an added bonus, this change makes the "jailbreakPhase" obsolete.
2015-02-25 20:15:26 +01:00
Peter Simons d732039ecc haskell-generic-builder: set LOCALE_ARCHIVE only on Linux 2015-02-25 19:49:39 +01:00
Peter Simons 5ea3b3e36f haskell-generic-builder.nix: don't add lib64 directories to the search path
Packages that provide 32 and 64-bit libraries in the same store path are rare
and usually require manual overrides anyway. It seems pointless to try and
guess proper settings for them. The effect is that we'll end up with bogus
settings that take more effort to correct that it takes to configure proper
settings in the first place. Point in case: haskell-cuda and it's configuration
for "cudatools".

Fixes https://github.com/NixOS/nixpkgs/issues/6564.
2015-02-25 19:42:42 +01:00
Peter Simons aaf09cd216 haskell-cuda: jump through hoops to make this build succeed
The package has undeclared dependencies on 'nvidia_x11' and 'cudatoolkit', the
latter of which also comes with a non-standard directory layout that our
builder cannot handle without help. Last but not least, the build hard-codes
impure search paths like /usr/local/cuda that need to be patched out.

Resolves https://github.com/NixOS/nixpkgs/issues/6562.
2015-02-25 16:52:02 +01:00
Domen Kožar 61c3aa5047 python: 3.4.2 -> 3.4.3 2015-02-25 15:21:14 +01:00
Peter Simons 2ce047165a hackage-packages.nix: re-generate from Hackage 2015-02-25T12:26:26+0100 2015-02-25 14:11:17 +01:00
Domen Kožar f4acbf30f2 Revert "Fix eval"
This reverts commit 6afc1907c8.

Not needed anymore after revert at
b653e3f661
2015-02-25 09:43:25 +01:00
Domen Kožar 9214859fd2 Revert "Mark many packages (mostly python) broken because of broken dependencies."
This reverts commit bf86758a42.

See 71a9aa10ca25f5659a657d8910e11f36c3439a36
2015-02-25 09:23:31 +01:00
Domen Kožar 67f9edc98e Revert "python-packages.nix: updated 'disabled' attributes to reduce the number of evaluation errors in http://hydra.nixos.org/jobset/nixpkgs/trunk#tabs-errors"
This reverts commit a250e9b908.

See 71a9aa10ca25f5659a657d8910e11f36c3439a36
2015-02-25 09:23:31 +01:00
Domen Kožar b653e3f661 Revert "python-generic: set meta.broken for disabled packages instead of raising an error during evaluation"
This reverts commit 79a5fec9c0.

meta.broken uses 'throw' under the hood so it can not improve the
current situation. Reverting to previous behaviour gives us correct
error message to the user indicating that interpreter is not supported.

Correcting Hydra output is out of scope of Python packaging.
2015-02-25 09:23:31 +01:00
Vincent Laporte b6d8d57905 libharu: update from 2.2.1 to 2.3.0 2015-02-25 08:46:57 +01:00
codyopel e29b0da9c7 remove stdenv.isBSD 2015-02-24 22:15:51 -05:00
Mateusz Kowalczyk cc4a5073e2 Resurrect openjpeg 2.0.x and use it for mupdf
mupdf doesn't compile with 2.1 due to API changes

cc @codyopel who made the openjpeg update
2015-02-25 01:50:06 +00:00
Peter Simons 7cc7e9b64a haskell-haxr has been fixed. 2015-02-24 23:29:58 +01:00
Peter Simons 27e37a11d1 haskell-ng: update Cabal to version 1.22.1.1 and binary to version 0.7.4.0 2015-02-24 23:29:58 +01:00
Peter Simons 475097ace1 hackage-packages: re-generate from Hackage 2015-02-24T12:08:55+0100 2015-02-24 23:29:58 +01:00
vbgl 8300898f98 Merge pull request #6533 from michelk/gdal_1.11.2
gdal: update to 1.11.2
2015-02-24 22:45:50 +01:00
William A. Kennington III 51b7fe53fa libinput: 0.10 -> 0.11 2015-02-24 11:52:19 -08:00
William A. Kennington III dbaf941212 Merge pull request #6422 from codyopel/libinput
libinput: refactor & add optional dependencies
2015-02-24 11:47:45 -08:00
Pascal Wittmann c639b834c2 groovy: update from 2.4.0 to 2.4.1 2015-02-24 19:04:23 +01:00
Pascal Wittmann 48add86c05 groovy: update homepage 2015-02-24 19:04:23 +01:00
Eelco Dolstra 843f21fd6a nss: Update to 3.17.4 2015-02-24 18:50:04 +01:00
Eelco Dolstra 3facd6b66d sqlite: Update to 3.8.7.4 2015-02-24 18:42:16 +01:00
Peter Simons a250e9b908 python-packages.nix: updated 'disabled' attributes to reduce the number of evaluation errors in http://hydra.nixos.org/jobset/nixpkgs/trunk#tabs-errors 2015-02-24 15:23:45 +01:00
Luca Bruno bf521d7b55 Add setup-hook to hicolor_icon_theme 2015-02-24 14:09:31 +01:00
codyopel ac2ed3818c libinput: refactor & add optional dependencies 2015-02-24 02:39:31 -05:00
Michel Kuhlmann 3e87b82fe2 gdal: enabling geos
In order to use ogr2ogr for clipping, this options needs to be
enabled.
2015-02-24 08:35:34 +01:00
William A. Kennington III ee41f35c40 Merge pull request #6490 from codyopel/openjpegbr
openjpeg: refactor to generic, add 1.x & 2.0.0 -> 2.1.0
2015-02-23 22:02:56 -08:00
Nathaniel Baxter 0be8418275 libvirt: update from 1.2.9 to 1.2.12
libvirt-glib: update from 0.1.9 to 0.2.0
pythonPackages.libvirt: update from 1.2.9 to 1.2.12

Potentially fixes CVE-2014-7823 CVE-2015-0236
2015-02-23 20:09:54 +01:00
Bjørn Forsman 6afc1907c8 Fix eval
Fixes this:

$ nix-env -f . -qa \* --meta --xml --drv-path --show-trace >/dev/null
...
error: while querying the derivation named ‘pypy2.5-graph-tool-2.2.36’:
while evaluating the attribute ‘preConfigure’ of the derivation ‘pypy2.5-graph-tool-2.2.36’ at "/home/bfo/nixpkgs/pkgs/development/python-modules/graph-tool/2.x.x.nix":5:3:
attribute ‘sitePackages’ missing, at "/home/bfo/nixpkgs/pkgs/development/python-modules/graph-tool/2.x.x.nix":22:54
2015-02-23 19:45:05 +01:00
Jaka Hudoklin 97ea4ab54e nodePackages: add namePrefix parameter to override package name prefix 2015-02-23 14:27:38 +01:00
Peter Simons bf86758a42 Mark many packages (mostly python) broken because of broken dependencies. 2015-02-23 14:06:24 +01:00
Peter Simons 524e184c68 haskell-ng: fix crf-chain1-constrained and crf-chain2-tiers 2015-02-23 13:46:04 +01:00
Peter Simons 921eadb2ad haskell-hspec-webdriver does not compile. 2015-02-23 13:46:04 +01:00
Peter Simons ad56a5c124 haskell-haxr doesn't compile. 2015-02-23 13:46:04 +01:00
Peter Simons 347969c671 haskell-buffer-builder and haskell-language-lua have been fixed. 2015-02-23 13:46:04 +01:00
Peter Simons b1dd0a0db5 haskell-dbmigrations: build has been has been fixed
But the test suite requires a running PostgreSQL server.
2015-02-23 13:46:04 +01:00
Peter Simons a88d2eeb3a hackage-packages.nix: re-generate from Hackage 2015-02-23T11:43:03+0100 2015-02-23 13:46:04 +01:00
lethalman a5a424bbce Merge pull request #6530 from sheganinans/master
Ur/Web version bump
2015-02-23 13:31:32 +01:00
Jaka Hudoklin b2fdcf801c nodePackages: add platform support, fix a lot of bugs 2015-02-23 13:29:50 +01:00
Jaka Hudoklin 60993d7716 nodePackages: prefix packages based on interpreter name 2015-02-23 13:29:50 +01:00
Jaka Hudoklin 284046cebc Merge pull request #6510 from offlinehacker/pkgs/libsass/add
Add libsass
2015-02-23 13:07:11 +01:00
Nikolay Amiantov 68ed035798 Merge pull request #6506 from nathanielbaxter/dev/libbluray
libbluray: fix aacs support
2015-02-23 14:17:41 +03:00