Commit graph

1088 commits

Author SHA1 Message Date
Orivej Desh dc4224bc54 Merge branch 'master' into staging
* master: (36 commits)
  libipt: set platforms to unix
  licenses: refer to curl using spdx
  qhull: specify spdx license
  ocamlPackages.spacetime_lib: 0.1.0 -> 0.3.0
  ocamlPackages.owee: 0.2 -> 0.3
  nixFlakes: 2.4pre20190913_a25c022 -> 2.4pre20190922_382aa05
  daemon: init at 0.6.4
  k9s: 0.7.13 -> 0.8.4
  cask: Use generated src/version from Melpa
  python.pkgs.flask_oauthlib: remove
  radeon-profile: 20170714 -> 20190903
  radeon-profile: use Qt mkDerivation
  afew: propagate setuptools
  pythonPackages.flask-jwt-extended: 3.17.0 -> 3.23.0
  mutt: 1.12.1 -> 1.12.2
  unit: 1.10.0 -> 1.11.0
  emacsPackages: Update elpa
  emacsPackages: Update melpa
  cask: Fix cask usage
  git-lfs: use buildGoPackage
  ...
2019-09-22 21:33:00 +00:00
Vladimír Čunát 6c567ed797
Merge branch 'staging-next' into staging 2019-09-22 10:06:45 +02:00
Vladimír Čunát 22a216849b
Re-Revert "Merge branch 'staging-next'"
This reverts commit f8a8fc6c7c.
2019-09-22 09:38:09 +02:00
Vladimír Čunát f8a8fc6c7c
Revert "Merge branch 'staging-next'"
This reverts commit 41af38f372, reversing
changes made to f0fec244ca.

Let's delay this.  We have some serious regressions.
2019-09-21 20:05:09 +02:00
Vladimír Čunát 41af38f372
Merge branch 'staging-next' 2019-09-21 13:14:09 +02:00
Mario Rodas f14caea161 wallutils: use buildGoPackage 2019-09-21 04:30:00 -05:00
Pierre Bourdon 18b607b71b
zbar: disable Qt assertions
Greatly decreases zbar-lib transitive closure size: assertion messages
contain paths to Qt header files, causing zbar-lib to depend on
qtbase-dev.

The Qt specific mkDerivation normally does this automatically, but we
can't use it here due to having only a small part of the project being
Qt related.
2019-09-21 03:46:57 +02:00
worldofpeace ac0e914fdc zbar: Move D-Bus conf file to share/dbus-1/system.d
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
2019-09-16 13:59:09 -04:00
Vladimír Čunát b6c6e1f9e8
Merge branch 'master' into staging-next 2019-09-15 13:18:54 +02:00
Linus Heckemann 39ee74629c
Merge pull request #68388 from alyssais/appleseed
appleseed: fix build
2019-09-13 18:47:17 +02:00
Jan Tojnar 9b6789de73
tree-wide: replace wrapProgram with wrapGApp
where appropriate
2019-09-10 17:54:57 +02:00
Jan Tojnar 8752ff2254
zbar: clean up (#68389)
zbar: clean up
2019-09-10 06:57:40 +02:00
Jan Tojnar 2eb7541b1a
zbar: use libsForQt5.callPackage 2019-09-10 05:54:35 +02:00
Jan Tojnar 86f3b3f628
zbar: drop Perl dependency
It does not appear to be necessary
2019-09-10 01:56:40 +02:00
Jan Tojnar 021faed5ba
zbar: switch to GTK 3 2019-09-10 01:56:40 +02:00
Jan Tojnar 61fdd203d6
zbar: wrap Qt frontend 2019-09-10 01:56:40 +02:00
Jan Tojnar da135c2704
zbar: drop pygtk support
It is deprecated and we do not actually use it anywhere
2019-09-10 01:56:39 +02:00
Jan Tojnar e1cb839d17
zbar: Split to multiple outputs
Also fix D-Bus config dir path: The configure script is appending `/dbus-1/system.d`
so when we added passed in `$out/etc/dbus-1/system.d`, it ended up with extra nesting.
2019-09-10 01:34:50 +02:00
Jan Tojnar b27da0dde7
gmic & gmic-qt: update & clean-up (#68257)
gmic & gmic-qt: update & clean-up
2019-09-10 01:21:17 +02:00
Jan Tojnar 41fbd55689
zbar: format with nixpkgs-fmt 2019-09-10 00:32:22 +02:00
Alyssa Ross 5617881a42
appleseed: fix build 2019-09-09 22:14:34 +00:00
volth 7b8fb5c06c treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00
Orivej Desh 88825bbbde freeimage: 3.17.0 -> 3.18.0 2019-09-08 14:46:31 +00:00
Jan Tojnar 7a0f2fc3a0
gmic-qt: 2.3.6 → 2.7.1 2019-09-07 20:15:57 +02:00
Jan Tojnar ac757fbd42
gmic: 2.2.2 → 2.7.1 2019-09-07 20:15:56 +02:00
Jan Tojnar d8749430e4
gmic-qt: allow building non-Krita hosts
* Use qt5’s mkDerivation
* Also switch gimpPlugins.gmic to qmic-qt
2019-09-07 19:55:11 +02:00
Jan Tojnar 8ad04d92f6
gmic-qt: format with nixpkgs-fmt 2019-09-07 19:55:11 +02:00
Jan Tojnar 7c22e3af30
gmic-qt-krita: rename from gmic_krita_qt 2019-09-07 19:55:10 +02:00
Frederik Rietdijk 66bc7fc1b3 Merge master into staging-next 2019-09-06 22:46:05 +02:00
Dylan Simon d42ed9b401 graphviz: use git hash for removed release tag 2019-09-06 21:55:53 +02:00
Jan Tojnar cdf426488b
Merge branch 'master' into staging-next
Fixed trivial conflicts caused by removing rec.
2019-09-06 03:20:09 +02:00
Vladimír Čunát 4aad2947f8
Merge branch 'master' into staging-next 2019-09-04 11:00:56 +02:00
Will Dietz 21c0acbd80
pngquant: 2.12.1 -> 2.12.5
Looks like libimagequant is already at 2.12.5
2019-09-03 20:28:57 -05:00
Michael Weiss 3b7946d0ae
wallutils: 5.8.1 -> 5.8.2 2019-09-03 12:23:00 +02:00
Vladimír Čunát f21211ebfe
Merge branch 'master' into staging 2019-09-02 23:25:24 +02:00
Ivan Kozik e54007370f vulkan-headers, vulkan-tools: fix version
This fixes an assertion error in vulkan-loader on version == vulkan-headers.version:

assertion failed at /nix/store/ca66sbxzxlxlfpb579nxxnw97z2ql1gv-source/pkgs/development/libraries/vulkan-loader/default.nix:8:1

The sha256 for vulkan-headers and vulkan-tools are unchanged because
they were already set to the newer version. The correct version was
lost in the staging-next merge.
2019-08-31 17:38:42 +00:00
Frederik Rietdijk 98ef78326d Merge staging-next into staging 2019-08-31 18:07:33 +02:00
Frederik Rietdijk 96e5474329 Merge master into staging-next 2019-08-31 18:04:31 +02:00
Aaron Andersen 6951cbeea9
Merge pull request #66238 from jonringer/update-vulkan
Update vulkan packages
2019-08-31 11:45:50 -04:00
volth 7bb6b373ab treewide: name -> pname (#67513) 2019-08-31 07:41:22 -04:00
Frederik Rietdijk ad1d58c622 Merge staging-next into staging 2019-08-31 10:04:20 +02:00
Frederik Rietdijk fc74ba8291 Merge master into staging-next 2019-08-31 09:50:38 +02:00
Alexey Shmalko e2eef8d28d
escrotum: 2017-01-28 -> 2019-06-10 2019-08-29 12:20:01 +03:00
volth 08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Vladimír Čunát 2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
Robin Gloster c55d90b81c
scrot: 0.8-18 -> 1.2 2019-08-23 16:28:51 +02:00
Robin Gloster 4e60b0efae
treewide: update globin's maintained drvs 2019-08-20 19:36:05 +02:00
Rickard Nilsson 225e412edb Remove myself as maintainer of some packages. 2019-08-20 15:24:01 +02:00
ivanbrennan 268dc94653 wkhtmltopdf: use qt5's mkDerivation
See #65399
2019-08-18 17:34:34 -04:00
volth c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00