From c048af9f692e47e5203d5618894aa93b583bc311 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Fri, 24 Jul 2020 11:50:24 +0200 Subject: [PATCH] Always use "nixos-*" channels to look up for builds (#139) --- import-scripts/import_scripts/channel.py | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/import-scripts/import_scripts/channel.py b/import-scripts/import_scripts/channel.py index 119c017..827cb8c 100644 --- a/import-scripts/import_scripts/channel.py +++ b/import-scripts/import_scripts/channel.py @@ -27,18 +27,9 @@ S3_BUCKET = "nix-releases" 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])