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: ac551299e80c
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: dc6912fa9e0b
Choose a head ref
  • 5 commits
  • 168 files changed
  • 2 contributors

Commits on Jul 19, 2018

  1. treewide: remove aliases in nixpkgs 

    This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.

Misc...

- qtikz: use libsForQt5.callPackage

  This ensures we get the right poppler.

- rewrites:

  docbook5_xsl -> docbook_xsl_ns
  docbook_xml_xslt -> docbook_xsl

diffpdf: fixup
    @matthewbauer
    matthewbauer committed Jul 19, 2018
    Configuration menu
    Copy the full SHA
    76999cc View commit details
    Browse the repository at this point in the history

  2. release: disallow aliases 

    This will make hydra & ofborg ignore aliases when evluating
    @matthewbauer
    matthewbauer committed Jul 19, 2018
    Configuration menu
    Copy the full SHA
    25c42e7 View commit details
    Browse the repository at this point in the history

  3. lollypop-portal: use callPackage 

    otherwise we get this error on evaluation:

derivation 'lollypop-portal' has invalid meta attribute 'override'
derivation 'lollypop-portal' has invalid meta attribute 'overrideDerivation'
    @matthewbauer
    matthewbauer committed Jul 19, 2018
    2 Configuration menu
    Copy the full SHA
    aab3182 View commit details
    Browse the repository at this point in the history

  4. treewide: preserve hashes from 76999cc 

    76999cc changed some hashes resulting in this PR being technically
a mass rebuild. To avoid this, I am restoring some of the hashes (even
though it seems silly). My main goal is to get this PR merged quickly
as treewide changes like this get out-of-date quickly.

This commit should be reverted on the next mass rebuild.
    @matthewbauer
    matthewbauer committed Jul 19, 2018
    Configuration menu
    Copy the full SHA
    4ed7a4b View commit details
    Browse the repository at this point in the history

  5. Merge pull request #43692 from matthewbauer/disallow-aliases-in-release 

    Avoid using aliases, disallow aliases in release
    @matthewbauer
    matthewbauer committed Jul 19, 2018
    Configuration menu
    Copy the full SHA
    dc6912f View commit details
    Browse the repository at this point in the history