Commit Graph

3641 Commits

Author SHA1 Message Date
Michele Guerini Rocco
b5f2aa78c7
Merge pull request #124891 from cwyc/fix-antimony-desktop-file
antimony: add desktop item
2021-06-02 10:15:01 +02:00
Sandro
839713a179
Merge pull request #125096 from SebTM/update/sane-airscan_09926 2021-06-01 22:50:50 +02:00
cwyc
b80463f8d5 antimony: add desktop item 2021-06-01 15:23:42 -04: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
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
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
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
Nikolay Korotkiy
740c34ac9f
qvge: 0.6.2 → 0.6.3 2021-05-23 03:37:25 +03: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]
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
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
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
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