3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

1499 commits

Author SHA1 Message Date
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
github-actions[bot] 8634c6f7d1
Merge staging-next into staging 2021-04-26 00:17:03 +00:00
R. RyanTM 0080a58690 vips: 8.10.5 -> 8.10.6 2021-04-26 00:37:49 +02:00
R. RyanTM 4b0bde3b42 agi: 1.1.0-dev-20210421 -> 1.1.0-dev-20210423 2021-04-25 19:44:22 +00:00
github-actions[bot] 1626c4772a
Merge staging-next into staging 2021-04-25 12:06:12 +00:00
ZerataX 5debc57760
mangohud: init at 0.4.1 2021-04-24 22:45:45 +02:00
Thomas Gerbet b479a7031e exif: 0.6.21 -> 0.6.22
https://github.com/libexif/exif/blob/exif-0_6_22-release/NEWS
2021-04-24 12:31:53 +02:00
github-actions[bot] cdece2032d
Merge staging-next into staging 2021-04-22 18:14:30 +00:00
R. RyanTM 89524c348a agi: 1.1.0-dev-20210413 -> 1.1.0-dev-20210421 2021-04-22 04:26:48 +00:00
github-actions[bot] 6faea022df
Merge staging-next into staging 2021-04-21 00:15:23 +00:00
Sandro 8c4eadf7b5
Merge pull request #119018 from dasisdormax/add-astc-encoder 2021-04-20 23:18:02 +02:00
Maximilian Wende d94462e97b
astc-encoder: init at 2.5
This builds the astc-encoder with the appropriate SIMD
instructions automatically selected depending on host machine.
2021-04-20 09:17:53 +02:00
github-actions[bot] da0e7f5fab
Merge staging-next into staging 2021-04-18 00:15:39 +00:00
Sandro 07bb31e70e
Merge pull request #119743 from evils/grim
grim: 1.3.1 -> 1.3.2
2021-04-17 22:30:55 +02:00
Evils 280e6d1b11 grim: 1.3.1 -> 1.3.2 2021-04-17 21:43:45 +02:00
github-actions[bot] 33182b194a
Merge staging-next into staging 2021-04-17 18:10:41 +00:00
Sandro 7bf5d700c5
Merge pull request #119624 from LeSuisse/jhead-3.06.0.1
jhead: 3.04 -> 3.06.0.1
2021-04-17 17:30:59 +02:00
Jörg Thalheim b2a1e04eed
Merge remote-tracking branch 'upstream/staging-next' into HEAD 2021-04-17 16:37:04 +02:00
Thomas Gerbet 7050620e33 jhead: 3.04 -> 3.06.0.1
Fixes CVE-2020-6624 and CVE-2020-6625.
2021-04-17 09:54:01 +02:00