From 57024a21290d6f29aac9d8df0fbe107663b3945e Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Thu, 8 Feb 2024 23:21:00 +0100
Subject: [oxalica-toolchain-only] remove custom toolchains from toolchains.nix

---
 nix/toolchain.nix | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

(limited to 'nix/toolchain.nix')

diff --git a/nix/toolchain.nix b/nix/toolchain.nix
index 532db74e..c4fef9ab 100644
--- a/nix/toolchain.nix
+++ b/nix/toolchain.nix
@@ -3,29 +3,9 @@
 with import ./common.nix;
 
 let
-  platforms = [
-    #"x86_64-unknown-linux-musl"
-    "i686-unknown-linux-musl"
-    #"aarch64-unknown-linux-musl"
-    "armv6l-unknown-linux-musleabihf"
-  ];
-  pkgsList = builtins.map (target:
-    import pkgsSrc {
-      inherit system;
-      crossSystem = {
-        config = target;
-        isStatic = true;
-      };
-      overlays = [ cargo2nixOverlay ];
-    }) platforms;
   pkgsHost = import pkgsSrc { };
-  lib = pkgsHost.lib;
   kaniko = (import ./kaniko.nix) pkgsHost;
   winscp = (import ./winscp.nix) pkgsHost;
   manifestTool = (import ./manifest-tool.nix) pkgsHost;
-in lib.flatten (builtins.map (pkgs: [
-  pkgs.rustPlatform.rust.rustc
-  pkgs.rustPlatform.rust.cargo
-  pkgs.buildPackages.stdenv.cc
-]) pkgsList) ++ [ kaniko winscp manifestTool ]
+in [ kaniko winscp manifestTool ]
 
-- 
cgit v1.2.3


From d35d4599de13d2bad95523547bb368f1c754a014 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Fri, 9 Feb 2024 11:15:52 +0100
Subject: [nix-improvements] use kaniko and manifest-tools from nixpkgs,
 simplify

---
 nix/toolchain.nix | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 nix/toolchain.nix

(limited to 'nix/toolchain.nix')

diff --git a/nix/toolchain.nix b/nix/toolchain.nix
deleted file mode 100644
index c4fef9ab..00000000
--- a/nix/toolchain.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ system ? builtins.currentSystem, }:
-
-with import ./common.nix;
-
-let
-  pkgsHost = import pkgsSrc { };
-  kaniko = (import ./kaniko.nix) pkgsHost;
-  winscp = (import ./winscp.nix) pkgsHost;
-  manifestTool = (import ./manifest-tool.nix) pkgsHost;
-in [ kaniko winscp manifestTool ]
-
-- 
cgit v1.2.3