From dbe98be6a1922a44c0e4457408eb3363a22dfa4b Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Mon, 5 Mar 2012 21:23:22 +0000 Subject: Updating btar svn path=/nixpkgs/trunk/; revision=32807 --- pkgs/tools/backup/btar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/btar/default.nix b/pkgs/tools/backup/btar/default.nix index 2ec82ff4a68af..7fe9e5252d809 100644 --- a/pkgs/tools/backup/btar/default.nix +++ b/pkgs/tools/backup/btar/default.nix @@ -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 ]; -- cgit 1.4.1 From 1f847aa4c5b6703304c5407b8c29407ff2254483 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Mar 2012 23:32:24 +0000 Subject: haskell-Crypto: fix build on GHC 7.4.1 http://anonscm.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-crypto;a=filediff;h=20120213034652-b2814-0019a3f92e453e9be86166d6c1f1bc0dad6e4d12.gz;f=patches/class-constraints.diff svn path=/nixpkgs/trunk/; revision=32808 --- .../haskell/Crypto/class-constraints.diff | 27 ++++++++++++++++++++++ .../libraries/haskell/Crypto/default.nix | 1 + 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/libraries/haskell/Crypto/class-constraints.diff diff --git a/pkgs/development/libraries/haskell/Crypto/class-constraints.diff b/pkgs/development/libraries/haskell/Crypto/class-constraints.diff new file mode 100644 index 0000000000000..77035322678ad --- /dev/null +++ b/pkgs/development/libraries/haskell/Crypto/class-constraints.diff @@ -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 diff --git a/pkgs/development/libraries/haskell/Crypto/default.nix b/pkgs/development/libraries/haskell/Crypto/default.nix index 0adb00ccc8624..01bc1a1a01265 100644 --- a/pkgs/development/libraries/haskell/Crypto/default.nix +++ b/pkgs/development/libraries/haskell/Crypto/default.nix @@ -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"; -- cgit 1.4.1 From fd9fedc32a7bc7d2d34d0de29d870257dd893936 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 6 Mar 2012 09:28:08 +0000 Subject: XaoS wants libpng12 svn path=/nixpkgs/trunk/; revision=32809 --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 243df1a266a06..5607cd20365b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7736,7 +7736,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 { }; -- cgit 1.4.1 From 20c29256cfd3af4bf42e528fd1d7580e750985f2 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 6 Mar 2012 10:18:28 +0000 Subject: xsane needs libpng12.. svn path=/nixpkgs/trunk/; revision=32813 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5607cd20365b8..bb8d9cb1b647d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8772,7 +8772,9 @@ let xosd = callPackage ../misc/xosd { }; - xsane = callPackage ../misc/xsane { }; + xsane = callPackage ../misc/xsane { + libpng = libpng12; + }; yafc = callPackage ../applications/networking/yafc { }; -- cgit 1.4.1 From 4adb9195bc2dba2ba277c3cf08f6459f7ef0c3c2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 6 Mar 2012 11:05:42 +0000 Subject: haskell-base64-bytestring: updated to version 0.1.1.1 svn path=/nixpkgs/trunk/; revision=32815 --- .../libraries/haskell/base64-bytestring/0.1.0.3.nix | 17 ----------------- .../libraries/haskell/base64-bytestring/0.1.1.0.nix | 17 ----------------- .../libraries/haskell/base64-bytestring/default.nix | 17 +++++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 +--- 4 files changed, 18 insertions(+), 37 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/base64-bytestring/0.1.0.3.nix delete mode 100644 pkgs/development/libraries/haskell/base64-bytestring/0.1.1.0.nix create mode 100644 pkgs/development/libraries/haskell/base64-bytestring/default.nix diff --git a/pkgs/development/libraries/haskell/base64-bytestring/0.1.0.3.nix b/pkgs/development/libraries/haskell/base64-bytestring/0.1.0.3.nix deleted file mode 100644 index f974a72347fd3..0000000000000 --- a/pkgs/development/libraries/haskell/base64-bytestring/0.1.0.3.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal }: - -cabal.mkDerivation (self: { - pname = "base64-bytestring"; - version = "0.1.0.3"; - sha256 = "0d4j8b1d8z9qr1y446bfkj764xgilk8gw2frj0wn0717y8knvmx3"; - 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 - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/base64-bytestring/0.1.1.0.nix b/pkgs/development/libraries/haskell/base64-bytestring/0.1.1.0.nix deleted file mode 100644 index 304889991f054..0000000000000 --- a/pkgs/development/libraries/haskell/base64-bytestring/0.1.1.0.nix +++ /dev/null @@ -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 - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/base64-bytestring/default.nix b/pkgs/development/libraries/haskell/base64-bytestring/default.nix new file mode 100644 index 0000000000000..3690c8cff76ba --- /dev/null +++ b/pkgs/development/libraries/haskell/base64-bytestring/default.nix @@ -0,0 +1,17 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "base64-bytestring"; + version = "0.1.1.1"; + sha256 = "0j0jns0yf7dv2bx91hayc8hx0pdab7rhkjllmkl8019kf8rx3gwd"; + 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 + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 82f0fd3660556..d1162884f90bc 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -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 {}; -- cgit 1.4.1 From ae525117794ac95b5f2bf16a5cf9aff2f239f52e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 6 Mar 2012 11:05:45 +0000 Subject: haskell-clientsession: updated to version 0.7.4.2 svn path=/nixpkgs/trunk/; revision=32816 --- pkgs/development/libraries/haskell/clientsession/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix index d4a770d34b74e..e89be643ea495 100644 --- a/pkgs/development/libraries/haskell/clientsession/default.nix +++ b/pkgs/development/libraries/haskell/clientsession/default.nix @@ -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 -- cgit 1.4.1 From 453a3a7d394f0e90906f54e16d7abb4a4b7e61a9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 6 Mar 2012 11:05:48 +0000 Subject: haskell-xss-sanitize: updated to version 0.3.1.1 svn path=/nixpkgs/trunk/; revision=32817 --- pkgs/development/libraries/haskell/xss-sanitize/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/xss-sanitize/default.nix b/pkgs/development/libraries/haskell/xss-sanitize/default.nix index 745480ecf0c6f..aa74f72ba3e72 100644 --- a/pkgs/development/libraries/haskell/xss-sanitize/default.nix +++ b/pkgs/development/libraries/haskell/xss-sanitize/default.nix @@ -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; -- cgit 1.4.1 From 10ec4c4a6a6100124575d315dad899e89eeca172 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 6 Mar 2012 11:05:50 +0000 Subject: all-packages.nix: xsane doesn't depend on libpng svn path=/nixpkgs/trunk/; revision=32818 --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb8d9cb1b647d..5607cd20365b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8772,9 +8772,7 @@ let xosd = callPackage ../misc/xosd { }; - xsane = callPackage ../misc/xsane { - libpng = libpng12; - }; + xsane = callPackage ../misc/xsane { }; yafc = callPackage ../applications/networking/yafc { }; -- cgit 1.4.1 From 88d14c0e29a5966dcf16b307eaa71b583ac7ea50 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 6 Mar 2012 11:24:20 +0000 Subject: git-annex: updated to version 3.20120230 Note that the latest version of git-annex must be compiled with GHC 7.4.1 or later, because it takes advantage of some freaky file name encoding guessing features that are absent in older versions of the base library. svn path=/nixpkgs/trunk/; revision=32819 --- .../applications/version-management/git-and-tools/default.nix | 5 ++--- .../version-management/git-and-tools/git-annex/default.nix | 11 ++++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index a942babdbd09c..f2e7b6b98e957 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -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 { diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 759bd66beb93f..9a2cb7f71f77e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -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 = { -- cgit 1.4.1