MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-15 14:26:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
nixpkgs/lib/systems/doubles.nix

82 lines
2.5 KiB
Nix
Raw Normal View History

Convert libs to a fixed-point This does break the API of being able to import any lib file and get its libs, however I'm not sure people did this. I made this while exploring being able to swap out docFn with a stub in #2305, to avoid functor performance problems. I don't know if that is going to move forward (or if it is a problem or not,) but after doing all this work figured I'd put it up anyway :) Two notable advantages to this approach: 1. when a lib inherits another lib's functions, it doesn't automatically get put in to the scope of lib 2. when a lib implements a new obscure functions, it doesn't automatically get put in to the scope of lib Using the test script (later in this commit) I got the following diff on the API: + diff master fixed-lib 11764a11765,11766 > .types.defaultFunctor > .types.defaultTypeMerge 11774a11777,11778 > .types.isOptionType > .types.isType 11781a11786 > .types.mkOptionType 11788a11794 > .types.setType 11795a11802 > .types.types This means that this commit _adds_ to the API, however I can't find a way to fix these last remaining discrepancies. At least none are _removed_. Test script (run with nix-repl in the PATH): #!/bin/sh set -eux repl() { suff=${1:-} echo "(import ./lib)$suff" \ | nix-repl 2>&1 } attrs_to_check() { repl "${1:-}" \ | tr ';' $'\n' \ | grep "\.\.\." \ | cut -d' ' -f2 \ | sed -e "s/^/${1:-}./" \ | sort } summ() { repl "${1:-}" \ | tr ' ' $'\n' \ | sort \ | uniq } deep_summ() { suff="${1:-}" depth="${2:-4}" depth=$((depth - 1)) summ "$suff" for attr in $(attrs_to_check "$suff" | grep -v "types.types"); do if [ $depth -eq 0 ]; then summ "$attr" | sed -e "s/^/$attr./" else deep_summ "$attr" "$depth" | sed -e "s/^/$attr./" fi done } ( cd nixpkgs #git add . #git commit -m "Auto-commit, sorry" || true git checkout fixed-lib deep_summ > ../fixed-lib git checkout master deep_summ > ../master ) if diff master fixed-lib; then echo "SHALLOW MATCH!" fi ( cd nixpkgs git checkout fixed-lib repl .types )
2017-07-29 02:05:35 +02:00
{ lib }:
lib: Fix system parsing, and use for doubles lists The old hard-coded lists are now used to test system parsing. In the process, make an `assertTrue` in release lib for eval tests; also use it in release-cross
2017-02-09 22:09:47 +01:00
let
Convert libs to a fixed-point This does break the API of being able to import any lib file and get its libs, however I'm not sure people did this. I made this while exploring being able to swap out docFn with a stub in #2305, to avoid functor performance problems. I don't know if that is going to move forward (or if it is a problem or not,) but after doing all this work figured I'd put it up anyway :) Two notable advantages to this approach: 1. when a lib inherits another lib's functions, it doesn't automatically get put in to the scope of lib 2. when a lib implements a new obscure functions, it doesn't automatically get put in to the scope of lib Using the test script (later in this commit) I got the following diff on the API: + diff master fixed-lib 11764a11765,11766 > .types.defaultFunctor > .types.defaultTypeMerge 11774a11777,11778 > .types.isOptionType > .types.isType 11781a11786 > .types.mkOptionType 11788a11794 > .types.setType 11795a11802 > .types.types This means that this commit _adds_ to the API, however I can't find a way to fix these last remaining discrepancies. At least none are _removed_. Test script (run with nix-repl in the PATH): #!/bin/sh set -eux repl() { suff=${1:-} echo "(import ./lib)$suff" \ | nix-repl 2>&1 } attrs_to_check() { repl "${1:-}" \ | tr ';' $'\n' \ | grep "\.\.\." \ | cut -d' ' -f2 \ | sed -e "s/^/${1:-}./" \ | sort } summ() { repl "${1:-}" \ | tr ' ' $'\n' \ | sort \ | uniq } deep_summ() { suff="${1:-}" depth="${2:-4}" depth=$((depth - 1)) summ "$suff" for attr in $(attrs_to_check "$suff" | grep -v "types.types"); do if [ $depth -eq 0 ]; then summ "$attr" | sed -e "s/^/$attr./" else deep_summ "$attr" "$depth" | sed -e "s/^/$attr./" fi done } ( cd nixpkgs #git add . #git commit -m "Auto-commit, sorry" || true git checkout fixed-lib deep_summ > ../fixed-lib git checkout master deep_summ > ../master ) if diff master fixed-lib; then echo "SHALLOW MATCH!" fi ( cd nixpkgs git checkout fixed-lib repl .types )
2017-07-29 02:05:35 +02:00
inherit (lib) lists;
lib: Avoid double import
2018-01-31 04:10:34 +01:00
inherit (lib.systems) parse;
inherit (lib.systems.inspect) predicates;
Convert libs to a fixed-point This does break the API of being able to import any lib file and get its libs, however I'm not sure people did this. I made this while exploring being able to swap out docFn with a stub in #2305, to avoid functor performance problems. I don't know if that is going to move forward (or if it is a problem or not,) but after doing all this work figured I'd put it up anyway :) Two notable advantages to this approach: 1. when a lib inherits another lib's functions, it doesn't automatically get put in to the scope of lib 2. when a lib implements a new obscure functions, it doesn't automatically get put in to the scope of lib Using the test script (later in this commit) I got the following diff on the API: + diff master fixed-lib 11764a11765,11766 > .types.defaultFunctor > .types.defaultTypeMerge 11774a11777,11778 > .types.isOptionType > .types.isType 11781a11786 > .types.mkOptionType 11788a11794 > .types.setType 11795a11802 > .types.types This means that this commit _adds_ to the API, however I can't find a way to fix these last remaining discrepancies. At least none are _removed_. Test script (run with nix-repl in the PATH): #!/bin/sh set -eux repl() { suff=${1:-} echo "(import ./lib)$suff" \ | nix-repl 2>&1 } attrs_to_check() { repl "${1:-}" \ | tr ';' $'\n' \ | grep "\.\.\." \ | cut -d' ' -f2 \ | sed -e "s/^/${1:-}./" \ | sort } summ() { repl "${1:-}" \ | tr ' ' $'\n' \ | sort \ | uniq } deep_summ() { suff="${1:-}" depth="${2:-4}" depth=$((depth - 1)) summ "$suff" for attr in $(attrs_to_check "$suff" | grep -v "types.types"); do if [ $depth -eq 0 ]; then summ "$attr" | sed -e "s/^/$attr./" else deep_summ "$attr" "$depth" | sed -e "s/^/$attr./" fi done } ( cd nixpkgs #git add . #git commit -m "Auto-commit, sorry" || true git checkout fixed-lib deep_summ > ../fixed-lib git checkout master deep_summ > ../master ) if diff master fixed-lib; then echo "SHALLOW MATCH!" fi ( cd nixpkgs git checkout fixed-lib repl .types )
2017-07-29 02:05:35 +02:00
inherit (lib.attrsets) matchAttrs;
lib: Make platform predicates more ergonomic to use `hostPlatform.isDarwin` instead of `lib.system.parse.isDarwin hostPlatform.parsed`
2017-05-21 19:39:23 +02:00
lib: Fix system parsing, and use for doubles lists The old hard-coded lists are now used to test system parsing. In the process, make an `assertTrue` in release lib for eval tests; also use it in release-cross
2017-02-09 22:09:47 +01:00
all = [
"aarch64-linux"
lib: Add armv7a-linux to doubles.nix This is needed for android.
2019-10-01 18:51:57 +02:00
"armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux"
lib: Fix system parsing, and use for doubles lists The old hard-coded lists are now used to test system parsing. In the process, make an `assertTrue` in release lib for eval tests; also use it in release-cross
2017-02-09 22:09:47 +01:00
lib, treewide: Add missing MIPS arches, and fix existing usage Existing "mips64el" should be "mipsel". This is just the barest minimum so that nixpkgs can recognize them as systems - although required for building individual derivations onto MIPS boards, it is not sufficient if you want to actually build nixos on those targets
2017-12-05 11:27:45 +01:00
"mipsel-linux"
lib: Fix system parsing, and use for doubles lists The old hard-coded lists are now used to test system parsing. In the process, make an `assertTrue` in release lib for eval tests; also use it in release-cross
2017-02-09 22:09:47 +01:00
"i686-cygwin" "i686-freebsd" "i686-linux" "i686-netbsd" "i686-openbsd"
Revert "Revert "systems/doubles.nix: add Apple doubles"" This reverts commit ce2f74df2cade57e74c235292c8b074281903e71. Doubles are treated as -darwin here, to provide some consistency. There is some ambiguity between “x86_64-darwin” and “i686-darwin” which could refer to binaries linked between iOS simulator or real macOS binaries. useiOSPrebuilt can be used to determine which to use, however.
2019-07-10 20:38:55 +02:00
"x86_64-cygwin" "x86_64-freebsd" "x86_64-linux"
lib: Fix system parsing, and use for doubles lists The old hard-coded lists are now used to test system parsing. In the process, make an `assertTrue` in release lib for eval tests; also use it in release-cross
2017-02-09 22:09:47 +01:00
"x86_64-netbsd" "x86_64-openbsd" "x86_64-solaris"
systems/doubles.nix: add mingw doubles this makes it easier to show what supports windows vs. unix.
2018-10-17 04:56:58 +02:00
Revert "Revert "systems/doubles.nix: add Apple doubles"" This reverts commit ce2f74df2cade57e74c235292c8b074281903e71. Doubles are treated as -darwin here, to provide some consistency. There is some ambiguity between “x86_64-darwin” and “i686-darwin” which could refer to binaries linked between iOS simulator or real macOS binaries. useiOSPrebuilt can be used to determine which to use, however.
2019-07-10 20:38:55 +02:00
"x86_64-darwin" "i686-darwin" "aarch64-darwin" "armv7a-darwin"
Correctly set windows doubles mingw is the toolchain name but it is actually run on a window kernel
2018-10-18 00:03:00 +02:00
"x86_64-windows" "i686-windows"
wasm: init cross target Adds pkgsCross.wasm32 and pkgsCross.wasm64. Use it to build Nixpkgs with a WebAssembly toolchain. stdenv/cross: use static overlay on isWasm isWasm doesn’t make sense dynamically linked.
2019-01-30 03:01:24 +01:00
"wasm64-wasi" "wasm32-wasi"
systems: add riscv double This was never listed in doubles.nix! Not sure why?
2019-04-30 17:50:45 +02:00
redox: add as target
2020-07-21 22:11:36 +02:00
"x86_64-redox"
systems: add missing doubles in https://github.com/NixOS/nixpkgs/pull/60349, the attr handling was removed. This means we rely on these double values for determing what we are compatible with. This adds some of the missing doubles to this list. https://hydra.nixos.org/eval/1523389#tabs-removed
2019-06-04 19:34:40 +02:00
"powerpc64le-linux"
systems: add riscv double This was never listed in doubles.nix! Not sure why?
2019-04-30 17:50:45 +02:00
"riscv32-linux" "riscv64-linux"
systems: add missing doubles in https://github.com/NixOS/nixpkgs/pull/60349, the attr handling was removed. This means we rely on these double values for determing what we are compatible with. This adds some of the missing doubles to this list. https://hydra.nixos.org/eval/1523389#tabs-removed
2019-06-04 19:34:40 +02:00
lib: Add armv6l-none to doubles list
2020-03-12 14:56:17 +01:00
"arm-none" "armv6l-none" "aarch64-none"
"avr-none"
"i686-none" "x86_64-none"
"powerpc-none"
"msp430-none"
"riscv64-none" "riscv32-none"
"vc4-none"
Add support for cross compiling to `js-ghcjs` This platform doesn't have a C compiler, and so relies and the changes in the previous commit to work.
2019-11-25 00:07:20 +01:00
"js-ghcjs"
lib/systems: Add Genode platform definitions Add platform definitions for 64-bit ARM and x86. This is sufficient for for building Genode where a toolchain is provided as an overlay. Toolchain: git+https://git.sr.ht/~ehmry/genodepkgs?rev=14fc773ac9ecd2cbb30cb4612b284eee83d83546
2020-03-24 09:02:18 +01:00
Define a i686-genode system double
2020-08-04 17:50:55 +02:00
"aarch64-genode" "i686-genode" "x86_64-genode"
lib: Fix system parsing, and use for doubles lists The old hard-coded lists are now used to test system parsing. In the process, make an `assertTrue` in release lib for eval tests; also use it in release-cross
2017-02-09 22:09:47 +01:00
];
allParsed = map parse.mkSystemFromString all;
filterDoubles = f: map parse.doubleFromSystem (lists.filter f allParsed);
treewide: remove redundant rec
2019-08-13 23:52:01 +02:00
in {
lib: Fix system parsing, and use for doubles lists The old hard-coded lists are now used to test system parsing. In the process, make an `assertTrue` in release lib for eval tests; also use it in release-cross
2017-02-09 22:09:47 +01:00
inherit all;
* selectMaintained (renamed): don't use meta.maintainer, just use meta.platforms. * Valgrind *should* work on Darwin now, except that our GCC doesn't recognise the -arch flag. svn path=/nixpkgs/trunk/; revision=17372
2009-09-23 21:45:02 +02:00
lib.platforms: alphabetize
2016-02-26 19:53:03 +01:00
none = [];
treewide: isArm -> isAarch32 Following legacy packing conventions, `isArm` was defined just for 32-bit ARM instruction set. This is confusing to non packagers though, because Aarch64 is an ARM instruction set. The official ARM overview for ARMv8[1] is surprisingly not confusing, given the overall state of affairs for ARM naming conventions, and offers us a solution. It divides the nomenclature into three levels: ``` ISA: ARMv8 {-A, -R, -M} / \ Mode: Aarch32 Aarch64 | / \ Encoding: A64 A32 T32 ``` At the top is the overall v8 instruction set archicture. Second are the two modes, defined by bitwidth but differing in other semantics too, and buttom are the encodings, (hopefully?) isomorphic if they encode the same mode. The 32 bit encodings are mostly backwards compatible with previous non-Thumb and Thumb encodings, and if so we can pun the mode names to instead mean "sets of compatable or isomorphic encodings", and then voilà we have nice names for 32-bit and 64-bit arm instruction sets which do not use the word ARM so as to not confused either laymen or experienced ARM packages. [1]: https://developer.arm.com/products/architecture/a-profile
2018-03-20 03:41:06 +01:00
arm = filterDoubles predicates.isAarch32;
treewide: get rid of platforms.allBut Negative reasoning like `allBut` is a bad idea with an open world of platforms. Concretely, if we add a new, quite different sort of platform, existing packages with `allBut` will claim they work on it even though they probably won't.
2018-03-13 23:00:52 +01:00
aarch64 = filterDoubles predicates.isAarch64;
x86 = filterDoubles predicates.isx86;
lib: Make platform predicates more ergonomic to use `hostPlatform.isDarwin` instead of `lib.system.parse.isDarwin hostPlatform.parsed`
2017-05-21 19:39:23 +02:00
i686 = filterDoubles predicates.isi686;
x86_64 = filterDoubles predicates.isx86_64;
lib, stdenv: Check `meta.platforms` against host platform and be open world First, we need check against the host platform, not the build platform. That's simple enough. Second, we move away from exahustive finite case analysis (i.e. exhaustively listing all platforms the package builds on). That only work in a closed-world setting, where we know all platforms we might build one. But with cross compilation, we may be building for arbitrary platforms, So we need fancier filters. This is the closed world to open world change. The solution is instead of having a list of systems (strings in the form "foo-bar"), we have a list of of systems or "patterns", i.e. attributes that partially match the output of the parsers in `lib.systems.parse`. The "check meta" logic treats the systems strings as an exact whitelist just as before, but treats the patterns as a fuzzy whitelist, intersecting the actual `hostPlatform` with the pattern and then checking for equality. (This is done using `matchAttrs`). The default convenience lists for `meta.platforms` are now changed to be lists of patterns (usually a single pattern) in `lib/systems/for-meta.nix` for maximum flexibility under this new system. Fixes #30902
2018-01-31 06:11:03 +01:00
mips = filterDoubles predicates.isMips;
systems: add riscv double This was never listed in doubles.nix! Not sure why?
2019-04-30 17:50:45 +02:00
riscv = filterDoubles predicates.isRiscV;
initial implementation of vc4 cross-compile
2019-11-02 16:47:38 +01:00
vc4 = filterDoubles predicates.isVc4;
Fix lib tests js-ghcjs didn't fit in an existing categor.
2019-11-25 15:09:50 +01:00
js = filterDoubles predicates.isJavaScript;
lib: Make platform predicates more ergonomic to use `hostPlatform.isDarwin` instead of `lib.system.parse.isDarwin hostPlatform.parsed`
2017-05-21 19:39:23 +02:00
cygwin = filterDoubles predicates.isCygwin;
darwin = filterDoubles predicates.isDarwin;
freebsd = filterDoubles predicates.isFreeBSD;
hurd: cleanup unmaintained target This has been not touched in 6 years. Let's remove it to cause less problems when adding new cross-compiling infrastructure. This also simplify gcc significantly.
2018-08-28 23:17:54 +02:00
# Should be better, but MinGW is unclear.
tests/systems.nix: fix tests these weren’t being run correctly
2018-10-18 21:12:49 +02:00
gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabi; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabihf; });
lib: Make platform predicates more ergonomic to use `hostPlatform.isDarwin` instead of `lib.system.parse.isDarwin hostPlatform.parsed`
2017-05-21 19:39:23 +02:00
illumos = filterDoubles predicates.isSunOS;
linux = filterDoubles predicates.isLinux;
netbsd = filterDoubles predicates.isNetBSD;
openbsd = filterDoubles predicates.isOpenBSD;
unix = filterDoubles predicates.isUnix;
wasm: init cross target Adds pkgsCross.wasm32 and pkgsCross.wasm64. Use it to build Nixpkgs with a WebAssembly toolchain. stdenv/cross: use static overlay on isWasm isWasm doesn’t make sense dynamically linked.
2019-01-30 03:01:24 +01:00
wasi = filterDoubles predicates.isWasi;
redox: add as target
2020-07-21 22:11:36 +02:00
redox = filterDoubles predicates.isRedox;
systems/doubles.nix: add mingw doubles this makes it easier to show what supports windows vs. unix.
2018-10-17 04:56:58 +02:00
windows = filterDoubles predicates.isWindows;
lib/systems: Add Genode platform definitions Add platform definitions for 64-bit ARM and x86. This is sufficient for for building Genode where a toolchain is provided as an overlay. Toolchain: git+https://git.sr.ht/~ehmry/genodepkgs?rev=14fc773ac9ecd2cbb30cb4612b284eee83d83546
2020-03-24 09:02:18 +01:00
genode = filterDoubles predicates.isGenode;
lib.platforms: alphabetize
2016-02-26 19:53:03 +01:00
systems: fix lib-tests These were broken by the added system doubles. This just adds those to the lib-tests.
2019-06-04 20:49:58 +02:00
embedded = filterDoubles predicates.isNone;
mesa: armv7a-linux supports mesa
2019-02-22 03:02:59 +01:00
mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "armv7a-linux" "aarch64-linux" "powerpc64le-linux"];
Adding eProver to buildfarm via maintanership svn path=/nixpkgs/trunk/; revision=16854
2009-08-25 10:28:08 +02:00
}
Reference in a new issue Copy permalink