Commit graph

1967 commits

Author SHA1 Message Date
William A. Kennington III
0450b0ad0a intel-gpu-tools: Add derivation 2014-08-07 01:32:43 +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
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
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
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
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
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
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