From f878c639ce9aeb5d115124c92e7eedf3f3fc2f1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Sun, 11 Apr 2021 12:00:49 +0200 Subject: [PATCH] rename nix packages --- .gitlab-ci.yml | 4 ++-- nix/README.md | 18 +++++++++--------- nix/ci/rust.nix | 4 ++-- nix/default.nix | 8 ++++---- .../developer.nix | 2 +- nix/{qaul-manual => irdest-manual}/user.nix | 2 +- nix/{qaul-rust => irdest-rust}/default.nix | 2 +- .../default.nix | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-) rename nix/{qaul-manual => irdest-manual}/developer.nix (94%) rename nix/{qaul-manual => irdest-manual}/user.nix (95%) rename nix/{qaul-rust => irdest-rust}/default.nix (97%) rename nix/{qaul-website => irdest-website}/default.nix (92%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 048b62e6..7e48ff25 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,14 +7,14 @@ build-rust: tags: [ irdest-nix ] stage: build script: - - nix-build nix -A qaul-rust + - nix-build nix -A irdest-rust build-website: needs: [] tags: [ irdest-nix ] stage: build script: - - nix-build nix -A qaul-website + - nix-build nix -A irdest-website artifacts: paths: - result/* diff --git a/nix/README.md b/nix/README.md index 872cf84a..7fd89aa2 100644 --- a/nix/README.md +++ b/nix/README.md @@ -1,4 +1,4 @@ -# Nix packaging for qaul components +# Nix packaging for irdest components From the [Nix Package Manager Guide](https://nixos.org/manual/nix/stable/#ch-about-nix): @@ -10,32 +10,32 @@ From the [Nix Package Manager Guide](https://nixos.org/manual/nix/stable/#ch-abo ## Packages -The `default.nix` file describes all qaul-specific packages that are not packaged in nixpkgs. Some of them are: +The `default.nix` file describes all irdest-specific packages that are not packaged in nixpkgs. Some of them are: -### `qaul-rust` +### `irdest-rust` ``` -$ nix-build nix -A qaul-rust +$ nix-build nix -A irdest-rust ``` A combined derivation that builds the whole rust workspace (equivalent to running `cargo build --release` in the repository root). It is packaged with [nearsk](https://github.com/nmattia/naersk/). The Rust dependencies are read from `../Cargo.lock`. -The web client (which connects to a local qaul instance) based on emberjs. It is packaged with [yarn2nix](https://github.com/nix-community/yarn2nix). The JavaScript dependencies are read from `../emberweb/yarn.lock`. +The web client (which connects to a local irdest instance) based on emberjs. It is packaged with [yarn2nix](https://github.com/nix-community/yarn2nix). The JavaScript dependencies are read from `../emberweb/yarn.lock`. -### `qaul-website` +### `irdest-website` ``` -$ nix-build nix -A qaul-website +$ nix-build nix -A irdest-website ``` -The website served on [qaul.org](https://qaul.org/). It is built using the Hugo static site generator. +The website served on [irde.st](https://irde.st/). It is built using the Hugo static site generator. ## Using `nix-shell` for development You can build Rust components in a Nix development shell, which will make all required native dependencies available: ``` -$ nix-shell nix -A qaul-rust.builtDependencies +$ nix-shell nix -A irdest-rust.builtDependencies $ cargo build ``` diff --git a/nix/ci/rust.nix b/nix/ci/rust.nix index 573e537b..28fff48c 100644 --- a/nix/ci/rust.nix +++ b/nix/ci/rust.nix @@ -8,7 +8,7 @@ in rec { # keys and lists of the corresponding components as values testsListsIfd = pkgs.runCommand "unittests-list" {} '' - cd ${pkgs.qaul-rust.testBinaries}/bin + cd ${pkgs.irdest-rust.testBinaries}/bin echo "{" > $out for binary in * @@ -38,7 +38,7 @@ in rec { pkgs.runCommand "${component}-${test}" {} '' set -xo pipefail mkdir -p $out - ${pkgs.qaul-rust.testBinaries}/bin/${component}-test ${test} | tee $out/log + ${pkgs.irdest-rust.testBinaries}/bin/${component}-test ${test} | tee $out/log echo $? > $out/status set +x '' diff --git a/nix/default.nix b/nix/default.nix index 19d1ec73..8da3596a 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -3,10 +3,10 @@ let overlay = self: super: { naersk = self.callPackage sources.naersk {}; - qaul-manual-developer = self.callPackage ./qaul-manual/developer.nix {}; - qaul-manual-user = self.callPackage ./qaul-manual/user.nix {}; - qaul-rust = self.callPackage ./qaul-rust {}; - qaul-website = self.callPackage ./qaul-website {}; + irdest-manual-developer = self.callPackage ./irdest-manual/developer.nix {}; + irdest-manual-user = self.callPackage ./irdest-manual/user.nix {}; + irdest-rust = self.callPackage ./irdest-rust {}; + irdest-website = self.callPackage ./irdest-website {}; }; in diff --git a/nix/qaul-manual/developer.nix b/nix/irdest-manual/developer.nix similarity index 94% rename from nix/qaul-manual/developer.nix rename to nix/irdest-manual/developer.nix index 66035a79..17d99ad4 100644 --- a/nix/qaul-manual/developer.nix +++ b/nix/irdest-manual/developer.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation rec { - pname = "qaul-docs-developer"; + pname = "irdest-docs-developer"; version = "0.0.0"; src = lib.cleanSourceWith { filter = lib.cleanSourceFilter; diff --git a/nix/qaul-manual/user.nix b/nix/irdest-manual/user.nix similarity index 95% rename from nix/qaul-manual/user.nix rename to nix/irdest-manual/user.nix index 3abf3d39..78dd3811 100644 --- a/nix/qaul-manual/user.nix +++ b/nix/irdest-manual/user.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation rec { - pname = "qaul-manual-user"; + pname = "irdest-manual-user"; version = "0.0.0"; src = lib.cleanSourceWith { filter = lib.cleanSourceFilter; diff --git a/nix/qaul-rust/default.nix b/nix/irdest-rust/default.nix similarity index 97% rename from nix/qaul-rust/default.nix rename to nix/irdest-rust/default.nix index f603b880..62bd24e1 100644 --- a/nix/qaul-rust/default.nix +++ b/nix/irdest-rust/default.nix @@ -31,7 +31,7 @@ naersk.buildPackage rec { cmake pkg-config - # Required for qaul-gtk + # Required for irdest-gtk glib gtk3 atk diff --git a/nix/qaul-website/default.nix b/nix/irdest-website/default.nix similarity index 92% rename from nix/qaul-website/default.nix rename to nix/irdest-website/default.nix index 7a1bf77e..eab66fcc 100644 --- a/nix/qaul-website/default.nix +++ b/nix/irdest-website/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - pname = "qaul-website"; + pname = "irdest-website"; version = "0.0.0"; src = ../../docs/website;