Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 3920d3846da9
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 29d14fecce65
Choose a head ref
  • 4 commits
  • 4 files changed
  • 1 contributor

Commits on Mar 25, 2021

  1. fixup! folks: 0.14.0 → 0.15.2

    @jtojnar
    jtojnar committed Mar 25, 2021
    Copy the full SHA
    f221c5f View commit details
    Browse the repository at this point in the history

  2. squash! gnome3.gnome-desktop: 40.rc → 40.0 

    - use libxkbregistry to parse evdev rules files for us https://gitlab.gnome.org/GNOME/gnome-desktop/-/merge_requests/88
    @jtojnar
    jtojnar committed Mar 25, 2021
    Copy the full SHA
    9c530f9 View commit details
    Browse the repository at this point in the history

  3. squash! folks: 0.14.0 → 0.15.2 

    - Had to add libgdata to fix:
	[40/253] Compiling Vala source ../backends/eds/lib/edsf-persona-store.vala ../backends/eds/lib/edsf-persona.vala backends/eds/lib/namespace.vala folks/folks.vapi folks/folks-internal.vapila ../backends/ofono/org-ofono.vala folks/folks.vapi folks/folks-internal.vapi
	FAILED: backends/eds/lib/libfolks-eds.so.26.0.0.p/edsf-persona-store.c backends/eds/lib/libfolks-eds.so.26.0.0.p/edsf-persona.c backends/eds/lib/libfolks-eds.so.26.0.0.p/namespace.c backends/eds/lib/folks/folks-eds.h backends/eds/lib/folks-eds.vapi backends/eds/lib/FolksEds-0.7.gir
	valac -C --vapidir /build/folks-0.15.2/folks -D FOLKS_COMPILATION --pkg libxml-2.0 --pkg libedataserver-1.2 --pkg libebook-contacts-1.2 --pkg libebook-1.2 /build/folks-0.15.2/folks/folks-generics.vapi --pkg gee-0.8 --pkg gio-2.0 --pkg gmodule-2.0 --pkg gobject-2.0 /build/folks-0.15.2/folks/build-conf.vapi --color=always --directory backends/eds/lib/libfolks-eds.so.26.0.0.p --basedir ../backends/eds/lib --library folks-eds --header backends/eds/lib/folks/folks-eds.h --vapi ../folks-eds.vapi --gir ../FolksEds-0.7.gir --includedir folks ../backends/eds/lib/edsf-persona-store.vala ../backends/eds/lib/edsf-persona.vala backends/eds/lib/namespace.vala folks/folks.vapi folks/folks-internal.vapi
	error: Package `libgdata' not found in specified Vala API directories or GObject-Introspection GIR directories
	Compilation failed: 1 error(s), 0 warning(s)
	[41/253] Compiling Vala source ../backends/ofono/ofono-backend-factory.vala ../backends/ofono/ofono-backend.vala ../backends/ofono/ofono-persona-store.vala ../backends/ofono/ofono-persona.vala ../backends/ofono/org-ofono.vala folks/folks.vapi folks/folks-internal.vapi
	FAILED: backends/ofono/ofono.so.p/ofono-backend-factory.c backends/ofono/ofono.so.p/ofono-backend.c backends/ofono/ofono.so.p/ofono-persona-store.c backends/ofono/ofono.so.p/ofono-persona.c backends/ofono/ofono.so.p/org-ofono.c backends/ofono/ofono.h backends/ofono/ofono.vapi
	valac -C --vapidir /build/folks-0.15.2/folks -D FOLKS_COMPILATION --pkg libedataserver-1.2 --pkg libebook-1.2 /build/folks-0.15.2/folks/folks-generics.vapi --pkg gee-0.8 --pkg gio-2.0 --pkg gmodule-2.0 --pkg gobject-2.0 /build/folks-0.15.2/folks/build-conf.vapi --color=always --directory backends/ofono/ofono.so.p --basedir ../backends/ofono --library ofono --header backends/ofono/ofono.h --vapi ../ofono.vapi ../backends/ofono/ofono-backend-factory.vala ../backends/ofono/ofono-backend.vala ../backends/ofono/ofono-persona-store.vala ../backends/ofono/ofono-persona.vala ../backends/ofono/org-ofono.vala folks/folks.vapi folks/folks-internal.vapi
	error: Package `libgdata' not found in specified Vala API directories or GObject-Introspection GIR directories
	Compilation failed: 1 error(s), 0 warning(s)
    @jtojnar
    jtojnar committed Mar 25, 2021
    Copy the full SHA
    183a5d5 View commit details
    Browse the repository at this point in the history

  4. squash! gnome3.gnome-initial-setup: 3.38.4 → 40.0 

    - gnome-tour is now launched by shell https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/issues/120
    @jtojnar
    jtojnar committed Mar 25, 2021
    Copy the full SHA
    29d14fe View commit details
    Browse the repository at this point in the history