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

Commits on Mar 7, 2020

  1. eigen: fetch source from gitlab

    @eadwu
    eadwu committed Mar 7, 2020
    Copy the full SHA
    805e068 View commit details

Commits on Mar 8, 2020

  1. Merge pull request #81998 from eadwu/eigen/gitlab-source 

    eigen: fetch source from gitlab
    @markuskowa
    markuskowa authored Mar 8, 2020
    Copy the full SHA
    fd48d9b View commit details
Showing with 19 additions and 22 deletions.
  1. +10 −11 pkgs/development/libraries/eigen/2.0.nix
  2. +9 −11 pkgs/development/libraries/eigen/default.nix
21 changes: 10 additions & 11 deletions pkgs/development/libraries/eigen/2.0.nix
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
{stdenv, fetchurl, cmake}:
{ stdenv, fetchFromGitLab, cmake }:

let
v = "2.0.17";
in
stdenv.mkDerivation {
name = "eigen-${v}";
stdenv.mkDerivation rec {
pname = "eigen";
version = "2.0.17";

src = fetchurl {
url = "https://bitbucket.org/eigen/eigen/get/${v}.tar.bz2";
name = "eigen-${v}.tar.bz2";
sha256 = "0q4ry2pmdb9lvm0g92wi6s6qng3m9q73n5flwbkfcz1nxmbfhmbj";
src = fetchFromGitLab {
owner = "libeigen";
repo = "eigen";
rev = version;
sha256 = "0d4knrcz04pxmxaqs5r3wv092950kl1z9wsw87vdzi9kgvc6wl0b";
};

nativeBuildInputs = [ cmake ];

meta = with stdenv.lib; {
description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
license = licenses.lgpl3Plus;
homepage = http://eigen.tuxfamily.org ;
homepage = "https://eigen.tuxfamily.org";
maintainers = with stdenv.lib.maintainers; [ sander raskin ];
branch = "2";
platforms = with stdenv.lib.platforms; unix;
20 changes: 9 additions & 11 deletions pkgs/development/libraries/eigen/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
{stdenv, fetchurl, cmake}:
{ stdenv, fetchFromGitLab, cmake }:

let
version = "3.3.7";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "eigen";
inherit version;
version = "3.3.7";

src = fetchurl {
url = "https://bitbucket.org/eigen/eigen/get/${version}.tar.gz";
name = "eigen-${version}.tar.gz";
sha256 = "1nnh0v82a5xibcjaph51mx06mxbllk77fvihnd5ba0kpl23yz13y";
src = fetchFromGitLab {
owner = "libeigen";
repo = "eigen";
rev = version;
sha256 = "1i3cvg8d70dk99fl3lrv3wqhfpdnm5kx01fl7r2bz46sk9bphwm1";
};

patches = [
@@ -22,7 +20,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
license = licenses.lgpl3Plus;
homepage = http://eigen.tuxfamily.org ;
homepage = "https://eigen.tuxfamily.org";
platforms = platforms.unix;
maintainers = with stdenv.lib.maintainers; [ sander raskin ];
inherit version;