summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* vocal: fix buildorigin/backport-125386-to-release-21.05fortuneteller2k2021-06-031-2/+13
| | | | | Co-authored-by: Sandro <sandro.jaeckel@gmail.com> (cherry picked from commit 01ef9faecb7e1be1f40f7aac4ebcefa4885d4652)
* nix: 2.3.11 -> 2.3.12Jonathan Ringer2021-06-031-2/+2
| | | | (cherry picked from commit ff50095bd4121f35e1ca73b4df68912db1bff2a4)
* nixUnstable: 2.4pre20210503_6d2553a -> 2.4pre20210601_5985b8b5Jonathan Ringer2021-06-031-10/+7
| | | | (cherry picked from commit f7fe3008d106b8b8834a4f64868ae386a9b26e08)
* iso-image: Improve disk detectionSamuel Dionne-Riel2021-06-031-1/+9
| | | | | | | | | | | | | | | | | | | | This should help in rare hardware-specific situations where the root is not automatically detected properly. We search using a marker file. This should help some weird UEFI setups where the root is set to `(hd0,msdos2)` by default. Defaulting to `(hd0)` by looking for the ESP **will break themeing**. It is unclear why, but files in `(hd0,msdos2)` are not all present as they should be. This also fixes an issue introduced with cb5c4fcd3c5d4070f040d591b2dd1da580f234d1 where rEFInd stopped booting in many cases. This is because it ended up using (hd0) rather than using the `search` which was happening beforehand, which in turn uses (hd0,msdos2), which is the ESP. Putting back the `search` here fixes that. (cherry picked from commit 20b023b5ea63a6513a4dce7f162736a00bce5cc8)
* iso-image: unqualified root → ($root)Samuel Dionne-Riel2021-06-031-6/+6
| | | | | | | | | This technically changes nothing. In practice `$root` is always the "CWD", whether searched for automatically or not. But this serves to announce we are relying on `$root`... I guess... (cherry picked from commit c9bb054dd68964b0eb9a38c51bdf824bfb212fc7)
* iso-image: change date on all filesSamuel Dionne-Riel2021-06-031-1/+3
| | | | | | | | It may be that in some conditions dates earlier than 1980 on FAT on GRUB 2.06~ish will cause failures https://github.com/NixOS/nixpkgs/issues/123376#issuecomment-845515035 (cherry picked from commit 15eaed0718515db3f2fa7d4ed71676e6069d3fb5)
* iso-image: Force gfxmodeSamuel Dionne-Riel2021-06-031-0/+13
| | | | | https://www.gnu.org/software/grub/manual/grub/html_node/gfxmode.html (cherry picked from commit f93f0e72e9ef423ed591951030f08cafd209e637)
* Merge pull request #125342 from NixOS/backport-125334-to-release-21.05Sandro2021-06-031-9/+9
|\ | | | | [Backport release-21.05] matterbridge: 1.12.1 -> 1.12.2
| * matterbridge: 1.12.1 -> 1.12.2origin/backport-125334-to-release-21.05legendofmiracles2021-06-021-9/+9
| | | | | | | | (cherry picked from commit a08f23039cf98d5b8648e2c3d6b872b348bac9d9)
* | Merge pull request #125475 from NixOS/backport-125372-to-release-21.05Domen Kožar2021-06-032-0/+23
|\ \ | | | | | | [Backport release-21.05] nixos/tests/test-driver: add shell_interact
| * | nixos/tests/test-driver: make it clear when shell is readyorigin/backport-125372-to-release-21.05Patrick Hilhorst2021-06-031-0/+1
| | | | | | | | | | | | | | | Co-authored-by: Domen Kožar <domen@enlambda.com> (cherry picked from commit fd739c4dee12fbe57199f73c44ec22db2355028e)
| * | nixos/tests/test-driver: mention drawbackPatrick Hilhorst2021-06-031-0/+1
| | | | | | | | | | | | (cherry picked from commit 287144273162acd869f514f7770a3daae4649d37)
| * | nixos/tests/test-driver: document shell_interactPatrick Hilhorst2021-06-032-1/+12
| | | | | | | | | | | | (cherry picked from commit 9469433e341f7337308468bb4b9ccfff84b2951b)
| * | nixos/tests/test-driver: add shell_interactPatrick Hilhorst2021-06-031-0/+10
|/ / | | | | | | (cherry picked from commit 5a589b5ba8941d734e9c3aebbf2be2f50d7c32a5)
* | blender: fix darwin buildDmitry Kalinkin2021-06-032-14/+9
| | | | | | | | (cherry picked from commit dca87350f4e00539e52731628b98cbcc15c4319a)
* | blender: 2.92.0 -> 2.93.0Jonas Carpay2021-06-031-9/+9
| | | | | | | | (cherry picked from commit ff60dfcc7f700a9f60c5ff3ebbcf61781c17671e)
* | redis: 6.2.3 -> 6.2.4 (#125444)github-actions[bot]2021-06-031-2/+2
| | | | | | | | | | | | https://github.com/redis/redis/releases/tag/6.2.4 (cherry picked from commit 8d34fb204ce256c124b35968f6bf3ee940bb36fc) Co-authored-by: Mario Rodas <marsam@users.noreply.github.com>
* | Merge pull request #125336 from NixOS/backport-125306-to-release-21.05Martin Weinelt2021-06-031-2/+2
|\ \ | | | | | | [Backport release-21.05] firefox-esr: 78.10.1esr -> 78.11.0esr
| * | firefox-esr: 78.10.1esr -> 78.11.0esrorigin/backport-125306-to-release-21.05Martin Weinelt2021-06-021-2/+2
| |/ | | | | | | | | | | https://www.mozilla.org/en-US/firefox/78.11.0/releasenotes/ https://www.mozilla.org/en-US/security/advisories/mfsa2021-24/ (cherry picked from commit f42ea75dec8fff9becbdf2094044485ec103dcd1)
* | Merge pull request #125406 from eduardosm/dr14_tmeteradisbladis2021-06-021-1/+1
|\ \ | | | | | | [21.05] dr14_tmeter: use ffmpeg 4
| * | dr14_tmeter: use ffmpeg 4Eduardo Sánchez Muñoz2021-06-021-1/+1
| | | | | | | | | | | | | | | | | | migrate away from ffmpeg_3 (https://github.com/NixOS/nixpkgs/issues/120705) (cherry picked from commit 0b32978596d24542e6561a31b5f134ddcc6b811c)
* | | Merge pull request #125433 from sternenseemann/greenclip-fixDennis Gosnell2021-06-033-14/+11
|\ \ \ | | | | | | | | [21.05] haskellPackages.greenclip: unbreak
| * | | haskellPackages.greenclip: unmark as brokensternenseemann2021-06-032-3/+0
| | | | | | | | | | | | | | | | libXScrnSaver is passed correctly now, so greenclip builds again.
| * | | hackage-packages.nix: Regenerate based on current configsternenseemann2021-06-031-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh Main point here is to apply the new cabal2nix-unstable generation with a libNixName entry for libXScrnSaver, so greenclip builds again.
| * | | haskellPackages.cabal2nix-unstable: update to latest version from github(cdep)illabout2021-06-031-3/+3
|/ / / | | | | | | | | | (cherry picked from commit 259177f1097be0f8de5969242e98f8e026df8037)
* | | Merge pull request #125425 from NixOS/backport-124407-to-release-21.05Maximilian Bosch2021-06-031-7/+7
|\ \ \ | | | | | | | | [Backport release-21.05] synapse: 1.34.0 -> 1.35.0
| * | | synapse: 1.34.0 -> 1.35.0Sumner Evans2021-06-021-7/+7
| |/ / | | | | | | | | | (cherry picked from commit c6a546e996d7dce5a688a6718ee7baeca694ddde)
* | | Merge pull request #125411 from NixOS/backport-125392-to-release-21.05Michele Guerini Rocco2021-06-021-0/+3
|\ \ \ | |/ / |/| | [Backport release-21.05] pdns-recursor: disable on i686-linux
| * | pdns-recursor: disable on i686-linuxorigin/backport-125392-to-release-21.05rnhmjoj2021-06-021-0/+3
|/ / | | | | | | | | | | | | Support for 32-bit platforms with no 64-bit time_t has ended. See https://mailman.powerdns.com/pipermail/pdns-users/2021-May/027220.html (cherry picked from commit cbfd8831a1082f6bea819f92c8bfd6ec688c9fc4)
* | Merge pull request #125341 from hercules-ci/backport-podman-improvementsRobert Hensing2021-06-0216-11/+552
|\ \ | | | | | | [Backport release-21.05] podman improvements
| * | nixos/podman-network-socket-ghostunnel: move condition to include socketzowoq2021-06-021-2/+2
| | | | | | | | | | | | (cherry picked from commit 72f54c32a6114a69caec30170a29837c91434aff)
| * | podman: Add nixosTests.podman-dnsname to testsRobert Hensing2021-06-021-1/+4
| | | | | | | | | | | | (cherry picked from commit 1d781e5c80d3c392933479a114e9e3857a1d9529)
| * | nixos/podman-dnsname: initRobert Hensing2021-06-025-0/+84
| | | | | | | | | | | | (cherry picked from commit 54f2f1e5f1c7fd34e564a84443e8490477e26eb7)
| * | nixos/podman: Add defaultNetwork.extraPluginsRobert Hensing2021-06-021-1/+22
| | | | | | | | | | | | (cherry picked from commit d81631fb98ea35b107d86f5de287cf727d0dfc18)
| * | nixos/containers: Add virtualisation.containers.containersConf.cniPluginsRobert Hensing2021-06-021-1/+21
| | | | | | | | | | | | (cherry picked from commit efba949352271ec77d9d5e7d54f2d16b9c53ee4f)
| * | dnsname-cni: Use wrapper instead of patch for dnsmasqRobert Hensing2021-06-022-24/+11
| | | | | | | | | | | | | | | | | | | | | The patch proved to be an incomplete solution while developing nixosTests.podman-dnsname (cherry picked from commit 651777934941480a36f7df9c434e6044957d045d)
| * | podman: Add iproute2, fixing docker network rmRobert Hensing2021-06-022-0/+3
| | | | | | | | | | | | (cherry picked from commit db31d8354d9c1988968f076c4e01843330162e03)
| * | nixos/podman-network-socket-ghostunnel: initRobert Hensing2021-06-025-1/+191
| | | | | | | | | | | | (cherry picked from commit b6570e723836167640c9b7efc63f327ff17b0755)
| * | nixos/podman: Add generic networkSocket interfaceRobert Hensing2021-06-022-0/+92
| | | | | | | | | | | | (cherry picked from commit 52844efcd67028a481a24103d8e93c7ef2bf4f08)
| * | nixos/podman: Add dockerSocket.enableRobert Hensing2021-06-022-2/+60
| | | | | | | | | | | | (cherry picked from commit ff4d83a66727ad13da0f51d00db4eda8a8c50590)
| * | nixos/podman: Change podman socket to new podman groupRobert Hensing2021-06-021-1/+12
| | | | | | | | | | | | (cherry picked from commit fb8b0a38433c8e83a53c1dc0a739c5a7ad64e2fc)
| * | nixos/podman: install cni config from packagezowoq2021-06-021-2/+2
| | | | | | | | | | | | (cherry picked from commit 30ae7e4ba983de461c7b71d02274d184ab55244d)
| * | podman: install cni configzowoq2021-06-022-0/+2
| | | | | | | | | | | | (cherry picked from commit fd59022ee9eb8d08b65df563c65e4218a68fca3c)
| * | podman: add systemd to rpathNick Cao2021-06-021-0/+5
| | | | | | | | | | | | (cherry picked from commit ada45ac3aee664265759611d09443d549250bd70)
| * | dnsname-cni: init at 1.1.1Mark Vainomaa2021-06-023-0/+53
| | | | | | | | | | | | (cherry picked from commit 5826e9020636c8ba3bc311294ce78b6466fd2b24)
| * | maintainers: add mikroskeemMark Vainomaa2021-06-021-0/+10
| | | | | | | | | | | | (cherry picked from commit f830b000fc8aafd14bf3151178919378584e87c9)
| * | docker: add clientOnly / docker-clientzowoq2021-06-022-4/+6
| |/ | | | | | | | | | | | | Currently the docker client is only available on non-linux platforms as `docker`, this makes the client available on linux and other platforms as `docker-client`. (cherry picked from commit 7233acd515546107e5902a8fef6832f4f319390c)
* | Merge pull request #125388 from NixOS/backport-125216-to-release-21.05Robert Hensing2021-06-021-1/+1
|\ \ | | | | | | [Backport release-21.05] dockerTools: Fix passthru image tag
| * | dockerTools: Fix passthru image tagorigin/backport-125216-to-release-21.05Robert Hensing2021-06-021-1/+1
|/ / | | | | | | | | | | | | | | It should match the actual image tag. This fixes the problem introduced in 00996b5e03f33bebafc2b17c41a175d3726a9bde https://github.com/NixOS/nixpkgs/pull/115491#pullrequestreview-672789901 (cherry picked from commit ff55c41facaa6812f9cc879a49f6929321881d4f)
* | Merge pull request #125368 from NixOS/backport-125289-to-release-21.05Michele Guerini Rocco2021-06-022-4/+5
|\ \ | | | | | | [Backport release-21.05] qutebrowser: 2.2.2 -> 2.2.3
generated by cgit v1.2.3 (git 2.52.0) at 2026-01-17 06:01:26 +0000