Commit Graph

326 Commits

Author SHA1 Message Date
Alyssa Ross
52c286ee5b
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/libraries/pmdk/default.nix
2023-02-23 13:51:34 +00:00
Artturin
f9fdf2d402 treewide: move NIX_CFLAGS_COMPILE to the env attrset
with structuredAttrs lists will be bash arrays which cannot be exported
which will be a issue with some patches and some wrappers like cc-wrapper

this makes it clearer that NIX_CFLAGS_COMPILE must be a string as lists
in env cause a eval failure
2023-02-22 21:23:04 +02:00
github-actions[bot]
b0f16e56b0
Merge staging-next into staging 2023-02-11 18:01:50 +00:00
John Ericson
b1aa0e9f2a glib: Add meta.pkgConfigModules and test 2023-02-11 11:03:00 -05:00
Jan Tojnar
746e2b1fc4 glib: 2.74.3 → 2.74.5
https://gitlab.gnome.org/GNOME/glib/-/compare/2.74.3...2.74.5

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
2023-02-02 00:06:52 +01:00
Alyssa Ross
8e9e08a587 glib: fix build for FreeBSD
These same options are disabled in FreeBSD Ports.
2023-01-26 17:56:44 +00:00
Alyssa Ross
252a20d0a5 glib: use a better homepage
The previous homepage barely mention Glib.
2023-01-26 17:56:44 +00:00
Guillaume Girol
33afbf39f6 treewide: switch to nativeCheckInputs
checkInputs used to be added to nativeBuildInputs. Now we have
nativeCheckInputs to do that instead. Doing this treewide change allows
to keep hashes identical to before the introduction of
nativeCheckInputs.
2023-01-21 12:00:00 +00:00
Jan Tojnar
72c37eddec Merge branch 'staging-next' into staging 2022-12-25 01:30:47 +01:00
Jan Tojnar
3c5fffed82
Merge pull request #206291 from jtojnar/mk-gsettings-patch
makeHardcodeGsettingsPatch: Support other constructors
2022-12-20 22:13:25 +01:00
Jan Tojnar
35d24b51f5 makeHardcodeGsettingsPatch: Rename from glib.mkHardcodeGsettingsPatch
glib expression is messy enough as is.

Also rename the `glib-schema-to-var` argument to `schemaIdToVariableMapping` to better match Nixpkgs coding style.
2022-12-19 17:17:32 +01:00
Vladimír Čunát
397b520aa7
Merge #206078: glib: Pick GVariant security patches
...into staging
2022-12-19 11:03:53 +01:00
figsoda
ec8cb34358 treewide: fix typos 2022-12-17 19:39:44 -05:00
Jan Tojnar
cf63ef8b34 glib: Pick security patches
https://discourse.gnome.org/t/multiple-fixes-for-gvariant-normalisation-issues-in-glib/12835
https://discourse.gnome.org/t/fixes-for-gdbusmenumodel-crashes-in-glib/12846
2022-12-14 21:54:43 +01:00
Jan Tojnar
f2d78a4d52
Merge pull request #204383 from jtojnar/gnome-staging
GNOME staging updates
2022-12-06 16:25:14 +01:00
Jan Tojnar
2edad4b9c2 glib: 2.74.1 → 2.74.3
https://gitlab.gnome.org/GNOME/glib/-/compare/2.74.1...2.74.3

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
2022-12-05 19:02:33 +01:00
github-actions[bot]
6aeef7531c
Merge staging-next into staging 2022-11-28 06:01:53 +00:00
Sandro
853077236a
Merge pull request #202124 from SuperSandro2000/dbus-passthru-daemon 2022-11-28 01:35:34 +01:00
github-actions[bot]
d002d690a2
Merge staging-next into staging 2022-11-25 00:02:54 +00:00
Mika Tammi
87ed2b765a glib: fix build with musl 2022-11-24 23:09:05 +00:00
Sandro Jäckel
c7f5becba3 dbus: remove unused daemon passhtru 2022-11-21 20:23:00 +01:00
github-actions[bot]
39b3610a57
Merge staging-next into staging 2022-11-15 06:01:51 +00:00
Vladimír Čunát
1f4c790f71
Merge #201229: glib: Fix infinite loop in GNOME Keyring
...into staging-next
2022-11-15 01:36:49 +01:00
Jan Tojnar
808095530a glib: Fix infinite loop in GNOME Keyring
This was a regression in GLib 2.74.1:

https://gitlab.gnome.org/GNOME/gnome-keyring/-/issues/123
2022-11-14 20:46:21 +01:00
squalus
e9c35f11c2 glib: fix cross compile
Made libxslt an unconditional input. It's used for building man pages,
which are enabled on cross builds.
2022-11-11 13:26:08 -08:00
Guillaume Girol
e094494915 glib: add an update script combinator to patch gsettings schema paths
and use it in evolution-data-server and evolution-ews as a proof of
concept
2022-11-11 13:30:00 +01:00
Jan Tojnar
0b5be61ca1 glib: 2.74.0 → 2.74.1
https://gitlab.gnome.org/GNOME/glib/-/compare/2.74.0...2.74.1

- Docs no longer can be generated in static builds.
- Drop merged patches.
- Add a comment to an undocumented patch.
- Drop huge with statement.
- Drop meson override not needed since a4a300dfff

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
2022-10-25 18:16:48 +02:00
Maxine Aubrey
d86b3713f1 glib: fix gimp text editing crashes 2022-10-11 18:52:35 +02:00
Jan Tojnar
bdd3746cb6 glib: 2.73.3 → 2.74.0
https://gitlab.gnome.org/GNOME/glib/-/compare/2.73.3...2.74.0

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
2022-10-11 18:52:26 +02:00
Jan Tojnar
71721a1c6b glib: 2.73.2 → 2.73.3
https://gitlab.gnome.org/GNOME/glib/-/compare/2.73.2...2.73.3

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
2022-10-11 18:52:14 +02:00
Jan Tojnar
9c64673e4d glib: 2.72.3 → 2.73.2
https://gitlab.gnome.org/GNOME/glib/-/compare/2.72.3...2.73.2

Changelog-Reviewed-By: jtojnar
2022-10-11 18:52:03 +02:00
Alyssa Ross
4610260d99
pkgsStatic.glib: fix build
Since 9f309c8792 ("stdenv: mesonFlags: use canExecute in needs_exe_wrapper"),
glib's tests are built (but not run by default) in pkgsStatic.  This
broke the build because some of the tests required shared libraries.
This patch (which is awaiting review upstream) disables building those
libraries and any tests that depend on them in a static-only build.
2022-09-14 14:08:58 +00:00
Alyssa Ross
d65d8002c7 glib.tests.withChecks: init
This will allow OfBorg to run the GLib tests, which it didn't do
before.  To do this correctly for the glib we're building, we need to
override it rather than taking glib as an input.
finalAttrs.finalPackage is not overrideable, so instead we need to use
overrideAttrs.  Since we can now consult finalAttrs.doCheck, there's
no longer any need for a separate doCheck option, so I've removed it
in favour of overrideAttrs.
2022-09-04 21:18:49 +00:00
Alyssa Ross
2be1bcb3d2 glib: use finalAttrs instead of rec
This will be important when we replace the doCheck option with an
overrideAttrs, because then we can use it in passthru.tests.
2022-09-04 21:18:49 +00:00
Alyssa Ross
14adc91759 glib: unconditionally apply test patch
This patch shouldn't have any effect on builds that don't run the
tests, so it doesn't need to be conditionally applied.  Applying it
unconditionally will make it easier to notice if it breaks e.g. when
updating glib.
2022-09-04 21:18:49 +00:00
Alyssa Ross
6b836517db glib: skip g-file-info test if atime unsupported
atime=off is probably not uncommon among Nix users using ZFS.
2022-09-04 21:18:49 +00:00
Alyssa Ross
e1656e231c glib: move test substitutions into postPatch
Doing this in preCheck means that the tests will already have been
built before the substitutions are made, so they'll have to be rebuilt
after the substitutions.  Move the substitution earlier in the build,
to avoid this unnecessary extra work.

I've made the substitutions run even if tests aren't being run, to
avoid a repeat of the situation where a glib update breaks the tests
due to paths changing.
2022-09-04 21:18:49 +00:00
Alyssa Ross
1ea4a3bab6 glib: fix tests by patching Python shebangs
This has to happen in postConfigure rather than postPatch, because the
files are generated by the configure phase.
2022-09-04 21:18:49 +00:00
Alyssa Ross
3f3f318a6b glib: fix paths of tests in sed
Since the switch to Meson, we're already in the build directory in
preCheck, so we need to update the relative paths we're using
accordingly.

Fixes: 0149459f42 ("glib: 2.56.0 → 2.58.1")
2022-09-04 21:18:49 +00:00
Alyssa Ross
0856bf8144 glib: remove unnecessary substituteInPlace
/bin/true hasn't been hardcoded in this file since Glib 2.55.0.
2.56.0, the first stable version to include this change, was released
in 2018.

Fixes: 0973618e4e ("gnome3: automated update")
2022-09-04 21:18:49 +00:00
Michal Sojka
0cbedad03f glib: move bash completions to right outputs
Previously, bash completion scripts were installed in the "out"
output, which didn't contain any binaries. With this change, the
completion scripts are installed in the outputs containing the
corresponding binaries. Namely, gapplication, gdbus, gio, and
gsettings completion scripts go to $bin, and gresource to $dev. The
result is that the completions work out of the box, when the binaries
are available to the user.
2022-08-01 15:02:25 +02:00
Michal Sojka
ecc304df44 glib: add command man pages
This change adds man pages for commands provided by glib. Namely, the
$bin output now includes man pages (section 1) for:

   gapplication gdbus gio gsettings

The $dev output for:

   gdbus-codegen gio-querymodules glib-compile-resources
   glib-compile-schemas glib-genmarshal glib-gettextize glib-mkenums
   gobject-query gresource gtester-report gtester
2022-08-01 15:02:25 +02:00
R. Ryantm
c99ba0c467 glib: 2.72.2 -> 2.72.3 2022-07-01 15:09:54 +02:00
R. Ryantm
002669d20a glib: 2.72.1 -> 2.72.2 2022-05-31 13:39:04 +02:00
Vladimír Čunát
1aed1a8440
Merge #168747: glib: 2.72.0 -> 2.72.1 (into staging) 2022-04-23 13:06:45 +02:00
R. Ryantm
5979a0a072
glib: 2.72.0 → 2.72.1
https://gitlab.gnome.org/GNOME/glib/-/compare/2.72.0...2.72.1
https://gitlab.gnome.org/GNOME/glib/-/blob/2.72.1/NEWS
2022-04-20 12:52:11 +08:00
github-actions[bot]
ffa96ab0c0
Merge staging-next into staging 2022-04-02 18:01:37 +00:00
github-actions[bot]
fc17fe6417
Merge master into staging-next 2022-04-02 18:01:07 +00:00
Nick Cao
815601ff61
glib: use correct meson for cross compilation 2022-04-03 00:09:33 +08:00
Jan Tojnar
ca0b2cdd67 glib: add support for Pantheon’s terminal emulator
Just like we did for GNOME’s in the parent commit.
2022-03-29 10:23:52 +02:00