diff --git a/pkgs/by-name/gc/gcc-arm-embedded-10/package.nix b/pkgs/by-name/gc/gcc-arm-embedded-10/package.nix deleted file mode 100644 index 119c137ffd64..000000000000 --- a/pkgs/by-name/gc/gcc-arm-embedded-10/package.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - ncurses5, -}: - -stdenv.mkDerivation rec { - pname = "gcc-arm-embedded"; - version = "10.3.1"; - release = "10.3-2021.10"; - - suffix = - { - aarch64-linux = "aarch64-linux"; - x86_64-darwin = "mac"; - x86_64-linux = "x86_64-linux"; - } - .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${release}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; - sha256 = - { - aarch64-linux = "020j8gkzc0i0b74vz98gvngnwjm5222j1gk5nswfk6587krba1gn"; - x86_64-darwin = "0fr8pki2g4bfk1rk90dzwql37d0b71ngzs9zyx0g2jainan3sqgv"; - x86_64-linux = "18y92vpl22hf74yqdvmpw8adrkl92s4crzzs6avm05md37qb9nwp"; - } - .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - }; - - dontConfigure = true; - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - - installPhase = '' - mkdir -p $out - cp -r * $out - ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man - ''; - - preFixup = lib.optionalString stdenv.isLinux '' - find $out -type f | while read f; do - patchelf "$f" > /dev/null 2>&1 || continue - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${ - lib.makeLibraryPath [ - "$out" - stdenv.cc.cc - ncurses5 - ] - } "$f" || true - done - ''; - - meta = with lib; { - description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; - homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; - license = with licenses; [ - bsd2 - gpl2 - gpl3 - lgpl21 - lgpl3 - mit - ]; - maintainers = with maintainers; [ - prusnak - prtzl - ]; - platforms = [ - "x86_64-linux" - "aarch64-linux" - "x86_64-darwin" - ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/by-name/gc/gcc-arm-embedded-11/package.nix b/pkgs/by-name/gc/gcc-arm-embedded-11/package.nix deleted file mode 100644 index bd2525f3d6c6..000000000000 --- a/pkgs/by-name/gc/gcc-arm-embedded-11/package.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - ncurses5, - libxcrypt-legacy, -}: - -stdenv.mkDerivation rec { - pname = "gcc-arm-embedded"; - version = "11.3.rel1"; - - platform = - { - aarch64-linux = "aarch64"; - x86_64-darwin = "darwin-x86_64"; - x86_64-linux = "x86_64"; - } - .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu/${version}/binrel/arm-gnu-toolchain-${version}-${platform}-arm-none-eabi.tar.xz"; - sha256 = - { - aarch64-linux = "0pmm5r0k5mxd5drbn2s8a7qkm8c4fi8j5y31c70yrp0qs08kqwbc"; - x86_64-darwin = "1kr9kd9p2xk84fa99zf3gz5lkww2i9spqkjigjwakfkzbva56qw2"; - x86_64-linux = "08b1w1zmj4z80k59zmlc1bf34lg8d7z65fwvp5ir2pb1d1zxh86l"; - } - .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - }; - - dontConfigure = true; - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - - installPhase = '' - mkdir -p $out - cp -r * $out - # these binaries require ancient Python 3.8 not available in Nixpkgs - rm $out/bin/{arm-none-eabi-gdb-py,arm-none-eabi-gdb-add-index-py} || : - ''; - - preFixup = lib.optionalString stdenv.isLinux '' - find $out -type f | while read f; do - patchelf "$f" > /dev/null 2>&1 || continue - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${ - lib.makeLibraryPath [ - "$out" - stdenv.cc.cc - ncurses5 - libxcrypt-legacy - ] - } "$f" || true - done - ''; - - meta = with lib; { - description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; - homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; - license = with licenses; [ - bsd2 - gpl2 - gpl3 - lgpl21 - lgpl3 - mit - ]; - maintainers = with maintainers; [ - prusnak - prtzl - ]; - platforms = [ - "x86_64-linux" - "aarch64-linux" - "x86_64-darwin" - ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/by-name/gc/gcc-arm-embedded-12/package.nix b/pkgs/by-name/gc/gcc-arm-embedded-12/package.nix deleted file mode 100644 index 73eb2ceff0b2..000000000000 --- a/pkgs/by-name/gc/gcc-arm-embedded-12/package.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - ncurses5, - libxcrypt-legacy, -}: - -stdenv.mkDerivation rec { - pname = "gcc-arm-embedded"; - version = "12.3.rel1"; - - platform = - { - aarch64-darwin = "darwin-arm64"; - aarch64-linux = "aarch64"; - x86_64-darwin = "darwin-x86_64"; - x86_64-linux = "x86_64"; - } - .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu/${version}/binrel/arm-gnu-toolchain-${version}-${platform}-arm-none-eabi.tar.xz"; - sha256 = - { - aarch64-darwin = "sha256-Oy7uC99xwbvrPDt0JPv3vZ1cPw9aOkp4FZyeOtIZ570="; - aarch64-linux = "sha256-FMBIfVdT9gcdJOVoiB98fmf4DdgxZd7FFks3MTlK9DE="; - x86_64-darwin = "sha256-5u2L+TD62c4z4SCrkLNpV7H3efzKpt5snKmliYLAQpE="; - x86_64-linux = "sha256-EqKBVkQxjrzOr4S+q7Zl0JJLbnniEEhFLFMxpWMyswk="; - } - .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - }; - - dontConfigure = true; - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - - installPhase = '' - mkdir -p $out - cp -r * $out - # these binaries require ancient Python 3.8 not available in Nixpkgs - rm $out/bin/{arm-none-eabi-gdb-py,arm-none-eabi-gdb-add-index-py} || : - ''; - - preFixup = lib.optionalString stdenv.isLinux '' - find $out -type f | while read f; do - patchelf "$f" > /dev/null 2>&1 || continue - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${ - lib.makeLibraryPath [ - "$out" - stdenv.cc.cc - ncurses5 - libxcrypt-legacy - ] - } "$f" || true - done - ''; - - meta = with lib; { - description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; - homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; - license = with licenses; [ - bsd2 - gpl2 - gpl3 - lgpl21 - lgpl3 - mit - ]; - maintainers = with maintainers; [ - prusnak - prtzl - ]; - platforms = [ - "x86_64-linux" - "aarch64-linux" - "x86_64-darwin" - "aarch64-darwin" - ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/by-name/gc/gcc-arm-embedded-6/package.nix b/pkgs/by-name/gc/gcc-arm-embedded-6/package.nix deleted file mode 100644 index 5d6d75f5e461..000000000000 --- a/pkgs/by-name/gc/gcc-arm-embedded-6/package.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - ncurses5, -}: - -stdenv.mkDerivation rec { - pname = "gcc-arm-embedded"; - version = "6.3.1"; - release = "6-2017-q2-update"; - subdir = "6-2017q2"; - - suffix = - { - x86_64-darwin = "mac"; - x86_64-linux = "linux"; - } - .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; - sha256 = - { - x86_64-darwin = "0019ylpq4inq7p5gydpmc9m8ni72fz2csrjlqmgx1698998q0c3x"; - x86_64-linux = "1hvwi02mx34al525sngnl0cm7dkmzxfkb1brq9kvbv28wcplp3p6"; - } - .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - }; - - dontConfigure = true; - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - - installPhase = '' - mkdir -p $out - cp -r * $out - ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man - ''; - - preFixup = lib.optionalString stdenv.isLinux '' - find $out -type f | while read f; do - patchelf "$f" > /dev/null 2>&1 || continue - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${ - lib.makeLibraryPath [ - "$out" - stdenv.cc.cc - ncurses5 - ] - } "$f" || true - done - ''; - - meta = with lib; { - description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; - homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; - license = with licenses; [ - bsd2 - gpl2 - gpl3 - lgpl21 - lgpl3 - mit - ]; - maintainers = with maintainers; [ prusnak ]; - platforms = [ - "x86_64-linux" - "x86_64-darwin" - ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/by-name/gc/gcc-arm-embedded-7/package.nix b/pkgs/by-name/gc/gcc-arm-embedded-7/package.nix deleted file mode 100644 index 1d594b3a320b..000000000000 --- a/pkgs/by-name/gc/gcc-arm-embedded-7/package.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - ncurses5, -}: - -stdenv.mkDerivation rec { - pname = "gcc-arm-embedded"; - version = "7.3.1"; - release = "7-2018-q2-update"; - subdir = "7-2018q2"; - - suffix = - { - x86_64-darwin = "mac"; - x86_64-linux = "linux"; - } - .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; - sha256 = - { - x86_64-darwin = "0nc7m0mpa39qyhfyydxkkyqm7spfc27xf6ygi2vd2aym4r9azi61"; - x86_64-linux = "0sgysp3hfpgrkcbfiwkp0a7ymqs02khfbrjabm52b5z61sgi05xv"; - } - .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - }; - - dontConfigure = true; - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - - installPhase = '' - mkdir -p $out - cp -r * $out - ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man - ''; - - preFixup = lib.optionalString stdenv.isLinux '' - find $out -type f | while read f; do - patchelf "$f" > /dev/null 2>&1 || continue - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${ - lib.makeLibraryPath [ - "$out" - stdenv.cc.cc - ncurses5 - ] - } "$f" || true - done - ''; - - meta = with lib; { - description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; - homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; - license = with licenses; [ - bsd2 - gpl2 - gpl3 - lgpl21 - lgpl3 - mit - ]; - maintainers = with maintainers; [ prusnak ]; - platforms = [ - "x86_64-linux" - "x86_64-darwin" - ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/by-name/gc/gcc-arm-embedded-8/package.nix b/pkgs/by-name/gc/gcc-arm-embedded-8/package.nix deleted file mode 100644 index 57960b832b62..000000000000 --- a/pkgs/by-name/gc/gcc-arm-embedded-8/package.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - ncurses5, -}: - -stdenv.mkDerivation rec { - pname = "gcc-arm-embedded"; - version = "8.3.1"; - release = "8-2019-q3-update"; - subdir = "8-2019q3/RC1.1"; - - suffix = - { - x86_64-darwin = "mac"; - x86_64-linux = "linux"; - } - .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; - sha256 = - { - x86_64-darwin = "fc235ce853bf3bceba46eff4b95764c5935ca07fc4998762ef5e5b7d05f37085"; - x86_64-linux = "b50b02b0a16e5aad8620e9d7c31110ef285c1dde28980b1a9448b764d77d8f92"; - } - .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - }; - - dontConfigure = true; - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - - installPhase = '' - mkdir -p $out - cp -r * $out - ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man - ''; - - preFixup = lib.optionalString stdenv.isLinux '' - find $out -type f | while read f; do - patchelf "$f" > /dev/null 2>&1 || continue - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${ - lib.makeLibraryPath [ - "$out" - stdenv.cc.cc - ncurses5 - ] - } "$f" || true - done - ''; - - meta = with lib; { - description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; - homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; - license = with licenses; [ - bsd2 - gpl2 - gpl3 - lgpl21 - lgpl3 - mit - ]; - maintainers = with maintainers; [ prusnak ]; - platforms = [ - "x86_64-linux" - "x86_64-darwin" - ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/by-name/gc/gcc-arm-embedded-9/package.nix b/pkgs/by-name/gc/gcc-arm-embedded-9/package.nix deleted file mode 100644 index 04db68661c77..000000000000 --- a/pkgs/by-name/gc/gcc-arm-embedded-9/package.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - ncurses5, -}: - -stdenv.mkDerivation rec { - pname = "gcc-arm-embedded"; - version = "9.3.1"; - release = "9-2020-q2-update"; - subdir = "9-2020q2"; - - suffix = - { - aarch64-linux = "aarch64-linux"; - x86_64-darwin = "mac"; - x86_64-linux = "x86_64-linux"; - } - .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; - sha256 = - { - aarch64-linux = "1b5q2y710hy7lddj8vj3zl54gfl74j30kx3hk3i81zrcbv16ah8z"; - x86_64-darwin = "1ils9z16wrvglh72m428y5irmd36biq79yj86756whib8izbifdv"; - x86_64-linux = "07zi2yr5gvhpbij5pnj49zswb9g2gw7zqp4xwwniqmq477h2xp2s"; - } - .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - }; - - dontConfigure = true; - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - - installPhase = '' - mkdir -p $out - cp -r * $out - ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man - ''; - - preFixup = lib.optionalString stdenv.isLinux '' - find $out -type f | while read f; do - patchelf "$f" > /dev/null 2>&1 || continue - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${ - lib.makeLibraryPath [ - "$out" - stdenv.cc.cc - ncurses5 - ] - } "$f" || true - done - ''; - - meta = with lib; { - description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; - homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; - license = with licenses; [ - bsd2 - gpl2 - gpl3 - lgpl21 - lgpl3 - mit - ]; - maintainers = with maintainers; [ prusnak ]; - platforms = [ - "x86_64-linux" - "aarch64-linux" - "x86_64-darwin" - ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/by-name/ni/nitrokey-start-firmware/package.nix b/pkgs/by-name/ni/nitrokey-start-firmware/package.nix index 8bad7ed5fbc2..4169ccf702c0 100644 --- a/pkgs/by-name/ni/nitrokey-start-firmware/package.nix +++ b/pkgs/by-name/ni/nitrokey-start-firmware/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - gcc-arm-embedded, + gcc-arm-embedded-13, }: stdenv.mkDerivation (finalAttrs: { @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { "--enable-certdo" ]; - nativeBuildInputs = [ gcc-arm-embedded ]; + nativeBuildInputs = [ gcc-arm-embedded-13 ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 729df4dba04c..9c5a3c202b49 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2541,9 +2541,7 @@ with pkgs; klipper = callPackage ../servers/klipper { }; - klipper-firmware = callPackage ../servers/klipper/klipper-firmware.nix { - gcc-arm-embedded = gcc-arm-embedded-13; - }; + klipper-firmware = callPackage ../servers/klipper/klipper-firmware.nix { }; klipper-flash = callPackage ../servers/klipper/klipper-flash.nix { }; @@ -6371,7 +6369,7 @@ with pkgs; inherit (llvmPackages_15) llvm; }; - gcc-arm-embedded = gcc-arm-embedded-12; + gcc-arm-embedded = gcc-arm-embedded-14; # It would be better to match the default gcc so that there are no linking errors # when using C/C++ libraries in D packages, but right now versions >= 12 are broken.