1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 06:01:15 +00:00
Commit graph

857 commits

Author SHA1 Message Date
Forkk f7865c29c2 screencloud: init at 1.2.0
Added a package for Screencloud, a program for taking screenshots and
uploading them to various websites.

This package was a bit finicky due to some nonsense in the CMakeLists
file, but it seems to work properly.

The package also includes API keys for the screencloud.net website.
According to the author of the Arch Linux User Repo package for
screencloud, these keys are only used for usage tracking, so we should
be fine including them in the package here.
2015-04-15 22:04:39 -05:00
Pavan Rikhi 8571ce2a8a pencil: v2.0.9 -> v2.0.10 2015-04-14 07:25:36 -04:00
William A. Kennington III 6044bfe3af feh: 2.12 -> 2.12.1 2015-04-12 20:34:20 -07:00
Thomas Tuegel 88918e10e9 Merge branch 'master' into staging 2015-04-10 07:45:38 -05:00
Pavan Rikhi 251f801719
pencil: v2.0.8 -> v2.0.9 2015-04-09 03:54:13 -04:00
Aristid Breitkreuz 13360ba5dc Merge pull request #7257 from spwhitt/inkscape
Fixes to build inkscape on Darwin
2015-04-08 21:59:48 +02:00
Spencer Whitt 22dfdbd2cf inkscape: patch to build with clang (Darwin) 2015-04-08 01:05:51 -04:00
Spencer Whitt ce1e7cccb6 feh: enable build on Darwin 2015-04-07 18:49:27 -04:00
Eric Seidel 6ec373d776 Merge branch master into staging 2015-04-06 18:58:08 -07:00
Ryan Mulligan 93f1029b0f Get rid of fetchurlGnome
closes #1707
2015-04-04 22:22:12 -07:00
Arseniy Seroka d7382dc748 Merge pull request #7130 from spwhitt/gimp
Get GIMP to build on Darwin and misc. related fixes
2015-04-02 06:02:49 +03:00
William A. Kennington III a604b42480 mysql: Use libs in place of the binary mysql 2015-04-01 16:46:53 -07:00
Spencer Whitt 2b79ac6339 gimp: build on Darwin 2015-04-01 19:25:06 -04:00
lethalman b6c7eba554 Merge pull request #7097 from prikhi/update-pencil
pencil: v2.0.5 -> v2.0.8
2015-03-31 10:10:23 +02:00
Pavan Rikhi f67ce9160d
pencil: v2.0.5 -> v2.0.8
Switch to actively developed fork.
2015-03-30 22:59:04 -04:00
Tobias Geerinckx-Rice ee7c9bd86a Add simple-scan 3.16.0.1 2015-03-31 00:51:47 +02:00
Michael Raskin 70a1e3c837 propagate many inputs in imagemagick: otherwise dependent builds fail 2015-03-30 08:46:16 +03:00
William A. Kennington III b058f829d2 ImageMagick: Disable HDRI for now 2015-03-29 19:37:53 -07:00
William A. Kennington III fa2e5b25ba Merge branch 'master' into staging 2015-03-29 14:25:48 -07:00
Nikolay Amiantov c7a0925ac2 yEd: update 2015-03-29 13:01:47 +03:00
William A. Kennington III 7ccccc15ba Merge branch 'master' into staging 2015-03-27 16:03:03 -07:00
William A. Kennington III 49e980fa32 imagemagick: More cleanups 2015-03-27 15:46:08 -07:00
William A. Kennington III 1f632813e4 imagemagick: Refactor 2015-03-27 15:36:26 -07:00
William A. Kennington III 5d2fd00457 imagemagick: 6.9.0 -> 6.9.1 2015-03-27 15:36:25 -07:00
William A. Kennington III 767c179a94 Merge branch 'master' into staging 2015-03-26 14:44:05 -07:00
Mateusz Kowalczyk e104a7870f sxiv: update to latest git 2015-03-25 00:46:58 +00:00
Thomas Tuegel 5d1f6ad57c qt5: make qt-5.4.1 default 2015-03-24 17:14:56 -05:00
Vladimír Čunát e924f05cc3 Merge branch 'master' into staging 2015-03-17 13:35:05 +01:00
Cillian de Róiste 849df05f6c digiKam: tidy up, and add myself to the maintainers 2015-03-15 14:56:09 +01:00
Cillian de Róiste a2c488e6c0 digiKam: fix gphoto camera support 2015-03-15 14:56:09 +01:00
Peter Simons 6694ef42a9 Merge branch 'master' into staging.
Conflicts:
      pkgs/development/libraries/gtk+/2.x.nix
      pkgs/tools/security/gnupg/21.nix
      pkgs/top-level/all-packages.nix
2015-03-10 12:09:43 +01:00
Luca Bruno aae9e49cbc Add setup-hook to hicolor_icon_theme 2015-03-09 15:55:24 +01:00
Cillian de Róiste 79d7605311 darktable: update from 1.6.2 to 1.6.3 2015-03-07 19:02:55 +01:00
Vladimír Čunát 33153a2166 paraview, vtk: fix build after mesa update 2015-03-06 12:09:01 +01:00
Peter Simons 5341196f01 Merge branch 'master' into staging. 2015-03-02 21:10:36 +01:00
Cillian de Róiste 66dc6872ce darktable: update from 1.6.1 to 1.6.2 2015-02-28 17:12:12 +01:00
Bob van der Linden 0ae99380d0 yed: upgraded to yed-3.14 2015-02-24 15:35:09 +01:00
Luca Bruno bf521d7b55 Add setup-hook to hicolor_icon_theme 2015-02-24 14:09:31 +01:00
aszlig 7cd6dd9ada
inkscape: Clean up and update to version 0.91.
This now also includes support vor visio and cdr and also adds the
missing dependency on libexif.

Forcing -lX11 in NIX_LDFLAGS is no longer needed in 0.91, so we drop
that as well as the patch and the --with-python configure flag, which is
now no longer even valid.

Tests now seem to run fine without -j1 as well.

I also tested it against the DXF test file mentioned in #3449, to be
sure we don't regress here.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-02-22 08:14:53 +01:00
Mateusz Kowalczyk 2875250c5f mcomix: update to 1.01 2015-02-09 12:16:38 +00:00
Cillian de Róiste 90e9c1a63c synfigstudio 0.64.2 -> 0.64.3 2015-02-07 18:21:18 +01:00
Shea Levy c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00
Sibi 7f5718b06f Version bump and made name attribute to lowercase.
(Tested the fix in my local machine just to be sure)
2015-01-30 18:49:38 +05:30
Vladimír Čunát b35e0a09a8 imagemagick: fixup URL after #6056 2015-01-29 23:18:19 +01:00
Sibi 8e5cf5889c imagemagick: rename package to lowercase (close #6056)
Change it to lowercase to according to the convention presented here:
http://nixos.org/nixpkgs/manual/#chap-conventions

Thanks to goibhniu from #nixos for pointing me this.
2015-01-29 19:36:26 +01:00
lethalman cd487d6489 Merge pull request #5911 from echo-oddly/leocad
new package: leocad
2015-01-27 12:59:26 +01:00
David Virgilio cd96404ff9 new package: leocad 2015-01-26 01:44:33 -06:00
Mateusz Kowalczyk 5881401348 sxiv: update to most recent git 2015-01-23 19:41:28 +00:00
Lluís Batlle i Rossell 205e338a83 Updating digikam to 4.6.0 and adding libpgf.
4.6.0 fixes the build with current gcc/glibc, and libpgf was a new requirement.

(cherry picked from commit 91b63783e1)
2015-01-23 10:30:16 +01:00
vbgl 7edbd7ad19 Merge pull request #5041 from vbgl/mono
Updates mono, fsharp and monodevelop

Closes #4782.
2015-01-21 13:54:37 +01:00
Vincent Laporte abfee3e840 feh: enable exif support 2015-01-21 10:54:54 +01:00
Vincent Laporte 480148f2ce Removes f-spot (broken) 2015-01-20 09:30:09 +01:00
Eric Seidel f272730399 rename <gcc-frontend>.gcc to <gcc-frontend>.cc 2015-01-14 20:59:10 -08:00
Pascal Wittmann 82e07fb1e8 geeqie: update from 1.1 to 1.2
Fetch source from debian as the geeeqie team stopped using sourceforge, see
https://www.mail-archive.com/geeqie-devel@lists.sourceforge.net/msg01484.html
2015-01-14 14:23:46 +01:00
Ludovic Courtès 41b53577a8 unmaintain a bunch of packages 2015-01-13 22:33:49 +01:00
Cillian de Róiste d168e77b71 darktable: update from 1.6.0 to 1.6.1 2015-01-02 23:48:48 +01:00
Eelco Dolstra fee59b1235 geeqie: Revert to 1.1
Version 1.2 has some relatively critical issues:

  https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=762257
  https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=765437

Until these are fixed, it's better to stick to 1.1.
2015-01-02 17:15:20 +01:00
Lluís Batlle i Rossell b985a9e0a1 Adding scantailor.
(cherry picked from commit 7eda68709e)
2014-12-29 10:23:27 +01:00
Eduard Bachmakov 5e4a8d9fd8 Add photoqt-1.1.0.1
Also, add myself to maintainers.
2014-12-27 22:13:41 +01:00
Matthias C. M. Troffaes 29575e4901 Also install hicolor_icon_theme. 2014-12-22 09:36:20 +00:00
Matthias C. M. Troffaes 1aacda5490 shotwell: Fix "Using the 'memory' GSettings backend" (fix suggested by lethalman, see issue #5433). 2014-12-22 09:36:20 +00:00
Matthias C. M. Troffaes 59e22e8879 shotwell: uses icons from gnome3.gnome_icon_theme and gnome3.gnome_icon_theme_symbolic 2014-12-22 08:47:21 +00:00
Pascal Wittmann f94580da69 Fix license attribute of many bsd-like licensed packages 2014-12-21 00:00:35 +01:00
Pascal Wittmann f55545c0c9 fix maintainer information
s/maintainer/maintainers
2014-12-20 21:54:22 +01:00
Oliver Charles 6221af50c4 apitrace: New expression 2014-12-14 15:41:51 +00:00
Vladimír Čunát 8ca78f0376 luminance-hdr: fix build by Debian patch 2014-12-10 13:36:57 +01:00
Markus Kohlhase 3826c3fc32 nixpkgs: darktable 1.4.2 -> 1.6.0 2014-12-09 18:50:42 +01:00
Domen Kožar 4aa3eec330 Merge branch 'master' into staging
Conflicts:
	pkgs/development/libraries/fontconfig/default.nix
2014-12-07 14:02:48 +01:00
Mateusz Kowalczyk 4106631b96 sxiv: update git revision 2014-12-03 16:55:17 +00:00
Vladimír Čunát cbd2305d4d Merge branch 'master' into staging 2014-11-28 18:59:07 +01:00
Vladimír Čunát e86ebdc0e3 synfigstudio: fix a strange build error
Also enableParallelBuilding.
fonts.conf isn't supposed to be put into buildIputs, but it's still weird.
2014-11-26 23:17:43 +01:00
Edward Tjörnhammar d177b477c1 Merge pull request #5138 from abbradar/yed
yed: add package
2014-11-26 22:17:48 +01:00
Nikolay Amiantov 88aa54a09f yed: add package 2014-11-27 00:15:30 +03:00
Domen Kožar 00146e3e08 shotwell: 0.18.0 -> 0.20.2, fix build 2014-11-26 22:13:07 +01:00
Igor Pashev 53fc3e178f ImageMagick: update (close #5133) 2014-11-26 21:49:11 +01:00
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