mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-19 04:02:10 +00:00
152c63c9ff
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 )
131 lines
2.8 KiB
Nix
131 lines
2.8 KiB
Nix
# These can be passed to nixpkgs as either the `localSystem` or
|
|
# `crossSystem`. They are put here for user convenience, but also used by cross
|
|
# tests and linux cross stdenv building, so handle with care!
|
|
{ lib }:
|
|
let platforms = import ./platforms.nix { inherit lib; }; in
|
|
|
|
rec {
|
|
#
|
|
# Linux
|
|
#
|
|
|
|
sheevaplug = rec {
|
|
config = "armv5tel-unknown-linux-gnueabi";
|
|
bigEndian = false;
|
|
arch = "armv5tel";
|
|
float = "soft";
|
|
withTLS = true;
|
|
libc = "glibc";
|
|
platform = platforms.sheevaplug;
|
|
openssl.system = "linux-generic32";
|
|
inherit (platform) gcc;
|
|
};
|
|
|
|
raspberryPi = rec {
|
|
config = "armv6l-unknown-linux-gnueabihf";
|
|
bigEndian = false;
|
|
arch = "armv6l";
|
|
float = "hard";
|
|
fpu = "vfp";
|
|
withTLS = true;
|
|
libc = "glibc";
|
|
platform = platforms.raspberrypi;
|
|
openssl.system = "linux-generic32";
|
|
inherit (platform) gcc;
|
|
};
|
|
|
|
armv7l-hf-multiplatform = rec {
|
|
config = "arm-unknown-linux-gnueabihf";
|
|
bigEndian = false;
|
|
arch = "armv7-a";
|
|
float = "hard";
|
|
fpu = "vfpv3-d16";
|
|
withTLS = true;
|
|
libc = "glibc";
|
|
platform = platforms.armv7l-hf-multiplatform;
|
|
openssl.system = "linux-generic32";
|
|
inherit (platform) gcc;
|
|
};
|
|
|
|
aarch64-multiplatform = rec {
|
|
config = "aarch64-unknown-linux-gnu";
|
|
bigEndian = false;
|
|
arch = "aarch64";
|
|
withTLS = true;
|
|
libc = "glibc";
|
|
platform = platforms.aarch64-multiplatform;
|
|
inherit (platform) gcc;
|
|
};
|
|
|
|
scaleway-c1 = armv7l-hf-multiplatform // rec {
|
|
platform = platforms.scaleway-c1;
|
|
inherit (platform) gcc;
|
|
inherit (gcc) fpu;
|
|
};
|
|
|
|
pogoplug4 = rec {
|
|
arch = "armv5tel";
|
|
config = "armv5tel-softfloat-linux-gnueabi";
|
|
float = "soft";
|
|
|
|
platform = platforms.pogoplug4;
|
|
|
|
inherit (platform) gcc;
|
|
libc = "glibc";
|
|
|
|
withTLS = true;
|
|
openssl.system = "linux-generic32";
|
|
};
|
|
|
|
fuloongminipc = rec {
|
|
config = "mips64el-unknown-linux-gnu";
|
|
bigEndian = false;
|
|
arch = "mips";
|
|
float = "hard";
|
|
withTLS = true;
|
|
libc = "glibc";
|
|
platform = platforms.fuloong2f_n32;
|
|
openssl.system = "linux-generic32";
|
|
inherit (platform) gcc;
|
|
};
|
|
|
|
#
|
|
# Darwin
|
|
#
|
|
|
|
iphone64 = {
|
|
config = "aarch64-apple-darwin14";
|
|
arch = "arm64";
|
|
libc = "libSystem";
|
|
platform = {};
|
|
};
|
|
|
|
iphone32 = {
|
|
config = "arm-apple-darwin10";
|
|
arch = "armv7-a";
|
|
libc = "libSystem";
|
|
platform = {};
|
|
};
|
|
|
|
#
|
|
# Windows
|
|
#
|
|
|
|
# 32 bit mingw-w64
|
|
mingw32 = {
|
|
config = "i686-pc-mingw32";
|
|
arch = "x86"; # Irrelevant
|
|
libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
|
|
platform = {};
|
|
};
|
|
|
|
# 64 bit mingw-w64
|
|
mingwW64 = {
|
|
# That's the triplet they use in the mingw-w64 docs.
|
|
config = "x86_64-pc-mingw32";
|
|
arch = "x86_64"; # Irrelevant
|
|
libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
|
|
platform = {};
|
|
};
|
|
}
|