rename nix packages

develop
Milan Pässler 3 years ago
parent fb8f83197e
commit f878c639ce
No known key found for this signature in database
GPG Key ID: A6DC6A7CB0B97859
  1. 4
      .gitlab-ci.yml
  2. 18
      nix/README.md
  3. 4
      nix/ci/rust.nix
  4. 8
      nix/default.nix
  5. 2
      nix/irdest-manual/developer.nix
  6. 2
      nix/irdest-manual/user.nix
  7. 2
      nix/irdest-rust/default.nix
  8. 2
      nix/irdest-website/default.nix

@ -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/*

@ -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
```

@ -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
''

@ -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

@ -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;

@ -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;

@ -31,7 +31,7 @@ naersk.buildPackage rec {
cmake
pkg-config
# Required for qaul-gtk
# Required for irdest-gtk
glib
gtk3
atk

@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
pname = "qaul-website";
pname = "irdest-website";
version = "0.0.0";
src = ../../docs/website;
Loading…
Cancel
Save