Unverified Commit c904e6bf authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 7541ec60 dda0c576
Loading
Loading
Loading
Loading
+60 −0
Original line number Diff line number Diff line
@@ -651,6 +651,66 @@ buildPythonPackage rec {
}
```

#### Rust package built with `meson` {#rust-package-built-with-meson}

Some projects, especially GNOME applications, are built with the Meson Build System instead of calling Cargo directly. Using `rustPlatform.buildRustPackage` may successfully build the main program, but related files will be missing. Instead, you need to set up Cargo dependencies with `fetchCargoTarball` and `cargoSetupHook` and leave the rest to Meson. `rust` and `cargo` are still needed in `nativeBuildInputs` for Meson to use.

```nix
{ lib
, stdenv
, fetchFromGitLab
, meson
, ninja
, pkg-config
, rustPlatform
, rustc
, cargo
, wrapGAppsHook4
, blueprint-compiler
, libadwaita
, libsecret
, tracker
}:

stdenv.mkDerivation rec {
  pname = "health";
  version = "0.95.0";

  src = fetchFromGitLab {
    domain = "gitlab.gnome.org";
    owner = "World";
    repo = "health";
    rev = version;
    hash = "sha256-PrNPprSS98yN8b8yw2G6hzTSaoE65VbsM3q7FVB4mds=";
  };

  cargoDeps = rustPlatform.fetchCargoTarball {
    inherit src;
    name = "${pname}-${version}";
    hash = "sha256-8fa3fa+sFi5H+49B5sr2vYPkp9C9s6CcE0zv4xB8gww=";
  };

  nativeBuildInputs = [
    meson
    ninja
    pkg-config
    rustPlatform.cargoSetupHook
    rustc
    cargo
    wrapGAppsHook4
    blueprint-compiler
  ];

  buildInputs = [
    libadwaita
    libsecret
    tracker
  ];

  # ...
}
```

## `buildRustCrate`: Compiling Rust crates using Nix instead of Cargo {#compiling-rust-crates-using-nix-instead-of-cargo}

### Simple operation {#simple-operation}
+6 −0
Original line number Diff line number Diff line
@@ -392,6 +392,12 @@ in mkLicense lset) ({
    fullName = "Common Public Attribution License 1.0";
  };

  commons-clause = {
    fullName = "Commons Clause License";
    url = "https://commonsclause.com/";
    free = false;
  };

  cpl10 = {
    spdxId = "CPL-1.0";
    fullName = "Common Public License 1.0";
+20 −0
Original line number Diff line number Diff line
@@ -2958,6 +2958,12 @@
    github = "bycEEE";
    githubId = 8891115;
    name = "Brian Choy";
  };
   ByteSudoer = {
    email = "bytesudoer@gmail.com";
    github = "bytesudoer";
    githubId = 88513682;
    name = "ByteSudoer";
  };
  bzizou = {
    email = "Bruno@bzizou.net";
@@ -12556,6 +12562,15 @@
    githubId = 15093162;
    name = "Melanie B. Sigl";
  };
  melvyn2 = {
    email = "melvyn2@dnsense.pub";
    github = "melvyn2";
    githubId = 9157412;
    name = "melvyn";
    keys = [{
      fingerprint = "232B 9F00 2153 CA86 849C  9224 25A2 B728 0CE3 AFF6";
    }];
  };
  mephistophiles = {
    email = "mussitantesmortem@gmail.com";
    name = "Maxim Zhukov";
@@ -16541,6 +16556,11 @@
    githubId = 61013287;
    name = "Ricardo Steijn";
  };
  richar = {
    github = "ri-char";
    githubId = 17962023;
    name = "richar";
  };
  richardipsum = {
    email = "richardipsum@fastmail.co.uk";
    github = "richardipsum";
+6 −0
Original line number Diff line number Diff line
@@ -456,6 +456,12 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m

- The module `services.github-runner` has been removed. To configure a single GitHub Actions Runner refer to `services.github-runners.*`. Note that this will trigger a new runner registration.

- The `services.slskd` has been refactored to include more configuation options in
  the freeform `services.slskd.settings` option, and some defaults (including listen ports)
  have been changed to match the upstream defaults. Additionally, disk logging is now
  disabled by default, and the log rotation timer has been removed.
  The nginx virtualhost option is now of the `vhost-options` type.

- The `btrbk` module now automatically selects and provides required compression
  program depending on the configured `stream_compress` option. Since this
  replaces the need for the `extraPackages` option, this option will be
+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ in {

    security.polkit.enable = true;

    fonts.fontDir.enable = true;

    services.dbus.packages = [ pkgs.flatpak ];

    systemd.packages = [ pkgs.flatpak ];
Loading