Skip to content

[release-23.11] rustPackages_1_76.{cargo,rustc}: init at 1.76.0#298206

Merged
mweinelt merged 1 commit intoNixOS:release-23.11from
emilylange:backport-rust_1_76
Mar 23, 2024
Merged

[release-23.11] rustPackages_1_76.{cargo,rustc}: init at 1.76.0#298206
mweinelt merged 1 commit intoNixOS:release-23.11from
emilylange:backport-rust_1_76

Conversation

@emilylange
Copy link
Member

Description of changes

This is a manual backport/cherry-pick of 866d117 (#289940) and e9ca603 (#268075).

We need a newer version than 1.73 to build the latest chromium stable backport (123.0.6312.58).
The same thing has been done for Firefox multiple times in the past.

Closes #292779.
Needed for #297543 and #297891

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

This is a manual backport/cherry-pick of 866d117
and e9ca603.

We need a newer version than `1.73` to build the latest chromium stable
backport (`123.0.6312.58`).
The same thing has been done for Firefox multiple times in the past.
@github-actions github-actions bot added the 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. label Mar 22, 2024
@emilylange
Copy link
Member Author

@ofborg build rustPackages_1_76.cargo rustPackages_1_76.rustc

@emilylange emilylange changed the title rustPackages_1_76.{cargo,rustc}: init at 1.76.0 [release-23.11] rustPackages_1_76.{cargo,rustc}: init at 1.76.0 Mar 23, 2024
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Mar 23, 2024
@emilylange
Copy link
Member Author

Successfully ran nixpkgs-review (no rebuilds) and

nix-build -A rustPackages_1_76.rustc.tests
/nix/store/inzvn4d14gybk3226bk673844ga0033k-fd-8.7.1
/nix/store/i66qfwlmz1n30h90ncn5fwm2hkm6fsxr-firefox-124.0.1
/nix/store/jc774xyapmj56icn80q9h60nhavxc272-ripgrep-13.0.0
/nix/store/7x5my7mr0c2yv6iva50zr2fyxi8w63p3-thunderbird-115.8.1
/nix/store/af93ccrskfzd6azq09hl9xswjjcyclhb-wezterm-20230712-072601-f4abf8fd

for this PR on x86_64-linux.

I also successfully built one of the packages I maintain with rustPackages_1_76.rustPlatform.buildRustPackage using

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 51039b08d6cd..02acb2066ebf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22398,7 +22398,9 @@ with pkgs;
   LASzip = callPackage ../development/libraries/LASzip { };
   LASzip2 = callPackage ../development/libraries/LASzip/LASzip2.nix { };
 
-  laurel = callPackage ../servers/monitoring/laurel/default.nix { };
+  laurel = callPackage ../servers/monitoring/laurel/default.nix {
+    inherit (rustPackages_1_76) rustPlatform;
+  };
 
   lcm = callPackage ../development/libraries/lcm { };
 

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants