summary refs log tree commit diff
diff options
context:
space:
mode:
authorsternenseemann <sternenseemann@systemli.org>2022-05-27 14:52:42 +0200
committerGitHub <noreply@github.com>2022-05-27 14:52:42 +0200
commitd01774baa3e358c8395fc98588452d5b1f0c9a37 (patch)
tree29d9d658346abd81817f338efab2a90a78ca5cc6
parent18e4c7d8d12b2e43a9b4294af212f49d87d2c35b (diff)
parent089ff89f49e4417cb42450d70704c7319e36091d (diff)
downloadnixpkgs-d01774baa3e358c8395fc98588452d5b1f0c9a37.tar
nixpkgs-d01774baa3e358c8395fc98588452d5b1f0c9a37.tar.gz
nixpkgs-d01774baa3e358c8395fc98588452d5b1f0c9a37.tar.bz2
nixpkgs-d01774baa3e358c8395fc98588452d5b1f0c9a37.tar.lz
nixpkgs-d01774baa3e358c8395fc98588452d5b1f0c9a37.tar.xz
nixpkgs-d01774baa3e358c8395fc98588452d5b1f0c9a37.tar.zst
nixpkgs-d01774baa3e358c8395fc98588452d5b1f0c9a37.zip
Merge pull request #174917 from alyssais/scaleway-c1
lib.systems: drop scaleway-c1
-rw-r--r--lib/systems/examples.nix2
-rw-r--r--lib/systems/platforms.nix7
-rw-r--r--pkgs/stdenv/linux/make-bootstrap-tools-cross.nix1
-rw-r--r--pkgs/top-level/release-cross.nix1
4 files changed, 0 insertions, 11 deletions
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 170db6fb9fa..e41290864ed 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -79,8 +79,6 @@ rec {
     useLLVM = true;
   };
 
-  scaleway-c1 = armv7l-hf-multiplatform // platforms.scaleway-c1;
-
   pogoplug4 = {
     config = "armv5tel-unknown-linux-gnueabi";
   } // platforms.pogoplug4;
diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix
index 72535372fc2..d93d292a9fb 100644
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -242,13 +242,6 @@ rec {
     };
   };
 
-  scaleway-c1 = armv7l-hf-multiplatform // {
-    gcc = {
-      cpu = "cortex-a9";
-      fpu = "vfpv3";
-    };
-  };
-
   utilite = {
     linux-kernel = {
       name = "utilite";
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index 9fc2300b6ef..02eb112451b 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -8,7 +8,6 @@ let
   lib = import ../../../lib;
 in lib.mapAttrs (n: make) (with lib.systems.examples; {
   armv5tel   = sheevaplug;
-  scaleway   = scaleway-c1;
   pogoplug4  = pogoplug4;
   armv6l     = raspberryPi;
   armv7l     = armv7l-hf-multiplatform;
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index 63a4a335dc9..ba4f998296e 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -153,7 +153,6 @@ in
 
   /* Linux on armv7l-hf */
   armv7l-hf = mapTestOnCross lib.systems.examples.armv7l-hf-multiplatform linuxCommon;
-  scaleway-c1 = mapTestOnCross lib.systems.examples.scaleway-c1 linuxCommon;
 
   pogoplug4 = mapTestOnCross lib.systems.examples.pogoplug4 linuxCommon;