Commit graph

1236 commits

Author SHA1 Message Date
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
Eelco Dolstra
5553546c21 Remove a bunch of unreferenced files
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Mathijs Kwik
288d98afd9 neoload: upgrade to 4.1.0 2012-11-27 02:14:06 +01:00
Florian Friesdorf
fc57b8940b intltool: fix license attribute name 2012-11-26 16:11:32 +01:00
Michael Raskin
7333c01dba Update Compiz 2012-11-25 23:58:04 +04:00
Lluís Batlle i Rossell
2880190491 valgrind: updating to bugfix release 3.8.1 2012-11-23 15:04:51 +01:00
Michael Raskin
1c32897905 Merge pull request #187 from orbitz/ocaml-findlib-add-topfind
Ocaml findlib add topfind
2012-11-21 21:34:09 -08:00
Peter Simons
f67d5a9a39 Merge branch 'master' into stdenv-updates.
Conflicts have been resolved in:

        pkgs/tools/misc/file/default.nix
        pkgs/top-level/all-packages.nix
        pkgs/top-level/python-packages.nix
2012-11-21 16:20:36 +01:00
Mathijs Kwik
b155a188e3 neoload: link used jre to a location which is hard-coded into some binaries 2012-11-21 09:49:35 +01:00