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: 8ed485c67b1c
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 4f3e9ca93a91
Choose a head ref
  • 9 commits
  • 22 files changed
  • 2 contributors

Commits on Aug 18, 2019

  1. flatpak: 1.2.4 -> 1.4.2 

    * Regenerated all patches for 1.4.2 and resolved
  any conflicts.

* fix-test-paths.patch doesn't copy the whole locale archive
  because we have C.UTF8 now.

* nixos/flatpak creates a Flatpak system helper user
  Change introduced in 1.3.2.

Changes:
See https://github.com/flatpak/flatpak/releases/tag/1.3.1 through
1.4.2.
    @worldofpeace
    worldofpeace committed Aug 18, 2019
    Copy the full SHA
    1728bc8 View commit details
    Browse the repository at this point in the history

  2. xdg-desktop-portal: 1.2.0 -> 1.4.2 

    * adapt respect-path-env-var.patch to code being
  moved around, etc.

* Add  json-glib

https://github.com/flatpak/xdg-desktop-portal/releases/tag/1.4.0
    @worldofpeace
    worldofpeace committed Aug 18, 2019
    Copy the full SHA
    2eb94bd View commit details
    Browse the repository at this point in the history

  3. xdg-desktop-portal-gtk: 1.2.0 -> 1.4.0 

    Stylize expression.

https://github.com/flatpak/xdg-desktop-portal-gtk/releases/tag/1.4.0
    @worldofpeace
    worldofpeace committed Aug 18, 2019
    Copy the full SHA
    46d0ebb View commit details
    Browse the repository at this point in the history

  4. ostree: 2019.1 -> 2019.2 

    All patches synced.
fix-1592.patch needed some new additions since that
issue affects more test cases.

https://github.com/ostreedev/ostree/releases/tag/v2019.2

Co-authored-by: Jan Tojnar <jtojnar@gmail.com>
    @worldofpeace @jtojnar
    worldofpeace and jtojnar committed Aug 18, 2019
    Copy the full SHA
    dca61d8 View commit details
    Browse the repository at this point in the history

  5. libmodulemd: init at 2.6.0 

    Includes a patch for the usual pygobject override stuff.
Pending upstream submission.
    @worldofpeace
    worldofpeace committed Aug 18, 2019
    Copy the full SHA
    fdd2898 View commit details
    Browse the repository at this point in the history

  6. libmodulemd_1: init at 1.8.15

    @worldofpeace
    worldofpeace committed Aug 18, 2019
    Copy the full SHA
    8fbae8c View commit details
    Browse the repository at this point in the history

  7. rpm-ostree: 2019.2 -> 2019.5 

    https://github.com/projectatomic/rpm-ostree/releases/tag/v2019.3
https://github.com/projectatomic/rpm-ostree/releases/tag/v2019.4
https://github.com/projectatomic/rpm-ostree/releases/tag/v2019.5
    @worldofpeace
    worldofpeace committed Aug 18, 2019
    Copy the full SHA
    2f48ebb View commit details
    Browse the repository at this point in the history

  8. nixos/flatpak: add comment about selinux

    @worldofpeace
    worldofpeace committed Aug 18, 2019
    Copy the full SHA
    ce0511e View commit details
    Browse the repository at this point in the history

  9. Merge pull request #65291 from worldofpeace/xdg-updates 

    Flatpak updates
    @worldofpeace
    worldofpeace committed Aug 18, 2019
    Copy the full SHA
    4f3e9ca View commit details
    Browse the repository at this point in the history