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

octave: build without qscintilla by default #79161

Merged
merged 1 commit into from Feb 3, 2020

Conversation

@bcdarwin
Copy link
Member

@bcdarwin bcdarwin commented Feb 3, 2020

  • qscintilla is used for IDE features in the GUI, which is not built since qt support isn't enabled
  • this removes qt from the Octave closure
Motivation for this change

The default Octave build was pulling in qt4 via qscintilla for no reason.

I didn't use any conditional/assert logic in the Octave expression to enforce reasonable dependencies between Qt and Qscintilla, rather simply improving the options used to build Nixpkgs, but I am open to doing so.

Build is still broken on OS X for unrelated reasons; reverse dependency octaveHg won't rebuild due to texlive issues.

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.
- qscintilla is used for IDE features in the GUI, which is not built since qt support isn't enabled
- this removes qt from the Octave closure
@lsix
lsix approved these changes Feb 3, 2020
Copy link
Member

@lsix lsix left a comment

Nice catch.

Thanks !

@lsix lsix merged commit b07817f into NixOS:master Feb 3, 2020
15 checks passed
15 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
octave on aarch64-linux Success
Details
octave on x86_64-linux Success
Details
@bcdarwin bcdarwin deleted the bcdarwin:octave-disable-qscintilla branch Feb 3, 2020
dtzWill added a commit to dtzWill/nixpkgs that referenced this pull request Feb 4, 2020
octave: build without qscintilla by default
(cherry picked from commit b07817f)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.