lunik1
e3f7168d86
libretro.ppsspp: update to v1.11 and fix build againt ffmpeg 4.4
...
(cherry picked from commit a5a5088eae8955bc781f240af54880fa78232a2f)
2021-05-25 16:49:02 +01:00
Domen Kožar
0ae5309111
Merge pull request #124258 from domenkozar/revert-sandbox-path-21.05
...
Revert "nixos/nix-daemon: fix sandbox-paths option"
2021-05-24 15:37:55 +02:00
regnat
0cebbdf687
Revert "nixos/nix-daemon: fix sandbox-paths option"
...
This reverts commit aeeee447bc
.
(cherry picked from commit 113823669b9b71fff84bc592d1fd6022635c28eb)
Signed-off-by: Domen Kožar <domen@dev.si>
2021-05-24 15:20:58 +02:00
Michael Weiss
97b94af4eb
Merge pull request #124182 from primeos/signal-desktop-backport
...
[21.05] Revert "signal-desktop: Add a Python wrapper to re-encrypt DBs"
2021-05-24 14:50:37 +02:00
Mario Rodas
3cb8557ce1
Merge pull request #124229 from LeSuisse/redis-6.2.3-21.05
...
[21.05] redis: 6.2.1 -> 6.2.3
2021-05-24 04:39:06 -05:00
Maximilian Bosch
a4b270df3a
Merge pull request #124231 from talyz/21.05-php-dom
...
[21.05] phpExtensions.dom: fix build
2021-05-24 10:50:16 +02:00
Maximilian Bosch
2bffd5fef9
phpExtensions.dom: fix build
...
ZHF #122042
(cherry picked from commit 53951c0c1444e500585205e8b2510270b2ad188f)
2021-05-24 09:24:47 +02:00
Jörg Thalheim
0c67f4a204
odp-dpdk: 1.22.0.0_DPDK_18.11 -> 1.27.0.0_DPDK_19.11
...
(cherry picked from commit b50d58d9884bcd9216376e0f2c8f8f096572e7bf)
2021-05-24 09:18:28 +02:00
Jörg Thalheim
c443ac73f2
pktgen: 19.12.0 -> 21.05.0
...
(cherry picked from commit 9d002b110e74cb73b0e08029088d1f034c23f80a)
2021-05-24 09:18:27 +02:00
Jörg Thalheim
ee76949241
spdk: 20.04.1 -> 21.04
...
(cherry picked from commit 00a7a0f609352bd077b6c4d5dab88bddb70458fc)
2021-05-24 09:18:27 +02:00
Jörg Thalheim
40b3403d59
dpdk: 20.05 -> 21.02
...
(cherry picked from commit a443ea7d0142ac3f8c27a40a3dcc5723cb49d62e)
2021-05-24 09:18:26 +02:00
Thomas Gerbet
35f631618f
redis: 6.2.1 -> 6.2.3
...
Fixes CVE-2021-29477 and CVE-2021-29478.
https://github.com/redis/redis/blob/6.2.3/00-RELEASENOTES
(cherry picked from commit 0d1b14161acc0c79b0712ea4f4c476684bfa41a3)
2021-05-24 08:44:43 +02:00
Kim Lindberger
df25a8867f
Merge pull request #124138 from talyz/21.05-php-iconv-errno
...
[21.05] php74.extensions.iconv: fix error signalling
2021-05-23 17:48:31 +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
Guillaume Girol
bfa9bc365d
Merge pull request #124148 from hyperfekt/mount-pstore-quiet
...
nixos/filesystems: condition mount-pstore.service on unmounted /sys/fs/pstore (once more)
2021-05-23 13:52:37 +00:00
Guillaume Girol
1c1e5094d9
Merge pull request #123902 from hyperfekt/mount-pstore-quiet
...
nixos/filesystems: condition mount-pstore.service on unmounted /sys/fs/pstore
(cherry picked from commit d7555732bc8bb8a2acb50fd4ecba96c825b4f21e)
Reason: activation throws an error from failing to start the unit
2021-05-23 15:04:41 +02:00
Christian Kögler
7375cb1c0e
neovide: Fix build caused by llvm multi output
2021-05-23 14:34:23 +02: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
Jan Tojnar
b39ac7cf2b
php74.extensions.iconv: fix error signalling
...
The configure script checks whether iconv supports errno. Unfortunately, on PHP < 8, the test program includes $PHP_ICONV_H_PATH, which defaults to FHS path so it fails to build:
conftest.c:13:10: fatal error: /usr/include/iconv.h: No such file or directory
13 | #include </usr/include/iconv.h>
| ^~~~~~~~~~~~~~~~~~~~~~
That causes the feature check to report a false negative, leading PHP to use a degraded code that returns PHP_ICONV_ERR_UNKNOWN when error occurs, breaking granular error handling in applications.
To prevent this, let’s just include <iconv.h>.
PHP 8 just uses include path so the detection works there: 7bd1d70341
(cherry picked from commit 024243bac4612c62ef5be676818ed2465edae27f)
2021-05-23 13:13:11 +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
Michael Weiss
13e13349bd
Revert "signal-desktop: Add a Python wrapper to re-encrypt DBs"
...
This reverts commit 45bd7b39a4
.
The database for users on NixOS 20.09 is still encrypted so we don't
need this wrapper for users that upgrade from NixOS 20.09 to 21.05.
2021-05-23 11:37:15 +02:00
Jonathan Ringer
11f5b3279d
Merge pull request #124090 from jonringer/backport-staging-next
...
[21.05] Backport staging next
2021-05-22 19:40:52 -07:00
Jonathan Ringer
8e7956833a
Revert "21.11 is Porcupine!"
...
This reverts commit ff1ded3e20
.
2021-05-22 19:08:29 -07:00
Jonathan Ringer
d547493e0c
Revert "nixos/doc: add md-to-db.sh, convert "Building Your Own NixOS CD" to CommonMark"
...
This reverts commit 6c14851943
.
2021-05-22 19:08:27 -07:00
Jonathan Ringer
f05e41b6f4
Revert "CODEOWNERS: add ryantm to /nixos/doc"
...
This reverts commit a67febac45
.
2021-05-22 19:08:25 -07:00
Jonathan Ringer
4a974e6695
Revert "nixos/doc: convert "Contributing to this manual" to CommonMark"
...
This reverts commit 7501467903
.
2021-05-22 19:08:23 -07:00
Jonathan Ringer
c294c2fb40
Revert "nixos/doc: add 21.11 release notes stub"
...
This reverts commit 6543c61311
.
2021-05-22 19:08:15 -07:00
Jonathan Ringer
c2bb4bad68
Merge remote-tracking branch 'origin/master' into backport-staging-next
...
Forgot to merge staging-next into master before branching off.
This is meant to include the additional stabilization changes.
2021-05-22 18:48:23 -07: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
Ryan Mulligan
6543c61311
nixos/doc: add 21.11 release notes stub
2021-05-22 18:14:49 -07:00
Ryan Mulligan
7501467903
nixos/doc: convert "Contributing to this manual" to CommonMark
...
Also updates it to mention running md-to-db.sh.
2021-05-22 18:14:49 -07:00
Ryan Mulligan
a67febac45
CODEOWNERS: add ryantm to /nixos/doc
2021-05-22 18:14:49 -07:00
Ryan Mulligan
6c14851943
nixos/doc: add md-to-db.sh, convert "Building Your Own NixOS CD" to CommonMark
2021-05-22 18:14:49 -07:00
Jonathan Ringer
ff1ded3e20
21.11 is Porcupine!
2021-05-22 18:14:06 -07:00
Jonathan Ringer
12c5acf376
21.05 beta release
2021-05-22 17:56:13 -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
Sandro
ad4b24a802
Merge pull request #123684 from netcrns/netcrns/bunyan
2021-05-23 02:03:14 +02:00
Martin Weinelt
84f649f693
Merge pull request #121626 from mweinelt/botamusique
2021-05-23 02:02:09 +02:00
Sandro
3ac63fbb09
Merge pull request #123425 from erictapen/osrm-backend-5.25.0
2021-05-23 02:00:08 +02:00
Sandro
037b7e2834
Merge pull request #123387 from bjornfor/update-whipper
2021-05-23 01:59:16 +02:00
Kim Lindberger
1693374dbd
synergy: 1.11.1 -> 1.13.1.41 ( #123359 )
2021-05-23 01:55:42 +02:00
Robert Scott
117a632169
Merge pull request #123987 from LeSuisse/htmldoc-1.9.12
...
htmldoc: 1.9.11 -> 1.9.12
2021-05-23 00:49:23 +01:00
Fabian Affolter
31601a5977
python3Packages.aiohomekit: 0.2.61 -> 0.2.62
2021-05-22 16:40:07 -07:00
R. RyanTM
bd441a1339
liblinphone: 4.5.15 -> 4.5.17
2021-05-22 16:37:13 -07:00
Martin Weinelt
bafd6631da
python3Packages.pymumble: 1.6 -> 1.6.1
2021-05-23 01:01:52 +02:00
Martin Weinelt
f05a2c22cf
botamusique: unstable-2021-03-13 -> unstable-2021-05-19
2021-05-23 01:01:52 +02:00
Martin Weinelt
f79c1d1c3e
botamusique: add passthru test
2021-05-23 01:01:52 +02:00