Commit Graph

1622 Commits

Author SHA1 Message Date
Sandro
ad18cf9e5a
Merge pull request #128317 from kira-bruneau/mangohud
mangohud: 0.6.3 → 0.6.4
2021-06-27 18:03:12 +02:00
Kira Bruneau
4a9f048d89 mangohud: 0.6.3 → 0.6.4 2021-06-27 10:28:10 -04:00
github-actions[bot]
947012b992
Merge staging-next into staging 2021-06-26 00:09:11 +00:00
Robert Schütz
d6234c2165 Merge branch 'master' into staging-next 2021-06-26 00:33:58 +02:00
Dmitry Kalinkin
9959bb87e8
Merge pull request #127522 from rytone/ocio2
blender: Switch to OpenColorIO 2.x
2021-06-25 10:39:43 -04:00
Maxwell Beck
de8a4f1741
opencolorio: Replace with 2.x
All applications besides Blender have been pinned to 1.x
2021-06-23 19:43:44 -05:00
Robert Schütz
7eb297d5e3
Merge pull request #123108 from Mindavi/graphviz/2.47.1
graphviz: 2.42.2 -> 2.47.2
2021-06-22 10:51:18 +02:00
Martin Weinelt
eef9694ebc
Merge branch 'master' into staging-next 2021-06-22 00:58:31 +02:00
Rick van Schijndel
93e119866d graphviz: 2.42.2 -> 2.47.2
also cleanup some parameters
2021-06-21 22:13:16 +02:00
Nikolay Korotkiy
83e8b3d065
maim: 5.6.3 → 5.7.4 (#127416)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-06-20 23:35:04 +02:00
Sandro
92e9653aa9
Merge pull request #127469 from kira-bruneau/mangohud 2021-06-20 18:26:57 +02:00
Sandro
c633b8d589
Merge pull request #121422 from kira-bruneau/goverlay
goverlay: init at 0.5.1
2021-06-20 18:05:41 +02:00
Kira Bruneau
0bf03aee89 mangohud: support Nvidia cards by adding OpenGL path 2021-06-19 19:11:36 -04:00
Kira Bruneau
839b933ef4 mangohud: 0.6.1 → 0.6.3 2021-06-19 16:44:08 -04:00
Kira Bruneau
1cce751a51 mangohud: prefer wrapping with XDG_DATA_DIRS
`XDG_DATA_DIRS` is what's used by Vulkan-Loader to search for MangoHud
when installed.
2021-06-19 16:33:53 -04:00
Kira Bruneau
a6293df119 goverlay: init at 0.5.1 2021-06-19 11:20:38 -04:00
Kira Bruneau
1c5ba73b66 mangohud: separate doc & man outputs 2021-06-19 11:03:38 -04:00
Kira Bruneau
2f2dde5315 mangohud: support wayland 2021-06-19 11:03:31 -04:00
github-actions[bot]
dd892e7e2f
Merge master into staging-next 2021-06-18 12:04:55 +00:00
SCOTT-HAMILTON
9f0979714e
eplot: 2.07 -> 2.09 (#126937)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-06-18 13:58:54 +02:00
Jan Tojnar
e3dfa79441
Merge branch 'staging-next' into staging
Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.
2021-06-16 19:59:05 +02:00
Michael Weiss
42ded9d56b
maintainers: remove mbakke
Their last commit is b5bd862f24 from 2016.
Thank you for your contributions.
2021-06-15 13:46:24 +02:00
Michael Weiss
876dde6413
maim,slop: Remove myself as maintainer
I've switched to Wayland (using grim and slurp, which are pretty
similar) so I cannot even properly test these X11 tools anymore.
2021-06-15 13:42:35 +02:00
Robert Scott
764a102f35 exif: add patches for CVE-2021-27815 2021-06-12 17:10:53 +01:00
Alyssa Ross
926765c5e3
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/servers/http/apache-httpd/2.4.nix
2021-06-11 02:05:00 +00:00
Matthew Bauer
3ed3aa0884
Merge pull request #126305 from andersk/mesa-demos-data
mesa-demos: Configure --with-system-data-files
2021-06-10 13:29:09 -05:00
github-actions[bot]
cf8441dd85
Merge staging-next into staging 2021-06-09 18:14:53 +00:00
Sandro
1ff2de3b13
Merge pull request #125981 from musfay/glmark2
glmark2: 2017-09-01 -> 2021.02
2021-06-09 15:21:16 +02:00
Mustafa Çalışkan
ef12ba0d04
glmark2: 2017-09-01 -> 2021.02 2021-06-09 14:33:35 +03:00
Anders Kaseorg
b3f37af994 mesa-demos: Configure --with-system-data-files
Fixes #126301.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2021-06-08 21:03:03 -07:00
Maximilian Bosch
b35402361f
Merge pull request #125763 from r-ryantm/auto-update/gnuplot
gnuplot: 5.4.1 -> 5.4.2
2021-06-05 21:56:59 +02:00
github-actions[bot]
0397e518b7
Merge staging-next into staging 2021-06-05 18:30:31 +00:00
R. RyanTM
2c97a3630c gnuplot: 5.4.1 -> 5.4.2 2021-06-05 08:14:31 +00:00
R. RyanTM
fc48487637 astc-encoder: 2.5 -> 3.0 2021-06-03 13:45:06 +00:00
github-actions[bot]
ddd2865cf8
Merge staging-next into staging 2021-05-29 01:44:01 +00:00
Mitsuhiro Nakamura
b9bf2ab441 feedgnuplot: 1.51 -> 1.58 2021-05-28 20:52:39 +09:00
Mitsuhiro Nakamura
75176e353c feedgnuplot: fix perl shebang 2021-05-28 20:52:39 +09:00
Robert Schütz
b4e8099795 graphviz: patch CVE-2020-18032 2021-05-28 10:59:08 +02:00
Kira Bruneau
cd4780fab4
maintainers: rename metadark -> kira-bruneau (#124035) 2021-05-22 16:47:40 +02:00
Sandro
55aa5e870c
Merge pull request #123226 from pacien/ldgallery-fix-darwin-build 2021-05-22 15:51:52 +02:00
pacien
eb01e51938 ldgallery: fix darwin build
This adds a missing build dependency for building on Darwin.

GitHub: fixes #122681
2021-05-22 15:27:17 +02:00
R. RyanTM
aaa5b24921 agi: 1.1.0-dev-20210514 -> 1.1.0-dev-20210517 2021-05-20 14:47:44 -07:00
R. RyanTM
54a5d41968 agi: 1.1.0-dev-20210513 -> 1.1.0-dev-20210514 2021-05-19 10:46:17 -07:00
Stéphan Kochen
df51504424 pikchr: fix darwin build 2021-05-18 11:46:51 +02:00
Robert Schütz
d496275b80 yaxg: use ffmpeg instead of ffmpeg_3 2021-05-18 11:14:34 +02:00
Sandro
f85bc843c2
Merge pull request #122759 from dotlambda/mono6 2021-05-18 01:25:35 +02:00
Michael Raskin
70b37f9bf2
Merge pull request #123340 from dotlambda/cfdg-ffmpeg
cfdg: use ffmpeg instead of ffmpeg_3
2021-05-17 11:04:55 +00:00
Robert Schütz
d9252ffa69 cfdg: use ffmpeg instead of ffmpeg_3 2021-05-17 11:40:22 +02:00
Sandro
700942d2a5
Merge pull request #121119 from SuperSandro2000/remove-gnidorah
treewide: remove gnidorah
2021-05-17 02:42:24 +02:00
Martin Weinelt
7bd65d54f7 treewide: remove nand0p as maintainer
While looking at the sphinx package I noticed it was heavily
undermaintained, which is when we noticed nand0p has been inactive for
roughly 18 months. It is therefore prudent to assume they will not be
maintaining their packages, modules and tests.

- Their last contribution to nixpkgs was in 2019/12
- On 2021/05/08 I wrote them an email to the address listed in the
  maintainer-list, which they didn't reply to.
2021-05-17 01:50:49 +02:00
github-actions[bot]
b484cef365
Merge master into staging-next 2021-05-16 01:00:58 +00:00
Sandro
8c756df77e
Merge pull request #122935 from r-ryantm/auto-update/agi
agi: 1.1.0-dev-20210507 -> 1.1.0-dev-20210513
2021-05-15 21:34:05 +02:00
Jonathan Ringer
0546e68ef7
Merge remote-tracking branch 'origin/master' into staging-next 2021-05-14 21:57:09 -07:00
Stéphan Kochen
bb24db68aa
dmtx-utils: fix darwin build (#123033) 2021-05-14 17:34:07 -04:00
R. RyanTM
f3b5e9c76d agi: 1.1.0-dev-20210507 -> 1.1.0-dev-20210513 2021-05-14 01:21:17 +00:00
Robert Schütz
d099e7558e mono: 5 -> 6 2021-05-12 21:32:40 +02:00
Martin Weinelt
a18880bf72 Merge remote-tracking branch 'origin/master' into staging-next 2021-05-12 18:28:03 +02:00
Sandro
76e3279009
Merge pull request #122636 from rmcgibbo/vips
vips: fix darwin
2021-05-12 18:15:41 +02:00
github-actions[bot]
d8fb37f470
Merge master into staging-next 2021-05-12 06:21:33 +00:00
davidak
4beb9ae883
Merge pull request #122465 from MetaDark/mangohud
mangohud: 0.4.1 → 0.6.1
2021-05-12 07:49:01 +02:00
Robert T. McGibbon
c7b3d9522b vips: fix darwin 2021-05-11 16:54:27 -04:00
Kira Bruneau
c3a52c2a27 mangohud: 0.4.1 → 0.6.1 2021-05-11 12:52:12 -04:00
github-actions[bot]
10e16ec9ab
Merge master into staging-next 2021-05-11 06:20:33 +00:00
R. RyanTM
4b9a7b96dc agi: 1.1.0-dev-20210506 -> 1.1.0-dev-20210507 2021-05-11 00:34:00 +00:00
github-actions[bot]
450e66080b
Merge master into staging-next 2021-05-09 18:23:01 +00:00
Ryan Mulligan
b64ef0127c
Merge pull request #121967 from r-ryantm/auto-update/agi
agi: 1.1.0-dev-20210504 -> 1.1.0-dev-20210506
2021-05-09 10:46:46 -07:00
Vladimír Čunát
5663b2b2d3
Merge branch 'master' into staging-next
(a trivial conflict in transmission)
2021-05-09 09:31:55 +02:00
R. RyanTM
c6dbb82d8c gmic: 2.9.6 -> 2.9.7 2021-05-08 17:51:07 -07:00
Sandro
84a721ff5f
Merge pull request #121549 from hzeller/timg-142 2021-05-08 21:08:50 +02:00
github-actions[bot]
b8cdb044e9
Merge staging-next into staging 2021-05-07 06:20:24 +00:00
Ivar Scholten
33d042b667 snapdragon-profiler: init at v2021.2
Co-authored-by: PixelyIon <pixelyion@protonmail.com>
2021-05-06 21:17:39 -07:00
R. RyanTM
db95d0ce9a agi: 1.1.0-dev-20210504 -> 1.1.0-dev-20210506 2021-05-07 00:34:55 +00:00
Jan Tojnar
d9f177eb4d
Merge branch 'staging-next' into staging
The transmission conflict was non-trivial:
- libbrotli added to apparmor rules <1bdda029cd>
- apparmor rules rewritten <b280e64078>

Chosen the rewrite and verified that brotli is part of the rule set generated by `apparmorRulesFromClosure`.
2021-05-06 08:42:50 +02:00
Uri Baghin
a4026fb952
perceptualdiff: fix darwin support (#121646) 2021-05-05 22:36:08 -04:00
R. RyanTM
5dff40a628 agi: 1.1.0-dev-20210430 -> 1.1.0-dev-20210504 2021-05-05 00:31:00 +00:00
github-actions[bot]
5e177b16b1
Merge staging-next into staging 2021-05-03 18:25:49 +00:00
Sandro
d19a57aa07
Merge pull request #121521 from fortuneteller2k/add-xcolor
xcolor: init at unstable-2021-02-02
2021-05-03 17:32:56 +02:00
Sandro
e53f471872
Merge pull request #121340 from r-ryantm/auto-update/agi
agi: 1.1.0-dev-20210423 -> 1.1.0-dev-20210430
2021-05-03 16:55:30 +02:00
Henner Zeller
af10e7ca21 timg: 1.4.0 -> 1.4.2
Signed-off-by: Henner Zeller <h.zeller@acm.org>
2021-05-02 19:07:05 -07:00
github-actions[bot]
afe3fd192f
Merge staging-next into staging 2021-05-03 00:53:51 +00:00
Mario Rodas
8b0515eb9a
pngquant: 2.12.5 -> 2.14.1 (#121470) 2021-05-02 23:59:08 +02:00
fortuneteller2k
4b5ab91904 xcolor: init at unstable-2021-02-02 2021-05-02 23:38:24 +08:00
github-actions[bot]
a7e07bddd5
Merge staging-next into staging 2021-05-02 12:24:53 +00:00
Michele Guerini Rocco
d5fe3a1270
Merge pull request #121488 from rnhmjoj/monero
quirc: 2016-08-16 -> 2020-04-06;  monero: 0.17.1.9 -> 0.17.2.0; monero-gui: 0.17.1.9 -> 0.17.2.1
2021-05-02 13:53:40 +02:00
rnhmjoj
4dfcc530cd
quirc: 2016-08-16 -> 2020-04-06 2021-05-02 11:30:04 +02:00
github-actions[bot]
49721bed32
Merge staging-next into staging 2021-05-01 18:26:21 +00:00
davidak
20935f3e29
Merge pull request #95225 from ZerataX/mangohud
mangohud: init at 0.4.1
2021-05-01 15:24:28 +02:00
R. RyanTM
cbdce83008 agi: 1.1.0-dev-20210423 -> 1.1.0-dev-20210430 2021-05-01 00:36:41 +00:00
Sandro Jäckel
ae02415ee8
treewide: remove gnidorah
due to github account removal/deletion and not other mean of contact.
2021-04-30 01:48:19 +02:00
R. RyanTM
88c0658236 gifski: 1.4.0 -> 1.4.3 2021-04-28 11:01:05 +00:00
Ryan Mulligan
8c0828e4ce
Merge pull request #124104 from r-ryantm/auto-update/agi
agi: 1.1.0-dev-20210517 -> 1.1.0-dev-20210521
2021-05-25 11:27:45 -07:00
R. RyanTM
3dc662d5cb agi: 1.1.0-dev-20210517 -> 1.1.0-dev-20210521 2021-05-23 06:03:49 +00:00
Jonathan Ringer
11a9ac00fc
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
 pkgs/tools/networking/xh/default.nix
2021-05-22 18:19:10 -07:00
Jonathan Ringer
6b15fdce86
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
 pkgs/shells/ion/default.nix
 pkgs/tools/misc/cicero-tui/default.nix
2021-05-20 22:11:42 -07:00
github-actions[bot]
8a5e4be6b6
Merge master into staging-next 2021-05-19 18:34:10 +00:00
Jonathan Ringer
f7a112f6c4
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
  pkgs/applications/graphics/emulsion/default.nix
  pkgs/development/tools/misc/texlab/default.nix
  pkgs/development/tools/rust/bindgen/default.nix
  pkgs/development/tools/rust/cargo-udeps/default.nix
  pkgs/misc/emulators/ruffle/default.nix
  pkgs/tools/misc/code-minimap/default.nix
2021-05-18 08:57:16 -07:00
Jonathan Ringer
c227fb4b17
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/tools/rust/cargo-cache/default.nix
	pkgs/development/tools/rust/cargo-embed/default.nix
	pkgs/development/tools/rust/cargo-flash/default.nix
	pkgs/servers/nosql/influxdb2/default.nix
2021-05-17 07:01:38 -07:00
github-actions[bot]
3ff6965554
Merge master into staging-next 2021-05-17 06:22:23 +00:00
github-actions[bot]
9911b1c75b
Merge staging-next into staging 2021-05-16 01:01:01 +00:00
github-actions[bot]
78ae7ac75e
Merge staging-next into staging 2021-05-15 06:22:25 +00:00