Unverified Commit 2918b2c8 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into haskell-updates

parents a48f3268 e32981ab

.github/workflows/check-nix-format.yml

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ jobs: 
            pkgs/development/cuda-modules

            pkgs/test/cuda

            pkgs/top-level/cuda-packages.nix

          NIX_FMT_PATHS_VSCODE_EXTS: pkgs/applications/editors/vscode/extensions

        # Iterate over all environment variables beginning with NIX_FMT_PATHS_.

        run: |

          for env_var in "${!NIX_FMT_PATHS_@}"; do

doc/languages-frameworks/gnome.section.md

+3 −3
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ Programs in the GNOME universe are written in various languages but they all use 


[GSettings](https://developer.gnome.org/gio/stable/GSettings.html) API is often used for storing settings. GSettings schemas are required, to know the type and other metadata of the stored values. GLib looks for `glib-2.0/schemas/gschemas.compiled` files inside the directories of `XDG_DATA_DIRS`.



On Linux, GSettings API is implemented using [dconf](https://wiki.gnome.org/Projects/dconf) backend. You will need to add `dconf` [GIO module](#ssec-gnome-gio-modules) to `GIO_EXTRA_MODULES` variable, otherwise the `memory` backend will be used and the saved settings will not be persistent.

On Linux, GSettings API is implemented using [dconf](https://gitlab.gnome.org/GNOME/dconf) backend. You will need to add `dconf` [GIO module](#ssec-gnome-gio-modules) to `GIO_EXTRA_MODULES` variable, otherwise the `memory` backend will be used and the saved settings will not be persistent.



Last you will need the dconf database D-Bus service itself. You can enable it using `programs.dconf.enable`.
@@ -76,11 +76,11 @@ Previously, a GTK theme needed to be in `XDG_DATA_DIRS`. This is no longer neces 


### GObject introspection typelibs {#ssec-gnome-typelibs}



[GObject introspection](https://wiki.gnome.org/Projects/GObjectIntrospection) allows applications to use C libraries in other languages easily. It does this through `typelib` files searched in `GI_TYPELIB_PATH`.

[GObject introspection](https://gitlab.gnome.org/GNOME/gobject-introspection) allows applications to use C libraries in other languages easily. It does this through `typelib` files searched in `GI_TYPELIB_PATH`.



### Various plug-ins {#ssec-gnome-plugins}



If your application uses [GStreamer](https://gstreamer.freedesktop.org/) or [Grilo](https://wiki.gnome.org/Projects/Grilo), you should set `GST_PLUGIN_SYSTEM_PATH_1_0` and `GRL_PLUGIN_PATH`, respectively.

If your application uses [GStreamer](https://gstreamer.freedesktop.org/) or [Grilo](https://gitlab.gnome.org/GNOME/grilo), you should set `GST_PLUGIN_SYSTEM_PATH_1_0` and `GRL_PLUGIN_PATH`, respectively.



## Onto `wrapGAppsHook` {#ssec-gnome-hooks}

lib/systems/doubles.nix

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ let 
    "x86_64-darwin" "i686-darwin" "aarch64-darwin" "armv7a-darwin"



    # FreeBSD

    "i686-freebsd13" "x86_64-freebsd13"

    "i686-freebsd" "x86_64-freebsd"



    # Genode

    "aarch64-genode" "i686-genode" "x86_64-genode"

lib/systems/examples.nix

+1 −1
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ rec { 
  # BSDs



  x86_64-freebsd = {

    config = "x86_64-unknown-freebsd13";

    config = "x86_64-unknown-freebsd";

    useLLVM = true;

  };

lib/systems/parse.nix

+1 −5
Original line number Diff line number Diff line
@@ -326,11 +326,7 @@ rec { 
    # the normalized name for macOS.

    macos    = { execFormat = macho;   families = { inherit darwin; }; name = "darwin"; };

    ios      = { execFormat = macho;   families = { inherit darwin; }; };

    # A tricky thing about FreeBSD is that there is no stable ABI across

    # versions. That means that putting in the version as part of the

    # config string is paramount.

    freebsd12 = { execFormat = elf;     families = { inherit bsd; }; name = "freebsd"; version = 12; };

    freebsd13 = { execFormat = elf;     families = { inherit bsd; }; name = "freebsd"; version = 13; };

    freebsd  = { execFormat = elf;     families = { inherit bsd; }; name = "freebsd"; };

    linux    = { execFormat = elf;     families = { }; };

    netbsd   = { execFormat = elf;     families = { inherit bsd; }; };

    none     = { execFormat = unknown; families = { }; };