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

beluga: 20180403 -> unstable-2020-03-11 #84535

Merged
merged 4 commits into from Apr 20, 2020
Merged

Conversation

bcdarwin
Copy link
Member

@bcdarwin bcdarwin commented Apr 7, 2020

Motivation for this change

Update a package and perform some necesary dependency updates.

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.

Copy link
Contributor

@JeffLabonte JeffLabonte left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Beluge builds but there is a package that doesn't:

$ nix build --no-link --keep-going --option build-use-sandbox relaxed -f /home/jflabonte/.cache/nixpkgs-review/pr-84535-1/build.nix
warning: ignoring the user-specified setting 'sandbox', because it is a restricted setting and you are not a trusted user
builder for '/nix/store/vibsabsv18yqm7wm0jlgmjcjf7r4k0k4-ocaml4.07.1-iri-0.4.0.drv' failed with exit code 2; last 10 log lines:
  building
  build flags: SHELL=/nix/store/ffli6m23501dkiznwlkf6n4xvrj02snr-bash-4.4-p23/bin/bash
  ocamlfind ocamlc -c -package sedlex,uutf,uunf.string -annot -bin-annot -safe-string -g iri_types.mli
  ocamlfind ocamlc -c -package sedlex,uutf,uunf.string -annot -bin-annot -safe-string -g iri_lexer.mli
  ocamlfind ocamlc -c -package sedlex,uutf,uunf.string -annot -bin-annot -safe-string -g iri.mli
  ocamlfind ocamlc -c -package sedlex,uutf,uunf.string -annot -bin-annot -safe-string -g iri_types.ml
  ocamlfind ocamlc -c -package sedlex,uutf,uunf.string -annot -bin-annot -safe-string -g iri_lexer.ml
  File "iri_lexer.ml", line 28, characters 14-27:
  Error: Uninterpreted extension 'sedlex.regexp'.
  make: *** [Makefile:69: iri_lexer.cmo] Error 2
cannot build derivation '/nix/store/ih4lpbqkkj7lnycj97h429mgh3dfhs78-ocaml4.07.1-xtmpl-0.17.0.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/x4113ahjknniq7pnwmhkzv08pp3hkwb2-higlo-0.6.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/aqal70g25991a94x573385bxhlyx1ddq-stog-0.18.0.drv': 2 dependencies couldn't be built
[1/0/2 built (1 failed)] building ocaml4.07.1-beluga-unstable-20200311 (checkPh[1/0/2 built (1 failed)] building ocaml4.07.1-beluga-unstable-20200311 (fixupPhcannot build derivation '/nix/store/qq2qrql10v195krcxazwl3wzrf12pa29-env.drv': 1 dependencies couldn't be built
[1 built (1 failed)]
error: build of '/nix/store/qq2qrql10v195krcxazwl3wzrf12pa29-env.drv' failed
https://github.com/NixOS/nixpkgs/pull/84535
1 package failed to build:
stog

1 package built:
beluga

meta = with lib; {
inherit (dune_2.meta) homepage;
description = "Embed build information inside executables";
maintainers = [ maintainers.bcdarwin ];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could write `with maintainers; [ bcdarwin ];

pkgs/development/ocaml-modules/sedlex/default.nix Outdated Show resolved Hide resolved
@bcdarwin
Copy link
Member Author

bcdarwin commented Apr 7, 2020

Hmm, I thought ocamlPackages.iri (hence ocamlPackages.xtmpl and hence stog) were previously broken but that doesn't seem to be the case.

I guess the best solution here is to add a sedlex/1.x expression? [edit: there's already a 2.nix]

@bcdarwin
Copy link
Member Author

bcdarwin commented Apr 7, 2020

@JeffLabonte -- updated the PR so as not to touch sedlex, fixing the build.

Copy link
Contributor

@JeffLabonte JeffLabonte left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review-may-2019/3032/140

@bcdarwin bcdarwin changed the title beluga: 20180403 -> unstable-20200311 beluga: 20180403 -> unstable-2020-03-11 Apr 20, 2020
@bhipple
Copy link
Contributor

bhipple commented Apr 20, 2020

Result of nixpkgs-review pr 84535 1

49 packages marked as broken and skipped:
- clang-sierraHack-stdenv
- crossLibcStdenv
- digitalbitbox
- gdata-sharp
- iterm2
- linuxPackages.sch_cake
- linuxPackages_4_14.sch_cake
- linuxPackages_4_4.evdi
- linuxPackages_4_4.sysdig
- linuxPackages_4_4.zenpower
- linuxPackages_4_9.sysdig
- linuxPackages_4_9.zenpower
- linuxPackages_5_6.sch_cake
- linuxPackages_hardkernel_4_14.bcc
- linuxPackages_hardkernel_4_14.bpftrace
- linuxPackages_hardkernel_4_14.can-isotp
- linuxPackages_hardkernel_4_14.chipsec
- linuxPackages_hardkernel_4_14.digimend
- linuxPackages_hardkernel_4_14.evdi
- linuxPackages_hardkernel_4_14.mba6x_bl
- linuxPackages_hardkernel_4_14.nvidia_x11
- linuxPackages_hardkernel_4_14.nvidia_x11_legacy390
- linuxPackages_hardkernel_4_14.prl-tools
- linuxPackages_hardkernel_4_14.r8125
- linuxPackages_hardkernel_4_14.r8168
- linuxPackages_hardkernel_4_14.rtl8814au
- linuxPackages_hardkernel_4_14.rtl8821au
- linuxPackages_hardkernel_4_14.rtl8821ce
- linuxPackages_hardkernel_4_14.rtlwifi_new
- linuxPackages_hardkernel_4_14.sysdig
- linuxPackages_hardkernel_4_14.v4l2loopback
- linuxPackages_hardkernel_4_14.vhba
- linuxPackages_hardkernel_4_14.wireguard
- linuxPackages_hardkernel_4_14.zenpower
- linuxPackages_latest_hardened.sch_cake
- linuxPackages_xen_dom0_hardened.sch_cake
- muslCross
- newlibCross
- ocamlPackages.stog
- octoprint
- php74Extensions.couchbase
- python27Packages.flitBuildHook
- python27Packages.libmodulemd
- python37Packages.nixpart
- python37Packages.notify
- python38Packages.libselinux
- python38Packages.nixpart
- python38Packages.poezio
- qes
5 packages built:
- beluga
- flow
- ocamlPackages.dune-build-info
- ocamlPackages.linenoise
- ocamlPackages.sedlex_2

@bhipple bhipple merged commit e4db75f into NixOS:master Apr 20, 2020
@bcdarwin bcdarwin deleted the update-beluga branch April 20, 2020 02:55
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.

None yet

4 participants