Closed
Conversation
gtk3 related updates: pygtk is now contained in pygobject gobjectIntrospection now creates interface files: - typelib files - gir files typelib files are compressed gir files Eventually multiple derivation outputs should be used, because uncompressed gir xml files are huge (30% of the final gobject gtk derivation for instance) this makes it possible to compile: - gnome color manager (colord) - dispcalgui - mypaint (git version)
This patch introduces mergeAttrsByVersion to lib. In some cases it does make sense to keep "experimental" and "older" versions of the same package in one file because it follows the "do it once only" principle. Very often many versions share their build instructions - so even though I understand Eelcos opinion that different versions should be put into their own .nix files - its my feeling telling me that this is fastest for most cases. I agree with Eelco that if tweaks for individual versions become too much they should be split into individual files. See comments above mergeAttrsByVersion learn about its usage. Signed-off-by: Marc Weber <marco-oweber@gmx.de> Conflicts: pkgs/lib/misc.nix
adding colord
Member
|
I looked at this more thoroughly, and it seems to me that the introspection data isn't really a big part, locale is usually much larger (and mostly unused as well). Thus, I would keep it as it is now. I solved conflicts against x-updates here https://github.com/vcunat/nixpkgs/commits/vlada/introspection (simple). I would merge it, only colord seems outdated (maybe others as well, I haven't tried to build all yet). Do you have some updates for this in your repos? |
Contributor
Author
|
I added it to my todo list, may take a week this time. |
Member
|
No need to hurry, I know about no plans to merge x-updates soon anyway. |
vcunat
added a commit
that referenced
this pull request
Aug 4, 2013
This is all work of Marc Weber <marco-oweber@gmx.de>, except for a few nitpicks. Tested space blowup: IMHO negligible to headers and similar stuff, e.g. the firefox closure (reported by du) grows from 560 to 579 MB. Saving space should be handled separately, e.g. we have the multiple-outputs branch.
Member
|
Hmm, x-updates is likely to merge soon, after all (with minor safe stuff mostly). Therefore, I picked the lib updates from this which seemed without any problem (I did just some nitpicks). The rest can be easily pushed directly to master afterwards, as it only affects few packages. |
MarcWeber
added a commit
to MarcWeber/nixpkgs
that referenced
this pull request
Aug 8, 2013
…fixes * commit 'refs/top-bases/tmp/x-updates-fixes': (809 commits) introspection disabling -- clutter-gtk, NM-applet, gnome_panel disable auto-detected introspection for libwnck and clutter add introspection into GTK libs (part of NixOS#517) xorg: bugfix updates of some libs poppler: bugfix update, waiting with major bump clean some include flags that weren't really needed GTK-related minor updates automake113x: minor update to .4 mesa: bugfix update 9.1.4 -> 9.1.6 idris: upgrade to 0.9.9 add haskell-llvm-general blivet: Update sha256, as it changed upstream. nixpart: Update to bugfix version 0.4.1. Adding CL-Launch. CL-Launch is a wrapper for unified launching of various Lisp implementations Add simple hsetroot package. git-subtree: Remove git: Install git-subtree git: Update to 1.8.3.4 VM builds: Reduce kernel verbosity VM builds: Use the default kernel ... Conflicts: pkgs/development/libraries/glib/default.nix
MarcWeber
added a commit
to MarcWeber/nixpkgs
that referenced
this pull request
Aug 8, 2013
* tmp/x-updates-fixes: (809 commits) introspection disabling -- clutter-gtk, NM-applet, gnome_panel disable auto-detected introspection for libwnck and clutter add introspection into GTK libs (part of NixOS#517) xorg: bugfix updates of some libs poppler: bugfix update, waiting with major bump clean some include flags that weren't really needed GTK-related minor updates automake113x: minor update to .4 mesa: bugfix update 9.1.4 -> 9.1.6 idris: upgrade to 0.9.9 add haskell-llvm-general blivet: Update sha256, as it changed upstream. nixpart: Update to bugfix version 0.4.1. Adding CL-Launch. CL-Launch is a wrapper for unified launching of various Lisp implementations Add simple hsetroot package. git-subtree: Remove git: Install git-subtree git: Update to 1.8.3.4 VM builds: Reduce kernel verbosity VM builds: Use the default kernel ...
MarcWeber
added a commit
to MarcWeber/nixpkgs
that referenced
this pull request
Aug 8, 2013
* commit '0825416': (1767 commits) introspection disabling -- clutter-gtk, NM-applet, gnome_panel disable auto-detected introspection for libwnck and clutter add introspection into GTK libs (part of NixOS#517) xorg: bugfix updates of some libs poppler: bugfix update, waiting with major bump clean some include flags that weren't really needed GTK-related minor updates automake113x: minor update to .4 mesa: bugfix update 9.1.4 -> 9.1.6 idris: upgrade to 0.9.9 add haskell-llvm-general blivet: Update sha256, as it changed upstream. nixpart: Update to bugfix version 0.4.1. Adding CL-Launch. CL-Launch is a wrapper for unified launching of various Lisp implementations Add simple hsetroot package. git-subtree: Remove git: Install git-subtree git: Update to 1.8.3.4 VM builds: Reduce kernel verbosity VM builds: Use the default kernel ... Conflicts: pkgs/development/libraries/atk/default.nix
MarcWeber
added a commit
to MarcWeber/nixpkgs
that referenced
this pull request
Aug 8, 2013
* tmp/gtk3: (1767 commits) introspection disabling -- clutter-gtk, NM-applet, gnome_panel disable auto-detected introspection for libwnck and clutter add introspection into GTK libs (part of NixOS#517) xorg: bugfix updates of some libs poppler: bugfix update, waiting with major bump clean some include flags that weren't really needed GTK-related minor updates automake113x: minor update to .4 mesa: bugfix update 9.1.4 -> 9.1.6 idris: upgrade to 0.9.9 add haskell-llvm-general blivet: Update sha256, as it changed upstream. nixpart: Update to bugfix version 0.4.1. Adding CL-Launch. CL-Launch is a wrapper for unified launching of various Lisp implementations Add simple hsetroot package. git-subtree: Remove git: Install git-subtree git: Update to 1.8.3.4 VM builds: Reduce kernel verbosity VM builds: Use the default kernel ... Conflicts: pkgs/lib/misc.nix
Member
|
Much of this has been already merged somehow. Is there something left? Rebase? |
Contributor
Author
|
Eventually some packages. But you're right that should retest it and send an update. Please give me a couple of days to do so. |
Contributor
Author
|
dispcalgui might still be missing. I'll create a new pull request for that, soon. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
patch against x-updates branch
The patch experimental/multiple-versions-in-one-file is also in trunk but has not been merged into x-updates yet