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

Merge master into staging-next

parents 300eaad1 79812f80

pkgs/applications/blockchains/snarkos/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -10,16 +10,16 @@ 
}:

rustPlatform.buildRustPackage rec {

  pname = "snarkos";

  version = "2.1.6";

  version = "2.1.7";



  src = fetchFromGitHub {

    owner = "AleoHQ";

    repo = "snarkOS";

    rev = "v${version}";

    sha256 = "sha256-S79u9jAtYHsCFwvhNTRKrQL/CUBrzt8twx4mzwNtxhs=";

    sha256 = "sha256-kW41SNbl2vckgUth+BZ6/aM03aT6MFeY4Hwi9OVWtTI=";

  };



  cargoHash = "sha256-cDyViA3TuUoQsU9OnEF3UDgwQhPhgg4mTcqDy2VIA9c=";

  cargoHash = "sha256-znEAb4q9H0Doc+XYCf27hV/z2t74kjQUffl/aJzW6tI=";



  # buildAndTestSubdir = "cli";

pkgs/applications/misc/camunda-modeler/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ stdenvNoCC.mkDerivation rec { 
  meta = with lib; {

    homepage = "https://github.com/camunda/camunda-modeler";

    description = "An integrated modeling solution for BPMN, DMN and Forms based on bpmn.io";

    maintainers = with maintainers; [ n0emis ];

    maintainers = teams.wdz.members;

    license = licenses.mit;

    inherit (electron.meta) platforms;

  };

pkgs/desktops/plasma-5/fetch.sh

+1 −1
Original line number Diff line number Diff line 
WGET_ARGS=( https://download.kde.org/stable/plasma/5.27.7/ -A '*.tar.xz' )
 
WGET_ARGS=( https://download.kde.org/stable/plasma/5.27.8/ -A '*.tar.xz' )

pkgs/desktops/plasma-5/plasma-sdk.nix

+0 −11
Original line number Diff line number Diff line
@@ -16,22 +16,11 @@ 
, ktexteditor

, kwidgetsaddons

, kdoctools

, fetchpatch

}:



mkDerivation {

  pname = "plasma-sdk";



  patches = [

    # remove duplicate doc entries, fix build

    # FIXME: remove for next update

    (fetchpatch {

      url = "https://invent.kde.org/plasma/plasma-sdk/-/commit/e766c3c0483329f52ba0dd7536c4160131409f8e.patch";

      revert = true;

      hash = "sha256-NoQbRo+0gT4F4G6YbvTiQulqrsFtnD7z0/0I4teQvUM=";

    })

  ];



  nativeBuildInputs = [ extra-cmake-modules kdoctools ];

  buildInputs = [

    karchive

pkgs/desktops/plasma-5/plasma-workspace/default.nix

+0 −7
Original line number Diff line number Diff line
@@ -148,13 +148,6 @@ mkDerivation { 
  patches = [

    ./0001-startkde.patch

    ./0002-absolute-wallpaper-install-dir.patch



    # backport patch fixing a Wayland crash

    # FIXME: remove in next release

    (fetchpatch {

      url = "https://invent.kde.org/plasma/plasma-workspace/-/commit/fc01a7f837d06ee9e92d02f13acb79c2b06e9e3c.diff";

      hash = "sha256-cHupiD6fKZ7ICFb4AcuUErrA4646sNGxeGiACPs8IHQ=";

    })

  ];



  # QT_INSTALL_BINS refers to qtbase, and qdbus is in qttools