292961 Commits

Author SHA1 Message Date
sternenseemann
9a84eb7ec8 haskell.compiler.*: pull in unwrapped bintools for darwin
GHC calls otool on darwin which is contained in the
stdenv.cc.bintools.bintools derivation and thus needs adding to the
runtime PATH of GHC. Since this is toolchain specific technically, we
check for cctools instead of darwin (although I don't know if GHC
or nixpkgs work on macOS without cctools).

This fixes usage of GHC in an environment where otool is not available
and more specifically in stdenvNoCC which is used by writers.writeHaskell.
Resolves #123228.

(cherry picked from commit 118b28a127c79dbae8c513742fbb17f300407a4b)
2021-06-14 12:21:22 +02: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
bc3694b59c imagemagick: 7.0.11-14 -> 7.1.0-0
(cherry picked from commit 50967b77c0051ee7a5ca8d974d3cc43bf5069a5a)
2021-06-13 22:01:06 +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
Kerstin Humm
757e57a0a2 imagemagick: 7.0.11-13 -> 7.0.11-14
(cherry picked from commit 31a8c0e5c4d9f63a17054ea30d7b963c48f5790e)
2021-06-13 21:05:51 +02:00
Michael Livshin
37d81fb867 clang-tools: fix clangd
Whatever change has necessitated
https://github.com/NixOS/nixpkgs/pull/122044, it also broke clangd --
<clang-wrapper>/resource-root/include is no longer automagically
searched for includes, which kills pretty much any indexing since that
directory contains vital stuff like stddef.h etc.

Fix by appending the directory to CPATH & CPLUS_INCLUDE_PATH in the
clangd wrapper.

(cherry picked from commit 8e06a39574aeb6500ad233e3b529e0e43fb80788)
2021-06-13 17:57:42 +03: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
Elis Hirwing
7821201018
php.extensions.swoole: 4.6.4 -> 4.6.7
(cherry picked from commit 2fc95948446d0b3ef0284956fc62b9e968dc9376)
2021-06-13 12:24:35 +02:00
Elis Hirwing
2d08d4cfd0
php.extensions.maxminddb: 1.10.0 -> 1.10.1
(cherry picked from commit 9e12aefc411d846b1fe2d909dff08d28bf24b5ee)
2021-06-13 12:23:35 +02:00
Elis Hirwing
519f5b1887
php.extensions.event: 3.0.2 -> 3.0.4
(cherry picked from commit b169c6d5e8338b7d9ed4f2dc7bc83c7d5c184b7b)
2021-06-13 12:23:20 +02:00
Elis Hirwing
0c09dcb45f
php.extensions.ast: 1.0.10 -> 1.0.12
(cherry picked from commit c082df8e6284b668b2e19bb40e69d782f14afc7a)
2021-06-13 12:23:04 +02:00
Elis Hirwing
43a783ebdf
php.extensions.igbinary: 3.2.1 -> 3.2.2
(cherry picked from commit 8307e75f8056e72b89ee444bf20399982cbf3c76)
2021-06-13 12:22:41 +02:00
Elis Hirwing
417ee18054
php.extensions.mongodb: 1.9.0 -> 1.9.1
(cherry picked from commit 06ea32f7bf0153575fb03519c38a0bd9151c7e38)
2021-06-13 12:22:08 +02:00
Elis Hirwing
d1646f426f
php.extensions.pcov: 1.0.8 -> 1.0.9
(cherry picked from commit 8a5d4b63280a8e08589c676a108fe1fd64885c0a)
2021-06-13 12:21:33 +02:00
Elis Hirwing
64867ce1b9
php.extensions.protobuf: 3.14.0 -> 3.17.2
(cherry picked from commit c79d977ca15016d3aafab6633b178ad042e696c2)
2021-06-13 12:20:18 +02:00
Elis Hirwing
460f69e000
php.extensions.redis: 5.3.3 -> 5.3.4
(cherry picked from commit 867a4d38d709853595f8472179df5c781b5d3135)
2021-06-13 12:18:12 +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
Jörg Thalheim
21a1ba4fce dpdk-kmods: init at 2021-04-21
In the last release dpdk moved the uio_igb driver to a different package
Without it dpdk is not very useful.

(cherry picked from commit 0d2276ec343e8965c023eecc1780d3521276047f)
2021-06-13 09:40:56 +00:00
Elis Hirwing
9bb5ef1389
php.extensions.xdebug: 3.0.3 -> 3.0.4
(cherry picked from commit a4e774d3b066572b5e76055d04dd1e9ca5cee651)
2021-06-13 11:33:18 +02: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
d7dce44057 glibc: 2.32-46 -> 2.32-48
https://sourceware.org/bugzilla/show_bug.cgi?id=27896
https://nvd.nist.gov/vuln/detail/CVE-2021-33574
(cherry picked from commit e58564267b173d51157847eb5453bfa735268604)
2021-06-11 12:42:27 +00: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