Commit Graph

2029 Commits

Author SHA1 Message Date
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
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
Eelco Dolstra
40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
Cillian de Róiste
336f1f9d88 chromedriver 2.9 -> 2.10 2014-06-30 12:48:38 +02:00
Austin Seipp
2245580812 Merge pull request #3077 from vbgl/cppo
Adds cppo
2014-06-28 20:37:46 -05:00
Benno Fünfstück
e10001042d fetchbzr, fetchdarcs, fetchhg: use rev attr
This makes it match the behaviour of fetchgit and fetchsvn, so it's
easier to write scripts that support all of them.
2014-06-28 21:06:10 +02:00
Austin Seipp
48f2ca07f4 arcanist: 20140617 -> 20140627
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-27 01:12:49 -05:00
Vladimír Čunát
dfd80a1b7e Merge recent master into x-updates
Hydra eval: 1131611
2014-06-26 22:05:15 +02:00
Vladimír Čunát
02a1e85ab1 cmake, podofo: fix finding freetype-2.5 2014-06-26 18:24:44 +02:00
Bjørn Forsman
32bca3976f openocd: update meta attributes
* Don't repeat package name in description
* Fix longDescription indent
* Use licenses.gpl2Plus instead of string literal "GPLv2+"
2014-06-25 20:39:10 +02:00
Bjørn Forsman
1149154e0e openocd: update 0.7.0 -> 0.8.0
* Remove unneeded --enable-<JLINK_BASED_DEBUGGER> configure flags.
  configure auto selects support for them now (and they're all enabled).

* Not everything is auto-detected; I asked on the openocd mailing list
  and they suggested a set of ./configure flags for a "distro build"
  (add them).

* Remove --enable-ft2232_libftdi because configure says that it's
  deprecated and we should use libftdi (which we are using when *not*
  passing --enable-ft2232_libftdi (or --enable-legacy-ft2232_libftdi as
  the option is now known as)).

* Add needed pkgconfig build input.

* Udev rules file has been renamed in source archive: openocd.rules =>
  99-openocd.rules.
2014-06-25 20:18:53 +02:00
Vincent Laporte
e7df430d91 Adds cppo 2014-06-25 10:25:14 +02:00
John Wiegley
6776fe077a Merge pull request #3066 from cstrahan/gocode
add gocode package
2014-06-24 15:21:00 -07:00
John Wiegley
ff4c3444bc Merge pull request #3063 from cstrahan/etcdctl
add etcdctl package
2014-06-24 15:20:21 -07:00
John Wiegley
8cf92b530a Merge pull request #3060 from cstrahan/packer
Add gox and packer packages
2014-06-24 15:19:42 -07:00
Bjørn Forsman
f2909d0763 dejagnu: fix description (don't repeat package name) 2014-06-23 16:16:18 +02:00
Charles Strahan
f76fbe03e0 add gocode package 2014-06-23 05:50:48 -04:00
Charles Strahan
70ce3ee861 add etcdctl package 2014-06-23 05:03:03 -04:00
Charles Strahan
06a07684aa Add gox and packer packages 2014-06-23 03:56:31 -04:00
Bjørn Forsman
239d35338f antlr: add meta attributes 2014-06-22 21:59:41 +02:00
Peter Simons
d4e1604c1e Merge pull request #3048 from chrisfarms/sqsh
New package: sqsh. An SQL query tool/shell for Sybase/MSSQL
2014-06-22 15:31:33 +02:00
Peter Simons
5b6f3fc7f5 Merge pull request #3017 from ttuegel/wrap-haskell
Wrap Haskell tools to find GHC packages
2014-06-22 15:29:53 +02:00
Chris Farmiloe
0669981ba0 New package: sqsh. An SQL query tool/shell for Sybase/MSSQL 2014-06-22 14:32:02 +02:00
Bjørn Forsman
9883b5806a chrpath: new package
chrpath is a command line tool to adjust the RPATH or RUNPATH of ELF
binaries.

(Yes, it is similar to our patchelf tool.)

gpsd and Yocto/OpenEmbedded depend on chrpath (although we have
currently patched that dependency out of gpsd).
2014-06-22 14:21:55 +02:00
John Wiegley
812bba77f1 swig: ccache tests broken on Darwin with Gcc 4.8.3 2014-06-21 23:53:49 -07:00
Peter Simons
8420a2e979 cppcheck: update from 1.64 to 1.65 2014-06-21 14:04:15 +02:00
Peter Simons
006eca8947 haskell-keter: update to version 1.3.2 2014-06-20 16:56:00 +02:00
Peter Simons
72dae9f3e0 ShellCheck: re-generate with cabal2nix 2014-06-20 14:56:33 +02:00
Thomas Tuegel
048ec25757 Wrap haddock 2.10+ to find GHC packages 2014-06-19 06:36:11 -05:00