Samuel Gräfenstein
044a0d06c7
nixos-rebuild: fix creating ./result symlink for flakes
...
(cherry picked from commit 531dc2e0f12673cce9cc6ea3dc5fd8bfef39c9bf)
2021-06-15 15:21:24 +00:00
Kim Lindberger
34b9ccb9c8
Merge pull request #126956 from NixOS/backport-126892-to-release-21.05
...
[Backport release-21.05] gitlab: 13.12.3 -> 13.12.4
2021-06-15 17:10:34 +02:00
Milan Pässler
bcdb378e19
gitlab: 13.12.3 -> 13.12.4
...
https://about.gitlab.com/releases/2021/06/14/gitlab-13-12-4-released/
(cherry picked from commit 5c04139da22d64f59b0f97a7672d875d82bdb7a5)
2021-06-15 14:55:09 +00:00
Martin Weinelt
7d3289094d
Merge pull request #126948 from stigtsp/package/convos-6.24-backport-21.05
2021-06-15 16:24:32 +02:00
github-actions[bot]
fe67150321
prometheus-node-exporter: fix version info ( #126722 )
...
Closes #126359
(cherry picked from commit ad5830098f6add9a4fae2b0fe01afcd374292eaa)
Co-authored-by: Maximilian Bosch <maximilian@mbosch.me>
2021-06-15 10:12:28 -04:00
Stig Palmquist
f13ce435a4
convos: 6.11 -> 6.24
...
(cherry picked from commit 09b17967b3b59bd2dffa3cbf76092aa88e112abc)
2021-06-15 15:46:41 +02:00
Stig Palmquist
b0b44c1c1d
perlPackages.MojoliciousPluginWebpack: 0.14 -> 1.01
...
(cherry picked from commit f09f0be1834c14bc1b7dbffeacf20d3801267741)
2021-06-15 15:46:30 +02:00
Sandro
856dc82a7f
Merge pull request #126654 from drupol/feature/add-symfony-cli-backport
2021-06-15 15:02:46 +02:00
Domen Kožar
6c784b44c7
Merge pull request #126852 from NixOS/backport-126844-to-release-21.05
...
[Backport release-21.05] openssl: fix Darwin cross infinite recursion
2021-06-15 12:00:16 +02:00
Maximilian Bosch
8db24dec53
Merge pull request #126827 from NixOS/backport-126789-to-release-21.05
...
[Backport release-21.05] linuxPackages_5_4.wireguard: 1.0.20210424 -> 1.0.20210606
2021-06-14 23:04:59 +02:00
Simon Thoby
9d0a88e91f
nixos/services/torrent/transmission.nix: add the web UI files to apparmor allowed paths
...
(cherry picked from commit f02264af8244de928c9c72bba3bbd35d2ccb0de4)
2021-06-14 22:22:14 +02:00
Alyssa Ross
cc7a4e5312
openssl: fix Darwin cross infinite recursion
...
stdenv depends on openssl, and isGNU depends on stdenv.
Thanks-to: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Fixes: https://github.com/NixOS/nixpkgs/issues/126829
(cherry picked from commit 502de3c377ec6a20673c395062b484a1a99c21fd)
2021-06-14 17:06:34 +00:00
Kim Lindberger
32d2d13094
Merge pull request #126824 from NixOS/backport-126812-to-release-21.05
...
[Backport release-21.05] gitlab: 13.12.2 -> 13.12.3
2021-06-14 15:55:34 +02:00
Pol Dellaiera
b2ecbc070f
maintainers: add drupol
...
(cherry picked from commit 4e1dcacc306a1b2a3a2bfa38717b8fd0b3576a3f)
2021-06-14 14:38:22 +02:00
Pol Dellaiera
e4fe0a62ae
symfony-cli: init at 4.25.2
...
(cherry picked from commit f1bbe0c2cacba75b96311ea0ffea8cd1222ed1ed)
2021-06-14 14:38:14 +02:00
Maximilian Bosch
3437fe775d
linuxPackages_5_4.wireguard: 1.0.20210424 -> 1.0.20210606
...
ChangeLog: https://lists.zx2c4.com/pipermail/wireguard/2021-June/006781.html
(cherry picked from commit 96c89ab82ab2e3c14bd3d23cb22ae2c591b92f1c)
2021-06-14 11:53:30 +00:00
Milan Pässler
852f6f8f7d
gitlab: 13.12.2 -> 13.12.3
...
(cherry picked from commit d62aac819bc3140514098f646cdca8999938b194)
2021-06-14 11:34:13 +00:00
Vladimír Čunát
3988964387
sqlite tools: fix download hash after update
...
Clearly a copy&paste error in commit 14a274763e. Now it builds.
(cherry picked from commit 34c88a4d5c6e530ac2516b8e54b016696fd8995e)
2021-06-14 08:30:53 +02:00
Artturin
641efce99b
nvidia-optical-flow-sdk: 1.0 -> 2.0
...
(cherry picked from commit 04e8ab8fdf8c8009741a8ebb26e4cd8e2cb6bd61)
2021-06-13 23:04:23 -07:00
Artturin
13d6008df1
opencv: update cuda_opt_flow.patch
...
(cherry picked from commit e3ec283df10cbe5e87c240d28afd81c72f8226b2)
2021-06-13 23:04:23 -07:00
Vincent Laporte
162c4e4e16
ocamlPackages.ppx_import: disable checks
...
(cherry picked from commit ecf820740a0b576361dac53778a4e6e2e6338287)
2021-06-14 03:52:03 +02:00
Maximilian Bosch
93963c27b9
Merge pull request #126502 from NixOS/backport-126468-to-release-21.05
...
[Backport release-21.05] tmux: 3.2 -> 3.2a
2021-06-13 22:45:38 +02:00
Robert Schütz
f822238b76
imagemagick6: 6.9.12-14 -> 6.9.12-15
...
(cherry picked from commit 929ddc6fa567c99bfaeada7927f6e52ef4de5025)
2021-06-13 21:16:16 +02:00
Vladimír Čunát
c15b784d29
Merge branch 'staging-next-21.05' into release-21.05
...
PR #126251 . I think it's high time. Hydra's eval
https://hydra.nixos.org/eval/1677846
isn't perfect yet, but there doesn't seem to be anything really risky.
2021-06-13 21:12:02 +02:00
Michael Weiss
e7c31a0eae
Merge pull request #126740 from NixOS/backport-126662-to-release-21.05
...
[Backport release-21.05] ungoogled-chromium: 91.0.4472.77 -> 91.0.4472.101
2021-06-13 13:52:50 +02:00
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
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
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
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
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