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.

Sign up for GitHub

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

sourcetrail: 2019.3.46 -> 2020.2.43 #95530

Merged
merged 2 commits into from
Oct 27, 2020
Merged

sourcetrail: 2019.3.46 -> 2020.2.43 #95530

merged 2 commits into from
Oct 27, 2020

Conversation

midchildan
Copy link
Member

@midchildan midchildan commented Aug 15, 2020 •
edited
Loading

Motivation for this change
Things done
  • basic application functionality
  • static analyzer
    • C/C++
    • Java
    • Python
  • 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.

@midchildan midchildan changed the title [WIP] sourcetrail: 2019.3.46 -> 2020.2.43 sourcetrail: 2019.3.46 -> 2020.2.43 Aug 19, 2020
@midchildan midchildan marked this pull request as ready for review August 19, 2020 17:48
@midchildan
Copy link
Member Author

/marvin opt-in
/status needs_reviewer

@marvin-mk2 marvin-mk2 bot added the marvin This PR was reviewed by Marvin, a discontinued bot: https://github.com/timokau/marvin-mk2 label Aug 19, 2020
@marvin-mk2
Copy link

marvin-mk2 bot commented Aug 19, 2020

Hi! I'm an experimental bot. My goal is to guide this PR through its stages, hopefully ending with a merge. You can read up on the usage here.

@midchildan midchildan mentioned this pull request Aug 19, 2020
Closed
@midchildan
Copy link
Member Author

3 test cases are failing. I've just disabled the checks altogether with doCheck = false for now.

@midchildan
Copy link
Member Author

I've turned doCheck back on after making the following chages:

Fixed 1 test (CoatiSoftware/Sourcetrail#1073)
Disabled 5 tests regarding sample maven projects

timokau
timokau requested changes Oct 20, 2020
View reviewed changes
Copy link
Member

@timokau timokau left a comment

Choose a reason for hiding this comment

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

I've skimmed over the changes, generally looks okay to me. I haven't looked in much details though, you're the expert on this package after all :)

I have no experience with how java packages are managed. @NeQuissimus could you review that part?

pkgs/development/tools/sourcetrail/default.nix Show resolved Hide resolved
@ofborg ofborg bot added the 11.by: package-maintainer This PR was created by the maintainer of the package it changes label Oct 21, 2020
@NeQuissimus
Copy link
Member

I don't have much to say here :) I think the Java work I did is an abomination but it works OK.
So if this works for you, great :)
I don't think many people use the infrastructure, so if issues arise, you may need to investigate yourself.

timokau
timokau requested changes Oct 21, 2020
View reviewed changes
Copy link
Member

@timokau timokau left a comment

Choose a reason for hiding this comment

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

In that case I think its almost ready for merge 👍 Please squash your fixups.

pkgs/development/tools/sourcetrail/default.nix Show resolved Hide resolved
@midchildan
javaPackages: add upgraded packages
55871dc 
These are packages required to build Sourcetrail Java support

- maven-compiler-plugin 3.2
- plexus-compiler-api 2.4
- plexus-compiler-javac 2.4
- plexus-compiler-manager 2.4
@midchildan
Copy link
Member Author

Hmm, Python indexing broke after rebasing. Probably due to Jedi updates.

@midchildan
Copy link
Member Author

It's likely related to 12a9a93, I don't think there's much that can be done until

  1. jedi publishes a new release
  2. sourcetrail uses that release

@timokau
Copy link
Member

timokau commented Oct 22, 2020

Upstream would probably appreciate a notification, maybe open an issue?

@midchildan
Copy link
Member Author

It's purely a packaging issue, so I don't think upstream is exactly a right place for discussion. I brought over another copy of jedi and parso from past nixpkgs commits, and that fixed the problem quite well. I intend to remove these once it's no longer needed.

@marvin-mk2
Copy link

marvin-mk2 bot commented Oct 25, 2020

Reminder: Please review!

This Pull Request is awaiting review. If you are the assigned reviewer, please have a look. Try to find another reviewer if necessary. If you can't, please say so. If the status is not accurate, please change it. If nothing happens, this PR will be put back in the needs_reviewer queue in one day.

@timokau
Copy link
Member

timokau commented Oct 26, 2020

It's purely a packaging issue, so I don't think upstream is exactly a right place for discussion

Well upstream needs to add support for the newer versions of their dependencies right? They might not be aware that those new versions exist or that they are incompatible. They would probably appreciate the notification.

@timokau
Copy link
Member

timokau commented Oct 26, 2020

The changes look good. Pleas squash the sourcetrail commits to keep a working history.

@midchildan
Copy link
Member Author

squashed :-)

@midchildan midchildan mentioned this pull request Oct 27, 2020
Open
@midchildan
Copy link
Member Author

Also notified upstream.

timokau
timokau approved these changes Oct 27, 2020
View reviewed changes
Copy link
Member

@timokau timokau left a comment

Choose a reason for hiding this comment

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

Thank you!

@timokau timokau merged commit 55669a9 into NixOS:master Oct 27, 2020
@midchildan midchildan deleted the package/sourcetrail branch October 29, 2020 02:34
@Br1ght0ne Br1ght0ne mentioned this pull request Jul 20, 2021
Closed
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@timokau timokau timokau approved these changes

Assignees
No one assigned
Labels
8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes awaiting_reviewer marvin This PR was reviewed by Marvin, a discontinued bot: https://github.com/timokau/marvin-mk2
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@midchildan @NeQuissimus @timokau