diff --git a/.envrc b/.envrc index e09e64d..9bd4806 100644 --- a/.envrc +++ b/.envrc @@ -1,4 +1,4 @@ use guix -export GUILE_LOAD_PATH="$(pwd)/channel:$HOME/.config/guix/current/share/guile/site/3.0" +export GUILE_LOAD_PATH="$(pwd)/guix:$HOME/.config/guix/current/share/guile/site/3.0" export RUSTUP_DIST_SERVER="https://mirrors.ustc.edu.cn/rust-static" diff --git a/.guix-channel b/.guix-channel index bfbb491..719365c 100644 --- a/.guix-channel +++ b/.guix-channel @@ -2,7 +2,7 @@ (channel (version 0) - (directory ".") + (directory "guix") (url "https://github.com/declantsien/guix-rustup") (dependencies (channel diff --git a/channel/rustup/build/manifest.scm b/guix/rustup/build/manifest.scm similarity index 100% rename from channel/rustup/build/manifest.scm rename to guix/rustup/build/manifest.scm diff --git a/channel/rustup/build/toml.scm b/guix/rustup/build/toml.scm similarity index 100% rename from channel/rustup/build/toml.scm rename to guix/rustup/build/toml.scm diff --git a/channel/rustup/build/toolchain.scm b/guix/rustup/build/toolchain.scm similarity index 100% rename from channel/rustup/build/toolchain.scm rename to guix/rustup/build/toolchain.scm diff --git a/channel/rustup/build/utils.scm b/guix/rustup/build/utils.scm similarity index 100% rename from channel/rustup/build/utils.scm rename to guix/rustup/build/utils.scm diff --git a/channel/rustup/dist.scm b/guix/rustup/dist.scm similarity index 100% rename from channel/rustup/dist.scm rename to guix/rustup/dist.scm diff --git a/channel/rustup/dist/2020-11-19.scm b/guix/rustup/dist/2020-11-19.scm similarity index 100% rename from channel/rustup/dist/2020-11-19.scm rename to guix/rustup/dist/2020-11-19.scm diff --git a/channel/rustup/dist/2020-12-31.scm b/guix/rustup/dist/2020-12-31.scm similarity index 100% rename from channel/rustup/dist/2020-12-31.scm rename to guix/rustup/dist/2020-12-31.scm diff --git a/channel/rustup/dist/2021-02-11.scm b/guix/rustup/dist/2021-02-11.scm similarity index 100% rename from channel/rustup/dist/2021-02-11.scm rename to guix/rustup/dist/2021-02-11.scm diff --git a/channel/rustup/dist/2021-03-25.scm b/guix/rustup/dist/2021-03-25.scm similarity index 100% rename from channel/rustup/dist/2021-03-25.scm rename to guix/rustup/dist/2021-03-25.scm diff --git a/channel/rustup/dist/2021-05-06.scm b/guix/rustup/dist/2021-05-06.scm similarity index 100% rename from channel/rustup/dist/2021-05-06.scm rename to guix/rustup/dist/2021-05-06.scm diff --git a/channel/rustup/dist/2021-05-10.scm b/guix/rustup/dist/2021-05-10.scm similarity index 100% rename from channel/rustup/dist/2021-05-10.scm rename to guix/rustup/dist/2021-05-10.scm diff --git a/channel/rustup/dist/2021-06-17.scm b/guix/rustup/dist/2021-06-17.scm similarity index 100% rename from channel/rustup/dist/2021-06-17.scm rename to guix/rustup/dist/2021-06-17.scm diff --git a/channel/rustup/dist/2021-07-29.scm b/guix/rustup/dist/2021-07-29.scm similarity index 100% rename from channel/rustup/dist/2021-07-29.scm rename to guix/rustup/dist/2021-07-29.scm diff --git a/channel/rustup/dist/2021-09-09.scm b/guix/rustup/dist/2021-09-09.scm similarity index 100% rename from channel/rustup/dist/2021-09-09.scm rename to guix/rustup/dist/2021-09-09.scm diff --git a/channel/rustup/dist/2021-10-21.scm b/guix/rustup/dist/2021-10-21.scm similarity index 100% rename from channel/rustup/dist/2021-10-21.scm rename to guix/rustup/dist/2021-10-21.scm diff --git a/channel/rustup/dist/2021-11-01.scm b/guix/rustup/dist/2021-11-01.scm similarity index 100% rename from channel/rustup/dist/2021-11-01.scm rename to guix/rustup/dist/2021-11-01.scm diff --git a/channel/rustup/dist/2021-12-02.scm b/guix/rustup/dist/2021-12-02.scm similarity index 100% rename from channel/rustup/dist/2021-12-02.scm rename to guix/rustup/dist/2021-12-02.scm diff --git a/channel/rustup/dist/2022-01-13.scm b/guix/rustup/dist/2022-01-13.scm similarity index 100% rename from channel/rustup/dist/2022-01-13.scm rename to guix/rustup/dist/2022-01-13.scm diff --git a/channel/rustup/dist/2022-01-20.scm b/guix/rustup/dist/2022-01-20.scm similarity index 100% rename from channel/rustup/dist/2022-01-20.scm rename to guix/rustup/dist/2022-01-20.scm diff --git a/channel/rustup/dist/2022-02-24.scm b/guix/rustup/dist/2022-02-24.scm similarity index 100% rename from channel/rustup/dist/2022-02-24.scm rename to guix/rustup/dist/2022-02-24.scm diff --git a/channel/rustup/dist/2022-04-07.scm b/guix/rustup/dist/2022-04-07.scm similarity index 100% rename from channel/rustup/dist/2022-04-07.scm rename to guix/rustup/dist/2022-04-07.scm diff --git a/channel/rustup/dist/2022-05-19.scm b/guix/rustup/dist/2022-05-19.scm similarity index 100% rename from channel/rustup/dist/2022-05-19.scm rename to guix/rustup/dist/2022-05-19.scm diff --git a/channel/rustup/dist/2022-06-30.scm b/guix/rustup/dist/2022-06-30.scm similarity index 100% rename from channel/rustup/dist/2022-06-30.scm rename to guix/rustup/dist/2022-06-30.scm diff --git a/channel/rustup/dist/2022-07-19.scm b/guix/rustup/dist/2022-07-19.scm similarity index 100% rename from channel/rustup/dist/2022-07-19.scm rename to guix/rustup/dist/2022-07-19.scm diff --git a/channel/rustup/dist/2022-08-11.scm b/guix/rustup/dist/2022-08-11.scm similarity index 100% rename from channel/rustup/dist/2022-08-11.scm rename to guix/rustup/dist/2022-08-11.scm diff --git a/channel/rustup/dist/2022-09-22.scm b/guix/rustup/dist/2022-09-22.scm similarity index 100% rename from channel/rustup/dist/2022-09-22.scm rename to guix/rustup/dist/2022-09-22.scm diff --git a/channel/rustup/dist/2022-11-03.scm b/guix/rustup/dist/2022-11-03.scm similarity index 100% rename from channel/rustup/dist/2022-11-03.scm rename to guix/rustup/dist/2022-11-03.scm diff --git a/channel/rustup/dist/2022-12-15.scm b/guix/rustup/dist/2022-12-15.scm similarity index 100% rename from channel/rustup/dist/2022-12-15.scm rename to guix/rustup/dist/2022-12-15.scm diff --git a/channel/rustup/dist/2023-01-10.scm b/guix/rustup/dist/2023-01-10.scm similarity index 100% rename from channel/rustup/dist/2023-01-10.scm rename to guix/rustup/dist/2023-01-10.scm diff --git a/channel/rustup/dist/2023-01-26.scm b/guix/rustup/dist/2023-01-26.scm similarity index 100% rename from channel/rustup/dist/2023-01-26.scm rename to guix/rustup/dist/2023-01-26.scm diff --git a/channel/rustup/dist/2023-02-09.scm b/guix/rustup/dist/2023-02-09.scm similarity index 100% rename from channel/rustup/dist/2023-02-09.scm rename to guix/rustup/dist/2023-02-09.scm diff --git a/channel/rustup/dist/2023-03-09.scm b/guix/rustup/dist/2023-03-09.scm similarity index 100% rename from channel/rustup/dist/2023-03-09.scm rename to guix/rustup/dist/2023-03-09.scm diff --git a/channel/rustup/dist/2023-03-23.scm b/guix/rustup/dist/2023-03-23.scm similarity index 100% rename from channel/rustup/dist/2023-03-23.scm rename to guix/rustup/dist/2023-03-23.scm diff --git a/channel/rustup/dist/2023-03-28.scm b/guix/rustup/dist/2023-03-28.scm similarity index 100% rename from channel/rustup/dist/2023-03-28.scm rename to guix/rustup/dist/2023-03-28.scm diff --git a/channel/rustup/dist/2023-04-20.scm b/guix/rustup/dist/2023-04-20.scm similarity index 100% rename from channel/rustup/dist/2023-04-20.scm rename to guix/rustup/dist/2023-04-20.scm diff --git a/channel/rustup/dist/2023-06-01.scm b/guix/rustup/dist/2023-06-01.scm similarity index 100% rename from channel/rustup/dist/2023-06-01.scm rename to guix/rustup/dist/2023-06-01.scm diff --git a/channel/rustup/dist/2023-07-13.scm b/guix/rustup/dist/2023-07-13.scm similarity index 100% rename from channel/rustup/dist/2023-07-13.scm rename to guix/rustup/dist/2023-07-13.scm diff --git a/channel/rustup/dist/2023-08-03.scm b/guix/rustup/dist/2023-08-03.scm similarity index 100% rename from channel/rustup/dist/2023-08-03.scm rename to guix/rustup/dist/2023-08-03.scm diff --git a/channel/rustup/dist/2023-08-24.scm b/guix/rustup/dist/2023-08-24.scm similarity index 100% rename from channel/rustup/dist/2023-08-24.scm rename to guix/rustup/dist/2023-08-24.scm diff --git a/channel/rustup/dist/2023-09-19.scm b/guix/rustup/dist/2023-09-19.scm similarity index 100% rename from channel/rustup/dist/2023-09-19.scm rename to guix/rustup/dist/2023-09-19.scm diff --git a/channel/rustup/dist/2023-10-05.scm b/guix/rustup/dist/2023-10-05.scm similarity index 100% rename from channel/rustup/dist/2023-10-05.scm rename to guix/rustup/dist/2023-10-05.scm diff --git a/channel/rustup/dist/2023-11-16.scm b/guix/rustup/dist/2023-11-16.scm similarity index 100% rename from channel/rustup/dist/2023-11-16.scm rename to guix/rustup/dist/2023-11-16.scm diff --git a/channel/rustup/dist/2023-12-07.scm b/guix/rustup/dist/2023-12-07.scm similarity index 100% rename from channel/rustup/dist/2023-12-07.scm rename to guix/rustup/dist/2023-12-07.scm diff --git a/channel/rustup/dist/2023-12-28.scm b/guix/rustup/dist/2023-12-28.scm similarity index 100% rename from channel/rustup/dist/2023-12-28.scm rename to guix/rustup/dist/2023-12-28.scm diff --git a/channel/rustup/dist/2024-02-08.scm b/guix/rustup/dist/2024-02-08.scm similarity index 100% rename from channel/rustup/dist/2024-02-08.scm rename to guix/rustup/dist/2024-02-08.scm diff --git a/channel/rustup/dist/2024-03-21.scm b/guix/rustup/dist/2024-03-21.scm similarity index 100% rename from channel/rustup/dist/2024-03-21.scm rename to guix/rustup/dist/2024-03-21.scm diff --git a/channel/rustup/dist/2024-03-28.scm b/guix/rustup/dist/2024-03-28.scm similarity index 100% rename from channel/rustup/dist/2024-03-28.scm rename to guix/rustup/dist/2024-03-28.scm diff --git a/channel/rustup/dist/2024-04-09.scm b/guix/rustup/dist/2024-04-09.scm similarity index 100% rename from channel/rustup/dist/2024-04-09.scm rename to guix/rustup/dist/2024-04-09.scm diff --git a/channel/rustup/dist/2024-05-02.scm b/guix/rustup/dist/2024-05-02.scm similarity index 100% rename from channel/rustup/dist/2024-05-02.scm rename to guix/rustup/dist/2024-05-02.scm diff --git a/channel/rustup/packages/rust.scm b/guix/rustup/packages/rust.scm similarity index 100% rename from channel/rustup/packages/rust.scm rename to guix/rustup/packages/rust.scm