21.05 release (#311)

* Bump unstable and add 21.05 release

* The usual typos

* The frontend stuff was missing

* preserve the order

* Update import-scripts/import_scripts/channel.py

Co-authored-by: Rok Garbas <rok@garbas.si>

Co-authored-by: Jonathan Ringer <jonringer117@gmail.com>
This commit is contained in:
Rok Garbas 2021-06-02 06:49:42 +02:00 committed by GitHub
parent ff8022fba5
commit d1085b806f
Failed to generate hash of commit
2 changed files with 12 additions and 12 deletions

View file

@ -32,8 +32,8 @@ CURRENT_DIR = os.path.dirname(os.path.abspath(__file__))
INDEX_SCHEMA_VERSION = os.environ.get("INDEX_SCHEMA_VERSION", 0) INDEX_SCHEMA_VERSION = os.environ.get("INDEX_SCHEMA_VERSION", 0)
DIFF_OUTPUT = ["json", "stats"] DIFF_OUTPUT = ["json", "stats"]
CHANNELS = { CHANNELS = {
"unstable": "nixos/unstable/nixos-21.05pre", "unstable": "nixos/unstable/nixos-21.11pre",
"20.03": "nixos/20.03/nixos-20.03.", "21.05": "nixos/21.05/nixos-21.05.",
"20.09": "nixos/20.09/nixos-20.09.", "20.09": "nixos/20.09/nixos-20.09.",
} }
ALLOWED_PLATFORMS = ["x86_64-linux", "aarch64-linux", "x86_64-darwin", "i686-linux"] ALLOWED_PLATFORMS = ["x86_64-linux", "aarch64-linux", "x86_64-darwin", "i686-linux"]

View file

@ -371,8 +371,8 @@ createUrl toRoute model =
type Channel type Channel
= Unstable = Unstable
| Release_20_03
| Release_20_09 | Release_20_09
| Release_21_05
{-| TODO: we should consider using more dynamic approach here {-| TODO: we should consider using more dynamic approach here
@ -388,7 +388,7 @@ type alias ChannelDetails =
defaultChannel : String defaultChannel : String
defaultChannel = defaultChannel =
"20.09" "21.05"
channelDetails : Channel -> ChannelDetails channelDetails : Channel -> ChannelDetails
@ -397,12 +397,12 @@ channelDetails channel =
Unstable -> Unstable ->
ChannelDetails "unstable" "unstable" "nixos/trunk-combined" "nixos-unstable" ChannelDetails "unstable" "unstable" "nixos/trunk-combined" "nixos-unstable"
Release_20_03 ->
ChannelDetails "20.03" "20.03" "nixos/release-20.03" "nixos-20.03"
Release_20_09 -> Release_20_09 ->
ChannelDetails "20.09" "20.09" "nixos/release-20.09" "nixos-20.09" ChannelDetails "20.09" "20.09" "nixos/release-20.09" "nixos-20.09"
Release_21_05 ->
ChannelDetails "21.05" "21.05" "nixos/release-21.05" "nixos-21.05"
channelFromId : String -> Maybe Channel channelFromId : String -> Maybe Channel
channelFromId channel_id = channelFromId channel_id =
@ -410,12 +410,12 @@ channelFromId channel_id =
"unstable" -> "unstable" ->
Just Unstable Just Unstable
"20.03" ->
Just Release_20_03
"20.09" -> "20.09" ->
Just Release_20_09 Just Release_20_09
"21.05" ->
Just Release_21_05
_ -> _ ->
Nothing Nothing
@ -428,8 +428,8 @@ channelDetailsFromId channel_id =
channels : List String channels : List String
channels = channels =
[ "20.03" [ "20.09"
, "20.09" , "21.05"
, "unstable" , "unstable"
] ]