Merge staging-next into staging

doc/languages-frameworks/rust.section.md

@@ -438,7 +438,7 @@ you of the correct hash.
 
 `rustPlatform` provides the following hooks to automate Cargo builds:
 
-* `cargoSetupHook`: configure Cargo to use depenencies vendored
+* `cargoSetupHook`: configure Cargo to use dependencies vendored
  through `fetchCargoTarball`. This hook uses the `cargoDeps`
  environment variable to find the vendored dependencies. If a project
  already vendors its dependencies, the variable `cargoVendorDir` can
@@ -701,7 +701,7 @@ Some crates require external libraries. For crates from
 `defaultCrateOverrides` package in nixpkgs itself.
 
 Starting from that file, one can add more overrides, to add features
-or build inputs by overriding the hello crate in a seperate file.
+or build inputs by overriding the hello crate in a separate file.
 
 ```nix
 with import <nixpkgs> {};

maintainers/maintainer-list.nix

@@ -8910,6 +8910,12 @@
  githubId = 421510;
  name = "Noé Rubinstein";
  };
+ photex = {
+ email = "[email protected]";
+ github = "photex";
+ githubId = 301903;
+ name = "Chip Collier";
+ };
  phreedom = {
  email = "[email protected]";
  github = "phreedom";

nixos/doc/manual/administration/cleaning-store.chapter.md

@@ -58,5 +58,5 @@ a while to finish.
 ## NixOS Boot Entries {#sect-nixos-gc-boot-entries}
 
 If your `/boot` partition runs out of space, after clearing old profiles
-you must rebuild your system with `nixos-rebuild` to update the `/boot`
-partition and clear space.
+you must rebuild your system with `nixos-rebuild boot` or `nixos-rebuild
+switch` to update the `/boot` partition and clear space.

nixos/doc/manual/from_md/administration/cleaning-store.chapter.xml

@@ -64,7 +64,8 @@ $ nix-store --optimise
  <para>
  If your <literal>/boot</literal> partition runs out of space,
  after clearing old profiles you must rebuild your system with
- <literal>nixos-rebuild</literal> to update the
+ <literal>nixos-rebuild boot</literal> or
+ <literal>nixos-rebuild switch</literal> to update the
  <literal>/boot</literal> partition and clear space.
  </para>
  </section>

nixos/modules/services/audio/roon-server.nix

@@ -42,7 +42,7 @@ in {
  environment.ROON_DATAROOT = "/var/lib/${name}";
 
  serviceConfig = {
- ExecStart = "${pkgs.roon-server}/start.sh";
+ ExecStart = "${pkgs.roon-server}/bin/RoonServer";
  LimitNOFILE = 8192;
  User = cfg.user;
  Group = cfg.group;

nixos/tests/wine.nix

@@ -0,0 +1,41 @@
+{ system ? builtins.currentSystem
+, pkgs ? import ../.. { inherit system; config = { }; }
+}:
+
+let
+ inherit (pkgs.lib) concatMapStrings listToAttrs;
+ inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest;
+
+ hello32 = "${pkgs.pkgsCross.mingw32.hello}/bin/hello.exe";
+ hello64 = "${pkgs.pkgsCross.mingwW64.hello}/bin/hello.exe";
+
+ makeWineTest = packageSet: exes: variant: rec {
+ name = "${packageSet}-${variant}";
+ value = makeTest {
+ inherit name;
+ meta = with pkgs.lib.maintainers; { maintainers = [ chkno ]; };
+
+ machine = { pkgs, ... }: {
+ environment.systemPackages = [ pkgs."${packageSet}"."${variant}" ];
+ virtualisation.diskSize = "800";
+ };
+
+ testScript = ''
+ machine.wait_for_unit("multi-user.target")
+ ${concatMapStrings (exe: ''
+ greeting = machine.succeed(
+ "bash -c 'wine ${exe} 2> >(tee wine-stderr >&2)'"
+ )
+ assert 'Hello, world!' in greeting
+ machine.fail(
+ "fgrep 'Could not find Wine Gecko. HTML rendering will be disabled.' wine-stderr"
+ )
+ '') exes}
+ '';
+ };
+ };
+
+ variants = [ "base" "full" "minimal" "staging" "unstable" ];
+
+in listToAttrs (map (makeWineTest "winePackages" [ hello32 ]) variants
+ ++ map (makeWineTest "wineWowPackages" [ hello32 hello64 ]) variants)

pkgs/applications/blockchains/ledger-live-desktop/default.nix

@@ -2,12 +2,12 @@
 
 let
  pname = "ledger-live-desktop";
- version = "2.34.3";
+ version = "2.34.4";
  name = "${pname}-${version}";
 
  src = fetchurl {
  url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage";
- sha256 = "07r7gfn44c4bdcq9rgs6v4frrl2g004lh9lcsrj6rbqy6949r9j2";
+ sha256 = "00zl7ywmkbhwzkj7p618rin5pd0ix8cas5q1b8ka6ynw4wlg3w5c";
  };
 
  appimageContents = appimageTools.extractType2 {

pkgs/applications/editors/jetbrains/common.nix

@@ -17,7 +17,7 @@ let loName = toLower product;
  + ".vmoptions";
 in
 
-with stdenv; lib.makeOverridable mkDerivation rec {
+with stdenv; lib.makeOverridable mkDerivation (rec {
  inherit name src;
  meta = args.meta // { inherit mainProgram; };
 
@@ -94,4 +94,4 @@ with stdenv; lib.makeOverridable mkDerivation rec {
 
 } // lib.optionalAttrs (!(meta.license.free or true)) {
  preferLocalBuild = true;
-}
+})

pkgs/applications/misc/coreaction/default.nix → pkgs/applications/misc/cubocore-packages/coreaction/default.nix

@@ -1,4 +1,4 @@
-{ mkDerivation, lib, fetchFromGitLab, fetchpatch, qtsvg, qtbase, libcsys, libcprime, cmake, ninja, }:
+{ mkDerivation, lib, fetchFromGitLab, fetchpatch, qtsvg, qtbase, cmake, ninja, libcprime, libcsys }:
 
 mkDerivation rec {
  pname = "coreaction";
@@ -27,8 +27,8 @@ mkDerivation rec {
  buildInputs = [
  qtsvg
  qtbase
- libcsys
  libcprime
+ libcsys
  ];
 
  meta = with lib; {

pkgs/tools/archivers/corearchiver/default.nix → pkgs/applications/misc/cubocore-packages/corearchiver/default.nix

@@ -1,4 +1,4 @@
-{ mkDerivation, lib, fetchFromGitLab, qtbase, libarchive, libarchive-qt, libcprime, cmake, ninja, }:
+{ mkDerivation, lib, fetchFromGitLab, qtbase, libarchive, libarchive-qt, cmake, ninja, libcprime, libcsys }:
 
 mkDerivation rec {
  pname = "corearchiver";
@@ -18,9 +18,10 @@ mkDerivation rec {
 
  buildInputs = [
  qtbase
- libcprime
  libarchive-qt
  libarchive
+ libcprime
+ libcsys
  ];
 
  meta = with lib; {

pkgs/applications/misc/corefm/default.nix → pkgs/applications/misc/cubocore-packages/corefm/default.nix

@@ -1,4 +1,4 @@
-{ mkDerivation, lib, fetchFromGitLab, qtbase, libcprime, libcsys, cmake, ninja }:
+{ mkDerivation, lib, fetchFromGitLab, qtbase, cmake, ninja, libcprime, libcsys }:
 
 mkDerivation rec {
  pname = "corefm";

pkgs/applications/misc/coregarage/default.nix → pkgs/applications/misc/cubocore-packages/coregarage/default.nix

@@ -1,4 +1,4 @@
-{ mkDerivation, lib, fetchFromGitLab, qtbase, libarchive, libarchive-qt, libcprime, cmake, ninja }:
+{ mkDerivation, lib, fetchFromGitLab, qtbase, libarchive, libarchive-qt, cmake, ninja, libcprime, libcsys }:
 
 mkDerivation rec {
  pname = "coregarage";
@@ -18,9 +18,10 @@ mkDerivation rec {
 
  buildInputs = [
  qtbase
- libcprime
  libarchive
  libarchive-qt
+ libcprime
+ libcsys
  ];
 
  meta = with lib; {

pkgs/applications/misc/corehunt/default.nix → pkgs/applications/misc/cubocore-packages/corehunt/default.nix

@@ -1,4 +1,4 @@
-{ mkDerivation, lib, fetchFromGitLab, qtbase, libcprime, cmake, ninja }:
+{ mkDerivation, lib, fetchFromGitLab, qtbase, cmake, ninja, libcprime, libcsys }:
 
 mkDerivation rec {
  pname = "corehunt";
@@ -19,6 +19,7 @@ mkDerivation rec {
  buildInputs = [
  qtbase
  libcprime
+ libcsys
  ];
 
  meta = with lib; {

pkgs/applications/graphics/coreimage/default.nix → pkgs/applications/misc/cubocore-packages/coreimage/default.nix

@@ -1,4 +1,4 @@
-{ mkDerivation, lib, fetchFromGitLab, libcprime, qtbase, cmake, ninja }:
+{ mkDerivation, lib, fetchFromGitLab, qtbase, cmake, ninja, libcprime, libcsys }:
 
 mkDerivation rec {
  pname = "coreimage";
@@ -19,6 +19,7 @@ mkDerivation rec {
  buildInputs = [
  qtbase
  libcprime
+ libcsys
  ];
 
  meta = with lib; {

pkgs/applications/misc/cubocore-packages/coreinfo/default.nix

@@ -0,0 +1,35 @@
+{ mkDerivation, lib, fetchFromGitLab, qtbase, libzen, libmediainfo, zlib, cmake, ninja, libcprime, libcsys }:
+
+mkDerivation rec {
+ pname = "coreinfo";
+ version = "4.2.0";
+
+ src = fetchFromGitLab {
+ owner = "cubocore/coreapps";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-kLBOvvulHE1+4TyZVEVZwEA+Id7+w8fI3ll+QL2ukr0=";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ ninja
+ ];
+
+ buildInputs = [
+ qtbase
+ libzen
+ libmediainfo
+ zlib
+ libcprime
+ libcsys
+ ];
+
+ meta = with lib; {
+ description = "A file information tool from the C Suite";
+ homepage = "https://gitlab.com/cubocore/coreapps/coreinfo";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ dan4ik605743 ];
+ platforms = platforms.linux;
+ };
+}

pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix

@@ -0,0 +1,35 @@
+{ mkDerivation, lib, fetchFromGitLab, qtbase, qtx11extras, xorg, cmake, ninja, libcprime, libcsys }:
+
+mkDerivation rec {
+ pname = "corekeyboard";
+ version = "4.2.0";
+
+ src = fetchFromGitLab {
+ owner = "cubocore/coreapps";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-0CbQ43BN4ORvtxs6FwNkgk/0jcVdFJq/tqvjUGYanM4=";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ ninja
+ ];
+
+ buildInputs = [
+ qtbase
+ qtx11extras
+ xorg.libXtst
+ xorg.libX11
+ libcprime
+ libcsys
+ ];
+
+ meta = with lib; {
+ description = "A virtual keyboard for X11 from the C Suite";
+ homepage = "https://gitlab.com/cubocore/coreapps/corekeyboard";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ dan4ik605743 ];
+ platforms = platforms.linux;
+ };
+}

pkgs/applications/misc/cubocore-packages/corepad/default.nix

@@ -0,0 +1,32 @@
+{ mkDerivation, lib, fetchFromGitLab, qtbase, cmake, ninja, libcprime, libcsys }:
+
+mkDerivation rec {
+ pname = "corepad";
+ version = "4.2.0";
+
+ src = fetchFromGitLab {
+ owner = "cubocore/coreapps";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-2bGHVv0+0NlkIqnvWm014Kr20uARWnOS5xSuNmCt/bQ=";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ ninja
+ ];
+
+ buildInputs = [
+ qtbase
+ libcprime
+ libcsys
+ ];
+
+ meta = with lib; {
+ description = "A document editor from the C Suite";
+ homepage = "https://gitlab.com/cubocore/coreapps/corepad";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ dan4ik605743 ];
+ platforms = platforms.linux;
+ };
+}

pkgs/applications/misc/cubocore-packages/corepaint/default.nix

@@ -0,0 +1,32 @@
+{ mkDerivation, lib, fetchFromGitLab, qtbase, cmake, ninja, libcprime, libcsys }:
+
+mkDerivation rec {
+ pname = "corepaint";
+ version = "4.2.0";
+
+ src = fetchFromGitLab {
+ owner = "cubocore/coreapps";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-nATraYm7FZEXoNWgXt1G86KdrAvRgM358F+YdfWcnkg=";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ ninja
+ ];
+
+ buildInputs = [
+ qtbase
+ libcprime
+ libcsys
+ ];
+
+ meta = with lib; {
+ description = "A paint app from the C Suite";
+ homepage = "https://gitlab.com/cubocore/coreapps/corepaint";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ dan4ik605743 ];
+ platforms = platforms.linux;
+ };
+}

pkgs/applications/misc/cubocore-packages/corepdf/default.nix

@@ -0,0 +1,33 @@
+{ mkDerivation, lib, fetchFromGitLab, qtbase, poppler, cmake, ninja, libcprime, libcsys }:
+
+mkDerivation rec {
+ pname = "corepdf";
+ version = "4.2.0";
+
+ src = fetchFromGitLab {
+ owner = "cubocore/coreapps";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-HeOklgCwJ5h3DeelJOZqasG+eC9DGG3R0Cqg2yPKYhM=";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ ninja
+ ];
+
+ buildInputs = [
+ qtbase
+ poppler
+ libcprime
+ libcsys
+ ];
+
+ meta = with lib; {
+ description = "A PDF viewer from the C Suite";
+ homepage = "https://gitlab.com/cubocore/coreapps/corepdf";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ dan4ik605743 ];
+ platforms = platforms.linux;
+ };
+}