Commit Graph

1812 Commits

Author SHA1 Message Date
John Ericson
81387c2e78 Merge remote-tracking branch 'upstream/master' into staging 2018-05-11 17:12:04 -04:00
Matthew Bauer
1d2f7dff36 gimp: only use libgudev on linux
libgudev relies on udev which is a part of systemd. These are very
tightly coupled to Linux so we just enable them on Linux.
2018-05-11 13:55:20 -05:00
Frederik Rietdijk
a18b493e02 Merge master into staging 2018-05-09 10:48:01 +02:00
Dmitry Kalinkin
9b7d3f10e4 graphicsmagick-imagemagick-compat: init at 1.3.28 2018-05-09 03:11:19 -05:00
Matthew Bauer
6748534d83 Merge remote-tracking branch 'upstream/master' into staging 2018-05-08 09:36:00 -05:00
Matthew Justin Bauer
3fe9421f50
Merge pull request #39771 from r-ryantm/auto-update/graphicsmagick
graphicsmagick: 1.3.28 -> 1.3.29
2018-05-05 15:50:45 -05:00
Matthew Justin Bauer
fd75da0459
Merge pull request #39739 from r-ryantm/auto-update/pqiv
pqiv: 2.10.3 -> 2.10.4
2018-05-05 15:50:16 -05:00
Matthew Justin Bauer
30caa09e51
Merge pull request #39881 from nh2/epeg
Add epeg
2018-05-05 00:33:50 -05:00
xeji
4c8c314689
Merge pull request #39913 from Ma27/shutter/add-hicolor-icon-theme
shutter: wrap `XDG_DATA_DIRS` with `hicolor-icon-theme`
2018-05-04 22:48:56 +02:00
Maximilian Bosch
40226e647e
shutter: wrap XDG_DATA_DIRS with hicolor-icon-theme
When opening `shutter` it adds an indicator icon to the status bar.
However this doesn't happen (and an ugly default icon will be used) if
`shutter` can't find the `hicolor-icon-theme`. In such a case a warning
like this can be found in `stderr`:

```
Gtk-WARNING **: Could not find the icon 'image-png'. The 'hicolor' theme
was not found either, perhaps you need to install it.
```

As I don't think that we should force users to install this theme
globally and several other packages including `tor-browser`, `gparted`
or `clawsmail` add `hicolor-icon-theme` to their closure this seems to
be a fair measure.
2018-05-04 22:33:37 +02:00
Michael Raskin
c68dc2212e openscad: fix build by switching to git master and Qt5 2018-05-04 19:15:35 +02:00
John Ericson
cf06e42d1c Merge remote-tracking branch 'upstream/master' into staging 2018-05-03 16:35:36 -04:00
Matthew Bauer
143978a477 treewide: remove platform assertions
linux: readd assertion
2018-05-03 13:09:20 -05:00
R. RyanTM
2e16074180 imagemagick7: 7.0.7-27 -> 7.0.7-29
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.

These checks were done:

- built on NixOS
- ran ‘/nix/store/sjpf6fsvmv7aj4x1ngl8ri423cym07cj-imagemagick-7.0.7-29/bin/magick-script -h’ got 0 exit code
- ran ‘/nix/store/sjpf6fsvmv7aj4x1ngl8ri423cym07cj-imagemagick-7.0.7-29/bin/magick-script --help’ got 0 exit code
- ran ‘/nix/store/sjpf6fsvmv7aj4x1ngl8ri423cym07cj-imagemagick-7.0.7-29/bin/magick -h’ got 0 exit code
- ran ‘/nix/store/sjpf6fsvmv7aj4x1ngl8ri423cym07cj-imagemagick-7.0.7-29/bin/magick --help’ got 0 exit code
- ran ‘/nix/store/sjpf6fsvmv7aj4x1ngl8ri423cym07cj-imagemagick-7.0.7-29/bin/magick help’ got 0 exit code
- found 7.0.7-29 with grep in /nix/store/sjpf6fsvmv7aj4x1ngl8ri423cym07cj-imagemagick-7.0.7-29
- directory tree listing: https://gist.github.com/12ed56d2de915ea05dcb89d5486181f8
2018-05-03 00:47:32 +02:00
Matthew Justin Bauer
eeb016e8f0
Merge branch 'staging' into fix-ncurses-darwin-extensions 2018-05-02 15:40:38 -05:00
Niklas Hambüchen
c7b21cd191 epeg: init at 0.9.1.042
Signed-off-by: Niklas Hambüchen <mail@nh2.me>
2018-05-02 22:36:55 +02:00
Matthew Justin Bauer
5e6f1abfd3
Merge pull request #39790 from matthewbauer/gnu-on-darwin
GNUs on Darwin
2018-05-01 13:56:54 -05:00
tilpner
16e46207ec
goxel: don't save imgui.ini to working directory 2018-05-01 10:36:38 +02:00
xeji
70b165794b
Merge pull request #39768 from r-ryantm/auto-update/goxel
goxel: 0.7.3 -> 0.8.0
2018-05-01 09:59:59 +02:00
Ryan Mulligan
038a0c9a60 treewide: http to https 2018-04-30 21:39:20 -07:00
Matthew Bauer
ccaebf04c1 ocrad: supports darwin 2018-04-30 23:33:49 -05:00
R. RyanTM
1e295ccaf7 graphicsmagick: 1.3.28 -> 1.3.29
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.

These checks were done:

- built on NixOS
- ran ‘/nix/store/j8gk0alkmajz7wsv7wn368blshmk89mk-graphicsmagick-1.3.29/bin/gm help’ got 0 exit code
- ran ‘/nix/store/j8gk0alkmajz7wsv7wn368blshmk89mk-graphicsmagick-1.3.29/bin/GraphicsMagick++-config --version’ and found version 1.3.29
- ran ‘/nix/store/j8gk0alkmajz7wsv7wn368blshmk89mk-graphicsmagick-1.3.29/bin/GraphicsMagick-config --version’ and found version 1.3.29
- ran ‘/nix/store/j8gk0alkmajz7wsv7wn368blshmk89mk-graphicsmagick-1.3.29/bin/GraphicsMagickWand-config --version’ and found version 1.3.29
- found 1.3.29 with grep in /nix/store/j8gk0alkmajz7wsv7wn368blshmk89mk-graphicsmagick-1.3.29
- directory tree listing: https://gist.github.com/014b06393c82c79d1f5dfeea620b71f3
2018-04-30 16:16:51 -07:00
Will Dietz
4b7b083bcb treewide: stdenv.lib.platforms.gnu -> ... gnu ++ linux
Include all linux platforms.
2018-04-30 18:12:10 -05:00
Will Dietz
855e0463ab tree-wide: platforms = platforms.gnu; -> platforms = gnu ++ linux
"platforms.gnu" has been linux-only since at least 17.03:

$ nix eval -f channel:nixos-17.03 lib.platforms.gnu
[ "i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "mips64el-linux" ]

Unlike platforms.linux, platforms.gnu indicates "must use glibc"
which for the most part is not intended.

Replacing platforms.gnu with platforms.linux would be the same "today"
but let's err on preserving existing behavior and be optimistic
about platforms these packages work on.
2018-04-30 18:08:48 -05:00
R. RyanTM
67b3dcde4c goxel: 0.7.3 -> 0.8.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/goxel/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/af30rki4lvc9cinx3nxq1nqdnfgi6g1b-goxel-0.8.0/bin/goxel --help’ got 0 exit code
- ran ‘/nix/store/af30rki4lvc9cinx3nxq1nqdnfgi6g1b-goxel-0.8.0/bin/goxel -V’ and found version 0.8.0
- ran ‘/nix/store/af30rki4lvc9cinx3nxq1nqdnfgi6g1b-goxel-0.8.0/bin/goxel --version’ and found version 0.8.0
- ran ‘/nix/store/af30rki4lvc9cinx3nxq1nqdnfgi6g1b-goxel-0.8.0/bin/.goxel-wrapped --help’ got 0 exit code
- ran ‘/nix/store/af30rki4lvc9cinx3nxq1nqdnfgi6g1b-goxel-0.8.0/bin/.goxel-wrapped -V’ and found version 0.8.0
- ran ‘/nix/store/af30rki4lvc9cinx3nxq1nqdnfgi6g1b-goxel-0.8.0/bin/.goxel-wrapped --version’ and found version 0.8.0
- found 0.8.0 with grep in /nix/store/af30rki4lvc9cinx3nxq1nqdnfgi6g1b-goxel-0.8.0
- directory tree listing: https://gist.github.com/ee8a96a0b785c0293e1e477b693c483b
2018-04-30 15:58:28 -07:00
R. RyanTM
4e5cecabcf pqiv: 2.10.3 -> 2.10.4
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/pqiv/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/80y2wx9ga0c647w0m0nhkx2hgfhnwpv5-pqiv-2.10.4/bin/pqiv -h’ got 0 exit code
- ran ‘/nix/store/80y2wx9ga0c647w0m0nhkx2hgfhnwpv5-pqiv-2.10.4/bin/pqiv --help’ got 0 exit code
- ran ‘/nix/store/80y2wx9ga0c647w0m0nhkx2hgfhnwpv5-pqiv-2.10.4/bin/pqiv help’ got 0 exit code
- found 2.10.4 with grep in /nix/store/80y2wx9ga0c647w0m0nhkx2hgfhnwpv5-pqiv-2.10.4
- directory tree listing: https://gist.github.com/4743505ebdeb4ef63b3c2637f5d6879d
2018-04-30 11:41:45 -07:00
Jan Tojnar
0e1147d137
Merge pull request #37915 from jtojnar/gimp-2.10
GIMP 2.10
2018-04-29 15:12:27 +02:00
Jan Tojnar
5c4b687a88
gimp-with-plugins: filter out broken plugins from default selection 2018-04-29 14:29:36 +02:00
Jan Tojnar
4779556ed1
gimpPlugins.texturize: mark as broken 2018-04-29 14:23:46 +02:00
Jan Tojnar
518fb36dcb
gimpPlugins.focusblur: mark as broken 2018-04-29 14:23:36 +02:00
Jan Tojnar
4f420c6802
gmic: 2.2.1 → 2.2.2 + build gimpPlugin 2018-04-29 09:14:19 +02:00
Jan Tojnar
63a234c4a7
ufraw: build gimp plugin 2018-04-29 08:39:06 +02:00
Jan Tojnar
882682827a
gimpPlugins.lqrPlugin: use liblqr1 from pkgs 2018-04-29 08:39:06 +02:00
Jan Tojnar
b0d3ed3484
gimp: 2.8.22 → 2.10.0 2018-04-29 08:39:05 +02:00
Jörg Thalheim
cbc6560122
Merge pull request #39553 from r-ryantm/auto-update/darktable
darktable: 2.4.2 -> 2.4.3
2018-04-27 09:00:00 +01:00
Matthew Justin Bauer
047c9372ab
inkscape: fix on darwin again
I have no idea why but this broke Darwin. So added a conditional for the shebang patching.

https://hydra.nixos.org/build/73283875
2018-04-26 20:47:16 -05:00
Matthew Justin Bauer
38364c0b07
inkscape: don't patch share/filters
This should not be needed because they are using `#!/usr/bin/env python` as the shebang and in fact it will break inkscape.x86_64-darwin.

https://hydra.nixos.org/build/73283875/
2018-04-26 10:36:57 -05:00
R. RyanTM
5a62cfe4d3 darktable: 2.4.2 -> 2.4.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/darktable/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/9c4h87rp848ik02prxawwi85qzidjkmz-darktable-2.4.3/bin/darktable-cltest help’ got 0 exit code
- ran ‘/nix/store/9c4h87rp848ik02prxawwi85qzidjkmz-darktable-2.4.3/bin/darktable-cmstest -h’ got 0 exit code
- ran ‘/nix/store/9c4h87rp848ik02prxawwi85qzidjkmz-darktable-2.4.3/bin/darktable-cmstest --help’ got 0 exit code
- ran ‘/nix/store/9c4h87rp848ik02prxawwi85qzidjkmz-darktable-2.4.3/bin/darktable-cmstest help’ got 0 exit code
- ran ‘/nix/store/9c4h87rp848ik02prxawwi85qzidjkmz-darktable-2.4.3/bin/.darktable-cmstest-wrapped -h’ got 0 exit code
- ran ‘/nix/store/9c4h87rp848ik02prxawwi85qzidjkmz-darktable-2.4.3/bin/.darktable-cmstest-wrapped --help’ got 0 exit code
- ran ‘/nix/store/9c4h87rp848ik02prxawwi85qzidjkmz-darktable-2.4.3/bin/.darktable-cmstest-wrapped help’ got 0 exit code
- found 2.4.3 with grep in /nix/store/9c4h87rp848ik02prxawwi85qzidjkmz-darktable-2.4.3
- directory tree listing: https://gist.github.com/70f09e7ec3ef4b1bba88d54f066cf9df
2018-04-26 06:55:28 -07:00
aszlig
6c748ae749
inkscape: Fix build on NixOS
The first problem that was introduced in a276d5160c
was a linking error:

ld: cannot find -licui18n
ld: cannot find -licuuc
ld: cannot find -licudata

So I added icu to the buildInputs.

The second problem was that the interpreter wasn't patched in
share/filters, apparently this is only needed when building with
autotools:

make[3]: Entering directory '/build/inkscape-0.92.3/share/filters'
./i18n.py ./filters.svg > ./filters.svg.h
./i18n.py: /usr/bin/env: bad interpreter: No such file or directory

A similar error also occurs for share/palettes, share/patterns,
share/symbols and share/templates, so I added patching the interpreter
there as well.

Switching to autotools in Inkscape is a very bad idea, because upstream
currently still has their own autotools files in the 0.92.x tree but
master already has them removed, see this commit:

e471a664f9

However for the sake of trying to not break Inkscape on Darwin again,
I tried to keep the fixes minimal and not went back to CMake.

I did however mark the stuff that's unneeded for CMake, so that we can
avoid forgetting to remove that crap once we get back to CMake.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @matthewbauer
2018-04-25 17:09:04 +02:00
Matthew Bauer
0a8c91a931 inkscape: typo 2018-04-25 00:17:21 -05:00
Jan Malakhovski
7438083a4d tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00:00
Matthew Bauer
a276d5160c inkscape: fix on Darwin
Fixes #39175
2018-04-24 22:54:33 -05:00
Jörg Thalheim
f7785dd61c
Merge branch 'master' into minc_ecosystem 2018-04-21 20:18:27 +01:00
Dirk Lemstra
5d3c7ff2e1 Fixed repo for ImageMagick 6 (#39276) 2018-04-21 10:42:57 +02:00
Vladyslav Mykhailichenko
63de21fba1 feh: 2.25.1 -> 2.26 2018-04-20 23:33:01 +03:00
R. RyanTM
efffa4e392 jpegoptim: 1.4.5 -> 1.4.6 (#39229)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/jpegoptim/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/c0w9l7rcn6kx098z11nx3x5q53dvcvmd-jpegoptim-1.4.6/bin/jpegoptim -h’ got 0 exit code
- ran ‘/nix/store/c0w9l7rcn6kx098z11nx3x5q53dvcvmd-jpegoptim-1.4.6/bin/jpegoptim --help’ got 0 exit code
- ran ‘/nix/store/c0w9l7rcn6kx098z11nx3x5q53dvcvmd-jpegoptim-1.4.6/bin/jpegoptim help’ got 0 exit code
- found 1.4.6 with grep in /nix/store/c0w9l7rcn6kx098z11nx3x5q53dvcvmd-jpegoptim-1.4.6
- directory tree listing: https://gist.github.com/ccc6411a2aca02d1769831b9c561f6b4
2018-04-20 19:32:54 +02:00
Bjørn Forsman
8a5b142545 shutter: add missing dependencies for Screenshot->Export (Ctrl+U) support
However, none of the exporters I tried actually _worked_, but now
shutter at least returns an error to the user (pop-up UI element)
instead of silently hanging and only leaving messages on stdout/stderr
about the missing deps.

AFAICS, this changes the failure of Screenshot->Export functionality
from a packaging bug to an application bug (upstream).
2018-04-19 19:02:58 +02:00
Matthew Justin Bauer
a5b8b2e0cf
Merge pull request #38970 from thorstenweber83/add-pkg-fstl
fstl: init at 0.9.3
2018-04-19 12:01:54 -05:00
Matthew Justin Bauer
117b79d2bf
Merge pull request #38697 from r-ryantm/auto-update/scantailor-advanced
scantailor-advanced: 1.0.12 -> 1.0.14
2018-04-18 22:01:05 -05:00
Jörg Thalheim
ad77d624a1
Merge pull request #39039 from r-ryantm/auto-update/pqiv
pqiv: 2.10.2 -> 2.10.3
2018-04-17 23:14:05 +01:00