Unverified Commit 62c4ed5a authored by R. RyanTM's avatar R. RyanTM Committed by GitHub
Browse files

mrustc: 0.10.1 -> 0.11.2 (#375039) 

*  mrustc.bootstrap: update dont-download-rustc.patch
*  mrustc.bootstrap: fix vendored openssl build
parent 1ebe8b99

pkgs/development/compilers/mrustc/bootstrap.nix

+3 −3
Original line number Diff line number Diff line
@@ -7,10 +7,10 @@ 
  llvm_12,

  libffi,

  cmake,

  perl,

  python3,

  zlib,

  libxml2,

  openssl,

  pkg-config,

  curl,

  which,
@@ -56,6 +56,7 @@ stdenv.mkDerivation rec { 
    cmake

    mrustc

    mrustc-minicargo

    perl

    pkg-config

    python3

    time
@@ -68,8 +69,7 @@ stdenv.mkDerivation rec { 
    zlib

    libxml2

    # for cargo

    openssl

    (curl.override { inherit openssl; })

    curl

  ];



  makeFlags = [

pkgs/development/compilers/mrustc/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
}:



let

  version = "0.10.1";

  version = "0.11.2";

  tag = "v${version}";

  rev = "b6754f574f8846eb842feba4ccbeeecb10bdfacc";

in
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec { 
    owner = "thepowersgang";

    repo = "mrustc";

    rev = tag;

    hash = "sha256-sYnx5dUTaQbK4ugnSzAJwIUwZKPUhThmNA+WlY+LEWc=";

    hash = "sha256-HW9+2mXri3ismeNeaDoTsCY6lxeH8AELegk+YbIn7Jw=";

  };



  postPatch = ''

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

+11 −11
Original line number Diff line number Diff line 
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.



--- a/minicargo.mk	2023-04-06 08:26:18.408817572 +0200

+++ b/minicargo.mk	2023-04-06 08:27:11.553536996 +0200

@@ -176,7 +176,7 @@

 	@echo [CURL] $@

 	@rm -f $@

 	@curl -sS https://static.rust-lang.org/dist/$@ -o $@

-$(RUSTC_SRC_DL): $(RUSTC_SRC_TARBALL) rustc-$(RUSTC_VERSION)-src.patch

+$(RUSTC_SRC_DL): rustc-$(RUSTC_VERSION)-src.patch

 	tar -xf $(RUSTC_SRC_TARBALL)

 	cd $(RUSTCSRC) && patch -p0 < ../rustc-$(RUSTC_VERSION)-src.patch;

 	touch $(RUSTC_SRC_DL)
 
--- a/minicargo.mk

+++ b/minicargo.mk

@@ -220,7 +220,7 @@ $(RUSTC_SRC_DL): rustc-$(RUSTC_VERSION)-src/extracted rustc-$(RUSTC_VERSION)-src

 # - libstd, libpanic_unwind, libtest and libgetopts

 # - libproc_macro (mrustc)

 ifeq ($(USE_MERGED_BUILD),1)

-$(RUSTCSRC)mrustc-stdlib/Cargo.toml: $(RUSTC_SRC_DL) minicargo.mk

+$(RUSTCSRC)mrustc-stdlib/Cargo.toml: minicargo.mk

 	@mkdir -p $(dir $@)

 	@echo "#![no_core]" > $(dir $@)/lib.rs

 	@echo "[package]" > $@

pkgs/top-level/all-packages.nix

+1 −3
Original line number Diff line number Diff line
@@ -5818,9 +5818,7 @@ with pkgs; 


  mrustc = callPackage ../development/compilers/mrustc { };

  mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { };

  mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix {

    openssl = openssl_1_1;

  };

  mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { };



  rustPackages_1_88 = rust_1_88.packages.stable;

  rustPackages = rustPackages_1_88;