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

Merge master into staging-next

parents 749f60ad 82ee8249

nixos/modules/module-list.nix

+1 −0
Original line number Diff line number Diff line
@@ -382,6 +382,7 @@ 
  ./services/databases/pgmanage.nix

  ./services/databases/postgresql.nix

  ./services/databases/redis.nix

  ./services/databases/surrealdb.nix

  ./services/databases/victoriametrics.nix

  ./services/desktops/accountsservice.nix

  ./services/desktops/bamf.nix

nixos/modules/services/databases/surrealdb.nix

0 → 100644
+79 −0
Original line number Diff line number Diff line 
{ config, lib, pkgs, ... }:



with lib;

let



  cfg = config.services.surrealdb;

in {



  options = {

    services.surrealdb = {

      enable = mkEnableOption (lib.mdDoc "A scalable, distributed, collaborative, document-graph database, for the realtime web ");



      dbPath = mkOption {

        type = types.str;

        description = lib.mdDoc ''

          The path that surrealdb will write data to. Use null for in-memory.

          Can be one of "memory", "file://:path", "tikv://:addr".

        '';

        default = "file:///var/lib/surrealdb/";

        example = "memory";

      };



      host = mkOption {

        type = types.str;

        description = lib.mdDoc ''

          The host that surrealdb will connect to.

        '';

        default = "127.0.0.1";

        example = "127.0.0.1";

      };



      port = mkOption {

        type = types.port;

        description = lib.mdDoc ''

          The port that surrealdb will connect to.

        '';

        default = 8000;

        example = 8000;

      };

    };

  };



  config = mkIf cfg.enable {



    # Used to connect to the running service

    environment.systemPackages = [ pkgs.surrealdb ] ;



    systemd.services.surrealdb = {

      description = "A scalable, distributed, collaborative, document-graph database, for the realtime web ";

      wantedBy = [ "multi-user.target" ];

      after = [ "network.target" ];



      serviceConfig = {

        ExecStart = "${pkgs.surrealdb}/bin/surreal start --bind ${cfg.host}:${toString cfg.port} ${optionalString (cfg.dbPath != null) "-- ${cfg.dbPath}"}";

        DynamicUser = true;

        Restart = "on-failure";

        StateDirectory = "surrealdb";

        CapabilityBoundingSet = "";

        NoNewPrivileges = true;

        PrivateTmp = true;

        ProtectHome = true;

        ProtectClock = true;

        ProtectProc = "noaccess";

        ProcSubset = "pid";

        ProtectKernelLogs = true;

        ProtectKernelModules = true;

        ProtectKernelTunables = true;

        ProtectControlGroups = true;

        ProtectHostname = true;

        RestrictSUIDSGID = true;

        RestrictRealtime = true;

        RestrictNamespaces = true;

        LockPersonality = true;

        RemoveIPC = true;

        SystemCallFilter = [ "@system-service" "~@privileged" ];

      };

    };

  };

}

pkgs/applications/emulators/duckstation/default.nix

+10 −8
Original line number Diff line number Diff line
@@ -4,11 +4,11 @@ 
, SDL2

, cmake

, copyDesktopItems

, makeDesktopItem

, curl

, extra-cmake-modules

, libpulseaudio

, libXrandr

, libpulseaudio

, makeDesktopItem

, mesa # for libgbm

, ninja

, pkg-config
@@ -18,14 +18,16 @@ 
, vulkan-loader

, wayland

, wrapQtAppsHook

, enableWayland ? true

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation {

  pname = "duckstation";

  version = "unstable-2022-11-18";



  src = fetchFromGitHub {

    owner = "stenzek";

    repo = pname;

    repo = "duckstation";

    rev = "8d7aea5e19859ed483699cc4a5dbd47165c7be8b";

    sha256 = "sha256-92Wn1ZEEZszmVK/KrJqjDuQf/lyD8/VScfTI/St5dY4=";

  };
@@ -49,13 +51,13 @@ stdenv.mkDerivation rec { 
    qtbase

    qtsvg

    vulkan-loader

    wayland

  ];

  ]

  ++ lib.optionals enableWayland [ wayland ];



  cmakeFlags = [

    "-DUSE_DRMKMS=ON"

    "-DUSE_WAYLAND=ON"

  ];

  ]

  ++ lib.optionals enableWayland [ "-DUSE_WAYLAND=ON" ];



  desktopItems = [

    (makeDesktopItem {

pkgs/applications/graphics/qimgv/default.nix

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


mkDerivation rec {

  pname = "qimgv";

  version = "1.0.2";

  version = "1.0.3-alpha";



  src = fetchFromGitHub {

    owner = "easymodo";

    repo = pname;

    rev = "v${version}";

    sha256 = "sha256-YlV/ysm7bdPverpKpanrL+jPVvMtP1paoAm0PREMaww=";

    sha256 = "sha256-fHMSo8zlOl9Lt8nYwClUzON4TPB9Ogwven+TidsesxY=";

  };



  nativeBuildInputs = [

pkgs/applications/graphics/qimgv/qt5-12-compat.diff

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
diff --git a/qimgv/components/directorymanager/watchers/linux/linuxworker.cpp b/qimgv/components/directorymanager/watchers/linux/linuxworker.cpp

index 96ec9d3..6d95d08 100644

--- a/qimgv/components/directorymanager/watchers/linux/linuxworker.cpp

+++ b/qimgv/components/directorymanager/watchers/linux/linuxworker.cpp

@@ -21,7 +21,7 @@ void LinuxWorker::setDescriptor(int desc) {

 

 void LinuxWorker::run() {

     emit started();

-    isRunning.storeRelaxed(true);

+    isRunning.store(true);

 

     if (fd == -1) {

         qDebug() << TAG << "File descriptor isn't set! Stopping";