From 8bdc1401a2a22602c182f698ecf22a42a3c0fcbf Mon Sep 17 00:00:00 2001 From: cab Date: Sat, 28 May 2022 23:11:54 +0400 Subject: [PATCH 01/58] pkgs: added gcc10StdenvCompat Many packages got broken by gcc10 -> 11 switch. This makes overriding broken libraries a bit easier. --- 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 cdfcf5ff5266..cb8874ba14ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -992,7 +992,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 { }; @@ -2021,7 +2021,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 { }; @@ -4967,7 +4967,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 { }; @@ -12568,6 +12568,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 @@ -14944,10 +14946,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; }; @@ -16848,7 +16847,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 { }; @@ -25890,7 +25889,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 { }; @@ -31613,16 +31612,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 { }; @@ -32739,23 +32738,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 { @@ -33232,7 +33231,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 c6af26acfc7e15420c288dcc488a79afc816036d Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:18:37 +0400 Subject: [PATCH 02/58] clingcon: stdenv -> gcc10Stdenv --- 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 cb8874ba14ed..f447de4786d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3006,7 +3006,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 e46b811478874c17d6041ce70b1e7d00c5970ab4 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:19:35 +0400 Subject: [PATCH 03/58] cxxtools: stdenv -> gcc10Stdenv --- 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 f447de4786d2..cde83239ffa4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16953,7 +16953,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 30d46169971537ff99134bb758abc3d7156fc845 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:20:31 +0400 Subject: [PATCH 04/58] diopser: stdenv -> gcc10Stdenv --- 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 cde83239ffa4..29c7e967eb2a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2142,7 +2142,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 a484f4f331e658b55776ad8577048c19be7427d5 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:21:27 +0400 Subject: [PATCH 05/58] djv: stdenv -> gcc10Stdenv --- 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 29c7e967eb2a..ba02feac2b75 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3335,7 +3335,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 9882ffead490cfe93a6a41f22ebc01850b384073 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:22:23 +0400 Subject: [PATCH 06/58] dl-poly-classic-mpi: stdenv -> gcc10Stdenv --- 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 ba02feac2b75..7e36e22c85ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33135,7 +33135,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 fd26c9493b7b5312ed2db0925d3750e3ec72b7ed Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:23:19 +0400 Subject: [PATCH 07/58] dxx-rebirth: stdenv -> gcc10Stdenv --- 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 7e36e22c85ef..51b1c68810f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31644,9 +31644,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 5b12d3a80728c018fa4d1fa5b858be8979e244b4 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:24:15 +0400 Subject: [PATCH 08/58] ericw-tools: stdenv -> gcc10Stdenv --- 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 51b1c68810f5..57eb77c84584 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5619,7 +5619,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 5e081aeaa14f7fabc85f3adad8c941695a7b2770 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:25:11 +0400 Subject: [PATCH 09/58] fluxus: stdenv -> gcc10Stdenv --- 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 57eb77c84584..810e361d74a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26211,7 +26211,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 77aab56ca46e69328d0c261398ade4f344fb5af4 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:26:07 +0400 Subject: [PATCH 10/58] flwrap: stdenv -> gcc10Stdenv --- 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 810e361d74a0..2ab81b3482bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26213,7 +26213,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 5d8e2a71f170fc73c834c05d188dfaae59e284e9 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:27:03 +0400 Subject: [PATCH 11/58] gammy: stdenv -> gcc10Stdenv --- 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 2ab81b3482bb..10a0c1e6cb65 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2242,7 +2242,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 feb6162f839c511d633f8f7363d4a7dc61026888 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:27:58 +0400 Subject: [PATCH 12/58] gebaar-libinput: stdenv -> gcc10Stdenv --- 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 10a0c1e6cb65..7fc907fad394 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4736,7 +4736,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 9f22d631ebe66f4c5daf0b48c1966211309117ff Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:28:53 +0400 Subject: [PATCH 13/58] getdp: stdenv -> gcc10Stdenv --- 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 7fc907fad394..82975b1fc015 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32980,7 +32980,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 0e05668dc3bcae625e9b781cb519923bcd25175b Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:29:48 +0400 Subject: [PATCH 14/58] gosmore: stdenv -> gcc10Stdenv --- 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 82975b1fc015..c78de6f140b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26905,7 +26905,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 8dc4d7347789bf10e80ff200f898953b15554c50 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:30:48 +0400 Subject: [PATCH 15/58] gsmlib: stdenv -> gcc10Stdenv --- 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 c78de6f140b0..2c77b84a0db8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6732,9 +6732,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 591dc2fdd20604c260d4a83fdf46d238ff7c0e63 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:32:42 +0400 Subject: [PATCH 16/58] hobbes: stdenv -> gcc10Stdenv --- 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 2c77b84a0db8..6cd79f42e094 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -389,7 +389,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 0590c39ffac4a76facd3c177c16c62677017e6f7 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:33:38 +0400 Subject: [PATCH 17/58] idsk: stdenv -> gcc10Stdenv --- 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 6cd79f42e094..d9b4c6163bb3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34070,7 +34070,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 daa692e42c78791505b2cb9f04df2721be490021 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:34:34 +0400 Subject: [PATCH 18/58] iqueue: stdenv -> gcc10Stdenv --- 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 d9b4c6163bb3..ed652e4624ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1628,7 +1628,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 fcb1fbf5fcfb9112f0d97e0522c7d7575c98a7d2 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:35:29 +0400 Subject: [PATCH 19/58] isrcsubmit: stdenv -> gcc10Stdenv --- 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 ed652e4624ee..13b9c4d15399 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7222,7 +7222,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 872f42247b166b06bc163ab113fff475cf48e44a Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:36:24 +0400 Subject: [PATCH 20/58] jigdo: stdenv -> gcc10Stdenv --- 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 13b9c4d15399..de3e543a8d8a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27482,7 +27482,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 14a2dec50d54bcd6db2c346098e5e2d7d94d5912 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:37:27 +0400 Subject: [PATCH 21/58] libdynd: stdenv -> gcc10Stdenv --- 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 de3e543a8d8a..a5223a3a6601 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21270,7 +21270,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 e374625845656b36e7601c7fbf7eeee9c019696f Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:10:58 +0400 Subject: [PATCH 22/58] loki: stdenv -> gcc10Stdenv --- 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 a5223a3a6601..0e3aae97d0c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8127,7 +8127,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 b31af490cdc25a70c431810c659c2c00b8dc364c Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:11:48 +0400 Subject: [PATCH 23/58] mars: stdenv -> gcc10Stdenv --- 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 0e3aae97d0c6..75bd44447af1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31910,7 +31910,7 @@ with pkgs; manaplus = callPackage ../games/manaplus { }; - mars = callPackage ../games/mars { }; + mars = callPackage ../games/mars { stdenv = gcc10StdenvCompat; }; megaglest = callPackage ../games/megaglest { }; From 43494af5eb40c7cde1e9aa99c0a74de05df0dcf0 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:12:39 +0400 Subject: [PATCH 24/58] miniaudicle: stdenv -> gcc10Stdenv --- 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 75bd44447af1..3978d2040cd8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28096,7 +28096,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 7976cdf59e6ab91cbab01c8c560847ff19e3772d Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:13:30 +0400 Subject: [PATCH 25/58] mitscheme: stdenv -> gcc10Stdenv --- 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 3978d2040cd8..3b39514ecfce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13503,9 +13503,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 33851c466f24548a12d90759fcbc3ab7138c4eb6 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:14:20 +0400 Subject: [PATCH 26/58] mkcue: stdenv -> gcc10Stdenv --- 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 3b39514ecfce..3c0ed8dbcdac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8365,7 +8365,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 c27f7b1b0088a7cfee9e3287bc3abcf6ebc04672 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:15:14 +0400 Subject: [PATCH 27/58] mps: stdenv -> gcc10Stdenv --- 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 3c0ed8dbcdac..f4923c1b8f9e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19654,7 +19654,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 41e537a5851b4c9d707118172cb88b0ce1d095e1 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:16:06 +0400 Subject: [PATCH 28/58] mrustc-bootstrap: stdenv -> gcc10Stdenv --- 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 f4923c1b8f9e..be12c506776a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13695,7 +13695,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 3eac0002ecaf7ff6964aae36e1148c084199f3c6 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:17:05 +0400 Subject: [PATCH 29/58] nano-wallet: stdenv -> gcc10Stdenv --- 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 be12c506776a..bae713b9c288 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31241,9 +31241,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 15b44bab797525e200b4fbfc480e25dcb64636b5 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:18:00 +0400 Subject: [PATCH 30/58] non: stdenv -> gcc10Stdenv --- 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 bae713b9c288..ce1464986792 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19776,7 +19776,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 2be028e9433ebad3fd74ee2a19e13c02e7f870cb Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:18:52 +0400 Subject: [PATCH 31/58] obliv-c: stdenv -> gcc10Stdenv --- 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 ce1464986792..1bb7d7437a56 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13581,9 +13581,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 5ec76e1cd6d8b447b845e21025053e2e329c0612 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:19:42 +0400 Subject: [PATCH 32/58] olive-editor: stdenv -> gcc10Stdenv --- 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 1bb7d7437a56..d0eb5dbceec7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8919,9 +8919,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 e86878e1b1b502e6ae73d91c615f5b87921edfa9 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:20:37 +0400 Subject: [PATCH 33/58] openclonk: stdenv -> gcc10Stdenv --- 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 d0eb5dbceec7..913dee5cef65 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32005,7 +32005,7 @@ with pkgs; openlierox = callPackage ../games/openlierox { }; - openclonk = callPackage ../games/openclonk { }; + openclonk = callPackage ../games/openclonk { stdenv = gcc10StdenvCompat; }; openjk = callPackage ../games/openjk { }; From 28bcbe1ac8341fec2f52e2d8e85b293af213bc33 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:21:27 +0400 Subject: [PATCH 34/58] opendbx: stdenv -> gcc10Stdenv --- 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 913dee5cef65..ea4192b7b22a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8952,7 +8952,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 edd13b5528f280e8d49f1d6acc1b764a18f32d7d Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:22:17 +0400 Subject: [PATCH 35/58] openvino: stdenv -> gcc10Stdenv --- 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 ea4192b7b22a..6ad1acde9692 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35172,9 +35172,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 32e76212c5d3b08fafbd85cc4c1621f3e5997d90 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:23:07 +0400 Subject: [PATCH 36/58] oxen: stdenv -> gcc10Stdenv --- 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 6ad1acde9692..7f4e4706c82a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31231,9 +31231,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 cbdb85b7431e42bd6cbbf7ade24595f586cb1354 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:23:59 +0400 Subject: [PATCH 37/58] percona-server56: stdenv -> gcc10Stdenv --- 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 7f4e4706c82a..2f828e793b62 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22261,7 +22261,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 5785f8321c360e2b287476a033950f3e758cfdc0 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:24:50 +0400 Subject: [PATCH 38/58] percona-xtrabackup_2_4: stdenv -> gcc10Stdenv --- 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 2f828e793b62..3337d3ee3b06 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9218,9 +9218,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 0655723b231e348eebd5f276daf0c9f787de419e Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:25:39 +0400 Subject: [PATCH 39/58] percona-xtrabackup_8_0: stdenv -> gcc10Stdenv --- 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 3337d3ee3b06..a743dadc2bdb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9220,9 +9220,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 533171bfff38d4d3bf6b5cbb1808441d6802f4ea Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:26:32 +0400 Subject: [PATCH 40/58] pianobooster: stdenv -> gcc10Stdenv --- 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 a743dadc2bdb..b082b4117c58 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28937,7 +28937,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 8297eeacdacbfe51a757b758da2d2e86cac52380 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:27:23 +0400 Subject: [PATCH 41/58] pktgen: stdenv -> gcc10Stdenv --- 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 b082b4117c58..c9004a45a700 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23627,7 +23627,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 91ef8a2d4e980be9bb4b6d2598b985fadb951655 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:46:16 +0400 Subject: [PATCH 42/58] rss-glx: stdenv -> gcc10Stdenv --- 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 c9004a45a700..897afa6c5826 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34526,7 +34526,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 b9af2b5afded6f97f1c77e988fd759337e6935b0 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:47:07 +0400 Subject: [PATCH 43/58] sonic-lineup: stdenv -> gcc10Stdenv --- 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 897afa6c5826..8ca162b866bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29686,7 +29686,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 c526e73ea2e2b985a7d6a6f24f59fe1ebfd95223 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:47:58 +0400 Subject: [PATCH 44/58] spring: stdenv -> gcc10Stdenv --- 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 8ca162b866bd..8c17ae1dcff3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32231,10 +32231,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 38a3766228d556e4effa03b12a4cefe07ea0eb50 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:48:49 +0400 Subject: [PATCH 45/58] strelka: stdenv -> gcc10Stdenv --- 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 8c17ae1dcff3..d2c4c1116d76 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32901,7 +32901,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 70e3e0d8392e72d58418bbe987bc9797b2207bde Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:49:40 +0400 Subject: [PATCH 46/58] stuntrally: stdenv -> gcc10Stdenv --- 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 d2c4c1116d76..0f13d7c7f08f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32272,12 +32272,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 8c379ef34fd7e9cf64377f0b0a89ad2fee25dd6a Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:50:31 +0400 Subject: [PATCH 47/58] swfmill: stdenv -> gcc10Stdenv --- 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 0f13d7c7f08f..214fa3eb780a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16295,7 +16295,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 fe9163bac70fced8dd9a8c94789229630e3b684c Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:51:21 +0400 Subject: [PATCH 48/58] swiftshader: stdenv -> gcc10Stdenv --- 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 214fa3eb780a..43142e7ca0cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16280,7 +16280,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 7bd4ef283545b3c7a9c190be3bb797ec1f46ee52 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:52:20 +0400 Subject: [PATCH 49/58] textadept11: stdenv -> gcc10Stdenv --- 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 43142e7ca0cc..c55076fbbb9d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10843,7 +10843,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 bb1a8a87a6f430d26462cdce1bdd72779b217f36 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:53:11 +0400 Subject: [PATCH 50/58] tiscamera: stdenv -> gcc10Stdenv --- 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 c55076fbbb9d..0a349b2997e9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20881,7 +20881,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 17cca50520f19e793ff1a9cb962193c21f4d277b Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:54:03 +0400 Subject: [PATCH 51/58] tracebox: stdenv -> gcc10Stdenv --- 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 0a349b2997e9..95ca27df027b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11035,7 +11035,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 101927cc4608314b9d1f9af465d9ac0a78b2246e Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:54:53 +0400 Subject: [PATCH 52/58] ucg: stdenv -> gcc10Stdenv --- 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 95ca27df027b..0e5f217daa03 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6651,7 +6651,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 4281581f32b5c8133532e5640607571241b57da9 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:55:44 +0400 Subject: [PATCH 53/58] uri: stdenv -> gcc10Stdenv --- 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 0e5f217daa03..1b423325cf60 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16917,7 +16917,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 1affead2e664e4e98ee2fd8eaa4dcf7e516ed6f8 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:56:35 +0400 Subject: [PATCH 54/58] webrtc-audio-processing_1: stdenv -> gcc10Stdenv --- 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 1b423325cf60..984247b5f58c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21095,7 +21095,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 1461ead834295d5d49e0d29473ee8dfe8fbc29c9 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:57:26 +0400 Subject: [PATCH 55/58] wxcam: stdenv -> gcc10Stdenv --- 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 984247b5f58c..27de08757660 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30641,11 +30641,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 a5739070a074aaca5177ef3392e3f421300dc544 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:58:17 +0400 Subject: [PATCH 56/58] xc3sprog: stdenv -> gcc10Stdenv --- 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 27de08757660..08839a0f9ddf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16444,7 +16444,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 da31172e101780456194a922e6304afb4251f1bb Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 19:03:21 +0400 Subject: [PATCH 57/58] xqilla: stdenv -> gcc10Stdenv --- 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 08839a0f9ddf..a5e292d4fd53 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22721,7 +22721,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 8a6dbc8b7d4ea08956e651b02a824520fda7aed2 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 19:04:13 +0400 Subject: [PATCH 58/58] yafaray-core: stdenv -> gcc10Stdenv --- 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 a5e292d4fd53..ff8b997d58f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11889,7 +11889,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 { };