Skip to content

nixVersions.nix_2_24: 2.24.5 → 2.24.6, nixVersions.latest: nix_2_23 → nix_2_24#341007

Merged
Lassulus merged 5 commits intoNixOS:masterfrom
Mic92:nix-bump
Sep 10, 2024
Merged

nixVersions.nix_2_24: 2.24.5 → 2.24.6, nixVersions.latest: nix_2_23 → nix_2_24#341007
Lassulus merged 5 commits intoNixOS:masterfrom
Mic92:nix-bump

Conversation

@Mic92
Copy link
Member

@Mic92 Mic92 commented Sep 10, 2024 •
edited
Loading

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin (except -git)
    • 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.

@Mic92 Mic92 requested review from a team and RaitoBezarius as code owners September 10, 2024 13:14
@Mic92 Mic92 removed the request for review from RaitoBezarius September 10, 2024 13:14
@Mic92 Mic92 added 1.severity: security Issues which raise a security issue, or PRs that fix one backport release-24.05 labels Sep 10, 2024
@Mic92
Copy link
Member Author

Mic92 commented Sep 10, 2024

Currently on a bus, so compiling on all platforms is difficult.

@Aleksanaa Aleksanaa requested a review from a team September 10, 2024 13:34
@Mic92
Copy link
Member Author

Mic92 commented Sep 10, 2024 •
edited
Loading

  • one check on aarch64-linux nixVersions.git currently fail, but I will probably just disable installChecks for now.

@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Sep 10, 2024
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Sep 10, 2024
@khaneliman
Copy link
Contributor

khaneliman commented Sep 10, 2024

Result of nixpkgs-review pr 341007 run on x86_64-linux 1

16 packages built:
  • colmena
  • harmonia
  • nil
  • nix-eval-jobs
  • nix-fast-build
  • nix-fast-build.dist
  • nixVersions.git
  • nixVersions.git.debug
  • nixVersions.git.dev
  • nixVersions.git.doc
  • nixVersions.git.man
  • nixVersions.latest (nixVersions.nix_2_24)
  • nixVersions.latest.debug (nixVersions.nix_2_24.debug)
  • nixVersions.latest.dev (nixVersions.nix_2_24.dev)
  • nixVersions.latest.doc (nixVersions.nix_2_24.doc)
  • nixVersions.latest.man (nixVersions.nix_2_24.man)

@khaneliman
Copy link
Contributor

khaneliman commented Sep 10, 2024

Result of nixpkgs-review pr 341007 run on aarch64-darwin 1

14 packages built:
  • colmena
  • harmonia
  • nil
  • nix-eval-jobs
  • nix-fast-build
  • nix-fast-build.dist
  • nixVersions.git
  • nixVersions.git.dev
  • nixVersions.git.doc
  • nixVersions.git.man
  • nixVersions.latest (nixVersions.nix_2_24)
  • nixVersions.latest.dev (nixVersions.nix_2_24.dev)
  • nixVersions.latest.doc (nixVersions.nix_2_24.doc)
  • nixVersions.latest.man (nixVersions.nix_2_24.man)

@Mic92
Copy link
Member Author

Mic92 commented Sep 10, 2024

Found a compilation error on nixVersions.git x86_64-darwin. Investigating

@domenkozar
Copy link
Member

domenkozar commented Sep 10, 2024

Found a compilation error on nixVersions.git x86_64-darwin. Investigating

Most likely NixOS/nix@0395ff9 as I've hit it too?

@Mic92
Copy link
Member Author

Mic92 commented Sep 10, 2024

Found a compilation error on nixVersions.git x86_64-darwin. Investigating

Most likely NixOS/nix@0395ff9 as I've hit it too?

Afaik we are already doing this in nixpkgs.

@FlameFlag
Copy link
Member

FlameFlag commented Sep 10, 2024

Result of nixpkgs-review pr 341007 run on aarch64-darwin 1

18 packages built:
  • colmena
  • harmonia
  • nil
  • nix-eval-jobs
  • nix-fast-build
  • nix-fast-build.dist
  • nixVersions.git
  • nixVersions.git.dev
  • nixVersions.git.doc
  • nixVersions.git.man
  • nixVersions.latest
  • nixVersions.latest.dev
  • nixVersions.latest.doc
  • nixVersions.latest.man
  • nixVersions.nix_2_23
  • nixVersions.nix_2_23.dev
  • nixVersions.nix_2_23.doc
  • nixVersions.nix_2_23.man

@Mic92
Copy link
Member Author

Mic92 commented Sep 10, 2024

The odd thing it only fails in the nix build on x86_64-darwin, but not outside:

nix-x86_64-darwin> src/libutil/args.hh:116:17: error: no type named 'path' in namespace 'std::filesystem'; did you mean 'Path'?
nix-x86_64-darwin>         Handler(std::filesystem::path * dest)
nix-x86_64-darwin>                 ^~~~~~~~~~~~~~~~~~~~~
nix-x86_64-darwin>                 Path

@Mic92
Copy link
Member Author

Mic92 commented Sep 10, 2024

Clang too old? Wrong c++ version?

@khaneliman
Copy link
Contributor

khaneliman commented Sep 10, 2024

@reckenrode @emilazy Maybe will have good insight on that kind of stuff

@Mic92
Copy link
Member Author

Mic92 commented Sep 10, 2024 •
edited
Loading

could be a missing include, I give it a second try.

@Kamillaova
Copy link
Contributor

Kamillaova commented Sep 10, 2024 •
edited
Loading

Can you just ask someone with push access to the nix repository to upstream x86_64-darwin fix? I think it could be quick

Mic92
Mic92 commented Sep 10, 2024
View reviewed changes
@khaneliman
Copy link
Contributor

khaneliman commented Sep 10, 2024

Result of nixpkgs-review pr 341007 run on x86_64-darwin 1

18 packages built:
  • colmena
  • harmonia
  • nil
  • nix-eval-jobs
  • nix-fast-build
  • nix-fast-build.dist
  • nixVersions.git
  • nixVersions.git.dev
  • nixVersions.git.doc
  • nixVersions.git.man
  • nixVersions.latest
  • nixVersions.latest.dev
  • nixVersions.latest.doc
  • nixVersions.latest.man
  • nixVersions.nix_2_23
  • nixVersions.nix_2_23.dev
  • nixVersions.nix_2_23.doc
  • nixVersions.nix_2_23.man

@khaneliman khaneliman mentioned this pull request Sep 10, 2024
Merged
@khaneliman
Copy link
Contributor

khaneliman commented Sep 10, 2024

@Mic92 looks like fix got merged upstream if you wanna remove patch and bump the git version?

@Mic92
Copy link
Member Author

Mic92 commented Sep 10, 2024

This is good to merge from my side.

@Mic92
Copy link
Member Author

Mic92 commented Sep 10, 2024

@ofborg build nix

@Mic92
Copy link
Member Author

Mic92 commented Sep 10, 2024

@ofborg build nixVersions.git

@Mic92
Copy link
Member Author

Mic92 commented Sep 10, 2024

@ofborg build nixVersions.latest

@khaneliman
Copy link
Contributor

khaneliman commented Sep 10, 2024

Result of nixpkgs-review pr 341007 run on x86_64-darwin 1

18 packages built:
  • colmena
  • harmonia
  • nil
  • nix-eval-jobs
  • nix-fast-build
  • nix-fast-build.dist
  • nixVersions.git
  • nixVersions.git.dev
  • nixVersions.git.doc
  • nixVersions.git.man
  • nixVersions.latest
  • nixVersions.latest.dev
  • nixVersions.latest.doc
  • nixVersions.latest.man
  • nixVersions.nix_2_23
  • nixVersions.nix_2_23.dev
  • nixVersions.nix_2_23.doc
  • nixVersions.nix_2_23.man

@khaneliman
Copy link
Contributor

khaneliman commented Sep 10, 2024

Result of nixpkgs-review pr 341007 run on aarch64-darwin 1

18 packages built:
  • colmena
  • harmonia
  • nil
  • nix-eval-jobs
  • nix-fast-build
  • nix-fast-build.dist
  • nixVersions.git
  • nixVersions.git.dev
  • nixVersions.git.doc
  • nixVersions.git.man
  • nixVersions.latest
  • nixVersions.latest.dev
  • nixVersions.latest.doc
  • nixVersions.latest.man
  • nixVersions.nix_2_23
  • nixVersions.nix_2_23.dev
  • nixVersions.nix_2_23.doc
  • nixVersions.nix_2_23.man

@khaneliman
Copy link
Contributor

khaneliman commented Sep 10, 2024

Result of nixpkgs-review pr 341007 run on x86_64-linux 1

21 packages built:
  • colmena
  • harmonia
  • nil
  • nix-eval-jobs
  • nix-fast-build
  • nix-fast-build.dist
  • nixVersions.git
  • nixVersions.git.debug
  • nixVersions.git.dev
  • nixVersions.git.doc
  • nixVersions.git.man
  • nixVersions.latest
  • nixVersions.latest.debug
  • nixVersions.latest.dev
  • nixVersions.latest.doc
  • nixVersions.latest.man
  • nixVersions.nix_2_23
  • nixVersions.nix_2_23.debug
  • nixVersions.nix_2_23.dev
  • nixVersions.nix_2_23.doc
  • nixVersions.nix_2_23.man

@Lassulus Lassulus merged commit 1214336 into NixOS:master Sep 10, 2024
@github-actions
Copy link
Contributor

github-actions bot commented Sep 10, 2024

Backport failed for release-24.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.05
git worktree add -d .worktree/backport-341007-to-release-24.05 origin/release-24.05
cd .worktree/backport-341007-to-release-24.05
git switch --create backport-341007-to-release-24.05
git cherry-pick -x b576c486ef2e94feba02f93a4544eb6f392223a0 dfaef71403faaa8d79b487c26d980e051678c607 3986d6976bd418f24737acd6938291e69ddfa43b 9103a4d978ddc60e165fa26b22a471b7d50840fd 74787857f812116406bf53c56b16ba2c1df55ace

@Mic92 Mic92 deleted the nix-bump branch September 10, 2024 16:26
@Mic92
Copy link
Member Author

Mic92 commented Sep 10, 2024

#341049

@fabianhjr fabianhjr changed the title nix 2.24 bump nixVersions.nix_2_24: 2.24.5 → 2.24.6, nixVersions.latest: nix_2_23 → nix_2_24 Sep 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@emilazy emilazy emilazy left review comments

@Aleksanaa Aleksanaa Aleksanaa left review comments

@edolstra edolstra Awaiting requested review from edolstra

@Artturin Artturin Awaiting requested review from Artturin

@lovesegfault lovesegfault Awaiting requested review from lovesegfault

Assignees

No one assigned

Labels

1.severity: security Issues which raise a security issue, or PRs that fix one 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-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

9 participants

@Mic92 @khaneliman @domenkozar @FlameFlag @Kamillaova @edolstra @emilazy @Aleksanaa @Lassulus