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

Merge master into staging-next

parents 2c561ae6 a5c84766

nixos/modules/services/networking/knot.nix

+1 −0
Original line number Diff line number Diff line
@@ -337,6 +337,7 @@ in { 
        SystemCallFilter = [

          "@system-service"

          "~@privileged"

          "@chown"

        ] ++ optionals (cfg.enableXDP) [

          "bpf"

        ];

pkgs/applications/misc/gallery-dl/default.nix

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


buildPythonApplication rec {

  pname = "gallery-dl";

  version = "1.27.5";

  version = "1.27.6";

  format = "setuptools";



  src = fetchPypi {

    inherit version;

    pname = "gallery_dl";

    hash = "sha256-q/byWRvbzrV6KjPIDjJJWl0fkrluGEcvrISPKz8SJ+4=";

    hash = "sha256-bxh15aZIupTaHnYM65MAYuYtKx0z2OIQl3WKEU1gO4Q=";

  };



  propagatedBuildInputs = [

pkgs/applications/misc/skytemple/default.nix

+2 −8
Original line number Diff line number Diff line
@@ -10,14 +10,14 @@ 


python3Packages.buildPythonApplication rec {

  pname = "skytemple";

  version = "1.6.5";

  version = "1.8.3";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "SkyTemple";

    repo = "skytemple";

    rev = "refs/tags/${version}";

    hash = "sha256-yfXu1sboKi8STPiX5FUD9q+1U9GfhOyEKDRvU9rgdfI=";

    hash = "sha256-RFLxDV/L6Qbz14KqIEcMX/EnirNUrHL0MW8v5Z8ByK0=";

  };



  build-system = with python3Packages; [ setuptools ];
@@ -36,11 +36,6 @@ python3Packages.buildPythonApplication rec { 
    wrapGAppsHook3

  ];



  pythonRelaxDeps = [

    "skytemple-files"

    "skytemple-ssb-debugger"

  ];



  dependencies = with python3Packages; [

    cairosvg

    natsort
@@ -49,7 +44,6 @@ python3Packages.buildPythonApplication rec { 
    pycairo

    pygal

    psutil

    gbulb

    pypresence

    sentry-sdk

    setuptools

pkgs/by-name/cl/cloak-pt/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
  fetchFromGitHub,

}:

let

  version = "2.9.0";

  version = "2.10.0";

in

buildGoModule {

  pname = "Cloak";
@@ -14,10 +14,10 @@ buildGoModule { 
    owner = "cbeuw";

    repo = "Cloak";

    rev = "v${version}";

    hash = "sha256-IclSnSJAUSWWAk8UZbUJLMVcnoZk5Yvsd1n3u67cM2g=";

    hash = "sha256-JbwjsLVOxQc6v47+6rG2f1JLS8ieZI6jYV/twtaVx9M=";

  };



  vendorHash = "sha256-kkb/gPnDbJvfc5Qqc5HuM1c9OwOu1ijfO7nNNnY3mOo=";

  vendorHash = "sha256-0veClhg9GujI5VrHVzAevIXkjqtZ6r7RGTP2QeWbO2w=";



  doCheck = false;

pkgs/by-name/fe/feather/package.nix

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


stdenv.mkDerivation (finalAttrs: {

  pname = "feather";

  version = "2.6.8";

  version = "2.7.0";



  src = fetchFromGitHub {

    owner = "feather-wallet";

    repo = "feather";

    rev = finalAttrs.version;

    hash = "sha256-l1kyNpUIqezMfInhrKgnTnArqeSjvhBwdqVi0aUlKF8=";

    hash = "sha256-CwydKX8cCtmrUSLUHNCDOteVmkjzj0zMHgwUyrWrWm8=";

    fetchSubmodules = true;

  };