Peter Simons
0823aea0a6
Merge branch 'master' into stdenv-updates.
...
Conflicts:
pkgs/development/libraries/libxslt/default.nix
Commit 1764ea2b0a
introduced changes to libxslt
in an awkward way to avoid re-builds on Linux. This patch has been simplified
during this merge.
2013-03-25 13:43:45 +01:00
Peter Simons
ab98d72fad
git: fix build on FreeBSD
...
Our hard-linking code depended on md5sum, which FreeBSD doesn't have in its
system environment. To avoid that impure dependency, the hard-linking is now
done with the 'hardlink' utility from Nixpkgs.
2013-03-25 12:47:39 +01:00
Peter Simons
b08ba87b36
rsync: add meta.license attribute
2013-03-25 12:44:22 +01:00
Peter Simons
58211c125a
Merge pull request #407 from maggesi/proofgeneral_updates
...
Update ProofGeneral to version 4.2
2013-03-25 03:33:21 -07:00
Florian Friesdorf
9f7aef51ea
Revert "chromium-25.0.1364.172, 26.0.1410.40, 27.0.1448.0"
...
This reverts commit 6617f5ca9e
.
The old situation was definitely better. Sorry for waiting so long for
the revert.
2013-03-25 07:17:20 +01:00
Marco Maggesi
7b35dcdc62
ProofGeneral: remove dead code (compatibility with emacs 23).
2013-03-24 23:43:18 +01:00
Florian Friesdorf
c93aebb87e
get iptraf to compile
2013-03-24 14:44:10 +01:00
Shea Levy
4fa4ab3a6e
Partially revert my recent kernelPackages changes
...
First, pass in `self' again so that overriding works properly (thanks
for pointing that out, @edolstra)
Second, instead of having linuxPackages*.kernel mean something different
inside the set and out, add a new attribute linuxPackages*.kernelDev,
which for the generic kernel is simply linuxPackages*.kernel but for the
manual-config kernel is the `dev' output (which has the build tree,
source tree, etc.)
The second change required trivial modifications in a bunch of
expressions, I verified that all of the linuxPackages* sets defined in
all-packages.nix have the same drv paths before and after the change.
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-24 07:45:00 -04:00
Florian Friesdorf
6617f5ca9e
chromium-25.0.1364.172, 26.0.1410.40, 27.0.1448.0
...
26.0.1410.28 was broken for me
2013-03-23 18:20:38 +01:00
Peter Simons
6fc2cccfe6
Add myself as a maintainer to all Haskell packages (re-)generated by hackage4nix.
2013-03-23 15:58:14 +01:00
Lluís Batlle i Rossell
4144141c7b
Fixing the teamviewer evaluation and builds.
...
Now tested even the tarball, before committing.
2013-03-22 16:16:37 +01:00
Rok Garbas
f7ddf2fc4a
Merge pull request #398 from the-kenny/dunst
...
dunst, a lightweight notification daemon
2013-03-22 05:17:02 -07:00
Moritz Ulrich
c4ffd2cac9
dunst: Add meta.platforms.
...
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-03-22 13:00:49 +01:00
Lluís Batlle i Rossell
fb7b910aa3
Fixing tarball (missed assertion)
2013-03-22 12:55:01 +01:00
Peter Simons
7df21af242
wxmaxima: don't try to build this package on FreeBSD
2013-03-22 12:53:07 +01:00
Lluís Batlle i Rossell
d716731cf4
teamviewer: adding a work-in-progress lowprio version 8.
...
It requires root running a daemon, just to use the client. Suspicious.
2013-03-22 12:41:16 +01:00
Lluís Batlle i Rossell
6f64c0c6d6
teamviewer: fixing broken wine reference
2013-03-22 12:17:05 +01:00
Lluís Batlle i Rossell
930ace150b
Adding teamviewer client for linux (www.teamviewer.com)
...
In fact it uses wine.
2013-03-22 12:10:50 +01:00
Peter Simons
73c610e1d6
git: update to version 1.8.2
2013-03-22 02:11:38 +01:00
Mathijs Kwik
208a35558e
emacs-w3m: upgrade to current cvs
2013-03-22 00:00:06 +01:00
Mathijs Kwik
b73b3c9d62
htmlize: upgrade to 1.47
2013-03-22 00:00:06 +01:00
Mathijs Kwik
8b39202106
add dutch tax application for 2012
2013-03-22 00:00:04 +01:00
Peter Simons
22fb1ad99e
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-03-21 09:23:54 +01:00
Vladimír Čunát
d210a4a8fa
goldendict: fix build with gcc47
2013-03-21 00:08:24 +01:00
viric
9dc4ec57a1
Merge pull request #397 from modulistic/master
...
i3 improvements
2013-03-20 13:52:32 -07:00
Moritz Ulrich
c2d3d24349
Add dunst, a lightweight notification daemon.
...
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-03-20 21:35:13 +01:00
Lluís Batlle i Rossell
0d23e54588
opus-tools: update
2013-03-20 20:28:39 +01:00
Peter Simons
d28d3f37a8
topgit: fix build on FreeBSD
...
The BSD unices have a version of install(1) that doesn't support the -D flag. Grr.
2013-03-20 11:43:43 +01:00
Peter Simons
7ee8641410
haskell-xmonad-contrib: update to version 0.11.1
2013-03-20 10:44:54 +01:00
Peter Simons
51e64392ea
git-annex: update to version 4.20130314
2013-03-20 10:15:06 +01:00
Peter Simons
a1a7448e5b
topgit: update to version 0.9
2013-03-20 09:50:06 +01:00
modulistic
ae9b33ac51
i3 window manager: version bump from 4.5 to 4.5.1
2013-03-20 00:14:22 +01:00
modulistic
f976962d7b
i3 window manager: enable Pango support for antialiased fonts
2013-03-20 00:13:44 +01:00
Marco Maggesi
cd3caeaf8f
Update ProofGeneral to version 4.2
2013-03-19 14:49:45 +01:00
Peter Simons
4fcb4a1ca1
gv: update to version 3.7.4
2013-03-18 11:36:16 +01:00
Lluís Batlle i Rossell
470a015950
transmission: nicer about disabling gtk
2013-03-17 22:30:42 +01:00
Lluís Batlle i Rossell
51528e61d9
transmission: update to 2.77, but leave the old 2.60 for its gtk client
...
The gtk client in 2.61 and above require a gtk3 we don't have in nixpkgs yet.
2013-03-17 22:27:55 +01:00
Rok Garbas
464fd741cd
notmuch: update to 0.15.2
2013-03-17 15:13:53 +01:00
Rok Garbas
16f6c3b752
i3: update to 4.5 also updating i3status to 2.7
2013-03-17 14:45:37 +01:00
Danny Wilson
d007a78ccb
Merge remote-tracking branch 'origin/stdenv-updates' into illumos
...
Conflicts:
pkgs/development/libraries/gmp/5.1.1.nix
pkgs/development/libraries/mpc/default.nix
pkgs/development/libraries/mpfr/default.nix
pkgs/development/libraries/ppl/default.nix
pkgs/tools/misc/coreutils/default.nix
2013-03-17 13:22:24 +01:00
Vladimír Čunát
192bdc79ae
Merge pull request #380 from oxij/random-updates
...
cmus: update to 2.5.0
2013-03-16 11:40:06 -07:00
Vladimír Čunát
d898a207b9
Merge pull request #375 from ierton/viewnior
...
viewnior: Add viewnior, GTK image viewer program
2013-03-16 11:33:53 -07:00
Cillian de Róiste
1f000ba427
Merge branch 'master' of github.com:NixOS/nixpkgs
2013-03-16 16:33:43 +01:00
Cillian de Róiste
2b07e1bf4c
Ardour3: update to the release of Ardour 3.0
...
A tarball is only available to subscribers or people who pay
to download it on the site. This project is GPL licensed but
users are strongly encouraged to support it financially
2013-03-16 16:33:16 +01:00
Lluis Batlle
8d76cf51bb
elinks: allow building without guile
...
Guile doesn't build on armv5tel now (failing an important test),
so better if I can disable it for elinks.
2013-03-16 13:39:30 +01:00
Eelco Dolstra
098190c9dd
firefox: Update to 19.0.2
2013-03-15 14:31:25 +01:00
Vladimír Čunát
9ac8a16277
vimprobable2, surf: fix the settings-schemas problem
...
Note that they still segfault.
2013-03-14 16:01:53 +01:00
Sander van der Burg
23c78e41db
git: Adding -lgcc_s on darwin causes the build to fail, so we disable it for that platform
2013-03-14 14:57:40 +01:00
Jan Malakhovski
33379ae58a
cmus: update to 2.5.0
...
This version builds with current ffmpeg.
CUE support is nice too.
2013-03-14 13:50:29 +00:00
Peter Simons
ea804dfb1a
Merge pull request #376 from pcapriotti/master
...
Fix bip build
2013-03-13 02:55:00 -07:00