BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* Final sync with the trunk.

Browse source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32820
This commit is contained in:
Eelco Dolstra 2012-03-06 11:34:11 +00:00
commit 3c56e571af
11 changed files with 48 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/applications/version-management/git-and-tools/default.nix
View file

@ -47,9 +47,8 @@ rec {
gitAnnex = lib.makeOverridable (import ./git-annex) {
inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which coreutils;
inherit (haskellPackages) ghc MissingH utf8String pcreLight SHA dataenc
HTTP testpack hS3 mtl network hslogger hxt json liftedBase monadControl;
QuickCheck2 = haskellPackages.QuickCheck_2_4_0_1;
inherit (haskellPackages_ghc741) ghc MissingH utf8String pcreLight SHA dataenc
HTTP testpack hS3 mtl network hslogger hxt json liftedBase monadControl IfElse QuickCheck2;
};
qgit = import ./qgit {

11
pkgs/applications/version-management/git-and-tools/git-annex/default.nix
View file

@ -1,32 +1,33 @@
{ stdenv, fetchurl, curl, dataenc, findutils, ghc, git, hS3, hslogger, HTTP, hxt
, ikiwiki, json, libuuid, MissingH, monadControl, mtl, network, pcreLight, perl
, QuickCheck2, rsync, SHA, testpack, utf8String, which, liftedBase, coreutils
, QuickCheck2, rsync, SHA, testpack, utf8String, which, liftedBase, coreutils, IfElse
}:
let
version = "3.20120123";
version = "3.20120230";
in
stdenv.mkDerivation {
name = "git-annex-${version}";
src = fetchurl {
url = "http://ftp.de.debian.org/debian/pool/main/g/git-annex/git-annex_${version}.tar.gz";
sha256 = "dad93dad08ddfd0d239ee57bbf61dd2ee3755d9a94e2946ac5d7bb4cfa565488";
sha256 = "2406fd1405bcdc30cb57ba0455919b5bad2be64bcfe6b6f921cd6ea1797a66fa";
};
buildInputs = [
curl dataenc findutils ghc git hS3 hslogger HTTP hxt ikiwiki json
libuuid MissingH monadControl mtl network pcreLight perl QuickCheck2
rsync SHA testpack utf8String which liftedBase
rsync SHA testpack utf8String which liftedBase IfElse
];
checkTarget = "test";
doCheck = true;
# The 'add_url' test fails because it attempts to use the network.
preConfigure = ''
makeFlagsArray=( PREFIX=$out )
sed -i -e 's|#!/usr/bin/perl|#!${perl}/bin/perl|' mdwn2man
sed -i -e 's|"cp |"${coreutils}/bin/cp |' -e 's|"rm -f |"${coreutils}/bin/rm -f |' test.hs
sed -i -e 's|"cp |"${coreutils}/bin/cp |' -e 's|"rm -f |"${coreutils}/bin/rm -f |' -e 's|, test_addurl||' test.hs
'';
meta = {

27
pkgs/development/libraries/haskell/Crypto/class-constraints.diff Normal file
View file

@ -0,0 +1,27 @@
--- a/Data/Digest/SHA2.hs
+++ b/Data/Digest/SHA2.hs
@@ -106,7 +106,7 @@
data Hash384 = Hash384 !Word64 !Word64 !Word64 !Word64 !Word64 !Word64 deriving (Eq, Ord)
data Hash224 = Hash224 !Word32 !Word32 !Word32 !Word32 !Word32 !Word32 !Word32 deriving (Eq, Ord)
-instance (Integral a) => Show (Hash8 a) where
+instance (Integral a, Show a) => Show (Hash8 a) where
showsPrec _ (Hash8 a b c d e f g h) =
(showHex a) . (' ':) .
(showHex b) . (' ':) .
@@ -146,7 +146,7 @@
where
bs = bitSize (head r)
-instance (Integral h, Bits h) => Hash (Hash8 h) where
+instance (Integral h, Bits h, Show h) => Hash (Hash8 h) where
toOctets (Hash8 x0 x1 x2 x3 x4 x5 x6 x7) = bitsToOctets =<< [x0, x1, x2, x3, x4, x5, x6, x7]
instance Hash Hash384 where
@@ -282,4 +282,4 @@
-- Test with:
-- ghc -no-recomp -O --make Data/Digest/SHA2.hs -main-is Data.Digest.SHA2.moduleTest -o moduleTest && ./moduleTest && rm moduleTest
-moduleTest = runTestTT test_sha2
\ No newline at end of file
+moduleTest = runTestTT test_sha2

1
pkgs/development/libraries/haskell/Crypto/default.nix
View file

@ -7,6 +7,7 @@ cabal.mkDerivation (self: {
isLibrary = true;
isExecutable = true;
buildDepends = [ HUnit QuickCheck random ];
patches = [ ./class-constraints.diff ];
meta = {
description = "Collects together existing Haskell cryptographic functions into a package";
license = "unknown";

17
pkgs/development/libraries/haskell/base64-bytestring/0.1.1.0.nix
View file

@ -1,17 +0,0 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "base64-bytestring";
version = "0.1.1.0";
sha256 = "0vdmwajxg6w924pcsls45bz4bn29xgl3sgvdp2g1jb8f7qb58r7i";
meta = {
homepage = "https://github.com/bos/base64-bytestring";
description = "Fast base64 encoding and deconding for ByteStrings";
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/base64-bytestring/0.1.0.3.nix → pkgs/development/libraries/haskell/base64-bytestring/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "base64-bytestring";
version = "0.1.0.3";
sha256 = "0d4j8b1d8z9qr1y446bfkj764xgilk8gw2frj0wn0717y8knvmx3";
version = "0.1.1.1";
sha256 = "0j0jns0yf7dv2bx91hayc8hx0pdab7rhkjllmkl8019kf8rx3gwd";
meta = {
homepage = "https://github.com/bos/base64-bytestring";
description = "Fast base64 encoding and deconding for ByteStrings";

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "clientsession";
version = "0.7.4.1";
sha256 = "1fnrngbx86zcvh0ybv7ans132d216ayxdzlgw0x4qh0sw9r3w2ip";
version = "0.7.4.2";
sha256 = "0b1afz9frky3kp2crrkmk8cvj77fnyyxrfv1ky0p0cb0lllvdhwp";
buildDepends = [
base64Bytestring cereal cprngAes cryptoApi cryptocipher entropy
skein tagged

6
pkgs/development/libraries/haskell/xss-sanitize/default.nix
View file

@ -2,13 +2,13 @@
cabal.mkDerivation (self: {
pname = "xss-sanitize";
version = "0.3.1";
sha256 = "0s8nqqx5f5b07xxlda4gh0w6vmlkhbqbz36cf6glhbhhyw27jkx5";
version = "0.3.1.1";
sha256 = "1nv28nk1fdxym1vv50wgkyfkinpr3bd7cn6vwi41x5iqy9vgjjpl";
buildDepends = [
attoparsec cssText network tagsoup text utf8String
];
meta = {
homepage = "http://github.com/gregwebs/haskell-xss-sanitize";
homepage = "http://github.com/yesodweb/haskell-xss-sanitize";
description = "sanitize untrusted HTML to prevent XSS attacks";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;

4
pkgs/tools/backup/btar/default.nix
View file

@ -1,10 +1,10 @@
{ stdenv, fetchurl, librsync }:
stdenv.mkDerivation rec {
name = "btar-0.9.1";
name = "btar-0.9.2";
src = fetchurl {
url = "http://vicerveza.homeunix.net/~viric/soft/btar/${name}.tar.gz";
sha256 = "1fmaq5z81zvs3gjrkwnqz8nb4a6dqij5cmw99jhcaxlnwl45y3vj";
sha256 = "113l5qn3qizxnv2r0w8awnm9agjsmf39fl5w9gcvrxqy021f2jd9";
};
buildInputs = [ librsync ];

3
pkgs/top-level/all-packages.nix
View file

@ -7557,7 +7557,8 @@ let
xaos = builderDefsPackage (import ../applications/graphics/xaos) {
inherit (xlibs) libXt libX11 libXext xextproto xproto;
inherit gsl aalib zlib libpng intltool gettext perl;
inherit gsl aalib zlib intltool gettext perl;
libpng = libpng12;
};
xara = callPackage ../applications/graphics/xara { };

4
pkgs/top-level/haskell-packages.nix
View file

@ -456,9 +456,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
base64String = callPackage ../development/libraries/haskell/base64-string {};
base64Bytestring_0_1_0_3 = callPackage ../development/libraries/haskell/base64-bytestring/0.1.0.3.nix {};
base64Bytestring_0_1_1_0 = callPackage ../development/libraries/haskell/base64-bytestring/0.1.1.0.nix {};
base64Bytestring = self.base64Bytestring_0_1_0_3; # Version 0.1.1.0 has serious performance issues.
base64Bytestring = callPackage ../development/libraries/haskell/base64-bytestring {};
baseUnicodeSymbols = callPackage ../development/libraries/haskell/base-unicode-symbols {};