Commit Graph

17461 Commits

Author SHA1 Message Date
Arie Middelkoop
d6f60f7135 emacs htmlize: fix of broken source url.
svn path=/nixpkgs/trunk/; revision=31827
2012-01-24 22:06:35 +00:00
Peter Simons
5f39616d9d haskell-ghc-mod: revert updated to version 1.0.7
The check-in accidentally overwrote Emacs-specific extensions of the expression.

svn path=/nixpkgs/trunk/; revision=31826
2012-01-24 22:06:33 +00:00
Sander van der Burg
c436381674 Bumped versions of disnix and disnixos
svn path=/nixpkgs/trunk/; revision=31825
2012-01-24 21:13:42 +00:00
Peter Simons
c7dc7f5e87 haskell-tar: updated to version 0.3.2.0
svn path=/nixpkgs/trunk/; revision=31823
2012-01-24 15:06:39 +00:00
Peter Simons
3680b19ba5 haskell-zeromq-haskell: updated to version 0.8.3
svn path=/nixpkgs/trunk/; revision=31822
2012-01-24 15:06:37 +00:00
Peter Simons
c1782a6cf3 haskell-tls-extra: updated to version 0.4.2.1
svn path=/nixpkgs/trunk/; revision=31821
2012-01-24 15:06:35 +00:00
Peter Simons
b5c5f34de9 haskell-statistics: updated to version 0.10.1.0
svn path=/nixpkgs/trunk/; revision=31820
2012-01-24 15:06:32 +00:00
Peter Simons
3a9f2dd52f haskell-pretty-show: updated to version 1.2
svn path=/nixpkgs/trunk/; revision=31819
2012-01-24 15:06:30 +00:00
Peter Simons
ab05bdf5b0 haskell-mongoDB: updated to version 1.2.0
svn path=/nixpkgs/trunk/; revision=31818
2012-01-24 15:06:27 +00:00
Peter Simons
26692953cd haskell-instant-generics: updated to version 0.3.4
svn path=/nixpkgs/trunk/; revision=31817
2012-01-24 15:06:25 +00:00
Peter Simons
fdb8059a3d haskell-hxt: updated to version 9.2.0
svn path=/nixpkgs/trunk/; revision=31816
2012-01-24 15:06:23 +00:00
Peter Simons
076a50553d haskell-happstack-hamlet: updated to version 6.2.3
svn path=/nixpkgs/trunk/; revision=31815
2012-01-24 15:06:20 +00:00
Peter Simons
1898dbd6cb haskell-ghc-mod: updated to version 1.0.7
svn path=/nixpkgs/trunk/; revision=31814
2012-01-24 15:06:18 +00:00
Peter Simons
19764552a0 haskell-generic-deriving: updated to version 1.0.3
svn path=/nixpkgs/trunk/; revision=31813
2012-01-24 15:06:16 +00:00
Peter Simons
6ca63ba20a haskell-data-object-yaml: updated to version 0.3.4.1
svn path=/nixpkgs/trunk/; revision=31812
2012-01-24 15:06:13 +00:00
Peter Simons
d5e86595d6 haskell-criterion: updated to version 0.6.0.1
svn path=/nixpkgs/trunk/; revision=31811
2012-01-24 15:06:11 +00:00
Peter Simons
58a4717d0a haskell-bson: updated to version 0.1.7
svn path=/nixpkgs/trunk/; revision=31810
2012-01-24 15:06:08 +00:00
Peter Simons
592c7f453b haskell-aeson: updated to version 0.6.0.0
svn path=/nixpkgs/trunk/; revision=31809
2012-01-24 15:06:06 +00:00
Peter Simons
f99bad4225 haskell-HStringTemplate: updated to version 0.6.8
svn path=/nixpkgs/trunk/; revision=31808
2012-01-24 15:06:03 +00:00
Peter Simons
ea9708ca01 haskell-mwc-random: added version 0.11.0.0
svn path=/nixpkgs/trunk/; revision=31807
2012-01-24 15:06:00 +00:00
Peter Simons
5f7e961d15 haskell-HsOpenSSL: added version 0.10.1.2
svn path=/nixpkgs/trunk/; revision=31806
2012-01-24 15:05:57 +00:00
Peter Simons
9e5c06adc9 haskell-language-javascript: updated to version 0.4.6
svn path=/nixpkgs/trunk/; revision=31805
2012-01-24 15:05:54 +00:00
Peter Simons
76cbc8ade8 haskell-text: added version 0.11.1.13
svn path=/nixpkgs/trunk/; revision=31804
2012-01-24 15:05:51 +00:00
Ludovic Courtès
b479c4b172 GCC 4.5.1: Add `gcc45_debug'.
svn path=/nixpkgs/trunk/; revision=31803
2012-01-24 14:56:41 +00:00
Karn Kallio
47ae4a01bd kdenlive builds for kde48 release candidate (and kde47).
svn path=/nixpkgs/trunk/; revision=31802
2012-01-24 04:50:55 +00:00
Karn Kallio
151fcc6133 Get kdelibs from kde48 release candidate to build.
svn path=/nixpkgs/trunk/; revision=31801
2012-01-24 01:54:49 +00:00
Karn Kallio
8e00bbb06b Get kadu to compile with kde48 (as well as kde47).
svn path=/nixpkgs/trunk/; revision=31800
2012-01-24 00:00:41 +00:00
Karn Kallio
39206f5b44 Get psi to compile with kde47 and kde48.
svn path=/nixpkgs/trunk/; revision=31799
2012-01-24 00:00:34 +00:00
Karn Kallio
90563b958f kde 4.8 release candidate uses unstable directory for download.
svn path=/nixpkgs/trunk/; revision=31798
2012-01-23 21:56:33 +00:00
Karn Kallio
05bbc5edd5 ProofGeneral documentation does not build without cm-super fonts.
svn path=/nixpkgs/trunk/; revision=31797
2012-01-23 19:03:41 +00:00
Andres Löh
bbc726c86a Adding haskell-DSH and dependencies.
svn path=/nixpkgs/trunk/; revision=31794
2012-01-23 16:22:34 +00:00
Florian Friesdorf
5c05e3f866 emacs-24 alsaLib and imagemagickBig
svn path=/nixpkgs/trunk/; revision=31788
2012-01-23 00:55:48 +00:00
Ludovic Courtès
44e38c020a libgc 7.2alpha6 (June 2011).
svn path=/nixpkgs/trunk/; revision=31787
2012-01-22 10:52:09 +00:00
Arie Middelkoop
c298a5ba25 Version bumb of libmsn to 4.2.1.
This fixes the problem that with the previous version a connection with microsoft services could not be established anymore.

svn path=/nixpkgs/trunk/; revision=31786
2012-01-21 23:59:36 +00:00
Peter Simons
9b740035a4 mplayer: renamed the expression from "mplayer-r${version}" to "mplayer-${version}"
The additional 'r' after the hyphen prevented nix-env from recognizing the SVN
revision number as a version'ish kind of thing; thus nix-env would never update
an installed mplayer in any user profile.

In other words, to get this particular update, you must remove the old
expression by running

    nix-env -e mplayer-r33472

..., and then install the new one:

nix-env -i mplayer

svn path=/nixpkgs/trunk/; revision=31785
2012-01-21 21:25:45 +00:00
Peter Simons
c9d11ba56a mplayer: update mplayer and ffmpeg to current HEAD versions
svn path=/nixpkgs/trunk/; revision=31784
2012-01-21 21:25:41 +00:00
Peter Simons
70895ed45c haskell-lifted-base: updated to version 0.1.0.3
svn path=/nixpkgs/trunk/; revision=31783
2012-01-21 20:39:44 +00:00
Peter Simons
7f062680e4 ledger3: updated to current HEAD
svn path=/nixpkgs/trunk/; revision=31782
2012-01-21 19:25:50 +00:00
Peter Simons
83fef2d3fa ledger3: added some kind of date-based fake version number to help nix-env decide when to update
svn path=/nixpkgs/trunk/; revision=31781
2012-01-21 19:25:45 +00:00
Peter Simons
cf287936ac ledger: renamed 2.6.3 version's nix file for consistency
svn path=/nixpkgs/trunk/; revision=31780
2012-01-21 19:25:41 +00:00
Peter Simons
40656ea5d1 mercurial: remove obsolete 'getConfig' mechanism to enable/disable GUI in favor of override
svn path=/nixpkgs/trunk/; revision=31778
2012-01-21 19:08:58 +00:00
Peter Simons
3c733ba49f all-packages.nix: provide mercurialFull package that comes with GUI front-end
This version preferred in user profiles, but not by packages that refer
to mercurial by attribute name.

svn path=/nixpkgs/trunk/; revision=31777
2012-01-21 19:08:56 +00:00
Peter Simons
a118bc809e all-packages.nix: removed comment which I believe to be obsolete
svn path=/nixpkgs/trunk/; revision=31776
2012-01-21 19:08:52 +00:00
Peter Simons
680787f13e mercurial: updated to version 2.0.2
svn path=/nixpkgs/trunk/; revision=31775
2012-01-21 19:08:48 +00:00
Peter Simons
58b19bd365 all-packages.nix: removed notmuchGit attribute to fix "nix-env -u \*"
The corresponding expression is missing.

svn path=/nixpkgs/trunk/; revision=31774
2012-01-21 18:55:22 +00:00
Peter Simons
8045c6ebe2 dri-proto: upgraded to version 2.6 so that we can use intel 2.17 driver
svn path=/nixpkgs/trunk/; revision=31773
2012-01-21 18:47:40 +00:00
Peter Simons
87f1f70070 mesa: disabled unmaintained i965 gallium driver
svn path=/nixpkgs/trunk/; revision=31772
2012-01-21 18:47:37 +00:00
Peter Simons
e926d8d9f2 emacs: updated 23.3 to 23.3b
svn path=/nixpkgs/trunk/; revision=31771
2012-01-21 18:46:37 +00:00
Peter Simons
e86daecce9 emacs: strip trailing whitespace from expression for 23.x
svn path=/nixpkgs/trunk/; revision=31770
2012-01-21 18:46:28 +00:00
Peter Simons
33cfa26445 cups: don't build with dbus support on non-Linux platforms
svn path=/nixpkgs/trunk/; revision=31769
2012-01-21 18:46:09 +00:00
Florian Friesdorf
364f1ce3f7 notmuch as emacsPackage and top-level without emacs support
svn path=/nixpkgs/trunk/; revision=31768
2012-01-21 18:29:14 +00:00
Florian Friesdorf
a8a8f5df23 notmuch-0.11
svn path=/nixpkgs/trunk/; revision=31767
2012-01-21 18:29:11 +00:00
Florian Friesdorf
89afc87de6 xapian-1.2.8
svn path=/nixpkgs/trunk/; revision=31766
2012-01-21 18:29:08 +00:00
Florian Friesdorf
c554168536 org-7.8.03
svn path=/nixpkgs/trunk/; revision=31765
2012-01-21 18:29:06 +00:00
Florian Friesdorf
57733bae5d remove emacsSnapshot in favour of emacs24
svn path=/nixpkgs/trunk/; revision=31764
2012-01-21 18:29:02 +00:00
Florian Friesdorf
0d2d1dd139 emacs-24.0.92
svn path=/nixpkgs/trunk/; revision=31763
2012-01-21 18:28:57 +00:00
Florian Friesdorf
aa277f7d06 emacs-23 as base for emacs-24
svn path=/nixpkgs/trunk/; revision=31762
2012-01-21 18:28:54 +00:00
Florian Friesdorf
2d0a86d057 conkeror-1.0pre-20120105
svn path=/nixpkgs/trunk/; revision=31761
2012-01-21 18:28:51 +00:00
Florian Friesdorf
c9a2081809 conkeror, added myself as maintainer
svn path=/nixpkgs/trunk/; revision=31760
2012-01-21 18:28:48 +00:00
Florian Friesdorf
0c01cddb03 chromium 18.0.975.0-pre114925
svn path=/nixpkgs/trunk/; revision=31759
2012-01-21 18:28:44 +00:00
Florian Friesdorf
98613aa43d chromium, added myself as maintainer
svn path=/nixpkgs/trunk/; revision=31758
2012-01-21 18:28:39 +00:00
Peter Simons
f8eee42a66 git-annex: updated to version 3.20120116
svn path=/nixpkgs/trunk/; revision=31757
2012-01-21 14:32:42 +00:00
Lluís Batlle i Rossell
a4c35d0393 I made the use of ccacheWrapper somewhat easier.
svn path=/nixpkgs/trunk/; revision=31756
2012-01-21 11:22:13 +00:00
Lluís Batlle i Rossell
9ed137c45b Picking in pkgconfig the latest config.guess, as it does not know
mips64el-linux 3.2.0.

svn path=/nixpkgs/trunk/; revision=31754
2012-01-21 01:29:17 +00:00
Lluís Batlle i Rossell
8ea631310b Making the ccacheWrapper a bit nicer. More flexible, specifically.
svn path=/nixpkgs/trunk/; revision=31753
2012-01-21 01:29:06 +00:00
Lluís Batlle i Rossell
4a1c721c01 Changing every reference from mips64-linux to mips64el-linux. That's
what the new nix thinks the fuloong is.

Anyone having the old nix should use a nixpkgs previous to this change to build
the new nix. And then, with the new nix, he can use any newer nixpkgs revision.

svn path=/nixpkgs/trunk/; revision=31751
2012-01-21 00:34:51 +00:00
Lluís Batlle i Rossell
e6c1aa2005 Fixing the kernel configuration for Fuloong2F. Specially with VGA_CONSOLE enabled,
it will not boot.

svn path=/nixpkgs/trunk/; revision=31750
2012-01-21 00:34:38 +00:00
Lluís Batlle i Rossell
6945a75f7b Adding a patch for mesa, for it to build on the loongson2f.
svn path=/nixpkgs/trunk/; revision=31749
2012-01-21 00:34:30 +00:00
Lluís Batlle i Rossell
09fee60ee2 Fixing a typo. And letting stdenvCross be prioritary to the global override.
svn path=/nixpkgs/trunk/; revision=31748
2012-01-21 00:26:50 +00:00
Lluís Batlle i Rossell
2f2ce81046 Modifying the all-packages stdenv changer, so it allows having a global stdenv
wrapper.

This will fail for crossStdenv, but it allows a wrapper that uses ccache for
example. That's so described in all-packages.nix around 'ccache'.


svn path=/nixpkgs/trunk/; revision=31747
2012-01-21 00:25:30 +00:00
Peter Simons
9c55349494 cups: cosmetic, no functional change
svn path=/nixpkgs/trunk/; revision=31746
2012-01-20 18:08:54 +00:00
Peter Simons
c99249d0c2 cups: blind attempt to fix the CUPS build for non-Linux platforms, particularly Darwin
svn path=/nixpkgs/trunk/; revision=31745
2012-01-20 18:08:50 +00:00
Lluís Batlle i Rossell
10394bd844 Updating linux 3.2 to 3.2.1
svn path=/nixpkgs/trunk/; revision=31743
2012-01-20 16:51:39 +00:00
Eelco Dolstra
b786ce664d * Bump nixUnstable.
svn path=/nixpkgs/trunk/; revision=31738
2012-01-20 15:26:47 +00:00
Sander van der Burg
2c3e921a4c Bumped MySQL 5.5.15 to 5.5.20
svn path=/nixpkgs/trunk/; revision=31735
2012-01-20 12:29:13 +00:00
Andres Löh
dd83243b8c Make statistics and criterion compile with ghc-6.12.3.
svn path=/nixpkgs/trunk/; revision=31733
2012-01-20 10:54:09 +00:00
Yury G. Kudryashov
c2b80e225c directfb-1.5.3
svn path=/nixpkgs/trunk/; revision=31730
2012-01-20 00:45:22 +00:00
Ludovic Courtès
5cd82587aa overrideDerivation: Check whether hostDrv' and buildDrv' are present.
svn path=/nixpkgs/trunk/; revision=31727
2012-01-19 22:29:26 +00:00
Peter Simons
bf71d12fd4 texlive-moderncv: updated to version 2012.01.16
svn path=/nixpkgs/trunk/; revision=31725
2012-01-19 22:10:41 +00:00
Peter Simons
1bc803cb09 glib-2.28.x: blind commit that hopefully fixes a lot of build errors on Darwin
It appears that users of glibc expect to be able to link libintl via pkgconfig.
On Linux, this always works because that library comes with glibc, but on other
platforms gettext is required to fulfill the dependency.

I don't have access to Darwin, so I cannot actually test this change. If any
runs into problems because of this modification, please feel free to revert it!

svn path=/nixpkgs/trunk/; revision=31723
2012-01-19 21:43:17 +00:00
Peter Simons
e2633477c0 haskell-hakyll: updated to version 3.2.4.1
svn path=/nixpkgs/trunk/; revision=31722
2012-01-19 21:43:14 +00:00
Eelco Dolstra
2ebf8df601 * Apply the latest Gentoo patches to Grub 1.
svn path=/nixpkgs/trunk/; revision=31720
2012-01-19 21:08:33 +00:00
Ludovic Courtès
723e46b6a7 GRUB 0.97: Use an old Automake.
svn path=/nixpkgs/trunk/; revision=31719
2012-01-19 21:07:02 +00:00
Peter Simons
b94fef3cba all-packages.nix: added texLiveFull attribute, which is a working TexLive installation with all supported packages enabled
svn path=/nixpkgs/trunk/; revision=31717
2012-01-19 20:45:17 +00:00
Yury G. Kudryashov
d0c8b530e9 leiningen: added package version 1.6.2
svn path=/nixpkgs/trunk/; revision=31716
2012-01-19 20:34:59 +00:00
Yury G. Kudryashov
185a3d13aa digikam-2.5.0
svn path=/nixpkgs/trunk/; revision=31715
2012-01-19 20:28:13 +00:00
Yury G. Kudryashov
8deba0e4f8 Revert digikam change
svn path=/nixpkgs/trunk/; revision=31714
2012-01-19 20:28:09 +00:00
Yury G. Kudryashov
d38c5e7ee4 KTorrent 4.1.3, fix build with KDE 4.8
svn path=/nixpkgs/trunk/; revision=31713
2012-01-19 20:28:05 +00:00
Yury G. Kudryashov
8899e60693 Remove unused patches, fix pykde4 patch
svn path=/nixpkgs/trunk/; revision=31712
2012-01-19 20:27:59 +00:00
Rob Vermaas
087af1bfe7 add gwt 2.4.0, patch provided by TermNL
svn path=/nixpkgs/trunk/; revision=31711
2012-01-19 19:31:25 +00:00
Ludovic Courtès
08439eb00a overrideDerivation: Override hostDrv' and buildDrv' too.
svn path=/nixpkgs/trunk/; revision=31706
2012-01-19 16:44:17 +00:00
Peter Simons
f84e15f11c haskell-xml-conduit: updated to version 0.5.1.2
svn path=/nixpkgs/trunk/; revision=31697
2012-01-19 14:46:06 +00:00
Peter Simons
f52d0d1634 haskell-web-routes: updated to version 0.26.2
svn path=/nixpkgs/trunk/; revision=31696
2012-01-19 14:46:04 +00:00
Peter Simons
af2e5746af haskell-web-routes-quasi: updated to version 0.7.1.1
svn path=/nixpkgs/trunk/; revision=31695
2012-01-19 14:46:01 +00:00
Peter Simons
42105ddc82 haskell-vault: updated to version 0.1.0.0
svn path=/nixpkgs/trunk/; revision=31694
2012-01-19 14:45:59 +00:00
Peter Simons
9af6a32767 haskell-shakespeare-css: updated to version 0.10.6
svn path=/nixpkgs/trunk/; revision=31693
2012-01-19 14:45:56 +00:00
Peter Simons
c037e74e61 haskell-neither: updated to version 0.3.0.1
svn path=/nixpkgs/trunk/; revision=31692
2012-01-19 14:45:51 +00:00
Peter Simons
d1645c819d haskell-json-enumerator: updated to version 0.0.1.2
svn path=/nixpkgs/trunk/; revision=31691
2012-01-19 14:45:47 +00:00
Peter Simons
5e9d807f5f haskell-http-enumerator: updated to version 0.7.2.5
svn path=/nixpkgs/trunk/; revision=31690
2012-01-19 14:45:44 +00:00
Peter Simons
ac0ab1b200 haskell-hamlet: updated to version 0.10.7.1
svn path=/nixpkgs/trunk/; revision=31689
2012-01-19 14:45:41 +00:00
Peter Simons
007bb142bd haskell-data-object: updated to version 0.3.1.9
svn path=/nixpkgs/trunk/; revision=31688
2012-01-19 14:45:38 +00:00
Peter Simons
4bf2f17323 haskell-convertible-text: updated to version 0.4.0.2
svn path=/nixpkgs/trunk/; revision=31687
2012-01-19 14:45:29 +00:00
Peter Simons
5856dbaa53 haskell-control-monad-attempt: updated to version 0.3.0.1
svn path=/nixpkgs/trunk/; revision=31686
2012-01-19 14:45:14 +00:00
Peter Simons
40a684701a haskell-blaze-textual-native: updated to version 0.2.1.1
svn path=/nixpkgs/trunk/; revision=31685
2012-01-19 14:45:10 +00:00
Peter Simons
62e31a562f haskell-aeson-native: updated to version 0.3.3.2
svn path=/nixpkgs/trunk/; revision=31684
2012-01-19 14:44:55 +00:00
Peter Simons
13e5cf2efb haskell-vault: added version 0.1.0.0
svn path=/nixpkgs/trunk/; revision=31683
2012-01-19 14:44:33 +00:00
Ludovic Courtès
652712b77a udisks: Autoreconf properly.
svn path=/nixpkgs/trunk/; revision=31679
2012-01-19 09:23:24 +00:00
Ludovic Courtès
ed221cf4cc GNUnet 0.9.1.
svn path=/nixpkgs/trunk/; revision=31677
2012-01-18 20:53:00 +00:00
Ludovic Courtès
94a0bbcef3 GNU Source-Highlight 3.1.6.
svn path=/nixpkgs/trunk/; revision=31676
2012-01-18 20:52:55 +00:00
Ludovic Courtès
9975a56711 GNU xnee 3.11.
svn path=/nixpkgs/trunk/; revision=31675
2012-01-18 20:52:50 +00:00
Ludovic Courtès
7ce8cc9f2c GNU Parallel 20111222.
svn path=/nixpkgs/trunk/; revision=31674
2012-01-18 20:52:45 +00:00
Ludovic Courtès
d9433c2167 GNU ddrescue 1.15.
svn path=/nixpkgs/trunk/; revision=31673
2012-01-18 20:52:40 +00:00
Ludovic Courtès
ffdd332cf7 libassuan 2.0.3.
svn path=/nixpkgs/trunk/; revision=31672
2012-01-18 20:52:36 +00:00
Ludovic Courtès
16753086a3 GNU Libidn 1.24.
svn path=/nixpkgs/trunk/; revision=31671
2012-01-18 20:52:31 +00:00
Ludovic Courtès
c295b6638e GNU SIP Witch 1.2.1.
svn path=/nixpkgs/trunk/; revision=31670
2012-01-18 20:52:26 +00:00
Ludovic Courtès
8aaa52d532 GNU Common C++ 5.1.2.
svn path=/nixpkgs/trunk/; revision=31669
2012-01-18 20:52:22 +00:00
Ludovic Courtès
649168b846 GNU FreeIPMI 1.1.1.
svn path=/nixpkgs/trunk/; revision=31668
2012-01-18 20:52:17 +00:00
Ludovic Courtès
300372af20 GNU Automake 1.11.2.
svn path=/nixpkgs/trunk/; revision=31667
2012-01-18 20:52:12 +00:00
Ludovic Courtès
3d7597fdb9 GNU recutils 1.5.
svn path=/nixpkgs/trunk/; revision=31666
2012-01-18 20:52:07 +00:00
Ludovic Courtès
9d5df9699b GnuTLS 3.0.11.
svn path=/nixpkgs/trunk/; revision=31665
2012-01-18 20:52:02 +00:00
Ludovic Courtès
449c5b537d GNU Zile 2.4.3.
svn path=/nixpkgs/trunk/; revision=31664
2012-01-18 20:51:58 +00:00
Ludovic Courtès
2a6f139c5d expect: Remove unneeded dependency on Autoconf.
svn path=/nixpkgs/trunk/; revision=31663
2012-01-18 20:51:52 +00:00
Peter Simons
0f3fa64430 wicd: integrate with upstart events
quite some services need to be started/restarted when a connection is
established/teared down. Also, some services are optional depending on
the connected access point. For example: use a vpn on an untrusted
network.

these small trigger scripts don't change any behaviour by themselves,
but allow you to hook in to them if you need.

example use:

  jobs.gw6c.startOn = pkgs.lib.mkForce "started  openvpn-dcsOffice";
  jobs.gw6c.stopOn  = pkgs.lib.mkForce "stopping openvpn-dcsOffice";
  jobs."openvpn-dcsOffice".startOn        = pkgs.lib.mkForce "wicd-postconnect";
  jobs."openvpn-dcsOffice".stopOn         = pkgs.lib.mkForce "stopping network-interfaces or wicd-predisconnect";

In the example, I use 3 layers. When a physical connection is
available (wifi connect), I setup a vpn connection, and setup an ipv6
tunnel on top of that. When disconnecting, they are automatically shut
down in the right order as well.

svn path=/nixpkgs/trunk/; revision=31662
2012-01-18 20:38:34 +00:00
Peter Simons
5ebdf058cc intel X driver: upgraded to fix display glitches on newer chips
at least 2 nixos users were affected by a graphics bug that got fixed
in 2.15.
Officially 2.15 was meant for a newer xorg server, libdrm, mesa and all, but
I've been running with this for over a month with no issues (used
compositing desktop, opengl and hd video).

I know 2.17 is in the repo, but it doesn't builde (missing deps I
think).

svn path=/nixpkgs/trunk/; revision=31661
2012-01-18 20:38:30 +00:00
Peter Simons
8b3dd70553 openvpn: use iproute2 instead of net-tools
for setting up tunnel/routes.
I had some issues with ipv6, iproute2 fixed those.

Both are equally well supported by upstream.

svn path=/nixpkgs/trunk/; revision=31660
2012-01-18 20:38:27 +00:00
Peter Simons
1e4a7842d2 rsync: optional feature (disabled by default) to sync devices
I use this feature for doing snapshot backups, which is way faster
than copying a huge files tree.

The patch is semi-official, rsync-patches is maintained by rsync
upstream itself.
The patch doesn't affect any behaviour, it only adds 1 option
so it shouldn't affect you if you don't use it.

svn path=/nixpkgs/trunk/; revision=31659
2012-01-18 20:38:24 +00:00
Peter Simons
7b1be8e27d btrfs-progs: small fix for Makefile
line was split so we cannot append anymore because that appends after \

svn path=/nixpkgs/trunk/; revision=31656
2012-01-18 20:32:45 +00:00
Peter Simons
8985708131 mongodb: new package (nosql database) - nixos integration available
svn path=/nixpkgs/trunk/; revision=31655
2012-01-18 20:32:41 +00:00
Peter Simons
e58052514b youtube-dl: new package (download clips from youtube)
svn path=/nixpkgs/trunk/; revision=31654
2012-01-18 20:32:37 +00:00
Peter Simons
02392785c5 ghc-mod: new package (emacs haskell-mode extension)
svn path=/nixpkgs/trunk/; revision=31653
2012-01-18 20:32:34 +00:00
Peter Simons
cd22d76a8e maintainers: added myself for upcoming packages
svn path=/nixpkgs/trunk/; revision=31652
2012-01-18 20:32:31 +00:00
Peter Simons
1646bc36da wpa_supplicant: fixed crashing bug
on some hardware, wpa_supplicant would crash when controlled via dbus
(wicd/networkmanager), this patch fixes it.

svn path=/nixpkgs/trunk/; revision=31651
2012-01-18 20:32:29 +00:00
Peter Simons
f94f871b67 node.js: use shared v8 instead of bundled one
svn path=/nixpkgs/trunk/; revision=31650
2012-01-18 20:32:26 +00:00
Peter Simons
7abb4986a2 v8: upgraded to latest stable 3.6 version (which node.js uses)
svn path=/nixpkgs/trunk/; revision=31649
2012-01-18 20:32:23 +00:00
Peter Simons
3eca1b395f jruby: upgraded to latest version, fixed java dependency
svn path=/nixpkgs/trunk/; revision=31648
2012-01-18 20:32:20 +00:00
Peter Simons
3dd02a75ef openvpn: upgraded to latest version
svn path=/nixpkgs/trunk/; revision=31647
2012-01-18 20:32:17 +00:00
Peter Simons
3ea9f68e75 uhc: upgraded to latest version
svn path=/nixpkgs/trunk/; revision=31646
2012-01-18 20:32:14 +00:00
Peter Simons
db009e0eb8 emacs org-mode: upgraded to latest version
svn path=/nixpkgs/trunk/; revision=31645
2012-01-18 20:32:10 +00:00
Eelco Dolstra
f6db0ed1e0 * Mesa only builds on Linux.
svn path=/nixpkgs/trunk/; revision=31640
2012-01-18 18:45:00 +00:00
Michael Raskin
faedda84ef A more correct condition for adding scripts to install
svn path=/nixpkgs/trunk/; revision=31638
2012-01-18 17:23:41 +00:00
Sander van der Burg
45add982ae Bumped JSON to 2.53 and JSON-XS to 2.32. The older versions doesn't seem to be located on these sites anymore
svn path=/nixpkgs/trunk/; revision=31634
2012-01-18 16:19:25 +00:00
Alexander Tsamutali
87441a72be perl-packages.nix: Added Sort-Versions.
svn path=/nixpkgs/trunk/; revision=31631
2012-01-18 15:14:42 +00:00
Peter Simons
a0672a86dc haskell-yaml: updated to version 0.5.1.2
svn path=/nixpkgs/trunk/; revision=31630
2012-01-18 15:09:47 +00:00
Peter Simons
a0e44836a4 haskell-xml-conduit: updated to version 0.5.1.1
svn path=/nixpkgs/trunk/; revision=31629
2012-01-18 15:09:45 +00:00
Peter Simons
6094053539 haskell-zlib-conduit: updated to version 0.0.1
svn path=/nixpkgs/trunk/; revision=31628
2012-01-18 15:04:24 +00:00
Peter Simons
45bd1f2365 haskell-xml: updated to version 1.3.12
svn path=/nixpkgs/trunk/; revision=31627
2012-01-18 15:04:21 +00:00
Peter Simons
4401790252 haskell-tls: updated to version 0.8.5
svn path=/nixpkgs/trunk/; revision=31626
2012-01-18 15:04:19 +00:00
Peter Simons
2448541afc haskell-data-accessor-template: updated to version 0.2.1.9
svn path=/nixpkgs/trunk/; revision=31625
2012-01-18 15:04:16 +00:00
Peter Simons
8cc90001d9 haskell-blaze-builder-conduit: updated to version 0.0.1
svn path=/nixpkgs/trunk/; revision=31624
2012-01-18 15:04:14 +00:00
Peter Simons
494083fbf6 haskell-attoparsec-conduit: updated to version 0.0.1
svn path=/nixpkgs/trunk/; revision=31623
2012-01-18 15:04:11 +00:00
Peter Simons
09dee8994f haskell-idris: updated to version 0.9.0
svn path=/nixpkgs/trunk/; revision=31622
2012-01-18 15:04:09 +00:00
Alexander Tsamutali
6b174cfb82 applications/networking/remote/freerdp: Updated to 1.0.0.
svn path=/nixpkgs/trunk/; revision=31620
2012-01-18 13:45:46 +00:00
Eelco Dolstra
bbe40d00f4 * Bump nixUnstable.
svn path=/nixpkgs/trunk/; revision=31619
2012-01-18 12:23:42 +00:00
Michael Raskin
6fd326a636 Remove obsolete phase
svn path=/nixpkgs/trunk/; revision=31618
2012-01-18 10:27:48 +00:00
Michael Raskin
a975a35254 Update Vacuum-IM
svn path=/nixpkgs/trunk/; revision=31617
2012-01-18 10:26:38 +00:00
Arie Middelkoop
ef07990836 Update of the 'thunderbird' package to 9.0.1.
Note: this update simplified the nix expression, as some of the problems mentioned in
the original expression do not seem present anymore.

Also note: the original expression did not compile in combination with the 3.1 kernel. 

svn path=/nixpkgs/trunk/; revision=31615
2012-01-17 22:43:26 +00:00
Arie Middelkoop
b02bc1ef59 Update of the 'jedit' package.
svn path=/nixpkgs/trunk/; revision=31614
2012-01-17 22:40:05 +00:00
Eelco Dolstra
be1805b4fb * Make Xfce 4.8 the default. Will remove 4.6 later.
svn path=/nixpkgs/trunk/; revision=31613
2012-01-17 19:15:50 +00:00
Eelco Dolstra
2f1edcc1eb * Added Xfce's appfinder application.
svn path=/nixpkgs/trunk/; revision=31611
2012-01-17 18:08:09 +00:00
Peter Simons
39204c8649 haskell-http-enumerator: updated to version 0.7.2.4
svn path=/nixpkgs/trunk/; revision=31610
2012-01-17 17:44:42 +00:00
Peter Simons
47aaa3a4c0 haskell-http-conduit: updated to version 1.1.2.2
svn path=/nixpkgs/trunk/; revision=31609
2012-01-17 17:44:39 +00:00
Peter Simons
7b6b4212b9 haskell-colour: updated to version 2.3.3
svn path=/nixpkgs/trunk/; revision=31608
2012-01-17 17:44:35 +00:00
Eelco Dolstra
24431bd0f6 * Update various Xfce packages.
svn path=/nixpkgs/trunk/; revision=31607
2012-01-17 17:43:48 +00:00
Ludovic Courtès
eb1360bd66 hwloc: Make it easy to disable optional dependencies; fix cross-builds.
svn path=/nixpkgs/trunk/; revision=31606
2012-01-17 16:34:10 +00:00
Yury G. Kudryashov
3aa99d803e Remove PATHS from find-svn.patch
svn path=/nixpkgs/trunk/; revision=31605
2012-01-17 16:27:57 +00:00
Eelco Dolstra
dc9830111b * Added wkhtmltopdf.
svn path=/nixpkgs/trunk/; revision=31604
2012-01-17 11:04:14 +00:00
Peter Simons
729aea56b5 haskell-xml: updated to version 1.3.11
svn path=/nixpkgs/trunk/; revision=31603
2012-01-17 10:24:53 +00:00
Peter Simons
683d60e419 haskell-iteratee: updated to version 0.8.8.1
svn path=/nixpkgs/trunk/; revision=31602
2012-01-17 10:24:47 +00:00
Ludovic Courtès
4cbd319ce3 libffi: Revert to 3.0.9.
Version 3.0.10 fails to build on x86_64-freebsd8.2.  Reported on
libffi-discuss@sourceware.org.

svn path=/nixpkgs/trunk/; revision=31601
2012-01-16 23:36:05 +00:00
Ludovic Courtès
92703a6d9e libffi 3.0.10.
svn path=/nixpkgs/trunk/; revision=31600
2012-01-16 21:59:33 +00:00
Yury G. Kudryashov
6957240078 Fix typo
svn path=/nixpkgs/trunk/; revision=31599
2012-01-16 17:50:54 +00:00
Yury G. Kudryashov
ee0822153a Upgrade libdrm and mesa to the latest versions
svn path=/nixpkgs/trunk/; revision=31598
2012-01-16 17:48:33 +00:00
Yury G. Kudryashov
81b4eef864 jasper: propagate libjpeg, kopete: remove 'fix'
svn path=/nixpkgs/trunk/; revision=31595
2012-01-16 17:36:59 +00:00
Eelco Dolstra
67f921896e * nodejs 0.6.7 breaks npm, so go back to 0.6.6.
svn path=/nixpkgs/trunk/; revision=31594
2012-01-16 16:56:57 +00:00
Eelco Dolstra
fd6238d2c8 * NodeJS updated to 0.6.7.
svn path=/nixpkgs/trunk/; revision=31593
2012-01-16 16:34:13 +00:00
Peter Simons
5bcd4dd4dd haskell-threadscope: updated to version 0.2.1
svn path=/nixpkgs/trunk/; revision=31592
2012-01-16 11:47:59 +00:00
Peter Simons
5d03943ec7 haskell-ghc-events: updated to version 0.4.0.0
svn path=/nixpkgs/trunk/; revision=31591
2012-01-16 11:47:57 +00:00
Peter Simons
0e224241bf logstalgica: added version 1.0.3
svn path=/nixpkgs/trunk/; revision=31590
2012-01-16 11:34:00 +00:00
Peter Simons
01bea39bad gource: cosmetic, no functional change
svn path=/nixpkgs/trunk/; revision=31589
2012-01-16 11:33:57 +00:00
Peter Simons
4cc9c46240 haskell-xml-types: updated to version 0.3.1
svn path=/nixpkgs/trunk/; revision=31588
2012-01-16 11:33:55 +00:00
Peter Simons
a4d0d699ea haskell-xml-conduit: updated to version 0.5.1
svn path=/nixpkgs/trunk/; revision=31587
2012-01-16 11:33:52 +00:00
Peter Simons
bae87bb714 haskell-random-shuffle: updated to version 0.0.3
svn path=/nixpkgs/trunk/; revision=31586
2012-01-16 11:33:50 +00:00
Peter Simons
bfb2f12099 haskell-http-conduit: updated to version 1.1.1
svn path=/nixpkgs/trunk/; revision=31585
2012-01-16 11:33:48 +00:00
Peter Simons
c74f588e8d haskell-enumerator: updated to version 0.4.18
svn path=/nixpkgs/trunk/; revision=31584
2012-01-16 11:33:45 +00:00
Peter Simons
a9f5e79a1b haskell-conduit: updated to version 0.0.4
svn path=/nixpkgs/trunk/; revision=31583
2012-01-16 11:33:42 +00:00
Peter Simons
89f9d84c5f haskell-cereal: updated to version 0.3.5.1
svn path=/nixpkgs/trunk/; revision=31582
2012-01-16 11:33:40 +00:00
Peter Simons
4b229a7291 haskell-base64-bytestring: updated to version 0.1.1.0
svn path=/nixpkgs/trunk/; revision=31581
2012-01-16 11:33:38 +00:00
Peter Simons
4907bb6cf5 haskell-math-functions: added version 0.1.1.0
svn path=/nixpkgs/trunk/; revision=31580
2012-01-16 11:33:34 +00:00
Arie Middelkoop
c87285c255 Updated the coccinelle package to the latest release (1.0.0-RC9).
Added additional ocaml modules which are needed for coccinelle.

svn path=/nixpkgs/trunk/; revision=31579
2012-01-16 10:20:13 +00:00
Arie Middelkoop
3b833cc93b Minor-version bump of ocaml-batteries.
The previous version did not compile with ocaml>=3.12, and this version is also backwards compatible with 3.11.

svn path=/nixpkgs/trunk/; revision=31578
2012-01-16 10:17:02 +00:00
Andres Löh
57d26cdd8e Adding recurseIntoAttrs for ghc-HEAD (for the ghc-7.4.1 rc phase).
svn path=/nixpkgs/trunk/; revision=31577
2012-01-16 09:55:03 +00:00
Shea Levy
5c64d68344 Update ruby gems
svn path=/nixpkgs/trunk/; revision=31576
2012-01-16 02:05:41 +00:00
Peter Simons
b7c53fcc4c ftgl: added meta information
svn path=/nixpkgs/trunk/; revision=31573
2012-01-15 11:44:11 +00:00
Peter Simons
7ccde05271 git-annex: cosmetic change for the meta.license attribute
svn path=/nixpkgs/trunk/; revision=31572
2012-01-15 11:44:08 +00:00
Peter Simons
116a7c4ac2 ftgl: fixed download URL
svn path=/nixpkgs/trunk/; revision=31571
2012-01-15 11:44:05 +00:00
Peter Simons
3c8a798411 gource: added meta information and moved the package into version-management category
svn path=/nixpkgs/trunk/; revision=31570
2012-01-15 11:44:02 +00:00
Peter Simons
97e815a9af git-annex: bumped to version 3.20120113
svn path=/nixpkgs/trunk/; revision=31569
2012-01-15 11:43:57 +00:00
Yury G. Kudryashov
5fe8b64cea SDO: add meta.homepage
svn path=/nixpkgs/trunk/; revision=31566
2012-01-14 18:04:34 +00:00
Yury G. Kudryashov
6232b9129d cairo: propagate more dependencies
svn path=/nixpkgs/trunk/; revision=31565
2012-01-14 18:04:28 +00:00
Yury G. Kudryashov
d5b73eadeb Fix kalzium build
svn path=/nixpkgs/trunk/; revision=31564
2012-01-14 18:04:25 +00:00