nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-22 21:53:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,017 Commits 180 Branches 125 Tags 8.3 GiB
f7acce83fc
Commit Graph

2156 Commits

Author SHA1 Message Date
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
Rickard Nilsson
7c06bb13be re2c: Fix license reference 2014-08-20 15:30:18 +02:00
Peter Simons
4bbe6a39bb Merge pull request #3686 from ts468/hdevtool 
Fix: hdevtools: correct sha256 hash of patch
 2014-08-20 12:40:37 +02:00
Eelco Dolstra
5c53f22492 Revert "binutils: Enable sysroot support" 
This reverts commit 773595540b. It
breaks stuff and we don't need it anymore.

http://hydra.nixos.org/build/13517591
 2014-08-20 11:13:46 +02:00
Austin Seipp
528a1c0f56 ninja: 1.4.0 -> 1.5.1 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-08-20 01:13:33 -05:00
Austin Seipp
9f5eba94d8 re2c: 0.13.6 -> 0.13.7.4 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-08-20 01:12:21 -05:00
Thomas Strobel
1fbf590713 Fix: hdevtools: correct sha256 hash of patch 2014-08-20 01:17:16 +02:00
Peter Simons
f700bcaf06 haskell-cabal-bounds: update to version 0.8.4 2014-08-19 23:47:59 +02:00
Peter Simons
08bb0c8a81 haskell-happy-meta: update to version 0.2.0.7 2014-08-19 23:47:58 +02:00
Vincent Laporte
e8d2f8f109 merlin: update to 1.7 2014-08-19 18:43:41 +02:00
Igor Pashev
628ae1c63e jq: make sure libjq is in library search path 
Fixes runtime error:

jq: error while loading shared libraries: libjq.so.1:
cannot open shared object file: No such file or directory
 2014-08-18 16:22:51 +02:00
Pascal Wittmann
f06419e1a8 inotify-tools: update from 3.13 to 3.14 and add myself to maintainers 
note: project has moved to github on 23 November 2009
 2014-08-17 23:13:12 +02:00
Eelco Dolstra
773595540b binutils: Enable sysroot support 2014-08-17 17:25:12 +02:00
Peter Simons
0f78da8878 haskell-cabal-bounds: update to version 0.8.3 2014-08-17 00:20:13 +02:00
Peter Simons
7f875a328f haskell-happy-meta: update to version 0.2.0.6 2014-08-17 00:20:12 +02:00
Peter Simons
3b12f59ead Merge pull request #3610 from ts468/hdevtools 
Fix for hdevtools: update patch to build with ghc 7.8.3
 2014-08-15 15:25:20 +02:00
Thomas Strobel
5f14d3cceb Fix for hdevtools: update patch to build with ghc 7.8.3 2014-08-15 15:05:46 +02:00
Mateusz Kowalczyk
bd957f8038 haskell-cabal-bounds: update to 0.8.1 2014-08-15 02:16:33 +01:00
Luca Bruno
36bef2b267 gobject-introspection: refer to shlibs with absolute paths in typelibs 
After this, LD_LIBRARY_PATH should not be required anymore.
The patch has been applied only for .la files, so there may
be some other cases missing.
 2014-08-14 23:16:51 +02:00
Peter Simons
1c29dba62a haskell-pointfree: re-generate with cabal2nix 2014-08-14 14:41:22 +02:00
Peter Simons
423f789602 haskell-pointful: re-generate with cabal2nix 2014-08-14 14:41:22 +02:00
Peter Simons
09d214dfbf haskell-hscope: re-generate with cabal2nix 2014-08-14 14:41:22 +02:00
Peter Simons
4e45e7c60f haskell-docs: re-generate with cabal2nix 2014-08-14 14:41:22 +02:00
Thomas Strobel
637ed1642e Add Haskell package: pointfree 2014-08-14 14:41:22 +02:00
Peter Simons
758838df2b Merge pull request #3579 from ts468/haskell-haskell-docs 
Add Haskell package: haskell-docs
 2014-08-14 13:56:24 +02:00
Peter Simons
91ce5a47a6 Merge pull request #3578 from ts468/haskell-hscope 
Add Haskell packages: hscope and pure-cdb
 2014-08-14 13:55:55 +02:00
Michael Raskin
8da8c805bb Update luarocks 2014-08-14 10:14:21 +04:00
Thomas Strobel
aab5ab8711 Add Haskell package: haskell-docs 2014-08-14 01:00:31 +02:00
Thomas Strobel
f2e30cb9b2 Add Haskell package: pointful 2014-08-14 00:40:33 +02:00
Thomas Strobel
26bda4eb00 Add Haskell packages: hscope and pure-cdb 2014-08-14 00:35:32 +02:00
Austin Seipp
6bd1b35509 arcanist: 20140717 -> 20140812 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-08-12 21:52:35 -05:00
Peter Simons
d3c68cd723 haskell-cabal2nix: update to version 1.68 2014-08-12 16:09:22 +02:00
Moritz Ulrich
e3bf7253b0 rebar: Bump to 2.5.1. 2014-08-12 13:47:59 +02:00
Moritz Ulrich
1f221a72de dfu-programmer: Bump to 0.7. 2014-08-12 13:42:10 +02:00
Peter Simons
e823c123a8 Don't build broken Haskell packages on Hydra. 
These packages don't compile:

 - cabal-delete
 - cabal-file-th
 - categories
 - cmdtheline
 - codec-image-devil
 - concurrent-extra
 - cryptol 1.8.x
 - data-lens
 - diagrams-postscript
 - djinn
 - download
 - dstring
 - enummapset
 - git-date
 - github-backup
 - gtkglext
 - happyy-meta
 - haskeline-class
 - pakcs

These packages depend on some of the packages listed before:

 - Chart-diagrams
 - data-lens-template
 - hp2any-manager
 - purescript
 - repr

These packages fail with GHC 7.8.3 but still compile with older compilers:

 - happy: 1.18.4, 1.18.5, 1.18.6
 2014-08-12 12:37:44 +02:00
Mateusz Kowalczyk
e7832f4b80 haskell-cabal-bounds: update to 0.8 
doCheck = false; remains due to
https://github.com/dan-t/cabal-bounds/issues/3
 2014-08-11 14:34:10 +02:00
Mateusz Kowalczyk
bb5841875d haskell-threadscope: mark as broken 
Needs updating for the gtk/glib/pango API change. Ticket at
https://github.com/haskell/ThreadScope/issues/38 .
 2014-08-11 13:58:39 +02:00
Mateusz Kowalczyk
9cb34308da haskell-PastePipe: add version 1.5 2014-08-11 07:03:19 +02:00
John Wiegley
326ca0f690 Many minor fixes to get things building after recent compiler changes 2014-08-10 23:18:57 -05:00
Peter Simons
43fd39de43 Merge pull request #3520 from pavelkogan/SourceGraph 
new packages: SourceGraph + dependency
 2014-08-10 22:42:56 +02:00
Pavel Kogan
a00209a38e Add SourceGraph: Haskell code analysis tool 2014-08-10 16:13:35 +01:00
Eelco Dolstra
0acc4e6b26 cmake: Fix setup hook on bash < 4.0 
This matters in nix-shell and stdenvNative on Darwin.

Fixes #3204.
 2014-08-09 23:14:01 +02:00
Peter Simons
5ebc4d829b Re-generate Haskell expressions with latest cabal2nix. 2014-08-09 13:49:24 +02:00
Peter Simons
18250b97ae Remove 'andres' from the meta.maintainer section of all Haskell package where I 
had added him earlier.
 2014-08-09 13:49:24 +02:00
Peter Simons
d9f6e54e7a Disable Hydra builds for all "old" Haskell packages. 
Old means that we have a newer version in Nixpkgs already. If there is a reason
for the old package to still exist, i.e. because some other package is still
referring to it, then Hydra will still build the package as a dependency, but
we won't want to build old packages on their own right.
 2014-08-09 13:49:24 +02:00
Peter Simons
c00e814202 HaRe: remove broken package until it supports GHC 7.8.3 2014-08-09 13:49:23 +02:00
Peter Simons
ba59416c3d haddock: don't build old versions of this package with a recent GHC 2014-08-09 00:39:52 +02:00
Peter Simons
cee9394fb3 alex: don't build old versions of this package with a recent GHC 2014-08-09 00:39:52 +02:00
Peter Simons
faa33d58ce HaRe: don't build this with Hydra; the build is broken because of missing dependencies 2014-08-09 00:39:52 +02:00
Peter Simons
c2b405e06c haskell-{alex,BNFC}-meta: remove broken packages 2014-08-09 00:39:52 +02:00
Vladimír Čunát
52d9c93abe Merge 'staging' into master 2014-08-08 20:13:23 +02:00
Eelco Dolstra
8a7f3c3618 Mark a bunch of packages as broken or not supported on Darwin 2014-08-08 17:59:02 +02:00
Peter Simons
9226fbf56a Merge remote-tracking branch 'origin/master' into staging. 2014-08-08 09:51:01 +02:00
William A. Kennington III
0450b0ad0a intel-gpu-tools: Add derivation 2014-08-07 01:32:43 +02:00
Joel Taylor
a232a2d2c5 prevent usage of binutils on darwin 2014-08-04 13:30:05 -07:00
Peter Simons
2d326e5032 Merge remote-tracking branch 'origin/master' into staging. 
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
 2014-08-04 16:51:47 +02:00
Michael Raskin
4c176fd76e Update Scons build manager 2014-08-03 22:29:41 +04:00
Vladimír Čunát
6295a3ca36 Merge recent master into x-updates 
Hydra: ?compare=1142825

Conflicts (easy):
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
 2014-08-02 05:08:07 +02:00
Pascal Wittmann
0baac649aa Merge pull request #3188 from vbgl/merlin 
Adds merlin
 2014-08-01 13:39:27 +02:00
Vincent Laporte
81f258e7bf merlin: some cleaning of the derivation 2014-08-01 09:42:37 +02:00
John Wiegley
511f41387d haskell-haddock: use buildTools, not extraBuildInputs 
Fixes #2815
 2014-07-31 12:48:54 -05:00
Bjørn Forsman
410f2a9dab lttng: align attribute name with package name 
lttngModules => lttng-modules
lttngTools => lttng-tools
lttngUst => lttng-ust

But keep the old attributes around for backward compatibility.
 2014-07-31 16:00:04 +02:00
Peter Simons
ae6d32ffd3 haskell-cabal2nix: update to version 1.67 2014-07-31 15:48:30 +02:00
Matej Cotman
b1ba1689bd zed: build from source, ditch the installer, upgrade node-webkit 2014-07-30 12:43:24 +02:00
Peter Simons
90939a0482 haskell-hlint: update to version 1.9.3 2014-07-29 18:39:36 +02:00
Eelco Dolstra
8a10d8bbc3 autoconf: Disable tests 
These take waaaay too long.
 2014-07-29 17:03:48 +02:00
Peter Simons
86dc30daa6 haskell-keter: update to version 1.3.3 2014-07-28 20:32:59 +02:00
Peter Simons
d0ca8c237e Fix broken license references. 2014-07-28 11:43:20 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra
f64d84698e Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/applications/audio/espeak/edit.nix
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
 2014-07-28 11:30:49 +02:00
Cray Elliott
441ccf85dc update hlint to 1.9.2 2014-07-25 14:45:47 -07:00
Austin Seipp
ee775eebda sparse: 0.4.4 -> 0.5.0 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-07-24 06:04:36 -05:00
Vladimír Čunát
b9045a7d96 Merge branch 'x-updates' into staging 
...in preparation for a merge to master
 2014-07-22 22:28:39 +02:00
Peter Simons
fd3ca78bfc haskell-hlint: update to version 1.9.1 2014-07-22 14:20:59 +02:00
Peter Simons
029d26cdfb haskell-codex: update to version 0.1.0.3 2014-07-22 14:20:59 +02:00
Peter Simons
7b9288bc81 haskell-HaRe: update to version 0.7.2.6 2014-07-22 14:20:59 +02:00
Eelco Dolstra
4f7289eec9 Don't use ensureDir 2014-07-22 11:01:32 +02:00
Eelco Dolstra
7f410ef923 Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/misc/vim-plugins/default.nix
 2014-07-22 11:00:00 +02:00
Vladimír Čunát
9b02635faa Merge recent master into x-updates 
Hydra: ?compare=1138350

Conflicts:
	nixos/modules/services/x11/desktop-managers/default.nix
	Two imports were added independently on the same line.
	I split it as well, as it was very long now.
 2014-07-21 12:05:57 +02:00
Pascal Wittmann
c7add6c270 Merge pull request #3317 from Mathnerd314/prelink 
Add prelink package
 2014-07-20 14:03:12 +02:00
Peter Simons
713379c658 Re-generate Haskell packages with cabal2nix. 2014-07-19 21:12:04 +02:00
Mathnerd314
dd325fa30c Add prelink package 2014-07-19 02:16:41 +02:00
John Wiegley
9b608c0e99 haskell-codex: jailbreak due to circular dependency 
It seems the codex-0.1.0.2 build requires 0.1.0.1.
 2014-07-18 18:00:27 -05:00
Alexander Tsamutali
a1a9c26ccc Merge branch 'master' of https://github.com/NixOS/nixpkgs 2014-07-18 20:12:00 +04:00
Alexander Tsamutali
cc4c108965 usb-modeswitch: Update to 2.2.0. 2014-07-18 20:11:16 +04:00
Peter Simons
125aeed5a0 haddock: update to version 2.14.3 2014-07-18 17:30:48 +02:00
Peter Simons
dfbce69f05 haskell-codex: update to version 0.1.0.2 2014-07-18 17:30:48 +02:00
Peter Simons
c0791a5b2c haskell-HaRe: update to version 0.7.2.5 2014-07-18 17:30:48 +02:00
lethalman
5ef6745be3 Merge pull request #3278 from sztupi/vagrant 
vagrant: upgrade to 1.6.3
 2014-07-18 14:35:55 +02:00
Vladimír Čunát
16e35532e4 Merge recent master into x-updates 2014-07-17 19:30:56 +02:00
Austin Seipp
d5326a4af0 arcanist: 20140627 -> 20140717 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-07-17 01:26:44 -05:00
Peter Simons
ea4767221f haskell-cabal2nix: update to version 1.66 2014-07-16 12:51:43 +02:00
Eelco Dolstra
b9d19af3e6 Merge remote-tracking branch 'origin/master' into staging 2014-07-15 12:14:35 +02:00
Attila Sztupak
84939f1d14 vagrant: upgrade to 1.6.3 2014-07-15 01:53:07 +01:00
Pascal Wittmann
5df645dd28 spin: update from 5.1.7 to 6.3.2, clean up and fetch sources as a different user agent (the default curl agent string is blocked) 2014-07-14 19:57:33 +02:00
Peter Simons
6a8ee6ad5c haskell-cabal2nix: update to version 1.65 2014-07-14 17:39:15 +02:00
Peter Simons
ab00da7caf Add "please don't edit" comment at the top of every auto-generated Haskell file. 2014-07-14 17:33:52 +02:00
Peter Simons
b85bd47e9e haskell-cabal-bounds: update to version 0.7 2014-07-14 17:33:51 +02:00
Peter Simons
78c7ea2c8f haskell-ShellCheck: update to version 0.3.4 2014-07-14 17:33:50 +02:00
Peter Simons
be090a6372 happy: remove obsolete versions 1.18.8, 1.18.11, 1.19.2, and 1.19.3 2014-07-14 17:33:48 +02:00
Peter Simons
15d9034477 happy: update to version 1.19.4 2014-07-14 17:33:48 +02:00
Eelco Dolstra
ff97b7dbe6 Merge remote-tracking branch 'origin/master' into staging 2014-07-14 17:04:55 +02:00
Shea Levy
b57bc220cc Merge branch 'master' of git://github.com/ip1981/nixpkgs 
Added quilt-0.63
 2014-07-14 10:26:39 -04:00
Igor Pashev
a95e65da60 Added quilt-0.63 2014-07-14 15:35:27 +02:00
Peter Simons
d2e731e111 Add "please don't edit" comment at the top of every auto-generated Haskell file. 2014-07-14 13:21:41 +02:00
John Wiegley
6863cd0910 haskell-codex: updated 0.1.0.0 -> 0.1.0.1 2014-07-10 21:25:56 -05:00
cillianderoiste
d6e8e764ae Merge pull request #3233 from wjlroe/exercism 
New Exercism package
 2014-07-10 18:56:47 +02:00
William Roe
8788eb09c7 Remove full stop from description 2014-07-10 15:11:12 +01:00
William Roe
09209878c6 Added wjlroe (me) as maintainer of this new Exercism package 2014-07-10 15:03:50 +01:00
William Roe
e22c0e6367 New exercism package 2014-07-10 15:03:42 +01:00
Peter Simons
a77078b84a haskell-cabal2nix: update to version 1.64 2014-07-10 13:12:14 +02:00
Vladimír Čunát
5979d428b4 Merge recent master into x-updates 
Hydra: ?compare=1134869

Conflicts (just meta):
	pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
 2014-07-09 22:13:29 +02:00
Peter Simons
4e39d2dde6 haskell-uuagc: update to version 0.9.51 2014-07-08 15:58:22 +02:00
Peter Simons
cefbc461cc haskell-codex: update to version 0.1.0.0 2014-07-08 15:58:22 +02:00
Peter Simons
93e5ad83bc haskell-cake3: update to version 0.5.1.0 2014-07-08 15:58:22 +02:00
Peter Simons
a9a9b758d0 haskell-HaRe: update to version 0.7.2.4 2014-07-08 15:58:22 +02:00
Eelco Dolstra
973c9abdbe Fix info command 
The "info" command has been broken on NixOS since
457fdb3842 (proving that nobody uses
info).
 2014-07-08 15:19:08 +02:00
Eelco Dolstra
95b828de42 Merge remote-tracking branch 'origin/master' into staging 2014-07-07 13:16:26 +02:00
Charles Strahan
6b16c2ec34 watchman: new package 
This adds `watchman`, a CLI utility that watches files and takes action when
they change.
 2014-07-06 01:34:11 -04:00
Vincent Laporte
f16124d521 Adds merlin 
Merlin is an editor-independant tool to ease the developpement of
programs in OCaml. It aims to provide features available in modern IDEs.

Homepage: http://the-lambda-church.github.io/merlin/
 2014-07-05 17:33:55 +02:00
Bjørn Forsman
3950f2582d openocd: fix symlink to udev rules file 
I made an error last time I touched this line. Fix it (.udev => .rules).
 2014-07-05 14:56:10 +02:00
Luca Bruno
ac711a705e dfeet: fix icons 2014-07-05 12:18:17 +02:00
Peter Simons
f5a5f46b57 haskell-hlint: update to version 1.9 2014-07-04 12:04:22 +02:00
Peter Simons
d9d6af1bda haskell-cpphs: update to version 1.18.5 2014-07-04 11:45:42 +02:00
Vladimír Čunát
aceb30cd93 Merge master into x-updates 
Adds the mass-rebuilding python update.
 2014-07-02 22:54:41 +02:00
Eelco Dolstra
06fc1ec34d Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/servers/serfdom/default.nix
 2014-07-01 11:25:41 +02:00