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: 346fd9e8445f
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 6b36d26a2430
Choose a head ref
  • 7 commits
  • 5 files changed
  • 3 contributors

Commits on Apr 25, 2017

  1. LTS Haskell 8.12

    @peti
    peti committed Apr 25, 2017
    Configuration menu
    Copy the full SHA
    0f10417 View commit details
    Browse the repository at this point in the history

  2. hackage2nix: update list of broken packages

    @peti
    peti committed Apr 25, 2017
    Configuration menu
    Copy the full SHA
    2a34188 View commit details
    Browse the repository at this point in the history

  3. hackage-packages.nix: automatic Haskell package set update 

    This update was generated by hackage2nix v2.1.1-8-g19ebdb9 from Hackage revision
commercialhaskell/all-cabal-hashes@1404855.
    @peti
    peti committed Apr 25, 2017
    Configuration menu
    Copy the full SHA
    9fa927f View commit details
    Browse the repository at this point in the history

  4. halvm: set proper meta.platforms 

    64-bit Linux is the only platform that has Xen in Nixpkgs.
    @peti
    peti committed Apr 25, 2017
    1 Configuration menu
    Copy the full SHA
    9284424 View commit details
    Browse the repository at this point in the history

  5. purescript: remove overrides 

    It now supports recent versions of various dependencies.
    @mdorman @peti
    mdorman authored and peti committed Apr 25, 2017
    Configuration menu
    Copy the full SHA
    9b74549 View commit details
    Browse the repository at this point in the history

  6. haskell: preserve overrideScope on override 

    We want code such as `(pkg.override {}).overrideScope (self: super: {})` to
work. This didn't work before, since `override` will call the original package
again, and the attribute `overideScope`, which `callPackageWithScope` added,
wasn't added again. The fix for this is to modify the package function itself
to include the `callPackageWithScope` attribute, so it'll be re-added whenever
the function is overriden for with arguments.

There is a small problem here though: since callPackage uses some magic
(`builtins.functionArgs`) to determine the auto-arguments of a function, we
can't just write `callPackageWith scope drvScope`, since
`builtins.functionArgs drvScope` will be `{}`. To fix this, we implement our own
`callPackageWith`.

Fixes #7953.
Closes #9336.
    @bennofs @peti
    bennofs authored and peti committed Apr 25, 2017
    Configuration menu
    Copy the full SHA
    731e0fa View commit details
    Browse the repository at this point in the history

  7. haskell: add more callPackageWithScope docs

    @bennofs @peti
    bennofs authored and peti committed Apr 25, 2017
    Configuration menu
    Copy the full SHA
    6b36d26 View commit details
    Browse the repository at this point in the history