Merge pull request #94287 from zowoq/ecc-misc
This commit is contained in:
commit
baca1baa43
@ -50,7 +50,7 @@ map (p: p.name) pkgs.rxvt-unicode.plugins
|
|||||||
In addition to <literal>plugins</literal> the options
|
In addition to <literal>plugins</literal> the options
|
||||||
<literal>extraDeps</literal> and <literal>perlDeps</literal> can be used
|
<literal>extraDeps</literal> and <literal>perlDeps</literal> can be used
|
||||||
to install extra packages.
|
to install extra packages.
|
||||||
<literal>extraDeps</literal> can be used, for example, to provide
|
<literal>extraDeps</literal> can be used, for example, to provide
|
||||||
<literal>xsel</literal> (a clipboard manager) to the clipboard plugin,
|
<literal>xsel</literal> (a clipboard manager) to the clipboard plugin,
|
||||||
without installing it globally:
|
without installing it globally:
|
||||||
<programlisting>rxvt-unicode.override { configure = { availablePlugins, ... }: {
|
<programlisting>rxvt-unicode.override { configure = { availablePlugins, ... }: {
|
||||||
|
@ -68,7 +68,7 @@
|
|||||||
<title>How to Install BEAM Packages</title>
|
<title>How to Install BEAM Packages</title>
|
||||||
|
|
||||||
<para>
|
<para>
|
||||||
BEAM builders are not registered at the top level, simply because they are not relevant to the vast majority of Nix users.
|
BEAM builders are not registered at the top level, simply because they are not relevant to the vast majority of Nix users.
|
||||||
To install any of those builders into your profile, refer to them by their attribute path <literal>beamPackages.rebar3</literal>:
|
To install any of those builders into your profile, refer to them by their attribute path <literal>beamPackages.rebar3</literal>:
|
||||||
</para>
|
</para>
|
||||||
|
|
||||||
|
@ -21,11 +21,11 @@ Modes of use of `emscripten`:
|
|||||||
* **Declarative usage**:
|
* **Declarative usage**:
|
||||||
|
|
||||||
This mode is far more power full since this makes use of `nix` for dependency management of emscripten libraries and targets by using the `mkDerivation` which is implemented by `pkgs.emscriptenStdenv` and `pkgs.buildEmscriptenPackage`. The source for the packages is in `pkgs/top-level/emscripten-packages.nix` and the abstraction behind it in `pkgs/development/em-modules/generic/default.nix`.
|
This mode is far more power full since this makes use of `nix` for dependency management of emscripten libraries and targets by using the `mkDerivation` which is implemented by `pkgs.emscriptenStdenv` and `pkgs.buildEmscriptenPackage`. The source for the packages is in `pkgs/top-level/emscripten-packages.nix` and the abstraction behind it in `pkgs/development/em-modules/generic/default.nix`.
|
||||||
* build and install all packages:
|
* build and install all packages:
|
||||||
* `nix-env -iA emscriptenPackages`
|
* `nix-env -iA emscriptenPackages`
|
||||||
|
|
||||||
* dev-shell for zlib implementation hacking:
|
* dev-shell for zlib implementation hacking:
|
||||||
* `nix-shell -A emscriptenPackages.zlib`
|
* `nix-shell -A emscriptenPackages.zlib`
|
||||||
|
|
||||||
|
|
||||||
## Imperative usage
|
## Imperative usage
|
||||||
@ -90,7 +90,7 @@ See the `zlib` example:
|
|||||||
libz.so.${old.version} -I . -o example.js
|
libz.so.${old.version} -I . -o example.js
|
||||||
|
|
||||||
echo "Using node to execute the test"
|
echo "Using node to execute the test"
|
||||||
${pkgs.nodejs}/bin/node ./example.js
|
${pkgs.nodejs}/bin/node ./example.js
|
||||||
|
|
||||||
set +x
|
set +x
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
@ -112,7 +112,7 @@ See the `zlib` example:
|
|||||||
|
|
||||||
### Usage 2: pkgs.buildEmscriptenPackage
|
### Usage 2: pkgs.buildEmscriptenPackage
|
||||||
|
|
||||||
This `xmlmirror` example features a emscriptenPackage which is defined completely from this context and no `pkgs.zlib.override` is used.
|
This `xmlmirror` example features a emscriptenPackage which is defined completely from this context and no `pkgs.zlib.override` is used.
|
||||||
|
|
||||||
xmlmirror = pkgs.buildEmscriptenPackage rec {
|
xmlmirror = pkgs.buildEmscriptenPackage rec {
|
||||||
name = "xmlmirror";
|
name = "xmlmirror";
|
||||||
@ -163,7 +163,7 @@ This `xmlmirror` example features a emscriptenPackage which is defined completel
|
|||||||
checkPhase = ''
|
checkPhase = ''
|
||||||
|
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
### Declarative debugging
|
### Declarative debugging
|
||||||
|
|
||||||
@ -182,4 +182,3 @@ Use `nix-shell -I nixpkgs=/some/dir/nixpkgs -A emscriptenPackages.libz` and from
|
|||||||
Using this toolchain makes it easy to leverage `nix` from NixOS, MacOSX or even Windows (WSL+ubuntu+nix). This toolchain is reproducible, behaves like the rest of the packages from nixpkgs and contains a set of well working examples to learn and adapt from.
|
Using this toolchain makes it easy to leverage `nix` from NixOS, MacOSX or even Windows (WSL+ubuntu+nix). This toolchain is reproducible, behaves like the rest of the packages from nixpkgs and contains a set of well working examples to learn and adapt from.
|
||||||
|
|
||||||
If in trouble, ask the maintainers.
|
If in trouble, ask the maintainers.
|
||||||
|
|
||||||
|
@ -72,7 +72,7 @@ pet = buildGoModule rec {
|
|||||||
|
|
||||||
When `null` is used as a value, rather than fetching the dependencies
|
When `null` is used as a value, rather than fetching the dependencies
|
||||||
and vendoring them, we use the vendoring included within the source repo.
|
and vendoring them, we use the vendoring included within the source repo.
|
||||||
If you'd like to not have to update this field on dependency changes,
|
If you'd like to not have to update this field on dependency changes,
|
||||||
run `go mod vendor` in your source repo and set 'vendorSha256 = null;'
|
run `go mod vendor` in your source repo and set 'vendorSha256 = null;'
|
||||||
</para>
|
</para>
|
||||||
</section>
|
</section>
|
||||||
|
@ -79,7 +79,7 @@ pkgs.rustPlatform.buildRustPackage {
|
|||||||
|
|
||||||
When using `buildRustPackage`, the `checkPhase` is enabled by default and runs
|
When using `buildRustPackage`, the `checkPhase` is enabled by default and runs
|
||||||
`cargo test` on the package to build. To make sure that we don't compile the
|
`cargo test` on the package to build. To make sure that we don't compile the
|
||||||
sources twice and to actually test the artifacts that will be used at runtime,
|
sources twice and to actually test the artifacts that will be used at runtime,
|
||||||
the tests will be ran in the `release` mode by default.
|
the tests will be ran in the `release` mode by default.
|
||||||
|
|
||||||
However, in some cases the test-suite of a package doesn't work properly in the
|
However, in some cases the test-suite of a package doesn't work properly in the
|
||||||
|
@ -220,7 +220,7 @@ fi
|
|||||||
|
|
||||||
preConfigure=preConfigure
|
preConfigure=preConfigure
|
||||||
preConfigure() {
|
preConfigure() {
|
||||||
|
|
||||||
# Determine the frontends to build.
|
# Determine the frontends to build.
|
||||||
langs="c"
|
langs="c"
|
||||||
if test -n "$langCC"; then
|
if test -n "$langCC"; then
|
||||||
@ -262,7 +262,7 @@ postInstall() {
|
|||||||
|
|
||||||
#if test -z "$profiledCompiler"; then
|
#if test -z "$profiledCompiler"; then
|
||||||
#makeFlags="bootstrap"
|
#makeFlags="bootstrap"
|
||||||
#else
|
#else
|
||||||
#makeFlags="profiledbootstrap"
|
#makeFlags="profiledbootstrap"
|
||||||
#fi
|
#fi
|
||||||
|
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
# Always defined, but the value depends on the presence of an option.
|
# Always defined, but the value depends on the presence of an option.
|
||||||
config = {
|
config = {
|
||||||
value = if options ? enable then 360 else 7;
|
value = if options ? enable then 360 else 7;
|
||||||
}
|
}
|
||||||
# Only define if possible.
|
# Only define if possible.
|
||||||
// lib.optionalAttrs (options ? enable) {
|
// lib.optionalAttrs (options ? enable) {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -60,7 +60,7 @@ nixexpr() {
|
|||||||
"darwin-tested" "unstable" "stdenvBootstrapTools"
|
"darwin-tested" "unstable" "stdenvBootstrapTools"
|
||||||
"moduleSystem" "lib-tests" # these just confuse the output
|
"moduleSystem" "lib-tests" # these just confuse the output
|
||||||
];
|
];
|
||||||
|
|
||||||
in
|
in
|
||||||
tweak (builtins.removeAttrs hydraJobs blacklist)
|
tweak (builtins.removeAttrs hydraJobs blacklist)
|
||||||
EONIX
|
EONIX
|
||||||
@ -124,4 +124,3 @@ if [ -n "$optPrint" ]; then
|
|||||||
echo
|
echo
|
||||||
cat "$newlist"
|
cat "$newlist"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -13,15 +13,15 @@
|
|||||||
</refnamediv>
|
</refnamediv>
|
||||||
<refsynopsisdiv>
|
<refsynopsisdiv>
|
||||||
<cmdsynopsis>
|
<cmdsynopsis>
|
||||||
<command>nixos-build-vms</command>
|
<command>nixos-build-vms</command>
|
||||||
<arg>
|
<arg>
|
||||||
<option>--show-trace</option>
|
<option>--show-trace</option>
|
||||||
</arg>
|
</arg>
|
||||||
|
|
||||||
<arg>
|
<arg>
|
||||||
<option>--no-out-link</option>
|
<option>--no-out-link</option>
|
||||||
</arg>
|
</arg>
|
||||||
|
|
||||||
<arg>
|
<arg>
|
||||||
<option>--help</option>
|
<option>--help</option>
|
||||||
</arg>
|
</arg>
|
||||||
|
@ -13,21 +13,21 @@
|
|||||||
</refnamediv>
|
</refnamediv>
|
||||||
<refsynopsisdiv>
|
<refsynopsisdiv>
|
||||||
<cmdsynopsis>
|
<cmdsynopsis>
|
||||||
<command>nixos-enter</command>
|
<command>nixos-enter</command>
|
||||||
<arg>
|
<arg>
|
||||||
<arg choice='plain'>
|
<arg choice='plain'>
|
||||||
<option>--root</option>
|
<option>--root</option>
|
||||||
</arg>
|
</arg>
|
||||||
<replaceable>root</replaceable>
|
<replaceable>root</replaceable>
|
||||||
</arg>
|
</arg>
|
||||||
|
|
||||||
<arg>
|
<arg>
|
||||||
<arg choice='plain'>
|
<arg choice='plain'>
|
||||||
<option>--system</option>
|
<option>--system</option>
|
||||||
</arg>
|
</arg>
|
||||||
<replaceable>system</replaceable>
|
<replaceable>system</replaceable>
|
||||||
</arg>
|
</arg>
|
||||||
|
|
||||||
<arg>
|
<arg>
|
||||||
<arg choice='plain'>
|
<arg choice='plain'>
|
||||||
<option>-c</option>
|
<option>-c</option>
|
||||||
@ -40,13 +40,13 @@
|
|||||||
<option>--silent</option>
|
<option>--silent</option>
|
||||||
</arg>
|
</arg>
|
||||||
</arg>
|
</arg>
|
||||||
|
|
||||||
<arg>
|
<arg>
|
||||||
<arg choice='plain'>
|
<arg choice='plain'>
|
||||||
<option>--help</option>
|
<option>--help</option>
|
||||||
</arg>
|
</arg>
|
||||||
</arg>
|
</arg>
|
||||||
|
|
||||||
<arg>
|
<arg>
|
||||||
<arg choice='plain'>
|
<arg choice='plain'>
|
||||||
<option>--</option>
|
<option>--</option>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user