1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-20 12:42:24 +00:00
Commit graph

766 commits

Author SHA1 Message Date
William A. Kennington III 074c4a7f78 Merge remote-tracking branch 'upstream/master' into staging 2015-05-07 01:44:49 -07:00
Peter Simons 324719a5a6 Drop obsolete pre-NG Haskell builds. 2015-05-05 21:44:47 +02:00
Vladimír Čunát 30f31c9afc Merge 'master' into staging
(relatively simple conflicts)
2015-04-26 22:52:08 +02:00
William A. Kennington III 1adb482638 Convert more applications to libmysql 2015-04-22 16:09:41 -07:00
Joachim Fasting 8488d133f3 meta.licenses -> license 2015-04-21 23:10:07 +02:00
Joel Moberg 49f4dba4c7 xournal: add license info 2015-04-20 18:22:37 +02:00
Cillian de Róiste 3c656e1014 darktable: update from 1.6.3 to 1.6.4 2015-04-20 14:49:55 +02:00
Tobias Geerinckx-Rice 6e6a41d1d6 apitrace 09519af205 -> 6.1 2015-04-17 00:46:21 +02:00
Arseniy Seroka f029ccadc9 Merge pull request #7385 from Forkk/screencloud
Add package for Screencloud 1.2.0
2015-04-16 06:28:00 +03:00
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