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
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
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
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
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