Vladimír Čunát
5227fb1dd5
Merge commit staging+systemd into closure-size
...
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Luca Bruno
6bb4df642e
glib: 2.44.1 -> 2.46.0
2015-09-25 10:48:39 +02:00
Luca Bruno
eae4712f52
glib-tested: disable appinfo test, cannot reproduce hydra failure
2015-07-22 13:52:40 +02:00
William A. Kennington III
9d6555dc0a
Merge branch 'master.upstream' into staging.upstream
2015-06-06 12:04:42 -07:00
Eelco Dolstra
4f60156afb
Revert "qemu-nix: Build statically"
...
This reverts commit 5afa4f18d6
2015-06-04 14:54:47 +02:00
Domen Kožar
dc3316268e
Merge branch 'master' into staging
2015-06-01 11:00:51 +02:00
William A. Kennington III
5afa4f18d6
qemu-nix: Build statically
2015-06-01 01:50:05 -07:00
Vladimír Čunát
c4f1011cab
gtk+ stack: maintenance updates
2015-05-27 22:05:42 +02:00
Eric Seidel
662a6b1ca6
remove all references to stdenv.cc.cc.is{GNU,Clang}
...
use the new `stdenv.cc.is{GNU,Clang}` instead, which will always be
defined.
2015-05-11 14:44:50 -07:00
Vladimír Čunát
6b8a8ca59f
glib: fix splitting outputs, comment on internal pcre
...
glib-tested succeeds for me, assuming one reverts old splitting changes
in tzdata.
2015-04-20 10:01:06 +02:00
Vladimír Čunát
bf414c9d4f
Merge 'staging' into closure-size
...
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes
Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
2015-04-18 11:22:20 +02:00
koral
2dd534e10a
glib: 2.42.2 -> 2.44.0
2015-04-17 10:33:24 +00:00
Vladimír Čunát
c4f238c39c
glib: maintenance update
2015-03-09 15:55:28 +01:00
Eric Seidel
e08b9ab8d3
kill libiconvOr*
...
Conflicts:
pkgs/applications/networking/mailreaders/sup/default.nix
pkgs/development/compilers/ghc/7.8.3-binary.nix
pkgs/development/interpreters/php/5.3.nix
pkgs/development/interpreters/ruby/patches.nix
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/poppler/default.nix
pkgs/top-level/all-packages.nix
2015-02-07 20:29:28 -08:00
Eric Seidel
f3c6827373
rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc
2015-01-14 20:27:55 -08:00
aszlig
840f9b419c
glib-tested: Remove explicitly adding libgcc_s.so.
...
As of 65221567c1
2015-01-03 18:18:42 +01:00
John Wiegley
28b6fb61e6
Change occurrences of gcc to the more general cc
...
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Vladimír Čunát
7d05dff782
glib: maintenance update
2014-11-10 21:34:03 +01:00
Vladimír Čunát
e3652e7ead
glib: feature update 2.40.* -> 2.42.0
...
http://upstream-tracker.org/ looks good enough, and so do the NEWS.
2014-10-19 19:31:58 +02:00
Alexander Kjeldaas
3bf4362381
python: improve library determinism
...
1) Make the core python libraries deterministic.
2) Make the python libraries created by glib deterministic.
@vcunat put back the removal of share/gtk-doc in glib.
2014-09-13 15:03:12 +02:00
Vladimír Čunát
8da52a642a
Merge branch 'staging' into v/modular
...
Conflicts (easy):
pkgs/development/interpreters/perl/5.10/setup-hook.sh
pkgs/development/interpreters/perl/5.8/setup-hook.sh
pkgs/development/libraries/gtk+/2.x.nix
2014-08-31 12:23:18 +02:00
Vladimír Čunát
abbc93f783
WIP: getting better
2014-08-30 19:11:52 +02:00
Luca Bruno
30aac2c877
glib-tested: skip broken timer test on i686
2014-08-27 17:37:26 +02:00
Vladimír Čunát
fb59f27a43
WIP: getting good
2014-08-27 01:14:09 +02:00
Vladimír Čunát
4dccb224c5
WIP2
2014-08-26 01:10:56 +02:00
Bjørn Forsman
c9baba9212
Fix many package descriptions
...
(My OCD kicked in today...)
Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.
I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.
I've tried to stay away from generated expressions (and I think I
succeeded).
Some specifics worth mentioning:
* cron, has "Vixie Cron" in its description. The "Vixie" part is not
mentioned anywhere else. I kept it in a parenthesis at the end of the
description.
* ctags description started with "Exuberant Ctags ...", and the
"exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
at the end of description.
* nix has the description "The Nix Deployment System". Since that
doesn't really say much what it is/does (especially after removing
the package name!), I changed that to "Powerful package manager that
makes package management reliable and reproducible" (borrowed from
nixos.org).
* Tons of "GNU Foo, Foo is a [the important bits]" descriptions
is changed to just [the important bits]. If the package name doesn't
contain GNU I don't think it's needed to say it in the description
either.
2014-08-24 22:31:37 +02:00
Eelco Dolstra
2d6d43c02c
Fix tarball build
2014-08-24 18:52:50 +02:00
Vladimír Čunát
96cec2a7bd
Merge 'staging' into multiple-outputs
...
Conflicts:
pkgs/applications/audio/flac/default.nix
pkgs/build-support/gcc-wrapper/builder.sh
pkgs/development/libraries/apr-util/default.nix
pkgs/development/libraries/apr/default.nix
pkgs/development/libraries/atk/default.nix
pkgs/development/libraries/freetype/default.nix
pkgs/development/libraries/gdk-pixbuf/default.nix
pkgs/development/libraries/glib/default.nix
pkgs/development/libraries/glibc/2.17/builder.sh
pkgs/development/libraries/glibc/2.17/locales.nix
pkgs/development/libraries/libjpeg/default.nix
pkgs/development/libraries/libogg/default.nix
pkgs/development/libraries/libsamplerate/default.nix
pkgs/development/libraries/libtiff/default.nix
pkgs/development/libraries/libvorbis/default.nix
pkgs/development/libraries/mesa/default.nix
pkgs/development/libraries/pango/default.nix
pkgs/development/web/nodejs/default.nix
pkgs/os-specific/linux/pam/default.nix
pkgs/os-specific/linux/systemd/default.nix
pkgs/stdenv/generic/setup.sh
pkgs/stdenv/linux/default.nix
pkgs/top-level/all-packages.nix
pkgs/top-level/release-small.nix
2014-08-23 16:04:53 +02:00
Luca Bruno
926514868c
glib-tested: fix running tests
2014-08-09 17:09:37 +02:00
Eelco Dolstra
ebd4594c2c
glib: Fix compilation on Darwin and use default gcc
...
http://hydra.nixos.org/build/12458779
2014-07-15 11:09:30 +02:00
Eelco Dolstra
24e8c3ac41
Tweak
2014-07-01 16:28:34 +02:00
John Wiegley
61b94dff81
Get glib, gtk+, harfbuzz and pango working on Darwin
2014-05-12 16:53:11 -05:00
Vladimír Čunát
1f6a15d7de
Merge #1901 : add preFixupPhases to stdenv; for gsettings
...
Without this stdenv change it seems difficult to fix some glib's gsettings issues,
as the folders in question may (not) be created in installPhase.
2014-04-02 19:06:41 +02:00
Vladimír Čunát
151ac5ab9e
gtk+3 core stack: update to 3.12
2014-03-27 20:53:50 +01:00
Vladimír Čunát
dcf6cbf5b3
glib: add -tested variant, also to the unstable job
...
Replaces #1753 .
2014-02-18 20:27:23 +01:00
Kevin Quick
80adf16703
glib on darwin: disable warnings to avoid prototype errors
...
vcunat did some reformatting before pushing.
2014-01-26 10:31:05 +01:00
Vladimír Čunát
e740b565cf
Merge master into stdenv-updates
...
Conflicts (easy):
pkgs/development/compilers/llvm/default.nix
pkgs/development/compilers/openjdk/default.nix
pkgs/development/libraries/icu/default.nix
pkgs/development/libraries/libssh/default.nix
pkgs/development/libraries/libxslt/default.nix
pkgs/development/tools/parsing/bison/3.x.nix
2013-12-29 10:01:22 +01:00
Vladimír Čunát
1876b8e4b2
glib: bugfix update 2.38.0 -> .2
2013-11-17 13:48:22 +01:00
Vladimír Čunát
cb8fff57c1
update gtk deps, on GNOME-3.10 branches now
2013-10-05 21:25:53 +02:00
Mathijs Kwik
1a55c4b89f
Merge remote-tracking branch 'official/master' into multiple-outputs
...
Conflicts:
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/freetype/default.nix
pkgs/development/libraries/glib/default.nix
pkgs/development/libraries/libpng/default.nix
pkgs/development/libraries/pango/default.nix
pkgs/tools/typesetting/tex/texlive/default.nix
pkgs/top-level/all-packages.nix
2013-09-11 10:53:31 +02:00
Vladimír Čunát
74488e2b58
Merge branch 'x-updates' into stdenv-updates
...
Conflicts (simple):
pkgs/development/libraries/glib/default.nix
pkgs/development/libraries/mesa/default.nix
2013-09-02 15:44:57 +02:00
Eelco Dolstra
32d823d3d0
Revert "glib doesn't produce doc output (check later)"
...
This reverts commit 73688ec63b
2013-08-21 17:44:43 +02:00
Mathijs Kwik
73688ec63b
glib doesn't produce doc output (check later)
2013-08-21 17:35:53 +02:00
Eelco Dolstra
10cb4a8cf2
Merge remote-tracking branch 'origin/master' into multiple-outputs
...
Conflicts:
pkgs/development/libraries/gtk+/2.x.nix
pkgs/development/libraries/libsamplerate/default.nix
pkgs/development/libraries/libsndfile/default.nix
pkgs/misc/cups/default.nix
pkgs/top-level/all-packages.nix
2013-08-21 17:05:30 +02:00
Vladimír Čunát
7d23ab7c75
glib: bugfix update (important for ext4 sync)
2013-08-15 08:31:31 +02:00
Jason \"Don\" O'Conal
d2e1023d73
gobjectIntrospection: fix build on darwin ( close #832 )
...
vcunat edit: SANE_MALLOC_PROTOS is gone, removing the handling
https://git.gnome.org/browse/glib/commit/?id=518e3104bf6cdb5d8e6b43d3b721805db5951139
2013-08-15 07:56:25 +02:00
Vladimír Čunát
98f3716650
clean some include flags that weren't really needed
...
Tested the builds still work (x86_64-linux).
2013-08-03 10:45:13 +02:00
Vladimír Čunát
d374527509
GTK-related minor updates
2013-08-03 09:45:22 +02:00
Peter Simons
522acfd2f4
Merge remote-tracking branch 'master' into stdenv-updates.
...
Conflicts:
pkgs/applications/version-management/git-and-tools/git/default.nix
pkgs/top-level/all-packages.nix
2013-07-30 11:29:30 +02:00
Jason \"Don\" O'Conal
8c54b95273
glib: fix build on darwin
...
* add libintlOrEmpty to build inputs
* add -lintl to CFLAGS
2013-07-12 16:26:44 +02:00
![](https://secure.gravatar.com/avatar/2f93d08a773b27d6548598c5f45aa3a9?d=identicon&s=56 "Jason \\"Don\\" O'Conal"){kind=small}
