diff --git a/flake.lock b/flake.lock index aa95dc4..09a0a1e 100644 --- a/flake.lock +++ b/flake.lock @@ -2,15 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1644115497, - "narHash": "sha256-L9tz1lq2JrZJQr1kdaAp0ksp6WMMuRCqF4i6R0bakGM=", - "owner": "NixOS", + "lastModified": 1647852803, + "narHash": "sha256-m2rS0BUaFi/e7Om3qF28Hi4zFGUmKOORAzsID6+LtmM=", + "owner": "Mic92", "repo": "nixpkgs", - "rev": "955079ad77917d544a88fcae9f6ca31738941254", + "rev": "1471db9d8406f120b4b0955d700e517d96bebe59", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "Mic92", + "ref": "fix-platforms", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 053b9c3..006edf5 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "Prebuild cross-toolchains for various targets"; - inputs.nixpkgs.url = "github:NixOS/nixpkgs"; + inputs.nixpkgs.url = "github:Mic92/nixpkgs/fix-platforms"; outputs = { self, nixpkgs }: let pkgsCross = nixpkgs.legacyPackages.x86_64-linux.pkgsCross; @@ -31,7 +31,6 @@ "ppc64-musl" "ppc64" "ppcle-embedded" - "raspberryPi" "remarkable1" "remarkable2" "riscv64" @@ -87,12 +86,17 @@ in { packages.x86_64-linux = lib.filterAttrs (n: v: !( - (lib.hasPrefix "iphone" n) || # not supported on Linux - (lib.hasSuffix "darwin" n) || # not supported on Linux - n == "amd64-netbsd" || # deprecated alias - n == "x86_64-netbsd-llvm" || # this is unfinished buisness - n == "fuloongminipc" || # some definition conflict broken with glibc <-> kernelHeaders - n == "vc4" || # binutils/gcc broken; clevera wants to fix it + (lib.hasPrefix "iphone" n) || # not supported on Linux + (lib.hasSuffix "darwin" n) || # not supported on Linux + n == "amd64-netbsd" || # deprecated alias + n == "x86_64-netbsd-llvm" || # this is unfinished buisness + n == "fuloongminipc" || # some definition conflict broken with glibc <-> kernelHeaders + n == "vc4" || # binutils/gcc broken; clevera wants to fix it + (lib.hasPrefix "mipsisa" n) || # junk, never worked, should be not in nixpkgs + n == "mipsel-linux-gnu" || # junk, unknown abi o32 + n == "mips-linux-gnu" || # junk, unknown abi o32 + n == "mips64el-linux-gnuabin32" || # junk + n == "mips64-linux-gnuabin32" || # junk false ) ) pkgsCross;