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

freecad: 0.18.4 -> unstable-2020-09-25 #98845

Merged
merged 7 commits into from Sep 26, 2020
Merged

Conversation

gebner
Copy link
Member

@gebner gebner commented Sep 26, 2020

Motivation for this change

We should be packaging the git version of FreeCAD instead of the latest "official" release. AFAICT almost everybody else is using the nightlies anyhow. Upstream doesn't even accept bug reports for 0.18.4.

As a side effect, we can finally upgrade opencascade-occt and get rid of one more qtwebkit dependency.

Fixes #98821

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
Member

@mmilata mmilata left a comment

Choose a reason for hiding this comment

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

Things are sometimes broken in the nightlies, I wonder if it would make sense to offer both, e.g. as freecad and freecad-stable packages?

pkgs/applications/graphics/freecad/default.nix Outdated Show resolved Hide resolved
@gebner
Copy link
Member Author

gebner commented Sep 26, 2020

Things are sometimes broken in the nightlies, I wonder if it would make sense to offer both, e.g. as freecad and freecad-stable packages?

Ok, I've added back a freecadStable package.

@redvers
Copy link
Member

redvers commented Sep 26, 2020

Fair warning, you're likely you be asked to squash these commits. The general rule is one commit per PR.

We may also want to have a conversation about directly tracking their master.

My concern is two-fold:

  1. If a user includes freecad in their systemPackages and one day it ceases to compile due to say, a change in dependencies or their buildsystem then those users stuck with a system that won't build or, if they remove it - no way to install freecad until it is updated.
  2. It's going to make caching near-useless.

I suggest instead of tracking master directly, specify a hash and version it with the date.

For example, the current would have a rev of 7616153b3c31ace006169cdc2fdafab484498858, and a version of "unstable-2020-09-25".

Does that make sense?

@gebner
Copy link
Member Author

gebner commented Sep 26, 2020

Fair warning, you're likely you be asked to squash these commits. The general rule is one commit per PR.

I'm not sure where you got that from. Usually we have one commit per changed package (with a commit message like <package name>: 1.0 -> 2.0 or <package name>: init at 1.0 or <package name>: <other change>). Commits for multiple packages should not be squashed together. Please also don't include merge commits in PRs if possible.

We may also want to have a conversation about directly tracking their master. [...]

I think there is a slight misunderstanding here. This PR updates FreeCAD to the latest master version as of now. This version will not change until we update it the next time, in a separate PR. It will not suddenly break if new commits are pushed to the FreeCAD repository.

Copy link
Member

@mmilata mmilata left a comment

Choose a reason for hiding this comment

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

Didn't test but LGTM.

@redvers
Copy link
Member

redvers commented Sep 26, 2020

Fair warning, you're likely you be asked to squash these commits. The general rule is one commit per PR.

I'm not sure where you got that from. Usually we have one commit per changed package (with a commit message like <package name>: 1.0 -> 2.0 or <package name>: init at 1.0 or <package name>: <other change>). Commits for multiple packages should not be squashed together. Please also don't include merge commits in PRs if possible.

Thank you for the correction. I don't know how I misread that. Maybe I shouldn't be looking at PRs before midday? :-)

I think there is a slight misunderstanding here. This PR updates FreeCAD to the latest master version as of now. This version will not change until we update it the next time, in a separate PR. It will not suddenly break if new commits are pushed to the FreeCAD repository.

Perfect!

@gebner gebner merged commit bbb854f into NixOS:master Sep 26, 2020
@jonringer
Copy link
Contributor

I think it should have been freecad and freecadUnstable as that's similar to other already established paradigms like zfs and zfsUnstable

@gebner
Copy link
Member Author

gebner commented Sep 27, 2020

At first I only wanted to upgrade freecad (to the git version). Personally, I would have only kept the current version.

If you think we should change the names to freecad and freecadUnstable now, we can also do that.

@FRidh
Copy link
Member

FRidh commented Sep 27, 2020

Given upstream does not support their stable version, I think it is fine with the current naming. I would even say we should drop freecadStable for exactly that reason. Of course, if there are users that want the stable one we could choose to still provide it.

@jonringer
Copy link
Contributor

Given upstream does not support their stable version, I think it is fine with the current naming.

ah, I was unaware of this

@risicle risicle added the 9.needs: port to stable A PR needs a backport to the stable release. label Sep 30, 2020
@gebner gebner mentioned this pull request Nov 12, 2020
69 tasks
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.

Freecad 0.19
7 participants