diff options
Diffstat (limited to 'pkgs/development')
4 files changed, 54 insertions, 1 deletions
diff --git a/pkgs/development/compilers/llvm/3.4/clang-purity.patch b/pkgs/development/compilers/llvm/3.4/clang-purity.patch new file mode 100644 index 00000000000..c7021a58f9b --- /dev/null +++ b/pkgs/development/compilers/llvm/3.4/clang-purity.patch @@ -0,0 +1,19 @@ +diff -Naur clang-3.4-orig/lib/Driver/Tools.cpp clang-3.4/lib/Driver/Tools.cpp +--- clang-3.4-orig/lib/Driver/Tools.cpp 2013-12-08 21:59:27.000000000 -0500 ++++ clang-3.4/lib/Driver/Tools.cpp 2014-01-27 12:48:29.421872597 -0500 +@@ -6477,15 +6477,6 @@ + } + } + +- if (ToolChain.getArch() == llvm::Triple::arm || +- ToolChain.getArch() == llvm::Triple::thumb || +- (!Args.hasArg(options::OPT_static) && +- !Args.hasArg(options::OPT_shared))) { +- CmdArgs.push_back("-dynamic-linker"); +- CmdArgs.push_back(Args.MakeArgString( +- D.DyldPrefix + getLinuxDynamicLinker(Args, ToolChain))); +- } +- + CmdArgs.push_back("-o"); + CmdArgs.push_back(Output.getFilename()); + diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix index 6f174a411cb..eafbc28661f 100644 --- a/pkgs/development/compilers/llvm/3.4/clang.nix +++ b/pkgs/development/compilers/llvm/3.4/clang.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { (cd llvm-${version} && patch -Np1 -i ${./llvm-separate-build.patch}) ''; - patches = [ ./clang-separate-build.patch ]; + patches = [ ./clang-separate-build.patch ./clang-purity.patch ]; buildInputs = [ cmake libedit libxml2 ]; diff --git a/pkgs/development/libraries/haskell/iCalendar/default.nix b/pkgs/development/libraries/haskell/iCalendar/default.nix new file mode 100644 index 00000000000..7244e15c293 --- /dev/null +++ b/pkgs/development/libraries/haskell/iCalendar/default.nix @@ -0,0 +1,20 @@ +{ cabal, base64Bytestring, caseInsensitive, dataDefault, mime, mtl +, network, parsec, text, time +}: + +cabal.mkDerivation (self: { + pname = "iCalendar"; + version = "0.3.0.1"; + sha256 = "0d51rb46vcpb05vsqqmk3w7rymybl3vz8cqs0pw088a52kiy4xc3"; + buildDepends = [ + base64Bytestring caseInsensitive dataDefault mime mtl network + parsec text time + ]; + meta = { + homepage = "http://github.com/tingtun/iCalendar"; + description = "iCalendar data types, parser, and printer"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/mime/default.nix b/pkgs/development/libraries/haskell/mime/default.nix new file mode 100644 index 00000000000..37c231d08ff --- /dev/null +++ b/pkgs/development/libraries/haskell/mime/default.nix @@ -0,0 +1,14 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "mime"; + version = "0.3.4"; + sha256 = "1klvy32idy6v029p5a6g93r79ac5cycnrx5c8z9bgvplbplpfjwy"; + meta = { + homepage = "https://github.com/GaloisInc/mime"; + description = "Working with MIME types"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) |