Commit Graph

22226 Commits

Author SHA1 Message Date
Michael Raskin
f33979461d Merge pull request #5815 from eduarrrd/3dfsb
Add 3dfsb
2015-01-19 09:20:08 +03:00
Brian McKenna
8c66a5e8c0 Enable experimental for gst-plugins-good
This enables v4l2sink, a way of piping input into v4l2loopback. This is
useful for using a phone camera as a webcam, for example.
2015-01-18 22:46:50 -07:00
Eduard Bachmakov
825f976b27 Add package: SDL_stretch-0.3.1
Added in preparation for 3dfsb.
2015-01-18 22:22:17 -05:00
Domen Kožar
1cd6cb2d6d Merge pull request #5834 from Ralith/libuv
libuv: pkgconfig
2015-01-19 01:22:45 +01:00
Charles Strahan
673fccf505 ruby: new bundler approach 2015-01-18 18:47:28 -05:00
Benjamin Saunders
c6269eb0d8 libuv: pkgconfig 2015-01-18 22:24:16 +01:00
Michael Raskin
47f0784985 Fix license reference 2015-01-18 23:53:15 +03:00
Krzysztof Starecki
87862a003b Add spatialite-tools and its missing dependency (readosm) 2015-01-18 23:51:14 +03:00
Michael Raskin
eee450779e Remove strange reference to coffee-script with two versions 2015-01-18 23:29:07 +03:00
Markus Kohlhase
73c966534a updated to v0.1.6 2015-01-18 23:23:50 +03:00
Markus Kohlhase
cfb9e8b94d added sloc v0.1.5 2015-01-18 23:23:50 +03:00
Peter Simons
486ee12f77 Merge pull request #5818 from purefn/master
disable tests on haskellngPackages.http-media and jwt
2015-01-18 21:17:33 +01:00
Richard Wallace
a5a27d3949 disable checking on haskellngPackages.jwt 2015-01-18 13:09:13 -07:00
Domen Kožar
652cfc36e9 python2.6: add a patch to fix parallel make failure
(cherry picked from commit 23a202519cb1d8704a0b4294d8d13a224efb1a74)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-01-18 19:20:07 +01:00
Pascal Wittmann
e4294c27e0 mujs: update to latest commit 2015-01-18 18:42:01 +01:00
Johannes Bornhold
51b4ce18f4 dub: Add dub to interact with the D package registry 2015-01-18 18:32:46 +01:00
Michael Raskin
2bf8920ac0 Sodium: 1.0.1 -> 1.0.2 2015-01-18 18:20:09 +03:00
Michael Raskin
da8828f5cf Botan (unstable): 1.11.12 -> 1.11.13 2015-01-18 18:20:09 +03:00
Michael Raskin
5c9df93376 Allegro 5 (stable): 5.0.10 -> 5.0.11 2015-01-18 18:20:09 +03:00
Peter Simons
35e5f59aee Cabal-1.22.0.0: fix build with GHC 7.2.2 2015-01-18 12:58:31 +01:00
Peter Simons
380114738f haskell-ng: rename "noHaddock" attribute to "doHaddock"
This makes the attribute (a) consistent with "doCheck" and friends and (b)
avoids the double negation "noHaddock = false" meaning "doHaddock = true".

Fixes https://github.com/NixOS/cabal2nix/issues/63.
2015-01-18 12:58:31 +01:00
Peter Simons
8c833f2a12 hackage-packages.nix: re-generate from Hackage 2015-01-18T10:18:52+0100 2015-01-18 12:58:31 +01:00
Domen Kožar
de9f27b07d remove biolib 2015-01-18 11:52:00 +01:00
Domen Kožar
029dae30ac Merge pull request #5696 from mdesantis/ruby-2.2.0-package
Add Ruby 2.2.0 package
2015-01-18 11:41:03 +01:00
Jos van den Oever
35cce01afa Update to 1.29.3. 2015-01-18 11:17:49 +01:00
Richard Wallace
7abfc12a9a disable tests on http-media 2015-01-17 16:49:16 -07:00
Michael Raskin
4a8feb5792 Update CLX 2015-01-18 01:58:20 +03:00
Peter Simons
ce06d504bb cabal2nix-2.x: bump to latest version 2015-01-17 23:43:27 +01:00
Peter Simons
3274e5cad2 hackage-packages: disable all Hydra builds have never succeeded 2015-01-17 23:40:09 +01:00
Peter Simons
703bf2978d haskell-unordered-containers: fix build with GHC 7.4.2 2015-01-17 20:29:00 +01:00
Peter Simons
51457dd687 haskell-primitive: fix build with GHC 7.4.2 2015-01-17 20:29:00 +01:00
Peter Simons
3dae215667 haskell-utf8-string: fix build on GHC 6.12.x 2015-01-17 20:29:00 +01:00
Peter Simons
a317a4ae11 haskell-configuration-ghc-7.8.x: cosmetic changes to amazonka environment 2015-01-17 20:29:00 +01:00
Peter Simons
7c1eae89f0 hackage-packages.nix: update from Hackage 2015-01-17T11:39:27+0100 2015-01-17 20:29:00 +01:00
Peter Simons
20560e667a Remove obsolete, broken, and unnecessary versions of GHC.
These versions have been removed:

 - 6.4.2-binary.nix
 - 6.4.2.nix
 - 6.6.1.nix
 - 6.8.2.nix
 - 6.8.3.nix
 - 6.10.1-binary.nix
 - 6.10.1.nix
 - 6.10.2.nix
 - 6.10.3.nix
 - 6.11.nix
 - 6.12.1-binary.nix
 - 6.12.1.nix
 - 6.12.2.nix
 - 7.0.1.nix
 - 7.0.2.nix
 - 7.0.3.nix
 - 7.2.1.nix
 - 7.4.1.nix
 - 7.6.1.nix
 - 7.6.2.nix
 - 7.8.3-binary.nix

As a rule of thumb, we keep the latest version in every major release. If
someone feels up to the task of fixing versions 6.4.x, 6.6.x, and 6.8.x, then
please don't hesitate to revive those builds.

Fixes https://github.com/NixOS/nixpkgs/issues/5630.
2015-01-17 20:29:00 +01:00
Peter Simons
54bbfd5440 haskell-generic-builder: re-factor for improved modularity 2015-01-17 20:29:00 +01:00
Peter Simons
e6ecb1fb83 haskell-ng: enable package sets for GHC 6.12.3, 7.0.4, 7.2.2, and 7.4.2 2015-01-17 20:29:00 +01:00
Peter Simons
d1fc5370e9 ghc: pass explicit 'ncurses' path to ./configure instead of finding through the environment
Fixes https://github.com/NixOS/nixpkgs/issues/5616. For real this time!
2015-01-17 20:29:00 +01:00
Tobias Geerinckx-Rice
6b957783a5 libnetfilter_conntrack: propagate buildInput libnfnetlink 2015-01-17 18:38:56 +01:00
Tobias Geerinckx-Rice
4d6c69d9bf Add libcli 1.9.7: emulate a Cisco-telnet-style command line 2015-01-17 15:48:54 +01:00
Domen Kožar
a4e3393050 matplotlib: be consistent 2015-01-17 15:24:54 +01:00
Domen Kožar
64e9e827b1 Merge pull request #5785 from flosse/openbr
nixpkgs: new: openbr v0.5
2015-01-17 15:21:42 +01:00
Domen Kožar
c222352cf8 Merge pull request #5795 from pmahoney/skarnet-2015-01-14
Skarnet release 2015-01-14
2015-01-17 15:21:27 +01:00
Domen Kožar
0f82c6bdb2 matplotlib: add optional gtk3 backend, fixes #4500 2015-01-17 15:11:24 +01:00
Robert Helgesson
0c27d37495 Remove some matplotlib optional backends.
The removed ones are not certain to work at the moment.
2015-01-17 14:24:49 +01:00
Robert Helgesson
c8d0d91db1 Add optional backends to matplotlib. 2015-01-17 14:24:49 +01:00
Domen Kožar
9a33fbb52d python: don't propagate installed packages into userenv, refs #4949
Propagation is not needed anymore, as we have more powerful apis today
than this dirty hack. See nix-shell tool and python.buildEnv function
in nixpkgs manual.
2015-01-17 14:19:29 +01:00
Domen Kožar
c611f5837c fix gevent/eventlet on python 2.7.9, fixes #5782 2015-01-17 14:15:18 +01:00
Edward Tjörnhammar
2594999ced ihaskell: fix path to installedconf in wrapper 2015-01-17 01:26:18 +01:00
Peter Simons
5d91f7f47f Merge pull request #5762 from boothead/master
Haskell: Bump 'mvc' to 1.0.3
2015-01-16 22:32:43 +01:00
Peter Simons
39746cb02d haskell-ChasingBottems: fix build with GHC 7.6.x 2015-01-16 21:01:24 +01:00
Michael Raskin
1e0d2a96b3 Bump allowed Firefox version for SlimerJS again, and with some reserve... 2015-01-16 12:18:38 +03:00
Peter Simons
7397bb8d63 Merge pull request #5788 from abbradar/yesod-pagination
yesod-pagination: add Haskell package
2015-01-16 09:50:35 +01:00
Peter Simons
ac82dd8233 Merge pull request #5792 from gridaphobe/darwin-haskell-ng
Haskell-ng: don't use cpphs by default on darwin
2015-01-16 09:48:25 +01:00
Cray Elliott
db85ee9e77 Add haskellngPackages.cabal2nix missing dependencies
added QuickCheck, deepseq-generics and hspec
2015-01-15 21:04:00 -08:00
Charles Strahan
9ad38ec322 ruby: allow for overriding the src 2015-01-15 20:58:05 -05:00
Oliver Charles
415b32311f hackage-packages.nix: re-generate from Hackage 2015-01-15T22:40:10+00:00 2015-01-15 22:40:21 +00:00
Patrick Mahoney
cbd1b0ec1f skalibs: update to 2.2.0.0 2015-01-15 16:07:42 -06:00
Eric Seidel
ed1ca3928d don't use cpphs by default on darwin 2015-01-15 13:40:04 -08:00
koral
90658e62a4 either: 4.3.2 -> 4.3.2.1 2015-01-15 21:56:57 +01:00
koral
e484d90745 lifted-base: 0.2.3.1 -> 0.2.3.3 2015-01-15 21:43:37 +01:00
koral
6ba730d481 lifted-async: 0.2.0.2 -> 0.6.0.1 2015-01-15 21:43:37 +01:00
koral
82aeda6d6b monad-control: 0.3.3.0 -> 1.0.0.1 2015-01-15 21:43:36 +01:00
Nikolay Amiantov
b2a6fd6059 yesod-pagination: add Haskell package 2015-01-15 22:26:41 +03:00
Peter Simons
f93ce4faf1 haskell-configuration-common: remove redundant jailbreaks 2015-01-15 19:03:47 +01:00
Markus Kohlhase
daf75aae57 nixpkgs: new: openbr v0.5 2015-01-15 15:57:04 +00:00
Oliver Charles
d5f63e9626 haskellngPackages.th-desugar: Remove doJailbreak
Latest version builds without needing to jailbreak.
2015-01-15 14:54:15 +00:00
Oliver Charles
08d9755acb haskellngPackages.snaplet-redis: Remove doJailbreak
Now handled by hackage2nix
2015-01-15 14:53:25 +00:00
Oliver Charles
e259b1ed94 haskellngPackages.stripe: Remove doJailbreak
0.8.3 does not need to be jailbroken.
2015-01-15 14:51:44 +00:00
Oliver Charles
ef296fa407 haskell-ng.snaplet-stripe: Remove doJailbreak
Now done automatically by hackage2nix
2015-01-15 14:50:55 +00:00
Oliver Charles
2b63483bd5 haskellngPackages.fb: Update patch 2015-01-15 14:26:06 +00:00
Oliver Charles
1d4098dd03 Haskell: correct sha256 for tasty-ant-xml
For some reason hackage2nix always outputs `nil`.

CC @peti
2015-01-15 14:15:13 +00:00
Oliver Charles
0305f3b797 hackage-packages.nix: re-generate from Hackage 2015-01-15 14:11:26+00:00 2015-01-15 14:11:32 +00:00
Vincent Laporte
1fd73de1d4 Lua4: adds branch information 2015-01-15 10:28:40 +01:00
Peter Simons
0e6fd630a4 hackage-packages.nix: drop hard-coded configureFlags and add automatic jailbreaks
The new version of hackage2nix adds an automatic jailbreak=true attribute to
all builds that are known to fail because of unsatisfied dependency version
constraints. Of course, hackage2nix is only able to detect these problems for
the default package set -- "haskellngPackages" -- that's built with GHC 7.8.4.
It cannot know problems that might arise if you build a package with a
different version of GHC, which comes with different versions of the core
libraries. This change "fixed" 806 builds: http://hydra.cryp.to/eval/85620.

Please pay attention to possible jailbreaks when reporting build errors
upstream! If a build was run with jailbreaking enabled, the build log says

 | Running jailbreak-cabal to lift version restrictions on build inputs.

at the very top. Upstream bug reports about build errors should contain that
information, i.e. the package author should know that you're building with
different (newer!) library versions than they're specifying.

Furthermore, build expressions no longer contain an explicit list of every
Cabal flag setting. Instead, we trust that Cabal figures out an appropriate
configuration at build time. This makes the build expressions more space to
adapt to different configuration at the cost of being slightly less
deterministic.
2015-01-15 10:15:13 +01:00
Peter Simons
02caf57cee jailbreak-cabal: build with Cabal 1.18.x on GHC 7.6.x 2015-01-15 10:15:11 +01:00
Peter Simons
ee158bf659 Cabal-1.18.x: remove unnecessary jailbreak 2015-01-15 10:15:11 +01:00
Peter Simons
5bb103b4b2 haskell-vector: fix test suite on i686 2015-01-15 10:15:10 +01:00
Peter Simons
841b829fcd haskell-ng: bump cabal2nix to latest Git version 2015-01-15 10:15:10 +01:00
Peter Simons
e8b14bd783 hackage-packages.nix: update from Hackage 2015-01-14T14:28:46+0100 2015-01-15 10:15:10 +01:00
Charles Strahan
1a1e6cfc04 ruby: various fixes 2015-01-14 21:19:53 -05:00
Pascal Wittmann
e38c351f2b Merge pull request #5774 from j-keck/scala_2.11.5
scala: update to 2.11.5
2015-01-15 01:10:59 +01:00
j-keck
67fc5b509a scala: update to 2.11.5 2015-01-15 00:11:14 +01:00
Peter Simons
1912736a86 ghc-7.8.4: re-implement "fix build on Darwin" to avoid re-builds on Linux
Originally, I thought that I can commit a "clean" patch -- even if it
triggers re-builds -- because those re-builds were triggered by the
ncurses patch to GHC anyway . That patch had to be reverted, though, so
now I'm rewriting this patch to avoid re-builds on Linux.

What a mess. :-(
2015-01-15 00:06:06 +01:00
Pascal Wittmann
116fc8afc4 yodl: update from 3.04.00 to 3.05.00 2015-01-14 23:58:17 +01:00
Peter Simons
df76eb1268 ghc: revert "propagate 'gmp' and 'ncurses' to ensure users can link the 'haskeline' library, etc."
I thought that [1] could be fixed by ensuring that ncurses is available in the
environment (because ghc exports it as a propagateBuildInput), and indeed that
change fixed *some* build failures we've had before. However, the same error
still occurs with other packages, like hledger [2] and Agda [3]. Frankly, I
have no idea why those packages fail and others don't. But clearly the fix was
inadequate, so I'm reverting commit a8076c76.

[1] https://github.com/NixOS/nixpkgs/issues/5616
[2] http://hydra.cryp.to/build/372451/nixlog/1/raw
[2] http://hydra.cryp.to/build/373161/nixlog/1/raw
2015-01-14 22:24:33 +01:00
William A. Kennington III
26e275398e gperftools: 2.3 -> 2.4 2015-01-14 13:22:31 -08:00
Peter Simons
ee62982af7 Merge pull request #5679 from nkaretnikov/yesod-markdown
New Haskell package: yesod-markdown
2015-01-14 20:03:14 +01:00
Georges Dubus
c2f8791e83 pypy: added patch to fix build with gcc 4.9.2 2015-01-14 16:02:08 +01:00
Oliver Charles
5b70a64286 haskell-ng.fb: Apply a patch to use monad-control >= 1.0.0
Manually applying the patch at
https://github.com/prowdsponsor/fb/pull/33
2015-01-14 14:10:34 +00:00
Oliver Charles
0059182821 snaplet-stripe: Jailbreak
Necessary until https://github.com/LukeHoersten/snaplet-stripe/pull/4 is
merged and released.
2015-01-14 13:54:16 +00:00
Oliver Charles
dd0bde0b3b haskell-ng.stripe: Jailbreak
Necessary until https://github.com/michaelschade/hs-stripe/pull/37 is
merged and released.
2015-01-14 13:51:49 +00:00
Oliver Charles
3dbb43e62e haskell-ng.snaplet-redis: Jailbreak
Necessary until https://github.com/dzhus/snaplet-redis/pull/11 is merged and released.
2015-01-14 13:47:38 +00:00
Oliver Charles
9c71a83fd1 haskellng.th-desugar: Don't run the tests
Tests fail to build, see
https://github.com/goldfirere/th-desugar/issues/21
2015-01-14 13:40:11 +00:00
Pascal Wittmann
8d322e0fee checkstyle: update from 6.1.1 to 6.2 2015-01-14 14:23:47 +01:00
Georges Dubus
0ca664e996 gusb: fixed build, updated to 0.2.4 2015-01-14 13:39:39 +01:00
Oliver Charles
06cfa238df hackage-packages.nix: re-generate from Hackage 2015-01-14T12:32:30+00:00 2015-01-14 12:32:35 +00:00
Peter Simons
a8076c7654 ghc: propagate 'gmp' and 'ncurses' to ensure users can link the 'haskeline' library, etc.
Fixes https://github.com/NixOS/nixpkgs/issues/5616.
2015-01-14 11:24:59 +01:00
Eric Seidel
a92afcd34a ghc-7.8.4: fix build on Darwin
https://github.com/NixOS/nixpkgs/pull/5746
2015-01-14 11:24:59 +01:00
Peter Simons
1b50c50432 r-modules: enable packages that were broken by the missing gdal dependency 2015-01-14 11:24:28 +01:00
Peter Simons
30904c7789 hackage-packages.nix: re-generate from Hackage 2015-01-14T09:34:03+0100 2015-01-14 11:24:16 +01:00
Vincent Laporte
0a0b46a9b0 ocp-indent: fix installation 2015-01-14 10:22:35 +01:00
Charles Strahan
aaa2e9705a ruby: cache gem files 2015-01-14 04:20:50 -05:00
Ben Ford
5ff81fd0ae Haskell: Bump 'mvc' to 1.0.3 2015-01-14 08:26:22 +00:00
Benjamin Staffin
b3d33d398c gdal: fix the build
Commit 28b6fb61e6 added explicit CC and
CXX assignments in pkgs/build-support/gcc-wrapper/setup-hook.sh.
That breaks the gdal python extension build somehow, presumably by
confusing libtool.

This appears to revert gdal to building with g++ and gcc (on linux at
least), but at least it builds this way.

Change-Id: I83fb78daa9314dc60c4f635d3f1e937a90349b8a
2015-01-13 23:46:26 -08:00
Benjamin Saunders
0351b7a710 Add tup
Closes #5720
2015-01-14 01:37:44 -05:00
Charles Strahan
8d19679e7d Merge pull request #5635 from Ralith/libuv
Update libuv repository and add latest stable version
2015-01-14 01:16:18 -05:00
Charles Strahan
32bae8d09a bundler: update HEAD version 2015-01-14 01:13:51 -05:00
Charles Strahan
bab648c5b4 chruby: update to 0.3.9 2015-01-13 21:58:25 -05:00
Charles Strahan
3b524fe6c4 watchman: update to 3.0.0 2015-01-13 21:48:44 -05:00
Nikita Karetnikov
bbb304fbbd New Haskell package: yesod-markdown 2015-01-14 01:10:11 +03:00
Vladimír Čunát
ca1116d297 gst-plugins-good-0.10: add libsoup support (close #5749) 2015-01-13 22:56:00 +01:00
Peter Simons
c11f898e7e Merge pull request #4548 from echo-oddly/clash
new package: clash
2015-01-13 22:45:02 +01:00
Ludovic Courtès
41b53577a8 unmaintain a bunch of packages 2015-01-13 22:33:49 +01:00
Peter Simons
007628fd49 haskell-generic-builder: use cpphs pre-processor by default on Darwin
Allegedly, the cpp implementation of Clang is weird and causes errors.
2015-01-13 22:33:17 +01:00
Peter Simons
67312f83ad haskell-generic-builder: pass "--with-gcc=$CC" on Darwin to help Cabal find Clang
Suggested in https://github.com/NixOS/nixpkgs/pull/5746.
2015-01-13 22:33:01 +01:00
Peter Simons
ddf0804a87 ghc-7.8.3-binary: remove broken platforms
The source tarballs URLs and hashes for everything but x86_64-darwin
were just copied from the 7.0.4 binaries. That's not going to work. :-(
2015-01-13 21:25:14 +01:00
Peter Simons
d6ed34170d haskell-configuration-common: fix reference to optparse-applicative_0_10_0 2015-01-13 20:43:18 +01:00
Peter Simons
9da7482e87 haskell-configuration-common: minor cosmetic 2015-01-13 20:22:07 +01:00
vbgl
7c03e66ebe Merge pull request #5671 from aaronlevin/patch-1
Bump version of vinyl to 0.5
2015-01-13 20:19:16 +01:00
Tom Hunger
123039c22e haskellng: Make haskell-zeromq4 pick up the correct zeromq nix package. 2015-01-13 18:36:36 +00:00
Tom Hunger
381ba6b22f haskellng: disable safecopy's broken tests. 2015-01-13 18:00:01 +00:00
Tom Hunger
ffe05e7476 haskellng: Fix elm ecosytem by adding a few special cases. 2015-01-13 17:35:14 +00:00
Vladimír Čunát
995c9db5e6 openjdk: add platforms on darwin to fix #5634 2015-01-13 16:42:32 +01:00
Peter Simons
51b9c9b262 idris: fix build with GHC 7.8.x 2015-01-13 15:21:51 +01:00
Shea Levy
2ba3653ef6 Update hackage-packages
Includes NixOS/cabal2nix#127
2015-01-13 08:55:02 -05:00
Oliver Charles
20b1fd3fa4 Merge pull request #5710 from alpmestan/update-haskell-taggy
update the haskell taggy package to 0.1.3
2015-01-13 13:36:12 +00:00
Oliver Charles
9669b4a0e8 Merge pull request #5740 from alpmestan/add-haskell-sitemap
add the 'sitemap' haskell package
2015-01-13 13:35:56 +00:00
Oliver Charles
304819b3a3 haskellPackages.exhaustive: New expression 2015-01-13 13:25:37 +00:00
Vincent Laporte
b094768e99 Adds ocaml-gtktop
Gtktop is a small OCaml library to ease the creation of graphical
toplevels.

Homepage: http://zoggy.github.io/gtktop/
2015-01-13 14:17:56 +01:00
lethalman
01cf6fa04d Merge pull request #5722 from nckx/coan
coan: don't double-gzip man page
2015-01-13 14:14:07 +01:00
lethalman
19d6d436dc Merge pull request #5699 from pmahoney/fswatch
Fswatch
2015-01-13 14:12:43 +01:00
Peter Simons
e4a68f0b98 haskell-ng: add more tools to our help function library 2015-01-13 12:44:53 +01:00
Peter Simons
9489dac1d3 r-modules: update list of broken packages 2015-01-13 12:44:11 +01:00
Peter Simons
844828afad r-caret: update hash 2015-01-13 12:44:11 +01:00
Peter Simons
6b47d8c610 gdal: the build is broken on (at least) Linux
http://hydra.nixos.org/build/18650326/nixlog/1/raw
2015-01-13 12:44:11 +01:00
Peter Simons
f09fec34e9 r-skmeans: update hash 2015-01-13 12:44:11 +01:00
Peter Simons
d2d868534f r-OceanView: update hash 2015-01-13 12:44:11 +01:00
Alp Mestanogullari
126955d050 add the 'sitemap' haskell package 2015-01-13 12:04:21 +01:00
Vincent Laporte
7169b87664 Adds ocaml-lablgtk-extras
Lablgtk-extras is a collection of libraries and modules useful when
developing OCaml/LablGtk2 applications.

Homepage: http://gtk-extras.forge.ocamlcore.org/
2015-01-13 11:14:28 +01:00
Vincent Laporte
81b57bb8ef Adds ocaml-config-file
config-file is an OCaml library used to manage the configuration
file(s) of an application.

Homepage: http://config-file.forge.ocamlcore.org/
2015-01-13 09:46:48 +01:00
devhell
b7a5027547 libmediainfo: 0.7.71 -> 0.7.72 2015-01-13 00:42:55 -08:00
Shea Levy
9e114ccd26 haskellng: Make amazonka env externally visible 2015-01-12 18:13:40 -05:00
Shea Levy
3dc5be9ec5 More amazonka packages on 7.8 2015-01-12 20:58:57 +00:00
Shea Levy
67460ea19f haskellng: Fix amazonka-core on 7.8
Required adding a flag to the generic builder to build Setup.hs with
core packages even if there is an override in buildInputs, to break
circular dependencies.
2015-01-12 15:41:03 -05:00
Tobias Geerinckx-Rice
9b7a58e1f9 coan: don't double-gzip man page
`make install` gzips coan.1 with the wrong extension (.1). So Nix re-
compresses it. Result: coan.1.1.gz, and a screen full of gobbledygook.
2015-01-12 21:38:31 +01:00
Shea Levy
d30e9082bb D'oh 2015-01-12 12:20:42 -05:00
Shea Levy
3f714f32ac overrideCabal: Preserve overrideScope attr 2015-01-12 12:18:46 -05:00
Peter Simons
8e25e4e368 hackage-packages.nix: break infinite recursions and other evaluation errors 2015-01-12 16:35:15 +01:00
Peter Simons
2225b43bd4 hledger-web: test suite has been fixed 2015-01-12 16:35:14 +01:00
Peter Simons
36b5b900db haskell-modules-lib: add 'markBroken' helper function 2015-01-12 16:35:14 +01:00
Peter Simons
fecd280708 haskell-configuration-ghc-7.9.x: we can use a doctest release version now 2015-01-12 16:35:14 +01:00
Peter Simons
f7bca36c53 hackage-packages.nix: re-generate from Hackage 2015-01-12T10:33:40+0100 2015-01-12 16:35:14 +01:00
Shea Levy
e0b270efc9 Fix http-date build on ghc 7.10 2015-01-12 09:58:56 -05:00
Shea Levy
baa634cf18 Fix retry build on ghc 7.10 2015-01-12 09:46:35 -05:00
Shea Levy
2f5cd9ec85 haskell-chell: Fix for 7.10.1 2015-01-12 09:37:20 -05:00
Shea Levy
c972ea1e8c haskell-options: Fix for 7.10.1 2015-01-12 09:14:50 -05:00
Vladimír Čunát
9274093a34 uthash: new package
It's headers only. Newer fontforge needs it.
2015-01-12 13:43:30 +01:00
Jaka Hudoklin
b093220c5d Merge pull request #5724 from benmos/grafana-1.9.1
Upgrading Grafana 1.8.0-rc1 -> 1.9.1
2015-01-12 11:06:56 +01:00
Ben Moseley
80ab18f269 Upgrading Grafana 1.8.0-rc1 -> 1.9.1 2015-01-12 09:20:54 +00:00
Peter Simons
e6bd78e8e5 Merge pull request #5718 from ryantrinkle/master
Pull submodules of the ghcjs-boot repository recursively
2015-01-12 10:20:10 +01:00
Charles Strahan
96fd899fea capnproto: update to 0.5.0 2015-01-12 03:24:52 -05:00
Peter Simons
87eba920fa haskell-lib.nix: fix doCheck helper 2015-01-12 01:28:15 +01:00
Michael Raskin
9a6afa95c1 Re-add SBCL 1.2.5 --- for StumpWM compatibility 2015-01-12 02:11:13 +03:00
Ryan Trinkle
363259acec Pull submodules of the ghcjs-boot repository recursively
Without this, the result will not match the sha256 provided
2015-01-11 18:03:45 -05:00
Michael Raskin
ff800b4270 Julia: update OpenBLAS dependency version 2015-01-12 01:46:57 +03:00
Peter Simons
2f4dc089a9 haskell-ng: fix transformers-compat for GHC 7.6.x 2015-01-11 20:56:21 +01:00
Peter Simons
f49fa1f20b hackage-packages.nix: re-generate to fix ALUT 2015-01-11 20:56:21 +01:00
Peter Simons
4cd9c8c3ae haskell-ng: jailbreak AbortT-transformers to fix the build 2015-01-11 20:56:21 +01:00
Peter Simons
cfc2aeaa91 haskell-ng: disable ABList test suite to fix the build 2015-01-11 20:56:21 +01:00
Peter Simons
3e64a6e382 haskell-ng: fix 7.6.3 build of hashable 2015-01-11 20:56:21 +01:00
Peter Simons
921bb64a6d haskell-ng: fix old Cabal builds 2015-01-11 20:56:21 +01:00
Arseniy Seroka
88683589b4 Merge pull request #5706 from nckx/coan
Add coan: the C preprocessor chainsaw
2015-01-11 20:42:45 +03:00
Arseniy Seroka
01f5b79524 Merge pull request #5681 from Ericson2314/master
Remove `rust=rustc` alias,update racer
2015-01-11 20:41:58 +03:00
John Ericson
81bc099d48 Remove rust=rustc alias
I was asked to add this for backwards comparability when I renamed `rust`
to `rustc` and added `rustcMaster`. It has been a few months so I'd hope
deprecating this is acceptable.
2015-01-11 17:33:58 +00:00
Alp Mestanogullari
e5c6bff61d update the haskell taggy package to 0.1.3 2015-01-11 17:21:44 +01:00
Tobias Geerinckx-Rice
03e53af0f5 Add coan: the C preprocessor chainsaw 2015-01-11 15:21:26 +01:00
Michael Raskin
3452bc132f SBCL: 1.2.5 -> 1.2.7 2015-01-11 16:43:29 +03:00
Michael Raskin
bda8de6b63 Allegro 5 unstable: 5.1.8 -> 5.1.9 2015-01-11 16:43:29 +03:00
Peter Simons
bca9b8d867 haskell-generic-builder: make $shellHook in 'env' attribute more robust
In case our GHC environment is empty, the old code ended up running
'grep export' on a GHC binary, which doesn't seem like a good idea.
2015-01-11 11:59:47 +01:00
Peter Simons
dbb4012fdc haskell-generic-builder: add a helpful message that explains why it makes no sense to build an 'env' attribute 2015-01-11 11:39:16 +01:00
Domen Kožar
44912c2ac1 Merge pull request #5598 from brendanlong/go-1.4
go: Update to 1.4
2015-01-11 07:46:58 +01:00
Domen Kožar
6eaefa8c31 Merge pull request #5660 from Calrama/seafile
seafile: update client, ccnet, libsearpc and shared
2015-01-11 07:44:43 +01:00
Peter Simons
7fa32aecd1 haskell-cabal-test-quickcheck: fix build with GHC 7.8.4 2015-01-11 01:46:30 +01:00
Peter Simons
b31082d246 haskell-generic-builder: propagate build inputs only if we're building a library 2015-01-10 23:54:30 +01:00
Peter Simons
be8219e35b haskell-ng: disable broken ghcjs build 2015-01-10 23:36:59 +01:00
Peter Simons
2ff8d1940f haskell-configuration-*: polish compiler-specific overrides 2015-01-10 23:36:59 +01:00
Peter Simons
55003ca34b pkgs/development/haskell-modules/lib.nix: add funky helper function for overriding 2015-01-10 23:36:59 +01:00
Patrick Mahoney
41ca36e30c fswatch: new derivation 2015-01-10 15:10:16 -06:00
Patrick Mahoney
70e7b34470 gettext: add derivation for 0.19 series 2015-01-10 13:26:01 -06:00
Maurizio De Santis
5bcd29466e ruby: add 2.2.0 package 2015-01-10 19:25:37 +01:00
Maurizio De Santis
369f04ac96 ruby: update RVM patchsets 2015-01-10 19:25:12 +01:00
Peter Simons
7e2f1493b7 haskell-ng: update to jailbreak-cabal 1.2, which supports Cabal 1.22.x now 2015-01-10 18:50:49 +01:00
Daniel Beecham
b9a7380060 haskell-base-prelude: version bump 2015-01-10 18:43:20 +01:00
Daniel Beecham
66f7542f79 Merge branch 'master' of git://github.com/NixOS/nixpkgs 2015-01-10 18:38:07 +01:00
Shea Levy
e4c9a521ef haskellng: remove amazonka patches.
New amazonka was released.

@peti Long-term, is there a way to have hackage2nix warn about patched
packages?
2015-01-10 11:35:25 -05:00
Peter Simons
11ac18a6e6 haskell-ng: update cabal2nix snapshot 2015-01-10 15:55:47 +01:00
Peter Simons
89b5d9ee14 haskell-generic-builder: add an 'env' attribute to every Haskell expression that can be used with nix-shell to create an interactive build environment for this package
For example:

  nix-shell --pure ~/.nix-defexpr -A haskell-ng.packages.ghc784.hsdns.env
2015-01-10 15:55:47 +01:00
Peter Simons
f36973ce83 haskell-ng: Make ghcWithPackages available as ghc.withPackages, too. 2015-01-10 15:55:47 +01:00
Peter Simons
afca6145d4 haskell-generic-builder: simplify "package.conf.d" management
The builder creates a temporary package.conf.d database in $TMP that
contains everything required to build the current package (i.e. the
transitive closure of the package's propagated build inputs). These
files are no longer installed, however, we just install the package.conf
file for the package we're actually building. This means that
package.conf.d directory in $out won't have collisions anymore, which
simplifies the with-packages-wrapper.nix a bit.
2015-01-10 15:55:47 +01:00
Peter Simons
fa27f2af5b hackage-packages.nix: rebuild from Hackage 2015-01-10T13:56:15+0100 2015-01-10 15:55:47 +01:00
Peter Simons
cbca401a04 configuration-ghc-7.9.x: fix license attribute for doctest override 2015-01-10 15:55:46 +01:00
Moritz Ulrich
7aca9db47d dfu-programmer: Update to 0.7.1. 2015-01-10 14:41:11 +01:00
Moritz Ulrich
85dc90565f leiningen: Update to 2.5.1. 2015-01-10 14:38:45 +01:00
Georges Dubus
4067b5bff4 racer: fixed version 2015-01-10 14:25:54 +01:00
Vincent Laporte
571e196aba getdata: update from 0.8.5 to 0.8.6 2015-01-10 14:19:07 +01:00
Daniel Beecham
8dd2352dd0 Added haskell-web-routes-happstack 2015-01-10 14:11:22 +01:00
Peter Simons
2d83ff9f3e haskell-configuration-ghc-7.9.x: use current Git HEAD of doctest to fix lots of test suites 2015-01-10 11:31:04 +01:00
Peter Simons
60ecd42514 haskell-ng: add current Git version of cabal2nix to the package set
nix-env -iA haskellPackages.cabal2nix    ==> 1.x branch
  nix-env -iA haskellngPackages.cabal2nix  ==> 2.x branch
2015-01-10 11:31:04 +01:00
Jim Garrison
04729dd26a julia: 0.3.3 -> 0.3.5 2015-01-09 22:50:27 -08:00
Shea Levy
6e008f05ab haskellng: Get amazonka family building
amazonka-0.0.7 is broken, so I also updated hackage-packages after
applying NixOS/cabal2nix#119.
2015-01-09 19:03:27 -05:00
Shea Levy
60fec84379 Disable split testsuite on 7.10 2015-01-09 17:02:42 -05:00
Shea Levy
dd558e0baa Disable old-locale for aeson on 7.10
@peti why does hackage2nix enable that flag anyway?
2015-01-09 16:24:38 -05:00
John Wiegley
753539800e coqPackages.fiat: enable building the examples as a test 2015-01-09 15:20:17 -06:00
Shea Levy
69f5738668 attoparsec: Fix build for 7.10 2015-01-09 16:18:16 -05:00
Shea Levy
4d325bcede haskellng: bump text-icu
Taken from d2566a190e
2015-01-09 15:55:22 -05:00
Shea Levy
473b0d9535 Revert "hackage-packages.nix: Update to 2015/01/09-20:00 UTC"
For some reason this set a lot of native dependencies to null. I'll just
take the text-icu bump by itself for now.

@peti how am I meant to use hackage2nix?

This reverts commit d2566a190e.
2015-01-09 15:53:35 -05:00
John Wiegley
443301ec8c coqPackages.fiat: correct installation directory 2015-01-09 14:21:08 -06:00
John Wiegley
2aec1b0f31 coqPackages.fiat: new expression 2015-01-09 14:07:39 -06:00
Shea Levy
d2566a190e hackage-packages.nix: Update to 2015/01/09-20:00 UTC
Needed text-icu bump
2015-01-09 15:03:42 -05:00
Shea Levy
b1c3c3276d Miscellaneous ghcHEAD fixes 2015-01-09 14:57:39 -05:00
Domen Kožar
dbbd849ce8 openssl: 1.0.1j -> 1.0.1k
(cherry picked from commit 70a7d4bd16454b8b27d404a109c615462cc4fa9e)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-01-09 20:22:02 +01:00
Shea Levy
93b75f6284 ghc-ng-7.10: More doctest fixes 2015-01-09 14:07:36 -05:00
Peter Simons
adf0a891be haskell-configuration-ghc-7.9.x: add a couple of overrides to disable failing test suites (mostly doctest) 2015-01-09 19:55:25 +01:00
Peter Simons
2761c63bcf configuration-ghc-7.9.x: GHC 7.10.1-rc1 can build Haddock documentation, but it cannot build Hoogle files 2015-01-09 19:55:25 +01:00
Peter Simons
2f2f767813 haskell-generic-builder: allow selective enabling/disabling of the --hoogle flag to Haddock 2015-01-09 19:55:25 +01:00
William A. Kennington III
15e7acd0cf cyrus-sasl: Explicitly define the openssl path
cyrus-sasl static libraries require linked binaries to pull in openssl
via -lcrypto and -lssl. This is problematic because it does not specify
-L${openssl}/lib when not explcitly configure to do so. This patch
forces cyrus-sasl to add -L${openssl}/lib to the static libraries which
propagates the openssl library path to linked binaries.
2015-01-09 10:40:29 -08:00
Michael Raskin
e67bb36821 Work around buildEnv sometimes deciding to make bin a symlink 2015-01-09 21:40:06 +03:00
Shea Levy
ad632cc9c8 utf8-string has too string base upper bound 2015-01-09 13:38:34 -05:00
Shea Levy
119f5baa22 Fix transformers-compat on 7.10-ng 2015-01-09 13:33:10 -05:00
Peter Simons
38e2e8702c ghcWithPackages: call this derivation exactly like the compiler it's based on
Furthermore, export "name" and "version" attributes that match those of the
underlying compiler. These changes make a ghcWithPackages-generated wrapper
look exactly like a normal GHC derivation and it can be used anywhere in
Nixpkgs where a normal GHC would be used.
2015-01-09 19:30:14 +01:00
Peter Simons
96ae5d58bf haskell-configuration-ghc-7.9.x: steal a working jailbreak-cabal binary from the 7.8.4 package set to alleviate the effects of https://github.com/peti/jailbreak-cabal/issues/3 2015-01-09 19:17:59 +01:00
Michael Raskin
1e659694c5 Fix the download link --- reported by Karn Kallio 2015-01-09 20:26:57 +03:00
William A. Kennington III
942e179974 heimdal: Correct the openssl dependency 2015-01-09 09:01:46 -08:00
Aaron Levin
b964fd3cdc Bump version of vinyl to 0.5 2015-01-09 11:56:49 -05:00
Peter Simons
e3d751ffae Merge pull request #5659 from mpickering/master
Update haskell package slack-api to 0.2.1
2015-01-09 14:16:41 +01:00
Georges Dubus
74f15178b1 racer: updated to last git master 2015-01-09 14:16:04 +01:00
Peter Simons
12c5a49933 Merge pull request #5651 from dysinger/purescript-0.6.3
purescript release 0.6.3
2015-01-09 14:13:09 +01:00
Moritz Maxeiner
56fe81a2e6 seafile: update client, ccnet, libsearpc and shared 2015-01-09 13:37:44 +01:00
Matthew Pickering
8052679559 Update haskell package slack-api to 0.2.1 2015-01-09 12:34:23 +00:00
Vincent Laporte
310623ad6c Addg ocaml-uri
RFC3986 URI parsing library for OCaml

Homepage: https://github.com/mirage/ocaml-uri
2015-01-09 10:28:36 +01:00
Tim Dysinger
61edf184e7 purescript release 0.6.3 2015-01-09 00:27:33 +00:00
Michael Raskin
9438fa4d3f Add haskellPackages.unique 2015-01-09 03:21:38 +03:00
Peter Simons
50b2fab866 Merge pull request #5646 from mpickering/master
Add psqueues and slack-api haskell packages
2015-01-08 21:41:41 +01:00
Peter Simons
615787e6da haskell-cabal2nix: update to version 1.73 2015-01-08 20:17:04 +01:00
Matthew Pickering
11576bcc93 Haskell: Add psqueues library 2015-01-08 18:30:38 +00:00
Matthew Pickering
e7cfdfbf8d Add slack-api haskell package 2015-01-08 18:30:38 +00:00
Peter Simons
388848fa9f haskell-configuration-ghc-7.8.x: various build fixes
- mtl-2.2.x needs transformers 0.4.x.
 - time-1.5.x can't build its test suite.
 - provide deep overrides for amazonka-* stuff to build with GHC 7.8.x
2015-01-08 18:50:19 +01:00
Peter Simons
3c8b33eee4 haskell-modules: implement overrideScope method for deep overriding
deepOverride turns out to be completely unfeasible for non-trivial overrides.
Nix evaluates for an eternity, and then comes back saying:

  Too many heap sections: Increase MAXHINCR or MAX_HEAP_SECTS
  nix-instantiate killed by signal 6

The hand-written deep-override, on the other hand, performs the job in a
fraction of a second, no problem.

All bow to Russell O'Connor!
2015-01-08 18:50:19 +01:00
Peter Simons
d737d463c6 hackage-packages.nix: update from Hackage 2015-01-08T16:50:56+0100
This update also brings monad-control version 1.x by default, and some
additional (older) versions of the amazonka package family.
2015-01-08 18:50:19 +01:00
rejuvyesh
c40a98b02b Update hledger, hledger-lib and hledger-web to 0.24 2015-01-08 20:22:58 +05:30
Shea Levy
5cb62016a5 Revert "Add amazonka, amazonka-core, amazonka-cloudwatch haskell packages"
Unnecessary change to the haskell packages infrastructure, will move
this to haskellng packages.

This reverts commit 0f04707953.
2015-01-08 09:38:47 -05:00
Peter Simons
c023a2778c Merge pull request #5641 from teh/master
Fix elm-reactor.
2015-01-08 15:18:54 +01:00
Tom Hunger
b32df8f6a7 Fix elm-reactor.
The elm-reactor setup.hs file tries to build an elm file that's not
distributed in the cabal archive. The archive contains the
already-compiled js file so the step is unnecessary and I'm patching
it out.
2015-01-08 14:12:20 +00:00
lethalman
908c47b281 Merge pull request #5550 from abbradar/fprintd
add fprintd support
2015-01-08 14:58:22 +01:00
lethalman
1e46e8a964 Merge pull request #5567 from ktosiek/test-kitchen
Add test-kitchen gem, with plugins for Ansible and Vagrant
2015-01-08 14:56:55 +01:00
Nikolay Amiantov
30cd59667b libfprint: add git version with patch for vfs5011 2015-01-08 16:42:37 +03:00
lethalman
174184ccc1 Merge pull request #5621 from prikhi/add-workrave
Add Workrave, an RSI prevention app
2015-01-08 14:41:29 +01:00
Peter Simons
197e7672e6 haskell-configuration-ghc-7.9.x: improve configuration to fix some builds 2015-01-08 13:46:47 +01:00
Peter Simons
0811375a69 haskell-configuration-common: cosmetic 2015-01-08 13:46:47 +01:00
lethalman
7665a97d06 Merge pull request #5601 from robberer/tmp1
php: add optional ZTS support and new PECL module pthreads
2015-01-08 13:22:08 +01:00
Georges Dubus
a9dc59992d Merge pull request #5636 from Ericson2314/master
Misc cleanups of rustc and cargo packaging
2015-01-08 13:17:07 +01:00
Vincent Laporte
b6f8d1f6d5 Adds ocaml-stringext
Extra string functions for OCaml

Homepage: https://github.com/rgrinberg/stringext
2015-01-08 11:23:19 +01:00
Austin Seipp
ec61a9ea5a nixpkgs: coccinelle 1.0.0-rc15 -> 1.0.0-rc23, and adopt
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-01-08 04:16:14 -06:00
John Ericson
8d96df76b9 cargo: common.nix now only contains version-agnostic bits 2015-01-08 08:38:20 +00:00
John Ericson
d47f443866 rustc: Cleanup HEAD and 0.12 derivations
Hopefully they are now easier to maintain.
2015-01-08 08:37:43 +00:00
John Ericson
f7092bb9d8 rustcMaster: Missing paren in error message 2015-01-08 08:22:56 +00:00
Benjamin Saunders
f012dc3216 libuv: add v1.2.0 2015-01-07 20:56:31 -08:00
Benjamin Saunders
1f80c4cb2d libuv: update to new repository location 2015-01-07 20:56:06 -08:00
William A. Kennington III
3e931d40d7 openjdk-darwin: Add missing home passthru 2015-01-07 15:02:14 -08:00
Peter Simons
c1c0b4bbfd ghc: bump HEAD compiler to 7.10.1-rc1 2015-01-07 23:58:23 +01:00
William A. Kennington III
406fefdf83 icedtea_web: Cleanup java home 2015-01-07 14:55:41 -08:00
William A. Kennington III
238f4d1652 jdkPath: Remove in favor of jdk.home 2015-01-07 14:55:41 -08:00
William A. Kennington III
c82410eeda java: Normalize to the default jre / jdk 2015-01-07 14:55:41 -08:00
William A. Kennington III
bbc4262514 java: Add home passthru 2015-01-07 14:55:41 -08:00
Peter Simons
54baa53df1 Say hello to our brand-new Haskell infrastructure. 2015-01-07 23:45:21 +01:00
Eduard Bachmakov
82b55b9c78 libva-intel-driver: 1.3.2 -> 1.5.0
Close #5502.
2015-01-07 22:48:41 +01:00
Eduard Bachmakov
82f62af38e libva: 1.3.1 -> 1.5.0 2015-01-07 22:48:40 +01:00
Michael Raskin
5b77abfbe4 Unmark haskellPackages.ipprint as broken 2015-01-08 00:37:12 +03:00
Peter Simons
c827471185 ihaskell-wrapper: adapt so that it evaluates with the new Haskell infrastructure 2015-01-07 22:21:23 +01:00
Ricardo M. Correia
e78763da0d rustcMaster: Rust's install script now installs the docs 2015-01-07 17:32:42 +01:00
Michael Raskin
4bbfa27e5c Make the Darwin fix in zlib keep Linux hash 2015-01-07 18:23:18 +03:00
Vincent Laporte
4e382bce7e Adds ocaml-re
Re is a regular expression library for OCaml.

Homepage: https://github.com/ocaml/ocaml-re
2015-01-07 14:15:10 +01:00
Karn Kallio
691b047cfb mercury: Update to 14.01.1 2015-01-07 12:56:59 +01:00
Eelco Dolstra
37ac9deb3d Revert "php: Update to 5.4.36"
This reverts commit e7d4d39c6e. The
build fails in a chroot because it tries to download a PEAR from the
network:

http://hydra.nixos.org/build/18517333
2015-01-07 12:53:01 +01:00
Eelco Dolstra
e7d4d39c6e php: Update to 5.4.36
CVE-2014-8142
2015-01-07 11:36:01 +01:00
Pavan Rikhi
a6e9175b6d gdome2: fix expression 2015-01-07 02:15:26 -05:00
Pavan Rikhi
5a228d4b4c ocaml lablgtkmathview: mark as broken 2015-01-07 02:15:26 -05:00
Ricardo M. Correia
e43cde6a6c rustcMaster: Update from 0.13.0-pre-2763-g6366631 -> 0.13.0-pre-3497-g6539cb4 2015-01-07 05:50:40 +01:00
Ricardo M. Correia
9ad3f0ed7e cargoSnapshot: Update from 2014-12-21 -> 2014-12-30 2015-01-07 05:50:17 +01:00
John Wiegley
f8bd5bb401 zlib: on darwin, correctly set the RPATH for libzlib 2015-01-06 14:52:58 -06:00
Shea Levy
0f04707953 Add amazonka, amazonka-core, amazonka-cloudwatch haskell packages
Required adding a deep override mechanism to haskell packages
2015-01-06 14:42:37 -05:00
Brendan Long
8c3399f4d8 go: Update to 1.4 2015-01-06 13:31:02 -06:00
William A. Kennington III
50469c1511 libtirpc: 0.2.4 -> 0.2.5 2015-01-06 11:27:48 -08:00
Peter Simons
90f20fa41d Merge pull request #5610 from sivteck/machines
Update haskell machines-io and machines-directory libraries
2015-01-06 20:01:41 +01:00
Sivaram Balakrishnan
f8f5627085 Update haskell machines-io and machines-directory libraries
Signed-off-by: Sivaram Balakrishnan <sivaram1992@gmail.com>
2015-01-06 23:59:15 +05:30
Michael Raskin
6d74aacbea Pass sqlite to webkitgtk --- fails to configure otherwise 2015-01-06 19:34:30 +03:00
aszlig
e957d71680
heimdal: Move openssh to propagatedBuildInputs.
A few more libraries were switched to using the kerberos attribute
instead of krb5 in 5fe7439. So those libraries are now built against
heimbal instead of MIT kerberos.

One of those libraries is libtirpc, which results in the following build
output:

http://hydra.nixos.org/build/18423661/nixlog/1/raw

The reason for this is, that "pkgconfig --libs" of heimdal lists
-lcrypto (which is part of OpenSSL), which is not propagated to
libtirpc.

See here (lines wrapped with backslash at the end of line):

$ nix-shell -p heimdal pkgconfig --command 'pkg-config --libs heimdal-gssapi'
-L/nix/store/cxjkl33j0mb4ilffaijl7gschbjzfv35-heimdal-1.5.3/lib -lgssapi \
-lheimntlm -lkrb5 -lhx509 -lcom_err -lcrypto -lasn1 -lwind -lroken -lcrypt \
-ldl -lresolv -pthread

Versus using MIT kerberos:

$ nix-shell -p krb5 pkgconfig --command 'pkg-config --libs krb5'
-L/nix/store/91vyw8yn89qnv8m8b35kgc4c4v7zp9as-krb5-1.13/lib -lkrb5 \
-lk5crypto -lcom_err

So the latter only lists libraries that are part of krb5 itself.

By adding openssh to propagatedBuildInputs, we should be able to build
any package that depends on either krb5/heimdal without any missing
dependencies.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-06 17:11:16 +01:00
Michael Raskin
bc159cc816 Update botan and fix the build 2015-01-06 18:47:02 +03:00
Oliver Charles
302f056f91 haskellPackages.nonEmpty: New expression 2015-01-06 15:05:24 +00:00