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

Merge #198236: staging-next 2022-10-28

parents aaef5af8 ceefe5ed

nixos/modules/services/hardware/pcscd.nix

+7 −3
Original line number Diff line number Diff line
@@ -5,6 +5,10 @@ with lib; 
let

  cfgFile = pkgs.writeText "reader.conf" config.services.pcscd.readerConfig;



  package = if config.security.polkit.enable

              then pkgs.pcscliteWithPolkit

              else pkgs.pcsclite;



  pluginEnv = pkgs.buildEnv {

    name = "pcscd-plugins";

    paths = map (p: "${p}/pcsc/drivers") config.services.pcscd.plugins;
@@ -49,8 +53,8 @@ in 


    environment.etc."reader.conf".source = cfgFile;



    environment.systemPackages = [ pkgs.pcsclite ];

    systemd.packages = [ (getBin pkgs.pcsclite) ];

    environment.systemPackages = [ package ];

    systemd.packages = [ (getBin package) ];



    systemd.sockets.pcscd.wantedBy = [ "sockets.target" ];
@@ -66,7 +70,7 @@ in 
      # around it, we force the path to the cfgFile.

      #

      # https://github.com/NixOS/nixpkgs/issues/121088

      serviceConfig.ExecStart = [ "" "${getBin pkgs.pcsclite}/bin/pcscd -f -x -c ${cfgFile}" ];

      serviceConfig.ExecStart = [ "" "${getBin package}/bin/pcscd -f -x -c ${cfgFile}" ];

    };

  };

}

pkgs/applications/audio/fluidsynth/default.nix

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


stdenv.mkDerivation rec {

  pname = "fluidsynth";

  version = "2.2.9";

  version = "2.3.0";



  src = fetchFromGitHub {

    owner = "FluidSynth";

    repo = "fluidsynth";

    rev = "v${version}";

    sha256 = "sha256-8vsYn/4qkANp6f6avtdaXHfJD+9NTHTrl7i4RTlKXPQ=";

    sha256 = "sha256-7SuM7a8IIecAJ83QvJfUba/wArAEXywqL2HwVbeG8H4=";

  };



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

pkgs/applications/networking/qv2ray/default.nix

+0 −2
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
, openssl

, pkg-config

, c-ares

, abseil-cpp

, libGL

, zlib

, curl
@@ -51,7 +50,6 @@ mkDerivation rec { 
    grpc

    protobuf

    openssl

    abseil-cpp

    c-ares

  ];

pkgs/applications/version-management/git-and-tools/git/default.nix

+3 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ assert sendEmailSupport -> perlSupport; 
assert svnSupport -> perlSupport;



let

  version = "2.38.0";

  version = "2.38.1";

  svn = subversionClient.override { perlBindings = perlSupport; };

  gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];

in
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { 


  src = fetchurl {

    url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";

    sha256 = "sha256-kj6t4msYFN540GvajgqfXai3xLMEs/kFD/tGTwMQMgo=";

    sha256 = "sha256-l9346liiueD7wlCOJFAoynWRG9ONFVFhaxSMGqV0Ctk=";

  };



  outputs = [ "out" ] ++ lib.optional withManual "doc";
@@ -207,6 +207,7 @@ stdenv.mkDerivation (finalAttrs: { 
      # Also put git-http-backend into $PATH, so that we can use smart

      # HTTP(s) transports for pushing

      ln -s $out/libexec/git-core/git-http-backend $out/bin/git-http-backend

      ln -s $out/share/git/contrib/git-jump/git-jump $out/bin/git-jump

    '' + lib.optionalString perlSupport ''

      # wrap perl commands

      makeWrapper "$out/share/git/contrib/credential/netrc/git-credential-netrc.perl" $out/bin/git-credential-netrc \

pkgs/build-support/cc-wrapper/default.nix

+1 −3
Original line number Diff line number Diff line
@@ -274,9 +274,7 @@ stdenv.mkDerivation { 


  setupHooks = [

    ../setup-hooks/role.bash

  ] ++ lib.optional (cc.langC or true)

        # Temporary hack; see https://github.com/NixOS/nixpkgs/pull/191724#issuecomment-1278602576

        (if stdenv.isLinux then ./setup-hook.sh else ./setup-hook-nonlinux.sh)

  ] ++ lib.optional (cc.langC or true) ./setup-hook.sh

    ++ lib.optional (cc.langFortran or false) ./fortran-hook.sh;



  postFixup =