292222 Commits

Author SHA1 Message Date
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 45bd7b39a444c904986324b5f7c46ba867612575.

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
Vladimír Čunát
ddc60bec55
Merge #123133: curlftpfs: fix sandboxed builds on darwin
(cherry picked from commit 29f57e475266edbb57d995c044aba3adf7f71298)
2021-05-23 08:19:50 +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 ff1ded3e2047268a55d3443459cda01cf9242e45.
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 6c14851943fe55da9df88a502d1e1fe2271d9666.
2021-05-22 19:08:27 -07:00
Jonathan Ringer
f05e41b6f4
Revert "CODEOWNERS: add ryantm to /nixos/doc"
This reverts commit a67febac45f8b9798a138b2fd59bd921c148bf17.
2021-05-22 19:08:25 -07:00
Jonathan Ringer
4a974e6695
Revert "nixos/doc: convert "Contributing to this manual" to CommonMark"
This reverts commit 7501467903faa3de62f6a45d5ee2fda35154b8a2.
2021-05-22 19:08:23 -07:00
Jonathan Ringer
c294c2fb40
Revert "nixos/doc: add 21.11 release notes stub"
This reverts commit 6543c61311c0397775253dd3d7f1f41154fc6189.
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
Martin Weinelt
d210ed99c4
nixos/tests/botamusique: init 2021-05-23 01:01:52 +02:00
Martin Weinelt
59e5ff4b29
nixos/botamusique: init 2021-05-23 01:01:51 +02:00
Robert Scott
5b511ca6f3 python3Packages.pyvex: fix build for darwin 2021-05-22 15:52:12 -07:00
sophrosyne97
ea5726aefe lite: fix build error 2021-05-22 15:27:26 -07:00
Jan Tojnar
aea7b5f08e
Merge pull request #124073 from mkg20001/cinnamonpolkit
nixos/cinnamon: add polkit_gnome to fix #124062
2021-05-23 00:21:28 +02:00
Jan Tojnar
141e85cc69
Merge pull request #124056 from mkg20001/cinnamonlocale
nixos/cinnamon: add cinnamon-translations to systemPackages
2021-05-23 00:21:11 +02:00
Sandro
939c4c1cbd python-packages: add aliases for google_api_python_client, googleapis_common_protos
Co-authored-by: sterni <sternenseemann@systemli.org>
2021-05-22 15:02:50 -07:00
Sandro Jäckel
d6ff646b3f pythonPackages.smart_open: rename to smart-open 2021-05-22 15:02:50 -07:00
Sandro Jäckel
0197f1dc41 pythonPackages: Add aliases 🎉 2021-05-22 15:02:50 -07:00
Maciej Krüger
56dbdba0cc
cinnamon.nemo: use cinnamon-translations 2021-05-22 23:59:35 +02:00
Maciej Krüger
4a36512431
cinnamon.cinnamon-settings-daemon: use cinnamon-translations 2021-05-22 23:59:34 +02:00
Maciej Krüger
77c27b6715
cinnamon.cinnamon-session: use cinnamon-translations 2021-05-22 23:59:34 +02:00
Maciej Krüger
eac85651a3
cinnamon.cinnamon-control-center: use cinnamon-translations 2021-05-22 23:59:33 +02:00
Maciej Krüger
425ac82c14
cinnamon.cinnamon-common: use cinnamon-translations
Also remove unused configureFlags
2021-05-22 23:59:33 +02:00
Maciej Krüger
eca2b05354
nixos/cinnamon: add cinnamon-translations to systemPackages
This allows other cinnamon applications to use the locales

Without this the cinnamon UI is not properly translated
2021-05-22 23:59:33 +02:00
Maciej Krüger
8664c2c743
nixos/cinnamon: add polkit_gnome to fix #124062 2021-05-22 23:58:06 +02:00
Maximilian Bosch
9d6f7c1080
Merge pull request #122000 from r-ryantm/auto-update/ceph
ceph: 16.2.1 -> 16.2.3
2021-05-22 23:42:57 +02:00
Martin Weinelt
aec6be52dd
Merge pull request #124044 from mweinelt/pinnwand 2021-05-22 23:23:20 +02:00
Maximilian Bosch
ef99783505
Merge pull request #122248 from aszlig/hocker-fetchdocker-eval-error
Fix fetchdocker call signature
2021-05-22 23:06:25 +02:00