Unverified Commit 588f479f authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

orthanc-framework: init at 1.12.6, orthanc-plugin-dicomweb: init at 1.18 (#391361)

parents 39fec493 b49b2351

nixos/modules/services/misc/orthanc.nix

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ in 
  };



  config = lib.mkIf cfg.enable {

    services.orthanc.settings = options.services.orthanc.settings.default;

    services.orthanc.settings = opt.settings.default;



    systemd.services.orthanc = {

      description = "Orthanc is a lightweight, RESTful DICOM server for healthcare and medical research";

pkgs/by-name/or/orthanc-framework/package.nix

0 → 100644
+44 −0
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  orthanc,

  gtest,

  icu,

  zlib,

}:



stdenv.mkDerivation (finalAttrs: {

  pname = "orthanc-framework";

  inherit (orthanc)

    src

    version

    nativeBuildInputs

    strictDeps

    cmakeFlags

    ;



  sourceRoot = "${finalAttrs.src.name}/OrthancFramework/SharedLibrary";

  outputs = [

    "out"

    "dev"

  ];



  buildInputs = orthanc.buildInputs ++ [

    icu

  ];



  NIX_LDFLAGS = lib.strings.concatStringsSep " " [

    "-L${lib.getLib zlib}"

    "-lz"

    "-L${lib.getLib gtest}"

    "-lgtest"

  ];



  meta = {

    description = "SDK for building Orthanc plugins and related applications";

    homepage = "https://www.orthanc-server.com/";

    license = lib.licenses.gpl3Plus;

    maintainers = with lib.maintainers; [ drupol ];

    platforms = lib.platforms.linux;

  };

})

pkgs/by-name/or/orthanc-plugin-dicomweb/fix-orthanc-framework-headers-detection.patch

0 → 100644
+16 −0
Original line number Diff line number Diff line 
diff -r ad41d16f36b1 Resources/Orthanc/CMake/DownloadOrthancFramework.cmake

--- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Fri Jan 17 12:24:54 2025 +0100

+++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Thu Mar 20 17:45:59 2025 +0100

@@ -552,9 +552,10 @@

     set(ORTHANC_FRAMEWORK_INCLUDE_DIR ${ORTHANC_FRAMEWORK_ROOT})

   else()

     find_path(ORTHANC_FRAMEWORK_INCLUDE_DIR OrthancFramework.h

-      /usr/include/orthanc-framework

-      /usr/local/include/orthanc-framework

+      /usr/

+      /usr/local/

       ${ORTHANC_FRAMEWORK_ROOT}

+      PATH_SUFFIXES include include/orthanc-framework

       )

   endif()

pkgs/by-name/or/orthanc-plugin-dicomweb/package.nix

0 → 100644
+106 −0
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  fetchhg,

  fetchurl,

  orthanc,

  cmake,

  python3,

  unzip,

  gtest,

  jsoncpp,

  boost,

  pugixml,

  libuuid,

  zlib,

  pkg-config,

}:



let

  bootstrap = fetchurl {

    url = "https://orthanc.uclouvain.be/downloads/third-party-downloads/bootstrap-5.3.3.zip";

    hash = "sha256-VdfxznlQQK+4MR3wnSnQ00ZIQAweqrstCi7SIWs9sF0=";

  };

  vuejs = fetchurl {

    url = "https://orthanc.uclouvain.be/downloads/third-party-downloads/dicom-web/vuejs-2.6.10.tar.gz";

    hash = "sha256-49kAzZJmtb7Zu21XX8mrZ4fnnnrSHAHuEne/9UUxIfI=";

  };

  axios = fetchurl {

    url = "https://orthanc.uclouvain.be/downloads/third-party-downloads/dicom-web/axios-0.19.0.tar.gz";

    hash = "sha256-KVd8YIWwkLTkqZOS/N1YL7a7y0myqvLMe3+jh0Ups4A=";

  };

  font-awesome = fetchurl {

    url = "https://orthanc.uclouvain.be/downloads/third-party-downloads/dicom-web/Font-Awesome-4.7.0.tar.gz";

    hash = "sha256-3lEroOHerTgrv843LN50s/GJcdh2//tjXukzPw2wXUM=";

  };

  babel-polyfill = fetchurl {

    url = "https://orthanc.uclouvain.be/downloads/third-party-downloads/dicom-web/babel-polyfill-6.26.0.min.js.gz";

    hash = "sha256-CH09LWISr7QY9QSRhY9/BVy1Te+2NR1sXQCPZioqlcI=";

  };

in

stdenv.mkDerivation (finalAttrs: {

  pname = "orthanc-plugin-dicomweb";

  version = "1.18";



  src = fetchhg {

    url = "https://orthanc.uclouvain.be/hg/orthanc-dicomweb/";

    rev = "OrthancDicomWeb-${finalAttrs.version}";

    hash = "sha256-ee271Fcu8yi1gZpTWrCuqhsBdFcPR/JK/fsnJg8PwIc=";

  };



  patches = [

    # Fix Orthanc Framework headers files detection

    ./fix-orthanc-framework-headers-detection.patch

  ];



  postPatch = ''

    mkdir -p ThirdPartyDownloads

    ln -s ${bootstrap} ThirdPartyDownloads/bootstrap-5.3.3.zip

    ln -s ${vuejs} ThirdPartyDownloads/vuejs-2.6.10.tar.gz

    ln -s ${axios} ThirdPartyDownloads/axios-0.19.0.tar.gz

    ln -s ${font-awesome} ThirdPartyDownloads/Font-Awesome-4.7.0.tar.gz

    ln -s ${babel-polyfill} ThirdPartyDownloads/babel-polyfill-6.26.0.min.js.gz

  '';



  SourceRoot = "${finalAttrs.src.name}/Build";



  nativeBuildInputs = [

    cmake

    python3

    unzip

  ];



  buildInputs = [

    orthanc

    orthanc.framework

    jsoncpp

    boost

    gtest

    libuuid

    pugixml

    zlib

  ];



  strictDeps = true;



  NIX_LDFLAGS = lib.strings.concatStringsSep " " [

    "-L${lib.getLib gtest}"

    "-lgtest"

  ];



  cmakeFlags = [

    "-DCMAKE_BUILD_TYPE=Release"

    "-DSTATIC_BUILD=OFF"

    "-DORTHANC_FRAMEWORK_SOURCE=system"

  ];



  meta = {

    description = "Plugin that extends Orthanc with support for the DICOMweb protocols";

    license = lib.licenses.gpl3Plus;

    maintainers = with lib.maintainers; [

      drupol

      dvcorreia

    ];

    platforms = lib.platforms.linux;

  };

})

pkgs/by-name/or/orthanc/package.nix

+21 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
  unzip,

  versionCheckHook,

  nixosTests,

  orthanc-framework,

}:



stdenv.mkDerivation (finalAttrs: {
@@ -41,6 +42,12 @@ stdenv.mkDerivation (finalAttrs: { 
    ./add-missing-include.patch

  ];



  outputs = [

    "out"

    "dev"

    "doc"

  ];



  sourceRoot = "${finalAttrs.src.name}/OrthancServer";



  nativeBuildInputs = [
@@ -98,6 +105,15 @@ stdenv.mkDerivation (finalAttrs: { 
    (lib.cmakeBool "USE_SYSTEM_ZLIB" true)

  ];



  # Remove warnings during the build

  env.NIX_CFLAGS_COMPILE = "-Wno-builtin-macro-redefined";



  postInstall = ''

    mkdir -p $doc/share/doc/orthanc

    cp -r $src/OrthancServer/Resources/Samples $doc/share/doc/orthanc/Samples

    cp -r $src/OrthancServer/Plugins/Samples $doc/share/doc/orthanc/OrthancPluginSamples

  '';



  nativeInstallCheckInputs = [

    versionCheckHook

  ];
@@ -105,9 +121,12 @@ stdenv.mkDerivation (finalAttrs: { 
  versionCheckProgramArg = "--version";

  doInstallCheck = true;



  passthru.tests = {

  passthru = {

    framework = orthanc-framework;

    tests = {

      inherit (nixosTests) orthanc;

    };

  };



  meta = {

    description = "Orthanc is a lightweight, RESTful DICOM server for healthcare and medical research";