Skip to content

nixos/archisteamfarm: don't use asf abbreviation for more clarity#272147

Merged
pbsds merged 2 commits intoNixOS:masterfrom
SuperSandro2000:archisteamfarm
Jan 22, 2024
Merged

nixos/archisteamfarm: don't use asf abbreviation for more clarity#272147
pbsds merged 2 commits intoNixOS:masterfrom
SuperSandro2000:archisteamfarm

Conversation

@SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Dec 4, 2023

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (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
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: documentation This PR adds or changes documentation 8.has: changelog This PR adds or changes release notes 8.has: module (update) This PR changes an existing module in `nixos/` labels Dec 4, 2023
@pbsds
Copy link
Member

pbsds commented Dec 30, 2023

Reproduced the eval error locally with nix-env --extra-experimental-features no-url-literals --option system x86_64-linux -f . -qaP --xml --out-path --show-trace --no-allow-import-from-derivation --meta --show-trace >/dev/null. It does not occur on the parent commit.

@SuperSandro2000
Copy link
Member Author

SuperSandro2000 commented Jan 4, 2024

A rebase seems to have fixed that. Not sure why but I take it. :)

@pbsds
Copy link
Member

pbsds commented Jan 4, 2024

Ofborg seems to disagree. Is it because the stateversion is used to determine a default value which is evaluated when building the manual?

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jan 8, 2024
@SuperSandro2000 SuperSandro2000 force-pushed the archisteamfarm branch 2 times, most recently from 09d4162 to bd15168 Compare January 8, 2024 22:41
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
services.archisteamfarm.dataDir = lib.mkIf (lib.versionAtLeast config.system.stateVersion "24.05") "/var/lib/asf";
services.archisteamfarm.dataDir = mkIf (lib.versionAtLeast config.system.stateVersion "24.05") (mkDefault "/var/lib/asf");

Use mkDefault so that preexisting configs configs that override dataDir continue to function.
Also removed the lib. as the file already contains a with lib; at the top.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure. Maybe I should drop that option entirely in another PR since I am not regularly testing it.

Also dropped with lib, since it is discouraged anyway.

@pbsds pbsds merged commit 76e9a3e into NixOS:master Jan 22, 2024
@SuperSandro2000 SuperSandro2000 deleted the archisteamfarm branch January 23, 2024 20:18
wolfgangwalther added a commit to wolfgangwalther/nixpkgs that referenced this pull request Nov 22, 2024
wolfgangwalther added a commit to wolfgangwalther/nixpkgs that referenced this pull request Nov 24, 2024
Scheduled for 24.11.

Added in NixOS#272147.

(cherry picked from commit 4255d7a)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog This PR adds or changes release notes 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants