Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

nixUnstable: 2.4pre20210802_47e96bb -> 2.4pre20210908_3c56f62 #136463

Merged
merged 1 commit into from
Sep 11, 2021
Merged

nixUnstable: 2.4pre20210802_47e96bb -> 2.4pre20210908_3c56f62 #136463

merged 1 commit into from
Sep 11, 2021

Conversation

Ma27
Copy link
Member

@Ma27 Ma27 commented Sep 2, 2021 •
edited
Loading

Motivation for this change

⚠️ Caution: I'd like to test this on my workstation for a while before merging this :)

Main motivation for is the bugfix regarding flake-follows and
path-inputs[1]. An overview over all changes - mostly bugfixes -
can be found on GitHub[2].

[1] NixOS/nix#4641
[2] NixOS/nix@47e96bb...3c56f62

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes (or backporting 21.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.

@Ma27 Ma27 requested review from edolstra and happysalada September 2, 2021 12:28
@happysalada
Copy link
Contributor

I'm sure you are aware, but somebody is attempting something similar
#136271
He mentioned that he was waiting for upstream regarding a darwin issue.
I've just started a nixpkgs-review on my darwin machine.

@happysalada
Copy link
Contributor

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

3 packages failed to build:
  • nix-update
  • nixUnstable
  • nixpkgs-review

@happysalada
Copy link
Contributor

It's the same failure he originally had. If you're interested, he has a branch with a fix referenced on the PR. I think he is working with to upstream that fix.

@happysalada
Copy link
Contributor

Just for more information, here is the PR that was submitted upstream for the fix
NixOS/nix#5197
It's closed now, so I guess this will need to wait on upstream.

@Ma27
Copy link
Member Author

Ma27 commented Sep 3, 2021

I'm sure you are aware, but somebody is attempting something similar
#136271

Whoops, I actually missed it this time 😅

It's closed now, so I guess this will need to wait on upstream.

Let's do that and see how we'll proceed here, then.

@SuperSandro2000 SuperSandro2000 mentioned this pull request Sep 5, 2021
Closed
12 tasks
SuperSandro2000
SuperSandro2000 reviewed Sep 5, 2021
View reviewed changes
Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

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

some ideas from the other PR

pkgs/tools/package-management/nix/default.nix Outdated
@@ -234,13 +234,13 @@ in rec {
nixUnstable = lib.lowPrio (callPackage common rec {
pname = "nix";
version = "2.4${suffix}";
suffix = "pre20210802_47e96bb";
suffix = "pre20210902_77ca5e9";
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
suffix = "pre20210902_77ca5e9";
suffix = "pre20210902_${lib.substring 0 7 src.rev}";

see https://github.com/NixOS/nixpkgs/pull/136271/files#diff-b94b72b12e07bed8c4a3b4c50242499d5efb1e32797426d319574fd613bc07aeR243

pkgs/tools/package-management/nix/default.nix
@@ -234,13 +234,13 @@ in rec {
nixUnstable = lib.lowPrio (callPackage common rec {
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
nixUnstable = lib.lowPrio (callPackage common rec {
nixUnstable = lib.lowPrio (callPackage common rec {
# Update checklist
# - version
# - date
# - src rev/sha256
# - changes in upstream packaging
# git diff OLD..NEW -- $(find . -name \*.nix | grep -v test)

https://github.com/NixOS/nixpkgs/pull/136271/files#diff-b94b72b12e07bed8c4a3b4c50242499d5efb1e32797426d319574fd613bc07aeR235-R240

@ncfavier
Copy link
Member

ncfavier commented Sep 8, 2021

Any chance to jump to NixOS/nix@9180239 ? Or should I wait for this PR to get merged and open a new one?

Diff: NixOS/nix@77ca5e9...9180239

@happysalada
Copy link
Contributor

I think unfortunately that the current PR and a potential PR based off the commit you suggested, wouldn't solve the darwin compilation failure.
I think any kind of update is blocked until upstream solves it.

@Ma27
Copy link
Member Author

Ma27 commented Sep 8, 2021

I don't have a problem with going forward a bit more (when I filed the PR I just used the latest rev of master :)), it should be tested
by a few people before merging it.

However, the Darwin thing is indeed an issue, but neither do I own a Mac nor do I have the capacity to look into this currently. So @ncfavier I guess the easiest thing to do is to set nix.package = pkgs.nixUnstable.overrideAttrs (old: /* ... */) and modify the source accordingly if you really need the bugfix you linked (the only rebuild will be nixUnstable itself then and that doesn't take too much time, so it shouldn't be such a big deal).

@ncfavier
Copy link
Member

ncfavier commented Sep 8, 2021

Attempted fix: NixOS/nix#5225

@ncfavier
Copy link
Member

ncfavier commented Sep 8, 2021

And merged. We should be able to push this forward to NixOS/nix@3c56f62 now.

@Ma27
nixUnstable: 2.4pre20210802_47e96bb -> 2.4pre20210908_3c56f62
04b552c 
Main motivation for is the bugfix regarding flake-follows and
path-inputs[1]. An overview over all changes - mostly bugfixes -
can be found on GitHub[2].

[1] NixOS/nix#4641
[2] NixOS/nix@47e96bb...3c56f62
@Ma27 Ma27 changed the title nixUnstable: 2.4pre20210802_47e96bb -> 2.4pre20210902_77ca5e9 nixUnstable: 2.4pre20210802_47e96bb -> 2.4pre20210908_3c56f62 Sep 8, 2021
@Ma27
Copy link
Member Author

Ma27 commented Sep 8, 2021

@ncfavier done :)

@ncfavier
Copy link
Member

ncfavier commented Sep 8, 2021

Cool, I'm gonna test this for a few days

@Ma27
Copy link
Member Author

Ma27 commented Sep 8, 2021

Yup, I'm also rebuilding my system with this nixUnstable :)

I guess unless we'll run into issues here until let's say next Monday, I'd merge :)

@happysalada
Copy link
Contributor

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

3 packages built:
  • nix-update
  • nixUnstable
  • nixpkgs-review

@L-as
Copy link
Member

L-as commented Sep 11, 2021

Any blockers for this?

@ncfavier
Copy link
Member

No, I think we can merge

@SuperSandro2000 SuperSandro2000 merged commit 07db0ff into NixOS:master Sep 11, 2021
@Ma27 Ma27 deleted the bump-nixunstable branch September 11, 2021 17:04
@github-actions github-actions bot mentioned this pull request Sep 11, 2021
Merged
1 task
@github-actions
Copy link
Contributor

Successfully created backport PR #137409 for release-21.05.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

@edolstra edolstra Awaiting requested review from edolstra

@happysalada happysalada Awaiting requested review from happysalada

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Ma27 @happysalada @ncfavier @L-as @SuperSandro2000