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

Merge master into staging-next

parents 3bfcfd7e e97f8fec

pkgs/applications/audio/open-stage-control/default.nix

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


buildNpmPackage rec {

  pname = "open-stage-control";

  version = "1.25.3";

  version = "1.25.5";



  src = fetchFromGitHub {

    owner = "jean-emmanuel";

    repo = "open-stage-control";

    rev = "v${version}";

    hash = "sha256-drv+QNBmUjvlRul8PlFK4ZBIDw6BV4kJXVw287H6WT4=";

    hash = "sha256-N0bL/kgw5tIVcD4fGYrahdola/w9ouct0+AUqw+dUOg=";

  };



  # Remove some Electron stuff from package.json
@@ -16,7 +16,7 @@ buildNpmPackage rec { 
    sed -i -e '/"electron"\|"electron-installer-debian"/d' package.json

  '';



  npmDepsHash = "sha256-M+6+zrxy8VpJQS0dG/xORMbflKEq8wO2DEOjGrA6OUw=";

  npmDepsHash = "sha256-unjoBWVwmUqxAU3mDC37sXzoh7aEOdny4Asa70+sZnk=";



  nativeBuildInputs = [

    copyDesktopItems

pkgs/applications/blockchains/go-ethereum/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -9,16 +9,16 @@ let 


in buildGoModule rec {

  pname = "go-ethereum";

  version = "1.12.2";

  version = "1.13.0";



  src = fetchFromGitHub {

    owner = "ethereum";

    repo = pname;

    rev = "v${version}";

    sha256 = "sha256-iCLOrf6/f0f7sD0YjmBtlcOcZRDIp9IZkBadTKj1Qjw=";

    sha256 = "sha256-tomzF0jM1tcxnnBHLfNWcR1XGECxU8Q/SQAWQBRAFW8=";

  };



  vendorHash = "sha256-ChmQjhz4dQdwcY/269Hi5XAn8/+0z/AF7Kd9PJ8WqHg=";

  vendorHash = "sha256-VX2S7yjdcconPd8wisV+Cl6FVuEUGU7smIBKfTxpUVY=";



  doCheck = false;

pkgs/applications/graphics/ImageMagick/default.nix

+5 −2
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
, Foundation

, testers

, imagemagick

, perlPackages

, python3

}:
@@ -47,13 +48,13 @@ in 


stdenv.mkDerivation (finalAttrs: {

  pname = "imagemagick";

  version = "7.1.1-15";

  version = "7.1.1-18";



  src = fetchFromGitHub {

    owner = "ImageMagick";

    repo = "ImageMagick";

    rev = finalAttrs.version;

    hash = "sha256-/fI/RrwcgvKX5loIrDAur60VF5O4FgyPYN7BbcPP/bU=";

    hash = "sha256-DnmX4dxpOqDGHOFSnq7ms2fLGdB1nKdZbpd0Q9t+X6A=";

  };



  outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
@@ -125,12 +126,14 @@ stdenv.mkDerivation (finalAttrs: { 


  passthru.tests = {

    version = testers.testVersion { package = finalAttrs.finalPackage; };

    inherit (perlPackages) ImageMagick;

    inherit (python3.pkgs) img2pdf;

    pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

  };



  meta = with lib; {

    homepage = "http://www.imagemagick.org/";

    changelog = "https://github.com/ImageMagick/Website/blob/main/ChangeLog.md";

    description = "A software suite to create, edit, compose, or convert bitmap images";

    pkgConfigModules = [ "ImageMagick" "MagickWand" ];

    platforms = platforms.linux ++ platforms.darwin;

pkgs/applications/misc/qcad/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -18,14 +18,14 @@ 


mkDerivation rec {

  pname = "qcad";

  version = "3.28.1.3";

  version = "3.28.2.2";



  src = fetchFromGitHub {

    name = "qcad-${version}-src";

    owner = "qcad";

    repo = "qcad";

    rev = "v${version}";

    sha256 = "sha256-4Kr/zKE2VqAblNvxT9dg1325V0OCMca3MPEiG3fTxT4=";

    sha256 = "sha256-0iH+fuh7jurk7FmEdTig+Tfm7ts3b2Azqv6T5kUNpg4=";

  };



  patches = [

pkgs/applications/misc/timewarrior/default.nix

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


stdenv.mkDerivation rec {

  pname = "timewarrior";

  version = "1.5.0";

  version = "1.6.0";



  src = fetchFromGitHub {

    owner = "GothenburgBitFactory";

    repo = "timewarrior";

    rev = "v${version}";

    sha256 = "sha256-qD49NExR0OZ6hgt5ejGiltxF9xkmseJjhJNzEGofnhw=";

    sha256 = "sha256-0obIMnPBvMO30o+qXqwtINNRobBR6cFO65B/xjVt+2w=";

    fetchSubmodules = true;

  };