Commit Graph

292584 Commits

Author SHA1 Message Date
Michael Weiss 39762d2342 ungoogled-chromium: 91.0.4472.77 -> 91.0.4472.101
(cherry picked from commit 3952d191751df8313e0ba0e17ea4818ded20e027)
2021-06-13 09:59:36 +00:00
Martin Weinelt 1f91fd1040
Merge pull request #126736 from Lassulus/weechat-matrix
[21.05] weechatScripts.weechat-matrix: fix matrix_sso_helper path
2021-06-13 11:32:41 +02:00
Robert Gerus ac93a00745 weechatScripts.weechat-matrix: fix matrix_sso_helper path
server.py tries to launch a matrix_sso_helper binary when connecting to
a homeserver that uses some SSO mechanism instead of plain login and
password, but doesn't have $out/bin in $PATH.

Using substituteInPlace to patch server.py so that the helper process is
started by using its actual filesystem location instead of relying on
$PATH.

Fixes: https://github.com/NixOS/nixpkgs/issues/124186
(cherry picked from commit f7ccc5f35d0e1fe11a7e01e3dddd1ff28566ba1d)
2021-06-13 11:29:58 +02:00
Matthieu Coudron 889a9b7c11 pythonPackages: set mainProgram to pname by default
Calling `nix run poetry` or another python package usually fails
because of the "pythonX" prefix in name.
Adjust mainProgram to ignore that prefix.

(cherry picked from commit b59875ef23dabddceda3673a7559ebbede9ab6aa)
2021-06-13 10:36:12 +02:00
Luke Granger-Brown b3872ff69c
Merge pull request #126716 from risicle/ris-envoy-1.16.4-r21.05
[21.05] envoy: 1.16.2 -> 1.16.4, addressing CVE-2021-29258
2021-06-13 00:41:34 +01:00
Robert Scott dd24b1bc0a envoy: 1.16.2 -> 1.16.4
resolving CVE-2021-29258
2021-06-12 22:59:29 +01:00
Sandro 81b3481d79
Merge pull request #126528 from NixOS/backport-126303-to-release-21.05
[Backport release-21.05] deno: 1.10.3 -> 1.11.0
2021-06-12 18:26:11 +02:00
Vladimír Čunát 1ba7a494bf
Merge #126619: knot-resolver: skip tests on aarch64-darwin
(cherry picked from commit 9affc60b0cd7575c075a7be13d500928b0909fd1)
It looks good on nixpkgs master (and other platforms don't even rebuild):
https://hydra.nixos.org/build/145261694
2021-06-12 16:51:53 +02:00
Guillaume Girol c5811ce005 tt-rss-plugin-tumblr-gdpr: 2.1 -> 2.2
fixes adding a new feed to ttrss.
the release only contains the fix, so it's low risk.
It's not a backport because the plugin has become unnecessary so we are
simply removing it from unstable.
2021-06-12 12:00:00 +00:00
Vladimír Čunát 6d286be97a
Merge branch 'release-21.05' into staging-next-21.05
This brings not that many rebuilds but still some.
2021-06-12 07:21:42 +02:00
Timothy Klim 20fb587164 sbt: 1.5.1 -> 1.5.3
(cherry picked from commit 7c74293590f5ff12920d9a46da84983b6c156e04)
2021-06-11 19:04:11 -04:00
Robert Scott b76c86678d bosh-cli: init at 6.4.3
(cherry picked from commit 8f3bf74e1c1689e8c04f83a2c4cf58b38c17ab33)
2021-06-11 22:45:52 +00:00
Bjørn Forsman c3094b06ce qcachegrind: license gpl2 -> gpl2Plus
According to https://apps.kde.org/kcachegrind/.

(cherry picked from commit 1b1f196fe6f46e6f713946e5c423bbbc90771328)
2021-06-11 23:09:20 +02:00
Bjørn Forsman bfff2cbbcd qcachegrind: fix fatal Could not find the Qt platform plugin "xcb" in ""
(cherry picked from commit 16cbc80a9370b13db95a75b74d20e1d2beb578b3)
2021-06-11 23:09:20 +02:00
Bjørn Forsman 0d417a343c nixos/jenkins: test declarative jobs
(cherry picked from commit a655b712015f1a37466371234620b8958887e9bf)
2021-06-11 23:08:41 +02:00
Bjørn Forsman a0fc6a7861 nixos/jenkins-job-builder: add support for folder jobs
Add support for folder jobs
(https://plugins.jenkins.io/cloudbees-folder/) by reworking the service
to support nested jobs.

This also fixes this deprecation warning (as a happy side effect):

  WARNING:jenkins_jobs.cli.subcommand.test:(Deprecated) The default output behavior of `jenkins-jobs test` when given the --output flag will change in JJB 3.0. Instead of writing jobs to OUTPUT/jobname; they will be written to OUTPUT/jobname/config.xml. The new behavior can be enabled by the passing `--config-xml` parameter

(cherry picked from commit 4bcb22e17aa8677c6b3fc4625732d4da791a576f)
2021-06-11 23:08:41 +02:00
Dmitry Kalinkin af3e82ab87 llvmPackages_12.compiler-rt: fix build on darwin
```
/tmp/nix-build-compiler-rt-libc-12.0.0.drv-0/compiler-rt-12.0.0.src/lib/sanitizer_common/sanitizer_mac.cpp:617:7: error: use of undeclared
      identifier 'TARGET_OS_IOS'
  if (TARGET_OS_IOS || TARGET_OS_TV) return 6;
      ^
/tmp/nix-build-compiler-rt-libc-12.0.0.drv-0/compiler-rt-12.0.0.src/lib/sanitizer_common/sanitizer_mac.cpp:617:24: error: use of undeclared
      identifier 'TARGET_OS_TV'
  if (TARGET_OS_IOS || TARGET_OS_TV) return 6;
                       ^
/tmp/nix-build-compiler-rt-libc-12.0.0.drv-0/compiler-rt-12.0.0.src/lib/sanitizer_common/sanitizer_mac.cpp:618:7: error: use of undeclared
      identifier 'TARGET_OS_WATCH'
  if (TARGET_OS_WATCH) return 13;
      ^
/tmp/nix-build-compiler-rt-libc-12.0.0.drv-0/compiler-rt-12.0.0.src/lib/sanitizer_common/sanitizer_mac.cpp:687:7: error: use of undeclared
      identifier 'TARGET_OS_IOS'
  if (TARGET_OS_IOS || TARGET_OS_TV)
      ^
/tmp/nix-build-compiler-rt-libc-12.0.0.drv-0/compiler-rt-12.0.0.src/lib/sanitizer_common/sanitizer_mac.cpp:687:24: error: use of undeclared
      identifier 'TARGET_OS_TV'
  if (TARGET_OS_IOS || TARGET_OS_TV)
                       ^
/tmp/nix-build-compiler-rt-libc-12.0.0.drv-0/compiler-rt-12.0.0.src/lib/sanitizer_common/sanitizer_mac.cpp:689:12: error: use of undeclared
      identifier 'TARGET_OS_WATCH'
  else if (TARGET_OS_WATCH)
           ^
6 errors generated.
```

(cherry picked from commit cf4e1b9e62ab987552eb676f7618ea085f12a751)
2021-06-11 16:45:59 +00:00
Kerstin Humm 30457b3fbd
imagemagick: 6.9.12-12 -> 6.9.12-14
(cherry picked from commit 99f12af681ebd3369a72580cccddc317841765c5)
2021-06-11 17:23:13 +02:00
Jan Solanti c2628780fc pipewire: 0.3.27 -> 0.3.30
(cherry picked from commit c702cc43213dce2573adb924ab9c67522616aea6)
2021-06-11 14:52:30 +00:00
Maximilian Bosch 39c1857cd5
Merge pull request #126589 from NixOS/backport-126540-to-release-21.05
[Backport release-21.05] Kernels 2021-06-10
2021-06-11 16:48:23 +02:00
TredwellGit 01f05483e3 linux/hardened/patches/5.4: 5.4.124-hardened1 -> 5.4.125-hardened1
(cherry picked from commit c22128ed44db5b8c2fa0c66ed8a33e1660421739)
2021-06-11 11:55:05 +00:00
TredwellGit a4b3179732 linux/hardened/patches/5.12: 5.12.9-hardened1 -> 5.12.10-hardened1
(cherry picked from commit 889319446ce58456ad06165748bf7d302181c3cc)
2021-06-11 11:55:05 +00:00
TredwellGit 6d28511e7f linux/hardened/patches/5.10: 5.10.42-hardened1 -> 5.10.43-hardened1
(cherry picked from commit 0879f36d2b5269d1ca097761601c5b7f26c2e3d7)
2021-06-11 11:55:05 +00:00
TredwellGit e08fc97b07 linux/hardened/patches/4.19: 4.19.193-hardened1 -> 4.19.194-hardened1
(cherry picked from commit 940bf55cab197e373102be460d6d7fd737fbd8e3)
2021-06-11 11:55:04 +00:00
TredwellGit 2eff1ca451 linux/hardened/patches/4.14: 4.14.235-hardened1 -> 4.14.236-hardened1
(cherry picked from commit e77f16cbcb80456b3874b649ddf35bd6183e4b43)
2021-06-11 11:55:04 +00:00
TredwellGit 0bfc50ac94 linux: 5.4.124 -> 5.4.125
(cherry picked from commit 7cf65d0f4a9a1200bdc2dd2d63b572dfb8350db6)
2021-06-11 11:55:04 +00:00
TredwellGit e7a8f48d6b linux: 5.12.9 -> 5.12.10
(cherry picked from commit fd44ed986cad429e42cb985a78e847895438e89d)
2021-06-11 11:55:04 +00:00
TredwellGit a5bfe124f9 linux: 5.10.42 -> 5.10.43
(cherry picked from commit 121dbb96538e04b1e54559a7728a5e4653a52e82)
2021-06-11 11:55:04 +00:00
TredwellGit 134c38917e linux: 4.9.271 -> 4.9.272
(cherry picked from commit 2961093d9b231fb085d74696d09334b7a1bedbc6)
2021-06-11 11:55:03 +00:00
TredwellGit 52f177d27c linux: 4.4.271 -> 4.4.272
(cherry picked from commit a31fb792707b189b3ec4c87e9cf7afdb410db72e)
2021-06-11 11:55:03 +00:00
TredwellGit 2cfe71a243 linux: 4.19.193 -> 4.19.194
(cherry picked from commit 89a533e7df2274b173dfa145eb2f224cffc2b606)
2021-06-11 11:55:03 +00:00
TredwellGit 40c83d56e0 linux: 4.14.235 -> 4.14.236
(cherry picked from commit a6d113ad1b17b731972a0550ee14fa333bac2644)
2021-06-11 11:55:03 +00:00
Maciej Krüger 0f4f2317c1
Merge pull request #126576 from mkg20001/x2go-backport 2021-06-11 09:50:42 +00:00
Maciej Krüger 6d9d295e38
[Backport release-21.05] x2goclient: unstable-2019-07-24 -> 4.1.2.2, fix #78907
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
(cherry picked from commit c4100d81bdbfb28f63f326204a4ee19133233a7b)
2021-06-11 11:35:20 +02:00
Jörg Thalheim 3fdff5f4b0
Merge pull request #126548 from NixOS/backport-126513-to-release-21.05
[Backport release-21.05] nixos-rebuild: Pass flakes flags when doing local flakes build
2021-06-11 09:04:28 +02:00
Anderson Torres 6d301bb54e
Merge pull request #126460 from NixOS/backport-126341-to-release-21.05
[Backport release-21.05] palemoon: 29.2.0 -> 29.2.1
2021-06-11 01:18:28 -03:00
Alyssa Ross 8d292bd4f7 apacheHttpd: 2.4.47 -> 2.4.48
(cherry picked from commit 8da3370dbd62379bbc14fc57ba04a10f7456690f)
2021-06-11 00:22:01 +00:00
Chuck c764b9f946 nixos-rebuild: Pass flakes flags when doing local flakes build
(cherry picked from commit 1c80856545fd1234ba84b8981d26ca8e786376c2)
2021-06-10 22:31:01 +00:00
R. RyanTM e7928186d9 deno: 1.10.3 -> 1.11.0
(cherry picked from commit c374fd03ffd37d400c6bad69a4cd386749df803b)
2021-06-10 19:25:30 +00:00
Michael Weiss 2311321709
Merge pull request #126506 from primeos/chromium-backport
[21.05] chromium: 91.0.4472.77 -> 91.0.4472.101
2021-06-10 20:59:02 +02:00
Maximilian Bosch 2c15e457a1
Merge pull request #126503 from NixOS/backport-126330-to-release-21.05
[Backport release-21.05] vorta: 0.7.5 -> 0.7.6
2021-06-10 19:32:19 +02:00
Michael Weiss 0312d6fcf7
chromiumDev: Install crashpad_handler
This executable is required to fix a startup error:
[990:990:0609/092114.482805:FATAL:double_fork_and_exec.cc(131)] execv /nix/store/k02xhxzn6sn2cihaal68wwsyk8cg9pkg-chromium-unwrapped-93.0.4535.3/libexec/chromium/crashpad_handler: No such file or directory (2)

Unfortunately Chromium M93 still segfaults in the VM test:
machine # [0610/100626.225850:ERROR:process_memory_range.cc(75)] read out of range
machine # [0610/100626.227312:ERROR:file_io_posix.cc(144)] open /sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq: No such file or directory (2)
machine # [0610/100626.240410:ERROR:file_io_posix.cc(144)] open /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq: No such file or directory (2)
machine # [   19.810981] systemd-coredump[1015]: Process 987 (chromium) of user 1000 dumped core.

(cherry picked from commit 1d6a0d3cf24f2edcf6755fd4db1901f9e1db1ac6)
2021-06-10 19:25:42 +02:00
Michael Weiss 06924553df
chromium: get-commit-message.py: Support a new 0-day sentence
The current stable release announcement [0] uses a slightly different
message/structure.

[0]: https://chromereleases.googleblog.com/2021/06/stable-channel-update-for-desktop.html

(cherry picked from commit c02ac479ba55d802d6232cdb743f5228984e2ff9)
2021-06-10 19:25:42 +02:00
Michael Weiss ede696c79d
chromium: 91.0.4472.77 -> 91.0.4472.101
https://chromereleases.googleblog.com/2021/06/stable-channel-update-for-desktop.html

This update includes 14 security fixes. Google is aware that an exploit
for CVE-2021-30551 exists in the wild.

CVEs:
CVE-2021-30544 CVE-2021-30545 CVE-2021-30546 CVE-2021-30547
CVE-2021-30548 CVE-2021-30549 CVE-2021-30550 CVE-2021-30551
CVE-2021-30552 CVE-2021-30553

(cherry picked from commit 053f1dc49028f8f438506b187739d80d83984c16)
2021-06-10 19:25:41 +02:00
Michael Weiss b6a71637a9
chromiumDev: Revert a patch to fix the build with LLVM 12
The build was failing with:
clang++: error: unknown argument: '-fsanitize-ignorelist=../../tools/cfi/ignores.txt'

(cherry picked from commit 950b321244d541e3c4d05bb163912d53c6c063df)
2021-06-10 19:25:41 +02:00
Michael Weiss 146ff19f4f
chromiumDev: 93.0.4530.5 -> 93.0.4535.3
(cherry picked from commit 5915f689b452816381e9f4e8d9cbf32ece20f467)
2021-06-10 19:25:40 +02:00
Michael Weiss c15df2350d
chromiumDev: 92.0.4515.40 -> 93.0.4530.5
(cherry picked from commit 2c9e2b68753d89764e7ad9a47374ad541130ba84)
2021-06-10 19:25:40 +02:00
Michael Weiss b60b15b410
chromiumBeta: 91.0.4472.77 -> 92.0.4515.40
(cherry picked from commit c6890330f5bb19cf561bf9e0dfc8119766be5aed)
2021-06-10 19:25:39 +02:00
Michael Weiss c92cc2463d
chromiumDev: 92.0.4515.20 -> 92.0.4515.40
(cherry picked from commit cf6496e72bb1c698c3a1516ab6b4ed0cde516cbc)
2021-06-10 19:25:39 +02:00
Michael Weiss ddde2dd1d2
chromiumDev: 92.0.4512.4 -> 92.0.4515.20
(cherry picked from commit 136addaa6e924e642669a925a323475a2d0c207e)
2021-06-10 19:25:38 +02:00