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: 37b90ed9af89
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 85ae7137ac6a
Choose a head ref
  • 19 commits
  • 14 files changed
  • 1 contributor

Commits on May 31, 2018

  1. Revert "inkscape: disable parallelBuilding" 

    This reverts commit 05a6e94.
    @matthewbauer
    matthewbauer committed May 31, 2018
    Configuration menu
    Copy the full SHA
    e8b7d73 View commit details
    Browse the repository at this point in the history

  2. Revert "inkscape: fix on darwin again" 

    This reverts commit 047c937.
    @matthewbauer
    matthewbauer committed May 31, 2018
    Configuration menu
    Copy the full SHA
    63c0885 View commit details
    Browse the repository at this point in the history

  3. Revert "inkscape: don't patch share/filters" 

    This reverts commit 38364c0.
    @matthewbauer
    matthewbauer committed May 31, 2018
    Configuration menu
    Copy the full SHA
    4a58ed6 View commit details
    Browse the repository at this point in the history

  4. Revert "inkscape: Fix build on NixOS" 

    This reverts commit 6c748ae.
    @matthewbauer
    matthewbauer committed May 31, 2018
    Configuration menu
    Copy the full SHA
    9e04546 View commit details
    Browse the repository at this point in the history

  5. Revert "inkscape: typo" 

    This reverts commit 0a8c91a.
    @matthewbauer
    matthewbauer committed May 31, 2018
    Configuration menu
    Copy the full SHA
    012a3a3 View commit details
    Browse the repository at this point in the history

  6. Revert "inkscape: fix on Darwin" 

    This reverts commit a276d51.
    @matthewbauer
    matthewbauer committed May 31, 2018
    Configuration menu
    Copy the full SHA
    95f9171 View commit details
    Browse the repository at this point in the history

  7. darwin.ICU: fix cctools

    @matthewbauer
    matthewbauer committed May 31, 2018
    Configuration menu
    Copy the full SHA
    279fd72 View commit details
    Browse the repository at this point in the history

  8. wesnoth: supports darwin

    @matthewbauer
    matthewbauer committed May 31, 2018
    Configuration menu
    Copy the full SHA
    9a4cb90 View commit details
    Browse the repository at this point in the history

  9. woff2: supports darwin

    @matthewbauer
    matthewbauer committed May 31, 2018
    Configuration menu
    Copy the full SHA
    0e04356 View commit details
    Browse the repository at this point in the history

  10. libpeas: supports darwin

    @matthewbauer
    matthewbauer committed May 31, 2018
    Configuration menu
    Copy the full SHA
    8950b14 View commit details
    Browse the repository at this point in the history

  11. all-packages: remove default.nix in callPackage 

    not needed
    @matthewbauer
    matthewbauer committed May 31, 2018
    Configuration menu
    Copy the full SHA
    58359ba View commit details
    Browse the repository at this point in the history

  12. haskell: disable language-nix on i686 linux 

    see NixOS/language-nix#4 for discusssion
    @matthewbauer
    matthewbauer committed May 31, 2018
    Configuration menu
    Copy the full SHA
    ced1670 View commit details
    Browse the repository at this point in the history

  13. qemu-flags: default to qemu-kvm 

    this is the "generic" version & should work everywhere.

also add darwin case
    @matthewbauer
    matthewbauer committed May 31, 2018
    Configuration menu
    Copy the full SHA
    753c63d View commit details
    Browse the repository at this point in the history

  14. emacsMacport: 25.3 -> 26.1

    @matthewbauer
    matthewbauer committed May 31, 2018
    3 Configuration menu
    Copy the full SHA
    ee1d611 View commit details
    Browse the repository at this point in the history

  15. zsh: only do promptInit when TERM!=dumb 

    This allows tramp to be used correctly when default shell is zsh.
    @matthewbauer
    matthewbauer committed May 31, 2018
    Configuration menu
    Copy the full SHA
    2f68e86 View commit details
    Browse the repository at this point in the history

  16. all-packages remove unused override

    @matthewbauer
    matthewbauer committed May 31, 2018
    Configuration menu
    Copy the full SHA
    f492246 View commit details
    Browse the repository at this point in the history

  17. cairo: fix build inputs

    @matthewbauer
    matthewbauer committed May 31, 2018
    Configuration menu
    Copy the full SHA
    e557a43 View commit details
    Browse the repository at this point in the history

  18. ffmpeg: fix 3.4 on darwin

    @matthewbauer
    matthewbauer committed May 31, 2018
    Configuration menu
    Copy the full SHA
    03b3148 View commit details
    Browse the repository at this point in the history

  19. Revert commit 4b2f397 

    This reverts commit 4b2f397. It
updated gdk_pixbuf to 2.36.12 but unfortunately broke macOS builds.
The new mime sniffing is not working correctly so that .png files
cannot be built.

Fixes #41314

/cc @jtojnar @LnL7
    @matthewbauer
    matthewbauer committed May 31, 2018
    3 Configuration menu
    Copy the full SHA
    85ae713 View commit details
    Browse the repository at this point in the history