Unverified Commit d6b863fd authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge #226795: staging-next 2023-04-18

parents 7b57f591 72fb6676

nixos/tests/installed-tests/pipewire.nix

+1 −11
Original line number Diff line number Diff line 
{ pkgs, lib, makeInstalledTest, ... }:

{ pkgs, makeInstalledTest, ... }:



makeInstalledTest {

  tested = pkgs.pipewire;

  testConfig = {

    hardware.pulseaudio.enable = false;

    services.pipewire = {

      enable = true;

      pulse.enable = true;

      jack.enable = true;

      alsa.enable = true;

      alsa.support32Bit = true;

    };

  };

}

pkgs/applications/audio/fluidsynth/default.nix

+4 −4
Original line number Diff line number Diff line 
{ stdenv, lib, fetchFromGitHub, buildPackages, pkg-config, cmake

, alsa-lib, glib, libjack2, libsndfile, libpulseaudio

, AudioUnit, CoreAudio, CoreMIDI, CoreServices

, AppKit, AudioUnit, CoreAudio, CoreMIDI, CoreServices

}:



stdenv.mkDerivation rec {

  pname = "fluidsynth";

  version = "2.3.1";

  version = "2.3.2";



  src = fetchFromGitHub {

    owner = "FluidSynth";

    repo = "fluidsynth";

    rev = "v${version}";

    sha256 = "05lr9f0q4x1kvgfa3xrfmagpwvijv9m1s316aa9figqlkcc5vv4k";

    sha256 = "sha256-BSJu3jB7b5G2ThXBUHUNnBGl55EXe3nIzdBdgfOWDSM=";

  };



  nativeBuildInputs = [ buildPackages.stdenv.cc pkg-config cmake ];



  buildInputs = [ glib libsndfile libjack2 ]

    ++ lib.optionals stdenv.isLinux [ alsa-lib libpulseaudio ]

    ++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreMIDI CoreServices ];

    ++ lib.optionals stdenv.isDarwin [ AppKit AudioUnit CoreAudio CoreMIDI CoreServices ];



  cmakeFlags = [

    "-Denable-framework=off"

pkgs/applications/audio/mpg123/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -21,11 +21,11 @@ assert withConplay -> !libOnly; 


stdenv.mkDerivation rec {

  pname = "${lib.optionalString libOnly "lib"}mpg123";

  version = "1.31.2";

  version = "1.31.3";



  src = fetchurl {

    url = "mirror://sourceforge/mpg123/mpg123-${version}.tar.bz2";

    sha256 = "sha256-sX8ikF4x9DtrQB399qce0Ru30Fb2jbRJ1wufmug5x94=";

    hash = "sha256-HKd9Omml/4RbegU294P+5VThBBE5prl49q/hT1gUrRo=";

  };



  outputs = [ "out" ] ++ lib.optional withConplay "conplay";

pkgs/applications/editors/vim/default.nix

+10 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ in 
stdenv.mkDerivation {

  pname = "vim";



  inherit (common) version src postPatch hardeningDisable enableParallelBuilding meta;

  inherit (common) version src postPatch hardeningDisable enableParallelBuilding enableParallelInstalling meta;



  nativeBuildInputs = [ gettext pkg-config ];

  buildInputs = [ ncurses bash gawk ]
@@ -50,6 +50,15 @@ stdenv.mkDerivation { 
    ln -s $out/bin/vim $out/bin/vi

    mkdir -p $out/share/vim

    cp "${vimrc}" $out/share/vim/vimrc



    # Prevent bugs in the upstream makefile from silently failing and missing outputs.

    # Some of those are build-time requirements for other packages.

    for tool in ex xxd vi view vimdiff; do

      if [ ! -e "$out/bin/$tool" ]; then

        echo "ERROR: install phase did not install '$tool'."

        exit 1

      fi

    done

  '';



  __impureHostDeps = [ "/dev/ptmx" ];

pkgs/applications/misc/privacyidea/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -11,7 +11,8 @@ let 
    packageOverrides = self: super: {

      sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec {

        version = "1.3.24";

        src = oldAttrs.src.override {

        src = super.fetchPypi {

          inherit (oldAttrs) pname;

          inherit version;

          hash = "sha256-67t3fL+TEjWbiXv4G6ANrg9ctp+6KhgmXcwYpvXvdRk=";

        };