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.

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

Nix improvements backports for 1.35 #4868

Merged
merged 4 commits into from
Feb 23, 2023
Merged

Conversation

jbgi
Copy link
Contributor

@jbgi jbgi commented Feb 8, 2023

No description provided.

@jbgi jbgi changed the title Nix improvements backports Nix improvements backports for 1.35 Feb 8, 2023
 to avoid unnecessary builds of big artifact, like dockerImages.
 Goal: bors ci build should not build anything if branch is up-to-date
 and ci pass.

 Some other minor clean-ups.
it was introduced for adding flake flags by default and also as a
work around for nix flake show/check: NixOS/nix#4265
But the added complexity is not worth it, given it breaks other
workflows with nix run (since the wrapper script does not use `exec`).

Also nowadays everyone (should) have flake activated by default in the nix config.
 because this lead to duplicates PATH entries for cardano-cli, cardano-node, etc.
 with one having gitrev set and the other not set.
@disassembler
Copy link
Contributor

Bors r+

iohk-bors bot added a commit that referenced this pull request Feb 23, 2023
4868: Nix improvements backports for 1.35 r=disassembler a=jbgi



Co-authored-by: Jean-Baptiste Giraudeau <[email protected]>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Feb 23, 2023

Timed out.

@jbgi
Copy link
Contributor Author

jbgi commented Feb 23, 2023

bors retry

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Feb 23, 2023

Build succeeded:

@iohk-bors iohk-bors bot merged commit 07b0c71 into release/1.35 Feb 23, 2023
@iohk-bors iohk-bors bot deleted the nix-improvements-backports branch February 23, 2023 17:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants