From 7c7f6d7d747343e5b17b68839ca3e55a27e4e439 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Fri, 27 May 2022 17:17:16 +0200 Subject: [PATCH 01/80] nixos/openconnect: add autoStart option (cherry picked from commit 106bfcaf8a916650f01df5498020e273905c2172) --- nixos/modules/services/networking/openconnect.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/openconnect.nix b/nixos/modules/services/networking/openconnect.nix index de4b505130eb..bc873b2198bc 100644 --- a/nixos/modules/services/networking/openconnect.nix +++ b/nixos/modules/services/networking/openconnect.nix @@ -9,6 +9,12 @@ let }; interfaceOptions = { options = { + autoStart = mkOption { + default = true; + description = "Whether this VPN connection should be started automatically."; + type = types.bool; + }; + gateway = mkOption { description = "Gateway server to connect to."; example = "gateway.example.com"; @@ -95,7 +101,7 @@ let description = "OpenConnect Interface - ${name}"; requires = [ "network-online.target" ]; after = [ "network.target" "network-online.target" ]; - wantedBy = [ "multi-user.target" ]; + wantedBy = optional icfg.autoStart "multi-user.target"; serviceConfig = { Type = "simple"; From a6e0f3aaa7c694dd275fda15aa4d02df4af3c28b Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 8 Jun 2022 16:43:04 +0000 Subject: [PATCH 02/80] llvmPackages_14: Fix remaining broken gnu-install-dirs patches (cherry picked from commit 942da65b07023a3a7c5f8a6c58e40781d0f1e748) --- .../compilers/llvm/14/libcxx/default.nix | 9 --- .../llvm/14/libcxx/gnu-install-dirs.patch | 76 ++----------------- .../compilers/llvm/14/libcxxabi/default.nix | 1 - .../llvm/14/libcxxabi/gnu-install-dirs.patch | 36 ++------- .../compilers/llvm/14/libunwind/default.nix | 1 - .../llvm/14/libunwind/gnu-install-dirs.patch | 52 +------------ 6 files changed, 16 insertions(+), 159 deletions(-) diff --git a/pkgs/development/compilers/llvm/14/libcxx/default.nix b/pkgs/development/compilers/llvm/14/libcxx/default.nix index 8891a69937ab..0a684782d490 100644 --- a/pkgs/development/compilers/llvm/14/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/14/libcxx/default.nix @@ -62,15 +62,6 @@ stdenv.mkDerivation rec { buildFlags = lib.optional headersOnly "generate-cxx-headers"; installTargets = lib.optional headersOnly "install-cxx-headers"; - # At this point, cxxabi headers would be installed in the dev output, which - # prevents moveToOutput from doing its job later in the build process. - postInstall = lib.optionalString (!headersOnly) '' - mv "$dev/include/c++/v1/"* "$out/include/c++/v1/" - pushd "$dev" - rmdir -p include/c++/v1 - popd - ''; - passthru = { isLLVM = true; }; diff --git a/pkgs/development/compilers/llvm/14/libcxx/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/14/libcxx/gnu-install-dirs.patch index 0f1d5c411ab8..bddf55d1e605 100644 --- a/pkgs/development/compilers/llvm/14/libcxx/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/14/libcxx/gnu-install-dirs.patch @@ -1,85 +1,21 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b0569a4a54ca..7d665f5a3258 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -10,6 +10,8 @@ endif() - #=============================================================================== - cmake_minimum_required(VERSION 3.13.4) - -+include(GNUInstallDirs) -+ - set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") - - # Add path for custom modules -@@ -415,13 +417,13 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) +@@ -436,7 +436,7 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) set(LIBCXX_GENERATED_INCLUDE_DIR "${LLVM_BINARY_DIR}/include/c++/v1") set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LLVM_BINARY_DIR}/include/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1") - set(LIBCXX_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH + set(LIBCXX_INSTALL_LIBRARY_DIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}" CACHE PATH "Path where built libc++ libraries should be installed.") -- set(LIBCXX_INSTALL_RUNTIME_DIR bin CACHE PATH -+ set(LIBCXX_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH - "Path where built libc++ runtime libraries should be installed.") -- set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH -+ set(LIBCXX_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/c++/v1" CACHE PATH - "Path where target-agnostic libc++ headers should be installed.") -- set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "include/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1" CACHE PATH -+ set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${CMAKE_INSTALL_INCLUDEDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1" CACHE PATH + set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${CMAKE_INSTALL_INCLUDEDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1" CACHE PATH "Path where target-specific libc++ headers should be installed.") - if(LIBCXX_LIBDIR_SUBDIR) - string(APPEND LIBCXX_LIBRARY_DIR /${LIBCXX_LIBDIR_SUBDIR}) -@@ -431,11 +433,11 @@ elseif(LLVM_LIBRARY_OUTPUT_INTDIR) - set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) - set(LIBCXX_GENERATED_INCLUDE_DIR "${LLVM_BINARY_DIR}/include/c++/v1") +@@ -453,7 +453,7 @@ else() + set(LIBCXX_GENERATED_INCLUDE_DIR "${CMAKE_BINARY_DIR}/include/c++/v1") + endif() set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LIBCXX_GENERATED_INCLUDE_DIR}") - set(LIBCXX_INSTALL_LIBRARY_DIR lib${LIBCXX_LIBDIR_SUFFIX} CACHE PATH -+ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} CACHE PATH ++ set(LIBCXX_INSTALL_LIBRARY_DIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" CACHE PATH "Path where built libc++ libraries should be installed.") -- set(LIBCXX_INSTALL_RUNTIME_DIR bin CACHE PATH -+ set(LIBCXX_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}/c++/v1" CACHE PATH - "Path where built libc++ runtime libraries should be installed.") -- set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH -+ set(LIBCXX_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/c++/v1" CACHE PATH - "Path where target-agnostic libc++ headers should be installed.") set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${LIBCXX_INSTALL_INCLUDE_DIR}" CACHE PATH "Path where target-specific libc++ headers should be installed.") -@@ -443,11 +445,11 @@ else() - set(LIBCXX_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXX_LIBDIR_SUFFIX}) - set(LIBCXX_GENERATED_INCLUDE_DIR "${CMAKE_BINARY_DIR}/include/c++/v1") - set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LIBCXX_GENERATED_INCLUDE_DIR}") -- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LIBCXX_LIBDIR_SUFFIX} CACHE PATH -+ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} CACHE PATH - "Path where built libc++ libraries should be installed.") -- set(LIBCXX_INSTALL_RUNTIME_DIR bin CACHE PATH -+ set(LIBCXX_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH - "Path where built libc++ runtime libraries should be installed.") -- set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH -+ set(LIBCXX_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/c++/v1" CACHE PATH - "Path where target-agnostic libc++ headers should be installed.") - set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${LIBCXX_INSTALL_INCLUDE_DIR}" CACHE PATH - "Path where target-specific libc++ headers should be installed.") -diff --git a/cmake/Modules/HandleLibCXXABI.cmake b/cmake/Modules/HandleLibCXXABI.cmake -index 5a8a4a270a1a..d69405ddeeac 100644 ---- a/cmake/Modules/HandleLibCXXABI.cmake -+++ b/cmake/Modules/HandleLibCXXABI.cmake -@@ -1,8 +1,9 @@ -- - #=============================================================================== - # Add an ABI library if appropriate - #=============================================================================== - -+include(GNUInstallDirs) -+ - # - # _setup_abi: Set up the build to use an ABI library - # -@@ -63,7 +64,7 @@ macro(setup_abi_lib abidefines abishared abistatic abifiles abidirs) - - if (LIBCXX_INSTALL_HEADERS) - install(FILES "${LIBCXX_BINARY_INCLUDE_DIR}/${fpath}" -- DESTINATION include/c++/v1/${dstdir} -+ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dstdir}" - COMPONENT cxx-headers - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ - ) diff --git a/pkgs/development/compilers/llvm/14/libcxxabi/default.nix b/pkgs/development/compilers/llvm/14/libcxxabi/default.nix index 07aaa2737cea..d64708ab040a 100644 --- a/pkgs/development/compilers/llvm/14/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/14/libcxxabi/default.nix @@ -82,6 +82,5 @@ stdenv.mkDerivation rec { # the UIUC License (a BSD-like license)": license = with lib.licenses; [ mit ncsa ]; maintainers = llvm_meta.maintainers ++ [ lib.maintainers.vlstill ]; - broken = true; # TODO: gnu-install-dirs.patch fails to apply }; } diff --git a/pkgs/development/compilers/llvm/14/libcxxabi/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/14/libcxxabi/gnu-install-dirs.patch index a93348ded0c1..bd25c903d5bc 100644 --- a/pkgs/development/compilers/llvm/14/libcxxabi/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/14/libcxxabi/gnu-install-dirs.patch @@ -1,46 +1,22 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 858f5d5cfd7f..16c67d7062be 100644 +index ecbc7091864e..53ba2dbc3bd1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -10,6 +10,8 @@ endif() - - cmake_minimum_required(VERSION 3.13.4) - -+include(GNUInstallDirs) -+ - set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") - - # Add path for custom modules -@@ -213,9 +215,9 @@ set(CMAKE_MODULE_PATH +@@ -216,7 +216,7 @@ set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) set(LIBCXXABI_HEADER_DIR ${LLVM_BINARY_DIR}) set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) - set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH + set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH "Path where built libc++abi libraries should be installed.") -- set(LIBCXXABI_INSTALL_RUNTIME_DIR bin CACHE PATH -+ set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH - "Path where built libc++abi runtime libraries should be installed.") if(LIBCXX_LIBDIR_SUBDIR) string(APPEND LIBCXXABI_LIBRARY_DIR /${LIBCXXABI_LIBDIR_SUBDIR}) -@@ -224,16 +226,16 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) - elseif(LLVM_LIBRARY_OUTPUT_INTDIR) - set(LIBCXXABI_HEADER_DIR ${LLVM_BINARY_DIR}) - set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) +@@ -230,7 +230,7 @@ else() + set(LIBCXXABI_HEADER_DIR ${CMAKE_BINARY_DIR}) + set(LIBCXXABI_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXXABI_LIBDIR_SUFFIX}) + endif() - set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH + set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH "Path where built libc++abi libraries should be installed.") -- set(LIBCXXABI_INSTALL_RUNTIME_DIR bin CACHE PATH -+ set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH - "Path where built libc++abi runtime libraries should be installed.") - else() - set(LIBCXXABI_HEADER_DIR ${CMAKE_BINARY_DIR}) - set(LIBCXXABI_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXXABI_LIBDIR_SUFFIX}) -- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH -+ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH - "Path where built libc++abi libraries should be installed.") -- set(LIBCXXABI_INSTALL_RUNTIME_DIR bin CACHE PATH -+ set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH - "Path where built libc++abi runtime libraries should be installed.") endif() diff --git a/pkgs/development/compilers/llvm/14/libunwind/default.nix b/pkgs/development/compilers/llvm/14/libunwind/default.nix index 109b92f1e027..c6d9eda5e474 100644 --- a/pkgs/development/compilers/llvm/14/libunwind/default.nix +++ b/pkgs/development/compilers/llvm/14/libunwind/default.nix @@ -43,6 +43,5 @@ stdenv.mkDerivation rec { I). It is a dependency of the C++ ABI library, and sometimes is a dependency of other runtimes. ''; - broken = true; # TODO: gnu-install-dirs.patch fails to apply }; } diff --git a/pkgs/development/compilers/llvm/14/libunwind/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/14/libunwind/gnu-install-dirs.patch index 3f05d2a87269..3fce8bf90343 100644 --- a/pkgs/development/compilers/llvm/14/libunwind/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/14/libunwind/gnu-install-dirs.patch @@ -1,65 +1,21 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index e3cc66dd2226..1299b596ce0d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -8,6 +8,8 @@ endif() - - cmake_minimum_required(VERSION 3.13.4) - -+include(GNUInstallDirs) -+ - set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") - - # Add path for custom modules -@@ -139,25 +141,27 @@ set(CMAKE_MODULE_PATH +@@ -147,7 +147,7 @@ set(LIBUNWIND_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) - set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH -+ set(LIBUNWIND_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}" CACHE PATH -+ "Path where built libunwind headers should be installed.") + set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH "Path where built libunwind libraries should be installed.") -- set(LIBUNWIND_INSTALL_RUNTIME_DIR bin CACHE PATH -+ set(LIBUNWIND_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH - "Path where built libunwind runtime libraries should be installed.") if(LIBCXX_LIBDIR_SUBDIR) string(APPEND LIBUNWIND_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR}) - string(APPEND LIBUNWIND_INSTALL_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR}) +@@ -159,7 +159,7 @@ else() + else() + set(LIBUNWIND_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX}) endif() --elseif(LLVM_LIBRARY_OUTPUT_INTDIR) -- set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) - set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH -- "Path where built libunwind libraries should be installed.") -- set(LIBUNWIND_INSTALL_RUNTIME_DIR bin CACHE PATH -- "Path where built libunwind runtime libraries should be installed.") - else() -- set(LIBUNWIND_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX}) -- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH -+ if(LLVM_LIBRARY_OUTPUT_INTDIR) -+ set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) -+ else() -+ set(LIBUNWIND_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX}) -+ endif() -+ set(LIBUNWIND_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}" CACHE PATH -+ "Path where built libunwind headers should be installed.") + set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH "Path where built libunwind libraries should be installed.") -- set(LIBUNWIND_INSTALL_RUNTIME_DIR bin CACHE PATH -+ set(LIBUNWIND_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH - "Path where built libunwind runtime libraries should be installed.") endif() -diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt -index c3bb1dd0f69f..adf1766c44cb 100644 ---- a/include/CMakeLists.txt -+++ b/include/CMakeLists.txt -@@ -14,7 +14,7 @@ if(LIBUNWIND_INSTALL_HEADERS) - foreach(file ${files}) - get_filename_component(dir ${file} DIRECTORY) - install(FILES ${file} -- DESTINATION "include/${dir}" -+ DESTINATION "${LIBUNWIND_INSTALL_INCLUDE_DIR}/${dir}" - COMPONENT unwind-headers - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ - ) From a8e6921eb26185cff28c45e05e11f08c1364de35 Mon Sep 17 00:00:00 2001 From: cab Date: Sat, 28 May 2022 23:11:54 +0400 Subject: [PATCH 03/80] pkgs: added gcc10StdenvCompat Many packages got broken by gcc10 -> 11 switch. This makes overriding broken libraries a bit easier. (cherry picked from commit 8bdc1401a2a22602c182f698ecf22a42a3c0fcbf) --- pkgs/top-level/all-packages.nix | 37 ++++++++++++++++----------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0985675acd69..d988302eac2c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -989,7 +989,7 @@ with pkgs; arc_unpacker = callPackage ../tools/archivers/arc_unpacker { boost = boost16x; # checkPhase fails with Boost 1.77 - stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + stdenv = gcc10StdenvCompat; }; adminer = callPackage ../servers/adminer { }; @@ -2007,7 +2007,7 @@ with pkgs; bonnmotion = callPackage ../development/tools/misc/bonnmotion { }; bonnie = callPackage ../tools/filesystems/bonnie { - stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + stdenv = gcc10StdenvCompat; }; botamusique = callPackage ../tools/audio/botamusique { }; @@ -4947,7 +4947,7 @@ with pkgs; createrepo_c = callPackage ../tools/package-management/createrepo_c { }; cromfs = callPackage ../tools/archivers/cromfs { - stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + stdenv = gcc10StdenvCompat; }; cron = callPackage ../tools/system/cron { }; @@ -12543,6 +12543,8 @@ with pkgs; gcc11Stdenv = overrideCC gccStdenv buildPackages.gcc11; gcc12Stdenv = overrideCC gccStdenv buildPackages.gcc12; + gcc10StdenvCompat = if stdenv.cc.isGNU && lib.versions.major stdenv.cc.version == "11" then gcc10Stdenv else stdenv; + # This is not intended for use in nixpkgs but for providing a faster-running # compiler to nixpkgs users by building gcc with reproducibility-breaking # profile-guided optimizations @@ -14915,10 +14917,7 @@ with pkgs; buildJdk = jdk11_headless; buildJdkName = "java11"; runJdk = jdk11_headless; - stdenv = - if stdenv.cc.isClang then llvmPackages.stdenv - else if stdenv.cc.isGNU then gcc10Stdenv - else stdenv; + stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else gcc10StdenvCompat; bazel_self = bazel_4; }; @@ -16819,7 +16818,7 @@ with pkgs; classads = callPackage ../development/libraries/classads { }; clfft = callPackage ../development/libraries/clfft { - stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + stdenv = gcc10StdenvCompat; }; clipp = callPackage ../development/libraries/clipp { }; @@ -25849,7 +25848,7 @@ with pkgs; droopy = python3Packages.callPackage ../applications/networking/droopy { }; drumgizmo = callPackage ../applications/audio/drumgizmo { - stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + stdenv = gcc10StdenvCompat; }; dsf2flac = callPackage ../applications/audio/dsf2flac { }; @@ -31569,16 +31568,16 @@ with pkgs; cuyo = callPackage ../games/cuyo { }; deliantra-server = callPackage ../games/deliantra/server.nix { - stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + stdenv = gcc10StdenvCompat; }; deliantra-arch = callPackage ../games/deliantra/arch.nix { - stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + stdenv = gcc10StdenvCompat; }; deliantra-maps = callPackage ../games/deliantra/maps.nix { - stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + stdenv = gcc10StdenvCompat; }; deliantra-data = callPackage ../games/deliantra/data.nix { - stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + stdenv = gcc10StdenvCompat; }; ddnet = callPackage ../games/ddnet { }; @@ -32697,23 +32696,23 @@ with pkgs; }; bpp-core = callPackage ../development/libraries/science/biology/bpp-core { - stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + stdenv = gcc10StdenvCompat; }; bpp-phyl = callPackage ../development/libraries/science/biology/bpp-phyl { - stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + stdenv = gcc10StdenvCompat; }; bpp-popgen = callPackage ../development/libraries/science/biology/bpp-popgen { - stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + stdenv = gcc10StdenvCompat; }; bpp-seq = callPackage ../development/libraries/science/biology/bpp-seq { - stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + stdenv = gcc10StdenvCompat; }; bppsuite = callPackage ../applications/science/biology/bppsuite { - stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + stdenv = gcc10StdenvCompat; }; cd-hit = callPackage ../applications/science/biology/cd-hit { @@ -33190,7 +33189,7 @@ with pkgs; alt-ergo = callPackage ../applications/science/logic/alt-ergo {}; aspino = callPackage ../applications/science/logic/aspino { - stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + stdenv = gcc10StdenvCompat; }; beluga = callPackage ../applications/science/logic/beluga {}; From 7e1e22358feb0b88e98b9ad830ec2b80b9a9178d Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:18:37 +0400 Subject: [PATCH 04/80] clingcon: stdenv -> gcc10Stdenv (cherry picked from commit c6af26acfc7e15420c288dcc488a79afc816036d) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d988302eac2c..fc2e762cf816 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2992,7 +2992,7 @@ with pkgs; clingo = callPackage ../applications/science/logic/potassco/clingo.nix { }; - clingcon = callPackage ../applications/science/logic/potassco/clingcon.nix { }; + clingcon = callPackage ../applications/science/logic/potassco/clingcon.nix { stdenv = gcc10StdenvCompat; }; clprover = callPackage ../applications/science/logic/clprover/clprover.nix { }; From 8c1830e5d52cd99afdc2fb8dcd11419167a366d8 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:19:35 +0400 Subject: [PATCH 05/80] cxxtools: stdenv -> gcc10Stdenv (cherry picked from commit e46b811478874c17d6041ce70b1e7d00c5970ab4) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc2e762cf816..6a3796c5e324 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16924,7 +16924,7 @@ with pkgs; cutelyst = libsForQt5.callPackage ../development/libraries/cutelyst { }; - cxxtools = callPackage ../development/libraries/cxxtools { }; + cxxtools = callPackage ../development/libraries/cxxtools { stdenv = gcc10StdenvCompat; }; cwiid = callPackage ../development/libraries/cwiid { }; From 30d5e7ec3e472c7656f6d6cca129853ba6cff5ea Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:20:31 +0400 Subject: [PATCH 06/80] diopser: stdenv -> gcc10Stdenv (cherry picked from commit 30d46169971537ff99134bb758abc3d7156fc845) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a3796c5e324..f5cb9f709185 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2128,7 +2128,7 @@ with pkgs; dfmt = callPackage ../tools/text/dfmt { }; - diopser = callPackage ../applications/audio/diopser { }; + diopser = callPackage ../applications/audio/diopser { stdenv = gcc10StdenvCompat; }; diskonaut = callPackage ../tools/misc/diskonaut { }; From e8ba7bd1e43833ed2487d765ec1d081d9a2bea86 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:21:27 +0400 Subject: [PATCH 07/80] djv: stdenv -> gcc10Stdenv (cherry picked from commit a484f4f331e658b55776ad8577048c19be7427d5) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f5cb9f709185..09022d297970 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3319,7 +3319,7 @@ with pkgs; gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; }; }; - djv = callPackage ../applications/graphics/djv { }; + djv = callPackage ../applications/graphics/djv { stdenv = gcc10StdenvCompat; }; dnschef = python3Packages.callPackage ../tools/networking/dnschef { }; From 6453f10948064ffc49d6f42d3f00e222d9f36530 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:22:23 +0400 Subject: [PATCH 08/80] dl-poly-classic-mpi: stdenv -> gcc10Stdenv (cherry picked from commit 9882ffead490cfe93a6a41f22ebc01850b384073) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09022d297970..c5b4e17706db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33093,7 +33093,7 @@ with pkgs; ### SCIENCE/MOLECULAR-DYNAMICS - dl-poly-classic-mpi = callPackage ../applications/science/molecular-dynamics/dl-poly-classic { }; + dl-poly-classic-mpi = callPackage ../applications/science/molecular-dynamics/dl-poly-classic { stdenv = gcc10StdenvCompat; }; lammps = callPackage ../applications/science/molecular-dynamics/lammps { fftw = fftw; From 601a30a915c7cfe5d19684d9e1caf6834bc0299f Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:23:19 +0400 Subject: [PATCH 09/80] dxx-rebirth: stdenv -> gcc10Stdenv (cherry picked from commit fd26c9493b7b5312ed2db0925d3750e3ec72b7ed) --- pkgs/top-level/all-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c5b4e17706db..118f15cb7dd1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31600,9 +31600,8 @@ with pkgs; dwarf-therapist = dwarf-fortress-packages.dwarf-therapist; - dxx-rebirth = callPackage ../games/dxx-rebirth { - physfs = physfs_2; - }; + dxx-rebirth = callPackage ../games/dxx-rebirth + { stdenv = gcc10StdenvCompat; physfs = physfs_2; }; inherit (callPackages ../games/dxx-rebirth/assets.nix { }) descent1-assets From bda56985cf55261efb48f882a121d1e6f38be741 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:24:15 +0400 Subject: [PATCH 10/80] ericw-tools: stdenv -> gcc10Stdenv (cherry picked from commit 5b12d3a80728c018fa4d1fa5b858be8979e244b4) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 118f15cb7dd1..8b4a1eab3f46 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5598,7 +5598,7 @@ with pkgs; endlessh-go = callPackage ../servers/endlessh-go { }; - ericw-tools = callPackage ../applications/misc/ericw-tools { }; + ericw-tools = callPackage ../applications/misc/ericw-tools { stdenv = gcc10StdenvCompat; }; cryfs = callPackage ../tools/filesystems/cryfs { }; From aa365454d9fe39abff80b32961f8a84b5ca42411 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:25:11 +0400 Subject: [PATCH 11/80] fluxus: stdenv -> gcc10Stdenv (cherry picked from commit 5e081aeaa14f7fabc85f3adad8c941695a7b2770) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b4a1eab3f46..b60c79c549bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26170,7 +26170,7 @@ with pkgs; flrig = callPackage ../applications/radio/flrig { }; - fluxus = callPackage ../applications/graphics/fluxus { }; + fluxus = callPackage ../applications/graphics/fluxus { stdenv = gcc10StdenvCompat; }; flwrap = callPackage ../applications/radio/flwrap { }; From 8372726fc47bb05e6aafea12fada0c79b74c91e9 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:26:07 +0400 Subject: [PATCH 12/80] flwrap: stdenv -> gcc10Stdenv (cherry picked from commit 77aab56ca46e69328d0c261398ade4f344fb5af4) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b60c79c549bf..e1ec60e8b1e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26172,7 +26172,7 @@ with pkgs; fluxus = callPackage ../applications/graphics/fluxus { stdenv = gcc10StdenvCompat; }; - flwrap = callPackage ../applications/radio/flwrap { }; + flwrap = callPackage ../applications/radio/flwrap { stdenv = gcc10StdenvCompat; }; fluidsynth = callPackage ../applications/audio/fluidsynth { inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreMIDI CoreServices; From 45a55199cbb618c8b67008271b2c8530ad0458b9 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:27:03 +0400 Subject: [PATCH 13/80] gammy: stdenv -> gcc10Stdenv (cherry picked from commit 5d8e2a71f170fc73c834c05d188dfaae59e284e9) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e1ec60e8b1e3..58bfc152467f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2228,7 +2228,7 @@ with pkgs; gamecube-tools = callPackage ../development/tools/gamecube-tools { }; - gammy = qt5.callPackage ../tools/misc/gammy { }; + gammy = qt5.callPackage ../tools/misc/gammy { stdenv = gcc10StdenvCompat; }; gams = callPackage ../tools/misc/gams (config.gams or {}); From 7ae5a1bb8dcc98179fc33217d85682531ce42e41 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:27:58 +0400 Subject: [PATCH 14/80] gebaar-libinput: stdenv -> gcc10Stdenv (cherry picked from commit feb6162f839c511d633f8f7363d4a7dc61026888) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 58bfc152467f..db98c164db83 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4718,7 +4718,7 @@ with pkgs; evscript = callPackage ../tools/inputmethods/evscript { }; - gebaar-libinput = callPackage ../tools/inputmethods/gebaar-libinput { }; + gebaar-libinput = callPackage ../tools/inputmethods/gebaar-libinput { stdenv = gcc10StdenvCompat; }; kime = callPackage ../tools/inputmethods/kime { }; From cc657df8a8c67476dc7e0c4a28575008b1fb280e Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:28:53 +0400 Subject: [PATCH 15/80] getdp: stdenv -> gcc10Stdenv (cherry picked from commit 9f22d631ebe66f4c5daf0b48c1966211309117ff) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db98c164db83..9e2a5dd2b800 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32938,7 +32938,7 @@ with pkgs; flintqs = callPackage ../development/libraries/science/math/flintqs { }; - getdp = callPackage ../applications/science/math/getdp { }; + getdp = callPackage ../applications/science/math/getdp { stdenv = gcc10StdenvCompat; }; gurobi = callPackage ../applications/science/math/gurobi { }; From d16bf92b1d0de75cd92a0243edcf8f3b91c371d9 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:29:48 +0400 Subject: [PATCH 16/80] gosmore: stdenv -> gcc10Stdenv (cherry picked from commit 0e05668dc3bcae625e9b781cb519923bcd25175b) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e2a5dd2b800..7a8040f0c121 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26864,7 +26864,7 @@ with pkgs; inherit (gnome2) GConf; }; - gosmore = callPackage ../applications/misc/gosmore { }; + gosmore = callPackage ../applications/misc/gosmore { stdenv = gcc10StdenvCompat; }; gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { inherit (darwin) IOKit; From e1cff75832fd7cb609f93a1bef2af247fd02a345 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:30:48 +0400 Subject: [PATCH 17/80] gsmlib: stdenv -> gcc10Stdenv (cherry picked from commit 8dc4d7347789bf10e80ff200f898953b15554c50) --- pkgs/top-level/all-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a8040f0c121..31c2a84fd027 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6711,9 +6711,8 @@ with pkgs; gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { }; - gsmlib = callPackage ../development/libraries/gsmlib { - autoreconfHook = buildPackages.autoreconfHook269; - }; + gsmlib = callPackage ../development/libraries/gsmlib + { stdenv = gcc10StdenvCompat; autoreconfHook = buildPackages.autoreconfHook269; }; gssdp = callPackage ../development/libraries/gssdp { }; From 265e6817b4069a2cf39d57c6dd306c256d64e82b Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:32:42 +0400 Subject: [PATCH 18/80] hobbes: stdenv -> gcc10Stdenv (cherry picked from commit 591dc2fdd20604c260d4a83fdf46d238ff7c0e63) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31c2a84fd027..e28a3062ec69 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -386,7 +386,7 @@ with pkgs; gpick = callPackage ../tools/misc/gpick { }; - hobbes = callPackage ../development/tools/hobbes { }; + hobbes = callPackage ../development/tools/hobbes { stdenv = gcc10StdenvCompat; }; html5validator = python3Packages.callPackage ../applications/misc/html5validator { }; From d089be3ff44ef58593b7911f9ba746bc5f5f9151 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:33:38 +0400 Subject: [PATCH 19/80] idsk: stdenv -> gcc10Stdenv (cherry picked from commit 0590c39ffac4a76facd3c177c16c62677017e6f7) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e28a3062ec69..282488274508 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34030,7 +34030,7 @@ with pkgs; utsushi-networkscan = callPackage ../misc/drivers/utsushi/networkscan.nix { }; - idsk = callPackage ../tools/filesystems/idsk { }; + idsk = callPackage ../tools/filesystems/idsk { stdenv = gcc10StdenvCompat; }; colima = callPackage ../applications/virtualization/colima { }; From 22924a9f9666b07d216c62e6fee51270ee539e61 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:34:34 +0400 Subject: [PATCH 20/80] iqueue: stdenv -> gcc10Stdenv (cherry picked from commit daa692e42c78791505b2cb9f04df2721be490021) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 282488274508..ab7b92bfe6fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1616,7 +1616,7 @@ with pkgs; writefreely = callPackage ../applications/misc/writefreely { }; - iqueue = callPackage ../development/libraries/iqueue { }; + iqueue = callPackage ../development/libraries/iqueue { stdenv = gcc10StdenvCompat; }; lifecycled = callPackage ../tools/misc/lifecycled { }; From ea01390e5e0550703f2bc923c77a8fbff0092a22 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:35:29 +0400 Subject: [PATCH 21/80] isrcsubmit: stdenv -> gcc10Stdenv (cherry picked from commit fcb1fbf5fcfb9112f0d97e0522c7d7575c98a7d2) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab7b92bfe6fa..9e57e1c45d44 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7201,7 +7201,7 @@ with pkgs; boost = boost16x; }; - isrcsubmit = callPackage ../tools/audio/isrcsubmit { }; + isrcsubmit = callPackage ../tools/audio/isrcsubmit { stdenv = gcc10StdenvCompat; }; isync = callPackage ../tools/networking/isync { inherit (darwin.apple_sdk.frameworks) Security; From 753f6b396d6c0ba2daf80a3ccd1eb5ca4ed39688 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:36:24 +0400 Subject: [PATCH 22/80] jigdo: stdenv -> gcc10Stdenv (cherry picked from commit 872f42247b166b06bc163ab113fff475cf48e44a) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e57e1c45d44..17886fc6a908 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27441,7 +27441,7 @@ with pkgs; jgmenu = callPackage ../applications/misc/jgmenu { }; - jigdo = callPackage ../applications/misc/jigdo { }; + jigdo = callPackage ../applications/misc/jigdo { stdenv = gcc10StdenvCompat; }; jitsi = callPackage ../applications/networking/instant-messengers/jitsi { }; From 5aa020b0f576f5ff1bb2e828c799aca4b70a0604 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:37:27 +0400 Subject: [PATCH 23/80] libdynd: stdenv -> gcc10Stdenv (cherry picked from commit 14a2dec50d54bcd6db2c346098e5e2d7d94d5912) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 17886fc6a908..4832cec81e73 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21237,7 +21237,7 @@ with pkgs; zlib-ng = callPackage ../development/libraries/zlib-ng { }; - libdynd = callPackage ../development/libraries/libdynd { }; + libdynd = callPackage ../development/libraries/libdynd { stdenv = gcc10StdenvCompat; }; zlog = callPackage ../development/libraries/zlog { }; From e31c0bae347115ddbbe4a68c498be8475e0bd174 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:10:58 +0400 Subject: [PATCH 24/80] loki: stdenv -> gcc10Stdenv (cherry picked from commit e374625845656b36e7601c7fbf7eeee9c019696f) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4832cec81e73..d68b4c38e85d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8106,7 +8106,7 @@ with pkgs; lokalise2-cli = callPackage ../tools/misc/lokalise2-cli { }; - loki = callPackage ../development/libraries/loki { }; + loki = callPackage ../development/libraries/loki { stdenv = gcc10StdenvCompat; }; longview = callPackage ../servers/monitoring/longview { }; From 965e804eed3c3183d4329ac27f5bf1816ada27dd Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:11:48 +0400 Subject: [PATCH 25/80] mars: stdenv -> gcc10Stdenv (cherry picked from commit b31af490cdc25a70c431810c659c2c00b8dc364c) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d68b4c38e85d..b6241ed08d34 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31868,7 +31868,7 @@ with pkgs; manaplus = callPackage ../games/manaplus { }; - mars = callPackage ../games/mars { }; + mars = callPackage ../games/mars { stdenv = gcc10StdenvCompat; }; megaglest = callPackage ../games/megaglest { }; From 9709d9041f2b7b9f577bdac5928c3a5c6d68bf4c Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:12:39 +0400 Subject: [PATCH 26/80] miniaudicle: stdenv -> gcc10Stdenv (cherry picked from commit 43494af5eb40c7cde1e9aa99c0a74de05df0dcf0) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b6241ed08d34..f8cacdb203b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28058,7 +28058,7 @@ with pkgs; mikmod = callPackage ../applications/audio/mikmod { }; - miniaudicle = callPackage ../applications/audio/miniaudicle { }; + miniaudicle = callPackage ../applications/audio/miniaudicle { stdenv = gcc10StdenvCompat; }; minicom = callPackage ../tools/misc/minicom { }; From c5fc385bfacc4ec76552e8b68e9eb1140174382b Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:13:30 +0400 Subject: [PATCH 27/80] mitscheme: stdenv -> gcc10Stdenv (cherry picked from commit 7976cdf59e6ab91cbab01c8c560847ff19e3772d) --- pkgs/top-level/all-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f8cacdb203b8..c22413a99b02 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13478,9 +13478,8 @@ with pkgs; mint = callPackage ../development/compilers/mint { }; - mitscheme = callPackage ../development/compilers/mit-scheme { - texLive = texlive.combine { inherit (texlive) scheme-small epsf texinfo; }; - }; + mitscheme = callPackage ../development/compilers/mit-scheme + { stdenv = gcc10StdenvCompat; texLive = texlive.combine { inherit (texlive) scheme-small epsf texinfo; }; }; mitschemeX11 = mitscheme.override { enableX11 = true; From 2223fa4343aae36854c69b0598aca84b432163a9 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:14:20 +0400 Subject: [PATCH 28/80] mkcue: stdenv -> gcc10Stdenv (cherry picked from commit 33851c466f24548a12d90759fcbc3ab7138c4eb6) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c22413a99b02..718140e10a15 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8342,7 +8342,7 @@ with pkgs; mkclean = callPackage ../applications/video/mkclean {}; - mkcue = callPackage ../tools/cd-dvd/mkcue { }; + mkcue = callPackage ../tools/cd-dvd/mkcue { stdenv = gcc10StdenvCompat; }; mkp224o = callPackage ../tools/security/mkp224o { }; From 0fec5225b461532f6b95ca0c42ae5b0a014045c3 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:15:14 +0400 Subject: [PATCH 29/80] mps: stdenv -> gcc10Stdenv (cherry picked from commit c27f7b1b0088a7cfee9e3287bc3abcf6ebc04672) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 718140e10a15..0a95be0c65fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19626,7 +19626,7 @@ with pkgs; mosquitto = callPackage ../servers/mqtt/mosquitto { }; - mps = callPackage ../development/libraries/mps { }; + mps = callPackage ../development/libraries/mps { stdenv = gcc10StdenvCompat; }; libmpeg2 = callPackage ../development/libraries/libmpeg2 { }; From a0b805e42b5f9737dd7c9e4e3a32d00e9b323576 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:16:06 +0400 Subject: [PATCH 30/80] mrustc-bootstrap: stdenv -> gcc10Stdenv (cherry picked from commit 41e537a5851b4c9d707118172cb88b0ce1d095e1) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a95be0c65fa..a7d2313cfb73 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13670,7 +13670,7 @@ with pkgs; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; - mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { }; + mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { stdenv = gcc10StdenvCompat; }; rustPackages_1_60 = rust_1_60.packages.stable; rustPackages = rustPackages_1_60; From a3b5a1fe0b5446b41e70032125b6290ff967ad40 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:17:05 +0400 Subject: [PATCH 31/80] nano-wallet: stdenv -> gcc10Stdenv (cherry picked from commit 3eac0002ecaf7ff6964aae36e1148c084199f3c6) --- pkgs/top-level/all-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7d2313cfb73..dc6c6f2eee8e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31197,9 +31197,8 @@ with pkgs; napari = with python3Packages; toPythonApplication napari; - nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet { - boost = boost172; - }; + nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet + { stdenv = gcc10StdenvCompat; boost = boost172; }; namecoin = callPackage ../applications/blockchains/namecoin { withGui = true; }; namecoind = callPackage ../applications/blockchains/namecoin { withGui = false; }; From 413b850dbf8de658eac8c31e97bc084a5e41efd5 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:18:00 +0400 Subject: [PATCH 32/80] non: stdenv -> gcc10Stdenv (cherry picked from commit 15b44bab797525e200b4fbfc480e25dcb64636b5) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc6c6f2eee8e..683433800058 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19748,7 +19748,7 @@ with pkgs; nntp-proxy = callPackage ../applications/networking/nntp-proxy { }; - non = callPackage ../applications/audio/non { }; + non = callPackage ../applications/audio/non { stdenv = gcc10StdenvCompat; }; ntl = callPackage ../development/libraries/ntl { }; From dafe9b4eeea7570d13d6f03a2ce954f39a464025 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:18:52 +0400 Subject: [PATCH 33/80] obliv-c: stdenv -> gcc10Stdenv (cherry picked from commit 2be028e9433ebad3fd74ee2a19e13c02e7f870cb) --- pkgs/top-level/all-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 683433800058..3e0da114c6cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13556,9 +13556,8 @@ with pkgs; nvidia_cg_toolkit = callPackage ../development/compilers/nvidia-cg-toolkit { }; - obliv-c = callPackage ../development/compilers/obliv-c { - ocamlPackages = ocaml-ng.ocamlPackages_4_05; - }; + obliv-c = callPackage ../development/compilers/obliv-c + { stdenv = gcc10StdenvCompat; ocamlPackages = ocaml-ng.ocamlPackages_4_05; }; ocaml-ng = callPackage ./ocaml-packages.nix { }; ocaml = ocamlPackages.ocaml; From beb5d0c7f306418b020dc1b8bf56f499178cb068 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:19:42 +0400 Subject: [PATCH 34/80] olive-editor: stdenv -> gcc10Stdenv (cherry picked from commit 5ec76e1cd6d8b447b845e21025053e2e329c0612) --- pkgs/top-level/all-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e0da114c6cf..28c6ab9fcf58 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8896,9 +8896,8 @@ with pkgs; ola = callPackage ../applications/misc/ola { }; - olive-editor = libsForQt514.callPackage ../applications/video/olive-editor { - inherit (darwin.apple_sdk.frameworks) CoreFoundation; - }; + olive-editor = libsForQt514.callPackage ../applications/video/olive-editor + { stdenv = gcc10StdenvCompat; inherit (darwin.apple_sdk.frameworks) CoreFoundation; }; ombi = callPackage ../servers/ombi { }; From 7a073fa2a9d3656294297188748a44fb70330b95 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:20:37 +0400 Subject: [PATCH 35/80] openclonk: stdenv -> gcc10Stdenv (cherry picked from commit e86878e1b1b502e6ae73d91c615f5b87921edfa9) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 28c6ab9fcf58..8a06033be9fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31963,7 +31963,7 @@ with pkgs; openlierox = callPackage ../games/openlierox { }; - openclonk = callPackage ../games/openclonk { }; + openclonk = callPackage ../games/openclonk { stdenv = gcc10StdenvCompat; }; openjk = callPackage ../games/openjk { }; From cc0ea7710c9ac8d84574c7ce8b51ba703156c5d4 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:21:27 +0400 Subject: [PATCH 36/80] opendbx: stdenv -> gcc10Stdenv (cherry picked from commit 28bcbe1ac8341fec2f52e2d8e85b293af213bc33) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a06033be9fc..597fd69038b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8929,7 +8929,7 @@ with pkgs; opencryptoki = callPackage ../tools/security/opencryptoki { }; - opendbx = callPackage ../development/libraries/opendbx { }; + opendbx = callPackage ../development/libraries/opendbx { stdenv = gcc10StdenvCompat; }; opendht = callPackage ../development/libraries/opendht { inherit (darwin.apple_sdk.frameworks) Security; From fe01fa2cdba7a41a89b9b7d05c1fddd9e1ea201d Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:22:17 +0400 Subject: [PATCH 37/80] openvino: stdenv -> gcc10Stdenv (cherry picked from commit edd13b5528f280e8d49f1d6acc1b764a18f32d7d) --- pkgs/top-level/all-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 597fd69038b9..32c013cee0ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35133,9 +35133,8 @@ with pkgs; openring = callPackage ../applications/misc/openring { }; - openvino = callPackage ../development/libraries/openvino { - python = python3; - }; + openvino = callPackage ../development/libraries/openvino + { stdenv = gcc10StdenvCompat; python = python3; }; phonetisaurus = callPackage ../development/libraries/phonetisaurus { # https://github.com/AdolfVonKleist/Phonetisaurus/issues/70 From cac20787305c2d933890da67bd3e9c96e474f39d Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:23:07 +0400 Subject: [PATCH 38/80] oxen: stdenv -> gcc10Stdenv (cherry picked from commit 32e76212c5d3b08fafbd85cc4c1621f3e5997d90) --- pkgs/top-level/all-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32c013cee0ff..8b2bb33d160a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31187,9 +31187,8 @@ with pkgs; boost = boost17x; }; - oxen = callPackage ../applications/blockchains/oxen { - boost = boost17x; - }; + oxen = callPackage ../applications/blockchains/oxen + { stdenv = gcc10StdenvCompat; boost = boost17x; }; masari = callPackage ../applications/blockchains/masari { boost = boost165; }; From 2ea483c077cfc90f852026459fc6d693ca62b934 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:23:59 +0400 Subject: [PATCH 39/80] percona-server56: stdenv -> gcc10Stdenv (cherry picked from commit cbdb85b7431e42bd6cbbf7ade24595f586cb1354) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b2bb33d160a..b116b61d3d53 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22224,7 +22224,7 @@ with pkgs; nginx-sso = callPackage ../servers/nginx-sso { }; - percona-server56 = callPackage ../servers/sql/percona/5.6.x.nix { }; + percona-server56 = callPackage ../servers/sql/percona/5.6.x.nix { stdenv = gcc10StdenvCompat; }; percona-server = percona-server56; riak = callPackage ../servers/nosql/riak/2.2.0.nix { From b57aecc742d064b5f357ae2d5ec19bc7d92cabee Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:24:50 +0400 Subject: [PATCH 40/80] percona-xtrabackup_2_4: stdenv -> gcc10Stdenv (cherry picked from commit 5785f8321c360e2b287476a033950f3e758cfdc0) --- pkgs/top-level/all-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b116b61d3d53..0dc637091d6d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9195,9 +9195,8 @@ with pkgs; perceptualdiff = callPackage ../tools/graphics/perceptualdiff { }; percona-xtrabackup = percona-xtrabackup_8_0; - percona-xtrabackup_2_4 = callPackage ../tools/backup/percona-xtrabackup/2_4.nix { - boost = boost159; - }; + percona-xtrabackup_2_4 = callPackage ../tools/backup/percona-xtrabackup/2_4.nix + { stdenv = gcc10StdenvCompat; boost = boost159; }; percona-xtrabackup_8_0 = callPackage ../tools/backup/percona-xtrabackup/8_0.nix { boost = boost170; }; From 43dcb64aac213f33947edcedfe54c6025cac6891 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:25:39 +0400 Subject: [PATCH 41/80] percona-xtrabackup_8_0: stdenv -> gcc10Stdenv (cherry picked from commit 0655723b231e348eebd5f276daf0c9f787de419e) --- pkgs/top-level/all-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0dc637091d6d..ac5ba94262d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9197,9 +9197,8 @@ with pkgs; percona-xtrabackup = percona-xtrabackup_8_0; percona-xtrabackup_2_4 = callPackage ../tools/backup/percona-xtrabackup/2_4.nix { stdenv = gcc10StdenvCompat; boost = boost159; }; - percona-xtrabackup_8_0 = callPackage ../tools/backup/percona-xtrabackup/8_0.nix { - boost = boost170; - }; + percona-xtrabackup_8_0 = callPackage ../tools/backup/percona-xtrabackup/8_0.nix + { stdenv = gcc10StdenvCompat; boost = boost170; }; pick = callPackage ../tools/misc/pick { }; From de90857f390e7f06a5d7f5d17049edab0f98eaf9 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:26:32 +0400 Subject: [PATCH 42/80] pianobooster: stdenv -> gcc10Stdenv (cherry picked from commit 533171bfff38d4d3bf6b5cbb1808441d6802f4ea) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac5ba94262d1..c8d1a82829ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28895,7 +28895,7 @@ with pkgs; pianobar = callPackage ../applications/audio/pianobar { }; - pianobooster = qt5.callPackage ../applications/audio/pianobooster { }; + pianobooster = qt5.callPackage ../applications/audio/pianobooster { stdenv = gcc10StdenvCompat; }; pianoteq = callPackage ../applications/audio/pianoteq { }; From 71f9a7eba3531ba760bab956a3f0e82f22016ffd Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:27:23 +0400 Subject: [PATCH 43/80] pktgen: stdenv -> gcc10Stdenv (cherry picked from commit 8297eeacdacbfe51a757b758da2d2e86cac52380) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c8d1a82829ce..9dab3e3d1fb0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23588,7 +23588,7 @@ with pkgs; pipework = callPackage ../os-specific/linux/pipework { }; - pktgen = callPackage ../os-specific/linux/pktgen { }; + pktgen = callPackage ../os-specific/linux/pktgen { stdenv = gcc10StdenvCompat; }; plymouth = callPackage ../os-specific/linux/plymouth { }; From fe705dabd038fbf4b7e93faf182fb7e49017de01 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:46:16 +0400 Subject: [PATCH 44/80] rss-glx: stdenv -> gcc10Stdenv (cherry picked from commit 91ef8a2d4e980be9bb4b6d2598b985fadb951655) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9dab3e3d1fb0..05a82fc47f2c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34487,7 +34487,7 @@ with pkgs; stdenv = gccStdenv; }; - rss-glx = callPackage ../misc/screensavers/rss-glx { }; + rss-glx = callPackage ../misc/screensavers/rss-glx { stdenv = gcc10StdenvCompat; }; run-scaled = callPackage ../tools/X11/run-scaled { }; From d2dd6aa729b03435131e422f5126800972f4e047 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:47:07 +0400 Subject: [PATCH 45/80] sonic-lineup: stdenv -> gcc10Stdenv (cherry picked from commit b9af2b5afded6f97f1c77e988fd759337e6935b0) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05a82fc47f2c..4d6a6b8064fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29644,7 +29644,7 @@ with pkgs; socialscan = with python3.pkgs; toPythonApplication socialscan; - sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { }; + sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { stdenv = gcc10StdenvCompat; }; sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser { }; From 3df111400d18224dd901899678e3142780308e0a Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:47:58 +0400 Subject: [PATCH 46/80] spring: stdenv -> gcc10Stdenv (cherry picked from commit c526e73ea2e2b985a7d6a6f24f59fe1ebfd95223) --- pkgs/top-level/all-packages.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d6a6b8064fd..2451a0606c95 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32189,10 +32189,8 @@ with pkgs; # You still can override by passing more arguments. space-orbit = callPackage ../games/space-orbit { }; - spring = callPackage ../games/spring { - asciidoc = asciidoc-full; - boost = boost155; - }; + spring = callPackage ../games/spring + { stdenv = gcc10StdenvCompat; asciidoc = asciidoc-full; boost = boost155; }; springLobby = callPackage ../games/spring/springlobby.nix { }; From e57538106c7b662ef557cf76ca5f3e94f418605a Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:48:49 +0400 Subject: [PATCH 47/80] strelka: stdenv -> gcc10Stdenv (cherry picked from commit 38a3766228d556e4effa03b12a4cefe07ea0eb50) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2451a0606c95..ed6803a8a036 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32859,7 +32859,7 @@ with pkgs; star = callPackage ../applications/science/biology/star { }; - strelka = callPackage ../applications/science/biology/strelka { }; + strelka = callPackage ../applications/science/biology/strelka { stdenv = gcc10StdenvCompat; }; inherit (callPackages ../applications/science/biology/sumatools {}) sumalibs From 472eb16a5dfd98181c4f3a2c50e1a5a3852e7fde Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:49:40 +0400 Subject: [PATCH 48/80] stuntrally: stdenv -> gcc10Stdenv (cherry picked from commit 70e3e0d8392e72d58418bbe987bc9797b2207bde) --- pkgs/top-level/all-packages.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed6803a8a036..2cec5b135000 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32230,12 +32230,8 @@ with pkgs; stt = callPackage ../tools/audio/stt { }; - stuntrally = callPackage ../games/stuntrally { - ogre = ogre1_9; - mygui = mygui.override { - withOgre = true; - }; - }; + stuntrally = callPackage ../games/stuntrally + { stdenv = gcc10StdenvCompat; ogre = ogre1_9; mygui = mygui.override { withOgre = true; }; }; superTux = callPackage ../games/supertux { }; From 39e4f16c13aac741f8ae93db208218078b9b3f63 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:50:31 +0400 Subject: [PATCH 49/80] swfmill: stdenv -> gcc10Stdenv (cherry picked from commit 8c379ef34fd7e9cf64377f0b0a89ad2fee25dd6a) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2cec5b135000..0be866be9b86 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16266,7 +16266,7 @@ with pkgs; c3c = callPackage ../development/compilers/c3c { }; - swfmill = callPackage ../tools/video/swfmill { }; + swfmill = callPackage ../tools/video/swfmill { stdenv = gcc10StdenvCompat; }; swftools = callPackage ../tools/video/swftools { stdenv = gccStdenv; From 05f528f3cd78160a26599bf7de4503a004a9e622 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:51:21 +0400 Subject: [PATCH 50/80] swiftshader: stdenv -> gcc10Stdenv (cherry picked from commit fe9163bac70fced8dd9a8c94789229630e3b684c) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0be866be9b86..216dafbd8bb3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16251,7 +16251,7 @@ with pkgs; symfony-cli = callPackage ../development/tools/symfony-cli { }; - swiftshader = callPackage ../development/libraries/swiftshader { }; + swiftshader = callPackage ../development/libraries/swiftshader { stdenv = gcc10StdenvCompat; }; systemfd = callPackage ../development/tools/systemfd { }; From ef7790a21811c496c9b19d90615e803699f29ef8 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:52:20 +0400 Subject: [PATCH 51/80] textadept11: stdenv -> gcc10Stdenv (cherry picked from commit 7bd4ef283545b3c7a9c190be3bb797ec1f46ee52) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 216dafbd8bb3..ad89ac97f0aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10818,7 +10818,7 @@ with pkgs; textadept = callPackage ../applications/editors/textadept/10 { }; - textadept11 = callPackage ../applications/editors/textadept/11 { }; + textadept11 = callPackage ../applications/editors/textadept/11 { stdenv = gcc10StdenvCompat; }; texworks = libsForQt5.callPackage ../applications/editors/texworks { }; From b4c8a1cf107137ea1a0c2ebcd53d1c1c4c4eada7 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:53:11 +0400 Subject: [PATCH 52/80] tiscamera: stdenv -> gcc10Stdenv (cherry picked from commit bb1a8a87a6f430d26462cdce1bdd72779b217f36) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad89ac97f0aa..024ea831a2bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20851,7 +20851,7 @@ with pkgs; tinyxml-2 = callPackage ../development/libraries/tinyxml-2 { }; - tiscamera = callPackage ../os-specific/linux/tiscamera { }; + tiscamera = callPackage ../os-specific/linux/tiscamera { stdenv = gcc10StdenvCompat; }; tivodecode = callPackage ../applications/video/tivodecode { }; From bea0a97588bb081709593bd89352df890951c1c6 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:54:03 +0400 Subject: [PATCH 53/80] tracebox: stdenv -> gcc10Stdenv (cherry picked from commit 17cca50520f19e793ff1a9cb962193c21f4d277b) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 024ea831a2bd..01c4620cdba4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11010,7 +11010,7 @@ with pkgs; traceroute = callPackage ../tools/networking/traceroute { }; - tracebox = callPackage ../tools/networking/tracebox { }; + tracebox = callPackage ../tools/networking/tracebox { stdenv = gcc10StdenvCompat; }; tracee = callPackage ../tools/security/tracee { }; From 05cd94742d696dbddbbe18087af3e0ab3627ff68 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:54:53 +0400 Subject: [PATCH 54/80] ucg: stdenv -> gcc10Stdenv (cherry picked from commit 101927cc4608314b9d1f9af465d9ac0a78b2246e) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01c4620cdba4..46e60711da6f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6630,7 +6630,7 @@ with pkgs; robodoc = callPackage ../tools/text/robodoc { }; - ucg = callPackage ../tools/text/ucg { }; + ucg = callPackage ../tools/text/ucg { stdenv = gcc10StdenvCompat; }; grive2 = callPackage ../tools/filesystems/grive2 { }; From 50f6f6a65873297284689456c8cec22b52ed9f76 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:55:44 +0400 Subject: [PATCH 55/80] uri: stdenv -> gcc10Stdenv (cherry picked from commit 4281581f32b5c8133532e5640607571241b57da9) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 46e60711da6f..35124a10cfa9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16888,7 +16888,7 @@ with pkgs; uci = callPackage ../development/libraries/uci { }; - uri = callPackage ../development/libraries/uri { }; + uri = callPackage ../development/libraries/uri { stdenv = gcc10StdenvCompat; }; cppcms = callPackage ../development/libraries/cppcms { }; From a144ddf99174e4ad248acf4c0e86058af3b26b05 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:56:35 +0400 Subject: [PATCH 56/80] webrtc-audio-processing_1: stdenv -> gcc10Stdenv (cherry picked from commit 1affead2e664e4e98ee2fd8eaa4dcf7e516ed6f8) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35124a10cfa9..a6131dbf5799 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21062,7 +21062,7 @@ with pkgs; websocketpp = callPackage ../development/libraries/websocket++ { }; - webrtc-audio-processing_1 = callPackage ../development/libraries/webrtc-audio-processing { }; + webrtc-audio-processing_1 = callPackage ../development/libraries/webrtc-audio-processing { stdenv = gcc10StdenvCompat; }; webrtc-audio-processing_0_3 = callPackage ../development/libraries/webrtc-audio-processing/0.3.nix { }; # bump when majoring of packages have updated webrtc-audio-processing = webrtc-audio-processing_0_3; From 1f5020ad4132e63960890916786d7bf474e733d0 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:57:26 +0400 Subject: [PATCH 57/80] wxcam: stdenv -> gcc10Stdenv (cherry picked from commit 1461ead834295d5d49e0d29473ee8dfe8fbc29c9) --- pkgs/top-level/all-packages.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a6131dbf5799..ffc511cc9d9a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30599,11 +30599,8 @@ with pkgs; wxGTK = wxGTK31; }; - wxcam = callPackage ../applications/video/wxcam { - inherit (gnome2) libglade; - wxGTK = wxGTK28; - gtk = gtk2; - }; + wxcam = callPackage ../applications/video/wxcam + { stdenv = gcc10StdenvCompat; inherit (gnome2) libglade; wxGTK = wxGTK28; gtk = gtk2; }; xa = callPackage ../development/compilers/xa/xa.nix { }; dxa = callPackage ../development/compilers/xa/dxa.nix { }; From fbbba9d932cc38cb793513c7494e94b2e3c7d7ee Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:58:17 +0400 Subject: [PATCH 58/80] xc3sprog: stdenv -> gcc10Stdenv (cherry picked from commit a5739070a074aaca5177ef3392e3f421300dc544) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ffc511cc9d9a..a6de8784eea3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16415,7 +16415,7 @@ with pkgs; webdis = callPackage ../development/tools/database/webdis { }; - xc3sprog = callPackage ../development/embedded/xc3sprog { }; + xc3sprog = callPackage ../development/embedded/xc3sprog { stdenv = gcc10StdenvCompat; }; xcb-imdkit = callPackage ../development/libraries/xcb-imdkit { }; From bf55b6e57dbc97c1e8de4ac34f3c8dcaf58a40cb Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 19:03:21 +0400 Subject: [PATCH 59/80] xqilla: stdenv -> gcc10Stdenv (cherry picked from commit da31172e101780456194a922e6304afb4251f1bb) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a6de8784eea3..63b9293d1754 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22684,7 +22684,7 @@ with pkgs; zookeeper_mt = callPackage ../development/libraries/zookeeper_mt { }; - xqilla = callPackage ../development/tools/xqilla { }; + xqilla = callPackage ../development/tools/xqilla { stdenv = gcc10StdenvCompat; }; xquartz = callPackage ../servers/x11/xquartz { }; From e2bb4ac359ff75d11e886b0ae752fc3c30539edb Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 19:04:13 +0400 Subject: [PATCH 60/80] yafaray-core: stdenv -> gcc10Stdenv (cherry picked from commit 8a6dbc8b7d4ea08956e651b02a824520fda7aed2) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63b9293d1754..951b860cfd7c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11862,7 +11862,7 @@ with pkgs; xwinwrap = callPackage ../tools/X11/xwinwrap {}; - yafaray-core = callPackage ../tools/graphics/yafaray-core { }; + yafaray-core = callPackage ../tools/graphics/yafaray-core { stdenv = gcc10StdenvCompat; }; yajsv = callPackage ../tools/misc/yajsv { }; From 523e6da72955ef843108c2db1b703fb7609556da Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 6 Jun 2022 18:06:38 +0300 Subject: [PATCH 61/80] pipewire: create home directory for the pipewire user when running systemwide wireplumber wants to store state there (cherry picked from commit 955d1a6dde9862822fbb0f2d6be9bfa51fdbc689) --- nixos/modules/services/desktops/pipewire/pipewire.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/desktops/pipewire/pipewire.nix b/nixos/modules/services/desktops/pipewire/pipewire.nix index 1323336d866e..7aac1c96fecb 100644 --- a/nixos/modules/services/desktops/pipewire/pipewire.nix +++ b/nixos/modules/services/desktops/pipewire/pipewire.nix @@ -251,6 +251,8 @@ in { ] ++ lib.optional config.security.rtkit.enable "rtkit"; description = "Pipewire system service user"; isSystemUser = true; + home = "/var/lib/pipewire"; + createHome = true; }; groups.pipewire.gid = config.ids.gids.pipewire; }; From 89f6d209ad3648ab21272edc0ce23666cef47814 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 10 Jun 2022 12:19:52 +0800 Subject: [PATCH 62/80] pantheon.elementary-videos: 2.8.3 -> 2.8.4 (cherry picked from commit 22e8068097cf022d8f2d212d3f8b2a7ebfb6c035) --- pkgs/desktops/pantheon/apps/elementary-videos/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index d4c03a076579..9059338da479 100644 --- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -7,7 +7,6 @@ , ninja , vala , python3 -, desktop-file-utils , gtk3 , granite , libgee @@ -20,17 +19,16 @@ stdenv.mkDerivation rec { pname = "elementary-videos"; - version = "2.8.3"; + version = "2.8.4"; src = fetchFromGitHub { owner = "elementary"; repo = "videos"; rev = version; - sha256 = "sha256-3V8iDy68ngdFTJxAGimuGi4vPru32pHYevThA0RwNpE="; + sha256 = "sha256-IUIY/WgGPVRYk9O+ZocopoBF7TlLnTtScNwO6gDCALw="; }; nativeBuildInputs = [ - desktop-file-utils meson ninja pkg-config From 9bb49b913ef3d25eae3ab0912e55ef6edafb5254 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 10 Jun 2022 12:23:02 +0800 Subject: [PATCH 63/80] pantheon.elementary-notifications: 6.0.1 -> 6.0.2 (cherry picked from commit 6667e3670fcbdc5f4c8a5b29601f48035f922e67) --- .../pantheon/services/elementary-notifications/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix index 4cea8b0894d2..afde58c5f509 100644 --- a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "elementary-notifications"; - version = "6.0.1"; + version = "6.0.2"; src = fetchFromGitHub { owner = "elementary"; repo = "notifications"; rev = version; - sha256 = "sha256-AEcZVQPAQLa202/Yvq0GihY8BfMEH46iXeQ5u3QvuXg="; + sha256 = "sha256-kM//T3P8gMGnCMDJ1caQQGgD6HBOQo0wp2wZGMUUPuU="; }; nativeBuildInputs = [ From 953f40a8b988c2cafa1697911bc8a58aef9a9118 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Mon, 6 Jun 2022 12:07:36 -0300 Subject: [PATCH 64/80] xdgmenumaker: format nix expression (cherry picked from commit 7eff2eb4226e4a633c88428aeff602de6eebdb6e) --- pkgs/applications/misc/xdgmenumaker/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xdgmenumaker/default.nix b/pkgs/applications/misc/xdgmenumaker/default.nix index 00ae2df100e3..12b8b2c67019 100644 --- a/pkgs/applications/misc/xdgmenumaker/default.nix +++ b/pkgs/applications/misc/xdgmenumaker/default.nix @@ -1,4 +1,11 @@ -{ lib, fetchFromGitHub, txt2tags, python3Packages, glib, gobject-introspection, wrapGAppsHook }: +{ lib +, fetchFromGitHub +, glib +, gobject-introspection +, python3Packages +, txt2tags +, wrapGAppsHook +}: python3Packages.buildPythonApplication rec { pname = "xdgmenumaker"; @@ -26,8 +33,8 @@ python3Packages.buildPythonApplication rec { ]; pythonPath = with python3Packages; [ - pyxdg pygobject3 + pyxdg ]; makeFlags = [ From 25fb133142c2950d20b3521032d525fba62ab41e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Mon, 6 Jun 2022 12:09:07 -0300 Subject: [PATCH 65/80] xdgmenumaker: add update script (cherry picked from commit 7be84e3f24f2106c9b68cfbd5369eead96c00258) --- pkgs/applications/misc/xdgmenumaker/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/misc/xdgmenumaker/default.nix b/pkgs/applications/misc/xdgmenumaker/default.nix index 12b8b2c67019..5e2b4685e7b1 100644 --- a/pkgs/applications/misc/xdgmenumaker/default.nix +++ b/pkgs/applications/misc/xdgmenumaker/default.nix @@ -5,6 +5,7 @@ , python3Packages , txt2tags , wrapGAppsHook +, gitUpdater }: python3Packages.buildPythonApplication rec { @@ -45,6 +46,8 @@ python3Packages.buildPythonApplication rec { "DESTDIR=" ]; + passthru.updateScript = gitUpdater {inherit pname version; }; + meta = with lib; { description = "Command line tool that generates XDG menus for several window managers"; homepage = "https://github.com/gapan/xdgmenumaker"; From 7844ff53b9f924536cdbeb6238d5fb7c8b4e8c42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Mon, 6 Jun 2022 12:26:06 -0300 Subject: [PATCH 66/80] xdgmenumaker: fix license (cherry picked from commit a8ffe753a8fc367d6a0a1067902b25571b4ff2d8) --- pkgs/applications/misc/xdgmenumaker/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/xdgmenumaker/default.nix b/pkgs/applications/misc/xdgmenumaker/default.nix index 5e2b4685e7b1..5fa3180f43e6 100644 --- a/pkgs/applications/misc/xdgmenumaker/default.nix +++ b/pkgs/applications/misc/xdgmenumaker/default.nix @@ -51,7 +51,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Command line tool that generates XDG menus for several window managers"; homepage = "https://github.com/gapan/xdgmenumaker"; - license = licenses.gpl2Plus; + license = licenses.gpl3Plus; # NOTE: exclude darwin from platforms because Travis reports hash mismatch platforms = with platforms; filter (x: !(elem x darwin)) unix; maintainers = [ maintainers.romildo ]; From 1a657e328f56f210f7ed5c780e20d970c6b0eefc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Mon, 6 Jun 2022 12:45:07 -0300 Subject: [PATCH 67/80] xdgmenumaker: avoid double wrapping (cherry picked from commit 8a24a370c348441b0c181ed89050fd31b8ed606d) --- pkgs/applications/misc/xdgmenumaker/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/misc/xdgmenumaker/default.nix b/pkgs/applications/misc/xdgmenumaker/default.nix index 5fa3180f43e6..2028ca1c78e8 100644 --- a/pkgs/applications/misc/xdgmenumaker/default.nix +++ b/pkgs/applications/misc/xdgmenumaker/default.nix @@ -23,6 +23,8 @@ python3Packages.buildPythonApplication rec { strictDeps = false; + dontWrapGApps = true; + nativeBuildInputs = [ gobject-introspection txt2tags @@ -46,6 +48,10 @@ python3Packages.buildPythonApplication rec { "DESTDIR=" ]; + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + passthru.updateScript = gitUpdater {inherit pname version; }; meta = with lib; { From fff47df0474ac3f22db749aa83abf99a81e86414 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Mon, 6 Jun 2022 12:26:42 -0300 Subject: [PATCH 68/80] xdgmenumaker: 1.5 -> 1.6 (cherry picked from commit 2a4b80a24d79cdfb0ad12986f5f0b7c18bd650b7) --- pkgs/applications/misc/xdgmenumaker/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/xdgmenumaker/default.nix b/pkgs/applications/misc/xdgmenumaker/default.nix index 2028ca1c78e8..357fa7f59648 100644 --- a/pkgs/applications/misc/xdgmenumaker/default.nix +++ b/pkgs/applications/misc/xdgmenumaker/default.nix @@ -1,7 +1,9 @@ { lib , fetchFromGitHub -, glib +, atk +, gdk-pixbuf , gobject-introspection +, pango , python3Packages , txt2tags , wrapGAppsHook @@ -10,13 +12,13 @@ python3Packages.buildPythonApplication rec { pname = "xdgmenumaker"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "gapan"; repo = pname; rev = version; - sha256 = "1vrsp5c1ah7p4dpwd6aqvinpwzd8crdimvyyr3lbm3c6cwpyjmif"; + sha256 = "Q38m8YrvkkTCY2dByvPj+Ee1DMSUbWvwSDI0kW182bU="; }; format = "other"; @@ -32,7 +34,9 @@ python3Packages.buildPythonApplication rec { ]; buildInputs = [ - glib + atk + gdk-pixbuf + pango ]; pythonPath = with python3Packages; [ @@ -44,10 +48,6 @@ python3Packages.buildPythonApplication rec { "PREFIX=${placeholder "out"}" ]; - installFlags = [ - "DESTDIR=" - ]; - preFixup = '' makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; From bb1d18e2e3736d4891a4af040feb3652d8f66fb9 Mon Sep 17 00:00:00 2001 From: nixpkgs-upkeep-bot Date: Fri, 10 Jun 2022 00:52:12 +0000 Subject: [PATCH 69/80] vscode: 1.67.2 -> 1.68.0 (cherry picked from commit df118d7a7a3fbe365673be84d54bf400c6dbb3a9) --- pkgs/applications/editors/vscode/vscode.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 3f4555430a68..912af05e6d3e 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -14,17 +14,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0yahcv64jblmz5q0ylgg1sghcnyam4nq47var3y18ndjpaqyb1fl"; - x86_64-darwin = "0zsizwrhc0na9dfics27i48q4x3kz0qq5m2vdjvrgi69y2iy5z4c"; - aarch64-linux = "01wpi9pdf1fjxfx8w5g5da31q561qw7ykjm9spb3arvnivq20dp2"; - aarch64-darwin = "0qk22jyn0vypsx8x4cmpab5wrmhqx6hdkm314k8k06mz5cg1v4r3"; - armv7l-linux = "04r0x31flahzw8y0kkbzqnvcwllifaa0ysr163bb5b8kiyc189kk"; + x86_64-linux = "1kvb92ygsvzi06nqwd6d9dlqbz44dxcjm0iq1rvvxnr7x33l8218"; + x86_64-darwin = "0jz0nik6wkqhgmfnhiwsq510hxbc9jw0z7s84154p2lhwcmpsbjp"; + aarch64-linux = "16jzpzxxmcq690d3w0ph0cnzhpyvjpk8ih48pyzzf25bgp94yi33"; + aarch64-darwin = "00xw4xml4zijpqj8305gdgn15shllpkv9ld1yh1aqrz11v522w3h"; + armv7l-linux = "0fzzdh9gkw51djrdwhzi3fbjxkm2l78v72gc0233xm8riq0gczsv"; }.${system}; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.67.2"; + version = "1.68.0"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; From 5278d3fa91c273deb76509bb3b09c4921fb4c141 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 Jun 2022 16:08:47 +0200 Subject: [PATCH 70/80] apacheHttpd: 2.4.53 -> 2.4.54 https://downloads.apache.org/httpd/CHANGES_2.4.54 Fixes: CVE-2022-31813, CVE-2022-30556, CVE-2022-30522, CVE-2022-29404, CVE-2022-28615, CVE-2022-28614, CVE-2022-28330, CVE-2022-26377 (cherry picked from commit 35c7173cf5392522d632cb6469298e1e73360929) --- pkgs/servers/http/apache-httpd/2.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index d72dcb9170b5..72ad91d017e1 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "apache-httpd"; - version = "2.4.53"; + version = "2.4.54"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "sha256-0LvREhpXtfKm/5LXuW+AUMWkXT8U2xGPZJedUlhY22M="; + sha256 = "sha256-6zl/7u/MryVPjUXeN2jZ1o6Oc4UcSa/VtxdtHs+Aw0A="; }; # FIXME: -dev depends on -doc From 676f2db2aed31970f02269f7d923cc9f2516dcb3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 9 Jun 2022 18:49:25 +0000 Subject: [PATCH 71/80] =?UTF-8?q?amtk:=205.4.0=20=E2=86=92=205.4.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/World/amtk/-/compare/5.4.0...5.4.1 (cherry picked from commit 273f87e5a1a817a568b40f9661cb395b7038928c) --- pkgs/development/libraries/amtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix index 961c63a3037f..30a16cb48df0 100644 --- a/pkgs/development/libraries/amtk/default.nix +++ b/pkgs/development/libraries/amtk/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "amtk"; - version = "5.4.0"; + version = "5.4.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "g10IUHo96sie91NRzOu0szWv/qNhuIvQ+mZ/QM53enA="; + sha256 = "frq8QpsO67KzI2DJv9vjaOSJs1w83AhqhWz8mzpGanI="; }; nativeBuildInputs = [ From f636c554f7ba3c5d4f0303c851b620a5791e8aa8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 9 Jun 2022 18:50:05 +0000 Subject: [PATCH 72/80] =?UTF-8?q?gnome.gnome-bluetooth:=2042.0=20=E2=86=92?= =?UTF-8?q?=2042.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-bluetooth/-/compare/42.0...42.1 (cherry picked from commit d87676e33e2f596cb89356969747665f01596e65) --- pkgs/desktops/gnome/core/gnome-bluetooth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix index 7d8fc2bc8674..678790217808 100644 --- a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix @@ -26,14 +26,14 @@ stdenv.mkDerivation rec { pname = "gnome-bluetooth"; - version = "42.0"; + version = "42.1"; # TODO: split out "lib" outputs = [ "out" "dev" "devdoc" "man" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "PR4nIGc7yaJCYZ3F0jH9bndsGKSdop9DzcQzBVrbAXA="; + sha256 = "2f5dZz8npAqGqeI9k8uZNn57Bt9Rhy6KxezJk45Vtes="; }; nativeBuildInputs = [ From aecbc57d044d7f73968bcb57d83e226cef715ce1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 9 Jun 2022 18:51:01 +0000 Subject: [PATCH 73/80] =?UTF-8?q?gnome-desktop:=2042.1=20=E2=86=92=2042.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-desktop/-/compare/42.1...42.2 (cherry picked from commit 4553fcbd6e69f156d8fdcfa85026d1138cafc114) --- pkgs/development/libraries/gnome-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gnome-desktop/default.nix b/pkgs/development/libraries/gnome-desktop/default.nix index 49f21fa54041..32f491c97cec 100644 --- a/pkgs/development/libraries/gnome-desktop/default.nix +++ b/pkgs/development/libraries/gnome-desktop/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "gnome-desktop"; - version = "42.1"; + version = "42.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-JDOrYG0kTDUk3luBIJTbimcPsR7Z/3GAwtAhrh/J/AU="; + sha256 = "sha256-9CsU6sjRRWwr/B+8l+9q/knI3W9XeW6P1f6zkzHtVb0="; }; patches = [ From 051509aa6397b61792ea4374407502b86a823168 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 9 Jun 2022 18:51:29 +0000 Subject: [PATCH 74/80] =?UTF-8?q?gupnp-av:=200.14.0=20=E2=86=92=200.14.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gupnp-av/-/compare/gupnp-av-0.14.0...gupnp-av-0.14.1 (cherry picked from commit 2746ab80ca76741f8af15a4327f30a74aab83c4d) --- pkgs/development/libraries/gupnp-av/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/development/libraries/gupnp-av/default.nix index 52baba6bfa58..0ef4ac9a0192 100644 --- a/pkgs/development/libraries/gupnp-av/default.nix +++ b/pkgs/development/libraries/gupnp-av/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "gupnp-av"; - version = "0.14.0"; + version = "0.14.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "IK7VRvyILnij8YagyLzlyEHMOkS36lKCmPvcgllvsVY="; + sha256 = "t5zgzEsMZtnFS8Ihg6EOVwmgAR0q8nICWUjvyrM6Pk8="; }; nativeBuildInputs = [ From 0b68ef5982238562b67dff5f32edab1e05a01126 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 9 Jun 2022 18:52:13 +0000 Subject: [PATCH 75/80] =?UTF-8?q?networkmanagerapplet:=201.26.0=20?= =?UTF-8?q?=E2=86=92=201.28.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/network-manager-applet/-/compare/1.26.0...1.28.0 (cherry picked from commit 5b6038016ee14d158006ec2f91a27a10850f41c5) --- pkgs/tools/networking/networkmanager/applet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/applet/default.nix b/pkgs/tools/networking/networkmanager/applet/default.nix index cca96577ad4c..0cdd01247653 100644 --- a/pkgs/tools/networking/networkmanager/applet/default.nix +++ b/pkgs/tools/networking/networkmanager/applet/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "network-manager-applet"; - version = "1.26.0"; + version = "1.28.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-aWEbKQZK29Vzlf4+Uanr3h6nlGFfd2kARTorvj2M3f0="; + sha256 = "sha256-XANIWB3p5hkYWqdLdH8H9AMSQX45Wv4LKTzJVd8U5Jw="; }; mesonFlags = [ From 35043a0e5b64013d728a0eb7cf6553b8c7e5a62c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 9 Jun 2022 18:52:20 +0000 Subject: [PATCH 76/80] =?UTF-8?q?tepl:=206.0.1=20=E2=86=92=206.0.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/swilmet/tepl/-/compare/6.0.1...6.0.2 (cherry picked from commit d38eed08f08dd2372e7a577e89deca917668fb6b) --- pkgs/development/libraries/tepl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tepl/default.nix b/pkgs/development/libraries/tepl/default.nix index a10ad67b23d9..e7918ea56e29 100644 --- a/pkgs/development/libraries/tepl/default.nix +++ b/pkgs/development/libraries/tepl/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "tepl"; - version = "6.0.1"; + version = "6.0.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "J08Fa75V8wpq5EQq0i8VfQTTphtWjZC8hRF7txMgIME="; + sha256 = "W0qcbGG9AAVT75eZ9MpiXQX1gBA2+ywvkopJRIyQPAk="; }; nativeBuildInputs = [ From d810838cae7f88e9b5e65fbf9795552b881a987f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 9 Jun 2022 18:52:24 +0000 Subject: [PATCH 77/80] =?UTF-8?q?tracker-miners:=203.3.0=20=E2=86=92=203.3?= =?UTF-8?q?.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/tracker-miners/-/compare/3.3.0...3.3.1 (cherry picked from commit 3f896ec0592a26df81502afabd1c88ec8b76c9dd) --- pkgs/development/libraries/tracker-miners/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index b4e2e3b78715..3224355e0451 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -47,11 +47,11 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "izh967d0BhwGrfsmeg4ODz0heZNxvwHQVklaubjdlBc="; + sha256 = "Pt3G0nLAKWn6TCwV360MSddtAh8aJ+xwi2m+gCU1PJQ="; }; nativeBuildInputs = [ From b52cb419e3d1e5dc45bdae37df3e4ba98294fe82 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 10 Jun 2022 17:38:16 +0300 Subject: [PATCH 78/80] nixVersions.unstable: pre20220530 -> pre20220610 (cherry picked from commit 676d99ff218fddf594731942f370b23d9a84b08e) --- pkgs/tools/package-management/nix/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 4b6dcfd36c7c..9b548c053957 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -90,13 +90,13 @@ in lib.makeExtensible (self: { # remember to backport updates to the stable branch! unstable = lib.lowPrio (common rec { - version = "2.8"; - suffix = "pre20220530_${lib.substring 0 7 src.rev}"; + version = "2.9"; + suffix = "pre20220610_${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "af23d38019a47e5bb4cd6585a1678b37c957130c"; - sha256 = "sha256-RH77Y4IhbTofNYlLQSGKLL0fJAG9iHSwRNvMEZ4M0VQ="; + rev = "45ebaab66594692035f028796200a6db2b1fedaf"; + sha256 = "sha256-82M5jKdGUxQBfYj+8nK2SvfVv4Uo0YrPxiuWV/fnvtI="; }; }); }) From b105122fb27b3ab8fbe264e6f99c4e5f94320805 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 10 Jun 2022 21:38:29 +0200 Subject: [PATCH 79/80] chromium: 102.0.5005.61 -> 102.0.5005.115 https://chromereleases.googleblog.com/2022/06/stable-channel-update-for-desktop.html This update includes 7 security fixes. CVEs: CVE-2022-2007 CVE-2022-2008 CVE-2022-2010 CVE-2022-2011 (cherry picked from commit 41c362c9d16c623b5b4b936832a96a34b61595be) --- .../browsers/chromium/upstream-info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 5cd12fbd2826..cd575e473cdf 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "102.0.5005.61", - "sha256": "07vbi3gn9g4n04b2qi2hm34r122snrqaifa46yk3pyh1d79rfdqs", - "sha256bin64": "100n8k3d9k5bq58irc36ig6m5m0lxggffyk4crqqqcib2anqd0zv", + "version": "102.0.5005.115", + "sha256": "1rj7vy824vn513hiivc90lnxvxyi2s0qkdmfqsdssv9v6zjl079h", + "sha256bin64": "0b32sscbjnvr98lk962i9k2srckv2s7fp9pifmsv5jlwndjhzm7y", "deps": { "gn": { "version": "2022-04-14", @@ -12,10 +12,10 @@ } }, "chromedriver": { - "version": "102.0.5005.27", - "sha256_linux": "1978xwj9kf8nihgakmnzgibizq6wp74qp2d2fxgrsgggjy1clmbv", - "sha256_darwin": "0abnqpdm5hgirzj9g2zwkjcc7cwnnr3va4qn09g5yqndlbvi9nqd", - "sha256_darwin_aarch64": "0mw7vypghnw3qdci8g11hgfwbfln471dq1mymxn4bi7691xxb6a2" + "version": "102.0.5005.61", + "sha256_linux": "0fzmvggb4jkjx8cdanarlqqava8xdf3z5wrx560x7772pgd7q02b", + "sha256_darwin": "1y6wq5waivrc5svlwj1svcsh0w72lp68kid52q4qwi044d0l25jg", + "sha256_darwin_aarch64": "03xvmix3hkzlvsv1k5yai2hvsvv60in59n3wdwxkb79fdnkpr3i3" } }, "beta": { From fd60d3b1fc2ab29c57e6d501b6cf26fb1cb8329a Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Fri, 10 Jun 2022 23:38:32 +0200 Subject: [PATCH 80/80] docker: 20.10.16 -> 20.10.17 - https://github.com/moby/moby/releases/tag/v20.10.17 - https://github.com/containerd/containerd/releases/tag/v1.6.6 - https://github.com/docker/cli/releases/tag/v20.10.17 - https://github.com/opencontainers/runc/releases/tag/v1.1.2 (cherry picked from commit c0a672b343939549b9dc63118d0b839631218819) --- .../applications/virtualization/docker/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 68f1ff45d144..b6309814429d 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -243,19 +243,19 @@ rec { # Get revisions from # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/* docker_20_10 = callPackage dockerGen rec { - version = "20.10.16"; + version = "20.10.17"; rev = "v${version}"; - sha256 = "sha256-Sktjh1JabeXrmWljLe5G934cxgChN0u3vdmQXasEFro="; + sha256 = "sha256-YCuohqtE4rbGyboVRyxvpqs93IS1k7aUTPdtHIlkUU8="; moby-src = fetchFromGitHub { owner = "moby"; repo = "moby"; rev = "v${version}"; - sha256 = "sha256-3dog2aGbFKiYzsPTXkG+bo9xjTWZYlmWxtrqXjdzO2s="; + sha256 = "sha256-7SQubrbMvXSN3blcCW47F9OnjuKZxdXM5O/lE85zx0I="; }; - runcRev = "v1.1.1"; - runcSha256 = "sha256-6g2km+Y45INo2MTWMFFQFhfF8DAR5Su+YrJS8k3LYBY="; - containerdRev = "v1.6.4"; - containerdSha256 = "sha256-425BcVHCliAHFQqGn6sWH/ahDX3JR6l/sYZWHpgmZW0="; + runcRev = "v1.1.2"; + runcSha256 = "sha256-tMneqB81w8lQp5RWWCjALyKbOY3xog+oqb6cYKasG/8="; + containerdRev = "v1.6.6"; + containerdSha256 = "sha256-cmarbad6VzcGTCHT/NtApkYsK/oo6WZQ//q8Fvh+ez8="; tiniRev = "v0.19.0"; tiniSha256 = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; };