From eb09ff5bc8f2596f53096e93d974836c942eaabc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 31 Dec 2022 20:20:07 +0000 Subject: [PATCH 01/18] sq: 0.18.2 -> 0.20.0 --- pkgs/development/tools/sq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/sq/default.nix b/pkgs/development/tools/sq/default.nix index d150332ae63e..e13549009792 100644 --- a/pkgs/development/tools/sq/default.nix +++ b/pkgs/development/tools/sq/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "sq"; - version = "0.18.2"; + version = "0.20.0"; src = fetchFromGitHub { owner = "neilotoole"; repo = pname; rev = "v${version}"; - sha256 = "sha256-x5NHMTyOZSGOnAUCRu1qZggU5m832TFrBTSNJU6DUKo="; + sha256 = "sha256-mJp4lb4pzjdjodHk2zLAEePn+oIPI/vTtU0YOIbmWDY="; }; - vendorSha256 = "sha256-IRuwX+VF0ltASTt/QKlZ3A00tgDhc9qpBfzhINp3HgQ="; + vendorSha256 = "sha256-8kk+KCanbnsizGRjF3qcxCBxC7Sx0zfptQFTETZp89E="; proxyVendor = true; From 46a3fc9bacbea5d8c80f863ca93e8add877df0d4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Jan 2023 03:36:58 +0000 Subject: [PATCH 02/18] httm: 0.18.3 -> 0.19.2 --- pkgs/tools/filesystems/httm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/httm/default.nix b/pkgs/tools/filesystems/httm/default.nix index 1138ecb7f997..a19333f1cc83 100644 --- a/pkgs/tools/filesystems/httm/default.nix +++ b/pkgs/tools/filesystems/httm/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "httm"; - version = "0.18.3"; + version = "0.19.2"; src = fetchFromGitHub { owner = "kimono-koans"; repo = pname; rev = version; - sha256 = "sha256-LJFBridWS7YYO9Bw3mzRdRnh2gGUxAtuoNq2T1wuAcY="; + sha256 = "sha256-0diHZFD4+glTdGWWJk/5amr0mDsvKV5OibKGQNtitIk="; }; - cargoSha256 = "sha256-/v0QQ3EnmL1EKEjJ4O0t52SOrCz+CVBpunogEfVMpBw="; + cargoSha256 = "sha256-Rg1wmDLmkDC25meZIe94WZ3Wp8a93VAqRJXjmaE6k18="; nativeBuildInputs = [ installShellFiles ]; From e53bdd0c21c8b45502a0dd2214f5ea20b10a9fc8 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 2 Jan 2023 19:52:55 -0500 Subject: [PATCH 03/18] cargo-nextest: 0.9.47 -> 0.9.48 Diff: https://github.com/nextest-rs/nextest/compare/cargo-nextest-0.9.47...cargo-nextest-0.9.48 Changelog: https://nexte.st/CHANGELOG.html --- pkgs/development/tools/rust/cargo-nextest/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-nextest/default.nix b/pkgs/development/tools/rust/cargo-nextest/default.nix index 13bfdccac61f..676a09bae86c 100644 --- a/pkgs/development/tools/rust/cargo-nextest/default.nix +++ b/pkgs/development/tools/rust/cargo-nextest/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; - version = "0.9.47"; + version = "0.9.48"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; rev = "cargo-nextest-${version}"; - sha256 = "sha256-G7Y2x9aRcQB28uR2TlyG8JW9kYSD9iMPASd0VFXOxcE="; + sha256 = "sha256-y1Ka9XEXuwavAI23C4UmjTHraHHnbsA3QzDIkkSqfoU="; }; - cargoSha256 = "sha256-7fesLvkHPpPS4xKn3r6hLjQzP0udm92BsVPhdckTk7c="; + cargoSha256 = "sha256-1LsAbBdRz5Xf+LF/eOc34d+SQ0Ein8JW5/4v7ZZEFqA="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; From 504f08a5738c2fb63617053632a945fca723e2fd Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 3 Jan 2023 04:20:00 +0000 Subject: [PATCH 04/18] universal-ctags: 5.9.20221106.0 -> 6.0.0 https://github.com/universal-ctags/ctags/releases/tag/v6.0.0 --- pkgs/development/tools/misc/universal-ctags/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix index 02d5a4e549da..efd73a2cc9ae 100644 --- a/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/pkgs/development/tools/misc/universal-ctags/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "universal-ctags"; - version = "5.9.20221106.0"; + version = "6.0.0"; src = fetchFromGitHub { owner = "universal-ctags"; repo = "ctags"; - rev = "p${finalAttrs.version}"; - hash = "sha256-6piWdofvlX+ysXmRPnQc7PlZuHSyVqdVxOztY2+Pcss="; + rev = "v${finalAttrs.version}"; + hash = "sha256-XlqBndo8g011SDGp3zM7S+AQ0aCp6rpQlqJF6e5Dd6w="; }; depsBuildBuild = [ From 76cf05c317a18cd6a5d103766334cdb6b8f33b8a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 3 Jan 2023 04:20:00 +0000 Subject: [PATCH 05/18] zsv: 0.3.3-alpha -> 0.3.4-alpha https://github.com/liquidaty/zsv/releases/tag/v0.3.4-alpha --- pkgs/development/tools/zsv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/zsv/default.nix b/pkgs/development/tools/zsv/default.nix index a4aabab9d93f..d5f188f80b68 100644 --- a/pkgs/development/tools/zsv/default.nix +++ b/pkgs/development/tools/zsv/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zsv"; - version = "0.3.3-alpha"; + version = "0.3.4-alpha"; src = fetchFromGitHub { owner = "liquidaty"; repo = "zsv"; rev = "v${version}"; - sha256 = "sha256-gKtnyBCgiXNKiAjOYk2rxExfcNGHEAmjealcCTWRj+M="; + sha256 = "sha256-3drVqKRs5bjkvQiHyEANI5geeF5g7ba2+RxmAhxbu84="; }; nativeBuildInputs = [ perl ]; From 784d85d2c51ebadb28fcb437dced258f33474969 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 3 Jan 2023 04:20:00 +0000 Subject: [PATCH 06/18] millet: 0.6.0 -> 0.6.7 --- .../tools/language-servers/millet/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/language-servers/millet/default.nix b/pkgs/development/tools/language-servers/millet/default.nix index ccc895b89569..1c87084f7d86 100644 --- a/pkgs/development/tools/language-servers/millet/default.nix +++ b/pkgs/development/tools/language-servers/millet/default.nix @@ -2,24 +2,24 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.6.0"; + version = "0.6.7"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - hash = "sha256-tP1ccUtHfj+JPUYGo+QFYjbz56uNl3p53QNeE/xaCt4="; + hash = "sha256-sZy5SQ3Gd6bZcEx/30XJXoUI2/HRGTUn8ZZHtti5Cos="; }; - cargoHash = "sha256-umOlvHDA8AtoAeB1i8nNgbjvzTmzwZfdjF+TCTKzqAU="; + cargoHash = "sha256-74bGGZakz3yAaamqt3UU4r0QGbUcN6vIXebsgTj6cBM="; postPatch = '' rm .cargo/config.toml ''; - cargoBuildFlags = [ "--package" "lang-srv" ]; + cargoBuildFlags = [ "--package" "millet-ls" ]; - cargoTestFlags = [ "--package" "lang-srv" ]; + cargoTestFlags = [ "--package" "millet-ls" ]; meta = with lib; { description = "A language server for Standard ML"; @@ -27,6 +27,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/azdavis/millet/raw/v${version}/docs/changelog.md"; license = [ licenses.mit /* or */ licenses.asl20 ]; maintainers = with maintainers; [ marsam ]; - mainProgram = "lang-srv"; + mainProgram = "millet-ls"; }; } From 7eb1973a7a3c03fafba11445c885dfe00eee6017 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 3 Jan 2023 04:20:00 +0000 Subject: [PATCH 07/18] universal-ctags: enable on all platforms --- pkgs/development/tools/misc/universal-ctags/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix index efd73a2cc9ae..30c0800f2c5f 100644 --- a/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/pkgs/development/tools/misc/universal-ctags/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = licenses.gpl2Plus; maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.unix; + platforms = platforms.all; mainProgram = "ctags"; priority = 1; # over the emacs implementation }; From efd2c6b1930f177a848cb3fe959907a60e25760f Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 2 Jan 2023 23:26:23 -0500 Subject: [PATCH 08/18] ruff: 0.0.207 -> 0.0.208 Diff: https://github.com/charliermarsh/ruff/compare/v0.0.207...v0.0.208 Changelog: https://github.com/charliermarsh/ruff/releases/tag/v0.0.208 --- pkgs/development/tools/ruff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index ef5a143f94c6..d7d3f8fc94d3 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.207"; + version = "0.0.208"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DAjBie0wiweT/FE4kHLrYoymy+NJvaXkYSky1iJwwv4="; + sha256 = "sha256-BV1NRQQwifdz2kl00lLf8kANVRvcgGJwx2bLbE5CJEI="; }; - cargoSha256 = "sha256-px6T0DsQPWD6qWZpvEoEUwAiFPxVaBmevGguYpPTQoo="; + cargoSha256 = "sha256-ShO1lrr6UpsPBabNJPDMtN6x7II0zEdIf/+EatNH0Tw="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices From 8b79bf0432511f89db9a81e171cea2edffd6cc3c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Jan 2023 13:42:16 +0100 Subject: [PATCH 09/18] doc/contributing/quick-start: Replace dead thunderbird link The thunderbird derivation is using `buildMozillaMach` these days, shared with Firefox and Librefox, so it is probably the correct , although more complicated, successor. --- doc/contributing/quick-start.chapter.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/contributing/quick-start.chapter.md b/doc/contributing/quick-start.chapter.md index 96b30d3822c1..e6bb5f2b0b60 100644 --- a/doc/contributing/quick-start.chapter.md +++ b/doc/contributing/quick-start.chapter.md @@ -34,7 +34,7 @@ To add a package to Nixpkgs: - Apache HTTPD: [`pkgs/servers/http/apache-httpd/2.4.nix`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/http/apache-httpd/2.4.nix). A bunch of optional features, variable substitutions in the configure flags, a post-install hook, and miscellaneous hackery. - - Thunderbird: [`pkgs/applications/networking/mailreaders/thunderbird/default.nix`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/mailreaders/thunderbird/default.nix). Lots of dependencies. + - buildMozillaMach: [`pkgs/applications/networking/browser/firefox/common.nix`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/browsers/firefox/common.nix). A reusable build function for Firefox, Thunderbird and Librewolf. - JDiskReport, a Java utility: [`pkgs/tools/misc/jdiskreport/default.nix`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/jdiskreport/default.nix). Nixpkgs doesn’t have a decent `stdenv` for Java yet so this is pretty ad-hoc. From 195977fa053d9ef387ffc8773eee2239f56fcaec Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 3 Jan 2023 11:03:45 -0500 Subject: [PATCH 10/18] ruff: 0.0.208 -> 0.0.209 Diff: https://github.com/charliermarsh/ruff/compare/v0.0.208...v0.0.209 Changelog: https://github.com/charliermarsh/ruff/releases/tag/v0.0.209 --- pkgs/development/tools/ruff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index d7d3f8fc94d3..8c38ec2833ca 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.208"; + version = "0.0.209"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BV1NRQQwifdz2kl00lLf8kANVRvcgGJwx2bLbE5CJEI="; + sha256 = "sha256-DYMGGA/GGE4Vue8G61gmDFspODVI81vTK9iOuIB8dDA="; }; - cargoSha256 = "sha256-ShO1lrr6UpsPBabNJPDMtN6x7II0zEdIf/+EatNH0Tw="; + cargoSha256 = "sha256-Uvl/3VutaquorMMd8KQlqBc5DOdh23oLZSjGExTqUWE="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices From f38b25295555e4c132d550c7f464f4bafaa0da87 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 4 Jan 2023 00:18:52 +0800 Subject: [PATCH 11/18] nixos/cinnamon: add missing xapp icons Mostly all mint app looks for xapp-* icons, while some icon themes do provide them, mint-y-* does not. We are just going the laziest way here to install xapp globally to get those icons. --- nixos/modules/services/x11/desktop-managers/cinnamon.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index 08c5625fc7dd..df1b6f731a4e 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -180,6 +180,7 @@ in mint-themes mint-x-icons mint-y-icons + xapp # provides some xapp-* icons ] config.environment.cinnamon.excludePackages); xdg.mime.enable = true; From 468fac7d356a8053f7701e89c0f4e775f200b463 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 30 Dec 2022 06:21:49 +0000 Subject: [PATCH 12/18] v2ray: 5.1.0 -> 5.2.0 --- pkgs/tools/networking/v2ray/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix index 741465bebee4..51f70abcc71d 100644 --- a/pkgs/tools/networking/v2ray/default.nix +++ b/pkgs/tools/networking/v2ray/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "v2ray-core"; - version = "5.1.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "v2fly"; repo = "v2ray-core"; rev = "v${version}"; - hash = "sha256-87BtyaJN6qbinZQ+6MAwaK62YzbVnncj4qnEErG5tfA="; + hash = "sha256-/n8GyKcTsus7BWspg6Br4ALH98A1dSpkNFNKkRlIqHs="; }; # `nix-update` doesn't support `vendorHash` yet. # https://github.com/Mic92/nix-update/pull/95 - vendorSha256 = "sha256-RuDCAgTzqwe5fUwa9ce2wRx4FPT8siRLbP7mU8/jg/Y="; + vendorSha256 = "sha256-85k6XWe12m2siejfoPJru87/AYdVSl+ag09jUkBIc0M="; ldflags = [ "-s" "-w" "-buildid=" ]; From 8583f2b7b3bc08020d0f90d0fc8db8e1398319ae Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 18 Aug 2022 20:06:22 +1000 Subject: [PATCH 13/18] dnsname-cni: remove passthru.tests --- pkgs/applications/networking/cluster/dnsname-cni/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/dnsname-cni/default.nix b/pkgs/applications/networking/cluster/dnsname-cni/default.nix index a0bc37f2cdb8..3a543f40dd49 100644 --- a/pkgs/applications/networking/cluster/dnsname-cni/default.nix +++ b/pkgs/applications/networking/cluster/dnsname-cni/default.nix @@ -3,7 +3,6 @@ dnsmasq, fetchFromGitHub, lib, - nixosTests, makeWrapper, }: @@ -28,10 +27,6 @@ buildGoModule rec { doCheck = false; # NOTE: requires root privileges - passthru.tests = { - inherit (nixosTests) podman-dnsname; - }; - meta = with lib; { description = "DNS name resolution for containers"; homepage = "https://github.com/containers/dnsname"; From bf052185a314a166e2b2869b8e36b6cde3972a59 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 18 Aug 2022 13:58:05 +1000 Subject: [PATCH 14/18] cni-plugins: remove podman from passthru.tests --- pkgs/applications/networking/cluster/cni/plugins.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index aad583c675c0..bc39dbcd5e40 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -38,7 +38,7 @@ buildGoModule rec { "plugins/meta/vrf" ]; - passthru.tests = { inherit (nixosTests) cri-o podman; }; + passthru.tests = { inherit (nixosTests) cri-o; }; meta = with lib; { description = "Some standard networking plugins, maintained by the CNI team"; From cf4d35fe609d9139fe95e88307441613aa61ce39 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 18 Aug 2022 16:02:54 +1000 Subject: [PATCH 15/18] aardvark-dns: add podman to passthru.tests --- pkgs/tools/networking/aardvark-dns/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/networking/aardvark-dns/default.nix b/pkgs/tools/networking/aardvark-dns/default.nix index fdf76d459a29..4f4576dfe297 100644 --- a/pkgs/tools/networking/aardvark-dns/default.nix +++ b/pkgs/tools/networking/aardvark-dns/default.nix @@ -1,6 +1,7 @@ { lib , rustPlatform , fetchFromGitHub +, nixosTests }: rustPlatform.buildRustPackage rec { @@ -16,6 +17,8 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-naWkSXQHfImd6R+RHKkmTe8UiqxknZEFYoJ0g/URCVY="; + passthru.tests = { inherit (nixosTests) podman; }; + meta = with lib; { description = "Authoritative dns server for A/AAAA container records"; homepage = "https://github.com/containers/aardvark-dns"; From 17c7ccb1abc2972a749faa841d7d04fa7f64f14c Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 18 Aug 2022 16:02:54 +1000 Subject: [PATCH 16/18] netavark: add podman to passthru.tests --- pkgs/tools/networking/netavark/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/networking/netavark/default.nix b/pkgs/tools/networking/netavark/default.nix index fbd0a8119c51..bac09558e7fb 100644 --- a/pkgs/tools/networking/netavark/default.nix +++ b/pkgs/tools/networking/netavark/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , installShellFiles , mandown +, nixosTests }: rustPlatform.buildRustPackage rec { @@ -25,6 +26,8 @@ rustPlatform.buildRustPackage rec { installManPage docs/netavark.1 ''; + passthru.tests = { inherit (nixosTests) podman; }; + meta = with lib; { description = "Rust based network stack for containers"; homepage = "https://github.com/containers/netavark"; From 469aec905bab3be98838c7eb996ceffb2ea44404 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 18 Aug 2022 13:58:03 +1000 Subject: [PATCH 17/18] nixos/podman, podman: switch to `netavark` network stack --- .../from_md/release-notes/rl-2305.section.xml | 9 ++++ .../manual/release-notes/rl-2305.section.md | 2 + .../modules/virtualisation/podman/default.nix | 47 ++++++++++--------- .../modules/virtualisation/podman/dnsname.nix | 36 -------------- nixos/tests/all-tests.nix | 1 - nixos/tests/podman/default.nix | 25 ++++++++++ nixos/tests/podman/dnsname.nix | 42 ----------------- .../virtualization/podman/default.nix | 2 - .../virtualization/podman/wrapper.nix | 6 ++- 9 files changed, 65 insertions(+), 105 deletions(-) delete mode 100644 nixos/modules/virtualisation/podman/dnsname.nix delete mode 100644 nixos/tests/podman/dnsname.nix diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml index 4fb5749e71c8..12e4d490300e 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml @@ -115,6 +115,15 @@ services.borgbackup.jobs.<name>.inhibitsSleep. + + + podman now uses the + netavark network stack. Users will need to + delete all of their local containers, images, volumes, etc, by + running podman system reset --force once + before upgrading their systems. + + The EC2 image module no longer fetches instance metadata in diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index b5c9c4ceb55d..07ee346c2c87 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -40,6 +40,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `borgbackup` module now has an option for inhibiting system sleep while backups are running, defaulting to off (not inhibiting sleep), available as [`services.borgbackup.jobs..inhibitsSleep`](#opt-services.borgbackup.jobs._name_.inhibitsSleep). +- `podman` now uses the `netavark` network stack. Users will need to delete all of their local containers, images, volumes, etc, by running `podman system reset --force` once before upgrading their systems. + - The EC2 image module no longer fetches instance metadata in stage-1. This results in a significantly smaller initramfs, since network drivers no longer need to be included, and faster boots, since metadata fetching can happen in parallel with startup of other services. This breaks services which rely on metadata being present by the time stage-2 is entered. Anything which reads EC2 metadata from `/etc/ec2-metadata` should now have an `after` dependency on `fetch-ec2-metadata.service` diff --git a/nixos/modules/virtualisation/podman/default.nix b/nixos/modules/virtualisation/podman/default.nix index 13bbb4471ea5..6c00fabaa185 100644 --- a/nixos/modules/virtualisation/podman/default.nix +++ b/nixos/modules/virtualisation/podman/default.nix @@ -1,7 +1,6 @@ { config, lib, pkgs, ... }: let cfg = config.virtualisation.podman; - toml = pkgs.formats.toml { }; json = pkgs.formats.json { }; inherit (lib) mkOption types; @@ -27,24 +26,13 @@ let done ''; - net-conflist = pkgs.runCommand "87-podman-bridge.conflist" - { - nativeBuildInputs = [ pkgs.jq ]; - extraPlugins = builtins.toJSON cfg.defaultNetwork.extraPlugins; - jqScript = '' - . + { "plugins": (.plugins + $extraPlugins) } - ''; - } '' - jq <${cfg.package}/etc/cni/net.d/87-podman-bridge.conflist \ - --argjson extraPlugins "$extraPlugins" \ - "$jqScript" \ - >$out - ''; - in { imports = [ - ./dnsname.nix + (lib.mkRemovedOptionModule [ "virtualisation" "podman" "defaultNetwork" "dnsname" ] + "Use virtualisation.podman.defaultNetwork.settings.dns_enabled instead.") + (lib.mkRemovedOptionModule [ "virtualisation" "podman" "defaultNetwork" "extraPlugins" ] + "Netavark isn't compatible with CNI plugins.") ./network-socket.nix ]; @@ -149,11 +137,11 @@ in ''; }; - defaultNetwork.extraPlugins = lib.mkOption { - type = types.listOf json.type; - default = [ ]; + defaultNetwork.settings = lib.mkOption { + type = json.type; + default = { }; description = lib.mdDoc '' - Extra CNI plugin configurations to add to podman's default network. + Settings for podman's default network. ''; }; @@ -164,11 +152,26 @@ in environment.systemPackages = [ cfg.package ] ++ lib.optional cfg.dockerCompat dockerCompat; - environment.etc."cni/net.d/87-podman-bridge.conflist".source = net-conflist; + # https://github.com/containers/podman/blob/097cc6eb6dd8e598c0e8676d21267b4edb11e144/docs/tutorials/basic_networking.md#default-network + environment.etc."containers/networks/podman.json" = lib.mkIf (cfg.defaultNetwork.settings != { }) { + source = json.generate "podman.json" ({ + dns_enabled = false; + driver = "bridge"; + id = "0000000000000000000000000000000000000000000000000000000000000000"; + internal = false; + ipam_options = { driver = "host-local"; }; + ipv6_enabled = false; + name = "podman"; + network_interface = "podman0"; + subnets = [{ gateway = "10.88.0.1"; subnet = "10.88.0.0/16"; }]; + } // cfg.defaultNetwork.settings); + }; virtualisation.containers = { enable = true; # Enable common /etc/containers configuration - containersConf.settings = lib.optionalAttrs cfg.enableNvidia { + containersConf.settings = { + network.network_backend = "netavark"; + } // lib.optionalAttrs cfg.enableNvidia { engine = { conmon_env_vars = [ "PATH=${lib.makeBinPath [ pkgs.nvidia-podman ]}" ]; runtimes.nvidia = [ "${pkgs.nvidia-podman}/bin/nvidia-container-runtime" ]; diff --git a/nixos/modules/virtualisation/podman/dnsname.nix b/nixos/modules/virtualisation/podman/dnsname.nix deleted file mode 100644 index 3e7d35ae1e44..000000000000 --- a/nixos/modules/virtualisation/podman/dnsname.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ config, lib, pkgs, ... }: -let - inherit (lib) - mkOption - mkIf - types - ; - - cfg = config.virtualisation.podman; - -in -{ - options = { - virtualisation.podman = { - - defaultNetwork.dnsname.enable = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Enable DNS resolution in the default podman network. - ''; - }; - - }; - }; - - config = { - virtualisation.containers.containersConf.cniPlugins = mkIf cfg.defaultNetwork.dnsname.enable [ pkgs.dnsname-cni ]; - virtualisation.podman.defaultNetwork.extraPlugins = - lib.optional cfg.defaultNetwork.dnsname.enable { - type = "dnsname"; - domainName = "dns.podman"; - capabilities.aliases = true; - }; - }; -} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 75f01d888b21..e9b58c7c4f77 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -527,7 +527,6 @@ in { plotinus = handleTest ./plotinus.nix {}; podgrab = handleTest ./podgrab.nix {}; podman = handleTestOn ["aarch64-linux" "x86_64-linux"] ./podman/default.nix {}; - podman-dnsname = handleTestOn ["aarch64-linux" "x86_64-linux"] ./podman/dnsname.nix {}; podman-tls-ghostunnel = handleTestOn ["aarch64-linux" "x86_64-linux"] ./podman/tls-ghostunnel.nix {}; polaris = handleTest ./polaris.nix {}; pomerium = handleTestOn ["x86_64-linux"] ./pomerium.nix {}; diff --git a/nixos/tests/podman/default.nix b/nixos/tests/podman/default.nix index 106ba2057d06..c2ea399d65af 100644 --- a/nixos/tests/podman/default.nix +++ b/nixos/tests/podman/default.nix @@ -13,6 +13,13 @@ import ../make-test-python.nix ( isNormalUser = true; }; }; + dns = { pkgs, ... }: { + virtualisation.podman.enable = true; + + virtualisation.podman.defaultNetwork.settings.dns_enabled = true; + + networking.firewall.allowedUDPPorts = [ 53 ]; + }; docker = { pkgs, ... }: { virtualisation.podman.enable = true; @@ -43,6 +50,7 @@ import ../make-test-python.nix ( podman.wait_for_unit("sockets.target") + dns.wait_for_unit("sockets.target") docker.wait_for_unit("sockets.target") start_all() @@ -120,6 +128,23 @@ import ../make-test-python.nix ( pid = podman.succeed("podman run --rm --init busybox readlink /proc/self").strip() assert pid == "2" + with subtest("aardvark-dns"): + dns.succeed("tar cv --files-from /dev/null | podman import - scratchimg") + dns.succeed( + "podman run -d --name=webserver -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin -w ${pkgs.writeTextDir "index.html" "

Hi

"} scratchimg ${pkgs.python3}/bin/python -m http.server 8000" + ) + dns.succeed("podman ps | grep webserver") + dns.succeed(""" + for i in `seq 0 120`; do + podman run --rm --name=client -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg ${pkgs.curl}/bin/curl http://webserver:8000 >/dev/console \ + && exit 0 + sleep 0.5 + done + exit 1 + """) + dns.succeed("podman stop webserver") + dns.succeed("podman rm webserver") + with subtest("A podman member can use the docker cli"): docker.succeed(su_cmd("docker version")) diff --git a/nixos/tests/podman/dnsname.nix b/nixos/tests/podman/dnsname.nix deleted file mode 100644 index 3768ae79e067..000000000000 --- a/nixos/tests/podman/dnsname.nix +++ /dev/null @@ -1,42 +0,0 @@ -import ../make-test-python.nix ( - { pkgs, lib, ... }: - let - inherit (pkgs) writeTextDir python3 curl; - webroot = writeTextDir "index.html" "

Hi

"; - in - { - name = "podman-dnsname"; - meta = { - maintainers = with lib.maintainers; [ roberth ] ++ lib.teams.podman.members; - }; - - nodes = { - podman = { pkgs, ... }: { - virtualisation.podman.enable = true; - virtualisation.podman.defaultNetwork.dnsname.enable = true; - }; - }; - - testScript = '' - podman.wait_for_unit("sockets.target") - - with subtest("DNS works"): # also tests inter-container tcp routing - podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg") - podman.succeed( - "podman run -d --name=webserver -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin -w ${webroot} scratchimg ${python3}/bin/python -m http.server 8000" - ) - podman.succeed("podman ps | grep webserver") - podman.succeed(""" - for i in `seq 0 120`; do - podman run --rm --name=client -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg ${curl}/bin/curl http://webserver:8000 >/dev/console \ - && exit 0 - sleep 0.5 - done - exit 1 - """) - podman.succeed("podman stop webserver") - podman.succeed("podman rm webserver") - - ''; - } -) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 3fed07237f75..f6cc83fde17c 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -68,7 +68,6 @@ buildGoModule rec { ${if stdenv.isDarwin then '' mv bin/{darwin/podman,podman} '' else '' - install -Dm644 cni/87-podman-bridge.conflist -t $out/etc/cni/net.d install -Dm644 contrib/tmpfile/podman.conf -t $out/lib/tmpfiles.d for s in contrib/systemd/**/*.in; do substituteInPlace "$s" --replace "@@PODMAN@@" "podman" # don't use unwrapped binary @@ -92,7 +91,6 @@ buildGoModule rec { # related modules inherit (nixosTests) podman-tls-ghostunnel - podman-dnsname ; oci-containers-podman = nixosTests.oci-containers.podman; }; diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix index d0131eacdd37..7fe483a7079e 100644 --- a/pkgs/applications/virtualization/podman/wrapper.nix +++ b/pkgs/applications/virtualization/podman/wrapper.nix @@ -15,12 +15,12 @@ , iproute2 , catatonit , gvproxy +, aardvark-dns +, netavark }: # do not add qemu to this wrapper, store paths get written to the podman vm config and break when GCed -# adding aardvark-dns/netavark to `helpersBin` requires changes to the modules and tests - let binPath = lib.makeBinPath ([ ] ++ lib.optionals stdenv.isLinux [ @@ -41,7 +41,9 @@ let paths = [ gvproxy ] ++ lib.optionals stdenv.isLinux [ + aardvark-dns catatonit # added here for the pause image and also set in `containersConf` for `init_path` + netavark podman-unwrapped.rootlessport ]; }; From 6d89aa8f1d238cc5ed97215f7e229b8283bef027 Mon Sep 17 00:00:00 2001 From: Gabriella Gonzalez Date: Tue, 3 Jan 2023 21:12:56 -0800 Subject: [PATCH 18/18] darwin.builder: auto-login as the `builder` user (#208772) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit … as suggested by @NiklasGollenstede in: https://github.com/NixOS/nixpkgs/pull/206951#issuecomment-1369020601 This simplifies the user experience for logging into and debugging the machine and also simplifies the instructions for shutting down the machine gracefully. --- doc/builders/special/darwin-builder.section.md | 12 +++++++----- nixos/modules/profiles/macos-builder.nix | 10 +++++++--- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/doc/builders/special/darwin-builder.section.md b/doc/builders/special/darwin-builder.section.md index af9de5751b2c..3913b692498d 100644 --- a/doc/builders/special/darwin-builder.section.md +++ b/doc/builders/special/darwin-builder.section.md @@ -28,19 +28,21 @@ Password: ``` … so that it can install a private key used to `ssh` into the build server. -After that the script will launch the virtual machine: +After that the script will launch the virtual machine and automatically log you +in as the `builder` user: ``` <<< Welcome to NixOS 22.11.20220901.1bd8d11 (aarch64) - ttyAMA0 >>> Run 'nixos-help' for the NixOS manual. -nixos login: +nixos login: builder (automatic login) + + +[builder@nixos:~]$ ``` -> Note: When you need to stop the VM, type `Ctrl`-`a` + `c` to open the `qemu` -> prompt and then type `system_powerdown` followed by `Enter`, or run `shutdown now` -> as the `builder` user (e.g. `ssh -i keys/builder_ed25519 builder@localhost shutdown now`) +> Note: When you need to stop the VM, run `shutdown now` as the `builder` user. To delegate builds to the remote builder, add the following options to your `nix.conf` file: diff --git a/nixos/modules/profiles/macos-builder.nix b/nixos/modules/profiles/macos-builder.nix index fddf19ad1251..4a5359582bce 100644 --- a/nixos/modules/profiles/macos-builder.nix +++ b/nixos/modules/profiles/macos-builder.nix @@ -59,10 +59,14 @@ in trusted-users = [ "root" user ]; }; - services.openssh = { - enable = true; + services = { + getty.autologinUser = user; - authorizedKeysFiles = [ "${keysDirectory}/%u_${keyType}.pub" ]; + openssh = { + enable = true; + + authorizedKeysFiles = [ "${keysDirectory}/%u_${keyType}.pub" ]; + }; }; system.build.macos-builder-installer =