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: 91365cd23abc
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: d5060ac3a783
Choose a head ref
  • 12 commits
  • 19 files changed
  • 1 contributor

Commits on May 11, 2018

  1. flatpak: init at 0.11.7

    @jtojnar
    jtojnar committed May 11, 2018
    Configuration menu
    Copy the full SHA
    215dcb7 View commit details
    Browse the repository at this point in the history

  2. xdg-desktop-portal: init at 0.11

    @jtojnar
    jtojnar committed May 11, 2018
    Configuration menu
    Copy the full SHA
    fe54e14 View commit details
    Browse the repository at this point in the history

  3. xdg-desktop-portal-gtk: init at 0.10

    @jtojnar
    jtojnar committed May 11, 2018
    Configuration menu
    Copy the full SHA
    556c40c View commit details
    Browse the repository at this point in the history

Commits on May 15, 2018

  1. nixos/flatpak: init

    @jtojnar
    jtojnar committed May 15, 2018
    Configuration menu
    Copy the full SHA
    e0a42d9 View commit details
    Browse the repository at this point in the history

  2. nixos/systemd-lib: fix conflict with dbus.service.d directory 

    When a package contains a directory in one of the systemd directories
(like flatpak does), it is symlinked into the *-units derivation.
Then later, the derivation will try to create the directory, which
will fail:

mkdir: cannot create directory '/nix/store/…-user-units/dbus.service.d': File exists
builder for '/nix/store/…-user-units.drv' failed with exit code 1

Closes: #33233
    @jtojnar
    jtojnar committed May 15, 2018
    Configuration menu
    Copy the full SHA
    17dd7bc View commit details
    Browse the repository at this point in the history

  3. gnome3.gnome-software: build with flatpak support

    @jtojnar
    jtojnar committed May 15, 2018
    Configuration menu
    Copy the full SHA
    2fc8b83 View commit details
    Browse the repository at this point in the history

  4. flatpak-builder: init add 0.10.10

    @jtojnar
    jtojnar committed May 15, 2018
    Configuration menu
    Copy the full SHA
    843bc0f View commit details
    Browse the repository at this point in the history

  5. nixos/flatpak: allow specifying extra portals

    @jtojnar
    jtojnar committed May 15, 2018
    Configuration menu
    Copy the full SHA
    ec80c5e View commit details
    Browse the repository at this point in the history

  6. nixos/flatpak: add test

    @jtojnar
    jtojnar committed May 15, 2018
    Configuration menu
    Copy the full SHA
    1c04363 View commit details
    Browse the repository at this point in the history

  7. nixos/xdg-desktop-portal: add test

    @jtojnar
    jtojnar committed May 15, 2018
    Configuration menu
    Copy the full SHA
    21ff482 View commit details
    Browse the repository at this point in the history

  8. nixos/flatpak: add docs

    @jtojnar
    jtojnar committed May 15, 2018
    Configuration menu
    Copy the full SHA
    d614f32 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #33371 from jtojnar/flatpak 

    Flatpak
    @jtojnar
    jtojnar committed May 15, 2018
    Configuration menu
    Copy the full SHA
    d5060ac View commit details
    Browse the repository at this point in the history