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

gjs: clean up #73841

Merged
merged 1 commit into from Nov 21, 2019
Merged

gjs: clean up #73841

merged 1 commit into from Nov 21, 2019

Conversation

@jtojnar
Copy link
Contributor

jtojnar commented Nov 20, 2019

  • Do not propagate spidermonkey, it is only needed gjs to link against.
  • Split out dev output, any propagated dependencies should go there.
  • Drop unnecessary sed, the readline thing is no longer there.

It is just 2.5 MB closure reduction but every megabyte counts.

Copy link
Member

worldofpeace left a comment

Can we add tests in passthru and use pname there? (not sure how I forgot this one)
Though these tests seem to timeout regularly

Also, glib things are in Requires.

* Do not propagate spidermonkey, it is only needed gjs to link against.
* Split out dev output, any propagated dependencies should go there.
* Drop unnecessary sed, the readline thing is no longer there.
* Add passthru.tests to allow running installed tests easily.
* Drop pango from buildInputs, we only need it as a transitive dependency of gtk3 for installed tests; gjs actually depends on cairo.
* Move libxml2 to nativeBuildInputs, it is called by glib-compile-resources when xml-stripblanks preprocessing is used.
* Propagate glib, as it is in Requires in the pc file.

It is just 2.5 MB closure reduction but every megabyte counts.
@jtojnar jtojnar force-pushed the jtojnar:gjs-cleanup branch from 89ce9bb to 201c1d3 Nov 21, 2019
@jtojnar jtojnar requested a review from worldofpeace Nov 21, 2019
@jtojnar

This comment has been minimized.

Copy link
Contributor Author

jtojnar commented Nov 21, 2019

Should we add a timeout argument to nixosTests.installed-tests? Or add meta argument and merge that? Or merge everything but the explicit arguments (NixOS/rfcs#58 would help)?

Also I looked at adding sysprof-capture, but sysprof’s closure is just huge. Another candidate for scalpel.

@worldofpeace

This comment has been minimized.

Copy link
Member

worldofpeace commented Nov 21, 2019

Should we add a timeout argument to nixosTests.installed-tests? Or add meta argument and merge that? Or merge everything but the explicit arguments (NixOS/rfcs#58 would help)?

Well we do have testRunnerFlags which is a blanket of simplicity, but then this could turn into adding one for every option

-d, --dir                   Only run tests from these dirs (default: all system data dirs)
-l, --list                  List matching tests
-p, --parallel=PROC         Specify parallelization to PROC processors; 0 will be dynamic)
--first-root=PROC           Only use first entry in XDG_DATA_DIRS
-L, --log-directory=DIR     Create a subdirectory with test logs
--report-directory=DIR      Create a subdirectory per failing test in DIR
--status=yes/no/auto        Output status information
--log-msgid=MSGID           Log unique message with id MSGID=MESSAGE
-t, --timeout=TIMEOUT       Cancel test after timeout seconds; defaults to 5 minutes

Not sure what would be better.

Also I looked at adding sysprof-capture, but sysprof’s closure is just huge. Another candidate for scalpel.

It seems you can configure the build to just be sysprof-capture

Copy link
Member

worldofpeace left a comment

Looks good, fixing the test is out of scope of this PR.

@jtojnar

This comment has been minimized.

Copy link
Contributor Author

jtojnar commented Nov 21, 2019

Well we do have testRunnerFlags which is a blanket of simplicity, but then this could turn into adding one for every option

This is Hydra timing out so we would need to change meta.timeout.

@jtojnar jtojnar merged commit b94b8ca into NixOS:master Nov 21, 2019
16 checks passed
16 checks passed
gjs on x86_64-darwin No attempt
Details
Evaluation Performance Report Evaluator Performance Report
Details
gjs on aarch64-linux Success
Details
gjs on x86_64-linux Success
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
@jtojnar jtojnar deleted the jtojnar:gjs-cleanup branch Nov 21, 2019
@jtojnar

This comment has been minimized.

Copy link
Contributor Author

jtojnar commented Nov 21, 2019

Would not it be built twice then?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.