Skip to content

ci_: upgrade nixpkgs to 24.11 #6577

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

Merged
merged 1 commit into from
Jun 24, 2025
Merged

ci_: upgrade nixpkgs to 24.11 #6577

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
8 changes: 4 additions & 4 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@

inputs = {
# We are pinning the commit because ultimately we want to use same commit across different projects.
nixpkgs.url = "github:NixOS/nixpkgs/df27247e6f3e636c119e2610bf12d38b5e98cc79";
# A commit from nixpkgs 24.11 release : https://github.com/NixOS/nixpkgs/tree/release-24.11
nixpkgs.url = "github:NixOS/nixpkgs/3939f5f357444b182817a65b86019dbcb16bdb65";
# We cannot do follows since the nim-unwrapped-2_0 doesn't exist in this nixpkgs version above
nwaku.url = "git+https://github.com/waku-org/nwaku?submodules=1&rev=e755fd834f5f3d6fba216b09469316f0328b3b6f";
};
Expand Down
17 changes: 16 additions & 1 deletion nix/pkgs/gomobile/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
stdenv,
lib,
fetchgit,
fetchurl,
buildGo122Module,
zlib,
makeWrapper,
Expand All @@ -17,6 +16,7 @@
}
),
}:

buildGo122Module {
pname = "gomobile";
version = "0-unstable-2024-12-13";
Expand All @@ -32,6 +32,15 @@ buildGo122Module {

CGO_ENABLED = "1";

preBuild = lib.optionalString stdenv.hostPlatform.isDarwin ''
# to fix : error: unable to find sdk: 'iphoneos'
export DEVELOPER_DIR="/Applications/Xcode.app/Contents/Developer";
export SDKROOT="$(/usr/bin/xcrun --sdk macosx --show-sdk-path)";
if ! xcrun --sdk iphoneos --show-sdk-path >/dev/null 2>&1; then
echo "iOS SDK not found. Ensure Xcode is installed: sudo xcode-select --switch /Applications/Xcode.app"
fi
'';

subPackages = [
"bind"
"cmd/gobind"
Expand Down Expand Up @@ -64,11 +73,17 @@ buildGo122Module {
ln -s $src $out/src/golang.org/x/mobile
'';

# to fix : error: unable to find sdk: 'iphoneos'
Copy link
Member

Choose a reason for hiding this comment

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

This comment is bad, we don't know what it refers to.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah sorry I missed this, I was trying to be concise.
The full error was

 > /nix/store/5c4b1rmbak441s22150gb99crs0jppgb-gomobile-0-unstable-2024-12-13/bin/
gomobile: xcrun --find: exit status 255
> error: unable to find sdk: 'iphoneos'

postFixup = ''
for prog in gomobile gobind; do
wrapProgram $out/bin/$prog \
--suffix GOPATH : $out \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ zlib ]}" \
${lib.optionalString stdenv.hostPlatform.isDarwin ''
--set DEVELOPER_DIR "/Applications/Xcode.app/Contents/Developer" \
--prefix PATH : "/usr/bin" \
--run 'export SDKROOT="$(/usr/bin/xcrun --sdk macosx --show-sdk-path)"' \
''} \
${lib.optionalString withAndroidPkgs ''
--prefix PATH : "${androidPkgs.androidsdk}/bin" \
--set-default ANDROID_HOME "${androidPkgs.androidsdk}/libexec/android-sdk"
Expand Down
2 changes: 1 addition & 1 deletion nix/pkgs/status-go/library/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ in pkgs.buildGoPackage {
go-bindata
mockgen
protoc-gen-go
protobuf3_20
protobuf3_24
fakeGit
];

Expand Down
2 changes: 1 addition & 1 deletion nix/pkgs/status-go/mobile/build.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ in pkgs.buildGoPackage rec {
go-bindata
mockgen
protoc-gen-go
protobuf3_20
protobuf3_24
fakeGit
] ++ optional isAndroid pkgs.openjdk_headless
++ optional isAndroid pkgs.nwaku.libwaku-android-arm64
Expand Down
2 changes: 1 addition & 1 deletion nix/shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ in mkShell {
buildInputs = with pkgs; [
git jq which
go golangci-lint go-junit-report gopls go-bindata gomobileMod codecov-cli go-generate-fast
mockgen protobuf3_20 protoc-gen-go gotestsum go-modvendor openjdk openssl
mockgen protobuf3_24 protoc-gen-go gotestsum go-modvendor openjdk openssl
] ++ lib.optionals (stdenv.isDarwin) [ xcodeWrapper ];

shellHook = lib.optionalString (!isMacM1) ''
Expand Down
Loading