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: f2825d2ccad7
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 4fa7cc60c152
Choose a head ref
  • 13 commits
  • 10 files changed
  • 4 contributors

Commits on Aug 11, 2020

  1. gobject-introspection: Ensure the giDiscoverSelf is run before gappsW…

    …rapperArgsHook
    
    gappsWrapperArgsHook tries to collect GI_TYPELIB_PATH environment variable so if we want it to see the path giDiscoverSelf adds, we need to force the order.
    
    (cherry picked from commit 8f7387f)
    jtojnar authored and worldofpeace committed Aug 11, 2020
    Configuration menu
    Copy the full SHA
    4af94d3 View commit details
    Browse the repository at this point in the history
  2. wrapGAppsHook: move to a separate file

    (cherry picked from commit 69b8997)
    jtojnar authored and worldofpeace committed Aug 11, 2020
    Configuration menu
    Copy the full SHA
    e1d83fc View commit details
    Browse the repository at this point in the history
  3. wrapGAppsHook: add tests

    (cherry picked from commit 49b89af)
    jtojnar authored and worldofpeace committed Aug 11, 2020
    Configuration menu
    Copy the full SHA
    7293136 View commit details
    Browse the repository at this point in the history
  4. wrapGAppsHook: add comments

    (cherry picked from commit 0be3b18)
    jtojnar authored and worldofpeace committed Aug 11, 2020
    Configuration menu
    Copy the full SHA
    572b49b View commit details
    Browse the repository at this point in the history
  5. ibus: fix generation of 00-upstream-settings

    (cherry picked from commit bd6c12b)
    symphorien authored and worldofpeace committed Aug 11, 2020
    Configuration menu
    Copy the full SHA
    c61471d View commit details
    Browse the repository at this point in the history
  6. ibus: fix installation of dconf database

    Fixes this warning at ibus-daemon startup:
    
    (ibus-dconf:15691): dconf-WARNING **: 21:49:24.018: unable to open file '/etc/dconf/db/ibus': Failed to open file ?/etc/dconf/db/ibus?: open() failed: No such file or directory; expect degraded performance
    
    (cherry picked from commit a71dc0b)
    symphorien authored and worldofpeace committed Aug 11, 2020
    Configuration menu
    Copy the full SHA
    3419ccb View commit details
    Browse the repository at this point in the history
  7. nixos/tests/ibus: fix test

    (cherry picked from commit 5b7ffe6)
    symphorien authored and worldofpeace committed Aug 11, 2020
    Configuration menu
    Copy the full SHA
    2eda645 View commit details
    Browse the repository at this point in the history
  8. Revert "ibus: fix dconf db installation"

    (cherry picked from commit ee5cba2)
    worldofpeace committed Aug 11, 2020
    Configuration menu
    Copy the full SHA
    3e09a95 View commit details
    Browse the repository at this point in the history
  9. ibus: fix installation of dconf database

    Fixes this warning at ibus-daemon startup:
    
    (ibus-dconf:15691): dconf-WARNING **: 21:49:24.018: unable to open file '/etc/dconf/db/ibus': Failed to open file ?/etc/dconf/db/ibus?: open() failed: No such file or directory; expect degraded performance
    
    (cherry picked from commit 3dbd629)
    symphorien authored and worldofpeace committed Aug 11, 2020
    Configuration menu
    Copy the full SHA
    0d34112 View commit details
    Browse the repository at this point in the history
  10. Revert "Revert "ibus: fix dconf db installation""

    This reverts commit ee5cba2.
    
    (cherry picked from commit 11d6318)
    symphorien authored and worldofpeace committed Aug 11, 2020
    Configuration menu
    Copy the full SHA
    22fdd69 View commit details
    Browse the repository at this point in the history
  11. nixos/ibus: add ibus portal if portals are enabled

    (cherry picked from commit 76f7fc1)
    worldofpeace committed Aug 11, 2020
    Configuration menu
    Copy the full SHA
    6a0f658 View commit details
    Browse the repository at this point in the history
  12. nixos/ibus: fix evaluation

    Need to reference through `config` when checking what other modules have set.
    
    (cherry picked from commit c9d988b)
    hedning authored and worldofpeace committed Aug 11, 2020
    Configuration menu
    Copy the full SHA
    b79747e View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2020

  1. Merge pull request #95206 from worldofpeace/gi-backport

    [20.03] Fix ibus
    worldofpeace committed Aug 13, 2020
    Configuration menu
    Copy the full SHA
    4fa7cc6 View commit details
    Browse the repository at this point in the history