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

Jump to bottom

lttng-ust: python2 => python3 #108682

Merged
merged 1 commit into from Jan 7, 2021
Merged

lttng-ust: python2 => python3 #108682

merged 1 commit into from Jan 7, 2021

Conversation

NobbZ
Copy link
Contributor

@NobbZ NobbZ commented Jan 7, 2021

Motivation for this change

I realized that there was still a python 2 rolling through when building my home config.

Python 2 is EOL since February 2020 and shouldn't be used anymore.

Therefore I have hunted down this transitive dependency and updated its inputs accordingly.

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.
$ ./result/bin/lttng-gen-tp --help

 lttng-gen-tp - Generate the LTTng-UST header and source based on a simple template

 usage: lttng-gen-tp TEMPLATE_FILE [-o OUTPUT_FILE][-o OUTPUT_FILE]

 If no OUTPUT_FILE is given, the .h and .c file will be generated.
 (The basename of the template file with be used for the generated file.
  for example sample.tp will generate sample.h, sample.c and sample.o)

 When using the -o option, the OUTPUT_FILE must end with either .h, .c or .o
 The -o option can be repeated multiple times.

 The template file must contains TRACEPOINT_EVENT and TRACEPOINT_LOGLEVEL
 as per defined in the lttng/tracepoint.h file.
 See the lttng-ust(3) man page for more details on the format.

$ nix path-info -Ss  # before
/nix/store/d4k4zis25zmhb02ggcnv0dxqi115g4gp-lttng-ust-2.10.5        1433200       107057992
$ nix path-info -Ss  # after
/nix/store/wj71mpz1v2i0v6hkag60967q700x172z-lttng-ust-2.10.5        1433200       112641288

Despite the fact that the actual closure size increases, it is probably a netshrink, as we reduce the number of occasions that pull in python 2.

nix-review is still building ceph. Another 3 to go after that. So far only a single fail, which does currently fail on master even without this change:

$ hydra-check --channel master coreclr
Build Status for coreclr.x86_64-linux on master
✖ (Failed) coreclr-2.0.7 from 2021-01-03 - https://hydra.nixos.org/build/134237825

§ nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
$ git -c fetch.prune=false fetch --force https://github.com/NixOS/nixpkgs master:refs/nixpkgs-review/0
From https://github.com/NixOS/nixpkgs
   a9fe5fa39fd..e44a4abdbeb  master     -> refs/nixpkgs-review/0
$ git worktree add /home/nmelzer/.cache/nixpkgs-review/rev-e44a4abdbeb479a6cff041a80be9ec9e2cfa78ce-dirty/nixpkgs e44a4abdbeb479a6cff041a80be9ec9e2cfa78ce
Preparing worktree (detached HEAD e44a4abdbeb)
Updating files: 100% (23805/23805), done.
HEAD is now at e44a4abdbeb zfs: 2.0.0 -> 2.0.1
$ nix-env -f /home/nmelzer/.cache/nixpkgs-review/rev-e44a4abdbeb479a6cff041a80be9ec9e2cfa78ce-dirty/nixpkgs -qaP --xml --out-path --show-trace
Applying `nixpkgs` diff...
$ nix-env -f /home/nmelzer/.cache/nixpkgs-review/rev-e44a4abdbeb479a6cff041a80be9ec9e2cfa78ce-dirty/nixpkgs -qaP --xml --out-path --show-trace --meta
16 packages updated:
bareos ceph ceph ceph-client codeql coreclr lttng-tools lttng-tools lttng-ust lttng-ust osu-lazer powershell samba vscode-extension-ms-python-python vscode-extension-ms-vsliveshare-vsliveshare zoxide

$ nix --experimental-features nix-command build --no-link --keep-going --option build-use-sandbox relaxed -f /home/nmelzer/.cache/nixpkgs-review/rev-e44a4abdbeb479a6cff041a80be9ec9e2cfa78ce-dirty/build.nix
error: --- Error --- nix-daemon
builder for '/nix/store/r09hyccbw7hlzk04pzx75kpz0l4vzcms-coreclr-2.0.7.drv' failed with exit code 1; last 10 log lines:
  [  3%] Building ASM object src/pal/src/CMakeFiles/coreclrpal.dir/arch/amd64/context2.S.o
  [  3%] Building ASM object src/pal/src/CMakeFiles/coreclrpal.dir/arch/amd64/debugbreak.S.o
  [  3%] Building ASM object src/pal/src/CMakeFiles/coreclrpal.dir/arch/amd64/exceptionhelper.S.o
  [  3%] Building CXX object src/pal/src/CMakeFiles/coreclrpal.dir/arch/amd64/processor.cpp.o
  [  3%] Building ASM object src/pal/src/CMakeFiles/coreclrpal.dir/arch/amd64/callsignalhandlerwrapper.S.o
  [  3%] Building CXX object src/pal/src/CMakeFiles/coreclrpal.dir/arch/amd64/signalhandlerhelper.cpp.o
  [  3%] Linking CXX static library libcoreclrpal.a
  [  3%] Built target coreclrpal
  make: *** [Makefile:149: all] Error 2
  Failed to build CoreCLR component.
# build progress display

(§ represents my prompt, $ is as emitted by nix-review)

Also I have already rebuild powershell with the updated lttng-ust. No malfunction observable in a shallow test.

@NobbZ
lttng-ust: python2 => python3
701ece6 
whitespace cleanup
@ofborg ofborg bot requested a review from bjornfor January 7, 2021 15:23
@SuperSandro2000
Copy link
Member

This is a semi-automatic executed nixpkgs-review which does not build all packages (e.g. lumo, tensorflow or pytorch)
If you find some bugs or got suggestions for further things to search or run please reach out to SuperSandro2000 on IRC.

Result of nixpkgs-review pr 108682 run on x86_64-linux 1

1 package failed to build and are new build failure:
8 packages built:
  • codeql
  • lttng-tools
  • lttng-ust
  • osu-lazer
  • powershell
  • vscode-extensions.ms-python.python
  • vscode-extensions.ms-vsliveshare.vsliveshare
  • zoxide

@SuperSandro2000 SuperSandro2000 merged commit 4e56648 into NixOS:master Jan 7, 2021
@SuperSandro2000
Copy link
Member

This is a semi-automatic executed nixpkgs-review which does not build all packages (e.g. lumo, tensorflow or pytorch)
If you find some bugs or got suggestions for further things to search or run please reach out to SuperSandro2000 on IRC.

Result of nixpkgs-review pr 108682 run on x86_64-linux 1

1 package failed to build and are new build failure:
8 packages built:
  • codeql
  • lttng-tools
  • lttng-ust
  • osu-lazer
  • powershell
  • vscode-extensions.ms-python.python
  • vscode-extensions.ms-vsliveshare.vsliveshare
  • zoxide

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bjornfor bjornfor bjornfor approved these changes

@thiagokokada thiagokokada thiagokokada approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@NobbZ @SuperSandro2000 @bjornfor @thiagokokada