Commit graph

3489 commits

Author SHA1 Message Date
Eelco Dolstra e4ee3e2c9b * svn2git updated to 2.2.0.
svn path=/nixpkgs/trunk/; revision=32108
2012-02-07 12:22:48 +00:00
Yury G. Kudryashov c615cbae70 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=32099
2012-02-07 09:38:20 +00:00
Yury G. Kudryashov 215a07c1a9 svn merge ^/nixpkgs/trunk
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
2012-02-06 23:03:12 +00:00
Peter Simons 4e3dcd9254 esniper: updated to version 2.27.0
svn path=/nixpkgs/trunk/; revision=32087
2012-02-06 21:26:46 +00:00
Peter Simons ace1095639 upgraded emacs-w3m
svn path=/nixpkgs/trunk/; revision=32080
2012-02-06 19:08:58 +00:00
Michael Raskin 8bae3c51ff Add Firefox 11beta
svn path=/nixpkgs/trunk/; revision=32048
2012-02-06 08:28:24 +00:00
Alexander Tsamutali 109068c605 applications/misc/goldendict: New nixpkg.
svn path=/nixpkgs/trunk/; revision=32045
2012-02-05 21:02:27 +00:00
Yury G. Kudryashov a810d44d81 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=32024
2012-02-03 21:33:28 +00:00
Yury G. Kudryashov 4a5673f520 graphicsmagick: add meta.platforms
svn path=/nixpkgs/trunk/; revision=32022
2012-02-03 21:02:00 +00:00
Peter Simons 412e5dd87d haskell-hledger-interest: updated to version 1.4
svn path=/nixpkgs/trunk/; revision=32015
2012-02-03 21:00:16 +00:00
Lluís Batlle i Rossell cf2591c5ec Updating rdesktop to 1.7.1
svn path=/nixpkgs/trunk/; revision=31993
2012-02-03 16:16:18 +00:00
Yury G. Kudryashov df037ddafd svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31987
2012-02-02 20:36:11 +00:00
Eelco Dolstra 9d9e33b98d * Added Firefox 10.0. P.S. it seems that Firefox 10 no longer needs
--enable-official-branding to get a browser that calls itself
  "Firefox".  But I'll leave the flag in for the moment.
* Removed Firefox 8.0.

svn path=/nixpkgs/trunk/; revision=31984
2012-02-02 15:44:22 +00:00
Eelco Dolstra 7b5db94b5f * Updated Adobe Reader to 9.4.7.
svn path=/nixpkgs/trunk/; revision=31978
2012-02-02 12:19:17 +00:00
Lluís Batlle i Rossell f53c231cc4 Updating truecrypt to 7.1.
I pick the tarball not from the mainsite, but we checked that the hash
corresponds with that of the main site.


svn path=/nixpkgs/trunk/; revision=31963
2012-02-02 08:54:54 +00:00
Yury G. Kudryashov 2b3fb5a824 Merge two nix exprs for links2, upgrade to 2.5
svn path=/nixpkgs/trunk/; revision=31962
2012-02-01 22:33:35 +00:00
Arie Middelkoop cc145f2ae9 Update of skype expression: make the use of pulse audio optional based on the configuration setting for pulse audio (off by default).
Removing pulse audio from the build inputs when it is not used prevents the bug of Skype taking 100% cpu from showing up.
This demonstrates nicely nix' features: in other distributions the recomended solution was to remove read permission from the
pulse audio libs.

svn path=/nixpkgs/trunk/; revision=31959
2012-02-01 22:09:35 +00:00
Marco Maggesi 7c90b6a9bc Update HOL Light to rev 122.
svn path=/nixpkgs/trunk/; revision=31956
2012-02-01 14:37:50 +00:00
Eelco Dolstra f7626c1ddd * Unbreak icewm. Without -lfontconfig, it barfs with
icewm: error while loading shared libraries: libfontconfig.so.1:
    cannot open shared object file: No such file or directory

  This causes various NixOS tests to fail
  (e.g. http://hydra.nixos.org/build/1952097).

svn path=/nixpkgs/trunk/; revision=31945
2012-01-31 14:55:43 +00:00
Eelco Dolstra 399c575139 * Updated Spotify to 0.6.6.10.
svn path=/nixpkgs/trunk/; revision=31935
2012-01-30 16:44:56 +00:00
Peter Simons f1e16ea3c9 ikiwiki: updated to version 3.20120115
svn path=/nixpkgs/trunk/; revision=31933
2012-01-30 11:40:16 +00:00
Cillian de Roiste 467722ad1a Patching the prefix, since it is hardcoded. The application seems to work correctly now, although it does crash with my current gtk theme (oxygen) when adding a stream. Using the gnome gtk-icon-theme does work, but this is probably just a bug in the oxygen gtk theme and should be fixed there.
svn path=/nixpkgs/trunk/; revision=31913
2012-01-29 13:39:30 +00:00
Yury G. Kudryashov 71c28d0e33 Use meta.platforms
svn path=/nixpkgs/trunk/; revision=31909
2012-01-28 14:39:56 +00:00
Yury G. Kudryashov 9d67ff2a48 Remove glib-1.x and its reverse dependencies
Nobody told me that he uses generator or xmms, so I'm removing this old stuff.

svn path=/nixpkgs/trunk/; revision=31907
2012-01-28 13:06:07 +00:00
Yury G. Kudryashov e9e0418145 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31891
2012-01-27 18:57:35 +00:00
Yury G. Kudryashov ed92080b8d icewm-1.3.7
svn path=/nixpkgs/trunk/; revision=31890
2012-01-27 18:56:31 +00:00
Yury G. Kudryashov e155073b2c svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31888
2012-01-27 17:49:20 +00:00
Lluís Batlle i Rossell 3c5fee5243 I revert the previous change to libreoffice.
svn path=/nixpkgs/trunk/; revision=31885
2012-01-27 15:14:29 +00:00
Lluís Batlle i Rossell 29ca4d272f Updating gdb. I did not update the 'bleeding edge' thing though. That should be
better named to "one git checkout" instead of bleeding edge.


svn path=/nixpkgs/trunk/; revision=31883
2012-01-27 15:11:17 +00:00
Yury G. Kudryashov 3256c40575 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31878
2012-01-27 11:48:58 +00:00
Arie Middelkoop 7c8ab92620 kwooty expression: slight improvement of the build inputs.
svn path=/nixpkgs/trunk/; revision=31873
2012-01-26 23:24:40 +00:00
Michael Raskin 393f2479f8 Fix mismatch...
svn path=/nixpkgs/trunk/; revision=31870
2012-01-26 19:39:45 +00:00
Yury G. Kudryashov 5b132f6e96 svn merge ^/nixpkgs/trunk
Conflicts: cups, all-packages.nix (gcc45_debug)

svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
2012-01-26 15:27:03 +00:00
Michael Raskin b9916f0fd9 Add K3D 3D editor
svn path=/nixpkgs/trunk/; revision=31850
2012-01-26 13:12:36 +00:00
Yury G. Kudryashov 2ced89b7f1 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31846
2012-01-26 08:45:19 +00:00
Yury G. Kudryashov eb59b98c26 vlc-1.1.13
svn path=/nixpkgs/trunk/; revision=31843
2012-01-26 08:36:18 +00:00
Lluís Batlle i Rossell 06548b79e9 Adding what I have for today of libreoffice. It still does not build.
svn path=/nixpkgs/trunk/; revision=31839
2012-01-25 23:04:34 +00:00
Lluís Batlle i Rossell 7fc001306c I add some little code to fetch the srcs of libreoffice.
svn path=/nixpkgs/trunk/; revision=31838
2012-01-25 19:12:27 +00:00
Peter Simons 6e4f0b6365 git-annex: updated to version 3.20120123
svn path=/nixpkgs/trunk/; revision=31836
2012-01-25 16:07:52 +00:00
Arie Middelkoop f9fabb4626 added kwooty: a binary newsreader (kde).
svn path=/nixpkgs/trunk/; revision=31829
2012-01-24 22:09:17 +00:00
Arie Middelkoop d6f60f7135 emacs htmlize: fix of broken source url.
svn path=/nixpkgs/trunk/; revision=31827
2012-01-24 22:06:35 +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 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
Florian Friesdorf 5c05e3f866 emacs-24 alsaLib and imagemagickBig
svn path=/nixpkgs/trunk/; revision=31788
2012-01-23 00:55:48 +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 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 680787f13e mercurial: updated to version 2.0.2
svn path=/nixpkgs/trunk/; revision=31775
2012-01-21 19:08:48 +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
Florian Friesdorf a8a8f5df23 notmuch-0.11
svn path=/nixpkgs/trunk/; revision=31767
2012-01-21 18:29:11 +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
Yury G. Kudryashov 84c0185038 svn merge ^/nixpkgs/trunk, one simple conflict in jruby
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
2012-01-19 21:31:51 +00:00
Yury G. Kudryashov a525fdb18d svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31718
2012-01-19 21:00:43 +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
Eelco Dolstra d4d7931a62 * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
2012-01-18 20:53:01 +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 449c5b537d GNU Zile 2.4.3.
svn path=/nixpkgs/trunk/; revision=31664
2012-01-18 20:51:58 +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 db009e0eb8 emacs org-mode: upgraded to latest version
svn path=/nixpkgs/trunk/; revision=31645
2012-01-18 20:32:10 +00:00
Eelco Dolstra c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Eelco Dolstra 48ee2523da * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31633
2012-01-18 15:53:12 +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
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
Peter Simons 01bea39bad gource: cosmetic, no functional change
svn path=/nixpkgs/trunk/; revision=31589
2012-01-16 11:33:57 +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 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 13c81f6c79 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31568
2012-01-14 21:40:24 +00:00
Yury G. Kudryashov 0c79434ccb svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31567
2012-01-14 21:34:37 +00:00
Yury G. Kudryashov cced3d2b86 Fix compilation with qt-4.8
- Explicitly depend on libX11 and mesa
- Include GL/glu.h

svn path=/nixpkgs/trunk/; revision=31552
2012-01-14 18:03:41 +00:00
Yury G. Kudryashov c2e38f32c0 avogadro: explicitly depend on pkg-config
svn path=/nixpkgs/trunk/; revision=31541
2012-01-14 18:03:01 +00:00
Peter Simons 9ddd085129 subversion: instantiate SASL only when it's actually enabled
svn path=/nixpkgs/trunk/; revision=31532
2012-01-14 12:05:18 +00:00
Peter Simons ef343ed3ab subversion: add sasl support
svn path=/nixpkgs/trunk/; revision=31530
2012-01-14 11:41:06 +00:00
Arie Middelkoop edc1c525ba Removed some debugging info that I forgot to remove *oops*.
svn path=/nixpkgs/trunk/; revision=31525
2012-01-13 22:31:42 +00:00
Arie Middelkoop 0368987722 Desktopitem for the Skype package.
svn path=/nixpkgs/trunk/; revision=31522
2012-01-13 22:21:48 +00:00
Peter Simons bae5b8dabb git-annex: updated to version 3.20120106
svn path=/nixpkgs/trunk/; revision=31509
2012-01-13 09:27:08 +00:00
Peter Simons 6f5294ec94 ikiwiki: updated to version 3.20120109
svn path=/nixpkgs/trunk/; revision=31508
2012-01-13 09:27:05 +00:00
Lluís Batlle i Rossell 4238637b40 Adding GNU archimedes.
svn path=/nixpkgs/trunk/; revision=31505
2012-01-12 19:23:47 +00:00
Lluís Batlle i Rossell 1c186a3207 Making 'withGpg' optional in centerim.
svn path=/nixpkgs/trunk/; revision=31504
2012-01-12 19:00:35 +00:00
Lluís Batlle i Rossell 72aa6f5ffc Adding centerim.
svn path=/nixpkgs/trunk/; revision=31503
2012-01-12 18:55:08 +00:00
Arie Middelkoop 9cea0dd1c6 Update of XChat to 2.8.8; old version 2.8.4 does not compile.
svn path=/nixpkgs/trunk/; revision=31485
2012-01-11 22:32:17 +00:00
Alexander Tsamutali b61e32f19d google-talk-plugin: Updated x86_64 hash.
svn path=/nixpkgs/trunk/; revision=31470
2012-01-10 20:04:37 +00:00
Marco Maggesi 97d48a5426 Update HOL Light to rev 118
svn path=/nixpkgs/trunk/; revision=31468
2012-01-10 16:12:11 +00:00
Yury G. Kudryashov 2b50deaafc svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31459
2012-01-09 17:58:22 +00:00
Yury G. Kudryashov 4a11f058e4 update darktable, apply upstream libpng-15 patch
svn path=/nixpkgs/trunk/; revision=31458
2012-01-09 17:55:31 +00:00
Yury G. Kudryashov 7d018a5bc0 xine-ui: use libpng-1.2
svn path=/nixpkgs/branches/libpng15/; revision=31455
2012-01-09 12:48:45 +00:00
Yury G. Kudryashov 9e269f7e5e svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31452
2012-01-09 10:30:13 +00:00
Yury G. Kudryashov f4a079a76c Upgrade xine-lib and xine-ui
svn path=/nixpkgs/trunk/; revision=31451
2012-01-09 10:25:56 +00:00
Yury G. Kudryashov 365e05f7ce svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31448
2012-01-08 23:33:18 +00:00
Cillian de Roiste d9d74208b5 Adding dvswitch: a digital video mixer intended for interactive live mixing of several incoming DV video streams, typically used for recording conferences
svn path=/nixpkgs/trunk/; revision=31446
2012-01-08 23:27:45 +00:00
Yury G. Kudryashov de228351cd slim needs libpng-1.2.x
svn path=/nixpkgs/branches/libpng15/; revision=31445
2012-01-08 21:33:55 +00:00
Yury G. Kudryashov de82ba69f8 kde4.basket works. Remove kde3.kbasket
svn path=/nixpkgs/trunk/; revision=31442
2012-01-08 20:57:55 +00:00
Yury G. Kudryashov a398e2a401 Add skrooge
svn path=/nixpkgs/trunk/; revision=31438
2012-01-08 19:29:28 +00:00
Yury G. Kudryashov 532930a55f kmymoney-4.6.1
No aqbanking nor gwenhywfar since aqbanking FTBFS

svn path=/nixpkgs/trunk/; revision=31437
2012-01-08 19:29:17 +00:00
Yury G. Kudryashov 9ee0a9df9b svn merge ^/nixpkgs/trunk
A few trivial conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
2012-01-08 16:01:12 +00:00
Yury G. Kudryashov 3b672f9b75 (lib)gphoto-2.4.11
svn path=/nixpkgs/trunk/; revision=31412
2012-01-07 19:41:59 +00:00
Yury G. Kudryashov cd6824cb9f -kde3.kuickshow, +kde4.kuickshow
svn path=/nixpkgs/trunk/; revision=31407
2012-01-07 17:06:57 +00:00
Yury G. Kudryashov 7e320a7043 State qt version (3/4) in packages, not in all-packages.nix
svn path=/nixpkgs/trunk/; revision=31406
2012-01-07 17:06:49 +00:00
Alexander Tsamutali 69c91f30ce applications/virtualization/qemu: Added 0.15.nix
svn path=/nixpkgs/trunk/; revision=31401
2012-01-07 15:06:49 +00:00
Lluís Batlle i Rossell d1807a7b9b Making fbida cross-build.
svn path=/nixpkgs/trunk/; revision=31400
2012-01-07 15:03:56 +00:00
Yury G. Kudryashov ac911fce68 Fix XaraLX, add debian-patches.sh
svn path=/nixpkgs/trunk/; revision=31358
2012-01-06 18:13:11 +00:00
Shea Levy d788929c64 ledger3: Get building on darwin
svn path=/nixpkgs/trunk/; revision=31351
2012-01-06 15:55:24 +00:00
Shea Levy b884e56aa2 Enable parallel building of ledger 3
svn path=/nixpkgs/trunk/; revision=31350
2012-01-06 15:44:14 +00:00
Shea Levy 06c29d5ae7 Ledger isn't Linux-specific
svn path=/nixpkgs/trunk/; revision=31338
2012-01-06 05:52:21 +00:00
Yury G. Kudryashov 900c6e18cd svn merge ^/nixpkgs/trunk
Conflicts: openssl, libplist

svn path=/nixpkgs/branches/stdenv-updates/; revision=31337
2012-01-06 01:07:45 +00:00
Yury G. Kudryashov 5a0de50cf5 Add kde4.basket
svn path=/nixpkgs/trunk/; revision=31334
2012-01-06 00:55:30 +00:00
Yury G. Kudryashov 80d21cb05b Fix djvulibre compilation
Also remove djview3. Use djview4 instead.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31307
2012-01-05 09:54:46 +00:00
Lluís Batlle i Rossell b1ba53e50d Adding vimprobable2. Patch by Alexander Forenmy.
svn path=/nixpkgs/trunk/; revision=31303
2012-01-04 22:12:43 +00:00
Lluís Batlle i Rossell d0321537d9 Updating dwm to 6.0.
svn path=/nixpkgs/trunk/; revision=31301
2012-01-04 22:05:26 +00:00
Yury G. Kudryashov 394fd28e4e svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31280
2012-01-04 15:22:16 +00:00
Michael Raskin 07de46c2fa Update E prover
svn path=/nixpkgs/trunk/; revision=31269
2012-01-04 10:31:49 +00:00
Yury G. Kudryashov 3d61c49b42 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31268
2012-01-04 09:54:17 +00:00
Karn Kallio ec8e23cc97 In Emacs site-start.el check that NIX_PROFILES is set.
In the stdenv this is not set, which causes an elisp error
which in turn makes builds depending on Emacs (eg gnuplot) fail.

svn path=/nixpkgs/trunk/; revision=31261
2012-01-04 05:48:38 +00:00
Lluís Batlle i Rossell d028c7e00d Adding a preliminary package for librecad. It fails to install still.
svn path=/nixpkgs/trunk/; revision=31255
2012-01-03 21:14:14 +00:00
Florian Friesdorf 5a78287adf added myself to maintainers
svn path=/nixpkgs/trunk/; revision=31254
2012-01-03 20:59:00 +00:00
Florian Friesdorf f051f29fbd load-path also for emacs-22 and emacs-snapshot
svn path=/nixpkgs/trunk/; revision=31253
2012-01-03 20:58:57 +00:00
Florian Friesdorf 195ff32a63 set emacs load-path according to NIX_PROFILES via site-start.el
svn path=/nixpkgs/trunk/; revision=31252
2012-01-03 20:58:54 +00:00
Lluís Batlle i Rossell e43bd7c4ce Made lua and task warrior unstable crossbuild fine
svn path=/nixpkgs/trunk/; revision=31251
2012-01-03 19:12:06 +00:00
Yury G. Kudryashov 2bca92e32d Merge trunk
Conflicts:
1. cmake upgrade: use 2.8.7
2. openssl: left FreeBSD-asm patch.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31245
2012-01-03 17:25:24 +00:00
Eelco Dolstra ab13fb0c34 * Firefox updated to 9.0.1.
svn path=/nixpkgs/trunk/; revision=31236
2012-01-03 15:18:03 +00:00
Yury G. Kudryashov e785aae6e8 Fix most packages depending on fltk
I failed to build cinepaint

svn path=/nixpkgs/trunk/; revision=31224
2012-01-03 10:32:56 +00:00
Yury G. Kudryashov 995d3d3e03 tulip-3.6.1
svn path=/nixpkgs/trunk/; revision=31216
2012-01-02 18:36:04 +00:00
Yury G. Kudryashov 98e4666dcd update xfig, pull a few patches from debian
svn path=/nixpkgs/trunk/; revision=31213
2012-01-02 15:29:14 +00:00
Peter Simons 38f6d36e91 git-annex: updated to version 3.20111231
svn path=/nixpkgs/trunk/; revision=31212
2012-01-02 14:51:26 +00:00
Peter Simons b21a827d2a ikiwiki: updated to version 3.20111229
svn path=/nixpkgs/trunk/; revision=31210
2012-01-02 14:51:20 +00:00
Yury G. Kudryashov cb2202e499 libpano13-2.9.18
svn path=/nixpkgs/trunk/; revision=31209
2012-01-02 14:25:03 +00:00
Yury G. Kudryashov ae88794123 dia-0.97.2
svn path=/nixpkgs/trunk/; revision=31208
2012-01-02 14:13:03 +00:00
Yury G. Kudryashov 08761e83fc Merge trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31207
2012-01-02 14:12:40 +00:00
Yury G. Kudryashov 7928d532a2 Fix dia.name
svn path=/nixpkgs/trunk/; revision=31204
2012-01-02 13:42:11 +00:00
Yury G. Kudryashov 097b7635af Explicitly add sqlite to calibre.buildInputs
The better way would be adding sqlite to
pythonPackages.sqlite3.propagatedBuildInputs but I don't want to touch this
code.

svn path=/nixpkgs/trunk/; revision=31197
2012-01-02 10:42:36 +00:00
Florian Friesdorf 90dda8a07f adjusted awesome to generated names of xcbutil-*
svn path=/nixpkgs/trunk/; revision=31186
2011-12-31 06:14:31 +00:00
Florian Friesdorf 8dd443c8df awesome-3.4.11 - ru manpages disabled because of build failure
svn path=/nixpkgs/trunk/; revision=31173
2011-12-31 04:06:02 +00:00
Lluís Batlle i Rossell 3e9953290a THe stable task warrior has a licence GPLv2+, not MIT.
svn path=/nixpkgs/trunk/; revision=31152
2011-12-29 22:28:22 +00:00
Lluís Batlle i Rossell 7d4e6bbec9 Adding task warrior unstable.
svn path=/nixpkgs/trunk/; revision=31151
2011-12-29 22:27:32 +00:00
Lluís Batlle i Rossell 99e6a23f03 Adding task warrior, stable.
svn path=/nixpkgs/trunk/; revision=31150
2011-12-29 22:14:08 +00:00
Eelco Dolstra bf55fb9192 * Fixed Calibre (it was referring to "python2", which doesn't exist)
and updated it to 0.8.32.

svn path=/nixpkgs/trunk/; revision=31140
2011-12-29 16:22:46 +00:00
Marco Maggesi fd64bc5289 Oops!
svn path=/nixpkgs/trunk/; revision=31126
2011-12-28 12:49:29 +00:00
Marco Maggesi ff3b0ed420 Update HOL Light to r116
svn path=/nixpkgs/trunk/; revision=31125
2011-12-28 12:45:59 +00:00
Peter Simons 1d7bc50e9a emacs-modes/magit: updated to 1.1.0.0
svn path=/nixpkgs/trunk/; revision=31106
2011-12-26 20:24:59 +00:00
Lluís Batlle i Rossell 94a638d119 Updating digikam.
Now at least digikam now passes the configure stage. I've still not finished building it though.


svn path=/nixpkgs/trunk/; revision=31080
2011-12-25 22:54:32 +00:00
Yury G. Kudryashov f77741e018 merge trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31067
2011-12-25 05:47:23 +00:00
Peter Simons c7bed207d8 maxima: updated to version 5.26.0
svn path=/nixpkgs/trunk/; revision=31042
2011-12-22 12:30:19 +00:00
Michael Raskin 64290dbd96 Try updating veracity
svn path=/nixpkgs/trunk/; revision=30990
2011-12-20 21:37:23 +00:00
Eelco Dolstra 63c643d072 * Firefox 9.0.
svn path=/nixpkgs/trunk/; revision=30985
2011-12-20 14:51:26 +00:00
Lluís Batlle i Rossell 25bf67915d Updating kicad.
svn path=/nixpkgs/trunk/; revision=30953
2011-12-18 14:49:39 +00:00
Yury G. Kudryashov a670a7aca1 merge trunk
A few conflicts due to renames

svn path=/nixpkgs/branches/stdenv-updates/; revision=30947
2011-12-16 22:57:21 +00:00
Yury G. Kudryashov 1e74801dc4 wacomtablet-1.3.5
svn path=/nixpkgs/trunk/; revision=30946
2011-12-16 22:33:28 +00:00
Yury G. Kudryashov 9d43831de2 krusader-2.4.0beta1
svn path=/nixpkgs/trunk/; revision=30945
2011-12-16 22:33:16 +00:00
Yury G. Kudryashov bbc4ac6e9f rsibreak-0.11
Add some metadata

svn path=/nixpkgs/trunk/; revision=30941
2011-12-16 19:55:40 +00:00
Yury G. Kudryashov eff443fdd7 yakuake-2.9.8
svn path=/nixpkgs/trunk/; revision=30938
2011-12-16 19:38:34 +00:00
Peter Simons bf2e8e0bcc amarok: added missing function arguments
svn path=/nixpkgs/trunk/; revision=30932
2011-12-16 11:44:40 +00:00
Yury G. Kudryashov 2c3b02169f rekonq-0.8.1
svn path=/nixpkgs/trunk/; revision=30930
2011-12-16 10:48:59 +00:00
Yury G. Kudryashov 0971831ddc Reintegrate branches/drop-kde4.5
svn path=/nixpkgs/trunk/; revision=30928
2011-12-16 10:39:22 +00:00
Marco Maggesi 74c3fc3085 Update HOL Light to rev 114
svn path=/nixpkgs/trunk/; revision=30922
2011-12-16 07:44:29 +00:00
Yury G. Kudryashov b077940b3b svn merge https://nixos.org/repos/nix/nixpkgs/trunk
No conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=30916
2011-12-15 19:16:38 +00:00
Yury G. Kudryashov 76c2e7d82f xournal: prepare to poppler upgrade
svn path=/nixpkgs/trunk/; revision=30901
2011-12-15 08:01:03 +00:00
Yury G. Kudryashov 471ebaf6f8 calibre-0.8.30
svn path=/nixpkgs/trunk/; revision=30900
2011-12-15 06:58:27 +00:00
Marco Maggesi f6689d01a3 Update fossil to version 1.21
svn path=/nixpkgs/trunk/; revision=30875
2011-12-13 22:19:06 +00:00
Michael Raskin d5c702939c Update Golly
svn path=/nixpkgs/trunk/; revision=30874
2011-12-13 21:00:42 +00:00
Karn Kallio 135fe9059f ProofGeneral 4.1
svn path=/nixpkgs/trunk/; revision=30863
2011-12-13 01:13:46 +00:00
Eelco Dolstra 39c8bfdcc4 * New version of ‘ed’. W00t!
svn path=/nixpkgs/branches/stdenv-updates/; revision=30862
2011-12-12 23:44:49 +00:00
Alexander Tsamutali 7e82cfb7d6 Added support for Quake Live to Firefox wrapper.
svn path=/nixpkgs/trunk/; revision=30856
2011-12-12 17:25:51 +00:00
Eelco Dolstra eda3fd1730 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30852
2011-12-12 16:54:35 +00:00
Peter Simons a856742950 torchat: tell Hydra that it shouldn't attempt to build that package an Cygwin (fails with an assertion)
svn path=/nixpkgs/trunk/; revision=30833
2011-12-11 18:35:20 +00:00
Peter Simons cd90831b3c haskell-xmobar: updated to version 0.14
svn path=/nixpkgs/trunk/; revision=30823
2011-12-10 22:30:49 +00:00
Alexander Tsamutali 9ec2f699d6 applications/misc/bitcoin: Hash changed.
svn path=/nixpkgs/trunk/; revision=30819
2011-12-10 18:01:51 +00:00
Peter Simons 1817b55a7f git: updated to version 1.7.8
svn path=/nixpkgs/trunk/; revision=30805
2011-12-09 11:44:42 +00:00
Piotr Pietraszkiewicz 1bd85e4159 added libdvbpsi and added it to the dependency list of vlc so that vlc can play DVB
svn path=/nixpkgs/trunk/; revision=30789
2011-12-06 23:09:19 +00:00
Piotr Pietraszkiewicz 32163fa1ff added dvb-apps
svn path=/nixpkgs/trunk/; revision=30788
2011-12-06 23:01:22 +00:00
Eelco Dolstra acd7288678 * Proper version number.
svn path=/nixpkgs/trunk/; revision=30784
2011-12-06 21:16:20 +00:00
Piotr Pietraszkiewicz 6cb70eea88 upgraded to kadu-0.10.1
svn path=/nixpkgs/trunk/; revision=30781
2011-12-06 19:11:15 +00:00
Eelco Dolstra 621963488f * GnuCash updated to 2.4.8.
svn path=/nixpkgs/trunk/; revision=30780
2011-12-06 18:44:05 +00:00
Eelco Dolstra 3aedd3770f * Get svn2git to work.
svn path=/nixpkgs/trunk/; revision=30778
2011-12-06 15:41:16 +00:00
Eelco Dolstra b1e6ccae4e * Subversion 1.7.2.
svn path=/nixpkgs/trunk/; revision=30776
2011-12-06 14:56:47 +00:00
Peter Simons c86e037939 wxMaxima: updated to version 11.08.0
svn path=/nixpkgs/trunk/; revision=30774
2011-12-06 14:07:14 +00:00
Peter Simons 1382203c29 maxima: updated to version 5.25.1
svn path=/nixpkgs/trunk/; revision=30773
2011-12-06 14:07:11 +00:00
Peter Simons e2e5f9693d gv: updated to version 3.7.3
svn path=/nixpkgs/trunk/; revision=30767
2011-12-05 19:58:19 +00:00
Peter Simons 3357437461 git-annex: updated to version 3.20111203
svn path=/nixpkgs/trunk/; revision=30762
2011-12-05 16:23:05 +00:00
Peter Simons 42757e653a Temporarily keep monad-control 0.2.0.3 until a new version of git-annex comes out that supports the current version.
svn path=/nixpkgs/trunk/; revision=30761
2011-12-05 16:23:02 +00:00
Lluís Batlle i Rossell a9a03946df Updating gtkwave
svn path=/nixpkgs/trunk/; revision=30738
2011-12-05 10:44:53 +00:00
Shea Levy 69e12ad16e Add ncmpcpp
Patch by mornfall

svn path=/nixpkgs/trunk/; revision=30730
2011-12-05 01:32:25 +00:00
Ludovic Courtès dccc3f83b3 GNUnet 0.9.0.
svn path=/nixpkgs/trunk/; revision=30725
2011-12-04 13:49:03 +00:00
Shea Levy 3de62cd12a Add quvi
Patch submitted by mornfall

svn path=/nixpkgs/trunk/; revision=30720
2011-12-03 22:21:00 +00:00