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

..

analysis

checkstyle: update to 5.7

2014-08-29 18:18:41 +01:00

apktool

Another attempt to eradicate ensureDir

2014-06-30 14:56:10 +02:00

boomerang

…

build-managers

Update SCons

2014-08-31 18:20:07 +04:00

casperjs

…

cdecl

update constraints and maintainers

2014-05-18 20:51:08 -07:00

continuous-integration/jenkins

add platform and license to package metadata.

2014-03-13 13:01:49 -07:00

documentation

haskell-haddock: add version 2.15.0

2014-09-02 11:48:19 +02:00

etcdctl

Don't use ensureDir

2014-07-22 11:01:32 +02:00

exercism

Remove full stop from description

2014-07-10 15:11:12 +01:00

gnulib

gnulib: update to version 0.1-83-g8008cac

2014-02-17 17:11:58 +01:00

gocode

Don't use ensureDir

2014-07-22 11:01:32 +02:00

guile

Turn some license strings into lib.licenses values

2014-07-28 11:31:14 +02:00

haskell

haskell-timeplot: broken by Chart update

2014-09-02 11:48:20 +02:00

java

Fix many package descriptions

2014-08-24 22:31:37 +02:00

jq

jq: make sure libjq is in library search path

2014-08-18 16:22:51 +02:00

libsigrok

libsigrok: new package

2014-05-31 15:49:13 +02:00

libsigrokdecode

libsigrokdecode: new package

2014-05-31 15:49:13 +02:00

literate-programming/noweb

Another attempt to eradicate ensureDir

2014-06-30 14:56:10 +02:00

misc

Merge branch 'origin/master' into staging.

2014-09-02 12:31:03 +02:00

neoload

neoload: upgrade to 4.1.4 and fix mem issues

2014-04-24 08:05:44 +02:00

node-webkit

Merge remote-tracking branch 'origin/master' into staging.

2014-08-04 16:51:47 +02:00

ocaml

Merge pull request #3681 from vbgl/merlin-1.7

2014-09-02 02:07:27 +04:00

packer

Don't use ensureDir

2014-07-22 11:01:32 +02:00

parsing

Use a more permanent URL for the byacc version we're using

2014-09-01 19:26:21 +01:00

phantomjs

add phantomjs to darwin platform

2014-02-12 00:51:11 +00:00

profiling

Fix many package descriptions

2014-08-24 22:31:37 +02:00

pydb

Turn some license strings into lib.licenses values

2014-07-28 11:31:14 +02:00

quilt

Added quilt-0.63

2014-07-14 15:35:27 +02:00

selenium

chromedriver 2.9 -> 2.10

2014-06-30 12:48:38 +02:00

sigrok-cli

sigrok-cli: new package

2014-05-31 15:49:13 +02:00

slimerjs

Update SlimerJS

2014-08-31 18:20:07 +04:00

sqsh

Fix many package descriptions

2014-08-24 22:31:37 +02:00

vagrant

vagrant: upgrade to 1.6.3

2014-07-15 01:53:07 +01:00

watchman

Many minor fixes to get things building after recent compiler changes

2014-08-10 23:18:57 -05:00

yuicompressor

Another attempt to eradicate ensureDir

2014-06-30 14:56:10 +02:00