public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next-21.05 into staging-21.05

Browse Source
This commit is contained in:
github-actions[bot] 2021-08-03 18:02:54 +00:00 committed by GitHub
commit a9e1012368
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/system/boot/binfmt.nix
View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let
inherit (lib) mkOption types optionalString; inherit (lib) mkOption types optionalString stringAfter;
cfg = config.boot.binfmt; cfg = config.boot.binfmt;
@ -270,7 +270,7 @@ in {
environment.etc."binfmt.d/nixos.conf".source = builtins.toFile "binfmt_nixos.conf" environment.etc."binfmt.d/nixos.conf".source = builtins.toFile "binfmt_nixos.conf"
(lib.concatStringsSep "\n" (lib.mapAttrsToList makeBinfmtLine config.boot.binfmt.registrations)); (lib.concatStringsSep "\n" (lib.mapAttrsToList makeBinfmtLine config.boot.binfmt.registrations));
system.activationScripts.binfmt = '' system.activationScripts.binfmt = stringAfter [ "specialfs" ] ''
mkdir -p -m 0755 /run/binfmt mkdir -p -m 0755 /run/binfmt
${lib.concatStringsSep "\n" (lib.mapAttrsToList activationSnippet config.boot.binfmt.registrations)} ${lib.concatStringsSep "\n" (lib.mapAttrsToList activationSnippet config.boot.binfmt.registrations)}
''; '';

8
nixos/modules/virtualisation/virtualbox-image.nix
View File

@ -18,6 +18,13 @@ in {
The size of the VirtualBox base image in MiB. The size of the VirtualBox base image in MiB.
''; '';
}; };
baseImageFreeSpace = mkOption {
type = with types; int;
default = 30 * 1024;
description = ''
Free space in the VirtualBox base image in MiB.
'';
};
memorySize = mkOption { memorySize = mkOption {
type = types.int; type = types.int;
default = 1536; default = 1536;
@ -117,6 +124,7 @@ in {
inherit pkgs lib config; inherit pkgs lib config;
partitionTableType = "legacy"; partitionTableType = "legacy";
diskSize = cfg.baseImageSize; diskSize = cfg.baseImageSize;
additionalSpace = "${toString cfg.baseImageFreeSpace}M";
postVM = postVM =
'' ''

11
pkgs/top-level/perl-packages.nix
View File

@ -16971,20 +16971,15 @@ let
PerlMagick = buildPerlPackage rec { PerlMagick = buildPerlPackage rec {
pname = "PerlMagick"; pname = "PerlMagick";
version = "7.0.10"; version = "7.0.11-1";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/J/JC/JCRISTY/PerlMagick-${version}.tar.gz"; url = "mirror://cpan/authors/id/J/JC/JCRISTY/Image-Magick-${version}.tar.gz";
sha256 = "1x05hdb3b6qs36x958b4w46qanvkqm6rpc44rlq4rd2w3gbp4lhx"; sha256 = "sha256-c0vuFmVq9bypQABBnZElGIQrpkYKwtD/B+PloBAycuI=";
}; };
buildInputs = [ pkgs.imagemagick ]; buildInputs = [ pkgs.imagemagick ];
preConfigure = preConfigure =
'' ''
sed -i -e 's|my \$INC_magick = .*|my $INC_magick = "-I${pkgs.imagemagick.dev}/include/ImageMagick";|' Makefile.PL sed -i -e 's|my \$INC_magick = .*|my $INC_magick = "-I${pkgs.imagemagick.dev}/include/ImageMagick";|' Makefile.PL
# Enable HDRI support to match the native ImageMagick 7 defaults
# See: https://github.com/ImageMagick/ImageMagick/issues/3402#issuecomment-801195538
substituteInPlace Makefile.PL \
--replace 'MAGICKCORE_HDRI_ENABLE=0' 'MAGICKCORE_HDRI_ENABLE=1'
''; '';
}; };