From 8687bb03f4677f1749dcab1cd442c9b4f3d54234 Mon Sep 17 00:00:00 2001
From: antux18 <antux18@gmail.com>
Date: Wed, 24 Jul 2024 11:34:05 +0200
Subject: [PATCH] Switching from pip freeze to pip list because of inconsistent
 output mentionned in #18, close #22. Adding albab_k9db config.

---
 README.md                       |  3 +++
 artifacts/nickel/albab_k9db.ncl | 15 +++++++++++++++
 artifacts/nickel/template.ncl   |  2 +-
 ecg.py                          |  2 +-
 4 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 artifacts/nickel/albab_k9db.ncl

diff --git a/README.md b/README.md
index 374c615..d1a8628 100644
--- a/README.md
+++ b/README.md
@@ -13,9 +13,12 @@ It will then download the artifact, build the Dockerfile, and then create a list
 ## Setup
 
 A Linux operating system and the following packages are required:
+- `python`
+- `docker`
 - `snakemake`
 - `gawk`
 - `nickel`
+- `sed`
 
 The following Python package is also required:
 - `requests`
diff --git a/artifacts/nickel/albab_k9db.ncl b/artifacts/nickel/albab_k9db.ncl
new file mode 100644
index 0000000..61a37a7
--- /dev/null
+++ b/artifacts/nickel/albab_k9db.ncl
@@ -0,0 +1,15 @@
+{
+  artifact_url = "https://github.com/brownsys/K9db/archive/refs/tags/osdi2023.zip",
+  type = "zip",
+  doi = "...",
+  comment = "",
+  image_name = "k9db/latest",
+  dockerfile_location = "K9db-osdi2023",
+  package_managers = [ "dpkg", "pip" ],
+  git_packages = [],
+  misc_packages = [
+    { name = "bazel-4.0.0-installer-linux-x86_64", url = "https://github.com/bazelbuild/bazel/releases/download/4.0.0/bazel-4.0.0-installer-linux-x86_64.sh" },
+    { name = "rust", url = "https://sh.rustup.rs" },
+    { name = "mariadb-connector-cpp-1.0.0-ubuntu-groovy-amd64", url = "https://dlm.mariadb.com/1601342/Connectors/cpp/connector-cpp-1.0.0/mariadb-connector-cpp-1.0.0-ubuntu-groovy-amd64.tar.gz" }
+  ]
+}
diff --git a/artifacts/nickel/template.ncl b/artifacts/nickel/template.ncl
index d13322b..bca93e1 100644
--- a/artifacts/nickel/template.ncl
+++ b/artifacts/nickel/template.ncl
@@ -5,7 +5,7 @@
   comment = "Template for artifact configuration.",
   image_name = "image:version",
   dockerfile_location = "path/to/docker/folder",
-  package_managers = [ "dpkg" ],
+  package_managers = [ "dpkg", "rpm", "pacman", "pip", "conda" ],
   git_packages = [
     { name = "pkg1", location = "path/to/git/repo" }
   ],
diff --git a/ecg.py b/ecg.py
index 1c4b16d..ac87acb 100755
--- a/ecg.py
+++ b/ecg.py
@@ -231,7 +231,7 @@ def check_env(config, src_dir, pkglist_path):
         "dpkg": ("dpkg", "-l", "awk 'NR>5 {print $2 \",\" $3 \",\" \"dpkg\"}'"), \
         "rpm":("rpm", "-qa --queryformat '%{NAME},%{VERSION},rpm\\n'", ""), \
         "pacman":("pacman", "-Q", "awk '{print $0 \",\" $1 \",pacman\"}'"), \
-        "pip":("pip", "freeze", "sed 's/==/,/g' | awk '{print $0 \",pip\"}'"), \
+        "pip":("pip", "list", "awk 'NR>2 {print $1 \",\" $2 \",\" \"pip\"}'"), \
         "conda":("/root/.conda/bin/conda", "list -e", "sed 's/=/ /g' | awk 'NR>3 {print $1 \",\" $2 \",conda\"}'")
     }
     # Command to obtain the latest commit hash in a git repository (separated