Commit 45b015a1 authored by Karl Hallsby's avatar Karl Hallsby Committed by Doron Behar
Browse files

octavePackages: use alternative fetchers for moved projects 

Many projects moved from SourceForge to other hosting sites. Use an
appropriate fetcher for each of the packages that have moved to the
new sites.

octavePackages.bim: fetchurl -> fetchFromGitHub

There was a migration from SourceForge to GitHub by the authors.

octavePackages.msh: fetchurl -> fetchFromGitHub

There was a migration from SourceForge to GitHub by the authors.

octavePackages.statistics: fetchurl -> fetchFromGitHub

There was a migration from SourceForge to GitHub by the authors.

octavePackages.octclip: fetchurl -> fetchFromBitbucket

There was a migration from SourceForge to Bitbucket by the authors.

octavePackages.geometry: fetchurl -> fetchhg

Release 4.0.0 is broken. Revision
04965cda30b5f9e51774194c67879e7336df1710 was made shortly thereafter,
fixing a compilation bug.

The bug in question:
polygon.cpp:208:22:
error: static assertion failed: comparison object must be invocable as const
is_invocable_v<const _Compare&, const _Key&, const _Key&>,

octavePackages.octproj: fetchurl -> fetchFromBitbucket

There was a migration from SourceForge to Bitbucket by the authors.
parent 525ba3e4

pkgs/development/octave-modules/bim/default.nix

+6 −4
Original line number Diff line number Diff line 
{ buildOctavePackage

, lib

, fetchurl

, fetchFromGitHub

, fpl

, msh

}:
@@ -9,9 +9,11 @@ buildOctavePackage rec { 
  pname = "bim";

  version = "1.1.6";



  src = fetchurl {

    url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";

    sha256 = "sha256-pv64swrPlgopBlubpAlfoD9KJlOSgF9wdbgdHHTcr9c=";

  src = fetchFromGitHub {

    owner = "carlodefalco";

    repo = "bim";

    rev = "v${version}";

    sha256 = "sha256-hgFb1KFE1KJC8skIaeT/7h/fg1aqRpedGnEPY24zZSI=";

  };



  requiredOctavePackages = [

pkgs/development/octave-modules/geometry/default.nix

+6 −5
Original line number Diff line number Diff line 
{ buildOctavePackage

, lib

, fetchurl

, fetchhg

, matgeom

}:



buildOctavePackage rec {

  pname = "geometry";

  version = "4.0.0";

  version = "unstable-2021-07-07";



  src = fetchurl {

    url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";

    sha256 = "1zmd97xir62fr5v57xifh2cvna5fg67h9yb7bp2vm3ll04y41lhs";

  src = fetchhg {

    url = "http://hg.code.sf.net/p/octave/${pname}";

    rev = "04965cda30b5f9e51774194c67879e7336df1710";

    sha256 = "sha256-ECysYOJMF4gPiCFung9hFSlyyO60X3MGirQ9FlYDix8=";

  };



  requiredOctavePackages = [

pkgs/development/octave-modules/msh/default.nix

+6 −4
Original line number Diff line number Diff line 
{ buildOctavePackage

, lib

, fetchurl

, fetchFromGitHub

# Octave Dependencies

, splines

# Other Dependencies
@@ -15,9 +15,11 @@ buildOctavePackage rec { 
  pname = "msh";

  version = "1.0.12";



  src = fetchurl {

    url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";

    sha256 = "sha256-7xbB+RXq5SE7Ke5rNwSo/mqdSZTzCLXRhS4zdfGz55s=";

  src = fetchFromGitHub {

    owner = "carlodefalco";

    repo = "msh";

    rev = "v${version}";

    sha256 = "sha256-UnMrIruzm3ARoTgUlMMxfjTOMZw/znZUQJmj3VEOw8I=";

  };



  nativeBuildInputs = [

pkgs/development/octave-modules/octclip/default.nix

+6 −4
Original line number Diff line number Diff line 
{ buildOctavePackage

, lib

, fetchurl

, fetchFromBitbucket

}:



buildOctavePackage rec {

  pname = "octclip";

  version = "2.0.3";



  src = fetchurl {

    url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";

    sha256 = "sha256-u6wvCibdkLgmC8Q2LlpVLfXR3LYtssYlO2cRqYPmmR8=";

  src = fetchFromBitbucket {

    owner = "jgpallero";

    repo = pname;

    rev = "OctCLIP-${version}";

    sha256 = "sha256-gG2b8Ix6bzO6O7GRACE81JCVxfXW/+ZdfoniigAEq3g=";

  };



  # The only compilation problem is that no formatting specifier was provided

pkgs/development/octave-modules/octproj/default.nix

+6 −4
Original line number Diff line number Diff line 
{ buildOctavePackage

, lib

, fetchurl

, fetchFromBitbucket

, proj # >= 6.3.0

}:
@@ -8,9 +8,11 @@ buildOctavePackage rec { 
  pname = "octproj";

  version = "3.0.2";



  src = fetchurl {

    url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";

    sha256 = "sha256-G2Ajnt4KGaq9hdXHLHL+6d9lGb83wkMHZqswNijwSzs=";

  src = fetchFromBitbucket {

    owner = "jgpallero";

    repo = pname;

    rev = "OctPROJ-${version}";

    sha256 = "sha256-d/Zf172Etj+GA0cnGsQaKMjOmirE7Hwyj4UECpg7QFM=";

  };



  # The sed changes below allow for the package to be compiled.