colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: gcc11Stdenv on x86_64-linux -> gcc12Stdenv

Browse Source 
These seemed done to upgrade version on aarch64-linux,
but now they were (also) downgrading on x86_64-linux.
I checked that they still build; some cases were even fixed, e.g.:
https://hydra.nixos.org/log/40jmdmnk07ac7xwwxmdqa7smvc3xflm2-qcoro-0.7.0.drv
This commit is contained in:
Vladimír Čunát 2023-02-05 10:13:34 +01:00
parent dc1638927e
commit 8627b384af
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/emulators/rpcs3/default.nix
View File

@ -1,4 +1,4 @@
{ gcc11Stdenv, lib, fetchFromGitHub, wrapQtAppsHook, cmake, pkg-config, git { gcc12Stdenv, lib, fetchFromGitHub, wrapQtAppsHook, cmake, pkg-config, git
, qtbase, qtquickcontrols, qtmultimedia, openal, glew, vulkan-headers, vulkan-loader, libpng , qtbase, qtquickcontrols, qtmultimedia, openal, glew, vulkan-headers, vulkan-loader, libpng
, ffmpeg, libevdev, libusb1, zlib, curl, wolfssl, python3, pugixml, faudio, flatbuffers , ffmpeg, libevdev, libusb1, zlib, curl, wolfssl, python3, pugixml, faudio, flatbuffers
, sdl2Support ? true, SDL2 , sdl2Support ? true, SDL2
@ -21,7 +21,7 @@ let
sha256 = "0c3g30rj1y8fbd2q4kwlpg1jdy02z4w5ryhj3yr9051pdnf4kndz"; sha256 = "0c3g30rj1y8fbd2q4kwlpg1jdy02z4w5ryhj3yr9051pdnf4kndz";
}; };
in in
gcc11Stdenv.mkDerivation { gcc12Stdenv.mkDerivation {
pname = "rpcs3"; pname = "rpcs3";
version = rpcs3Version; version = rpcs3Version;

4
pkgs/applications/plasma-mobile/neochat.nix
View File

@ -1,4 +1,4 @@
{ gcc11Stdenv { gcc12Stdenv
, lib , lib
, srcs , srcs
@ -31,7 +31,7 @@
}: }:
# Workaround for AArch64 not using GCC11 yet. # Workaround for AArch64 not using GCC11 yet.
gcc11Stdenv.mkDerivation rec { gcc12Stdenv.mkDerivation rec {
pname = "neochat"; pname = "neochat";
inherit (srcs.neochat) version src; inherit (srcs.neochat) version src;

6
pkgs/applications/plasma-mobile/spacebar.nix
View File

@ -1,6 +1,6 @@
{ lib { lib
, mkDerivation , mkDerivation
, gcc11Stdenv , gcc12Stdenv
, srcs , srcs
, cmake , cmake
@ -23,8 +23,8 @@
, qtquickcontrols2 , qtquickcontrols2
}: }:
# Workaround for AArch64 not using GCC11 yet. # Workaround for AArch64 still using GCC9.
gcc11Stdenv.mkDerivation rec { gcc12Stdenv.mkDerivation rec {
pname = "spacebar"; pname = "spacebar";
inherit (srcs.spacebar) version src; inherit (srcs.spacebar) version src;

4
pkgs/development/libraries/qcoro/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv { stdenv
, gcc11Stdenv , gcc12Stdenv
, lib , lib
, fetchFromGitHub , fetchFromGitHub
, cmake , cmake
@ -9,7 +9,7 @@
, wrapQtAppsHook , wrapQtAppsHook
}: }:
gcc11Stdenv.mkDerivation rec { gcc12Stdenv.mkDerivation rec {
pname = "qcoro"; pname = "qcoro";
version = "0.7.0"; version = "0.7.0";

10
pkgs/top-level/all-packages.nix
View File

@ -4898,11 +4898,11 @@ with pkgs;
}; };
hyprland = callPackage ../applications/window-managers/hyprwm/hyprland { hyprland = callPackage ../applications/window-managers/hyprwm/hyprland {
stdenv = gcc11Stdenv; stdenv = gcc12Stdenv;
}; };
hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper {
stdenv = gcc11Stdenv; stdenv = gcc12Stdenv;
}; };
hysteria = callPackage ../tools/networking/hysteria { }; hysteria = callPackage ../tools/networking/hysteria { };
@ -20542,7 +20542,7 @@ with pkgs;
lmdbxx = callPackage ../development/libraries/lmdbxx { }; lmdbxx = callPackage ../development/libraries/lmdbxx { };
lemon-graph = callPackage ../development/libraries/lemon-graph { lemon-graph = callPackage ../development/libraries/lemon-graph {
stdenv = if stdenv.isLinux then gcc11Stdenv else stdenv; stdenv = if stdenv.isLinux then gcc12Stdenv else stdenv;
}; };
levmar = callPackage ../development/libraries/levmar { }; levmar = callPackage ../development/libraries/levmar { };
@ -25757,7 +25757,7 @@ with pkgs;
}; };
btop = callPackage ../tools/system/btop { btop = callPackage ../tools/system/btop {
stdenv = gcc11Stdenv; stdenv = gcc12Stdenv;
}; };
nmon = callPackage ../os-specific/linux/nmon { }; nmon = callPackage ../os-specific/linux/nmon { };
@ -30779,7 +30779,7 @@ with pkgs;
ladybird = qt6Packages.callPackage ../applications/networking/browsers/ladybird { ladybird = qt6Packages.callPackage ../applications/networking/browsers/ladybird {
# https://github.com/NixOS/nixpkgs/issues/201254 # https://github.com/NixOS/nixpkgs/issues/201254
stdenv = if stdenv.isDarwin then llvmPackages_14.stdenv else gcc11Stdenv; stdenv = if stdenv.isDarwin then llvmPackages_14.stdenv else gcc12Stdenv;
}; };
lazpaint = callPackage ../applications/graphics/lazpaint { }; lazpaint = callPackage ../applications/graphics/lazpaint { };