diff options
author | John Ericson <git@JohnEricson.me> | 2024-05-01 10:03:12 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-01 10:03:12 -0400 |
commit | c38dd73dece84257b655cf809b3cb65d5d7de27d (patch) | |
tree | e86be1af7bba0ccdf9f11160cbaa482252bc3b72 | |
parent | 9f84a634600901698925b7deae0955ec745cf41b (diff) | |
parent | 266cdd7d3795263bbcb45ebcf3923a17985d2fb2 (diff) |
Merge pull request #308032 from obsidiansystems/freebsd-no-suffix-version
treewide: freebsd13 -> freebsd
-rw-r--r-- | lib/systems/doubles.nix | 2 | ||||
-rw-r--r-- | lib/systems/examples.nix | 2 | ||||
-rw-r--r-- | lib/systems/parse.nix | 6 | ||||
-rw-r--r-- | lib/tests/systems.nix | 6 | ||||
-rw-r--r-- | pkgs/development/compilers/rust/rustc.nix | 2 | ||||
-rw-r--r-- | pkgs/development/interpreters/ngn-k/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/libunwind/default.nix | 2 |
7 files changed, 9 insertions, 13 deletions
diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 13f029ee1f40b..b4cd5acfcc5b2 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -13,7 +13,7 @@ let "x86_64-darwin" "i686-darwin" "aarch64-darwin" "armv7a-darwin" # FreeBSD - "i686-freebsd13" "x86_64-freebsd13" + "i686-freebsd" "x86_64-freebsd" # Genode "aarch64-genode" "i686-genode" "x86_64-genode" diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index b16445eadfea8..8a3726f369682 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -328,7 +328,7 @@ rec { # BSDs x86_64-freebsd = { - config = "x86_64-unknown-freebsd13"; + config = "x86_64-unknown-freebsd"; useLLVM = true; }; diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 191e9734b879a..4890912d7fed4 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -326,11 +326,7 @@ rec { # the normalized name for macOS. macos = { execFormat = macho; families = { inherit darwin; }; name = "darwin"; }; ios = { execFormat = macho; families = { inherit darwin; }; }; - # A tricky thing about FreeBSD is that there is no stable ABI across - # versions. That means that putting in the version as part of the - # config string is paramount. - freebsd12 = { execFormat = elf; families = { inherit bsd; }; name = "freebsd"; version = 12; }; - freebsd13 = { execFormat = elf; families = { inherit bsd; }; name = "freebsd"; version = 13; }; + freebsd = { execFormat = elf; families = { inherit bsd; }; name = "freebsd"; }; linux = { execFormat = elf; families = { }; }; netbsd = { execFormat = elf; families = { inherit bsd; }; }; none = { execFormat = unknown; families = { }; }; diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix index e142ff307fbd4..03c5d68689624 100644 --- a/lib/tests/systems.nix +++ b/lib/tests/systems.nix @@ -40,7 +40,7 @@ lib.runTests ( testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv6l-netbsd" "armv6l-none" "armv7a-linux" "armv7a-netbsd" "armv7l-linux" "armv7l-netbsd" "arm-none" "armv7a-darwin" ]; testarmv7 = mseteq armv7 [ "armv7a-darwin" "armv7a-linux" "armv7l-linux" "armv7a-netbsd" "armv7l-netbsd" ]; - testi686 = mseteq i686 [ "i686-linux" "i686-freebsd13" "i686-genode" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" "i686-none" "i686-darwin" ]; + testi686 = mseteq i686 [ "i686-linux" "i686-freebsd" "i686-genode" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" "i686-none" "i686-darwin" ]; testmips = mseteq mips [ "mips-none" "mips64-none" "mips-linux" "mips64-linux" "mips64el-linux" "mipsel-linux" "mipsel-netbsd" ]; testmmix = mseteq mmix [ "mmix-mmixware" ]; testpower = mseteq power [ "powerpc-netbsd" "powerpc-none" "powerpc64-linux" "powerpc64le-linux" "powerpcle-none" ]; @@ -48,11 +48,11 @@ lib.runTests ( testriscv32 = mseteq riscv32 [ "riscv32-linux" "riscv32-netbsd" "riscv32-none" ]; testriscv64 = mseteq riscv64 [ "riscv64-linux" "riscv64-netbsd" "riscv64-none" ]; tests390x = mseteq s390x [ "s390x-linux" "s390x-none" ]; - testx86_64 = mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd13" "x86_64-genode" "x86_64-redox" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" "x86_64-windows" "x86_64-none" ]; + testx86_64 = mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-genode" "x86_64-redox" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" "x86_64-windows" "x86_64-none" ]; testcygwin = mseteq cygwin [ "i686-cygwin" "x86_64-cygwin" ]; testdarwin = mseteq darwin [ "x86_64-darwin" "i686-darwin" "aarch64-darwin" "armv7a-darwin" ]; - testfreebsd = mseteq freebsd [ "i686-freebsd13" "x86_64-freebsd13" ]; + testfreebsd = mseteq freebsd [ "i686-freebsd" "x86_64-freebsd" ]; testgenode = mseteq genode [ "aarch64-genode" "i686-genode" "x86_64-genode" ]; testredox = mseteq redox [ "x86_64-redox" ]; testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */); diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index ee4ee37dfc98b..4c02692b75bd5 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -274,7 +274,7 @@ in stdenv.mkDerivation (finalAttrs: { # Platforms with host tools from # https://doc.rust-lang.org/nightly/rustc/platform-support.html "x86_64-darwin" "i686-darwin" "aarch64-darwin" - "i686-freebsd13" "x86_64-freebsd13" + "i686-freebsd" "x86_64-freebsd" "x86_64-solaris" "aarch64-linux" "armv6l-linux" "armv7l-linux" "i686-linux" "loongarch64-linux" "powerpc64-linux" "powerpc64le-linux" diff --git a/pkgs/development/interpreters/ngn-k/default.nix b/pkgs/development/interpreters/ngn-k/default.nix index 0a24bbdfe0f79..9ec1f0b673d3d 100644 --- a/pkgs/development/interpreters/ngn-k/default.nix +++ b/pkgs/development/interpreters/ngn-k/default.nix @@ -65,6 +65,6 @@ useStdenv.mkDerivation { homepage = "https://codeberg.org/ngn/k"; license = lib.licenses.agpl3Only; maintainers = [ lib.maintainers.sternenseemann ]; - platforms = [ "x86_64-linux" "x86_64-freebsd13" ]; + platforms = [ "x86_64-linux" "x86_64-freebsd" ]; }; } diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 66f9f076dab49..5144abc6dc5b6 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { description = "A portable and efficient API to determine the call-chain of a program"; maintainers = with maintainers; [ orivej ]; # https://github.com/libunwind/libunwind#libunwind - platforms = [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-freebsd13" "i686-linux" "loongarch64-linux" "mips64el-linux" "mipsel-linux" "powerpc64-linux" "powerpc64le-linux" "riscv64-linux" "s390x-linux" "x86_64-freebsd13" "x86_64-linux" "x86_64-solaris" ]; + platforms = [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-freebsd" "i686-linux" "loongarch64-linux" "mips64el-linux" "mipsel-linux" "powerpc64-linux" "powerpc64le-linux" "riscv64-linux" "s390x-linux" "x86_64-freebsd" "x86_64-linux" "x86_64-solaris" ]; license = licenses.mit; }; } |