Commit Graph

40933 Commits

Author SHA1 Message Date
Robert Scott bae3f3be2a
Merge pull request #124928 from NixOS/backport-124713-to-release-21.05
[Backport release-21.05] getdata: add security patch from Debian
2021-05-30 12:46:21 +01:00
Simon Bruder bad208a3e6 vapoursynth: improve plugin dependency resolution
Some python packages (e.g. functools32) are conditionally disabled for
certain interpreter versions by having them return null instead of a
derivation. `getRecursivePropagatedBuildInputs` fails if such a package
is part of the dependency tree. This commit makes it only recurse into
derivations and ignore everything else.

This also deduplicates the final plugin list to improve startup time.

(cherry picked from commit 9b3a2e66b141733fe7cb5372f64d30b66445cccd)
2021-05-30 08:26:24 +00:00
Sandro 4330bdd244 Update pkgs/development/libraries/getdata/default.nix
(cherry picked from commit 1b77912d10ba5a5e8ddf7853f00ac3cb841d59bf)
2021-05-30 02:08:03 +00:00
Vincent Laporte 81c84a9194 getdata: add security patch from Debian
(cherry picked from commit 14bb4b8f9aed4b1e04c0edab0851c31144ccd7e3)
2021-05-30 02:08:03 +00:00
Dmitry Kalinkin 7198e20169 webkitgtk: fix on darwin
(cherry picked from commit 61e49ba58b487b49832028a1829f50fd2abcab06)
2021-05-29 18:39:16 -04:00
Markus Kowalewski 58ba40336c mpich: 3.4.1 -> 3.4.2
(cherry picked from commit 0853275727138c6bb9ade80aa8d2e0f298044f47)
2021-05-29 20:17:55 +00:00
Zhaofeng Li a5cbb1a436 nv-codec-headers-10: init at 10.0.26.2
(cherry picked from commit 13f114593bb7796010fccaffbdb0686852a1de27)
2021-05-28 21:39:53 -04:00
Dmitry Kalinkin 46a5d32fc9
qhull: add fixDarwinDylibNames
(cherry picked from commit e34b55910991a52b432f97cddfb2e8a2b4b13f97)
cc #124578
2021-05-27 16:55:02 -04:00
Trolli Schmittlauch 611cedc127 poppler: build with nss by default for signature support
Since 21.01, poppler supports PDF signing. As applications like okular
start to make use of that feature, nss support for poppler is enabled by
default to avoid unnecessary package duplication.
When building a `minimal` version of poppler, nss is disabled as well.

closes #120928

(cherry picked from commit 5f9862d524ee0ec1edcaa450fff4f54f4f5cc68e)
2021-05-27 03:48:21 -04:00
Jonathan Ringer 7e49e3ea89
Merge remote-tracking branch 'origin/release-21.05' into staging-next-21.05 2021-05-25 00:02:45 -07:00
Jan Tojnar 1b1608a7b8 libxml2: Work around lxml API misuse
(cherry picked from commit 7099f24c4a1788e074c4851d68fc7d56d7c8e3a7)
2021-05-24 23:56:08 -07:00
Jonathan Ringer befda3568c exempi: disable tests for i686
Unable to find boost unittest framework.

Tests are still ran on the x86_64 platform

(cherry picked from commit 266f6ee63a562016b28d9a155fc4d84006d746d0)
2021-05-24 23:53:37 -07:00
Jörg Thalheim ee76949241
spdk: 20.04.1 -> 21.04
(cherry picked from commit 00a7a0f609352bd077b6c4d5dab88bddb70458fc)
2021-05-24 09:18:27 +02:00
Atemu 036b557bd9 libndctl: build docs with asciidoc instead of asciidoctor
Removes dependency on ruby 2.7 and isn't much slower

(cherry picked from commit 786579c0b8ee5311af04feb036d04b78efd4b5b2)
2021-05-23 22:04:25 +02:00
Robert Scott 0548d93697
Merge pull request #124145 from dotlambda/igraph-arpack-darwin-blas-paths
[21.05] igraph,arpack: correct libblas.dylib's path on darwin, fixing python3Packages.python-igraph
2021-05-23 16:02:09 +01:00
Robert Scott b7e6b86c74 igraph: fix libblas.dylib's path on darwin
(cherry picked from commit 73df171f26f426d1e2201e04ad0a7fa556eca17b)
2021-05-23 13:52:32 +02:00
Robert Scott 6514fc8f6b arpack: fix libblas.dylib's path on darwin
(cherry picked from commit 1241d9fae3451b824506277174b6053a379f4db7)
2021-05-23 13:52:32 +02:00
Florian Klink 075ab49dc2 qtwebengine: only set -webengine-webrtc-pipewire with qt >= 5.15
This fails the build of qt514.qtwebengine otherwise:

```
QMAKEPATH=/nix/store/29n056mi3pji6si51b128pa67b1qr7wq-qtbase-5.14.2-dev:/nix/store/g7wady1f1r23wlmy4q1f3b8j2fj5q2sq-qtdeclarative-dev:/nix/store/xfqnh2pma99915d4gsanls68z1jikcpx-qtsvg-dev:/nix/store/zlnsjdj5yv1ivi1miq49j9gp382byl35-qtlocation-dev:/nix/store/lb7cidi60cabpa7swv51xnss9045vqzi-qtmultimedia-dev:/nix/store/jrk6bcqihxwsszwy6rwy2vnfc2sb4rv9-qtwebchannel-dev
qmake PREFIX=/nix/store/pa3jhipp59f6ykh9k8l8z8jf88k52bz8-qtwebengine NIX_OUTPUT_OUT=/nix/store/pa3jhipp59f6ykh9k8l8z8jf88k52bz8-qtwebengine NIX_OUTPUT_DEV=/nix/store/jngs3qilw9iiv97rawb9sb9sd6qdbp2s-qtwebengine-dev NIX_OUTPUT_BIN=/nix/store/91hqv88qvg2wb91lv1h1pd4d8wwrkd5d-qtwebengine-bin NIX_OUTPUT_DOC=/nix/store/jngs3qilw9iiv97rawb9sb9sd6qdbp2s-qtwebengine-dev/share/doc/qt-5.14.2 NIX_OUTPUT_QML=/nix/store/91hqv88qvg2wb91lv1h1pd4d8wwrkd5d-qtwebengine-bin/lib/qt-5.14.2/qml NIX_OUTPUT_PLUGIN=/nix/store/91hqv88qvg2wb91lv1h1pd4d8wwrkd5d-qtwebengine-bin/lib/qt-5.14.2/plugins CONFIG+=release -- -system-ffmpeg -webengine-webrtc-pipewire -proprietary-codecs
Info: creating stash file /build/qtwebengine-everywhere-src-5.14.2/.qmake.stash
Info: creating cache file /build/qtwebengine-everywhere-src-5.14.2/.qmake.cache
ERROR: Unknown command line option '-webengine-webrtc-pipewire'.
builder for '/nix/store/g6dvr7789sswmahlxc6zs5pr8k2g5pgy-qtwebengine.drv' failed with exit code 3
```

Also, only bring in pipewire_0_2 if we enable pipewire support.

(cherry picked from commit 4cbb20402a88abee9a68b53a8786df5af87b4101)
2021-05-23 12:37:07 +02:00
Jonathan Ringer d9de79194a
Merge pull request #123279 from NixOS/staging-next
Staging next
2021-05-22 18:46:35 -07:00
Mario Rodas c9fd31e591
Merge pull request #123988 from r-ryantm/auto-update/actor-framework
caf: 0.18.1 -> 0.18.3
2021-05-22 20:40:41 -05: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
Sandro 900115a4f7
Merge pull request #124038 from r-ryantm/auto-update/glibmm
glibmm_2_68: 2.68.0 -> 2.68.1
2021-05-23 02:05:53 +02:00
R. RyanTM bd441a1339 liblinphone: 4.5.15 -> 4.5.17 2021-05-22 16:37:13 -07:00
Gabriel Ebner fc9a86afb0
Merge pull request #124030 from gebner/abseil202103241
abseil-cpp: 20200923.3 -> 20210324.1
2021-05-22 19:18:03 +02:00
R. RyanTM c6bf23a12e glibmm_2_68: 2.68.0 -> 2.68.1 2021-05-22 15:30:04 +00:00
Gabriel Ebner a6d48f9c2a or-tools: 8.1 -> 9.0 2021-05-22 16:57:32 +02:00
Gabriel Ebner fc4f549d39 abseil-cpp: 20200923.3 -> 20210324.1 2021-05-22 16:57:32 +02:00
R. RyanTM 31aab8c980 cairomm_1_16: 1.16.0 -> 1.16.1 2021-05-22 16:56:55 +02:00
Tal Walter 4509181d6c
cereal: add patch for CVE-2020-11105 (#121574)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-05-22 15:21:54 +02:00
github-actions[bot] 563389a7fd
Merge master into staging-next 2021-05-22 12:27:09 +00:00
sohalt be01cb8b97 nixos/spacenavd: run as user service 2021-05-22 12:48:12 +02:00
R. RyanTM 15af55ebe3 caf: 0.18.1 -> 0.18.3 2021-05-22 07:53:59 +00:00
Jonathan Ringer 7507aed4e1
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
 pkgs/development/tools/rust/cargo-expand/default.nix
 pkgs/tools/misc/blflash/default.nix
2021-05-21 19:49:05 -07:00
Mario Rodas 6bf9e13e82
Merge pull request #123855 from marsam/update-grpc
grpc: 1.37.1 -> 1.38.0
2021-05-21 20:53:20 -05:00
github-actions[bot] 901fb5e64e
Merge master into staging-next 2021-05-22 00:56:03 +00:00
Michael Weiss 9452353abf intel-media-driver: 21.2.0 -> 21.2.1 2021-05-21 16:34:48 -07:00
Ben Wolsieffer cd49262ab2 octomap: 1.9.6 -> 1.9.7 2021-05-21 16:29:30 -07:00
Robert Schütz da4a86ac3d
Merge pull request #123366 from dotlambda/linphone-ffmpeg
linphone: use ffmpeg instead of ffmpeg_3
2021-05-21 20:44:36 +02:00
github-actions[bot] 5efa447c88
Merge master into staging-next 2021-05-21 18:39:29 +00:00
Robert Schütz b65a64086f
libsForQt5.applet-window-buttons: 0.8.1 -> 0.9.0 (#122611)
https://github.com/psifidotos/applet-window-buttons/releases/tag/0.9.0
2021-05-21 20:36:38 +02:00
Vladimír Čunát acb7a605e2
poppler: drop patches already contained in src 2021-05-21 09:09:20 +02:00
github-actions[bot] 2b12bace86
Merge master into staging-next 2021-05-21 06:22:09 +00:00
Michele Guerini Rocco 80f883b71f
Merge pull request #123724 from johnae/qutebrowser-pipewire
qutebrowser: support for webrtc pipewire (needed for wayland native screen sharing support)
2021-05-21 08:13:13 +02: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
Robert Schütz 1f065cafc9
libextractor: use ffmpeg instead of ffmpeg_3 (#123344) 2021-05-21 00:43:21 +02:00
Pierre Bourdon 4445699061
libvdpau-va-gl: drop obsolete ffmpeg_3 dependency (#123757)
I couldn't find any reference as to why this dependency would be
required for 0.4.2. Digging into the changelog, it looks like 0.4.0
dropped the libswscale dependency, so this seems like it's now unneeded.
2021-05-20 14:44:14 -07:00
sophrosyne97 644aff8eab wt: 4.2.0 -> 4.5.0 2021-05-20 14:11:01 -07:00
zowoq 0617c9ea21 libslirp: 4.4.0 -> 4.5.0
https://gitlab.freedesktop.org/slirp/libslirp/-/releases/v4.5.0
2021-05-20 12:13:24 -07:00
Stéphan Kochen 4b6673216f ffmpeg-full: fix darwin build
libglslang is a dependency of vulkan filters, so only makes sense if
those are enabled.
2021-05-20 11:50:17 -07:00
github-actions[bot] 34a05e29f1
Merge master into staging-next 2021-05-20 18:36:00 +00:00
R. RyanTM ddb752acfc libofx: 0.10.1 -> 0.10.2 2021-05-20 10:07:34 -07:00
R. RyanTM b5394fe57f coordgenlibs: 2.0.2 -> 2.0.3 2021-05-20 09:37:49 -07:00
Ivan Babrou 274ec21015 gsl: cap MACOSX_DEPLOYMENT_TARGET at 10.16 2021-05-20 09:19:32 -07:00
Jonathan Ringer 14f3686af1
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
  pkgs/applications/terminal-emulators/alacritty/default.nix
  pkgs/servers/clickhouse/default.nix
2021-05-20 09:12:42 -07:00
Ivan Babrou 24f13758b9 gtk2: cap MACOSX_DEPLOYMENT_TARGET at 10.16 2021-05-20 09:05:30 -07:00
R. RyanTM 29b92903ae liblinphone: 4.5.1 -> 4.5.15 2021-05-20 08:26:33 -07:00
Robert Schütz e581a55094 mediastreamer: use ffmpeg instead of ffmpeg_3 2021-05-20 13:50:41 +02:00
Dmitry Kalinkin 145658a40f
Merge pull request #123638 from veprbl/pr/libAfterImage_fixes
libAfterImage: unvendor dependencies
2021-05-20 04:08:14 -04:00
John Axel Eriksson 7a714e8ed2
qtwebengine: enable pipewire/webrtc 2021-05-20 07:58:50 +02:00
Mario Rodas 04e18727c4 grpc: 1.37.1 -> 1.38.0
https://github.com/grpc/grpc/releases/tag/v1.38.0
2021-05-20 04:20:00 +00:00
Michael Francis c5ef875426 wayland: broken for darwin 2021-05-19 17:56:21 -07:00
Robert Schütz a20dd34600
ffmpeg_3: mark as insecure (#123496) 2021-05-19 23:45:41 +02:00
Robert Scott 1abb228389
Merge pull request #123473 from stephank/fix-opencl-clang-darwin
opencl-clang: fix darwin build
2021-05-19 22:10:42 +01:00
Louis Bettens 13484444d4 ghc-filesystem: init at 1.5.4 2021-05-19 14:10:03 -07:00
markuskowa a2e7d49882
Merge pull request #123681 from markuskowa/upd-ucx
ucx: 1.10.0 -> 1.10.1
2021-05-19 22:35:53 +02:00
Andrew Childs 84afb3a167 libidn2: fix build on darwin
The documentation requirements changed after the version upgrade in
https://github.com/NixOS/nixpkgs/pull/123059.
2021-05-19 12:25:25 -07:00
R. RyanTM 5833277e95 freetds: 1.2.18 -> 1.2.21 2021-05-19 12:17:13 -07: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
Pascal Winkelmann b343a40f99 gtk-sharp: fix build 2021-05-19 10:25:50 -07:00
R. RyanTM a9b5556d30 gensio: 2.2.4 -> 2.2.5 2021-05-19 08:26:27 -07:00
Markus Kowalewski 788306b573
ucx: 1.10.0 -> 1.10.1 2021-05-19 14:36:06 +02:00
Dmitry Kalinkin bfaeb1bdd7 libAfterImage: compile against libX11
This is needed to not have X_DISPLAY_MISSING for asimage2pixmap function
to be implemented:
https://root-forum.cern.ch/t/root-xpm-error-on-ubuntu-revisited/4552/10
2021-05-19 07:52:19 -04:00
Dmitry Kalinkin 0b6dcc02cd libAfterImage: build shared libs by default 2021-05-19 07:52:18 -04:00
Dmitry Kalinkin 3ec06bc2eb libAfterImage: don't use weird mmx flags 2021-05-19 02:37:17 -04:00
Dmitry Kalinkin 68cfba1ac6 libAfterImage: unvendor dependencies 2021-05-19 02:37:02 -04:00
Jörg Thalheim 9a417aebd6
Merge pull request #123506 from stephank/fix-spacenav-cube-example-darwin
spacenav-cube-example: fix darwin build
2021-05-19 06:54:49 +01:00
github-actions[bot] 7000ae2b9a
Merge master into staging-next 2021-05-19 00:55:36 +00:00
Robert Schütz 52833ef8c0
Merge pull request #123365 from dotlambda/opencv-ffmpeg
opencv: use ffmpeg instead of ffmpeg_3
2021-05-19 00:04:57 +02:00
Stéphan Kochen 3ac820e157
tachyon: fix darwin build (#123558) 2021-05-18 17:10:44 -04:00
Andreas Rammhold abbbeaf42a Revert "libgcc: use glibc major and minor version but not the patch level"
The fix is no longer required with the restored passthru version.

This reverts commit 6020fe2508.
2021-05-18 12:54:43 -07:00
Jonathan Ringer a459e51174 glibc: restore version passthru
downstream packages use the major.minor version
to determine ABI compatibility and paths which
do not depend on patch version
2021-05-18 12:54:43 -07:00
Stéphan Kochen 84078e6165 sqlar: fix darwin build 2021-05-18 21:37:04 +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
Dmitry Kalinkin a088175a26
Merge pull request #121546 from superherointj/package-firebird
firebird: 2.5.7 -> 2.5.9, init 3.0.7, init 4.0.0-rc1
2021-05-18 12:46:12 -04: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
Maciej Krüger c4a2f86ebe
Merge pull request #123521 from mkg20001/gtk-2-fix
gtk-sharp-2_0: fix with patch from arch
2021-05-18 17:27:30 +02:00
Stéphan Kochen e097fa08c8
nss_wrapper: broken on darwin (#123462) 2021-05-18 10:38:38 -04:00
Maciej Krüger 6e98a27ffa
gtk-sharp-2_0: fix with patch from arch 2021-05-18 16:26:25 +02:00
Stéphan Kochen 1e6e18ddd1 libspnav: fix dylib install name on darwin 2021-05-18 13:55:51 +02:00
Stéphan Kochen 32cf9f8121 physfs_2: fix darwin build 2021-05-18 11:44:38 +02:00
Stéphan Kochen 5afd15a2af opencl-clang: fix darwin build 2021-05-18 11:11:53 +02:00
sophrosyne97 3cdff535f7 pmdk: 1.7 -> 1.9.2 2021-05-17 23:21:04 -07:00
R. RyanTM e33d287810 embree: 3.12.2 -> 3.13.0 2021-05-17 16:34:02 -07:00
Sandro 17e3fb2e23
Merge pull request #122448 from misuzu/psi-plus-update
psi-plus: 1.4.1473 -> 1.5.1520
2021-05-18 01:29:50 +02:00
Stéphan Kochen a8c374380d libspnav: fix darwin build 2021-05-17 14:52:58 -07:00
R. RyanTM 3528c4151e hivex: 1.3.19 -> 1.3.20 2021-05-17 14:30:44 -07:00
Stéphan Kochen 0776eae5ae libvncserver: fix darwin build 2021-05-17 14:13:50 -07:00
Stéphan Kochen 29fe52f3bd microsoft_gsl: fix darwin build 2021-05-17 14:02:55 -07:00
Stéphan Kochen 1d5d237cf9 l-smash: fix darwin build 2021-05-17 14:02:41 -07:00
Jan Tojnar 23d1505f89 libjcat: 0.1.6 -> 0.1.7 2021-05-17 13:51:13 -07:00
Robert Scott 1d676b24a0
Merge pull request #123391 from stephank/fix-qca-qt5-darwin
libsForQt5.qca-qt5: fix darwin build
2021-05-17 21:47:29 +01:00
R. RyanTM 9e6d18dfb9 libgig: 4.2.0 -> 4.3.0 2021-05-17 13:37:42 -07:00
R. RyanTM 1d30907750 belle-sip: 4.5.3 -> 4.5.14 2021-05-17 13:34:35 -07:00
Doron Behar 8b33abc6de cpp-utilities: address common issues in the derivation 2021-05-17 13:27:46 -07:00
R. RyanTM 8ead9feb90 cpp-utilities: 5.10.2 -> 5.10.3 2021-05-17 13:27:46 -07:00
R. RyanTM 42d285b631 libdivecomputer: 0.6.0 -> 0.7.0 2021-05-17 13:25:32 -07:00
Robert Scott ce56badfa4
Merge pull request #123389 from stephank/fix-libow-darwin
libow: fix darwin build
2021-05-17 20:01:57 +01:00
Sandro ed7822b0c7
Merge pull request #123060 from lopsided98/fcl-init 2021-05-17 21:01:43 +02:00
R. RyanTM 6a1792ab05 libamqpcpp: 4.3.11 -> 4.3.12 2021-05-17 11:50:43 -07:00
R. RyanTM 977a70d25b libchardet: 1.0.5 -> 1.0.6 2021-05-17 11:48:35 -07:00
Stéphan Kochen d051dab8d1 libow: fix darwin build 2021-05-17 20:45:35 +02:00
Stéphan Kochen b9efe88a98 libsForQt5.qca-qt5: fix darwin build 2021-05-17 20:01:20 +02:00
Sandro 811b50437a
Merge pull request #122830 from lromor/openslide 2021-05-17 19:29:09 +02:00
Sandro f3deee088a
Merge pull request #122984 from dotlambda/libxlsxwriter-1.0.5 2021-05-17 18:59:21 +02:00
Sandro 5c308c8f67
Merge pull request #123080 from LouisDK1/hdhomerun-20210224
libhdhomerun: 20200907 -> 20210224
2021-05-17 18:59:07 +02:00
misuzu e43880bd35 usrsctp: init at 0.9.5.0 2021-05-17 18:59:05 +03: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
Robert Schütz 305bad4fcf liblibphone: use ffmpeg instead of ffmpeg_3 2021-05-17 14:34:47 +02:00
Robert Schütz 242f2064f5 opencv2: use ffmpeg instead of ffmpeg_3 2021-05-17 13:00:34 +02:00
Robert Schütz d8f202e83e opencv3: use ffmpeg instead of ffmpeg_3 2021-05-17 12:58:16 +02:00
Robert Schütz c2161e94f8 opencv4: use ffmpeg instead of ffmpeg_3 2021-05-17 12:57:09 +02:00
Maximilian Bosch 57194feea2
Merge pull request #123182 from r-ryantm/auto-update/alembic
alembic: 1.8.0 -> 1.8.1
2021-05-17 10:52:59 +02:00
Domen Kožar 4e82cf911c
Merge pull request #120936 from talyz/v8-darwin
v8: Fix darwin build
2021-05-17 10:22:58 +02:00
Stéphan Kochen 371d80c468 libical: fix darwin build 2021-05-16 23:49:52 -07:00
github-actions[bot] 3ff6965554
Merge master into staging-next 2021-05-17 06:22:23 +00:00
Ben Siraphob c5a669d3f7 treewide: remove unzip where not needed 2021-05-16 19:29:28 -07:00
Ben Siraphob aba7bc983f openvino: move unzip to nativeBuildInputs 2021-05-16 19:29:28 -07: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
Sandro 72df572fa3
Merge pull request #122819 from primeos/maintainers-remove-pesterhazy
maintainers: remove pesterhazy
2021-05-17 02:22:35 +02:00
Sandro 622c2c2382
Merge pull request #122994 from mweinelt/remove-inactive-maintainer/nand0p
treewide: remove nand0p as maintainer
2021-05-17 02:18:03 +02:00
Sandro 3fdef8c015
Merge pull request #123204 from r-ryantm/auto-update/ace
ace: 7.0.1 -> 7.0.2
2021-05-17 02:15:21 +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
Andreas Rammhold 6020fe2508 libgcc: use glibc major and minor version but not the patch level
libgcc requires the version scheme X.Y whilst our glibc version
attribute usually is X.Y-Z where Z is our patchlevel.
2021-05-16 16:36:44 -07:00
OPNA2608 7f56f38051 wiiuse: Make Darwin-compatible 2021-05-16 22:22:10 +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
Andrew Childs 7f216a4424 catch: backport support for Apple Silicon 2021-05-17 00:28:05 +09:00
Andrew Childs 92d53249f6 apr: update libtool, fix downstream aprutil on aarch64-darwin 2021-05-17 00:28:05 +09:00
Andrew Childs e00c4cdc0a openldap: cap MACOSX_DEPLOYMENT_TARGET at 10.16 2021-05-17 00:28:04 +09:00
Andrew Childs c96c85873c openbsm: cap MACOSX_DEPLOYMENT_TARGET at 10.16 2021-05-17 00:28:04 +09:00
Andrew Childs ea2e64c5c0 libevent: cap MACOSX_DEPLOYMENT_TARGET at 10.16 2021-05-17 00:28:04 +09:00
Andrew Childs 3e47747657 libxml2: cap MACOSX_DEPLOYMENT_TARGET at 10.16
libxml2 is used in bootstrapping, so the alternates solution of
running libtoolize is tricky here.
2021-05-17 00:27:03 +09:00
Andrew Childs 1182552332 gmp: disable assembly on Apple Silicon 2021-05-17 00:27:01 +09:00
Andrew Childs c9af80e44a fontconfig: backport atomics fixes for aarch64-darwin 2021-05-17 00:27:00 +09:00
Andrew Childs 48a1e1cb22 pcre2: disable jit on Apple Silicon 2021-05-17 00:27:00 +09:00
Andrew Childs 8e33b341a3 pcre: disable jit on Apple Silicon 2021-05-17 00:27:00 +09:00
Andrew Childs 24a378c070 zlib: fix cross compilation on darwin 2021-05-17 00:27:00 +09:00
Andrew Childs 9088e445fe glib: fix build
It's not clear why this is required, but glib includes CoreServices
headers and calls CoreServices functions, so it's reasonable to link
against the framework explicitly.
2021-05-17 00:27:00 +09:00
Andrew Childs 529346745c openssl: Apple Silicon support 2021-05-17 00:26:59 +09:00
Jan Tojnar 684991c696
Merge branch 'master' into staging-next
- Thunderbird 68 has been dropped on master.
- gccCrossLibcStdenv has been factored out on staging-next in all-packages.nix, while the file has been re-formatted on master.
2021-05-16 15:34:51 +02:00
superherointj d0c9638dc4 libtomcrypt: enable libtommath flags 2021-05-16 10:28:26 -03:00
Matthieu Coudron 3399b0e332
Merge pull request #123129 from helsinki-systems/drop/thunderbird-68
drop thunderbird{,-bin} 68
2021-05-16 12:15:51 +02:00
Jan Tojnar 3f061ca18e
Merge pull request #117658 from r-ryantm/auto-update/poppler-glib
poppler: 21.02.0 -> 21.05.0
2021-05-16 11:13:51 +02:00
Michael Raskin a617911254
Merge pull request #123206 from r-ryantm/auto-update/bctoolbox
bctoolbox: 4.5.7 -> 4.5.15
2021-05-16 08:47:32 +00:00
Michael Raskin e23040bf78
Merge pull request #123061 from r-ryantm/auto-update/libmwaw
libmwaw: 0.3.18 -> 0.3.19
2021-05-16 08:46:18 +00:00
Fabian Affolter f680d44fe2
Merge pull request #123090 from LouisDK1/hunspell-dict-da-dk
hunspell-dict-da-dk: 2.5.137 -> 2.5.189
2021-05-16 10:27:26 +02:00
R. RyanTM 11ac26ba22 bctoolbox: 4.5.7 -> 4.5.15 2021-05-16 07:33:05 +00:00
Vladimír Čunát e4d9759314
Merge #123169: ffmpeg(_4): fix build error on darwin 2021-05-16 09:32:51 +02:00
Vladimír Čunát 3e43d42f87
ffmpeg_4: only apply the patch on darwin
It's not a big deal, but why rebuild the linux dependencies now.
2021-05-16 09:31:27 +02:00
R. RyanTM 37434d704b lime: 4.5.1 -> 4.5.14 2021-05-16 02:54:49 -04:00
R. RyanTM 4539a5b8be ace: 7.0.1 -> 7.0.2 2021-05-16 06:52:17 +00: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
R. RyanTM 1dde95b786 alembic: 1.8.0 -> 1.8.1 2021-05-16 00:37:10 +00:00
Stéphan Kochen 8ceb0380a2 cxxopts: fix darwin build
Co-authored-by: Steven Pease <peasteven@gmail.com>
2021-05-15 17:14:36 -07:00
Zane van Iperen 8f64c5d9fc
ffmpeg_4: fix build error on darwin
See https://trac.ffmpeg.org/ticket/9242
2021-05-16 08:05:03 +10:00
Stéphan Kochen f8a8ac2331
cairomm_1_16: fix darwin build (#123020) 2021-05-15 15:28:44 -04:00
github-actions[bot] c10600230e
Merge staging-next into staging 2021-05-15 18:30:31 +00:00
github-actions[bot] f1b78f8618
Merge master into staging-next 2021-05-15 18:30:28 +00:00
ajs124 36d2488cb6 nss_3_44: drop 2021-05-15 17:59:39 +02:00
Ben Wolsieffer e7ac3946b4 fcl: add upstream patches to fix build on ARM
Previously, SSE was unconditionally enabled, which can't work on ARM.
2021-05-15 11:23:25 -04:00
Jan Tojnar a553f6c1fd
Merge pull request #122920 from jtojnar/glib-2681
glib: 2.68.1 → 2.68.2
2021-05-15 17:13:14 +02:00
Ben Wolsieffer f3c7a6c56a fcl: init at 0.6.1 2021-05-15 10:58:31 -04:00
Ben Wolsieffer 4e0d914db7 libccd: init at 2.1 2021-05-15 10:58:31 -04:00
Ben Wolsieffer cba07da6b1 octomap: init at 1.9.6 2021-05-15 10:58:26 -04:00
Jan Tojnar 80a3e0dc0e
Merge pull request #122997 from NixOS/gnome-40
GNOME 40: more updates
2021-05-15 16:25:54 +02:00
github-actions[bot] 49ec716c04
Merge staging-next into staging 2021-05-15 12:25:36 +00:00
github-actions[bot] ec10b0958d
Merge master into staging-next 2021-05-15 12:25:33 +00:00
Louis Tim Larsen 841c900baa hunspell-dict-da-dk: 2.5.137 -> 2.5.189 2021-05-15 13:12:30 +02:00
Leonardo Romor eb88a2fb42
openslide: init at v3.4.1
OpenSlide is a C library that provides a simple interface to read whole-slide images (also known as virtual slides).

https://openslide.org

Apply suggestions from code review

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-05-15 13:04:36 +02:00
Louis Tim Larsen 56b13f1e9d libhdhomerun: 20200907 -> 20210224 2021-05-15 11:33:33 +02:00
Vladimír Čunát 77549f4b75
wlroots_0_12: fixup build with ffmpeg-4.4
-Werror=deprecated-declarations is nice upstream but not in distro.
https://nix-cache.s3.amazonaws.com/log/cfmk2qkvck88qc002bvxzgsb2zc5b1h2-wlroots-0.12.0.drv
2021-05-15 11:07:47 +02:00
R. RyanTM d40306b324 libidn2: 2.3.0 -> 2.3.1 2021-05-15 00:23:55 -07:00
Emmanuel Rosa 281c5413df taglib-extras: add missing dependency zlib
This change adds zlib as a dependency to address the error:

```
/nix/store/5xyjd2qiily84lcv2w2grmwsb8r1hqpr-binutils-2.35.1/bin/ld: cannot find -lz
collect2: error: ld returned 1 exit status
make[2]: *** [taglib-extras/CMakeFiles/tag-extras.dir/build.make:208:
taglib-extras/libtag-extras.so.1.0.0] Error 1
make[1]: *** [CMakeFiles/Makefile2:154:
taglib-extras/CMakeFiles/tag-extras.dir/all] Error 2
make: *** [Makefile:149: all] Error 2
builder for
'/nix/store/w1ac3b6v5yfblbnqzyxa6y4738frlmvr-taglib-extras-1.0.1.drv'
failed with exit code 2
```

ZHF: #122042
2021-05-15 14:15:09 +07:00
github-actions[bot] 78ae7ac75e
Merge staging-next into staging 2021-05-15 06:22:25 +00:00
R. RyanTM 777c73d75d libmwaw: 0.3.18 -> 0.3.19 2021-05-15 04:08:09 +00:00
Vladimír Čunát c48eaa70e3
Merge branch 'master' into staging-next 2021-05-14 22:27:34 +02:00
Thomas Tuegel 2f06be9f99
Merge pull request #122955 from peterhoeg/u/taglib_1_12
taglib: 1.11.1 -> 1.12
2021-05-14 11:09:03 -05:00
Jan Tojnar 8522540b7f graphene: 1.10.2 → 1.10.6
- https://github.com/ebassi/graphene/releases/tag/1.10.4
- https://github.com/ebassi/graphene/releases/tag/1.10.6
2021-05-14 16:36:54 +02:00
Jan Tojnar bb1355a22d libportal: 0.3 → 0.4 2021-05-14 16:36:54 +02:00
Jan Tojnar 4d2d4d329d gtk-frdp: init at 3.37.1-unstable-2020-10-26 2021-05-14 16:36:53 +02:00
Robert Schütz 5133e8b441 libxlsxwriter: 1.0.4 -> 1.0.5
https://github.com/jmcnamara/libxlsxwriter/releases/tag/RELEASE_1.0.5
2021-05-14 14:00:00 +02:00
Thomas Tuegel e45c0ea4cd
Restore version in Qt derivation names 2021-05-14 05:53:30 -05:00
Markus Kowalewski e4642783ba
libxc: 5.1.3 -> 5.1.4 2021-05-14 11:37:13 +02:00
Peter Hoeg 4a29d1156c taglib: 1.11.1 -> 1.12 2021-05-14 14:37:18 +08:00
zowoq 004f8cd986 Merge staging-next into staging 2021-05-14 16:32:43 +10:00
Jan Tojnar 76c58493d7 libxslt: find libxml2 using pkg-config
It fails for reasons unknown otherwise and pkg-config is better for cross-compilation anyway.
2021-05-13 23:12:59 -07:00
Jan Tojnar d01a4e3fe9 libxml2: 2.9.10 → 2.9.12
https://mail.gnome.org/archives/xml/2021-May/msg00000.html

CVE-2021-3541
2021-05-13 23:12:59 -07:00
github-actions[bot] bf5d8bb531
Merge master into staging-next 2021-05-14 00:58:11 +00:00
Jan Tojnar ca0080865f
glib: 2.68.1 → 2.68.2 2021-05-13 23:43:05 +00:00
Sandro 98352e5439
Merge pull request #122623 from tollb/fix/geos-remove-python-dependency-20210511a
geos: remove unnecessary python dependency
2021-05-13 23:49:39 +02:00
Robert T. McGibbon cb21e3d5e4 xgboost: 0.90 -> 1.4.1 2021-05-13 13:48:35 -07:00
Robert Scott 4db7d30365
Merge pull request #122836 from rmcgibbo/libunique
libunique: fix darwin
2021-05-13 20:07:01 +01:00
Robert T. McGibbon e6997a0900 libunique: fix darwin 2021-05-13 10:19:08 -04:00
Michael Weiss b364139f2b
maintainers: remove pesterhazy
Their last commit was caf43ad5af from 2015.
Thank you for your contributions.
2021-05-13 13:00:47 +02:00
Jan Tojnar 0313c77b55
Merge branch 'staging-next' into staging 2021-05-13 11:42:36 +02:00
github-actions[bot] a8e5ac148b
Merge master into staging-next 2021-05-13 00:56:26 +00:00
Rick van Schijndel 3d770c1aa5 libnixxml: patch /bin/bash path 2021-05-12 19:23:00 -04:00
Rick van Schijndel bf434ca1a1 libnixxml: fix build + support cross + enable tests
Run the symlinking of the ./bootstrap script in the preAutoreconf hook.

Remove the tests that are broken and enable testing again.

Put correct dependencies in nativeBuildInputs vs buildInputs vs
checkInputs to support cross-compilation.
2021-05-12 19:23:00 -04:00
Robert Scott 012cb9d3e2
Merge pull request #122468 from stephank/fix-libfive-darwin
libfive: fix darwin build
2021-05-12 22:54:51 +01:00
Jan Tojnar e91e916056
Merge pull request #122587 from jtojnar/tbb-pc
tbb: install pkg-config file
2021-05-12 23:49:43 +02:00
Thomas Tuegel 5121d67a3c
Merge pull request #122032 from ttuegel/kde-frameworks-5.81
KDE Frameworks 5.81
2021-05-12 14:20:25 -05:00
github-actions[bot] b057978bb2
Merge staging-next into staging 2021-05-12 18:32:29 +00:00
github-actions[bot] f214722172
Merge master into staging-next 2021-05-12 18:32:26 +00:00
Michael Weiss a605e0318d
Merge pull request #122475 from stephank/fix-wayland-darwin
wayland: fix build on darwin
2021-05-12 20:18:48 +02:00
Sandro 362e8958d6
Merge pull request #122494 from rmcgibbo/realsense2
librealsense2: 2.43.0 -> 2.45.0
2021-05-12 18:33:40 +02:00
ajs124 ba7dccbda7
Merge pull request #122451 from helsinki-systems/fix/libsoup
libsoup: fix building cpp applications after recent glib update
2021-05-12 17:30:54 +02:00
Jan Tojnar 71fa678899
Merge branch 'staging-next' into staging 2021-05-12 14:31:36 +02:00
github-actions[bot] 1d2db66464
Merge master into staging-next 2021-05-12 12:27:04 +00:00
Alyssa Ross 264533c9e9 spdk: don't manually enableParallelBuilding
This is automatic for Meson builds.
2021-05-12 11:57:35 +00:00
Alyssa Ross 31c5b4fe9b mesa: don't manually enableParallelBuilding
This is automatic for Meson builds.
2021-05-12 11:57:35 +00:00
Alyssa Ross 11e0b4022e lyra: don't manually enableParallelBuilding
This is automatic for Meson builds.
2021-05-12 11:57:35 +00:00
Alyssa Ross f6d6908898 gtkmm: don't manually enableParallelBuilding
This is automatic for Meson builds.
2021-05-12 11:57:35 +00:00
Alyssa Ross 058854e4e0 glibmm: don't manually enableParallelBuilding
This is automatic for Meson builds.
2021-05-12 11:57:35 +00:00
Alyssa Ross 5fe3cbceae gcr: don't manually enableParallelBuilding
This is automatic for Meson builds.
2021-05-12 11:57:35 +00:00
Thomas Gerbet 330cc7eff3 md4c: 0.4.7 -> 0.4.8
Fixes CVE-2021-30027.
Changelog: https://github.com/mity/md4c/blob/release-0.4.8/CHANGELOG.md
2021-05-12 13:29:46 +02:00
Vladimír Čunát 8a0c5da648
Merge #122333: webkitgtk: Fix bubblewrap opengl-driver path 2021-05-12 12:53:16 +02:00
Vladimír Čunát 1c7d154bb1
Merge #122441: webkitgtk: 2.32.0 -> 2.32.1 2021-05-12 12:53:12 +02:00
Thomas Tuegel 0f7eacc147
kdeFrameworks: 5.80 -> 5.81 2021-05-12 05:42:48 -05:00
Christoph Hrdinka 55301e2cb3
Merge pull request #122563 from stephank/fix-communi-darwin
communi: fix darwin build
2021-05-12 09:51:44 +02:00
Christoph Hrdinka 65d339dc38
Merge pull request #122610 from tollb/fix/mapnik-3.1.0-missing-proj-and-libxml2-support-20210511b
mapnik: fix missing proj and libxml2 support
2021-05-12 09:43:34 +02:00
R. RyanTM 344ec021bf libxmlb: 0.3.0 -> 0.3.1 2021-05-12 09:30:57 +02:00
github-actions[bot] 5c4cda9988
Merge staging-next into staging 2021-05-12 00:50:13 +00:00
github-actions[bot] 5a513ae14b
Merge master into staging-next 2021-05-12 00:50:10 +00:00
John Ericson cf02b24813 Merge remote-tracking branch 'upstream/staging-next' into staging 2021-05-11 22:30:46 +00:00
Vladimír Čunát a7833724fd
webkitgtk: 2.32.0 -> 2.32.1
https://webkitgtk.org/2021/05/10/webkitgtk2.32.1-released.html
In particular, we now needed to fix the build with icu-69.
2021-05-11 22:13:36 +02:00
Bruce Toll 9c85535bc7 geos: remove unnecessary python dependency
The python bindings were removed in versions starting with 3.9.0.

See: https://git.osgeo.org/gitea/geos/geos/pulls/111
2021-05-11 14:57:47 -04:00
Robert Schütz 35d969a581 libdeltachat: 1.54.0 -> 1.55.0
https://github.com/deltachat/deltachat-core-rust/blob/1.55.0/CHANGELOG.md
2021-05-11 20:46:10 +02:00
github-actions[bot] 37c26a396b
Merge master into staging-next 2021-05-11 18:28:07 +00:00
Michael Raskin 010661db26
Merge pull request #122604 from rmcgibbo/flint
flint: fix build on darwin
2021-05-11 18:26:38 +00:00
Robert Schütz 7c35d1e73e
Merge pull request #122332 from dotlambda/mauikit-1.2.2
libsForQt5.mauikit: 1.2.1 -> 1.2.2
2021-05-11 19:12:53 +02:00
Bruce Toll beed9092dd mapnik: fix missing proj and libxml2 support
This commit provides three minor improvements:

1. Fix missing proj support. Fixes #91889.
2. Fix missing libxml2 support.
3. Improve build time with parallel build.

Fix missing proj support:
-------------------------
The 2019-07-09 update to proj version 6.1.1 in nixpkgs
commit d55cba68ff caused two problems for mapnik:

1. The separation of the dev output was not reflected in the mapnik
   expression. Since proj support is optional in the mapnik build,
   the build succeeded but no longer included proj support.

   See build log for: https://hydra.nixos.org/build/96274475.

2. Even if the mapnik expression was updated to use the separate
   dev output, it would still have dropped proj support because mapnik
   has not been updated for the proj 6 API.

This commit fixes the PROJ_INCLUDES to use the correct dev output and
also makes the PROJ_LIBS output explicit. In addition, it defines
ACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1 since mapnik still does not have
a tagged release that supports the proj 6 api.

Looking to the future, it appears that the mapnik master branch includes
proj 6 support, so some checks were included to help insure that this
workaround gets removed once it is no longer required.

Fix missing libxml2 support:
----------------------------
Configure with "XMLPARSER=libxml2" to get libxml2 support. This has been
needed since mapnik 3.0.2. Remove XML2_INCLUDES and XML2_LIBS which
trigger a bug in the supplied SConstruct script (when used with
"XMLPARSER=libxml2.

In addition, libxml2 needs to be a propagatedBuildInput to avoid
errors building apacheHttpdPackages.mod_tile, python-mapnik, and
possibly other packages.

Enable parallel build:
----------------------
Setting enableParallelBuild does not result in a parallel build
with mapnik. However, setting JOBS=$(NIX_BUILD_CORES) in buildFlags
works and significantly reduces the build time.
2021-05-11 13:10:37 -04:00
Robert T. McGibbon bae8a2bedc flint: fix build on darwin 2021-05-11 12:56:06 -04:00
Jan Tojnar d8258b513d
tbb: add pkg-config file
Gazebo does not list the tbb dependency in its pkg-config file otherwise.
2021-05-11 18:43:00 +02:00
Jan Tojnar d2f30b0b11
pkgsMusl.tbb: fix build
Use patches from openembedded:

39185eb1d1/meta-oe/recipes-support/tbb/tbb

Also apply the patches unconditionally so that it is obvious when they do not apply any more.
2021-05-11 18:43:00 +02:00
Jan Tojnar 99396a48a5
tbb: clean up
- Drop compiler and stdver arguments – if someone needs to provide them, they can just use overrideAttrs
- Update repo source
- Narrow scope of `with lib` declaration
- Change optional → optionals
- Use one input per line
- Build on all unix platforms
- Re-order attributes
2021-05-11 18:38:24 +02:00
John Ericson 032a1e4478
Merge pull request #122522 from Ericson2314/glibc-pname
glibc, libiconv: use pname and version
2021-05-11 11:47:21 -04:00
Robert T. McGibbon 93deff3962 mpir: fix darwin 2021-05-11 11:09:25 -04:00
R. RyanTM 5ff66dca33 tbb: 2019_U9 -> 2020_U3 2021-05-11 15:24:45 +02:00