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

Merge master into staging-next

parents 85abdfd3 2709b7a1

nixos/tests/udisks2.nix

+3 −0
Original line number Diff line number Diff line
@@ -32,6 +32,9 @@ in 
    ''

      import lzma



      machine.systemctl("start udisks2")

      machine.wait_for_unit("udisks2.service")



      with lzma.open(

          "${stick}"

      ) as data, open(machine.state_dir / "usbstick.img", "wb") as stick:

pkgs/applications/misc/appeditor/default.nix

+2 −7
Original line number Diff line number Diff line
@@ -16,13 +16,13 @@ 


stdenv.mkDerivation rec {

  pname = "appeditor";

  version = "1.1.3";

  version = "1.1.5";



  src = fetchFromGitHub {

    owner = "donadigo";

    repo = "appeditor";

    rev = version;

    sha256 = "sha256-0zutz1nnThyF7h44cDxjE53hhAJfJf6DTs9p4HflXr8=";

    sha256 = "sha256-A0YasHw5osGrgUPiUPuRBnv1MR/Pth6jVHGEx/klOGY=";

  };



  nativeBuildInputs = [
@@ -43,11 +43,6 @@ stdenv.mkDerivation rec { 
  ];



  postPatch = ''

    # Fix build with vala 0.56

    # https://github.com/donadigo/appeditor/pull/122

    substituteInPlace src/Application.vala \

      --replace "private static string? create_exec_filename;" "public static string? create_exec_filename;"



    chmod +x meson/post_install.py

    patchShebangs meson/post_install.py

  '';

pkgs/by-name/cp/cpu-x/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -16,13 +16,13 @@ 


stdenv.mkDerivation rec {

  pname = "cpu-x";

  version = "5.0.0";

  version = "5.0.1";



  src = fetchFromGitHub {

    owner = "X0rg";

    repo = "CPU-X";

    rev = "v${version}";

    sha256 = "sha256-mykN+E2ghp2+a06WLYXg9oaQQ2SJDyxIVQSUM00zrCo=";

    sha256 = "sha256-g3k9P7EevVeDHvnc1dG8cI4C7xhjrDy7gwdoWj6G6zA=";

  };



  nativeBuildInputs = [ cmake pkg-config wrapGAppsHook nasm makeWrapper ];

pkgs/desktops/lomiri/data/lomiri-schemas/default.nix

0 → 100644
+58 −0
Original line number Diff line number Diff line 
{ stdenv

, lib

, fetchFromGitLab

, gitUpdater

, testers

, cmake

, cmake-extras

, glib

, intltool

, pkg-config

}:



stdenv.mkDerivation (finalAttrs: {

  pname = "lomiri-schemas";

  version = "0.1.3";



  src = fetchFromGitLab {

    owner = "ubports";

    repo = "development/core/lomiri-schemas";

    rev = finalAttrs.version;

    hash = "sha256-FrDUFqdD0KW2VG2pTA6LMb6/9PdNtQUlYTEo1vnW6QQ=";

  };



  strictDeps = true;



  nativeBuildInputs = [

    cmake

    glib # glib-compile-schemas

    pkg-config

    intltool

  ];



  buildInputs = [

    cmake-extras

    glib

  ];



  cmakeFlags = [

    "-DGSETTINGS_LOCALINSTALL=ON"

    "-DGSETTINGS_COMPILE=ON"

  ];



  passthru = {

    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

    updateScript = gitUpdater { };

  };



  meta = with lib; {

    description = "GSettings / AccountsService schema files for Lomiri";

    homepage = "https://gitlab.com/ubports/development/core/lomiri-schemas";

    license = licenses.lgpl21Plus;

    maintainers = teams.lomiri.members;

    platforms = platforms.linux;

    pkgConfigModules = [

      "lomiri-schemas"

    ];

  };

})

pkgs/desktops/lomiri/default.nix

+3 −0
Original line number Diff line number Diff line
@@ -7,6 +7,9 @@ let 
  packages = self: let

    inherit (self) callPackage;

  in {

    #### Data

    lomiri-schemas = callPackage ./data/lomiri-schemas { };



    #### Development tools / libraries

    cmake-extras = callPackage ./development/cmake-extras { };

    deviceinfo = callPackage ./development/deviceinfo { };