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

Update nix and use an overlay #446

Merged
merged 1 commit into from
Aug 15, 2023
Merged

Conversation

saschagrunert
Copy link
Member

@saschagrunert saschagrunert commented Aug 15, 2023

This will:

  • Fix and run make nixpkgs to update the dependencies
  • Reduce duplication by using overlay.nix
  • Pushed manually to cachix to refresh the build cache
  • Switched to pcre2 instead of pcre
  • Removed static.nix, since it's not required any more

All CI binaries look sane:

> file *
conmon_0: ELF 64-bit LSB executable, x86-64, version 1 (SYSV), statically linked, for GNU/Linux 3.10.0, stripped
conmon_1: ELF 64-bit LSB executable, ARM aarch64, version 1 (SYSV), statically linked, for GNU/Linux 3.10.0, stripped
conmon_2: ELF 64-bit LSB executable, 64-bit PowerPC or cisco 7500, OpenPOWER ELF V2 ABI, version 1 (SYSV), statically linked, for GNU/Linux 3.10.0, stripped
conmon_3: ELF 64-bit LSB executable, UCB RISC-V, RVC, double-float ABI, version 1 (SYSV), statically linked, for GNU/Linux 4.15.0, stripped

This will:

- Fix and run `make nixpkgs` to update the dependencies
- Reduce duplication by using `overlay.nix`
- Pushed manually to cachix to refresh the build cache
- Switched to `pcre2` instead of `pcre`
- Removed `static.nix`, since it's not required any more

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
@haircommander haircommander merged commit b0bdc23 into containers:main Aug 15, 2023
@saschagrunert saschagrunert deleted the nix branch August 15, 2023 13:34
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