Unverified Commit 54b7ab5b authored by Naïm Favier's avatar Naïm Favier
Browse files

Merge branch 'master' into haskell-updates

parents bb132441 2bbfcd0d

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -7777,6 +7777,12 @@ 
    githubId = 10654650;

    name = "Guillaume Koenig";

  };

  guillaumematheron = {

    email = "guillaume_nix@matheron.eu";

    github = "guillaumematheron";

    githubId = 1949438;

    name = "Guillaume Matheron";

  };

  guitargeek = {

    email = "jonas.rembser@cern.ch";

    github = "guitargeek";

nixos/lib/testing/driver.nix

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ in 
    enableOCR = mkOption {

      description = ''

        Whether to enable Optical Character Recognition functionality for

        testing graphical programs. See [Machine objects](`ssec-machine-objects`).

        testing graphical programs. See [`Machine objects`](#ssec-machine-objects).

      '';

      type = types.bool;

      default = false;

nixos/modules/system/boot/binfmt.nix

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ in { 
  };



  config = {

    boot.binfmt.registrations = builtins.listToAttrs (map (system: {

    boot.binfmt.registrations = builtins.listToAttrs (map (system: assert system != pkgs.system; {

      name = system;

      value = { config, ... }: let

        interpreter = getEmulator system;

pkgs/applications/audio/cava/default.nix

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


stdenv.mkDerivation rec {

  pname = "cava";

  version = "0.10.1";

  version = "0.10.2";



  src = fetchFromGitHub {

    owner = "karlstav";

    repo = "cava";

    rev = version;

    hash = "sha256-hndlEuKbI8oHvm0dosO0loQAw/U2qasoJ+4K8JG7I2Q=";

    hash = "sha256-y6RslsU/zmr0Ai/rnr73N3OtjuBcWa3JCwh9P5GkNss=";

  };



  buildInputs = [

pkgs/applications/graphics/ImageMagick/default.nix

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


stdenv.mkDerivation (finalAttrs: {

  pname = "imagemagick";

  version = "7.1.1-30";

  version = "7.1.1-32";



  src = fetchFromGitHub {

    owner = "ImageMagick";

    repo = "ImageMagick";

    rev = finalAttrs.version;

    hash = "sha256-btXl1J/WjV+5BZibgUzylVmBrhR3KBK/ZSbP0B2fM5c=";

    hash = "sha256-9pDxnUNMmrwnP4rrR41OSZOJZjQnlVvedpLvMZJJnJo=";

  };



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