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

hydra: 2020-03-24 -> 2020-04-07 #84501

Merged
merged 1 commit into from Apr 8, 2020
Merged

hydra: 2020-03-24 -> 2020-04-07 #84501

merged 1 commit into from Apr 8, 2020

Conversation

Ma27
Copy link
Member

@Ma27 Ma27 commented Apr 6, 2020 •
edited

Motivation for this change

Upgrades Hydra to the latest git revs, also fixes the build of hydra-unstable (https://hydra.nixos.org/build/116209553).

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs 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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@Ma27 Ma27 added the 9.needs: port to stable A PR needs a backport to the stable release. label Apr 6, 2020
@Ma27 Ma27 added this to the 20.03 milestone Apr 6, 2020
@Ma27 Ma27 mentioned this pull request Apr 6, 2020
Closed
@knedlsepp
Copy link
Member

Could this be the reason why I've been getting segmentation faults after completing the hydra migration?

@Mic92 Mic92 mentioned this pull request Apr 7, 2020
Closed
@Ma27
Copy link
Member Author

Ma27 commented Apr 7, 2020

So, the flake changes have been merged into master (which also fixed the build any made my PR obsolete). Will update the PR accordingly today.

Could this be the reason why I've been getting segmentation faults after completing the hydra migration?

Uhm what? I'm not sure tbh since those issues appeared after the latest nixUnstable bump. Which package are you using now? And when did that happen?

@Ma27
hydra: 2020-03-24 -> 2020-04-07
0f5c38f 
Also removed `pkgs.hydra-flakes` since flake-support has been merged
into master[1]. Because of that, `pkgs.hydra-unstable` is now compiled
against `pkgs.nixFlakes` and currently requires a patch since Hydra's
master doesn't compile[2] atm.

[1] NixOS/hydra#730
[2] NixOS/hydra#732
@Ma27 Ma27 changed the title hydra: 2020-03-{24,27} -> 2020-{04-01,03-31} hydra: 2020-03-24 -> 2020-04-07 Apr 7, 2020
@Ma27 Ma27 requested a review from nlewo April 7, 2020 12:14
@Ma27
Copy link
Member Author

Ma27 commented Apr 7, 2020

Before merging, we should discuss though if we want to provide an older version of Hydra without flake-support, at least for 20.03 since this feature isn't stabilized or officially accepted.

@grahamc
Copy link
Member

grahamc commented Apr 7, 2020

In my personal opinion, I wouldn't worry about it. Users won't be able to use flake support in Hydra unless they go through the rigamarole of enabling it all in their local envs too, and by that point they should be well aware of it being experimental ... right? Just my $0.001.

@worldofpeace
Copy link
Contributor

In my personal opinion, I wouldn't worry about it. Users won't be able to use flake support in Hydra unless they go through the rigamarole of enabling it all in their local envs too, and by that point they should be well aware of it being experimental ... right? Just my $0.001.

That sounds correct to me also, but I don't really know how that will look in hydra. (:exclamation: this thing is experimental)

@worldofpeace
Copy link
Contributor

$0.001.

can you even withdraw that little physically? 😁

@grahamc
Copy link
Member

grahamc commented Apr 7, 2020

Only in Office Space, and even then the decimal place is in the wrong spot :)

@Ma27 Ma27 merged commit e8a4b9f into NixOS:master Apr 8, 2020
@Ma27 Ma27 deleted the bump-hydra branch April 8, 2020 18:08
@Ma27 Ma27 restored the bump-hydra branch April 8, 2020 18:08
@Ma27 Ma27 deleted the bump-hydra branch April 8, 2020 18:08
@knedlsepp
Copy link
Member

knedlsepp commented Apr 9, 2020 •
edited

We'll also need this on stable: https://hydra.nixos.org/job/nixos/release-20.03/nixos.tests.hydra.hydra-unstable.x86_64-linux #80379

@Ma27
Copy link
Member Author

Ma27 commented Apr 9, 2020

I'm aware of that :)
The thing is, yesterday there was llvm broken on 20.03, so I couldn't properly test my backport. My local release-20.03 already has the latest Hydra, I'll push this as soon as I tested it sufficiently :)

@Ma27
Copy link
Member Author

Ma27 commented Apr 9, 2020

@knedlsepp backported as c25e25f. If you want to use it now, you may need some patience though, I had to compile rustc, cargo and nix locally.

@Ma27 Ma27 added 8.has: port to stable A PR already has a backport to the stable release. and removed 9.needs: port to stable A PR needs a backport to the stable release. labels Apr 9, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@grahamc grahamc Awaiting requested review from grahamc

@worldofpeace worldofpeace Awaiting requested review from worldofpeace

@nlewo nlewo Awaiting requested review from nlewo

Assignees
No one assigned
Labels
6.topic: nixos 8.has: changelog 8.has: clean-up 8.has: documentation 8.has: module (update) 8.has: port to stable A PR already has a backport to the stable release. 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 11.by: package-maintainer
Projects
None yet
Milestone
20.03
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Ma27 @knedlsepp @grahamc @worldofpeace