···462462 ++ (lib.optional (cfg.role != "server" && cfg.charts != { })463463 "k3s: Helm charts are only made available to the cluster on server nodes (role == server), they will be ignored by this node."464464 )465465- ++ (lib.optional (cfg.disableAgent && cfg.images != [ ])466466- "k3s: Images are only imported on nodes with an enabled agent, they will be ignored by this node"465465+ ++ (lib.optional (466466+ cfg.disableAgent && cfg.images != [ ]467467+ ) "k3s: Images are only imported on nodes with an enabled agent, they will be ignored by this node")468468+ ++ (lib.optional (469469+ cfg.role == "agent" && cfg.configPath == null && cfg.serverAddr == ""470470+ ) "k3s: ServerAddr or configPath (with 'server' key) should be set if role is 'agent'")471471+ ++ (lib.optional472472+ (cfg.role == "agent" && cfg.configPath == null && cfg.tokenFile == null && cfg.token == "")473473+ "k3s: Token or tokenFile or configPath (with 'token' or 'token-file' keys) should be set if role is 'agent'"467474 );468475469476 assertions = [470477 {471471- assertion = cfg.role == "agent" -> (cfg.configPath != null || cfg.serverAddr != "");472472- message = "serverAddr or configPath (with 'server' key) should be set if role is 'agent'";473473- }474474- {475475- assertion =476476- cfg.role == "agent" -> cfg.configPath != null || cfg.tokenFile != null || cfg.token != "";477477- message = "token or tokenFile or configPath (with 'token' or 'token-file' keys) should be set if role is 'agent'";478478- }479479- {480478 assertion = cfg.role == "agent" -> !cfg.disableAgent;481481- message = "disableAgent must be false if role is 'agent'";479479+ message = "k3s: disableAgent must be false if role is 'agent'";482480 }483481 {484482 assertion = cfg.role == "agent" -> !cfg.clusterInit;485485- message = "clusterInit must be false if role is 'agent'";483483+ message = "k3s: clusterInit must be false if role is 'agent'";486484 }487485 ];488486
···3030 ${confServer}3131 ${confNoServer}3232 '';3333- confFile = if cfg.checkconf then pkgs.runCommandLocal "unbound-checkconf" { } ''3333+ confFile = if cfg.checkconf then pkgs.runCommand "unbound-checkconf" {3434+ preferLocalBuild = true;3535+ } ''3436 cp ${confFileUnchecked} unbound.conf35373638 # fake stateDir which is not accessible in the sandbox
···20712071 mktplcRef = {20722072 publisher = "github";20732073 name = "copilot";20742074- version = "1.246.1233"; # compatible with vscode ^1.9520752075- hash = "sha256-Pz46qTCGtn7q7UqCzwkQbuEEkH6tKxZV1HKSUs9WA8M=";20742074+ version = "1.251.0"; # compatible with vscode ^1.9620752075+ hash = "sha256-nv6lTPTPcggwMgO8a4KAF0W7gpou1399f/axnH0sS4s=";20762076 };2077207720782078 meta = {···20892089 publisher = "github";20902090 name = "copilot-chat";20912091 # Verify which version is available with nix run nixpkgs#vsce -- show github.copilot-chat --json20922092- version = "0.23.2024102903"; # compatible with vscode ^1.9520932093- hash = "sha256-FGvB+b24i23bdhpJpCQDvIHqqFvCJrWAKnX6fJgkr2E=";20922092+ version = "0.24.2024121201"; # compatible with vscode ^1.9620932093+ hash = "sha256-v3wdodDzYalz927KqqpL4IqEqLRmx1CLWdGBvZgNmpE=";20942094 };20952095 meta = {20962096 description = "GitHub Copilot Chat is a companion extension to GitHub Copilot that houses experimental chat features";
+8-8
pkgs/applications/editors/vscode/vscode.nix
···36363737 sha256 =3838 {3939- x86_64-linux = "0ijv2y2brc05m45slsy24dp8r0733d89f082l3mbs64vkz76s748";4040- x86_64-darwin = "012lkaxq5cqcby6lzmgwxbhgr36mk5szqvnxkw9xf5bjcpmxllfz";4141- aarch64-linux = "1975pvzg9hvbwqri80sbzbrgr96h85fi22x1walgqw4px74lsa1d";4242- aarch64-darwin = "023an5g5lgjizdppv52lpsah8kr0y40dm2kl7rq7byvsfxjga0gy";4343- armv7l-linux = "1f871lafkfyjw57iwz5gzl3bjjhqdac32akj0n26lkl3zq86p417";3939+ x86_64-linux = "07bnp0ywrpcpfqmr6h3adsv1gwng4fiyf2dqpj8g4dbwkgakalzk";4040+ x86_64-darwin = "1k5wmhnr8dr3f76f65agkn2igzbi40qqz3df7fai1gk1ichsw0s2";4141+ aarch64-linux = "0s8s5x3vhs3rv4kj86irprzp1pprx1npyv0sbgvd821h3bh6s6k9";4242+ aarch64-darwin = "1li4s74lqj5qr4w2biz29r88dx741a85v5s3mfxxqvnlhi7rkmx5";4343+ armv7l-linux = "028g7f7fhvni7kn2kvpn7q1n66r03jr8maxkxihwsxr0xh6srca0";4444 }4545 .${system} or throwSystem;4646in4747callPackage ./generic.nix rec {4848 # Please backport all compatible updates to the stable release.4949 # This is important for the extension ecosystem.5050- version = "1.95.3";5050+ version = "1.96.0";5151 pname = "vscode" + lib.optionalString isInsiders "-insiders";52525353 # This is used for VS Code - Remote SSH test5454- rev = "f1a4fb101478ce6ec82fe9627c43efbf9e98c813";5454+ rev = "138f619c86f1199955d53b4166bef66ef252935c";55555656 executableName = "code" + lib.optionalString isInsiders "-insiders";5757 longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";···7575 src = fetchurl {7676 name = "vscode-server-${rev}.tar.gz";7777 url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";7878- sha256 = "1ij7qfp5z801ny3n397801fv3hw5yvss1wxl9cyjgmjxmi6id7c1";7878+ sha256 = "1kjivqnc0abrnqjn9dw2l612z7qra7y2fvxxrallsrqmqiibzcdk";7979 };8080 stdenv = stdenvNoCC;8181 };
···20202121rustPlatform.buildRustPackage rec {2222 pname = "cosmic-edit";2323- version = "1.0.0-alpha.3";2323+ version = "1.0.0-alpha.4";24242525 src = fetchFromGitHub {2626 owner = "pop-os";2727 repo = "cosmic-edit";2828 rev = "epoch-${version}";2929- hash = "sha256-GCy/JyicPeCA7y9bfbVlyYiofRp0c82INPZi0zbnnxE=";2929+ hash = "sha256-IAIO5TggPGzZyfET2zBKpde/aePXR4FsSg/Da1y3saA=";3030 };31313232 useFetchCargoVendor = true;3333- cargoHash = "sha256-mQSCUnCJ52iSekljNAvf7G+WefmXhhmZTxumvXl9Jyc=";3333+ cargoHash = "sha256-pRp6Bi9CcHg2tMAC86CZybpfGL2BTxzst3G31tXJA5A=";34343535 # COSMIC applications now uses vergen for the About page3636 # Update the COMMIT_DATE to match when the commit was made
···168168169169stdenv.mkDerivation (finalAttrs: {170170 pname = "microsoft-edge";171171- version = "131.0.2903.70";171171+ version = "131.0.2903.86";172172173173 src = fetchurl {174174 url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";175175- hash = "sha256-LcinHmzr3o5ILjGdr8uuiOGWok0J9G/kTdASfYQh/tM=";175175+ hash = "sha256-THhE5R/++/WllfPZPmM0gcYIHw/ZVNFcwIBm6iPdrPM=";176176 };177177178178 # With strictDeps on, some shebangs were not being patched correctly