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
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
github-actions[bot]
3ff6965554
Merge master into staging-next
2021-05-17 06:22:23 +00: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]
9911b1c75b
Merge staging-next into staging
2021-05-16 01:01:01 +00: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
github-actions[bot]
78ae7ac75e
Merge staging-next into staging
2021-05-15 06:22:25 +00: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
github-actions[bot]
b057978bb2
Merge staging-next into staging
2021-05-12 18:32:29 +00: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]
e2cf474986
Merge staging-next into staging
2021-05-12 06:21:36 +00: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
Jan Tojnar
7982550ac4
Merge branch 'staging-next' into staging
2021-05-11 09:09:10 +02: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
Jan Tojnar
594a885912
Merge branch 'staging-next' into staging
2021-05-10 09:45:47 +02: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
Daniël de Kok
85f96822a0
treewide: fix cargoSha256/cargoHash
...
Rust 1.50.0 incorporated a Cargo change (rust-lang/cargo#8937) in
which cargo vendor erroneously changed permissions of vendored
crates. This was fixed in Rust
1.51.0 (rust-lang/cargo#9131). Unfortunately, this means that all
cargoSha256/cargoHashes produced during the Rust 1.50.0 cycle are
potentially broken.
This change updates cargoSha256/cargoHash tree-wide.
Fixes #121994 .
2021-05-08 00:36:37 -07: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