3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

2085 commits

Author SHA1 Message Date
Vladimír Čunát d957b4bd78 Merge recent master into staging
Hydra nixpkgs: ?compare=1151601
2014-09-13 21:48:29 +02:00
Vladimír Čunát 82797f98f2 Merge branch 'staging' into modular-stdenv
Conflicts:
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/stdenv/linux/default.nix
2014-09-08 18:24:58 +02:00
Vladimír Čunát 1e389c976c merge 'staging' into modular-stdenv
In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix
were not merged correctly.

Conflicts:
	pkgs/stdenv/generic/default.nix
2014-09-08 18:16:54 +02:00
Eelco Dolstra 585983bc95 Merge remote-tracking branch 'origin/staging'
Conflicts:
	pkgs/applications/version-management/subversion/default.nix
2014-09-08 11:42:09 +02:00
Vladimír Čunát 06fea81c6e Merge recent master into staging
Hydra: ?compare=1150594
2014-09-06 16:52:45 +02:00
Pascal Wittmann f99ad6fe94 help2man: update from 1.46.1 to 1.46.2 2014-09-06 16:23:15 +02:00
Rüdiger Sonderfeld 46266cc216 gdb: Update to 7.8 and include Guile support.
GDB 7.8 adds Guile scripting support.  This is now enabled by default as
well.  Checking for guile also adds a pkg-config dependency.

It seems Python is explicitly excluded from cross building.  I'm not
sure if Guile should also be excluded.
2014-09-06 13:31:56 +02:00
Florent Becker 02a4e40474 Reexport ocaml data notation in the ocaml-oasis derivation 2014-09-06 12:44:33 +04:00
Florent Becker 3245b97000 Add a derivation for js_of_ocaml 2014-09-06 12:44:32 +04:00
Domen Kožar f9ba413b55 fix eval 2014-09-05 00:06:11 +02:00
Michael Raskin 5523408947 Merge pull request #3969 from manveru/vagrant
vagrant: 1.6.3 -> 1.6.4
2014-09-04 22:56:28 +04:00
Michael Fellinger f21cccb2b6 vagrant: 1.6.3 -> 1.6.4 2014-09-04 20:24:21 +02:00
Moritz Ulrich e30baf653e cppcheck: update from 1.65 to 1.66 2014-09-04 19:31:32 +02:00
Moritz Ulrich af8a91b0b2 ant: update from 1.9.3 to 1.9.4 2014-09-04 19:31:32 +02:00
Michael Raskin 6fcf8c0f63 Merge pull request #3954 from wjlroe/elixir-for-unix
Elixir and rebar aren't Linux-specific tools
2014-09-03 23:22:48 +04:00
William Roe 9a30ea90f0 Elixir and rebar aren't Linux-specific tools
Widen platform support to all unix
2014-09-03 20:14:57 +01:00
Michael Raskin 068d1696df Add radare2 2014-09-03 23:02:02 +04:00
Michael Raskin 71086542ee Fix radre for now by not using libewf and update it to latest 2014-09-03 23:02:02 +04:00
Michael Raskin d81303813a Merge pull request #3465 from joelteon/picky-binutils
Stop binutils from trying to build on Darwin
2014-09-03 19:57:09 +04:00
Luca Bruno 83c968fa2c Add new kgraphviewer and massif-visualizer packages
I chose the unstable versions because the stable versions
seemed too outdated to me. They work with kde 4.12 anyway.
2014-09-03 17:04:22 +02:00
Eelco Dolstra 9d64b445b6 swig: Disable ccache stuff
http://hydra.nixos.org/build/13936297
2014-09-02 13:07:49 +02:00
Peter Simons 1c0d15b90e Merge branch 'origin/master' into staging.
Conflicts:
	pkgs/development/libraries/ffmpeg/2.x.nix
	pkgs/development/libraries/serf/default.nix
2014-09-02 12:31:03 +02:00
Peter Simons 2fcbff576a haskell-timeplot: broken by Chart update
https://github.com/jkff/timeplot/issues/17
2014-09-02 11:48:20 +02:00
Peter Simons 3129fb3a11 haskell-docs: broken by the recent update to Haddock 2.15 2014-09-02 11:48:20 +02:00
Peter Simons 49c7b7040b haskell-haddock: add version 2.15.0 2014-09-02 11:48:19 +02:00
Michael Raskin 4e3ee27060 Merge pull request #3681 from vbgl/merlin-1.7
Merlin: update to 1.7
2014-09-02 02:07:27 +04:00
Daniel Peebles 933ac5e9f8 Use a more permanent URL for the byacc version we're using
The other one is likely to change with every new release.
2014-09-01 19:26:21 +01:00
Ricardo M. Correia f9e63ca20d inotify-tools: Fix hash
The hash wasn't updated when the version was bumped.
2014-09-01 15:07:54 +02:00
Daniel Peebles ba13808259 Fix byacc 2014-08-31 16:01:03 -04:00
Peter Simons 9733b56609 haskell-cabal-bounds: update to version 0.8.6 2014-08-31 18:17:01 +02:00
Peter Simons b259dde853 haskell-codex: update to version 0.1.0.4 2014-08-31 18:17:00 +02:00
Michael Raskin 1bfcc7b477 Update SCons 2014-08-31 18:20:07 +04:00
Michael Raskin 7a998aca73 Update SlimerJS 2014-08-31 18:20:07 +04:00
Michael Raskin fe549d89be Update CL-Launch 2014-08-31 18:20:06 +04:00
Pascal Wittmann 408832ac67 help2man: update from 1.44.1 to 1.46.1 and add myself as a maintainer 2014-08-30 23:59:35 +02:00
Florent Becker d7b67d8cfa add utop (improved ocaml toplevel) 2014-08-30 19:37:15 +04:00
Vladimír Čunát e51f73652d Merge recent master into staging
Hydra: ?compare=1149952

Conflicts:
	nixos/doc/manual/configuration.xml (changed split file)
	nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
	pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
2014-08-30 10:04:02 +02:00
Mateusz Kowalczyk 4e189f68ab checkstyle: update to 5.7 2014-08-29 18:18:41 +01:00
Peter Simons c9286fd171 haskell-hlint: update to version 1.9.4 2014-08-29 12:52:27 +02:00
ambrop7@gmail.com 21090fa778 Add BOSSA.
BOSSA is a flash programming utility for Atmel's SAM family of flash-based ARM microcontrollers. The motivation behind
BOSSA is to create a simple, easy-to-use, open source utility to replace Atmel's SAM-BA software. BOSSA is an acronym
for Basic Open Source SAM-BA Application to reflect that goal.
2014-08-27 13:07:43 +02:00
Bjørn Forsman c9baba9212 Fix many package descriptions
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
2014-08-24 22:31:37 +02:00
Peter Simons 99a863f306 haskell-cabal-bounds: update to version 0.8.5 2014-08-24 20:28:12 +02:00
Peter Simons 40fdda7237 haskell-cabal2nix: update to version 1.69 2014-08-24 20:28:11 +02:00
Georges Dubus 6418007dab nixbang: add expession 2014-08-24 16:07:23 +02:00
Peter Simons 25e0377e51 haddock-2.14.3: enable test suite
https://github.com/NixOS/cabal2nix/pull/86
2014-08-24 11:49:20 +02:00
Vincent Laporte e2db82874c Updates merlin to 1.7.1 2014-08-22 14:56:33 +02:00
Vladimír Čunát d4e9fd2a90 Merge recent master into staging
Hydra: ?compare=1148749

Conflicts (easy):
	nixos/modules/virtualisation/containers.nix
2014-08-21 15:09:31 +02:00
Peter Simons 128039217e haskell-hdevtools: fix patch checksum one more time
It appears that upstream has re-based the pull request, thereby changing the hash.
2014-08-20 20:26:57 +02:00
Peter Simons e910c8d6c9 Disable Hydra builds for broken Haskell packages.
The following packages are broken with GHC 7.8.3:

 - filesystem-conduit version 1.0.0.2
 - ghc-events-analyze version 0.2.0
 - haskelldb version 2.2.2
 - haskell-mpi version 1.2.1
 - haxr-th version 3000.5
 - hoauth version 0.3.5
 - holy-project version 0.1.1.0
 - hoogle version 4.2.32
 - hspread version 0.3.3
 - instant-generics version 0.4
 - ivor version 0.1.14.1
 - jmacro-rpc-happstack version 0.3
 - lambdacube-engine version 0.2.4
 - language-c-inline version 0.6.0.0
 - lockfree-queue version 0.2.3
 - monad-peel version 0.1.1
 - network-transport-tests version 0.1.0.1
 - poppler version 0.12.3
 - profiteur version 0.1.2.1
 - prolog-graph-lib version 0.2.0.1
 - semigroupoid-extras version 4.0
 - setlocale version 0.0.3
 - sized-types version 0.5.0
 - snaplet-postgresql-simple version 0.5
 - snap-loader-dynamic version 0.10.0.2
 - uhc git version 20120502
 - uniqueid version 0.1.1
 - unix-process-conduit version 0.2.2.3
 - vado version 0.0.1
 - vcsgui version 0.0.4
 - xml-html-conduit-lens version 0.3.2.0

The following packages depend on one of the broken ones above:

 - hoodle-builder version 0.3
 - hoodle-core version 0.14
 - hoodle-extra version 0.1
 - hoodle-parser version 0.3
 - hoodle-render version 0.4
 - hoodle-types version 0.3
 - hoodle version 0.3
 - kansas-lava version 0.2.4
 - liblastfm version 0.4.0.0
 - prolog-graph version 0.1.0.2
 - vacuum-cairo version 0.5
 - wcwidth version 0.0.2
2014-08-20 20:26:57 +02:00
Shea Levy 908bd66407 Merge branch 'master' of git://github.com/ip1981/nixpkgs
jq: make sure libjq is in library search path
2014-08-20 11:33:25 -04:00