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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4fd9ca3a51b2
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b667721ce2c7
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 19, 2018

  1. haskellPackages.spatial-rotations: dontCheck for cyclic dependency

    @srhb
    srhb committed Jul 19, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b53b595 View commit details

  2. Merge pull request #43730 from srhb/dontcheck-spatial-rotation 

    haskellPackages.spatial-rotations: dontCheck for cyclic dependency
    @peti
    peti authored Jul 19, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b667721 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/development/haskell-modules/configuration-nix.nix
2 changes: 1 addition & 1 deletion pkgs/development/haskell-modules/configuration-nix.nix
View file
Original file line number Diff line number Diff line change
@@ -494,7 +494,7 @@ self: super: builtins.intersectAttrs super {
# Break cyclic reference that results in an infinite recursion.
partial-semigroup = dontCheck super.partial-semigroup;
colour = dontCheck super.colour;
manifolds = super.manifolds.override { spatial-rotations = dontCheck self.spatial-rotations; };
spatial-rotations = dontCheck super.spatial-rotations;

LDAP = dontCheck (overrideCabal super.LDAP (drv: {
librarySystemDepends = drv.librarySystemDepends or [] ++ [ pkgs.cyrus_sasl.dev ];