Commit Graph

293915 Commits

Author SHA1 Message Date
David Arnold e07870c95e lib: fix functionArgs for functors
`functionArgs` should give valid results on
functions that have been identified with `lib.isFunction`
instead of erroring out.

(cherry picked from commit cf8e219b7e3c8933d6301175f2611990c5281ae9)
2021-08-03 22:07:22 +00:00
Guillaume Girol 2bd2119bf3
Merge pull request #131938 from chuahou/update-flameshot-backport-21.05
[21.05] Backport flameshot update from 0.9.0 -> 0.10.1
2021-08-03 21:46:40 +00:00
davidak 8d5fd4302f
Merge pull request #132577 from NixOS/backport-132575-to-release-21.05
[Backport release-21.05] restic: 0.12.0 -> 0.12.1
2021-08-03 21:36:07 +02:00
Serg Nesterov 5bdfd956f1 restic: 0.12.0 -> 0.12.1
(cherry picked from commit c69f341a0590f8d0e00a45672bb0cb1c7ea98b56)
2021-08-03 19:11:43 +00:00
github-actions[bot] a9e1012368
Merge staging-next-21.05 into staging-21.05 2021-08-03 18:02:54 +00:00
github-actions[bot] fa297ea736
Merge release-21.05 into staging-next-21.05 2021-08-03 18:02:18 +00:00
Artturin fbec1356fa perlPackages.PerlMagick: 7.0.10 -> 7.0.11-1
(cherry picked from commit 55692c5a0a65a18947431f323aad73baa53c824f)
2021-08-03 18:56:27 +02:00
Jörg Thalheim 51cfc3c6db
Merge pull request #132536 from NixOS/backport-129413-to-release-21.05
[Backport release-21.05] nixos/binfmt: run binfmt activation script after mounting /run
2021-08-03 17:35:01 +01:00
Silvan Mosberger 6f2e900e10
Merge pull request #132482 from Infinisil/vbox-size-backport
[backport] vbox-image: add new option to set free space in image
2021-08-03 17:38:11 +02:00
github-actions[bot] 98f5aba8cb
Merge staging-next-21.05 into staging-21.05 2021-08-03 12:03:48 +00:00
github-actions[bot] 0bbe89d8e6
Merge release-21.05 into staging-next-21.05 2021-08-03 12:03:04 +00:00
Kazutoshi Noguchi 3d3ced33c9 nixos/binfmt: run binfmt activation script after mounting /run
binfmt activation script creates /run/binfmt before mounting /run
when system activation.

To fix it I added dependency to specialfs to binfmt activation
script.

(cherry picked from commit bf227785854c9fd4a14c20db12dd6d3ebaf02981)
2021-08-03 11:24:05 +00:00
Maximilian Bosch 4feab93d28
Merge pull request #132462 from NixOS/backport-132438-to-release-21.05
[Backport release-21.05] element-{web,desktop}: 1.7.33 -> 1.7.34
2021-08-03 11:52:21 +02:00
Michael Weiss dc7227dbd8 chromium: 92.0.4515.107 -> 92.0.4515.131
https://chromereleases.googleblog.com/2021/08/the-stable-channel-has-been-updated-to.html

This update includes 10 security fixes.

CVEs:
CVE-2021-30590 CVE-2021-30591 CVE-2021-30592 CVE-2021-30593
CVE-2021-30594 CVE-2021-30596 CVE-2021-30597

(cherry picked from commit 7015db7881584aa264e5cd21df03429ce64b14d0)
2021-08-03 08:01:59 +00:00
Vladimír Čunát ebcb3fce2b
Merge #132501: knot-dns: disable tests broken on aarch64-darwin 2021-08-03 09:18:18 +02:00
Vladimír Čunát 2a18907734 knot-dns: disable tests broken on aarch64-darwin
Upstream is aware but they don't have a fix yet.
I'm not aware of NixPkgs being used for another platform
affected by this (e.g. ppc64le).

(cherry picked from commit 895ce97eeadded30c897022b1768b645df21501e)
2021-08-03 06:29:57 +00:00
github-actions[bot] cfd18a549e
Merge staging-next-21.05 into staging-21.05 2021-08-03 06:03:36 +00:00
github-actions[bot] dec47f5e9d
Merge release-21.05 into staging-next-21.05 2021-08-03 06:02:56 +00:00
davidak 8549835351
Merge pull request #125246 from NixOS/backport-123895-to-release-21.05
[Backport release-21.05] bazel_4: 4.0.0 -> 4.1.0
2021-08-03 06:51:54 +02:00
davidak 1fb9572267
Merge pull request #125221 from NixOS/backport-124404-to-release-21.05
[Backport release-21.05] Small option type adjustments
2021-08-03 06:33:12 +02:00
davidak 3682a03cc8
Merge pull request #126456 from fgaz/backport/21.05/shattered-pixel-dungeon/0.9.3
[backport 21.05] shattered-pixel-dungeon: 0.9.2 -> 0.9.3
2021-08-03 06:09:14 +02:00
Luke Granger-Brown 2194711ae0 nixos/virtualbox-image: cast baseImageFreeSpace into str
This fixes an evaluation error that's blocking the nixos-unstable
channel (#132328).

(cherry picked from commit b5fab53628e8f080bae24ea1396f72d9d21e1f9b)
2021-08-03 02:47:14 +02:00
lassulus a2a5df1e63 vbox-image: add new option to set free space in image
(cherry picked from commit a6700d75f38cda83367a8af84651a2a72ce0f3ef)
2021-08-03 02:45:28 +02:00
github-actions[bot] 8b5b236a70
Merge staging-next-21.05 into staging-21.05 2021-08-03 00:03:17 +00:00
github-actions[bot] 29bcf81336
Merge release-21.05 into staging-next-21.05 2021-08-03 00:02:37 +00:00
Maximilian Bosch b812e1f413
Merge pull request #132463 from NixOS/backport-131583-to-release-21.05
[Backport release-21.05] seahorse: add glib-networking for sync
2021-08-03 00:04:34 +02:00
Sebastian Sellmeier dd05346f79 seahorse: add glib-networking for sync
(cherry picked from commit 9f629693f349ec0064a67bfdbffdfd1e8f2fb08c)
2021-08-02 21:26:25 +00:00
Sumner Evans 5d16df2ab1 element-{web,desktop}: 1.7.33 -> 1.7.34
(cherry picked from commit d1ec2fae863e38de150626e3d5f1479032f48d33)
2021-08-02 21:24:50 +00:00
Maximilian Bosch bbd7696843
Merge pull request #132440 from NixOS/backport-132338-to-release-21.05
[Backport release-21.05] nixos/captive-browser: fix startup
2021-08-02 22:19:56 +02:00
Linus Heckemann c15e294a60
Merge pull request #132441 from Ma27/backport-captive-browser
[21.05] captive-browser: 2019-04-16 -> 2021-08-01
2021-08-02 20:55:55 +02:00
Maximilian Bosch 655cc5e747
captive-browser: 2019-04-16 -> 2021-08-01
Had to do this manually, because this `name`->`pname` "refactoring"
makes automated backports impossible.

Changes: 08450562e5...9c707dc32a
(cherry picked from commit bee0468d7ba37fffc19d509eaffdd49bf30ed9e1)
2021-08-02 20:31:44 +02:00
Maximilian Bosch 985d2d0dec nixos/captive-browser: fix startup
It seems as since Chromium 92, `chromium` crashes on startup if
`XDG_CONFIG_HOME` points to a read-only (store-)path.

(cherry picked from commit 8c35a69a6ea206204ddfd3116c4497020b9f2724)
2021-08-02 18:22:00 +00:00
github-actions[bot] 79348ac652
Merge staging-next-21.05 into staging-21.05 2021-08-02 18:03:06 +00:00
github-actions[bot] c7d12b8159
Merge release-21.05 into staging-next-21.05 2021-08-02 18:02:34 +00:00
Domen Kožar 39b51feb80
Merge pull request #132432 from NixOS/backport-132431-to-release-21.05
[Backport release-21.05] enableRedistributableFirmware: add rtw89-firmware
2021-08-02 18:46:49 +02:00
Domen Kožar 07255eea7b enableRedistributableFirmware: add rtw89-firmware
(cherry picked from commit 749620cd4f8001d1509c6af150814515003f3e72)
2021-08-02 15:56:36 +00:00
github-actions[bot] 16f1e824e8
Merge release-21.05 into staging-next-21.05 2021-08-02 12:02:41 +00:00
Jörg Thalheim 4280aed6fe
Merge pull request #132314 from NixOS/backport-132247-to-release-21.05
[Backport release-21.05] linux_zen: 5.13.5 -> 5.13.7
2021-08-02 12:16:20 +01:00
Robert Scott d4590d2100
Merge pull request #132276 from NixOS/backport-132099-to-release-21.05
[Backport release-21.05] python3Packages.tensorflow: add patch fixing NotImplementedError with numpy 1.20
2021-08-02 09:27:49 +01:00
davidak 74e2faf596
Merge pull request #127576 from NixOS/backport-127435-to-release-21.05
[Backport release-21.05] sweet: add gtk-engine-murrine
2021-08-02 08:39:10 +02:00
Maximilian Bosch c8d3bf8c02
Merge pull request #132336 from NixOS/backport-132235-to-release-21.05
[Backport release-21.05] epson-escpr2: 1.1.34 -> 1.1.38
2021-08-02 08:37:04 +02:00
github-actions[bot] 18fd910d83
Merge staging-next-21.05 into staging-21.05 2021-08-02 06:03:39 +00:00
github-actions[bot] e90ec145d2
Merge release-21.05 into staging-next-21.05 2021-08-02 06:03:06 +00:00
Jonathan Ringer 71e370e534 mill: 0.9.6 -> 0.9.9
Use the `${version}-assembly` artifact, which avoids
having to download it using the release script

(cherry picked from commit 74090eb68a2fd8e0a6ef0000f36a784ed2d27194)
2021-08-01 22:56:38 -07:00
davidak 59f8ccb41f
Merge pull request #131961 from NixOS/backport-131954-to-release-21.05
[Backport release-21.05] python3Packages.trezor: 0.12.2 -> 0.12.3
2021-08-02 06:53:03 +02:00
ajs124 e04ad378fd grub2: 2.06-rc1 -> 2.06
* GCC 10 support.
* clang 10 support.
* SBAT support.
* LUKS2 support.
* Drop small MBR gap support.
* Xen Security Modules (XSM/FLASK) support.
* The lockdown mechanism similar to the Linux kernel one.
* Disable the os-prober by default.
* Many backports of GRUB distros specific patches.
* BootHole and BootHole2 fixes.
* XFS bigtime support.
* ...and tons of other fixes and cleanups...

(cherry picked from commit 963b0a1dbf32b80eb6375973bff48af313c2a7c5)
2021-08-01 20:43:18 -07:00
github-actions[bot] abbdf9574b
Merge staging-next-21.05 into staging-21.05 2021-08-02 00:03:12 +00:00
github-actions[bot] bfed1c52a9
Merge release-21.05 into staging-next-21.05 2021-08-02 00:02:34 +00:00
Robert Hensing 60c4e61a61
Merge pull request #132363 from NixOS/backport-131814-to-release-21.05
[Backport release-21.05] nixos/nix-daemon: fix registry flake type
2021-08-02 01:49:18 +02:00
David Arnold a791442a31 nixos/nix-daemon: fix registry flake type
Before this commit, the `flake` option was typed with `types.unspecified`.

This type get's merged via [`mergeDefaultOption`](ebb592a04c/lib/options.nix (L119-L128)), which has a line
```nix
else if all isFunction list then x: mergeDefaultOption loc (map (f: f x) list)
```

`lib.isFunction` detects an attrs in the shape of `{__functor = ...}` as
a function and hence this line substitutes such attrs with a function
(f: f x).

If now, a flake input has a `__functor` as it's output, this will
coerce the once attrs to a function. This breaks a lot of things later
in the stack, for example a later `lib.filterAttrs seive <LAMBDA>` will
fail for obious reasons.

According to @infinisil, `types.unspecified` is due to deprecation. In
the meantime this PR provides a specific fix for the specific problem
discovered.

(cherry picked from commit ecae25c3ef137d972e909eb0e85960d90481789e)
2021-08-01 22:09:08 +00:00