Skip to content

Commit

Permalink
[BUILD] Update OTB 9.1.0rc to 9.1.0 (#18)
Browse files Browse the repository at this point in the history
* Switch to fetchFromGitHub and replace version.json references

* Replaced `fetchgit` with `fetchFromGitHub` for fetching the source.
  • Loading branch information
daspk04 authored Jan 4, 2025
1 parent 3874e60 commit ebb5282
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 14 deletions.
19 changes: 9 additions & 10 deletions pkgs/otb/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.
{
cmake,
fetchgit,
fetchFromGitHub,
makeWrapper,
lib,
stdenv,
Expand Down Expand Up @@ -58,7 +58,6 @@
pkgs,
...
}: let
versionMeta = builtins.fromJSON (builtins.readFile ./version.json);

inherit (lib) optionalString optionals optional;
pythonInputs =
Expand All @@ -85,15 +84,15 @@
otbTsSmooth = pkgs.callPackage ./otb-temporalsmoothing/. {};
in
stdenv.mkDerivation rec {
pname = "otb";
version = versionMeta.version;
pname = "otb";
version = "9.1.0";

src = builtins.fetchGit {
name = pname;
url = "https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb";
ref = "refs/tags/${version}";
rev = versionMeta.rev;
};
src = fetchFromGitHub {
owner = "orfeotoolbox";
repo = "OTB";
rev = "refs/tags/${version}";
hash = "sha256-NRyq6WTGxtPpBHXBXLCQyq60n0cJ/575xPs7QYSziYo=";
};

postPatch = lib.concatStringsSep "\n" (
(optionals enableMLUtils ["ln -sr ${mlUtils} Modules/Remote/MLUtils"])
Expand Down
4 changes: 0 additions & 4 deletions pkgs/otb/version.json

This file was deleted.

0 comments on commit ebb5282

Please sign in to comment.