c8h4/aux-search
1
0
Fork 0
Code Issues Pull requests Packages Releases Activity

Always use NixOS/nixpkgs instead of NixOS/nixpkgs-channels (#208)

Browse source 
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.
This commit is contained in:
Andreas Rammhold 2020-10-07 02:26:07 +02:00 committed by GitHub
parent a2c570e52e
commit 33c2c8a837
Failed to generate hash of commit
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
import-scripts/import_scripts/channel.py
View file

@ -395,7 +395,7 @@ def get_packages(evaluation, evaluation_builds):
) )
result = subprocess.run( result = subprocess.run(
shlex.split( shlex.split(
f"nix-env -f '<nixpkgs>' -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 '<nixpkgs>' -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, stdout=subprocess.PIPE,
check=True, check=True,
@ -498,7 +498,7 @@ def get_packages(evaluation, evaluation_builds):
def get_options(evaluation): def get_options(evaluation):
result = subprocess.run( result = subprocess.run(
shlex.split( shlex.split(
f"nix-build <nixpkgs/nixos/release.nix> --no-out-link -A options -I nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/{evaluation['git_revision']}.tar.gz" f"nix-build <nixpkgs/nixos/release.nix> --no-out-link -A options -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/{evaluation['git_revision']}.tar.gz"
), ),
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
check=True, check=True,

2
src/Page/Options.elm
View file

@ -213,7 +213,7 @@ viewResultItemDetails channel item =
code [] [ text value ] code [] [ text value ]
githubUrlPrefix branch = githubUrlPrefix branch =
"https://github.com/NixOS/nixpkgs-channels/blob/" ++ branch ++ "/" "https://github.com/NixOS/nixpkgs/blob/" ++ branch ++ "/"
cleanPosition value = cleanPosition value =
if String.startsWith "source/" value then if String.startsWith "source/" value then

2
src/Page/Packages.elm
View file

@ -254,7 +254,7 @@ viewResultItemDetails channel item =
a [ href value ] [ text value ] a [ href value ] [ text value ]
githubUrlPrefix branch = githubUrlPrefix branch =
"https://github.com/NixOS/nixpkgs-channels/blob/" ++ branch ++ "/" "https://github.com/NixOS/nixpkgs/blob/" ++ branch ++ "/"
cleanPosition value = cleanPosition value =
if String.startsWith "source/" value then if String.startsWith "source/" value then