github-actions[bot]
2908f0cd18
Merge staging-next into staging
2021-06-02 02:32:54 +00:00
github-actions[bot]
c8ea5daaaf
Merge master into staging-next
2021-06-02 02:32:51 +00:00
Sandro
839713a179
Merge pull request #125096 from SebTM/update/sane-airscan_09926
2021-06-01 22:50:50 +02:00
mingmingrr
03956aa12b
pythonPackages.hydrus: 438 -> 441
2021-06-01 15:59:35 -04:00
cwyc
b80463f8d5
antimony: add desktop item
2021-06-01 15:23:42 -04:00
Phillip Cloud
c8ec847d48
openimageio2: add giflib dependency
2021-06-01 13:11:49 -04:00
github-actions[bot]
15d7e7d545
Merge staging-next into staging
2021-06-01 07:50:24 +00:00
github-actions[bot]
65e3e9dc51
Merge master into staging-next
2021-06-01 07:50:21 +00:00
Jörg Thalheim
f40605db9c
Merge pull request #125150 from zhaofengli/imagemagick-gcc-arch
...
imagemagick: Allow compilation without --with-gcc-arch
2021-06-01 06:49:20 +02:00
Zhaofeng Li
990431c1e3
imagemagick: Allow compilation without --with-gcc-arch
...
The --with-gcc-arch flag is used to specify the value used for
--march and --mtune [1], therefore it does not make sense to fail the
evaluation simply because it's not enumerated by us. However,
it's necessary to specify --without-gcc-arch, otherwise the config
script will guess the values and lead to incompatible / non-determinstic
artifacts.
[1] 850d5a9fc5/m4/ax_gcc_archflag.m4
2021-05-31 18:40:34 -07:00
github-actions[bot]
abef57f931
Merge staging-next into staging
2021-05-31 19:44:15 +00:00
github-actions[bot]
7f14676873
Merge master into staging-next
2021-05-31 19:44:13 +00:00
Kerstin Humm
31a8c0e5c4
imagemagick: 7.0.11-13 -> 7.0.11-14
2021-05-31 21:15:45 +02:00
Maciej Krüger
ef555f6a0b
Merge pull request #123426 from mattchrist/brscan5
2021-05-31 17:52:16 +02:00
Sebastian Sellmeier
19120ab497
sane-airscan: 0.99.24 -> 0.99.26
2021-05-31 16:36:26 +02:00
github-actions[bot]
f8a73160e3
Merge staging-next into staging
2021-05-26 12:31:58 +00:00
github-actions[bot]
df4ebfc46c
Merge master into staging-next
2021-05-26 12:31:55 +00:00
Jordan Justen
413d927150
inkscape: 1.0.2 -> 1.1
...
Reworks:
* Remove fetchpatch
* Remove gdl (jtojnar)
* gtkspell -> gspell (jtojnar)
* Add pillow to fix jpg export (jtojnar)
* Remove double-conversion, add substituteInPlace (jtojnar)
2021-05-26 00:20:44 -07:00
github-actions[bot]
26e0f79db0
Merge staging-next into staging
2021-05-24 01:00:32 +00:00
github-actions[bot]
a8835232ec
Merge master into staging-next
2021-05-24 01:00:29 +00:00
Guillaume Girol
f1721209f0
Merge pull request #124086 from sikmir/qvge
...
qvge: 0.6.2 → 0.6.3
2021-05-23 20:48:52 +00:00
Luke Granger-Brown
0afc94a9ff
Merge pull request #123582 from erictapen/imagemagick-7.0.11-13
...
imagemagick: 7.0.11-12 -> 7.0.11-13
2021-05-23 15:17:35 +01:00
Nikolay Korotkiy
740c34ac9f
qvge: 0.6.2 → 0.6.3
2021-05-23 03:37:25 +03:00
github-actions[bot]
d0c1f6a78f
Merge staging-next into staging
2021-05-22 12:27:12 +00:00
github-actions[bot]
563389a7fd
Merge master into staging-next
2021-05-22 12:27:09 +00:00
timput
d0755bdb5f
freecad: add openscad file support
2021-05-21 21:07:55 -06:00
github-actions[bot]
9fb5041877
Merge staging-next into staging
2021-05-22 00:56:06 +00:00
github-actions[bot]
901fb5e64e
Merge master into staging-next
2021-05-22 00:56:03 +00:00
Matt Christ
a9b7300f6f
brscan5: init at 1.2.6-0
2021-05-21 12:59:30 -05:00
Meghea Iulian
01f0665aac
avocode: add missing deps
2021-05-21 09:02:54 +03:00
github-actions[bot]
9c9882ecd9
Merge staging-next into staging
2021-05-19 18:34:13 +00:00
Jonathan Ringer
c1f8a15dac
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
nixos/doc/manual/release-notes/rl-2105.xml
pkgs/tools/security/sequoia/default.nix
2021-05-19 10:39:54 -07:00
Vladimír Čunát
7cefeafb11
Merge #122934 : krita: add breeze-icons
2021-05-19 09:17:58 +02:00
Kerstin Humm
c2521a6b36
imagemagick: 7.0.11-12 -> 7.0.11.13
2021-05-18 22:40:33 +02:00
Robert Schütz
09a617cdf7
Merge pull request #123225 from erictapen/imagemagick-7.0.11-12
...
imagemagick: 7.0.11-9 -> 7.0.11-12
2021-05-18 21:15:35 +02:00
Jonathan Ringer
ca46ad3762
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/tools/package-management/cargo-release/default.nix
2021-05-18 11:03:38 -07:00
Kerstin Humm
1738b9877a
imagemagick: 7.0.11-9 -> 7.0.11-12
2021-05-18 19:47:33 +02: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
Anderson Torres
de83b9baff
Merge pull request #122712 from AndersonTorres/adoption
...
Adoption of some packages from worldofpeace
2021-05-18 12:52:13 -03:00
AndersonTorres
ac31cfa66b
fondo: adoption
2021-05-18 11:12:32 -03:00
Jan Tojnar
c007fb4026
gimpPlugins.pluginDerivation: Fix name
...
The name should not contain the gimp version, otherwise parseDrvName will consider it the gimp package.
Fixes: https://github.com/NixOS/nixpkgs/issues/114995
2021-05-17 23:47:27 +02:00
R. RyanTM
b0b023a940
emulsion: 8.0 -> 9.0
2021-05-17 13:48:02 -07:00
R. RyanTM
1f79b3e79b
avocode: 4.12.0 -> 4.14.0
2021-05-17 11:50:21 -07:00
github-actions[bot]
3ff6965554
Merge master into staging-next
2021-05-17 06:22:23 +00:00
Jonathan Ringer
d8e62d8e41
Merge remote-tracking branch 'origin/master' into staging-next
...
Fix cargo-flash build
2021-05-16 18:27:14 -07:00
Sandro
700942d2a5
Merge pull request #121119 from SuperSandro2000/remove-gnidorah
...
treewide: remove gnidorah
2021-05-17 02:42:24 +02:00
Francesco Gazzetta
6e80cf8238
meme: rename to meme-image-generator, unstable-2020-05-28 -> 1.0.1 ( #120079 )
2021-05-17 02:33:18 +02:00
Robert Schütz
333994ca6a
Merge pull request #123227 from erictapen/imagemagick-6.9.12-12
...
imagemagick6: 6.9.12.8 -> 6.9.12-12
2021-05-16 22:27:55 +02:00
Jonathan Ringer
20acd4c4f1
Merge pull request #105026 from thefloweringash/apple-silicon
...
Native support for Apple Silicon
2021-05-16 11:38:18 -07:00
github-actions[bot]
6cdac75d25
Merge staging-next into staging
2021-05-16 18:32:44 +00:00
github-actions[bot]
8c6d819143
Merge master into staging-next
2021-05-16 18:32:41 +00:00
Domen Kožar
e20c5753f4
Merge pull request #123238 from stephank/fix-jpeg-archive-darwin
...
jpeg-archive: fix darwin build
2021-05-16 20:17:04 +02:00
Anderson Torres
cf45c45605
Merge pull request #121588 from eduardosm/sip-rename
...
pythonPackages.sip: rename to sip_4, pythonPackages.sip_5: rename to sip
2021-05-16 13:31:55 -03:00
Jonathan del Strother
c022642fec
imagemagick: support aarch64-darwin
2021-05-17 00:28:04 +09:00
Stéphan Kochen
eb8890f3bb
jpeg-archive: fix darwin build
2021-05-16 13:56:30 +02:00
Kerstin Humm
f1d61e1b4b
imagemagick6: 6.9.12.8 -> 6.9.12-12
2021-05-16 13:21:54 +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
006d7f80eb
imagemagick6: fix darwin build ( #123023 )
2021-05-14 16:21:38 -04:00
Evils
df2eb33f06
krita: add breeze-icons
...
otherwise there are no icons available
2021-05-14 02:56:30 +02:00
John Ericson
cf02b24813
Merge remote-tracking branch 'upstream/staging-next' into staging
2021-05-11 22:30:46 +00:00
github-actions[bot]
37c26a396b
Merge master into staging-next
2021-05-11 18:28:07 +00:00
Robert Schütz
c9494b6fe0
megapixels: 0.16.0 -> 1.0.1 ( #121722 )
...
https://git.sr.ht/~martijnbraam/megapixels/refs/1.0.0
https://git.sr.ht/~martijnbraam/megapixels/refs/1.0.1
2021-05-11 20:07:20 +02:00
Anderson Torres
dac4b0ad97
Merge pull request #122436 from peterhoeg/u/freecad_0_19_2
...
freecad: 0.19.1 -> 0.19.2
2021-05-11 10:42:58 -03:00
Jan Tojnar
7982550ac4
Merge branch 'staging-next' into staging
2021-05-11 09:09:10 +02:00
Eduardo Sánchez Muñoz
08a26e4579
pythonPackages.sip: rename to sip_4
...
sip 4 is the old and unmaintained version
2021-05-10 20:41:38 +02:00
github-actions[bot]
61fa3fdde8
Merge master into staging-next
2021-05-10 18:28:17 +00:00
Jan Tojnar
594a885912
Merge branch 'staging-next' into staging
2021-05-10 09:45:47 +02:00
Peter Hoeg
77447c96ca
freecad: 0.19.1 -> 0.19.2
2021-05-10 14:46:37 +08:00
github-actions[bot]
1e3d91bd19
Merge master into staging-next
2021-05-10 00:48:32 +00:00
pacien
13b226745a
gscan2pdf: 2.11.1 -> 2.12.1
2021-05-10 00:45:11 +02:00
Robin Gloster
73e62029b9
feh: 3.6.3 -> 3.7 ( #122375 )
2021-05-09 21:44:39 +02: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
Thomas Gerbet
8647f1570f
pqiv: use ffmpeg4
...
See migrate away from ffmpeg_3 #120705 .
2021-05-08 19:49:11 -07:00
Jan Tojnar
dd78ce1c53
Merge branch 'staging-next' into staging
2021-05-08 20:59:05 +02:00
github-actions[bot]
6d46d8a9b9
Merge master into staging-next
2021-05-08 18:22:46 +00:00
Robert Hensing
8e3c5eb501
treewide: xvfb_run -> xvfb-run
2021-05-08 15:48:41 +02:00
Martin Weinelt
9651084620
Merge remote-tracking branch 'origin/master' into staging-next
2021-05-08 14:43:43 +02:00
Vladimír Čunát
080cd658ca
Merge #121780 : treewide meta.maintainers tweaks
2021-05-08 10:47:08 +02:00
Jan Tojnar
468cb5980b
gnome: rename from gnome3
...
Since GNOME version is now 40, it no longer makes sense to use the old attribute name.
2021-05-08 09:47:42 +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]
e21fb16f9a
Merge master into staging-next
2021-05-08 06:20:05 +00:00
Maciej Krüger
3f5b404980
Merge pull request #122065 from mkg20001/pick-update
...
pick-colour-picker: unstable-2019-10-11 -> unstable-2021-01-19
2021-05-08 06:50:49 +02:00
github-actions[bot]
b4416b52c5
Merge master into staging-next
2021-05-08 00:46:50 +00:00
Maciej Krüger
6fe87c0dff
pick-colour-picker: unstable-2019-10-11 -> unstable-2021-01-19
2021-05-07 22:08:25 +02:00
Jan Solanti
49d736450b
renderdoc: 1.12 -> 1.13
2021-05-07 22:27:53 +03:00
Maximilian Bosch
fcd5670a07
emulsion: fix build
...
ZHF #122042
Failing Hydra build: https://hydra.nixos.org/build/142625836
2021-05-07 11:35:55 -07:00
github-actions[bot]
1ae6d3d02f
Merge master into staging-next
2021-05-07 18:24:29 +00:00
Vladimír Čunát
73e17a3594
treewide: remove lethalman from meta.maintainers
...
He hasn't been heard of for years.
2021-05-07 15:36:40 +02:00
Vladimír Čunát
9f054b5e1a
treewide: remove worldofpeace from meta.maintainers
...
(It was requested by them.)
I left one case due to fetching from their personal repo:
pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix
2021-05-07 15:36:40 +02:00
nicoo
4e80c9b383
solvespace: 3.0rc2 → 3.0
2021-05-07 15:07:08 +02:00
github-actions[bot]
12193913a1
Merge staging-next into staging
2021-05-07 12:23:21 +00:00
Jan Tojnar
9468b07326
Merge branch 'gnome-40'
2021-05-07 12:12:40 +02:00
Robert Hensing
aaec26af39
Merge pull request #121896 from raboof/extract-version-test-to-utility
...
test-utilities: version test
2021-05-07 11:56:01 +02:00
Arnout Engelen
b68130fd2c
test-utilities: version test
...
Extract 'version test' to a reusable test utility as discussed in
https://github.com/NixOS/nixpkgs/pull/119636#issuecomment-826137021 and
2021-05-07 09:53:35 +02:00
github-actions[bot]
b8cdb044e9
Merge staging-next into staging
2021-05-07 06:20:24 +00:00
Yusuf Bera Ertan
240b3cd5d3
pythonPackages.hydrus: 436 -> 438
2021-05-06 21:20:18 -07:00
Jan Tojnar
26e044b14a
imagemagick: Try to fix Darwin build
2021-05-05 22:43:09 +02:00
Jan Tojnar
58fce4e270
gimp: 2.10.22 → 2.10.24
...
https://www.gimp.org/news/2021/03/29/gimp-2-10-24-released/
2021-05-05 22:42:56 +02:00
Jan Tojnar
1a7ac9640a
inkscape: Fix build with glib 2.68
2021-05-05 22:42:54 +02:00