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
Vladimír Čunát
0d72174dbd
Merge branch stdenv-updates into x-updates
...
x-updates is supposed to merge after stdenv-updates, so let's test it
Conflicts:
pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
2013-02-21 12:43:00 +01: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
Lluís Batlle i Rossell
bcbf9472ea
Merge remote-tracking branch 'central/master' into x-updates
2013-02-18 13:49:11 +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
Vladimír Čunát
f536aa7e7a
Merge pull request #293 from vcunat/vlada/intltool
...
unify intltool
2013-02-14 12:29:29 -08: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
Vladimír Čunát
efd432e862
intltool: add propagated gettext
2013-01-31 17:41:07 +01:00
Vladimír Čunát
38ee738b8a
unify intltool
...
IMHO:
- It's no longer GNOME package.
- It seems best for everyone to use the newest version.
2013-01-31 16:43:52 +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
Eelco Dolstra
5cad2c497d
valgrind: Support Glibc 2.17
...
http://hydra.nixos.org/build/3894741
2013-01-28 17:19:03 +01:00
Eelco Dolstra
d8f37cdf9a
gdb: Update to 7.5.1
2013-01-28 15:47:22 +01:00
Shea Levy
6ce14a6729
leiningen: Update to 2.0.0.
...
Patch thanks to Patrick Lee.
2013-01-27 20:38:32 -05:00
Lluís Batlle i Rossell
3b26ba7019
Merge remote-tracking branch 'central/master' into stdenv-updates
...
Conflicts:
pkgs/os-specific/linux/alsa-utils/default.nix
2013-01-27 11:32:12 +01:00
Peter Simons
3395d065ee
haskell-cpphs: update to version 1.16
2013-01-25 14:52:04 +01:00
Peter Simons
8db11ef402
haskell-hlint: update to version 1.8.42
2013-01-25 14:52:04 +01:00
Peter Simons
7aa6680ecb
haskell-cabal2nix: update to version 1.43
2013-01-25 14:52:04 +01:00
Peter Simons
ce2423a6e7
haskell-BNFC: update to version 2.6.0.3
2013-01-25 14:52:04 +01:00
Rickard Nilsson
1886d1db6a
Merge remote-tracking branch 'upstream/master' into stdenv-updates
2013-01-20 16:53:21 +01:00
Peter Simons
f8447dc1e0
haskell-hlint: update to version 1.8.41
2013-01-20 16:42:50 +01:00
Mathijs Kwik
0890c45498
buildNativeInputs -> nativeBuildInputs
2013-01-13 11:33:45 +01:00
Peter Simons
b33ad366a1
Merge branch 'master' into stdenv-updates.
2013-01-11 15:46:10 +01:00
Peter Simons
a547de1ecb
haskell-hlint: update to version 1.8.40
2013-01-07 12:18:36 +01:00
Peter Simons
9e9cd7b529
Merge branch 'master' into stdenv-updates.
2013-01-04 21:00:53 +01:00
Peter Simons
fdf4dddac1
automake: add version 1.13.1
2013-01-04 20:51:45 +01:00
Peter Simons
21dcee77c0
haskell-splot: update to version 0.3.8
2013-01-04 19:24:18 +01:00
Peter Simons
e1a9fb4f98
haskell-SourceGraph: update to version 0.7.0.4
2013-01-04 19:24:17 +01:00
Lluís Batlle i Rossell
b58780c43d
Merge remote-tracking branch 'eelco/master' into stdenv-updates
...
Conflicts:
pkgs/development/compilers/gcc/4.7/default.nix
Trivial solution.
2012-12-28 23:28:16 +01:00
Eelco Dolstra
84779a6f7d
Remove unnecessary parentheses around if conditions
...
Pet peeve...
2012-12-28 19:54:15 +01:00
Eelco Dolstra
ab3eeabfed
Rename buildNativeInputs -> nativeBuildInputs
...
Likewise for propagatedBuildNativeInputs, etc. "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Eelco Dolstra
5be0a9acd7
Rename hostDrv -> crossDrv, buildDrv -> nativeDrv
...
This is for consistency with terminology in stdenv (and the terms
"hostDrv" and "buildDrv" are not very intuitive, even if they're
consistent with GNU terminology).
2012-12-28 19:08:19 +01:00
Arseniy Alekseyev
d1e70f9b84
Updated sysprof from 1.0.12 to 1.2.0.
...
Updated the sysprof package. I've removed 1.0.12 because itwas failing to build.
It also allowed to simplify the expression because 1.2.0 no longer
includes a kernel module.
2012-12-27 01:02:06 +00:00
Lluís Batlle i Rossell
499e686ca5
distcc: Fixing indentation
...
Noticed by niksnut.
2012-12-26 23:32:23 +01:00
Lluís Batlle i Rossell
67c73aafe8
Fixing distccMasquerade to have gas too
2012-12-26 21:54:09 +00:00
Lluís Batlle i Rossell
d779fc2da9
distccMasquerade: some fixes
2012-12-26 21:54:07 +00:00
Lluís Batlle i Rossell
ea5f15813c
distcc: Adding a derivation that prepares a masquerade for distccd
2012-12-26 21:54:06 +00:00
Lluís Batlle i Rossell
3e57886620
Adding wrappers for distcc, similar to those of ccache.
2012-12-26 21:53:57 +00:00
Peter Simons
b0e92ac388
haskell-timeplot: update to version 1.0.19
2012-12-25 11:35:04 +01:00
Peter Simons
5827744a0e
haskell-splot: update to version 0.3.7
2012-12-25 11:35:04 +01:00
Lluís Batlle i Rossell
d476a7eac0
distcc: making it build
2012-12-22 17:13:47 +01:00
Lluís Batlle i Rossell
d9f4b0a2e4
binutils: update to 2.23.1, and addition of patch for DT_NEEDED
2012-12-20 23:05:27 +01:00
Mathijs Kwik
4d57a834f9
phantomjs: it seems upx packing is only used on x86_64
2012-12-14 00:27:43 +01:00
Mathijs Kwik
fbee57defb
new package: casperjs
2012-12-13 17:51:03 +01:00
Mathijs Kwik
2cdc567ff5
new package: phantomjs
2012-12-13 17:51:03 +01:00
Eelco Dolstra
f364619e22
Merge remote-tracking branch 'origin/master' into stdenv-updates
2012-12-12 17:01:20 +01:00
Peter Simons
f9ad750bdc
haskell-uuagc: update to version 0.9.42.2
2012-12-08 11:35:18 +01:00
Peter Simons
f38f3e19f6
haskell-uuagc-cabal: update to version 1.0.4.0
2012-12-08 11:35:18 +01:00
Peter Simons
45ffccf33a
haskell-hlint: update to version 1.8.39
2012-12-08 11:35:18 +01:00
Michael Raskin
d3e5b8feee
Fix dummy pseudo-updates being found for some packages
2012-12-08 13:05:43 +04:00
Eelco Dolstra
5e256ccc88
Merge remote-tracking branch 'origin/master' into stdenv-updates
2012-12-04 17:12:35 +01:00
Mathijs Kwik
2b4fba3d03
neoload: upgrade to 4.1.1
2012-12-04 12:02:36 +01:00
Peter Simons
158388b521
haskell-cpphs: update to version 1.15
2012-12-03 16:12:12 +01:00
Peter Simons
b690d7a20b
haskell-hlint: update to version 1.8.37
2012-12-03 16:12:12 +01:00
Rob Vermaas
faaa1581e2
Added re2c 0.13.5
2012-12-02 00:25:01 +01:00
Eelco Dolstra
72684fb42f
Remove support for the obsolete powerpc-darwin and i686-darwin platforms
2012-11-29 14:10:49 +01:00