summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | python3Packages.adblock: fix build on DarwinRobert Schütz2021-06-021-2/+3
| | | | | | | | | | | | (cherry picked from commit 9f9de0069cf323533375286468e44f134c117234)
| * | qutebrowser: 2.2.2 -> 2.2.3Robert Schütz2021-06-021-2/+2
| | | | | | | | | | | | | | | https://github.com/qutebrowser/qutebrowser/releases/tag/v2.2.3 (cherry picked from commit 29043644b0119bd3c5e695fb90ea5e52b4656045)
* | | Merge branch 'staging-21.05' into release-21.05Vladimír Čunát2021-06-021-0/+13
|\ \ \ | |/ / |/| | | | | | | | It's a bit older version of the branch, as it has binaries from https://hydra.nixos.org/eval/1674261
| * | Merge branch 'release-21.05' into staging-21.05Vladimír Čunát2021-05-30146-3422/+2543
| |\ \
| * | | lz4: patch CVE-2021-3520 and null pointer dereferenceTredwellGit2021-05-301-0/+13
| | | | | | | | | | | | | | | | (cherry picked from commit 2acd087dca93a3b589721b3ec32d13d9150684bb)
* | | | beam-packages: drop erlang R18 R19 R20 and cuterThomas Depierre2021-06-029-165/+14
| | | | | | | | | | | | | | | | (cherry picked from commit f55c3e2f21073be564fed477847ad5bd649c9fb9)
* | | | Merge pull request #125343 from NixOS/backport-124891-to-release-21.05Michele Guerini Rocco2021-06-022-1/+32
|\ \ \ \ | | | | | | | | | | [Backport release-21.05] antimony: add desktop item
| * | | | antimony: add desktop itemorigin/backport-124891-to-release-21.05cwyc2021-06-022-1/+32
| | |_|/ | |/| | | | | | | | | | (cherry picked from commit b80463f8d574bb4efff0392c94d63021c63916b9)
* | | | Merge pull request #125338 from NixOS/backport-124494-to-release-21.05Robert Hensing2021-06-023-2/+51
|\ \ \ \ | |/ / / |/| | | [Backport release-21.05] dockerTools: Allow omitting all store paths
| * | | dockerTools: Allow omitting all store pathsorigin/backport-124494-to-release-21.05Robert Hensing2021-06-023-1/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds includeStorePaths, allowing the omission of the store paths. You generally want to leave it on, but tooling may disable this to insert the store paths more efficiently via other means, such as bind mounting the host store. (cherry picked from commit 5259d66b7487b94233821e28aafb0683ae3f1df6)
| * | | dockerTools: FormatRobert Hensing2021-06-021-1/+1
|/ / / | | | | | | | | | (cherry picked from commit 69de7cc12abfa1d0434750e5d346c299992a57ec)
* | | Merge pull request #125305 from NixOS/backport-125300-to-release-21.05Martin Weinelt2021-06-022-5/+5
|\ \ \ | | | | | | | | [Backport release-21.05] botamusique: unstable-2021-05-19 -> unstable-2021-06-01
| * | | botamusique: unstable-2021-05-19 -> unstable-2021-06-01Martin Weinelt2021-06-022-5/+5
|/ / / | | | | | | | | | (cherry picked from commit dbb7e6bc8a6d35f8da7e74e5c47dce18a51955af)
* | | Merge pull request #125219 from NixOS/backport-125178-to-release-21.05Robert Scott2021-06-021-3/+3
|\ \ \ | | | | | | | | [Backport release-21.05] deno: 1.10.2 -> 1.10.3
| * | | deno: 1.10.2 -> 1.10.3R. RyanTM2021-06-011-3/+3
| | | | | | | | | | | | | | | | (cherry picked from commit c89224c2d351fa860fe7703aba498b6f64e28f41)
* | | | Merge pull request #125277 from NixOS/backport-125148-to-release-21.05Robert Scott2021-06-011-2/+2
|\ \ \ \ | | | | | | | | | | [Backport release-21.05] stagit: 0.9.5 → 0.9.6
| * | | | stagit: 0.9.5 → 0.9.6Nikolay Korotkiy2021-06-011-2/+2
| | | | | | | | | | | | | | | | | | | | (cherry picked from commit dd068ab0e09ffb311d1ab43a25f390497bd26810)
* | | | | Merge pull request #125230 from NixOS/backport-124603-to-release-21.05Robert Scott2021-06-012-1/+2
|\ \ \ \ \ | |/ / / / |/| | | | [Backport release-21.05] php.buildPecl: Add checkPhase
| * | | | php.buildPecl: Add checkPhaseMarco Sirabella2021-06-012-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also update phpPackages' to use NO_INTERACTION (cherry picked from commit 3a66432f2616484c880b6daea2393bf1e9425a33)
* | | | | Merge pull request #125269 from NixOS/backport-125245-to-release-21.05Michele Guerini Rocco2021-06-011-2/+2
|\ \ \ \ \ | | | | | | | | | | | | [Backport release-21.05] warzone2100: fix build
| * | | | | warzone2100: fix buildrnhmjoj2021-06-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm not sure how the build broke[1] or how it worked before, but the problem is zip is being used in place of p7zip, which obviously fail as the flags have different meanings. [1]: https://hydra.nixos.org/build/143354937 (cherry picked from commit 302d6b1b8b94f2082f9937d04e27c2aaefb93aa2)
* | | | | | Merge pull request #125126 from NixOS/backport-125111-to-release-21.05Robert Scott2021-06-011-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | [Backport release-21.05] lua5_4: 5.4.2 -> 5.4.3
| * | | | | | lua5_4: 5.4.2 -> 5.4.3Janne Heß2021-05-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 490970ae8b34107aa5e092629271ac7739407478)
* | | | | | | Merge pull request #125249 from NixOS/backport-124995-to-release-21.05Robert Scott2021-06-011-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [Backport release-21.05] ijq: 0.2.3 → 0.3.4
| * | | | | | | ijq: 0.2.3 → 0.3.4Jan Tojnar2021-06-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/gpanders/ijq/compare/v0.2.3...v0.3.4 (cherry picked from commit 691a876749de1029f150b3ff7e23cf92403510a4)
* | | | | | | | Merge pull request #125248 from NixOS/backport-124986-to-release-21.05Robert Scott2021-06-011-1/+10
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | [Backport release-21.05] libccd: fix pkgconfig file paths
| * | | | | | | libccd: fix pkgconfig file pathsBen Wolsieffer2021-06-011-1/+10
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libccd has the common bug of assuming CMAKE_INSTALL_*DIR is relative. I have submitted the fix upstream, but don't have much hope of getting it merged because there have been no updates since 2018. (cherry picked from commit 3d2092ab58fe83e89a3162728e9d4b733295b561)
* | | | | | | Merge pull request #125247 from NixOS/backport-124996-to-release-21.05Robert Scott2021-06-011-6/+11
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | [Backport release-21.05] schismtracker: 20200412 -> 20210525
generated by cgit v1.2.3 (git 2.52.0) at 2026-01-17 06:01:04 +0000