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

snabb: fix build #203205

Merged
merged 1 commit into from
Nov 29, 2022
Merged

snabb: fix build #203205

merged 1 commit into from
Nov 29, 2022

Conversation

seanrmurphy
Copy link
Contributor

@seanrmurphy seanrmurphy commented Nov 27, 2022

Description of changes
  • Fixed the build for ZHF (🦝 NixOS 22.11 - Zero Hydra Failures #199919) at #ZurichZHF :)
  • Version bump from 2019.11 to 2022.10
  • Remove prePatch substitutions as these were causing build failure
  • More cleanups to nix file based on feedback from @lukego @risicle
    • removed openstack refs
    • removed parallel build content
    • removed pre build make clean
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, 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/)
  • 22.11 Release Notes (or backporting 22.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@risicle
Copy link
Contributor

risicle commented Nov 27, 2022

The supportOpenstack arg now no longer does anything.

@lukego
Copy link
Contributor

lukego commented Nov 28, 2022

Hey nice work @seanrmurphy!

Hey in this post-OpenStack era I think that we could prune quite a few dependencies back. The parallel build failure workaround doesn't seem needed anymore either.

Maybe something like this? (Builds okay for me.)

{ stdenv, lib, fetchFromGitHub }:

stdenv.mkDerivation rec {
  pname = "snabb";
  version = "2022.10";

  src = fetchFromGitHub {
    owner = "snabbco";
    repo = "snabb";
    rev = "v${version}";
    sha256 = "GIIW+2/1fuHTmYev/QvuO5Yb2ozbyw/45qQkym36US8=";
  };

  installPhase = ''
    mkdir -p $out/bin
    cp src/snabb $out/bin
  '';

  meta = <unchanged>;
}

@seanrmurphy
Copy link
Contributor Author

Thanks for feedback @lukego @risicle - modified as suggested; tested build locally and everything seems in order.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants