Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/languages-frameworks/dlang.section.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# D (Dlang) {#dlang}

Nixpkgs provides multiple D compilers such as `ldc`, `dmd` and `gdc`.
Nixpkgs provides multiple D compilers such as `ldc` and `dmd`.
These can be used like any other package during build time.

However, Nixpkgs provides a build helper for compiling packages using the `dub` package manager.
Expand Down
2 changes: 2 additions & 0 deletions doc/release-notes/rl-2511.section.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@

- The `offrss` package was removed due to lack of upstream maintenance since 2012. It's recommended for users to migrate to another RSS reader

- GCC 9, 10, 11, and 12 have been removed, as they have reached end‐of‐life upstream and are no longer supported.

- `base16-builder` node package has been removed due to lack of upstream maintenance.
- `gentium` package now provides `Gentium-*.ttf` files, and not `GentiumPlus-*.ttf` files like before. The font identifiers `Gentium Plus*` are available in the `gentium-plus` package, and if you want to use the more recently updated package `gentium` [by sil](https://software.sil.org/gentium/), you should update your configuration files to use the `Gentium` font identifier.
- `space-orbit` package has been removed due to lack of upstream maintenance. Debian upstream stopped tracking it in 2011.
Expand Down
22 changes: 3 additions & 19 deletions pkgs/build-support/cc-wrapper/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
bintools,
coreutils ? null,
apple-sdk ? null,
zlib ? null,
nativeTools,
noLibc ? false,
nativeLibc,
Expand Down Expand Up @@ -534,21 +533,13 @@ stdenvNoCC.mkDerivation {
ln -sf ${cc} $out/nix-support/gprconfig-gnat-unwrapped
''

+ optionalString cc.langD or false ''
wrap ${targetPrefix}gdc $wrapper $ccPath/${targetPrefix}gdc
''

+ optionalString cc.langFortran or false ''
wrap ${targetPrefix}gfortran $wrapper $ccPath/${targetPrefix}gfortran
ln -sv ${targetPrefix}gfortran $out/bin/${targetPrefix}g77
ln -sv ${targetPrefix}gfortran $out/bin/${targetPrefix}f77
export named_fc=${targetPrefix}gfortran
''

+ optionalString cc.langJava or false ''
wrap ${targetPrefix}gcj $wrapper $ccPath/${targetPrefix}gcj
''

+ optionalString cc.langGo or false ''
wrap ${targetPrefix}gccgo $wrapper $ccPath/${targetPrefix}gccgo
wrap ${targetPrefix}go ${./go-wrapper.sh} $ccPath/${targetPrefix}go
Expand All @@ -558,8 +549,7 @@ stdenvNoCC.mkDerivation {
propagatedBuildInputs = [
bintools
]
++ extraTools
++ optionals cc.langD or cc.langJava or false [ zlib ];
++ extraTools;
depsTargetTargetPropagated = optional (libcxx != null) libcxx ++ extraPackages;

setupHooks = [
Expand Down Expand Up @@ -672,12 +662,12 @@ stdenvNoCC.mkDerivation {
+ optionalString (!isArocc) ''
echo "-B${libc_lib}${libc.libdir or "/lib/"}" >> $out/nix-support/libc-crt1-cflags
''
+ optionalString (!(cc.langD or false)) ''
+ ''
echo "-${
if isArocc then "I" else "idirafter"
} ${libc_dev}${libc.incdir or "/include"}" >> $out/nix-support/libc-cflags
''
+ optionalString (isGNU && (!(cc.langD or false))) ''
+ optionalString isGNU ''
for dir in "${cc}"/lib/gcc/*/*/include-fixed; do
echo '-idirafter' ''${dir} >> $out/nix-support/libc-cflags
done
Expand Down Expand Up @@ -796,9 +786,6 @@ stdenvNoCC.mkDerivation {
ln -s ${cc.man} $man
ln -s ${cc.info} $info
''
+ optionalString (cc.langD or cc.langJava or false && !isArocc) ''
echo "-B${zlib}${zlib.libdir or "/lib/"}" >> $out/nix-support/libc-cflags
''

##
## Hardening support
Expand Down Expand Up @@ -857,9 +844,6 @@ stdenvNoCC.mkDerivation {
+ optionalString cc.langAda or false ''
hardening_unsupported_flags+=" format stackprotector strictoverflow"
''
+ optionalString cc.langD or false ''
hardening_unsupported_flags+=" format"
''
+ optionalString cc.langFortran or false ''
hardening_unsupported_flags+=" format"
''
Expand Down
94 changes: 0 additions & 94 deletions pkgs/by-name/ar/arangodb/package.nix

This file was deleted.

39 changes: 0 additions & 39 deletions pkgs/by-name/co/collada2gltf/package.nix

This file was deleted.

11 changes: 0 additions & 11 deletions pkgs/by-name/gd/gdmd/0001-gdc-store-path.diff

This file was deleted.

48 changes: 0 additions & 48 deletions pkgs/by-name/gd/gdmd/package.nix

This file was deleted.

10 changes: 0 additions & 10 deletions pkgs/by-name/gf/gfortran10/package.nix

This file was deleted.

10 changes: 0 additions & 10 deletions pkgs/by-name/gf/gfortran11/package.nix

This file was deleted.

10 changes: 0 additions & 10 deletions pkgs/by-name/gf/gfortran12/package.nix

This file was deleted.

10 changes: 0 additions & 10 deletions pkgs/by-name/gf/gfortran9/package.nix

This file was deleted.

2 changes: 1 addition & 1 deletion pkgs/by-name/ru/rund/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ stdenv.mkDerivation rec {

buildInputs = [ dcompiler ];
buildPhase = ''
for candidate in dmd ldmd2 gdmd; do
for candidate in dmd ldmd2; do
echo Checking for DCompiler $candidate ...
dc=$(type -P $candidate || echo "")
if [ ! "$dc" == "" ]; then
Expand Down
17 changes: 0 additions & 17 deletions pkgs/development/compilers/gcc/common/configure-flags.nix
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

langC,
langCC,
langD ? false,
langFortran,
langAda ? false,
langGo,
Expand Down Expand Up @@ -207,7 +206,6 @@ let
lib.concatStringsSep "," (
lib.optional langC "c"
++ lib.optional langCC "c++"
++ lib.optional langD "d"
++ lib.optional langFortran "fortran"
++ lib.optional langAda "ada"
++ lib.optional langGo "go"
Expand Down Expand Up @@ -287,21 +285,6 @@ let
++ lib.optionals langJit [
"--enable-host-shared"
]
++ lib.optionals (langD) [
"--with-target-system-zlib=yes"
]
# On mips64-unknown-linux-gnu libsanitizer defines collide with
# glibc's definitions and fail the build. It was fixed in gcc-13+.
++
lib.optionals
(
targetPlatform.isMips
&& targetPlatform.parsed.abi.name == "gnu"
&& lib.versions.major version == "12"
)
[
"--disable-libsanitizer"
]
++ lib.optionals targetPlatform.isAlpha [
# Workaround build failures like:
# cc1: error: fp software completion requires '-mtrap-precision=i' [-Werror]
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/compilers/gcc/common/dependencies.nix
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ in
gmp
mpfr
libmpc
libxcrypt
]
++ optionals (lib.versionAtLeast version "10") [ libxcrypt ]
++ [
targetPackages.stdenv.cc.bintools # For linking code at run-time
]
Expand Down
Loading
Loading