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

Vala cleanup #32833

Merged
merged 23 commits into from Dec 20, 2017
Merged

Vala cleanup #32833

merged 23 commits into from Dec 20, 2017

Conversation

jtojnar
Copy link
Contributor

@jtojnar jtojnar commented Dec 19, 2017

Motivation for this change

Closes: #32800

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@jtojnar jtojnar added 6.topic: GNOME GNOME desktop environment and its underlying platform 8.has: clean-up 8.has: package (update) labels Dec 19, 2017
};

buildInputs = [ skk-dicts ];
nativeBuildInputs = [ vala gnome_common gobjectIntrospection libtool intltool pkgconfig ];
propagatedBuildInputs = [ libgee_0_8 json_glib ];
nativeBuildInputs = [ vala gnome_common gobjectIntrospection libtool gettext pkgconfig ];
Copy link
Member

Choose a reason for hiding this comment

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

just out of interest, when do I use gettext, when do I want intltool?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

intltool is basically abandoned now and gettext should be able to do all the things you needed intltool for. Though the helper commands are different so you can only drop intltools when a package does so (reading changelogs is useful). See also https://wiki.gnome.org/Initiatives/GnomeGoals/GettextMigration

@@ -59,6 +53,12 @@ in rec {
sha256 = "16cjybjw100qps6jg0jdyjh8hndz8a876zmxpybnf30a8vygrk7m";
};

vala_0_36 = generic {
Copy link
Member

Choose a reason for hiding this comment

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

What depends on vala_0_36?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hmm, you are right, I must have confused it with 0.26.

@jtojnar
Copy link
Contributor Author

jtojnar commented Dec 19, 2017

Okay, now we have

but I am not sure if it is worse to keep them all on the common supported version and drop the rest, or keep each on its own most recent supported version leaving the old valas in the repo.

@Mic92
Copy link
Member

Mic92 commented Dec 19, 2017

Looks good to me for the moment. The evaluation error should be fixed though.

@grahamc
Copy link
Member

grahamc commented Dec 19, 2017

@GrahamcOfBorg eval

@jtojnar
Copy link
Contributor Author

jtojnar commented Dec 19, 2017

Oh, I forgot to commit the finalterm fix, it is okay now.


meta = with stdenv.lib; {
homepage = https://github.com/valum-framework/valum;
description = "Web micro-framework written in Vala";
license = licenses.lgpl;
Copy link
Contributor

Choose a reason for hiding this comment

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

There is no such attribute.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh, right. Is there a way, I can check metadata locally?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Turns out I can just run nix-build nixos/release.nix

Copy link
Contributor

Choose a reason for hiding this comment

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

@jtojnar
Copy link
Contributor Author

jtojnar commented Dec 20, 2017

@GrahamcOfBorg build zssh libosinfo osinfo-db osinfo-db-tools

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: x86_64-linux

stripping (with flags -S) in /nix/store/9sgprm78r9zb4wq7hm3hr3kkv0xmln9y-libosinfo-1.1.0-dev/lib 
patching script interpreter paths in /nix/store/9sgprm78r9zb4wq7hm3hr3kkv0xmln9y-libosinfo-1.1.0-dev
checking for references to /tmp/nix-build-libosinfo-1.1.0.drv-0 in /nix/store/9sgprm78r9zb4wq7hm3hr3kkv0xmln9y-libosinfo-1.1.0-dev...
shrinking RPATHs of ELF executables and libraries in /nix/store/pz41r6mzsl9ksz3jsx4cxnh1ccjw3dir-libosinfo-1.1.0-devdoc
patching script interpreter paths in /nix/store/pz41r6mzsl9ksz3jsx4cxnh1ccjw3dir-libosinfo-1.1.0-devdoc
checking for references to /tmp/nix-build-libosinfo-1.1.0.drv-0 in /nix/store/pz41r6mzsl9ksz3jsx4cxnh1ccjw3dir-libosinfo-1.1.0-devdoc...
/nix/store/7nhnpc8hw10qgb8qm4rrjlfzild7f6d8-zssh-1.5c
/nix/store/19fhk8p1vx37ipr63mav2mgnyl5arzrx-libosinfo-1.1.0
/nix/store/vdmsh3z02m6yw1dqdq536c6d839ka3a8-osinfo-db-20170813
/nix/store/1c2889v51a7h8cn4fjrhq186s8l1pbdn-osinfo-db-tools-1.1.0

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: aarch64-linux

stripping (with flags -S) in /nix/store/y73lf4pl3v43p4b38l1bv8cfbmd9rriq-libosinfo-1.1.0-dev/lib
patching script interpreter paths in /nix/store/y73lf4pl3v43p4b38l1bv8cfbmd9rriq-libosinfo-1.1.0-dev
checking for references to /build in /nix/store/y73lf4pl3v43p4b38l1bv8cfbmd9rriq-libosinfo-1.1.0-dev...
shrinking RPATHs of ELF executables and libraries in /nix/store/ylxwwnyj0iv7hrn1gifa47a6ip9a6rra-libosinfo-1.1.0-devdoc
patching script interpreter paths in /nix/store/ylxwwnyj0iv7hrn1gifa47a6ip9a6rra-libosinfo-1.1.0-devdoc
checking for references to /build in /nix/store/ylxwwnyj0iv7hrn1gifa47a6ip9a6rra-libosinfo-1.1.0-devdoc...
/nix/store/1msb4pbsi7jkzryknb7sglfvbvqqmm1w-zssh-1.5c
/nix/store/djfgbf0rscrdmkc6vv8mwy627rjv2qx7-libosinfo-1.1.0
/nix/store/9nbd29n384v85qglnvb554lpina2y851-osinfo-db-20170813
/nix/store/l8qycmc03fz4kibfhjymihfwaikngs0i-osinfo-db-tools-1.1.0

@orivej orivej merged commit 3445138 into NixOS:master Dec 20, 2017
@orivej
Copy link
Contributor

orivej commented Dec 20, 2017

Tested with nox-review and merged.

@jtojnar jtojnar deleted the vala-cleanup branch December 20, 2017 03:44
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

5 participants