summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* hydra-unstable: 2021-05-03 -> 2021-08-11•••(cherry picked from commit 25722c43d12b2331676157ee5e9247f21c436000) origin/backport-132739-to-release-21.05happysalada2021-08-111-3/+3
* nixUnstable: 2.4pre20210707_02dd6bb -> 2.4pre20210802_47e96bb•••(cherry picked from commit f578589a2ba19a17f468dba84a7b2e14b91d3a6e) happysalada2021-08-111-3/+3
* clojure: fix clj script•••At some point the clj script stopped just calling clojure, but instead $bin_dir/clojure. As a result we now need to additionally substitute BINDIR in the clj script. sternenseemann2021-08-111-0/+1
* Merge pull request #133468 from rski/release-21.05•••CONTRIBUTING.md: Move to repo root, where it is more visible.Niklas Hambüchen2021-08-113-3/+3
|\
| * CONTRIBUTING.md: Move to repo root, where it is more visible.•••We found that many users found it difficult to locate this document. Github supports it in the root, see: https://docs.github.com/en/communities/setting-up-your-project-for-healthy-contributions/setting-guidelines-for-repository-contributors (cherry picked from commit 3c29ced243cc032806f680ae67845b9b3a879183) This fixes the links on the nixos.org website, the stable branch docs point to master on github, so both master and the release branch need to have the file in the same location. fixes https://github.com/NixOS/nixos-homepage/issues/736 Niklas Hambüchen2021-08-113-3/+3
|/
* Merge pull request #133390 from NixOS/backport-133388-to-release-21.05Martin Weinelt2021-08-101-0/+1
|\
| * nixos/tests: unbreak the tested job•••I expect it suffices that the channel only blocks on one firefox ESR test - the one for the default ESR. I didn't want to have the information about the default in two places, so either of the tests will be evaluated twice (but to the same *.drv I hope). (cherry picked from commit c0097aa84adb19a9e5d947487c118505faf98bc0) Vladimír Čunát2021-08-101-0/+1
|/
* Merge pull request #133367 from NixOS/backport-133216-to-release-21.05•••[Backport release-21.05] gpsd: 3.22 -> 3.23Martin Weinelt2021-08-101-23/+55
|\
| * gpsd: 3.22 -> 3.23•••Clean up unnecessary dependencies, update license. Add todo to generate asciidoctor documentation. (cherry picked from commit 65db4268d056afefac988705bae2f65651b1f7c2) R. RyanTM2021-08-101-23/+55
|/
* Merge #132834: go security bumps (into release-21.05)Vladimír Čunát2021-08-102-4/+4
|\
| * go_1_16: 1.16.6 -> 1.16.7•••(cherry picked from commit 869e4a894e7436441bdcb084846c60ae07a1dddd) zowoq2021-08-051-2/+2
| * go_1_15: 1.15.14 -> 1.15.15•••(cherry picked from commit 1d3f4cd77fd7ce68cc80f2dd33bd678a5633af93) zowoq2021-08-051-2/+2
* | Merge branch 'staging-next-21.05' into release-21.05•••https://hydra.nixos.org/eval/1694658 Vladimír Čunát2021-08-104-33/+62
|\ \
| * \ Merge staging-next-21.05 into staging-21.05github-actions[bot]2021-08-107-406/+452
| |\ \
| | * \ Merge release-21.05 into staging-next-21.05github-actions[bot]2021-08-107-406/+452
| | |\ \
| * | | | Merge staging-next-21.05 into staging-21.05github-actions[bot]2021-08-096-16/+157
| |\| | |
| | * | | Merge release-21.05 into staging-next-21.05github-actions[bot]2021-08-096-16/+157
| | |\ \ \
| * | | | | Merge staging-next-21.05 into staging-21.05github-actions[bot]2021-08-0910-34/+34
| |\| | | |
| | * | | | Merge release-21.05 into staging-next-21.05github-actions[bot]2021-08-0910-34/+34
| | |\ \ \ \
| * | | | | | Merge staging-next-21.05 into staging-21.05github-actions[bot]2021-08-0911-17/+308
| |\| | | | |
| | * | | | | Merge release-21.05 into staging-next-21.05github-actions[bot]2021-08-0911-17/+308
| | |\ \ \ \ \
| * | | | | | | Merge staging-next-21.05 into staging-21.05github-actions[bot]2021-08-082-2/+13
| |\| | | | | |
| | * | | | | | Merge release-21.05 into staging-next-21.05github-actions[bot]2021-08-082-2/+13
| | |\ \ \ \ \ \
| * | | | | | | | Merge staging-next-21.05 into staging-21.05github-actions[bot]2021-08-085-11/+68
| |\| | | | | | |
| | * | | | | | | Merge release-21.05 into staging-next-21.05github-actions[bot]2021-08-085-11/+68
| | |\ \ \ \ \ \ \
| * | | | | | | | | Merge staging-next-21.05 into staging-21.05github-actions[bot]2021-08-085-16/+83
| |\| | | | | | | |
| | * | | | | | | | Merge release-21.05 into staging-next-21.05github-actions[bot]2021-08-085-16/+83
| | |\ \ \ \ \ \ \ \
| * | | | | | | | | | Merge staging-next-21.05 into staging-21.05github-actions[bot]2021-08-082-6/+7
| |\| | | | | | | | |
| | * | | | | | | | | Merge release-21.05 into staging-next-21.05github-actions[bot]2021-08-082-6/+7
| | |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Merge staging-next-21.05 into staging-21.05github-actions[bot]2021-08-075-37/+43
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge release-21.05 into staging-next-21.05github-actions[bot]2021-08-075-37/+43
| | |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Merge staging-next-21.05 into staging-21.05github-actions[bot]2021-08-0757-710/+2045
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge release-21.05 into staging-next-21.05github-actions[bot]2021-08-0757-710/+2045
| | |\ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ Merge pull request #131730 from NixOS/backport-130851-to-staging-21.05•••[Backport staging-21.05] kernel: enable MOUSE_PS2_VMMOUSEArtturi2021-08-071-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | kernel: enable MOUSE_PS2_VMMOUSE•••Turns VMware guest mouse support on in the kernel. This is needed for running Wayland and non-root X in a VMWare guest. In a pre-Wayland world the `xf86-input-vmmouse` userspace driver would have handled this for us. This allows the mouse to properly work in a vmware guest (for example it can now leave the vmware window). See: https://github.com/vmware/open-vm-tools/issues/528 (cherry picked from commit 1207e7581f7bb863d0789c980930464d92d221cb) Jeremy Kolb2021-07-271-0/+1
| * | | | | | | | | | | | | | Merge staging-next-21.05 into staging-21.05github-actions[bot]2021-08-0621-100/+118
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge release-21.05 into staging-next-21.05github-actions[bot]2021-08-0621-100/+118
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #131806 from NixOS/backport-127832-to-staging-21.05Artturi2021-08-063-33/+61
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | poppler: 21.05.0 -> 21.06.1•••(cherry picked from commit 004970b1524ab59f791137e0954b43c2b65615bb) AndersonTorres2021-07-281-22/+23
| | * | | | | | | | | | | | | | | poppler_0_61: cosmetical rewrite 0.61.nix•••(cherry picked from commit a4e85ae2b88d29224bad8be685e6b366845a5257) AndersonTorres2021-07-281-10/+34
| | * | | | | | | | | | | | | | | poppler_utils: cosmetical rewrite all-packages.nix•••(cherry picked from commit 6943ac5dd761c1461438300743a153326caf3c97) AndersonTorres2021-07-281-1/+4
| * | | | | | | | | | | | | | | | Merge staging-next-21.05 into staging-21.05github-actions[bot]2021-08-066-13/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge release-21.05 into staging-next-21.05github-actions[bot]2021-08-066-13/+16
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Merge staging-next-21.05 into staging-21.05github-actions[bot]2021-08-061-2/+2
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge release-21.05 into staging-next-21.05github-actions[bot]2021-08-061-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Merge staging-next-21.05 into staging-21.05github-actions[bot]2021-08-065-34/+19
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge release-21.05 into staging-next-21.05github-actions[bot]2021-08-065-34/+19
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge staging-next-21.05 into staging-21.05github-actions[bot]2021-08-0512-34/+39
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge release-21.05 into staging-next-21.05github-actions[bot]2021-08-0512-34/+39
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Merge staging-next-21.05 into staging-21.05github-actions[bot]2021-08-051-1/+13
| |\| | | | | | | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.52.0) at 2026-01-17 03:09:58 +0000