nixpkgs upgrade to 23.11
#18321
Closed
nixpkgs upgrade to 23.11
#18321
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Jenkins BuildsClick to see older builds (123)
|
13 tasks
siddarthkay
force-pushed
the
upgrade-nixpkgs-to-23_11
branch
2 times, most recently
from
7964f8d
to
c22f201
Compare
|
You can't find Use Also, the commit your using this, where is it from? |
|
Also, it's important to use stable branches like
|
|
Here's an example of a It is good to list notable upgrade in the commit and PR description to make it clear what is being changes in tooling and libraries. |
|
It appears @richard-ramos needs Go 1.21 and for that reason is interested in upgrading Please coordinate with him to settle on the same version, preferably from stable |
siddarthkay
force-pushed
the
upgrade-nixpkgs-to-23_11
branch
8 times, most recently
from
1b0824f
to
d2e0d86
Compare
siddarthkay
force-pushed
the
upgrade-nixpkgs-to-23_11
branch
from
d2e0d86
to
16d0435
Compare
siddarthkay
added a commit
that referenced
this pull request
Jan 14, 2024
### Summary We need to bump `kotlin` Plugin version to `1.9.0` because the `nixpkgs` upgrade will set default `gradle` version to `8.4`. `gradle` version `8.4` comes with a base `kotlin` version of `1.9.0` which becomes incompatible with our existing version of `1.7` Otherwise we get errors like this : ``` e: /Users/siddarthkumar/code/experiments/status-mobile/node_modules/@react-native/ gradle-plugin/src/main/kotlin/com/facebook/react/utils/TaskUtils.kt: (25, 7): Class 'kotlin.collections.CollectionsKt__CollectionsKt' was compiled with an incompatible version of Kotlin. The binary version of its metadata is 1.9.0, expected version is 1.7.1. The class is loaded from /nix/store/3a228ppiiljfvsrxyq15h25chmiwsmbh-gradle-8.4/lib/gradle/lib/ kotlin-stdlib-1.9.10.jar!/kotlin/collections/CollectionsKt__CollectionsKt.class e: /Users/siddarthkumar/code/experiments/status-mobile/node_modules/@react-native/gradle-plugin/ src/main/kotlin/com/facebook/react/utils/TaskUtils.kt: (25, 47): Class 'kotlin.collections.CollectionsKt___CollectionsKt' was compiled with an incompatible version of Kotlin. The binary version of its metadata is 1.9.0, expected version is 1.7.1. The class is loaded from /nix/store/3a228ppiiljfvsrxyq15h25chmiwsmbh-gradle-8.4/lib/gradle/lib/ kotlin-stdlib-1.9.10.jar!/kotlin/collections/CollectionsKt___CollectionsKt.class e: /Users/siddarthkumar/code/experiments/status-mobile/node_modules/@react-native/gradle-plugin/ src/main/kotlin/com/facebook/react/utils/TaskUtils.kt: (27, 12): Class 'kotlin.collections.ArraysKt___ArraysKt' was compiled with an incompatible version of Kotlin. The binary version of its metadata is 1.9.0, expected version is 1.7.1. The class is loaded from /nix/store/3a228ppiiljfvsrxyq15h25chmiwsmbh-gradle-8.4/lib/gradle/lib/ kotlin-stdlib-1.9.10.jar!/kotlin/collections/ArraysKt___ArraysKt.class ``` needed for #18321 In this commit we set `kotlinPluginVersion` to `1.9.0` and update `gradle` dependencies. #### Platforms - Android
|
converting to draft since this will require lots of ongoing work |
siddarthkay
added a commit
that referenced
this pull request
Jan 15, 2024
### Summary We need to bump `kotlin` Plugin version to `1.9.0` because the `nixpkgs` upgrade will set default `gradle` version to `8.4`. `gradle` version `8.4` comes with a base `kotlin` version of `1.9.0` which becomes incompatible with our existing version of `1.7` Otherwise we get errors like this : ``` e: /Users/siddarthkumar/code/experiments/status-mobile/node_modules/@react-native/ gradle-plugin/src/main/kotlin/com/facebook/react/utils/TaskUtils.kt: (25, 7): Class 'kotlin.collections.CollectionsKt__CollectionsKt' was compiled with an incompatible version of Kotlin. The binary version of its metadata is 1.9.0, expected version is 1.7.1. The class is loaded from /nix/store/3a228ppiiljfvsrxyq15h25chmiwsmbh-gradle-8.4/lib/gradle/lib/ kotlin-stdlib-1.9.10.jar!/kotlin/collections/CollectionsKt__CollectionsKt.class e: /Users/siddarthkumar/code/experiments/status-mobile/node_modules/@react-native/gradle-plugin/ src/main/kotlin/com/facebook/react/utils/TaskUtils.kt: (25, 47): Class 'kotlin.collections.CollectionsKt___CollectionsKt' was compiled with an incompatible version of Kotlin. The binary version of its metadata is 1.9.0, expected version is 1.7.1. The class is loaded from /nix/store/3a228ppiiljfvsrxyq15h25chmiwsmbh-gradle-8.4/lib/gradle/lib/ kotlin-stdlib-1.9.10.jar!/kotlin/collections/CollectionsKt___CollectionsKt.class e: /Users/siddarthkumar/code/experiments/status-mobile/node_modules/@react-native/gradle-plugin/ src/main/kotlin/com/facebook/react/utils/TaskUtils.kt: (27, 12): Class 'kotlin.collections.ArraysKt___ArraysKt' was compiled with an incompatible version of Kotlin. The binary version of its metadata is 1.9.0, expected version is 1.7.1. The class is loaded from /nix/store/3a228ppiiljfvsrxyq15h25chmiwsmbh-gradle-8.4/lib/gradle/lib/ kotlin-stdlib-1.9.10.jar!/kotlin/collections/ArraysKt___ArraysKt.class ``` needed for #18321 In this commit we set `kotlinPluginVersion` to `1.9.0` and update `gradle` dependencies. #### Platforms - Android
siddarthkay
added a commit
that referenced
this pull request
Jan 16, 2024
### Summary We need to bump `kotlin` Plugin version to `1.9.0` because the `nixpkgs` upgrade will set default `gradle` version to `8.4`. `gradle` version `8.4` comes with a base `kotlin` version of `1.9.0` which becomes incompatible with our existing version of `1.7` Otherwise we get errors like this : ``` e: /Users/siddarthkumar/code/experiments/status-mobile/node_modules/@react-native/ gradle-plugin/src/main/kotlin/com/facebook/react/utils/TaskUtils.kt: (25, 7): Class 'kotlin.collections.CollectionsKt__CollectionsKt' was compiled with an incompatible version of Kotlin. The binary version of its metadata is 1.9.0, expected version is 1.7.1. The class is loaded from /nix/store/3a228ppiiljfvsrxyq15h25chmiwsmbh-gradle-8.4/lib/gradle/lib/ kotlin-stdlib-1.9.10.jar!/kotlin/collections/CollectionsKt__CollectionsKt.class e: /Users/siddarthkumar/code/experiments/status-mobile/node_modules/@react-native/gradle-plugin/ src/main/kotlin/com/facebook/react/utils/TaskUtils.kt: (25, 47): Class 'kotlin.collections.CollectionsKt___CollectionsKt' was compiled with an incompatible version of Kotlin. The binary version of its metadata is 1.9.0, expected version is 1.7.1. The class is loaded from /nix/store/3a228ppiiljfvsrxyq15h25chmiwsmbh-gradle-8.4/lib/gradle/lib/ kotlin-stdlib-1.9.10.jar!/kotlin/collections/CollectionsKt___CollectionsKt.class e: /Users/siddarthkumar/code/experiments/status-mobile/node_modules/@react-native/gradle-plugin/ src/main/kotlin/com/facebook/react/utils/TaskUtils.kt: (27, 12): Class 'kotlin.collections.ArraysKt___ArraysKt' was compiled with an incompatible version of Kotlin. The binary version of its metadata is 1.9.0, expected version is 1.7.1. The class is loaded from /nix/store/3a228ppiiljfvsrxyq15h25chmiwsmbh-gradle-8.4/lib/gradle/lib/ kotlin-stdlib-1.9.10.jar!/kotlin/collections/ArraysKt___ArraysKt.class ``` needed for #18321 In this commit we set `kotlinPluginVersion` to `1.9.0` and update `gradle` dependencies. #### Platforms - Android
siddarthkay
added a commit
that referenced
this pull request
Jan 16, 2024
### Summary We need to bump `kotlin` Plugin version to `1.9.0` because the `nixpkgs` upgrade will set default `gradle` version to `8.4`. `gradle` version `8.4` comes with a base `kotlin` version of `1.9.0` which becomes incompatible with our existing version of `1.7` Otherwise we get errors like this : ``` e: /Users/siddarthkumar/code/experiments/status-mobile/node_modules/@react-native/ gradle-plugin/src/main/kotlin/com/facebook/react/utils/TaskUtils.kt: (25, 7): Class 'kotlin.collections.CollectionsKt__CollectionsKt' was compiled with an incompatible version of Kotlin. The binary version of its metadata is 1.9.0, expected version is 1.7.1. The class is loaded from /nix/store/3a228ppiiljfvsrxyq15h25chmiwsmbh-gradle-8.4/lib/gradle/lib/ kotlin-stdlib-1.9.10.jar!/kotlin/collections/CollectionsKt__CollectionsKt.class e: /Users/siddarthkumar/code/experiments/status-mobile/node_modules/@react-native/gradle-plugin/ src/main/kotlin/com/facebook/react/utils/TaskUtils.kt: (25, 47): Class 'kotlin.collections.CollectionsKt___CollectionsKt' was compiled with an incompatible version of Kotlin. The binary version of its metadata is 1.9.0, expected version is 1.7.1. The class is loaded from /nix/store/3a228ppiiljfvsrxyq15h25chmiwsmbh-gradle-8.4/lib/gradle/lib/ kotlin-stdlib-1.9.10.jar!/kotlin/collections/CollectionsKt___CollectionsKt.class e: /Users/siddarthkumar/code/experiments/status-mobile/node_modules/@react-native/gradle-plugin/ src/main/kotlin/com/facebook/react/utils/TaskUtils.kt: (27, 12): Class 'kotlin.collections.ArraysKt___ArraysKt' was compiled with an incompatible version of Kotlin. The binary version of its metadata is 1.9.0, expected version is 1.7.1. The class is loaded from /nix/store/3a228ppiiljfvsrxyq15h25chmiwsmbh-gradle-8.4/lib/gradle/lib/ kotlin-stdlib-1.9.10.jar!/kotlin/collections/ArraysKt___ArraysKt.class ``` needed for #18321 In this commit we set `kotlinPluginVersion` to `1.9.0` and update `gradle` dependencies. #### Platforms - Android
siddarthkay
force-pushed
the
upgrade-nixpkgs-to-23_11
branch
from
cd36091
to
2016bc2
Compare
siddarthkay
changed the title
nixpkgs upgrade to 23.11nixpkgs upgrade to 23.11
88% of end-end tests have passedFailed tests (2)Click to expandClass TestActivityMultipleDevicePR:
Class TestOneToOneChatMultipleSharedDevicesNewUiTwo:
Expected to fail tests (4)Click to expandClass TestOneToOneChatMultipleSharedDevicesNewUiTwo:
Class TestCommunityOneDeviceMerged:
Class TestCommunityMultipleDeviceMergedTwo:
Class TestGroupChatMultipleDeviceMergedNewUI:
Passed tests (42)Click to expandClass TestOneToOneChatMultipleSharedDevicesNewUiTwo:
Class TestDeepLinksOneDevice:
Class TestCommunityMultipleDeviceMerged:
Class TestGroupChatMultipleDeviceMergedNewUI:
Class TestCommunityMultipleDeviceMergedTwo:
Class TestOneToOneChatMultipleSharedDevicesNewUi:
Class TestCommunityOneDeviceMerged:
Class TestActivityCenterContactRequestMultipleDevicePR:
Class TestActivityMultipleDevicePR:
Class TestActivityMultipleDevicePRTwo:
|
jakubgs
requested changes
Jan 29, 2024
yakimant
reviewed
Jan 29, 2024
| @@ -6,10 +6,11 @@ let | |||
| # For testing local version of nixpkgs | |||
| #nixpkgsSrc = (import <nixpkgs> { }).lib.cleanSource "/home/jakubgs/work/nixpkgs"; | |||
|
|
|||
| # We follow the master branch of official nixpkgs. | |||
| # using a fork of nixpkgs since we need changes from https://github.com/NixOS/nixpkgs/pull/269479 | |||
| # on top of https://github.com/NixOS/nixpkgs/releases/tag/23.11 | |||
There was a problem hiding this comment.
Maybe taking from 23.11 branch head is better, it can contain usefull fixes.
because |
|
I also hope to merge this PR after the RN upgrade has been merged, so the RN upgrade commit in this PR would go away with rebase. |
0% of end-end tests have passedFailed tests (47)Click to expandClass TestActivityMultipleDevicePRTwo:
Class TestCommunityMultipleDeviceMerged:
Class TestOneToOneChatMultipleSharedDevicesNewUi:
Class TestActivityMultipleDevicePR:
Class TestDeepLinksOneDevice:
Class TestOneToOneChatMultipleSharedDevicesNewUiTwo:
Class TestGroupChatMultipleDeviceMergedNewUI:
Class TestCommunityMultipleDeviceMergedTwo:
Class TestActivityCenterContactRequestMultipleDevicePR:
Class TestCommunityOneDeviceMerged:
Expected to fail tests (1)Click to expandClass TestCommunityOneDeviceMerged:
|
0% of end-end tests have passedFailed tests (47)Click to expandClass TestCommunityMultipleDeviceMergedTwo:
Class TestActivityCenterContactRequestMultipleDevicePR:
Class TestDeepLinksOneDevice:
Class TestOneToOneChatMultipleSharedDevicesNewUiTwo:
Class TestCommunityOneDeviceMerged:
Class TestActivityMultipleDevicePR:
Class TestActivityMultipleDevicePRTwo:
Class TestOneToOneChatMultipleSharedDevicesNewUi:
Class TestGroupChatMultipleDeviceMergedNewUI:
Class TestCommunityMultipleDeviceMerged:
Expected to fail tests (1)Click to expandClass TestCommunityOneDeviceMerged:
|
19% of end-end tests have passedFailed tests (37)Click to expandClass TestOneToOneChatMultipleSharedDevicesNewUiTwo:
Class TestDeepLinksOneDevice:
Class TestCommunityMultipleDeviceMergedTwo:
Class TestGroupChatMultipleDeviceMergedNewUI:
Class TestActivityCenterContactRequestMultipleDevicePR:
Class TestActivityMultipleDevicePR:
Class TestCommunityOneDeviceMerged:
Class TestCommunityMultipleDeviceMerged:
Class TestActivityMultipleDevicePRTwo:
Class TestOneToOneChatMultipleSharedDevicesNewUi:
Expected to fail tests (2)Click to expandClass TestCommunityOneDeviceMerged:
Class TestGroupChatMultipleDeviceMergedNewUI:
Passed tests (9)Click to expandClass TestGroupChatMultipleDeviceMergedNewUI:
Class TestActivityCenterContactRequestMultipleDevicePR:
Class TestActivityMultipleDevicePR:
Class TestCommunityOneDeviceMerged:
Class TestOneToOneChatMultipleSharedDevicesNewUi:
|
|
update: will resume working on this after the release is done. |
|
This would become a tough rebase. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
This PR upgrades
nixpkgsto23.11We also apply fixes from NixOS/nixpkgs#269479 in our fork of
nixpkgsand use that commit.Depends on
react nativeto 0.73.5 #18563 for android related fixes (commit is included in this PR as well)Notable changes from previous version
Gradlehas been bumped from8.0.1to8.4clojure-lspwas upgradedfixes #18311
Platforms
status: ready