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

Merge master into staging-next

parents 0d7cb3a2 e4b2d823

maintainers/maintainer-list.nix

+1 −1
Original line number Diff line number Diff line
@@ -16490,7 +16490,7 @@ 
    name = "zimbatm";

  };

  Zimmi48 = {

    email = "theo.zimmermann@univ-paris-diderot.fr";

    email = "theo.zimmermann@telecom-paris.fr";

    github = "Zimmi48";

    githubId = 1108325;

    name = "Théo Zimmermann";

pkgs/applications/graphics/ImageMagick/default.nix

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


stdenv.mkDerivation (finalAttrs: {

  pname = "imagemagick";

  version = "7.1.0-61";

  version = "7.1.0-62";



  src = fetchFromGitHub {

    owner = "ImageMagick";

    repo = "ImageMagick";

    rev = finalAttrs.version;

    hash = "sha256-g7WeqPpPd1gceU+s+vRDpb41IX1lzpiqh3cAYeFdUlg=";

    hash = "sha256-K74BWxGTpkaE+KBrdOCVd+m/2MJP6YUkB2CFh/YEHyI=";

  };



  outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

pkgs/applications/networking/mailreaders/mutt/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 
, gssSupport   ? true

, writeScript

}:

assert smimeSupport -> sslSupport;

assert gpgmeSupport -> sslSupport;



stdenv.mkDerivation rec {

  pname = "mutt";

pkgs/applications/version-management/sapling/Cargo.lock

+302 −255

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/applications/version-management/sapling/default.nix

+7 −6
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ let 
    owner = "facebook";

    repo = "sapling";

    rev = version;

    hash = "sha256-zlvb+qn9SSBPZmlF8KwKTWyKj94FGOafSMRMNLsccOU";

    hash = "sha256-WOvkw+vuU/9vWgxCx7ogawQWCr1O7E70uw/LhuLiSzE";

  };



  addonsSrc = "${src}/addons";
@@ -51,7 +51,7 @@ let 
  # Fetches the Yarn modules in Nix to to be used as an offline cache

  yarnOfflineCache = fetchYarnDeps {

    yarnLock = "${addonsSrc}/yarn.lock";

    sha256 = "sha256-+29WAgSXVciHhLMN04yfKiWCpjM3Vo54nUdTP6owSLs";

    sha256 = "sha256-haeVRO5JBStrO7fjI9WhC5xZwX0IlZR1wxh0Q+m/UQM";

  };



  # Builds the NodeJS server that runs with `sl web`
@@ -100,12 +100,13 @@ python3Packages.buildPythonApplication { 
  cargoDeps = rustPlatform.importCargoLock {

    lockFile = ./Cargo.lock;

    outputHashes = {

      "cloned-0.1.0" = "sha256-DYQTK722wgeDUJtOVXHLt42G6gpe6A62rET+JH+bPKU=";

      "abomonation-0.7.3+smallvec1" = "sha256-AxEXR6GC8gHjycIPOfoViP7KceM29p2ZISIt4iwJzvM=";

      "cloned-0.1.0" = "sha256-ZWO3/+O3Oc2Zg99seJ40CInrW1+3rFvL5HjIxhjDW5I=";

      "deltae-0.3.0" = "sha256-a9Skaqs+tVTw8x83jga+INBr+TdaMmo35Bf2wbfR6zs=";

      "fb303_core-0.0.0" = "sha256-YEFNTYvtgp8nc/1O7AbdyxCD3Xx2xCjbS17fTTEsUL0=";

      "fbthrift-0.0.1+unstable" = "sha256-mDoYhXOzQIDqP7XdmiBbmq5VmAKAgggTNH/kW2kHv4k=";

      "fb303_core-0.0.0" = "sha256-LEib4QL5sMCUyQ9yGWnsOmO6hmlDaE80nfmrTC8elu0=";

      "fbthrift-0.0.1+unstable" = "sha256-4SjdZzG6UP8OY7/Qy7ebdKOg1WdZ2USG6wJ7YhA/PxU=";

      "reqwest-0.11.11" = "sha256-uhc8XhkGW22XDNo0qreWdXeFF2cslOOZHfTRQ30IBcE=";

      "serde_bser-0.3.1" = "sha256-/zn1NfXWytXvnalkgPsg9BdujVV97PGkXwmPtQGVeCc=";

      "serde_bser-0.3.1" = "sha256-uW7qXEn0p7m6uo5r+rD3TDH/Lf1cBMWml0TbhysgDH8=";

    };

  };

  postPatch = ''