Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ededb063329c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ddf38a824108
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Jul 17, 2019

  1. nixos/binfmt: handle wasm binaries 

    This adds handling for WASM binaries to binfmt’s emulatedSystems. To
enable, add this to your configuration:

  boot.binfmt.emulatedSystems = [ "wasm32-wasi" ];

After rebuilding with nixos-rebuild switch, you can run wasm binaries
directly.
    @matthewbauer
    matthewbauer committed Jul 17, 2019
    Copy the full SHA
    1acc701 View commit details

  2. nixos/binfmt: update release notes and provide examples

    @matthewbauer
    matthewbauer committed Jul 17, 2019
    Copy the full SHA
    857f7fb View commit details

Commits on Aug 9, 2019

  1. Merge pull request #65002 from matthewbauer/binfmt-wasm 

    Add binfmt interpreter for wasm
    @matthewbauer
    matthewbauer authored Aug 9, 2019
    Copy the full SHA
    ddf38a8 View commit details
Showing with 18 additions and 0 deletions.
  1. +9 −0 nixos/doc/manual/release-notes/rl-1909.xml
  2. +9 −0 nixos/modules/system/boot/binfmt.nix
9 changes: 9 additions & 0 deletions nixos/doc/manual/release-notes/rl-1909.xml
View file
Original file line number Diff line number Diff line change
@@ -33,6 +33,15 @@
PHP 7.1 is no longer supported due to upstream not supporting this version for the entire lifecycle of the 19.09 release.
</para>
</listitem>
<listitem>
<para>
The binfmt module is now easier to use. Additional systems can
be added through <option>boot.binfmt.emulatedSystems</option>.
For instance, <literal>boot.binfmt.emulatedSystems = [
"wasm32-wasi" "x86_64-windows" "aarch64-linux" ];</literal> will
set up binfmt interpreters for each of those listed systems.
</para>
</listitem>
</itemizedlist>
</section>

9 changes: 9 additions & 0 deletions nixos/modules/system/boot/binfmt.nix
View file
Original file line number Diff line number Diff line change
@@ -115,6 +115,14 @@ let
magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xf3\x00'';
mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'';
};
wasm32-wasi = {
magicOrExtension = ''\x00asm'';
mask = ''\xff\xff\xff\xff'';
};
wasm64-wasi = {
magicOrExtension = ''\x00asm'';
mask = ''\xff\xff\xff\xff'';
};
x86_64-windows = {
magicOrExtension = ".exe";
recognitionType = "extension";
@@ -226,6 +234,7 @@ in {

emulatedSystems = mkOption {
default = [];
example = [ "wasm32-wasi" "x86_64-windows" "aarch64-linux" ];
description = ''
List of systems to emulate. Will also configure Nix to
support your new systems.