talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

mrustc: 0.10.1 -> 0.11.2 (#375039)

Browse Source 
*  mrustc.bootstrap: update dont-download-rustc.patch
*  mrustc.bootstrap: fix vendored openssl build
This commit is contained in:
R. RyanTM 2025-08-19 18:37:12 +10:00 committed by GitHub
parent 1ebe8b99ee
commit 62c4ed5ad7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/mrustc/bootstrap.nix
View File

@ -7,10 +7,10 @@
llvm_12, llvm_12,
libffi, libffi,
cmake, cmake,
perl,
python3, python3,
zlib, zlib,
libxml2, libxml2,
openssl,
pkg-config, pkg-config,
curl, curl,
which, which,
@ -56,6 +56,7 @@ stdenv.mkDerivation rec {
cmake cmake
mrustc mrustc
mrustc-minicargo mrustc-minicargo
perl
pkg-config pkg-config
python3 python3
time time
@ -68,8 +69,7 @@ stdenv.mkDerivation rec {
zlib zlib
libxml2 libxml2
# for cargo # for cargo
openssl curl
(curl.override { inherit openssl; })
]; ];
makeFlags = [ makeFlags = [

4
pkgs/development/compilers/mrustc/default.nix
View File

@ -6,7 +6,7 @@
}: }:
let let
version = "0.10.1"; version = "0.11.2";
tag = "v${version}"; tag = "v${version}";
rev = "b6754f574f8846eb842feba4ccbeeecb10bdfacc"; rev = "b6754f574f8846eb842feba4ccbeeecb10bdfacc";
in in
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
owner = "thepowersgang"; owner = "thepowersgang";
repo = "mrustc"; repo = "mrustc";
rev = tag; rev = tag;
hash = "sha256-sYnx5dUTaQbK4ugnSzAJwIUwZKPUhThmNA+WlY+LEWc="; hash = "sha256-HW9+2mXri3ismeNeaDoTsCY6lxeH8AELegk+YbIn7Jw=";
}; };
postPatch = '' postPatch = ''

22
pkgs/development/compilers/mrustc/patches/0001-dont-download-rustc.patch
View File

@ -1,14 +1,14 @@
The $(RUSTC_SRC_DL) file already exists, but for some reason Make wants to rebuild The $(RUSTC_SRC_DL) file already exists, but for some reason Make wants to rebuild
this target when it has $(RUSTC_SRC_TARBALL) as a dependency. this target when it has $(RUSTC_SRC_TARBALL) as a dependency.
--- a/minicargo.mk 2023-04-06 08:26:18.408817572 +0200 --- a/minicargo.mk
+++ b/minicargo.mk 2023-04-06 08:27:11.553536996 +0200 +++ b/minicargo.mk
@@ -176,7 +176,7 @@ @@ -220,7 +220,7 @@ $(RUSTC_SRC_DL): rustc-$(RUSTC_VERSION)-src/extracted rustc-$(RUSTC_VERSION)-src
@echo [CURL] $@ # - libstd, libpanic_unwind, libtest and libgetopts
@rm -f $@ # - libproc_macro (mrustc)
@curl -sS https://static.rust-lang.org/dist/$@ -o $@ ifeq ($(USE_MERGED_BUILD),1)
-$(RUSTC_SRC_DL): $(RUSTC_SRC_TARBALL) rustc-$(RUSTC_VERSION)-src.patch -$(RUSTCSRC)mrustc-stdlib/Cargo.toml: $(RUSTC_SRC_DL) minicargo.mk
+$(RUSTC_SRC_DL): rustc-$(RUSTC_VERSION)-src.patch +$(RUSTCSRC)mrustc-stdlib/Cargo.toml: minicargo.mk
tar -xf $(RUSTC_SRC_TARBALL) @mkdir -p $(dir $@)
cd $(RUSTCSRC) && patch -p0 < ../rustc-$(RUSTC_VERSION)-src.patch; @echo "#![no_core]" > $(dir $@)/lib.rs
touch $(RUSTC_SRC_DL) @echo "[package]" > $@

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

@ -5818,9 +5818,7 @@ with pkgs;
mrustc = callPackage ../development/compilers/mrustc { }; mrustc = callPackage ../development/compilers/mrustc { };
mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { };
mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { };
openssl = openssl_1_1;
};
rustPackages_1_88 = rust_1_88.packages.stable; rustPackages_1_88 = rust_1_88.packages.stable;
rustPackages = rustPackages_1_88; rustPackages = rustPackages_1_88;