Commit Graph

217 Commits

Author SHA1 Message Date
Matthew Bauer
76999cc40e treewide: remove aliases in nixpkgs
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.

Misc...

- qtikz: use libsForQt5.callPackage

  This ensures we get the right poppler.

- rewrites:

  docbook5_xsl -> docbook_xsl_ns
  docbook_xml_xslt -> docbook_xsl

diffpdf: fixup
2018-07-18 23:25:20 -04:00
Will Dietz
3a6b91fa90 glib: also add gobject init patch to fix w/musl 2018-06-25 11:20:04 -05:00
Will Dietz
7fa6b34093 glib: patch to fix w/musl, quark static ctor order assumptions
From [1] with prefix added, using local copy to avoid dep on fetchpatch.

[1] https://raw.githubusercontent.com/void-linux/void-packages/master/srcpkgs/glib/patches/quark_init_on_demand.patch
2018-06-25 09:47:51 -05:00
Ben Gamari
da48154158 glib: Enable cross-compilation
glib needs gettext for the build machine. Since gettext is also a
propagatedBuildInput I'm assuming that it's also used at runtime.
2018-05-03 17:06:01 -04:00
Matthew Bauer
143978a477 treewide: remove platform assertions
linux: readd assertion
2018-05-03 13:09:20 -05:00
Jörg Thalheim
9d6ac12f39 glib: bin/gio is required by gvfs executables
this fixes gvfs in caia (mate desktop)
2018-04-06 00:21:46 +01:00
Will Dietz
f623858a82 glib: no one wants --witih-libiconv=gnu
Previously this was set on FreBSD and SunOS...
2018-03-25 21:17:49 -05:00
Matthew Justin Bauer
8349d73c8f
glib: oops 2018-03-25 02:00:32 -05:00
Matthew Justin Bauer
d0384cc7b8
glib: propagate gettext/iconv 2018-03-25 01:56:57 -05:00
Matthew Bauer
ed2a9cf65f treewide: remove libintl hacks 2018-03-22 16:50:11 -05:00
Jan Tojnar
0973618e4e
gnome3: automated update 2018-03-22 07:46:42 +01:00
Jan Tojnar
c02794b666
glib: add updateScript 2018-03-04 20:05:51 +01:00
Jan Tojnar
a31d98f312
tree-wide: autorename gnome packages to use dashes 2018-02-25 17:41:16 +01:00
John Ericson
82ebace595 glibc: Fix Darwin build
Fix the failure caused in #34198 by a suggested change of mine. @vcunat
reported in [1].

[1]: https://github.com/NixOS/nixpkgs/pull/34198#issuecomment-361075911
2018-01-29 00:47:02 -05:00
Ben Gamari
c68aa532d6 glib: Allow cross compilation
tweaked to handle non-glibc along with others
2018-01-24 09:33:37 -06:00
Vladimír Čunát
081b9c9d96
glib: 2.54.2 -> 2.54.3 (maintenance) 2018-01-21 16:09:24 +01:00
José Romildo Malaquias
d51897e439 glib: fix pre phases
*Phases are strings, not arrays.
2018-01-06 02:33:28 +00:00
John Ericson
046f091e0d treewide: Don't use envHook anymore
This commits needs a MAJOR audit as I oftentimes just guessed which of
`$hostOffset`, `$targetOffset`, or a fixed offset should be used.
2017-12-30 22:04:22 -05:00
Vladimír Čunát
9642fb40e8
glib: maintenance 2.54.1 -> 2.54.2 2017-11-27 13:54:15 +01:00
Jan Tojnar
1f79b943c0
glib: recognize NIX_GSETTINGS_OVERRIDES_DIR variable
For some reason, the GNOME 3.26 update broke the overrides. It turns
out the overrides now need to come before the overriden schemas in the
XDG_DATA_DIRS variable. This is not possible in general due to applications
prefixing the variable (e.g. in wrapGAppsHook).

To fix this, a new environment variable NIX_GSETTINGS_OVERRIDES_DIR
was introduced. It has greater priority than XDG_DATA_DIRS but lower
than GSETTINGS_SCHEMA_DIR. A separate variable was chosen in order not
to block the built-in one for users.
2017-11-15 03:45:24 +01:00
Vladimír Čunát
714a168052
glib: maintenance 2.54.0 -> 2.54.1 2017-10-08 18:24:12 +02:00
Vladimír Čunát
00b4e2646c
glib: 2.52.3 -> 2.54.0
License was updated upstream.  Also tidy the expression a bit,
and unify the nix coding style.
2017-09-24 11:28:31 +02:00
Linus Heckemann
b73e3b6095 GNOME: 3.22 -> 3.24
This is a squash commit of the joint work from:

* Jan Tojnar (@jtojnar)
* Linus Heckemann (@lheckemann)
* Ryan Mulligan (@ryantm)
* romildo (@romildo)
* Tom Hunger (@teh)
2017-08-28 15:32:49 +01:00
mimadrid
09e0cc7cc7
Update homepage attributes: http -> https
Homepage link "http://.../" is a permanent redirect to "https://.../" and should be updated
https://repology.org/repository/nix_stable/problems
2017-08-03 11:56:15 +02:00
David McFarland
504f11bbab glib: allow cygwin 2017-06-26 09:26:10 -03:00
Vladimír Čunát
878bbaf4e9
glib: 2.50.3 -> 2.52.1 2017-04-14 12:28:01 +02:00
Vladimír Čunát
96d41e393d
treewide: purge maintainers.urkud
It's sad, but he's been inactive for the last five years.
Keeping such people in meta.maintainers is counter-productive.
2017-03-27 19:52:29 +02:00
Vladimír Čunát
dbae14164b
glib: maintenance 2.50.2 -> 2.50.3 2017-02-20 21:33:03 +01:00
Vladimír Čunát
ff62e8a72e
glib: avoid runtime reference from gtk3
Fixes #21022.  Related: #15931.
2016-12-09 18:53:39 +01:00
Vladimír Čunát
b78ea7f6e0
glib: maintenance 2.50.1 -> 2.50.2 2016-12-03 12:33:13 +01:00
Alexander Ried
83c594fe38 glib: 2.50.0 -> 2.50.1 2016-10-11 18:03:47 +02:00
Alexander Ried
868eb83019 glib: 2.48.2 -> 2.50.0
glib now uses libmount per default -> depend on utillinux.
To avoid circular dependency (glib, utillinux, systemd, glib) use the
minimal version
2016-09-22 22:19:06 +02:00
Eelco Dolstra
8172cd734c docdev -> devdoc
It's "developer documentation", not "documentation developer" after
all.
2016-09-01 11:07:23 +02:00
Tuomas Tynkkynen
a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Vladimír Čunát
532f88cd3a glib: bugfix 2.48.1 -> 2.48.2
Suggested on #17852.
2016-08-20 01:18:03 +02:00
Vladimír Čunát
5ff3fc0a93 glib: maintenance update 2.48.0 -> 2.48.1 2016-05-22 12:10:40 +02:00
Damien Cassou
9c8148dbab glib: 2.46.1 -> 2.48.0 2016-04-20 16:45:58 +02:00
Vladimír Čunát
d1df28f8e5 Merge 'staging' into closure-size
This is mainly to get the update of bootstrap tools.
Otherwise there were mysterious segfaults:
https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
2016-04-07 14:40:51 +02:00
Luca Bruno
184b7ba3c6 glib-tested: suppress gdbus test needing machine-id 2016-03-30 21:27:29 +02:00
Vladimír Čunát
54299b60c4 Merge #12779: Mass replace pkg}/bin-style strings
... to refer to correct outputs
2016-02-03 17:25:22 +01:00
Vladimír Čunát
ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Tuomas Tynkkynen
a4dff4bf1b treewide: Mass replace 'dbus_daemon}/bin' to refer the 'out' output 2016-02-01 20:45:59 +02:00
Danny Wilson
e67717bc8d glib: fix compilation on SmartOS/Illumos (close #12479)
Recent illumos includes a linux-incompatible `inotify.h` header, which configure detects: compilation fails.
Also, a newer `dtrace` on SmartOS fails creating the probes ELF linkable object (with `dtrace -G`). Disable for now.

Remove old configure option `--disable-modular-tests`.
2016-01-19 17:38:44 +01:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
janus
a472d836f6 FreeBSD: apr-util, cyrus-sasl, berkeley db, glib, gnutls, kerberos, libelf-freebsd, openldap, serf, guile, tet, shishi, gawk, gnugrep 2016-01-01 17:01:13 +00:00
janus
a1ade02cdc FreeBSD support 2016-01-01 16:59:48 +00:00
Luca Bruno
5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Luca Bruno
e289717414 rename moveToOutput and propagatedBuildInputs 2015-12-02 10:05:36 +01:00
Tuomas Tynkkynen
cab1cb5af4 glib: Fix path to gettext_dir in glib-gettextize
Otherwise e.g. epiphany doesn't build.
2015-11-26 10:07:20 +01:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Danny Wilson
e0f732415f Fix glib build on SmartOS 2015-11-16 17:20:13 +01:00
William A. Kennington III
767f1d5a74 glib: 2.46.0 -> 2.46.2 2015-11-07 16:32:17 -08:00
Vladimír Čunát
55b7d3a181 glib: fixup output paths and use system pcre
Now pcre costs us <0.5 MB and using internal one would cost ~0.2 MB,
so if we take into account that pcre is often used, e.g. by grep...
2015-10-28 11:52:23 +01:00
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
Vladimír Čunát
653cdac274 glib hooks: move gsettings-schemas if on wrong place
Fixes #7325.
2015-06-14 16:23:59 +02:00
Vladimír Čunát
92725618b2 Revert "glib hooks: move gsettings-schemas if on wrong place"
This reverts commit 5df1aadd68.

It introduced some problems.
2015-06-08 13:12:18 +02:00
Vladimír Čunát
5df1aadd68 glib hooks: move gsettings-schemas if on wrong place
Fixes #7325.
2015-06-07 09:22:13 +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, it's no longer needed.

Also, this is one of the packages that has caused the tarball evaluation
to fail for freebsd targets, so I guess it's twice a reason to remove
it.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
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
85b1ede2bf glib gschemas hook: fixup #1901
- move frome $out to $out/share
- fix quoting that prevented globbing
- indent by spaces (as it is more common in nixpkgs; 4 spaces for shell)

More work is still needed for some individual packages.
2014-04-05 13:01:51 +02: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 since
glib does have doc output.
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