diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-03-06 06:01:19 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-06 06:01:19 +0000 |
| commit | 09c267dae0dae6585ddbc98bd2301bd8153ac177 (patch) | |
| tree | 5e1eec08f81d5ae05609717a2a41aa95016282d1 /pkgs/development/compilers | |
| parent | 8660ec23c78ad726f0a7dd3acdad92fd598d9712 (diff) | |
| parent | 9df3e30ce24fd28c7b3e2de0d986769db5d6225d (diff) | |
| download | nixlib-09c267dae0dae6585ddbc98bd2301bd8153ac177.tar nixlib-09c267dae0dae6585ddbc98bd2301bd8153ac177.tar.gz nixlib-09c267dae0dae6585ddbc98bd2301bd8153ac177.tar.bz2 nixlib-09c267dae0dae6585ddbc98bd2301bd8153ac177.tar.lz nixlib-09c267dae0dae6585ddbc98bd2301bd8153ac177.tar.xz nixlib-09c267dae0dae6585ddbc98bd2301bd8153ac177.tar.zst nixlib-09c267dae0dae6585ddbc98bd2301bd8153ac177.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/compilers')
5 files changed, 15 insertions, 15 deletions
diff --git a/pkgs/development/compilers/dotnet/packages.nix b/pkgs/development/compilers/dotnet/packages.nix index 3eef77ff7144..c7a8e048121e 100644 --- a/pkgs/development/compilers/dotnet/packages.nix +++ b/pkgs/development/compilers/dotnet/packages.nix @@ -36,7 +36,7 @@ in { ''; passthru = { - inherit (vmr) icu targetRid updateScript; + inherit (vmr) icu targetRid; }; meta = vmr.meta // { diff --git a/pkgs/development/compilers/gcc-arm-embedded/11/default.nix b/pkgs/development/compilers/gcc-arm-embedded/11/default.nix index ad132f5bbf6c..4ed1ac9b99b0 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/11/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/11/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , ncurses5 -, python38 +, python39 , libxcrypt-legacy , runtimeShell }: @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { 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 python38 libxcrypt-legacy ]} "$f" || true + patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python39 libxcrypt-legacy ]} "$f" || true done ''; @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { mv $out/bin/arm-none-eabi-gdb $out/bin/arm-none-eabi-gdb-unwrapped cat <<EOF > $out/bin/arm-none-eabi-gdb #!${runtimeShell} - export PYTHONPATH=${python38}/lib/python3.8 - export PYTHONHOME=${python38}/bin/python3.8 + export PYTHONPATH=${python39}/lib/python3.9 + export PYTHONHOME=${python39.interpreter} exec $out/bin/arm-none-eabi-gdb-unwrapped "\$@" EOF chmod +x $out/bin/arm-none-eabi-gdb diff --git a/pkgs/development/compilers/gcc-arm-embedded/12/default.nix b/pkgs/development/compilers/gcc-arm-embedded/12/default.nix index 8f18579f93f6..0407cfa71e09 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/12/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/12/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , ncurses5 -, python38 +, python39 , libxcrypt-legacy , runtimeShell }: @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { 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 python38 libxcrypt-legacy ]} "$f" || true + patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python39 libxcrypt-legacy ]} "$f" || true done ''; @@ -50,8 +50,8 @@ stdenv.mkDerivation rec { mv $out/bin/arm-none-eabi-gdb $out/bin/arm-none-eabi-gdb-unwrapped cat <<EOF > $out/bin/arm-none-eabi-gdb #!${runtimeShell} - export PYTHONPATH=${python38}/lib/python3.8 - export PYTHONHOME=${python38}/bin/python3.8 + export PYTHONPATH=${python39}/lib/python3.9 + export PYTHONHOME=${python39.interpreter} exec $out/bin/arm-none-eabi-gdb-unwrapped "\$@" EOF chmod +x $out/bin/arm-none-eabi-gdb diff --git a/pkgs/development/compilers/gcc-arm-embedded/13/default.nix b/pkgs/development/compilers/gcc-arm-embedded/13/default.nix index 14d7d215a00d..a16348dad02c 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/13/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/13/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , ncurses5 -, python38 +, python39 , libxcrypt-legacy , runtimeShell }: @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { 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 python38 libxcrypt-legacy ]} "$f" || true + patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python39 libxcrypt-legacy ]} "$f" || true done ''; @@ -50,8 +50,8 @@ stdenv.mkDerivation rec { mv $out/bin/arm-none-eabi-gdb $out/bin/arm-none-eabi-gdb-unwrapped cat <<EOF > $out/bin/arm-none-eabi-gdb #!${runtimeShell} - export PYTHONPATH=${python38}/lib/python3.8 - export PYTHONHOME=${python38}/bin/python3.8 + export PYTHONPATH=${python39}/lib/python3.9 + export PYTHONHOME=${python39.interpreter} exec $out/bin/arm-none-eabi-gdb-unwrapped "\$@" EOF chmod +x $out/bin/arm-none-eabi-gdb diff --git a/pkgs/development/compilers/go/1.22.nix b/pkgs/development/compilers/go/1.22.nix index d5fc4ae0bdd7..ddab1d422b2c 100644 --- a/pkgs/development/compilers/go/1.22.nix +++ b/pkgs/development/compilers/go/1.22.nix @@ -46,11 +46,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.22.0"; + version = "1.22.1"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-TRlsPUGg1sHfxk0E48wfYIsMQ2vYe3Bgzj4jI04fTVw="; + hash = "sha256-ecm5HX8QlRWiX8Ps2q0SXWfmvbVPbU2YWA9GeZyuoyE="; }; strictDeps = true; |