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: c3c020c16881
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 0c52651bb73c
Choose a head ref
  • 6 commits
  • 5 files changed
  • 2 contributors

Commits on Sep 3, 2019

  1. gnome2.gvfs: drop 

    Not needed by anything and dropping it will allow us to clean up the expression.

Changed to an alias as that is what it was in the first place.
    @jtojnar
    jtojnar committed Sep 3, 2019
    Copy the full SHA
    8605b47 View commit details
    Browse the repository at this point in the history

  2. gvfs: only support GNOME 3, not GNOME 2 

    It will make the expression and calls nicer.
    @jtojnar
    jtojnar committed Sep 3, 2019
    Copy the full SHA
    ef19440 View commit details
    Browse the repository at this point in the history

  3. gvfs: format with nixpkgs-fmt

    @jtojnar
    jtojnar committed Sep 3, 2019
    Copy the full SHA
    f5a54f3 View commit details
    Browse the repository at this point in the history

  4. gnome3.gvfs: fix eval with allowAliases = false

    @jtojnar
    jtojnar committed Sep 3, 2019
    Copy the full SHA
    6fabbe5 View commit details
    Browse the repository at this point in the history

  5. gnome3.glib-networking: replace with alias 

    Since we moved gsettings-desktop-schemas to top-level, gnome3.glib-networking was the same as glib-networking.
We could try to make the top-level variant not depend on gsettings-desktop-schemas again but that is probably
pointless, as the dependency is rather small compared to things like libproxy. Instead, we will just drop
the package in gnome3 attr set and always rely on the top-level expression.
    @jtojnar
    jtojnar committed Sep 3, 2019
    Copy the full SHA
    fa03881 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #67935 from jtojnar/gnome-fixes 

    gnome3.gvfs: fix eval with allowAliases = false
    @worldofpeace
    worldofpeace committed Sep 3, 2019
    Copy the full SHA
    0c52651 View commit details
    Browse the repository at this point in the history