mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 06:31:02 +00:00
Code Issues Wiki Activity
152566 commits 262 branches 124 tags 6.9 GiB
Commit graph

1990 commits

Author SHA1 Message Date
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
Frederik Rietdijk b910b697f6 Merge master into staging 2018-09-02 12:10:33 +02:00
xeji a3434cf4e5
Merge pull request #45921 from markuskowa/homepages 
Cleanup homepage links
 2018-09-02 08:39:30 +02:00
Markus Kowalewski 3cbd6c559e
grafx2: update homepage 2018-09-02 00:05:49 +02:00
greydot 028b64ab08 qcomicbook: init at 0.9.1. (#44074) 2018-09-01 23:39:38 +02:00
Thra11 ef21e949a0 krita: refactor to fix build on aarch64 (#45906) 
An optional dependency, Vc, doesn't currently provide any optimisations
on aarch64 and causes a build failure in krita. Exclude it from the
build inputs on arm and aarch64.
 2018-09-01 20:25:38 +02:00
Vladimír Čunát 2d6179d1e8
Merge branch 'master' into staging 
A few trivial conflicts due to *Platforms mass replace.
 2018-09-01 17:38:18 +02:00
Markus Kowalewski e014edeb8b
k3d: add license 2018-09-01 16:11:19 +02:00
lewo fc39e5c645
Merge pull request #41920 from fgaz/drawpile 
drawpile: init at 2.0.10
 2018-08-31 18:37:37 +02:00
Andrew Childs 78d842e8fb pbrt: 2017-01-12 -> 2018-08-15; cmake 3.12 compatibility (#45863) 2018-08-31 16:18:05 +02:00
John Ericson 0828e2d8c3 treewide: Remove usage of remaining redundant platform compatability stuff 
Want to get this out of here for 18.09, so it can be deprecated
thereafter.
 2018-08-30 17:20:32 -04:00
John Ericson 2c2f1e37d4 reewide: Purge all uses stdenv.system and top-level system 
It is deprecated and will be removed after 18.09.
 2018-08-30 17:20:32 -04:00
John Wiegley fa817fb9f7
imgcat: New expression 2.3.0 2018-08-28 12:51:09 -07:00
Francesco Gazzetta 62a2574eb3 drawpile: init at 2.0.11 2018-08-26 21:00:39 +02:00
Vladimír Čunát 7db611f2af
Merge branch 'staging' 
Includes libX11 security update.
 2018-08-24 09:19:43 +02:00
Markus Kowalewski 2025bd892e
epeg: add license 2018-08-23 11:57:40 +02:00
Markus Kowalewski c365453fed
qiv: add license 2018-08-23 11:57:39 +02:00
Markus Kowalewski 7a05294639
photivo: add license 2018-08-23 11:57:39 +02:00
Markus Kowalewski 74a12299dd
imagemagick: add license 2018-08-23 11:28:06 +02:00
Markus Kowalewski 4cee9af609
gqview: add license 2018-08-23 11:28:06 +02:00
Markus Kowalewski b76029d568
dia: add license 2018-08-23 11:28:06 +02:00
Markus Kowalewski b97ea32ff0
batik: add meta data 2018-08-23 11:28:06 +02:00
Matthew Bauer f7bc33abf0 Revert "treewide: fixup breakage due to absolute compiler path" 
This reverts commit d0888d1503.
 2018-08-22 01:14:53 +02:00
Vladimír Čunát 765d695b89
Merge branch 'staging-next' 
Security fixes for a few packages are included.
 2018-08-21 15:36:02 +02:00
Vladimír Čunát d0888d1503
treewide: fixup breakage due to absolute compiler path 
Some packages just can't handle them #44767.  It was tempting to try
to abstract this in some way, but I didn't do that ATM.
 2018-08-21 12:34:33 +02:00
Jan Tojnar 4b60e77002
gimp: 2.10.4 → 2.10.6 2018-08-20 15:52:28 +02:00
Vladimír Čunát 153a19df05
Merge branch 'master' into staging-next 
Hydra: ?compare=1474536
 2018-08-20 09:15:33 +02:00
Michael Raskin bc9082bf35
Merge pull request #45354 from markuskowa/xfig-pr 
xfig: 3.2.5b -> 3.2.7a
 2018-08-20 05:22:46 +00:00
Markus Kowalewski 6d95b55d3c
xfig: 3.2.5b -> 3.2.7a 
init fig2dev as separate package (3.2.7a).
fig2dev was included in xfig in the previous version.
 2018-08-20 00:43:11 +02:00
Meghea Iulian e1d1b7ff65 avocode: 3.2.0 -> 3.4.0 (#45350) 2018-08-19 23:45:53 +02:00
Markus Kowalewski 824a0192a7
xfig: update meta data 2018-08-18 00:45:54 +02:00
Vladimír Čunát 14aa936ec5
Merge branch 'staging-next' into staging 2018-08-17 20:53:27 +02:00
Vladimír Čunát cbabebcc2e
Merge branch 'master' into staging-next 
Hydra: ?compare=1473892
 2018-08-17 13:45:21 +02:00
Sarah Brofeldt 131f385bcc
Merge pull request #45106 from jfrankenau/update-raphodo 
rapid-photo-downloader: 0.9.9 -> 0.9.10
 2018-08-16 10:58:46 +02:00
Jörg Thalheim 0a17d08a97
Merge pull request #44922 from Enzime/fix/darktable-on-macos 
darktable: Fix compilation on macOS
 2018-08-15 20:24:20 +02:00
Johannes Frankenau 53c265d0f9 rapid-photo-downloader: 0.9.9 -> 0.9.10 2018-08-14 20:56:22 +02:00
Patrick Chilton 6bdb20dec0 meshlab: 2016.02 -> 20180627-beta 2018-08-14 17:03:44 +08:00