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

brewtarget: 2.3.1 -> 3.0.6 #217648

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

brewtarget: 2.3.1 -> 3.0.6 #217648

wants to merge 2 commits into from

Conversation

avnik
Copy link
Contributor

@avnik avnik commented Feb 22, 2023

Upgrade to 3.0.6
Also drop "insecure" qtwebkit

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Copy link
Member

@balsoft balsoft left a comment

Choose a reason for hiding this comment

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

Actually, please make sure that the package name in commit and PR title match the pname exactly, including the case

@avnik avnik changed the title Brewtarget: 2.3.1 -> 3.0.6 brewtarget: 2.3.1 -> 3.0.6 Feb 27, 2023
Copy link
Contributor

@totoroot totoroot left a comment

Choose a reason for hiding this comment

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

@avnik Could you please also replace Qt's mkDerivation with stdenv.mkDerivation to fix
#180841
For that to work wrapQtAppsHook will be needed.

If you can, please also update it to 3.0.7 which has already been released in the meantime:
https://github.com/Brewtarget/brewtarget/releases/tag/v3.0.7

pkgs/applications/misc/brewtarget/default.nix Outdated Show resolved Hide resolved
pkgs/applications/misc/brewtarget/default.nix Outdated Show resolved Hide resolved
pkgs/applications/misc/brewtarget/default.nix Show resolved Hide resolved
pkgs/applications/misc/brewtarget/default.nix Outdated Show resolved Hide resolved
@totoroot
Copy link
Contributor

Also this PR would fix the issue with qtwebkit for brewtarget (for cross-reference):
#53079

@avnik
Copy link
Contributor Author

avnik commented May 1, 2023

@totoroot I fixed all suggestions (except bumping to 3.0.7 -- newer brewtarget depends on boost_stacktrace_backtrace which not yet packaged), also rebased PR on newer master

nativeBuildInputs = [ cmake ];
buildInputs = [ qtbase qttools qtmultimedia qtwebkit qtsvg ];
nativeBuildInputs = [ cmake qt5.wrapQtAppsHook ];
buildInputs = [ boost xalanc xercesc ] ++
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
buildInputs = [ boost xalanc xercesc ] ++
buildInputs = [ boost curl xalanc xercesc ] ++

, fetchFromGitHub
, bash
, boost
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
, boost
, boost
, curl

@totoroot
Copy link
Contributor

@avnik Sorry for the late response. The last I checked, it did not build on darwin, which can be seen in ofborg's tests as well.
I have to check again later this week, what has to be done exactly to make it build.
Meanwhile brewtarget 3.0.9 got released...would you mind updating the PR?

@totoroot totoroot mentioned this pull request Jul 13, 2023
13 tasks
@@ -2958,7 +2958,7 @@ with pkgs;

brakeman = callPackage ../development/tools/analysis/brakeman { };

brewtarget = libsForQt5.callPackage ../applications/misc/brewtarget { } ;
Copy link
Contributor

Choose a reason for hiding this comment

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

Why?

@wegank wegank added 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md 2.status: merge conflict labels Mar 19, 2024
@stale stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Mar 20, 2024
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

7 participants