summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* vscodium: 1.60.0 -> 1.60.1•••(cherry picked from commit 6ddc49fac23d751094405a45db810daf2f65a5bf) origin/backport-138003-to-release-21.05nixpkgs-upkeep-bot2021-09-161-5/+5
* Merge pull request #137439 from NixOS/backport-137328-to-release-21.05Patrick Hilhorst2021-09-161-5/+5
|\
| * vscodium: 1.59.1 -> 1.60.0•••(cherry picked from commit 93fea775e17c1266d0ff592dc63e0bfdc252be6c) origin/backport-137328-to-release-21.05nixpkgs-upkeep-bot2021-09-111-5/+5
* | Merge pull request #137984 from NixOS/backport-137673-to-release-21.05•••[Backport release-21.05] github-runner: 2.281.1 -> 2.282.0, prevent self-updateJörg Thalheim2021-09-153-31/+34
|\ \
| * | github-runner: 2.281.1 -> 2.282.0•••(cherry picked from commit cd641476cfcf8d5494e661debac9a3fe40f4cf32) Vincent Haupert2021-09-151-2/+2
| * | github-runner: prevent self-updates•••As of yet, a patch caused the runner to discard update messages. Unfortunately, GitHub keeps sending update messages to outdated runners causing them to no longer pick up jobs. This commit causes the runner to send a high version to GitHub which should be more recent for quite a time. That way, GitHub does not send update message and keeps scheduling jobs even for outdated runners. Naturally, an oudated runner can still break at any time as GitHub's current approach assumes that all runners are always up-to-date. We should still strive for quick nixpkgs updates but this patch should give us some time. (cherry picked from commit e8bbcc79fd07014b146835dfd7f5eba2079d9a55) Vincent Haupert2021-09-153-26/+28
| * | github-runner: use dummy SHA-1 as `GitInfoCommitHash`•••The runner only references `GitInfoCommitHash`/`CommitHash` to print informational log entries. To allow for just referencing the tag of a version instead of the commit hash, this commit sets the value of the `GitInfoCommitHash` to a static dummy value. (cherry picked from commit cc5c902fdf94b798c3b68e55ebb7e1a1185113a1) Vincent Haupert2021-09-151-3/+4
|/ /
* | Merge pull request #137162 from NixOS/backport-136988-to-release-21.05•••[Backport release-21.05] github-runner: 2.279.0 -> 2.281.1Jörg Thalheim2021-09-151-52/+53
|\ \
| * | github-runner: adapt to latest lttng-ust•••ref: ab2501bd171f2c930ebd3f3bf6b6a1a228477a08 (cherry picked from commit 1614fc6eb63d012b704cbb34b9c53c823d51c32c) origin/backport-136988-to-release-21.05Vincent Haupert2021-09-091-0/+4
| * | github-runner: 2.279.0 -> 2.281.1•••(cherry picked from commit ebcf2468ac67b473821946a6d5539c001861b465) Vincent Haupert2021-09-091-3/+3
| * | github-runner: make derivation easier to override•••(cherry picked from commit 0d1e42786e6bc5249248e50793f9f8537aaad857) Vincent Haupert2021-09-091-50/+47
* | | Merge pull request #137889 from NixOS/backport-137759-to-release-21.05•••[Backport release-21.05] signal-desktop: 5.17.0 -> 5.17.1Michael Weiss2021-09-151-2/+2
|\ \ \
| * | | signal-desktop: 5.17.0 -> 5.17.1•••(cherry picked from commit e3c0374da4ff8c9a0ad65a429c6ab030e4ae8cc3) R. RyanTM2021-09-141-2/+2
* | | | Merge branch 'staging-next-21.05' into release-21.05Vladimír Čunát2021-09-1422-53/+102
|\ \ \ \ | |/ / / |/| | |
| * | | Merge release-21.05 into staging-next-21.05github-actions[bot]2021-09-144-6/+23
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #137311 from symphorien/evolution-stable-update•••[21.05] evolution, evolution-ews, evolution-data-server: backport patch release bumpsGuillaume Girol2021-09-143-6/+6
|\ \ \ \
| * | | | evolution-data-server: 3.40.3 -> 3.40.4Ilan Joselevich2021-09-091-2/+2
| * | | | evolution-data-server: 3.40.2 -> 3.40.3R. RyanTM2021-09-091-2/+2
| * | | | evolution-ews: 3.40.1 -> 3.40.3R. RyanTM2021-09-091-2/+2
| * | | | evolution: 3.40.1 -> 3.40.3R. RyanTM2021-09-091-2/+2
* | | | | Merge pull request #137683 from NixOS/backport-137671-to-release-21.05•••[Backport release-21.05] firefox-unwrapped: workaround issues on non-Gnome wayland WM's on FF 92Bernardo Meurer2021-09-141-0/+17
|\ \ \ \ \
| * | | | | firefox-unwrapped: workaround issues on non-Gnome wayland WM's on FF 92•••Closes: #137649 (cherry picked from commit dfccb3045e76872eda32cdfa338dbe6aae8ccfcb) Bernardo Meurer2021-09-131-0/+17
| | | * | | Merge release-21.05 into staging-next-21.05github-actions[bot]2021-09-141-1/+8
| | | |\ \ \ | |_|_|/ / / |/| | | | |
* | | | | | element-desktop: apply patch to run on Wayland (#137666)•••See upstream PR#261[1] for further reference. Previously, the `enable-features`-setting was entirely discarded due to an earlier regression resulting in an attempt to start `element-desktop` in Wayland-mode without all necessary components. Closes #137377 [1] https://github.com/vector-im/element-desktop/pull/261 (cherry picked from commit 5a0d0ec1cf90aae4354a97a2afaff079605ffc82) Maximilian Bosch2021-09-141-1/+8
| | | * | | Merge release-21.05 into staging-next-21.05github-actions[bot]2021-09-142-13/+58
| | | |\ \ \ | |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #137428 from risicle/ris-flask-appbuilder-3.3.2-r21.05•••[21.05] python3Packages.flask-appbuilder: 3.3.0 -> 3.3.2Robert Scott2021-09-142-13/+58
|\ \ \ \ \ \
| * | | | | | python3Packages.flask-appbuilder: 3.3.1 -> 3.3.2•••(cherry picked from commit 3f795e071dd0e368f09c308248743653c9bb5903) Robert Scott2021-09-111-2/+2
| * | | | | | python3Packages.flask-appbuilder: 3.3.0 -> 3.3.1•••(cherry picked from commit a3510b8eb61e47b4162caef64b84c0bba9c19e51) Ivan Tkachev2021-09-112-13/+58
| | | | * | | Merge release-21.05 into staging-next-21.05github-actions[bot]2021-09-147-29/+609
| | | | |\ \ \ | |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge pull request #137665 from NixOS/backport-106574-to-release-21.05•••[Backport release-21.05] nixos/amazonImageZfs: initTimothy DeHerrera2021-09-136-28/+510
|\ \ \ \ \ \ \
| * | | | | | | amazon images: extend the image-info.json to have a disks object•••Having a disks object with a dictionary of all the disks and their properties makes it easier to process multi-disk images. Note the rename of `label` to `system_label` is because `$label`i is something of a special token to jq. (cherry picked from commit 71b3d18181974523ef7264106a4bf213a3103439) Graham Christensen2021-09-131-6/+18
| * | | | | | | NixOS/amazonImageZfs: init•••Introduce an AWS EC2 AMI which supports aarch64 and x86_64 with a ZFS root. This uses `make-zfs-image` which implies two EBS volumes are needed inside EC2, one for boot, one for root. It should not matter which is identified `xvda` and which is `xvdb`, though I have always uploaded `boot` as `xvda`. (cherry picked from commit bd38b059eae05871579b2dfd51cd41d058b6a1ec) Graham Christensen2021-09-135-28/+165
| * | | | | | | 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) Graham Christensen2021-09-131-0/+333
* | | | | | | | Merge pull request #137676 from NixOS/backport-135568-to-release-21.05•••[Backport release-21.05] ZFS: expand on bootTimothy DeHerrera2021-09-131-1/+99
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | services.zfs.expandOnBoot: support expanding pools on boot•••Either enumerating a list of pools to expand or expanding all pools on boot. (cherry picked from commit 4bb4bcc30c7f481581ef462ed7b1dcca71693717) Your Name2021-09-131-1/+99
|/ / / / / / /
| | | | * | | Merge release-21.05 into staging-next-21.05github-actions[bot]2021-09-136-10/+12
| | | | |\ \ \ | |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge pull request #137663 from NixOS/backport-137645-to-release-21.05•••[Backport release-21.05] element-{web,desktop}: 1.8.2 -> 1.8.4Maximilian Bosch2021-09-133-5/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | element-desktop: 1.8.2 -> 1.8.4•••ChangeLog: https://github.com/vector-im/element-desktop/releases/tag/v1.8.4 (cherry picked from commit c81983ec9f228b9b1405f492429a33cb3976201b) Maximilian Bosch2021-09-132-3/+3
| * | | | | | element-web: 1.8.2 -> 1.8.4•••ChangeLog: https://github.com/vector-im/element-web/releases/tag/v1.8.4 (cherry picked from commit 55d25c13bda5daa4f83f6c1965e4a263a3a84d74) Maximilian Bosch2021-09-131-2/+2
|/ / / / / /
* | | | | | Merge pull request #137629 from drupol/update/php-7.4.21-to-7.4.23-backport-t...•••[Backport release-21.05] php74: 7.4.21 -> 7.4.23ajs1242021-09-131-2/+2
|\ \ \ \ \ \
| * | | | | | php74: 7.4.21 -> 7.4.23•••(cherry picked from commit 3fbb55710d31b27c8fa5897e4e7714ea54ce06e5) Pol Dellaiera2021-09-131-2/+2
* | | | | | | Merge pull request #137655 from talyz/backport-php-8.0.10•••[21.05] php80: 8.0.8 -> 8.0.10ajs1242021-09-131-2/+2
|\ \ \ \ \ \ \
| * | | | | | | php80: 8.0.8 -> 8.0.10•••ChangeLog: https://www.php.net/ChangeLog-8.php#8.0.10 (cherry picked from commit ab8017a2dd84af08ebfb4b9e43964013b3351f65) Maximilian Bosch2021-09-131-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #137648 from NixOS/backport-137642-to-release-21.05•••[Backport release-21.05] rPackages.RMySQL: fix packageMaciej Krüger2021-09-131-1/+3
|\ \ \ \ \ \ \
| * | | | | | | rPackages.RMySQL: fix package•••(cherry picked from commit a286dc9ef2fcc0748796c460f4a3ca169801b160) Maciej Krüger2021-09-131-1/+3
|/ / / / / / /
| | | | * | | Merge release-21.05 into staging-next-21.05github-actions[bot]2021-09-131-2/+2
| | | | |\ \ \ | |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge #132287: jetty: 9.4.41.v20210516 -> 9.4.43.v20210629•••...into release-21.05 Vladimír Čunát2021-09-131-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | jetty: 9.4.41.v20210516 -> 9.4.43.v20210629•••Closes #132133 R. RyanTM2021-08-011-2/+2
| | | | * | | Merge #137572: Kernels 2021-09-12 (into staging-21.05)Vladimír Čunát2021-09-135-10/+10
| | | | |\ \ \
| | | | | * | | linux-rt_5_4: 5.4.143-rt63 -> 5.4.143-rt64•••(cherry picked from commit 5698fc0dfc669166371b07a12ed6908696b2776c) TredwellGit2021-09-121-2/+2
generated by cgit v1.2.3 (git 2.52.0) at 2026-01-17 03:07:55 +0000