3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

2226 commits

Author SHA1 Message Date
Jörg Thalheim ba34ffc665
Merge pull request #54619 from Mic92/remove-wkennington
treewide: remove wkennington as maintainer
2019-01-26 23:37:27 +00:00
Vladyslav Mykhailichenko dea84cac63
sxiv: 24 -> 25 2019-01-26 22:49:59 +02:00
Jörg Thalheim b5c1deca8a
treewide: remove wkennington as maintainer
He prefers to contribute to his own nixpkgs fork triton.
Since he is still marked as maintainer in many packages
this leaves the wrong impression he still maintains those.
2019-01-26 10:05:32 +00:00
worldofpeace 8a2aef753d krita: 4.1.5 -> 4.1.7.101 2019-01-23 01:13:09 -05:00
Vladimír Čunát 3fe32b675e
Merge branch 'master' into staging 2019-01-22 15:59:42 +01:00
Robert Schütz ca7ef865c4
antimony: find boost::python3 (#54368)
Fixes https://github.com/NixOS/nixpkgs/issues/54329.
2019-01-20 13:59:04 +01:00
Frederik Rietdijk d531da6f8a
Merge pull request #54094 from rnhmjoj/shell
treewide: use ${stdenv.shell} instead of /bin/sh where possible
2019-01-19 14:15:51 +01:00
rnhmjoj bcf54ce5bb
treewide: use ${stdenv.shell} instead of /bin/sh where possible 2019-01-16 20:37:15 +01:00
Jörg Thalheim 1dcfe5ab28
Merge pull request #53913 from dtzWill/update/ipe-7.2.8
ipe: 7.2.7 -> 7.2.9
2019-01-16 17:38:45 +00:00
Will Dietz b5deb430a4 ipe: 7.2.8 -> 7.2.9
https://mailman.science.uu.nl/pipermail/ipe-announce/2019-January/000076.html
2019-01-16 08:48:35 -06:00
Johannes Frankenau 7788e5d536 darktable: 2.4.4 -> 2.6.0 2019-01-14 22:41:16 +02:00
Will Dietz a075573115 ocrad: 0.26 -> 0.27
https://lists.gnu.org/archive/html/bug-ocrad/2019-01/msg00000.html
2019-01-13 20:42:14 -06:00
Will Dietz e4ae3ed923 ipe: 7.2.7 -> 7.2.8
https://mailman.science.uu.nl/pipermail/ipe-announce/2019-January/000075.html
2019-01-13 17:45:23 -06:00
Vladimír Čunát 287144e342
Merge branch 'master' into staging-next 2019-01-10 13:07:21 +01:00
Edmund Wu ca531efae8
feh: include prove for tests 2019-01-06 08:30:57 -05:00
Vladimír Čunát 10a12194e3
Merge #53490: fix treewide linking errors after #51770
Issue #53001.  This might not be all of them, but let's not wait.
2019-01-06 12:14:52 +01:00
Frederik Rietdijk 60a3973a55 Merge staging-next into staging 2019-01-05 10:15:00 +01:00
Piotr Bogdan 3d94f68c75 gqview: link with libm explicitly 2019-01-04 21:44:19 +00:00
Piotr Bogdan 418a2d771c goxel: link with pthreads explicitly 2019-01-04 21:44:19 +00:00
Piotr Bogdan e828ad6ad9 cinepaint: link with lib{m,png} explicitly 2019-01-04 21:44:18 +00:00
Piotr Bogdan 8fe36d7285 autopanosiftc: fix libm underlinking 2019-01-04 21:04:52 +00:00
Frederik Rietdijk 9618abe87c Merge master into staging-next 2019-01-04 21:13:19 +01:00
Piotr Bogdan e7040637e5 ahoviewer: link with pthread explicitly 2019-01-04 19:33:49 +00:00
Jörg Thalheim 7d75e31c52
Merge pull request #53316 from r-ryantm/auto-update/imagemagick
imagemagick7: 7.0.8-14 -> 7.0.8-22
2019-01-04 15:46:58 +01:00
Lengyel Balazs f4a53ff3bc treewide/xorg: replace *proto with xorgproto 2019-01-04 14:38:57 +01:00
R. RyanTM 2a28248352 goxel: 0.8.1 -> 0.8.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/goxel/versions
2019-01-03 10:44:00 -08:00
R. RyanTM 1cf9c63af1 imagemagick7: 7.0.8-14 -> 7.0.8-22
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/imagemagick/versions
2019-01-03 06:47:10 -08:00
Frederik Rietdijk 092e3b50a8 Merge master into staging-next 2019-01-02 21:08:27 +01:00
Vladimír Čunát 70bff06140
Merge branch 'master' into staging 2019-01-02 17:19:23 +01:00
Silvan Mosberger ced0be5c06
Merge pull request #53078 from tex/wings3d
wings3d: 1.5.4 -> 2.2.1
2018-12-31 16:20:02 +01:00
Frederik Rietdijk 070290bda7 Merge master into staging-next 2018-12-31 12:00:36 +01:00
Dmitry Kalinkin 00754cd689 digikam: switch from QtWebKit to QtWebEngine 2018-12-31 10:18:04 +01:00
Milan Svoboda c65e727236 remove icons folder 2018-12-30 15:47:32 +01:00
Milan Svoboda 70a05bcfaa wings3d: 1.5.4 -> 2.2.1 2018-12-30 15:32:40 +01:00
Orivej Desh 39b3cad721 k3d: fix build 2018-12-27 17:31:28 +00:00
worldofpeace c1599d29d9 gcr: rename from gnome3.gcr 2018-12-25 20:14:28 -05:00
Jan Tojnar ef935fa101
Merge branch 'master' into staging 2018-12-24 15:02:29 +01:00
Alexey Shmalko dbca9081b9
Merge pull request #52693 from r-ryantm/auto-update/rawtherapee
rawtherapee: 5.4 -> 5.5
2018-12-22 21:18:15 +02:00
R. RyanTM 6965ec04b9 rawtherapee: 5.4 -> 5.5
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/rawtherapee/versions
2018-12-22 09:48:07 -08:00
Michael Raskin ede54f9144
Merge pull request #52379 from erikarvstedt/tesseract
Major tesseract improvements
2018-12-20 14:41:48 +00:00
Erik Arvstedt 0289f4adf0
tesseract: add tesseract3 top-level attr 2018-12-19 18:10:43 +01:00
Erik Arvstedt 8d1ba999cb
tesseract: rename to tesseract4, add alias
This is more consistent with the naming of the most popular versioned pkgs.
2018-12-19 18:09:56 +01:00
Erik Arvstedt b818997807
tesseract: add separate language derivations
This frees users from downloading all languages when building
Tesseract with a custom set of languages.

`enableLanguagesHash` is now obsolete.
2018-12-19 18:08:21 +01:00
Erik Arvstedt aaaed13077
tesseract: add a wrapper to setup languages
Tesseract is now decoupled from the tessdata language corpus.

This avoids recompilation when building Tesseract with a custom set
of languages.

Update k2pdfopt to use the new wrapper interface.
2018-12-19 18:08:16 +01:00
Erik Arvstedt 45d2a2dd91
tesseract: change file layout
Rename default.nix -> tesseract3.nix
Rename 4.x.nix -> tesseract4.nix

This is needed for the following commits.
2018-12-19 18:07:39 +01:00
Frederik Rietdijk 9ab61ab8e2 Merge staging-next into staging 2018-12-19 09:00:36 +01:00
volth fed7914539
Merge branch 'staging' into make-perl-pathd 2018-12-18 17:13:27 +00:00
Jörg Thalheim 1148ce1b60
Merge pull request #52062 from volth/perl526-drop
perl526: drop
2018-12-18 17:02:01 +00:00
R. RyanTM ace1f064e8 glabels: 3.4.0 -> 3.4.1
* glabels: 3.4.0 -> 3.4.1 (#52285)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/glabels/versions

* glabels: fetch from Gnome mirrors

+ corrected licensing - see https://github.com/jimevins/glabels/blob/glabels-3_4_1/COPYING.README_FIRST
2018-12-17 20:04:10 +01:00
R. RyanTM 6d7e94aa1e graphicsmagick: 1.3.30 -> 1.3.31
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/graphicsmagick/versions
2018-12-17 02:06:41 +00:00
Maximilian Bosch 8c35b88dc1
Merge pull request #52292 from r-ryantm/auto-update/gthumb
gthumb: 3.6.1 -> 3.6.2
2018-12-16 22:31:09 +01:00
Vladyslav M d3e574ddf4
Merge pull request #52311 from r-ryantm/auto-update/feh
feh: 3.0 -> 3.1.1
2018-12-16 11:16:52 +02:00
R. RyanTM e68c8ab017 feh: 3.0 -> 3.1.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/feh/versions
2018-12-15 21:49:56 -08:00
R. RyanTM a331afb05b gthumb: 3.6.1 -> 3.6.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gthumb/versions
2018-12-15 19:28:44 -08:00
volth bb9557eb7c lib.makePerlPath -> perlPackages.makePerlPath 2018-12-15 03:50:31 +00:00
volth 6d2edfb0b8 treewide: remove aliases evaluated to null 2018-12-14 16:27:53 +00:00
worldofpeace d9eadb4aa7
Merge pull request #51472 from Ralith/renderdoc
renderdoc: 1.1 -> 1.2
2018-12-12 04:25:02 -05:00
Frederik Rietdijk 5f554279ec Merge master into staging-next 2018-12-07 15:22:35 +01:00
Yegor Timoshenko 851a52983b
yed: 3.18.1.1 -> 3.18.2 2018-12-06 01:02:52 +03:00
Matthew Bauer ab22183941
Merge pull request #51469 from matthewbauer/gimp-fix
gimp: fix on darwin
2018-12-05 13:43:40 -06:00
Matthew Bauer 73a87b57a6 gimp: fix on darwin
Fixes #41071
2018-12-05 13:20:14 -06:00
Benjamin Saunders 51c9a39299 renderdoc: 1.1 -> 1.2 2018-12-03 12:32:56 -08:00
Bjørn Forsman 84a2463499 jpeginfo: init at 1.6.1
jpeginfo prints information and tests integrity of JPEG/JFIF files.
2018-12-03 17:03:48 +01:00
Frederik Rietdijk a510aa2672 Merge master into staging-next 2018-12-03 12:18:43 +01:00
Jan Tojnar a51a99c690
gobject-introspection: rename package
camelCase package name was a huge inconsistency in GNOME package set.
2018-12-02 12:42:29 +01:00
Will Dietz 5ea1bbcf01 pqiv: 2.10.4 -> 2.11
https://github.com/phillipberndt/pqiv/releases/tag/2.11
2018-12-01 13:30:55 -06:00
Jan Tojnar bb3a7342c3
shotwell: 0.28.2 → 0.30.0 2018-11-30 21:34:39 +01:00
Frederik Rietdijk 9db2421d1f Merge master into staging-next 2018-11-29 08:12:56 +01:00
Maximilian Bosch f211bad8c4
Merge pull request #51000 from ryantm/tesseract
tesseract_4: 4.00.00alpha-git-20170410 -> 4.0.0
2018-11-29 03:34:29 +01:00
Vladimír Čunát a5de78b7d7
Merge branch 'master' into staging-next 2018-11-26 10:28:00 +01:00
Ryan Mulligan fe551d1d53
deskew: init at 1.25
* deskew: init at 1.25

* Update pkgs/applications/graphics/deskew/default.nix

Co-Authored-By: ryantm <ryan@ryantm.com>
2018-11-25 07:40:41 -08:00
Ryan Mulligan d4b9752212 tesseract_4: 4.00.00alpha-git-20170410 -> 4.0.0
The 4.0.0 stable release is out.

Changelog: https://github.com/tesseract-ocr/tesseract/wiki/4.0x-Changelog
2018-11-24 15:25:59 -08:00
Frederik Rietdijk c31cb577ae Merge master into staging-next 2018-11-22 09:57:08 +01:00
worldofpeace 5a0423823f
Merge pull request #50638 from scolobb/processing-hash-bump
processing3: update the hash of the reference
2018-11-21 21:56:06 -05:00
Matthew Bauer 3e6d7a2329 ao: replace with libfive
ao has been renamed to libfive. Because there’s already a libfive
package, we can just remove the old ao package. No packages appear to
depend directly on it.
2018-11-21 09:38:53 -06:00
Frederik Rietdijk aabf1a93bc Merge staging-next into staging 2018-11-20 11:51:11 +01:00
Frederik Rietdijk fd26e7be2a Merge master into staging-next 2018-11-20 11:47:26 +01:00
R. RyanTM 82a7f0d9ab feh: 2.28.1 -> 3.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/feh/versions
2018-11-19 09:50:45 -08:00
Frederik Rietdijk e343a85cfb Merge master into staging-next 2018-11-19 09:55:32 +01:00
Matthew Bauer 2c1d3a9a82 Merge remote-tracking branch 'upstream/master' into staging 2018-11-18 19:02:09 -06:00
Matthew Bauer e2817a270b inkscape: make python & perl runtime deps
These two interpreters are needed for some runtime scripts.

Fixes #50570
2018-11-18 18:47:02 -06:00
Sergiu Ivanov 839d063545 processing3: update the hash of the reference 2018-11-18 23:47:50 +01:00
Ben Backhouse fca9a06c2e inkscape: add scour as dependency 2018-11-18 13:40:54 +01:00
Frederik Rietdijk 0d0d7dcd06 Merge staging-next into staging 2018-11-18 10:41:34 +01:00
Frederik Rietdijk 63c6875f26 Merge master into staging-next 2018-11-18 10:32:12 +01:00
Oyren 04b234e995 write_stylus: fix loading libGL.so with libglvnd (#50395)
./Write: error while loading shared libraries: libGL.so.1: cannot open shared object file: No such file or directory
2018-11-15 13:55:05 +00:00
Matthew Bauer bfbfe941ab treewide: use scons setup hook
Lots of packages can use it. Here is the list:

- jackmix
- klick
- mixx
- nova-filters
- rhvoice
- giv
- mypaint
- swift-im
- bombono
- mapnik
- serf
- nuitka
- pyexiv2
- godot
- hammer
- toluapp
- btanks
- dxx-rebirth
- endless-sky
- globulation
- the-powder-toy
- fceux
- gpsd
- mongodb
- rippled
- mariadb
- lprof
2018-11-13 19:14:10 -06:00
Frederik Rietdijk 3b052406ea Merge staging-next into staging 2018-11-12 19:01:36 +01:00
Frederik Rietdijk 1d3bff25db Merge staging-next into staging 2018-11-11 14:28:08 +01:00
markuskowa e9aec8ccab
Merge pull request #50095 from r-ryantm/auto-update/gocr
gocr: 0.51 -> 0.52
2018-11-11 13:33:39 +01:00
Jan Tojnar 0655c904bf
Merge pull request #50116 from r-ryantm/auto-update/gegl
gimp: 2.10.6 → 2.10.8
2018-11-10 14:50:33 +01:00
Jan Tojnar 47d439addd
gimp: 2.10.6 → 2.10.8 2018-11-10 14:06:34 +01:00
Jörg Thalheim 5cad46ed9e
Merge pull request #50031 from r-ryantm/auto-update/openimageio
openimageio: 1.8.15 -> 1.8.16
2018-11-10 10:32:51 +00:00
Jörg Thalheim 9f5eb3c2f4
Merge pull request #50058 from r-ryantm/auto-update/krop
krop: 0.5.0 -> 0.5.1
2018-11-10 10:04:01 +00:00
Vladyslav M 1ab73260c2
Merge pull request #50120 from r-ryantm/auto-update/feh
feh: 2.28 -> 2.28.1
2018-11-10 10:17:00 +02:00
R. RyanTM 75f77c24e0 feh: 2.28 -> 2.28.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/feh/versions
2018-11-09 20:04:48 -08:00
R. RyanTM 7cd159db1b gocr: 0.51 -> 0.52
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gocr/versions
2018-11-09 16:35:56 -08:00
R. RyanTM 8c13a37604 krop: 0.5.0 -> 0.5.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/krop/versions
2018-11-09 11:34:22 -08:00
Renaud 0fcf1989da
Merge pull request #49737 from cocreature/yacreader
yacreader: init at 9.5.0, libunarr: init at 1.0.1
2018-11-09 18:29:40 +01:00
Moritz Kiefer d52de90dba yacreader: init at 9.5.0, libunarr: init at 1.0.1 2018-11-09 17:46:30 +01:00
R. RyanTM 6be46a2b9f openimageio: 1.8.15 -> 1.8.16
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/openimageio/versions
2018-11-09 07:25:25 -08:00
Jörg Thalheim da1903907d
Merge pull request #49944 from r-ryantm/auto-update/rapid-photo-downloader
rapid-photo-downloader: 0.9.12 -> 0.9.13
2018-11-08 21:25:31 +00:00
R. RyanTM 457e3d57dd rapid-photo-downloader: 0.9.12 -> 0.9.13
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/rapid-photo-downloader/versions
2018-11-08 12:52:39 -08:00
Piotr Bogdan d3cfda14fb gimp: get rid of compiler from the runtime closure 2018-11-07 15:21:21 +01:00
Patrick Hilhorst b0e9fc131c
treewide: Fix packages using name where they should use pname 2018-11-06 00:06:17 +01:00
Frank Doepper fc84be03be phototonic: 1.7.1 -> 2.1 2018-11-04 15:45:44 +01:00
Tristan Helmich 5a1708b1ab shutter: 0.94 -> 0.94.2 (#49546)
* shutter: 0.94 -> 0.94.2

* shutter: dependencies refresh

procps and perlPackages.FileBaseDir were missing
Perl package JSONMaybeXS replaces JSONXS
Moved makeWrapper to nativeBuildInputs
2018-11-03 17:00:30 +01:00
R. RyanTM d60faae441 imagemagick7: 7.0.8-12 -> 7.0.8-14 (#49298)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/imagemagick/versions
2018-10-29 16:19:33 +01:00
xzfc b489c57f35 ahoviewer: 1.5.0 -> 1.6.4 (#49307) 2018-10-29 12:00:34 +01:00
Jörg Thalheim 56d2af6e98
Merge pull request #49222 from plumelo/feature/avocode-3.6.2
avocode: 3.4.0 -> 3.6.2
2018-10-29 00:42:51 +00:00
R. RyanTM 6c8760f07c krita: 4.1.3 -> 4.1.5
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/krita/versions
2018-10-27 09:02:13 -07:00
Meghea Iulian f3fb56d633 avocode: 3.4.0 -> 3.6.2 2018-10-27 18:07:48 +03:00
Andreas Rammhold 1103b3fbe6 batik: mark as insecure
The package hasn't been updated in a long time. There have been several
issues with the package. There is no dependant  package in the
repository so marking it as insecure until someone maintains it sounds
reasonable.
2018-10-26 12:17:58 +02:00
Frederik Rietdijk ca6ee8f519 Merge master into staging-next 2018-10-20 09:40:09 +02:00
Jörg Thalheim 4f3a0a394d
Merge pull request #48389 from r-ryantm/auto-update/openimageio
openimageio: 1.8.14 -> 1.8.15
2018-10-19 11:34:11 +01:00
Frederik Rietdijk 89349fdae9 Merge staging-next into staging 2018-10-17 08:36:28 +02:00
Johannes Frankenau 6032bdd532 rapid-photo-downloader: 0.9.10 -> 0.9.12 2018-10-15 13:45:10 +02:00
R. RyanTM f8f0a36c74 openimageio: 1.8.14 -> 1.8.15
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/openimageio/versions
2018-10-14 04:01:10 -07:00
R. RyanTM 49284e4a00 goxel: 0.8.0 -> 0.8.1 (#47789)
* goxel: 0.8.0 -> 0.8.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/goxel/versions

* goxel: build only on x86_64-linux
2018-10-13 16:41:54 +02:00
volth a974ecf803
Merge branch 'staging' into remove-top-perlXMLParser 2018-10-13 13:22:11 +00:00
Yegor Timoshenko a600f3b577
Merge pull request #47776 from r-ryantm/auto-update/krita
krita: 4.1.1 -> 4.1.3
2018-10-13 12:51:07 +00:00
volth c0fed1ba77 perlXMLParser -> perlPackages.XMLParser 2018-10-12 22:56:15 +00:00
Dmitry Kalinkin c047572a17 dia: fix on darwin (#48176)
Fixes runtime error:
  GTK+ 2.x symbols detected. Using GTK+ 2.x and GTK+ 3 in the same process is not supported
2018-10-10 23:20:34 +02:00
Eelco Dolstra a3382a85b3 digikam: libGLU_combined -> libGL + libGLU
This prevents a runtime dependency on a large number of -dev outputs.
2018-10-08 22:56:23 +02:00
edef b5a2181899 solvespace: 2.3-20170808 -> 2.3-20180906 2018-10-06 14:07:36 +00:00
Vladyslav M a5d6705e20 imagemagick7: 7.0.8-6 -> 7.0.8-12 (#47851) 2018-10-05 15:48:38 +02:00
Jan Tojnar 5cc18c4781
gnome3: remove versionBranch attribute
Standard library now contains stdenv.lib.versions.majorMinor,
which does the same.
2018-10-05 02:17:19 +02:00
R. RyanTM dbe2f0ba23 krita: 4.1.1 -> 4.1.3
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/krita/versions
2018-10-03 09:30:38 -07:00
R. RyanTM 844ebe2039 kgraphviewer: 2.4.2 -> 2.4.3 (#47031)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/kgraphviewer/versions
2018-09-28 22:15:11 +02:00
R. RyanTM ee8f6be536 openimageio: 1.8.9 -> 1.8.14 (#46232)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
openimageio
2018-09-28 21:12:26 +02:00
Frederik Rietdijk 56853dc6d8
Merge pull request #45941 from NixOS/staging-next
Staging next
2018-09-23 09:31:28 +02:00
Orivej Desh 1491d4f268 yed: 3.18.1 -> 3.18.1.1 2018-09-22 16:59:38 +00:00
R. RyanTM 4d35759735 feh: 2.27.1 -> 2.28 (#47055)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/feh/versions
2018-09-21 00:49:51 +02:00
Frederik Rietdijk de419917a3 Merge master into staging-next 2018-09-18 18:44:48 +02:00
Jan Tojnar eb9de57dd7
gcolor3: 2.3 → 2.3.1 2018-09-17 12:43:36 +02:00
Ryan Mulligan f91a79ecc8 treewide: fix config.allowAliases = false evaluation 2018-09-13 06:47:22 -07:00
Uli Baum 1df2560dde Merge branch 'master' into staging-next 2018-09-13 10:08:53 +02:00
Michele Guerini Rocco fd7e69be1c antimony: 0.9.3 -> 2018-10-17 (#46486) 2018-09-10 22:17:00 +02:00
Maximilian Bosch 6d6cbd316d pythonmagick: fix build (#46469)
The original build broke with the following linker issue:

```
  CXXLD    _PythonMagick.la
/nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/ld: cannot find -l-L/nix/store/4gh6ynzsd5ndx37hmkl62xa8z30k43y1-imagemagick-6.9.9-34/lib
collect2: error: ld returned 1 exit status
```

This happens since `BOOST_PYTHON_LIB` wasn't set properly, however
`_PythonMagick.la` was linked with `-l$(BOOST_PYTHON_LIB)
$(MAGICK_LIBS)`. With an empty `BOOST_PYTHON_LIB` the linker got
confused.

To work around this, the `boost` library directory needs to be specified
explicitly. To ensure that the changes take effect, the original
`configure` script shipped with `$src` needs to be removed and recreated
using the `autoreconfHook`.

Additionally the `imagemagick` license (https://spdx.org/licenses/ImageMagick.html)
needs to be added to `lib/licenses.nix` to document the proper license
of `pythonmagick` in the meta section.
2018-09-10 11:59:51 +02:00
aszlig 7bda775331
imv: Include i686-linux in platforms attribute
The package builds and works fine on i686-linux, so there is no need to
fail evaluation on those systems.

Signed-off-by: aszlig <aszlig@nix.build>
Issue: #45976
Cc: @rnhmjoj, @xeji
2018-09-09 10:30:58 +02:00
R. RyanTM cdf82f6ddd kipi-plugins: 5.2.0 -> 5.9.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
kipi-plugins
2018-09-06 19:30:21 -07:00
Vladimír Čunát 1428d00aa4
Merge branch 'master' into staging-next
Hydra: ?compare=1477053
2018-09-04 13:06:45 +02:00
xeji 6f91e44b6a
Merge pull request #45976 from rnhmjoj/imv
imv: 2.1.3 -> 3.0.0
2018-09-04 00:48:20 +02:00
rnhmjoj d5b0c4d5c2
imv: build only on x86_64 linux 2018-09-04 00:35:17 +02:00
worldofpeace 507dfccdf8 photoflow: mark broken for aarch64 2018-09-03 15:31:12 -04:00
worldofpeace a3db67282d photoflow: 2018-03-06 -> 2018-08-28 2018-09-03 14:51:41 -04:00
worldofpeace 66385a66dc imgcat: fix build 2018-09-03 14:51:40 -04:00
rnhmjoj 7a58a44474
imv: 2.1.3 -> 3.0.0 2018-09-03 14:22:32 +02:00
Jan Tojnar e2a731fc5c
Merge pull request #45949 from jtojnar/gcolor3
gcolor3: 2.2 → 2.3
2018-09-02 18:24:23 +01:00
Jan Tojnar 87f3a2a406
gcolor3: 2.2 → 2.3 2018-09-02 18:53:04 +02:00