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

oq: fix build #99040

Merged
merged 1 commit into from Oct 10, 2020
Merged

oq: fix build #99040

merged 1 commit into from Oct 10, 2020

Conversation

@risicle
Copy link
Contributor

@risicle risicle commented Sep 28, 2020

Motivation for this change

ZHF: #97479

A libyaml upgrade broke some overly strict tests in oq. Add a patch from upstream to make these more lenient.

This patch is actually included in the already-released oq 1.1.2, but we can't upgrade to that because it requires crystal 0.35, which we don't seem to have yet.

Also enable for darwin because it WFM macos 10.14.

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.
this patch is actually included in the already-released oq 1.1.2, but we
can't upgrade to that because it requires crystal 0.35, which we don't
seem to have yet

enable for darwin
@risicle risicle force-pushed the risicle:ris-oq-fix branch from 3fd69b6 to 892712e Sep 29, 2020
@markuskowa markuskowa merged commit ae5eda2 into NixOS:master Oct 10, 2020
19 checks passed
19 checks passed
tests tests
Details
action
Details
oq, oq.passthru.tests on aarch64-linux No attempt
Details
Evaluation Performance Report Evaluator Performance Report
Details
Wait for ofborg
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="892712e"; rev="892712e26052114ec46b786ce69f405d44d20ce2"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="892712e"; rev="892712e26052114ec46b786ce69f405d44d20ce2"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="892712e"; rev="892712e26052114ec46b786ce69f405d44d20ce2"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="892712e"; rev="892712e26052114ec46b786ce69f405d44d20ce2"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="892712e"; rev="892712e26052114ec46b786ce69f405d44d20ce2"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="892712e"; rev="892712e26052114ec46b786ce69f405d44d20ce2"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="892712e"; rev="892712e26052114ec46b786ce69f405d44d20ce2"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
oq, oq.passthru.tests on x86_64-linux Success
Details
@risicle risicle mentioned this pull request Oct 10, 2020
4 of 10 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.