From 33c2c8a837a04e72958a8e2fc207d82bfd3ceb22 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Wed, 7 Oct 2020 02:26:07 +0200 Subject: [PATCH] Always use NixOS/nixpkgs instead of NixOS/nixpkgs-channels (#208) Links in the search results for NixOS 20.09 started throwing 404 otherwise. Not all channels are being pushed to nixpkgs-channels as apparently it is being phased out. --- import-scripts/import_scripts/channel.py | 4 ++-- src/Page/Options.elm | 2 +- src/Page/Packages.elm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/import-scripts/import_scripts/channel.py b/import-scripts/import_scripts/channel.py index 0793b20..549e8b7 100644 --- a/import-scripts/import_scripts/channel.py +++ b/import-scripts/import_scripts/channel.py @@ -395,7 +395,7 @@ def get_packages(evaluation, evaluation_builds): ) result = subprocess.run( shlex.split( - f"nix-env -f '' -I nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/{evaluation['git_revision']}.tar.gz --arg config 'import {CURRENT_DIR}/packages-config.nix' -qa --json" + f"nix-env -f '' -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/{evaluation['git_revision']}.tar.gz --arg config 'import {CURRENT_DIR}/packages-config.nix' -qa --json" ), stdout=subprocess.PIPE, check=True, @@ -498,7 +498,7 @@ def get_packages(evaluation, evaluation_builds): def get_options(evaluation): result = subprocess.run( shlex.split( - f"nix-build --no-out-link -A options -I nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/{evaluation['git_revision']}.tar.gz" + f"nix-build --no-out-link -A options -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/{evaluation['git_revision']}.tar.gz" ), stdout=subprocess.PIPE, check=True, diff --git a/src/Page/Options.elm b/src/Page/Options.elm index 7af7e03..739693b 100644 --- a/src/Page/Options.elm +++ b/src/Page/Options.elm @@ -213,7 +213,7 @@ viewResultItemDetails channel item = code [] [ text value ] githubUrlPrefix branch = - "https://github.com/NixOS/nixpkgs-channels/blob/" ++ branch ++ "/" + "https://github.com/NixOS/nixpkgs/blob/" ++ branch ++ "/" cleanPosition value = if String.startsWith "source/" value then diff --git a/src/Page/Packages.elm b/src/Page/Packages.elm index 2db6edc..d0a4c82 100644 --- a/src/Page/Packages.elm +++ b/src/Page/Packages.elm @@ -254,7 +254,7 @@ viewResultItemDetails channel item = a [ href value ] [ text value ] githubUrlPrefix branch = - "https://github.com/NixOS/nixpkgs-channels/blob/" ++ branch ++ "/" + "https://github.com/NixOS/nixpkgs/blob/" ++ branch ++ "/" cleanPosition value = if String.startsWith "source/" value then