Always use "nixos-*" channels to look up for builds

NixOS · Jul 24, 2020 · 1d6aa60 · 1d6aa60
1 parent cc5e4a5
commit 1d6aa60
Showing 1 changed file with 5 additions and 14 deletions.
diff --git a/import-scripts/import_scripts/channel.py b/import-scripts/import_scripts/channel.py
@@ -27,18 +27,9 @@
 CURRENT_DIR = os.path.dirname(os.path.abspath(__file__))
 INDEX_SCHEMA_VERSION = os.environ.get("INDEX_SCHEMA_VERSION", 0)
 CHANNELS = {
-    "unstable": {
-        "packages": "nixpkgs/nixpkgs-20.09pre",
-        "options": "nixos/unstable/nixos-20.09pre",
-    },
-    "19.09": {
-        "packages": "nixpkgs/nixpkgs-19.09pre",
-        "options": "nixos/19.09/nixos-19.09.",
-    },
-    "20.03": {
-        "packages": "nixpkgs/nixpkgs-20.03pre",
-        "options": "nixos/20.03/nixos-20.03.",
-    },
+    "unstable": "nixos/unstable/nixos-20.09pre",
+    "19.09": "nixos/19.09/nixos-19.09.",
+    "20.03": "nixos/20.03/nixos-20.03.",
 }
 ANALYSIS = {
     "normalizer": {
@@ -551,8 +542,8 @@ def run(es_url, channel, force, verbose):
     logger.debug(f"Verbosity is {verbose}")
     logger.debug(f"Logging set to {logging_level}")
 
-    evaluation_packages = get_last_evaluation(CHANNELS[channel]["packages"])
-    evaluation_options = get_last_evaluation(CHANNELS[channel]["options"])
+    evaluation_packages = get_last_evaluation(CHANNELS[channel])
+    evaluation_options = get_last_evaluation(CHANNELS[channel])
     evaluation_packages_builds = get_evaluation_builds(evaluation_packages["id"])
 
     es = elasticsearch.Elasticsearch([es_url])