public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

synchronize with trunk

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30027
This commit is contained in:
Peter Simons
2011-10-26 09:15:25 +00:00
parent 706b80c282 892889cf35
commit dfd063cf12
80 changed files with 1163 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/gcc-4.4/default.nix
View File

@@ -31,7 +31,7 @@ assert langVhdl -> gnat != null;
with stdenv.lib;
let version = "4.4.3";
let version = "4.4.6";
javaEcj = fetchurl {
# The `$(top_srcdir)/ecj.jar' file is automatically picked up at
# `configure' time.

14
pkgs/development/compilers/gcc-4.4/sources.nix
View File

@@ -1,26 +1,26 @@
/* Automatically generated by `update-gcc.sh', do not edit.
For GCC 4.4.2. */
For GCC 4.4.6. */
{ fetchurl, optional, version, langC, langCC, langFortran, langJava, langAda }:
assert version == "4.4.3";
assert version == "4.4.6";
optional /* langC */ true (fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-core-${version}.tar.bz2";
sha256 = "0ml360nwkf95w0ykn19zlyxmdvvzpmrbxj2vfrn0k8i2pvk13wwj";
sha256 = "c2959820de3e42eee6b1d381586992f26430f0083b9a51db31d706080fc9b44a";
}) ++
optional langCC (fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-g++-${version}.tar.bz2";
sha256 = "1s5zy8pfn4rgfm2l1dpfzrrdhi2l5zhphqk0h3gsbn1pdw751kkv";
sha256 = "6d5d2dacab9569472e4caa291abe94017a9b19574b9b0d866de7b04702634ddf";
}) ++
optional langFortran (fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-fortran-${version}.tar.bz2";
sha256 = "0iivw5kgwxdlqamwgaw5zhw48jajsmg09fgynyxkrxsa702s74sw";
sha256 = "2b9998716a16b80f4cf843ce81da1cf58ce116e0b85422e3004ce4454e8ff923";
}) ++
optional langJava (fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-java-${version}.tar.bz2";
sha256 = "13r0yxz6sif3i6sxh7b3fa5m1ygynvsg1bf6ssq6njp1fzp9a2kq";
sha256 = "7c8c12eac21d2a5c605ea4d9b7aa52e482354205b801bc93d62603b6f0956b35";
}) ++
optional langAda (fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-ada-${version}.tar.bz2";
sha256 = "146jfkwgg7gdgfqnrm04133amk8k9vr51wc01rwp2bcjai9c3kk7";
sha256 = "771ef0e90abf61208ce84689bed15391ad249287e36a28e816d6a044035af0c6";
}) ++
[]

42
pkgs/development/compilers/llvm/clang-system-llvm-libs.patch Normal file
View File

@@ -0,0 +1,42 @@
diff -Naur llvm-2.9-orig/Makefile.rules llvm-2.9/Makefile.rules
--- llvm-2.9-orig/Makefile.rules 2011-03-25 02:26:58.000000000 -0400
+++ llvm-2.9/Makefile.rules 2011-10-19 15:31:38.538674143 -0400
@@ -941,7 +941,7 @@
@echo "*** llvm-config doesn't exist - rebuilding it."
@$(MAKE) -C $(PROJ_OBJ_ROOT)/tools/llvm-config
-$(ToolDir)/$(strip $(TOOLNAME))$(EXEEXT): $(LLVM_CONFIG)
+$(ToolDir)/$(strip $(TOOLNAME))$(EXEEXT):
ifeq ($(ENABLE_SHARED), 1)
# We can take the "auto-import" feature to get rid of using dllimport.
@@ -1137,7 +1137,7 @@
else
SharedLibKindMessage := "Shared Library"
endif
-$(LibName.SO): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths) $(SharedLibDir)/.dir
+$(LibName.SO): $(ObjectsO) $(ProjLibsPaths) $(SharedLibDir)/.dir
$(Echo) Linking $(BuildMode) $(SharedLibKindMessage) \
$(notdir $@)
$(Verb) $(Link) $(SharedLinkOptions) -o $@ $(ObjectsO) \
@@ -1411,7 +1411,7 @@
$(ToolBuildPath): $(ToolDir)/.dir
endif
-$(ToolBuildPath): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths)
+$(ToolBuildPath): $(ObjectsO) $(ProjLibsPaths)
$(Echo) Linking $(BuildMode) executable $(TOOLNAME) $(StripWarnMsg)
$(Verb) $(Link) -o $@ $(TOOLLINKOPTS) $(ObjectsO) $(ProjLibsOptions) \
$(LLVMLibsOptions) $(ExtraLibs) $(TOOLLINKOPTSB) $(LIBS)
diff -Naur llvm-2.9-orig/unittests/Makefile.unittest llvm-2.9/unittests/Makefile.unittest
--- llvm-2.9-orig/unittests/Makefile.unittest 2011-02-04 12:12:18.000000000 -0500
+++ llvm-2.9/unittests/Makefile.unittest 2011-10-19 15:47:27.100035616 -0400
@@ -47,7 +47,7 @@
Run.Shared := $(SHLIBPATH_VAR)="$(SharedLibDir)$${$(SHLIBPATH_VAR):+:}$$$(SHLIBPATH_VAR)"
endif
-$(LLVMUnitTestExe): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths)
+$(LLVMUnitTestExe): $(ObjectsO) $(ProjLibsPaths)
$(Echo) Linking $(BuildMode) unit test $(TESTNAME) $(StripWarnMsg)
$(Verb) $(Link) -o $@ $(TOOLLINKOPTS) $(ObjectsO) $(ProjLibsOptions) \
$(TESTLIBS) $(LLVMLibsOptions) $(ExtraLibs) $(TOOLLINKOPTSB) $(LIBS)

134
pkgs/development/compilers/llvm/clang-tblgen.patch Normal file
View File

@@ -0,0 +1,134 @@
diff -Naur a/tools/clang/include/clang/AST/Makefile b/tools/clang/include/clang/AST/Makefile
--- a/tools/clang/include/clang/AST/Makefile 2010-08-18 19:23:40.000000000 -0400
+++ b/tools/clang/include/clang/AST/Makefile 2011-10-19 14:19:21.420750346 -0400
@@ -6,24 +6,24 @@
include $(CLANG_LEVEL)/Makefile
-$(ObjDir)/Attrs.inc.tmp : $(TD_SRC_DIR)/Attr.td $(TBLGEN) \
+$(ObjDir)/Attrs.inc.tmp : $(TD_SRC_DIR)/Attr.td \
$(ObjDir)/.dir
$(Echo) "Building Clang attribute classes with tblgen"
$(Verb) $(TableGen) -gen-clang-attr-classes -o $(call SYSPATH, $@) \
-I $(PROJ_SRC_DIR)/../../ $<
-$(ObjDir)/AttrImpl.inc.tmp : $(TD_SRC_DIR)/Attr.td $(TBLGEN) \
+$(ObjDir)/AttrImpl.inc.tmp : $(TD_SRC_DIR)/Attr.td \
$(ObjDir)/.dir
$(Echo) "Building Clang attribute implementations with tblgen"
$(Verb) $(TableGen) -gen-clang-attr-impl -o $(call SYSPATH, $@) \
-I $(PROJ_SRC_DIR)/../../ $<
-$(ObjDir)/StmtNodes.inc.tmp : $(TD_SRC_DIR)/StmtNodes.td $(TBLGEN) \
+$(ObjDir)/StmtNodes.inc.tmp : $(TD_SRC_DIR)/StmtNodes.td \
$(ObjDir)/.dir
$(Echo) "Building Clang statement node tables with tblgen"
$(Verb) $(TableGen) -gen-clang-stmt-nodes -o $(call SYSPATH, $@) $<
-$(ObjDir)/DeclNodes.inc.tmp : $(TD_SRC_DIR)/DeclNodes.td $(TBLGEN) \
+$(ObjDir)/DeclNodes.inc.tmp : $(TD_SRC_DIR)/DeclNodes.td \
$(ObjDir)/.dir
$(Echo) "Building Clang declaration node tables with tblgen"
$(Verb) $(TableGen) -gen-clang-decl-nodes -o $(call SYSPATH, $@) $<
diff -Naur a/tools/clang/include/clang/Basic/Makefile b/tools/clang/include/clang/Basic/Makefile
--- a/tools/clang/include/clang/Basic/Makefile 2010-09-09 16:27:36.000000000 -0400
+++ b/tools/clang/include/clang/Basic/Makefile 2011-10-19 14:17:54.950837324 -0400
@@ -29,20 +29,20 @@
CLANG_HAS_VERSION_PATCHLEVEL := 1
endif
-$(ObjDir)/Diagnostic%Kinds.inc.tmp : Diagnostic.td Diagnostic%Kinds.td $(TBLGEN) $(ObjDir)/.dir
+$(ObjDir)/Diagnostic%Kinds.inc.tmp : Diagnostic.td Diagnostic%Kinds.td $(ObjDir)/.dir
$(Echo) "Building Clang $(patsubst Diagnostic%Kinds.inc.tmp,%,$(@F)) diagnostic tables with tblgen"
$(Verb) $(TableGen) -gen-clang-diags-defs -clang-component=$(patsubst Diagnostic%Kinds.inc.tmp,%,$(@F)) -o $(call SYSPATH, $@) $<
-$(ObjDir)/DiagnosticGroups.inc.tmp : Diagnostic.td DiagnosticGroups.td $(INPUT_TDS) $(TBLGEN) $(ObjDir)/.dir
+$(ObjDir)/DiagnosticGroups.inc.tmp : Diagnostic.td DiagnosticGroups.td $(INPUT_TDS) $(ObjDir)/.dir
$(Echo) "Building Clang diagnostic groups with tblgen"
$(Verb) $(TableGen) -gen-clang-diag-groups -o $(call SYSPATH, $@) $<
-$(ObjDir)/AttrList.inc.tmp : Attr.td $(TBLGEN) $(ObjDir)/.dir
+$(ObjDir)/AttrList.inc.tmp : Attr.td $(ObjDir)/.dir
$(Echo) "Building Clang attribute list with tblgen"
$(Verb) $(TableGen) -gen-clang-attr-list -o $(call SYSPATH, $@) \
-I $(PROJ_SRC_DIR)/../.. $<
-$(ObjDir)/arm_neon.inc.tmp : arm_neon.td $(TBLGEN) $(ObjDir)/.dir
+$(ObjDir)/arm_neon.inc.tmp : arm_neon.td $(ObjDir)/.dir
$(Echo) "Building Clang arm_neon.inc with tblgen"
$(Verb) $(TableGen) -gen-arm-neon-sema -o $(call SYSPATH, $@) $<
diff -Naur a/tools/clang/include/clang/Driver/Makefile b/tools/clang/include/clang/Driver/Makefile
--- a/tools/clang/include/clang/Driver/Makefile 2010-06-08 16:34:18.000000000 -0400
+++ b/tools/clang/include/clang/Driver/Makefile 2011-10-19 14:25:33.739369159 -0400
@@ -5,14 +5,14 @@
include $(CLANG_LEVEL)/Makefile
-$(ObjDir)/Options.inc.tmp : Options.td OptParser.td $(TBLGEN) $(ObjDir)/.dir
+$(ObjDir)/Options.inc.tmp : Options.td OptParser.td $(ObjDir)/.dir
$(Echo) "Building Clang Driver Option tables with tblgen"
$(Verb) $(TableGen) -gen-opt-parser-defs -o $(call SYSPATH, $@) $<
-$(ObjDir)/CC1Options.inc.tmp : CC1Options.td OptParser.td $(TBLGEN) $(ObjDir)/.dir
+$(ObjDir)/CC1Options.inc.tmp : CC1Options.td OptParser.td $(ObjDir)/.dir
$(Echo) "Building Clang CC1 Option tables with tblgen"
$(Verb) $(TableGen) -gen-opt-parser-defs -o $(call SYSPATH, $@) $<
-$(ObjDir)/CC1AsOptions.inc.tmp : CC1AsOptions.td OptParser.td $(TBLGEN) $(ObjDir)/.dir
+$(ObjDir)/CC1AsOptions.inc.tmp : CC1AsOptions.td OptParser.td $(ObjDir)/.dir
$(Echo) "Building Clang CC1 Assembler Option tables with tblgen"
$(Verb) $(TableGen) -gen-opt-parser-defs -o $(call SYSPATH, $@) $<
diff -Naur a/tools/clang/include/clang/Lex/Makefile b/tools/clang/include/clang/Lex/Makefile
--- a/tools/clang/include/clang/Lex/Makefile 2010-10-19 22:31:43.000000000 -0400
+++ b/tools/clang/include/clang/Lex/Makefile 2011-10-19 14:18:25.082807086 -0400
@@ -6,7 +6,7 @@
include $(CLANG_LEVEL)/Makefile
-$(ObjDir)/AttrSpellings.inc.tmp : $(TD_SRC_DIR)/Attr.td $(TBLGEN) \
+$(ObjDir)/AttrSpellings.inc.tmp : $(TD_SRC_DIR)/Attr.td \
$(ObjDir)/.dir
$(Echo) "Building Clang attribute spellings with tblgen"
$(Verb) $(TableGen) -gen-clang-attr-spelling-list -o $(call SYSPATH, $@) \
diff -Naur a/tools/clang/include/clang/Serialization/Makefile b/tools/clang/include/clang/Serialization/Makefile
--- a/tools/clang/include/clang/Serialization/Makefile 2010-08-18 19:23:40.000000000 -0400
+++ b/tools/clang/include/clang/Serialization/Makefile 2011-10-19 14:25:05.764398164 -0400
@@ -6,13 +6,13 @@
include $(CLANG_LEVEL)/Makefile
-$(ObjDir)/AttrPCHRead.inc.tmp : $(TD_SRC_DIR)/Attr.td $(TBLGEN) \
+$(ObjDir)/AttrPCHRead.inc.tmp : $(TD_SRC_DIR)/Attr.td \
$(ObjDir)/.dir
$(Echo) "Building Clang PCH reader with tblgen"
$(Verb) $(TableGen) -gen-clang-attr-pch-read -o $(call SYSPATH, $@) \
-I $(PROJ_SRC_DIR)/../../ $<
-$(ObjDir)/AttrPCHWrite.inc.tmp : $(TD_SRC_DIR)/Attr.td $(TBLGEN) \
+$(ObjDir)/AttrPCHWrite.inc.tmp : $(TD_SRC_DIR)/Attr.td \
$(ObjDir)/.dir
$(Echo) "Building Clang PCH writer with tblgen"
$(Verb) $(TableGen) -gen-clang-attr-pch-write -o $(call SYSPATH, $@) \
diff -Naur a/tools/clang/lib/Headers/Makefile b/tools/clang/lib/Headers/Makefile
--- a/tools/clang/lib/Headers/Makefile 2010-07-21 21:19:36.000000000 -0400
+++ b/tools/clang/lib/Headers/Makefile 2011-10-19 14:15:18.520993127 -0400
@@ -49,6 +49,6 @@
install-local:: $(INSTHEADERS)
-$(ObjDir)/arm_neon.h.inc.tmp : $(CLANG_LEVEL)/include/clang/Basic/arm_neon.td $(TBLGEN) $(ObjDir)/.dir
+$(ObjDir)/arm_neon.h.inc.tmp : $(CLANG_LEVEL)/include/clang/Basic/arm_neon.td $(ObjDir)/.dir
$(Echo) "Building Clang arm_neon.h.inc with tblgen"
$(Verb) $(TableGen) -gen-arm-neon -o $(call SYSPATH, $@) $<
diff -Naur a/tools/clang/lib/StaticAnalyzer/Checkers/Makefile b/tools/clang/lib/StaticAnalyzer/Checkers/Makefile
--- a/tools/clang/lib/StaticAnalyzer/Checkers/Makefile 2011-02-15 02:42:38.000000000 -0500
+++ b/tools/clang/lib/StaticAnalyzer/Checkers/Makefile 2011-10-19 14:15:58.240953760 -0400
@@ -19,6 +19,6 @@
include $(CLANG_LEVEL)/Makefile
-$(ObjDir)/Checkers.inc.tmp : Checkers.td $(PROJ_SRC_DIR)/$(CLANG_LEVEL)/include/clang/StaticAnalyzer/Checkers/CheckerBase.td $(TBLGEN) $(ObjDir)/.dir
+$(ObjDir)/Checkers.inc.tmp : Checkers.td $(PROJ_SRC_DIR)/$(CLANG_LEVEL)/include/clang/StaticAnalyzer/Checkers/CheckerBase.td $(ObjDir)/.dir
$(Echo) "Building Clang SA Checkers tables with tblgen"
$(Verb) $(TableGen) -gen-clang-sa-checkers -I $(PROJ_SRC_DIR)/$(CLANG_LEVEL)/include -o $(call SYSPATH, $@) $<

63
pkgs/development/compilers/llvm/clang.nix Normal file
View File

@@ -0,0 +1,63 @@
{ stdenv, fetchurl, perl, groff, llvm }:
assert stdenv.isLinux && stdenv.gcc.gcc != null;
let version = "2.9"; in
stdenv.mkDerivation {
name = "clang-${version}";
src = llvm.src;
buildInputs = [ perl llvm groff ];
configureFlags = [ "--enable-optimized" "--enable-shared" "--disable-static" ]
++ stdenv.lib.optionals (stdenv.gcc ? clang) [
"--with-built-clang=yes"
"CXX=clang++"
];
srcClang = fetchurl {
url = "http://llvm.org/releases/${version}/clang-${version}.tgz";
sha256 = "1pq9g7qxw761dp6gx3amx39kl9p4zhlymmn8gfmcnw9ag0zizi3h";
};
prePatch = ''
pushd tools
unpackFile $srcClang
mv clang-${version} clang
popd
find
'';
patches = [ ./clang-include-paths.patch ./clang-ld-flags.patch ./clang-tblgen.patch ./clang-system-llvm-libs.patch ];
buildFlags = [ "TableGen=tblgen" "LLVM_CONFIG=llvm-config" ];
preBuild = ''
sed -i -e 's,C_INCLUDE_PATH,"${stdenv.gcc.libc}/include/",' \
-e 's,CPP_HOST,"'$(${stdenv.gcc.gcc}/bin/gcc -dumpmachine)'",' \
-e 's,CPP_INCLUDE_PATH,"${stdenv.gcc.gcc}/include/c++/${stdenv.gcc.gcc.version}",' \
tools/clang/lib/Frontend/InitHeaderSearch.cpp
pushd utils/unittest
make
popd
cd tools/clang
'';
postInstall = ''
install -v -m755 tools/scan-build/scan-build $out/bin
install -v -m755 tools/scan-view/scan-view $out/bin
'';
passthru = { gcc = stdenv.gcc.gcc; };
meta = {
homepage = http://clang.llvm.org/;
description = "A C language family frontend for LLVM";
license = "BSD";
maintainers = with stdenv.lib.maintainers; [viric shlevy];
platforms = with stdenv.lib.platforms; all;
};
}

58
pkgs/development/compilers/llvm/default.nix
View File

@@ -1,9 +1,8 @@
{ stdenv, fetchurl, gcc, flex, perl, libtool, groff
, buildClang ? false }:
{ stdenv, fetchurl, perl, groff, darwinSwVersUtility }:
let version = "2.9"; in
stdenv.mkDerivation ({
stdenv.mkDerivation {
name = "llvm-${version}";
src = fetchurl {
@@ -11,9 +10,14 @@ stdenv.mkDerivation ({
sha256 = "0y9pgdakn3n0vf8zs6fjxjw6972nyw4rkfwwza6b8a3ll77kc4k6";
};
buildInputs = [ gcc flex perl groff ];
buildInputs = [ perl groff ] ++
stdenv.lib.optional stdenv.isDarwin darwinSwVersUtility;
configureFlags = [ "--enable-optimized" "--enable-shared" "--disable-static" ];
configureFlags = [ "--enable-optimized" "--enable-shared" "--disable-static" ]
++ stdenv.lib.optionals (stdenv.gcc ? clang) [
"--with-built-clang=yes"
"CXX=clang++"
];
meta = {
homepage = http://llvm.org/;
@@ -23,48 +27,4 @@ stdenv.mkDerivation ({
platforms = with stdenv.lib.platforms; all;
};
}
// stdenv.lib.optionalAttrs buildClang (
# I write the assert because 'gcc.libc' will be evaluated although 'triplet' would not
# evaluate properly (in the preConfigure below)
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
let
triplet = if (stdenv.system == "i686-linux") then "i686-unknown-linux-gnu"
else if (stdenv.system == "x86_64-linux") then "x86_64-unknown-linux-gnu"
else throw "System not supported";
in {
name = "clang-${version}";
srcClang = fetchurl {
url = "http://llvm.org/releases/${version}/clang-${version}.tgz";
sha256 = "1pq9g7qxw761dp6gx3amx39kl9p4zhlymmn8gfmcnw9ag0zizi3h";
};
prePatch = ''
pushd tools
unpackFile $srcClang
mv clang-${version} clang
popd
find
'';
patches = [ ./clang-include-paths.patch ./clang-ld-flags.patch ];
# Set up the header file paths
preConfigure = ''
sed -i -e 's,C_INCLUDE_PATH,"${gcc.libc}/include/",' \
-e 's,CPP_HOST,"${triplet}",' \
-e 's,CPP_INCLUDE_PATH,"${gcc.gcc}/include/c++/${gcc.gcc.version}",' \
tools/clang/lib/Frontend/InitHeaderSearch.cpp
'';
passthru = { gcc = gcc.gcc; };
meta = {
homepage = http://clang.llvm.org/;
description = "A C language family frontend for LLVM";
license = "BSD";
maintainers = with stdenv.lib.maintainers; [viric shlevy];
platforms = with stdenv.lib.platforms; linux;
};
}
))

9
pkgs/development/interpreters/guile/default.nix
View File

@@ -1,4 +1,4 @@
{ fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring
{ fetchurl, stdenv, xz, libtool, readline, gmp, pkgconfig, boehmgc, libunistring
, libffi, gawk, makeWrapper, coverageAnalysis ? null }:
# Do either a coverage analysis build or a standard build.
@@ -7,13 +7,14 @@
else stdenv.mkDerivation)
rec {
name = "guile-2.0.2";
name = "guile-2.0.3";
src = fetchurl {
url = "mirror://gnu/guile/${name}.tar.gz";
sha256 = "0adiwydwb285bb7mcakfdzjgyv24lrm7pk2grgxzi66kidpm6dhx";
url = "mirror://gnu/guile/${name}.tar.xz";
sha256 = "14rhlpxxa4v5y3gl992l7lnd5qnqawx0a84idnwq0w2qviwcvsyj";
};
buildNativeInputs = [ xz ];
buildInputs =
[ makeWrapper gawk readline libtool libunistring
libffi pkgconfig

10
pkgs/development/libraries/gnutls/default.nix
View File

@@ -1,15 +1,15 @@
{ fetchurl, stdenv, xz, zlib, lzo, libtasn1, nettle
, guileBindings, guile }:
, guileBindings, guile, perl }:
assert guileBindings -> guile != null;
stdenv.mkDerivation rec {
name = "gnutls-3.0.2";
name = "gnutls-3.0.4";
src = fetchurl {
url = "mirror://gnu/gnutls/${name}.tar.xz";
sha256 = "0jy0j77inv6yr7s9mnhs5kvjjmhj0ifg35145s1qn3hd9ma36nii";
sha256 = "16mhr52c07xlkv5m5bxgr51ppjz0gqjw6rgv52ql4iyi569ffrx3";
};
configurePhase = ''
@@ -22,9 +22,11 @@ stdenv.mkDerivation rec {
else ""}
'';
buildInputs = [ xz zlib lzo ]
buildInputs = [ zlib lzo ]
++ stdenv.lib.optional guileBindings guile;
buildNativeInputs = [ xz perl ];
propagatedBuildInputs = [ nettle libtasn1 ];
doCheck = true;

5
pkgs/development/libraries/haskell/ConfigFile/default.nix
View File

@@ -2,11 +2,12 @@
cabal.mkDerivation (self: {
pname = "ConfigFile";
version = "1.0.6";
sha256 = "339722184b86d53d8b361933e572b6e1478824c7eba3fb66b67d0eb5245cd038";
version = "1.1.0";
sha256 = "0m5p56if711qi69lxw78746sb0jr5gqbmip5hdbb7lk4z5drgvhc";
isLibrary = true;
isExecutable = true;
buildDepends = [ MissingH mtl parsec ];
noHaddock = true;
meta = {
homepage = "http://software.complete.org/configfile";
description = "Configuration file reading & writing";

19
pkgs/development/libraries/haskell/NanoProlog/default.nix Normal file
View File

@@ -0,0 +1,19 @@
{ cabal, ListLike, uuParsinglib }:
cabal.mkDerivation (self: {
pname = "NanoProlog";
version = "0.2.3.3";
sha256 = "0008xpahqbs2djchlw1bslhqqhbc0n7ql7pqm4g7lh8xd3ampxba";
isLibrary = true;
isExecutable = true;
buildDepends = [ ListLike uuParsinglib ];
meta = {
description = "Very small interpreter for a Prolog-like language";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

18
pkgs/development/libraries/haskell/WebBits/2.1.nix Normal file
View File

@@ -0,0 +1,18 @@
{ cabal, mtl, parsec, syb }:
cabal.mkDerivation (self: {
pname = "WebBits";
version = "2.1";
sha256 = "18m19fck9zb6jh8bfd47nja1q6ab1jmd0q5r3k8m5674i6273hyn";
buildDepends = [ mtl parsec syb ];
meta = {
homepage = "http://www.cs.brown.edu/research/plt/";
description = "JavaScript analysis tools";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

4
pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix
View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "blaze-builder-enumerator";
version = "0.2.0.2";
sha256 = "0as4mjh695jpxp9qfhpsxyr1448l0pk94sh5kk8sgxv5hfiy41k9";
version = "0.2.0.3";
sha256 = "00a9rly27sh49gi5askg7z3ji8ig9llxk4qcznsag01d1z0kb97n";
buildDepends = [ blazeBuilder enumerator transformers ];
meta = {
homepage = "https://github.com/meiersi/blaze-builder-enumerator";

4
pkgs/development/libraries/haskell/bytestring-nums/default.nix
View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "bytestring-nums";
version = "0.3.3";
sha256 = "09gdbyj5qw98j57cs9phzsbmvdm7y6j07wg908i34jklwm24nxfd";
version = "0.3.5";
sha256 = "12knbyrvr1wa7za8bwypvq3cp81k18qi032dl98s2ylhcz1r6rdk";
isLibrary = true;
isExecutable = true;
meta = {

13
pkgs/development/libraries/haskell/cabal-file-th/default.nix Normal file
View File

@@ -0,0 +1,13 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "cabal-file-th";
version = "0.2.1";
sha256 = "0nczwicgf6kx3lk5m7wqf1wj6ghn8jfx112dzh7jh4f4xs66nsd1";
meta = {
homepage = "http://github.com/nkpart/cabal-file-th";
description = "Template Haskell expressions for reading fields from a project's cabal file";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

4
pkgs/development/libraries/haskell/clientsession/default.nix
View File

@@ -3,8 +3,8 @@
cabal.mkDerivation (self: {
pname = "clientsession";
version = "0.7.3.1";
sha256 = "0q16brla4m5g7dmgln3awx964ms7pi1s2r21idmc0mk4rnw2rpi7";
version = "0.7.3.2";
sha256 = "1ml1f5sarfck39qrv4zjcbk1vwgazn32gnjm78fm047ixczi9340";
buildDepends = [
base64Bytestring cereal cryptoApi cryptocipher skein
];

8
pkgs/development/libraries/haskell/cprng-aes/default.nix
View File

@@ -1,10 +1,10 @@
{ cabal, cereal, cryptoApi, cryptocipher, random }:
{ cabal, cereal, cryptoApi, cryptocipher, entropy, random }:
cabal.mkDerivation (self: {
pname = "cprng-aes";
version = "0.2.1";
sha256 = "0q6qkvha7cckz3zjnzfsrx298arzbdavy1f73hygrd8f7n74442j";
buildDepends = [ cereal cryptoApi cryptocipher random ];
version = "0.2.2";
sha256 = "0jfa9fb670bqlnkplmscz878hvdbpap47xfxvshgs102iq7rjasf";
buildDepends = [ cereal cryptoApi cryptocipher entropy random ];
meta = {
homepage = "http://github.com/vincenthz/hs-cprng-aes";
description = "Crypto Pseudo Random Number Generator using AES in counter mode";

4
pkgs/development/libraries/haskell/crypto-api/default.nix
View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "crypto-api";
version = "0.6.4";
sha256 = "1v3nnfw13r514a723lsx8d1awlad6fmv27bgp76f1ssv1garraf3";
version = "0.8";
sha256 = "1fwkafb9v2348vr1a4xnlmkgs4kh85az4f3wnrl9cbqwxf3cc328";
buildDepends = [ cereal entropy largeword tagged ];
meta = {
homepage = "http://trac.haskell.org/crypto-api/wiki";

4
pkgs/development/libraries/haskell/cryptohash/default.nix
View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cryptohash";
version = "0.7.3";
sha256 = "1wjmf7ll9jady6p79066b5ib70ywvbgnbc71s76pibkg5hsvclgj";
version = "0.7.4";
sha256 = "1nplmwihq40jmng4r3wiyfb0i33a8wx2gmlbqajc62wny98l7sab";
isLibrary = true;
isExecutable = true;
buildDepends = [ cereal cryptoApi tagged ];

4
pkgs/development/libraries/haskell/enumerator/default.nix
View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "enumerator";
version = "0.4.14";
sha256 = "06bvrr76y12r3i1xi1s98fc1v6mcmn8nzhbp80wgyi743ksqcr1d";
version = "0.4.15";
sha256 = "06yzf2xaadmdhgidzyp7qywd8d401f4n1qlfyx0q72nafgnlvr6v";
buildDepends = [ text transformers ];
meta = {
homepage = "https://john-millikin.com/software/enumerator/";

8
pkgs/development/libraries/haskell/gloss/default.nix
View File

@@ -1,10 +1,10 @@
{ cabal, GLUT, OpenGL }:
{ cabal, bmp, GLUT, OpenGL }:
cabal.mkDerivation (self: {
pname = "gloss";
version = "1.3.4.1";
sha256 = "0cyk75b495vq59pnfqy6ny5kb0i0zq2hwfb1q69vj0cfyiqiwjsb";
buildDepends = [ GLUT OpenGL ];
version = "1.4.0.1";
sha256 = "0za7imyzfgk3ndh9db55wi7zbxrmpvshws4vywrr35b77b3nabr1";
buildDepends = [ bmp GLUT OpenGL ];
meta = {
homepage = "http://gloss.ouroborus.net";
description = "Painless 2D vector graphics, animations and simulations";

4
pkgs/development/libraries/haskell/haskeline/default.nix
View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "haskeline";
version = "0.6.4.4";
sha256 = "03cnhidnpnz7fh34c7x0rpl15zi6hkh9khganrdhwa59srxzbxqb";
version = "0.6.4.5";
sha256 = "1blhbh53p6di3q3gldzmg3i8f4w3ahipai3di49i4rdcnjry0j5b";
buildDepends = [ extensibleExceptions mtl terminfo utf8String ];
meta = {
homepage = "http://trac.haskell.org/haskeline";

18
pkgs/development/libraries/haskell/hledger-web/default.nix
View File

@@ -1,19 +1,19 @@
{ cabal, aesonNative, blazeHtml, clientsession, cmdargs, dataObject
, dataObjectYaml, failure, fileEmbed, hamlet, hledger, hledgerLib
, HUnit, ioStorage, parsec, regexpr, safe, shakespeareCss
, shakespeareJs, shakespeareText, text, time, transformers, wai
, waiExtra, warp, yesod, yesodCore, yesodForm, yesodJson
, yesodStatic
{ cabal, aesonNative, blazeHtml, cabalFileTh, clientsession
, cmdargs, dataObject, dataObjectYaml, failure, fileEmbed, hamlet
, hledger, hledgerLib, HUnit, ioStorage, parsec, regexpr, safe
, shakespeareCss, shakespeareJs, shakespeareText, text, time
, transformers, wai, waiExtra, warp, yesod, yesodCore, yesodForm
, yesodJson, yesodStatic
}:
cabal.mkDerivation (self: {
pname = "hledger-web";
version = "0.16.3";
sha256 = "0jciah0k6i4aa21hgpl1nqfyjkmm5kg5zmzmxwynvwckncy17ihg";
version = "0.16.4";
sha256 = "1p776fzgan9y7g03g92gsvnassc3k28l6l3gr1vd9v3fcnckg2wj";
isLibrary = true;
isExecutable = true;
buildDepends = [
aesonNative blazeHtml clientsession cmdargs dataObject
aesonNative blazeHtml cabalFileTh clientsession cmdargs dataObject
dataObjectYaml failure fileEmbed hamlet hledger hledgerLib HUnit
ioStorage parsec regexpr safe shakespeareCss shakespeareJs
shakespeareText text time transformers wai waiExtra warp yesod

1
pkgs/development/libraries/haskell/hmatrix/default.nix
View File

@@ -10,6 +10,7 @@ cabal.mkDerivation (self: {
binary HUnit QuickCheck random storableComplex vector
];
extraLibraries = [ blas gsl liblapack ];
configureFlags = "-fvector";
meta = {
homepage = "http://perception.inf.um.es/hmatrix";
description = "Linear algebra and numerical computation";

8
pkgs/development/libraries/haskell/hp2any-core/default.nix
View File

@@ -1,10 +1,10 @@
{ cabal, bytestringTrie, network, time }:
{ cabal, attoparsec, network, time }:
cabal.mkDerivation (self: {
pname = "hp2any-core";
version = "0.10.1";
sha256 = "1qblsvlj4x22ml3k5mlr28r5xk9rmi7lpipd369dbvdzm0rflf03";
buildDepends = [ bytestringTrie network time ];
version = "0.11.1";
sha256 = "146bigmch7dawyyakj0w55p0jdpnxkj8q5izjsswqqk0pdxia546";
buildDepends = [ attoparsec network time ];
meta = {
homepage = "http://www.haskell.org/haskellwiki/Hp2any";
description = "Heap profiling helper library";

4
pkgs/development/libraries/haskell/nixos-types/default.nix
View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "nixos-types";
version = "1.1";
sha256 = "0vnlhq2pjnslq1h9h3lyaxw604s3zdhs7k8hfr35m178rdm3a5az";
version = "1.2";
sha256 = "140qk6wqq87qfk471cnhrg135fnqv0vfmfxh8kj14ar2kxvzrr8w";
buildDepends = [ regexPosix ];
meta = {
homepage = "http://github.com/haskell4nix/nixos-types";

4
pkgs/development/libraries/haskell/skein/default.nix
View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "skein";
version = "0.1.0.1";
sha256 = "1i05ajmnsm0ac9cqnf1lmdaa6sxkirxv5r2h8phpapzvzwislpr8";
version = "0.1.0.2";
sha256 = "1ay7ri011vwvl74b9calbnav90d0r08gzqgdk8nvw1qx4slk1ibs";
buildDepends = [ cereal cryptoApi tagged ];
meta = {
description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";

18
pkgs/development/libraries/haskell/vty/4.6.0.4.nix
View File

@@ -1,18 +0,0 @@
{ cabal, deepseq, mtl, parallel, parsec, terminfo, utf8String }:
cabal.mkDerivation (self: {
pname = "vty";
version = "4.6.0.4";
sha256 = "0kabssw3v7nglvsr687ppmdnnmii1q2g5zg8rxwi2hcmvnjx7567";
buildDepends = [ deepseq mtl parallel parsec terminfo utf8String ];
meta = {
homepage = "http://trac.haskell.org/vty/";
description = "A simple terminal access library";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

0
pkgs/development/libraries/haskell/vty/4.7.0.4.nix → pkgs/development/libraries/haskell/vty/default.nix
View File

4
pkgs/development/libraries/haskell/yap/default.nix
View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "yap";
version = "0.0";
sha256 = "0cjsmf9p220fb9yf2i81xspa3rpnlln3hfb9yc5x6xbcc6py0nw5";
version = "0.1";
sha256 = "14x1z5pmb499qq5sy0iksxv0mli8556s1jh9jm7rdg671h1cy1hl";
meta = {
description = "yet another prelude - a simplistic refactoring with algebraic classes";
license = self.stdenv.lib.licenses.bsd3;

4
pkgs/development/libraries/haskell/yesod-auth/default.nix
View File

@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "yesod-auth";
version = "0.7.2";
sha256 = "18i1ijxrhmmxy45ymc89f7m2zazd7lca4jv4q08d7mr1hdgsx8cn";
version = "0.7.4";
sha256 = "088hhyy7fwga7hwqqwxxn12iqnz6jadq1bc9p8hdv1jy6ib769dl";
buildDepends = [
aesonNative authenticate blazeHtml controlMonadAttempt hamlet
httpEnumerator mimeMail persistent persistentTemplate pureMD5

24
pkgs/development/libraries/haskell/yesod-core/default.nix
View File

@@ -1,19 +1,21 @@
{ cabal, blazeBuilder, blazeHtml, caseInsensitive, cereal
, clientsession, cookie, enumerator, failure, hamlet, httpTypes
, monadControl, parsec, pathPieces, random, shakespeare
, shakespeareCss, shakespeareJs, strictConcurrency, text, time
, transformers, wai, waiExtra
{ cabal, aesonNative, blazeBuilder, blazeHtml, caseInsensitive
, cereal, clientsession, cookie, dataObject, dataObjectYaml
, enumerator, failure, hamlet, httpTypes, monadControl, parsec
, pathPieces, random, shakespeare, shakespeareCss, shakespeareJs
, strictConcurrency, text, time, transformers, vector, wai
, waiExtra
}:
cabal.mkDerivation (self: {
pname = "yesod-core";
version = "0.9.2";
sha256 = "1h9w5fgdr4w4ikp5axzxmsvc14ikbsjmlwd2lmlrh1cjcx8xzjwf";
version = "0.9.3.2";
sha256 = "1h45vgxcn4sraax5rsccksx5yz57k32d7vzpp02prz2s2x5bv3xl";
buildDepends = [
blazeBuilder blazeHtml caseInsensitive cereal clientsession cookie
enumerator failure hamlet httpTypes monadControl parsec pathPieces
random shakespeare shakespeareCss shakespeareJs strictConcurrency
text time transformers wai waiExtra
aesonNative blazeBuilder blazeHtml caseInsensitive cereal
clientsession cookie dataObject dataObjectYaml enumerator failure
hamlet httpTypes monadControl parsec pathPieces random shakespeare
shakespeareCss shakespeareJs strictConcurrency text time
transformers vector wai waiExtra
];
meta = {
homepage = "http://www.yesodweb.com/";

4
pkgs/development/libraries/haskell/yesod-form/default.nix
View File

@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "yesod-form";
version = "0.3.2.1";
sha256 = "1gzd8vs9nabv7vf41b5xxwy49yak9jd3mpxkg4yx7pndm4321hp9";
version = "0.3.3";
sha256 = "1lym9h7xr26i36n62cvbdyzjxna1p0alyhx9qhi5zhg0xz4nd3xq";
buildDepends = [
blazeBuilder blazeHtml dataDefault emailValidate hamlet network
persistent shakespeareCss shakespeareJs text time transformers wai

11
pkgs/development/libraries/haskell/yesod-static/default.nix
View File

@@ -1,13 +1,14 @@
{ cabal, base64Bytestring, cereal, fileEmbed, httpTypes, pureMD5
, text, transformers, unixCompat, wai, waiAppStatic, yesodCore
{ cabal, base64Bytestring, cereal, enumerator, fileEmbed, httpTypes
, pureMD5, text, transformers, unixCompat, wai, waiAppStatic
, yesodCore
}:
cabal.mkDerivation (self: {
pname = "yesod-static";
version = "0.3.0.1";
sha256 = "1dvg60kawmvczwxvkxzx5k19y36i23fi0faw71ck58mlkjdczby5";
version = "0.3.1.2";
sha256 = "0r72xspxq7122k9vird4yqqzrn6p4xgzvxid7ig62zdxjlw1p36j";
buildDepends = [
base64Bytestring cereal fileEmbed httpTypes pureMD5 text
base64Bytestring cereal enumerator fileEmbed httpTypes pureMD5 text
transformers unixCompat wai waiAppStatic yesodCore
];
meta = {

4
pkgs/development/libraries/haskell/yesod/default.nix
View File

@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "yesod";
version = "0.9.2.2";
sha256 = "09l7cdsrxlr1nb03h3nisih9sm824gnp3nkblvgh8b1pfi54wdkl";
version = "0.9.3";
sha256 = "1w5fml250i63qhlxkn1bidc3sminmxf98zsdzvdi42sfjx8fdkkx";
isLibrary = true;
isExecutable = true;
buildDepends = [

4
pkgs/development/libraries/opendkim/default.nix
View File

@@ -1,10 +1,10 @@
{stdenv, fetchurl, openssl, libmilter}:
stdenv.mkDerivation rec {
name = "opendkim-1.2.2";
name = "opendkim-2.4.2";
src = fetchurl {
url = "mirror://sourceforge/opendkim/files/${name}.tar.gz";
sha256 = "01kvhm10kv17mm4zfz0zd24wzr98fxqwyzm56m2l1v262ng3l4nw";
sha256 = "0gwgcrnl5c60sxb9z38ari2gl7vd626r3z3dcq8a6aw28pw9w2lk";
};
configureFlags="--with-openssl=${openssl} --with-milter=${libmilter}";

8
pkgs/development/libraries/yajl/default.nix
View File

@@ -19,10 +19,8 @@ stdenv.mkDerivation {
C, and a small validating JSON generator.
'';
homepage = http://lloyd.github.com/yajl/;
license = stdenv.lib.license.isc;
platforms = with stdenv.lib.platforms; [ linux darwin ];
maintainers = with stdenv.lib.maintainers; [
z77z
];
license = stdenv.lib.licenses.isc;
platforms = with stdenv.lib.platforms; linux ++ darwin;
maintainers = with stdenv.lib.maintainers; [ z77z ];
};
}

60
pkgs/development/perl-modules/net-amazon-ec2-ipv6.patch Normal file
View File

@@ -0,0 +1,60 @@
Support OpenStack's DescribeInstancesV6 API call.
diff -ru -x '*~' Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2/RunningInstances.pm Net-Amazon-EC2-0.14//lib/Net/Amazon/EC2/RunningInstances.pm
--- Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2/RunningInstances.pm 2010-01-24 02:12:50.000000000 +0100
+++ Net-Amazon-EC2-0.14//lib/Net/Amazon/EC2/RunningInstances.pm 2011-06-21 17:19:36.000000000 +0200
@@ -25,6 +25,10 @@
This element remains empty until the instance enters a
running state.
+=item dns_name_v6 (optional)
+
+The public IPv6 address of the instance.
+
=item image_id (required)
The image id of the AMI currently running in this instance.
@@ -126,6 +130,7 @@
has 'ami_launch_index' => ( is => 'ro', isa => 'Str', required => 0 );
has 'dns_name' => ( is => 'ro', isa => 'Maybe[Str]', required => 0 );
+has 'dns_name_v6' => ( is => 'ro', isa => 'Maybe[Str]', required => 0 );
has 'image_id' => ( is => 'ro', isa => 'Str', required => 1 );
has 'kernel_id' => ( is => 'ro', isa => 'Maybe[Str]', required => 1 );
has 'ramdisk_id' => ( is => 'ro', isa => 'Maybe[Str]', required => 1 );
diff -ru -x '*~' Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2.pm Net-Amazon-EC2-0.14//lib/Net/Amazon/EC2.pm
--- Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2.pm 2011-06-16 16:11:53.000000000 +0200
+++ Net-Amazon-EC2-0.14//lib/Net/Amazon/EC2.pm 2011-10-20 20:13:12.585277245 +0200
@@ -1542,6 +1542,7 @@
my $self = shift;
my %args = validate( @_, {
InstanceId => { type => SCALAR | ARRAYREF, optional => 1 },
+ Action => { default => "DescribeInstances" },
});
# If we have a array ref of instances lets split them out into their InstanceId.n format
@@ -1556,7 +1557,8 @@
$args{"InstanceId.1"} = delete $args{InstanceId};
}
- my $xml = $self->_sign(Action => 'DescribeInstances', %args);
+ my $xml = $self->_sign(Action => $args{Action}, %args);
+ delete $args{Action};
my $reservations;
if ( grep { defined && length } $xml->{Errors} ) {
@@ -1635,6 +1637,7 @@
my $running_instance = Net::Amazon::EC2::RunningInstances->new(
ami_launch_index => $instance_elem->{amiLaunchIndex},
dns_name => $instance_elem->{dnsName},
+ dns_name_v6 => $instance_elem->{dnsNameV6},
image_id => $instance_elem->{imageId},
kernel_id => $instance_elem->{kernelId},
ramdisk_id => $instance_elem->{ramdiskId},
@@ -3866,4 +3869,4 @@
=head1 SEE ALSO
-Amazon EC2 API: L<http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/>
\ No newline at end of file
+Amazon EC2 API: L<http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/>

11
pkgs/development/perl-modules/net-amazon-ec2-nova-compat.patch
View File

@@ -1,6 +1,6 @@
diff -ru -x '*~' Net-Amazon-EC2-0.14-orig/lib/Net/Amazon/EC2.pm Net-Amazon-EC2-0.14/lib/Net/Amazon/EC2.pm
--- Net-Amazon-EC2-0.14-orig/lib/Net/Amazon/EC2.pm 2010-02-02 02:26:58.000000000 +0100
+++ Net-Amazon-EC2-0.14/lib/Net/Amazon/EC2.pm 2011-06-16 14:18:19.874176129 +0200
+++ Net-Amazon-EC2-0.14/lib/Net/Amazon/EC2.pm 2011-06-16 16:11:53.861341300 +0200
@@ -1552,6 +1552,8 @@
$args{"InstanceId." . $count} = $instance_id;
$count++;
@@ -10,3 +10,12 @@ diff -ru -x '*~' Net-Amazon-EC2-0.14-orig/lib/Net/Amazon/EC2.pm Net-Amazon-EC2-0
}
my $xml = $self->_sign(Action => 'DescribeInstances', %args);
@@ -3739,6 +3741,8 @@
$args{"InstanceId." . $count} = $instance_id;
$count++;
}
+ } else {
+ $args{"InstanceId.1"} = delete $args{InstanceId};
}
my $xml = $self->_sign(Action => 'TerminateInstances', %args);

19
pkgs/development/python-modules/boto-1.9-python-2.7.patch Normal file
View File

@@ -0,0 +1,19 @@
Fix Boto 1.9 on Python 2.7.
https://github.com/boto/boto/commit/6760075073c34d6dddb7e13b80dfa8d09f0f4f79
diff --git a/boto/connection.py b/boto/connection.py
index c5779e2..71942f1 100644
--- a/boto/connection.py
+++ b/boto/connection.py
@@ -252,8 +252,9 @@ class AWSAuthConnection(object):
# versions, it would append ":443" to the hostname sent
# in the Host header and so we needed to make sure we
# did the same when calculating the V2 signature. In 2.6
+ # (and higher!)
# it no longer does that. Hence, this kludge.
- if sys.version[:3] == "2.6" and port == 443:
+ if sys.version[:3] in ('2.6', '2.7') and port == 443:
signature_host = self.host
else:
signature_host = '%s:%d' % (self.host, port)

4
pkgs/development/tools/haskell/cabal2nix/default.nix
View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cabal2nix";
version = "1.17";
sha256 = "0pga0rfghpvjazhs0mgnxg2kf82m8bsmlx3g9pxhiw5f4amfr2g7";
version = "1.18";
sha256 = "1bx9gv5nxz68p8rimai6gy05l84f7n3rajacvg6dak9nsrnbl95i";
isLibrary = false;
isExecutable = true;
buildDepends = [ hackageDb HTTP mtl nixosTypes regexPosix ];