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: 51991d77525f
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: e6febf8f7e22
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Feb 18, 2020

  1. flatpak: propagate glib and ostree 

    Pantheon's sideload broke:
```
meson.build:17:0: ERROR: Could not generate cargs for flatpak:
Package ostree-1 was not found in the pkg-config search path.
Perhaps you should add the directory containing `ostree-1.pc'
to the PKG_CONFIG_PATH environment variable
Package 'ostree-1', required by 'flatpak', not found
```

https://hydra.nixos.org/build/113077888

ZHF: #80379
(cherry picked from commit 461ea02)
    @worldofpeace
    worldofpeace committed Feb 18, 2020
    Copy the full SHA
    4603e70 View commit details
    Browse the repository at this point in the history

  2. flatpak: add dev output 

    (cherry picked from commit 26f1d1e)
    @worldofpeace
    worldofpeace committed Feb 18, 2020
    Copy the full SHA
    33ce841 View commit details
    Browse the repository at this point in the history

  3. flatpak: 1.6.1 -> 1.6.2 

    https://github.com/flatpak/flatpak/releases/tag/1.6.2
(cherry picked from commit d744b4f)
    @zowoq @worldofpeace
    zowoq authored and worldofpeace committed Feb 18, 2020
    Copy the full SHA
    e6febf8 View commit details
    Browse the repository at this point in the history