Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3561ed6953f9
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 126e5c1bd15a
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 6, 2020

  1. ldc: 1.20.1 -> 1.24.0

    @fabianhjr
    fabianhjr committed Nov 6, 2020
    Copy the full SHA
    b936e6f View commit details

Commits on Nov 7, 2020

  1. Merge pull request #102964 from LibreCybernetics/update-ldc 

    ldc: 1.20.1 -> 1.24.0
    @danieldk
    danieldk authored Nov 7, 2020
    Copy the full SHA
    126e5c1 View commit details
Showing with 4 additions and 9 deletions.
  1. +2 −3 pkgs/development/compilers/ldc/default.nix
  2. +2 −6 pkgs/development/compilers/ldc/generic.nix
5 changes: 2 additions & 3 deletions pkgs/development/compilers/ldc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import ./generic.nix {
version = "1.20.1";
ldcSha256 = "1bqsgab22v02pc3c9gcyf15y7aimadv24d68icaw5lpgnvzxy89b";
version = "1.24.0";
ldcSha256 = "0g5svf55i0kq55q49awmwqj9qi1n907cyrn1vjdjgs8nx6nn35gx";
}

8 changes: 2 additions & 6 deletions pkgs/development/compilers/ldc/generic.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ version, ldcSha256 }:
{ stdenv, fetchurl, cmake, ninja, llvm_5, llvm_8, curl, tzdata
{ stdenv, fetchurl, cmake, ninja, llvm_11, curl, tzdata
, libconfig, lit, gdb, unzip, darwin, bash
, callPackage, makeWrapper, runCommand, targetPackages
, ldcBootstrap ? callPackage ./bootstrap.nix { }
@@ -56,16 +56,12 @@ stdenv.mkDerivation rec {
'';

nativeBuildInputs = [
cmake ninja makeWrapper unzip ldcBootstrap lit lit.python
cmake ldcBootstrap lit lit.python llvm_11 makeWrapper ninja unzip
]
++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.Foundation
# https://github.com/NixOS/nixpkgs/issues/57120
# https://github.com/NixOS/nixpkgs/pull/59197#issuecomment-481972515
llvm_5
]
++ stdenv.lib.optionals (!stdenv.hostPlatform.isDarwin) [
llvm_8
# https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818
gdb
];