Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

treewide: replace darwin.apple_sdk_11_0.stdenv with stdenv on darwin #370661

Merged
merged 1 commit into from
Jan 3, 2025
Merged

treewide: replace darwin.apple_sdk_11_0.stdenv with stdenv on darwin #370661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pkgs/by-name/ne/nextcloud-client/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
, gitUpdater
, fetchFromGitHub
, qt6Packages
, stdenv
, cmake
, extra-cmake-modules
, inotify-tools
Expand All @@ -18,7 +19,7 @@
, libsysprof-capture
}:

qt6Packages.stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
pname = "nextcloud-client";
version = "3.15.2";

Expand Down
5 changes: 1 addition & 4 deletions pkgs/by-name/op/openimagedenoise/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,7 @@
xcodebuild,
}:

let
stdenv' = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
in
stdenv'.mkDerivation (finalAttrs: {
stdenv.mkDerivation (finalAttrs: {
pname = "openimagedenoise";
version = "2.2.2";

Expand Down
2 changes: 1 addition & 1 deletion pkgs/by-name/qo/qownnotes/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ let
appname = "QOwnNotes";
version = "24.12.7";
in
qt6Packages.stdenv.mkDerivation {
stdenv.mkDerivation {
inherit pname version;

src = fetchurl {
Expand Down
4 changes: 1 addition & 3 deletions pkgs/development/libraries/mongocxx/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ lib
, pkgs
, stdenv
, fetchFromGitHub
, mongoc
, openssl
Expand All @@ -10,8 +10,6 @@
, darwin
}:

let stdenv = if pkgs.stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else pkgs.stdenv; in

stdenv.mkDerivation (finalAttrs: {
pname = "mongocxx";
version = "4.0.0";
Expand Down
5 changes: 1 addition & 4 deletions pkgs/development/libraries/qscintilla/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@
darwin,
}:

let
stdenv' = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
in
stdenv'.mkDerivation rec {
stdenv.mkDerivation rec {
pname = "qscintilla-qt5";
version = "2.13.2";

Expand Down
3 changes: 1 addition & 2 deletions pkgs/development/python-modules/openusd/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,7 @@ buildPythonPackage rec {
hash = "sha256-slBJleeDi0mCVThty4NUX4M9vaCLV+E8rnp1Ab77TmE=";
};

stdenv =
if python.stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else python.stdenv;
stdenv = python.stdenv;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BTW, I think these are no‐ops (probably should have caught them during review).


outputs = [ "out" ] ++ lib.optional withDocs "doc";

Expand Down
3 changes: 1 addition & 2 deletions pkgs/development/python-modules/python-mapnik/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ buildPythonPackage rec {
./python-mapnik_std_optional.patch
];

stdenv =
if python.stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else python.stdenv;
stdenv = python.stdenv;

build-system = [ setuptools ];

Expand Down
47 changes: 7 additions & 40 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3668,9 +3668,7 @@ with pkgs;

haste-client = callPackage ../tools/misc/haste-client { };

hal-hardware-analyzer = libsForQt5.callPackage ../applications/science/electronics/hal-hardware-analyzer {
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
};
hal-hardware-analyzer = libsForQt5.callPackage ../applications/science/electronics/hal-hardware-analyzer { };

halide = callPackage ../development/compilers/halide {
llvmPackages = llvmPackages_18;
Expand Down Expand Up @@ -4672,9 +4670,7 @@ with pkgs;

padthv1 = libsForQt5.callPackage ../applications/audio/padthv1 { };

pageedit = libsForQt5.callPackage ../applications/office/PageEdit {
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
};
pageedit = libsForQt5.callPackage ../applications/office/PageEdit { };

pagefind = libsForQt5.callPackage ../applications/misc/pagefind { };

Expand Down Expand Up @@ -4858,7 +4854,6 @@ with pkgs;

proxmark3 = libsForQt5.callPackage ../tools/security/proxmark3/default.nix {
inherit (darwin.apple_sdk_11_0.frameworks) Foundation AppKit;
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
};

pws = callPackage ../tools/misc/pws { };
Expand Down Expand Up @@ -5259,7 +5254,6 @@ with pkgs;
};

texmacs = libsForQt5.callPackage ../applications/editors/texmacs {
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
extraFonts = true;
};

Expand Down Expand Up @@ -9052,10 +9046,6 @@ with pkgs;

ghcid = haskellPackages.ghcid.bin;

gr-framework = callPackage ../by-name/gr/gr-framework/package.nix {
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
};

graphia = qt6Packages.callPackage ../applications/science/misc/graphia { };

libgit2 = callPackage ../development/libraries/libgit2 {
Expand Down Expand Up @@ -10364,7 +10354,6 @@ with pkgs;
};

pcl = libsForQt5.callPackage ../development/libraries/pcl {
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
inherit (darwin.apple_sdk_11_0.frameworks) Cocoa AGL OpenGL;
};

Expand Down Expand Up @@ -10511,7 +10500,7 @@ with pkgs;

qt6Packages = recurseIntoAttrs (import ./qt6-packages.nix {
inherit lib __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope pkgsHostTarget kdePackages;
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
inherit stdenv;
});

quill = callPackage ../tools/security/quill {
Expand Down Expand Up @@ -13135,22 +13124,8 @@ with pkgs;

av-98 = callPackage ../applications/networking/browsers/av-98 { };

bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker {
stdenv = if stdenv.hostPlatform.isDarwin then
darwin.apple_sdk_11_0.stdenv
else
stdenv;
};
bambootracker-qt6 = qt6Packages.callPackage ../applications/audio/bambootracker {
stdenv = if stdenv.hostPlatform.isDarwin then
darwin.apple_sdk_11_0.stdenv
else
stdenv;
};

ptcollab = callPackage ../by-name/pt/ptcollab/package.nix {
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
};
bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker { };
bambootracker-qt6 = qt6Packages.callPackage ../applications/audio/bambootracker { };

schismtracker = callPackage ../applications/audio/schismtracker {
inherit (darwin.apple_sdk.frameworks) Cocoa;
Expand Down Expand Up @@ -13525,7 +13500,6 @@ with pkgs;

keepassxc = libsForQt5.callPackage ../applications/misc/keepassxc {
inherit (darwin.apple_sdk_11_0.frameworks) LocalAuthentication;
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
};

evolution-data-server-gtk4 = evolution-data-server.override { withGtk3 = false; withGtk4 = true; };
Expand Down Expand Up @@ -15143,9 +15117,7 @@ with pkgs;

qtpass = libsForQt5.callPackage ../applications/misc/qtpass { };

quassel = libsForQt5.callPackage ../applications/networking/irc/quassel {
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
};
quassel = libsForQt5.callPackage ../applications/networking/irc/quassel { };

quasselClient = quassel.override {
monolithic = false;
Expand Down Expand Up @@ -15490,7 +15462,6 @@ with pkgs;
};

synergy = libsForQt5.callPackage ../applications/misc/synergy {
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices Carbon Cocoa CoreServices ScreenSaver UserNotifications;
};

Expand Down Expand Up @@ -16030,9 +16001,7 @@ with pkgs;
lua = lua5_3;
};

xpdf = libsForQt5.callPackage ../applications/misc/xpdf {
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
};
xpdf = libsForQt5.callPackage ../applications/misc/xpdf { };

xmobar = haskellPackages.xmobar.bin;

Expand Down Expand Up @@ -16151,7 +16120,6 @@ with pkgs;
};

bitcoin = libsForQt5.callPackage ../applications/blockchains/bitcoin {
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
withGui = true;
inherit (darwin) autoSignDarwinBinariesHook;
};
Expand Down Expand Up @@ -16663,7 +16631,6 @@ with pkgs;

mudlet = libsForQt5.callPackage ../games/mudlet {
lua = lua5_1;
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
inherit (darwin.apple_sdk_11_0.frameworks) AppKit;
};

Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/qt6-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ makeScopeWithSplicing' {
inherit (self) callPackage;
noExtraAttrs = set: lib.attrsets.removeAttrs set [ "extend" "override" "overrideScope" "overrideDerivation" ];
in (noExtraAttrs qt6) // {
inherit stdenv;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we should add a warning here for a release cycle first. LGTM otherwise.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've reverted this change, since I'm not sure how to properly add a warning here...

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think just stdenv = lib.warn "qt6Packages.stdenv: this is going away!!" stdenv; would do it, as long as there’s nothing else in the tree using it.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed, thanks. I wonder what I was worried about...

stdenv = lib.warn "qt6Packages.stdenv is deprecated. Use stdenv instead." stdenv;

# LIBRARIES
accounts-qt = callPackage ../development/libraries/accounts-qt { };
Expand Down
Loading