Skip to content

hydra: 2024-08-20 -> 0-unstable-2024-08-27 #338097

Merged
zowoq merged 5 commits intoNixOS:masterfrom
qowoz:hydra
Aug 29, 2024
Merged

hydra: 2024-08-20 -> 0-unstable-2024-08-27 #338097
zowoq merged 5 commits intoNixOS:masterfrom
qowoz:hydra

Conversation

@zowoq
Copy link
Contributor

@zowoq zowoq commented Aug 29, 2024

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.11 Release Notes (or backporting 23.11 and 24.05 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 6.topic: haskell General-purpose, statically typed, purely functional programming language 8.has: module (update) This PR changes an existing module in `nixos/` labels Aug 29, 2024
@ofborg ofborg bot added 8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package labels Aug 29, 2024
@ofborg ofborg bot requested review from Conni2461, Mindavi and dasJ August 29, 2024 05:05
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Aug 29, 2024
Copy link
Contributor

Choose a reason for hiding this comment

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

It would be nice if we could still override nix, sometimes I use an overlay to quickly verify some hydra patches and it could happen that nix also needed overriding then. Of course nixVersions.nix_2_22 = nixVersions.nix_2_24 might work, but it doesn't feel great...

Not the highest priority, we can let it go if we don't find a satisfactory solution.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, better to keep that around. Still using all-packages seems to be fine according to the docs.

So instead it is preferable to use the same generic parameter name `libbar`
and override its value in [`pkgs/top-level/all-packages.nix`](../top-level/all-packages.nix):

Such packages may still be moved to `pkgs/by-name` however, while keeping the definition in `all-packages.nix`.

Copy link
Contributor

@Mindavi Mindavi left a comment

Choose a reason for hiding this comment

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

One thing, but I don't want to block on that.

@Mindavi
Copy link
Contributor

Mindavi commented Aug 29, 2024

Even better, thanks ♥️. LGTM.

@ofborg ofborg bot requested a review from Mindavi August 29, 2024 06:15
@zowoq zowoq merged commit 18e404b into NixOS:master Aug 29, 2024
@zowoq zowoq deleted the hydra branch August 29, 2024 07:49
''
find /var/lib/hydra/build-logs -type f -name "*.drv" -mtime +3 -size +0c | xargs -r bzip2 -v -f
set -eou pipefail
compression=$(sed -nr 's/compress_build_logs_compression = ()/\1/p' ${baseDir}/hydra.conf)
Copy link
Member

Choose a reason for hiding this comment

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

We need a default value when compress_build_logs_compression is not configured.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

github-merge-queue bot pushed a commit that referenced this pull request Dec 16, 2025
The entry in `all-packages.nix` was left in while moving to `by-name` with a
[reference to the docs]. This recommendation had [since changed] and this
commit aligns the expression with the new recommendation.

[reference to the docs]: #338097 (comment)
[since changed]: 4664ae4
barsikus007 pushed a commit to barsikus007/nixpkgs that referenced this pull request Dec 16, 2025
The entry in `all-packages.nix` was left in while moving to `by-name` with a
[reference to the docs]. This recommendation had [since changed] and this
commit aligns the expression with the new recommendation.

[reference to the docs]: NixOS#338097 (comment)
[since changed]: NixOS@4664ae4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: haskell General-purpose, statically typed, purely functional programming language 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: clean-up This PR removes packages or removes other cruft 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package 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.

4 participants