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