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

Merge master into staging-next

parents 4a5ad096 476bcb4b

pkgs/applications/editors/emacs/sources.nix

+10 −8
Original line number Diff line number Diff line
@@ -50,14 +50,16 @@ let 
        "macport" = "https://bitbucket.org/mituharu/emacs-mac/raw/${rev}/NEWS-mac";

      }.${variant};

      license = lib.licenses.gpl3Plus;

      maintainers = with lib.maintainers; [

      maintainers = {

        "mainline" = with lib.maintainers; [

          AndersonTorres

          adisbladis

          jwiegley

          lovek323

          matthewbauer

        # atemu for issues relating to Macport

        ];

        "macport" = with lib.maintainers; [ ];

      }.${variant};

      platforms = {

        "mainline" = lib.platforms.all;

        "macport" = lib.platforms.darwin;

pkgs/by-name/ca/caido/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -15,14 +15,14 @@ let 
    "cli"

    "desktop"

  ];

  version = "0.41.0";

  version = "0.42.0";

  cli = fetchurl {

    url = "https://caido.download/releases/v${version}/caido-cli-v${version}-linux-x86_64.tar.gz";

    hash = "sha256-aQhax0efp5L3JNqGsOWsoO6z5pVVc/rxlz+5mvZoPNU=";

    hash = "sha256-Y0ygbdL9IKvTRLwR0oW1LjFQZfPxKOoZnSDV2zgtJjM=";

  };

  desktop = fetchurl {

    url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-linux-x86_64.AppImage";

    hash = "sha256-DgXxOOWaLJG1h1nB+mkw77APh06WiJo9V9ZFCiWeha8=";

    hash = "sha256-zS/lbcXK1iN2tuUMWc6Us0q2eUypD8mXsw0C+QKE3+w=";

  };

  appimageContents = appimageTools.extractType2 {

    inherit pname version;

pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix

+4 −2
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
, vala

, libadwaita

, libgee

, libical

, granite7

, gtk4

, libxml2
@@ -18,13 +19,13 @@ 


stdenv.mkDerivation rec {

  pname = "switchboard-plug-datetime";

  version = "8.0.0";

  version = "8.1.0";



  src = fetchFromGitHub {

    owner = "elementary";

    repo = pname;

    rev = version;

    sha256 = "sha256-PE1ig8p9H4MfipIpN3ubXAJNzLwGVW89adn+SF3rEuQ=";

    sha256 = "sha256-VOL0F0obuXVz0G5hMI/hpUf2T3H8XUw64wu4MxRi57g=";

  };



  patches = [
@@ -47,6 +48,7 @@ stdenv.mkDerivation rec { 
    gtk4

    libadwaita

    libgee

    libical

    switchboard

  ];

pkgs/kde/third-party/krohnkite/default.nix

+5 −5
Original line number Diff line number Diff line
@@ -9,16 +9,16 @@ 
}:

buildNpmPackage rec {

  pname = "krohnkite";

  version = "0.9.7";

  version = "0.9.8.2";



  src = fetchFromGitHub {

    owner = "anametologin";

    repo = "krohnkite";

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

    hash = "sha256-8A3zW5tK8jK9fSxYx28b8uXGsvxEoUYybU0GaMD2LNw=";

    hash = "sha256-chADfJ1zaufnwi4jHbEN1Oec3XFNw0YsZxLFhnY3T9w=";

  };



  npmDepsHash = "sha256-My1goFEoZW9kFA3zb8xKPxAPXm6bypyq+ajPM8zVOHQ=";

  npmDepsHash = "sha256-3yE2gyyVkLn/dPDG9zDdkHAEb4/hqTJdyMXE5Y6Z5pM=";



  dontWrapQtApps = true;
@@ -40,8 +40,8 @@ buildNpmPackage rec { 
    runHook preInstall



    substituteInPlace Makefile --replace-fail '7z a -tzip' 'zip -r'

    make krohnkite-${version}.kwinscript

    kpackagetool6 --type=KWin/Script --install=krohnkite-${version}.kwinscript --packageroot=$out/share/kwin/scripts

    make KWINPKG_FILE=krohnkite.kwinscript krohnkite.kwinscript

    kpackagetool6 --type=KWin/Script --install=krohnkite.kwinscript --packageroot=$out/share/kwin/scripts



    runHook postInstall

  '';

pkgs/kde/third-party/krohnkite/package-lock.json

+94 −27

File changed.

Preview size limit exceeded, changes collapsed.