staging-next 2022-10-28 #198236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

vcunat merged 263 commits into master from staging-next

Nov 2, 2022

nixos/modules/services/hardware/pcscd.nix

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -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

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -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

-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,6 @@ @@
     , openssl
     , pkg-config
     , c-ares
-    , abseil-cpp
     , libGL
     , zlib
     , curl
@@ Expand Down Expand Up / @@ -51,7 +50,6 @@ mkDerivation rec { @@
         grpc
         protobuf
         openssl
-        abseil-cpp
         c-ares
       ];
@@ Expand Down @@

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

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -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

-Original file line number
+Diff line change
@@ Expand Up / @@ -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 =
@@ Expand Down @@

pkgs/build-support/cc-wrapper/setup-hook-nonlinux.sh

This file was deleted.

pkgs/build-support/cc-wrapper/setup-hook.sh

-Original file line number
+Diff line change
@@ Expand Up / @@ -69,12 +69,10 @@ ccWrapper_addCVars () { @@
         getHostRoleEnvHook
         if [ -d "$1/include" ]; then
-            (! echo "$NIX_CFLAGS_COMPILE" | grep -q -F "$1/include") &&
             export NIX_CFLAGS_COMPILE${role_post}+=" -isystem $1/include"
         fi
         if [ -d "$1/Library/Frameworks" ]; then
-            (! echo "$NIX_CFLAGS_COMPILE" | grep -q -F "$1/Library/Frameworks") &&
             export NIX_CFLAGS_COMPILE${role_post}+=" -iframework $1/Library/Frameworks"
         fi
     }
@@ Expand Down Expand Up / @@ -109,8 +107,6 @@ fi @@
     export NIX_CC${role_post}=@out@
-    export CC${role_post}=@named_cc@
-    export CXX${role_post}=@named_cxx@
     export CC${role_post}=@named_cc@
     export CXX${role_post}=@named_cxx@
@@ Expand Down @@

pkgs/development/compilers/glslang/default.nix

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -9,13 +9,13 @@
  
    }:

    stdenv.mkDerivation rec {

      pname = "glslang";

      version = "1.3.224.1";

      version = "1.3.231.0";

      src = fetchFromGitHub {

        owner = "KhronosGroup";

        repo = "glslang";

        rev = "sdk-${version}";

        hash = "sha256-VEOENuy/VhYBBX52O4QHJFXUjsj6jL4vDD4cLDlQcIA=";

        hash = "sha256-huPrQr+lPi7QCF8CufAavHEKGDDimGrcskiojhH9QYk=";

      };

      # These get set at all-packages, keep onto them for child drvs

pkgs/development/compilers/go/1.18.nix

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -45,11 +45,11 @@ let
  
    in

    stdenv.mkDerivation rec {

      pname = "go";

      version = "1.18.7";

      version = "1.18.8";

      src = fetchurl {

        url = "https://go.dev/dl/go${version}.src.tar.gz";

        sha256 = "sha256-lGfjO4Gfcb67IfsO4d1nlP0iRK6UkHqYQoZxL5g5qUQ=";

        sha256 = "sha256-H3mAIwUBVHnnfYxkFTC8VOyZRlfVxSceAXLrcRg0ahI=";

      };

      strictDeps = true;

pkgs/development/compilers/go/1.19.nix

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -45,11 +45,11 @@ let
  
    in

    stdenv.mkDerivation rec {

      pname = "go";

      version = "1.19.2";

      version = "1.19.3";

      src = fetchurl {

        url = "https://go.dev/dl/go${version}.src.tar.gz";

        sha256 = "sha256-LOkw1wqTHeZg/a8nHXAZJ5OxskAnJkW/AnV3n2cE32s=";

        sha256 = "sha256-GKwmPjkhC89o2F9DcOl/sXNBZplaH2P7OLT24H2Q0hI=";

      };

      strictDeps = true;

pkgs/development/compilers/llvm/10/compiler-rt/X86-support-extension.patch

-Original file line number
+Diff line change
@@ -0,0 +1,23 @@
+    diff --git a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt
+    index 3a66dd9c3fb..7efc85d9f9f 100644
+    --- a/lib/builtins/CMakeLists.txt
+    +++ b/lib/builtins/CMakeLists.txt
+    @@ -301,6 +301,10 @@ if (NOT MSVC)
+         i386/umoddi3.S
+       )
+    +  set(i486_SOURCES ${i386_SOURCES})
+    +  set(i586_SOURCES ${i386_SOURCES})
+    +  set(i686_SOURCES ${i386_SOURCES})
+    +
+       if (WIN32)
+         set(i386_SOURCES
+           ${i386_SOURCES}
+    @@ -608,6 +612,7 @@ else ()
+       endif()
+       foreach (arch ${BUILTIN_SUPPORTED_ARCH})
+    +      message("arch: ${arch}")
+         if (CAN_TARGET_${arch})
+           # For ARM archs, exclude any VFP builtins if VFP is not supported
+           if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$")

pkgs/development/compilers/llvm/10/compiler-rt/default.nix

-Original file line number
+Diff line change
@@ Expand Up / @@ -46,9 +46,7 @@ stdenv.mkDerivation { @@
       ] ++ lib.optionals (bareMetal) [
         "-DCOMPILER_RT_OS_DIR=baremetal"
       ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
-        # The compiler-rt build infrastructure sniffs supported platforms on Darwin
-        # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
-        # when it tries to use libc++ and libc++api for i386.
+        "-DDARWIN_macosx_OVERRIDE_SDK_VERSION=ON"
         "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}"
         "-DDARWIN_osx_BUILTIN_ARCHS=${stdenv.hostPlatform.darwinArch}"
       ];
@@ Expand All / @@ -60,6 +58,7 @@ stdenv.mkDerivation { @@
         ./find-darwin-sdk-version.patch # don't test for macOS being >= 10.15
         ./gnu-install-dirs.patch
         ../../common/compiler-rt/libsanitizer-no-cyclades-11.patch
+        ./X86-support-extension.patch # backported from LLVM 11
       ] ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch;
       # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
@@ Expand All / @@ -70,6 +69,8 @@ stdenv.mkDerivation { @@
       postPatch = lib.optionalString (!stdenv.isDarwin) ''
         substituteInPlace cmake/builtin-config-ix.cmake \
           --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)'
+        substituteInPlace cmake/config-ix.cmake \
+          --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)'
       '' + lib.optionalString stdenv.isDarwin ''
         substituteInPlace cmake/config-ix.cmake \
           --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
@@ Expand All / @@ -88,8 +89,16 @@ stdenv.mkDerivation { @@
       '' + lib.optionalString (useLLVM) ''
         ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o
         ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o
+        ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbeginS.o
+        ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtendS.o
         ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o
         ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/crtendS.o
+      ''
+      # See https://reviews.llvm.org/D37278 for why android exception
+      + lib.optionalString (stdenv.hostPlatform.isx86_32 && !stdenv.hostPlatform.isAndroid) ''
+        for f in $out/lib/*/*builtins-i?86*; do
+          ln -s "$f" $(echo "$f" | sed -e 's/builtins-i.86/builtins-i386/')
+        done
       '';
       meta = llvm_meta // {
@@ Expand Down @@

pkgs/development/compilers/llvm/11/compiler-rt/default.nix

-Original file line number
+Diff line change
@@ Expand Up / @@ -78,6 +78,8 @@ stdenv.mkDerivation { @@
       postPatch = lib.optionalString (!stdenv.isDarwin) ''
         substituteInPlace cmake/builtin-config-ix.cmake \
           --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)'
+        substituteInPlace cmake/config-ix.cmake \
+          --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)'
       '' + lib.optionalString stdenv.isDarwin ''
         substituteInPlace cmake/config-ix.cmake \
           --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
@@ Expand All / @@ -96,8 +98,16 @@ stdenv.mkDerivation { @@
       '' + lib.optionalString (useLLVM) ''
         ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o
         ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o
+        ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbeginS.o
+        ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtendS.o
         ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o
         ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/crtendS.o
+      ''
+      # See https://reviews.llvm.org/D37278 for why android exception
+      + lib.optionalString (stdenv.hostPlatform.isx86_32 && !stdenv.hostPlatform.isAndroid) ''
+        for f in $out/lib/*/*builtins-i?86*; do
+          ln -s "$f" $(echo "$f" | sed -e 's/builtins-i.86/builtins-i386/')
+        done
       '';
       meta = llvm_meta // {
@@ Expand Down @@

pkgs/development/compilers/llvm/11/default.nix

-Original file line number
+Diff line change
@@ Expand Up / @@ -43,6 +43,7 @@ let @@
           mkdir "$rsrc"
           ln -s "${cc.lib}/lib/clang/${release_version}/include" "$rsrc"
           echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
+          echo "-B $rsrc/lib" >> $out/nix-support/cc-cflags
         '';
         mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + ''
           ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

staging-next 2022-10-28 #198236

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!