JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
245,716 Commits 2 Branches 0 Tags 13 GiB
0814821151
Commit Graph

1289 Commits

Author SHA1 Message Date
Jan Tojnar
9555834399
netpbm: split into multiple outputs 2020-03-01 15:13:03 +01:00
Jan Tojnar
90180905a2
netpbm: Fix tiff support 
The build script check whether JPEGLIB and ZLIB are not set to NONE.
We did not set the latter as pkg-config handles zlib requirement
for libpng dependency and the comment in config.mk only talks about
zlib being needed for libpng.

Since libtiff only needs libz for static linking, we turn TIFFLIB_NEEDS_ZLIB
off instead of pointlessly setting ZLIB value.

Closes: https://github.com/NixOS/nixpkgs/issues/75156
 2020-03-01 15:13:03 +01:00
Jan Tojnar
aa1aefd06a
netpbm: 10.82.01 → 10.89.1 
https://sourceforge.net/p/netpbm/code/3735/tree//advanced/doc/HISTORY
 2020-03-01 15:13:03 +01:00
Jan Tojnar
6b4d057b66
netpbm: add pre/post phase hooks 2020-03-01 15:13:02 +01:00
Jan Tojnar
8ea075bcb9
netpbm: Clean up 
* Format with nixpkgs-fmt
* Move build tools to nativeBuildInputs
* Clarify license
 2020-03-01 15:13:02 +01:00
Jan Tojnar
b19ce7cfe9
netpbm: add updateScript 2020-03-01 15:13:02 +01:00
Benjamin Hipple
c580dfc0ce
viu: upgrade cargo fetcher and cargoSha256 (#81240) 
Infra upgrade as part of #79975; no functional change expected.
 2020-02-29 12:49:19 +01:00
Michael Weiss
18938fb2a5
wallutils: 5.8.3 -> 5.9.0 2020-02-28 21:13:17 +01:00
Mario Rodas
35536325f9
Merge pull request #81236 from bhipple/u/rust-cargo-svgcleaner 
svgcleaner: upgrade cargo fetcher and cargoSha256
 2020-02-28 05:24:23 -05:00
Vladyslav M
24714485eb
Merge pull request #81237 from bhipple/u/rust-cargo-oxipng 
oxipng: upgrade cargo fetcher and cargoSha256
 2020-02-28 10:45:16 +02:00
Benjamin Hipple
07f35e7aee shotgun: upgrade cargo fetcher and cargoSha256 
Infra upgrade as part of #79975; no functional change expected.
 2020-02-27 22:31:56 -05:00
Benjamin Hipple
26d5e7edff oxipng: upgrade cargo fetcher and cargoSha256 
Infra upgrade as part of #79975; no functional change expected.
 2020-02-27 22:04:51 -05:00
Benjamin Hipple
a49d7187ae svgcleaner: upgrade cargo fetcher and cargoSha256 
Infra upgrade as part of #79975; no functional change expected.
 2020-02-27 21:58:56 -05:00
Aaron Andersen
987d6c216f
Merge pull request #77710 from emilazy/add-imageworsener 
imageworsener: init at 1.3.3
 2020-02-24 07:00:51 -05:00
Andreas Rammhold
8e08f7515a
netpbm: fix typo on substituteInPlace parameters 
It seems like originally `-dSAFER` should have been replaced with
`-dPARANOIDSAFER` instead of `-DSAFER` (capital D vs lower case d).

This was pointed out in #75153. This might now finally (properly?) fix
CVE-2005-2471.
 2020-02-22 14:28:32 +01:00
Benjamin Hipple
eb8ae2166e gifski: 0.9.1 -> 0.10.2 2020-02-21 18:59:26 -05:00
Mario Rodas
310b108efa
lepton: enable on darwin 2020-02-14 04:20:00 -05:00
Sirio Balmelli
c91aade77f
mscgen: enable on darwin (#79996) 
Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
 2020-02-17 10:48:11 -05:00
Benjamin Hipple
eb11feaa0b treewide: change fetchCargoTarball default to opt-out 
Changes the default fetcher in the Rust Platform to be the newer
`fetchCargoTarball`, and changes every application using the current default to
instead opt out.

This commit does not change any hashes or cause any rebuilds. Once integrated,
we will start deleting the opt-outs and recomputing hashes.

See #79975 for details.
 2020-02-13 22:41:37 -08:00
Benjamin Saunders
ad1934b465 vulkan-tools: 1.1.114.0 -> 1.2.131.1 2020-02-11 19:11:32 +01:00
Maximilian Bosch
513482763b
wdisplays: 2019-10-26 -> 2020-01-12 2020-02-09 20:30:34 +01:00
R. RyanTM
d06536ffed vips: 8.9.0 -> 8.9.1 2020-02-06 23:19:42 +00:00
Ryan Mulligan
752639c2bf
Merge pull request #78544 from r-ryantm/auto-update/vips 
vips: 8.8.4 -> 8.9.0
 2020-01-27 12:33:12 -08:00
Michael Raskin
4eba7020b9 cfdg: 3.0.9 -> 3.2_2, fix build 2020-01-27 00:19:52 +01:00
R. RyanTM
61a6a60bf2 vips: 8.8.4 -> 8.9.0 2020-01-26 13:27:17 +00:00
R. RyanTM
2176d2fc8d argyllcms: 2.1.1 -> 2.1.2 2020-01-22 01:01:11 -08:00
Peter Simons
6cc43ee38c
Merge pull request #78069 from r-ryantm/auto-update/asymptote 
asymptote: 2.61 -> 2.62
 2020-01-20 10:15:44 +01:00
R. RyanTM
68ee1de5d2 asymptote: 2.61 -> 2.62 2020-01-20 03:07:05 +00:00
Maximilian Bosch
e89c6aeabc
grim: 1.2.0 -> 1.3.0 
https://github.com/emersion/grim/releases/tag/v1.3.0
 2020-01-16 13:13:40 +01:00
Emily
9fb77128ee imageworsener: init at 1.3.3 2020-01-15 00:28:00 +00:00
Niklas Hambüchen
b0649e2ed9
Merge pull request #77187 from r-ryantm/auto-update/pstoedit 
pstoedit: 3.74 -> 3.75
 2020-01-12 04:24:06 +01:00
Will Dietz
cf104600ab
gnuplot: 5.2.7 -> 5.2.8 
http://www.gnuplot.info/ReleaseNotes_5_2_8.html
 2020-01-07 16:16:29 -06:00
R. RyanTM
671d8686b0 pstoedit: 3.74 -> 3.75 2020-01-06 23:23:43 -08:00
Maximilian Bosch
254d6e5cbf
nifskope: fix aarch64 build 
https://hydra.nixos.org/build/109694386
 2020-01-06 18:16:14 +01:00
Robin Gloster
6ca6ac796b
treewide: configureFlags is a flat list 2019-12-31 01:37:49 +01:00
Robin Gloster
5f2b92e3ec
treewide: NIX_*_COMPILE -> string 2019-12-31 00:13:29 +01:00
Robin Gloster
ab0cfd9e03
treewide: NIX_*_COMPILE -> string 2019-12-31 00:10:18 +01:00
Frederik Rietdijk
6d059becd3 Merge gcc-9 into staging (#68029) 2019-12-30 16:38:38 +01:00
Merijn Broeren
133103d709
treewide: replace make/build/configure/patchFlags with nix lists 2019-12-30 12:58:11 +01:00
Robin Gloster
96fc34a8cd
pfstools: *Flags are lists 2019-12-30 12:15:30 +01:00
Robin Gloster
6c40a45b88
argyllcms: *Flags are lists 2019-12-30 11:13:42 +01:00
Franz Pletz
77b6c3cd06
Merge remote-tracking branch 'origin/master' into gcc-9 2019-12-26 14:17:36 +01:00
R. RyanTM
2d84be73e1 asymptote: 2.60 -> 2.61 2019-12-22 21:44:37 -08:00
Orivej Desh
2ac6f1e352 ifm: init at 2015-11-08 
Listed on http://www.ifarchive.org/indexes/if-archiveXmapping-tools.html
 2019-12-10 17:09:14 +00:00
Mario Rodas
13b87494eb
Merge pull request #75415 from r-ryantm/auto-update/vips 
vips: 8.8.3 -> 8.8.4
 2019-12-10 00:32:36 -05:00
R. RyanTM
83c6d2a7e1 vips: 8.8.3 -> 8.8.4 2019-12-09 18:14:42 -08:00
Michael Raskin
fd0e1eef28
Merge pull request #69058 from dtzWill/update/graphviz-2.42.2 
graphviz: 2.40.1 -> 2.42.2
 2019-12-08 18:11:24 +00:00
markuskowa
24c1f9505a
Merge pull request #75209 from r-ryantm/auto-update/dpic 
dpic: 2019.08.30 -> 2019.11.30
 2019-12-08 14:32:51 +01:00
R. RyanTM
c0648bc231 dpic: 2019.08.30 -> 2019.11.30 2019-12-07 21:45:37 -08:00
worldofpeace
4d9ccae632
Merge pull request #75134 from andersk/gnuplot_qt 
gnuplot_qt: Use qt mkDerivation
 2019-12-07 05:50:48 -05:00
Anders Kaseorg
c55f48477a gnuplot_qt: Use qt mkDerivation 
Fixes this error:

gnuplot> plot [-5:5] sin(x)
qt.qpa.plugin: Could not find the Qt platform plugin "xcb" in ""
This application failed to start because no Qt platform plugin could
be initialized. Reinstalling the application may fix this problem.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
 2019-12-06 21:14:26 -08:00
Jan Tojnar
3e074a47b6
Merge pull request #74301 from risicle/ris-gmic-opencv3 
gmic, gmic-qt: switch to opencv3
 2019-12-06 02:24:11 +01:00
Frederik Rietdijk
51ef7c3e49 Merge master into staging-next 2019-12-05 09:14:08 +01:00
Mateusz Kowalczyk
1451a52a38 Remove myself (fuuzetsu) from maintainer lists 
I haven't been doing any maintenance for a long time now and not only
do I get notified, it also creates a fake impression that all these
packages had at least one maintainer when in practice they had none.
 2019-12-05 16:29:48 +09:00
Jan Tojnar
a4bbc84e16
Merge branch 'staging-next' into staging 2019-12-01 01:44:03 +01:00
Jan Tojnar
8cbc862b83
dconf: move to top-level 2019-12-01 01:01:40 +01:00
Frederik Rietdijk
9f84415541 Merge staging-next into staging 2019-11-30 08:58:01 +01:00
Jonathan Ringer
0c1c18ca44
Merge branch 'master' into staging-next 2019-11-27 22:57:50 -08:00
Robert Scott
53b523b4ed gmic-qt: switch to opencv3 
opencv2 is essentially EOL and has security concerns
 2019-11-27 01:09:02 +00:00
Robert Scott
81d24990bb gmic: switch to opencv3 
opencv2 is essentially EOL and has security concerns
 2019-11-27 01:08:54 +00:00
Robert Scott
8361442cf7
facedetect: switch to opencv4 
opencv2 is essentially EOL and has security concerns
 2019-11-26 20:01:37 +01:00
Christian Kauhaus
f02d65c980
Merge pull request #73586 from c0bw3b/sec/jasper 
jasper: mark as vulnerable, replace with openjpeg where possible, disable JPEG2000 support.
 2019-11-24 13:15:02 +01:00
c0bw3b
9a48332935 dcraw: mark as vulnerable 2019-11-20 19:46:14 +01:00
Frederik Rietdijk
10d0c68a9b Merge staging-next into staging 2019-11-20 10:02:21 +01:00
Frederik Rietdijk
65edeb8633 Merge master into staging-next 2019-11-20 10:01:49 +01:00
Daniel Schaefer
d901b2a166
Merge pull request #73474 from matthuszagh/asymptote-2.60 
asymptote: 2.47 -> 2.60
 2019-11-20 09:35:55 +01:00
Frederik Rietdijk
5f8b0d7d99 Merge staging-next into staging 2019-11-19 14:53:29 +01:00
Frederik Rietdijk
f6b39f852e Merge master into staging-next 2019-11-19 10:53:44 +01:00
Matt Huszagh
098a903ce2 asymptote: 2.47 -> 2.60 
Also cleans up some unnecessary steps in the build
expression.
 2019-11-18 15:36:53 -08:00
adisbladis
dcfc821c6c
treewide: Stop using Qt 5.9 2019-11-18 20:10:43 +00:00
adisbladis
c9d8624ccd
treewide: Get rid of libGLU_combined 2019-11-18 20:10:43 +00:00
Michael Weiss
f62e1c41e2
wallutils: 5.8.2 -> 5.8.3 2019-11-17 21:27:07 +01:00
Frederik Rietdijk
c6e31d0767 Merge master into staging-next 2019-11-14 13:31:39 +01:00
Silvan Mosberger
3f0082d579
jpegexiforient: init at unstable-2002-02-17 2019-11-14 02:36:30 +01:00
adisbladis
13acfd0e28
maim: Don't use libGLU_combined 2019-11-09 10:34:49 +00:00
Franz Pletz
e9eb9ebad3
appleseed: fix build with gcc9 2019-11-07 01:09:08 +01:00
R. RyanTM
8eb5b27504 gmic: 2.7.4 -> 2.7.5 (#72517) 2019-11-03 00:17:52 +01:00
Julien Dehos
41778dd605 pfstools: add netpbm support (fix #60841) (#61083) 2019-11-02 19:42:53 +01:00
Julien Dehos
8ca3cad711 pfstools: build pfsalign (fix #60843) (#61050) 2019-11-02 19:00:39 +01:00
Robert Scott
7dacaa056c jhead: add patches for CVE-2019-1010301, CVE-2019-1010302 2019-10-31 21:02:34 +00:00
Linus Heckemann
1bf0d4444c
wdisplays: init at 2019-10-26-unstable 2019-10-29 18:40:18 +01:00
lumi
ac2d736b3a shotgun: init at 2.2.0 2019-10-27 22:44:07 -07:00
R. RyanTM
bb6389ee89 gmic: 2.7.1 -> 2.7.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/gmic/versions
 2019-10-22 10:11:04 +02:00
Vladyslav M
8bf9c32749
oxipng: 2.2.2 -> 2.3.0 2019-10-17 21:09:48 +03:00
Vladimír Čunát
b5697c6954
Merge branch 'master' into staging-next 
Hydra nixpkgs: ?compare=1548439
 2019-10-13 13:31:33 +02:00
Robin Gloster
4fb5cdd413
treewide: update some homepage URLs 
Updated dead or redirecting URLs on packages maintained by me.
 2019-10-12 14:52:34 +02:00
Jan Tojnar
6c8aed6391
Merge branch 'master' into staging-next 2019-10-12 00:50:21 +02:00
Marek Mahut
d94d213f48
Merge pull request #70565 from r-ryantm/auto-update/dpic 
dpic: 2016.01.12 -> 2019.08.30
 2019-10-10 11:24:10 +02:00
Frederik Rietdijk
a0c34f54cc Merge master into staging-next 2019-10-08 11:56:52 +02:00
R. RyanTM
acfef2ea91 povray: 3.7.0.8 -> 3.8.0-x.10064738 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/povray/versions
 2019-10-07 21:11:20 -07:00
Will Dietz
b906513cf5
graphviz: 2.40.1 -> 2.42.2 
Little uncertain what's going on re:versions,
here's some info:

2.42.0 "Fixes quite a few bugs"[1], which is primary motivation.

[1] https://gitlab.com/graphviz/graphviz/blob/stable_release_2.42.0/ChangeLog

2.42.1 has a note in 2.42.2's ChangeLog[2] which is good but also
interesting as 2.42.2 doesn't have an entry in its own ChangeLog :).
FWIW there are two tags for 2.42.2 but happily they're equivalent.

While a bit verbose, the changes between these versions can be looked at
using git locally or a URL like one of these:

* https://gitlab.com/graphviz/graphviz/compare/stable_release_2.42.0...stable_release_2.42.2
* https://gitlab.com/graphviz/graphviz/compare/stable_release_2.40.1...stable_release_2.42.0

Anyway, looks like a bunch of bugfixes! :)
 2019-10-07 17:58:09 -05:00
R. RyanTM
8353a2183a dpic: 2016.01.12 -> 2019.08.30 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/dpic/versions
 2019-10-06 20:44:55 -07:00
Jan Tojnar
b3fcd9375d
Merge branch 'master' into staging-next 2019-10-03 01:47:08 +02:00
Maximilian Bosch
b5204d9f5f svgbob: fix build 
See https://hydra.nixos.org/build/102480738

Bumping to latest version (which is 0.4.2 according to Cargo.lock) fixes
the build error. As no dependency changes happened, cargoSha256 doesn't
need to be updated.

ZHF #68361
 2019-10-01 10:13:32 -07:00
Mario Rodas
b82d5546c7
Merge pull request #69987 from r-ryantm/auto-update/vips 
vips: 8.8.1 -> 8.8.3
 2019-09-29 08:55:59 -05:00
Frederik Rietdijk
503081fa5b Merge staging into staging-next 2019-09-29 11:05:22 +02:00
R. RyanTM
990a562310 vips: 8.8.1 -> 8.8.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/vips/versions
 2019-09-29 01:27:47 -07:00
Vladimír Čunát
217cf982c7
Merge branch 'master' into staging-next 2019-09-27 22:13:02 +02:00
worldofpeace
1dc0dcf1ab
Merge pull request #69403 from worldofpeace/peek/update 
peek: 1.3.1 -> 1.4.0
 2019-09-26 14:53:33 -04:00
worldofpeace
f9edafb796 gifski: 0.8.7 -> 0.9.1 2019-09-25 03:06:37 -04:00
Vladimír Čunát
eab41878ac
Merge branch 'master' into staging-next 2019-09-24 08:14:34 +02:00
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