Commit 9627659c authored by Weijia Wang's avatar Weijia Wang
Browse files

Merge branch 'master' into staging-next

parents 023d20ae 6f1609ec

nixos/modules/services/web-apps/freshrss.nix

+3 −3
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ in 
            "catch_workers_output" = true;

          };

          phpEnv = {

            FRESHRSS_DATA_PATH = "${cfg.dataDir}";

            DATA_PATH = "${cfg.dataDir}";

          };

        };

      };
@@ -267,7 +267,7 @@ in 
            WorkingDirectory = cfg.package;

          };

          environment = {

            FRESHRSS_DATA_PATH = cfg.dataDir;

            DATA_PATH = cfg.dataDir;

          };



          script =
@@ -302,7 +302,7 @@ in 
        wantedBy = [ "multi-user.target" ];

        startAt = "*:0/5";

        environment = {

          FRESHRSS_DATA_PATH = cfg.dataDir;

          DATA_PATH = cfg.dataDir;

        };

        serviceConfig = defaultServiceConfig //{

          ExecStart = "${cfg.package}/app/actualize_script.php";

nixos/modules/services/x11/desktop-managers/plasma5.nix

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ let 
  libsForQt5 = pkgs.plasma5Packages;

  inherit (libsForQt5) kdeGear kdeFrameworks plasma5;

  inherit (lib)

    getBin optionalString literalExpression

    getBin optionalAttrs optionalString literalExpression

    mkRemovedOptionModule mkRenamedOptionModule

    mkDefault mkIf mkMerge mkOption mkPackageOptionMD types;
@@ -178,7 +178,7 @@ in 
          capabilities = "cap_sys_nice+ep";

          source = "${getBin plasma5.kwin}/bin/kwin_wayland";

        };

      } // mkIf (!cfg.runUsingSystemd) {

      } // optionalAttrs (!cfg.runUsingSystemd) {

        start_kdeinit = {

          setuid = true;

          owner = "root";

pkgs/applications/editors/cudatext/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -38,13 +38,13 @@ let 
in

stdenv.mkDerivation rec {

  pname = "cudatext";

  version = "1.200.0";

  version = "1.201.0";



  src = fetchFromGitHub {

    owner = "Alexey-T";

    repo = "CudaText";

    rev = version;

    hash = "sha256-0+bjp9JOR06wLzA3CJqtGjCK1M0qPdzoLRt6+fV8tJ0=";

    hash = "sha256-Do2JPNZtoi7zbUnJomQAZ8zR/WPB6+G051xZWmeUBP4=";

  };



  postPatch = ''

pkgs/applications/editors/cudatext/deps.json

+5 −5
Original line number Diff line number Diff line
@@ -11,13 +11,13 @@ 
  },

  "ATFlatControls": {

    "owner": "Alexey-T",

    "rev": "2023.10.02",

    "hash": "sha256-9oV8xqkqpCfA7rk4UMxWFBIFQQ9slClFbaENRldFb8Q="

    "rev": "2023.10.30",

    "hash": "sha256-fuTQnnuWjIsABx457y+n6luLxQf+b9TiZGLXYjNsUrw="

  },

  "ATSynEdit": {

    "owner": "Alexey-T",

    "rev": "2023.10.03",

    "hash": "sha256-dJYpsvJNwQg6/NeXT23cpWFXwcfIYnWkHYoDItiUeOo="

    "rev": "2023.10.30",

    "hash": "sha256-xsJ02zGzi7ByFBXql4lLWWLiPVWwtOLXzixmv4AeC2I="

  },

  "ATSynEdit_Cmp": {

    "owner": "Alexey-T",
@@ -36,7 +36,7 @@ 
  },

  "Python-for-Lazarus": {

    "owner": "Alexey-T",

    "rev": "2023.06.29",

    "rev": "2023.06.30",

    "hash": "sha256-mO8/RNJjy9KtFuDUmV2Y8Ff+Jjm9yRd7GSrI6mOONUc="

  },

  "Emmet-Pascal": {

pkgs/applications/graphics/krita/generic.nix

+6 −0
Original line number Diff line number Diff line
@@ -27,6 +27,12 @@ mkDerivation rec { 
      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/krita/-/raw/acd9a818660e86b14a66fceac295c2bab318c671/exiv2-0.28.patch";

      hash = "sha256-iD2pyid513ThJVeotUlVDrwYANofnEiZmWINNUm/saw=";

    })

    (fetchpatch {

      name = "krita-opencolorio-2.3-compat.patch";

      url = "https://invent.kde.org/graphics/krita/-/commit/520c633c2c868f2236d8e56eefecdcb6e3ebd840.patch";

      hash = "sha256-eXsgBN8OnKjZOQsOxViPypts6CVh3L+IYKMB/mDUcfQ=";

      includes = [ "plugins/dockers/lut/ocio_display_filter_vfx2021.cpp" ];

    })

  ];



  nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ];