mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-30 01:20:40 +00:00
Code Issues Wiki Activity
63543 commits 265 branches 124 tags 5.2 GiB
Commit graph

782 commits

Author SHA1 Message Date
Vladimír Čunát b1803465d9 imagemagick: use a stable URL, reshuffle mirrors 
CC: #5133.
 2014-11-26 21:42:42 +01:00
Cillian de Róiste d250ca4e31 openimageio: update from 1.4.14 to 1.4.15 2014-11-25 15:33:22 +01:00
Cillian de Róiste 909311b650 openimageio: update from 1.4.13 to 1.4.14 2014-11-24 22:17:00 +01:00
lethalman 44628e9e90 Merge pull request #5036 from abbradar/sane-mfd-fix 
sane: fix multifunctional devices rights conflict with cups
 2014-11-19 17:29:40 +01:00
Cillian de Róiste 86fd3ad7a4 kde4.digikam: update from 3.5.0 to 4.4.0, potentially fixes CVE-2012-4514 2014-11-18 21:32:58 +01:00
Michael Raskin fb76f0fe7d Fix XSane build 2014-11-16 11:28:21 +03:00
Nikolay Amiantov 88d731925d sane: fix multifunctional devices rights conflict with cups 2014-11-16 03:44:37 +03:00
Mateusz Kowalczyk 55ec78eac4 sxiv: update revision 
Mainly to kick off Hydra again: it thinks the build is broken because we
used a SSH URL for git before.
 2014-11-15 01:54:00 +00:00
Pascal Wittmann 8df0e0b151 Fixed many descriptions 2014-11-11 14:36:34 +01:00
Eelco Dolstra 6f53886360 imagemagick: Use --with-gcc-arch 
Without this, ImageMagick's configure script will generate code
specific to the machine building the package. This code may then fail
on other CPU types.

http://hydra.nixos.org/build/16564129
Signed-off-by: Domen Kožar <domen@dev.si>
 2014-11-06 11:10:32 +01:00
Mateusz Kowalczyk 007f80c1d0 Turn more licenses into lib.licenses style 
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
 2014-11-06 00:48:16 +00:00
Eelco Dolstra ebfdfdb7e4 geeqie: Disable libchamplain dependency for now 
It causes Geeqie to depend on both GTK+ 2 and 3, which is undesirable.
 2014-11-05 14:45:52 +01:00
Eelco Dolstra 4942acc0d9 geeqie: Don't use fetchgit 
Fetchgit considered harmful.
 2014-11-05 14:45:49 +01:00
Eelco Dolstra 1aafb0a700 Revert "geeqie: xxd is required as build dependency" 
This reverts commit 852f0bf2d4. Geeqie
builds fine without vim.
 2014-11-05 14:45:20 +01:00
Pascal Wittmann 852f0bf2d4 geeqie: xxd is required as build dependency 2014-11-05 13:52:58 +01:00
Mateusz Kowalczyk 6e726e1348 sxiv: use https 2014-11-05 11:33:45 +00:00
Michael Raskin 0e3a86e145 Fix GeeQie build 2014-11-04 15:12:23 +03:00
Michael Raskin a2fffba5cf Re-remove boost.lib 2014-11-04 12:19:37 +03:00
Michael Raskin dddf86ca28 Update Rapcad 2014-11-04 12:15:20 +03:00
Mateusz Kowalczyk de96fb7cc7 sxiv: update to 1.3-git and fix runtime behaviour 
The fix involves using imlib2 built with giflib instead of a libungif.
Initially I split imlib2 into two but other distros seem to build imlib2
with giflib already and everything still builds with giflib version so I
migrated imlib2 to giflib all together.

Closes #4622
 2014-11-03 23:03:51 +00:00
Peter Simons b5fed52c43 Merge pull request #4238 from wkennington/master.boost 
Make boost 156 the default
 2014-11-03 23:03:01 +01:00
Michael Raskin b8069e784e Update zgrviewer 2014-11-03 16:54:38 +03:00
William A. Kennington III d660565747 synfigstudio: Refactor 2014-11-02 18:58:40 -08:00
William A. Kennington III 096e002f0b geeqie: Refactor 2014-11-02 17:22:28 -08:00
William A. Kennington III aa3e800be7 boost: Remove boost.lib 2014-11-02 17:22:27 -08:00
Cillian de Róiste 9751c9a1cc synfigstudio: update from 0.64.1 to 0.64.2 2014-11-03 00:02:48 +01:00
Mateusz Kowalczyk 7f7233b61d sxiv: use giflib 5.0 
https://github.com/muennich/sxiv/issues/180
 2014-10-22 18:42:35 +01:00
Justin Bedo cd1bacb03d Update ImageMagick version 2014-10-20 17:49:30 +11:00
Longrin Wischnewski 6e7de2155b change md5sum to sha256sum for a few packages 2014-10-12 16:13:21 +02:00
Domen Kožar 9ca95f700e sxiv: add missing patch 2014-10-11 18:19:58 +02:00
Domen Kožar 51ac867551 sxiv: 1.1.1 - 1.2 2014-10-11 18:06:46 +02:00
Aristid Breitkreuz 6f07399727 ufraw: update from 0.19.2 to 0.20 2014-10-08 20:23:25 +02:00
Michael Raskin d171942ed1 Update Dia 2014-10-07 16:23:27 +04:00
Pascal Wittmann e42f5edb7c ocrad: update from 0.23 to 0.24 2014-10-07 10:47:39 +02:00
Michael Raskin fdad3e5661 Geeqie release is a Git tag, apparently Gitorious gave non-deterministic archive 2014-10-04 16:38:09 +04:00
Pascal Wittmann d156824f48 geeqie: update from 1.1 to 1.2 and adopt it 2014-09-26 23:18:57 +02:00
Pascal Wittmann d1c7ac1388 Merge pull request #4281 from sztupi/openimageio-version-fix 
openimageio: using tagged version as src url instead of (moving) branch
 2014-09-26 16:09:47 +02:00
Attila Sztupak 4a9f541a86 openimageio: using tagged version as src url instead of (moving) branch 2014-09-26 11:44:02 +01:00
David Guibert 691c8393ea Merge pull request #4276 from k0ral/xournal 
xournal: 0.4.5 -> 0.4.8
 2014-09-26 09:45:31 +02:00
koral d178ce6e1e xournal: 0.4.5 -> 0.4.8 2014-09-25 23:58:53 +02:00
Pascal Wittmann d9fb16ebd7 ocrad: update from 0.21 to 0.23 and adopt it 2014-09-25 21:14:17 +02:00
Domen Kožar 6e3114a8a3 k3d: 0.8.0.2 -> 0.8.03 2014-09-23 11:33:40 +02:00
William A. Kennington III 31220480d8 boost: Update depdendent packages 2014-09-21 17:20:59 -07:00
Moritz Ulrich fe3c2a56c8 New package: Solvespace. 
A parametric 2D/3D CAD application.
 2014-09-15 16:29:08 +02:00
Pascal Wittmann 8d67b9a240 transformed meta.maintainers of some packages into lists 2014-09-13 13:52:02 +02:00
Rob Vermaas fdfd948d96 panotools: update from 2.9.18 to 2.9.19 2014-09-11 13:34:50 +02:00
Luca Bruno 83c968fa2c Add new kgraphviewer and massif-visualizer packages 
I chose the unstable versions because the stable versions
seemed too outdated to me. They work with kde 4.12 anyway.
 2014-09-03 17:04:22 +02:00
Cillian de Róiste cc1866eacb processing: apply patch from IRC to make it work without the IDE too 2014-09-02 08:58:09 +02:00
Cillian de Róiste 622bdca26c processing: keep processing-java and patch it to make it work 2014-08-31 22:46:02 +02:00
Michael Raskin 347dd52019 Fix K3D build 2014-08-31 12:53:13 +04:00
Michael Raskin dcb38fc8aa Add missing libXmu dependency 2014-08-31 00:26:03 +04:00
Michael Raskin d593d3ac88 Fix K3D patching and cmake-configuration phases 2014-08-30 23:49:11 +04:00
Cillian de Róiste ef9c1d612d processing: add license 2014-08-30 19:54:03 +02:00
Cillian de Róiste c40a256548 Add processing: A language and IDE for electronic arts 
(cherry picked from commit 0db6387d1c3a8a8f7a9a1e111532d8acd1f794d6)
 2014-08-30 19:20:13 +02:00
Mateusz Kowalczyk 4210665c4f mcomix: update to 1.00 2014-08-30 13:48:02 +01:00
Rüdiger Sonderfeld 4d84ac77f9 gimp: Update to 2.8.14. 2014-08-27 18:46:24 +02:00
Cillian de Róiste 307924bbcc synfigstudio: fix chroot build / hydra 
The error message was:
Fontconfig error: Cannot load default config file
make[2]: *** [128x128/synfig_icon.png] Segmentation fault

(cherry picked from commit 759980c4fe9b07932f671d2e657189068d117405)

Conflicts:
	pkgs/top-level/all-packages.nix
 2014-08-25 23:00:59 +02:00
Bjørn Forsman c9baba9212 Fix many package descriptions 
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
 2014-08-24 22:31:37 +02:00
Domen Kožar bd32f323d8 k3d: move patches into source 2014-08-23 11:46:53 +02:00
Peter Simons e910c8d6c9 Disable Hydra builds for broken Haskell packages. 
The following packages are broken with GHC 7.8.3:

 - filesystem-conduit version 1.0.0.2
 - ghc-events-analyze version 0.2.0
 - haskelldb version 2.2.2
 - haskell-mpi version 1.2.1
 - haxr-th version 3000.5
 - hoauth version 0.3.5
 - holy-project version 0.1.1.0
 - hoogle version 4.2.32
 - hspread version 0.3.3
 - instant-generics version 0.4
 - ivor version 0.1.14.1
 - jmacro-rpc-happstack version 0.3
 - lambdacube-engine version 0.2.4
 - language-c-inline version 0.6.0.0
 - lockfree-queue version 0.2.3
 - monad-peel version 0.1.1
 - network-transport-tests version 0.1.0.1
 - poppler version 0.12.3
 - profiteur version 0.1.2.1
 - prolog-graph-lib version 0.2.0.1
 - semigroupoid-extras version 4.0
 - setlocale version 0.0.3
 - sized-types version 0.5.0
 - snaplet-postgresql-simple version 0.5
 - snap-loader-dynamic version 0.10.0.2
 - uhc git version 20120502
 - uniqueid version 0.1.1
 - unix-process-conduit version 0.2.2.3
 - vado version 0.0.1
 - vcsgui version 0.0.4
 - xml-html-conduit-lens version 0.3.2.0

The following packages depend on one of the broken ones above:

 - hoodle-builder version 0.3
 - hoodle-core version 0.14
 - hoodle-extra version 0.1
 - hoodle-parser version 0.3
 - hoodle-render version 0.4
 - hoodle-types version 0.3
 - hoodle version 0.3
 - kansas-lava version 0.2.4
 - liblastfm version 0.4.0.0
 - prolog-graph version 0.1.0.2
 - vacuum-cairo version 0.5
 - wcwidth version 0.0.2
 2014-08-20 20:26:57 +02:00
Mateusz Kowalczyk 03a37d5851 Add Japanese to default tesseract languages 2014-08-17 11:54:25 +01:00
Vladimír Čunát 6af1388fbd kipi_plugins: mark as broken; should come from digikam 2014-08-14 15:43:35 +02:00
Vladimír Čunát df76cbaa21 hugin, enblend-enfuse: enbaleParallelBuilding, default boost 
Also unset meta.broken.
 2014-08-12 21:17:53 +02:00
Vladimír Čunát 54c18db1ca Merge master into this PR 2014-08-12 21:16:47 +02:00
Christoph Hrdinka f44e69a55d luminanceHDR: add version 2.4.0 
fixes #3229
 2014-08-12 10:19:35 +02:00
Michael Raskin 004be1bf51 Fix oiio build; maybe will fix blender build 2014-08-12 04:33:10 +04:00
Cillian de Róiste d597651949 inkscape: add python to the PATH, fixes #3449 2014-08-09 17:02:36 +02:00
Peter Simons 5ebc4d829b Re-generate Haskell expressions with latest cabal2nix. 2014-08-09 13:49:24 +02:00
Vladimír Čunát 52d9c93abe Merge 'staging' into master 2014-08-08 20:13:23 +02:00
Eelco Dolstra 8a7f3c3618 Mark a bunch of packages as broken or not supported on Darwin 2014-08-08 17:59:02 +02:00
Peter Simons 9226fbf56a Merge remote-tracking branch 'origin/master' into staging. 2014-08-08 09:51:01 +02:00
Christoph Hrdinka 83f78fa82d mcomix: add sqlite3 dependency 2014-08-07 08:57:02 +02:00
NOTtheMessiah 682f215084 Update default.nix 2014-08-07 01:17:01 +02:00
NOTtheMessiah 9e9e628417 Added gcolor2 2014-08-07 01:17:01 +02:00
Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging. 
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
 2014-08-04 16:51:47 +02:00
Bjørn Forsman 5fc4ab1dfe freecad: small cleanup 
* FreeCAD v0.14 switched from pyqt4 to pyside, remove unneeded pyqt4 dependency
* cmake.patch is not used anymore, remove it
* License is now only LGPLv2+ (since v0.14)
* Homepage moved to http://www.freecadweb.org/

Ref. http://www.freecadweb.org/wiki/index.php?title=Release_notes_014
 2014-08-03 13:26:14 +02:00
Vladimír Čunát 6295a3ca36 Merge recent master into x-updates 
Hydra: ?compare=1142825

Conflicts (easy):
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
 2014-08-02 05:08:07 +02:00
Lluís Batlle i Rossell 5e35fef0eb freecad: updating to 0.14 
I had to update all the pyside programs, or freecad failed to build.  I picked
the versions advertised in http://qt-project.org/wiki/PySideDownloads . The
rest I took for github latest releases.
 2014-08-01 16:56:27 +02:00
Peter Simons d0ca8c237e Fix broken license references. 2014-07-28 11:43:20 +02:00
Mateusz Kowalczyk 7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Vladimír Čunát b9045a7d96 Merge branch 'x-updates' into staging 
...in preparation for a merge to master
 2014-07-22 22:28:39 +02:00
Eelco Dolstra 7f410ef923 Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/misc/vim-plugins/default.nix
 2014-07-22 11:00:00 +02:00
Vladimír Čunát 9b02635faa Merge recent master into x-updates 
Hydra: ?compare=1138350

Conflicts:
	nixos/modules/services/x11/desktop-managers/default.nix
	Two imports were added independently on the same line.
	I split it as well, as it was very long now.
 2014-07-21 12:05:57 +02:00
Cillian de Róiste bc8fe732d0 Add gimpPlugins.focusblur 2014-07-20 21:28:50 +02:00
Vladimír Čunát df99ec18dc inkscape: enableParallelBuilding, doCheck, add meta 2014-07-18 11:56:47 +02:00
Vladimír Čunát 7e9a0b8ec2 inkscape: maintenance update 
Needed to fix build with poppler-0.26.
 2014-07-18 11:56:44 +02:00
Vladimír Čunát 16e35532e4 Merge recent master into x-updates 2014-07-17 19:30:56 +02:00
Peter Simons f0de2bd4a1 Re-generate Haskell expressions with cabal2nix. 2014-07-16 12:10:10 +02:00
Ian-Woo Kim 02d6445409 update hoodle-types 0.2.2 -> 0.3, hoodle-builder 0.2.2.0 -> 0.3, hoodle-parser 0.2.2 -> 0.3, hoodle-render 0.3.2 -> 0.4, hoodle-core 0.13.0.0 -> 0.14, and hoodle 0.2.2.1 -> 0.3 2014-07-16 12:10:10 +02:00
Eelco Dolstra ff97b7dbe6 Merge remote-tracking branch 'origin/master' into staging 2014-07-14 17:04:55 +02:00
Peter Simons d2e731e111 Add "please don't edit" comment at the top of every auto-generated Haskell file. 2014-07-14 13:21:41 +02:00
Christoph Hrdinka 75518f748f hugin: update to version 2013.0.0 2014-07-12 13:18:22 +02:00
Vladimír Čunát 4b263946dd qt3, graphicsmagick137, fox, neverball: fix build 
Broken after freetype propagating libpng, which hid the older ones.
Reordering is enough to ensure the older libpng gets picked.
 2014-07-09 21:52:04 +02:00
Eelco Dolstra 06fc1ec34d Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/servers/serfdom/default.nix
 2014-07-01 11:25:41 +02:00
Eelco Dolstra 40f7b0f9df Another attempt to eradicate ensureDir 
See c556a6ea46.
 2014-06-30 14:56:10 +02:00
Benno Fünfstück e10001042d fetchbzr, fetchdarcs, fetchhg: use rev attr 
This makes it match the behaviour of fetchgit and fetchsvn, so it's
easier to write scripts that support all of them.
 2014-06-28 21:06:10 +02:00
Bjørn Forsman a14365b568 alchemy: add meta.longDescription 2014-06-22 21:46:34 +02:00
Michael Raskin 566ef0e31a Adding an auto-updater script for qiv and updating it to 2.3.1 2014-06-13 13:37:12 +04:00
Michael Raskin ed7b509fbf Oops. Fix the permissions on initialized persistence file for Dia 2014-06-13 01:33:18 +04:00
Michael Raskin 6b35f37005 Fix dia when run not from $PATH 2014-06-13 01:22:56 +04:00
Michael Raskin 80b701ca94 Put a correct Dia persistence file in ~/.dia unless such a file exists. Fixes #1691. 2014-06-12 15:02:49 +04:00
John Wiegley 0085a1aae3 potrace: allow building on any unix 2014-06-10 08:57:41 +00:00
Michael Raskin 26c8490ea1 Install libpotrace 2014-06-10 11:24:43 +04:00
Pascal Wittmann b40ce8a1f1 Update feh from 2.11 to 2.12. 
The relevant source code of giblib was imported into feh,
therefore giblib is no longer a dependency.
 2014-06-07 15:22:20 +02:00
Pascal Wittmann 91b2021782 feh: Set the default theme explicitly to 'feh' 
feh uses argv[0] to set the default theme, because
feh is wrapped this will be .feh-wrapper. This makes
it hard to use the configuration on multiple systems
and can be confusion. Therefore the theme is explicity
set to 'feh'.
 2014-06-07 15:18:09 +02:00
Eelco Dolstra 36f5ede37a geeqie: Fix incorrect longDescription formatting 
Note that longDescription should not be formatted as:

  longDescription =
    '' Bla bla
       bla bla
    '';

because this will cause the second line to have more preceding
whitespace. It should be:

  longDescription =
    ''
      Bla bla
      bla bla
    '';
 2014-06-03 11:47:39 +02:00
Michael Raskin 80cc011f77 Merge pull request #2617 from ttuegel/hplip 
hplip: update and fix scanning
 2014-05-27 02:31:27 -07:00
Eelco Dolstra 1e6c82825a gimp: Fix download URL 2014-05-22 12:11:52 +02:00
Vladimír Čunát 8e9ead8656 berlios.de probably shut down, replace it 
The shutdown was announced years ago, only now it stopped working.
 2014-05-18 13:30:27 +02:00
Thomas Tuegel b4c8981064 sane: add mkSaneConfig 2014-05-11 14:01:07 -05:00
cillianderoiste 885a2d9c53 Merge pull request #2410 from pSub/potrace 
Add potrace-1.11, a tool for tracing bitmaps
 2014-05-11 14:46:12 +02:00
Pascal Wittmann 8b0d0e3601 Add potrace-1.11, a tool for tracing bitmaps 2014-05-09 14:23:00 +02:00
Eelco Dolstra 46b77d3bb4 fetchurl_gnome -> fetchurlGnome 2014-05-08 15:30:17 +02:00
Benjamin Podszun 313900d819 nixpkgs: Bump feh to 2.11 2014-05-08 13:15:09 +02:00
Cillian de Róiste 849f6788ac darktable: update from 1.4.1 to 1.4.2 2014-05-03 15:16:12 +02:00
Jaka Hudoklin b12b180fc2 meshlab: fix build 
Patches are from the Arch Linux package.
 2014-04-21 11:24:26 +02:00
ambrop7@gmail.com 3bab2f2fc4 FreeCAD: Fix build. 2014-04-20 16:45:00 +02:00
James Cook ee79d43e40 ImageMagick: update to 6.8.9-0 2014-04-19 11:25:01 +01:00
Luca Bruno 35ccaa2e52 Fix gsettings schemas usage for several packages due to #1901 
Also add icons to epiphany
 2014-04-06 11:02:21 +02:00
Domen Kožar d7bd83d0ae shotwell: 0.15.1 -> 0.18 2014-03-21 18:02:15 +01:00
Vladimír Čunát 5bb0803254 fix evaluation (shotwell license) 2014-03-19 21:10:43 +01:00
Domen Kozar 902b059967 Add shotwell 1.15.1 2014-03-18 18:23:13 +01:00
Bjørn Forsman 562f937d21 openscad: bump 2013.06 -> 2014.03 
openscad now depends on glib, and it needs pkgconfig to find glib.
 2014-03-14 22:21:15 +01:00
Cillian de Róiste fcfbe753e7 Add synfig: A 2D animation program 2014-03-13 01:14:05 +01:00
James Cook 5d14048867 ImageMagick: update to 6.8.8-7 
Fixes CVE-2014-{1947,1958,2030}.
 2014-03-08 10:35:05 +01:00
Peter Simons db2776ee8a feh: update from 2.9.3 to 2.10 2014-03-03 11:10:27 +01:00
Domen Kožar 40b8b3206e fix remaining broken python packages due to refactoring 2014-02-21 23:27:06 +01:00
Cillian de Róiste 30fb0365df openimageio: update from 1.1.12 to 1.3.12 2014-02-19 22:49:21 +01:00
Sergey Mironov a629aaee72 viewnior: version bump (1.4) (close #1781) 2014-02-19 20:44:30 +01:00
Jaka Hudoklin d34f77fd1f feh: add jpeg image manipulation support 2014-02-16 14:11:32 +01:00
Cillian de Róiste e2151230ab darktable: update from 1.2.3 to 1.4.1 2014-02-15 18:49:18 +01:00
Petr Rockai d2758ce017 freecad: Fix build with current cmake. 2014-02-15 10:27:39 +01:00
Vladimír Čunát 32cd198d8f gimp: remove 2.6, because it's old and vulnerable 
CVE-2012-2763 and three others. If we really need to resurrect it,
I think I saw debian could have patches for these somewhere.

Also add linux platforms for 2.8.
 2014-02-06 19:56:28 +01:00
Song Wenwu 1c83b079d2 gimp: wrap plugins with PYTHONPATH, fix #223 2014-01-31 14:05:53 +08:00
Rickard Nilsson e28c0da32e sane-backends: Add extra source url 
It seems alioth.debian.org has some problem (login needed for download), so
I've added a pkgs.fedoraproject.org url.
 2014-01-30 12:26:11 +01:00
Petr Rockai 6f5be260b4 Adopt packages. 2014-01-28 17:31:17 +01:00
Petr Rockai cf7ee03377 photivo: Fix paths. 2014-01-25 18:08:47 +01:00
Petr Rockai 2953c39409 photivo: Update. 2014-01-25 18:08:47 +01:00
Peter Simons 4e983788cd feh: update from 2.8 to 2.9.3 2014-01-21 20:19:21 +01:00
Vladimír Čunát ac6761c908 Merge master into stdenv-updates 
Conflicts:
	pkgs/applications/version-management/gource/default.nix
	pkgs/top-level/all-packages.nix
 2014-01-20 19:39:28 +01:00
Peter Simons b4e1774272 haskell-hoodle: re-generate with cabal2nix 2014-01-20 18:04:59 +01:00
Ian-Woo Kim 7b51e24de9 add hoodle (pen notetaking program written in haskell) to nixpkgs 2014-01-20 15:18:04 +00:00
Vladimír Čunát 0a58b512cb Merge master into stdenv-updates 
Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix
 2014-01-18 14:46:20 +01:00
Peter Simons 2d1c8d6f60 gocr: update to version 0.50 2014-01-13 17:05:45 +01:00
Eelco Dolstra 6fb27abf33 Merge branch 'java' 2014-01-13 13:16:17 +01:00
Eelco Dolstra 16e626a80d Replace lib/java -> share/java 2014-01-09 13:01:38 +01:00
Vladimír Čunát d91e03d422 k3d: fix build with newer gcc versions (-fpermissive) 2014-01-05 13:09:41 +01:00
Vladimír Čunát 9443129b08 Merge master into stdenv-updates 
Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates)
	pkgs/misc/emulators/zsnes/default.nix (more complex, build tested)
	pkgs/top-level/all-packages.nix (auto-solved)
 2014-01-04 18:34:53 +01:00
Peter Simons 72629aa7da sane-backends-git: update to version 1.0.24.73-g6c4f6bc (i.e. current Git HEAD) 2014-01-03 12:42:48 +01:00
Bjørn Forsman 4d6605e882 Whitespace fixes in package expressions I maintain 2014-01-02 17:58:08 +01:00