Lets get it merged

isabel · May 3, 2024, 1:17pm

This topic exists purely to send your PRs or maybe someone else’s that you would like to get merged.

isabel · May 3, 2024, 1:17pm

github.com/auxolotl/nixpkgs

nixos/k3s: add `registries` option

auxolotl:master ← Goorzhel:k3s-aux

opened 07:39AM - 03 May 24 UTC

Goorzhel

+26 -0

Replay of nixos/nixpkgs#292023. I suspected very little about the PR flow has ch…anged, but I figured I'd learn by doing. ## Description of changes  ## Things done - Built on platform(s) - [x] x86_64-linux - [ ] aarch64-linux - [ ] x86_64-darwin - [ ] aarch64-darwin - For non-Linux: Is sandboxing enabled in `nix.conf`? (See [Nix manual](https://nixos.org/manual/nix/stable/command-ref/conf-file.html)) - [ ] `sandbox = relaxed` - [ ] `sandbox = true` - [x] Tested, as applicable: - [NixOS test(s)](https://nixos.org/manual/nixos/unstable/index.html#sec-nixos-tests) (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests)) - and/or [package tests](https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md#package-tests) - or, for functions and "core" functionality, tests in [lib/tests](https://github.com/NixOS/nixpkgs/blob/master/lib/tests) or [pkgs/test](https://github.com/NixOS/nixpkgs/blob/master/pkgs/test) - made sure NixOS tests are [linked](https://nixos.org/manual/nixpkgs/unstable/#ssec-nixos-tests-linking) to the relevant packages - [X] Tested compilation of all packages that depend on this change using ~~`nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"`~~ **the new review tool**, `nix run github:auxolotl/nixpkgs-review -- rev HEAD`. - [ ] Tested basic functionality of all binary files (usually in `./result/bin/`) - [24.05 Release Notes](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2405.section.md) (or backporting [23.05](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2305.section.md) and [23.11](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2311.section.md) Release notes) - [ ] (Package updates) Added a release notes entry if the change is major or breaking - [x] (Module updates) Added a release notes entry if the change is significant - [ ] (Module addition) Added a release notes entry if adding a new NixOS module - [X] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).  --- Add a :+1: [reaction] to [pull requests you find important]. [reaction]: https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/ [pull requests you find important]: https://github.com/NixOS/nixpkgs/pulls?q=is%3Aopen+sort%3Areactions-%2B1-desc

jakehamilton · May 3, 2024, 9:12pm

Did you mean to put this thread in SIG: Home (home-manager integration)?

isabel · May 3, 2024, 9:14pm

No, that’s my bad. I’ll fix that.

isabel · May 4, 2024, 7:03pm

Would apricate some thoughts here from everyone

github.com/auxolotl/templates

treewide: replace system variables with a local module system

auxolotl:main ← NotAShelf:main

opened 10:10AM - 04 May 24 UTC

NotAShelf

+28 -4

Currently just a draft. I'd like to hear a bit from others to see if this is a c…hange worth pursuing, or if it gets deemed too complicated. - Formats darwin template with nixfmt - Replaces the local variables in flake.nix with a module system the user can expand - Removes `system` that was passed to nixosSystem, which is [actually not necessary](https://github.com/NixOS/nixpkgs/blob/ba10489eae3b2b2f665947b516e7043594a235c8/nixos/lib/eval-config.nix#L12-L15). I will replace this with `nixpkgs.hostPlatform` in a future commit, but that is going to be in the generated hardware-configuration.nix so it may not be necessary.