vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/redox-unix'

Browse source
This commit is contained in:
Jeremy Soller 2019-06-16 21:09:40 -06:00
parent e1c67ce9b3 b8620a2503
commit 40b94e5d3a
No known key found for this signature in database
GPG key ID: E988B49EE78A7FB1
7 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitmodules vendored
View file

@ -25,7 +25,7 @@
[submodule "rust"] [submodule "rust"]
path = rust path = rust
url = https://gitlab.redox-os.org/redox-os/rust.git url = https://gitlab.redox-os.org/redox-os/rust.git
branch = redox-2019-04-06 branch = redox-unix-2019-04-06
[submodule "redoxfs"] [submodule "redoxfs"]
path = redoxfs path = redoxfs
url = https://gitlab.redox-os.org/redox-os/redoxfs.git url = https://gitlab.redox-os.org/redox-os/redoxfs.git

1
config/desktop.toml
View file

@ -120,6 +120,7 @@ ptyd = {}
redoxfs = {} redoxfs = {}
#redox-ssh = {} #redox-ssh = {}
#relibc = {} #relibc = {}
#relibc-tests = {}
#ripgrep = {} #ripgrep = {}
#rodioplay = {} #rodioplay = {}
#rs-nes = {} #rs-nes = {}

2
cookbook

@ -1 +1 @@
Subproject commit 1483b6cd5c724870b0c2a9d7fc6dd4eca6a6c3db Subproject commit e16d69117a8494110bb8a4286cb2273ed86bc712

2
mk/config.mk
View file

@ -4,7 +4,7 @@ ARCH?=x86_64
## Flags to pass to the installer (empty to download binary packages) ## Flags to pass to the installer (empty to download binary packages)
INSTALLER_FLAGS?=--cookbook=cookbook INSTALLER_FLAGS?=--cookbook=cookbook
## Enabled to use binary prefix (much faster) ## Enabled to use binary prefix (much faster)
PREFIX_BINARY?=1 PREFIX_BINARY?=0
## Enabled to build custom rustc ## Enabled to build custom rustc
PREFIX_RUSTC?=1 PREFIX_RUSTC?=1
## Filesystem size in MB (256 is the default) ## Filesystem size in MB (256 is the default)

2
relibc

@ -1 +1 @@
Subproject commit dab6530fb40200e8ee8ecebc315ecf8dd88d385b Subproject commit e929538098376804370e84c0a7b8c92d9ccc2a0c

2
rust

@ -1 +1 @@
Subproject commit 57cf5eabfda7e4a3182559159f98b95bf9085826 Subproject commit 21ba98fa2cebf10914e1ee1d8bea9e512d26c358

16
shell.nix
View file

@ -1,14 +1,6 @@
let { pkgs ? import <nixpkgs> {} }:
pkgs = import <nixpkgs> {
overlays = [ pkgs.mkShell rec {
(import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz))
];
};
rust = (pkgs.rustChannelOf {
date = "2019-04-06";
channel = "nightly";
}).rust;
in pkgs.mkShell rec {
hardeningDisable = [ "all" ]; hardeningDisable = [ "all" ];
# used in mk/prefix.mk to patch interpreter when PREFIX_BINARY=1 # used in mk/prefix.mk to patch interpreter when PREFIX_BINARY=1
@ -20,7 +12,7 @@ in pkgs.mkShell rec {
]; ];
LD_LIBRARY_PATH = LIBRARY_PATH; LD_LIBRARY_PATH = LIBRARY_PATH;
nativeBuildInputs = with pkgs; [ gnumake cmake nasm pkgconfig gcc automake autoconf bison gperf qemu rust ]; nativeBuildInputs = with pkgs; [ gnumake cmake nasm pkgconfig gcc automake autoconf bison gperf qemu rustup ];
buildInputs = with pkgs; [ fuse openssl gettext libtool flex libpng perl perlPackages.HTMLParser ]; buildInputs = with pkgs; [ fuse openssl gettext libtool flex libpng perl perlPackages.HTMLParser ];
shellHook = '' shellHook = ''