Branch: refs/heads/haskell-fix-override
Home: https://github.com/NixOS/nixpkgs
Commit: 513c9ea10f3602f0efd4ebd80c1879ac13fd7208
https://github.com/NixOS/nixpkgs/commit/513c9ea10f3602f0efd4ebd80c1879ac13fd7208
Author: Benno Fünfstück <[email protected]>
Date: 2017-04-23 (Sun, 23 Apr 2017)
Changed paths:
M pkgs/build-support/rust/fetch-cargo-deps
Log Message:
-----------
rust: fix fetch-cargo-deps for git dependencies
We need to make sure that `$revs` ends with a space, since files must always
end with newlines. The previous code ignored the last entry in `$revs`, because
read already returns non-zero exit code for the last entry, as it does not end
with a space.
Commit: ce72c46bf02270ff9085b86d445733ca3cc6f32a
https://github.com/NixOS/nixpkgs/commit/ce72c46bf02270ff9085b86d445733ca3cc6f32a
Author: Benno Fünfstück <[email protected]>
Date: 2017-04-24 (Mon, 24 Apr 2017)
Changed paths:
M pkgs/development/haskell-modules/make-package-set.nix
Log Message:
-----------
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 NixOS/nixpkgs#7953
Compare: https://github.com/NixOS/nixpkgs/compare/02bb2660f953...ce72c46bf022_______________________________________________
nix-commits mailing list
[email protected]
https://mailman.science.uu.nl/mailman/listinfo/nix-commits
