public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
294,552 Commits 1 Branch 0 Tags 1.5 GiB
Commit Graph

294552 Commits

Author SHA1 Message Date
Graham Christensen 5d0154f812 nixos/make-zfs-image: init 
This is a private interface for internal NixOS  use. It is similar
to `make-disk-image` except it is much more opinionated about what
kind of disk image it'll make.

Specifically, it will always create *two* disks:

1. a `boot` disk formatted with FAT in a hybrid GPT mode.
2. a `root` disk which is completely owned by a single zpool.

The partitioning and FAT decisions should make the resulting images
bootable under EFI or BIOS, with systemd-boot or grub.

The root disk's zpools options are highly customizable, including
fully customizable datasets and their options.

Because the boot disk and partition are highly opinionated, it is
expected that the `boot` disk will be mounted at `/boot`. It is
always labeled ESP even on BIOS boot systems.

In order for the datasets to be mounted properly, the `datasets`
passed in to `make-zfs-image` are turned in to NixOS configuration
stored at /etc/nixos/configuration.nix inside the VM.
NOTE: The function accepts a system configuration in the `config`
argument. The *caller* must manually configure the system
in `config` to have each specified `dataset` be represented
by a corresponding `fileSystems` entry.

One way to test the resulting images is with qemu:

```sh
boot=$(find ./result/ -name '*.boot.*');
root=$(find ./result/ -name '*.root.*');

echo '`Ctrl-a h` to get help on the monitor';
echo '`Ctrl-a x` to exit';

qemu-kvm \
    -nographic \
    -cpu max \
    -m 16G \
    -drive file=$boot,snapshot=on,index=0,media=disk \
    -drive file=$root,snapshot=on,index=1,media=disk \
    -boot c \
    -net user \
    -net nic \
    -msg timestamp=on
```

(cherry picked from commit 076f6e2d948259e18ddac8e562c62b5b53de9fe6)
 2021-09-13 16:20:46 +00:00
ajs124 b3083bc693
Merge pull request #137629 from drupol/update/php-7.4.21-to-7.4.23-backport-to-release-21.05 
[Backport release-21.05] php74: 7.4.21 -> 7.4.23
 2021-09-13 17:06:43 +02:00
ajs124 9544502814
Merge pull request #137655 from talyz/backport-php-8.0.10 
[21.05] php80: 8.0.8 -> 8.0.10
 2021-09-13 17:05:59 +02:00
Maximilian Bosch 85cdc98680
php80: 8.0.8 -> 8.0.10 
ChangeLog: https://www.php.net/ChangeLog-8.php#8.0.10

(cherry picked from commit ab8017a2dd84af08ebfb4b9e43964013b3351f65)
 2021-09-13 16:09:39 +02:00
Maciej Krüger f35f8db4b8
Merge pull request #137648 from NixOS/backport-137642-to-release-21.05 
[Backport release-21.05] rPackages.RMySQL: fix package
 2021-09-13 15:11:19 +02:00
Maciej Krüger f5fb1a3080 rPackages.RMySQL: fix package 
(cherry picked from commit a286dc9ef2fcc0748796c460f4a3ca169801b160)
 2021-09-13 12:51:07 +00:00
Pol Dellaiera 72eba819ce php74: 7.4.21 -> 7.4.23 
(cherry picked from commit 3fbb55710d31b27c8fa5897e4e7714ea54ce06e5)
 2021-09-13 10:56:56 +02:00
Vladimír Čunát 9a3277af47
Merge #132287: jetty: 9.4.41.v20210516 -> 9.4.43.v20210629 
...into release-21.05
 2021-09-13 10:53:15 +02:00
Mario Rodas 53c72f9981
Merge pull request #137374 from risicle/ris-flask-restx-CVE-2021-32838 
[21.05] python38Packages.flask-restx: add patch for CVE-2021-32838
 2021-09-12 17:00:54 -05:00
Maximilian Bosch 042bd4f47b
nixos/kernel: add 5.14 to kernel test-suite 
Same as 2444c11431a37e04de025b63f6a12bdd05d2f4c1 on master.
 2021-09-12 23:15:14 +02:00
Maximilian Bosch 92109a3f58
Merge pull request #137554 from NixOS/backport-137132-to-release-21.05 
[Backport release-21.05] nixos/privacyidea: use `sudo(8)` that's configured via the module
 2021-09-12 22:54:39 +02:00
TredwellGit 0d85dce13f steam: fix steamwebhelper 
Fixes https://github.com/NixOS/nixpkgs/issues/137279 and https://github.com/ValveSoftware/steam-runtime/issues/462.

(cherry picked from commit 64c6851fd3acb13440bbffccf1fe386702725291)
 2021-09-12 12:13:37 -07:00
Maximilian Bosch 5a17bb5d2b nixos/privacyidea: use `sudo(8)` that's configured via the module 
(cherry picked from commit 69e75754d57b4c9785058d663daa3817745930aa)
 2021-09-12 18:13:58 +00:00
Maximilian Bosch cedaaad5f5
Merge pull request #137545 from NixOS/backport-135751-to-release-21.05 
[Backport release-21.05] nixos/promtail: Allow write access to positions file if not in CacheDirectory
 2021-09-12 18:56:08 +02:00
Maximilian Bosch bb1ccebd17
Merge pull request #137434 from NixOS/backport-137281-to-release-21.05 
[Backport release-21.05] Kernels 2021-09-10
 2021-09-12 18:22:24 +02:00
Maximilian Bosch ee5a613395
Merge pull request #137266 from NixOS/backport-137187-to-release-21.05 
[Backport release-21.05] Kernels 2021-09-09
 2021-09-12 18:21:53 +02:00
Zhaofeng Li f69c32ec21 nixos/promtail: Allow write access to positions file if not in CacheDirectory 
Because of `ProtectSystem=strict`, Promtail cannot write to the positions
file if it's not in its `CacheDirectory` (the default value).

(cherry picked from commit b6ad701a2c6bf619fa9418a8e27c4940ce921456)
 2021-09-12 16:21:38 +00:00
Maximilian Bosch 1c67ae83db
Merge pull request #137409 from NixOS/backport-136463-to-release-21.05 
[Backport release-21.05] nixUnstable: 2.4pre20210802_47e96bb -> 2.4pre20210908_3c56f62
 2021-09-12 18:20:13 +02:00
Maximilian Bosch bad0efd147
Merge pull request #137524 from NixOS/backport-137510-to-release-21.05 
[Backport release-21.05] wiki-js: 2.5.201 -> 2.5.214
 2021-09-12 18:19:27 +02:00
Vladimír Čunát e85f0175e3
Merge #137522: qt514.qt3d: fix upstream URL (into release-21.05) 2021-09-12 15:14:23 +02:00
Maximilian Bosch caef9da135 wiki-js: 2.5.201 -> 2.5.214 
ChangeLog: https://github.com/Requarks/wiki/releases/tag/2.5.214
(cherry picked from commit 75eaccdcbc79f908902638bbea4aef33ebdad712)
 2021-09-12 12:51:18 +00:00
Sergei Trofimovich ad6e478766 qt514.qt3d: fix upstream URL 
hydra can't build qt514.qt3d binary as it fails to fetch the tarball
from outdated source from:
    https://download.qt.io/official_releases/qt/
as it only contains `5.12`, `5.15`, `6.0` and `6.2`.

`/archive` still has the releases:
    https://download.qt.io/archive/qt/5.14/5.14.2/submodules/

Let's use those instead.

(cherry picked from commit 042119cadebeea9034aa517b46d8ef4fd359a087)
 2021-09-12 12:48:55 +00:00
Vladimír Čunát f9aaed3713
Merge #137298: thunderbird-bin: 91.0.3 -> 91.1.0 (into release-21.05) 2021-09-12 10:50:41 +02:00
Pavol Rusnak a414ce0044
Merge pull request #136676 from prusnak/electron-21.05 
[21.05] Electron updates
 2021-09-12 10:13:03 +02:00
Tim Steinbach 075f639909 linux/hardened/patches/5.14: init at 5.14.2-hardened1 
(cherry picked from commit 820d68d2dc5eacc10f199f7903301ee577f44a52)
 2021-09-11 20:33:43 +00:00
Tim Steinbach 1309fb071c linux/hardened/patches/5.13: 5.13.14-hardened1 -> 5.13.15-hardened1 
(cherry picked from commit 02b5c3b291cbf69867122862debca8521388ad39)
 2021-09-11 20:33:43 +00:00
Tim Steinbach d9f651a0d2 linux/hardened/patches/5.10: 5.10.62-hardened1 -> 5.10.63-hardened1 
(cherry picked from commit 3fe64b3728a4beeaa53542375d1d7793517baab1)
 2021-09-11 20:33:42 +00:00
Artturi 05d063d9e6
Merge pull request #137414 from Artturin/backport-129273-to-release-21.05 2021-09-11 22:47:27 +03:00
Guillaume Girol 63118e3dc5
Merge pull request #129454 from OPNA2608/update/openmpt123-0.5.10/21.05 
[21.05] openmpt123: 0.5.8 -> 0.5.11
 2021-09-11 18:12:26 +00:00
Bernardo Meurer ff224c89bd firefox: increase silent timeout to 14400s (4h) 
Fixes: #129115
Replaces: #129212
(cherry picked from commit 919e2a98ac1090be9be5ed673bc5c402f347bae7)
 2021-09-11 20:59:21 +03:00
Maximilian Bosch 21c1c063da nixUnstable: 2.4pre20210802_47e96bb -> 2.4pre20210908_3c56f62 
Main motivation for is the bugfix regarding flake-follows and
path-inputs[1]. An overview over all changes - mostly bugfixes -
can be found on GitHub[2].

[1] https://github.com/NixOS/nix/pull/4641
[2] 47e96bb...3c56f62093

(cherry picked from commit 04b552c32312e8067ab5e3948513ce4624f35c4d)
 2021-09-11 17:07:42 +00:00
Bernardo Meurer f661394e53
Merge pull request #137229 from nh2/thunderbird-CVE-2021-38495-21.05 
[21.05] thunderbird: Update to fix CVE-2021-38495
 2021-09-11 17:06:20 +00:00
Robert Scott fbef3e574e python38Packages.flask-restx: add patch for CVE-2021-32838 2021-09-11 13:35:56 +01:00
OPNA2608 7c42b2adae openmpt123: 0.5.10 -> 0.5.11 
(cherry picked from commit 68178096c65de75036508e47b965043bed33d4a1)

Excluding treewide renaming of this package.
 2021-09-10 21:05:32 +02:00
Shamrock Lee 8abb3e29d4 [21.05] thunderbird-bin: 91.0.3 -> 91.1.0 
Backport from #137175

Use release-source.nix changed in commit
706f6c57be606a5676ea3e5193e671d36182c47a

High-security fixes
 2021-09-11 00:44:50 +08:00
Tim Steinbach a79fc9eb07 linux: 5.14.1 -> 5.14.2 
(cherry picked from commit af1cc206a2018de2022a15166f06d8f3948d8456)
 2021-09-10 12:05:22 +00:00
Tim Steinbach 582f4b93ef linux: 5.13.14 -> 5.13.15 
(cherry picked from commit 1caac87c555b9a623dba47d621a7d8c8dae609a4)
 2021-09-10 12:05:21 +00:00
Tim Steinbach 3fef4a375d linux: 5.10.62 -> 5.10.63 
(cherry picked from commit 2262394b585370bfa87c70580f68dd16d33b4436)
 2021-09-10 12:05:20 +00:00
Martin Weinelt 8b0b81dab1 nss_latest: 3.68 -> 3.70 2021-09-10 08:00:45 -04:00
Martin Weinelt cfeb077a73 firefox-78-esr: 78.13.1esr -> 78.14.0esr 
(cherry picked from commit d11cd01ad148d61d9ad364ac8d488b3eb8d75030)
 2021-09-10 08:00:45 -04:00
Martin Weinelt c1f2adc76f firefox-91-esr: 91.0.1esr -> 91.1.0esr 
(cherry picked from commit b31a7ba0029e6aac3ff6cf9b94df3e61a9ef4cf4)
 2021-09-10 08:00:45 -04:00
Tim Steinbach c810cc5632 firefox-unwrapped: 91.0.2 -> 92.0 
(cherry picked from commit 21c5ff7850dfbaa002f47297960436cb98cf8dc1)
 2021-09-10 08:00:45 -04:00
Martin Weinelt 528d6e2b8b
Merge pull request #137208 from vcunat/p/knot-dns_bump 
[21.05] knot-dns: 3.0.8 -> 3.0.9
 2021-09-10 13:50:18 +02:00
Jörg Thalheim bf6c393ba4 clang-tools: fix missing extra tools 
fixes https://github.com/NixOS/nixpkgs/issues/128909

(cherry picked from commit f69522b22745fcb808835a1f4c25d533bc46943d)
 2021-09-10 13:05:38 +02:00
Michael Weiss bde61d72f0
Merge pull request #137231 from NixOS/backport-137227-to-release-21.05 
[Backport release-21.05] signal-desktop: 5.16.0 -> 5.17.0
 2021-09-10 11:04:53 +02:00
Michael Weiss b374471c04 signal-desktop: 5.16.0 -> 5.17.0 
(cherry picked from commit 894ff4f2e471f91de7ac54e432e9c9cbcb1830ec)
 2021-09-09 21:33:44 +00:00
Niklas Hambüchen de1ff3208f thunderbird-78: 78.13.0 -> 78.14.0 
Fixes CVE-2021-38495:

https://www.mozilla.org/en-US/security/advisories/mfsa2021-41/#CVE-2021-38495
 2021-09-09 22:56:08 +02:00
Niklas Hambüchen 2bb004dde3 thunderbird-91: 91.0.3 -> 91.1.0 
Fixes CVE-2021-38495:

https://www.mozilla.org/en-US/security/advisories/mfsa2021-41/#CVE-2021-38495
 2021-09-09 22:56:08 +02:00
Vladimír Čunát 7e6d1241ef
knot-dns: 3.0.8 -> 3.0.9 
(NixPkgs master is on 3.1.x already.)
https://gitlab.nic.cz/knot/knot-dns/-/tags/v3.0.9
 2021-09-09 19:59:55 +02:00
Maximilian Bosch 276671abd1
Merge pull request #137130 from herrwiese/backport-135335-to-release-21.05 
[backport release-21.05] grocy: 3.1.0 -> 3.1.1
 2021-09-08 23:15:38 +02:00