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

292584 Commits

Author SHA1 Message Date
Robert Hensing 297970378b
Merge pull request #125341 from hercules-ci/backport-podman-improvements 
[Backport release-21.05] podman improvements
 2021-06-02 18:23:15 +02:00
Robert Hensing 68e821b051
Merge pull request #125388 from NixOS/backport-125216-to-release-21.05 
[Backport release-21.05] dockerTools: Fix passthru image tag
 2021-06-02 17:19:19 +02:00
Martin Weinelt bbdaa7f504
Merge pull request #125309 from NixOS/backport-124982-to-staging-21.05 
[Backport staging-21.05] curl: add patches for CVE-2021-22897, CVE-2021-22898 & CVE-2021-22901
 2021-06-02 17:12:13 +02:00
Robert Hensing fc30ee8ce7 dockerTools: Fix passthru image tag 
It should match the actual image tag.
This fixes the problem introduced in 00996b5e03
https://github.com/NixOS/nixpkgs/pull/115491#pullrequestreview-672789901

(cherry picked from commit ff55c41facaa6812f9cc879a49f6929321881d4f)
 2021-06-02 15:02:31 +00:00
Martin Weinelt bdf95a994e
lasso: Fix signature verification in AuthnResponse messages 
Fixes: CVE-2021-28091
 2021-06-02 16:49:11 +02:00
Martin Weinelt 3308be986a
Merge pull request #125344 from helsinki-systems/bkp/21.05/cacert 2021-06-02 15:47:27 +02:00
Andreas Rammhold e2960f429b cacerts: Make updater script aware of the nss_latest attribute 
Usually, on the stable channel, we have a nss_latest attribute that is
more up to date than the nss attribute (which is usually frozen during
branch-off and only receives security updates). Cacerts are a sensitive
matter and should be updated more frequently than the stable NSS package,
if required. By making the update script aware of the nss_latest
attribute we can prefer that when it exists.

By having this change in the unstable branch of Nixpgks we can carry it
from release to release without requiring more churn from those doing
the stable release maintenance.

(cherry picked from commit 4e318bcca19e7972d1fa8b15c4eadf85e3d5a6a1)
 2021-06-02 15:17:44 +02:00
Michele Guerini Rocco 5285a51c2e
Merge pull request #125368 from NixOS/backport-125289-to-release-21.05 
[Backport release-21.05] qutebrowser: 2.2.2 -> 2.2.3
 2021-06-02 14:54:51 +02:00
Vladimír Čunát 4b04e53f2a
Merge branch 'staging-21.05' into release-21.05 
It's a bit older version of the branch, as it has binaries from
https://hydra.nixos.org/eval/1674261
 2021-06-02 13:59:29 +02:00
Robert Schütz 5b6ba9f492 python3Packages.adblock: fix build on Darwin 
(cherry picked from commit 9f9de0069cf323533375286468e44f134c117234)
 2021-06-02 11:54:54 +00:00
Robert Schütz 22e2e017df qutebrowser: 2.2.2 -> 2.2.3 
https://github.com/qutebrowser/qutebrowser/releases/tag/v2.2.3
(cherry picked from commit 29043644b0119bd3c5e695fb90ea5e52b4656045)
 2021-06-02 11:54:54 +00:00
Thomas Depierre 0894deca29 beam-packages: drop erlang R18 R19 R20 and cuter 
(cherry picked from commit f55c3e2f21073be564fed477847ad5bd649c9fb9)
 2021-06-02 19:23:26 +09:00
Michele Guerini Rocco 5bf359c593
Merge pull request #125343 from NixOS/backport-124891-to-release-21.05 
[Backport release-21.05] antimony: add desktop item
 2021-06-02 11:38:05 +02:00
Jörg Thalheim 5dfad380ad
containerd: fix checksum 2021-06-02 11:30:23 +02:00
ajs124 ffcb3c66fa cacert: 3.63 -> 3.66 
mozilla says this is CA version 2.50, up from 2.48 in nss 3.63

(cherry picked from commit e579e93b6517c29af8b84641d2ec16a064d34c8b)
 2021-06-02 10:55:51 +02:00
Robert Hensing eaba7870ff
Merge pull request #125338 from NixOS/backport-124494-to-release-21.05 
[Backport release-21.05] dockerTools: Allow omitting all store paths
 2021-06-02 10:22:59 +02:00
zowoq 0684f78698 nixos/podman-network-socket-ghostunnel: move condition to include socket 
(cherry picked from commit 72f54c32a6114a69caec30170a29837c91434aff)
 2021-06-02 10:20:11 +02:00
Robert Hensing eeefa0a65d podman: Add nixosTests.podman-dnsname to tests 
(cherry picked from commit 1d781e5c80d3c392933479a114e9e3857a1d9529)
 2021-06-02 10:20:11 +02:00
Robert Hensing c758b69375 nixos/podman-dnsname: init 
(cherry picked from commit 54f2f1e5f1c7fd34e564a84443e8490477e26eb7)
 2021-06-02 10:20:11 +02:00
Robert Hensing 9e4729617b nixos/podman: Add defaultNetwork.extraPlugins 
(cherry picked from commit d81631fb98ea35b107d86f5de287cf727d0dfc18)
 2021-06-02 10:20:11 +02:00
Robert Hensing f28df17dfa nixos/containers: Add virtualisation.containers.containersConf.cniPlugins 
(cherry picked from commit efba949352271ec77d9d5e7d54f2d16b9c53ee4f)
 2021-06-02 10:20:11 +02:00
Robert Hensing 03e08759f7 dnsname-cni: Use wrapper instead of patch for dnsmasq 
The patch proved to be an incomplete solution while developing
nixosTests.podman-dnsname

(cherry picked from commit 651777934941480a36f7df9c434e6044957d045d)
 2021-06-02 10:20:11 +02:00
Robert Hensing 29ee113277 podman: Add iproute2, fixing docker network rm 
(cherry picked from commit db31d8354d9c1988968f076c4e01843330162e03)
 2021-06-02 10:20:11 +02:00
Robert Hensing 833b005e37 nixos/podman-network-socket-ghostunnel: init 
(cherry picked from commit b6570e723836167640c9b7efc63f327ff17b0755)
 2021-06-02 10:20:10 +02:00
Robert Hensing ffde2bb4a1 nixos/podman: Add generic networkSocket interface 
(cherry picked from commit 52844efcd67028a481a24103d8e93c7ef2bf4f08)
 2021-06-02 10:20:10 +02:00
Robert Hensing 0c5e6d0bea nixos/podman: Add dockerSocket.enable 
(cherry picked from commit ff4d83a66727ad13da0f51d00db4eda8a8c50590)
 2021-06-02 10:20:10 +02:00
Robert Hensing db05ed8b0d nixos/podman: Change podman socket to new podman group 
(cherry picked from commit fb8b0a38433c8e83a53c1dc0a739c5a7ad64e2fc)
 2021-06-02 10:20:10 +02:00
zowoq f63aff597b nixos/podman: install cni config from package 
(cherry picked from commit 30ae7e4ba983de461c7b71d02274d184ab55244d)
 2021-06-02 10:20:10 +02:00
zowoq 17ba99dd68 podman: install cni config 
(cherry picked from commit fd59022ee9eb8d08b65df563c65e4218a68fca3c)
 2021-06-02 10:20:10 +02:00
Nick Cao 0919b5c419 podman: add systemd to rpath 
(cherry picked from commit ada45ac3aee664265759611d09443d549250bd70)
 2021-06-02 10:20:10 +02:00
Mark Vainomaa d33aa3d0d3 dnsname-cni: init at 1.1.1 
(cherry picked from commit 5826e9020636c8ba3bc311294ce78b6466fd2b24)
 2021-06-02 10:20:10 +02:00
Mark Vainomaa 73f566b2ad maintainers: add mikroskeem 
(cherry picked from commit f830b000fc8aafd14bf3151178919378584e87c9)
 2021-06-02 10:20:10 +02:00
cwyc 508f877ab9 antimony: add desktop item 
(cherry picked from commit b80463f8d574bb4efff0392c94d63021c63916b9)
 2021-06-02 08:18:16 +00:00
legendofmiracles 2d5507fcd1 matterbridge: 1.12.1 -> 1.12.2 
(cherry picked from commit a08f23039cf98d5b8648e2c3d6b872b348bac9d9)
 2021-06-02 08:18:02 +00:00
Greizgh 2234f20897 sqlx-cli: 0.5.2 -> 0.5.5 
(cherry picked from commit d8c7fbe7616d40d1ee68c803660de4c4ae6770d9)
 2021-06-02 08:10:23 +00:00
Robert Hensing fb8409427c dockerTools: Allow omitting all store paths 
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)
 2021-06-02 07:51:33 +00:00
Robert Hensing 2e0ff58c76 dockerTools: Format 
(cherry picked from commit 69de7cc12abfa1d0434750e5d346c299992a57ec)
 2021-06-02 07:51:32 +00:00
zowoq 32c5e04919 docker: add clientOnly / docker-client 
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)
 2021-06-02 09:14:21 +02:00
Martin Weinelt 8ab70f5edc firefox-esr: 78.10.1esr -> 78.11.0esr 
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)
 2021-06-02 06:53:38 +00:00
Robert Scott 1e0edddaff curl: add patches for CVE-2021-22897, CVE-2021-22898 & CVE-2021-22901 
(cherry picked from commit 742c60f6f839e23822d29b668071baa653253656)
 2021-06-02 00:35:37 +00:00
Martin Weinelt bb8a5e5484
Merge pull request #125305 from NixOS/backport-125300-to-release-21.05 
[Backport release-21.05] botamusique: unstable-2021-05-19 -> unstable-2021-06-01
 2021-06-02 02:28:57 +02:00
Martin Weinelt 4a2d2ac6f1 botamusique: unstable-2021-05-19 -> unstable-2021-06-01 
(cherry picked from commit dbb7e6bc8a6d35f8da7e74e5c47dce18a51955af)
 2021-06-02 00:00:06 +00:00
Robert Scott 1c1eefa5e6
Merge pull request #125219 from NixOS/backport-125178-to-release-21.05 
[Backport release-21.05] deno: 1.10.2 -> 1.10.3
 2021-06-02 00:17:53 +01:00
Robert Scott adfdebe96c
Merge pull request #125277 from NixOS/backport-125148-to-release-21.05 
[Backport release-21.05] stagit: 0.9.5 → 0.9.6
 2021-06-01 22:37:25 +01:00
Robert Scott 5237039cc1
Merge pull request #125230 from NixOS/backport-124603-to-release-21.05 
[Backport release-21.05] php.buildPecl: Add checkPhase
 2021-06-01 21:00:19 +01:00
Nikolay Korotkiy 1e15757384 stagit: 0.9.5 → 0.9.6 
(cherry picked from commit dd068ab0e09ffb311d1ab43a25f390497bd26810)
 2021-06-01 19:16:34 +00:00
Michele Guerini Rocco 3e45cf0eec
Merge pull request #125269 from NixOS/backport-125245-to-release-21.05 
[Backport release-21.05] warzone2100: fix build
 2021-06-01 21:02:38 +02:00
Robert Scott 7c1d76fbeb
Merge pull request #125126 from NixOS/backport-125111-to-release-21.05 
[Backport release-21.05] lua5_4: 5.4.2 -> 5.4.3
 2021-06-01 19:44:38 +01:00
Robert Scott 0c988f04d7
Merge pull request #125249 from NixOS/backport-124995-to-release-21.05 
[Backport release-21.05] ijq: 0.2.3 → 0.3.4
 2021-06-01 19:38:40 +01:00
Robert Scott 6f38e99a9e
Merge pull request #125248 from NixOS/backport-124986-to-release-21.05 
[Backport release-21.05] libccd: fix pkgconfig file paths
 2021-06-01 19:32:36 +01:00