diff --git a/artifacts_nickel/breitweiser_high.ncl b/artifacts_nickel/breitweiser_high.ncl index 97c0e7f..b8083b6 100644 --- a/artifacts_nickel/breitweiser_high.ncl +++ b/artifacts_nickel/breitweiser_high.ncl @@ -12,23 +12,19 @@ let { Artifact, .. } = import "../workflow/nickel/artifact_contract.ncl" in misc_packages = [ { name = "NetLogo-6.2.0-64", - url = "http://ccl.northwestern.edu/netlogo/6.2.0/NetLogo-6.2.0-64.tgz", - type = "tar" + url = "http://ccl.northwestern.edu/netlogo/6.2.0/NetLogo-6.2.0-64.tgz" }, { name = "root_v6.22.06_python3.9_ubuntu-20.04", - url = "http://biodynamo-lfs.web.cern.ch/biodynamo-lfs/third-party/root_v6.22.06_python3.9_ubuntu-20.04.tar.gz", - type = "tar" + url = "http://biodynamo-lfs.web.cern.ch/biodynamo-lfs/third-party/root_v6.22.06_python3.9_ubuntu-20.04.tar.gz" }, { name = "qt_v5.12.10_ubuntu-20.04", - url = "http://biodynamo-lfs.web.cern.ch/biodynamo-lfs/third-party/qt_v5.12.10_ubuntu-20.04.tar.gz", - type = "tar" + url = "http://biodynamo-lfs.web.cern.ch/biodynamo-lfs/third-party/qt_v5.12.10_ubuntu-20.04.tar.gz" }, { name = "paraview_v5.9.0_ubuntu-20.04_default", - url = "http://biodynamo-lfs.web.cern.ch/biodynamo-lfs/third-party/paraview_v5.9.0_ubuntu-20.04_default.tar.gz", - type = "tar" + url = "http://biodynamo-lfs.web.cern.ch/biodynamo-lfs/third-party/paraview_v5.9.0_ubuntu-20.04_default.tar.gz" }, ], } | Artifact \ No newline at end of file diff --git a/artifacts_nickel/moses_high.ncl b/artifacts_nickel/moses_high.ncl index 58df8fe..3113893 100644 --- a/artifacts_nickel/moses_high.ncl +++ b/artifacts_nickel/moses_high.ncl @@ -10,6 +10,6 @@ let { Artifact, .. } = import "../workflow/nickel/artifact_contract.ncl" in { name = "MocCUDA", location = "/root/MocCUDA"} ], misc_packages = [ - { name = "cmake-3.23.1", url = "https://github.com/Kitware/CMake/releases/download/v3.23.1/cmake-3.23.1.tar.gz", type = "tar" } + { name = "cmake-3.23.1", url = "https://github.com/Kitware/CMake/releases/download/v3.23.1/cmake-3.23.1.tar.gz" } ], } | Artifact \ No newline at end of file diff --git a/artifacts_nickel/parasyris_approximate.ncl b/artifacts_nickel/parasyris_approximate.ncl index 1ed3627..e9b13b6 100644 --- a/artifacts_nickel/parasyris_approximate.ncl +++ b/artifacts_nickel/parasyris_approximate.ncl @@ -8,6 +8,6 @@ let { Artifact, .. } = import "../workflow/nickel/artifact_contract.ncl" in package_managers = [ "dpkg", "pip" ], git_packages = [], misc_packages = [ - { name = "HPAC", url = "https://github.com/koparasy/HPAC/archive/refs/heads/develop.zip", type = "zip" } # CMake also but not downloaded, so cannot add to list... + { name = "HPAC", url = "https://github.com/koparasy/HPAC/archive/refs/heads/develop.zip" } # CMake also but not downloaded, so cannot add to list... ], } | Artifact \ No newline at end of file diff --git a/artifacts_nickel/template.ncl b/artifacts_nickel/template.ncl index cac8851..0c8232f 100644 --- a/artifacts_nickel/template.ncl +++ b/artifacts_nickel/template.ncl @@ -10,6 +10,6 @@ let { Artifact, .. } = import "../workflow/nickel/artifact_contract.ncl" in { name = "pkg1", location = "path/to/git/repo"} ], misc_packages = [ - { name = "mpkg1", url = "http://example.com/package.zip", type = "zip" # Possible values: zip, tar } + { name = "mpkg1", url = "http://example.com/package.zip" } ] } | Artifact diff --git a/artifacts_nickel/test.ncl b/artifacts_nickel/test.ncl index c164b07..a27483a 100644 --- a/artifacts_nickel/test.ncl +++ b/artifacts_nickel/test.ncl @@ -10,6 +10,6 @@ let { Artifact, .. } = import "../workflow/nickel/artifact_contract.ncl" in { name = "pkg1", location = "/pkg1"} ], misc_packages = [ - { name = "mpkg1", url = "http://localhost/package1.zip", type = "zip" } + { name = "mpkg1", url = "http://localhost/package1.zip" } ], } | Artifact \ No newline at end of file diff --git a/artifacts_nickel/wang_tgopt.ncl b/artifacts_nickel/wang_tgopt.ncl index 1b00a53..ff1796f 100644 --- a/artifacts_nickel/wang_tgopt.ncl +++ b/artifacts_nickel/wang_tgopt.ncl @@ -8,6 +8,6 @@ let { Artifact, .. } = import "../workflow/nickel/artifact_contract.ncl" in package_managers = [ "dpkg", "conda" ], git_packages = [], misc_packages = [ - {name = "Miniconda3-py37_4.12.0-Linux-x86_64", url = "https://repo.anaconda.com/miniconda/Miniconda3-py37_4.12.0-Linux-x86_64.sh", type = "zip"} + {name = "Miniconda3-py37_4.12.0-Linux-x86_64", url = "https://repo.anaconda.com/miniconda/Miniconda3-py37_4.12.0-Linux-x86_64.sh" } ], } | Artifact \ No newline at end of file diff --git a/artifacts_nickel/ziogas_deinsum-cpu.ncl b/artifacts_nickel/ziogas_deinsum-cpu.ncl index c37416c..8326cfb 100644 --- a/artifacts_nickel/ziogas_deinsum-cpu.ncl +++ b/artifacts_nickel/ziogas_deinsum-cpu.ncl @@ -14,13 +14,11 @@ let { Artifact, .. } = import "../workflow/nickel/artifact_contract.ncl" in misc_packages = [ { name = "mpich-3.1.4", - url = "http://www.mpich.org/static/downloads/3.1.4/mpich-3.1.4.tar.gz", - type = "tar" + url = "http://www.mpich.org/static/downloads/3.1.4/mpich-3.1.4.tar.gz" }, { name = "Python-3.10.2", - url = "https://www.python.org/ftp/python/3.10.2/Python-3.10.2.tgz", - type = "tar" + url = "https://www.python.org/ftp/python/3.10.2/Python-3.10.2.tgz" } ], } | Artifact \ No newline at end of file diff --git a/artifacts_nickel/ziogas_deinsum-gpu.ncl b/artifacts_nickel/ziogas_deinsum-gpu.ncl index 1115e87..ec1a78f 100644 --- a/artifacts_nickel/ziogas_deinsum-gpu.ncl +++ b/artifacts_nickel/ziogas_deinsum-gpu.ncl @@ -7,11 +7,11 @@ let { Artifact, .. } = import "../workflow/nickel/artifact_contract.ncl" in dockerfile_location = "deinsum-sc22-artifact-7559901/docker_gpu", package_managers = [ "dpkg", "pip" ], git_packages = [ - { name = "dace", location = "/dace"}, - { name = "multilinear-algebra-sc22-artifact", location = "/multilinear-algebra-sc22-artifact"}, - { name = "ctf", location = "/ctf"} + { name = "dace", location = "/dace" }, + { name = "multilinear-algebra-sc22-artifact", location = "/multilinear-algebra-sc22-artifact" }, + { name = "ctf", location = "/ctf" } ], misc_packages = [ - { name = "pip", url = "https://bootstrap.pypa.io/get-pip.py", type = "zip"} + { name = "pip", url = "https://bootstrap.pypa.io/get-pip.py" } ], } | Artifact \ No newline at end of file