Shea Levy
b634efe63c
ocamlPackages.opam: Fix indentation
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 17:12:56 -05:00
Shea Levy
66ad165829
Merge branch 'add-opam-0.9.5' of git://github.com/orbitz/nixpkgs
...
This adds the opam ocaml package, and also adds orbitz as a maintainer.
I've tested that it builds, nothing more.
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 17:10:54 -05:00
orbitz
55be059467
Add myself to maintainers, remove 0.9.4, set maintainer for this packge to me
2013-03-08 22:59:54 +01:00
orbitz
98a6759bc7
Delete 0.9.4
2013-03-08 22:48:58 +01:00
orbitz
fd48192018
Add opam 0.9.5
2013-03-08 22:42:22 +01:00
Peter Simons
1f38a4ca66
haskell-cabal2nix: update to version 1.47
2013-03-08 13:44:59 +01:00
orbitz
6da29419e4
Add opam 0.9.4
2013-03-08 11:56:50 +01:00
Eelco Dolstra
234c6b74c6
Merge remote-tracking branch 'origin/stdenv-updates'
2013-03-07 23:09:05 +01:00
Eelco Dolstra
674c51af3c
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-03-07 19:33:52 +01:00
Jack Cummings
96f662f746
lsof-4.87
2013-03-07 10:23:43 -08:00
Peter Simons
1fdd780e2c
ctags: update to SVN revision 804
2013-03-06 12:38:49 +01:00
Peter Simons
70836d5e64
haskell-cabal2nix: update to version 1.45
2013-03-06 11:06:01 +01:00
Rickard Nilsson
14ceed2ddb
gob2: Use fetchurl_gnome. Previous URL disappeared.
2013-03-03 20:52:31 +01:00
Vladimír Čunát
26af997d41
Merge branch 'master' into stdenv-updates
...
Conflicts (simple):
pkgs/applications/networking/browsers/chromium/default.nix
pkgs/development/libraries/libsoup/default.nix
pkgs/os-specific/linux/kernel/manual-config.nix
pkgs/os-specific/linux/qemu-kvm/default.nix
2013-03-02 10:41:53 +01:00
Peter Simons
97c3f61e08
haskell-jailbreak-cabal: update to version 1.1
2013-02-28 11:31:50 +01:00
Vladimír Čunát
9bc36c9729
gnumake381: fix the patching because of gnumake
2013-02-27 15:26:56 +01:00
Vladimír Čunát
d3821edb9e
gnumake: patch the patches so it looks nice
2013-02-27 15:26:56 +01:00
Vladimír Čunát
8ad7893bfc
make: PATCHES from gentoo
...
also needed for updated firebird to build
2013-02-27 15:26:55 +01:00
Peter Simons
55b67195d4
haskell-packunused: add version 0.1.0.0
2013-02-27 12:00:52 +01:00
Cillian de Róiste
d2b6645e82
Add chromedriver: a server for running Selenium tests in Chrome
2013-02-26 00:41:10 +01:00
Peter Simons
e16c5eab9f
haskell-jailbreak-cabal: update to version 1.1
2013-02-25 01:44:09 +01:00
Peter Simons
04b2efff19
Merge branch 'master' into stdenv-updates.
2013-02-25 01:26:26 +01:00
Peter Simons
e993649477
haskell-cabal2nix: update to version 1.44
2013-02-25 01:13:44 +01:00
Peter Simons
a540dd5650
alex: disable 'doCheck' to avoid compilation errors
...
The test-suite stanza is incomplete.
2013-02-25 00:32:42 +01:00
Peter Simons
1fac9c5a41
haddock: disable 'doCheck' to avoid compilation errors
...
The test-suite stanza is incomplete.
2013-02-25 00:32:42 +01:00
Peter Simons
a30df95691
Re-generate all Haskell packages with the latest version of cabal2nix.
...
This change brings support for building and running the regressions test suites.
2013-02-25 00:32:40 +01:00
Peter Simons
024f036ecd
alex: disable 'doCheck' to avoid compilation errors
...
The test-suite stanza is incomplete.
2013-02-24 22:22:02 +01:00
Peter Simons
6d212a9129
haddock: disable 'doCheck' to avoid compilation errors
...
The test-suite stanza is incomplete.
2013-02-24 22:21:54 +01:00
Peter Simons
7165babaf1
Re-generate all Haskell packages with the latest version of cabal2nix.
...
This change brings support for building and running the regressions test suites.
2013-02-24 22:09:07 +01:00
Peter Simons
5f32207dfc
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-02-24 19:27:08 +01:00
Peter Simons
9fc277e0b6
haskell-cabal2ghci: add version 0.0.1.0
2013-02-24 11:00:52 +01:00
Peter Simons
d4b8008a44
haskell-tar: dropped obsolete version 0.3.2.0
2013-02-24 10:44:17 +01:00
Peter Simons
c2fc8c6da3
cabal-dev: update to Git version to fix build with ghc 7.6.2
2013-02-24 10:42:30 +01:00
Vladimír Čunát
25d00bf765
oprofile: fix via minor update
2013-02-23 23:49:48 +01:00
Vladimír Čunát
e6e3035dbf
autogen: minor update and fix by disabling tests
...
/dev/tty is missing
2013-02-23 14:44:38 +01:00
Shea Levy
acd4299e75
Merge branch 'master' into stdenv-updates
...
Conflicts:
pkgs/applications/networking/browsers/chromium/default.nix
pkgs/top-level/all-packages.nix
Merge conflicts seemed trivial, but a look from viric and aszlig would be nice.
2013-02-21 11:13:30 -05:00
Peter Simons
6d560fb081
Merge pull request #308 from bjornfor/master
...
openocd: bump from 0.4.0 to 0.6.1
2013-02-21 05:42:56 -08:00
Peter Simons
773c5a04e4
haskell-alex: update to version 3.0.4
2013-02-20 11:35:36 +01:00
Shea Levy
aacca1902c
Merge branch 'upstream-master' into stdenv-updates
2013-02-19 10:09:39 -05:00
Peter Simons
7dfd7a93d4
haskell-BNFC: fix broken version number in executable
2013-02-19 13:26:01 +01:00
Peter Simons
dfebdde16f
texinfo: added version 5.0
2013-02-19 12:53:44 +01:00
Peter Simons
9e68734d61
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-02-18 11:54:56 +01:00
Peter Simons
b91414b12e
haskell-SourceGraph: update to version 0.7.0.5
2013-02-18 11:11:17 +01:00
Bjørn Forsman
ff47b7b6ec
openocd: bump from 0.4.0 to 0.6.1
...
Also:
* Remove commented out "GuruPlug installer" stuff that hasn't worked
since openocd 0.2.0 (according to the comments).
* Build with support for the following JTAG hardware:
- Segger J-Link
- Raisonance RLink
- Keil ULINK
- STMicroelectronics ST-Link
2013-02-16 18:01:02 +01:00
Eelco Dolstra
2aa6f262cb
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-02-15 13:36:34 +01:00
Shea Levy
45f6008817
cmake setup hook: If configurePhase is set, don't override it
2013-02-07 14:03:23 -05:00
Shea Levy
b3ec511a1a
sysbench: Fix URL
2013-02-06 15:38:44 -05:00
Aristid Breitkreuz
d6f5d3c9a8
pydb: mirror://sourceforge.net/ is no longer valid
2013-02-05 20:35:39 +01:00
Lluís Batlle i Rossell
36f6f003fe
docutils: updating to 0.10
...
mplayer2 required "rst2man.py", not available in 0.5.
2013-01-31 00:23:55 +01:00
Peter Simons
e816889ccc
haskell-hlint: update to version 1.8.43
2013-01-30 11:29:59 +01:00