JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
324,424 Commits 2 Branches 0 Tags 12 GiB
b3157a9ea5
Commit Graph

3958 Commits

Author SHA1 Message Date
Sandro Jäckel
daa36171c0
paraview: cleanup, format 2021-08-10 10:32:45 +02:00
David Guibert
8d8ad8aad1
Merge pull request #133183 from hrhino/fix/paraview 
paraview: 5.8.0 -> 5.9.1, install documentation, cleanup
 2021-08-10 09:30:37 +02:00
R. RyanTM
a71cb740fc goxel: 0.10.7 -> 0.10.8 2021-08-09 19:43:38 +00:00
Harrison Houghton
1e0f240b10 paraview: license is bsd3 
See https://github.com/Kitware/ParaView/blob/master/Copyright.txt
 2021-08-08 16:05:07 -04:00
Harrison Houghton
b8611ee768 paraview: install doc files by default 
The "Getting Started"/"Tutorial"/"Guide" options on the splash screen
and help menu don't work otherwise.
 2021-08-08 16:05:06 -04:00
R. RyanTM
a39a7d9591
krita: 4.4.5 -> 4.4.7 (#133093) 2021-08-08 09:42:20 +02:00
davidak
a743aa80a3
Merge pull request #133010 from r-ryantm/auto-update/akira 
akira-unstable: 0.0.14 -> 0.0.15
 2021-08-07 14:24:52 +02:00
R. RyanTM
8e36d0e0cd akira-unstable: 0.0.14 -> 0.0.15 2021-08-07 11:52:35 +00:00
R. RyanTM
2680c91bc3 imv: 4.2.0 -> 4.3.0 2021-08-07 01:51:22 +00:00
Harrison Houghton
89bcf569f6 paraview: use fetchFromGitLab 
The main repo is on GitLab; the GitHub repository is a mirror.
 2021-08-05 22:43:47 -04:00
Harrison Houghton
ab5810a2e1 paraview: 5.8.0 -> 5.9.1 
The new version supports python 3.9.

The patch to avoid the string-format warning is no longer needed.
 2021-08-05 22:43:19 -04:00
OPNA2608
f2eef8fab0 megapixels: 1.1.0 -> 1.2.0 2021-08-05 22:09:01 +02:00
Sandro
3d10cceee5
Merge pull request #131147 from Artturin/saned-awk 2021-08-05 15:41:16 +02:00
Bobby Rong
c97a772176
akira: 0.0.13 -> 0.0.14 (#132782) 2021-08-05 15:36:26 +02:00
Artturin
813f2f11e1 sane-backends: add gawk to buildInputs 2021-08-05 15:27:40 +03:00
Sandro
2d035e3ae6
Merge pull request #132682 from erictapen/glimpse-add-graphviz 
glimpse: add graphviz as runtime dependency
 2021-08-04 22:24:10 +02:00
Kerstin Humm
8d67153deb
glimpse: add graphviz as runtime dependency 
Fixes https://github.com/NixOS/nixpkgs/issues/132405

See also:
https://gitlab.gnome.org/GNOME/gegl/-/issues/279
f83fd22c4b
 2021-08-04 18:08:39 +02:00
Sandro
3a0047ac27
Merge pull request #132565 from Artturin/shutter 2021-08-04 16:49:27 +02:00
Artturin
ac72256745 shutter: 0.94.3 -> 0.97 2021-08-04 00:01:00 +03:00
Artturi
d5dde029f1
openscad: move templates to Resources on darwin (#132552) 2021-08-03 10:15:53 -04:00
Sandro
e3ac38c730
Merge pull request #121829 from davidak/pantheon-team 2021-08-03 10:20:20 +00:00
Stig
c464dc811b
Merge pull request #132237 from Artturin/perlmagikupdate 
perlPackages.ImageMagick: 7.0.10 -> 7.0.11
 2021-08-03 00:16:14 +02:00
Anderson Torres
0529fe7a38
Merge pull request #132309 from blitz/djv 
djv: init at 2.0.8-unstable-2021-07-31
 2021-08-02 18:17:56 -03:00
Julian Stecklina
41d6e94bdf djv: init at 2.0.8-unstable-2021-07-31 2021-08-02 21:38:34 +02:00
davidak
8f02a4486d pantheon: add maintainers team 2021-08-02 19:09:29 +02:00
Artturin
f173c77476 perlPackages.ImageMagick: rename from perlPackages.PerlMagick 2021-08-02 20:05:00 +03:00
Sandro Jäckel
a322ea2345
renderdoc: format, cleanup 2021-08-02 10:58:47 +02:00
davidak
08af2daa6d
Merge pull request #132326 from jansol/renderdoc 
renderdoc: 1.14 -> 1.15
 2021-08-02 06:19:39 +02:00
Jan Solanti
a9b07d1cb7 renderdoc: 1.14 -> 1.15 2021-08-01 19:03:39 +03:00
Profpatsch
6376458424 sane: Add support for the unfree Fujitsu ScanSnap drivers 
This adds the scanner files already linked from the
`etc/sane.d/epjitsu.conf` file, which are extracted from the Windows
drivers and mirrored on GitHub.

Being a Japanese hardware vendor, Fujitsu’s software release &
licensing methods are horrifying, but their scanners are some of the
best, so we should definitly have discoverable support for them, which
this patch hopefully adds.

Inspiration was taken from the following sources:
https://www.josharcher.uk/code/install-scansnap-s1300-drivers-linux/
https://ubuntuforums.org/archive/index.php/t-1461915.html
https://github.com/stevleibelt/scansnap-firmware
 2021-08-01 13:45:46 +02:00
Ben Siraphob
2f94991628 treewide: fix redirected URLs 
Using the script in maintainers/scripts/update-redirected-urls.sh
 2021-08-01 00:01:50 +07:00
Frederik Rietdijk
8dcfe523f7
Merge pull request #131719 from FRidh/python2-to-3 
Python: further migrate packages from 2 to 3
 2021-07-29 10:49:00 +02:00
Frederik Rietdijk
3888701716
Merge pull request #131345 from NixOS/staging-next 
Staging next
 2021-07-29 10:45:20 +02:00
Daniel Olsen
ac996ae59a hydrus: 447 -> 448 2021-07-29 02:47:02 +02:00
github-actions[bot]
4fc7a31edb
Merge master into staging-next 2021-07-29 00:01:33 +00:00
Eelco Dolstra
9f038da2bb geeqie: 1.5.1 -> 1.6.0 2021-07-28 21:21:56 +02:00
Frederik Rietdijk
9070c34cd1 k3d: stay with python2 
not tested whether python3 works
 2021-07-27 20:37:05 +02:00
github-actions[bot]
476a483145
Merge master into staging-next 2021-07-26 12:01:21 +00:00
Maximilian Bosch
c98fa09bb9
Merge pull request #131560 from r-ryantm/auto-update/feh 
feh: 3.7 -> 3.7.1
 2021-07-26 12:42:55 +02:00
R. RyanTM
1493f098f8 feh: 3.7 -> 3.7.1 2021-07-26 09:21:29 +00:00
Frederik Rietdijk
62370fb59a Merge remote-tracking branch 'upstream/master' into staging-next 2021-07-26 09:19:44 +02:00
Robert Schütz
beb353c776 imagemagick6: 6.9.12-17 -> 6.9.12-19 2021-07-25 15:45:36 +02:00
github-actions[bot]
a37fbac53b
Merge master into staging-next 2021-07-25 00:01:35 +00:00
Sandro
fbf61871ee
Merge pull request #131298 from dali99/add_to_hydrus_maintainer 
hydrus: Update and improve package
 2021-07-24 20:55:36 +00:00
Daniel Olsen
c8516c8ce5 hydrus: correct dependencies, simply external programs 2021-07-24 21:38:22 +02:00
Daniel Olsen
97be046b0e hydrus: Add pylzma as dependency 2021-07-24 21:33:26 +02:00
Nikolay Korotkiy
8eff44934a
xournalpp: 1.0.20 → 1.1.0 2021-07-24 18:00:41 +03:00
Daniel Olsen
cfe66d16b7 hydrus: 441 -> 447 2021-07-23 18:47:11 +02:00
Daniel Olsen
2a8936a081 hydrus: Add dandellion to maintainers 2021-07-23 18:44:56 +02:00
Sandro
aa30d80e74
Merge pull request #130547 from erictapen/imagemagick-7.1.0-3 
imagemagick: 7.1.0-2 -> 7.1.0-4
 2021-07-23 14:06:57 +02:00
github-actions[bot]
2e00ed4420
Merge staging-next into staging 2021-07-22 06:01:44 +00:00
Sandro
d06f7e07a6
Merge pull request #130925 from SuperSandro2000/python-aliases 2021-07-22 03:21:11 +02:00
Sandro Jäckel
4209fed914
pythonPackages: deprecate pytestcov alias 2021-07-21 13:32:17 +02:00
dan4ik
960fffcbf9 coreimage: init at 4.2.0 2021-07-20 23:19:03 +07:00
Ben Siraphob
4ce8c34049 treewide: remove unnecessary enableParallelBuilding when using qmake 2021-07-20 10:32:58 +07:00
Kerstin Humm
937dae1dad
imagemagick: 7.1.0-2 -> 7.1.0-4 2021-07-18 23:15:39 +02:00
Felix Buehler
82cb33a0ae treewide: remove meta.version 2021-07-18 00:07:38 +02:00
Sandro
e0b1c7a177
Merge pull request #130189 from Stunkymonkey/swingsane-phases 
swingsane: deprecate phases
 2021-07-15 23:37:09 +02:00
Thomas Gerbet
57aff6b0ae fig2dev: apply patch for CVE-2021-3561 2021-07-15 18:51:53 +02:00
Felix Buehler
acdd581a7a swingsane: deprecate phases 2021-07-14 16:35:06 +02:00
Sandro Jäckel
388a4ef423
treewide: convert all links git.archlinux.org to github.com/archlinux/svntogit-* 2021-07-14 03:35:21 +02:00
R. RyanTM
cfc749e5b4 digikam: 7.2.0 -> 7.3.0 2021-07-12 23:38:23 -07:00
Mica Semrick
46f213b36d darktable: add some optional packages 2021-07-10 23:46:32 -07:00
github-actions[bot]
89ee82a6e9
Merge master into staging-next 2021-07-04 06:01:11 +00:00
Sandro
8723bd8119
Merge pull request #129122 from dotlambda/dateutil-alias 2021-07-04 02:53:34 +02:00
github-actions[bot]
af65e88cc6
Merge master into staging-next 2021-07-04 00:01:25 +00:00
Johannes May
3f2a44978b darktable: 3.4.1 -> 3.6.0 
Release information: https://www.darktable.org/2021/07/darktable-360-released/
 2021-07-03 17:02:25 +02:00
github-actions[bot]
6cead635ad
Merge master into staging-next 2021-07-03 12:01:23 +00:00
Robert Schütz
1ec5651913 treewide: use pythonPackages.python-dateutil instead of pythonPackages.dateutil 2021-07-03 13:45:57 +02:00
Daniël de Kok
017aa88470 Remove danieldk as a maintainer for some packages 
- AMD GPU packages: AMD removed support for the RX5x0 GPUs from ROCm, so
  I cannot test these packages anymore.
- A small number of GUI packages: I switched back to macOS on the
  desktop for work reasons, so I cannot easily test these.
- broot: I took over maintainership from someone else, but do not really
  use broot.
 2021-07-03 12:14:20 +02:00
github-actions[bot]
de136681f7
Merge master into staging-next 2021-06-29 06:04:18 +00:00
R. RyanTM
f717dcafbf avocode: 4.14.3 -> 4.15.0 2021-06-29 02:39:04 +00:00
github-actions[bot]
dcfd9788a1
Merge master into staging-next 2021-06-29 00:10:52 +00:00
Sandro
a9a0ec0414
Merge pull request #128077 from doronbehar/pkg/imagej 2021-06-28 23:41:32 +02:00
Doron Behar
796ae067c4 imagej: 150 -> 153 2021-06-27 20:10:48 +03:00
Doron Behar
0750062126 imagej: Add desktop item and icon 2021-06-27 20:10:48 +03:00
Doron Behar
e1d6051d81 imagej: reformat expression 
- Use 1 line per input argument.
- Don't use let ... in if not needed.
- Use ${version} in url string.
- Run hooks in explicit installPhase.
 2021-06-27 19:41:23 +03:00
github-actions[bot]
ff0ea63da1
Merge staging-next into staging 2021-06-27 06:08:04 +00:00
Anderson Torres
f5b9a25cdd
Merge pull request #123378 from eduardosm/sip_6 
python3Packages.sip: 5.5.0 -> 6.1.1;
pythonPackages.pyqt5: 5.15.2 -> 5.15.4;
python3Packages.pyqt-builder: 1.6.0 -> 1.10.1
 2021-06-27 01:41:19 -03:00
Eduardo Sánchez Muñoz
52457525ad veusz: fix PyQt5 sip path and use sip 4 
veusz tries to use the `sip` binary, which is no longer available in sip 6
 2021-06-27 00:59:55 +02:00
Eduardo Sánchez Muñoz
7079b4c050 krita: fix PyQt5 SIP path 2021-06-27 00:25:13 +02:00
github-actions[bot]
8f71a7f335
Merge staging-next into staging 2021-06-26 18:04:40 +00:00
Robert Schütz
071e8ee2f7 imagemagick7: 7.1.0-1 -> 7.1.0-2 2021-06-26 16:42:21 +02:00
Robert Schütz
a93194815b imagemagick6: 6.9.12-16 -> 6.9.12-17 2021-06-26 16:41:14 +02:00
Martin Weinelt
40bb731ec7
Merge pull request #127151 from NixOS/staging-next 2021-06-26 14:45:48 +02:00
Jan Tojnar
69015ede61
Merge pull request #128037 from jtojnar/inkscape-app-trans 
inkscape-extensions.applytransforms: 0.0.0+unstable=2021-05-11
 2021-06-26 14:44:51 +02:00
github-actions[bot]
947012b992
Merge staging-next into staging 2021-06-26 00:09:11 +00:00
Robert Schütz
d6234c2165 Merge branch 'master' into staging-next 2021-06-26 00:33:58 +02:00
Sandro
6b4b3deaed
Merge pull request #83149 from DieracDelta/fix/imagemagick-default 
imagemagick: add liquid rescale build option
 2021-06-25 19:17:02 +02:00
Dmitry Kalinkin
9959bb87e8
Merge pull request #127522 from rytone/ocio2 
blender: Switch to OpenColorIO 2.x
 2021-06-25 10:39:43 -04:00
github-actions[bot]
be086cc67b
Merge staging-next into staging 2021-06-25 12:06:08 +00:00
github-actions[bot]
bae6b2055f
Merge master into staging-next 2021-06-25 12:06:04 +00:00
Jan Tojnar
5efd65b2d9
inkscape-with-extension: make enabling all extensions easier 
Previously, we needed something like

	inkscape-with-extensions.override { inkscapeExtensions = builtins.filter lib.isDerivation (builtins.attrValues inkscape-extensions); }

Now, we can just do

	inkscape-with-extensions.override { inkscapeExtensions = null; }
 2021-06-25 12:41:11 +02:00
Jan Tojnar
75ea980211
inkscape-extensions.applytransforms: 0.0.0+unstable=2021-05-11 2021-06-25 12:41:11 +02:00
Robert Schütz
b6cdaa5b75 megapixels: 1.0.1 -> 1.1.0 
https://git.sr.ht/~martijnbraam/megapixels/refs/1.1.0
 2021-06-25 09:23:06 +02:00
Justin Restivo
77c3d60b89
imagemagick: add liquid rescale build option 2021-06-24 21:11:41 -04:00
Jan Tojnar
a5252d1f00
inkscape: Fix parsing paths by Python extensions 2021-06-25 01:20:07 +02:00
Maxwell Beck
de8a4f1741
opencolorio: Replace with 2.x 
All applications besides Blender have been pinned to 1.x
 2021-06-23 19:43:44 -05:00
github-actions[bot]
1f528e6ac6
Merge staging-next into staging 2021-06-24 00:06:31 +00:00
github-actions[bot]
d437a6cac2
Merge master into staging-next 2021-06-24 00:06:27 +00:00
Martin Weinelt
b262d7d569
Merge pull request #127846 from dotlambda/spyder_3-drop 2021-06-23 21:15:20 +02:00
Robert Schütz
cf4e702b2c cq-editor: use default version of spyder 2021-06-23 11:52:05 +02:00
github-actions[bot]
3db2949911
Merge staging-next into staging 2021-06-23 06:04:29 +00:00
github-actions[bot]
c54b530a39
Merge master into staging-next 2021-06-23 06:04:26 +00:00
R. RyanTM
24b29d114e avocode: 4.14.1 -> 4.14.3 2021-06-22 17:34:03 -07:00
github-actions[bot]
b766664645
Merge staging-next into staging 2021-06-22 12:05:04 +00:00
github-actions[bot]
c7bb5a79c8
Merge master into staging-next 2021-06-22 12:05:00 +00:00
Robert Schütz
d2b489b24a imagemagick6: 6.9.12-15 -> 6.9.12-16 2021-06-22 12:50:33 +02:00
Robert Schütz
f6ca26a309
Merge pull request #127775 from erictapen/imagemagick-7.1.0-1 
imagemagick: 7.1.0-0 -> 7.1.0-1
 2021-06-22 12:44:21 +02:00
Kerstin Humm
1688ff519b
imagemagick: 7.1.0-0 -> 7.1.0-1 2021-06-22 11:45:57 +02:00
Martin Weinelt
eef9694ebc
Merge branch 'master' into staging-next 2021-06-22 00:58:31 +02:00
laikq
9943455f94 veusz: init at 3.3.1 2021-06-18 19:57:08 +02:00
github-actions[bot]
8b9fa8d446
Merge staging-next into staging 2021-06-16 18:04:48 +00:00
github-actions[bot]
2d104c99a7
Merge master into staging-next 2021-06-16 18:04:45 +00:00
Jan Tojnar
e3dfa79441
Merge branch 'staging-next' into staging 
Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.
 2021-06-16 19:59:05 +02:00
Robert Schütz
d86f21194a
Merge pull request #127058 from r-ryantm/auto-update/krita 
krita: 4.4.3 -> 4.4.5
 2021-06-16 19:15:40 +02:00
R. RyanTM
c3967b6406 krita: 4.4.3 -> 4.4.5 2021-06-16 08:49:36 +00:00
github-actions[bot]
f060a3768b
Merge master into staging-next 2021-06-16 06:04:41 +00:00
R. RyanTM
c78d3f3ecd avocode: 4.14.0 -> 4.14.1 2021-06-15 20:04:52 -07:00
github-actions[bot]
9a860729b2
Merge staging-next into staging 2021-06-14 00:08:51 +00:00
github-actions[bot]
13f31f60bf
Merge master into staging-next 2021-06-14 00:08:48 +00:00
Ricardo M. Correia
945c021476 imv: clarify license 
licenses.gpl2 is deprecated, either gpl2Only or gpl2Plus should be
specified. However, imv is dual-licensed under the GPL and MIT licenses.

MIT is the one in the root LICENSE file, it's the one that Github shows
in  the main repo page and is also the more permissive one, therefore I
changed it to licenses.mit.
 2021-06-14 00:32:05 +02:00
Ricardo M. Correia
2732a344bb imv: remove unused fontconfig argument 2021-06-14 00:32:05 +02:00
Ricardo M. Correia
54f77325e7 imv: install .desktop file 2021-06-14 00:32:05 +02:00
Robert Schütz
162e6eaa34 imagemagick: 7.0.11-14 -> 7.1.0-0 2021-06-13 21:30:00 +02:00
Robert Schütz
547fb093c3 imagemagick6: 6.9.12-14 -> 6.9.12-15 2021-06-13 20:48:11 +02:00
github-actions[bot]
8f3ead7190
Merge staging-next into staging 2021-06-11 18:05:09 +00:00
github-actions[bot]
69f9534853
Merge master into staging-next 2021-06-11 18:05:07 +00:00
Kerstin Humm
99f12af681 imagemagick: 6.9.12-12 -> 6.9.12-14 2021-06-11 16:34:41 +02:00
Jan Tojnar
ba733d435b
Merge branch 'staging-next' into staging 2021-06-10 14:07:45 +02:00
github-actions[bot]
da8d931c82
Merge master into staging-next 2021-06-10 06:07:24 +00:00
AndersonTorres
e9e5f5f84d Change all alsaLib references to alsa-lib 2021-06-10 01:12:49 -03:00
github-actions[bot]
e40e33d9d8
Merge staging-next into staging 2021-06-08 18:16:30 +00:00
github-actions[bot]
e8f8906d68
Merge master into staging-next 2021-06-08 18:16:27 +00:00
Jordan Justen
d6714cd18b
renderdoc: 1.13 -> 1.14 
Signed-off-by: Jordan Justen <jljusten@gmail.com>
 2021-06-06 03:02:54 -07:00
Robert Scott
99d13e8c01
Merge pull request #125361 from andir/staging/graphicsmagic-closure-bloat 
[staging] graphicsmagic: reduce runtime closure bloat
 2021-06-05 12:17:00 +01:00
github-actions[bot]
0b0d0c21ec
Merge staging-next into staging 2021-06-04 13:00:29 +00:00
github-actions[bot]
065a1dcee6
Merge master into staging-next 2021-06-04 13:00:24 +00:00
polygon
5e903ee079 nufraw: fix build 
Sources would include glib-headers from within an extern-C scope.
Since glib-headers contained templates, this would fail. Add a patch
to move the header includes outside of the extern-C scope.
 2021-06-04 08:26:06 +02:00
github-actions[bot]
b511c637c8
Merge staging-next into staging 2021-06-03 19:52:05 +00:00
github-actions[bot]
a9f286f5cf
Merge master into staging-next 2021-06-03 19:52:02 +00:00
Sandro
46cd89039e
Merge pull request #125258 from cpcloud/add-giflib-to-oiio 
openimageio2: add giflib dependency
 2021-06-03 17:47:24 +02:00
Sandro
ee91003786
Merge pull request #125257 from mingmingrr/master 
pythonPackages.hydrus: 438 -> 441
 2021-06-03 17:34:21 +02:00
Sandro
67897e581c
Merge pull request #125119 from erictapen/imagemagick-7.0.11-14 
imagemagick: 7.0.11-13 -> 7.0.11-14
 2021-06-03 17:11:49 +02:00
github-actions[bot]
a261aaf9c2
Merge staging-next into staging 2021-06-02 13:08:16 +00:00
github-actions[bot]
9e56e764cd
Merge master into staging-next 2021-06-02 13:08:13 +00:00
Andreas Rammhold
a1ab165b81
graphicsmagick: reduce runtime closure size 
Before this commit we had libxml and freetype development files as part
of the runtime closure of graphicsmagick. Both of these combined added
up to 2MiB. With this commit those references are now gone :-)
 2021-06-02 12:57:34 +02:00
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
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