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
github-actions[bot]
b057978bb2
Merge staging-next into staging
2021-05-12 18:32:29 +00:00
github-actions[bot]
e2cf474986
Merge staging-next into staging
2021-05-12 06:21:36 +00:00
Jan Tojnar
7982550ac4
Merge branch 'staging-next' into staging
2021-05-11 09:09:10 +02:00
Jan Tojnar
594a885912
Merge branch 'staging-next' into staging
2021-05-10 09:45:47 +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]
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
Sandro
2d5ea25167
Merge pull request #119248 from IvarWithoutBones/init/agi
...
agi: init at 1.1.0-dev-20210413
2021-04-17 00:44:17 +02:00
Francesco Gazzetta
087f1e1daf
pikchr: init at unstable-2021-04-07 ( #119006 )
2021-04-16 13:36:11 -04:00
Alyssa Ross
451d9d6f8e
fbv: fix build with giflib; clarify license
...
libungif was merged into giflib in 2006, and hasn't been updated
since.
2021-04-16 14:06:10 +00:00
IvarWithoutBones
94cb97abee
agi: init at 1.1.0-dev-20210413
2021-04-15 22:28:49 +02:00
Henner Zeller
e53421e195
timg: init at v1.4.0
...
Timg is an image and video viewer for the terminal,
useful to look at images without leaving the comfort
of the shell or if remotely logged in to a shell.
https://timg.sh/
I am the maintainer of timg.
Signed-off-by: Henner Zeller <h.zeller@acm.org>
2021-04-14 19:35:23 -07:00
Maximilian Bosch
569a030d28
wdisplays: 1.0 -> 2021-04-03
...
I just realized that the original repository disappeared, so I decided
switch to a fork[1] for now. Also, I changed the following things:
* The project got relicensed[2] to `gpl3Plus`. Unfortunately the tags are
gone, but it seems as this has happened after the 1.0 release, so no
problem for us.
* The patch for sway 1.5[3] got merged into the fork, so it doesn't have
to be applied here.
* Decided to go for `master` here for now. First of all there are no
tags anymore, also there are a few fixes on `master` now.
* Compared the new source with the old 1.0 tarball via `diff -r`. Even
though most of the changes were written by the original author on top
of 1.0, I did a diff against everything from 1.0 and didn't find any
issues. Also, `luispabon` doesn't seem to be a throw-away account so
I'd say that using this fork for now is fine.
[1] https://github.com/luispabon/wdisplays
[2] 69564522bc
[3] 5198a9c94b
2021-04-09 12:50:19 +02:00
Sandro Jäckel
33a395f195
yacc: deprecate alias
...
and add a new line after the alphabetically sorting to please my inner monk
2021-04-04 03:18:58 +02:00
Frederik Rietdijk
02522e4f76
escrotum: stay with python2
2021-03-25 12:39:49 +01:00
Frederik Rietdijk
ff12cb0ef6
blockhash: use python2
2021-03-25 10:57:48 +01:00
github-actions[bot]
d73a492e83
Merge master into staging-next
2021-03-19 00:41:01 +00:00
Sandro
711ea2b67d
Merge pull request #116600 from siraben/darwin-mass-fix-buildInputs=0
2021-03-19 00:37:20 +01:00
Jan Tojnar
2445e9a681
Merge branch 'master' into staging-next
2021-03-18 19:24:39 +01:00
Ben Siraphob
65e9dd0348
spirv-cross: expand platforms to all
2021-03-18 23:02:07 +07:00
Ben Siraphob
cc097672b9
imgurbash2: expand platforms to all
2021-03-18 23:02:06 +07:00
Ben Siraphob
dc3138d9b0
epstool: fix darwin build
2021-03-18 23:02:06 +07:00
Jan Tojnar
0136206b12
Merge branch 'master' into staging-next
2021-03-18 13:35:59 +01:00