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

Commits on Mar 1, 2018

  1. No longer needed and causes confusion

    @idontgetoutmuch
    idontgetoutmuch committed Mar 1, 2018
    Copy the full SHA
    183c360 View commit details

  2. Merge branch 'master' of https://github.com/NixOS/nixpkgs

    @idontgetoutmuch
    idontgetoutmuch committed Mar 1, 2018
    Copy the full SHA
    d1ac8d1 View commit details

  3. Merge pull request #36157 from idontgetoutmuch/master 

    Stop forcing hmatrix-gsl to use gsl 1.16 and use gsl 2.4 instead
    @peti
    peti authored Mar 1, 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
    56f1785 View commit details
Showing with 0 additions and 4 deletions.
  1. +0 −4 pkgs/development/haskell-modules/configuration-nix.nix
4 changes: 0 additions & 4 deletions pkgs/development/haskell-modules/configuration-nix.nix
View file
Original file line number Diff line number Diff line change
@@ -471,10 +471,6 @@ self: super: builtins.intersectAttrs super {
'';
});

# Fails to link against with newer gsl versions because a deprecrated function
# was removed
hmatrix-gsl = super.hmatrix-gsl.override { gsl = pkgs.gsl_1; };

# tests run executable, relying on PATH
# without this, tests fail with "Couldn't launch intero process"
intero = overrideCabal super.intero (drv: {