From 4d90c6b8356fa321e6cbb27cbe911561bcadcf05 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Tue, 15 May 2012 06:28:14 +0000 Subject: [PATCH 001/403] Add assertion: BLCR do not build on recent kernels svn path=/nixpkgs/trunk/; revision=34098 --- pkgs/os-specific/linux/blcr/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/blcr/default.nix b/pkgs/os-specific/linux/blcr/default.nix index cc7f3934734..71d7bcb7d77 100644 --- a/pkgs/os-specific/linux/blcr/default.nix +++ b/pkgs/os-specific/linux/blcr/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, kernel, perl, makeWrapper }: -assert stdenv.isLinux; +assert stdenv.isLinux && builtins.compareVersion kernel.version "2.6.38" != 1; stdenv.mkDerivation { name = "blcr-0.8.4-${kernel.version}"; From 003d844aafe8246bb9418103489212b63d9e3244 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Tue, 15 May 2012 06:30:58 +0000 Subject: [PATCH 002/403] Removed dead code svn path=/nixpkgs/trunk/; revision=34099 --- 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 fe12783a382..95f41a6287e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5675,9 +5675,7 @@ let callPackage ../os-specific/linux/aufs-util/3.nix { } else null; - blcr = callPackage ../os-specific/linux/blcr { - #libtool = libtool_1_5; # libtool 2 causes a fork bomb - }; + blcr = callPackage ../os-specific/linux/blcr { }; e1000e = callPackage ../os-specific/linux/e1000e {}; From ebb486baf81b809e005cb3004902884b0c7978ee Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Tue, 15 May 2012 06:52:38 +0000 Subject: [PATCH 003/403] Typo svn path=/nixpkgs/trunk/; revision=34100 --- pkgs/os-specific/linux/blcr/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/blcr/default.nix b/pkgs/os-specific/linux/blcr/default.nix index 71d7bcb7d77..516b8b9ed38 100644 --- a/pkgs/os-specific/linux/blcr/default.nix +++ b/pkgs/os-specific/linux/blcr/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, kernel, perl, makeWrapper }: -assert stdenv.isLinux && builtins.compareVersion kernel.version "2.6.38" != 1; +assert stdenv.isLinux && builtins.compareVersions kernel.version "2.6.38" != 1; stdenv.mkDerivation { name = "blcr-0.8.4-${kernel.version}"; From 201bdca9628be3d3164a988ec47cf8ef3db26ef1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 15 May 2012 11:50:48 +0000 Subject: [PATCH 004/403] Updated Haskell packages. - cryptocipher: updated to version 0.3.2 - Crypto: updated to version 4.2.5 - darcs: updated to version 2.8.1 - hamlet: updated to version 1.0.1.3 - monad-par-extras: updated to version 0.3.2 - persistent-template: updated to version 0.9.0.2 - pool-conduit: updated to version 0.1.0.2 - shakespeare-css: updated to version 1.0.1.2 - shakespeare-i18n: updated to version 1.0.0.2 - shakespeare-js: updated to version 1.0.0.2 - shakespeare-text: updated to version 1.0.0.2 - shakespeare: updated to version 1.0.0.2 - warp: updated to version 1.2.1 - wxcore: updated to version 0.90.0.1 - wxc: updated to version 0.90.0.3 - wx: updated to version 0.90.0.1 - xml-conduit: updated to version 0.7.0.3 - xss-sanitize: updated to version 0.3.2 - yesod-auth: updated to version 1.0.2.1 - yesod-core: updated to version 1.0.1.2 - yesod-default: updated to version 1.0.1.1 - yesod-form: updated to version 1.0.0.4 - yesod-json: updated to version 1.0.0.1 - yesod-persistent: updated to version 1.0.0.1 - yesod-routes: updated to version 1.0.1.2 - yesod-static: updated to version 1.0.0.2 - yesod: updated to version 1.0.1.6 svn path=/nixpkgs/trunk/; revision=34102 --- .../version-management/darcs/default.nix | 4 +-- .../haskell/Crypto/class-constraints.diff | 27 ------------------- .../libraries/haskell/Crypto/default.nix | 5 ++-- .../haskell/cryptocipher/default.nix | 4 +-- .../libraries/haskell/hamlet/default.nix | 10 +++---- .../haskell/monad-par-extras/default.nix | 4 +-- .../haskell/persistent-template/default.nix | 4 +-- .../haskell/pool-conduit/default.nix | 4 +-- .../haskell/shakespeare-css/default.nix | 4 +-- .../haskell/shakespeare-i18n/default.nix | 4 +-- .../haskell/shakespeare-js/default.nix | 4 +-- .../haskell/shakespeare-text/default.nix | 4 +-- .../libraries/haskell/shakespeare/default.nix | 4 +-- .../libraries/haskell/warp/default.nix | 4 +-- .../libraries/haskell/wxHaskell/wx.nix | 4 +-- .../libraries/haskell/wxHaskell/wxc.nix | 4 +-- .../libraries/haskell/wxHaskell/wxcore.nix | 4 +-- .../libraries/haskell/xml-conduit/default.nix | 4 +-- .../haskell/xss-sanitize/default.nix | 4 +-- .../libraries/haskell/yesod-auth/default.nix | 23 ++++++++-------- .../libraries/haskell/yesod-core/default.nix | 27 ++++++++++--------- .../haskell/yesod-default/default.nix | 4 +-- .../libraries/haskell/yesod-form/default.nix | 17 ++++++------ .../libraries/haskell/yesod-json/default.nix | 4 +-- .../haskell/yesod-persistent/default.nix | 4 +-- .../haskell/yesod-routes/default.nix | 4 +-- .../haskell/yesod-static/default.nix | 4 +-- .../libraries/haskell/yesod/default.nix | 22 +++++++-------- 28 files changed, 95 insertions(+), 120 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/Crypto/class-constraints.diff diff --git a/pkgs/applications/version-management/darcs/default.nix b/pkgs/applications/version-management/darcs/default.nix index 4ce820b7876..53cb4b360a0 100644 --- a/pkgs/applications/version-management/darcs/default.nix +++ b/pkgs/applications/version-management/darcs/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "darcs"; - version = "2.8.0"; - sha256 = "10yfab7qb20hzikwrgra7zhx7ad2j0s6l7zksmvczf4xm6hw458l"; + version = "2.8.1"; + sha256 = "1fz9k9zihb0fz0w2y55iqa1fd604nxzz48r62sx3ixxn8qqsvrd1"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/Crypto/class-constraints.diff b/pkgs/development/libraries/haskell/Crypto/class-constraints.diff deleted file mode 100644 index 77035322678..00000000000 --- a/pkgs/development/libraries/haskell/Crypto/class-constraints.diff +++ /dev/null @@ -1,27 +0,0 @@ ---- 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 01bc1a1a012..f6f06b9c283 100644 --- a/pkgs/development/libraries/haskell/Crypto/default.nix +++ b/pkgs/development/libraries/haskell/Crypto/default.nix @@ -2,12 +2,11 @@ cabal.mkDerivation (self: { pname = "Crypto"; - version = "4.2.4"; - sha256 = "05wafv8flrh1893rh208azzig5k5pa022s2fg3f8lrqb23c6v63p"; + version = "4.2.5"; + sha256 = "0wv48is2jqia8hda6q65y3mhabxlw9hjzmpk3dx70rzh4w44yxb8"; 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"; diff --git a/pkgs/development/libraries/haskell/cryptocipher/default.nix b/pkgs/development/libraries/haskell/cryptocipher/default.nix index 1b2dc44fbdd..767891bf18a 100644 --- a/pkgs/development/libraries/haskell/cryptocipher/default.nix +++ b/pkgs/development/libraries/haskell/cryptocipher/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cryptocipher"; - version = "0.3.1"; - sha256 = "14icn1p0mjg4y45q6pbh8qamw5hm1z2z7d424gmiknbf24nq8nmi"; + version = "0.3.2"; + sha256 = "0nw7rwlnakdslzg4z6ik9hfylwnrbn103n677w0xr5b81wj19a5j"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index 5a13b3e888e..083e75a87f1 100644 --- a/pkgs/development/libraries/haskell/hamlet/default.nix +++ b/pkgs/development/libraries/haskell/hamlet/default.nix @@ -1,13 +1,13 @@ -{ cabal, blazeBuilder, blazeHtml, failure, parsec, shakespeare -, text +{ cabal, blazeBuilder, blazeHtml, blazeMarkup, failure, parsec +, shakespeare, text }: cabal.mkDerivation (self: { pname = "hamlet"; - version = "1.0.1.2"; - sha256 = "1lb1q2nkih7z63gh1rdwl4656ybmpdqic1d09q5jqgm6bjqrgw53"; + version = "1.0.1.3"; + sha256 = "0pdnq8kvln6jr5gwzd1fj0knd2ph1a76ra1njwaccliqig1s7j3n"; buildDepends = [ - blazeBuilder blazeHtml failure parsec shakespeare text + blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; diff --git a/pkgs/development/libraries/haskell/monad-par-extras/default.nix b/pkgs/development/libraries/haskell/monad-par-extras/default.nix index 2be599a7c5c..fb877337221 100644 --- a/pkgs/development/libraries/haskell/monad-par-extras/default.nix +++ b/pkgs/development/libraries/haskell/monad-par-extras/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "monad-par-extras"; - version = "0.3"; - sha256 = "1nrxzqswb265slxq4dhm6bav7zb4zglbrh99w5x6hwx6drgsw10d"; + version = "0.3.2"; + sha256 = "1k0j3n803z4lv5impz6xd1nzav35dl5f68nlw2ppgg1bbfpvdv6b"; buildDepends = [ abstractPar cereal deepseq mtl random transformers ]; diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index b83a32385de..a4bbb10a5dd 100644 --- a/pkgs/development/libraries/haskell/persistent-template/default.nix +++ b/pkgs/development/libraries/haskell/persistent-template/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "persistent-template"; - version = "0.9.0.1"; - sha256 = "0hxv69qifkmv36zkzlhlw40s6zzv4jf977iqim069b4v8824r9pc"; + version = "0.9.0.2"; + sha256 = "1x3xn5dxv41hbadb0riss046lcr3k0h4rg6cvk60x8zxblrswabw"; buildDepends = [ aeson monadControl persistent text transformers ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; diff --git a/pkgs/development/libraries/haskell/pool-conduit/default.nix b/pkgs/development/libraries/haskell/pool-conduit/default.nix index abb5d83f5e7..73966514e49 100644 --- a/pkgs/development/libraries/haskell/pool-conduit/default.nix +++ b/pkgs/development/libraries/haskell/pool-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "pool-conduit"; - version = "0.1.0.1"; - sha256 = "1a88x8yi5p99qpq262idfzn9f5cjjdq417rbayp0kknm5c6d9n5c"; + version = "0.1.0.2"; + sha256 = "1fs2kskvsvck9n011f2pv0s3mxd2hh71p61dxrskz79mfvks5yky"; buildDepends = [ resourcePool resourcet transformers ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index 1fd81d9d6a5..1fd00e5e08a 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-css"; - version = "1.0.1.1"; - sha256 = "1janifi0sqdvxwq8ywk6g1y9r8qgy2jvizlm0drp09lnw1dlss25"; + version = "1.0.1.2"; + sha256 = "055nzffn5zlbwilm8624iaqzxchi247rwpca8adbxai1n2ja9fh7"; buildDepends = [ parsec shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; diff --git a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix index 5ef05d877e3..1150ead0394 100644 --- a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-i18n"; - version = "1.0.0.1"; - sha256 = "1g4jczz3kvfvdk2w64kbphmv451g8khx5d1bxmhscqkmlh6zgqjz"; + version = "1.0.0.2"; + sha256 = "11ydkl6v31v79q8a8fqf4p99p7dv9dlimr3rhi9cs5lrxz9gmf5z"; buildDepends = [ parsec shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix index f6b7fbbea4b..1b8605bb802 100644 --- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-js"; - version = "1.0.0.1"; - sha256 = "13l1hsc6b87lbz10xhihvmzf1922mwmrbinr4rhkrn48hlxf2fii"; + version = "1.0.0.2"; + sha256 = "1qygxihhfl7wzv3djxmldh82pwk8rhnk54zfvwy1pxhxb8y30wkm"; buildDepends = [ shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix index ad12fdd1d07..04f9a100619 100644 --- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-text"; - version = "1.0.0.1"; - sha256 = "0afbxjz6ma0fk4m3xp8cx9sfaxdnsxzbj3ikyfn6vmx4ivid299f"; + version = "1.0.0.2"; + sha256 = "1dnw6aipx68cd832vs5rwxv2hr7kfk1y83mzd1xl2b3am1g0izfc"; buildDepends = [ shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix index f8a88002f71..c5fd290f08d 100644 --- a/pkgs/development/libraries/haskell/shakespeare/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare"; - version = "1.0.0.1"; - sha256 = "1x682irbxr7wwrpz4ri2j4pl85r8s8hs0draf9bfaskagp14d522"; + version = "1.0.0.2"; + sha256 = "04nk9l7c5wk3rbkk57s5as30zvsa7wzrsmhdak59i6v30ww22c9f"; buildDepends = [ parsec text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 47d91c4172f..18633f4cc1b 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "1.2.0.2"; - sha256 = "08gd0xzx3j47adl2pgvcc0dj7vvfj2igbvrgnl8rifz8r5gj17lq"; + version = "1.2.1"; + sha256 = "0yjvd9dc0rwczj3041s55lhfn46zhymgibrawl84ssxky68syhx4"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit httpTypes liftedBase network networkConduit simpleSendfile transformers diff --git a/pkgs/development/libraries/haskell/wxHaskell/wx.nix b/pkgs/development/libraries/haskell/wxHaskell/wx.nix index 98dcc20feb0..dc030f68059 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wx.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wx.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "wx"; - version = "0.90"; - sha256 = "01rr8n99mas5x0vfxh8wf01vbh29vil860waxnsn6xdqc9fm5jj2"; + version = "0.90.0.1"; + sha256 = "116vlpssjcyzil99xmz3azc2vl97iban3gdpxd593q5gi24l838m"; buildDepends = [ stm wxcore ]; meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix index b96ecfb4d9d..7bfd121a13f 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "wxc"; - version = "0.90.0.2"; - sha256 = "1vqs9517qacm04d2bxpbpcdgfmlhpblm6af45nmcdikvlfa1v0jp"; + version = "0.90.0.3"; + sha256 = "14b8g2w4knwxj5vkp759y8m3nmsi4n1zy57ma1kz7lw6jklb7dlq"; buildDepends = [ wxdirect ]; extraLibraries = [ libX11 mesa wxGTK ]; noHaddock = true; diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix index 4627e7fcf1d..9fa98d47f91 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wxcore"; - version = "0.90"; - sha256 = "1vrv683576cdvxfiriw2aw5kw1gzrddd27pxa06rrg5nny0jni46"; + version = "0.90.0.1"; + sha256 = "031947805bjw32f1a8w2ra8714ysq5k0pxp11cr9hgcc93l9f3pq"; buildDepends = [ filepath parsec stm time wxc wxdirect ]; extraLibraries = [ libX11 mesa wxGTK ]; meta = { diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix index 192d836686d..9e2d0c59a52 100644 --- a/pkgs/development/libraries/haskell/xml-conduit/default.nix +++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "xml-conduit"; - version = "0.7.0.2"; - sha256 = "0qrfl946db56p2bfjrnmkl816fncn598g5jg1s1q4xq4jp7mm70k"; + version = "0.7.0.3"; + sha256 = "143cd8mjxckknlza327cmn63prw89ypnw32bk762s72vbqm1xvvv"; buildDepends = [ attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit conduit dataDefault failure monadControl resourcet systemFilepath diff --git a/pkgs/development/libraries/haskell/xss-sanitize/default.nix b/pkgs/development/libraries/haskell/xss-sanitize/default.nix index 6df83a35723..0fac2ad6372 100644 --- a/pkgs/development/libraries/haskell/xss-sanitize/default.nix +++ b/pkgs/development/libraries/haskell/xss-sanitize/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "xss-sanitize"; - version = "0.3.1.1"; - sha256 = "1nv28nk1fdxym1vv50wgkyfkinpr3bd7cn6vwi41x5iqy9vgjjpl"; + version = "0.3.2"; + sha256 = "0m7gl232i06i090kbrlz67cs4q3pqf8169m9kjdj41kj6jay1dcx"; buildDepends = [ attoparsec cssText network tagsoup text utf8String ]; diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index 4ee7f77e526..3b92570989e 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -1,19 +1,20 @@ -{ cabal, aeson, authenticate, blazeHtml, hamlet, httpConduit -, liftedBase, mimeMail, persistent, persistentTemplate, pureMD5 -, pwstoreFast, random, SHA, shakespeareCss, text, transformers -, unorderedContainers, wai, yesodCore, yesodForm, yesodJson -, yesodPersistent +{ cabal, aeson, authenticate, blazeHtml, blazeMarkup, hamlet +, httpConduit, liftedBase, mimeMail, persistent, persistentTemplate +, pureMD5, pwstoreFast, random, SHA, shakespeareCss, text +, transformers, unorderedContainers, wai, yesodCore, yesodForm +, yesodJson, yesodPersistent }: cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.0.2"; - sha256 = "1rbp62phyzlxm458xgqxg3qg5fvivmhcgzd8pprqy9ya0v58wwlr"; + version = "1.0.2.1"; + sha256 = "0fkk9vyb8z9hr77d771f74ka6s95fbzk5zw359cx8m2d5rc9fqvr"; buildDepends = [ - aeson authenticate blazeHtml hamlet httpConduit liftedBase mimeMail - persistent persistentTemplate pureMD5 pwstoreFast random SHA - shakespeareCss text transformers unorderedContainers wai yesodCore - yesodForm yesodJson yesodPersistent + aeson authenticate blazeHtml blazeMarkup hamlet httpConduit + liftedBase mimeMail persistent persistentTemplate pureMD5 + pwstoreFast random SHA shakespeareCss text transformers + unorderedContainers wai yesodCore yesodForm yesodJson + yesodPersistent ]; meta = { homepage = "http://www.yesodweb.com/"; diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index ac5f201a028..b21ce4b00f0 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -1,21 +1,22 @@ -{ cabal, aeson, blazeBuilder, blazeHtml, caseInsensitive, cereal -, clientsession, conduit, cookie, failure, fastLogger, hamlet -, httpTypes, liftedBase, monadControl, parsec, pathPieces, random -, resourcet, shakespeare, shakespeareCss, shakespeareI18n -, shakespeareJs, text, time, transformers, transformersBase, vector -, wai, waiExtra, waiLogger, yesodRoutes +{ cabal, aeson, blazeBuilder, blazeHtml, blazeMarkup +, caseInsensitive, cereal, clientsession, conduit, cookie, failure +, fastLogger, hamlet, httpTypes, liftedBase, monadControl, parsec +, pathPieces, random, resourcet, shakespeare, shakespeareCss +, shakespeareI18n, shakespeareJs, text, time, transformers +, transformersBase, vector, wai, waiExtra, waiLogger, yesodRoutes }: cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.0.1.1"; - sha256 = "05zspm7dfkjzb40839qnf002hxsav01vxkv3dccidvp0q340j0vz"; + version = "1.0.1.2"; + sha256 = "1c9ay0xv2s1kcj92ai0bj1gbml4k4w62n2mw7c5r6m88k8wmxh6z"; buildDepends = [ - aeson blazeBuilder blazeHtml caseInsensitive cereal clientsession - conduit cookie failure fastLogger hamlet httpTypes liftedBase - monadControl parsec pathPieces random resourcet shakespeare - shakespeareCss shakespeareI18n shakespeareJs text time transformers - transformersBase vector wai waiExtra waiLogger yesodRoutes + aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal + clientsession conduit cookie failure fastLogger hamlet httpTypes + liftedBase monadControl parsec pathPieces random resourcet + shakespeare shakespeareCss shakespeareI18n shakespeareJs text time + transformers transformersBase vector wai waiExtra waiLogger + yesodRoutes ]; meta = { homepage = "http://www.yesodweb.com/"; diff --git a/pkgs/development/libraries/haskell/yesod-default/default.nix b/pkgs/development/libraries/haskell/yesod-default/default.nix index 50896ae3c0e..d801d36e9c4 100644 --- a/pkgs/development/libraries/haskell/yesod-default/default.nix +++ b/pkgs/development/libraries/haskell/yesod-default/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-default"; - version = "1.0.1"; - sha256 = "1b9qxfs9pbgn090cipnnbd6vf1ajyhs0xjfynkj87k8fx6j2lqb9"; + version = "1.0.1.1"; + sha256 = "0jv7fxrgh2x93saz0vrba0mzafq3wmq85b3idcsny4d8mgj6ngv0"; buildDepends = [ networkConduit shakespeareCss shakespeareJs text transformers unorderedContainers wai waiExtra warp yaml yesodCore diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 85a6228e793..512c0ca1b6d 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -1,16 +1,17 @@ -{ cabal, blazeBuilder, blazeHtml, dataDefault, emailValidate -, hamlet, network, persistent, shakespeareCss, shakespeareJs, text -, time, transformers, wai, xssSanitize, yesodCore, yesodPersistent +{ cabal, blazeBuilder, blazeHtml, blazeMarkup, dataDefault +, emailValidate, hamlet, network, persistent, shakespeareCss +, shakespeareJs, text, time, transformers, wai, xssSanitize +, yesodCore, yesodPersistent }: cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.0.0.3"; - sha256 = "0xqgvmpxv9lrpl06qh3pqn53f5pa02k8v5c4z6brzb8s44ppw1pq"; + version = "1.0.0.4"; + sha256 = "1wc7nrsf7r9zs24q2amy1zij5sfycs1arnrf8g769c7gihjhdqfd"; buildDepends = [ - blazeBuilder blazeHtml dataDefault emailValidate hamlet network - persistent shakespeareCss shakespeareJs text time transformers wai - xssSanitize yesodCore yesodPersistent + blazeBuilder blazeHtml blazeMarkup dataDefault emailValidate hamlet + network persistent shakespeareCss shakespeareJs text time + transformers wai xssSanitize yesodCore yesodPersistent ]; meta = { homepage = "http://www.yesodweb.com/"; diff --git a/pkgs/development/libraries/haskell/yesod-json/default.nix b/pkgs/development/libraries/haskell/yesod-json/default.nix index debc3d7cb09..7ff0abedc1a 100644 --- a/pkgs/development/libraries/haskell/yesod-json/default.nix +++ b/pkgs/development/libraries/haskell/yesod-json/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-json"; - version = "1.0.0"; - sha256 = "159j303yd3d5n2iqkbi55vj9d5d3jdnpnz115m9p6nf60qqmhj97"; + version = "1.0.0.1"; + sha256 = "0dh294y067xa1y9lxamspbq21npv66ilsiayynsiykzik86k6vph"; buildDepends = [ aeson attoparsecConduit blazeBuilder conduit safe shakespeareJs text transformers vector wai waiExtra yesodCore yesodRoutes diff --git a/pkgs/development/libraries/haskell/yesod-persistent/default.nix b/pkgs/development/libraries/haskell/yesod-persistent/default.nix index 42f3f93c507..c6cf7f22159 100644 --- a/pkgs/development/libraries/haskell/yesod-persistent/default.nix +++ b/pkgs/development/libraries/haskell/yesod-persistent/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "yesod-persistent"; - version = "1.0.0"; - sha256 = "1dawhs9ab2z5njq9m37p9zrr5wdzrmw4i0ixb2j4rhff8z50hjaf"; + version = "1.0.0.1"; + sha256 = "1v4ip4g9x2a5byl0a9a1raad3aba7hs618vx7fnc5n2ajjji84mx"; buildDepends = [ persistent persistentTemplate transformers yesodCore ]; diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix index adf9ed5f2c6..8b3a685105a 100644 --- a/pkgs/development/libraries/haskell/yesod-routes/default.nix +++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "yesod-routes"; - version = "1.0.1"; - sha256 = "12m2j7sl7gr8755xza7k5nlqxl4g7az3vin5vdl8km5aw754761w"; + version = "1.0.1.2"; + sha256 = "15ar99ywxrsd6pgqwmql7vg801n53l3jw0s2iynddq9jjl4yqpf7"; buildDepends = [ pathPieces text vector ]; meta = { homepage = "http://www.yesodweb.com/"; diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index a921e621f5c..c37287cd241 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-static"; - version = "1.0.0.1"; - sha256 = "1zrpwd9dfqw5bzmrcsny4xkrw3y71ki8xhdfcyznf1bkmbnbim5n"; + version = "1.0.0.2"; + sha256 = "12r3i4s1g9wlf5jmbvqw9qzcgw96zdlky6zisdipy40yzpg6m07v"; buildDepends = [ base64Bytestring cereal conduit cryptoConduit cryptohash fileEmbed httpTypes text transformers unixCompat wai waiAppStatic yesodCore diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index b8ffdba7c6e..256c398cfe4 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -1,21 +1,21 @@ -{ cabal, attoparsec, blazeBuilder, blazeHtml, Cabal, fastLogger -, filepath, hamlet, httpTypes, monadControl, parsec, shakespeareCss -, shakespeareJs, shakespeareText, text, time, transformers -, unixCompat, wai, waiExtra, waiLogger, warp, yesodAuth, yesodCore -, yesodForm, yesodJson, yesodPersistent +{ cabal, attoparsec, blazeBuilder, blazeHtml, blazeMarkup, Cabal +, fastLogger, filepath, hamlet, httpTypes, monadControl, parsec +, shakespeareCss, shakespeareJs, shakespeareText, text, time +, transformers, unixCompat, wai, waiExtra, waiLogger, warp +, yesodAuth, yesodCore, yesodForm, yesodJson, yesodPersistent }: cabal.mkDerivation (self: { pname = "yesod"; - version = "1.0.1.5"; - sha256 = "1va0pq5gn10anh333fqv8a99gngjip5w5lwl4i5q7lbparz93iji"; + version = "1.0.1.6"; + sha256 = "0w5k5bcv50fjpyja6ydknk78dk50swx6b0myhizj8rcf851xga43"; isLibrary = true; isExecutable = true; buildDepends = [ - attoparsec blazeBuilder blazeHtml Cabal fastLogger filepath hamlet - httpTypes monadControl parsec shakespeareCss shakespeareJs - shakespeareText text time transformers unixCompat wai waiExtra - waiLogger warp yesodAuth yesodCore yesodForm yesodJson + attoparsec blazeBuilder blazeHtml blazeMarkup Cabal fastLogger + filepath hamlet httpTypes monadControl parsec shakespeareCss + shakespeareJs shakespeareText text time transformers unixCompat wai + waiExtra waiLogger warp yesodAuth yesodCore yesodForm yesodJson yesodPersistent ]; meta = { From 3e2a3f5d09c3735913d7e1ea5321ac2271b36fae Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 15 May 2012 13:51:03 +0000 Subject: [PATCH 005/403] Added ZRAM module support to the SheevaPlug kernel. svn path=/nixpkgs/trunk/; revision=34104 --- pkgs/top-level/platforms.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index ca1fdb277be..02732768f1d 100644 --- a/pkgs/top-level/platforms.nix +++ b/pkgs/top-level/platforms.nix @@ -73,6 +73,8 @@ rec { CIFS_FSCACHE y CIFS_ACL y + ZRAM m + # Fail to build DRM n SCSI_ADVANSYS n From 00b9523bbba2078b96546fe284d4672fb452b43b Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 15 May 2012 14:00:21 +0000 Subject: [PATCH 006/403] Added IP_PNP_DHCP to the SheevaPlug kernel configuration. This allows the SheevaPlug to set up the network automatically with DHCP, if the "ip=dhcp" kernel option is set. svn path=/nixpkgs/trunk/; revision=34105 --- pkgs/top-level/platforms.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index 02732768f1d..386ca566d55 100644 --- a/pkgs/top-level/platforms.nix +++ b/pkgs/top-level/platforms.nix @@ -48,6 +48,7 @@ rec { USB_STORAGE_CYPRESS_ATACB m IP_PNP y + IP_PNP_DHCP y NFS_FS y ROOT_NFS y TUN m From c7ab74baccdcc138e6a78401c60d09ccca4ef530 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 15 May 2012 14:09:15 +0000 Subject: [PATCH 007/403] lsof 4.86. svn path=/nixpkgs/trunk/; revision=34106 --- pkgs/development/tools/misc/lsof/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index 69503782d6e..a7d5ad0e393 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "lsof-4.85"; + name = "lsof-4.86"; src = fetchurl { - url = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.85.tar.bz2; - sha256 = "1hd1aihbzx2c2p4ps4zll6nldyf9l7js59hllnnmpi1r6pk5iaj9"; + url = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.86.tar.bz2; + sha256 = "13e52b8e87dddf1b2e219004e315d755c659217ce6ffc6a5f1102969f1c4dd0c"; }; unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); "; From ea74e1ea6db16b9d4f1dd2ed9ba47077aa98c9cb Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 15 May 2012 14:14:33 +0000 Subject: [PATCH 008/403] lighttpd 1.4.30. svn path=/nixpkgs/trunk/; revision=34107 --- pkgs/servers/http/lighttpd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index c0184b87538..11df6e74bd6 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pcre, libxml2, zlib, attr, bzip2 }: stdenv.mkDerivation { - name = "lighttpd-1.4.19"; + name = "lighttpd-1.4.30"; src = fetchurl { - url = http://www.lighttpd.net/download/lighttpd-1.4.19.tar.bz2; - sha256 = "1mziqb36ik9z4lf1h5ccm1h4ab7d2hx0cz0g5425lwy374r34fd2"; + url = http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.30.tar.xz; + sha256 = "c237692366935b19ef8a6a600b2f3c9b259a9c3107271594c081a45902bd9c9b"; }; buildInputs = [ pcre libxml2 zlib attr bzip2 ]; From ec996106ec1d0eebb5370573f8314d1d528a61ea Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 15 May 2012 14:25:14 +0000 Subject: [PATCH 009/403] tftp-hpa 5.2. svn path=/nixpkgs/trunk/; revision=34108 --- pkgs/tools/networking/tftp-hpa/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/tftp-hpa/default.nix b/pkgs/tools/networking/tftp-hpa/default.nix index 95420b48a30..c88b0b2dbe3 100644 --- a/pkgs/tools/networking/tftp-hpa/default.nix +++ b/pkgs/tools/networking/tftp-hpa/default.nix @@ -11,10 +11,10 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="tftp-hpa"; - version="5.1"; + version="5.2"; name="${baseName}-${version}"; - url="mirror://kernel/software/network/tftp/${name}.tar.bz2"; - hash="0k72s0c7wm4fyb6lqfypdkcy6rimanr49slimx8p0di69w394gzx"; + url="mirror://kernel/software/network/tftp/tftp-hpa/${name}.tar.xz"; + hash="afee361df96a2f88344e191f6a25480fd714e1d28d176c3f10cc43fa206b718b"; }; in rec { From c12005ef5667e12196529873d206365cfa845c7c Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 15 May 2012 14:31:43 +0000 Subject: [PATCH 010/403] spotify 0.8.3.278. svn path=/nixpkgs/trunk/; revision=34109 --- pkgs/applications/audio/spotify/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 4711d0f29ea..a5c7918e4b6 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -2,7 +2,7 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; -let version = "0.6.6.10"; in +let version = "0.8.3.278"; in stdenv.mkDerivation { name = "spotify-${version}"; @@ -10,13 +10,13 @@ stdenv.mkDerivation { src = if stdenv.system == "i686-linux" then fetchurl { - url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gbd39032.58-1_i386.deb"; - sha256 = "184wvw2jqihw7bbmd7pgz51nkzvk777imz9pvknv52mggai61523"; + url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}.g21c7566.632-1_i386.deb"; + sha256 = "7f587585365498c5182bd7f3beafaf511d883102f5cece66cf84f4f94077765b"; } else if stdenv.system == "x86_64-linux" then fetchurl { - url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gbd39032.58-1_amd64.deb"; - sha256 = "0qy4dgcl4y8ymqk8i9vgabik7mq0niqpbkwl3sk8z66znax4am4c"; + url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}.g21c7566.632-1_amd64.deb"; + sha256 = "a37a13b1c1a8088a811054c732d85b9d6ccf0bd92ad4da75bfee6d70dc344b5e"; } else throw "Spotify not supported on this platform."; From 13bcdc5f337466ccdce6b23fa1feca14742c985a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 May 2012 14:37:24 +0000 Subject: [PATCH 011/403] * Fix building the tarball in a chroot. svn path=/nixpkgs/trunk/; revision=34110 --- pkgs/top-level/make-tarball.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index da83c6139c9..b3c29c26746 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -42,6 +42,7 @@ releaseTools.makeSourceTarball { checkPhase = '' export NIX_DB_DIR=$TMPDIR + export NIX_STATE_DIR=$TMPDIR nix-store --init # Run the regression tests in `lib'. From a3fe6bd059ef5b5037556708eee0a22535939b5f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 May 2012 15:40:20 +0000 Subject: [PATCH 012/403] * Samba 3.6.5 (fixes CVE-2012-2111). svn path=/nixpkgs/trunk/; revision=34111 --- pkgs/servers/samba/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix index 39ccfa9184e..3a3051e29bf 100644 --- a/pkgs/servers/samba/default.nix +++ b/pkgs/servers/samba/default.nix @@ -18,11 +18,11 @@ assert useKerberos -> kerberos != null; stdenv.mkDerivation rec { - name = "samba-3.6.4"; + name = "samba-3.6.5"; src = fetchurl { url = "http://us3.samba.org/samba/ftp/stable/${name}.tar.gz"; - sha256 = "052r5c9pwqk6qnzc2g6wljxml6j3nkydbpisgfa0xmvdgzyc42jr"; + sha256 = "1i40mf5rvz055zp7fy5rqp1lwlsm65g8k6n8jxw5w5f1p3rmzxla"; }; patches = From fb23d3a515c70b7e39ccfc7c9a5700db2ad854fe Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 May 2012 16:08:10 +0000 Subject: [PATCH 013/403] * Mark sqlite and sqliteFull as low priority (as opposed to sqliteInteractive). svn path=/nixpkgs/trunk/; revision=34112 --- pkgs/top-level/all-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95f41a6287e..ce0049c83f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4627,10 +4627,10 @@ let srtp = callPackage ../development/libraries/srtp {}; - sqlite = callPackage ../development/libraries/sqlite { + sqlite = lowPrio (callPackage ../development/libraries/sqlite { readline = null; ncurses = null; - }; + }); sqlite36 = callPackage ../development/libraries/sqlite/3.6.x.nix { readline = null; @@ -4641,9 +4641,9 @@ let inherit readline ncurses; }); - sqliteFull = callPackage ../development/libraries/sqlite/full.nix { + sqliteFull = lowPrio (callPackage ../development/libraries/sqlite/full.nix { inherit readline ncurses; - }; + }); stlport = callPackage ../development/libraries/stlport { }; From 68d2c3d70f54a53a2b7a51b427bc3e823f183bf1 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Tue, 15 May 2012 17:31:53 +0000 Subject: [PATCH 014/403] Blind attempt to update OpenAFS to version 1.6.1 svn path=/nixpkgs/trunk/; revision=34115 --- pkgs/servers/openafs-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix index ba7de83d939..2db5ab59486 100644 --- a/pkgs/servers/openafs-client/default.nix +++ b/pkgs/servers/openafs-client/default.nix @@ -4,10 +4,10 @@ assert stdenv.isLinux; stdenv.mkDerivation { - name = "openafs-1.6.0-${kernel.version}"; + name = "openafs-1.6.1-${kernel.version}"; src = fetchurl { - url = http://www.openafs.org/dl/openafs/1.6.0/openafs-1.6.0-src.tar.bz2; + url = http://www.openafs.org/dl/openafs/1.6.1/openafs-1.6.1-src.tar.bz2; sha256 = "1rj40qp30hswr08p69jigya78ggbn4dc7qnnw2sfjpv52ywa68p7"; }; From a5d77fcf2be980ea0459c11ea4c54a9eabc88d4a Mon Sep 17 00:00:00 2001 From: Cillian de Roiste Date: Tue, 15 May 2012 17:54:05 +0000 Subject: [PATCH 015/403] Updating erlange to R14B04 svn path=/nixpkgs/trunk/; revision=34116 --- pkgs/development/interpreters/erlang/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/default.nix b/pkgs/development/interpreters/erlang/default.nix index 64c8e7830b3..b5133bd7f83 100644 --- a/pkgs/development/interpreters/erlang/default.nix +++ b/pkgs/development/interpreters/erlang/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, gnum4, ncurses, openssl }: -let version = "R14B02"; in +let version = "R14B04"; in stdenv.mkDerivation { name = "erlang-" + version; src = fetchurl { url = "http://www.erlang.org/download/otp_src_" + version + ".tar.gz"; - sha256 = "1g85a85w031jr5pmz9b0x3p11d44glkf7qpy64l9y7l2b45hb7c4"; + sha256 = "0vlvjlg8vzcy6inb4vj00bnj0aarvpchzxwhmi492nv31s8kb6q9"; }; buildInputs = [ perl gnum4 ncurses openssl ]; From e9548cc845f8c13201c9a03e9b25ae5a8abe38b1 Mon Sep 17 00:00:00 2001 From: Cillian de Roiste Date: Tue, 15 May 2012 17:57:50 +0000 Subject: [PATCH 016/403] Upgrading default erlang to R15 and keeping R14 as an older option, removing extra random older versions. I assume they are not of interest. svn path=/nixpkgs/trunk/; revision=34117 --- pkgs/development/interpreters/erlang/R11B-5.nix | 12 ------------ .../interpreters/erlang/{R13B.nix => R14B04.nix} | 4 ++-- pkgs/development/interpreters/erlang/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 pkgs/development/interpreters/erlang/R11B-5.nix rename pkgs/development/interpreters/erlang/{R13B.nix => R14B04.nix} (83%) diff --git a/pkgs/development/interpreters/erlang/R11B-5.nix b/pkgs/development/interpreters/erlang/R11B-5.nix deleted file mode 100644 index 68cc3b5f2b5..00000000000 --- a/pkgs/development/interpreters/erlang/R11B-5.nix +++ /dev/null @@ -1,12 +0,0 @@ -args: with args; - -stdenv.mkDerivation { - name = "erlang-" + version; - src = fetchurl { - url = http://www.erlang.org/download/otp_src_R11B-5.tar.gz; - md5 = "96acec41da87d6ee0ef18e1aab36ffdd"; - }; - buildInputs = [perl gnum4 ncurses openssl]; - patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; - configureFlags = "--with-ssl=${openssl}"; -} diff --git a/pkgs/development/interpreters/erlang/R13B.nix b/pkgs/development/interpreters/erlang/R14B04.nix similarity index 83% rename from pkgs/development/interpreters/erlang/R13B.nix rename to pkgs/development/interpreters/erlang/R14B04.nix index 05c8e1331ab..b5133bd7f83 100644 --- a/pkgs/development/interpreters/erlang/R13B.nix +++ b/pkgs/development/interpreters/erlang/R14B04.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, gnum4, ncurses, openssl }: -let version = "R13B"; in +let version = "R14B04"; in stdenv.mkDerivation { name = "erlang-" + version; src = fetchurl { url = "http://www.erlang.org/download/otp_src_" + version + ".tar.gz"; - sha256 = "112889v9axhrk9x9swcgql5kpj19p14504m06h4n7b99irzxf4rg"; + sha256 = "0vlvjlg8vzcy6inb4vj00bnj0aarvpchzxwhmi492nv31s8kb6q9"; }; buildInputs = [ perl gnum4 ncurses openssl ]; diff --git a/pkgs/development/interpreters/erlang/default.nix b/pkgs/development/interpreters/erlang/default.nix index b5133bd7f83..0940936e531 100644 --- a/pkgs/development/interpreters/erlang/default.nix +++ b/pkgs/development/interpreters/erlang/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, gnum4, ncurses, openssl }: -let version = "R14B04"; in +let version = "R15B01"; in stdenv.mkDerivation { name = "erlang-" + version; src = fetchurl { url = "http://www.erlang.org/download/otp_src_" + version + ".tar.gz"; - sha256 = "0vlvjlg8vzcy6inb4vj00bnj0aarvpchzxwhmi492nv31s8kb6q9"; + sha256 = "1pmb3hk51p6dwsspxx40qs7gjfyhxjjc3290qk6w1wwa6bkpskzr"; }; buildInputs = [ perl gnum4 ncurses openssl ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ce0049c83f0..e0c8cff481c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2555,7 +2555,7 @@ let erlang = callPackage ../development/interpreters/erlang { }; - erlangR13B = callPackage ../development/interpreters/erlang/R13B.nix { }; + erlangR14B04 = callPackage ../development/interpreters/erlang/R14B04.nix { }; groovy = callPackage ../development/interpreters/groovy { }; From b734682fb4c3552963b14304a109283391e78cc9 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Tue, 15 May 2012 19:36:39 +0000 Subject: [PATCH 017/403] Fix openafs hash svn path=/nixpkgs/trunk/; revision=34118 --- pkgs/servers/openafs-client/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix index 2db5ab59486..efbcd151de5 100644 --- a/pkgs/servers/openafs-client/default.nix +++ b/pkgs/servers/openafs-client/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { src = fetchurl { url = http://www.openafs.org/dl/openafs/1.6.1/openafs-1.6.1-src.tar.bz2; - sha256 = "1rj40qp30hswr08p69jigya78ggbn4dc7qnnw2sfjpv52ywa68p7"; + sha256 = "1c7mid0dwl2x0sikr70bi5cs881y6pa4dfwkdmr3jscvx3wgfpnh"; }; buildInputs = [ autoconf automake flex yacc ncurses perl which ]; From cd55352e467f2456b117d67f86189c86f608a335 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 15 May 2012 21:45:35 +0000 Subject: [PATCH 018/403] Updated the Xfce URLs. The upstream releases have moved from http://www.xfce.org/archive to http://archive.xfce.org. svn path=/nixpkgs/trunk/; revision=34128 --- pkgs/desktops/xfce-4.6/applications/mousepad.nix | 2 +- pkgs/desktops/xfce-4.6/applications/ristretto.nix | 2 +- pkgs/desktops/xfce-4.6/applications/xfce4-power-manager.nix | 2 +- pkgs/desktops/xfce-4.6/art/xfce4-icon-theme.nix | 2 +- pkgs/desktops/xfce-4.6/core/exo.nix | 2 +- pkgs/desktops/xfce-4.6/core/gtk-xfce-engine.nix | 2 +- pkgs/desktops/xfce-4.6/core/libxfce4menu.nix | 2 +- pkgs/desktops/xfce-4.6/core/libxfce4util.nix | 2 +- pkgs/desktops/xfce-4.6/core/libxfcegui4.nix | 2 +- pkgs/desktops/xfce-4.6/core/thunar.nix | 2 +- pkgs/desktops/xfce-4.6/core/xfce-utils.nix | 2 +- pkgs/desktops/xfce-4.6/core/xfce4-panel.nix | 2 +- pkgs/desktops/xfce-4.6/core/xfce4-session.nix | 2 +- pkgs/desktops/xfce-4.6/core/xfce4-settings.nix | 2 +- pkgs/desktops/xfce-4.6/core/xfconf.nix | 2 +- pkgs/desktops/xfce-4.6/core/xfdesktop.nix | 2 +- pkgs/desktops/xfce-4.6/core/xfwm4.nix | 2 +- pkgs/desktops/xfce-4.8/applications/mousepad.nix | 2 +- pkgs/desktops/xfce-4.8/art/xfce4-icon-theme.nix | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/desktops/xfce-4.6/applications/mousepad.nix b/pkgs/desktops/xfce-4.6/applications/mousepad.nix index 920151282a8..5912b21c766 100644 --- a/pkgs/desktops/xfce-4.6/applications/mousepad.nix +++ b/pkgs/desktops/xfce-4.6/applications/mousepad.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "mousepad-0.2.16"; src = fetchurl { - url = "http://www.xfce.org/archive/src/apps/mousepad/0.2/${name}.tar.bz2"; + url = "http://archive.xfce.org/src/apps/mousepad/0.2/${name}.tar.bz2"; sha1 = "4e63033e0a71578f3ec9a0d2e6a505efd0424ef9"; }; diff --git a/pkgs/desktops/xfce-4.6/applications/ristretto.nix b/pkgs/desktops/xfce-4.6/applications/ristretto.nix index 198421e21d3..aefabcb65fb 100644 --- a/pkgs/desktops/xfce-4.6/applications/ristretto.nix +++ b/pkgs/desktops/xfce-4.6/applications/ristretto.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "ristretto-0.0.22"; src = fetchurl { - url = "http://www.xfce.org/archive/src/apps/ristretto/0.0/${name}.tar.gz"; + url = "http://archive.xfce.org/src/apps/ristretto/0.0/${name}.tar.gz"; sha1 = "bddbc8618ba67699ccf5ee4ea0b538b1be7fdb0a"; }; diff --git a/pkgs/desktops/xfce-4.6/applications/xfce4-power-manager.nix b/pkgs/desktops/xfce-4.6/applications/xfce4-power-manager.nix index 543b7660975..65e906f5d83 100644 --- a/pkgs/desktops/xfce-4.6/applications/xfce4-power-manager.nix +++ b/pkgs/desktops/xfce-4.6/applications/xfce4-power-manager.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "xfce4-power-manager-0.8.5"; src = fetchurl { - url = "http://www.xfce.org/archive/src/apps/xfce4-power-manager/0.8/${name}.tar.bz2"; + url = "http://archive.xfce.org/src/apps/xfce4-power-manager/0.8/${name}.tar.bz2"; sha1 = "b1ce0f120733ec1a6267d50ba5c2990bbbbccfd4"; }; diff --git a/pkgs/desktops/xfce-4.6/art/xfce4-icon-theme.nix b/pkgs/desktops/xfce-4.6/art/xfce4-icon-theme.nix index a17267a336c..f42790c6216 100644 --- a/pkgs/desktops/xfce-4.6/art/xfce4-icon-theme.nix +++ b/pkgs/desktops/xfce-4.6/art/xfce4-icon-theme.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "xfce4-icon-theme-4.4.3"; src = fetchurl { - url = "http://www.xfce.org/archive/src/art/xfce4-icon-theme/4.4/${name}.tar.bz2"; + url = "http://archive.xfce.org/src/art/xfce4-icon-theme/4.4/${name}.tar.bz2"; sha1 = "0c0d0c45cd4a7f609310db8e9d17c1c4a131a6e7"; }; diff --git a/pkgs/desktops/xfce-4.6/core/exo.nix b/pkgs/desktops/xfce-4.6/core/exo.nix index 53fc8fa8fcd..5115a402c0d 100644 --- a/pkgs/desktops/xfce-4.6/core/exo.nix +++ b/pkgs/desktops/xfce-4.6/core/exo.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "exo-0.3.107"; src = fetchurl { - url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2"; + url = "http://archive.xfce.org/xfce/4.6.2/src/${name}.tar.bz2"; sha256 = "18z2xmdl577r60ln2waai10dd7i384k0bxrmf7gchrxd9c9aq4ha"; }; diff --git a/pkgs/desktops/xfce-4.6/core/gtk-xfce-engine.nix b/pkgs/desktops/xfce-4.6/core/gtk-xfce-engine.nix index bab382a263f..156da1c6483 100644 --- a/pkgs/desktops/xfce-4.6/core/gtk-xfce-engine.nix +++ b/pkgs/desktops/xfce-4.6/core/gtk-xfce-engine.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "gtk-xfce-engine-2.6.0"; src = fetchurl { - url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2"; + url = "http://archive.xfce.org/xfce/4.6.2/src/${name}.tar.bz2"; sha1 = "a7be2f330833d150c5fb37f68a4c2138348b5446"; }; diff --git a/pkgs/desktops/xfce-4.6/core/libxfce4menu.nix b/pkgs/desktops/xfce-4.6/core/libxfce4menu.nix index f8a0c1ba87c..fda09979819 100644 --- a/pkgs/desktops/xfce-4.6/core/libxfce4menu.nix +++ b/pkgs/desktops/xfce-4.6/core/libxfce4menu.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libxfce4menu-4.6.2"; src = fetchurl { - url = "http://www.xfce.org/archive/xfce-4.6.2/src/${name}.tar.bz2"; + url = "http://archive.xfce.org/xfce-4.6.2/src/${name}.tar.bz2"; sha1 = "32a85c1ad31360347d5a2f240c4ddc08b444d124"; }; diff --git a/pkgs/desktops/xfce-4.6/core/libxfce4util.nix b/pkgs/desktops/xfce-4.6/core/libxfce4util.nix index 2625966bb58..ca90822cfd0 100644 --- a/pkgs/desktops/xfce-4.6/core/libxfce4util.nix +++ b/pkgs/desktops/xfce-4.6/core/libxfce4util.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libxfce4util-4.6.2"; src = fetchurl { - url = "http://www.xfce.org/archive/xfce-4.6.2/src/${name}.tar.bz2"; + url = "http://archive.xfce.org/xfce-4.6.2/src/${name}.tar.bz2"; sha256 = "10wcw7r8cjb0farffic037pcjr5bwrjrm8s3jrcb7c0b038pwbmf"; }; diff --git a/pkgs/desktops/xfce-4.6/core/libxfcegui4.nix b/pkgs/desktops/xfce-4.6/core/libxfcegui4.nix index 52ee3a6262f..056853f9eb1 100644 --- a/pkgs/desktops/xfce-4.6/core/libxfcegui4.nix +++ b/pkgs/desktops/xfce-4.6/core/libxfcegui4.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "libxfcegui4-4.6.4"; src = fetchurl { - url = "http://www.xfce.org/archive/xfce-4.6.2/src/${name}.tar.bz2"; + url = "http://archive.xfce.org/xfce-4.6.2/src/${name}.tar.bz2"; sha1 = "a12c79f8fa14c5d1fc0fca5615a451b7d23f8695"; }; diff --git a/pkgs/desktops/xfce-4.6/core/thunar.nix b/pkgs/desktops/xfce-4.6/core/thunar.nix index adbbd461c5e..2fecb7814b1 100644 --- a/pkgs/desktops/xfce-4.6/core/thunar.nix +++ b/pkgs/desktops/xfce-4.6/core/thunar.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "thunar-1.0.2"; src = fetchurl { - url = http://www.xfce.org/archive/xfce/4.6.2/src/Thunar-1.0.2.tar.bz2; + url = http://archive.xfce.org/xfce/4.6.2/src/Thunar-1.0.2.tar.bz2; sha1 = "f7ae00c32402e4bc502aba15477b78e2c558c7c3"; }; diff --git a/pkgs/desktops/xfce-4.6/core/xfce-utils.nix b/pkgs/desktops/xfce-4.6/core/xfce-utils.nix index 4f520058ccf..ed2bfc56108 100644 --- a/pkgs/desktops/xfce-4.6/core/xfce-utils.nix +++ b/pkgs/desktops/xfce-4.6/core/xfce-utils.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "xfce-utils-4.6.2"; src = fetchurl { - url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2"; + url = "http://archive.xfce.org/xfce/4.6.2/src/${name}.tar.bz2"; sha1 = "6373886c3d70e576859741bde747a235567ffd8e"; }; diff --git a/pkgs/desktops/xfce-4.6/core/xfce4-panel.nix b/pkgs/desktops/xfce-4.6/core/xfce4-panel.nix index b8a8c145801..7708d019b90 100644 --- a/pkgs/desktops/xfce-4.6/core/xfce4-panel.nix +++ b/pkgs/desktops/xfce-4.6/core/xfce4-panel.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "xfce4-panel-4.6.4"; src = fetchurl { - url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2"; + url = "http://archive.xfce.org/xfce/4.6.2/src/${name}.tar.bz2"; sha1 = "d2b310c036be84ed9886c06ae35b7a1a8eabfcb8"; }; diff --git a/pkgs/desktops/xfce-4.6/core/xfce4-session.nix b/pkgs/desktops/xfce-4.6/core/xfce4-session.nix index dc563502542..fc56be085c4 100644 --- a/pkgs/desktops/xfce-4.6/core/xfce4-session.nix +++ b/pkgs/desktops/xfce-4.6/core/xfce4-session.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "xfce4-session-4.6.2"; src = fetchurl { - url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2"; + url = "http://archive.xfce.org/xfce/4.6.2/src/${name}.tar.bz2"; sha1 = "2a5778a1543f97845f118a186e2dbb8a8ea3ff4b"; }; diff --git a/pkgs/desktops/xfce-4.6/core/xfce4-settings.nix b/pkgs/desktops/xfce-4.6/core/xfce4-settings.nix index b0bfadf8e52..0935955231e 100644 --- a/pkgs/desktops/xfce-4.6/core/xfce4-settings.nix +++ b/pkgs/desktops/xfce-4.6/core/xfce4-settings.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "xfce4-settings-4.6.5"; src = fetchurl { - url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2"; + url = "http://archive.xfce.org/xfce/4.6.2/src/${name}.tar.bz2"; sha1 = "c036cc2f3100a46b2649e678dff7c0106b219263"; }; diff --git a/pkgs/desktops/xfce-4.6/core/xfconf.nix b/pkgs/desktops/xfce-4.6/core/xfconf.nix index b4c14ef043e..2fc88bd1258 100644 --- a/pkgs/desktops/xfce-4.6/core/xfconf.nix +++ b/pkgs/desktops/xfce-4.6/core/xfconf.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "xfconf-4.6.2"; src = fetchurl { - url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2"; + url = "http://archive.xfce.org/xfce/4.6.2/src/${name}.tar.bz2"; sha1 = "2b9656a1b7f323d2600ddc929191afb50c8018f8"; }; diff --git a/pkgs/desktops/xfce-4.6/core/xfdesktop.nix b/pkgs/desktops/xfce-4.6/core/xfdesktop.nix index 83de4ed4dfe..90a69bd8692 100644 --- a/pkgs/desktops/xfce-4.6/core/xfdesktop.nix +++ b/pkgs/desktops/xfce-4.6/core/xfdesktop.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "xfdesktop-4.6.2"; src = fetchurl { - url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2"; + url = "http://archive.xfce.org/xfce/4.6.2/src/${name}.tar.bz2"; sha1 = "cefcd1c1386d34386d4e900cbf88b7c24ef3bafb"; }; diff --git a/pkgs/desktops/xfce-4.6/core/xfwm4.nix b/pkgs/desktops/xfce-4.6/core/xfwm4.nix index c7bab240691..6e88ef9cd0d 100644 --- a/pkgs/desktops/xfce-4.6/core/xfwm4.nix +++ b/pkgs/desktops/xfce-4.6/core/xfwm4.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "xfwm4-4.6.2"; src = fetchurl { - url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2"; + url = "http://archive.xfce.org/xfce/4.6.2/src/${name}.tar.bz2"; sha256 = "0a2q2pr5mzp6hsrd0llr90i9wii2qj2054shkpvkain20gp1ja11"; }; diff --git a/pkgs/desktops/xfce-4.8/applications/mousepad.nix b/pkgs/desktops/xfce-4.8/applications/mousepad.nix index ab4bea16f1c..395a5c9f084 100644 --- a/pkgs/desktops/xfce-4.8/applications/mousepad.nix +++ b/pkgs/desktops/xfce-4.8/applications/mousepad.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "mousepad-0.2.16"; src = fetchurl { - url = "http://www.xfce.org/archive/src/apps/mousepad/0.2/${name}.tar.bz2"; + url = "http://archive.xfce.org/src/apps/mousepad/0.2/${name}.tar.bz2"; sha1 = "4e63033e0a71578f3ec9a0d2e6a505efd0424ef9"; }; diff --git a/pkgs/desktops/xfce-4.8/art/xfce4-icon-theme.nix b/pkgs/desktops/xfce-4.8/art/xfce4-icon-theme.nix index d69a517b203..afa934b6031 100644 --- a/pkgs/desktops/xfce-4.8/art/xfce4-icon-theme.nix +++ b/pkgs/desktops/xfce-4.8/art/xfce4-icon-theme.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "xfce4-icon-theme-4.4.3"; src = fetchurl { - url = "http://www.xfce.org/archive/src/art/xfce4-icon-theme/4.4/${name}.tar.bz2"; + url = "http://archive.xfce.org/src/art/xfce4-icon-theme/4.4/${name}.tar.bz2"; sha1 = "0c0d0c45cd4a7f609310db8e9d17c1c4a131a6e7"; }; From 840b2b013c02e4dde1b45992f3b4329b7caf8d3d Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 15 May 2012 21:46:56 +0000 Subject: [PATCH 019/403] opera 11.64. svn path=/nixpkgs/trunk/; revision=34129 --- .../applications/networking/browsers/opera/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index b6c9789bcfe..c53a5f34525 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -13,18 +13,18 @@ let in stdenv.mkDerivation rec { - name = "opera-11.51-1087"; + name = "opera-11.64-1403"; src = if stdenv.system == "i686-linux" then fetchurl { - url = "${mirror}/linux/1151/${name}.i386.linux.tar.bz2"; - sha256 = "1baaim404g8nwd7knbl1p1ardpx36ib5159nkvqfnnavfyhkinp2"; + url = "${mirror}/linux/1164/${name}.i386.linux.tar.xz"; + sha256 = "8b7998586b1b3f8f5722beef7ebb621c0f15915c260b096249e9db5973e30d82"; } else if stdenv.system == "x86_64-linux" then fetchurl { - url = "${mirror}/linux/1151/${name}.x86_64.linux.tar.xz"; - sha256 = "1bciqyfhhdywaasj717by1a975ywf672r3pv9cw9bn0b90pgp933"; + url = "${mirror}/linux/1164/${name}.x86_64.linux.tar.xz"; + sha256 = "3b2012cbab826a04417deb56b85d8d31f9c17130071304736bcfa572f78b4c69"; } else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)"; From d61fb6e4ca4bcf53a30f379bbed49c659618bf1d Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Wed, 16 May 2012 08:44:20 +0000 Subject: [PATCH 020/403] BLCR fix arsert to include kernel versions 2.6.38.x svn path=/nixpkgs/trunk/; revision=34134 --- pkgs/os-specific/linux/blcr/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/blcr/default.nix b/pkgs/os-specific/linux/blcr/default.nix index 516b8b9ed38..8c77cffe177 100644 --- a/pkgs/os-specific/linux/blcr/default.nix +++ b/pkgs/os-specific/linux/blcr/default.nix @@ -1,6 +1,8 @@ { stdenv, fetchurl, kernel, perl, makeWrapper }: -assert stdenv.isLinux && builtins.compareVersions kernel.version "2.6.38" != 1; +# BLCR 0.8.4 works for kernel version up to 2.6.38 (including 2.6.38.x) +assert stdenv.isLinux; +assert builtins.compareVersions "2.6.39" kernel.version == 1; stdenv.mkDerivation { name = "blcr-0.8.4-${kernel.version}"; From e2df1da1e0664e0c5898fe49846769b1d3d95430 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 May 2012 08:58:30 +0000 Subject: [PATCH 021/403] haskell-certificate: updated to version 1.2.3 svn path=/nixpkgs/trunk/; revision=34135 --- pkgs/development/libraries/haskell/certificate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix index 019ff16733b..89410dbcb00 100644 --- a/pkgs/development/libraries/haskell/certificate/default.nix +++ b/pkgs/development/libraries/haskell/certificate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "certificate"; - version = "1.2.2"; - sha256 = "0qwx0y534fa5p2wzxd5q2bvcsvmmvmy45rwzj01g6zyjzmx2rnsb"; + version = "1.2.3"; + sha256 = "0xn46327a50vj70d26gc4z2rn4l6qk77j7mkdwg1j2yh6mcn0n7a"; isLibrary = true; isExecutable = true; buildDepends = [ asn1Data cryptoPubkeyTypes mtl pem time ]; From 9be7b3b4becaf2bdf9fe6ec502085d543279d4a1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 May 2012 08:58:34 +0000 Subject: [PATCH 022/403] haskell-reactive-banana: updated to version 0.6.0.0 svn path=/nixpkgs/trunk/; revision=34136 --- .../development/libraries/haskell/reactive-banana/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/reactive-banana/default.nix b/pkgs/development/libraries/haskell/reactive-banana/default.nix index 247b0aac4f6..1c5cb92d47b 100644 --- a/pkgs/development/libraries/haskell/reactive-banana/default.nix +++ b/pkgs/development/libraries/haskell/reactive-banana/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "reactive-banana"; - version = "0.5.0.3"; - sha256 = "0j60g7k0xrq66m8g8fd9fdrpbnz2jbgqxnmbz1rfi5bvnrkhv10v"; + version = "0.6.0.0"; + sha256 = "1s0ymkqrjnzylxdwqfslf87g7sjqk135hnvgdkzy4dbvvpplq113"; buildDepends = [ fclabels hashable QuickCheck transformers unorderedContainers vault ]; From e5e24322778c041ca9eac9f8850dcc9dbffd2305 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Wed, 16 May 2012 12:00:05 +0000 Subject: [PATCH 023/403] Upgrade ghc stable snapshot to 7.4.2rc1. svn path=/nixpkgs/trunk/; revision=34137 --- pkgs/development/compilers/ghc/7.4.2.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ghc/7.4.2.nix b/pkgs/development/compilers/ghc/7.4.2.nix index 1ea9e24a120..660f316e120 100644 --- a/pkgs/development/compilers/ghc/7.4.2.nix +++ b/pkgs/development/compilers/ghc/7.4.2.nix @@ -1,17 +1,19 @@ { stdenv, fetchurl, ghc, perl, gmp, ncurses }: stdenv.mkDerivation rec { - version = "7.4.1.20120412"; + version = "7.4.1.20120508"; name = "ghc-${version}"; src = fetchurl { - url = "http://haskell.org/ghc/dist/stable/dist/${name}-src.tar.bz2"; - sha256 = "0hpzd51s5nvlsjk3wza45ji5v6m0szqjzch45fvv7wfzllrm595l"; + url = "http://haskell.org/ghc/dist/7.4.2-rc1/${name}-src.tar.bz2"; + sha256 = "0i55003p6ns5vzx8dpni5jv45kxwjqqgspf76505l2vcilra8j2c"; }; buildInputs = [ ghc perl gmp ncurses ]; + enableParallelBuilding = true; + buildMK = '' libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib" libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include" From 503576d27708c1196bed931d78de8ab848aa4246 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 16 May 2012 20:04:56 +0000 Subject: [PATCH 024/403] * Pan 0.137. svn path=/nixpkgs/trunk/; revision=34139 --- pkgs/applications/networking/newsreaders/pan/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index 7c7449dd502..0f2f1ae985f 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -1,21 +1,21 @@ { spellChecking ? true , stdenv, fetchurl, pkgconfig, gtk, gtkspell ? null -, perl, pcre, gmime, gettext, intltool +, perl, pcre, gmime, gettext, intltool, dbus_glib, libnotify }: assert spellChecking -> gtkspell != null; -let version = "0.135"; in +let version = "0.137"; in stdenv.mkDerivation { name = "pan-${version}"; src = fetchurl { url = "http://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2"; - sha1 = "6cd93facf86615761279113badd7462e59399ae4"; + sha1 = "372f1f6406e2fcd9ce413774730975560f546fcf"; }; - buildInputs = [ pkgconfig gtk perl gmime gettext intltool ] + buildInputs = [ pkgconfig gtk perl gmime gettext intltool dbus_glib libnotify ] ++ stdenv.lib.optional spellChecking gtkspell; enableParallelBuilding = true; From cfc8538326100117fca6cec3df4bb7f8e22ef182 Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Wed, 16 May 2012 22:04:02 +0000 Subject: [PATCH 025/403] Updating coq and ssreflect to patch level 4. svn path=/nixpkgs/trunk/; revision=34146 --- .../science/logic/coq/default.nix | 5 +-- .../science/logic/ssreflect/default.nix | 22 +++++++++---- .../science/logic/ssreflect/static.patch | 33 +++++++++++++++++++ 3 files changed, 51 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/science/logic/ssreflect/static.patch diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 3fef10b44fb..cfd769fa6a2 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -4,7 +4,7 @@ {stdenv, fetchurl, ocaml, findlib, camlp5, lablgtk, ncurses}: let - version = "8.3pl3"; + version = "8.3pl4"; in stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://coq.inria.fr/V${version}/files/coq-${version}.tar.gz"; - sha256 = "0ivrafwr4p8pklb9wfq3zyai19xdk05xr3q16xqk4q9pfad9w9dg"; + sha256 = "17d3lmchmqir1rawnr52g78srg4wkd7clzpzfsivxc4y1zp6rwkr"; }; buildInputs = [ ocaml findlib camlp5 ncurses lablgtk ]; @@ -58,5 +58,6 @@ stdenv.mkDerivation { ''; homepage = "http://coq.inria.fr"; license = "LGPL"; + maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/applications/science/logic/ssreflect/default.nix b/pkgs/applications/science/logic/ssreflect/default.nix index 8443974a0a0..c554b5dcea1 100644 --- a/pkgs/applications/science/logic/ssreflect/default.nix +++ b/pkgs/applications/science/logic/ssreflect/default.nix @@ -2,11 +2,11 @@ # - coq needs to be invoked with the explicit path to the ssreflect theory # e.g. coqide -R ~/.nix-profile/lib/coq/user-contrib/ '' -{stdenv, fetchurl, ocaml, camlp5, coq}: +{stdenv, fetchurl, ocaml, camlp5, coq, makeWrapper}: let pname = "ssreflect"; - version = "1.3pl1"; + version = "1.3pl4"; name = "${pname}-${version}"; webpage = http://www.msr-inria.inria.fr/Projects/math-components; in @@ -16,22 +16,29 @@ stdenv.mkDerivation { src = fetchurl { url = "${webpage}/${name}.tar.gz"; - sha256 = "0ykrhqb68aanl5d4dmn0vnx8m34gg0jsbdhwx2852rqi7r00b9ri"; + sha256 = "1ha3iiqq79pgll5ra9z0xdi3d3dr3wb9f5vsm4amy884l5anva02"; }; - buildInputs = [ ocaml camlp5 coq ]; + buildInputs = [ ocaml camlp5 coq makeWrapper ]; + + patches = [ ./static.patch ]; - # this fails - /* postBuild = '' cd src coqmktop -ide -opt ssreflect.cmx -o ../bin/ssrcoqide + cd .. ''; - */ installPhase = '' COQLIB=$out/lib/coq make -f Makefile.coq install -e mkdir -p $out/bin + cp bin/* $out/bin + for i in $out/bin/*; do + wrapProgram "$i" \ + --add-flags "-R" \ + --add-flags "$out/lib/coq/user-contrib/Ssreflect" \ + --add-flags "Ssreflect" + done ''; meta = { @@ -43,5 +50,6 @@ stdenv.mkDerivation { ''; homepage = webpage; license = "CeCILL B FREE SOFTWARE LICENSE or CeCILL FREE SOFTWARE LICENSE"; + maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/applications/science/logic/ssreflect/static.patch b/pkgs/applications/science/logic/ssreflect/static.patch new file mode 100644 index 00000000000..edb8a6111f7 --- /dev/null +++ b/pkgs/applications/science/logic/ssreflect/static.patch @@ -0,0 +1,33 @@ +--- ssreflect1.3pl4/Make (revision 3823) ++++ ssreflect1.3pl4/Make (working copy) +@@ -1,18 +1,18 @@ + ## Uncomment for static linking + ## +-# +-#-custom "$(COQBIN)coqmktop -opt -o bin/ssrcoq src/ssreflect.cmx" "src/ssreflect.cmx" bin/ssrcoq +-#-custom "$(COQBIN)coqmktop -o bin/ssrcoq.byte src/ssreflect.cmo" "src/ssreflect.cmo bin/ssrcoq" bin/ssrcoq.byte +-#-custom "$(SSRCOQ) $(COQFLAGS) -compile $*" "%.v $(SSRCOQ)" "%.vo" +-#SSRCOQ = bin/ssrcoq +-# ++ ++-custom "$(COQBIN)coqmktop -opt -o bin/ssrcoq src/ssreflect.cmx" "src/ssreflect.cmx" bin/ssrcoq ++-custom "$(COQBIN)coqmktop -o bin/ssrcoq.byte src/ssreflect.cmo" "src/ssreflect.cmo bin/ssrcoq" bin/ssrcoq.byte ++-custom "$(SSRCOQ) $(COQFLAGS) -compile $*" "%.v $(SSRCOQ)" "%.vo" ++SSRCOQ = bin/ssrcoq ++ + ## + + ## Uncomment for dynamic linking + ## +- +--I src +- ++# ++#-I src ++# + ## + + ## What follows should be left untouched by the final user of ssreflect +Common subdirectories: old/src and new/src +Common subdirectories: old/test and new/test +Common subdirectories: old/theories and new/theories From 1d4df9f2998166b30c96285a7ed17aa19f483017 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 16 May 2012 22:58:49 +0000 Subject: [PATCH 026/403] * Added fail2ban, a program that scans log files for repeated failing login attempts and bans IP addresses. svn path=/nixpkgs/trunk/; revision=34148 --- pkgs/tools/security/fail2ban/default.nix | 53 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++- 2 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 pkgs/tools/security/fail2ban/default.nix diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix new file mode 100644 index 00000000000..b600f71c7c9 --- /dev/null +++ b/pkgs/tools/security/fail2ban/default.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchurl, pythonPackages, unzip }: + +let version = "0.8.6"; in + +pythonPackages.buildPythonPackage { + name = "fail2ban-${version}"; + + src = fetchurl { + url = "https://github.com/fail2ban/fail2ban/zipball/${version}"; + name = "fail2ban-${version}.zip"; + sha256 = "1linfz5qxmm4225lzi9vawsa79y41d3rcdahvrzlyqlhb02ipd55"; + }; + + buildInputs = [ unzip ]; + + preConfigure = + '' + substituteInPlace setup.cfg \ + --replace /usr $out + + substituteInPlace setup.py \ + --replace /etc $out/etc \ + --replace /var $TMPDIR/var \ + + for i in fail2ban-client fail2ban-regex fail2ban-server; do + substituteInPlace $i \ + --replace /usr/share/fail2ban $out/share/fail2ban + done + + for i in config/action.d/sendmail*.conf; do + substituteInPlace $i \ + --replace /usr/sbin/sendmail sendmail \ + --replace /usr/bin/whois whois + done + ''; + + doCheck = false; + + installCommand = + '' + python setup.py install --prefix=$out + + # A wrapper is not needed. + wrapPythonProgram() { true; } + ''; + + meta = { + homepage = http://www.fail2ban.org/; + description = "A program that scans log files for repeated failing login attempts and bans IP addresses"; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ stdenv.lib.maintainers.eelco ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0c8cff481c..c8c218812b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -662,10 +662,11 @@ let expect = callPackage ../tools/misc/expect { }; + fail2ban = callPackage ../tools/security/fail2ban { }; + fakeroot = callPackage ../tools/system/fakeroot { }; - fcron = callPackage ../tools/system/fcron { # see also cron - }; + fcron = callPackage ../tools/system/fcron { }; fdisk = callPackage ../tools/system/fdisk { }; From 660341c3958c37a8a91b9697672052664b42df95 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 17 May 2012 10:16:05 +0000 Subject: [PATCH 027/403] executable-path haskell package svn path=/nixpkgs/trunk/; revision=34150 --- .../libraries/haskell/executable-path/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/executable-path/default.nix diff --git a/pkgs/development/libraries/haskell/executable-path/default.nix b/pkgs/development/libraries/haskell/executable-path/default.nix new file mode 100644 index 00000000000..839ea6bc112 --- /dev/null +++ b/pkgs/development/libraries/haskell/executable-path/default.nix @@ -0,0 +1,14 @@ +{ cabal, filepath }: + +cabal.mkDerivation (self: { + pname = "executable-path"; + version = "0.0.3"; + sha256 = "1jg58qf19qz93c60ryglcavwdcysz4fd4qn8kpw5im9w9kniawlc"; + buildDepends = [ filepath ]; + meta = { + homepage = "http://code.haskell.org/~bkomuves/"; + description = "Finding out the full path of the executable"; + license = self.stdenv.lib.licenses.publicDomain; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 1899a801377..7ba7389ab77 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -592,6 +592,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); explicitException = callPackage ../development/libraries/haskell/explicit-exception {}; + executablePath = callPackage ../development/libraries/haskell/executable-path {}; + filepath_1_3_0_0 = callPackage ../development/libraries/haskell/filepath {}; filepath = null; # a core package in recent GHCs From 14968a4923aee17c3dd46b32ce36efeaeb80b033 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 17 May 2012 10:16:10 +0000 Subject: [PATCH 028/403] cabal-macosx haskell package svn path=/nixpkgs/trunk/; revision=34151 --- .../libraries/haskell/cabal-macosx/default.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/haskell/cabal-macosx/default.nix diff --git a/pkgs/development/libraries/haskell/cabal-macosx/default.nix b/pkgs/development/libraries/haskell/cabal-macosx/default.nix new file mode 100644 index 00000000000..45ca5b533a7 --- /dev/null +++ b/pkgs/development/libraries/haskell/cabal-macosx/default.nix @@ -0,0 +1,16 @@ +{ cabal, Cabal, fgl, filepath, MissingH, parsec }: + +cabal.mkDerivation (self: { + pname = "cabal-macosx"; + version = "0.2.2"; + sha256 = "14dc7swk03q2kp5fmhwibjh0x0pzf9ah1004skgd5six0vzfc1ch"; + isLibrary = true; + isExecutable = true; + buildDepends = [ Cabal fgl filepath MissingH parsec ]; + meta = { + homepage = "http://github.com/gimbo/cabal-macosx"; + description = "Cabal support for creating Mac OSX application bundles"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7ba7389ab77..c732bc78fe4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -454,6 +454,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cabalFileTh = callPackage ../development/libraries/haskell/cabal-file-th {}; + cabalMacosx = callPackage ../development/libraries/haskell/cabal-macosx {}; + cairo = callPackage ../development/libraries/haskell/cairo { inherit (pkgs) cairo zlib; libc = pkgs.stdenv.gcc.libc; From c84bc777742b36e307539b4aa9f43226d1ab8550 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 17 May 2012 10:16:14 +0000 Subject: [PATCH 029/403] reactive-banana-wx haskell package svn path=/nixpkgs/trunk/; revision=34152 --- .../haskell/reactive-banana-wx/default.nix | 22 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/libraries/haskell/reactive-banana-wx/default.nix diff --git a/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix b/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix new file mode 100644 index 00000000000..5459a2cab72 --- /dev/null +++ b/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix @@ -0,0 +1,22 @@ +{ cabal, cabalMacosx, reactiveBanana, wx, wxcore, buildExamples ? false, executablePath ? null}: + +assert buildExamples -> executablePath != null; + +cabal.mkDerivation (self: + let lib = self.stdenv.lib; + in + { + pname = "reactive-banana-wx"; + version = "0.6.0.0"; + sha256 = "1pxcymh6xpmbkbc8i2hvjbki9s81mx69wrp8nl1i0y4pppzi8ihp"; + isLibrary = true; + isExecutable = true; + buildDepends = [ cabalMacosx reactiveBanana wx wxcore ] ++ lib.optional buildExamples executablePath; + configureFlags = lib.optionalString buildExamples "-fbuildExamples"; + meta = { + homepage = "http://haskell.org/haskellwiki/Reactive-banana"; + description = "Examples for the reactive-banana library, using wxHaskell"; + license = lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c732bc78fe4..83e37599fd8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1126,6 +1126,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); reactiveBanana = callPackage ../development/libraries/haskell/reactive-banana {}; + reactiveBananaWx = callPackage ../development/libraries/haskell/reactive-banana-wx {}; + readline = callPackage ../development/libraries/haskell/readline { inherit (pkgs) readline; }; From 28df4ab97be4da8873e9b0da4f0403667741debb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 17 May 2012 13:33:08 +0000 Subject: [PATCH 030/403] * pycurl: don't require a static curl, and don't put the generated pycurl.so in a .egg file. svn path=/nixpkgs/trunk/; revision=34154 --- pkgs/top-level/python-packages.nix | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4ffcc8237bb..9def8413a85 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1475,36 +1475,27 @@ let pythonPackages = python.modules // rec { }); - pycurl = - let libcurl = pkgs.stdenv.lib.overrideDerivation pkgs.curl - (oldAttrs: { - configureFlags = - (if oldAttrs ? configureFlags then oldAttrs.configureFlags else "" ) - + " --enable-static"; - }); - in - buildPythonPackage (rec { + pycurl = buildPythonPackage (rec { name = "pycurl-7.19.0"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/pycryptopp/${name}.tar.gz"; + url = "http://pycurl.sourceforge.net/download/${name}.tar.gz"; sha256 = "0hh6icdbp7svcq0p57zf520ifzhn7jw64x07k99j7h57qpy2sy7b"; }; - buildInputs = [ libcurl ]; + buildInputs = [ pkgs.curl ]; doCheck = false; - postInstall = '' - find $out -name easy-install.pth | xargs rm -v - find $out -name 'site.py*' | xargs rm -v + preConfigure = '' + substituteInPlace setup.py --replace '--static-libs' '--libs' ''; + installCommand = "python setup.py install --prefix=$out"; + meta = { homepage = http://pycurl.sourceforge.net/; - description = "Python wrapper for libcurl"; - platforms = stdenv.lib.platforms.linux; }; }); From 1a931bfa62f499ac51906ca29a575257cfe9c715 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 17 May 2012 13:43:11 +0000 Subject: [PATCH 031/403] * Use Gamin to detect log file changes. svn path=/nixpkgs/trunk/; revision=34155 --- pkgs/tools/security/fail2ban/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index b600f71c7c9..5ac05907080 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -1,9 +1,10 @@ -{ stdenv, fetchurl, pythonPackages, unzip }: +{ stdenv, fetchurl, pythonPackages, unzip, gamin }: let version = "0.8.6"; in pythonPackages.buildPythonPackage { name = "fail2ban-${version}"; + namePrefix = ""; src = fetchurl { url = "https://github.com/fail2ban/fail2ban/zipball/${version}"; @@ -13,6 +14,8 @@ pythonPackages.buildPythonPackage { buildInputs = [ unzip ]; + pythonPath = [ gamin ]; + preConfigure = '' substituteInPlace setup.cfg \ @@ -39,9 +42,6 @@ pythonPackages.buildPythonPackage { installCommand = '' python setup.py install --prefix=$out - - # A wrapper is not needed. - wrapPythonProgram() { true; } ''; meta = { From 45a98ed3fc43477e9d762ecbb825b0683822e587 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 17 May 2012 16:07:03 +0000 Subject: [PATCH 032/403] * Linux man-pages updated to 3.41. svn path=/nixpkgs/trunk/; revision=34156 --- pkgs/data/documentation/man-pages/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index 71c41ccba61..0aca88a46c0 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "man-pages-3.38"; + name = "man-pages-3.41"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/Archive/${name}.tar.xz"; - sha256 = "10ha41yj5v3rjy73x8kpn65srbcy0iz399vv149bh12lvyv67kvy"; + sha256 = "1fldlsw51al9cvmz8dixrfv2j80bamjd5bzxsa66cvhc48n8p2nf"; }; preBuild = From 1e7dc29a983a5bab42a536fdb8b649337e59bd73 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 18 May 2012 07:50:10 +0000 Subject: [PATCH 033/403] add haproxy svn path=/nixpkgs/trunk/; revision=34165 --- pkgs/tools/networking/haproxy/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/tools/networking/haproxy/default.nix diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix new file mode 100644 index 00000000000..0a43251dc35 --- /dev/null +++ b/pkgs/tools/networking/haproxy/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "haproxy-1.4.20"; + + src = fetchurl { + url = http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.20.tar.gz; + sha256 = "0gi81dg8k3ypljs7ifbppvpfrwrnbafjv41fjpwnyqfwbxa4j2gh"; + }; + + buildInputs = []; + + preConfigure = '' + export makeFlags="TARGET=linux26 PREFIX=$out" + ''; + + meta = { + description = "HAProxy is a free, very fast and reliable solution offering high availability, load balancing, and proxying for TCP and HTTP-based applications."; + homepage = http://haproxy.1wt.eu/; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c8c218812b7..476fd3ca614 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -846,6 +846,8 @@ let pigz = callPackage ../tools/compression/pigz { }; + haproxy = callPackage ../tools/networking/haproxy { }; + hardlink = callPackage ../tools/system/hardlink { }; halibut = callPackage ../tools/typesetting/halibut { }; From f5211427b478ca32f551d87396a6b8bd20b42c66 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 18 May 2012 09:32:02 +0000 Subject: [PATCH 034/403] Adding zgrviewer svn path=/nixpkgs/trunk/; revision=34166 --- .../graphics/zgrviewer/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/applications/graphics/zgrviewer/default.nix diff --git a/pkgs/applications/graphics/zgrviewer/default.nix b/pkgs/applications/graphics/zgrviewer/default.nix new file mode 100644 index 00000000000..5fe30bd7a03 --- /dev/null +++ b/pkgs/applications/graphics/zgrviewer/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchurl, jre, unzip}: +stdenv.mkDerivation rec { + version = "0.8.2"; + pname = "zgrviewer"; + name="${pname}-${version}"; + src = fetchurl { + url = "mirror://sourceforge/zvtm/${pname}/${version}/${name}.zip"; + sha256 = "a76b9865c1490a6cfc08911592a19c15fe5972bf58e017cb31db580146f069bb"; + }; + buildInputs = [jre unzip]; + buildPhase = ""; + installPhase = '' + mkdir -p "$out"/{bin,lib/java/zvtm/plugins,share/doc/zvtm} + + cp overview.html *.license.* "$out/share/doc/zvtm" + + cp -r target/* "$out/lib/java/zvtm/" + + echo '#!/bin/sh' > "$out/bin/zgrviewer" + echo "java -jar '$out/lib/java/zvtm/zgrviewer-${version}.jar'" >> "$out/bin/zgrviewer" + chmod a+x "$out/bin/zgrviewer" + ''; + meta = { + # Quicker to unpack locally than load Hydra + platforms = []; + maintainers = with stdenv.lib.maintainers; [raskin]; + license = with stdenv.lib.licenses; lgpl21Plus; + description = "GraphViz graph viewer/navigator"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 476fd3ca614..909cf0fd662 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7673,6 +7673,8 @@ let zathura = callPackage ../applications/misc/zathura { }; + zgrviewer = callPackage ../applications/graphics/zgrviewer {}; + zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { }; ### GAMES From 5e7f049fc985ba814b884ae6dc6ab0df6ca3d936 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 18 May 2012 15:01:54 +0000 Subject: [PATCH 035/403] * svn2git-kde 1.0.5. svn path=/nixpkgs/trunk/; revision=34169 --- .../git-and-tools/svn2git-kde/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix index 1d8f0dcb9e5..c44f2dbcbb6 100644 --- a/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, qt4, subversion, apr}: stdenv.mkDerivation rec { - name = "svn2git-kde"; + name = "svn2git-kde-1.0.5"; src = fetchgit { url = http://git.gitorious.org/svn2git/svn2git.git; - rev = "197979b6a641b8b5fa4856c700b1235491c73a41"; - sha256 = "7be1a8f5822aff2d4ea7f415dce0b4fa8c6a82310acf24e628c5f1ada2d2d613"; + rev = "149d6c6e14a1724c96999328683a9264fc508264"; + sha256 = "818673fe751b00a42b6ed3e78a783549fb09b5245a01dee47b3dded667bfc582"; }; buildPhase = '' From ee5b3c893c7a54deb0d2262475e0cf1e96ba8279 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 18 May 2012 20:52:40 +0000 Subject: [PATCH 036/403] * Remove empty directory. svn path=/nixpkgs/trunk/; revision=34178 From 531b63a3899de58473baf4656453876f10073e2d Mon Sep 17 00:00:00 2001 From: Cillian de Roiste Date: Sat, 19 May 2012 23:15:50 +0000 Subject: [PATCH 037/403] Patching python-virtualenv so that it doesn't fail if the python version is specified, e.g. --python=python2.7, and now iff the python version is specified it successfully also installs additional libs such as readline into the virtualenv svn path=/nixpkgs/trunk/; revision=34184 --- .../virtualenv-change-prefix.patch | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/virtualenv-change-prefix.patch diff --git a/pkgs/development/python-modules/virtualenv-change-prefix.patch b/pkgs/development/python-modules/virtualenv-change-prefix.patch new file mode 100644 index 00000000000..5093fdbead9 --- /dev/null +++ b/pkgs/development/python-modules/virtualenv-change-prefix.patch @@ -0,0 +1,29 @@ +Without this patch `virtualenv --python=python2.7 .` fails with an error because it notices that the python readline.so is not in the same path as python2.7. I assume this is to avoid copying the wrong file on systems where it is possible to find incompatible libraries by accident. Adding "/nix/store" to the prefix fixes this problem. Unfortunately readline is still not available if you just run `virtualenv .`. + + +--- virtualenv-1.6.4/virtualenv.py 2012-05-20 00:40:38.070649647 +0200 ++++ virtualenv-1.6.4/virtualenv.py 2012-05-20 00:45:10.596242604 +0200 +@@ -951,13 +951,7 @@ + + + def change_prefix(filename, dst_prefix): +- prefixes = [sys.prefix] +- +- if sys.platform == "darwin": +- prefixes.extend(( +- os.path.join("/Library/Python", sys.version[:3], "site-packages"), +- os.path.join(sys.prefix, "Extras", "lib", "python"), +- os.path.join("~", "Library", "Python", sys.version[:3], "site-packages"))) ++ prefixes = ["/nix/store", sys.prefix] + + if hasattr(sys, 'real_prefix'): + prefixes.append(sys.real_prefix) +@@ -968,6 +962,8 @@ + _, relpath = filename.split(src_prefix, 1) + assert relpath[0] == os.sep + relpath = relpath[1:] ++ if src_prefix == "/nix/store": ++ relpath = "/".join(relpath.split("/")[1:]) + return join(dst_prefix, relpath) + assert False, "Filename %s does not start with any of these prefixes: %s" % \ + (filename, prefixes) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9def8413a85..09d8b5c0ec7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2266,6 +2266,8 @@ let pythonPackages = python.modules // rec { md5 = "1072b66d53c24e019a8f1304ac9d9fc5"; }; + patches = [ ../development/python-modules/virtualenv-change-prefix.patch ]; + doCheck = false; meta = with stdenv.lib; { From 920eedb75f8b49ea5ef49008bd1529f4aa134e02 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 20 May 2012 03:23:31 +0000 Subject: [PATCH 038/403] * Audacious updated to 3.2.2. svn path=/nixpkgs/trunk/; revision=34185 --- pkgs/applications/audio/audacious/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index edec7dcb41d..9bd793613c1 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -4,19 +4,19 @@ }: let - version = "3.2.1"; + version = "3.2.2"; in stdenv.mkDerivation { name = "audacious-${version}"; src = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2"; - sha256 = "064a8d2887a0f92a1637df9d71b8eefa8064199c04eccfaac725f840cff6eac3"; + sha256 = "1vj2f3jq67r9wc3s8p51w8338cjhidj3lpxmzyh31lrfikj21766"; }; pluginsSrc = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2"; - sha256 = "5b7d3e52f6b8903bc01ae15651817e990d3348ae6b9734767f354eb2dbfc8c2d"; + sha256 = "1z5p4ny0kzszaki4f1fgrvcr0q1j6i19847jhplc07nl1rvycdy6"; }; # `--enable-amidiplug' is to prevent configure from looking in /proc/asound. From 7aa85ac5361b21f6ca31ae0690b63caf464a5641 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Sun, 20 May 2012 17:38:03 +0000 Subject: [PATCH 039/403] Adding NVIDIA CUDA toolkit and haskell-accelerate-cuda plus deps. svn path=/nixpkgs/trunk/; revision=34186 --- .../compilers/cudatoolkit/default.nix | 52 +++++++++++++++++++ .../haskell/accelerate-cuda/default.nix | 23 ++++++++ .../haskell/accelerate-examples/default.nix | 27 ++++++++++ .../haskell/accelerate-io/default.nix | 15 ++++++ .../libraries/haskell/accelerate/default.nix | 14 +++++ .../libraries/haskell/cuda/default.nix | 43 +++++++++++++++ .../haskell/exception-mtl/default.nix | 15 ++++++ .../exception-transformers/default.nix | 15 ++++++ .../haskell/language-c-quote/default.nix | 21 ++++++++ .../libraries/haskell/language-c/0.3.2.1.nix | 16 ++++++ .../language-c/{default.nix => 0.4.2.nix} | 0 .../haskell/mainland-pretty/default.nix | 15 ++++++ .../libraries/haskell/pgm/default.nix | 15 ++++++ .../libraries/haskell/srcloc/default.nix | 15 ++++++ .../libraries/haskell/symbol/default.nix | 15 ++++++ pkgs/top-level/all-packages.nix | 4 ++ pkgs/top-level/haskell-packages.nix | 40 ++++++++++++-- 17 files changed, 341 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/compilers/cudatoolkit/default.nix create mode 100644 pkgs/development/libraries/haskell/accelerate-cuda/default.nix create mode 100644 pkgs/development/libraries/haskell/accelerate-examples/default.nix create mode 100644 pkgs/development/libraries/haskell/accelerate-io/default.nix create mode 100644 pkgs/development/libraries/haskell/accelerate/default.nix create mode 100644 pkgs/development/libraries/haskell/cuda/default.nix create mode 100644 pkgs/development/libraries/haskell/exception-mtl/default.nix create mode 100644 pkgs/development/libraries/haskell/exception-transformers/default.nix create mode 100644 pkgs/development/libraries/haskell/language-c-quote/default.nix create mode 100644 pkgs/development/libraries/haskell/language-c/0.3.2.1.nix rename pkgs/development/libraries/haskell/language-c/{default.nix => 0.4.2.nix} (100%) create mode 100644 pkgs/development/libraries/haskell/mainland-pretty/default.nix create mode 100644 pkgs/development/libraries/haskell/pgm/default.nix create mode 100644 pkgs/development/libraries/haskell/srcloc/default.nix create mode 100644 pkgs/development/libraries/haskell/symbol/default.nix diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix new file mode 100644 index 00000000000..fdb40be320c --- /dev/null +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchurl, patchelf, perl, ncurses, expat, python, zlib +, xlibs, fontconfig, freetype, unixODBC, alsaLib +} : + +stdenv.mkDerivation rec { + name = "cudatoolkit-4.2.9"; + + dontPatchELF = true; + dontStrip = true; + + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = http://developer.download.nvidia.com/compute/cuda/4_2/rel/toolkit/cudatoolkit_4.2.9_linux_64_suse11.2.run; + sha256 = "1inngzwq520bhpdfrh5bm4cxfyf3hxj94jialjxgviri5bj9hz60"; + } + else throw "cudatoolkit does not support platform ${stdenv.system}"; + + buildInputs = [ perl ]; + + runtimeDependencies = [ + ncurses expat python zlib + xlibs.libX11 xlibs.libXext xlibs.libXrender xlibs.libXt xlibs.libXtst xlibs.libXi xlibs.libXext + fontconfig freetype unixODBC alsaLib + ]; + + rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.gcc.gcc}/lib64"; + + unpackPhase = '' + sh $src --keep --noexec + cd pkg + ''; + + buildPhase = '' + find . -type f -executable -exec patchelf \ + --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + '{}' \; || true + find . -type f -exec patchelf \ + --set-rpath $rpath:$out/lib:$out/lib64:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \ + --force-rpath \ + '{}' \; || true + ''; + + installPhase = '' + mkdir $out + perl ./install-linux.pl --prefix="$out" + ''; + + meta = { + license = [ "nonfree" ]; + }; +} diff --git a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix new file mode 100644 index 00000000000..388ca445768 --- /dev/null +++ b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix @@ -0,0 +1,23 @@ +{ cabal, accelerate, binary, blazeBuilder, cryptohash, cuda +, fclabels, filepath, hashable, hashtables, languageCQuote +, mainlandPretty, mtl, srcloc, symbol, transformers +, unorderedContainers +}: + +cabal.mkDerivation (self: { + pname = "accelerate-cuda"; + version = "0.12.0.0"; + sha256 = "1h8rx8jcv3x7hg8fr23fzy59lcv72rb914vyczs40bgfr4cgdaaa"; + buildDepends = [ + accelerate binary blazeBuilder cryptohash cuda fclabels filepath + hashable hashtables languageCQuote mainlandPretty mtl srcloc symbol + transformers unorderedContainers + ]; + meta = { + homepage = "http://www.cse.unsw.edu.au/~chak/project/accelerate/"; + description = "Accelerate backend for NVIDIA GPUs"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/accelerate-examples/default.nix b/pkgs/development/libraries/haskell/accelerate-examples/default.nix new file mode 100644 index 00000000000..6d93c63f0e2 --- /dev/null +++ b/pkgs/development/libraries/haskell/accelerate-examples/default.nix @@ -0,0 +1,27 @@ +{ cabal, accelerate, accelerateCuda, accelerateIo +, attoparsec, bmp, bytestringLexing, cmdargs, criterion, cuda +, deepseq, fclabels, filepath, gloss, hashtables, mtl, mwcRandom +, pgm, QuickCheck, random, testFramework, testFrameworkQuickcheck2 +, vector, vectorAlgorithms +}: + +cabal.mkDerivation (self: { + pname = "accelerate-examples"; + version = "0.12.0.0"; + sha256 = "08mkfr46vl8vgcsxvmbs499frvybfq0chbcj1chpb8rwy8w9fa9h"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + accelerate accelerateCuda accelerateIo attoparsec + bmp bytestringLexing cmdargs criterion cuda deepseq fclabels + filepath gloss hashtables mtl mwcRandom pgm QuickCheck random + testFramework testFrameworkQuickcheck2 vector vectorAlgorithms + ]; + meta = { + homepage = "http://www.cse.unsw.edu.au/~chak/project/accelerate/"; + description = "Examples using the Accelerate library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/accelerate-io/default.nix b/pkgs/development/libraries/haskell/accelerate-io/default.nix new file mode 100644 index 00000000000..caa4eeaf759 --- /dev/null +++ b/pkgs/development/libraries/haskell/accelerate-io/default.nix @@ -0,0 +1,15 @@ +{ cabal, accelerate, repa, vector }: + +cabal.mkDerivation (self: { + pname = "accelerate-io"; + version = "0.12.0.0"; + sha256 = "0jc6vcxmji11kj041cds6j90by3mvaybswgmsiflxdlf4zlagd6h"; + buildDepends = [ accelerate repa vector ]; + meta = { + homepage = "http://www.cse.unsw.edu.au/~chak/project/accelerate/"; + description = "Read and write Accelerate arrays in various formats"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/accelerate/default.nix b/pkgs/development/libraries/haskell/accelerate/default.nix new file mode 100644 index 00000000000..d7e7205b83c --- /dev/null +++ b/pkgs/development/libraries/haskell/accelerate/default.nix @@ -0,0 +1,14 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "accelerate"; + version = "0.12.0.0"; + sha256 = "1hb1zqsh8598brnjhdds8knp9dfsdlshrx5c7lj4pgl37gqyb5q5"; + meta = { + homepage = "https://github.com/AccelerateHS/accelerate/"; + description = "An embedded language for accelerated array processing"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/cuda/default.nix b/pkgs/development/libraries/haskell/cuda/default.nix new file mode 100644 index 00000000000..5c0614bc0b4 --- /dev/null +++ b/pkgs/development/libraries/haskell/cuda/default.nix @@ -0,0 +1,43 @@ +{ cabal, c2hs, cudatoolkit, extensibleExceptions, nvidia_x11 }: + +cabal.mkDerivation (self: { + pname = "cuda"; + version = "0.4.1.0"; + sha256 = "1drr95d4v3khidxr6na5vyq28bv5rqk2n676q0bydc4rqwhb1z6w"; + buildDepends = [ extensibleExceptions ]; + buildTools = [ c2hs ]; + extraLibraries = [ cudatoolkit nvidia_x11 self.stdenv.gcc ]; + # Perhaps this should be the default in cabal.nix ... + # + # The cudatoolkit provides both 64 and 32-bit versions of the + # library. GHC's linker fails if the wrong version is found first. + # We solve this by eliminating lib64 from the path on 32-bit + # platforms and putting lib64 first on 64-bit platforms. + + libPaths = if self.stdenv.is64bit then "lib64 lib" else "lib"; + + configurePhase = '' + for i in Setup.hs Setup.lhs; do + test -f $i && ghc --make $i + done + + for p in $extraBuildInputs $propagatedBuildNativeInputs; do + if [ -d "$p/include" ]; then + extraLibDirs="$extraLibDirs --extra-include-dir=$p/include" + fi + for d in $libPaths; do + if [ -d "$p/$d" ]; then + extraLibDirs="$extraLibDirs --extra-lib-dir=$p/$d" + fi + done + done + + ./Setup configure --verbose --prefix="$out" $libraryProfiling $extraLibDirs $configureFlags + ''; + meta = { + description = "FFI binding to the CUDA interface for programming NVIDIA GPUs"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/exception-mtl/default.nix b/pkgs/development/libraries/haskell/exception-mtl/default.nix new file mode 100644 index 00000000000..9b378751ebf --- /dev/null +++ b/pkgs/development/libraries/haskell/exception-mtl/default.nix @@ -0,0 +1,15 @@ +{ cabal, exceptionTransformers, mtl, transformers }: + +cabal.mkDerivation (self: { + pname = "exception-mtl"; + version = "0.3.0.2"; + sha256 = "1mhk1z7hz50h8ssr4s7dzdxzn02rr0njxijdddfjjw71fln3nl5h"; + buildDepends = [ exceptionTransformers mtl transformers ]; + meta = { + homepage = "http://www.eecs.harvard.edu/~mainland/"; + description = "Exception monad transformer instances for mtl2 classes"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/exception-transformers/default.nix b/pkgs/development/libraries/haskell/exception-transformers/default.nix new file mode 100644 index 00000000000..b1e0fcec5e0 --- /dev/null +++ b/pkgs/development/libraries/haskell/exception-transformers/default.nix @@ -0,0 +1,15 @@ +{ cabal, stm, transformers }: + +cabal.mkDerivation (self: { + pname = "exception-transformers"; + version = "0.3.0.2"; + sha256 = "1ah3dimnc980vkr2lycpl4nsb615gxqws6mv9j90mz6g165h9khf"; + buildDepends = [ stm transformers ]; + meta = { + homepage = "http://www.eecs.harvard.edu/~mainland/"; + description = "Type classes and monads for unchecked extensible exceptions"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix new file mode 100644 index 00000000000..24cfe6cafb3 --- /dev/null +++ b/pkgs/development/libraries/haskell/language-c-quote/default.nix @@ -0,0 +1,21 @@ +{ cabal, alex, exceptionMtl, exceptionTransformers, filepath, happy +, haskellSrcMeta, mainlandPretty, mtl, srcloc, syb, symbol +}: + +cabal.mkDerivation (self: { + pname = "language-c-quote"; + version = "0.3.1.0"; + sha256 = "0y3zfc43izvalm1lrbk286nmg4s3vgpj5v2j6j2saz3c7l2ly8z6"; + buildDepends = [ + exceptionMtl exceptionTransformers filepath haskellSrcMeta + mainlandPretty mtl srcloc syb symbol + ]; + buildTools = [ alex happy ]; + meta = { + homepage = "http://www.eecs.harvard.edu/~mainland/"; + description = "C/CUDA/OpenCL quasiquoting library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/language-c/0.3.2.1.nix b/pkgs/development/libraries/haskell/language-c/0.3.2.1.nix new file mode 100644 index 00000000000..154bc68c3c5 --- /dev/null +++ b/pkgs/development/libraries/haskell/language-c/0.3.2.1.nix @@ -0,0 +1,16 @@ +{ cabal, alex, filepath, happy, syb }: + +cabal.mkDerivation (self: { + pname = "language-c"; + version = "0.3.2.1"; + sha256 = "1qk86p88p2jk1cbgl8p5g19ip3nh6z22ddj5jac58r5ny076iimx"; + buildDepends = [ filepath syb ]; + buildTools = [ alex happy ]; + meta = { + homepage = "http://www.sivity.net/projects/language.c/"; + description = "Analysis and generation of C code"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/language-c/default.nix b/pkgs/development/libraries/haskell/language-c/0.4.2.nix similarity index 100% rename from pkgs/development/libraries/haskell/language-c/default.nix rename to pkgs/development/libraries/haskell/language-c/0.4.2.nix diff --git a/pkgs/development/libraries/haskell/mainland-pretty/default.nix b/pkgs/development/libraries/haskell/mainland-pretty/default.nix new file mode 100644 index 00000000000..f4b49a6f409 --- /dev/null +++ b/pkgs/development/libraries/haskell/mainland-pretty/default.nix @@ -0,0 +1,15 @@ +{ cabal, srcloc, symbol }: + +cabal.mkDerivation (self: { + pname = "mainland-pretty"; + version = "0.1.2.0"; + sha256 = "0qhv8qfzcm5n1scgmxsv1c2qqnhvp8r0hmax22vzaq7jmlzwhj4p"; + buildDepends = [ srcloc symbol ]; + meta = { + homepage = "http://www.eecs.harvard.edu/~mainland/"; + description = "Pretty printing designed for printing source code"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/pgm/default.nix b/pkgs/development/libraries/haskell/pgm/default.nix new file mode 100644 index 00000000000..b1be8dd6d03 --- /dev/null +++ b/pkgs/development/libraries/haskell/pgm/default.nix @@ -0,0 +1,15 @@ +{ cabal, parsec }: + +cabal.mkDerivation (self: { + pname = "pgm"; + version = "0.1.3"; + sha256 = "1byq8bacqgdpahf57ccwwa45wf9ij0kkgp89rg9flsv1g10364d4"; + buildDepends = [ parsec ]; + meta = { + homepage = "https://github.com/sergeyastanin/haskell-pgm"; + description = "Pure Haskell implementation of PGM image format"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/srcloc/default.nix b/pkgs/development/libraries/haskell/srcloc/default.nix new file mode 100644 index 00000000000..a29d1bd662c --- /dev/null +++ b/pkgs/development/libraries/haskell/srcloc/default.nix @@ -0,0 +1,15 @@ +{ cabal, syb, symbol }: + +cabal.mkDerivation (self: { + pname = "srcloc"; + version = "0.1.1.1"; + sha256 = "131g83sa0kjwy4bz6hcaxplywqd0899sw5r5x0nr0bffkhk91k60"; + buildDepends = [ syb symbol ]; + meta = { + homepage = "http://www.eecs.harvard.edu/~mainland/"; + description = "Data types for managing source code locations"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/symbol/default.nix b/pkgs/development/libraries/haskell/symbol/default.nix new file mode 100644 index 00000000000..42cfd77f1c8 --- /dev/null +++ b/pkgs/development/libraries/haskell/symbol/default.nix @@ -0,0 +1,15 @@ +{ cabal, syb }: + +cabal.mkDerivation (self: { + pname = "symbol"; + version = "0.1.1.1"; + sha256 = "1vda97jh9jrvb4l9v9m3xzv8z96jdwf5fji643i6ff3n3h9ysn77"; + buildDepends = [ syb ]; + meta = { + homepage = "http://www.eecs.harvard.edu/~mainland/"; + description = "A 'Symbol' type for fast symbol comparison"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 909cf0fd662..e206d7165c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -544,6 +544,10 @@ let cron = callPackage ../tools/system/cron { # see also fcron }; + cudatoolkit = callPackage ../development/compilers/cudatoolkit { + python = python26; + }; + curl = makeOverridable (import ../tools/networking/curl) rec { fetchurl = fetchurlBoot; inherit stdenv zlib openssl libssh2; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 83e37599fd8..627c40ea834 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -356,6 +356,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellSrcExts = self.haskellSrcExts_1_11_1; }; + accelerate = callPackage ../development/libraries/haskell/accelerate {}; + + accelerateCuda = callPackage ../development/libraries/haskell/accelerate-cuda {}; + + accelerateExamples = callPackage ../development/libraries/haskell/accelerate-examples {}; + + accelerateIo = callPackage ../development/libraries/haskell/accelerate-io {}; + ACVector = callPackage ../development/libraries/haskell/AC-Vector {}; abstractDeque = callPackage ../development/libraries/haskell/abstract-deque {}; @@ -447,7 +455,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); bytestringTrie = callPackage ../development/libraries/haskell/bytestring-trie {}; - c2hs = callPackage ../development/libraries/haskell/c2hs {}; + c2hs = callPackage ../development/libraries/haskell/c2hs { + languageC = self.languageC_0_3_2_1; + }; Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix { cabal = self.cabal.override { Cabal = null; }; }; Cabal = null; # core package in GHC @@ -522,6 +532,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cryptoPubkeyTypes = callPackage ../development/libraries/haskell/crypto-pubkey-types {}; + cuda = callPackage ../development/libraries/haskell/cuda { + inherit (pkgs.linuxPackages) nvidia_x11; + }; + csv = callPackage ../development/libraries/haskell/csv {}; cssText = callPackage ../development/libraries/haskell/css-text {}; @@ -592,6 +606,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); erf = callPackage ../development/libraries/haskell/erf {}; + exceptionMtl = callPackage ../development/libraries/haskell/exception-mtl {}; + + exceptionTransformers = callPackage ../development/libraries/haskell/exception-transformers {}; + explicitException = callPackage ../development/libraries/haskell/explicit-exception {}; executablePath = callPackage ../development/libraries/haskell/executable-path {}; @@ -678,8 +696,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); GlomeVec = callPackage ../development/libraries/haskell/GlomeVec {}; gloss = callPackage ../development/libraries/haskell/gloss { - GLUT = self.GLUT22; - OpenGL = self.OpenGL24; + GLUT = self.GLUT23; + OpenGL = self.OpenGL25; }; GLURaw = callPackage ../development/libraries/haskell/GLURaw {}; @@ -693,6 +711,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); OpenGL = self.OpenGL_2_5_0_0; }; GLUT22 = self.GLUT_2_2_2_1; + GLUT23 = self.GLUT_2_3_0_0; GLUT = self.GLUT_2_3_0_0; gtk = callPackage ../development/libraries/haskell/gtk { @@ -900,7 +919,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); jsonTypes = callPackage ../development/libraries/haskell/jsonTypes {}; - languageC = callPackage ../development/libraries/haskell/language-c {}; + languageC_0_4_2 = callPackage ../development/libraries/haskell/language-c/0.4.2.nix {}; + languageC_0_3_2_1 = callPackage ../development/libraries/haskell/language-c/0.3.2.1.nix {}; + languageC = self.languageC_0_4_2; + + languageCQuote = callPackage ../development/libraries/haskell/language-c-quote/default.nix {}; languageJavascript = callPackage ../development/libraries/haskell/language-javascript {}; @@ -924,6 +947,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); mathFunctions = callPackage ../development/libraries/haskell/math-functions {}; + mainlandPretty = callPackage ../development/libraries/haskell/mainland-pretty {}; + maude = callPackage ../development/libraries/haskell/maude { parsec = self.parsec3; }; @@ -1023,6 +1048,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); OpenGL_2_4_0_2 = callPackage ../development/libraries/haskell/OpenGL/2.4.0.2.nix {}; OpenGL_2_5_0_0 = callPackage ../development/libraries/haskell/OpenGL/2.5.0.0.nix {}; OpenGL24 = self.OpenGL_2_4_0_2; + OpenGL25 = self.OpenGL_2_5_0_0; OpenGL = self.OpenGL_2_5_0_0; OpenGLRaw = callPackage ../development/libraries/haskell/OpenGLRaw {}; @@ -1071,6 +1097,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); persistentTemplate = callPackage ../development/libraries/haskell/persistent-template {}; + pgm = callPackage ../development/libraries/haskell/pgm {}; + polyparse_1_7 = callPackage ../development/libraries/haskell/polyparse/1.7.nix {}; polyparse_1_8 = callPackage ../development/libraries/haskell/polyparse/1.8.nix {}; polyparse = self.polyparse_1_8; @@ -1202,6 +1230,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); socks = callPackage ../development/libraries/haskell/socks {}; + srcloc = callPackage ../development/libraries/haskell/srcloc {}; + stateref = callPackage ../development/libraries/haskell/stateref {}; StateVar = callPackage ../development/libraries/haskell/StateVar {}; @@ -1277,6 +1307,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); libc = pkgs.stdenv.gcc.libc; }; + symbol = callPackage ../development/libraries/haskell/symbol {}; + systemFilepath = callPackage ../development/libraries/haskell/system-filepath {}; systemFileio = callPackage ../development/libraries/haskell/system-fileio {}; From 4550700ec939df2dd0f6319225a6f5eab63c3af7 Mon Sep 17 00:00:00 2001 From: Cillian de Roiste Date: Sun, 20 May 2012 18:15:23 +0000 Subject: [PATCH 040/403] Updating Yoshimi, no need for the fluid patch any more. svn path=/nixpkgs/trunk/; revision=34187 --- pkgs/applications/audio/yoshimi/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 2e7254dc8b8..082f5dd9ab9 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -5,11 +5,11 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { name = "yoshimi-${version}"; - version = "0.060.10"; + version = "0.060.12"; src = fetchurl { url = "mirror://sourceforge/yoshimi/${name}.tar.bz2"; - sha256 = "0y67w7y515hx2bi5gfjgsw1hdah1bdrrvcfmqyjsvn7jbd0q47v1"; + sha256 = "14javywkw6af9z9c7jr06rzdgzncyaz2ab6f0v0k6bgdndlcgslc"; }; buildInputs = [ alsaLib boost fftwSinglePrec fltk jackaudio libsndfile mesa @@ -18,13 +18,6 @@ stdenv.mkDerivation rec { preConfigure = "cd src"; - patches = [ - (fetchurl { - url = http://patch-tracker.debian.org/patch/series/dl/yoshimi/0.060.10-3/02-fluid_1.3.patch; - sha256 = "1sywirbaaw4zhn5ypga27j02qvrvqjwv3lw8kvzyj575q4c4qnri"; - }) - ]; - cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${stdenv.glibc}/lib/libm.so" ]; meta = with stdenv.lib; { From 56a2503c80474593bc7918da7d9cb74ba611986c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Sun, 20 May 2012 19:56:35 +0000 Subject: [PATCH 041/403] Remove platforms from accelerate-cuda. svn path=/nixpkgs/trunk/; revision=34188 --- pkgs/development/libraries/haskell/accelerate-cuda/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix index 388ca445768..5bfd29b47cd 100644 --- a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix @@ -17,7 +17,7 @@ cabal.mkDerivation (self: { homepage = "http://www.cse.unsw.edu.au/~chak/project/accelerate/"; description = "Accelerate backend for NVIDIA GPUs"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; + platforms = []; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) From 5144845d717f88554a3792beac87da7cdd929ee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Sun, 20 May 2012 20:21:55 +0000 Subject: [PATCH 042/403] Platform refinement. This should be stable under regeneration with hackage4nix. svn path=/nixpkgs/trunk/; revision=34189 --- pkgs/development/libraries/haskell/accelerate-cuda/default.nix | 2 +- pkgs/lib/platforms.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix index 5bfd29b47cd..5433eb4858e 100644 --- a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix @@ -17,7 +17,7 @@ cabal.mkDerivation (self: { homepage = "http://www.cse.unsw.edu.au/~chak/project/accelerate/"; description = "Accelerate backend for NVIDIA GPUs"; license = self.stdenv.lib.licenses.bsd3; - platforms = []; + platforms = self.stdenv.lib.platforms.none; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/lib/platforms.nix b/pkgs/lib/platforms.nix index c79e8468b23..45e863458d4 100644 --- a/pkgs/lib/platforms.nix +++ b/pkgs/lib/platforms.nix @@ -11,6 +11,7 @@ rec { cygwin = ["i686-cygwin"]; unix = linux ++ darwin ++ freebsd ++ openbsd; all = linux ++ darwin ++ cygwin ++ freebsd ++ openbsd; + none = []; allBut = platform: lists.filter (x: platform != x) all; mesaPlatforms = linux; } From 513b42ef2b1ce0789da7d278a9d9225d7059e63e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Sun, 20 May 2012 20:31:15 +0000 Subject: [PATCH 043/403] Regenerated accelerate-examples expression with cabal2nix. svn path=/nixpkgs/trunk/; revision=34190 --- .../haskell/accelerate-examples/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/accelerate-examples/default.nix b/pkgs/development/libraries/haskell/accelerate-examples/default.nix index 6d93c63f0e2..6a73274336d 100644 --- a/pkgs/development/libraries/haskell/accelerate-examples/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-examples/default.nix @@ -1,8 +1,8 @@ -{ cabal, accelerate, accelerateCuda, accelerateIo -, attoparsec, bmp, bytestringLexing, cmdargs, criterion, cuda -, deepseq, fclabels, filepath, gloss, hashtables, mtl, mwcRandom -, pgm, QuickCheck, random, testFramework, testFrameworkQuickcheck2 -, vector, vectorAlgorithms +{ cabal, accelerate, accelerateCuda, accelerateIo, attoparsec, bmp +, bytestringLexing, cmdargs, criterion, cuda, deepseq, fclabels +, filepath, gloss, hashtables, mtl, mwcRandom, pgm, QuickCheck +, random, testFramework, testFrameworkQuickcheck2, vector +, vectorAlgorithms }: cabal.mkDerivation (self: { @@ -12,11 +12,12 @@ cabal.mkDerivation (self: { isLibrary = false; isExecutable = true; buildDepends = [ - accelerate accelerateCuda accelerateIo attoparsec - bmp bytestringLexing cmdargs criterion cuda deepseq fclabels - filepath gloss hashtables mtl mwcRandom pgm QuickCheck random - testFramework testFrameworkQuickcheck2 vector vectorAlgorithms + accelerate accelerateCuda accelerateIo attoparsec bmp + bytestringLexing cmdargs criterion cuda deepseq fclabels filepath + gloss hashtables mtl mwcRandom pgm QuickCheck random testFramework + testFrameworkQuickcheck2 vector vectorAlgorithms ]; + configureFlags = "-f-opencl"; meta = { homepage = "http://www.cse.unsw.edu.au/~chak/project/accelerate/"; description = "Examples using the Accelerate library"; From 0542d359002a5b6d3564aef485027168ac2cf44f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Sun, 20 May 2012 21:04:52 +0000 Subject: [PATCH 044/403] Added prerelease version of haskell-platform-2012.2.0.0 svn path=/nixpkgs/trunk/; revision=34191 --- .../haskell/haskell-platform/2012.2.0.0.nix | 42 +++++++++ .../haskell-platform-2012.2.0.0.cabal | 89 +++++++++++++++++++ .../libraries/haskell/xhtml/3000.2.1.nix | 2 +- pkgs/top-level/haskell-defaults.nix | 1 + pkgs/top-level/haskell-packages.nix | 9 +- 5 files changed, 140 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/haskell/haskell-platform/2012.2.0.0.nix create mode 100644 pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal diff --git a/pkgs/development/libraries/haskell/haskell-platform/2012.2.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2012.2.0.0.nix new file mode 100644 index 00000000000..e57d76e8466 --- /dev/null +++ b/pkgs/development/libraries/haskell/haskell-platform/2012.2.0.0.nix @@ -0,0 +1,42 @@ +{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl, + haskellSrc, html, network, parallel, parsec, regexBase, regexCompat, regexPosix, + stm, syb, deepseq, text, transformers, mtl, xhtml, zlib, random, + cabalInstall, alex, happy, haddock, ghc}: + +# This is just a meta-package. Because upstream fails to provide proper versioned +# release tarballs that can be used for the purpose of verifying this package, we +# just create it on the fly from a simple Setup.hs file and a .cabal file that we +# store directly in the nixpkgs repository. + +cabal.mkDerivation (self : { + pname = "haskell-platform"; + version = "2011.4.0.0"; + cabalFile = ./haskell-platform-2012.2.0.0.cabal; + setupFile = ./Setup.hs; + src = null; + propagatedBuildInputs = [ + GLUT HTTP HUnit OpenGL QuickCheck cgi fgl + haskellSrc html network parallel parsec regexBase regexCompat regexPosix + stm syb deepseq text transformers mtl xhtml zlib random + cabalInstall alex happy ghc haddock + ]; + unpackPhase = '' + sourceRoot=haskell-platform + mkdir $sourceRoot + cp ${self.cabalFile} $sourceRoot/${self.pname}.cabal + cp ${self.setupFile} $sourceRoot/Setup.hs + touch $sourceRoot/LICENSE + ''; + noHaddock = true; + meta = { + homepage = "http://haskell.org/platform"; + description = "Haskell Platform meta package"; + 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/haskell-platform/haskell-platform-2012.2.0.0.cabal b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal new file mode 100644 index 00000000000..264d636f994 --- /dev/null +++ b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal @@ -0,0 +1,89 @@ +name: haskell-platform +version: 2012.2.0.0 +homepage: http://haskell.org/platform +license: BSD3 +license-file: LICENSE +author: libraries@haskell.org +maintainer: haskell-platform@projects.haskell.org +category: System +synopsis: The Haskell Platform +description: + The Haskell Platform (HP) is the blessed set of libraries and tools on + which to build further Haskell libraries and applications. It is + intended to provide a comprehensive, stable, and quality tested base for + Haskell projects to work from. + . + This version specifies the following additional developer tools be + installed, for a system to be in full compliance: + . + * cabal-install + * alex + * happy + * haddock + +cabal-version: >= 1.8 +build-type: Custom +tested-with: GHC ==7.4.1 + +library + build-depends: + -- ghc ==7.4.1, + + -- Core libraries: provided by every ghc installation + -- We don't include "non-API" packages here. + -- array ==0.4.0.0, + -- base ==4.5.0.0, + -- bytestring ==0.9.2.1, + -- Cabal ==1.14.0, + -- containers ==0.4.2.1, + -- deepseq ==1.3.0.0, + -- directory ==1.1.0.2, + -- extensible-exceptions ==0.1.1.4, + -- filepath ==1.3.0.0, + -- haskell2010 ==1.1.0.1, + -- haskell98 ==2.0.0.1, + -- hpc ==0.5.1.1, + -- old-locale ==1.0.0.4, + -- old-time ==1.1.0.0, + -- pretty ==1.1.1.0, + -- process ==1.1.0.1, + -- template-haskell ==2.7.0.0, + -- time ==1.4, + -- unix ==2.5.1.0, + -- Win32 ==2.2.2.0, + + -- Libraries in addition to what GHC provides: + -- Note: newer versions of cgi need monad-catchio. + cgi ==3001.1.7.4, + fgl ==5.4.2.4, + GLUT ==2.1.2.1, + haskell-src ==1.0.1.5, + html ==1.0.1.2, + HTTP ==4000.2.3, + HUnit ==1.2.4.2, + mtl ==2.1.1, + network ==2.3.0.13, + OpenGL ==2.2.3.1, + parallel ==3.2.0.2, + parsec ==3.1.2, + QuickCheck ==2.4.2, + random ==1.0.1.1, + regex-base ==0.93.2, + regex-compat ==0.95.1, + regex-posix ==0.95.1, + stm ==2.3, + syb ==0.3.6.1, + text ==0.11.2.0, + transformers ==0.3.0.0, + xhtml ==3000.2.1, + zlib ==0.5.3.3 + + -- Depending on programs does not work, they are not registered + -- We list them to help distro packaging. + build-tools: + cabal-install ==0.14.0, + alex ==3.0.1, + happy ==1.18.9 + -- hscolour ==1.19 + -- haddock ==2.10.0 -- need to use the one shipped with ghc + diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.1.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.1.nix index f1c11b790bb..66196c806ac 100644 --- a/pkgs/development/libraries/haskell/xhtml/3000.2.1.nix +++ b/pkgs/development/libraries/haskell/xhtml/3000.2.1.nix @@ -3,7 +3,7 @@ cabal.mkDerivation (self: { pname = "xhtml"; version = "3000.2.1"; - sha256 = "17qzc6kyiilhi8s25k68fbpyplihb1qxkpc6l93bvjrcchilsf22"; + sha256 = "1n6wgzxbj8xf0wf1il827qidphnffb5vzhwzqlxhh70c2y10f0ik"; meta = { homepage = "https://github.com/haskell/xhtml"; description = "An XHTML combinator library"; diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 93bc6838eca..226fe64d91d 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -19,6 +19,7 @@ ghc741Prefs_pedantic = self : self.haskellPlatformArgs_future self // { + haskellPlatform = self.haskellPlatform_2012_2_0_0; mtl1 = self.mtl_1_1_1_1; # 7.2 ok, 7.3 ok binary = null; # now a core package }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 627c40ea834..96f23ac5740 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -139,7 +139,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); regexPosix = self.regexPosix_0_95_1; # 7.4.1 ok stm = self.stm_2_3; # 7.4.1 ok syb = self.syb_0_3_6_1; # 7.4.1 ok - xhtml = self.xhtml_3000_2_0_5; # 7.4.1 ok + xhtml = self.xhtml_3000_2_1; # 7.4.1 ok zlib = self.zlib_0_5_3_3; # 7.4.1 ok HTTP = self.HTTP_4000_2_3; # 7.4.1 ok text = self.text_0_11_2_0; # 7.4.1 ok @@ -152,6 +152,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haddock = self.haddock_2_10_0; # 7.4.1 ok }; + # This is still a prerelease. + haskellPlatform_2012_2_0_0 = + callPackage ../development/libraries/haskell/haskell-platform/2012.2.0.0.nix + (self.haskellPlatformArgs_future self); + haskellPlatformArgs_2011_4_0_0 = self : { inherit (self) cabal ghc; cgi = self.cgi_3001_1_7_4; @@ -1529,7 +1534,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); zlib_0_5_3_1 = callPackage ../development/libraries/haskell/zlib/0.5.3.1.nix { inherit (pkgs) zlib; }; - zlib_0_5_3_3 = callPackage ../development/libraries/haskell/zlib/0.5.3.1.nix { + zlib_0_5_3_3 = callPackage ../development/libraries/haskell/zlib/0.5.3.3.nix { inherit (pkgs) zlib; }; zlib = self.zlib_0_5_3_3; From 6706ef1e9916178cf553c39ae8f78b55b5768c84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Mon, 21 May 2012 06:17:27 +0000 Subject: [PATCH 045/403] Fixed incorrect version number of Haskell Platform. svn path=/nixpkgs/trunk/; revision=34192 --- .../libraries/haskell/haskell-platform/2012.2.0.0.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/haskell-platform/2012.2.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2012.2.0.0.nix index e57d76e8466..be2aa50e396 100644 --- a/pkgs/development/libraries/haskell/haskell-platform/2012.2.0.0.nix +++ b/pkgs/development/libraries/haskell/haskell-platform/2012.2.0.0.nix @@ -10,7 +10,7 @@ cabal.mkDerivation (self : { pname = "haskell-platform"; - version = "2011.4.0.0"; + version = "2012.2.0.0"; cabalFile = ./haskell-platform-2012.2.0.0.cabal; setupFile = ./Setup.hs; src = null; From 5a270abcb65dd8a1ced0f764dfde7867de334d79 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Mon, 21 May 2012 14:58:16 +0000 Subject: [PATCH 046/403] Added missing pygtk dependency to Gnome VTE library. svn path=/nixpkgs/trunk/; revision=34194 --- pkgs/desktops/gnome-2/desktop/vte/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-2/desktop/vte/default.nix b/pkgs/desktops/gnome-2/desktop/vte/default.nix index c061a268479..c91522e695e 100644 --- a/pkgs/desktops/gnome-2/desktop/vte/default.nix +++ b/pkgs/desktops/gnome-2/desktop/vte/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, pkgconfig, glib, gtk, ncurses -, pythonSupport ? false, python}: +, pythonSupport ? false, python, pygtk}: stdenv.mkDerivation rec { name = "vte-0.28.0"; @@ -10,12 +10,19 @@ stdenv.mkDerivation rec { }; buildInputs = [ intltool pkgconfig glib gtk ncurses ] ++ - stdenv.lib.optional pythonSupport python; + stdenv.lib.optionals pythonSupport [python pygtk]; configureFlags = '' ${if pythonSupport then "--enable-python" else "--disable-python"} ''; - + + postInstall = stdenv.lib.optionalString pythonSupport '' + cd $(toPythonPath $out)/gtk-2.0 + for n in *; do + ln -s "gtk-2.0/$n" "../$n" + done + ''; + meta = { homepage = http://www.gnome.org/; description = "A library implementing a terminal emulator widget for GTK+"; From 61ef2ff439bd3951ccef9dd4dc610e52842c178b Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Mon, 21 May 2012 15:08:16 +0000 Subject: [PATCH 047/403] gnome-terminator 0.96. svn path=/nixpkgs/trunk/; revision=34195 --- .../misc/gnome_terminator/default.nix | 0 .../misc/gnome_terminator/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 3 files changed, 34 insertions(+) create mode 100644 applications/misc/gnome_terminator/default.nix create mode 100644 pkgs/applications/misc/gnome_terminator/default.nix diff --git a/applications/misc/gnome_terminator/default.nix b/applications/misc/gnome_terminator/default.nix new file mode 100644 index 00000000000..e69de29bb2d diff --git a/pkgs/applications/misc/gnome_terminator/default.nix b/pkgs/applications/misc/gnome_terminator/default.nix new file mode 100644 index 00000000000..feb4c313945 --- /dev/null +++ b/pkgs/applications/misc/gnome_terminator/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, python, pygtk, vte, gettext, intltool, makeWrapper }: + +stdenv.mkDerivation rec { + name = "gnome-terminator-0.96"; + + src = fetchurl { + url = "https://launchpad.net/terminator/trunk/0.96/+download/terminator_0.96.tar.gz"; + sha256 = "d708c783c36233fcafbd0139a91462478ae40f5cf696ef4acfcaf5891a843201"; + }; + + buildInputs = + [ python pygtk vte gettext intltool makeWrapper + ]; + + phases = "unpackPhase installPhase"; + + installPhase = '' + python setup.py --without-icon-cache install --prefix=$out + for i in $(cd $out/bin && ls); do + wrapProgram $out/bin/$i \ + --prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH" + done + ''; + + meta = { + description = "Gnome terminal emulator with support for tiling and tabs." + homepage = http://www.tenshu.net/p/terminator.html; + license = "GPLv2"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e206d7165c6..cdfad9837fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6819,6 +6819,10 @@ let inherit (gnome) GConf; }; + gnome_terminator = callPackage ../applications/misc/gnome_terminator { + vte = gnome.vte.override { pythonSupport = true; }; + }; + googleearth = callPackage_i686 ../applications/misc/googleearth { }; google_talk_plugin = callPackage ../applications/networking/browsers/mozilla-plugins/google-talk-plugin { }; From 3724758a969db7d680fcea6833c4db7283a1ecc5 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Mon, 21 May 2012 15:45:03 +0000 Subject: [PATCH 048/403] Fixed stupid syntax error in gnome-terminator's default.nix. svn path=/nixpkgs/trunk/; revision=34196 --- pkgs/applications/misc/gnome_terminator/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/gnome_terminator/default.nix b/pkgs/applications/misc/gnome_terminator/default.nix index feb4c313945..cbd0819e240 100644 --- a/pkgs/applications/misc/gnome_terminator/default.nix +++ b/pkgs/applications/misc/gnome_terminator/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Gnome terminal emulator with support for tiling and tabs." + description = "Gnome terminal emulator with support for tiling and tabs."; homepage = http://www.tenshu.net/p/terminator.html; license = "GPLv2"; }; From 1a22e9761d34254d88a12b3290be7b5843bf131f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 21 May 2012 17:51:40 +0000 Subject: [PATCH 049/403] * By default, build a dynamically linked Busybox. In the initrd we need Glibc anyway, so there is no point in static linking. This saves about a megabyte from the initrd. svn path=/nixpkgs/trunk/; revision=34197 --- pkgs/misc/busybox/default.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/busybox/default.nix b/pkgs/misc/busybox/default.nix index ce42a156605..2f876c98d6b 100644 --- a/pkgs/misc/busybox/default.nix +++ b/pkgs/misc/busybox/default.nix @@ -30,9 +30,9 @@ let CONFIG_INSTALL_NO_USR y ''; - staticConfig = (if enableStatic then '' - CONFIG_STATIC y - '' else ""); + staticConfig = stdenv.lib.optionalString enableStatic '' + CONFIG_STATIC y + ''; in @@ -65,6 +65,8 @@ stdenv.mkDerivation rec { '' else ""); }; + enableParallelBuilding = true; + meta = { description = "Tiny versions of common UNIX utilities in a single small executable"; homepage = http://busybox.net/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cdfad9837fa..7df281dc9f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8336,9 +8336,7 @@ let auctex = callPackage ../tools/typesetting/tex/auctex { }; - busybox = callPackage ../misc/busybox { - enableStatic = true; - }; + busybox = callPackage ../misc/busybox { }; cups = callPackage ../misc/cups { }; From 690051abbcc8b415394276efa3bb702b44101aaa Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 21 May 2012 18:14:47 +0000 Subject: [PATCH 050/403] * Linux 3.2.18. svn path=/nixpkgs/trunk/; revision=34198 --- pkgs/os-specific/linux/kernel/linux-3.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index cf4985adb34..f0f73128732 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -234,7 +234,7 @@ in import ./generic.nix ( rec { - version = "3.2.17"; + version = "3.2.18"; testing = false; modDirVersion = version; @@ -245,7 +245,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "16yyldmmk5rj4bm3x1phxnv2848cybapianj92bg9c6d8x3zzm8f"; + sha256 = "0qghi3n2xq2alkcgbjklpngy3pqwbsjm5cls7vah3qr9yw46m1fp"; }; config = configWithPlatform stdenv.platform; From 8336d5599396eef35236b26ebc0a651117f5680d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 21 May 2012 20:47:57 +0000 Subject: [PATCH 051/403] * Be less verbose generating initrds. svn path=/nixpkgs/trunk/; revision=34199 --- pkgs/build-support/kernel/make-initrd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/kernel/make-initrd.sh b/pkgs/build-support/kernel/make-initrd.sh index 8d334447b6d..b2c78463569 100644 --- a/pkgs/build-support/kernel/make-initrd.sh +++ b/pkgs/build-support/kernel/make-initrd.sh @@ -36,7 +36,7 @@ storePaths=$(perl $pathsFromGraph closure-*) # Put the closure in a gzipped cpio archive. mkdir -p $out -(cd root && find * -print0 | cpio -ov -H newc --null | gzip -9 > $out/initrd) +(cd root && find * -print0 | cpio -o -H newc --null | gzip -9 > $out/initrd) if [ -n "$makeUInitrd" ]; then mv $out/initrd $out/initrd.gz From 4ac1552b1597c4f1c6894efd55d51bd64ce210b1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 21 May 2012 20:48:19 +0000 Subject: [PATCH 052/403] * Added systemd. svn path=/nixpkgs/trunk/; revision=34200 --- pkgs/os-specific/linux/systemd/default.nix | 36 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/os-specific/linux/systemd/default.nix diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix new file mode 100644 index 00000000000..27612ec50a4 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gperf, libcap, udev, dbus, kmod +, xz, pam, acl, cryptsetup, libuuid, m4 }: + +stdenv.mkDerivation rec { + name = "systemd-44"; + + src = fetchurl { + url = "http://www.freedesktop.org/software/systemd/${name}.tar.xz"; + sha256 = "0g138b5yvn419xqrakpk75q2sb4g7pj10br9b6zq4flb9d5sqnks"; + }; + + buildInputs = + [ pkgconfig intltool gperf libcap udev dbus kmod xz pam acl + cryptsetup libuuid m4 + ]; + + configureFlags = + [ "--localstatedir=/var" + "--with-distro=other" + "--with-rootprefix=$(out)" + "--with-rootprefix=$(out)" + "--with-dbusinterfacedir=$(out)/share/dbus-1/interfaces" + "--with-dbuspolicydir=$(out)/etc/dbus-1/system.d" + "--with-dbussystemservicedir=$(out)/share/dbus-1/system-services" + "--with-dbussessionservicedir=$(out)/share/dbus-1/services" + ]; + + installFlags = "localstatedir=$(TMPDIR)/var"; + + enableParallelBuilding = true; + + meta = { + homepage = http://www.freedesktop.org/wiki/Software/systemd; + description = "A system and service manager for Linux"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7df281dc9f9..56b7cd95fae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5953,6 +5953,8 @@ let sysstat = callPackage ../os-specific/linux/sysstat { }; + systemd = callPackage ../os-specific/linux/systemd { }; + sysvinit = callPackage ../os-specific/linux/sysvinit { }; sysvtools = callPackage ../os-specific/linux/sysvinit { From f44b78641d1cec2706f05165639a60f90cf60a84 Mon Sep 17 00:00:00 2001 From: Cillian de Roiste Date: Mon, 21 May 2012 22:38:44 +0000 Subject: [PATCH 053/403] http://ftp.logilab.org is no longer valid, changing to ftp:// instead svn path=/nixpkgs/trunk/; revision=34202 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 09d8b5c0ec7..df184527baf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -174,7 +174,7 @@ let pythonPackages = python.modules // rec { name = "logilab-astng-0.21.1"; src = fetchurl { - url = "http://ftp.logilab.org/pub/astng/${name}.tar.gz"; + url = "ftp://ftp.logilab.org/pub/astng/${name}.tar.gz"; sha256 = "0rqp2vwrnv6gkzdd96j078h1sz26plh49cmnyswy2wb6l4wans67"; }; propagatedBuildInputs = [logilabCommon]; @@ -821,7 +821,7 @@ let pythonPackages = python.modules // rec { name = "logilab-common-0.56.0"; src = fetchurl { - url = "http://ftp.logilab.org/pub/common/${name}.tar.gz"; + url = "ftp://ftp.logilab.org/pub/common/${name}.tar.gz"; sha256 = "14p557nqypbd10d8k7qs6jlm58pksiwh86wvvl0axyki00hj6971"; }; propagatedBuildInputs = [unittest2]; @@ -1559,7 +1559,7 @@ let pythonPackages = python.modules // rec { name = "pylint-0.23.0"; src = fetchurl { - url = "http://ftp.logilab.org/pub/pylint/${name}.tar.gz"; + url = "ftp://ftp.logilab.org/pub/pylint/${name}.tar.gz"; sha256 = "07091avcc2b374i5f3blszmawjcin8xssjfryz91qbxybb8r7c6d"; }; propagatedBuildInputs = [astng]; From 6bf4d9522a2f9aa587815dd3eb5bc971b20a985f Mon Sep 17 00:00:00 2001 From: Cillian de Roiste Date: Mon, 21 May 2012 22:46:40 +0000 Subject: [PATCH 054/403] Submitting patch by qknight (Joachim Schiele) to add Gnome2 python bindings svn path=/nixpkgs/trunk/; revision=34203 --- .../gnome-2/bindings/gnome-python/default.nix | 38 +++++++++++++++++++ pkgs/desktops/gnome-2/default.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/desktops/gnome-2/bindings/gnome-python/default.nix diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix new file mode 100644 index 00000000000..3d47ed56787 --- /dev/null +++ b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, python, pkgconfig, libgnome, GConf, pygobject, pygtk, glib, gtk, pythonDBus}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + version = "2.28"; + name = "gnome-python-${version}.1"; + + src = fetchurl { + url = "http://ftp.gnome.org/pub/GNOME/sources/gnome-python/${version}/${name}.tar.bz2"; + sha256 = "759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8"; + }; + + phases = "unpackPhase configurePhase buildPhase installPhase"; + + # You should be using WAF instead; see the file INSTALL.WAF + configurePhase = '' + python waf configure --prefix=$out + ''; + + buildPhase = '' + python waf build + ''; + + installPhase = '' + python waf install + ''; + + buildInputs = [ python pkgconfig pygobject pygtk glib gtk GConf libgnome pythonDBus ]; + + doCheck = false; + + meta = { + homepage = "http://projects.gnome.org/gconf/"; + description = "Python wrapper for gconf"; + maintainers = [ stdenv.lib.maintainers.qknight ]; + }; +} \ No newline at end of file diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 4a4e6eaaefb..29090b1f9d4 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -111,4 +111,6 @@ libglademm = callPackage ./bindings/libglademm { }; + gnome_python = callPackage ./bindings/gnome-python { }; + } From f0e99eca2aab97f818736c98cdf23f07e919ef66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Tue, 22 May 2012 06:14:35 +0000 Subject: [PATCH 055/403] Updated the Haskell Platform prerelease. svn path=/nixpkgs/trunk/; revision=34206 --- .../libraries/haskell/GLUT/2.1.2.2.nix | 17 +++++++++++++++++ .../haskell-platform-2012.2.0.0.cabal | 2 +- pkgs/top-level/haskell-packages.nix | 3 ++- 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix b/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix new file mode 100644 index 00000000000..2b9a0fadfc9 --- /dev/null +++ b/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix @@ -0,0 +1,17 @@ +{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL }: + +cabal.mkDerivation (self: { + pname = "GLUT"; + version = "2.1.2.2"; + sha256 = "14g2ykcczy1hhpgflxv158zx2izkl1p0wj1x0am1grkkj1n9jbwi"; + buildDepends = [ OpenGL ]; + extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; + noHaddock = true; + meta = { + homepage = "http://www.haskell.org/HOpenGL/"; + description = "A binding for the OpenGL Utility Toolkit"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal index 264d636f994..e5838c4f9ee 100644 --- a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal +++ b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal @@ -56,7 +56,7 @@ library -- Note: newer versions of cgi need monad-catchio. cgi ==3001.1.7.4, fgl ==5.4.2.4, - GLUT ==2.1.2.1, + GLUT ==2.1.2.2, haskell-src ==1.0.1.5, html ==1.0.1.2, HTTP ==4000.2.3, diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 96f23ac5740..1acb09f4652 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -125,7 +125,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); inherit (self) cabal ghc; cgi = self.cgi_3001_1_7_4; # 7.4.1 ok fgl = self.fgl_5_4_2_4; # 7.4.1 ok - GLUT = self.GLUT_2_1_2_1; # 7.4.1 ok + GLUT = self.GLUT_2_1_2_2; # 7.4.1 ok haskellSrc = self.haskellSrc_1_0_1_5; # 7.4.1 ok html = self.html_1_0_1_2; # 7.4.1 ok HUnit = self.HUnit_1_2_4_2; # 7.4.1 ok @@ -709,6 +709,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); GLUT_2_1_1_2 = callPackage ../development/libraries/haskell/GLUT/2.1.1.2.nix {}; GLUT_2_1_2_1 = callPackage ../development/libraries/haskell/GLUT/2.1.2.1.nix {}; + GLUT_2_1_2_2 = callPackage ../development/libraries/haskell/GLUT/2.1.2.2.nix {}; GLUT_2_2_2_1 = callPackage ../development/libraries/haskell/GLUT/2.2.2.1.nix { OpenGL = self.OpenGL_2_4_0_2; }; From 21bd78667aae101d20c5f20b208a69b1fc8548a3 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 22 May 2012 12:31:31 +0000 Subject: [PATCH 056/403] Removed empty directory structure that I managed to commit by mistake. svn path=/nixpkgs/trunk/; revision=34207 --- applications/misc/gnome_terminator/default.nix | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 applications/misc/gnome_terminator/default.nix diff --git a/applications/misc/gnome_terminator/default.nix b/applications/misc/gnome_terminator/default.nix deleted file mode 100644 index e69de29bb2d..00000000000 From 7962af0fe5dc3d8c6a5cde338972d08777e65061 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 22 May 2012 14:30:12 +0000 Subject: [PATCH 057/403] Updating libv4l (part of v4l-utils). I moved v4l-utils to stdenv.mkDerivation style, and it's used to build either libv4l or the utils (with qt4). svn path=/nixpkgs/trunk/; revision=34208 --- pkgs/development/libraries/libv4l/default.nix | 10 --- pkgs/os-specific/linux/v4l-utils/default.nix | 70 +++++++------------ pkgs/top-level/all-packages.nix | 8 ++- 3 files changed, 33 insertions(+), 55 deletions(-) delete mode 100644 pkgs/development/libraries/libv4l/default.nix diff --git a/pkgs/development/libraries/libv4l/default.nix b/pkgs/development/libraries/libv4l/default.nix deleted file mode 100644 index fac2135b9ed..00000000000 --- a/pkgs/development/libraries/libv4l/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation { - name = "libv4l-0.6.2"; - src = fetchurl { - url = http://people.atrpms.net/~hdegoede/libv4l-0.6.1.tar.gz; - sha256 = "1grbyb9vsdlp6yx4inmazgp5g0jxga8wbl3h8dv6vlfh5hckxf9n"; - }; - installPhase = "make PREFIX=$out install"; -} diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index d20821e137c..ea63dadc8bd 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -1,50 +1,34 @@ -x@{builderDefsPackage - , libv4l, libjpeg, qt4 - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{stdenv, fetchurl, which, libjpeg +, withQt4 ? false, qt4 ? null}: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="v4l-utils"; - version="0.8.5"; - name="${baseName}-${version}"; - url="http://www.linuxtv.org/downloads/v4l-utils/${name}.tar.bz2"; - hash="0k2rkra8lyimj6bwm8khq6xrhjdy67d09blxa6brnj7kpa7q81f2"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; +assert withQt4 -> qt4 != null; + +stdenv.mkDerivation rec { + name = "v4l-utils-0.8.8"; + + src = fetchurl { + url = "http://linuxtv.org/downloads/v4l-utils/${name}.tar.bz2"; + sha256 = "0zx8f1npsl6g5vjah1gwydg1j5azl74kr83ifbjhshgmnvscd92z"; }; - inherit (sourceInfo) name version; - inherit buildInputs; + buildInputs = [ libjpeg which ] ++ stdenv.lib.optional withQt4 qt4; - /* doConfigure should be removed if not needed */ - phaseNames = ["doUnpack" "doMakeInstall"]; + # The keytable wants to touch /etc files and udev scripts in /lib. + # I skip it. + patchPhase = '' + sed -i s/keytable// utils/Makefile + ''; + + installPhase = '' + make PREFIX=$out install + ''; - makeFlags = [''PREFIX="" DESTDIR="$out"'']; - meta = { - description = "Video-4-Linux utilities"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - license = a.lib.licenses.gpl2; + homepage = http://linuxtv.org/projects.php; + description = "V4L utils and libv4l, that provides common image formats regardless of the v4l device"; + # (The libs are of LGPLv2.1+, some other pieces are GPL) + license = "free"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; }; - passthru = { - updateInfo = { - downloadPage = "http://www.linuxtv.org/downloads/v4l-utils/"; - }; - }; -}) x - +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 56b7cd95fae..52c63885f7c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4184,7 +4184,9 @@ let libunwind = callPackage ../development/libraries/libunwind { }; - libv4l = callPackage ../development/libraries/libv4l { }; + libv4l = v4l_utils.override { + withQt4 = false; + }; libva = callPackage ../development/libraries/libva { }; @@ -6025,7 +6027,9 @@ let inherit ncurses perl; }; - v4l_utils = callPackage ../os-specific/linux/v4l-utils {}; + v4l_utils = callPackage ../os-specific/linux/v4l-utils { + withQt4 = true; + }; windows = rec { w32api = callPackage ../os-specific/windows/w32api { From 5c393a469bfb7e7999f898776b375f696d2a76a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 22 May 2012 15:29:51 +0000 Subject: [PATCH 058/403] Adding linux 3.4. svn path=/nixpkgs/trunk/; revision=34209 --- pkgs/os-specific/linux/kernel/linux-3.4.nix | 257 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 9 + 2 files changed, 266 insertions(+) create mode 100644 pkgs/os-specific/linux/kernel/linux-3.4.nix diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix new file mode 100644 index 00000000000..18633ec7d34 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -0,0 +1,257 @@ +args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "" +, perl, mktemp, module_init_tools +, ... }: + +let + configWithPlatform = kernelPlatform : + '' + # powermanagement and debugging for powertop + DEBUG_KERNEL y + PM_ADVANCED_DEBUG y + PM_RUNTIME y + TIMER_STATS y + USB_SUSPEND y + BACKTRACE_SELF_TEST n + CPU_NOTIFIER_ERROR_INJECT? n + DEBUG_DEVRES n + DEBUG_NX_TEST n + DEBUG_STACK_USAGE n + DEBUG_STACKOVERFLOW n + RCU_TORTURE_TEST n + SCHEDSTATS n + + # Support drivers that need external firmware. + STANDALONE n + + # Make /proc/config.gz available. + IKCONFIG_PROC y + + # Optimize with -O2, not -Os. + CC_OPTIMIZE_FOR_SIZE n + + # Enable the kernel's built-in memory tester. + MEMTEST y + + # Include the CFQ I/O scheduler in the kernel, rather than as a + # module, so that the initrd gets a good I/O scheduler. + IOSCHED_CFQ y + BLK_CGROUP y # required by CFQ + + # Enable NUMA. + NUMA? y + + # Disable some expensive (?) features. + FTRACE n + KPROBES n + PM_TRACE_RTC n + + # Enable various subsystems. + ACCESSIBILITY y # Accessibility support + AUXDISPLAY y # Auxiliary Display support + DONGLE y # Serial dongle support + HIPPI? y + MTD_COMPLEX_MAPPINGS y # needed for many devices + SCSI_LOWLEVEL y # enable lots of SCSI devices + SCSI_LOWLEVEL_PCMCIA y + SPI y # needed for many devices + SPI_MASTER y + WAN y + + # Networking options. + IP_PNP n + IPV6_PRIVACY y + NETFILTER_ADVANCED y + IP_VS_PROTO_TCP y + IP_VS_PROTO_UDP y + IP_VS_PROTO_ESP y + IP_VS_PROTO_AH y + IP_DCCP_CCID3 n # experimental + CLS_U32_PERF y + CLS_U32_MARK y + + # Wireless networking. + IPW2100_MONITOR y # support promiscuous mode + IPW2200_MONITOR y # support promiscuous mode + HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver + HOSTAP_FIRMWARE_NVRAM y + ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus + ATH9K_AHB y # Ditto, AHB bus + + # Some settings to make sure that fbcondecor works - in particular, + # disable tileblitting and the drivers that need it. + + # Enable various FB devices. + FB y + FB_EFI y + FB_NVIDIA_I2C y # Enable DDC Support + FB_RIVA_I2C y + FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support + FB_ATY_GX y # Mach64 GX support + FB_SAVAGE_I2C y + FB_SAVAGE_ACCEL y + FB_SIS_300 y + FB_SIS_315 y + FB_3DFX_ACCEL y + FB_GEODE y + + # Video configuration + # Enable KMS for devices whose X.org driver supports it. + DRM_I915_KMS y + DRM_RADEON_KMS y + # Hybrid graphics support + VGA_SWITCHEROO y + + # Sound. + SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode + SND_HDA_INPUT_BEEP y # Support digital beep via input layer + SND_USB_CAIAQ_INPUT y + PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) + + # USB serial devices. + USB_SERIAL_GENERIC y # USB Generic Serial Driver + USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices + USB_SERIAL_KEYSPAN_USA28 y + USB_SERIAL_KEYSPAN_USA28X y + USB_SERIAL_KEYSPAN_USA28XA y + USB_SERIAL_KEYSPAN_USA28XB y + USB_SERIAL_KEYSPAN_USA19 y + USB_SERIAL_KEYSPAN_USA18X y + USB_SERIAL_KEYSPAN_USA19W y + USB_SERIAL_KEYSPAN_USA19QW y + USB_SERIAL_KEYSPAN_USA19QI y + USB_SERIAL_KEYSPAN_USA49W y + USB_SERIAL_KEYSPAN_USA49WLC y + + # Filesystem options - in particular, enable extended attributes and + # ACLs for all filesystems that support them. + EXT2_FS_XATTR y # Ext2 extended attributes + EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists + EXT2_FS_SECURITY y # Ext2 Security Labels + EXT2_FS_XIP y # Ext2 execute in place support + EXT4_FS_POSIX_ACL y + EXT4_FS_SECURITY y + REISERFS_FS_XATTR y + REISERFS_FS_POSIX_ACL y + REISERFS_FS_SECURITY y + JFS_POSIX_ACL y + JFS_SECURITY y + XFS_QUOTA y + XFS_POSIX_ACL y + XFS_RT y # XFS Realtime subvolume support + OCFS2_DEBUG_MASKLOG n + BTRFS_FS_POSIX_ACL y + UBIFS_FS_XATTR y + UBIFS_FS_ADVANCED_COMPR y + NFSD_V2_ACL y + NFSD_V3 y + NFSD_V3_ACL y + NFSD_V4 y + CIFS_XATTR y + CIFS_POSIX y + + # Security related features. + STRICT_DEVMEM y # Filter access to /dev/mem + SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default + + # Misc. options. + 8139TOO_8129 y + 8139TOO_PIO n # PIO is slower + AIC79XX_DEBUG_ENABLE n + AIC7XXX_DEBUG_ENABLE n + AIC94XX_DEBUG n + B43_PCMCIA y + BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support + BLK_DEV_IDEACPI y # IDE ACPI support + BLK_DEV_INTEGRITY y + BSD_PROCESS_ACCT_V3 y + BT_HCIUART_BCSP y + BT_HCIUART_H4 y # UART (H4) protocol support + BT_HCIUART_LL y + BT_RFCOMM m + BT_RFCOMM_TTY y # RFCOMM TTY support + CRASH_DUMP n + DMAR? n # experimental + DVB_DYNAMIC_MINORS y # we use udev + EFI_STUB y # EFI bootloader in the bzImage itself + FUSION y # Fusion MPT device support + IDE_GD_ATAPI y # ATAPI floppy support + IRDA_ULTRA y # Ultra (connectionless) protocol + JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels + JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels + JOYSTICK_XPAD_FF y # X-Box gamepad rumble support + JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED + LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support + LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger + LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback + LOGO n # not needed + MEDIA_ATTACH y + MEGARAID_NEWGEN y + MICROCODE_AMD y + MODVERSIONS y + MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension + MTRR_SANITIZER y + NET_FC y # Fibre Channel driver support + PPP_MULTILINK y # PPP multilink support + REGULATOR y # Voltage and Current Regulator Support + SCSI_LOGGING y # SCSI logging facility + SERIAL_8250 y # 8250/16550 and compatible serial support + SLIP_COMPRESSED y # CSLIP compressed headers + SLIP_SMART y + THERMAL_HWMON y # Hardware monitoring support + USB_DEBUG n + USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators + X86_CHECK_BIOS_CORRUPTION y + X86_MCE y + + # Linux Containers + RT_GROUP_SCHED? y + CGROUP_DEVICE? y + CGROUP_MEM_RES_CTLR? y + CGROUP_MEM_RES_CTLR_SWAP? y + DEVPTS_MULTIPLE_INSTANCES? y + + # Enable staging drivers. These are somewhat experimental, but + # they generally don't hurt. + STAGING y + + # PROC_EVENTS requires that the netlink connector is not built + # as a module. This is required by libcgroup's cgrulesengd. + CONNECTOR y + PROC_EVENTS y + + # Tracing + FTRACE y + FUNCTION_TRACER y + FTRACE_SYSCALLS y + SCHED_TRACER y + + ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} + ${extraConfig} + ''; +in + +import ./generic.nix ( + + rec { + version = "3.4"; + modDirVersion = "3.4.0"; + testing = false; + + preConfigure = '' + substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" + ''; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; + sha256 = "ff3dee6a855873d12487a6f4070ec2f7996d073019171361c955639664baa0c6"; + }; + + config = configWithPlatform stdenv.platform; + configCross = configWithPlatform stdenv.cross.platform; + + features.iwlwifi = true; + features.efiBootStub = true; + } + + // removeAttrs args ["extraConfig"] +) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 52c63885f7c..25eeacd14a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5650,6 +5650,14 @@ let ]; }; + linux_3_4 = makeOverridable (import ../os-specific/linux/kernel/linux-3.4.nix) { + inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; + kernelPatches = + [ #kernelPatches.fbcondecor_2_6_38 + kernelPatches.sec_perm_2_6_24 + ]; + }; + /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a specific kernel, we have a function that builds those packages @@ -5776,6 +5784,7 @@ let linuxPackages_nanonote_jz_2_6_36 = linuxPackagesFor linux_nanonote_jz_2_6_36 pkgs.linuxPackages_nanonote_jz_2_6_36; linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 pkgs.linuxPackages_3_2); linuxPackages_3_3 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_3 pkgs.linuxPackages_3_3); + linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 pkgs.linuxPackages_3_4); # The current default kernel / kernel modules. linux = linuxPackages.kernel; From 8805bf1ba5fd78c031d9948c0ac2bb30aaaa1afb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 22 May 2012 17:32:23 +0000 Subject: [PATCH 059/403] 'perf' wants flex and bison, since linux 3.4. svn path=/nixpkgs/trunk/; revision=34210 --- pkgs/os-specific/linux/kernel/perf.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index ba32362b6e8..dc49f10c177 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -1,5 +1,5 @@ { stdenv, kernel, elfutils, python, perl, newt, slang, asciidoc, xmlto -, docbook_xsl, docbook_xml_dtd_45, libxslt }: +, docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison }: stdenv.mkDerivation { name = "perf-linux-${kernel.version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { ''; # perf refers both to newt and slang - buildNativeInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt ]; + buildNativeInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt flex bison ]; buildInputs = [ elfutils python perl newt slang ]; installFlags = "install install-man ASCIIDOC8=1"; From a1d64b8082ff494ba5dd6d887257078e9abc671b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 22 May 2012 18:12:46 +0000 Subject: [PATCH 060/403] Updating the nvidia 295 driver, so it builds with linux 3.4. svn path=/nixpkgs/trunk/; revision=34211 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 4f06b3975ab..99e5ebe7be7 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -8,7 +8,7 @@ with stdenv.lib; -let versionNumber = "295.40"; in +let versionNumber = "295.53"; in stdenv.mkDerivation { name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; @@ -19,12 +19,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "0anffkx1p1yhcflmz6jv9b57xb9mnvqadnjhgwr50fl4vms6bm6c"; + sha256 = "185hy1d4yixc9drz4r3wgya30zbqcyh2949wfjaqcvxc2ri0jh00"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "0rs9nfkw8f9z52ippadap8r50zrrgldv9d9hdkm8g08cyif5g95w"; + sha256 = "06fdx3iwqcscwkl14rdb5n1wzscm0gvdxfywr5bzf7y591w4yl7y"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; From d628fd3d345bc21e18e6b0af95e68f53f0e57289 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 22 May 2012 19:46:33 +0000 Subject: [PATCH 061/403] ikiwiki: updated to version 3.20120516 svn path=/nixpkgs/trunk/; revision=34212 --- pkgs/applications/misc/ikiwiki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 51e765bb690..83665aab5f5 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -12,14 +12,14 @@ assert monotoneSupport -> (monotone != null); let name = "ikiwiki"; - version = "3.20120419"; + version = "3.20120516"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz"; - sha256 = "0d4fd709f4b3d33336d2dfa27f08e1473019d87869d9c1ffcb77f3ca9c434eaf"; + sha256 = "b75097d4f4db79a16f8b74bc4e7f824a586e0e150ecf18103888bbe553a41eb0"; }; buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate From ac64ba04bdbac4f0656a3ee008f3da7e68e20207 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 22 May 2012 19:46:37 +0000 Subject: [PATCH 062/403] git-annex: updated to version 3.20120522 svn path=/nixpkgs/trunk/; revision=34213 --- .../version-management/git-and-tools/git-annex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 82d333d1783..4b1a1b64686 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 @@ -5,14 +5,14 @@ }: let - version = "3.20120430"; + version = "3.20120522"; in stdenv.mkDerivation { name = "git-annex-${version}"; src = fetchurl { url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=refs/tags/${version}"; - sha256 = "74540ef25461b91acc2e1733ade169e54492fa96370f6ec22554524078e0c7dd"; + sha256 = "4ee3fd31ea96089eade9ea209a4844f87f6de94bafca74870dd71555bb516f37"; name = "git-annex-${version}.tar.gz"; }; From 801c82da559304a0c8028d59bec30d504310bcae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 22 May 2012 21:18:20 +0000 Subject: [PATCH 063/403] GNU Guile 2.0: Provide a 2.0ish setup hook. svn path=/nixpkgs/trunk/; revision=34215 --- pkgs/development/interpreters/guile/default.nix | 2 +- .../interpreters/guile/setup-hook-2.0.sh | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/interpreters/guile/setup-hook-2.0.sh diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 127e49087d3..ea895fb1186 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -46,7 +46,7 @@ doCheck = true; - setupHook = ./setup-hook.sh; + setupHook = ./setup-hook-2.0.sh; crossAttrs.preConfigure = stdenv.lib.optionalString (stdenv.cross.config == "i586-pc-gnu") diff --git a/pkgs/development/interpreters/guile/setup-hook-2.0.sh b/pkgs/development/interpreters/guile/setup-hook-2.0.sh new file mode 100644 index 00000000000..6994c4cd8dc --- /dev/null +++ b/pkgs/development/interpreters/guile/setup-hook-2.0.sh @@ -0,0 +1,13 @@ +addGuileLibPath () { + if test -d "$1/share/guile/site/2.0" + then + export GUILE_LOAD_PATH="${GUILE_LOAD_PATH}${GUILE_LOAD_PATH:+:}$1/share/guile/site/2.0" + export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site/2.0" + elif test -d "$1/share/guile/site" + then + export GUILE_LOAD_PATH="${GUILE_LOAD_PATH}${GUILE_LOAD_PATH:+:}$1/share/guile/site" + export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site" + fi +} + +envHooks=(${envHooks[@]} addGuileLibPath) From b4cecdea105f8199312435a11b2477f2221af66d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 22 May 2012 21:18:25 +0000 Subject: [PATCH 064/403] Ploticus 2.41. svn path=/nixpkgs/trunk/; revision=34216 --- pkgs/tools/graphics/ploticus/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/graphics/ploticus/default.nix b/pkgs/tools/graphics/ploticus/default.nix index f173f2f1e14..857a86d57af 100644 --- a/pkgs/tools/graphics/ploticus/default.nix +++ b/pkgs/tools/graphics/ploticus/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, zlib, libX11, libpng}: stdenv.mkDerivation { - name = "ploticus-2.40"; + name = "ploticus-2.41"; builder = ./builder.sh; src = fetchurl { - url = mirror://sourceforge/ploticus/pl240src.tar.gz; - sha256 = "1gwppsmfxajrpidjrplkhvq2yy35r9hmigpwjmjqv4r7dj7cnrw8"; + url = mirror://sourceforge/ploticus/ploticus/2.41/pl241src.tar.gz; + sha256 = "ecccb6afcf0008d5b31da2e9e74c448564101eb7b9bbde758a3dca1f2dc8c580"; }; buildInputs = [zlib libX11 libpng]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 25eeacd14a0..3e0b1aa3904 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1246,7 +1246,9 @@ let plan9port = callPackage ../tools/system/plan9port { }; - ploticus = callPackage ../tools/graphics/ploticus { }; + ploticus = callPackage ../tools/graphics/ploticus { + libpng = libpng12; + }; plotutils = callPackage ../tools/graphics/plotutils { }; From 0524b60614d49c96297afe54fc7acfc0e443b836 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 24 May 2012 15:03:54 +0000 Subject: [PATCH 065/403] PCRE: Disable tests on Cygwin. svn path=/nixpkgs/trunk/; revision=34219 --- pkgs/development/libraries/pcre/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 7802f89807d..edfe26740de 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ${if !cplusplusSupport then "--disable-cpp" else ""} '' + stdenv.lib.optionalString stdenv.isDarwin "CXXFLAGS=-O0"; - doCheck = true; + doCheck = !stdenv.isCygwin; # XXX: test failure on Cygwin meta = { homepage = "http://www.pcre.org/"; From ed2564f750a085cf1328645655dcab1c300bd37f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 24 May 2012 15:07:38 +0000 Subject: [PATCH 066/403] * Set the version number of generated Debian packages. Note that dpkg apparently doesn't allows underscores in version strings, so we replace them by dashes. This is the exact opposite of RPM, which doesn't allow dashes. svn path=/nixpkgs/trunk/; revision=34220 --- pkgs/build-support/release/debian-build.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix index 8d2ea849a09..0095a2ff881 100644 --- a/pkgs/build-support/release/debian-build.nix +++ b/pkgs/build-support/release/debian-build.nix @@ -65,6 +65,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation ( --fstrans=${if fsTranslation then "yes" else "no"} \ --requires="${concatStringsSep "," debRequires}" \ --provides="${concatStringsSep "," debProvides}" \ + ${optionalString (src ? version) "--pkgversion=$(echo ${src.version} | tr _ -)"} \ make install mkdir -p $out/debs From 70074d2b986db4efae9f88072c7b033c39b9d994 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 24 May 2012 17:25:03 +0000 Subject: [PATCH 067/403] Updating uclibc. This fixes some cross builds. svn path=/nixpkgs/trunk/; revision=34223 --- pkgs/os-specific/linux/uclibc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix index ce95dbaba92..e833948f5bf 100644 --- a/pkgs/os-specific/linux/uclibc/default.nix +++ b/pkgs/os-specific/linux/uclibc/default.nix @@ -49,12 +49,12 @@ let in stdenv.mkDerivation { - name = "uclibc-0.9.31" + stdenv.lib.optionalString (cross != null) + name = "uclibc-0.9.33.2" + stdenv.lib.optionalString (cross != null) ("-" + cross.config); src = fetchurl { - url = http://www.uclibc.org/downloads/uClibc-0.9.31.tar.bz2; - sha256 = "1yk328fnz0abgh2vm2r68y65ckfkx97rdp8hbg4xvmx5s94kblw0"; + url = http://www.uclibc.org/downloads/uClibc-0.9.33.2.tar.bz2; + sha256 = "0qhngsbzj2s6nz92b1s2p0dmvwk8xiqpy58j7ljzw186grvjr3cq"; }; # 'ftw' needed to build acl, a coreutils dependency From b71ca8c1386f25abe25c5a302aae892a9b3f5bfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 24 May 2012 18:59:13 +0000 Subject: [PATCH 068/403] Updating the kernels to be cross-built by hydra. The list was quite outdated related to nixpkgs. svn path=/nixpkgs/trunk/; revision=34224 --- pkgs/top-level/release-cross.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index e6a4798f27b..3c34ec4b0f6 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -17,10 +17,9 @@ let #xorgserver.hostDrv = nativePlatforms; }; nixUnstable.hostDrv = nativePlatforms; - linuxPackages_2_6_32.kernel.hostDrv = linux; - linuxPackages_2_6_33.kernel.hostDrv = linux; - linuxPackages_2_6_34.kernel.hostDrv = linux; - linuxPackages_2_6_35.kernel.hostDrv = linux; + linuxPackages_2_6_39.kernel.hostDrv = linux; + linuxPackages_3_3.kernel.hostDrv = linux; + linuxPackages_3_4.kernel.hostDrv = linux; }; /* Basic list of packages to be natively built, From d9fdfffef9d6538cf2642777ad9027af5aeee8d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 24 May 2012 19:02:27 +0000 Subject: [PATCH 069/403] Fixing the mingw cross gcc. I set it not to build shared libraries, because its specs for shared libraries are wrong. It should run "-lstdc++ -lsupc++" if libstdc++-6.dll is available, and instead it runs "-lstdc++" and therefore lack symbols. I think simply few people use shared gcc libs on mingw. svn path=/nixpkgs/trunk/; revision=34225 --- pkgs/development/compilers/gcc/4.6/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index 3955455df4c..b47a9457077 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -130,7 +130,11 @@ let version = "4.6.3"; " --enable-version-specific-runtime-libs" + " --disable-libssp" + " --disable-nls" + - " --with-dwarf2" + " --with-dwarf2" + + # I think noone uses shared gcc libs in mingw, so we better do the same. + # In any case, g++ linking is broken by default with shared libs, + # unless adding "-lsupc++" to any linking command. I don't know why. + " --disable-shared" else " --enable-threads=posix" + " --enable-nls" + @@ -426,7 +430,8 @@ stdenv.mkDerivation ({ installTargets = "install-gcc install-target-libgcc"; } -// optionalAttrs (!stripped) { dontStrip = true; NIX_STRIP_DEBUG = 0; } +# Strip kills static libs of other archs (hence cross != null) +// optionalAttrs (!stripped || cross != null) { dontStrip = true; NIX_STRIP_DEBUG = 0; } // optionalAttrs langVhdl rec { name = "ghdl-0.29"; From d5a5a30ae0146878ae3de15f7f65c99b79093553 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 24 May 2012 19:12:36 +0000 Subject: [PATCH 070/403] Adding UCLIBC_SUSV4_LEGACY, otherwise we get this building gcc: armv5tel-unknown-linux-gnueabi/libstdc++-v3/include/cstdio:133:11: error: '::tmpnam' has not been declared http://hydra.nixos.org/build/2644907 svn path=/nixpkgs/trunk/; revision=34226 --- pkgs/os-specific/linux/uclibc/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix index e833948f5bf..6ac89c4da9f 100644 --- a/pkgs/os-specific/linux/uclibc/default.nix +++ b/pkgs/os-specific/linux/uclibc/default.nix @@ -36,6 +36,7 @@ let archMakeFlag = if (cross != null) then "ARCH=${cross.arch}" else ""; crossMakeFlag = if (cross != null) then "CROSS=${cross.config}-" else ""; + # UCLIBC_SUSV4_LEGACY defines 'tmpnam', needed for gcc libstdc++ builds. nixConfig = '' RUNTIME_PREFIX "/" DEVEL_PREFIX "/" @@ -44,6 +45,7 @@ let UCLIBC_HAS_RPC y DO_C99_MATH y UCLIBC_HAS_PROGRAM_INVOCATION_NAME y + UCLIBC_SUSV4_LEGACY y KERNEL_HEADERS "${linuxHeaders}/include" ''; From 37fce10f9b26b826d5030906406639bcd9e77e45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 24 May 2012 19:16:00 +0000 Subject: [PATCH 071/403] Adding native threads support unconditionally to uclibc, or gcc fails to build (lack of pthread.h). Let's see if this breaks anything; I'm changing this to make comtrend.nix work (kernel 2.4). svn path=/nixpkgs/trunk/; revision=34227 --- pkgs/os-specific/linux/uclibc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix index 6ac89c4da9f..d97b4f8a1d7 100644 --- a/pkgs/os-specific/linux/uclibc/default.nix +++ b/pkgs/os-specific/linux/uclibc/default.nix @@ -46,6 +46,7 @@ let DO_C99_MATH y UCLIBC_HAS_PROGRAM_INVOCATION_NAME y UCLIBC_SUSV4_LEGACY y + UCLIBC_HAS_THREADS_NATIVE y KERNEL_HEADERS "${linuxHeaders}/include" ''; From 3729f9ce5ea25fbbe33f63277ebafca1c62f4683 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 24 May 2012 21:23:23 +0000 Subject: [PATCH 072/403] Trying to add a few bits of mingw-w64. To be tested. svn path=/nixpkgs/trunk/; revision=34228 --- .../os-specific/windows/mingw-w64/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 13 ++++++- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/windows/mingw-w64/default.nix diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix new file mode 100644 index 00000000000..570b40bdac6 --- /dev/null +++ b/pkgs/os-specific/windows/mingw-w64/default.nix @@ -0,0 +1,35 @@ +{stdenv, fetchurl, binutilsCross ? null, gccCross ? null, onlyHeaders ? false}: + +let + name = "mingw-w64-2.0.3"; +in +stdenv.mkDerivation (rec { + inherit name; + + src = fetchurl { + url = "mirror://sourceforge/mingw-w64/mingw-w64-v2.0.3.tar.gz"; + sha256 = "043jk6z90f9pxs9kfn6ckh2vlnbgcv6yfbp5ybahrj3z58dcijp5"; + }; + +} // +(if onlyHeaders then { + name = name + "-headers"; + preConfingure = '' + cd mingw-w64-headers + ''; + configureFlags = "--without-crt --host=x86_64-w64-mingw32"; + + # I don't know what's that $host directory about, I put the + # files inside include as usual. + postInstall = '' + mv $out/x86_64-w64-mingw32/include/* $out/include + rm -R $out/x86_64-w64-mingw32 + ''; +} else { + buildInputs = [ gccCross binutilsCross ]; + + crossConfig = gccCross.crossConfig; + + dontStrip = true; +}) +) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e0b1aa3904..c7a0fae055d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1852,7 +1852,9 @@ let gccCrossStageStatic = let isMingw = (stdenv.cross.libc == "msvcrt"); - libcCross1 = if isMingw then windows.mingw_headers1 else null; + isMingw64 = (stdenv.cross.libc == "msvcrt64"); + libcCross1 = if isMingw then windows.mingw_headers1 else + if isMingw64 then windows.mingw_w64_headers else null; in wrapGCCCross { gcc = forceBuildDrv (lib.addMetaAttrs { platforms = []; } ( @@ -6076,6 +6078,15 @@ let paths = [ w32api mingw_runtime ]; }; + mingw_w64 = callPackage ../os-specific/windows/mingw-w64 { + gccCross = gccCrossStageStatic; + binutilsCross = binutilsCross; + }; + + mingw_w64_headers = callPackage ../os-specific/windows/mingw-w64 { + onlyHeaders = true; + }; + pthreads = callPackage ../os-specific/windows/pthread-w32 { mingw_headers = mingw_headers2; }; From 1402a2ebc311e4d99ec6bc42eb4c53aeb4bae4d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 24 May 2012 21:44:34 +0000 Subject: [PATCH 073/403] Fixing the paths of uclibc libpthread svn path=/nixpkgs/trunk/; revision=34229 --- pkgs/os-specific/linux/uclibc/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix index d97b4f8a1d7..1ad392ad6fa 100644 --- a/pkgs/os-specific/linux/uclibc/default.nix +++ b/pkgs/os-specific/linux/uclibc/default.nix @@ -84,7 +84,8 @@ stdenv.mkDerivation { mkdir -p $out make PREFIX=$out VERBOSE=1 install ${crossMakeFlag} (cd $out/include && ln -s $(ls -d ${linuxHeaders}/include/* | grep -v "scsi$") .) - sed -i s@/lib/@$out/lib/@g $out/lib/libc.so + # libpthread.so may not exist, so I do || true + sed -i s@/lib/@$out/lib/@g $out/lib/libc.so $out/lib/libpthread.so || true ''; passthru = { From 5aa41fb2ef9f6d49df859b746164a1363797bc04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 24 May 2012 21:45:18 +0000 Subject: [PATCH 074/403] Adding a check for linux 2.6 related cross build parameters in glibc. svn path=/nixpkgs/trunk/; revision=34230 --- pkgs/development/libraries/glibc/2.13/common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/glibc/2.13/common.nix b/pkgs/development/libraries/glibc/2.13/common.nix index 536f23fe3bb..d0179b68ebc 100644 --- a/pkgs/development/libraries/glibc/2.13/common.nix +++ b/pkgs/development/libraries/glibc/2.13/common.nix @@ -112,6 +112,7 @@ stdenv.mkDerivation ({ ] ++ stdenv.lib.optionals (cross != null) [ (if cross.withTLS then "--with-tls" else "--without-tls") (if cross.float == "soft" then "--without-fp" else "--with-fp") + ] ++ stdenv.lib.optionals (cross != null && cross.platform.kernelMajor == "2.6") [ "--enable-kernel=2.6.0" "--with-__thread" ] ++ stdenv.lib.optionals stdenv.isArm [ From e9186a03b9eba84b830de16d341f3caedcac8ba7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 24 May 2012 21:45:49 +0000 Subject: [PATCH 075/403] Making gcc not build libgomp with uclibc, as it lacks '-ldl' in its checks and I don't know how to add it. This makes gcc build with uclibc. svn path=/nixpkgs/trunk/; revision=34231 --- pkgs/development/compilers/gcc/4.6/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index b47a9457077..ae626e21804 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -135,7 +135,10 @@ let version = "4.6.3"; # In any case, g++ linking is broken by default with shared libs, # unless adding "-lsupc++" to any linking command. I don't know why. " --disable-shared" - else + else (if cross.libc == "uclibc" then + # In uclibc cases, libgomp needs an additional '-ldl' + # and as I don't know how to pass it, I disable libgomp. + " --disable-libgomp" else "") + " --enable-threads=posix" + " --enable-nls" + " --disable-decimal-float") # No final libdecnumber (it may work only in 386) From 383b76df790a3722b005934f9799d3edc9fecb8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 24 May 2012 22:07:23 +0000 Subject: [PATCH 076/403] Fixing mingw-w64 builds. I can build simple C++ programs with gccCrossStageFinal. I also add tests for hydra; let's see if it builds far. svn path=/nixpkgs/trunk/; revision=34232 --- .../os-specific/windows/mingw-w64/default.nix | 14 +++++------ pkgs/top-level/all-packages.nix | 8 ++++--- pkgs/top-level/release-cross.nix | 23 +++++++++++++++++++ 3 files changed, 35 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix index 570b40bdac6..c358565c455 100644 --- a/pkgs/os-specific/windows/mingw-w64/default.nix +++ b/pkgs/os-specific/windows/mingw-w64/default.nix @@ -11,6 +11,13 @@ stdenv.mkDerivation (rec { sha256 = "043jk6z90f9pxs9kfn6ckh2vlnbgcv6yfbp5ybahrj3z58dcijp5"; }; + # I don't know what's that $host directory about, I put the + # files inside include as usual. + postInstall = '' + rmdir $out/include + mv $out/x86_64-w64-mingw32/* $out + rm -R $out/x86_64-w64-mingw32 + ''; } // (if onlyHeaders then { name = name + "-headers"; @@ -18,13 +25,6 @@ stdenv.mkDerivation (rec { cd mingw-w64-headers ''; configureFlags = "--without-crt --host=x86_64-w64-mingw32"; - - # I don't know what's that $host directory about, I put the - # files inside include as usual. - postInstall = '' - mv $out/x86_64-w64-mingw32/include/* $out/include - rm -R $out/x86_64-w64-mingw32 - ''; } else { buildInputs = [ gccCross binutilsCross ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c7a0fae055d..3e6658ef134 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1852,9 +1852,9 @@ let gccCrossStageStatic = let isMingw = (stdenv.cross.libc == "msvcrt"); - isMingw64 = (stdenv.cross.libc == "msvcrt64"); - libcCross1 = if isMingw then windows.mingw_headers1 else - if isMingw64 then windows.mingw_w64_headers else null; + isMingw64 = isMingw && stdenv.cross.config == "x86_64-w64-mingw32"; + libcCross1 = if isMingw64 then windows.mingw_w64_headers else + if isMingw then windows.mingw_headers1 else null; in wrapGCCCross { gcc = forceBuildDrv (lib.addMetaAttrs { platforms = []; } ( @@ -3528,6 +3528,8 @@ let # We can choose: libcCrossChooser = name : if (name == "glibc") then glibcCross else if (name == "uclibc") then uclibcCross + else if (name == "msvcrt" && stdenv.cross.config == "x86_64-w64-mingw32") then + windows.mingw_w64 else if (name == "msvcrt") then windows.mingw_headers3 else throw "Unknown libc"; diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 3c34ec4b0f6..a1af20acc77 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -164,6 +164,29 @@ in { }; }) // ( +/* Test some cross builds on mingw-w64 */ +let + crossSystem = { + # That's the triplet they use in the mingw-w64 docs, + # and it's relevant for nixpkgs conditions. + config = "x86_64-w64-mingw32"; + arch = "x86_64"; # Irrelevant + libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain + platform = {}; + }; +in { + crossMingwW64 = mapTestOnCross crossSystem { + coreutils.hostDrv = nativePlatforms; + boehmgc.hostDrv = nativePlatforms; + gmp.hostDrv = nativePlatforms; + guile_1_8.hostDrv = nativePlatforms; + libffi.hostDrv = nativePlatforms; + libtool.hostDrv = nativePlatforms; + libunistring.hostDrv = nativePlatforms; + windows.wxMSW.hostDrv = nativePlatforms; + }; +}) // ( + /* GNU aka. GNU/Hurd. */ let crossSystem = { From c5b6f8a374fd0100e174919dca9bba3d465f91fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 25 May 2012 07:38:44 +0000 Subject: [PATCH 077/403] GNU Awk: Disable tests on Cygwin. svn path=/nixpkgs/trunk/; revision=34236 --- pkgs/tools/text/gawk/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index 0c7e85cce4f..f760e832ccc 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0sss7rhpvizi2a88h6giv0i7w5h07s2fxkw3s6n1hqvcnhrfgbb0"; }; - doCheck = true; + doCheck = !stdenv.isCygwin; # XXX: `test-dup2' segfaults on Cygwin 6.1 buildInputs = [ libsigsegv ]; From c0be42fd6826a0d75fcfb7d341e3eb07c06c8a37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 25 May 2012 08:15:41 +0000 Subject: [PATCH 078/403] Trying to fix crossGNU builds (attribute `platform.kernelMajor' missing) svn path=/nixpkgs/trunk/; revision=34239 --- pkgs/development/libraries/glibc/2.13/common.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glibc/2.13/common.nix b/pkgs/development/libraries/glibc/2.13/common.nix index d0179b68ebc..4058ed3d302 100644 --- a/pkgs/development/libraries/glibc/2.13/common.nix +++ b/pkgs/development/libraries/glibc/2.13/common.nix @@ -112,7 +112,9 @@ stdenv.mkDerivation ({ ] ++ stdenv.lib.optionals (cross != null) [ (if cross.withTLS then "--with-tls" else "--without-tls") (if cross.float == "soft" then "--without-fp" else "--with-fp") - ] ++ stdenv.lib.optionals (cross != null && cross.platform.kernelMajor == "2.6") [ + ] ++ stdenv.lib.optionals (cross != null + && cross.platform ? kernelMajor + && cross.platform.kernelMajor == "2.6") [ "--enable-kernel=2.6.0" "--with-__thread" ] ++ stdenv.lib.optionals stdenv.isArm [ From e38bf5459263396e61752a2192451c2ffa1dfbab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 25 May 2012 09:11:51 +0000 Subject: [PATCH 079/403] GNU Awk: Fix Cygwin builds. svn path=/nixpkgs/trunk/; revision=34240 --- pkgs/tools/text/gawk/cygwin-identifiers.patch | 75 +++++++++++++++++++ pkgs/tools/text/gawk/default.nix | 8 +- 2 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/text/gawk/cygwin-identifiers.patch diff --git a/pkgs/tools/text/gawk/cygwin-identifiers.patch b/pkgs/tools/text/gawk/cygwin-identifiers.patch new file mode 100644 index 00000000000..baff9b55481 --- /dev/null +++ b/pkgs/tools/text/gawk/cygwin-identifiers.patch @@ -0,0 +1,75 @@ +This patch fixes compilation on Windows, where some of the identifiers +would clash. + +commit 5a0b7f9953f24dc034eca4052214da49fbad8bd0 +Author: Arnold D. Robbins +Date: Fri Jul 29 13:25:57 2011 +0300 + + Fix DJGPP problem with libsigsegv. + +diff --git a/builtin.c b/builtin.c +index 4d87592..941f5ad 100644 +--- a/builtin.c ++++ b/builtin.c +@@ -605,7 +605,7 @@ format_tree( + NODE *arg; + long fw, prec, argnum; + int used_dollar; +- int lj, alt, big, bigbig, small, have_prec, need_format; ++ int lj, alt, big_flag, bigbig_flag, small_flag, have_prec, need_format; + long *cur = NULL; + uintmax_t uval; + int sgn; +@@ -725,7 +725,7 @@ format_tree( + signchar = FALSE; + zero_flag = FALSE; + quote_flag = FALSE; +- lj = alt = big = bigbig = small = FALSE; ++ lj = alt = big_flag = bigbig_flag = small_flag = FALSE; + fill = sp; + cp = cend; + chbuf = lchbuf; +@@ -907,7 +907,7 @@ check_pos: + goto retry; + #endif + case 'l': +- if (big) ++ if (big_flag) + break; + else { + static short warned = FALSE; +@@ -921,10 +921,10 @@ check_pos: + goto out; + } + } +- big = TRUE; ++ big_flag = TRUE; + goto retry; + case 'L': +- if (bigbig) ++ if (bigbig_flag) + break; + else { + static short warned = FALSE; +@@ -938,10 +938,10 @@ check_pos: + goto out; + } + } +- bigbig = TRUE; ++ bigbig_flag = TRUE; + goto retry; + case 'h': +- if (small) ++ if (small_flag) + break; + else { + static short warned = FALSE; +@@ -955,7 +955,7 @@ check_pos: + goto out; + } + } +- small = TRUE; ++ small_flag = TRUE; + goto retry; + case 'c': + need_format = FALSE; diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index f760e832ccc..bb6e4e20d24 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libsigsegv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "gawk-4.0.0"; src = fetchurl { @@ -37,3 +37,9 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.ludo ]; }; } + +// + +stdenv.lib.optionalAttrs stdenv.isCygwin { + patches = [ ./cygwin-identifiers.patch ]; +}) From 44b2d2121210c8fe3bbd9aa2d3242b39d14e1449 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 25 May 2012 13:49:01 +0000 Subject: [PATCH 080/403] Mingw changes to gcc. Removing a gcc flag, --enable-version-specific-runtime-libs, that put gcc libs in a speparate directory instead of /lib; this broke the installation of libgcc_s.a for the case of "--enable-shared" in mingw-w64. And we already have all gccs in directories apart. I also add the option --enable-fully-dynamic-string, which is used in the prebuilt mingw64 toolchain; this way nixpkgs creates ABI-compatible binaries with mingw64 upstream. (told by jon_y on irc ##mingw) svn path=/nixpkgs/trunk/; revision=34242 --- pkgs/development/compilers/gcc/4.6/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index ae626e21804..c94a9285b29 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -127,14 +127,17 @@ let version = "4.6.3"; " --enable-threads=win32" + " --enable-sjlj-exceptions" + " --enable-hash-synchronization" + - " --enable-version-specific-runtime-libs" + " --disable-libssp" + " --disable-nls" + " --with-dwarf2" + # I think noone uses shared gcc libs in mingw, so we better do the same. - # In any case, g++ linking is broken by default with shared libs, + # In any case, mingw32 g++ linking is broken by default with shared libs, # unless adding "-lsupc++" to any linking command. I don't know why. - " --disable-shared" + " --disable-shared" + + (if cross.config == "x86_64-w64-mingw32" then + # To keep ABI compatibility with upstream mingw-w64 + " --enable-fully-dynamic-string" + else "") else (if cross.libc == "uclibc" then # In uclibc cases, libgomp needs an additional '-ldl' # and as I don't know how to pass it, I disable libgomp. From 3ff236c739c9e7973ea9d94f64582997761e0254 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Fri, 25 May 2012 16:19:52 +0000 Subject: [PATCH 081/403] Latest change (or reverse change) for the upcoming Haskell Platform. svn path=/nixpkgs/trunk/; revision=34245 --- .../haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal | 2 +- pkgs/top-level/haskell-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal index e5838c4f9ee..264d636f994 100644 --- a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal +++ b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal @@ -56,7 +56,7 @@ library -- Note: newer versions of cgi need monad-catchio. cgi ==3001.1.7.4, fgl ==5.4.2.4, - GLUT ==2.1.2.2, + GLUT ==2.1.2.1, haskell-src ==1.0.1.5, html ==1.0.1.2, HTTP ==4000.2.3, diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 1acb09f4652..5dd35599468 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -125,7 +125,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); inherit (self) cabal ghc; cgi = self.cgi_3001_1_7_4; # 7.4.1 ok fgl = self.fgl_5_4_2_4; # 7.4.1 ok - GLUT = self.GLUT_2_1_2_2; # 7.4.1 ok + GLUT = self.GLUT_2_1_2_1; # 7.4.1 ok haskellSrc = self.haskellSrc_1_0_1_5; # 7.4.1 ok html = self.html_1_0_1_2; # 7.4.1 ok HUnit = self.HUnit_1_2_4_2; # 7.4.1 ok From 89af9f3f4c95c3dcca5c4f33b830201ab20b75bf Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 25 May 2012 17:01:58 +0000 Subject: [PATCH 082/403] * Add a variant of mapAttrs that allows rewriting the name of each attribute in addition to the value. svn path=/nixpkgs/trunk/; revision=34246 --- pkgs/lib/attrsets.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/lib/attrsets.nix b/pkgs/lib/attrsets.nix index db4b9fb210c..260c61558a4 100644 --- a/pkgs/lib/attrsets.nix +++ b/pkgs/lib/attrsets.nix @@ -126,12 +126,25 @@ rec { Example: mapAttrs (name: value: name + "-" + value) - {x = "foo"; y = "bar";} - => {x = "x-foo"; y = "y-bar";} + { x = "foo"; y = "bar"; } + => { x = "x-foo"; y = "y-bar"; } */ mapAttrs = f: set: listToAttrs (map (attr: nameValuePair attr (f attr (getAttr attr set))) (attrNames set)); - + + + /* Like `mapAttrs', but allows the name of each attribute to be + changed in addition to the value. The applied function should + return both the new name and value as a `nameValuePair'. + + Example: + mapAttrs' (name: value: nameValuePair ("foo_" + name) ("bar-" + value)) + { x = "a"; y = "b"; } + => { foo_x = "bar-a"; foo_y = "bar-b"; } + */ + mapAttrs' = f: set: + listToAttrs (map (attr: f attr (getAttr attr set)) (attrNames set)); + /* Like `mapAttrs', except that it recursively applies itself to attribute sets. Also, the first argument of the argument From 040cf06388b1d5d94c0087c0243fd8fcf2502dce Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 25 May 2012 17:19:07 +0000 Subject: [PATCH 083/403] * Add a type "path". svn path=/nixpkgs/trunk/; revision=34247 --- pkgs/lib/types.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/lib/types.nix b/pkgs/lib/types.nix index c1d7240f693..2c85ee0077a 100644 --- a/pkgs/lib/types.nix +++ b/pkgs/lib/types.nix @@ -64,7 +64,7 @@ rec { string = mkOptionType { name = "string"; - check = lib.traceValIfNot (x: builtins ? isString -> builtins.isString x); + check = lib.traceValIfNot builtins.isString; merge = lib.concatStrings; }; @@ -86,6 +86,12 @@ rec { check = lib.traceValIfNot isDerivation; }; + path = mkOptionType { + name = "path"; + # Hacky: there is no ‘isPath’ primop. + check = lib.traceValIfNot (x: builtins.substring 0 1 (toString x) == "/"); + }; + listOf = types.list; list = elemType: mkOptionType { name = "list of ${elemType.name}s"; From d40123a24708b3e93ca49257434afeb390cec8be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 25 May 2012 17:52:45 +0000 Subject: [PATCH 084/403] Making librsync not stripped by native strip; it breaks the static lib. It's the case of mingw64 by default, it seems. svn path=/nixpkgs/trunk/; revision=34248 --- pkgs/development/libraries/librsync/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix index a70a61042e0..41445b84143 100644 --- a/pkgs/development/libraries/librsync/default.nix +++ b/pkgs/development/libraries/librsync/default.nix @@ -10,6 +10,10 @@ stdenv.mkDerivation { configureFlags = if stdenv.isCygwin then "--enable-static" else "--enable-shared"; + crossAttrs = { + dontStrip = true; + }; + meta = { homepage = http://librsync.sourceforge.net/; license = "LGPLv2+"; From 6934b46182014fc80da7d9d7f985c530fb8b3b7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 25 May 2012 17:53:37 +0000 Subject: [PATCH 085/403] Making a trick on myEnv so I can put the cross gcc and some 'propagatedBuildInputs', to have myEnv with cross-builders and cross-built libs. (I'm trying by now to mingw64 + librsync.hostDrv) svn path=/nixpkgs/trunk/; revision=34249 --- pkgs/misc/my-env/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix index dc729ec557a..990606668fe 100644 --- a/pkgs/misc/my-env/default.nix +++ b/pkgs/misc/my-env/default.nix @@ -56,17 +56,24 @@ and show you a shell with a prefixed prompt. */ -{ mkDerivation, substituteAll, pkgs } : { stdenv ? pkgs.stdenv, name, buildInputs ? [], cTags ? [], extraCmds ? "", shell ? "${pkgs.bashInteractive}/bin/bash"} : +{ mkDerivation, substituteAll, pkgs }: + { stdenv ? pkgs.stdenv, name, buildInputs ? [] + , propagatedBuildInputs ? [], gcc ? stdenv.gcc, cTags ? [], extraCmds ? "" + , shell ? "${pkgs.bashInteractive}/bin/bash"}: + mkDerivation { # The setup.sh script from stdenv will expect the native build inputs in # the buildNativeInputs environment variable. - buildNativeInputs = [ ] ++ buildInputs ; + buildNativeInputs = [ ] ++ buildInputs; + # Trick to bypass the stdenv usual change of propagatedBuildInputs => propagatedNativeBuildInputs + propagatedBuildInputs2 = propagatedBuildInputs; + name = "env-${name}"; phases = [ "buildPhase" "fixupPhase" ]; setupNew = substituteAll { src = ../../stdenv/generic/setup.sh; initialPath= (import ../../stdenv/common-path.nix) { inherit pkgs; }; - gcc = stdenv.gcc; + inherit gcc; }; buildPhase = '' @@ -81,6 +88,7 @@ mkDerivation { -i "$s" cat >> "$out/dev-envs/''${name/env-/}" << EOF buildNativeInputs="$buildNativeInputs" + propagatedBuildInputs="$propagatedBuildInputs2" # the setup-new script wants to write some data to a temp file.. so just let it do that and tidy up afterwards tmp="\$("${pkgs.coreutils}/bin/mktemp" -d)" NIX_BUILD_TOP="\$tmp" From 9b0cf4ca5de84561407dad1f8cb3e05ae739863f Mon Sep 17 00:00:00 2001 From: Cillian de Roiste Date: Sat, 26 May 2012 17:29:31 +0000 Subject: [PATCH 086/403] Updating Ardour 3 to beta 4a svn path=/nixpkgs/trunk/; revision=34250 --- pkgs/applications/audio/ardour/ardour3.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/ardour/ardour3.nix b/pkgs/applications/audio/ardour/ardour3.nix index 590cfa3a962..c34576016ad 100644 --- a/pkgs/applications/audio/ardour/ardour3.nix +++ b/pkgs/applications/audio/ardour/ardour3.nix @@ -6,16 +6,17 @@ , python }: let - rev = "11483"; + # Ardour 3 Beta 4a + rev = "12406"; in stdenv.mkDerivation { name = "ardour3-svn-${rev}"; src = fetchsvn { - url = http://subversion.ardour.org/svn/ardour2/tags/3.0-beta3; + url = http://subversion.ardour.org/svn/ardour2/branches/3.0; inherit rev; - sha256 = "02az11lvfbln475np9jyfkdlrkpp1pszjmk6gl75wq6ws08dd7rd"; + sha256 = "0a68xb3l36m5908y3airxw1b3bymhrjrf1l492mgcvviq6pn7pmk"; }; buildInputs = [ alsaLib aubio boost cairomm curl fftw fftwSinglePrec From a887c8c2c71da037ca7683d2965406c7e49d5ada Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 27 May 2012 11:15:01 +0000 Subject: [PATCH 087/403] Updating task spooler to 0.7.3 svn path=/nixpkgs/trunk/; revision=34251 --- pkgs/tools/system/ts/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix index abc04e96c32..a392ed0bcfd 100644 --- a/pkgs/tools/system/ts/default.nix +++ b/pkgs/tools/system/ts/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { - name = "ts-0.7.2"; + name = "ts-0.7.3"; installPhase=''make install "PREFIX=$out"''; @@ -11,8 +11,8 @@ stdenv.mkDerivation { }; src = fetchurl { - url = http://vicerveza.homeunix.net/~viric/soft/ts/ts-0.7.2.tar.gz; - sha256 = "08f9ipg98d6ygzb4fzdm1z157llzh4akipmq14ycfd7l023vidik"; + url = http://vicerveza.homeunix.net/~viric/soft/ts/ts-0.7.3.tar.gz; + sha256 = "1ajgk6y9y9bng5ssdqxwpzw44pmib30vn5284rgga6vr04ppakdy"; }; meta = { From 46809b6094391bbc7fe5271ffe54b16676169f76 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 27 May 2012 11:28:19 +0000 Subject: [PATCH 088/403] ProxyChains: version bump svn path=/nixpkgs/trunk/; revision=34252 --- pkgs/tools/networking/proxychains/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/proxychains/default.nix b/pkgs/tools/networking/proxychains/default.nix index 6ea12f262b4..71d2d61cc44 100644 --- a/pkgs/tools/networking/proxychains/default.nix +++ b/pkgs/tools/networking/proxychains/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl } : +{ stdenv, fetchgit } : stdenv.mkDerivation { - name = "proxychains-3.1"; - src = fetchurl { - url = mirror://sourceforge/proxychains/proxychains-3.1.tar.gz; - sha256 = "9a27657fe9f6e17de9e402ba5c60f9954e7e79fb270c1ef242770f3c01d8515a"; + name = "proxychains-4.0"; + src = fetchgit { + url = https://github.com/haad/proxychains.git; +# sha256 = "9a27657fe9f6e17de9e402ba5c60f9954e7e79fb270c1ef242770f3c01d8515a"; }; - patchPhase = "sed -e s@libproxychains.so@$out/lib/libproxychains.so@ -i proxychains/proxychains"; +# patchPhase = "sed -e s@libproxychains.so@$out/lib/libproxychains.so@ -i proxychains/proxychains"; meta = { description = "Proxifier for SOCKS proxies."; From 62b353e60541c5100f2c7ff1dbc7a42dd635665b Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 27 May 2012 12:37:59 +0000 Subject: [PATCH 089/403] proxychains: add revision and hash svn path=/nixpkgs/trunk/; revision=34253 --- pkgs/tools/networking/proxychains/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/proxychains/default.nix b/pkgs/tools/networking/proxychains/default.nix index 71d2d61cc44..e2eeb73fc64 100644 --- a/pkgs/tools/networking/proxychains/default.nix +++ b/pkgs/tools/networking/proxychains/default.nix @@ -1,13 +1,12 @@ { stdenv, fetchgit } : stdenv.mkDerivation { - name = "proxychains-4.0"; + name = "proxychains-4.0.1-head"; src = fetchgit { url = https://github.com/haad/proxychains.git; -# sha256 = "9a27657fe9f6e17de9e402ba5c60f9954e7e79fb270c1ef242770f3c01d8515a"; + rev = "c9b8ce35b24f9d4e80563242b759dff54867163f"; + sha256 = "4ab73e14c5db6d32d88e0710a9f1b7c9c77b59574a7cf0e9f69f34d8ec9fb643"; }; -# patchPhase = "sed -e s@libproxychains.so@$out/lib/libproxychains.so@ -i proxychains/proxychains"; - meta = { description = "Proxifier for SOCKS proxies."; homepage = http://proxychains.sourceforge.net; From 472808c5f91c222925b23a77a2dc5001c50e8086 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 28 May 2012 09:13:30 +0000 Subject: [PATCH 090/403] Adding mesa and libaio to qemu-kvm. As for libaio, I think it runs much better for IO for me. svn path=/nixpkgs/trunk/; revision=34254 --- pkgs/os-specific/linux/qemu-kvm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/qemu-kvm/default.nix b/pkgs/os-specific/linux/qemu-kvm/default.nix index dd12e79bd69..f6709bb439f 100644 --- a/pkgs/os-specific/linux/qemu-kvm/default.nix +++ b/pkgs/os-specific/linux/qemu-kvm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, attr, zlib, SDL, alsaLib, pkgconfig, pciutils, libuuid, vde2 -, libjpeg, libpng, ncurses, python, glib }: +, libjpeg, libpng, ncurses, python, glib, libaio, mesa }: assert stdenv.isLinux; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { buildInputs = [ attr zlib SDL alsaLib pkgconfig pciutils libuuid vde2 libjpeg libpng - ncurses python glib + ncurses python glib libaio mesa ]; postInstall = From c664157e7d64a9c2e5c5009f54f4fa9a71d25637 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 May 2012 10:23:20 +0000 Subject: [PATCH 091/403] Updated Haskell packages. - attoparsec: updated to version 0.10.2.0 - blaze-html: dropped obsolete version 0.4.3.4 - cairo: updated to version 0.12.3.1 - cryptocipher: updated to version 0.3.4 - file-embed: updated to version 0.0.4.4 - glib: updated to version 0.12.3.1 - gtk2hs-buildtools: updated to version 0.12.3.1 - gtksourceview2: updated to version 0.12.3.1 - hakyll: updated to version 3.3.0.0 - happstack-server: updated to version 7.0.2 - hjsmin: updated to version 0.1.2 - http-conduit: updated to version 1.4.1.7 - http-types: updated to version 0.6.11 - language-c-quote: updated to version 0.3.1.2 - parallel: added version 3.2.0.3 - regex-pcre: updated to version 0.94.3 - regex-posix: added version 0.95.2 - shakespeare-js: updated to version 1.0.0.3 - svgcairo: updated to version 0.12.1.1 - text: added version 0.11.2.1 - vty: updated to version 4.7.0.14 - warp: updated to version 1.2.1.1 - yaml: updated to version 0.7.0.2 - yesod-static: updated to version 1.0.0.3 svn path=/nixpkgs/trunk/; revision=34255 --- .../libraries/haskell/attoparsec/default.nix | 4 ++-- .../libraries/haskell/blaze-html/0.4.3.4.nix | 15 --------------- .../blaze-html/{0.5.0.0.nix => default.nix} | 0 .../haskell/cabal-macosx/default.nix | 1 + .../libraries/haskell/cairo/default.nix | 4 ++-- .../haskell/cryptocipher/default.nix | 4 ++-- .../haskell/executable-path/default.nix | 1 + .../libraries/haskell/file-embed/default.nix | 4 ++-- .../libraries/haskell/glib/default.nix | 4 ++-- .../haskell/gtk2hs-buildtools/0.12.3.nix | 18 ------------------ .../{0.12.1.nix => default.nix} | 4 ++-- .../haskell/gtksourceview2/default.nix | 4 ++-- .../libraries/haskell/hakyll/default.nix | 15 ++++++++------- .../haskell/happstack/happstack-server.nix | 4 ++-- .../libraries/haskell/hjsmin/default.nix | 4 ++-- .../haskell/http-conduit/default.nix | 18 +++++++++--------- .../libraries/haskell/http-types/default.nix | 4 ++-- .../haskell/language-c-quote/default.nix | 4 ++-- .../libraries/haskell/parallel/3.2.0.3.nix | 14 ++++++++++++++ .../libraries/haskell/regex-pcre/default.nix | 7 +++++-- .../libraries/haskell/regex-posix/0.95.2.nix | 15 +++++++++++++++ .../haskell/shakespeare-js/default.nix | 4 ++-- .../libraries/haskell/svgcairo/default.nix | 4 ++-- .../libraries/haskell/text/0.11.2.1.nix | 15 +++++++++++++++ .../libraries/haskell/vty/default.nix | 4 ++-- .../libraries/haskell/warp/default.nix | 4 ++-- .../libraries/haskell/yaml/default.nix | 4 ++-- .../haskell/yesod-static/default.nix | 4 ++-- pkgs/top-level/haskell-packages.nix | 19 ++++++++++--------- 29 files changed, 112 insertions(+), 94 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/blaze-html/0.4.3.4.nix rename pkgs/development/libraries/haskell/blaze-html/{0.5.0.0.nix => default.nix} (100%) delete mode 100644 pkgs/development/libraries/haskell/gtk2hs-buildtools/0.12.3.nix rename pkgs/development/libraries/haskell/gtk2hs-buildtools/{0.12.1.nix => default.nix} (85%) create mode 100644 pkgs/development/libraries/haskell/parallel/3.2.0.3.nix create mode 100644 pkgs/development/libraries/haskell/regex-posix/0.95.2.nix create mode 100644 pkgs/development/libraries/haskell/text/0.11.2.1.nix diff --git a/pkgs/development/libraries/haskell/attoparsec/default.nix b/pkgs/development/libraries/haskell/attoparsec/default.nix index bc05f92b561..6f923605b67 100644 --- a/pkgs/development/libraries/haskell/attoparsec/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "attoparsec"; - version = "0.10.1.1"; - sha256 = "07zl85nkimpswlb4rxycisaphhyrlq4la2limxxi7sk21gyh88b0"; + version = "0.10.2.0"; + sha256 = "0hvkx63knhxdc06lkv2avz2dblbvn0hhvckfqyr22ls1qrpgz71c"; buildDepends = [ deepseq text ]; meta = { homepage = "https://github.com/bos/attoparsec"; diff --git a/pkgs/development/libraries/haskell/blaze-html/0.4.3.4.nix b/pkgs/development/libraries/haskell/blaze-html/0.4.3.4.nix deleted file mode 100644 index e3ec5167f36..00000000000 --- a/pkgs/development/libraries/haskell/blaze-html/0.4.3.4.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ cabal, blazeBuilder, text }: - -cabal.mkDerivation (self: { - pname = "blaze-html"; - version = "0.4.3.4"; - sha256 = "1xd8l28rriczd5zxgmjif393kjzqibrp68pfah0kknrjmc3ybn20"; - buildDepends = [ blazeBuilder text ]; - meta = { - homepage = "http://jaspervdj.be/blaze"; - description = "A blazingly fast HTML combinator library for Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/blaze-html/0.5.0.0.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/blaze-html/0.5.0.0.nix rename to pkgs/development/libraries/haskell/blaze-html/default.nix diff --git a/pkgs/development/libraries/haskell/cabal-macosx/default.nix b/pkgs/development/libraries/haskell/cabal-macosx/default.nix index 45ca5b533a7..0f651e1eaae 100644 --- a/pkgs/development/libraries/haskell/cabal-macosx/default.nix +++ b/pkgs/development/libraries/haskell/cabal-macosx/default.nix @@ -12,5 +12,6 @@ cabal.mkDerivation (self: { description = "Cabal support for creating Mac OSX application bundles"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix index 46180b9a827..183e0815f71 100644 --- a/pkgs/development/libraries/haskell/cairo/default.nix +++ b/pkgs/development/libraries/haskell/cairo/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cairo"; - version = "0.12.3"; - sha256 = "0kgy6907vs41ws51dwqv6lwvfnvmgd1mns12cxzsifmli1jglswd"; + version = "0.12.3.1"; + sha256 = "173pql0n51a9z46vzpwd9q67nblhb61qirynjra9vzydiy79bfwi"; buildDepends = [ mtl ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ cairo libc pkgconfig zlib ]; diff --git a/pkgs/development/libraries/haskell/cryptocipher/default.nix b/pkgs/development/libraries/haskell/cryptocipher/default.nix index 767891bf18a..2864b0f7404 100644 --- a/pkgs/development/libraries/haskell/cryptocipher/default.nix +++ b/pkgs/development/libraries/haskell/cryptocipher/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cryptocipher"; - version = "0.3.2"; - sha256 = "0nw7rwlnakdslzg4z6ik9hfylwnrbn103n677w0xr5b81wj19a5j"; + version = "0.3.4"; + sha256 = "12ndzvb9sa37yn118f9ixm3qka36x6whvmxc5wax97rfm7y49p6r"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/executable-path/default.nix b/pkgs/development/libraries/haskell/executable-path/default.nix index 839ea6bc112..5c69969c20d 100644 --- a/pkgs/development/libraries/haskell/executable-path/default.nix +++ b/pkgs/development/libraries/haskell/executable-path/default.nix @@ -10,5 +10,6 @@ cabal.mkDerivation (self: { description = "Finding out the full path of the executable"; license = self.stdenv.lib.licenses.publicDomain; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/file-embed/default.nix b/pkgs/development/libraries/haskell/file-embed/default.nix index dbff3aa803a..1ca06b356ec 100644 --- a/pkgs/development/libraries/haskell/file-embed/default.nix +++ b/pkgs/development/libraries/haskell/file-embed/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "file-embed"; - version = "0.0.4.3"; - sha256 = "0iagibsab18czvam36si88swzf5sijm4phwy4za6gnn4z71nb9s6"; + version = "0.0.4.4"; + sha256 = "1czwa5vpafhvif4gv7bwa7hrxkrbrvvybgyjckd0hdpl6bpd4nhp"; meta = { homepage = "https://github.com/snoyberg/file-embed"; description = "Use Template Haskell to embed file contents directly"; diff --git a/pkgs/development/libraries/haskell/glib/default.nix b/pkgs/development/libraries/haskell/glib/default.nix index 4183ac45f70..86ce395f1ff 100644 --- a/pkgs/development/libraries/haskell/glib/default.nix +++ b/pkgs/development/libraries/haskell/glib/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "glib"; - version = "0.12.3"; - sha256 = "1hv7wnxsjzlr2bchl8ir967iv9qjzlv9lnlyvrilagzafr7nximb"; + version = "0.12.3.1"; + sha256 = "1k5s1d05kv0amvkjr644pqvicvmcgr5fffsz0xyljbj5jk4iv0py"; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; pkgconfigDepends = [ glib ]; diff --git a/pkgs/development/libraries/haskell/gtk2hs-buildtools/0.12.3.nix b/pkgs/development/libraries/haskell/gtk2hs-buildtools/0.12.3.nix deleted file mode 100644 index a9b5efe5877..00000000000 --- a/pkgs/development/libraries/haskell/gtk2hs-buildtools/0.12.3.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, alex, filepath, happy, random }: - -cabal.mkDerivation (self: { - pname = "gtk2hs-buildtools"; - version = "0.12.3"; - sha256 = "1129p2b0hvmin7zpq43ik670v2c63jv704bnmnh3cr0bw06qrrbi"; - isLibrary = false; - isExecutable = true; - buildDepends = [ filepath random ]; - buildTools = [ alex happy ]; - meta = { - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Tools to build the Gtk2Hs suite of User Interface libraries"; - license = self.stdenv.lib.licenses.gpl2; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/gtk2hs-buildtools/0.12.1.nix b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix similarity index 85% rename from pkgs/development/libraries/haskell/gtk2hs-buildtools/0.12.1.nix rename to pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix index 782e3fc9444..aea067af904 100644 --- a/pkgs/development/libraries/haskell/gtk2hs-buildtools/0.12.1.nix +++ b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "gtk2hs-buildtools"; - version = "0.12.1"; - sha256 = "003d48q8q6ji4axa69bh0sp95fic19cgw3hwigsjbl46qgh6n9gl"; + version = "0.12.3.1"; + sha256 = "0a5lay1zy1pi6inaqjvhn8v0by2z5dpy3dssqsxwbq2hkfxizzy6"; isLibrary = false; isExecutable = true; buildDepends = [ filepath random ]; diff --git a/pkgs/development/libraries/haskell/gtksourceview2/default.nix b/pkgs/development/libraries/haskell/gtksourceview2/default.nix index 353ae9e441d..756e1a1df97 100644 --- a/pkgs/development/libraries/haskell/gtksourceview2/default.nix +++ b/pkgs/development/libraries/haskell/gtksourceview2/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "gtksourceview2"; - version = "0.12.3"; - sha256 = "0bhwvhwsg3mf4w94fl6z6qkn67i68hh3zwwhzqa59lia0nc233gd"; + version = "0.12.3.1"; + sha256 = "1c91ja753dzr2c7sv13wn47sjbjg45jv8xx9ybx1q3188xrldqng"; buildDepends = [ glib gtk mtl ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 04375877bca..a3291ac4cec 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -1,15 +1,16 @@ -{ cabal, binary, blazeHtml, citeprocHs, cryptohash, filepath -, hamlet, mtl, pandoc, parsec, regexBase, regexTdfa, snapCore -, snapServer, tagsoup, time +{ cabal, binary, blazeHtml, blazeMarkup, citeprocHs, cryptohash +, filepath, hamlet, mtl, pandoc, parsec, regexBase, regexTdfa +, snapCore, snapServer, tagsoup, text, time }: cabal.mkDerivation (self: { pname = "hakyll"; - version = "3.2.7.2"; - sha256 = "1l37w3q2jhcxjkq3h0nh8hl21vscgvsj6jkkd2hni62kfzfrgqhw"; + version = "3.3.0.0"; + sha256 = "0ljfdmmqigdzg8vaj502vrsz4i6ynaw3vhc9ys24m9xcqdmyha4h"; buildDepends = [ - binary blazeHtml citeprocHs cryptohash filepath hamlet mtl pandoc - parsec regexBase regexTdfa snapCore snapServer tagsoup time + binary blazeHtml blazeMarkup citeprocHs cryptohash filepath hamlet + mtl pandoc parsec regexBase regexTdfa snapCore snapServer tagsoup + text time ]; meta = { homepage = "http://jaspervdj.be/hakyll"; diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index 6ccf6d77a0c..97cfd0173b9 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "happstack-server"; - version = "7.0.1"; - sha256 = "0sjcfxcpv9sssk5fr5np57b10rajcid7x582s5ialf3yc9n1fshj"; + version = "7.0.2"; + sha256 = "0p4vy1h3nkq7riipizljc9wz64y3jfiyq5vzv1r963badk3q0xzb"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/hjsmin/default.nix b/pkgs/development/libraries/haskell/hjsmin/default.nix index a61d798f429..6d749feea3a 100644 --- a/pkgs/development/libraries/haskell/hjsmin/default.nix +++ b/pkgs/development/libraries/haskell/hjsmin/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hjsmin"; - version = "0.1.1"; - sha256 = "0v28z5l5fraf09b65j0fm75b702xp1s4ar8p5g9kigfn1wh8b62k"; + version = "0.1.2"; + sha256 = "04yk383504blg8x10x5j1fd5mzyybqkhz7jfsyimvz2wz2v86qsb"; buildDepends = [ blazeBuilder languageJavascript text ]; meta = { homepage = "http://github.com/alanz/hjsmin"; diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index c431118ed76..ffe5de07db3 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -1,21 +1,21 @@ { cabal, asn1Data, attoparsec, attoparsecConduit, base64Bytestring , blazeBuilder, blazeBuilderConduit, caseInsensitive, certificate -, conduit, cookie, cprngAes, dataDefault, failure, httpTypes -, liftedBase, monadControl, mtl, network, regexCompat, resourcet -, socks, text, time, tls, tlsExtra, transformers, transformersBase -, utf8String, void, zlibConduit +, conduit, cookie, cprngAes, dataDefault, deepseq, failure +, httpTypes, liftedBase, monadControl, mtl, network, regexCompat +, resourcet, socks, text, time, tls, tlsExtra, transformers +, transformersBase, utf8String, void, zlibConduit }: cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.4.1.3"; - sha256 = "15mpha91dfpzy6bz2577jk0866nmyj17rjwnjz3x7zh3x0i06534"; + version = "1.4.1.7"; + sha256 = "0b3iz03y3s30wyj5j0r8s070qwwzjbk4cs7znag5yjxqgph1h22f"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie - cprngAes dataDefault failure httpTypes liftedBase monadControl mtl - network regexCompat resourcet socks text time tls tlsExtra - transformers transformersBase utf8String void zlibConduit + cprngAes dataDefault deepseq failure httpTypes liftedBase + monadControl mtl network regexCompat resourcet socks text time tls + tlsExtra transformers transformersBase utf8String void zlibConduit ]; meta = { homepage = "http://www.yesodweb.com/book/http-conduit"; diff --git a/pkgs/development/libraries/haskell/http-types/default.nix b/pkgs/development/libraries/haskell/http-types/default.nix index 83cb547896f..b3ae70bbb36 100644 --- a/pkgs/development/libraries/haskell/http-types/default.nix +++ b/pkgs/development/libraries/haskell/http-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "http-types"; - version = "0.6.10"; - sha256 = "0py6l6hk14vrpqwrrajvsiasfksqsklk75sij4zx4xws01jwh9xd"; + version = "0.6.11"; + sha256 = "1waxhicqwp0nmvmpmfadpq9gdldbcx9wh6jz717ghi6y9l485vhf"; buildDepends = [ blazeBuilder caseInsensitive text ]; meta = { homepage = "https://github.com/aristidb/http-types"; diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix index 24cfe6cafb3..b4986af4a01 100644 --- a/pkgs/development/libraries/haskell/language-c-quote/default.nix +++ b/pkgs/development/libraries/haskell/language-c-quote/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "language-c-quote"; - version = "0.3.1.0"; - sha256 = "0y3zfc43izvalm1lrbk286nmg4s3vgpj5v2j6j2saz3c7l2ly8z6"; + version = "0.3.1.2"; + sha256 = "0lqr9z2akx90l07k1qbv3y4wwwlcilj08zva4v9scbqydrwpqxip"; buildDepends = [ exceptionMtl exceptionTransformers filepath haskellSrcMeta mainlandPretty mtl srcloc syb symbol diff --git a/pkgs/development/libraries/haskell/parallel/3.2.0.3.nix b/pkgs/development/libraries/haskell/parallel/3.2.0.3.nix new file mode 100644 index 00000000000..e089c8dce8e --- /dev/null +++ b/pkgs/development/libraries/haskell/parallel/3.2.0.3.nix @@ -0,0 +1,14 @@ +{ cabal, deepseq }: + +cabal.mkDerivation (self: { + pname = "parallel"; + version = "3.2.0.3"; + sha256 = "1kbdzdz9s8jq0xysqgvxx1zvzqlxgj1sk476mciwcn327kpl0fhn"; + buildDepends = [ deepseq ]; + meta = { + description = "Parallel programming library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/regex-pcre/default.nix b/pkgs/development/libraries/haskell/regex-pcre/default.nix index 48785e97a2f..39cb888748c 100644 --- a/pkgs/development/libraries/haskell/regex-pcre/default.nix +++ b/pkgs/development/libraries/haskell/regex-pcre/default.nix @@ -2,10 +2,13 @@ cabal.mkDerivation (self: { pname = "regex-pcre"; - version = "0.94.2"; - sha256 = "0p4az8z4jlrcmmyz9bjf7n90hpg6n242vq4255w2dz5v29l822wn"; + version = "0.94.3"; + sha256 = "0ljng60s05ssy8pi4qnpcx5c1wrn6m35d77lq0xyafmj68cg4a2r"; buildDepends = [ regexBase ]; extraLibraries = [ pcre ]; + patchPhase = '' + sed -i -e '/Include-Dirs:/d' -e '/Extra-Lib-Dirs:/d' regex-pcre.cabal + ''; meta = { homepage = "http://sourceforge.net/projects/lazy-regex"; description = "Replaces/Enhances Text.Regex"; diff --git a/pkgs/development/libraries/haskell/regex-posix/0.95.2.nix b/pkgs/development/libraries/haskell/regex-posix/0.95.2.nix new file mode 100644 index 00000000000..6d7fac51658 --- /dev/null +++ b/pkgs/development/libraries/haskell/regex-posix/0.95.2.nix @@ -0,0 +1,15 @@ +{ cabal, regexBase }: + +cabal.mkDerivation (self: { + pname = "regex-posix"; + version = "0.95.2"; + sha256 = "0gkhzhj8nvfn1ija31c7xnl6p0gadwii9ihyp219ck2arlhrj0an"; + buildDepends = [ regexBase ]; + meta = { + homepage = "http://sourceforge.net/projects/lazy-regex"; + description = "Replaces/Enhances Text.Regex"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix index 1b8605bb802..aa759a240c7 100644 --- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-js"; - version = "1.0.0.2"; - sha256 = "1qygxihhfl7wzv3djxmldh82pwk8rhnk54zfvwy1pxhxb8y30wkm"; + version = "1.0.0.3"; + sha256 = "00x5xvjlaivl42q75cvbwbh055kgvk9i8s4y3xcmk4h7lnpfyzd6"; buildDepends = [ shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; diff --git a/pkgs/development/libraries/haskell/svgcairo/default.nix b/pkgs/development/libraries/haskell/svgcairo/default.nix index 6bacea99b59..e7aafd37264 100644 --- a/pkgs/development/libraries/haskell/svgcairo/default.nix +++ b/pkgs/development/libraries/haskell/svgcairo/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "svgcairo"; - version = "0.12.1"; - sha256 = "1nyr849ayk1fyjpxnpam1pychny609d6j2v3is84llh3gsyq99ps"; + version = "0.12.1.1"; + sha256 = "0fl9flsv4brvwryzxv4xpy8x3w0if4psx8nypxm2ix6l9qh3pghb"; buildDepends = [ cairo glib mtl ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc ]; diff --git a/pkgs/development/libraries/haskell/text/0.11.2.1.nix b/pkgs/development/libraries/haskell/text/0.11.2.1.nix new file mode 100644 index 00000000000..b34c1349ff7 --- /dev/null +++ b/pkgs/development/libraries/haskell/text/0.11.2.1.nix @@ -0,0 +1,15 @@ +{ cabal, deepseq }: + +cabal.mkDerivation (self: { + pname = "text"; + version = "0.11.2.1"; + sha256 = "0ajh2xhf8khh5vi4crdjgcs7w27dga7hlwzi8ia5xjs3hzgvbjb9"; + buildDepends = [ deepseq ]; + meta = { + homepage = "https://github.com/bos/text"; + description = "An efficient packed Unicode text type"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/vty/default.nix b/pkgs/development/libraries/haskell/vty/default.nix index 6cd63e8a873..684fbd2eed0 100644 --- a/pkgs/development/libraries/haskell/vty/default.nix +++ b/pkgs/development/libraries/haskell/vty/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "vty"; - version = "4.7.0.12"; - sha256 = "0mmx8rhj6k8c56qhaz7ay2yf9x61h27zxs14mrkw2y4qag6d4bii"; + version = "4.7.0.14"; + sha256 = "0wgn2jbr7lih9znkpa09nvb4qjd0801c0r4mwwrw4pd9n9mkjqn9"; buildDepends = [ deepseq mtl parallel parsec terminfo utf8String vector ]; diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 18633f4cc1b..9b2f80e8e53 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "1.2.1"; - sha256 = "0yjvd9dc0rwczj3041s55lhfn46zhymgibrawl84ssxky68syhx4"; + version = "1.2.1.1"; + sha256 = "1bgdvqa6c2ccxmgdsg5hjvc3mss8zgjj4xzqr5r5jdl338857xzg"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit httpTypes liftedBase network networkConduit simpleSendfile transformers diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index a495ba4df3c..8bc76c1baa7 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "yaml"; - version = "0.7.0"; - sha256 = "10l5isiidmjn818zm05ac65yaidrkq0qcb1bcpwnvi0fgjr308n5"; + version = "0.7.0.2"; + sha256 = "0hhxvw3zzra8vkbm9914nq03wpy5x5mg6sipwajqz0hv3j5hlsf3"; buildDepends = [ aeson attoparsec conduit resourcet text transformers unorderedContainers vector diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index c37287cd241..72a1fed8db9 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-static"; - version = "1.0.0.2"; - sha256 = "12r3i4s1g9wlf5jmbvqw9qzcgw96zdlky6zisdipy40yzpg6m07v"; + version = "1.0.0.3"; + sha256 = "1nl7cf8yw5akldlrkamnkbypwnj7g1pjkx7nkmlc38jbx58izf5d"; buildDepends = [ base64Bytestring cereal conduit cryptoConduit cryptohash fileEmbed httpTypes text transformers unixCompat wai waiAppStatic yesodCore diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 5dd35599468..141768b91a7 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -434,9 +434,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); blazeBuilderEnumerator = callPackage ../development/libraries/haskell/blaze-builder-enumerator {}; - blazeHtml_0_4_3_4 = callPackage ../development/libraries/haskell/blaze-html/0.4.3.4.nix {}; - blazeHtml_0_5_0_0 = callPackage ../development/libraries/haskell/blaze-html/0.5.0.0.nix {}; - blazeHtml = self.blazeHtml_0_4_3_4; + blazeHtml = callPackage ../development/libraries/haskell/blaze-html {}; blazeMarkup = callPackage ../development/libraries/haskell/blaze-markup {}; @@ -725,9 +723,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); libc = pkgs.stdenv.gcc.libc; }; - gtk2hsBuildtools_0_12_1 = callPackage ../development/libraries/haskell/gtk2hs-buildtools/0.12.1.nix {}; - gtk2hsBuildtools_0_12_3 = callPackage ../development/libraries/haskell/gtk2hs-buildtools/0.12.3.nix {}; - gtk2hsBuildtools = self.gtk2hsBuildtools_0_12_1; + gtk2hsBuildtools = callPackage ../development/libraries/haskell/gtk2hs-buildtools {}; gtk2hsC2hs = self.gtk2hsBuildtools; gtksourceview2 = callPackage ../development/libraries/haskell/gtksourceview2 { @@ -1074,7 +1070,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); parallel_2_2_0_1 = callPackage ../development/libraries/haskell/parallel/2.2.0.1.nix {}; parallel_3_1_0_1 = callPackage ../development/libraries/haskell/parallel/3.1.0.1.nix {}; parallel_3_2_0_2 = callPackage ../development/libraries/haskell/parallel/3.2.0.2.nix {}; - parallel = self.parallel_3_2_0_2; + parallel_3_2_0_3 = callPackage ../development/libraries/haskell/parallel/3.2.0.3.nix {}; + parallel = self.parallel_3_2_0_3; parseargs = callPackage ../development/libraries/haskell/parseargs {}; @@ -1189,7 +1186,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); regexPosix_0_95_1 = callPackage ../development/libraries/haskell/regex-posix/0.95.1.nix { regexBase = self.regexBase_0_93_2; }; - regexPosix = self.regexPosix_0_95_1; + regexPosix_0_95_2 = callPackage ../development/libraries/haskell/regex-posix/0.95.2.nix { + regexBase = self.regexBase_0_93_2; + }; + regexPosix = self.regexPosix_0_95_2; regexTDFA = callPackage ../development/libraries/haskell/regex-tdfa {}; regexTdfa = self.regexTDFA; @@ -1358,7 +1358,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); text_0_11_1_5 = callPackage ../development/libraries/haskell/text/0.11.1.5.nix {}; text_0_11_1_13 = callPackage ../development/libraries/haskell/text/0.11.1.13.nix {}; text_0_11_2_0 = callPackage ../development/libraries/haskell/text/0.11.2.0.nix {}; - text = self.text_0_11_2_0; + text_0_11_2_1 = callPackage ../development/libraries/haskell/text/0.11.2.1.nix {}; + text = self.text_0_11_2_1; thespian = callPackage ../development/libraries/haskell/thespian {}; From e6f2845b30c56345b79760857e52eda24fb66160 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 May 2012 10:53:46 +0000 Subject: [PATCH 092/403] haskell-defaults.nix: switch ghc 7.4.1 to latest versions of 'mtl' and 'transformers' svn path=/nixpkgs/trunk/; revision=34256 --- pkgs/development/libraries/haskell/ltk/default.nix | 3 +++ pkgs/top-level/haskell-defaults.nix | 5 +---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/ltk/default.nix b/pkgs/development/libraries/haskell/ltk/default.nix index a45169b4cc1..a945512fa1c 100644 --- a/pkgs/development/libraries/haskell/ltk/default.nix +++ b/pkgs/development/libraries/haskell/ltk/default.nix @@ -5,6 +5,9 @@ cabal.mkDerivation (self: { version = "0.12.0.0"; sha256 = "1hlsfi77yypfnvh1alr3rflbffby9pbmc71m507davr6b09v9w9f"; buildDepends = [ Cabal filepath glib gtk mtl parsec transformers ]; + patchPhase = '' + sed -i -e 's|mtl >=1.1.0.2 && <2.1|mtl|' -e 's|transformers >=0.2.2.0 && <0.3|transformers|' ltk.cabal + ''; meta = { homepage = "http://www.leksah.org"; description = "Leksah tool kit"; diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 226fe64d91d..42f0980c637 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -26,9 +26,6 @@ ghc741Prefs = self : ghc741Prefs_pedantic self // { - # These are necessary at the moment to prevent many packages from breaking. - mtl = self.mtl_2_0_1_0; - transformers = self.transformers_0_2_2_0; }; ghc722Prefs = ghc741Prefs; @@ -266,5 +263,5 @@ ghc704Binary; prefFun = ghcHEADPrefs; }; - + } From 8a4cc0bc120660ef2beaa35309a07151b62b4c58 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 May 2012 10:57:45 +0000 Subject: [PATCH 093/403] nbd: updated to version 3.1.1 svn path=/nixpkgs/trunk/; revision=34257 --- pkgs/tools/networking/nbd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index 987b5d261cd..97ef0080de2 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, glib }: let - name = "nbd-3.0"; + name = "nbd-3.1.1"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/nbd/${name}.tar.bz2"; - sha256 = "f7210edfa858f5ae69bdbf76f5467ac9dcaa97074d945e55e2a683e7aa228b93"; + sha256 = "5cd150b874f966aacf4a9dfe1e9de9b2139b295241ce89bae9f70f9aa844220b"; }; buildInputs = [ pkgconfig glib ] ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.kernelHeaders; From 952fabe3ce55d690a89e4221b4eff77939497a31 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 May 2012 11:14:19 +0000 Subject: [PATCH 094/403] haskell-cabal2nix: updated to version 1.32 svn path=/nixpkgs/trunk/; revision=34258 --- pkgs/development/tools/haskell/cabal2nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index 11369a42785..4efe8d70027 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.31"; - sha256 = "04qc74h6w3mvb3h3mv0hb3bbwk22ifl29hg3dcq1d5bg4y21j1vr"; + version = "1.32"; + sha256 = "03wjkhcbqkv7ky0a9r5qajandk8jqi5q0nahz4ywzf96cwlz9vw9"; isLibrary = false; isExecutable = true; buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ]; From 0ff3dd24adf4879341337d098dfe7ceefbff3863 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Mon, 28 May 2012 14:14:35 +0000 Subject: [PATCH 095/403] Fix hash change of ocaml-pcre sources svn path=/nixpkgs/trunk/; revision=34260 --- pkgs/development/ocaml-modules/pcre/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/pcre/default.nix b/pkgs/development/ocaml-modules/pcre/default.nix index d7c302a17ec..0e1774bdde3 100644 --- a/pkgs/development/ocaml-modules/pcre/default.nix +++ b/pkgs/development/ocaml-modules/pcre/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.ocaml.info/ocaml_sources/pcre-ocaml-${version}.tar.gz"; - sha256 = "f1774028a4525d22d1f4cf4ce0121c99d85a75aed7a498c3e8ab0f5e39888e47"; + sha256 = "33ec646d8f35770e90ec333b0d4910a88668be3d53c17f227428c82c5c3c3eb7"; }; buildInputs = [ocaml findlib]; From 390907e0a22ed04073e6cdc5e376ed61ffcb401f Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Mon, 28 May 2012 19:41:26 +0000 Subject: [PATCH 096/403] Update coq to use camlp5 version 6. svn path=/nixpkgs/trunk/; revision=34261 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e6658ef134..073bf66d349 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8244,7 +8244,7 @@ let coq = callPackage ../applications/science/logic/coq { inherit (ocamlPackages) findlib lablgtk; - camlp5 = ocamlPackages.camlp5_5_transitional; + camlp5 = ocamlPackages.camlp5_transitional; }; cvc3 = callPackage ../applications/science/logic/cvc3 {}; From f02a71103a7edb19d950622ff1970d9e878141e5 Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Mon, 28 May 2012 19:45:14 +0000 Subject: [PATCH 097/403] add support to make building coqide optional. svn path=/nixpkgs/trunk/; revision=34262 --- .../applications/science/logic/ssreflect/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/logic/ssreflect/default.nix b/pkgs/applications/science/logic/ssreflect/default.nix index c554b5dcea1..75a806cd945 100644 --- a/pkgs/applications/science/logic/ssreflect/default.nix +++ b/pkgs/applications/science/logic/ssreflect/default.nix @@ -33,12 +33,12 @@ stdenv.mkDerivation { COQLIB=$out/lib/coq make -f Makefile.coq install -e mkdir -p $out/bin cp bin/* $out/bin - for i in $out/bin/*; do - wrapProgram "$i" \ - --add-flags "-R" \ - --add-flags "$out/lib/coq/user-contrib/Ssreflect" \ - --add-flags "Ssreflect" - done +# for i in $out/bin/*; do +# wrapProgram "$i" \ +# --add-flags "-R" \ +# --add-flags "$out/lib/coq/user-contrib/Ssreflect" \ +# --add-flags "Ssreflect" +# done ''; meta = { From 417a07a0e92e5d3e368193b7cfbf8cfe956e1e34 Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Mon, 28 May 2012 20:53:17 +0000 Subject: [PATCH 098/403] Updatings ssreflect to depend on camlp5 version 6. svn path=/nixpkgs/trunk/; revision=34263 --- .../science/logic/coq/default.nix | 26 ++++++++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index cfd769fa6a2..bf759a4a326 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -1,10 +1,16 @@ -# TODO: -# - coqide compilation should be optional or (better) separate; +# - coqide compilation can be disabled by setting lablgtk to null; -{stdenv, fetchurl, ocaml, findlib, camlp5, lablgtk, ncurses}: +{stdenv, fetchurl, ocaml, findlib, camlp5, ncurses, lablgtk ? null}: -let +let version = "8.3pl4"; + buildIde = lablgtk != null; + ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; + idePatch = if buildIde then '' + substituteInPlace scripts/coqmktop.ml --replace \ + "\"-I\"; \"+lablgtk2\"" \ + "\"-I\"; \"$(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)\"; \"-I\"; \"$(echo "${lablgtk}"/lib/ocaml/*/site-lib/stublibs)\"" + '' else ""; in stdenv.mkDerivation { @@ -21,9 +27,10 @@ stdenv.mkDerivation { preConfigure = '' configureFlagsArray=( + -opt -camldir ${ocaml}/bin -camlp5dir $(ocamlfind query camlp5) - -lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -opt -coqide opt + ${ideFlags} ) ''; @@ -36,17 +43,16 @@ stdenv.mkDerivation { RM=$(type -tp rm) substituteInPlace configure --replace "/bin/uname" "$UNAME" substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM" - substituteInPlace scripts/coqmktop.ml --replace \ - "\"-I\"; \"+lablgtk2\"" \ - "\"-I\"; \"$(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)\"; \"-I\"; \"$(echo "${lablgtk}"/lib/ocaml/*/site-lib/stublibs)\"" + ${idePatch} ''; # This post install step is needed to build ssrcoqide from the ssreflect package # It could be made optional, but I see little harm in including it in the default # distribution -- roconnor - postInstall = '' + # This will likely no longer be necessary for coq >= 8.4. -- roconnor + postInstall = if buildIde then '' cp ide/*.cmi ide/ide.*a $out/lib/coq/ide/ - ''; + '' else ""; meta = { description = "Coq proof assistant"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 073bf66d349..28f7e07f2be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8298,7 +8298,7 @@ let spass = callPackage ../applications/science/logic/spass {}; ssreflect = callPackage ../applications/science/logic/ssreflect { - camlp5 = ocamlPackages.camlp5_5_transitional; + camlp5 = ocamlPackages.camlp5_transitional; }; tptp = callPackage ../applications/science/logic/tptp {}; From dace27b4c4eedfd06cbd2fc4fcda23c2d6f3a1a1 Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Mon, 28 May 2012 20:57:54 +0000 Subject: [PATCH 099/403] Revert accidentaly patch of ssreflect. svn path=/nixpkgs/trunk/; revision=34264 --- .../applications/science/logic/ssreflect/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/logic/ssreflect/default.nix b/pkgs/applications/science/logic/ssreflect/default.nix index 75a806cd945..c554b5dcea1 100644 --- a/pkgs/applications/science/logic/ssreflect/default.nix +++ b/pkgs/applications/science/logic/ssreflect/default.nix @@ -33,12 +33,12 @@ stdenv.mkDerivation { COQLIB=$out/lib/coq make -f Makefile.coq install -e mkdir -p $out/bin cp bin/* $out/bin -# for i in $out/bin/*; do -# wrapProgram "$i" \ -# --add-flags "-R" \ -# --add-flags "$out/lib/coq/user-contrib/Ssreflect" \ -# --add-flags "Ssreflect" -# done + for i in $out/bin/*; do + wrapProgram "$i" \ + --add-flags "-R" \ + --add-flags "$out/lib/coq/user-contrib/Ssreflect" \ + --add-flags "Ssreflect" + done ''; meta = { From 4129e8e78c80ca46e1e3287184c2cd816cc50671 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 29 May 2012 07:43:50 +0000 Subject: [PATCH 100/403] v8: upgraded to latest stable (3.6.6.25) svn path=/nixpkgs/trunk/; revision=34265 --- pkgs/development/libraries/v8/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index b26bcf0aaeb..a7630ee5d69 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -5,14 +5,14 @@ assert readline != null; let system = stdenv.system; arch = if system == "i686-linux" then "ia32" else if system == "x86_64-linux" || system == "x86_64-darwin" then "x64" else ""; - version = "3.6.6.24"; + version = "3.6.6.25"; in assert arch != ""; stdenv.mkDerivation rec { name = "v8-${version}"; src = fetchsvn { url = "http://v8.googlecode.com/svn/tags/${version}"; - sha256 = "405c905f6240b37b0da14769781e7ec6444fe9153a02ddacd5d774713fe1eb41"; + sha256 = "2a097cbea29a8488419840245bf7bf85513941ceb22c5ef0a3825bfe5edaa045"; }; buildInputs = [python scons readline makeWrapper]; From 459de475eedee8ddfbb416090ede89962a5a6b41 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 29 May 2012 07:43:56 +0000 Subject: [PATCH 101/403] node.js : upgraded to 0.6.18 svn path=/nixpkgs/trunk/; revision=34266 --- pkgs/development/web/nodejs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 36b9cdf28f2..cff2a5e2b11 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, openssl, python, zlib, v8 }: stdenv.mkDerivation rec { - version = "0.6.14"; + version = "0.6.18"; name = "nodejs-${version}"; src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "07ygshbzx4xxj4apx5qzlpwsavnpkk54i2845my1kiamh4q246g4"; + sha256 = "6cf4311ecbc1700e88f4382a31b3a7017c1572cd641fd06e653fc1692c2cffff"; }; configureFlags = [ From 71c305740665b667c99debf330367641ca844528 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 29 May 2012 07:43:58 +0000 Subject: [PATCH 102/403] mongodb: upgraded to 2.0.5 svn path=/nixpkgs/trunk/; revision=34267 --- pkgs/servers/nosql/mongodb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index 087f7e1daa0..85b949ef12c 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -3,11 +3,11 @@ assert useV8 -> v8 != null; stdenv.mkDerivation rec { - name = "mongodb-2.0.4"; + name = "mongodb-2.0.5"; src = fetchurl { - url = "http://downloads.mongodb.org/src/mongodb-src-r2.0.4.tar.gz"; - sha256 = "1y9qd94qfrp7h1mng7f8hfb36wgj93886d2ifadg8y3pfzr6sab5"; + url = "http://downloads.mongodb.org/src/mongodb-src-r2.0.5.tar.gz"; + sha256 = "0vnwphjn0iqgjrvfk18vridx5324zmmbrapp2d9rbqc9xg6jrpav"; }; buildInputs = [scons which boost] ++ stdenv.lib.optional useV8 v8; From b82a8f631952c774c38202afe8a481b3865caf48 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 29 May 2012 07:44:01 +0000 Subject: [PATCH 103/403] xmobar: enable optional wireless support svn path=/nixpkgs/trunk/; revision=34268 --- pkgs/applications/misc/xmobar/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix index 5fa4ecfc3ff..864e479cc10 100644 --- a/pkgs/applications/misc/xmobar/default.nix +++ b/pkgs/applications/misc/xmobar/default.nix @@ -1,7 +1,9 @@ { cabal, filepath, libXrandr, mtl, parsec, stm, time, utf8String -, X11, X11Xft +, X11, X11Xft, wirelessSupport ? false, wirelesstools ? null }: +assert wirelessSupport -> wirelesstools != null; + cabal.mkDerivation (self: { pname = "xmobar"; version = "0.14"; @@ -10,9 +12,9 @@ cabal.mkDerivation (self: { isExecutable = true; buildDepends = [ filepath mtl parsec stm time utf8String X11 X11Xft - ]; + ] ++ self.stdenv.lib.optional wirelessSupport wirelesstools; extraLibraries = [ libXrandr ]; - configureFlags = "-fwith_xft"; + configureFlags = ["-fwith_xft"] ++ self.stdenv.lib.optional wirelessSupport "-fwith_iwlib"; meta = { homepage = "http://projects.haskell.org/xmobar/"; description = "A Minimalistic Text Based Status Bar"; From 8c810af59b9336f53d9f3d9547b10ea647d20999 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 29 May 2012 09:08:55 +0000 Subject: [PATCH 104/403] GNU libiconv: Build the static library on Cygwin. svn path=/nixpkgs/trunk/; revision=34269 --- pkgs/development/libraries/libiconv/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 459987efa47..f2958e4668d 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "libiconv-1.13.1"; src = fetchurl { @@ -30,3 +30,13 @@ stdenv.mkDerivation rec { platforms = [ "i686-cygwin" "i686-darwin" ]; }; } + +// + +stdenv.lib.optionalAttrs stdenv.isCygwin { + # On Cygwin, Libtool produces a `.dll.a', which is not a "real" DLL + # (Windows' linker would need to be used somehow to produce an actual + # DLL.) Thus, build the static library too, and this is what Gettext + # will actually use. + configureFlags = [ "--enable-static" ]; +}) From ae23a33b9a44a45907e7885568841bd7c8ad5dbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 29 May 2012 10:13:23 +0000 Subject: [PATCH 105/403] GNU Gettext: Fix Cygwin build. svn path=/nixpkgs/trunk/; revision=34270 --- .../development/libraries/gettext/default.nix | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index f7b31139b56..73366b2bdc9 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libiconv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "gettext-0.18.1.1"; src = fetchurl { @@ -8,7 +8,14 @@ stdenv.mkDerivation rec { sha256 = "1sa3ch12qxa4h3ya6hkz119yclcccmincl9j20dhrdx5mykp3b4k"; }; - configureFlags = "--disable-csharp"; + configureFlags = [ "--disable-csharp" ] + ++ (stdenv.lib.optionals stdenv.isCygwin + [ # We have a static libiconv, so we can only build the static lib. + "--disable-shared" "--enable-static" + + # Share the cache among the various `configure' runs. + "--config-cache" + ]); # On cross building, gettext supposes that the wchar.h from libc # does not fulfill gettext needs, so it tries to work with its @@ -60,3 +67,16 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.all; }; } + +// + +stdenv.lib.optionalAttrs stdenv.isCygwin { + patchPhase = + # Make sure `error.c' gets compiled and is part of `libgettextlib.la'. + # This fixes: + # gettext-0.18.1.1/gettext-tools/src/msgcmp.c:371: undefined reference to `_error_message_count' + + '' sed -i gettext-tools/gnulib-lib/Makefile.in \ + -e 's/am_libgettextlib_la_OBJECTS =/am_libgettextlib_la_OBJECTS = error.lo/g' + ''; +}) From 4e10015cab9f9b27152cb482914f51f81bdd6fdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Tue, 29 May 2012 12:21:33 +0000 Subject: [PATCH 106/403] Added gnumeric. svn path=/nixpkgs/trunk/; revision=34272 --- pkgs/applications/office/gnumeric/default.nix | 26 +++++++++++++ pkgs/development/libraries/goffice/0.9.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 14 ++++++- 3 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/office/gnumeric/default.nix create mode 100644 pkgs/development/libraries/goffice/0.9.nix diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix new file mode 100644 index 00000000000..0c982dc99a9 --- /dev/null +++ b/pkgs/applications/office/gnumeric/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl +, bzip2, glib, goffice, gtk3, intltool, libglade, libgsf, libxml2 +, pango, pkgconfig, scrollkeeper, zlib +}: + +stdenv.mkDerivation { + name = "gnumeric-1.11.3"; + + src = fetchurl { + url = mirror://gnome/sources/gnumeric/1.11/gnumeric-1.11.3.tar.xz; + sha256 = "1hblcbba4qzlby094dih6ncclgf2n5ac59lqg9dykpz8ad3hxw72"; + }; + + configureFlags = "--disable-component"; + + buildInputs = [ + bzip2 glib goffice gtk3 intltool libglade libgsf libxml2 + pango pkgconfig scrollkeeper zlib + ]; + + meta = { + description = "The GNOME Office Spreadsheet"; + license = "GPLv2+"; + homepage = http://projects.gnome.org/gnumeric/; + }; +} diff --git a/pkgs/development/libraries/goffice/0.9.nix b/pkgs/development/libraries/goffice/0.9.nix new file mode 100644 index 00000000000..23b65b1c712 --- /dev/null +++ b/pkgs/development/libraries/goffice/0.9.nix @@ -0,0 +1,37 @@ +{ fetchurl, stdenv, pkgconfig, glib, gtk, libglade, bzip2 +, pango, libgsf, libxml2, libart, librsvg, intltool, gettext +, cairo, gconf, libgnomeui }: + +stdenv.mkDerivation rec { + name = "goffice-0.9.3"; + + src = fetchurl { + url = "mirror://gnome/sources/goffice/0.9/${name}.tar.xz"; + sha256 = "0l9achvmbmhn2p5qd0nl7vxn5c3nf1ndzlyknczzyiaa6d5zj91h"; + }; + + buildInputs = [ + pkgconfig libglade bzip2 libart intltool gettext + gconf libgnomeui + ]; + + propagatedBuildInputs = [ + glib libgsf libxml2 gtk libglade libart librsvg cairo pango + ]; + + doCheck = true; + + meta = { + description = "GOffice, a Glib/GTK+ set of document centric objects and utilities"; + + longDescription = '' + There are common operations for document centric applications that are + conceptually simple, but complex to implement fully: plugins, load/save + documents, undo/redo. + ''; + + license = "GPLv2+"; + + platforms = stdenv.lib.platforms.gnu; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 28f7e07f2be..532f0eb6ca9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1,4 +1,4 @@ -/* This file composes the Nix Packages collection. That is, it +/* This file composes the Nix Packages collection. That is, it gtk3 imports the functions that build the various packages, and calls them with appropriate arguments. The result is a set of all the packages in the Nix Packages collection for some particular @@ -3597,6 +3597,13 @@ let libart = gnome.libart_lgpl; }; + goffice_0_9 = callPackage ../development/libraries/goffice/0.9.nix { + inherit (gnome) libglade libgnomeui; + gconf = gnome.GConf; + libart = gnome.libart_lgpl; + gtk = gtk3; + }; + goocanvas = callPackage ../development/libraries/goocanvas { }; google_perftools = callPackage ../development/libraries/google-perftools { }; @@ -6795,6 +6802,11 @@ let inherit (gnome) GConf; }; + gnumeric = callPackage ../applications/office/gnumeric { + goffice = goffice_0_9; + inherit (gnome) libglade scrollkeeper; + }; + gnunet08 = callPackage ../applications/networking/p2p/gnunet/0.8.nix { inherit (gnome) libglade; guile = guile_1_8; From 9f47f715c14a1c6f9803512f980c1110c4d60f47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Tue, 29 May 2012 14:02:26 +0000 Subject: [PATCH 107/403] Revert bogus change. svn path=/nixpkgs/trunk/; revision=34273 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 532f0eb6ca9..422daf6fd56 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1,4 +1,4 @@ -/* This file composes the Nix Packages collection. That is, it gtk3 +/* This file composes the Nix Packages collection. That is, it imports the functions that build the various packages, and calls them with appropriate arguments. The result is a set of all the packages in the Nix Packages collection for some particular From 854ebba387ae35ac782864fd254c800a5df93436 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Tue, 29 May 2012 14:02:31 +0000 Subject: [PATCH 108/403] Whitespace. svn path=/nixpkgs/trunk/; revision=34274 --- pkgs/applications/office/gnumeric/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index 0c982dc99a9..6063024c216 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "gnumeric-1.11.3"; - + src = fetchurl { url = mirror://gnome/sources/gnumeric/1.11/gnumeric-1.11.3.tar.xz; sha256 = "1hblcbba4qzlby094dih6ncclgf2n5ac59lqg9dykpz8ad3hxw72"; From ac1857cef1441b18af1a466a65522886c0f3c2a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 29 May 2012 14:21:55 +0000 Subject: [PATCH 109/403] Adding fio, the flexible IO tester. svn path=/nixpkgs/trunk/; revision=34275 --- pkgs/tools/system/fio/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/system/fio/default.nix diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix new file mode 100644 index 00000000000..aadad3b96c8 --- /dev/null +++ b/pkgs/tools/system/fio/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchgit, libaio }: + +stdenv.mkDerivation rec { + name = "fio-2.0.8"; + + src = fetchgit { + url = git://git.kernel.dk/fio.git; + rev = "cf9a74c8bd63d9db5256f1362885c740e11a1fe5"; + sha256 = "b34de480bbbb9cde221d0c4557ead91790feb825a1e31c4013e222ee7f43e937"; + }; + + buildInputs = [ libaio ]; + + installPhase = '' + make install prefix=$out + ''; + + meta = { + homepage = http://git.kernel.dk/?p=fio.git;a=summary; + description = "Flexible IO Tester - an IO benchmark tool"; + license = "GPLv2"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 422daf6fd56..559c1b73e86 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -692,6 +692,8 @@ let finger_bsd = callPackage ../tools/networking/bsd-finger { }; + fio = callPackage ../tools/system/fio { }; + flvstreamer = callPackage ../tools/networking/flvstreamer { }; libbsd = callPackage ../development/libraries/libbsd { }; From dc4035a4bdd60cd79e2eb306f74cd850ad56af6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 29 May 2012 14:24:10 +0000 Subject: [PATCH 110/403] Fixing a typo in fio svn path=/nixpkgs/trunk/; revision=34276 --- pkgs/tools/system/fio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index aadad3b96c8..b4ddca4371e 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://git.kernel.dk/?p=fio.git;a=summary; + homepage = "http://git.kernel.dk/?p=fio.git;a=summary"; description = "Flexible IO Tester - an IO benchmark tool"; license = "GPLv2"; }; From 472a9d6e3dcdc0e5f99ccba4d7144a0d960c6e8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 29 May 2012 16:37:28 +0000 Subject: [PATCH 111/403] GNU M4: Disable tests on Cygwin. svn path=/nixpkgs/trunk/; revision=34277 --- pkgs/development/tools/misc/gnum4/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index 12cc50a37a0..8d3d175e730 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "035r7ma272j2cwni2961jp22k6bn3n9xwn3b3qbcn2yrvlghql22"; }; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.isDarwin + && !stdenv.isCygwin; # XXX: `test-dup2' fails on Cygwin # Upstream is aware of it; it may be in the next release. patches = [ ./s_isdir.patch ./readlink-EINVAL.patch ]; From 606913fc8fa9221692294c7aca7d0c7318ee4099 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 29 May 2012 16:37:31 +0000 Subject: [PATCH 112/403] hwloc: Disable dependency on Cairo and X11 on Cygwin. svn path=/nixpkgs/trunk/; revision=34278 --- pkgs/development/libraries/hwloc/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index 502e8b94bbd..48ee3cebe7e 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { # Filter out `null' inputs. This allows users to `.override' the # derivation and set optional dependencies to `null'. buildInputs = stdenv.lib.filter (x: x != null) - [ cairo expat ncurses libX11 ]; + ([ expat ncurses ] + ++ (stdenv.lib.optionals (!stdenv.isCygwin) [ cairo libX11 ])); doCheck = true; From 7e9eb60cfe03c35f2b8f6104741d3392a29e540a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 29 May 2012 16:37:34 +0000 Subject: [PATCH 113/403] hwloc 1.4.2. svn path=/nixpkgs/trunk/; revision=34279 --- pkgs/development/libraries/hwloc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index 48ee3cebe7e..230f1351d2e 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, cairo, expat, ncurses, libX11 }: stdenv.mkDerivation rec { - name = "hwloc-1.4"; + name = "hwloc-1.4.2"; src = fetchurl { url = "http://www.open-mpi.org/software/hwloc/v1.4/downloads/${name}.tar.bz2"; - sha256 = "1qcii99vn65jwgqpq8d2k4sksk734kkg223p58ck7v76q27h288y"; + sha256 = "0xamcnbkrf18v1rj4h6ddx6cn4gffx6zgzjaym8c3k5mlpgigfdw"; }; # XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo. From 011cd1baa6da762586f57480215719c383a69beb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 29 May 2012 20:16:01 +0000 Subject: [PATCH 114/403] haskell-hledger-lib: updated to version 0.18 svn path=/nixpkgs/trunk/; revision=34281 --- .../libraries/haskell/hledger-lib/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix index 62a90257d1d..92da07f9b96 100644 --- a/pkgs/development/libraries/haskell/hledger-lib/default.nix +++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix @@ -1,14 +1,14 @@ -{ cabal, cmdargs, filepath, HUnit, mtl, parsec, regexpr, safe -, split, time, utf8String +{ cabal, cmdargs, csv, filepath, HUnit, mtl, parsec, regexpr, safe +, shakespeareText, split, time, utf8String }: cabal.mkDerivation (self: { pname = "hledger-lib"; - version = "0.17"; - sha256 = "0dlm3hjbcf48nzz597ag1q9y0phsc09062wvzpmfkhk4hsijpds4"; + version = "0.18"; + sha256 = "17dd8pbn5ly8rxy8yp8fz1j8m2zad9s190jzcpx9pdaw6vf2jskc"; buildDepends = [ - cmdargs filepath HUnit mtl parsec regexpr safe split time - utf8String + cmdargs csv filepath HUnit mtl parsec regexpr safe shakespeareText + split time utf8String ]; meta = { homepage = "http://hledger.org"; From bb2d3311a257d53a4ef59c179fc50d5d3261eecc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 29 May 2012 20:16:06 +0000 Subject: [PATCH 115/403] haskell-hledger-web: updated to version 0.18 svn path=/nixpkgs/trunk/; revision=34282 --- .../libraries/haskell/hledger-web/default.nix | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix index 6b4ef21dea6..08ed4d68549 100644 --- a/pkgs/development/libraries/haskell/hledger-web/default.nix +++ b/pkgs/development/libraries/haskell/hledger-web/default.nix @@ -1,23 +1,21 @@ -{ cabal, aeson, blazeHtml, cabalFileTh, clientsession, cmdargs -, dataObject, dataObjectYaml, failure, fileEmbed, filepath, hamlet -, hledger, hledgerLib, httpEnumerator, HUnit, ioStorage, parsec -, regexpr, safe, shakespeareCss, shakespeareJs, shakespeareText -, text, time, tlsExtra, transformers, wai, waiExtra, warp, yesod -, yesodCore, yesodForm, yesodJson, yesodStatic +{ cabal, blazeHtml, cabalFileTh, clientsession, cmdargs, filepath +, hamlet, hledger, hledgerLib, HUnit, ioStorage, networkConduit +, parsec, regexpr, safe, shakespeareText, text, time, transformers +, wai, waiExtra, warp, yaml, yesod, yesodCore, yesodDefault +, yesodStatic }: cabal.mkDerivation (self: { pname = "hledger-web"; - version = "0.17.1"; - sha256 = "0cix0k2skbrcbjhj876cx4mizjvkqnr91s092a3lg4rv40dhgwa9"; + version = "0.18"; + sha256 = "1cxlyw9rs1pg0ympig9svkfi9fikpbvfzm6jc7hijkg215l617np"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson blazeHtml cabalFileTh clientsession cmdargs dataObject - dataObjectYaml failure fileEmbed filepath hamlet hledger hledgerLib - httpEnumerator HUnit ioStorage parsec regexpr safe shakespeareCss - shakespeareJs shakespeareText text time tlsExtra transformers wai - waiExtra warp yesod yesodCore yesodForm yesodJson yesodStatic + blazeHtml cabalFileTh clientsession cmdargs filepath hamlet hledger + hledgerLib HUnit ioStorage networkConduit parsec regexpr safe + shakespeareText text time transformers wai waiExtra warp yaml yesod + yesodCore yesodDefault yesodStatic ]; meta = { homepage = "http://hledger.org"; From e70b655b3c28d0d88ad59f6b2d81f8eccf547414 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 29 May 2012 20:16:08 +0000 Subject: [PATCH 116/403] haskell-hledger: updated to version 0.18 svn path=/nixpkgs/trunk/; revision=34283 --- .../libraries/haskell/hledger/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix index e53f08618b1..2eb34dcef98 100644 --- a/pkgs/development/libraries/haskell/hledger/default.nix +++ b/pkgs/development/libraries/haskell/hledger/default.nix @@ -1,16 +1,17 @@ -{ cabal, cabalFileTh, cmdargs, csv, filepath, haskeline, hledgerLib -, HUnit, mtl, parsec, regexpr, safe, split, time, utf8String +{ cabal, cabalFileTh, cmdargs, filepath, haskeline, hledgerLib +, HUnit, mtl, parsec, regexpr, safe, shakespeareText, split, text +, time, utf8String }: cabal.mkDerivation (self: { pname = "hledger"; - version = "0.17"; - sha256 = "0ah01d10hvz12zwkprk6sb3by8azz9fhm772440arhd7r9fn6232"; + version = "0.18"; + sha256 = "15jbfq9a1lydn0m998vzrx4nlpfkbv5ddvj6h03hljp562f2s0wi"; isLibrary = true; isExecutable = true; buildDepends = [ - cabalFileTh cmdargs csv filepath haskeline hledgerLib HUnit mtl - parsec regexpr safe split time utf8String + cabalFileTh cmdargs filepath haskeline hledgerLib HUnit mtl parsec + regexpr safe shakespeareText split text time utf8String ]; meta = { homepage = "http://hledger.org"; From 6050e8749c95ec743a6c5a9b79de88ab59cf340a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 29 May 2012 20:16:16 +0000 Subject: [PATCH 117/403] haskell-defaults.nix: dropped 'packages_ghc741_pedantic' variant, it's identical to 'packages_ghc741' now svn path=/nixpkgs/trunk/; revision=34284 --- pkgs/top-level/all-packages.nix | 1 - pkgs/top-level/haskell-defaults.nix | 10 +--------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 559c1b73e86..ddf64847d40 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2221,7 +2221,6 @@ let haskellPackages_ghc721 = haskell.packages_ghc721; haskellPackages_ghc722 = haskell.packages_ghc722; haskellPackages_ghc741 = recurseIntoAttrs (haskell.packages_ghc741); - haskellPackages_ghc741_pedantic = haskell.packages_ghc741_pedantic; # Stable branch snapshot. haskellPackages_ghc742 = recurseIntoAttrs (haskell.packages_ghc742); # Reasonably current HEAD snapshot. diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 42f0980c637..96744b4ee30 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -17,17 +17,13 @@ ghcHEADPrefs = ghc741Prefs; - ghc741Prefs_pedantic = + ghc741Prefs = self : self.haskellPlatformArgs_future self // { haskellPlatform = self.haskellPlatform_2012_2_0_0; mtl1 = self.mtl_1_1_1_1; # 7.2 ok, 7.3 ok binary = null; # now a core package }; - ghc741Prefs = - self : ghc741Prefs_pedantic self // { - }; - ghc722Prefs = ghc741Prefs; ghc721Prefs = ghc741Prefs; @@ -245,10 +241,6 @@ prefFun = ghc741Prefs; }; - # More strictly adhering to the probable future Haskell Platform. - packages_ghc741_pedantic = - packages_ghc741.override { prefFun = ghc741Prefs_pedantic; }; - # Stable branch snapshot. packages_ghc742 = packages { ghcPath = ../development/compilers/ghc/7.4.2.nix; From 272753809c3f7208a484f6fee69220e9d11c2fbb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 29 May 2012 20:47:29 +0000 Subject: [PATCH 118/403] haskell-hledger-interest: updated to version 1.4.1 svn path=/nixpkgs/trunk/; revision=34285 --- pkgs/applications/office/hledger-interest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/hledger-interest/default.nix b/pkgs/applications/office/hledger-interest/default.nix index 6715df077bf..5b9aefa182e 100644 --- a/pkgs/applications/office/hledger-interest/default.nix +++ b/pkgs/applications/office/hledger-interest/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hledger-interest"; - version = "1.4"; - sha256 = "0lm4jcxcig3yxzhbnka1q54fvshn5b9d91a5a2mbmkzbwhzjj0lg"; + version = "1.4.1"; + sha256 = "05mzqmnr9c4zmss0f2aac4qh4s954nbkimv924d31q2lisdddvw8"; isLibrary = false; isExecutable = true; buildDepends = [ Cabal hledgerLib mtl time ]; From 72a4c7aa8830aa853dd7b1133a5db864c108852e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 29 May 2012 21:25:45 +0000 Subject: [PATCH 119/403] haskell-Shellac-haskeline: patched to support current mtl and transformers svn path=/nixpkgs/trunk/; revision=34286 --- .../libraries/haskell/Shellac/Shellac-haskeline.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/haskell/Shellac/Shellac-haskeline.nix b/pkgs/development/libraries/haskell/Shellac/Shellac-haskeline.nix index 4ce09964cc6..9f75a09ee69 100644 --- a/pkgs/development/libraries/haskell/Shellac/Shellac-haskeline.nix +++ b/pkgs/development/libraries/haskell/Shellac/Shellac-haskeline.nix @@ -5,6 +5,9 @@ cabal.mkDerivation (self: { version = "0.2.0.1"; sha256 = "1xvs2ni83yyf7rx3ikmn2bkx20fyj03d03crqyyfw28mikhgv5br"; buildDepends = [ haskeline mtl Shellac ]; + patchPhase = '' + sed -i -e 's|mtl>=1.1 && < 2.1|mtl|' Shellac-haskeline.cabal + ''; meta = { description = "Haskeline backend module for Shellac"; license = self.stdenv.lib.licenses.bsd3; From 5fb3ac1d5bcca45245a3590b6361ba448e50f659 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 29 May 2012 21:25:52 +0000 Subject: [PATCH 120/403] haskell-happstack-data: patched to support current mtl and transformers svn path=/nixpkgs/trunk/; revision=34287 --- .../development/libraries/haskell/happstack/happstack-data.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/haskell/happstack/happstack-data.nix b/pkgs/development/libraries/haskell/happstack/happstack-data.nix index bdf27495d82..aa540e98bd5 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-data.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-data.nix @@ -11,6 +11,9 @@ cabal.mkDerivation (self: { buildDepends = [ binary mtl syb sybWithClass sybWithClassInstancesText text time ]; + patchPhase = '' + sed -i -e 's|mtl >= 1.1 && < 2.1|mtl|' happstack-data.cabal + ''; meta = { homepage = "http://happstack.com"; description = "Happstack data manipulation libraries"; From 8fad2b0a9867c1d7b26da57975b89197d8283fa9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 29 May 2012 21:26:09 +0000 Subject: [PATCH 121/403] haskell-happstack-util: patched to support current mtl and transformers svn path=/nixpkgs/trunk/; revision=34288 --- .../development/libraries/haskell/happstack/happstack-util.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/haskell/happstack/happstack-util.nix b/pkgs/development/libraries/haskell/happstack/happstack-util.nix index f63d253864c..b457ec6dc32 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-util.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-util.nix @@ -12,6 +12,9 @@ cabal.mkDerivation (self: { extensibleExceptions filepath hslogger mtl network parsec random time unixCompat ]; + patchPhase = '' + sed -i -e 's|mtl >= 1.1 && < 2.1|mtl|' happstack-util.cabal + ''; meta = { homepage = "http://happstack.com"; description = "Web framework"; From 0b56a39d464190f5047424dcefcc8bfbb66ae642 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 29 May 2012 21:26:15 +0000 Subject: [PATCH 122/403] haskell-multiplate: patched to support current mtl and transformers svn path=/nixpkgs/trunk/; revision=34289 --- pkgs/development/libraries/haskell/multiplate/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/haskell/multiplate/default.nix b/pkgs/development/libraries/haskell/multiplate/default.nix index b53c0b955e5..ac572b7c59a 100644 --- a/pkgs/development/libraries/haskell/multiplate/default.nix +++ b/pkgs/development/libraries/haskell/multiplate/default.nix @@ -5,6 +5,9 @@ cabal.mkDerivation (self: { version = "0.0.1.1"; sha256 = "00rxgkvgx1rfvk15gjyyg00vqyg4j24d8d19q6rj07j2mgfvdxw6"; buildDepends = [ transformers ]; + patchPhase = '' + sed -i -e 's|transformers >= 0.2 && < 0.3|transformers|' multiplate.cabal + ''; meta = { homepage = "http://haskell.org/haskellwiki/Multiplate"; description = "Lightweight generic library for mutually recursive data types"; From 5ca0b381e0556bc762f31baf1624e86f2306fde1 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Wed, 30 May 2012 20:53:13 +0000 Subject: [PATCH 123/403] Update HOL Light to rev 141 svn path=/nixpkgs/trunk/; revision=34290 --- pkgs/applications/science/logic/hol_light/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index 01746a748fe..5d9866a650b 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation { - name = "hol_light-20120427"; + name = "hol_light-20120529"; src = fetchsvn { url = http://hol-light.googlecode.com/svn/trunk; - rev = "134"; - sha256 = "91e7575eeac37a1fbd127eabe99f736b9e1a19fb7b1a0fa27cf31b66edad4b17"; + rev = "141"; + sha256 = "a11d7e5db7c6035a2debcf9e73f43c6322389aeac5bc4d123ebf58918052a57f"; }; buildInputs = [ ocaml findlib camlp5 ]; From eed22970cde671015d7d7cb3baf296eddfb73e4d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 30 May 2012 21:12:04 +0000 Subject: [PATCH 124/403] * Updated to pycrypto to 2.6. svn path=/nixpkgs/trunk/; revision=34291 --- pkgs/development/python-modules/pycrypto/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pycrypto/default.nix b/pkgs/development/python-modules/pycrypto/default.nix index 8ce5cc23764..9c756c9ed64 100644 --- a/pkgs/development/python-modules/pycrypto/default.nix +++ b/pkgs/development/python-modules/pycrypto/default.nix @@ -1,14 +1,11 @@ { stdenv, fetchurl, python, gmp }: -# TODO: Update to version 2.1.0 ASAP. The update works, but as of 2010-07-28 -# the download site appears to be down. - stdenv.mkDerivation rec { - name = "pycrypto-2.0.1"; + name = "pycrypto-2.6"; src = fetchurl { url = "http://pypi.python.org/packages/source/p/pycrypto/${name}.tar.gz"; - sha256 = "2dff97ae70b6811157b516bf633405d09147ee1e2bfa06b0c657ad2c22de5800"; + md5 = "88dad0a270d1fe83a39e0467a66a22bb"; }; buildInputs = [ python gmp ]; From 5bd2bc4a583586e979051ab186c58f4c1d209960 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 30 May 2012 21:12:40 +0000 Subject: [PATCH 125/403] * Add ReviewBoard and its dependencies (such as Django). svn path=/nixpkgs/trunk/; revision=34292 --- pkgs/top-level/python-packages.nix | 177 ++++++++++++++++++++++++++--- 1 file changed, 161 insertions(+), 16 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index df184527baf..5c7a7991fae 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -414,19 +414,18 @@ let pythonPackages = python.modules // rec { }; }); + dateutil = buildPythonPackage (rec { - name = "dateutil-1.4.1"; + name = "dateutil-1.5"; src = fetchurl { url = "http://pypi.python.org/packages/source/p/python-dateutil/python-${name}.tar.gz"; - sha256 = "0mrkh932k8s74h4rpgksvpmwbrrkq8zn78gbgwc22i2vlp31bdkl"; + sha256 = "02dhw57jf5kjcp7ng1if7vdrbnlpb9yjmz7wygwwvf3gni4766bg"; }; meta = { description = "Powerful extensions to the standard datetime module"; - homepage = http://pypi.python.org/pypi/python-dateutil; - license = "BSD-style"; }; }); @@ -460,6 +459,58 @@ let pythonPackages = python.modules // rec { }; }; + + django = buildPythonPackage rec { + name = "Django-1.3.1"; + + src = fetchurl { + url = "http://www.djangoproject.com/m/releases/1.3/${name}.tar.gz"; + sha256 = "0sqmvqy3y5h76pa3zjcnyiy5x01bzzy03afdp2qdwqx0x321i4dg"; + }; + + doCheck = false; + + meta = { + description = "A high-level Python Web framework"; + homepage = https://www.djangoproject.com/; + }; + }; + + + django_evolution = buildPythonPackage rec { + name = "django_evolution-0.6.7"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/d/django_evolution/${name}.tar.gz"; + md5 = "24b8373916f53f74d701b99a6cf41409"; + }; + + propagatedBuildInputs = [ django ]; + + meta = { + description = "A database schema evolution tool for the Django web framework"; + homepage = http://code.google.com/p/django-evolution/; + }; + }; + + + djblets = buildPythonPackage rec { + name = "Djblets-0.6.16"; + + src = fetchurl { + url = "http://downloads.reviewboard.org/releases/Djblets/0.6/Djblets-0.6.16.tar.gz"; + sha256 = "1793jy0y5w79p8395lvvdlmvdybgwvc5lvgzmk1csf08ba772vc4"; + }; + + propagatedBuildInputs = [ pkgs.pil django ]; + + meta = { + description = "A collection of useful extensions for Django"; + homepage = https://github.com/djblets/djblets; + }; + }; + + dulwich = buildPythonPackage rec { name = "dulwich-0.8.1"; @@ -480,6 +531,7 @@ let pythonPackages = python.modules // rec { }; }; + hggit = buildPythonPackage rec { name = "hg-git-0.3.1"; @@ -496,6 +548,7 @@ let pythonPackages = python.modules // rec { }; }; + docutils = buildPythonPackage rec { name = "docutils-0.8.1"; @@ -584,6 +637,7 @@ let pythonPackages = python.modules // rec { }; }); + foolscap = buildPythonPackage (rec { name = "foolscap-0.6.1"; @@ -926,6 +980,7 @@ let pythonPackages = python.modules // rec { }; }); + mechanize = buildPythonPackage (rec { name = "mechanize-0.1.11"; @@ -946,6 +1001,21 @@ let pythonPackages = python.modules // rec { }); + memcached = buildPythonPackage rec { + name = "memcached-1.48"; + + src = fetchurl { + url = "ftp://ftp.tummy.com/pub/python-memcached/old-releases/python-memcached-1.48.tar.gz"; + sha256 = "1i0h05z9j0zl65rgvw86p4f54pigkxynhzppn4qxby8rjlnwdfv6"; + }; + + meta = { + description = "Python API for communicating with the memcached distributed memory object cache daemon"; + homepage = http://www.tummy.com/Community/software/python-memcached/; + }; + }; + + mock = buildPythonPackage (rec { name = "mock-0.7.0"; @@ -1252,18 +1322,17 @@ let pythonPackages = python.modules // rec { }; }); - paramiko = buildPythonPackage { - name = "paramiko-1.7.6"; + + paramiko = buildPythonPackage rec { + name = "paramiko-1.7.7.1"; src = fetchurl { - url = "http://www.lag.net/paramiko/download/paramiko-1.7.6.tar.gz"; - sha256 = "00jhzl3s9xdkbj32h1kq1swk8wpx9zky7qfda40n8mb204xjcn9h"; + url = "http://www.lag.net/paramiko/download/${name}.tar.gz"; + sha256 = "1bjy4jn51c50mpq51jbwk0glzd8bxz83gxdfkr9p95dmrd17c7hh"; }; buildInputs = [ pkgs.pycrypto ]; - doCheck = false; - meta = { homepage = "http://www.lag.net/paramiko/"; description = "SSH2 protocol for python"; @@ -1516,15 +1585,16 @@ let pythonPackages = python.modules // rec { pygments = buildPythonPackage rec { - name = "Pygments-1.4"; + name = "Pygments-1.5"; src = fetchurl { url = "http://pypi.python.org/packages/source/P/Pygments/${name}.tar.gz"; - md5 = "d77ac8c93a7fb27545f2522abe9cc462"; + md5 = "ef997066cc9ee7a47d01fb4f3da0b5ff"; }; + meta = { homepage = http://pygments.org/; - description = "Pygments is a generic syntax highlighter for general use in all kinds of software such as forum systems, wikis or other applications that need to prettify source code."; + description = "A generic syntax highlighter"; }; }; @@ -1543,6 +1613,7 @@ let pythonPackages = python.modules // rec { }; }; + ldap = buildPythonPackage rec { name = "python-ldap-2.4.3"; @@ -1555,6 +1626,7 @@ let pythonPackages = python.modules // rec { propagatedBuildInputs = [pkgs.openldap pkgs.cyrus_sasl pkgs.openssl]; }; + pylint = buildPythonPackage rec { name = "pylint-0.23.0"; @@ -1565,6 +1637,7 @@ let pythonPackages = python.modules // rec { propagatedBuildInputs = [astng]; }; + pymacs = pkgs.stdenv.mkDerivation rec { version = "v0.24-beta2"; name = "Pymacs-${version}"; @@ -1593,6 +1666,7 @@ let pythonPackages = python.modules // rec { }; }; + pyopengl = let version = "3.0.0b5"; in @@ -1621,6 +1695,7 @@ let pythonPackages = python.modules // rec { }; }; + pyreport = buildPythonPackage (rec { name = "pyreport-0.3.4c"; @@ -1742,6 +1817,21 @@ let pythonPackages = python.modules // rec { }; + pytz = buildPythonPackage rec { + name = "pytz-2012c"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/pytz/${name}.tar.bz2"; + md5 = "660e0cee7f6c419ca2665db460f65131"; + }; + + meta = { + description = "World timezone definitions, modern and historical"; + homepage = http://pytz.sourceforge.net/; + }; + }; + + pyutil = buildPythonPackage (rec { name = "pyutil-1.7.9"; @@ -1775,6 +1865,7 @@ let pythonPackages = python.modules // rec { }; }); + pyyaml = buildPythonPackage (rec { name = "PyYAML-3.09"; @@ -1793,17 +1884,35 @@ let pythonPackages = python.modules // rec { }; }); - RBTools = buildPythonPackage rec { - name = "RBTools-0.4.1"; + + RBTools = buildPythonPackage rec { + name = "rbtools-0.4.1"; + namePrefix = ""; src = fetchurl { - url = "http://downloads.reviewboard.org/releases/RBTools/0.4/${name}.tar.gz"; + url = "http://downloads.reviewboard.org/releases/RBTools/0.4/RBTools-0.4.1.tar.gz"; sha256 = "1v0r7rfzrasj56s53mib51wl056g7ykh2y1c6dwv12r6hzqsycgv"; }; propagatedBuildInputs = [ setuptools ]; }; + + recaptcha_client = buildPythonPackage rec { + name = "recaptcha-client-1.0.6"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/r/recaptcha-client/${name}.tar.gz"; + md5 = "74228180f7e1fb76c4d7089160b0d919"; + }; + + meta = { + description = "A CAPTCHA for Python using the reCAPTCHA service"; + homepage = http://recaptcha.net/; + }; + }; + + reportlab = let freetype = pkgs.lib.overrideDerivation pkgs.freetype (args: { configureFlags = "--enable-static --enable-shared"; }); in buildPythonPackage rec { @@ -1823,6 +1932,22 @@ let pythonPackages = python.modules // rec { }; }; + + reviewboard = buildPythonPackage rec { + name = "ReviewBoard-1.6.6"; + + src = fetchurl { + url = "http://downloads.reviewboard.org/releases/ReviewBoard/1.6/${name}.tar.gz"; + sha256 = "de965f48c9e63198d3c7c2bb2e8404170868e8c0ee4d6ab796abb9b1ccda6c1d"; + }; + + propagatedBuildInputs = + [ recaptcha_client pytz memcached dateutil paramiko flup pygments + djblets django_evolution pkgs.pycrypto python.modules.sqlite3 + ]; + }; + + rdflib = buildPythonPackage (rec { name = "rdflib-3.0.0"; @@ -1973,6 +2098,7 @@ let pythonPackages = python.modules // rec { }; }; + setuptoolsTrial = buildPythonPackage { name = "setuptools-trial-0.5.12"; @@ -1992,6 +2118,7 @@ let pythonPackages = python.modules // rec { }; }; + simplejson = buildPythonPackage (rec { name = "simplejson-2.1.3"; @@ -2017,6 +2144,24 @@ let pythonPackages = python.modules // rec { }; }); + + six = buildPythonPackage rec { + name = "six-1.1.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/s/six/${name}.tar.gz"; + md5 = "9e8099b57cd27493a6988e9c9b313e23"; + }; + + doCheck = false; + + meta = { + description = "A Python 2 and 3 compatibility library"; + homepage = http://pypi.python.org/pypi/six/; + }; + }; + + skype4py = buildPythonPackage (rec { name = "Skype4Py-1.0.32.0"; From 596eddb6e8afe197665c6c9e4b6bd6c827f2be6e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 30 May 2012 21:49:36 +0000 Subject: [PATCH 126/403] * Add some dependencies. svn path=/nixpkgs/trunk/; revision=34293 --- pkgs/top-level/python-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5c7a7991fae..054ecd13889 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1943,7 +1943,8 @@ let pythonPackages = python.modules // rec { propagatedBuildInputs = [ recaptcha_client pytz memcached dateutil paramiko flup pygments - djblets django_evolution pkgs.pycrypto python.modules.sqlite3 + djblets django django_evolution pkgs.pycrypto python.modules.sqlite3 + pysvn pkgs.pil ]; }; From c57a50290a0581653e3a117ba069e81bc432751d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 31 May 2012 02:28:14 +0000 Subject: [PATCH 127/403] * Mark jdkPlugin/jrePlugin as low priority. svn path=/nixpkgs/trunk/; revision=34294 --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ddf64847d40..1ac1bd1c0e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2276,8 +2276,8 @@ let jdk = if stdenv.isDarwin then openjdkDarwin else jdkdistro true false; jre = jdkdistro false false; - jdkPlugin = jdkdistro true true; - jrePlugin = jdkdistro false true; + jdkPlugin = lowPrio (jdkdistro true true); + jrePlugin = lowPrio (jdkdistro false true); supportsJDK = system == "i686-linux" || From 0deabf5eaa80e049aedecc87b0601f51f4e1f306 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 31 May 2012 07:24:40 +0000 Subject: [PATCH 128/403] haskell-filestore: updated to version 0.5 svn path=/nixpkgs/trunk/; revision=34295 --- pkgs/development/libraries/haskell/filestore/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix index 8462629a4be..ac891fa8bd6 100644 --- a/pkgs/development/libraries/haskell/filestore/default.nix +++ b/pkgs/development/libraries/haskell/filestore/default.nix @@ -4,15 +4,14 @@ cabal.mkDerivation (self: { pname = "filestore"; - version = "0.4.2"; - sha256 = "1zv5c1r82a77p6dadabj8853a0z7p8qrk0fdxvr9sr02zd95cg16"; + version = "0.5"; + sha256 = "0cppm8iksz4dnh4kafyfy0cqbidw83rdpgc1mksiwh9c9gaxrlq7"; isLibrary = true; isExecutable = true; buildDepends = [ Diff filepath HUnit mtl parsec split time utf8String xml ]; meta = { - homepage = "http://johnmacfarlane.net/repos/filestore"; description = "Interface for versioning file stores"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 1dcdab8988d2c480214e487fc3f60e727331df13 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 31 May 2012 07:24:44 +0000 Subject: [PATCH 129/403] haskell-gitit: updated to version 0.10 svn path=/nixpkgs/trunk/; revision=34296 --- pkgs/development/libraries/haskell/gitit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix index 14951eebbd5..8d54514fa43 100644 --- a/pkgs/development/libraries/haskell/gitit/default.nix +++ b/pkgs/development/libraries/haskell/gitit/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "gitit"; - version = "0.9.0.1"; - sha256 = "1k1z6qvp72c61yhrfma3340wf4ysjkb80f8lqapaqsyhp96qjl3m"; + version = "0.10"; + sha256 = "04p0f8my6hb61a26l0pj3dfj3zhbyxc1wamlqfm76a5w7l5pl5zb"; isLibrary = true; isExecutable = true; buildDepends = [ From 0781e6718c60c2ac4559549e71239652955279b4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 31 May 2012 07:24:47 +0000 Subject: [PATCH 130/403] haskell-highlighting-kate: updated to version 0.5.1 svn path=/nixpkgs/trunk/; revision=34297 --- .../libraries/haskell/highlighting-kate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix index 7799ae0c311..d92d15d2a16 100644 --- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix +++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "highlighting-kate"; - version = "0.5.0.6"; - sha256 = "068ksmi8kdjm00279lnnhih4sqs9yh8mnvvn71brwak5r361m056"; + version = "0.5.1"; + sha256 = "0l0g71rg7cs9rm4i04h88fm20868s0kf2da89297xlrm58zfv0jj"; isLibrary = true; isExecutable = true; buildDepends = [ blazeHtml filepath mtl parsec regexPcreBuiltin ]; From bd1c986e5b122a189b1ce736f6b6b823dd74dd7d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 31 May 2012 07:24:50 +0000 Subject: [PATCH 131/403] haskell-monad-loops: updated to version 0.3.3.0 svn path=/nixpkgs/trunk/; revision=34298 --- pkgs/development/libraries/haskell/monad-loops/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/monad-loops/default.nix b/pkgs/development/libraries/haskell/monad-loops/default.nix index 8aca5bbfc5a..ef7d6c27173 100644 --- a/pkgs/development/libraries/haskell/monad-loops/default.nix +++ b/pkgs/development/libraries/haskell/monad-loops/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "monad-loops"; - version = "0.3.2.0"; - sha256 = "0si8vz1r13lwliya161kwgrb5dpj01j74b6gbjyv78d5fd4hn7n2"; + version = "0.3.3.0"; + sha256 = "06v8wnkbjrpsy47shjy2bd8asbw6d5rgzy8z5q0jwdhira42h3v1"; buildDepends = [ stm ]; meta = { homepage = "https://github.com/mokus0/monad-loops"; From 83d7540add197fc466257cb3c0370c3874b5d614 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 31 May 2012 07:24:54 +0000 Subject: [PATCH 132/403] haskell-regex-pcre: updated to version 0.94.4 svn path=/nixpkgs/trunk/; revision=34299 --- .../development/libraries/haskell/regex-pcre/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/regex-pcre/default.nix b/pkgs/development/libraries/haskell/regex-pcre/default.nix index 39cb888748c..2b7f53e4572 100644 --- a/pkgs/development/libraries/haskell/regex-pcre/default.nix +++ b/pkgs/development/libraries/haskell/regex-pcre/default.nix @@ -2,15 +2,12 @@ cabal.mkDerivation (self: { pname = "regex-pcre"; - version = "0.94.3"; - sha256 = "0ljng60s05ssy8pi4qnpcx5c1wrn6m35d77lq0xyafmj68cg4a2r"; + version = "0.94.4"; + sha256 = "1h16w994g9s62iwkdqa7bar2n9cfixmkzz2rm8svm960qr57valf"; buildDepends = [ regexBase ]; extraLibraries = [ pcre ]; - patchPhase = '' - sed -i -e '/Include-Dirs:/d' -e '/Extra-Lib-Dirs:/d' regex-pcre.cabal - ''; meta = { - homepage = "http://sourceforge.net/projects/lazy-regex"; + homepage = "http://hackage.haskell.org/package/regex-pcre"; description = "Replaces/Enhances Text.Regex"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 2de23edd59572ae8f10b11d7d3c516ac3eae7944 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 31 May 2012 11:04:28 +0000 Subject: [PATCH 133/403] Adding LLVM 3.1. (as a separate attribute, because it seems to be API-incompatible) svn path=/nixpkgs/trunk/; revision=34300 --- pkgs/development/compilers/llvm/3.1.nix | 27 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/compilers/llvm/3.1.nix diff --git a/pkgs/development/compilers/llvm/3.1.nix b/pkgs/development/compilers/llvm/3.1.nix new file mode 100644 index 00000000000..d0c7e689113 --- /dev/null +++ b/pkgs/development/compilers/llvm/3.1.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, perl, groff, cmake, python }: + +let version = "3.1"; in + +stdenv.mkDerivation { + name = "llvm-${version}"; + + src = fetchurl { + url = "http://llvm.org/releases/${version}/llvm-${version}.src.tar.gz"; + sha256 = "1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab"; + }; + + buildInputs = [ perl groff cmake python ]; + + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; + + enableParallelBuilding = true; + + meta = { + homepage = http://llvm.org/; + description = "Collection of modular and reusable compiler and toolchain technologies"; + license = "BSD"; + maintainers = with stdenv.lib.maintainers; [viric shlevy]; + platforms = with stdenv.lib.platforms; all; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ac1bd1c0e0..1db176209d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2302,6 +2302,7 @@ let }; llvm = callPackage ../development/compilers/llvm { }; + llvm_3_1 = callPackage ../development/compilers/llvm/3.1.nix { }; mitscheme = callPackage ../development/compilers/mit-scheme { }; From f6b2f17bc3c397703ba55ad8572b3fd312b26a02 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 31 May 2012 11:26:16 +0000 Subject: [PATCH 134/403] Given that I have a vested interest in working LLVM now - add myself as maintainer svn path=/nixpkgs/trunk/; revision=34302 --- pkgs/development/compilers/llvm/3.1.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/3.1.nix b/pkgs/development/compilers/llvm/3.1.nix index d0c7e689113..204c080b871 100644 --- a/pkgs/development/compilers/llvm/3.1.nix +++ b/pkgs/development/compilers/llvm/3.1.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { homepage = http://llvm.org/; description = "Collection of modular and reusable compiler and toolchain technologies"; license = "BSD"; - maintainers = with stdenv.lib.maintainers; [viric shlevy]; + maintainers = with stdenv.lib.maintainers; [viric shlevy raskin]; platforms = with stdenv.lib.platforms; all; }; } From c2fd3c184b0c44f92f35a82840eba267bafde9eb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 31 May 2012 13:50:47 +0000 Subject: [PATCH 135/403] * Install/uninstall all RPMs in one operation. This is necessary if the RPMs have dependencies between each other. svn path=/nixpkgs/trunk/; revision=34303 --- pkgs/build-support/release/rpm-build.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/build-support/release/rpm-build.nix b/pkgs/build-support/release/rpm-build.nix index a3256769762..9ec9ace0757 100644 --- a/pkgs/build-support/release/rpm-build.nix +++ b/pkgs/build-support/release/rpm-build.nix @@ -26,24 +26,22 @@ vmTools.buildRPM ( ''; # */ postInstall = '' + declare -a rpms rpmNames for i in $out/rpms/*/*.rpm; do if echo $i | grep -vq "\.src\.rpm$"; then echo "file rpm $i" >> $out/nix-support/hydra-build-products - - echo "installing $i..." - rpm -ip "$i" --excludepath /nix/store + rpms+=($i) + rpmNames+=("$(rpm -qp "$i")") fi done + echo "installing ''${rpms[*]}..." + rpm -ip ''${rpms[*]} --excludepath /nix/store + eval "$postRPMInstall" - for i in $out/rpms/*/*.rpm; do - if echo $i | grep -vq "\.src\.rpm$"; then - rpmName="$(rpm -qp "$i")" - echo "uninstalling $rpmName..." - rpm -e "$rpmName" - fi - done + echo "uninstalling ''${rpmNames[*]}..." + rpm -e ''${rpmNames[*]} for i in $out/rpms/*/*.src.rpm; do echo "file srpm $i" >> $out/nix-support/hydra-build-products From 99e9ea69b5c7411b5898039fffcc6dd95db7d078 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 31 May 2012 15:47:38 +0000 Subject: [PATCH 136/403] hwloc: Add dependency on pciutils and numactl on Linux. svn path=/nixpkgs/trunk/; revision=34304 --- pkgs/development/libraries/hwloc/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index 230f1351d2e..76bc49fb008 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, cairo, expat, ncurses, libX11 }: +{ stdenv, fetchurl, pkgconfig, cairo, expat, ncurses, libX11 +, pciutils, numactl }: stdenv.mkDerivation rec { name = "hwloc-1.4.2"; @@ -15,7 +16,8 @@ stdenv.mkDerivation rec { # derivation and set optional dependencies to `null'. buildInputs = stdenv.lib.filter (x: x != null) ([ expat ncurses ] - ++ (stdenv.lib.optionals (!stdenv.isCygwin) [ cairo libX11 ])); + ++ (stdenv.lib.optionals (!stdenv.isCygwin) [ cairo libX11 ]) + ++ (stdenv.lib.optionals stdenv.isLinux [ pciutils numactl ])); doCheck = true; From 781666f649334e16505fbd7ec02e2e62fe886466 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 31 May 2012 16:03:49 +0000 Subject: [PATCH 137/403] Updating ethtool (we had a 5-year-old ethtool) svn path=/nixpkgs/trunk/; revision=34305 --- pkgs/tools/misc/ethtool/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix index 4c19910608e..1fc03a4ebff 100644 --- a/pkgs/tools/misc/ethtool/default.nix +++ b/pkgs/tools/misc/ethtool/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "ethtool-6"; + name = "ethtool-3.2"; src = fetchurl { - url = mirror://sourceforge/gkernel/ethtool/6/ethtool-6.tar.gz; - sha256 = "1iml9w4lrrxsg366wzdkw1wnrydpyah0lprwqf4zcxyxwxrzaijh"; + url = mirror://kernel/software/network/ethtool/ethtool-3.2.tar.xz; + sha256 = "0g9ldaba3vwlsmf490j33y3fgsmpfzxlzzblwashl448f8lcfap7"; }; } From 6bba2234c444d5ed2fb0f4f976685adaad31c42d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 31 May 2012 16:45:37 +0000 Subject: [PATCH 138/403] hwloc: Add `-L' for numactl in `libhwloc.la'. svn path=/nixpkgs/trunk/; revision=34306 --- pkgs/development/libraries/hwloc/default.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index 76bc49fb008..e86a3ccac85 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -19,6 +19,20 @@ stdenv.mkDerivation rec { ++ (stdenv.lib.optionals (!stdenv.isCygwin) [ cairo libX11 ]) ++ (stdenv.lib.optionals stdenv.isLinux [ pciutils numactl ])); + postInstall = + stdenv.lib.optionalString (stdenv.isLinux && numactl != null) + '' if [ -d "${numactl}/lib64" ] + then + numalibdir="${numactl}/lib64" + else + numalibdir="${numactl}/lib" + test -d "$numalibdir" + fi + + sed -i "$out/lib/libhwloc.la" \ + -e "s|-lnuma|-L$numalibdir -lnuna|g" + ''; + doCheck = true; meta = { From 45c8db6065f3ffb126f46860fe84cb26332f2654 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 31 May 2012 19:22:20 +0000 Subject: [PATCH 139/403] * Remove duplicate python- prefix. svn path=/nixpkgs/trunk/; revision=34308 --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 054ecd13889..37b64c097ec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1616,6 +1616,7 @@ let pythonPackages = python.modules // rec { ldap = buildPythonPackage rec { name = "python-ldap-2.4.3"; + namePrefix = ""; src = fetchurl { url = "http://pypi.python.org/packages/source/p/python-ldap/${name}.tar.gz"; From 7fda94a082acf74b28a35b7d816bcba9090020a8 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Thu, 31 May 2012 21:26:12 +0000 Subject: [PATCH 140/403] Upstream hash change svn path=/nixpkgs/trunk/; revision=34310 --- pkgs/development/ocaml-modules/pcre/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/pcre/default.nix b/pkgs/development/ocaml-modules/pcre/default.nix index 0e1774bdde3..edf605c5054 100644 --- a/pkgs/development/ocaml-modules/pcre/default.nix +++ b/pkgs/development/ocaml-modules/pcre/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.ocaml.info/ocaml_sources/pcre-ocaml-${version}.tar.gz"; - sha256 = "33ec646d8f35770e90ec333b0d4910a88668be3d53c17f227428c82c5c3c3eb7"; + sha256 = "ff41006901f5b2d06a455ec48230eb34375f2eeb8240c341e81ebba0342ee331"; }; buildInputs = [ocaml findlib]; From de6b7ac64e557a51940ed644099db8f33c07f87d Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Fri, 1 Jun 2012 06:08:29 +0000 Subject: [PATCH 141/403] Update download link for pcre-ocaml svn path=/nixpkgs/trunk/; revision=34311 --- pkgs/development/ocaml-modules/pcre/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/development/ocaml-modules/pcre/default.nix b/pkgs/development/ocaml-modules/pcre/default.nix index edf605c5054..3ddac79a9a5 100644 --- a/pkgs/development/ocaml-modules/pcre/default.nix +++ b/pkgs/development/ocaml-modules/pcre/default.nix @@ -1,16 +1,11 @@ {stdenv, fetchurl, pcre, ocaml, findlib}: -let - ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "6.2.5"; -in - stdenv.mkDerivation { - name = "ocaml-pcre-${version}"; + name = "ocaml-pcre-6.2.5"; src = fetchurl { - url = "http://www.ocaml.info/ocaml_sources/pcre-ocaml-${version}.tar.gz"; - sha256 = "ff41006901f5b2d06a455ec48230eb34375f2eeb8240c341e81ebba0342ee331"; + url = https://bitbucket.org/mmottl/pcre-ocaml/downloads/pcre-ocaml-6.2.5.tar.gz; + sha256 = "0iwfi0wmw3xbx31ri96pmrsmmn4r3h9f0k6gyk8j4pajlhl40xzi"; }; buildInputs = [ocaml findlib]; From 6cf6d405347162967405547af3d9e992ecec9b63 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Fri, 1 Jun 2012 09:42:29 +0000 Subject: [PATCH 142/403] Update OCaml sqlite3 svn path=/nixpkgs/trunk/; revision=34312 --- pkgs/development/ocaml-modules/sqlite3/default.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix index d1203e6f290..a01660216bb 100644 --- a/pkgs/development/ocaml-modules/sqlite3/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3/default.nix @@ -1,17 +1,11 @@ {stdenv, fetchurl, sqlite, ocaml, findlib}: -let - ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "1.5.8"; -in - stdenv.mkDerivation { - name = "ocaml-sqlite3-${version}"; + name = "ocaml-sqlite3-1.6.3"; src = fetchurl { - url = "http://hg.ocaml.info/release/ocaml-sqlite3/archive/" + - "release-${version}.tar.bz2"; - sha256 = "0fqbxm90mc2gk6jp9p8s53kay0hbcd0qc0adq8znanz99n8zqp53"; + url = https://bitbucket.org/mmottl/sqlite3-ocaml/downloads/sqlite3-ocaml-1.6.3.tar.gz; + sha256 = "004wysf80bmb8r4yaa648v0bqrh2ry3kzy763gdksw4n15blghv5"; }; buildInputs = [ocaml findlib]; @@ -26,7 +20,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = "http://ocaml.info/home/ocaml_sources.html#ocaml-sqlite3"; + homepage = https://bitbucket.org/mmottl/sqlite3-ocaml; description = "OCaml bindings to the SQLite 3 database access library"; license = "MIT/X11"; platforms = ocaml.meta.platforms; From 23f81c74c906b2d44f2919b815d7d53219f630b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Fri, 1 Jun 2012 12:27:20 +0000 Subject: [PATCH 143/403] Provide a shortcut for the current Haskell Platform version. svn path=/nixpkgs/trunk/; revision=34314 --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1db176209d0..510e7f057ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2203,6 +2203,8 @@ let # Current default version: 7.0.4. haskellPackages = haskellPackages_ghc704; + # Current Haskell platform. + haskellPlatform = haskellPackages.haskellPlatform; haskellPackages_ghc6104 = recurseIntoAttrs (haskell.packages_ghc6104); haskellPackages_ghc6121 = haskell.packages_ghc6121; From ad17bee255b0ce66aef7735a3376c7442ed4eb1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 1 Jun 2012 13:06:35 +0000 Subject: [PATCH 144/403] hwloc: Fix typo. svn path=/nixpkgs/trunk/; revision=34315 --- pkgs/development/libraries/hwloc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index e86a3ccac85..fd93326d5ee 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { fi sed -i "$out/lib/libhwloc.la" \ - -e "s|-lnuma|-L$numalibdir -lnuna|g" + -e "s|-lnuma|-L$numalibdir -lnuma|g" ''; doCheck = true; From 0cbfd8ff0460db231f37bd236fe8022202157427 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 1 Jun 2012 17:53:53 +0000 Subject: [PATCH 145/403] * update hashes for debian queeze svn path=/nixpkgs/trunk/; revision=34316 --- pkgs/build-support/vm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index b38ae010216..6af4a5c0574 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1300,7 +1300,7 @@ rec { fullName = "Debian 6.0.4 Squeeze (i386)"; packagesList = fetchurl { url = mirror://debian/dists/squeeze/main/binary-i386/Packages.bz2; - sha256 = "5686732aa690d80ba4c390af3f7b9ba3c3c8c17861c89bca3a3694c403d7b7e6"; + sha256 = "1aih4n1iz4gzzm5cy1j14mpx8i25jj1237994j33k7dm0gnqgr2w"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; @@ -1311,7 +1311,7 @@ rec { fullName = "Debian 6.0.4 Squeeze (amd64)"; packagesList = fetchurl { url = mirror://debian/dists/squeeze/main/binary-amd64/Packages.bz2; - sha256 = "525f919bb48a4d2d0cb3a4fb5b0d4338e7936f68753ca945358ea1c3792ea7b7"; + sha256 = "1gb3im7kl8dwd7z82xj4wb5g58r86fjj8cirvq0ssrvcm9bqaiz7"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; From 2d85463e7d93d2ccbb5a0dca02aa9060897a6529 Mon Sep 17 00:00:00 2001 From: Cillian de Roiste Date: Fri, 1 Jun 2012 22:04:08 +0000 Subject: [PATCH 146/403] Applying patch from Rok Garbas to update weechat to 0.3.7, also taking the opportunity to tidy up the style a bit. svn path=/nixpkgs/trunk/; revision=34318 --- .../networking/irc/weechat/default.nix | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index a9cf07a0b12..0fd521b9cce 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -1,18 +1,26 @@ -{stdenv, fetchurl, ncurses, openssl, perl, python, aspell}: +{ stdenv, fetchurl, ncurses, openssl, perl, python, aspell, gnutls +, zlib, curl , pkgconfig, libgcrypt, ruby, lua5, tcl, guile }: -stdenv.mkDerivation { - name = "weechat-0.3.2"; +stdenv.mkDerivation rec { + version = "0.3.7"; + name = "weechat-${version}"; src = fetchurl { - url = http://weechat.org/files/src/weechat-0.3.2.tar.gz; - sha256 = "0ds548fmiv2fg69amhyg1v1rgyw51rqlp64p3rmsbm1lkcwwmivc"; + url = "http://weechat.org/files/src/${name}.tar.gz"; + sha256 = "1bphyhx5rnirga5l42z4lijw68qx724gffic1z60jdwfxc5dxknl"; }; - buildInputs = [ncurses perl python openssl aspell]; + buildInputs = + [ ncurses perl python openssl aspell gnutls zlib curl pkgconfig + libgcrypt ruby lua5 tcl guile + ]; meta = { homepage = http://http://www.weechat.org/; description = "A fast, light and extensible chat client"; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.garbas ]; + platforms = stdenv.lib.platforms.linux; }; } - + From 0ed3babd166c1be13f822e731f20d7ea6d9002ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 2 Jun 2012 16:39:58 +0000 Subject: [PATCH 147/403] Updating btar. svn path=/nixpkgs/trunk/; revision=34320 --- 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 7fe9e5252d8..6745ed7363a 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.2"; + name = "btar-1.0.0"; src = fetchurl { url = "http://vicerveza.homeunix.net/~viric/soft/btar/${name}.tar.gz"; - sha256 = "113l5qn3qizxnv2r0w8awnm9agjsmf39fl5w9gcvrxqy021f2jd9"; + sha256 = "0k06zgwccxhzh4y99cxiwr7zylr5cwzf2dgx8bvx0gbb03r6gh9l"; }; buildInputs = [ librsync ]; From a25d4ef7029f33437a8c2a04c9f4812064e5f72a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 2 Jun 2012 17:57:31 +0000 Subject: [PATCH 148/403] Updating btar again - failed release. svn path=/nixpkgs/trunk/; revision=34321 --- pkgs/tools/backup/btar/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/backup/btar/default.nix b/pkgs/tools/backup/btar/default.nix index 6745ed7363a..6600cee96f5 100644 --- a/pkgs/tools/backup/btar/default.nix +++ b/pkgs/tools/backup/btar/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "btar-1.0.0"; src = fetchurl { url = "http://vicerveza.homeunix.net/~viric/soft/btar/${name}.tar.gz"; - sha256 = "0k06zgwccxhzh4y99cxiwr7zylr5cwzf2dgx8bvx0gbb03r6gh9l"; + sha256 = "141mqrghqmms6zpbwn9bw98q4rkxfyly950jh8hajq9d2fk5qyn1"; }; buildInputs = [ librsync ]; From 3ed5283c2de8c218bc37783287aa767200b668ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 2 Jun 2012 17:58:46 +0000 Subject: [PATCH 149/403] argh. I forgot to increase the btar version number to 1.0.1. svn path=/nixpkgs/trunk/; revision=34322 --- pkgs/tools/backup/btar/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/backup/btar/default.nix b/pkgs/tools/backup/btar/default.nix index 6600cee96f5..919b814f60a 100644 --- a/pkgs/tools/backup/btar/default.nix +++ b/pkgs/tools/backup/btar/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, librsync }: stdenv.mkDerivation rec { - name = "btar-1.0.0"; + name = "btar-1.0.1"; src = fetchurl { url = "http://vicerveza.homeunix.net/~viric/soft/btar/${name}.tar.gz"; sha256 = "141mqrghqmms6zpbwn9bw98q4rkxfyly950jh8hajq9d2fk5qyn1"; From b5d937ce33a3def1807679ed37444441106248fe Mon Sep 17 00:00:00 2001 From: Cillian de Roiste Date: Sat, 2 Jun 2012 18:00:39 +0000 Subject: [PATCH 150/403] Updating the bitcoin client to 0.6.2 svn path=/nixpkgs/trunk/; revision=34323 --- pkgs/applications/misc/bitcoin/default.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/bitcoin/default.nix b/pkgs/applications/misc/bitcoin/default.nix index de74cd6abd9..d9f5a892487 100644 --- a/pkgs/applications/misc/bitcoin/default.nix +++ b/pkgs/applications/misc/bitcoin/default.nix @@ -1,30 +1,24 @@ { fetchurl, stdenv, openssl, db4, boost, zlib, miniupnpc, qt4 }: stdenv.mkDerivation rec { - version = "0.5.0"; + version = "0.6.2"; name = "bitcoin-${version}"; src = fetchurl { - url = " https://github.com/bitcoin/bitcoin/tarball/v${version}"; - sha256 = "1i9wnbjf9yrs9rq5jnh9pk1x5j982qh3xpjm05z8dgd3nympgyy8"; + url = "mirror://sourceforge/bitcoin/bitcoin-0.6.2-linux.tar.gz"; + sha256 = "0yhgqz98hmmn6ljk23rd48jsjfvzdii27370vazhbgvjwj8giais"; }; buildInputs = [ openssl db4 boost zlib miniupnpc qt4 ]; - unpackCmd = "tar xvf $curSrc"; - - buildPhase = '' - qmake - make + configurePhase = '' cd src - make -f makefile.unix - cd .. + qmake ''; installPhase = '' mkdir -p $out/bin cp bitcoin-qt $out/bin - cp src/bitcoind $out/bin ''; meta = { From 7ea86fc8a2fc1a94b31a71519ac4d9f379610e5f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 3 Jun 2012 18:26:09 +0000 Subject: [PATCH 151/403] Updated Haskell packages. - hlint: updated to version 1.8.29 - hscolour: updated to version 1.20.2 - random-fu: updated to version 0.2.3.0 svn path=/nixpkgs/trunk/; revision=34324 --- pkgs/development/libraries/haskell/hscolour/default.nix | 4 ++-- pkgs/development/libraries/haskell/random-fu/default.nix | 4 ++-- pkgs/development/tools/haskell/hlint/default.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/hscolour/default.nix b/pkgs/development/libraries/haskell/hscolour/default.nix index c608f6341a2..2c2aa5be7e6 100644 --- a/pkgs/development/libraries/haskell/hscolour/default.nix +++ b/pkgs/development/libraries/haskell/hscolour/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hscolour"; - version = "1.19"; - sha256 = "17wzd1b7kd4di7djj8d203rn6r1zvd6rykpxhqv7j06kzgx2r7bz"; + version = "1.20.2"; + sha256 = "0jl2m2bpsqg2hnf9mmwwrpa7af8wqwaajfp2h3nnnmy5qks10ad5"; isLibrary = true; isExecutable = true; meta = { diff --git a/pkgs/development/libraries/haskell/random-fu/default.nix b/pkgs/development/libraries/haskell/random-fu/default.nix index dff11ae2033..72936308464 100644 --- a/pkgs/development/libraries/haskell/random-fu/default.nix +++ b/pkgs/development/libraries/haskell/random-fu/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "random-fu"; - version = "0.2.2.0"; - sha256 = "1wv2c6ba3ad80zyj75xfds98q7psgjkmaqk2zm0srmipq06mx92r"; + version = "0.2.3.0"; + sha256 = "17vn1dz4z00xjpsxjx2dfjnz4qhbn5cbkm2s142kdskiphgxi2f8"; buildDepends = [ erf gamma monadLoops mtl randomShuffle randomSource rvar syb transformers vector diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix index ba7cfe7a51f..3b2afdd791e 100644 --- a/pkgs/development/tools/haskell/hlint/default.nix +++ b/pkgs/development/tools/haskell/hlint/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hlint"; - version = "1.8.28"; - sha256 = "136arfmlfx15qwxvg3lw6wci8fiva1f9hjrk5qf70k9g84dxsjn8"; + version = "1.8.29"; + sha256 = "07l281106kkahdzgilhh2njjirll0mhr318i3zmhn2ygcb9dvkdr"; isLibrary = true; isExecutable = true; buildDepends = [ From 1a024eabbcd11356699f15b510c73390d292634c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 3 Jun 2012 18:26:12 +0000 Subject: [PATCH 152/403] haskell-packages.nix: Haskell Platform version 2012.2.0.0 is out. Renamed 'haskellPlatformArgs_future' to 'haskellPlatformArgs_2012_2_0_0'. svn path=/nixpkgs/trunk/; revision=34325 --- pkgs/top-level/haskell-defaults.nix | 2 +- pkgs/top-level/haskell-packages.nix | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 96744b4ee30..37f6d580d30 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -18,7 +18,7 @@ ghcHEADPrefs = ghc741Prefs; ghc741Prefs = - self : self.haskellPlatformArgs_future self // { + self : self.haskellPlatformArgs_2012_2_0_0 self // { haskellPlatform = self.haskellPlatform_2012_2_0_0; mtl1 = self.mtl_1_1_1_1; # 7.2 ok, 7.3 ok binary = null; # now a core package diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 141768b91a7..04007c22946 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -118,10 +118,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); # NOTE: 2011.4.0.0 is the current default. - # These are currently set to versions that will likely be in - # the next platform release (May 2012). Please update with - # care. - haskellPlatformArgs_future = self : { + haskellPlatformArgs_2012_2_0_0 = self : { inherit (self) cabal ghc; cgi = self.cgi_3001_1_7_4; # 7.4.1 ok fgl = self.fgl_5_4_2_4; # 7.4.1 ok @@ -152,10 +149,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haddock = self.haddock_2_10_0; # 7.4.1 ok }; - # This is still a prerelease. haskellPlatform_2012_2_0_0 = callPackage ../development/libraries/haskell/haskell-platform/2012.2.0.0.nix - (self.haskellPlatformArgs_future self); + (self.haskellPlatformArgs_2012_2_0_0 self); haskellPlatformArgs_2011_4_0_0 = self : { inherit (self) cabal ghc; From 53d7bcb2060b41245ee4954c6023578e73996255 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 3 Jun 2012 18:26:15 +0000 Subject: [PATCH 153/403] haskell-packages.nix: cosmetic, no functional change Re-ordered entries in haskellPlatformArgs_2012_2_0_0 to match the order in the Cabal file. This makes it easier to compare the package list side by side. svn path=/nixpkgs/trunk/; revision=34326 --- pkgs/top-level/haskell-packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 04007c22946..8a120ce3ca3 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -125,28 +125,28 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); GLUT = self.GLUT_2_1_2_1; # 7.4.1 ok haskellSrc = self.haskellSrc_1_0_1_5; # 7.4.1 ok html = self.html_1_0_1_2; # 7.4.1 ok + HTTP = self.HTTP_4000_2_3; # 7.4.1 ok HUnit = self.HUnit_1_2_4_2; # 7.4.1 ok + mtl = self.mtl_2_1_1; # 7.4.1 ok network = self.network_2_3_0_13; # 7.4.1 ok OpenGL = self.OpenGL_2_2_3_1; # 7.4.1 ok parallel = self.parallel_3_2_0_2; # 7.4.1 ok parsec = self.parsec_3_1_2; # 7.4.1 ok QuickCheck = self.QuickCheck_2_4_2; # 7.4.1 ok + random = self.random_1_0_1_1; # 7.4.1 ok regexBase = self.regexBase_0_93_2; # 7.4.1 ok regexCompat = self.regexCompat_0_95_1; # 7.4.1 ok regexPosix = self.regexPosix_0_95_1; # 7.4.1 ok stm = self.stm_2_3; # 7.4.1 ok syb = self.syb_0_3_6_1; # 7.4.1 ok - xhtml = self.xhtml_3000_2_1; # 7.4.1 ok - zlib = self.zlib_0_5_3_3; # 7.4.1 ok - HTTP = self.HTTP_4000_2_3; # 7.4.1 ok text = self.text_0_11_2_0; # 7.4.1 ok transformers = self.transformers_0_3_0_0; # 7.4.1 ok - mtl = self.mtl_2_1_1; # 7.4.1 ok - random = self.random_1_0_1_1; # 7.4.1 ok + xhtml = self.xhtml_3000_2_1; # 7.4.1 ok + zlib = self.zlib_0_5_3_3; # 7.4.1 ok cabalInstall = self.cabalInstall_0_14_0; # 7.4.1 ok alex = self.alex_3_0_1; # 7.4.1 ok - happy = self.happy_1_18_9; # 7.4.1 ok haddock = self.haddock_2_10_0; # 7.4.1 ok + happy = self.happy_1_18_9; # 7.4.1 ok }; haskellPlatform_2012_2_0_0 = From 678c30c050d0b7d0fa433f827edbb9cd793dceb3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 3 Jun 2012 18:52:38 +0000 Subject: [PATCH 154/403] xmobar: re-generated expression with the latest version of Cabal2Nix This change enables wireless support unconditionally. svn path=/nixpkgs/trunk/; revision=34327 --- pkgs/applications/misc/xmobar/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix index 864e479cc10..9df8f9c49e3 100644 --- a/pkgs/applications/misc/xmobar/default.nix +++ b/pkgs/applications/misc/xmobar/default.nix @@ -1,9 +1,7 @@ { cabal, filepath, libXrandr, mtl, parsec, stm, time, utf8String -, X11, X11Xft, wirelessSupport ? false, wirelesstools ? null +, wirelesstools, X11, X11Xft }: -assert wirelessSupport -> wirelesstools != null; - cabal.mkDerivation (self: { pname = "xmobar"; version = "0.14"; @@ -12,9 +10,9 @@ cabal.mkDerivation (self: { isExecutable = true; buildDepends = [ filepath mtl parsec stm time utf8String X11 X11Xft - ] ++ self.stdenv.lib.optional wirelessSupport wirelesstools; - extraLibraries = [ libXrandr ]; - configureFlags = ["-fwith_xft"] ++ self.stdenv.lib.optional wirelessSupport "-fwith_iwlib"; + ]; + extraLibraries = [ libXrandr wirelesstools ]; + configureFlags = "-fwith_xft -fwith_iwlib"; meta = { homepage = "http://projects.haskell.org/xmobar/"; description = "A Minimalistic Text Based Status Bar"; From b89f433951358209d30bd2aecd3403c152c9f36b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 3 Jun 2012 18:52:43 +0000 Subject: [PATCH 155/403] haskell-reactive-banana-wx: re-generated expression with the latest version of Cabal2Nix The package won't compile when 'buildExamples' is enabled. First of all, it depends on an ancient version of the 'executable-path' library. That problem can be remedied by adding patchPhase = '' sed -i -e 's|executable-path == 0.0.\*|executable-path|' reactive-banana-wx.cabal ''; ..., but even then it won't build because the Cabal file doesn't declare all dependencies properly. Both GHC 7.0.4 and 7.4.1 fail complaining about the absence of Prelude. svn path=/nixpkgs/trunk/; revision=34328 --- .../haskell/reactive-banana-wx/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix b/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix index 5459a2cab72..c07d405045c 100644 --- a/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix +++ b/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix @@ -1,22 +1,18 @@ -{ cabal, cabalMacosx, reactiveBanana, wx, wxcore, buildExamples ? false, executablePath ? null}: +{ cabal, cabalMacosx, reactiveBanana, wx, wxcore }: -assert buildExamples -> executablePath != null; - -cabal.mkDerivation (self: - let lib = self.stdenv.lib; - in - { +cabal.mkDerivation (self: { pname = "reactive-banana-wx"; version = "0.6.0.0"; sha256 = "1pxcymh6xpmbkbc8i2hvjbki9s81mx69wrp8nl1i0y4pppzi8ihp"; isLibrary = true; isExecutable = true; - buildDepends = [ cabalMacosx reactiveBanana wx wxcore ] ++ lib.optional buildExamples executablePath; - configureFlags = lib.optionalString buildExamples "-fbuildExamples"; + buildDepends = [ cabalMacosx reactiveBanana wx wxcore ]; + configureFlags = "-f-buildExamples"; meta = { homepage = "http://haskell.org/haskellwiki/Reactive-banana"; description = "Examples for the reactive-banana library, using wxHaskell"; - license = lib.licenses.bsd3; + license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) From f3649161ec91c0fd72b6f18065dd63143cfd38ec Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 3 Jun 2012 18:57:30 +0000 Subject: [PATCH 156/403] haskell-cabal2nix: updated to version 1.33 svn path=/nixpkgs/trunk/; revision=34329 --- pkgs/development/tools/haskell/cabal2nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index 4efe8d70027..bf647013e5a 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.32"; - sha256 = "03wjkhcbqkv7ky0a9r5qajandk8jqi5q0nahz4ywzf96cwlz9vw9"; + version = "1.33"; + sha256 = "0fqbrl6ih0ngj15pfydhaffm3wlq5584z0sv308gkff13hplci2k"; isLibrary = false; isExecutable = true; buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ]; From ca5dfc96348f6092812353cea8ec1661f41ec160 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Sun, 3 Jun 2012 22:11:09 +0000 Subject: [PATCH 157/403] obnam 1.0 obnam is a backup program with support for deduplication, compression and encryption. See http://liw.fi/obnam/. svn path=/nixpkgs/trunk/; revision=34331 --- pkgs/lib/maintainers.nix | 1 + pkgs/top-level/python-packages.nix | 102 +++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+) diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index dcfc47a456a..20d6d2517f6 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -26,6 +26,7 @@ piotr = "Piotr Pietraszkiewicz "; qknight = "Joachim Schiele "; raskin = "Michael Raskin <7c6f434c@mail.ru>"; + rickynils = "Rickard Nilsson "; rob = "Rob Vermaas "; roconnor = "Russell O'Connor "; sander = "Sander van der Burg "; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 37b64c097ec..119e2f71c30 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2597,4 +2597,106 @@ let pythonPackages = python.modules // rec { }; }; + cliapp = buildPythonPackage rec { + name = "cliapp-0.29"; + + src = fetchurl rec { + url = "http://code.liw.fi/debian/pool/main/p/python-cliapp/python-cliapp_0.29.orig.tar.gz"; + sha256 = "4a3f2e1705c5e9ac5a80a460ae9bad8e88c0778f7013638eda39e3ee0dd008b2"; + }; + + buildInputs = [ sphinx ]; + + doCheck = false; + + meta = { + homepage = http://liw.fi/cliapp/; + description = "Python framework for Unix command line programs."; + maintainers = [ stdenv.lib.maintainers.rickynils ]; + platforms = python.meta.platforms; + }; + }; + + tracing = buildPythonPackage rec { + name = "tracing-0.6"; + + src = fetchurl rec { + url = "http://code.liw.fi/debian/pool/main/p/python-tracing/python-tracing_0.6.orig.tar.gz"; + sha256 = "1164cf05891f9bca93fb87413f32d2c4da90348adbf69b0ad36a464b7adcd354"; + }; + + buildInputs = [ sphinx ]; + + doCheck = false; + + meta = { + homepage = http://liw.fi/tracing/; + description = "Python debug logging helper."; + maintainers = [ stdenv.lib.maintainers.rickynils ]; + platforms = python.meta.platforms; + }; + }; + + ttystatus = buildPythonPackage rec { + name = "ttystatus-0.18"; + + src = fetchurl rec { + url = "http://code.liw.fi/debian/pool/main/p/python-ttystatus/python-ttystatus_0.18.orig.tar.gz"; + sha256 = "9fab747f3e1f474b66101354b06f943120d72d1f1e353b4692e7e6cca226b9cc"; + }; + + buildInputs = [ sphinx ]; + + doCheck = false; + + meta = { + homepage = http://liw.fi/ttystatus/; + description = "Progress and status updates on terminals for Python."; + maintainers = [ stdenv.lib.maintainers.rickynils ]; + platforms = python.meta.platforms; + }; + }; + + larch = buildPythonPackage rec { + name = "larch-0.31"; + + src = fetchurl rec { + url = "http://code.liw.fi/debian/pool/main/p/python-larch/python-larch_0.31.orig.tar.gz"; + sha256 = "18c243a45b35974c304c9b3d8b05718f1272f14c29cd3c9010800cf821064444"; + }; + + buildInputs = [ sphinx ]; + propagatedBuildInputs = [ tracing ttystatus cliapp ]; + + doCheck = false; + + meta = { + homepage = http://liw.fi/larch/; + description = "Python B-tree library."; + maintainers = [ stdenv.lib.maintainers.rickynils ]; + platforms = python.meta.platforms; + }; + }; + + obnam = buildPythonPackage rec { + name = "obnam-1.0"; + + src = fetchurl rec { + url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_1.0.orig.tar.gz"; + sha256 = "b3589aac8d97283e44ed8e8c8cf751c4e9cc0677d433a85e27bd42f0d54da623"; + }; + + buildInputs = [ sphinx pkgs.attr ]; + propagatedBuildInputs = [ paramiko tracing ttystatus cliapp larch ]; + + doCheck = false; + + meta = { + homepage = http://liw.fi/obnam/; + description = "A backup program supporting deduplication, compression and encryption."; + maintainers = [ stdenv.lib.maintainers.rickynils ]; + platforms = python.meta.platforms; + }; + }; + }; in pythonPackages From 1d828ffaab22825af408c245ca5df18bdc376f15 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 Jun 2012 03:21:12 +0000 Subject: [PATCH 158/403] * systemd: use units in /etc rather than $out/etc. Also fix references to mount/umount. svn path=/nixpkgs/trunk/; revision=34332 --- pkgs/os-specific/linux/systemd/default.nix | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 27612ec50a4..142df5baddb 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, gperf, libcap, udev, dbus, kmod -, xz, pam, acl, cryptsetup, libuuid, m4 }: +, xz, pam, acl, cryptsetup, libuuid, m4, utillinux }: stdenv.mkDerivation rec { name = "systemd-44"; @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" + "--sysconfdir=/etc" "--with-distro=other" "--with-rootprefix=$(out)" "--with-rootprefix=$(out)" @@ -25,7 +26,24 @@ stdenv.mkDerivation rec { "--with-dbussessionservicedir=$(out)/share/dbus-1/services" ]; - installFlags = "localstatedir=$(TMPDIR)/var"; + preConfigure = + '' + for i in units/remount-rootfs.service src/remount-api-vfs.c src/mount.c; do + substituteInPlace $i \ + --replace /bin/mount ${utillinux}/bin/mount \ + --replace /bin/umount ${utillinux}/bin/umount + done + ''; + + installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc"; + + # Get rid of configuration-specific data. + postInstall = + '' + mkdir -p $out/example/systemd + mv $out/lib/{modules-load.d,binfmt.d,sysctl.d,tmpfiles.d} $out/example + mv $out/lib/systemd/{system,user} $out/example/systemd + ''; enableParallelBuilding = true; From 6ed8a76ac64c88df0df3f01b536498983ad5ad23 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 Jun 2012 03:24:14 +0000 Subject: [PATCH 159/403] * Nixpkgs 0.14 release notes. svn path=/nixpkgs/trunk/; revision=34333 --- doc/release-notes.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/doc/release-notes.xml b/doc/release-notes.xml index f8a4e83c8b5..0551b36cdbf 100644 --- a/doc/release-notes.xml +++ b/doc/release-notes.xml @@ -5,6 +5,21 @@ Nixpkgs Release Notes +
Release 0.14 (June 4, 2012) + +In preparation for the switch from Subversion to Git, this +release is mainly the prevent the Nixpkgs version number from going +backwards. (This would happen because prerelease version numbers +produced for the Git repository are lower than those for the +Subversion repository.) + +Since the last release, there have been thousands of changes and +new packages by numerous contributors. For details, see the commit +logs. + +
+ +
Release 0.13 (February 5, 2010) As always, there are many changes. Some of the most important From 3761afc91a4e104db239e16ed3c59113d9d81a11 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 Jun 2012 03:53:25 +0000 Subject: [PATCH 160/403] * Bump version number. svn path=/nixpkgs/trunk/; revision=34334 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index c64601b23de..9f8e9b69a33 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.14 \ No newline at end of file +1.0 \ No newline at end of file From 887c89cc33706d47351fa143626d5af2bc48f210 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 Jun 2012 04:12:17 +0000 Subject: [PATCH 161/403] * Include the Git shortrev in the version number. * Less verbose output in the tarball job. svn path=/nixpkgs/trunk/; revision=34335 --- pkgs/top-level/make-tarball.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index b3c29c26746..d2f74fe74c0 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -2,17 +2,20 @@ also builds the documentation and tests whether the Nix expressions evaluate correctly. */ -{ nixpkgs ? {outPath = (import ./all-packages.nix {}).lib.cleanSource ../..; rev = 1234;} +{ nixpkgs ? { outPath = (import ./all-packages.nix {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } , officialRelease ? false }: with import nixpkgs.outPath {}; -releaseTools.makeSourceTarball { +releaseTools.sourceTarball { name = "nixpkgs-tarball"; src = nixpkgs; inherit officialRelease; + version = builtins.readFile ../../VERSION; + versionSuffix = if officialRelease then "" else "pre${toString nixpkgs.revCount}_${nixpkgs.shortRev}"; + buildInputs = [ lzma libxml2 # Needed for the release notes. @@ -24,7 +27,7 @@ releaseTools.makeSourceTarball { configurePhase = '' eval "$preConfigure" - releaseName=nixpkgs-$(cat $src/VERSION)$VERSION_SUFFIX + releaseName=nixpkgs-$VERSION$VERSION_SUFFIX echo "release name is $releaseName" echo $releaseName > relname ''; @@ -57,7 +60,7 @@ releaseTools.makeSourceTarball { header "checking pkgs/top-level/all-packages.nix on $platform" nix-env --readonly-mode -f pkgs/top-level/all-packages.nix \ --show-trace --argstr system "$platform" \ - -qa \* --drv-path --system-filter \* --system --meta --xml + -qa \* --drv-path --system-filter \* --system --meta --xml > /dev/null stopNest done From 0d719146a20449491a4ad21826122c3290716b36 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Mon, 4 Jun 2012 05:02:31 +0000 Subject: [PATCH 162/403] Moved obnam from pythonPackages to pkgs. svn path=/nixpkgs/trunk/; revision=34336 --- pkgs/tools/backup/obnam/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 21 --------------------- tools/backup/obnam/default.nix | 0 4 files changed, 25 insertions(+), 21 deletions(-) create mode 100644 pkgs/tools/backup/obnam/default.nix create mode 100644 tools/backup/obnam/default.nix diff --git a/pkgs/tools/backup/obnam/default.nix b/pkgs/tools/backup/obnam/default.nix new file mode 100644 index 00000000000..c70e8054c7c --- /dev/null +++ b/pkgs/tools/backup/obnam/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, python, pythonPackages, pycrypto, attr }: + +pythonPackages.buildPythonPackage { + name = "obnam-1.0"; + namePrefix = ""; + + src = fetchurl rec { + url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_1.0.orig.tar.gz"; + sha256 = "b3589aac8d97283e44ed8e8c8cf751c4e9cc0677d433a85e27bd42f0d54da623"; + }; + + buildInputs = [ pythonPackages.sphinx attr ]; + propagatedBuildInputs = [ pycrypto pythonPackages.paramiko pythonPackages.tracing pythonPackages.ttystatus pythonPackages.cliapp pythonPackages.larch ]; + + doCheck = false; + + meta = { + homepage = http://liw.fi/obnam/; + description = "A backup program supporting deduplication, compression and encryption."; + maintainers = [ stdenv.lib.maintainers.rickynils ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 510e7f057ea..9850ce2b00e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1143,6 +1143,8 @@ let obexftp = callPackage ../tools/bluetooth/obexftp { }; + obnam = callPackage ../tools/backup/obnam { }; + odt2txt = callPackage ../tools/text/odt2txt { }; offlineimap = callPackage ../tools/networking/offlineimap { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 119e2f71c30..cfd15c7105f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2678,25 +2678,4 @@ let pythonPackages = python.modules // rec { }; }; - obnam = buildPythonPackage rec { - name = "obnam-1.0"; - - src = fetchurl rec { - url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_1.0.orig.tar.gz"; - sha256 = "b3589aac8d97283e44ed8e8c8cf751c4e9cc0677d433a85e27bd42f0d54da623"; - }; - - buildInputs = [ sphinx pkgs.attr ]; - propagatedBuildInputs = [ paramiko tracing ttystatus cliapp larch ]; - - doCheck = false; - - meta = { - homepage = http://liw.fi/obnam/; - description = "A backup program supporting deduplication, compression and encryption."; - maintainers = [ stdenv.lib.maintainers.rickynils ]; - platforms = python.meta.platforms; - }; - }; - }; in pythonPackages diff --git a/tools/backup/obnam/default.nix b/tools/backup/obnam/default.nix new file mode 100644 index 00000000000..e69de29bb2d From 4fdbd75e4fe5e50d2c228691319f8c3d86e96f9b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Jun 2012 09:24:14 +0000 Subject: [PATCH 163/403] Updated Haskell packages. - ghc-mod: updated to version 1.10.16 - network: added version 2.3.0.14 - pandoc: updated to version 1.9.4 - xmobar: updated to version 0.15 svn path=/nixpkgs/trunk/; revision=34337 --- pkgs/applications/misc/xmobar/default.nix | 4 ++-- .../libraries/haskell/ghc-mod/default.nix | 20 +++++++++---------- .../libraries/haskell/network/2.3.0.14.nix | 15 ++++++++++++++ .../libraries/haskell/pandoc/default.nix | 4 ++-- pkgs/top-level/haskell-packages.nix | 3 ++- 5 files changed, 30 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/libraries/haskell/network/2.3.0.14.nix diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix index 9df8f9c49e3..3b46fcef8b4 100644 --- a/pkgs/applications/misc/xmobar/default.nix +++ b/pkgs/applications/misc/xmobar/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "xmobar"; - version = "0.14"; - sha256 = "1y26b2a5v9hxv1zmjcb4m8j9qkqdn74mqc3q58vgp5cav45rphvh"; + version = "0.15"; + sha256 = "1wa141bf3krzr8qcd9cyix3cflbw1yr1l3299ashjs7skqnjadcl"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index b95d1e6d73b..ca033a36556 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ghc-mod"; - version = "1.10.15"; - sha256 = "1ywsv8nxd5040k3v5r9kf4zb0myicnjg6yckxmp6xnvf5glylylm"; + version = "1.10.16"; + sha256 = "1fk4r0zxbgmnk67ra5agfiik8yysvii51r8ikkz0xmi6r3hrf21m"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -14,14 +14,13 @@ cabal.mkDerivation (self: { ]; buildTools = [ emacs ]; postInstall = '' - cd $out/share/$pname-$version - make - rm Makefile - cd .. - ensureDir "$out/share/emacs" - mv $pname-$version emacs/site-lisp - ''; - + cd $out/share/$pname-$version + make + rm Makefile + cd .. + ensureDir "$out/share/emacs" + mv $pname-$version emacs/site-lisp + ''; meta = { homepage = "http://www.mew.org/~kazu/proj/ghc-mod/"; description = "Happy Haskell programming on Emacs/Vim"; @@ -30,7 +29,6 @@ cabal.mkDerivation (self: { maintainers = [ self.stdenv.lib.maintainers.andres self.stdenv.lib.maintainers.bluescreen303 - self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/network/2.3.0.14.nix b/pkgs/development/libraries/haskell/network/2.3.0.14.nix new file mode 100644 index 00000000000..bbc43abc42b --- /dev/null +++ b/pkgs/development/libraries/haskell/network/2.3.0.14.nix @@ -0,0 +1,15 @@ +{ cabal, parsec }: + +cabal.mkDerivation (self: { + pname = "network"; + version = "2.3.0.14"; + sha256 = "0naqg7ai50m3p093mi342w2z0flaagarf9n9smkn1dqvq8jg75x5"; + buildDepends = [ parsec ]; + meta = { + homepage = "http://github.com/haskell/network"; + description = "Low-level networking interface"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index 5f30b407491..fba804bb69b 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "pandoc"; - version = "1.9.3"; - sha256 = "0dhzzx91ljmrcmi3znz1xvj3gwma5z5bwc4fsp5y8zd5yyb9b4j0"; + version = "1.9.4"; + sha256 = "0rqj9a3pkbhlqsmpxvjzahn992lm1pdg1bry677y8f5203ji10p2"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8a120ce3ca3..3f54d698ca2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1022,7 +1022,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); network_2_3_0_2 = callPackage ../development/libraries/haskell/network/2.3.0.2.nix {}; network_2_3_0_5 = callPackage ../development/libraries/haskell/network/2.3.0.5.nix {}; network_2_3_0_13 = callPackage ../development/libraries/haskell/network/2.3.0.13.nix {}; - network = self.network_2_3_0_13; + network_2_3_0_14 = callPackage ../development/libraries/haskell/network/2.3.0.13.nix {}; + network = self.network_2_3_0_14; networkConduit = callPackage ../development/libraries/haskell/network-conduit {}; From 9a59fdb41689752b1a77573ce4a14188068c9e1c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Jun 2012 09:24:18 +0000 Subject: [PATCH 164/403] haskell-packages.nix: added 'haskellPlatformArgs_future' configuration that has the latest version of the network library svn path=/nixpkgs/trunk/; revision=34338 --- pkgs/top-level/haskell-packages.nix | 32 +++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3f54d698ca2..e2b456aa015 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -118,6 +118,38 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); # NOTE: 2011.4.0.0 is the current default. + haskellPlatformArgs_future = self : { + inherit (self) cabal ghc; + cgi = self.cgi_3001_1_7_4; # 7.4.1 ok + fgl = self.fgl_5_4_2_4; # 7.4.1 ok + GLUT = self.GLUT_2_1_2_1; # 7.4.1 ok + haskellSrc = self.haskellSrc_1_0_1_5; # 7.4.1 ok + html = self.html_1_0_1_2; # 7.4.1 ok + HTTP = self.HTTP_4000_2_3; # 7.4.1 ok + HUnit = self.HUnit_1_2_4_2; # 7.4.1 ok + mtl = self.mtl_2_1_1; # 7.4.1 ok + network = self.network_2_3_0_14; # 7.4.1 ok + OpenGL = self.OpenGL_2_2_3_1; # 7.4.1 ok + parallel = self.parallel_3_2_0_2; # 7.4.1 ok + parsec = self.parsec_3_1_2; # 7.4.1 ok + QuickCheck = self.QuickCheck_2_4_2; # 7.4.1 ok + random = self.random_1_0_1_1; # 7.4.1 ok + regexBase = self.regexBase_0_93_2; # 7.4.1 ok + regexCompat = self.regexCompat_0_95_1; # 7.4.1 ok + regexPosix = self.regexPosix_0_95_1; # 7.4.1 ok + stm = self.stm_2_3; # 7.4.1 ok + syb = self.syb_0_3_6_1; # 7.4.1 ok + text = self.text_0_11_2_0; # 7.4.1 ok + transformers = self.transformers_0_3_0_0; # 7.4.1 ok + xhtml = self.xhtml_3000_2_1; # 7.4.1 ok + zlib = self.zlib_0_5_3_3; # 7.4.1 ok + cabalInstall = self.cabalInstall_0_14_0; # 7.4.1 ok + alex = self.alex_3_0_1; # 7.4.1 ok + haddock = self.haddock_2_10_0; # 7.4.1 ok + happy = self.happy_1_18_9; # 7.4.1 ok + }; + + haskellPlatformArgs_2012_2_0_0 = self : { inherit (self) cabal ghc; cgi = self.cgi_3001_1_7_4; # 7.4.1 ok From 1495e5ac1e080ef449a766c4f35de5b3dc10357e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Jun 2012 09:24:22 +0000 Subject: [PATCH 165/403] haskell-packages.nix: build xmobar with STM 2.3 This is the default in HP 2012.2.0.0, but GHC 7.0.4 still uses an older version. svn path=/nixpkgs/trunk/; revision=34339 --- pkgs/top-level/haskell-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e2b456aa015..aa484c0a30a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1669,7 +1669,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); }; }; - xmobar = callPackage ../applications/misc/xmobar {}; + xmobar = callPackage ../applications/misc/xmobar { + stm = self.stm_2_3; + }; xmonad = callPackage ../applications/window-managers/xmonad { X11 = self.X11_1_5_0_1; From c63096c9a9128f65690a36a37151b549af8c3b8c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Jun 2012 09:46:16 +0000 Subject: [PATCH 166/403] haskell-filestore: disable Haddock phase to fix build with GHC 7.0.4 svn path=/nixpkgs/trunk/; revision=34340 --- pkgs/development/libraries/haskell/filestore/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix index ac891fa8bd6..355c6ef876c 100644 --- a/pkgs/development/libraries/haskell/filestore/default.nix +++ b/pkgs/development/libraries/haskell/filestore/default.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { buildDepends = [ Diff filepath HUnit mtl parsec split time utf8String xml ]; + noHaddock = true; meta = { description = "Interface for versioning file stores"; license = self.stdenv.lib.licenses.bsd3; From 2e8c5de358f83be7d89ad3cd2be96d32d1b9afe6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Jun 2012 09:46:20 +0000 Subject: [PATCH 167/403] haskell-defaults.nix: updated mtl1 to the latest 1.x version (and override that choice in older compilers if necessary) svn path=/nixpkgs/trunk/; revision=34341 --- pkgs/top-level/haskell-defaults.nix | 7 +++---- pkgs/top-level/haskell-packages.nix | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 37f6d580d30..7db61f4f63e 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -20,7 +20,6 @@ ghc741Prefs = self : self.haskellPlatformArgs_2012_2_0_0 self // { haskellPlatform = self.haskellPlatform_2012_2_0_0; - mtl1 = self.mtl_1_1_1_1; # 7.2 ok, 7.3 ok binary = null; # now a core package }; @@ -31,7 +30,6 @@ ghc704Prefs = self : self.haskellPlatformArgs_2011_4_0_0 self // { haskellPlatform = self.haskellPlatform_2011_4_0_0; - mtl1 = self.mtl_1_1_1_1; repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; }; monadPar = self.monadPar_0_1_0_3; @@ -40,7 +38,6 @@ ghc703Prefs = self : self.haskellPlatformArgs_2011_2_0_1 self // { haskellPlatform = self.haskellPlatform_2011_2_0_1; - mtl1 = self.mtl_1_1_1_1; repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; }; monadPar = self.monadPar_0_1_0_3; @@ -51,7 +48,6 @@ ghc701Prefs = self : self.haskellPlatformArgs_2011_2_0_0 self // { haskellPlatform = self.haskellPlatform_2011_2_0_0; - mtl1 = self.mtl_1_1_1_1; repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; }; monadPar = self.monadPar_0_1_0_3; @@ -62,6 +58,7 @@ ghc6122Prefs = self : self.haskellPlatformArgs_2010_2_0_0 self // { haskellPlatform = self.haskellPlatform_2010_2_0_0; + mtl1 = self.mtl_1_1_0_2; repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; }; monadPar = self.monadPar_0_1_0_3; @@ -72,6 +69,7 @@ ghc6121Prefs = self : self.haskellPlatformArgs_2010_1_0_0 self // { haskellPlatform = self.haskellPlatform_2010_1_0_0; + mtl1 = self.mtl_1_1_0_2; extensibleExceptions = self.extensibleExceptions_0_1_1_0; repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u deepseq = self.deepseq_1_1_0_2; @@ -82,6 +80,7 @@ ghc6104Prefs = self : self.haskellPlatformArgs_2009_2_0_2 self // { haskellPlatform = self.haskellPlatform_2009_2_0_2; + mtl1 = self.mtl_1_1_0_2; extensibleExceptions = self.extensibleExceptions_0_1_1_0; text = self.text_0_11_0_6; repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index aa484c0a30a..cd42de321c2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1029,7 +1029,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); mtl_2_1_1 = callPackage ../development/libraries/haskell/mtl/2.1.1.nix { transformers = self.transformers_0_3_0_0; }; - mtl1 = self.mtl_1_1_0_2; + mtl1 = self.mtl_1_1_1_1; mtl2 = self.mtl_2_1_1; mtl = self.mtl2; From a92f3fac240a857e5542bca1ac9b28abae244f7f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Jun 2012 09:46:23 +0000 Subject: [PATCH 168/403] haskell-packages.nix: oops, fixed typo committed earlier svn path=/nixpkgs/trunk/; revision=34342 --- pkgs/top-level/haskell-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index cd42de321c2..a34830e3e2f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1054,7 +1054,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); network_2_3_0_2 = callPackage ../development/libraries/haskell/network/2.3.0.2.nix {}; network_2_3_0_5 = callPackage ../development/libraries/haskell/network/2.3.0.5.nix {}; network_2_3_0_13 = callPackage ../development/libraries/haskell/network/2.3.0.13.nix {}; - network_2_3_0_14 = callPackage ../development/libraries/haskell/network/2.3.0.13.nix {}; + network_2_3_0_14 = callPackage ../development/libraries/haskell/network/2.3.0.14.nix {}; network = self.network_2_3_0_14; networkConduit = callPackage ../development/libraries/haskell/network-conduit {}; From f0b9f401ae0f0029707a6275ece65d72a372b619 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Jun 2012 09:46:26 +0000 Subject: [PATCH 169/403] haskell-defaults.nix: switched ghc-7.5 pre-release to 'future' configuration svn path=/nixpkgs/trunk/; revision=34343 --- pkgs/top-level/haskell-defaults.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 7db61f4f63e..9ff9c91aacc 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -15,7 +15,10 @@ # Change these if you want to change the default versions of packages being used # for a particular GHC version. - ghcHEADPrefs = ghc741Prefs; + ghcHEADPrefs = + self : self.haskellPlatformArgs_future self // { + binary = null; # now a core package + }; ghc741Prefs = self : self.haskellPlatformArgs_2012_2_0_0 self // { From ce10ebebac6c484acc7f45f8cd4b2d56428037db Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 Jun 2012 15:40:25 +0000 Subject: [PATCH 170/403] * Subversion 1.7.5. svn path=/nixpkgs/trunk/; revision=34348 --- pkgs/applications/version-management/subversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 30b15f833d9..50a5ae8f6c3 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -21,13 +21,13 @@ assert compressionSupport -> neon.compressionSupport; stdenv.mkDerivation rec { - version = "1.7.4"; + version = "1.7.5"; name = "subversion-${version}"; src = fetchurl { url = "mirror://apache/subversion//${name}.tar.bz2"; - sha1 = "57a3cd351c1dbedddd020e7a1952df6cd2674527"; + sha1 = "05c079762690d5ac1ccd2549742e7ef70fa45cf1"; }; buildInputs = [ zlib apr aprutil sqlite ] From 104bd01e1def19d6e357689af3f57ef5740d5f8f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 Jun 2012 15:54:57 +0000 Subject: [PATCH 171/403] * Git 1.7.10.4. svn path=/nixpkgs/trunk/; revision=34349 --- .../version-management/git-and-tools/git/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 64f9cf36270..a898cc5f6da 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -8,15 +8,19 @@ }: let - version = "1.7.9.5"; + + version = "1.7.10.4"; + svn = subversionClient.override { perlBindings = true; }; + in + stdenv.mkDerivation { name = "git-${version}"; src = fetchurl { url = "http://git-core.googlecode.com/files/git-${version}.tar.gz"; - sha256 = "0nap6z8kfl61hx0h64ylk0x8786fxk31prdv7zk14ljbihs55p9x"; + sha256 = "1pd8vd9bgvai3n7xw7b11i7gznjma2pb97d29k304wk89mj57kkp"; }; patches = [ ./docbook2texi.patch ]; From 27bef25b17953d9749d50b6917d712172ab8e6ea Mon Sep 17 00:00:00 2001 From: Cillian de Roiste Date: Mon, 4 Jun 2012 17:38:47 +0000 Subject: [PATCH 172/403] Applying the patch from Rok Garbas to add GIMP 2.8.0 svn path=/nixpkgs/trunk/; revision=34352 --- pkgs/applications/graphics/gimp/2.8.0.nix | 33 +++++++++++++++++++ pkgs/development/libraries/babl/0.1.10.nix | 16 +++++++++ pkgs/development/libraries/gegl/0.2.0.nix | 24 ++++++++++++++ .../development/libraries/geoclue/default.nix | 2 +- pkgs/top-level/all-packages.nix | 12 +++++++ 5 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/graphics/gimp/2.8.0.nix create mode 100644 pkgs/development/libraries/babl/0.1.10.nix create mode 100644 pkgs/development/libraries/gegl/0.2.0.nix diff --git a/pkgs/applications/graphics/gimp/2.8.0.nix b/pkgs/applications/graphics/gimp/2.8.0.nix new file mode 100644 index 00000000000..bf29ae13e5e --- /dev/null +++ b/pkgs/applications/graphics/gimp/2.8.0.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk, glib, gdk_pixbuf +, pango, cairo, freetype, fontconfig, lcms2, libpng, libjpeg, poppler, libtiff +, webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper +, python, pygtk, libart_lgpl, libexif, gettext, xlibs }: + +stdenv.mkDerivation rec { + name = "gimp-2.8.0"; + + src = fetchurl { + url = "ftp://ftp.gimp.org/pub/gimp/v2.8/${name}.tar.bz2"; + md5 = "28997d14055f15db063eb92e1c8a7ebb"; + }; + + buildInputs = + [ pkgconfig intltool babl gegl gtk glib gdk_pixbuf pango cairo + freetype fontconfig lcms2 libpng libjpeg poppler libtiff webkit + libmng librsvg libwmf zlib libzip ghostscript aalib jasper + python pygtk libart_lgpl libexif gettext + ]; + + passthru = { inherit gtk; }; # probably its a good idea to use the same gtk in plugins ? + + #configureFlags = [ "--disable-print" ]; + + # "screenshot" needs this. + NIX_LDFLAGS = "-rpath ${xlibs.libX11}/lib"; + + meta = { + description = "The GNU Image Manipulation Program"; + homepage = http://www.gimp.org/; + license = "GPL"; + }; +} diff --git a/pkgs/development/libraries/babl/0.1.10.nix b/pkgs/development/libraries/babl/0.1.10.nix new file mode 100644 index 00000000000..41280e87253 --- /dev/null +++ b/pkgs/development/libraries/babl/0.1.10.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "babl-0.1.10"; + + src = fetchurl { + url = "ftp://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2"; + sha256 = "943fc36ceac7dd25bc928256bc7b535a42989c6b971578146869eee5fe5955f4"; + }; + + meta = { + description = "Image pixel format conversion library"; + homepage = http://gegl.org/babl/; + license = "GPL3"; + }; +} diff --git a/pkgs/development/libraries/gegl/0.2.0.nix b/pkgs/development/libraries/gegl/0.2.0.nix new file mode 100644 index 00000000000..5da6e3e40f4 --- /dev/null +++ b/pkgs/development/libraries/gegl/0.2.0.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg +, librsvg, pango, gtk, bzip2, intltool }: + +stdenv.mkDerivation rec { + name = "gegl-0.2.0"; + + src = fetchurl { + url = "ftp://ftp.gtk.org/pub/gegl/0.2/${name}.tar.bz2"; + sha256 = "df2e6a0d9499afcbc4f9029c18d9d1e0dd5e8710a75e17c9b1d9a6480dd8d426"; + }; + + # needs fonts otherwise don't know how to pass them + configureFlags = "--disable-docs"; + + buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk bzip2 intltool ]; + + buildNativeInputs = [ pkgconfig ]; + + meta = { + description = "Graph-based image processing framework"; + homepage = http://www.gegl.org; + license = "GPL3"; + }; +} diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index c5c8b694ba9..4c5d17eca99 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -14,7 +14,7 @@ let baseName="geoclue"; version="0.12.0"; name="${baseName}-${version}"; - url="http://folks.o-hand.com/jku/geoclue-releases/${name}.tar.gz"; + url="https://launchpad.net/geoclue/trunk/0.12/+download/${name}.tar.gz"; hash="15j619kvmdgj2hpma92mkxbzjvgn8147a7500zl3bap9g8bkylqg"; }; in diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9850ce2b00e..1b89c56e841 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3180,6 +3180,8 @@ let babl = callPackage ../development/libraries/babl { }; + babl_0_1_10 = callPackage ../development/libraries/babl/0.1.10.nix {}; + beecrypt = callPackage ../development/libraries/beecrypt { }; boehmgc = callPackage ../development/libraries/boehm-gc { }; @@ -3436,6 +3438,10 @@ let # avocodec avformat librsvg }; + gegl_0_2_0 = callPackage ../development/libraries/gegl/0.2.0.nix { + babl = babl_0_1_10; + }; + geoclue = callPackage ../development/libraries/geoclue {}; geoip = builderDefsPackage ../development/libraries/geoip { @@ -6763,6 +6769,12 @@ let inherit (gnome) libart_lgpl; }; + gimp_2_8_0 = callPackage ../applications/graphics/gimp/2.8.0.nix { + inherit (gnome) libart_lgpl; + babl = babl_0_1_10; + gegl = gegl_0_2_0; + }; + gimpPlugins = recurseIntoAttrs (import ../applications/graphics/gimp/plugins { inherit pkgs gimp; }); From d0d4123962ed53266319dff6b19c42444b26bb7a Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 4 Jun 2012 19:54:32 +0200 Subject: [PATCH 173/403] Compile glibc without -fstack-protector. At least until NixOS full supports -fstack-protector it's better to turn it off at the moment, as previous successful builds didn't include it either. --- pkgs/development/libraries/glibc/2.13/common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/glibc/2.13/common.nix b/pkgs/development/libraries/glibc/2.13/common.nix index 4058ed3d302..535fb373e04 100644 --- a/pkgs/development/libraries/glibc/2.13/common.nix +++ b/pkgs/development/libraries/glibc/2.13/common.nix @@ -103,6 +103,7 @@ stdenv.mkDerivation ({ "--enable-add-ons" "--sysconfdir=/etc" "--localedir=/var/run/current-system/sw/lib/locale" + "libc_cv_ssp=no" (if kernelHeaders != null then "--with-headers=${kernelHeaders}/include" else "--without-headers") From 8cf7f46ea0abed6a84c2460aacf6c83552061bdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Tue, 5 Jun 2012 08:09:06 +0000 Subject: [PATCH 174/403] Patching xmobar-0.15 to accept mtl-2.1. svn path=/nixpkgs/trunk/; revision=34354 --- pkgs/applications/misc/xmobar/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix index 3b46fcef8b4..73eefef2505 100644 --- a/pkgs/applications/misc/xmobar/default.nix +++ b/pkgs/applications/misc/xmobar/default.nix @@ -13,6 +13,9 @@ cabal.mkDerivation (self: { ]; extraLibraries = [ libXrandr wirelesstools ]; configureFlags = "-fwith_xft -fwith_iwlib"; + patchPhase = '' + sed -i -e 's|mtl ==.*$|mtl,|' xmobar.cabal + ''; meta = { homepage = "http://projects.haskell.org/xmobar/"; description = "A Minimalistic Text Based Status Bar"; From cfdf9cafaab69ea7fe58766ca973ab97749de1a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Tue, 5 Jun 2012 08:09:10 +0000 Subject: [PATCH 175/403] Setting GHC default version to 7.4.1, default platform to 2012.2.0.0. svn path=/nixpkgs/trunk/; revision=34355 --- pkgs/top-level/all-packages.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b89c56e841..9ed8bfd6d7e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2203,8 +2203,8 @@ let # particularly in connection with Hydra builds for all these packages. # So we enable it for selected versions only. - # Current default version: 7.0.4. - haskellPackages = haskellPackages_ghc704; + # Current default version: 7.4.1. + haskellPackages = haskellPackages_ghc741; # Current Haskell platform. haskellPlatform = haskellPackages.haskellPlatform; @@ -2215,16 +2215,16 @@ let haskellPackages_ghc701 = haskell.packages_ghc701; haskellPackages_ghc702 = haskell.packages_ghc702; haskellPackages_ghc703 = haskell.packages_ghc703; + haskellPackages_ghc704 = recurseIntoAttrs (haskell.packages_ghc704); + haskellPackages_ghc721 = haskell.packages_ghc721; + haskellPackages_ghc722 = haskell.packages_ghc722; # For the default version, we build profiling versions of the libraries, too. # The following three lines achieve that: the first two make Hydra build explicit # profiling and non-profiling versions; the final respects the user-configured # default setting. - haskellPackages_ghc704_no_profiling = recurseIntoAttrs (haskell.packages_ghc704.noProfiling); - haskellPackages_ghc704_profiling = recurseIntoAttrs (haskell.packages_ghc704.profiling); - haskellPackages_ghc704 = haskell.packages_ghc704.highPrio; - haskellPackages_ghc721 = haskell.packages_ghc721; - haskellPackages_ghc722 = haskell.packages_ghc722; - haskellPackages_ghc741 = recurseIntoAttrs (haskell.packages_ghc741); + haskellPackages_ghc741_no_profiling = recurseIntoAttrs (haskell.packages_ghc741.noProfiling); + haskellPackages_ghc741_profiling = recurseIntoAttrs (haskell.packages_ghc741.profiling); + haskellPackages_ghc741 = recurseIntoAttrs (haskell.packages_ghc741.highPrio); # Stable branch snapshot. haskellPackages_ghc742 = recurseIntoAttrs (haskell.packages_ghc742); # Reasonably current HEAD snapshot. From 7d15ad90b9ca4f2d06dd2f9e54c9d26f9926117d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 5 Jun 2012 08:31:42 +0000 Subject: [PATCH 176/403] Updated Haskell packages. - http-conduit: updated to version 1.4.1.8 - leksah-server: updated to version 0.12.1.0 - leksah: updated to version 0.12.1.0 - ltk: updated to version 0.12.1.0 - yaml: updated to version 0.7.0.3 svn path=/nixpkgs/trunk/; revision=34356 --- pkgs/applications/editors/leksah/default.nix | 4 ++-- .../development/libraries/haskell/http-conduit/default.nix | 4 ++-- .../development/libraries/haskell/leksah/leksah-server.nix | 4 ++-- pkgs/development/libraries/haskell/ltk/default.nix | 7 ++----- pkgs/development/libraries/haskell/yaml/default.nix | 4 ++-- 5 files changed, 10 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/editors/leksah/default.nix b/pkgs/applications/editors/leksah/default.nix index 40b5687ea91..fe9315809a5 100644 --- a/pkgs/applications/editors/leksah/default.nix +++ b/pkgs/applications/editors/leksah/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "leksah"; - version = "0.12.0.3"; - sha256 = "1374ffwban58kabnynacl0fyzs6756kd5q1lcfya46mp26l7syrd"; + version = "0.12.1.0"; + sha256 = "1993h74wfrndqgjx7xcfdhh5f2gqhg6kcbvzl1ckdbk8hynkia94"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index ffe5de07db3..8f347ffa87b 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.4.1.7"; - sha256 = "0b3iz03y3s30wyj5j0r8s070qwwzjbk4cs7znag5yjxqgph1h22f"; + version = "1.4.1.8"; + sha256 = "0vf72r4dpqdkl951bmjq3hjy6wnqyhxkjq9hr2p8scw91606cxyl"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie diff --git a/pkgs/development/libraries/haskell/leksah/leksah-server.nix b/pkgs/development/libraries/haskell/leksah/leksah-server.nix index f3658bdfe58..fb088181110 100644 --- a/pkgs/development/libraries/haskell/leksah/leksah-server.nix +++ b/pkgs/development/libraries/haskell/leksah/leksah-server.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "leksah-server"; - version = "0.12.0.5"; - sha256 = "0kr5xsnjl0brbdysw1rhd7a1gy3i0kn8rq2c5grc2m734ankil6z"; + version = "0.12.1.0"; + sha256 = "1jqrlz08ivr521a64cbdkixhgjra69qlfrasch7yac63dvf160i4"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/ltk/default.nix b/pkgs/development/libraries/haskell/ltk/default.nix index a945512fa1c..7960395eb09 100644 --- a/pkgs/development/libraries/haskell/ltk/default.nix +++ b/pkgs/development/libraries/haskell/ltk/default.nix @@ -2,12 +2,9 @@ cabal.mkDerivation (self: { pname = "ltk"; - version = "0.12.0.0"; - sha256 = "1hlsfi77yypfnvh1alr3rflbffby9pbmc71m507davr6b09v9w9f"; + version = "0.12.1.0"; + sha256 = "12x6nba5bll8fgzpxii1cf87j27jk4mn5gf1bx4ahd9v30h1a0h6"; buildDepends = [ Cabal filepath glib gtk mtl parsec transformers ]; - patchPhase = '' - sed -i -e 's|mtl >=1.1.0.2 && <2.1|mtl|' -e 's|transformers >=0.2.2.0 && <0.3|transformers|' ltk.cabal - ''; meta = { homepage = "http://www.leksah.org"; description = "Leksah tool kit"; diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index 8bc76c1baa7..e3228d039c1 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "yaml"; - version = "0.7.0.2"; - sha256 = "0hhxvw3zzra8vkbm9914nq03wpy5x5mg6sipwajqz0hv3j5hlsf3"; + version = "0.7.0.3"; + sha256 = "1w9xsg48np3wi859jdg5vm3dxihbdrbvd1i364lsfblbmry964mr"; buildDepends = [ aeson attoparsec conduit resourcet text transformers unorderedContainers vector From 3370d1284e08df01f1abc532d292d3b82d70ef91 Mon Sep 17 00:00:00 2001 From: Arie Middelkoop Date: Tue, 5 Jun 2012 09:12:45 +0000 Subject: [PATCH 177/403] Some explicit dependencies so that xmobar works with the latest haskellPlatform/stable ghc: xmobar -> mtl-version1 mtl-version1 -> transformers-version2 where version1 and version2 are different from the default, which is needed because their respective cabal files require that. svn path=/nixpkgs/trunk/; revision=34357 --- pkgs/top-level/haskell-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a34830e3e2f..560eaac49eb 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1025,7 +1025,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); mtl_1_1_0_2 = callPackage ../development/libraries/haskell/mtl/1.1.0.2.nix {}; mtl_1_1_1_1 = callPackage ../development/libraries/haskell/mtl/1.1.1.1.nix {}; - mtl_2_0_1_0 = callPackage ../development/libraries/haskell/mtl/2.0.1.0.nix {}; + mtl_2_0_1_0 = callPackage ../development/libraries/haskell/mtl/2.0.1.0.nix { + transformers = self.transformers_0_2_2_0; + }; mtl_2_1_1 = callPackage ../development/libraries/haskell/mtl/2.1.1.nix { transformers = self.transformers_0_3_0_0; }; @@ -1671,6 +1673,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); xmobar = callPackage ../applications/misc/xmobar { stm = self.stm_2_3; + mtl = self.mtl_2_0_1_0; }; xmonad = callPackage ../applications/window-managers/xmonad { From 7fd5e26ededa29fd0f842f84a658b644e25c5544 Mon Sep 17 00:00:00 2001 From: Arie Middelkoop Date: Tue, 5 Jun 2012 09:33:40 +0000 Subject: [PATCH 178/403] Revert on kosmikus' request. svn path=/nixpkgs/trunk/; revision=34358 --- pkgs/top-level/haskell-packages.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 560eaac49eb..a34830e3e2f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1025,9 +1025,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); mtl_1_1_0_2 = callPackage ../development/libraries/haskell/mtl/1.1.0.2.nix {}; mtl_1_1_1_1 = callPackage ../development/libraries/haskell/mtl/1.1.1.1.nix {}; - mtl_2_0_1_0 = callPackage ../development/libraries/haskell/mtl/2.0.1.0.nix { - transformers = self.transformers_0_2_2_0; - }; + mtl_2_0_1_0 = callPackage ../development/libraries/haskell/mtl/2.0.1.0.nix {}; mtl_2_1_1 = callPackage ../development/libraries/haskell/mtl/2.1.1.nix { transformers = self.transformers_0_3_0_0; }; @@ -1673,7 +1671,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); xmobar = callPackage ../applications/misc/xmobar { stm = self.stm_2_3; - mtl = self.mtl_2_0_1_0; }; xmonad = callPackage ../applications/window-managers/xmonad { From 797fafd8085fa65e0a248e03e2ad08af7ef01cb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 5 Jun 2012 12:29:03 +0000 Subject: [PATCH 179/403] hwloc: Disable tests on Cygwin. svn path=/nixpkgs/trunk/; revision=34359 --- pkgs/development/libraries/hwloc/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index fd93326d5ee..aa59a891714 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -33,7 +33,9 @@ stdenv.mkDerivation rec { -e "s|-lnuma|-L$numalibdir -lnuma|g" ''; - doCheck = true; + # XXX: A test hangs on Cygwin, see + # . + doCheck = !stdenv.isCygwin; meta = { description = "hwloc, a portable abstraction of hierarchical architectures for high-performance computing"; From 73a1d5e27face256c81af586de52b0062b5ce948 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 5 Jun 2012 15:24:16 +0000 Subject: [PATCH 180/403] * PostgreSQL updates. svn path=/nixpkgs/trunk/; revision=34361 --- pkgs/servers/sql/postgresql/8.3.x.nix | 4 ++-- pkgs/servers/sql/postgresql/8.4.x.nix | 4 ++-- pkgs/servers/sql/postgresql/9.0.x.nix | 4 ++-- pkgs/servers/sql/postgresql/9.1.x.nix | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/sql/postgresql/8.3.x.nix b/pkgs/servers/sql/postgresql/8.3.x.nix index c69cb135f7c..fb4c8302d81 100644 --- a/pkgs/servers/sql/postgresql/8.3.x.nix +++ b/pkgs/servers/sql/postgresql/8.3.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, ncurses, readline }: -let version = "8.3.18"; in +let version = "8.3.19"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "0iip7irc8sqz75w6p52fpdfqs4jlqchpzvp0w5s95w2ri5591d2x"; + sha256 = "1maq1gjnd111jn45d7k58av1dm273vypvwhhsbhknqywgr5hsvwq"; }; buildInputs = [ zlib ncurses readline ]; diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix index 8460a8f41d1..14e948d3d4e 100644 --- a/pkgs/servers/sql/postgresql/8.4.x.nix +++ b/pkgs/servers/sql/postgresql/8.4.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, ncurses, readline }: -let version = "8.4.11"; in +let version = "8.4.12"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "13ww30xv2pwd5hy1x5lsmba4jc59n6f6nz0dc29bb0k2s7qrzg2v"; + sha256 = "0xqgzi6qrx4g7g8f38hp02qj8grrfnvc33kyijc2hf0qxhqb7dwr"; }; buildInputs = [ zlib ncurses readline ]; diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix index 5b9c565d802..a4896d02a3a 100644 --- a/pkgs/servers/sql/postgresql/9.0.x.nix +++ b/pkgs/servers/sql/postgresql/9.0.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.0.7"; in +let version = "9.0.8"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "0cyqlr4c9jl4d786s0h8d45vkx6343f664ys2jamyncb3pbjdgns"; + sha256 = "1hhb9kaayrs3bqm1afg8g4p9mr3mc8hskrgy24hnwfablsl1p652"; }; buildInputs = [ zlib readline ]; diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix index 63c7255559c..8dbaf93df8f 100644 --- a/pkgs/servers/sql/postgresql/9.1.x.nix +++ b/pkgs/servers/sql/postgresql/9.1.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.1.3"; in +let version = "9.1.4"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "1mfmqimd3fvvpw60b0haql510l00nhyfgp4wpkcw2ca0c8580ybs"; + sha256 = "04lp7hfh8z2n8gzib6b9j1fq70h1s91z2fxn2hlilbdfnf75lyd0"; }; buildInputs = [ zlib readline ]; From 1067f51f924fc707022510837c07e5864f4d851a Mon Sep 17 00:00:00 2001 From: Cillian de Roiste Date: Tue, 5 Jun 2012 16:52:11 +0000 Subject: [PATCH 181/403] Updating Kdenlive to 0.9.2, and also updating mlt to 0.8.0 since it's a dependency svn path=/nixpkgs/trunk/; revision=34362 --- pkgs/applications/video/kdenlive/default.nix | 19 ++++++++++--------- pkgs/development/libraries/mlt/default.nix | 18 +++++++++++------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/video/kdenlive/default.nix b/pkgs/applications/video/kdenlive/default.nix index c133c90f8e9..d8620eb33cd 100644 --- a/pkgs/applications/video/kdenlive/default.nix +++ b/pkgs/applications/video/kdenlive/default.nix @@ -1,19 +1,20 @@ -{ stdenv, fetchurl, lib, cmake, qt4, perl, kdelibs, automoc4, phonon, mlt, gettext -, qimageblitz, qjson, shared_mime_info, soprano, pkgconfig }: +{ stdenv, fetchurl, lib, cmake, qt4, perl, kdelibs, automoc4, phonon +, mlt, gettext , qimageblitz, qjson, shared_mime_info, soprano +, pkgconfig }: stdenv.mkDerivation rec { name = "kdenlive-${version}"; - version = "0.8.2.1"; + version = "0.9.2"; src = fetchurl { - url = "mirror://sourceforge/kdenlive/${name}.tar.gz"; - sha256 = "a454a0659c9673453800df8382dfdbcb87acfb9b174712ffeb46b8304bf00717"; + url = "mirror://kde/stable/kdenlive/0.9.2/src/${name}.tar.bz2"; + sha256 = "1h240s0c10z8sgvwmrfzam33qlx7j2a5b12lw1mk02ihs9hl43j1"; }; - patches = [ ./qtgl-header-change.patch ]; - - buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon mlt gettext - qimageblitz qjson shared_mime_info soprano pkgconfig ]; + buildInputs = + [ cmake qt4 perl kdelibs automoc4 phonon mlt gettext qimageblitz + qjson shared_mime_info soprano pkgconfig + ]; meta = { description = "Free and open source video editor"; diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 1740de118a4..640bc7edc32 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -1,15 +1,19 @@ -{stdenv, fetchurl, SDL, qt4, pkgconfig, ffmpeg, libdv, libxml2, libsamplerate, -libvorbis, sox}: +{ stdenv, fetchurl, SDL, ffmpeg, libdv, libsamplerate, libvorbis +, libxml2 , pkgconfig, qt4, sox }: -stdenv.mkDerivation { - name = "mlt-0.7.8"; +stdenv.mkDerivation rec { + name = "mlt-${version}"; + version = "0.8.0"; src = fetchurl { - url = mirror://sourceforge/mlt/mlt-0.7.8.tar.gz; - sha256 = "0hvfjk0hspamym0ahi635ivx9iv3v2jy2qv15za1vmz28qkkp0wm"; + url = "mirror://sourceforge/mlt/${name}.tar.gz"; + sha256 = "1pf61imb5xzgzf65g54kybjr67235rxi20691023mcv34qwppl3v"; }; - buildInputs = [ qt4 SDL ffmpeg libdv libxml2 libsamplerate libvorbis sox pkgconfig ]; + buildInputs = + [ SDL ffmpeg libdv libsamplerate libvorbis libxml2 pkgconfig qt4 + sox + ]; # Mostly taken from: # http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine From da4c1e38fd0921fba903eac0c26146430aca094f Mon Sep 17 00:00:00 2001 From: Cillian de Roiste Date: Tue, 5 Jun 2012 17:50:22 +0000 Subject: [PATCH 182/403] Removed patch, no longer necessary svn path=/nixpkgs/trunk/; revision=34363 --- .../video/kdenlive/qtgl-header-change.patch | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 pkgs/applications/video/kdenlive/qtgl-header-change.patch diff --git a/pkgs/applications/video/kdenlive/qtgl-header-change.patch b/pkgs/applications/video/kdenlive/qtgl-header-change.patch deleted file mode 100644 index 91d9f13737b..00000000000 --- a/pkgs/applications/video/kdenlive/qtgl-header-change.patch +++ /dev/null @@ -1,14 +0,0 @@ -Correct for changed Qt opengl includes. -Reference: http://www.kdenlive.org/mantis/view.php?id=2396 - -diff -Naur kdenlive-0.8.2.1.orig//src/videoglwidget.cpp kdenlive-0.8.2.1/src/videoglwidget.cpp ---- kdenlive-0.8.2.1.orig//src/videoglwidget.cpp 2012-01-24 00:04:53.588121469 -0430 -+++ kdenlive-0.8.2.1/src/videoglwidget.cpp 2012-01-24 00:05:32.817410938 -0430 -@@ -2,6 +2,7 @@ - #include - #include - #include "videoglwidget.h" -+#include "GL/glu.h" - - #ifndef GL_TEXTURE_RECTANGLE_EXT - #define GL_TEXTURE_RECTANGLE_EXT GL_TEXTURE_RECTANGLE_NV From 430b05551604bf08827539b2f0ec3b294c923640 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 5 Jun 2012 21:21:21 +0000 Subject: [PATCH 183/403] Adding crossAttrs to cross-build qt with mingw32 and mingw64 svn path=/nixpkgs/trunk/; revision=34364 --- .../libraries/qt-4.x/4.8/default.nix | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index a3a78af439a..52a80d656cf 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -102,6 +102,41 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + crossAttrs = let + isMingw = stdenv.cross.config == "i686-pc-mingw32" || + stdenv.cross.config == "x86_64-w64-mingw32"; + in { + # I've not tried any case other than i686-pc-mingw32. + # -nomake tools: it fails linking some asian language symbols + # -no-svg: it fails to build on mingw64 + configureFlags = '' + -static -release -confirm-license -opensource + -no-opengl -no-phonon + -no-svg + -make qmake -make libs -nomake tools + -nomake demos -nomake examples -nomake docs + '' + stdenv.lib.optionalString isMingw " -xplatform win32-g++-4.6"; + patches = []; + preConfigure = '' + sed -i -e 's/ g++/ ${stdenv.cross.config}-g++/' \ + -e 's/ gcc/ ${stdenv.cross.config}-gcc/' \ + -e 's/ ar/ ${stdenv.cross.config}-ar/' \ + -e 's/ strip/ ${stdenv.cross.config}-strip/' \ + -e 's/ windres/ ${stdenv.cross.config}-windres/' \ + mkspecs/win32-g++/qmake.conf + ''; + + # I don't know why it does not install qmake + postInstall = '' + cp bin/qmake* $out/bin + ''; + dontSetConfigureCross = true; + dontStrip = true; + } // (if isMingw then + { + propagatedBuildInputs = [ ]; + } else {}); + meta = with stdenv.lib; { homepage = http://qt.nokia.com/products; description = "A cross-platform application framework for C++"; From 0332f87a0bf17aa34342c8225121c992f8ed919a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 5 Jun 2012 21:24:27 +0000 Subject: [PATCH 184/403] Adding windows jom; it does not build for me still, but it's close to it. I think it's better to share it though. I wrote a comment about the expression not building. svn path=/nixpkgs/trunk/; revision=34365 --- pkgs/os-specific/windows/jom/default.nix | 36 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/os-specific/windows/jom/default.nix diff --git a/pkgs/os-specific/windows/jom/default.nix b/pkgs/os-specific/windows/jom/default.nix new file mode 100644 index 00000000000..2cdd63cc0eb --- /dev/null +++ b/pkgs/os-specific/windows/jom/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchgit, qt48, flex, cmake }: + +# At the time of committing this, the expression fails for me to cross-build in +# both mingw32 and mingw64. + +stdenv.mkDerivation { + name = "jom-1.0.11"; + + src = fetchgit { + url = git://gitorious.org/qt-labs/jom.git; + rev = "c91a204b05f97eef3c73aaaba3036e20f79fd487"; + sha256 = "6d3ac84f83bb045213903d9d5340c0447c8fe41671d1dcdeae5c40b66d62ccbf"; + }; + + buildInputs = [ qt48 ]; + buildNativeInputs = [ flex /*cmake*/ ]; + + QTDIR = qt48; + configurePhase = '' + qmake PREFIX=$out + ''; + + crossAttrs = { + # cmakeFlags = "-DWIN32=1 -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_RC_COMPILER=${stdenv.cross.config}-windres"; + QTDIR = qt48.hostDrv; + preBuild = '' + export NIX_CROSS_CFLAGS_COMPILE=-fpermissive + ''; + }; + + meta = { + homepage = http://qt-project.org/wiki/jom; + description = "Clone of nmake supporting multiple independent commands in parallel"; + license = "GPLv2+"; # Explicitly, GPLv2 or GPLv3, but not later. + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ed8bfd6d7e..4bb577caf7b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6066,6 +6066,8 @@ let }; windows = rec { + jom = callPackage ../os-specific/windows/jom { }; + w32api = callPackage ../os-specific/windows/w32api { gccCross = gccCrossStageStatic; binutilsCross = binutilsCross; From 36d30b82796b455e391ffdec4af6b63643a6d13c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 6 Jun 2012 08:08:25 +0000 Subject: [PATCH 185/403] Updated Haskell packages. - cereal: updated to version 0.3.5.2 - leksah-server: updated to version 0.12.1.1 - repa-algorithms: updated to version 3.2.1.1 - repa-examples: updated to version 3.2.1.1 - repa-io: updated to version 3.2.1.1 - repa: updated to version 3.2.1.1 - RepLib: updated to version 0.5.3 - unbound: updated to version 0.4.1 svn path=/nixpkgs/trunk/; revision=34366 --- pkgs/development/libraries/haskell/RepLib/default.nix | 4 ++-- pkgs/development/libraries/haskell/cereal/default.nix | 4 ++-- .../libraries/haskell/leksah/leksah-server.nix | 8 ++++---- .../libraries/haskell/repa-algorithms/default.nix | 4 ++-- .../libraries/haskell/repa-examples/default.nix | 4 ++-- pkgs/development/libraries/haskell/repa-io/default.nix | 4 ++-- pkgs/development/libraries/haskell/repa/default.nix | 4 ++-- pkgs/development/libraries/haskell/unbound/default.nix | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/development/libraries/haskell/RepLib/default.nix b/pkgs/development/libraries/haskell/RepLib/default.nix index 1be11a557f8..1bc52184474 100644 --- a/pkgs/development/libraries/haskell/RepLib/default.nix +++ b/pkgs/development/libraries/haskell/RepLib/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "RepLib"; - version = "0.5.2.1"; - sha256 = "133zpiszfdb8s4hqd1xpgsiac98v04dclk3hivzxcg0h77m7qpcc"; + version = "0.5.3"; + sha256 = "1kpd4qli6fclrr3i21kmdwbpa0la7ssi9pgagzclr3yj2ca2hsgw"; buildDepends = [ mtl typeEquality ]; meta = { homepage = "http://code.google.com/p/replib/"; diff --git a/pkgs/development/libraries/haskell/cereal/default.nix b/pkgs/development/libraries/haskell/cereal/default.nix index a2a87fda385..a28ea11c511 100644 --- a/pkgs/development/libraries/haskell/cereal/default.nix +++ b/pkgs/development/libraries/haskell/cereal/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cereal"; - version = "0.3.5.1"; - sha256 = "1a9ri0fs0vh75c9llpjyvqp6qkjciqri6adpyn7hbqrn2z1h0l5n"; + version = "0.3.5.2"; + sha256 = "0yjxvhagsm552idfrs6d9lzlz6x5878xj1vfg0zxf8w1kixgghil"; meta = { description = "A binary serialization library"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/leksah/leksah-server.nix b/pkgs/development/libraries/haskell/leksah/leksah-server.nix index fb088181110..c86e4bddedf 100644 --- a/pkgs/development/libraries/haskell/leksah/leksah-server.nix +++ b/pkgs/development/libraries/haskell/leksah/leksah-server.nix @@ -1,18 +1,18 @@ { cabal, attoparsec, attoparsecEnumerator, binary, binaryShared , Cabal, deepseq, enumerator, filepath, haddock, hslogger, ltk -, network, parsec, processLeksah, time, transformers +, network, parsec, processLeksah, strict, time, transformers }: cabal.mkDerivation (self: { pname = "leksah-server"; - version = "0.12.1.0"; - sha256 = "1jqrlz08ivr521a64cbdkixhgjra69qlfrasch7yac63dvf160i4"; + version = "0.12.1.1"; + sha256 = "063pijwj5mpczmjwwcj49dc2zgyc0l2j9j5902f1hgnvj4xg4hq6"; isLibrary = true; isExecutable = true; buildDepends = [ attoparsec attoparsecEnumerator binary binaryShared Cabal deepseq enumerator filepath haddock hslogger ltk network parsec - processLeksah time transformers + processLeksah strict time transformers ]; meta = { homepage = "http://leksah.org"; diff --git a/pkgs/development/libraries/haskell/repa-algorithms/default.nix b/pkgs/development/libraries/haskell/repa-algorithms/default.nix index ca6059b68b3..d8a1e61c5d7 100644 --- a/pkgs/development/libraries/haskell/repa-algorithms/default.nix +++ b/pkgs/development/libraries/haskell/repa-algorithms/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "repa-algorithms"; - version = "3.1.3.1"; - sha256 = "04d0r68k7dhk5ka9hzqf6wy9yyhjwc0rndp1ir1vllc6w6f8k4wl"; + version = "3.2.1.1"; + sha256 = "19gc2vbkqxysnm0argksn8c3cv7vf30hkdycgv8fdfn0yc95xz0v"; buildDepends = [ repa vector ]; extraLibraries = [ llvm ]; meta = { diff --git a/pkgs/development/libraries/haskell/repa-examples/default.nix b/pkgs/development/libraries/haskell/repa-examples/default.nix index 9acc949042f..1f3e66e5e08 100644 --- a/pkgs/development/libraries/haskell/repa-examples/default.nix +++ b/pkgs/development/libraries/haskell/repa-examples/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "repa-examples"; - version = "3.1.3.1"; - sha256 = "15fg356a8sa48vmgn5fxgbj3s48hixsl1x4a8ds0mvvv8m0zlra8"; + version = "3.2.1.1"; + sha256 = "0nbdp3vwg7ha9vhz7f2kys3jxdlwiihxz031cfpkv2si5ci3gy1b"; isLibrary = false; isExecutable = true; buildDepends = [ random repa repaAlgorithms repaIo vector ]; diff --git a/pkgs/development/libraries/haskell/repa-io/default.nix b/pkgs/development/libraries/haskell/repa-io/default.nix index 21844f15fc8..293a7bc6d58 100644 --- a/pkgs/development/libraries/haskell/repa-io/default.nix +++ b/pkgs/development/libraries/haskell/repa-io/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "repa-io"; - version = "3.1.3.1"; - sha256 = "1ah5zqg3699p98820gs39xh1xipqdknlgkwxrdqsblnm33y1bqnb"; + version = "3.2.1.1"; + sha256 = "156amnlqsxhwalnc4nypcd66znv2f8c71d5xi8ja5g8d9f1yg02g"; buildDepends = [ binary bmp repa vector ]; meta = { homepage = "http://repa.ouroborus.net"; diff --git a/pkgs/development/libraries/haskell/repa/default.nix b/pkgs/development/libraries/haskell/repa/default.nix index 678a5c83b3d..b6102d45572 100644 --- a/pkgs/development/libraries/haskell/repa/default.nix +++ b/pkgs/development/libraries/haskell/repa/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "repa"; - version = "3.1.4.2"; - sha256 = "08vrrhaqhk03mmc2zddj4mm9dci9q7wkxwc3ilrh1p9q4j6r53qs"; + version = "3.2.1.1"; + sha256 = "0jzcy3xdlwmcjq1mpfqh0axcgbj3i03nxg7blw2sly8qrgfl0ri1"; buildDepends = [ QuickCheck vector ]; meta = { homepage = "http://repa.ouroborus.net"; diff --git a/pkgs/development/libraries/haskell/unbound/default.nix b/pkgs/development/libraries/haskell/unbound/default.nix index b64aff3ae13..466285d3e55 100644 --- a/pkgs/development/libraries/haskell/unbound/default.nix +++ b/pkgs/development/libraries/haskell/unbound/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "unbound"; - version = "0.4.0.2"; - sha256 = "0vwbqrjrahg7ifsqgmq18ddmmczjxnsdz5w3kfgb4jpv1glwlxrh"; + version = "0.4.1"; + sha256 = "1fryjs5byyqha945qy8vyfpq4fzjmnh0jc01wzvk6ri292qipsyn"; buildDepends = [ mtl RepLib transformers ]; meta = { homepage = "http://code.google.com/p/replib/"; From 43bc3880f6ebe557b31b378ae07b37d7e9cb370d Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 6 Jun 2012 13:26:48 +0000 Subject: [PATCH 186/403] Process relative URLs svn path=/nixpkgs/trunk/; revision=34367 --- pkgs/build-support/upstream-updater/urls-from-page.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/upstream-updater/urls-from-page.sh b/pkgs/build-support/upstream-updater/urls-from-page.sh index d9f2d34e011..065e3faf309 100755 --- a/pkgs/build-support/upstream-updater/urls-from-page.sh +++ b/pkgs/build-support/upstream-updater/urls-from-page.sh @@ -4,9 +4,11 @@ url="$1" protocol="${url%%:*}" path="${url#$protocol://}" server="${path%%/*}" +basepath="${path%/*}" relpath="${path#$server}" echo "URL: $url" >&2 curl -L -k "$url" | sed -re 's/^/-/;s/[hH][rR][eE][fF]="([^"]*)"/\n+\1\n-/g' | \ - sed -e '/^-/d; s/^[+]//; /^#/d;'"s/^\\//$protocol:\\/\\/$server\\//g" + sed -e '/^-/d; s/^[+]//; /^#/d;'"s/^\\//$protocol:\\/\\/$server\\//g" | \ + sed -re 's~^[^:]*$~'"$protocol://$basepath/&~" From f677edf57f71cf0c8c9e0906d26b4304e4213ef8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 6 Jun 2012 14:35:56 +0000 Subject: [PATCH 187/403] * Firefox 13.0. It's not stable yet though - it seems to hang the first time a Flash control is loaded, with the following message on stderr: /nix/store/c5ma4l7nlzcwdkjzrflni58aacqrfs1y-xulrunner-13.0/lib/xulrunner-13.0/plugin-container: symbol lookup error: /nix/store/c5ma4l7nlzcwdkjzrflni58aacqrfs1y-xulrunner-13.0/lib/xulrunner-13.0/plugin-container: undefined symbol: malloc_message Need to investigate where malloc_message is defined. svn path=/nixpkgs/trunk/; revision=34368 --- .../networking/browsers/firefox/10.0.nix | 181 ------------------ .../browsers/firefox/{11.0.nix => 13.0.nix} | 14 +- pkgs/top-level/all-packages.nix | 18 +- pkgs/top-level/release.nix | 3 +- 4 files changed, 16 insertions(+), 200 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/firefox/10.0.nix rename pkgs/applications/networking/browsers/firefox/{11.0.nix => 13.0.nix} (94%) diff --git a/pkgs/applications/networking/browsers/firefox/10.0.nix b/pkgs/applications/networking/browsers/firefox/10.0.nix deleted file mode 100644 index ff16cad0ee1..00000000000 --- a/pkgs/applications/networking/browsers/firefox/10.0.nix +++ /dev/null @@ -1,181 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL -, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs -, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify -, yasm, mesa, sqlite, unzip - -, # If you want the resulting program to call itself "Firefox" instead - # of "Shiretoko" or whatever, enable this option. However, those - # binaries may not be distributed without permission from the - # Mozilla Foundation, see - # http://www.mozilla.org/foundation/trademarks/. - enableOfficialBranding ? false -}: - -assert stdenv.gcc ? libc && stdenv.gcc.libc != null; - -rec { - - firefoxVersion = "10.0.2"; - - xulVersion = "10.0.2"; # this attribute is used by other packages - - - src = fetchurl { - url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha1 = "d9b459d915d4638a48b3e249fcbaf7cafc27e834"; - }; - - commonConfigureFlags = - [ "--enable-optimize" - "--disable-debug" - "--enable-strip" - "--with-system-jpeg" - "--with-system-zlib" - "--with-system-bz2" - "--with-system-nspr" - # "--with-system-nss" - # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" - "--enable-system-cairo" - "--enable-system-sqlite" - "--disable-crashreporter" - "--disable-tests" - "--disable-necko-wifi" # maybe we want to enable this at some point - "--disable-installer" - "--disable-updater" - ]; - - - xulrunner = stdenv.mkDerivation rec { - name = "xulrunner-${xulVersion}"; - - inherit src; - - buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 - python dbus dbus_glib pango freetype fontconfig xlibs.libXi - xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file - alsaLib nspr /* nss */ libnotify xlibs.pixman yasm mesa - xlibs.libXScrnSaver xlibs.scrnsaverproto - xlibs.libXext xlibs.xextproto sqlite unzip - ]; - - configureFlags = - [ "--enable-application=xulrunner" - "--disable-javaxpcom" - ] ++ commonConfigureFlags; - - enableParallelBuilding = true; - - # Hack to work around make's idea of -lbz2 dependency - preConfigure = - '' - find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${ - stdenv.lib.concatStringsSep ":" - (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc])) - }' ';' - - export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}" - ''; - - # !!! Temporary hack. - preBuild = - '' - export NIX_ENFORCE_PURITY= - ''; - - installFlags = "SKIP_GRE_REGISTRATION=1"; - - postInstall = '' - # Fix some references to /bin paths in the Xulrunner shell script. - substituteInPlace $out/bin/xulrunner \ - --replace /bin/pwd "$(type -tP pwd)" \ - --replace /bin/ls "$(type -tP ls)" - - # Fix run-mozilla.sh search - libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*) - echo libDir: $libDir - test -n "$libDir" - cd $out/bin - mv xulrunner ../lib/$libDir/ - - for i in $out/lib/$libDir/*; do - file $i; - if file $i | grep executable &>/dev/null; then - echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")"; - chmod a+x "$out/bin/$(basename "$i")"; - fi; - done; - for i in $out/lib/$libDir/{xpcshell,plugin-container,*.so}; do - patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true - done; - rm -f $out/bin/run-mozilla.sh - ''; # */ - - meta = { - description = "Mozilla Firefox XUL runner"; - homepage = http://www.mozilla.com/en-US/firefox/; - }; - - passthru = { inherit gtk; version = xulVersion; }; - }; - - - firefox = stdenv.mkDerivation rec { - name = "firefox-${firefoxVersion}"; - - inherit src; - - enableParallelBuilding = true; - - buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python - dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify - xlibs.pixman yasm mesa sqlite file unzip - ]; - - propagatedBuildInputs = [xulrunner]; - - configureFlags = - [ "--enable-application=browser" - "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}" - "--enable-chrome-format=jar" - "--disable-elf-hack" - ] - ++ commonConfigureFlags - ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding"; - - # Hack to work around make's idea of -lbz2 dependency - preConfigure = - '' - find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${ - stdenv.lib.concatStringsSep ":" - (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc])) - }' ';' - ''; - - postInstall = - '' - ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner - for j in $out/bin/*; do - i="$(readlink "$j")"; - file $i; - if file $i | grep executable &>/dev/null; then - rm "$out/bin/$(basename "$i")" - echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")" - chmod a+x "$out/bin/$(basename "$i")" - fi; - done; - ''; # */ - - meta = { - description = "Mozilla Firefox - the browser, reloaded"; - homepage = http://www.mozilla.com/en-US/firefox/; - maintainers = [ stdenv.lib.maintainers.eelco ]; - }; - - passthru = { - inherit gtk xulrunner nspr; - isFirefox3Like = true; - }; - }; -} diff --git a/pkgs/applications/networking/browsers/firefox/11.0.nix b/pkgs/applications/networking/browsers/firefox/13.0.nix similarity index 94% rename from pkgs/applications/networking/browsers/firefox/11.0.nix rename to pkgs/applications/networking/browsers/firefox/13.0.nix index 28f0f476833..8b1ab901c23 100644 --- a/pkgs/applications/networking/browsers/firefox/11.0.nix +++ b/pkgs/applications/networking/browsers/firefox/13.0.nix @@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; rec { - firefoxVersion = "11.0"; + firefoxVersion = "13.0"; - xulVersion = "11.0"; # this attribute is used by other packages + xulVersion = "13.0"; # this attribute is used by other packages src = fetchurl { url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - md5 = "4b07acf47857aff72776d805409cdd1b"; + sha1 = "f90608874a54883b9fbb90b8d6dd3dc75a305572"; }; commonConfigureFlags = @@ -35,7 +35,7 @@ rec { "--with-system-nspr" # "--with-system-nss" # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" - "--enable-system-cairo" + # "--enable-system-cairo" # disabled for the moment because our Cairo is too old "--enable-system-sqlite" "--disable-crashreporter" "--disable-tests" @@ -75,7 +75,11 @@ rec { }' ';' export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}" - ''; + + mkdir ../objdir + cd ../objdir + configureScript=../mozilla-release/configure + ''; # */ # !!! Temporary hack. preBuild = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4bb577caf7b..e6b441be523 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6709,24 +6709,18 @@ let firefox36Wrapper = wrapFirefox { browser = firefox36Pkgs.firefox; }; - firefox10Pkgs = callPackage ../applications/networking/browsers/firefox/10.0.nix { - inherit (gnome) libIDL; - }; - - firefox10Wrapper = wrapFirefox { browser = firefox10Pkgs.firefox; }; - - firefox11Pkgs = callPackage ../applications/networking/browsers/firefox/11.0.nix { - inherit (gnome) libIDL; - }; - - firefox11Wrapper = wrapFirefox { browser = firefox11Pkgs.firefox; }; - firefox12Pkgs = callPackage ../applications/networking/browsers/firefox/12.0.nix { inherit (gnome) libIDL; }; firefox12Wrapper = wrapFirefox { browser = firefox12Pkgs.firefox; }; + firefox13Pkgs = callPackage ../applications/networking/browsers/firefox/13.0.nix { + inherit (gnome) libIDL; + }; + + firefox13Wrapper = lowPrio (wrapFirefox { browser = firefox13Pkgs.firefox; }); + flac = callPackage ../applications/audio/flac { }; flashplayer = flashplayer11; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index aff1dd9ce9c..18bad093294 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -360,9 +360,8 @@ with (import ./release-lib.nix); }; firefox36Pkgs.firefox = linux; - firefox10Pkgs.firefox = linux; - firefox11Pkgs.firefox = linux; firefox12Pkgs.firefox = linux; + firefox13Pkgs.firefox = linux; gnome = { gnome_panel = linux; From 36667965f90145b1cad052913839c56dffff51f6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 6 Jun 2012 15:51:48 +0000 Subject: [PATCH 188/403] * Updated bind to 9.7.6-P1, which includes a fix for CVE-2012-1667. svn path=/nixpkgs/trunk/; revision=34370 --- pkgs/servers/dns/bind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 819bb30c5a6..cdd8704739b 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, openssl, libtool, perl, libxml2 }: let - version = "9.7.2-P3"; + version = "9.7.6-P1"; in stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "0zpvmgs75lisw746wccm2r428dmd4vv5s1pc512lyrmycr3mz56d"; + sha256 = "1xp7c3fpi3b6y1bz77mf7c98ic7rxp5lpwlmzqwsdrllip33qw1k"; }; patchPhase = '' From e9a003e3a209b4c103a38bd1219fe0d315490535 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 6 Jun 2012 16:07:30 +0000 Subject: [PATCH 189/403] * Updated systemd to 185 (which I overlooked because of the version jump). This contains the merged udev. svn path=/nixpkgs/trunk/; revision=34371 --- pkgs/os-specific/linux/systemd/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 142df5baddb..f867b3e224b 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -1,17 +1,19 @@ { stdenv, fetchurl, pkgconfig, intltool, gperf, libcap, udev, dbus, kmod -, xz, pam, acl, cryptsetup, libuuid, m4, utillinux }: +, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, usbutils, pciutils +, glib +}: stdenv.mkDerivation rec { - name = "systemd-44"; + name = "systemd-185"; src = fetchurl { url = "http://www.freedesktop.org/software/systemd/${name}.tar.xz"; - sha256 = "0g138b5yvn419xqrakpk75q2sb4g7pj10br9b6zq4flb9d5sqnks"; + sha256 = "1iwp41xvpq0x2flhhs8lpyjbfyg1220ahmy7037zdjy26w9g82br"; }; buildInputs = [ pkgconfig intltool gperf libcap udev dbus kmod xz pam acl - cryptsetup libuuid m4 + cryptsetup libuuid m4 usbutils pciutils glib ]; configureFlags = @@ -28,10 +30,15 @@ stdenv.mkDerivation rec { preConfigure = '' - for i in units/remount-rootfs.service src/remount-api-vfs.c src/mount.c; do + # FIXME: patch this in systemd properly (and send upstream). + for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c; do + test -e $i substituteInPlace $i \ --replace /bin/mount ${utillinux}/bin/mount \ - --replace /bin/umount ${utillinux}/bin/umount + --replace /bin/umount ${utillinux}/bin/umount \ + --replace /sbin/swapon ${utillinux}/sbin/swapon \ + --replace /sbin/swapoff ${utillinux}/sbin/swapoff \ + --replace /sbin/fsck ${utillinux}/sbin/fsck done ''; From 4b2c3d52de9033506077fb87e0f0521ec00d1240 Mon Sep 17 00:00:00 2001 From: Cillian de Roiste Date: Wed, 6 Jun 2012 19:05:06 +0000 Subject: [PATCH 190/403] Adding optional wx (GUI) support for Erlang, which enables the graphical debugger although pman (the process manager) fails to start. svn path=/nixpkgs/trunk/; revision=34372 --- pkgs/development/interpreters/erlang/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/default.nix b/pkgs/development/interpreters/erlang/default.nix index 0940936e531..18cfeca6329 100644 --- a/pkgs/development/interpreters/erlang/default.nix +++ b/pkgs/development/interpreters/erlang/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl, perl, gnum4, ncurses, openssl }: +{ stdenv, fetchurl, perl, gnum4, ncurses, openssl +, wxSupport ? false, mesa ? null, wxGTK ? null, xlibs ? null }: + +assert wxSupport -> mesa != null && wxGTK != null && xlibs != null; let version = "R15B01"; in @@ -10,7 +13,9 @@ stdenv.mkDerivation { sha256 = "1pmb3hk51p6dwsspxx40qs7gjfyhxjjc3290qk6w1wwa6bkpskzr"; }; - buildInputs = [ perl gnum4 ncurses openssl ]; + buildInputs = + [ perl gnum4 ncurses openssl + ] ++ stdenv.lib.optional wxSupport [ mesa wxGTK xlibs.libX11 ]; patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; From cadc02cb2b101437dac600aeb1243d4671ef778d Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Wed, 6 Jun 2012 20:44:11 +0000 Subject: [PATCH 191/403] Fix build of ocaml 3.12.1 on darwin svn path=/nixpkgs/trunk/; revision=34373 --- .../ocaml/3.12.1-darwin-fix-configure.patch | 32 +++++++++++++++++++ pkgs/development/compilers/ocaml/3.12.1.nix | 3 +- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/ocaml/3.12.1-darwin-fix-configure.patch diff --git a/pkgs/development/compilers/ocaml/3.12.1-darwin-fix-configure.patch b/pkgs/development/compilers/ocaml/3.12.1-darwin-fix-configure.patch new file mode 100644 index 00000000000..4b867bbb1e6 --- /dev/null +++ b/pkgs/development/compilers/ocaml/3.12.1-darwin-fix-configure.patch @@ -0,0 +1,32 @@ +diff -Nuar ocaml-3.12.1/configure ocaml-3.12.1-fix-configure/configure +--- ocaml-3.12.1/configure 2011-07-04 23:15:01.000000000 +0200 ++++ ocaml-3.12.1-fix-configure/configure 2012-06-06 22:20:40.000000000 +0200 +@@ -259,7 +259,7 @@ + bytecccompopts="-fno-defer-pop $gcc_warnings -DSHRINKED_GNUC" + mathlib="";; + *,*-*-darwin*) +- bytecccompopts="-fno-defer-pop -no-cpp-precomp $gcc_warnings" ++ bytecccompopts="-fno-defer-pop $gcc_warnings" + mathlib="" + # Tell gcc that we can use 32-bit code addresses for threaded code + # unless we are compiled for a shared library (-fPIC option) +@@ -739,7 +739,7 @@ + *,*,rhapsody,*) nativecccompopts="$gcc_warnings -DDARWIN_VERSION_6 $dl_defs" + if $arch64; then partialld="ld -r -arch ppc64"; fi;; + *,gcc*,cygwin,*) nativecccompopts="$gcc_warnings -U_WIN32";; +- amd64,gcc*,macosx,*) partialld="ld -r -arch x86_64";; ++ amd64,gcc*,macosx,*) partialld="ld -r";; + amd64,gcc*,solaris,*) partialld="ld -r -m elf_x86_64";; + *,gcc*,*,*) nativecccompopts="$gcc_warnings";; + esac +@@ -752,8 +752,8 @@ + asppprofflags='-pg -DPROFILING';; + alpha,*,*) as='as' + aspp='gcc -c';; +- amd64,*,macosx) as='as -arch x86_64' +- aspp='gcc -arch x86_64 -c';; ++ amd64,*,macosx) as='as' ++ aspp='gcc -c';; + amd64,*,solaris) as='as --64' + aspp='gcc -m64 -c';; + amd64,*,*) as='as' diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix index 44fe2d139d8..66075d4a966 100644 --- a/pkgs/development/compilers/ocaml/3.12.1.nix +++ b/pkgs/development/compilers/ocaml/3.12.1.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; buildInputs = [ncurses] ++ optionals useX11 [ x11 ]; installTargets = "install" + optionalString useNativeCompilers " installopt"; - patchPhase = '' + patches = optionals stdenv.isDarwin [ ./3.12.1-darwin-fix-configure.patch ]; + preConfigure = '' CAT=$(type -tp cat) sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang ''; From 93f41f5ad35b0f0d110bb537d178de78d5d13b47 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Wed, 6 Jun 2012 21:44:20 +0000 Subject: [PATCH 192/403] Fix build of apr on darwin svn path=/nixpkgs/trunk/; revision=34374 --- .../libraries/apr/darwin_fix_configure.patch | 17 +++++++++++++++++ pkgs/development/libraries/apr/default.nix | 6 ++++++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/libraries/apr/darwin_fix_configure.patch diff --git a/pkgs/development/libraries/apr/darwin_fix_configure.patch b/pkgs/development/libraries/apr/darwin_fix_configure.patch new file mode 100644 index 00000000000..84d3f207870 --- /dev/null +++ b/pkgs/development/libraries/apr/darwin_fix_configure.patch @@ -0,0 +1,17 @@ +diff -Nuar apr-1.4.6/configure apr-1.4.6-darwin-fix-configure/configure +--- apr-1.4.6/configure 2012-02-08 00:17:57.000000000 +0100 ++++ apr-1.4.6-darwin-fix-configure/configure 2012-06-06 23:08:56.000000000 +0200 +@@ -6854,10 +6854,10 @@ + *-apple-darwin*) + + if test "x$CPPFLAGS" = "x"; then +- test "x$silent" != "xyes" && echo " setting CPPFLAGS to \"-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK -no-cpp-precomp\"" +- CPPFLAGS="-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK -no-cpp-precomp" ++ test "x$silent" != "xyes" && echo " setting CPPFLAGS to \"-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK\"" ++ CPPFLAGS="-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK" + else +- apr_addto_bugger="-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK -no-cpp-precomp" ++ apr_addto_bugger="-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $CPPFLAGS; do diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index a0b9017d35f..8c3d5c03496 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -1,5 +1,9 @@ { stdenv, fetchurl }: +let + inherit (stdenv.lib) optionals; +in + stdenv.mkDerivation rec { name = "apr-1.4.6"; @@ -8,6 +12,8 @@ stdenv.mkDerivation rec { md5 = "ffee70a111fd07372982b0550bbb14b7"; }; + patches = optionals stdenv.isDarwin [ ./darwin_fix_configure.patch ]; + configureFlags = # Don't use accept4 because it's only supported on Linux >= 2.6.28. [ "apr_cv_accept4=no" ] From 4a5f21239f729a0454390d2797d20e667d570e1b Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Wed, 6 Jun 2012 21:47:26 +0000 Subject: [PATCH 193/403] Fix build of neon on darwin svn path=/nixpkgs/trunk/; revision=34375 --- .../libraries/neon/0.29.6-darwin-fix-configure.patch | 12 ++++++++++++ pkgs/development/libraries/neon/0.29.nix | 6 ++++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/neon/0.29.6-darwin-fix-configure.patch diff --git a/pkgs/development/libraries/neon/0.29.6-darwin-fix-configure.patch b/pkgs/development/libraries/neon/0.29.6-darwin-fix-configure.patch new file mode 100644 index 00000000000..87222a9c0ce --- /dev/null +++ b/pkgs/development/libraries/neon/0.29.6-darwin-fix-configure.patch @@ -0,0 +1,12 @@ +diff -Nuar neon-0.29.6/configure neon-0.29.6-darwin-fix-configure/configure +--- neon-0.29.6/configure 2011-05-03 14:25:31.000000000 +0200 ++++ neon-0.29.6-darwin-fix-configure/configure 2012-06-06 23:32:21.000000000 +0200 +@@ -4184,7 +4184,7 @@ + $as_echo "$ne_cv_os_uname" >&6; } + + if test "$ne_cv_os_uname" = "Darwin"; then +- CPPFLAGS="$CPPFLAGS -no-cpp-precomp" ++ CPPFLAGS="$CPPFLAGS" + LDFLAGS="$LDFLAGS -flat_namespace" + # poll has various issues in various Darwin releases + if test x${ac_cv_func_poll+set} != xset; then diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/0.29.nix index 8666f6233a9..ffc409d271e 100644 --- a/pkgs/development/libraries/neon/0.29.nix +++ b/pkgs/development/libraries/neon/0.29.nix @@ -9,6 +9,10 @@ assert compressionSupport -> zlib != null; assert sslSupport -> openssl != null; assert static || shared; +let + inherit (stdenv.lib) optionals; +in + stdenv.mkDerivation rec { name = "neon-0.29.6"; @@ -17,6 +21,8 @@ stdenv.mkDerivation rec { sha256 = "0hzbjqdx1z8zw0vmbknf159wjsxbcq8ii0wgwkqhxj3dimr0nr4w"; }; + patches = optionals stdenv.isDarwin [ ./0.29.6-darwin-fix-configure.patch ]; + buildInputs = [libxml2 pkgconfig openssl] ++ stdenv.lib.optional compressionSupport zlib; From 4d7e4334d97826ae37ddd88d420ea2819664aa57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Thu, 7 Jun 2012 10:58:24 +0000 Subject: [PATCH 194/403] Patching ghc-events to work with latest mtl. svn path=/nixpkgs/trunk/; revision=34377 --- pkgs/development/libraries/haskell/ghc-events/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/haskell/ghc-events/default.nix b/pkgs/development/libraries/haskell/ghc-events/default.nix index fa6ae059e84..4827b749484 100644 --- a/pkgs/development/libraries/haskell/ghc-events/default.nix +++ b/pkgs/development/libraries/haskell/ghc-events/default.nix @@ -7,6 +7,9 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ binary mtl ]; + patchPhase = '' + sed -i -e 's|mtl *>=.*$|mtl,|' ghc-events.cabal + ''; noHaddock = true; meta = { description = "Library and tool for parsing .eventlog files from GHC"; From acb95ca925ef7e7ef40df55de1d42ca4449b90a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Thu, 7 Jun 2012 11:27:25 +0000 Subject: [PATCH 195/403] Removed an unnecessary (and harmful) version constraint for haskell-download-curl. svn path=/nixpkgs/trunk/; revision=34378 --- pkgs/top-level/haskell-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a34830e3e2f..fc6c42f2d8f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -619,7 +619,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); download = callPackage ../development/libraries/haskell/download {}; - downloadCurl = callPackage ../development/libraries/haskell/download-curl { tagsoup = self.tagsoup_0_10_1; }; + downloadCurl = callPackage ../development/libraries/haskell/download-curl {}; DSH = callPackage ../development/libraries/haskell/DSH {}; From 789df7619eac13b7ba32d6271dad8e28764e3227 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Fri, 8 Jun 2012 08:25:30 +0000 Subject: [PATCH 196/403] Updated GHC HEAD snapshot. svn path=/nixpkgs/trunk/; revision=34379 --- pkgs/development/compilers/ghc/head.nix | 6 ++++-- pkgs/development/compilers/ghc/with-packages.nix | 15 +++++++++++++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 66b939cdfed..cf0c569d3be 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,17 +1,19 @@ { stdenv, fetchurl, ghc, perl, gmp, ncurses }: stdenv.mkDerivation rec { - version = "7.5.20120419"; + version = "7.5.20120607"; name = "ghc-${version}"; src = fetchurl { url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2"; - sha256 = "0fwq2s3syk3l4xx0m8x6h67snldlf3qk9bjjkvx46sgr0q3xjd05"; + sha256 = "1xrdx646g5ip2f2jypbm46y6jis3ddf8bild2704swbl2j4yb3vb"; }; buildInputs = [ ghc perl gmp ncurses ]; + enableParallelBuilding = true; + buildMK = '' libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib" libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include" diff --git a/pkgs/development/compilers/ghc/with-packages.nix b/pkgs/development/compilers/ghc/with-packages.nix index 5f36db177ec..9313c54b908 100644 --- a/pkgs/development/compilers/ghc/with-packages.nix +++ b/pkgs/development/compilers/ghc/with-packages.nix @@ -10,6 +10,17 @@ stdenv.mkDerivation rec { unpackPhase = "true"; installPhase = '' + numversion=$(${ghc}/bin/ghc --numeric-version) + majorversion=''${numversion%%.*} + minorversion=''${numversion#*.} + minorversion=''${minorversion%%.*} + + if [[ $majorversion -gt 6 ]] && [[ $minorversion -gt 4 ]]; then + globalConf="--global-package-db" + else + globalConf="--global-conf" + fi + originalTopDir="${ghc}/lib/ghc-${ghc.version}" originalPkgDir="$originalTopDir/package.conf.d" linkedTopDir="$out/lib" @@ -57,7 +68,7 @@ stdenv.mkDerivation rec { done echo -n "Generating package cache " - ${ghc}/bin/ghc-pkg --global-conf $linkedPkgDir recache + ${ghc}/bin/ghc-pkg $globalConf $linkedPkgDir recache echo . echo -n "Generating wrappers " @@ -73,7 +84,7 @@ stdenv.mkDerivation rec { done for prg in ghc-pkg ghc-pkg-${ghc.version}; do - makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "--global-conf $linkedPkgDir" + makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "$globalConf $linkedPkgDir" echo -n . done From 3c74283d034bc8103356208e50b887c152ab8178 Mon Sep 17 00:00:00 2001 From: Arie Middelkoop Date: Fri, 8 Jun 2012 10:16:46 +0000 Subject: [PATCH 197/403] Committing some outstanding modifications that I cannot make into smaller chunks anymore. * added briss: a pdf cropper * added compton, an improved fork of xcompmgr * added myself to the maintainers list * minor version bumps: xcompmgr, upower svn path=/nixpkgs/trunk/; revision=34380 --- .../window-managers/compton/default.nix | 25 +++++++++++++++ .../window-managers/xcompmgr/default.nix | 8 ++--- pkgs/lib/maintainers.nix | 1 + pkgs/os-specific/linux/upower/default.nix | 4 +-- pkgs/tools/graphics/briss/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 ++++ 6 files changed, 69 insertions(+), 6 deletions(-) create mode 100644 pkgs/applications/window-managers/compton/default.nix create mode 100644 pkgs/tools/graphics/briss/default.nix diff --git a/pkgs/applications/window-managers/compton/default.nix b/pkgs/applications/window-managers/compton/default.nix new file mode 100644 index 00000000000..dc1622972ad --- /dev/null +++ b/pkgs/applications/window-managers/compton/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchgit, pkgconfig, libXcomposite, libXfixes, libXdamage +, libXrender, libXext }: +stdenv.mkDerivation rec { + name = "compton-20120507"; + src = fetchgit { + url = git://github.com/chjj/compton.git; + rev = "d52f7a06dbc55d92e061f976730952177edac739"; + sha256 = "0f7600a841c4c77d181b54bc14cf7d90d0bad25aa5edbade320ca8b9946f14eb"; + }; + buildInputs = [ pkgconfig libXcomposite libXfixes libXdamage libXrender libXext ]; + buildFlagsArray = ["CFLAGS=-O3 -fomit-frame-pointer"]; + installFlags = "PREFIX=$(out)"; + meta = { + homepage = http://www.x.org/; + description = "A fork of XCompMgr, a sample compositing manager for X servers"; + longDescription = '' + A fork of XCompMgr, which is a sample compositing manager for X servers + supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE extensions. It enables + basic eye-candy effects. This fork adds additional features, such as additional + effects, and a fork at a well-defined and proper place. + ''; + license = "bsd"; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/applications/window-managers/xcompmgr/default.nix b/pkgs/applications/window-managers/xcompmgr/default.nix index 9dd5892d9fc..3e402b05b94 100644 --- a/pkgs/applications/window-managers/xcompmgr/default.nix +++ b/pkgs/applications/window-managers/xcompmgr/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, libXcomposite, libXfixes, libXdamage -, libXrender }: +, libXrender, libXext }: stdenv.mkDerivation rec { - name = "xcompmgr-1.1.5"; + name = "xcompmgr-1.1.6"; src = fetchurl { url = "http://www.x.org/releases/individual/app/${name}.tar.bz2"; - sha256 = "bb20737a6f9e0cdf5cfbd5288b6a9a4b16ca18d2be19444549c1d6be2a90b571"; + sha256 = "c98949d36793b30ed1ed47495c87a05fa245ac0fc2857d2abc54979124687c02"; }; - buildInputs = [ pkgconfig libXcomposite libXfixes libXdamage libXrender ]; + buildInputs = [ pkgconfig libXcomposite libXfixes libXdamage libXrender libXext ]; meta = { homepage = http://www.x.org/; description = "A sample compositing manager for X servers"; diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index 20d6d2517f6..b790d7d1c11 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -6,6 +6,7 @@ aforemny = "Alexander Foremny "; all = "Nix Committers "; + amiddelk = "Arie Middelkoop "; andres = "Andres Loeh "; astsmtl = "Alexander Tsamutali "; bjg = "Brian Gough "; diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 2679d23d76e..4a8cfbdbc51 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -4,11 +4,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "upower-0.9.15"; + name = "upower-0.9.16"; src = fetchurl { url = "http://upower.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "1313lr404hb29fzkf9frn1z0xxvibi451xmk05sf9kidyf01956m"; + sha256 = "eb9a3d39a8cb62970fd612e333bc7a43437ab0e7890303578b0a7e3c67c8c212"; }; buildInputs = [ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 ]; diff --git a/pkgs/tools/graphics/briss/default.nix b/pkgs/tools/graphics/briss/default.nix new file mode 100644 index 00000000000..2af2a9a8757 --- /dev/null +++ b/pkgs/tools/graphics/briss/default.nix @@ -0,0 +1,31 @@ +# The releases of this project are apparently precompiled to .jar files. + +{ stdenv, fetchurl, jre }: + +let + + version = "0.9"; + sha256 = "45dd668a9ceb9cd59529a9fefe422a002ee1554a61be07e6fc8b3baf33d733d9"; + +in stdenv.mkDerivation { + name = "briss-${version}"; + src = fetchurl { + url = "mirror://sourceforge/briss/briss-${version}.tar.gz"; + inherit sha256; + }; + + installPhase = '' + mkdir -p "$out/bin"; + mkdir -p "$out/share"; + install -D -m444 -t "$out/share" *.jar + echo "#!/bin/sh" > "$out/bin/briss" + echo "${jre}/bin/java -Xms128m -Xmx1024m -cp \"$out/share/\" -jar \"$out/share/briss-${version}.jar\"" >> "$out/bin/briss" + chmod +x "$out/bin/briss" + ''; + + meta = { + homepage = http://sourceforge.net/projects/briss/; + description = "Java application for cropping PDF files"; + license = stdenv.lib.licenses.gpl3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e6b441be523..f310a120ee5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1229,6 +1229,8 @@ let pdfread = callPackage ../tools/graphics/pdfread { }; + briss = callPackage ../tools/graphics/briss { }; + pdnsd = callPackage ../tools/networking/pdnsd { }; pg_top = callPackage ../tools/misc/pg_top { }; @@ -7602,6 +7604,8 @@ let wings = callPackage ../applications/graphics/wings { }; + dzen2 = callPackage ../applications/misc/dzen { }; + # I'm keen on wmiimenu only >wmii-3.5 no longer has it... wmiimenu = import ../applications/window-managers/wmii31 { libixp = libixp_for_wmii; @@ -7668,6 +7672,8 @@ let xcompmgr = callPackage ../applications/window-managers/xcompmgr { }; + compton = callPackage ../applications/window-managers/compton { }; + xdaliclock = callPackage ../tools/misc/xdaliclock {}; xdg_utils = callPackage ../tools/X11/xdg-utils { }; From b6ee9fb5c0d2f5a4049659c01bd0bf405958aaf2 Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Fri, 8 Jun 2012 12:20:41 +0000 Subject: [PATCH 198/403] fixed wgetpaste to make it work without having to have wget in the profile svn path=/nixpkgs/trunk/; revision=34381 --- pkgs/tools/text/wgetpaste/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/tools/text/wgetpaste/default.nix index b2da6602dd3..8cfc26d70cc 100644 --- a/pkgs/tools/text/wgetpaste/default.nix +++ b/pkgs/tools/text/wgetpaste/default.nix @@ -10,6 +10,7 @@ prePatch = '' substituteInPlace wgetpaste --replace "/usr/bin/env bash" "${bash}/bin/bash" + substituteInPlace wgetpaste --replace "LC_ALL=C wget" "LC_ALL=C ${wget}/bin/wget" ''; installPhase = '' From dd6ab8d7bf84f27b110c499fad33c7737f67ff7d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 8 Jun 2012 13:11:38 +0000 Subject: [PATCH 199/403] * Linux 3.2.19. svn path=/nixpkgs/trunk/; revision=34382 --- pkgs/os-specific/linux/kernel/linux-3.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index f0f73128732..5ca3db655b4 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -234,7 +234,7 @@ in import ./generic.nix ( rec { - version = "3.2.18"; + version = "3.2.19"; testing = false; modDirVersion = version; @@ -245,7 +245,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0qghi3n2xq2alkcgbjklpngy3pqwbsjm5cls7vah3qr9yw46m1fp"; + sha256 = "14kym3lhkbxvn1fcavxjsn4siccnyk85ax0n25lsispv0pvyzph1"; }; config = configWithPlatform stdenv.platform; From 572b182042e255824aca481303cb75209602e4cd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 8 Jun 2012 13:34:43 +0000 Subject: [PATCH 200/403] all-packages.nix: removed broken 'dzen2' attribute, it refers to a non-existent file svn path=/nixpkgs/trunk/; revision=34383 --- pkgs/top-level/all-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f310a120ee5..efa94f1d178 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7604,8 +7604,6 @@ let wings = callPackage ../applications/graphics/wings { }; - dzen2 = callPackage ../applications/misc/dzen { }; - # I'm keen on wmiimenu only >wmii-3.5 no longer has it... wmiimenu = import ../applications/window-managers/wmii31 { libixp = libixp_for_wmii; From e55ca0628fe06d0b41ae4981d3e6be34e9f88840 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 8 Jun 2012 13:38:20 +0000 Subject: [PATCH 201/403] Updated Haskell packages. - generic-deriving: updated to version 1.2.1 - ghc-mod: updated to version 1.10.17 - gitit: updated to version 0.10.0.1 - graphviz: updated to version 2999.13.0.3 - hsemail: updated to version 1.7.2 - split: updated to version 0.1.4.3 svn path=/nixpkgs/trunk/; revision=34384 --- .../libraries/haskell/generic-deriving/default.nix | 6 +++--- pkgs/development/libraries/haskell/ghc-mod/default.nix | 4 ++-- pkgs/development/libraries/haskell/gitit/default.nix | 4 ++-- pkgs/development/libraries/haskell/graphviz/default.nix | 7 ++----- pkgs/development/libraries/haskell/hsemail/default.nix | 4 ++-- pkgs/development/libraries/haskell/split/default.nix | 4 ++-- 6 files changed, 13 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/haskell/generic-deriving/default.nix b/pkgs/development/libraries/haskell/generic-deriving/default.nix index 0ed052acd3e..ffc44542976 100644 --- a/pkgs/development/libraries/haskell/generic-deriving/default.nix +++ b/pkgs/development/libraries/haskell/generic-deriving/default.nix @@ -2,10 +2,10 @@ cabal.mkDerivation (self: { pname = "generic-deriving"; - version = "1.0.3"; - sha256 = "0g5sw4m9qdr1l47zq15l6jk9ksz1nazssdxz7lrdqx6ib3xbrz6y"; + version = "1.2.1"; + sha256 = "0ld4kh3p3lmavxi4y25fpxvq75qk7bd87yvwcbj63j6af1v60h2z"; meta = { - description = "Generic programming library for generalized deriving"; + description = "Generic programming library for generalised deriving"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index ca033a36556..8501ac9a7e3 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ghc-mod"; - version = "1.10.16"; - sha256 = "1fk4r0zxbgmnk67ra5agfiik8yysvii51r8ikkz0xmi6r3hrf21m"; + version = "1.10.17"; + sha256 = "1ij04p6yw5sz1krsrqga9capahhkdazk4awmg15pvqsr62085hwj"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix index 8d54514fa43..7f15c201999 100644 --- a/pkgs/development/libraries/haskell/gitit/default.nix +++ b/pkgs/development/libraries/haskell/gitit/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "gitit"; - version = "0.10"; - sha256 = "04p0f8my6hb61a26l0pj3dfj3zhbyxc1wamlqfm76a5w7l5pl5zb"; + version = "0.10.0.1"; + sha256 = "0dx4jq7j0s6h5lfl8qrr4qnyb3j0cnnc1c786yf8kcmhk04n028f"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/graphviz/default.nix b/pkgs/development/libraries/haskell/graphviz/default.nix index f17133b4da3..77867472d66 100644 --- a/pkgs/development/libraries/haskell/graphviz/default.nix +++ b/pkgs/development/libraries/haskell/graphviz/default.nix @@ -4,14 +4,11 @@ cabal.mkDerivation (self: { pname = "graphviz"; - version = "2999.13.0.2"; - sha256 = "17b95zi8j7mnzrp3kybyfyqqpcdhbf0mdrk0sfnw3qp8fbyfrw1i"; + version = "2999.13.0.3"; + sha256 = "0rwjlwfa3s1vgh5mwzwmzq4s153iq338zy7jqi0qyxcs52illqq8"; buildDepends = [ colour dlist fgl filepath polyparse text transformers wlPprintText ]; - patchPhase = '' - sed -i graphviz.cabal -e 's|transformers == 0.2.\*|transformers|' - ''; meta = { homepage = "http://projects.haskell.org/graphviz/"; description = "Bindings to Graphviz for graph visualisation"; diff --git a/pkgs/development/libraries/haskell/hsemail/default.nix b/pkgs/development/libraries/haskell/hsemail/default.nix index cdacd2b362c..36a320dbe68 100644 --- a/pkgs/development/libraries/haskell/hsemail/default.nix +++ b/pkgs/development/libraries/haskell/hsemail/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hsemail"; - version = "1.7.1"; - sha256 = "0059015ab93d5facf6060404984a295090ebfc667ae5b84b283163e126805a9e"; + version = "1.7.2"; + sha256 = "1bl017gfyvjvxs9z1fns6sknk1l55905r82i31aqbz9qyaj70gzx"; buildDepends = [ mtl parsec ]; meta = { homepage = "http://gitorious.org/hsemail"; diff --git a/pkgs/development/libraries/haskell/split/default.nix b/pkgs/development/libraries/haskell/split/default.nix index 271d695fa9b..33f927e3d57 100644 --- a/pkgs/development/libraries/haskell/split/default.nix +++ b/pkgs/development/libraries/haskell/split/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "split"; - version = "0.1.4.2"; - sha256 = "09vi7vw4i4r78gyp3bbvhvvyiqi8rgf678ppmq99qrfqm34c2fl9"; + version = "0.1.4.3"; + sha256 = "1i9vmb0zvmhqj6qcbnsapsk9lhsyzznz336c8s7v4sz20s99hsby"; meta = { homepage = "http://code.haskell.org/~byorgey/code/split"; description = "Combinator library for splitting lists"; From 87d25896c1d2d56583904e041511f5697b9de7b0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 8 Jun 2012 14:02:21 +0000 Subject: [PATCH 202/403] git-annex: updated to version 3.20120605 svn path=/nixpkgs/trunk/; revision=34385 --- .../version-management/git-and-tools/git-annex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 4b1a1b64686..f40144ea857 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 @@ -5,14 +5,14 @@ }: let - version = "3.20120522"; + version = "3.20120605"; in stdenv.mkDerivation { name = "git-annex-${version}"; src = fetchurl { url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=refs/tags/${version}"; - sha256 = "4ee3fd31ea96089eade9ea209a4844f87f6de94bafca74870dd71555bb516f37"; + sha256 = "5c8f6575bc6e1bc9bc19e1fb1b6305d2a1aee3365927ccfaf9aa48a200775900"; name = "git-annex-${version}.tar.gz"; }; From 330ea0887f3a66fbad341bbd728bb7dd8bfaa1ed Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 8 Jun 2012 14:02:28 +0000 Subject: [PATCH 203/403] git-annex: added openssh to build inputs so that the configure phase enables support for SSH connection caching svn path=/nixpkgs/trunk/; revision=34386 --- .../applications/version-management/git-and-tools/default.nix | 2 +- .../version-management/git-and-tools/git-annex/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 6d69c9f8131..965e3e884c8 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -43,7 +43,7 @@ rec { }); gitAnnex = lib.makeOverridable (import ./git-annex) { - inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which coreutils; + inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which coreutils openssh; inherit (haskellPackages_ghc741) ghc MissingH utf8String pcreLight SHA dataenc HTTP testpack hS3 mtl network hslogger hxt json liftedBase monadControl IfElse QuickCheck2 bloomfilter editDistance; 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 f40144ea857..d814c521398 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,7 +1,7 @@ { 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 -, IfElse, bloomfilter, editDistance +, IfElse, bloomfilter, editDistance, openssh }: let @@ -20,7 +20,7 @@ stdenv.mkDerivation { 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 IfElse bloomfilter - editDistance + editDistance openssh ]; checkTarget = "test"; From 1181658cb88910ed6c657f391901f09f4f7ddf47 Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Fri, 8 Jun 2012 15:57:53 +0000 Subject: [PATCH 204/403] this won't compile yet as there is a python problem, probably related to what marc weber already fixed. will fix that later svn path=/nixpkgs/trunk/; revision=34388 --- .../python-modules/python-gudev/default.nix | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/python-gudev/default.nix diff --git a/pkgs/development/python-modules/python-gudev/default.nix b/pkgs/development/python-modules/python-gudev/default.nix new file mode 100644 index 00000000000..c9105555f9d --- /dev/null +++ b/pkgs/development/python-modules/python-gudev/default.nix @@ -0,0 +1,25 @@ +{stdenv, fetchgit, python, autoconf, automake, libtool, pygobject, pkgconfig, udev}: + +stdenv.mkDerivation { + name = "python-gudev-147.2"; + src = fetchgit { + url = git://github.com/nzjrs/python-gudev.git; + rev = "refs/tags/147.2"; + sha256 = "5b9766fcb88855a77ac8bb416ca3b51f55ac7d82b0e189f88c59cacb11586c15"; + }; + + buildInputs = [ python autoconf automake libtool pygobject pkgconfig udev ]; + + preConfigure = '' + sed -e 's@/usr/bin/file@file@g' -i configure.ac + sh autogen.sh + ''; + + meta = { + homepage = http://www.freedesktop.org/software/systemd/gudev/; + description = "Python binding to the GUDev udev helper library."; + license = "GPLv3+"; + maintainers = with stdenv.lib.maintainers; [qknight]; + platforms = with stdenv.lib.platforms; all; + }; +} From b36fce8040bdb73d065792c3ef95bf17720ad3fb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 8 Jun 2012 17:41:59 +0000 Subject: [PATCH 205/403] * NSPR updated to 4.9.1. svn path=/nixpkgs/trunk/; revision=34390 --- pkgs/development/libraries/nspr/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index f8423eb47f4..c570688de21 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: -let version = "4.9"; in +let version = "4.9.1"; in stdenv.mkDerivation { name = "nspr-${version}"; src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - sha1 = "57a6bb09ccb90d14303c3d9a6ec2592d8a5c0752"; + sha1 = "1d52282668f2f8f5aabf7a5a3e7f6ba9a5df9710"; }; preConfigure = "cd mozilla/nsprpub"; @@ -18,6 +18,8 @@ stdenv.mkDerivation { '' find $out -name "*.a" | xargs rm ''; + + enableParallelBuilding = true; meta = { homepage = http://www.mozilla.org/projects/nspr/; From f5cb1ecaf4d37334b2686a218c6994969775d504 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 9 Jun 2012 07:27:40 +0000 Subject: [PATCH 206/403] Updating the sheevaplug uboot. I've not tried it, but the old one disappeared from the server. svn path=/nixpkgs/trunk/; revision=34394 --- pkgs/misc/uboot/sheevaplug.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/uboot/sheevaplug.nix b/pkgs/misc/uboot/sheevaplug.nix index 5eb8d7d7bf8..ad8029d9020 100644 --- a/pkgs/misc/uboot/sheevaplug.nix +++ b/pkgs/misc/uboot/sheevaplug.nix @@ -6,7 +6,7 @@ # All this file is made for the Marvell Sheevaplug stdenv.mkDerivation { - name = "uboot-sheevaplug-3.4.19"; + name = "uboot-sheevaplug-3.4.27"; src = fetchurl { url = "ftp://ftp.denx.de/pub/u-boot/u-boot-1.1.4.tar.bz2"; @@ -14,14 +14,14 @@ stdenv.mkDerivation { }; srcAddon = fetchurl { - url = "http://www.plugcomputer.org/data/uboot/u-boot-3.4.19.zip"; - sha256 = "1wag1l6agr8dbnnfaw6bgcrwynwwgry4ihb3gp438699wmkmy91k"; + url = "http://www.plugcomputer.org/405/us/plug-basic/uboot/u-boot-3.4.27.zip"; + sha256 = "1wqxznpdb6d2kx58gral4q0mg5ddxyrv7az8c6v29nr3cd9yrfsg"; }; postUnpack = '' - mv u-boot-1.1.4 u-boot-3.4.19 + mv u-boot-1.1.4 u-boot-3.4.27 unzip -o $srcAddon - sourceRoot=u-boot-3.4.19 + sourceRoot=u-boot-3.4.27 ''; patches = [ ./gas220.patch ]; From 888a6507e694e086bc4d4fdfde67760db87fec9f Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 9 Jun 2012 13:09:07 +0000 Subject: [PATCH 207/403] sip-4.13.2 svn path=/nixpkgs/trunk/; revision=34395 --- pkgs/development/python-modules/python-sip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/python-sip/default.nix b/pkgs/development/python-modules/python-sip/default.nix index b73cabcb151..34daf294358 100644 --- a/pkgs/development/python-modules/python-sip/default.nix +++ b/pkgs/development/python-modules/python-sip/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "sip-4.12.4"; + name = "sip-4.13.2"; src = fetchurl { url = "http://www.riverbankcomputing.co.uk/static/Downloads/sip4/${name}.tar.gz"; - sha256 = "1cs7q2z5r59yil71ysy9nc32x0s65b9dz9jcrdsjmp6cww51z33n"; + sha256 = "1gzff61bi22g6fkdg9iya4q2qfdkwxs19v4rhhf8x4bm7hszbhsb"; }; configurePhase = "python ./configure.py -d $out/lib/${python.libPrefix}/site-packages -b $out/bin -e $out/include"; @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "Creates C++ bindings for Python modules"; license = "GPL"; - maintainers = [ stdenv.lib.maintainers.sander ]; + maintainers = with stdenv.lib.maintainers; [ urkud sander ]; }; } From eef17e625f37a31365f5fd9894f6410bfe4386ed Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 9 Jun 2012 13:09:13 +0000 Subject: [PATCH 208/403] pyqt-4.9.1 svn path=/nixpkgs/trunk/; revision=34396 --- pkgs/development/python-modules/pyqt/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pyqt/default.nix b/pkgs/development/python-modules/pyqt/default.nix index 7081c28ddd8..358254dd013 100644 --- a/pkgs/development/python-modules/pyqt/default.nix +++ b/pkgs/development/python-modules/pyqt/default.nix @@ -1,14 +1,11 @@ { stdenv, fetchurl, python, sip, qt4, pythonDBus, pkgconfig, lndir, makeWrapper }: stdenv.mkDerivation rec { - name = "PyQt-x11-gpl-4.8.5"; + name = "PyQt-x11-gpl-4.9.1"; src = fetchurl { - urls = [ - "http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/${name}.tar.gz" - "http://pkgs.fedoraproject.org/lookaside/pkgs/PyQt4/PyQt-x11-gpl-4.8.5.tar.gz/0e4264bb912edfbda319bb236ac84407/PyQt-x11-gpl-4.8.5.tar.gz" - ]; - sha256 = "0838nfis6xj92n4gccih7j14yigfm3x7p59yr7qa5jy75wxdzqn9"; + url = "http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/${name}.tar.gz"; + sha256 = "1ccvc80z8a0k0drvba9ngivsnv2k2nn5317yf86w1zwh45zmb0zj"; }; configurePhase = '' From 0d83120fd8f230f64d35664af52fc80d520a246d Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 9 Jun 2012 13:09:16 +0000 Subject: [PATCH 209/403] qt-4.8.2 svn path=/nixpkgs/trunk/; revision=34397 --- pkgs/development/libraries/qt-4.x/4.8/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 52a80d656cf..28999151580 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -12,7 +12,7 @@ }: let - v = "4.8.1"; + v = "4.8.2"; in # TODO: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${v}.tar.gz"; - sha256 = "1s3sv2p8q4bjy0h6r81gdnd64apdx8kwm5jc7rxavd21m8v1m1gg"; + sha256 = "0y93vkkn44md37gyg4y8sc9ylk27xkniaimfcpdcwd090qnjl6wj"; }; patches = [ ( substituteAll { From 70316d4e423c1d0b39a82f2663895d4f4a26a316 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 9 Jun 2012 13:09:20 +0000 Subject: [PATCH 210/403] attica-0.4.0 svn path=/nixpkgs/trunk/; revision=34398 --- pkgs/development/libraries/attica/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/attica/default.nix b/pkgs/development/libraries/attica/default.nix index 6d53ff303be..a719537dd2f 100644 --- a/pkgs/development/libraries/attica/default.nix +++ b/pkgs/development/libraries/attica/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, qt4 }: stdenv.mkDerivation rec { - name = "attica-0.3.0"; + name = "attica-0.4.0"; src = fetchurl { url = "mirror://kde/stable/attica/${name}.tar.bz2"; - sha256 = "1wfd37mvskn77ppzjdh3x6cb5p9na81ibh05ardfvbwqqn523gd0"; + sha256 = "172d1z97aw9iscq6wh23i31s4hgq7mmhr3mk4xgifqv0hjcmzyhq"; }; buildInputs = [ qt4 ]; From ecc8549965d3f69db47462e8178e9b92327762c4 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 9 Jun 2012 13:09:24 +0000 Subject: [PATCH 211/403] soprano-2.7.6, update patch svn path=/nixpkgs/trunk/; revision=34399 --- .../development/libraries/soprano/default.nix | 4 +-- .../libraries/soprano/find-virtuoso.patch | 30 +++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/soprano/default.nix b/pkgs/development/libraries/soprano/default.nix index d52d821843a..54e40efe65e 100644 --- a/pkgs/development/libraries/soprano/default.nix +++ b/pkgs/development/libraries/soprano/default.nix @@ -2,11 +2,11 @@ , pkgconfig }: stdenv.mkDerivation rec { - name = "soprano-2.7.5"; + name = "soprano-2.7.6"; src = fetchurl { url = "mirror://sourceforge/soprano/${name}.tar.bz2"; - sha256 = "0g9vi4z82dwz0hkg3b9gvi11akji1mzphjxwz3fw55213c0f0a3c"; + sha256 = "0cnprxc8wykl96aphsh2d3711h7cals7gnibbxpsmsqyqbnhbp98"; }; patches = [ ./find-virtuoso.patch ]; diff --git a/pkgs/development/libraries/soprano/find-virtuoso.patch b/pkgs/development/libraries/soprano/find-virtuoso.patch index 7da53d6f633..95a2c7e9656 100644 --- a/pkgs/development/libraries/soprano/find-virtuoso.patch +++ b/pkgs/development/libraries/soprano/find-virtuoso.patch @@ -7,10 +7,10 @@ Subject: [PATCH] Find virtuoso if virtuoso-t is in PATH 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/backends/virtuoso/virtuosobackend.cpp b/backends/virtuoso/virtuosobackend.cpp -index c83605d..8c30c81 100644 +index c245101..249958a 100644 --- a/backends/virtuoso/virtuosobackend.cpp +++ b/backends/virtuoso/virtuosobackend.cpp -@@ -27,6 +27,7 @@ +@@ -28,6 +28,7 @@ #include "odbcconnectionpool.h" #include "sopranodirs.h" @@ -18,7 +18,7 @@ index c83605d..8c30c81 100644 #include #include -@@ -188,19 +189,19 @@ namespace { +@@ -210,19 +211,19 @@ Soprano::BackendFeatures Soprano::Virtuoso::BackendPlugin::supportedFeatures() c bool Soprano::Virtuoso::BackendPlugin::isAvailable() const { @@ -29,14 +29,14 @@ index c83605d..8c30c81 100644 - } -#endif - - QString virtuosoBin = VirtuosoController::locateVirtuosoBinary(); + QString virtuosoBin = locateVirtuosoBinary(); if ( virtuosoBin.isEmpty() ) { qDebug() << Q_FUNC_INFO << "could not find virtuoso-t binary"; return false; } +#ifndef Q_OS_WIN -+ if ( findVirtuosoDriver(virtuosoBin).isEmpty() ) { ++ if ( findVirtuosoDriver( virtuosoBin ).isEmpty() ) { + qDebug() << Q_FUNC_INFO << "could not find Virtuoso ODBC driver"; + return false; + } @@ -45,17 +45,17 @@ index c83605d..8c30c81 100644 QString vs = determineVirtuosoVersion( virtuosoBin ); if ( vs.isEmpty() ) { qDebug() << Q_FUNC_INFO << "Failed to determine version of the Virtuoso server at" << virtuosoBin; -@@ -217,9 +218,21 @@ bool Soprano::Virtuoso::BackendPlugin::isAvailable() const - +@@ -267,9 +268,21 @@ QString Soprano::Virtuoso::BackendPlugin::locateVirtuosoBinary() #ifndef Q_OS_WIN --QString Soprano::Virtuoso::BackendPlugin::findVirtuosoDriver() const -+QString Soprano::Virtuoso::BackendPlugin::findVirtuosoDriver( const QString &virtuosoBinHint ) const + // static +-QString Soprano::Virtuoso::BackendPlugin::findVirtuosoDriver() ++QString Soprano::Virtuoso::BackendPlugin::findVirtuosoDriver( const QString &virtuosoBinHint ) { - return Soprano::findLibraryPath( "virtodbc_r", QStringList(), QStringList() << QLatin1String( "virtuoso/plugins/" ) << QLatin1String( "odbc/" ) ); + QString virtuosoBin; + if (virtuosoBinHint.isEmpty()) -+ virtuosoBin = VirtuosoController::locateVirtuosoBinary(); ++ virtuosoBin = locateVirtuosoBinary(); + else + virtuosoBin = virtuosoBinHint; + @@ -70,17 +70,17 @@ index c83605d..8c30c81 100644 #endif diff --git a/backends/virtuoso/virtuosobackend.h b/backends/virtuoso/virtuosobackend.h -index 3971b83..0807e5d 100644 +index 646b9f8..535fbb9 100644 --- a/backends/virtuoso/virtuosobackend.h +++ b/backends/virtuoso/virtuosobackend.h -@@ -50,7 +50,7 @@ namespace Soprano { +@@ -52,7 +52,7 @@ namespace Soprano { #ifndef Q_OS_WIN private: -- QString findVirtuosoDriver() const; -+ QString findVirtuosoDriver(const QString &virtuosoBinHint = QString()) const; +- static QString findVirtuosoDriver(); ++ static QString findVirtuosoDriver(const QString &virtuosoBinHint = QString()); #endif }; } -- -tg: (da390be..) t/find-virtuoso (depends on: master) +tg: (2321148..) t/find-virtuoso (depends on: master) From e4c0e87db0289f027d89ff4182fa968de9aceb27 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 9 Jun 2012 13:09:29 +0000 Subject: [PATCH 212/403] KDE SC 4.8.4 (automatic changes) svn path=/nixpkgs/trunk/; revision=34400 --- pkgs/desktops/kde-4.8/default.nix | 2 +- pkgs/desktops/kde-4.8/kde-package/4.8.2.nix | 299 ------------------ pkgs/desktops/kde-4.8/kde-package/4.8.4.nix | 299 ++++++++++++++++++ pkgs/desktops/kde-4.8/kde-wallpapers.nix | 2 +- pkgs/desktops/kde-4.8/l10n/manifest-4.8.2.nix | 277 ---------------- pkgs/desktops/kde-4.8/l10n/manifest-4.8.4.nix | 277 ++++++++++++++++ pkgs/desktops/kde-4.8/oxygen-icons.nix | 2 +- 7 files changed, 579 insertions(+), 579 deletions(-) delete mode 100644 pkgs/desktops/kde-4.8/kde-package/4.8.2.nix create mode 100644 pkgs/desktops/kde-4.8/kde-package/4.8.4.nix delete mode 100644 pkgs/desktops/kde-4.8/l10n/manifest-4.8.2.nix create mode 100644 pkgs/desktops/kde-4.8/l10n/manifest-4.8.4.nix diff --git a/pkgs/desktops/kde-4.8/default.nix b/pkgs/desktops/kde-4.8/default.nix index 7b85e8c198e..b77a9e4bfec 100644 --- a/pkgs/desktops/kde-4.8/default.nix +++ b/pkgs/desktops/kde-4.8/default.nix @@ -1,7 +1,7 @@ { callPackage, callPackageOrig, stdenv, qt48 }: let - release = "4.8.2"; + release = "4.8.4"; # Need callPackageOrig to avoid infinite cycle kde = callPackageOrig ./kde-package { diff --git a/pkgs/desktops/kde-4.8/kde-package/4.8.2.nix b/pkgs/desktops/kde-4.8/kde-package/4.8.2.nix deleted file mode 100644 index 16878de7175..00000000000 --- a/pkgs/desktops/kde-4.8/kde-package/4.8.2.nix +++ /dev/null @@ -1,299 +0,0 @@ -{stable=true; -hashes=builtins.listToAttrs[ - {name="analitza";value="0dkz8y16qjjwq81rnnz7r8nchcqlk8rs0vlz9vlib2fsd85y2rm3";} - {name="ark";value="11adynnzli5w3g82g9mbl1gl9n4kph7n746sw0bc3hdwfzzy361c";} - {name="blinken";value="13b88f08c1p76k5067bhkbivgwi1zx05gwxp8yx22rx03ql5114i";} - {name="cantor";value="1di1lbqzz1i0ijd8bl1dyn29vkz2d7968a5lnzz226dhgzkkacx3";} - {name="filelight";value="0r1ay89hci5pkgk2gl2f5mmj91acsd3qqjh5286sv2s06fnwx9yw";} - {name="gwenview";value="1qfisab89bkqcxnj80d57bfl0b2ps3kz8hxxqpp7srp8x0wmwlr4";} - {name="jovie";value="0jxav473r1bcsjlccykihnmnjw6pcdgrc29q6lv6gw41d0dwl1a1";} - {name="kaccessible";value="0czgqnzv74fx5nrgfld2ii04k694dn6wp75zq0yxq0642pjla8xc";} - {name="kactivities";value="1hnpspy4xsmany48babzi7y88xmjihhb7smv6gmhqbwqpnrzn7dy";} - {name="kalgebra";value="1028gjmdlirm2mc5l72c7wlmhhkclfmx4pkscxywfa5a6cafkxxy";} - {name="kalzium";value="14xcrq2p3rhr66xvf6fxapf1xc5w72wf3yc3fl2g902g655d3li1";} - {name="kamera";value="03smprvzrvdi3j8h9zn76rjwhzsqi44wg2bs95c31mxa7kydxz2r";} - {name="kanagram";value="022il9rkxzpdhb8wr0gyv4dsys5zvsazq1k390gv2r5m0h13bdzb";} - {name="kate";value="1ady49ipndsvk6b43msllmpvygn299d6hmhpx8lzlhxxyvp5k3gk";} - {name="kbruch";value="1icm1f0lp4hyh5dp413dgnq709jkz5xr5bp1v05l4gfwk4gcmh7f";} - {name="kcalc";value="057cqdmxj0j6kp4q1lx830kypp52ph56lhdhg6cz32xz64igvk75";} - {name="kcharselect";value="0wblkfmg7lbnfnl042d2k7rgdh2pfm0pw4l691adaxvczm031ig2";} - {name="kcolorchooser";value="168kfmam4vxf7g120c9gsjwr78cs7l7pfl3q1zcna0ysd9cz9v4y";} - {name="kdeadmin";value="0cxkq2gq3gv5apb6yg8phnkn0ln1mdq6cq6s5icsf5qz5m7b9996";} - {name="kdeartwork";value="16iip7ys2kah3xnlj8n972530kd58f4baihhcgdmlr6x0dlxviqq";} - {name="kde-baseapps";value="0fd2amnlx3vg06k8xkarg13zksjzvwz1bqdhqmpj4hqjq04s7pkh";} - {name="kdegames";value="1plvrdj46ldgc7plx3b3g252a5l24hkdwdxwf848bja78717mp8w";} - {name="kdegraphics-mobipocket";value="0x4c0pb4a0rwvwk6xnq0c73px0p9ha4dyrym78gs22m7j8wh44zb";} - {name="kdegraphics-strigi-analyzer";value="10nkkqvipzmh8lyc5rwsclk5y4y0q6l9x6q14ybcyi9sjrdp16xj";} - {name="kdegraphics-thumbnailers";value="12434z4c5hvqqkii2lbmfay09pl4pmcdh2xf248j75jdis0wxr03";} - {name="kdelibs";value="0ic0f8d2qx77z971rkmkll2095alaz0ih5mnx9xfh51zjprrxqk8";} - {name="kdemultimedia";value="0lrn0v44pr5k169g21q3gx059n9aspaj77x44vrr2iaqdbqzipjj";} - {name="kdenetwork";value="04knna0rfvxj5d90mpwln341fspagyh1hpprb0gw7ambjzpicv1n";} - {name="kdepim";value="17wgnf3l4zhwr0lr0d05ik419ik1s18c7fd2d3fd8mmgcj0k8s8q";} - {name="kdepimlibs";value="1w3qz42rhj4spi88lp6dn3i92c1dx89004mwpakjcbh0bb10fyc2";} - {name="kdepim-runtime";value="0gl0qa0nyvf403fwb16v9bg2d98c8y1xnkfgwrf7f26ww8mink46";} - {name="kdeplasma-addons";value="05dfp0l8n7k5hplfrr47y15xq2qbl8km6m06m91hb0v5ds6zsjhn";} - {name="kde-runtime";value="0sx46fwl07s0z6bb0sadnv6w6p8x735kbwzgvm004m9y1fdn3pp8";} - {name="kdesdk";value="0aly8br19y4acj3ah61aypxqpig3cf25xdnr9drgqgl2519rb0bk";} - {name="kdetoys";value="1wjwibf0aqwnjwysc9khriwg8h80fyzcgprrvam0a82b3xzns43v";} - {name="kde-wallpapers";value="07l035jhrysn56nbivxnkgyrayfczbk2b6idij5pfr29c9nha7xk";} - {name="kdewebdev";value="0768x2c70xr9fybjw24aw9n53517496hrlhx5ww2p5lbxd71m9hp";} - {name="kde-workspace";value="0a4rn3j8aardsdn9qp20i7f3dijsyhh691cac2z9djkcx0zb4fxd";} - {name="kdf";value="0d7pp1l86qwp40zkj575ispxszsjm3nsg5c0x2f6i2bagi9wnrq8";} - {name="kfloppy";value="0mcs7fnj0y505nwbg76fgq2n107vwhf0ypw3v4y0gyswvcg6lv5f";} - {name="kgamma";value="09jqqrqnpc1n0pkm3mw1qh0i7l1f1v8a7wqg2x0cawd0vqiqjd8n";} - {name="kgeography";value="1a0dxqzz8z5ndnnznmafgs8i6kz7jqsgl8ra0nqclbghzpxjbl55";} - {name="kgpg";value="0w2hfg5bi5cdr8rh783m1ygx6f1w9674gp7knifhiv037zc47xn8";} - {name="khangman";value="0rkaawjv3g5jnlnqkaxcg1946zrmmxr5x6g24ip0syvwrasaa98z";} - {name="kig";value="1mjppcj8rbalhaafr4m9xbc2ydagfmdwwhdcjrwxnk84xr1p5a53";} - {name="kimono";value="1ayx8zbrjq4j78970k0pifs3m7z1a2szh6d6qk2bajr3dav708cb";} - {name="kiten";value="10mmfys6bg16whpgidjmbwqcd9hcq30gn3vkyasq8kblvkig2g7m";} - {name="klettres";value="0w4zhan6q9rsilvhf724b0nrj03szrf91zc861vbizch64a7glw2";} - {name="kmag";value="1vgwpfiy5n1kjrd6f87ikxg6hmnj85qcn8nsgsbg4c4wwg325mhp";} - {name="kmousetool";value="0aiznlb7nkq6im14zfr6iikkrhv62c96cnq5iqax55w432bqjx7x";} - {name="kmouth";value="1nnvhb29q9s55byns0bk4xj165dlk7mypzama6l9ayc734qpcib8";} - {name="kmplot";value="1ic4g3g87fg7shmr8lw7xnyqpkgc0ha9rji9a64knanv94c21jfz";} - {name="kolourpaint";value="096xqwnx54s37lbzdgqgdi3lvc0dw3xgpvbmn2zbchk98rfccrbg";} - {name="konsole";value="05w05c6579hvs98iajf3vw3rck2a90nvy1bapyrb0hhwz651p1n7";} - {name="korundum";value="1wqshxypn9v3jlcx518xqbmmcng71fk1nb7xq3q9m2dqn81p7095";} - {name="kremotecontrol";value="0ry7jr09klkkfa446yg820dc5j3wivkyz6z9h117wiccacpfylxl";} - {name="kross-interpreters";value="0wcmaac003h5gc0z29sqkzczgap1i7abir75gpp5y67qkvb52zbn";} - {name="kruler";value="14f209gh2rbjvjvv9pjlcl6vhfnfr4s0rnc57vzirk0cb5wjfjx9";} - {name="ksaneplugin";value="15p822y8nn817b4qsmxfb1cz928dnk14mr3667ysvynjfa9l0kkc";} - {name="ksecrets";value="1i87ccjdvmlpvqlqsyihxcb9r7xg8ybhc9y8z91fn0y0dihvysfs";} - {name="ksnapshot";value="1p4krsbkgmzgsa0q6xrs4anq35qzxzdx1g0mv129p5wg6570yr0c";} - {name="kstars";value="15dan9l18wm25i2lkdlgxrmn6rkznhq1riag3kd83i4qwc2rzzdj";} - {name="ktimer";value="1pwxilhr3ymqghii00vmpsjrmzivv8j9jn6aypzs9z1qhp9v7gi7";} - {name="ktouch";value="0m08zgr6phkp8c8k04sj67m4d6him0c6pirijdb4z8ki0b5sgmp6";} - {name="kturtle";value="1701nb2p78yyl5j7f9cq0i6maddy0pjkrxjs4v8r92n2bl0wpl8b";} - {name="kwallet";value="1p7krlp824v7v0hlafgwx139i7g42x2x7raqjyyw5l22gy6qq05l";} - {name="kwordquiz";value="175pm548vkdfpiiq9c66jsw9p1h3m6bi6q6b8df5kknap914radi";} - {name="libkdcraw";value="12brv1wlgcghhcha1h65902rgpcdl2hfh5vaaysmvczs72j18rvf";} - {name="libkdeedu";value="085qfp84r2ck4b1rzh5qqk0cr5z6g7b4xnw3cgnqr6z93901llic";} - {name="libkexiv2";value="1mcvm7ffjy5brybbpr3pdcfh0prkd55323023rjysv3iyv4lylp8";} - {name="libkipi";value="0mhqaaxglh1ksc9fga3llvnmi66d0xkpnp8pcq1k3xc03f9gay3w";} - {name="libksane";value="0cxamj8djmhqn2xcx8672y06zq511l92p56ic32bpq8337xf9gzl";} - {name="marble";value="13ndxh8jdydz7adslkc4bzrq741hw3w0w16vys0ps0829sqbqpzn";} - {name="okular";value="038b1c9d7w3hyzfinzirixfmakxva4hyhbsrkjn3kgxmndmp2rrn";} - {name="oxygen-icons";value="1a15rjma3wgb36c6v1x58m8dv6ndgsp6k9a958vyack57775xri9";} - {name="parley";value="1bf2zc8qcx4m3yam1wsydmhs5z0830zfdl1s7zy84nffnslmszn6";} - {name="perlkde";value="0lkpvnqfjspl9c61avczvc1lbl515vkpr82vxa0bdkrnjijn2zz9";} - {name="perlqt";value="04sp4ricpwvaz856lyf6r7aal9pbr2chn8w8x77ydhy9pm6lpr3c";} - {name="printer-applet";value="0c5bazz3xa5scxiih11fx2z4qakcvmgnbnla3hy7hyc5xygzicpz";} - {name="pykde4";value="1rg0zikjdldm7vnrnhi4z10f89b3ka8lsghkwvjqmi742rqa097v";} - {name="qtruby";value="0nbn1lm55sxaiq5xkdqnph8kd9v831lq15h6niyard744133fhir";} - {name="qyoto";value="11ispw0a60dzxn9v9m1l6g61q7242z5jr95s3lf2ajl13gmrx0l9";} - {name="rocs";value="1jgpigcirjdyvpryvgba76qy46lnxsvr2x2d5chf7jzgzy3l5753";} - {name="smokegen";value="1qy7qj47rlsp56j3ghc1a077k2qydsy9lv1d09i48cn8xf3r0mcs";} - {name="smokekde";value="0fxfplcdndcvb7lsp6f3va5nn1x9knk1qi76wrmfwm1h4ahb0jsr";} - {name="smokeqt";value="0whw8r6hx8qza9an9x4yil8klmdicwxp3gsh2pq4bxavlgrw1f28";} - {name="step";value="06kf1vc6bxs8sg0j691cyprkv6bkaw8fmi3ikna9d54s33mnq5cj";} - {name="superkaramba";value="02k9f1jr9bvlf2zg8wm47qwch3i4ps24mhp6j2i25rpj9l8g7pm1";} - {name="svgpart";value="0sl94xia81hqjqy0ydqlqffpwsdybyaam9an4w6qa6sszmx7kbyj";} - {name="sweeper";value="0yin8jbpxjkdxv1sg3n8nysfm4hvfr37m15bxhn92bgjdkbh2zdz";} -]; -modules=[ -{ - module="kdegraphics"; - split=true; - pkgs=[ - { name="gwenview"; } - { name="kamera"; } - { name="kcolorchooser"; } - { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; } - { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; } - { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; } - { name="kgamma"; } - { name="kolourpaint"; } - { name="kruler"; } - { name="ksaneplugin"; } - { name="ksnapshot"; } - { name="libkdcraw"; } - { name="libkexiv2"; } - { name="libkipi"; } - { name="libksane"; } - { name="okular"; } - { name="svgpart"; } - ]; -} -{ - module="kdeutils"; - split=true; - pkgs=[ - { name="ark"; } - { name="filelight"; } - { name="kcalc"; } - { name="kcharselect"; } - { name="kdf"; } - { name="kfloppy"; } - { name="kgpg"; } - { name="kremotecontrol"; } - { name="ksecrets"; } - { name="ktimer"; } - { name="kwallet"; } - { name="printer-applet"; sane="printer_applet"; } - { name="superkaramba"; } - { name="sweeper"; } - ]; -} -{ - module="kdeedu"; - split=true; - pkgs=[ - { name="analitza"; } - { name="blinken"; } - { name="cantor"; } - { name="kalgebra"; } - { name="kalzium"; } - { name="kanagram"; } - { name="kbruch"; } - { name="kgeography"; } - { name="khangman"; } - { name="kig"; } - { name="kiten"; } - { name="klettres"; } - { name="kmplot"; } - { name="kstars"; } - { name="ktouch"; } - { name="kturtle"; } - { name="kwordquiz"; } - { name="libkdeedu"; } - { name="marble"; } - { name="parley"; } - { name="rocs"; } - { name="step"; } - ]; -} -{ - module="kdebindings"; - split=true; - pkgs=[ - { name="kimono"; } - { name="korundum"; } - { name="kross-interpreters"; sane="kross_interpreters"; } - { name="perlkde"; } - { name="perlqt"; } - { name="pykde4"; } - { name="qtruby"; } - { name="qyoto"; } - { name="smokegen"; } - { name="smokekde"; } - { name="smokeqt"; } - ]; -} -{ - module="kdeaccessibility"; - split=true; - pkgs=[ - { name="jovie"; } - { name="kaccessible"; } - { name="kmag"; } - { name="kmousetool"; } - { name="kmouth"; } - ]; -} -{ - module="kde-baseapps"; -sane="kde_baseapps"; split=true; - pkgs=[ - { name="kate"; } - { name="kde-baseapps"; sane="kde_baseapps"; } - { name="konsole"; } - ]; -} -{ module="kactivities"; split=false;} -{ module="kdeadmin"; split=false; - pkgs=[ - { name="strigi-analyzer"; sane="strigi_analyzer";} - { name="kuser"; } - { name="kcron"; } - { name="ksystemlog"; } - { name="system-config-printer-kde"; sane="system_config_printer_kde";} - ]; - -} -{ module="kdeartwork"; split=false; - pkgs=[ - { name="ColorSchemes"; } - { name="IconThemes"; } - { name="emoticons"; } - { name="kscreensaver"; } - { name="kwin-styles"; sane="kwin_styles";} - { name="sounds"; } - { name="styles"; } - { name="wallpapers"; } - { name="HighResolutionWallpapers"; } - { name="WeatherWallpapers"; } - { name="desktopthemes"; } - { name="aurorae"; } - ]; - -} -{ module="kdegames"; split=false;} -{ module="kdelibs"; split=false;} -{ module="kdemultimedia"; split=false;} -{ module="kdenetwork"; split=false; - pkgs=[ - { name="kfile-plugins"; sane="kfile_plugins";} - { name="kget"; } - { name="kopete"; } - { name="krdc"; } - { name="kppp"; } - { name="krfb"; } - { name="kdnssd"; } - { name="filesharing"; } - ]; - -} -{ module="kdepim"; split=false;} -{ module="kdepimlibs"; split=false;} -{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;} -{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;} -{ module="kde-runtime"; sane="kde_runtime"; split=false;} -{ module="kdesdk"; split=false; - pkgs=[ - { name="cervisia"; } - { name="lokalize"; } - { name="kdeaccounts-plugin"; sane="kdeaccounts_plugin";} - { name="dolphin-plugins-svn"; sane="dolphin_plugins_svn";subdir="dolphin-plugins/svn"; } - { name="dolphin-plugins-git"; sane="dolphin_plugins_git";subdir="dolphin-plugins/git"; } - { name="dolphin-plugins-hg"; sane="dolphin_plugins_hg";subdir="dolphin-plugins/hg"; } - { name="dolphin-plugins-bazaar"; sane="dolphin_plugins_bazaar";subdir="dolphin-plugins/bazaar"; } - { name="kcachegrind"; } - { name="kapptemplate"; } - { name="kpartloader"; } - { name="strigi-analyzer"; sane="strigi_analyzer";} - { name="kioslave"; } - { name="okteta"; } - { name="kmtrace"; } - { name="kompare"; } - { name="kprofilemethod"; } - { name="kstartperf"; } - { name="kuiviewer"; } - { name="poxml"; } - { name="scripts"; } - { name="umbrello"; } - ]; - -} -{ module="kdetoys"; split=false; - pkgs=[ - { name="kteatime"; } - { name="ktux"; } - { name="amor"; } - ]; - -} -{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;} -{ module="kdewebdev"; split=false; - pkgs=[ - { name="klinkstatus"; } - { name="kfilereplace"; } - { name="kimagemapeditor"; } - { name="kommander"; } - ]; - -} -{ module="kde-workspace"; sane="kde_workspace"; split=false;} -{ module="oxygen-icons"; sane="oxygen_icons"; split=false;} -]; -} diff --git a/pkgs/desktops/kde-4.8/kde-package/4.8.4.nix b/pkgs/desktops/kde-4.8/kde-package/4.8.4.nix new file mode 100644 index 00000000000..6fbaf097be0 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kde-package/4.8.4.nix @@ -0,0 +1,299 @@ +{stable=true; +hashes=builtins.listToAttrs[ + {name="analitza";value="0g3k6i9ncl8m8xr85wz6k0vbmjq7jwmygm0353jq2lj2hy5i2ipg";} + {name="ark";value="10m6bmiz4ylgbmxx03q0zfayy1zinxx696jczmllxn557z75nzn5";} + {name="blinken";value="1n0m70by3wd5d4nqlgqrm6bg0nplc3b92cn74xq5adi1dfi63ggr";} + {name="cantor";value="1grjxbzyshc9jlmx9gvxfsxdhcgrn391s3bh0mmprnk0kcsi4s5i";} + {name="filelight";value="1fpkwyz74nqm0szfylbjqfxwv25rgfdg03ghq5mncs2ys8mh4rn1";} + {name="gwenview";value="1xxkhq4psl3zq0ah6fp42s5ih1xik0kxq4sb2r2mhkimrsj11rvz";} + {name="jovie";value="103d7c1h3qfqsh6phyxm4g712kykkpd1vls26kypn3d6linc9p1s";} + {name="kaccessible";value="0s772i8nc1lx6c8sjsy3m928dcyackd8pay44b8nlp8k8hzh5x62";} + {name="kactivities";value="0kxpg0bwr9ph3bzndc5vqgfqkxy443chyg3rbrdvgbgb0xm54r5f";} + {name="kalgebra";value="0p5qhxwd6h8kvfd8n81ah0pszaa550z7y2zlzvrgypmfcgx8a802";} + {name="kalzium";value="17sxslsg5pi1xh7l0h6y0rmjhb6nshq9psjjjqwhfl7id6ansb24";} + {name="kamera";value="0r8rr4lq3jrvfz2fw4in83vsxqjm02x16h842r4hnn3k5svaqs49";} + {name="kanagram";value="02wp2rkm5m6920rvs6iyalvv4xczgh21w1mrf4a694j14fna4m1n";} + {name="kate";value="0530rq6pfrim2mfjkvpl9qxv56fykml7aq3awchyda3xbkq7vk3y";} + {name="kbruch";value="1znm2dmsib7svyfqpyhblip5ic4y2xdylax1kxx7ssmjgsi3bw54";} + {name="kcalc";value="1dv3d833ksz9bqrwhq9pbsqk0a8hv3jlqlxbqccwgkx840hmpclz";} + {name="kcharselect";value="015pj1zmlnjr8ys3arks3b1yqf8rh9fc02p0xfq1fkp11ing0lfg";} + {name="kcolorchooser";value="04360b4pjsdl0ckdwipn3y407fmsx2bimkzqqm01hz4vdyb41d9k";} + {name="kdeadmin";value="0qvynvim50xsv060598bhv6pwxd578sg25g1z2dzdi4ih021nlr0";} + {name="kdeartwork";value="1v5an8385d9zjb29ps94xgvpazpvqffxnlvfp4940pj5imdg98nm";} + {name="kde-baseapps";value="0z2jasna2d8i3iy8w4grylfml9a510imhl0bxnsw6whar409rzki";} + {name="kdegames";value="1jji5dw9qllhv7zh7a456iwwsb5vqrvjd0p871s2qi8lcd54fs1a";} + {name="kdegraphics-mobipocket";value="1ya4jzj864ikw6ysp9ip1ha2n6a8im380k4yhmca9agp5f21zvva";} + {name="kdegraphics-strigi-analyzer";value="1cwvaszjawzdbvggxzzaxvxdjpxmr9x4p4fqy4wq38qzx06lnsd1";} + {name="kdegraphics-thumbnailers";value="1zxvqzadmcsy5ydxx617gpfh3vswcrnyjwn19scy1cv7nwdpxnqj";} + {name="kdelibs";value="1wr0kadmc33kqbr93h05g6yxqwp66cgs9ab32danvqbfns0qgb15";} + {name="kdemultimedia";value="0h56vy27kb1s4p3vpa42gj3xjbpwl38n97bbjq7g1vj8dq2k0pl4";} + {name="kdenetwork";value="10lyrygi3avfiyaqxgw9g6dc3pmsbggawjvnkxhm8f2j2gy7sbbc";} + {name="kdepim";value="0q4fq26gg3hfmvxzfbizsa1ffk88a994k31ybbv72b7xcdjz68ff";} + {name="kdepimlibs";value="1wqi7dh1w3cinkd8sgc0zx9qf7fyvizli4asbimxh5faal1b10bb";} + {name="kdepim-runtime";value="1v1klgcfa0hwi7bxqn0nphd7hlbxwh3v6apghra0b8f7qqnzxysp";} + {name="kdeplasma-addons";value="1f4bpgrjqa9c1ikngc9wn3a0y0hw39icswc77ys4j04b9zazg8qn";} + {name="kde-runtime";value="0g2jlxfxm4flx1pr920hbmqaq433y8bdglk08vnhycychppkacmc";} + {name="kdesdk";value="15zg649sm851ig7yxcsv9cx54x36k94y83q1wvm1kf84jb1vl1yg";} + {name="kdetoys";value="038h6fmqfy7mh2i7kg3510w0jwji9hac94dpzfmfgk36i461dbnn";} + {name="kde-wallpapers";value="18hbd9d19yf48vs4vmxrrxvr87baxxlf3z417f69kgvjpvmpl905";} + {name="kdewebdev";value="1mv5nq8ayz5np1vmgk58dsai6wmqdl1kvq96pvi5awmhxxla2f5x";} + {name="kde-workspace";value="12vn117nbqxipvb58v7swc4prfddijz7m0c03xn5wi1kbzq5xj9n";} + {name="kdf";value="0alc9a7x75f8dx5gbhdqwn0xfx7kr5q7dl9qfmcmrgm9vn6agxpw";} + {name="kfloppy";value="0ajc3yq86n4q7hxjgibvkrbbagg7xnlbd6g7mx3cvmq9l7na105b";} + {name="kgamma";value="1yviy8xz8cqlbpvjj7sp9jylq4lk98r3mpp6lxl95ypkjqbjx8w3";} + {name="kgeography";value="0wklqqprg7d7mxjlwfyv4n5d2igkr6b2i174vxzdhj9dbsh9r67f";} + {name="kgpg";value="034mg0s5v0vqq59x1fwddslg6r2dx3v70icka6j2r9lhi8635j5m";} + {name="khangman";value="0b64pqywvxdxrbp3xcscimdlsn44hwlvm6ydxiwx2salm2rn9xxa";} + {name="kig";value="0cblkm71j78dq4r90r9fladn8nxq3xq75w40f85jl9dkmm1y3yiv";} + {name="kimono";value="1ij7bcvxv8zkfzcrmjasq6x0nf41104x5bj6ksfc8mibml182bq7";} + {name="kiten";value="1c3rdagddk0xd0j6vnp0bj16in78879niakvq1s35s7grgxh31ia";} + {name="klettres";value="0sxd3hwpzyzvjrvly0w2fwrssg4a9rs35fp9yi6in19x7x8rbsxl";} + {name="kmag";value="0fgddhsf9f5n4crzp4z2ii5p1asyvpbmsiqgb61kswqbpsr96mv8";} + {name="kmousetool";value="0f4ym6dihq9wmwaassap0ixam46lqjvf6jqkr6ib0y87myj3h9mi";} + {name="kmouth";value="1hpphlav8ip4kx3787p3dkfddkzpgg4mj25ripjcpy0xpbfvc2lw";} + {name="kmplot";value="19sab4hmdv8kwipgjzg4v3gq4lv1i17yh4hdq3y6lcyf7wjkxjpd";} + {name="kolourpaint";value="0mr4f1vbhg3vhap92f8jj5lkpfr8cjphn863vda49rfdydhv1x6w";} + {name="konsole";value="10fgjsq2dj56ifnzxy3dz87s92m2zfcmpqa751b5ar0wp3pil045";} + {name="korundum";value="0vkhf40ghbqgs9vxl7zpfq21r7sc9z4rm0iyl9cab04wvi9r2nsk";} + {name="kremotecontrol";value="11z0wc9yvpk72yrx9ic3zpky2z346wdkvs8qcik9nfbbxxpk4vnx";} + {name="kross-interpreters";value="0afqwxxsysd7wwl5xgwdw58q7hjr8y5sdvsfrz8sfkirinfdmp9s";} + {name="kruler";value="19xppbxvyw6qzgxz4y1yzz9g104464z1i7dvsd3919njqhsrm628";} + {name="ksaneplugin";value="0z2gkc0997s79haf2nxgg5xgvmpk5iz2s33147qhhy12hys6jq9m";} + {name="ksecrets";value="1f4n3x5rmc0l16q3bripk49mj0nyak6s3vf3v7j4g89qz8rr4c87";} + {name="ksnapshot";value="069v2qs4nl8514kdgcp6y03n1n4d6ymm5j5yq1wwrgij6iqc7a78";} + {name="kstars";value="1hl0z77cl317pm442lcd2hk6rb83hvch904a0jgflcxcd2w0gg54";} + {name="ktimer";value="1hf0sbl9y0a9w2xdxdl88lmv55skz7fp1kl9sgnsyj8gzjyv3nwa";} + {name="ktouch";value="00hij38zk469ja3ns9d7qpj91kyndwrnmf0v2fqd2nicv9mqxdih";} + {name="kturtle";value="0wvskx6cif0gsgvsc072i33jl58bp2n74vyl2qgbw4bibckp9aq8";} + {name="kwallet";value="1n4vl0gvr8sqh8ld0bmz3qdz8lws19vzndrp10xl5fmb40cibdsz";} + {name="kwordquiz";value="1w2xwfqz3bjmm0rg4pn08vgm7f0m1wr2bc8cwgjayc8105xy572h";} + {name="libkdcraw";value="0fpx8yprgrk6sg03xms8swgqb7b41ia2rnf9n5phm5hvbpwwbw9f";} + {name="libkdeedu";value="1nz53vjmd48x9vk73wrfz6k94drxv0w2nsa0nnh68q1mphxm8cz3";} + {name="libkexiv2";value="1w7h8ckq2b7pi6qdf8p7rk6jzpn5caxflzdczlaxa7jn84k4rsjn";} + {name="libkipi";value="02cdmqjky5sfwpz9m85yixkmcsh9ybjdspsi8dwhypndpq3pgj3w";} + {name="libksane";value="11wgzdccwix4whfdj8f7fyapxk9yp8jfra56s9gyn7a4sfgp40sp";} + {name="marble";value="09ph1lg3y6bzkxdnpwbhlysj9s56fbaxwsxpn2ydwg4vnsspspiy";} + {name="okular";value="06xd3xpm1hp2dk382p4sd2dj2gdwb1f4d97hkh67riddwwzlcdal";} + {name="oxygen-icons";value="0zw6kv456gf955ip28iykx8nmd4h0scpqdj4f035yqiyxms9p4g1";} + {name="parley";value="1mg5mkxlzrb1clnclsfcl4vpd8yn97asgcazlq9wmgr077z0f9yd";} + {name="perlkde";value="1k94rfchpi7nvzvwz2flx49ni92aw6x8cc6qnq1vr98j9hangjg4";} + {name="perlqt";value="0rjwd2d2jlqlsjvw6w198jb79kjib89p3gbslj4dfgblrq1cgrdq";} + {name="printer-applet";value="1y8r39dyc04bkqm33s65m77c6y4y19bi32v2cx5bl67w5377hvh0";} + {name="pykde4";value="0gnzqw2xj1swm2jr728fxb7l48ll8whvc4ranwcvx8920jdd8vk7";} + {name="qtruby";value="1ixb8kav1pxpkwar99p3cgwi6nql1dfjwmyq7ai2h8ls7g075gz8";} + {name="qyoto";value="07m64n9xlnpgmw6jj91vwyzzjnmwn9px3ckfi93qs4mgnsj263zi";} + {name="rocs";value="0zxdskps9ifc8yhrk6lngjsh4abp98pv7d9y48lw830jhy78bm57";} + {name="smokegen";value="08yzxg6x3bdpza7hld1bd1ils5ipav2laazcar811vsn70lr8rqy";} + {name="smokekde";value="1k8r7d82mbmilg2x565w9nwxb5x6xfznscqwv9vmsgync56nk982";} + {name="smokeqt";value="036128q7mz5701ikw7fjc22ygkmnlscckmlgv3nb8d914maa1cl0";} + {name="step";value="1i1334p7qlc84m8xjc4sp20pmnqal26y8854pcv7lh8r3xzyscd6";} + {name="superkaramba";value="05xgflb9ramhrqb6avqagxp1kcdax6qwdf1k6wm85l8ys6vjimry";} + {name="svgpart";value="0xrs93njmp5322m4dh3ycvwgl9p618kzsi5xmrnlksb9n0hi91gw";} + {name="sweeper";value="1gcyffzzap2gdxk3js43bllf87795f97i0lmykgyllhp364czv6x";} +]; +modules=[ +{ + module="kdegraphics"; + split=true; + pkgs=[ + { name="gwenview"; } + { name="kamera"; } + { name="kcolorchooser"; } + { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; } + { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; } + { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; } + { name="kgamma"; } + { name="kolourpaint"; } + { name="kruler"; } + { name="ksaneplugin"; } + { name="ksnapshot"; } + { name="libkdcraw"; } + { name="libkexiv2"; } + { name="libkipi"; } + { name="libksane"; } + { name="okular"; } + { name="svgpart"; } + ]; +} +{ + module="kdeutils"; + split=true; + pkgs=[ + { name="ark"; } + { name="filelight"; } + { name="kcalc"; } + { name="kcharselect"; } + { name="kdf"; } + { name="kfloppy"; } + { name="kgpg"; } + { name="kremotecontrol"; } + { name="ksecrets"; } + { name="ktimer"; } + { name="kwallet"; } + { name="printer-applet"; sane="printer_applet"; } + { name="superkaramba"; } + { name="sweeper"; } + ]; +} +{ + module="kdeedu"; + split=true; + pkgs=[ + { name="analitza"; } + { name="blinken"; } + { name="cantor"; } + { name="kalgebra"; } + { name="kalzium"; } + { name="kanagram"; } + { name="kbruch"; } + { name="kgeography"; } + { name="khangman"; } + { name="kig"; } + { name="kiten"; } + { name="klettres"; } + { name="kmplot"; } + { name="kstars"; } + { name="ktouch"; } + { name="kturtle"; } + { name="kwordquiz"; } + { name="libkdeedu"; } + { name="marble"; } + { name="parley"; } + { name="rocs"; } + { name="step"; } + ]; +} +{ + module="kdebindings"; + split=true; + pkgs=[ + { name="kimono"; } + { name="korundum"; } + { name="kross-interpreters"; sane="kross_interpreters"; } + { name="perlkde"; } + { name="perlqt"; } + { name="pykde4"; } + { name="qtruby"; } + { name="qyoto"; } + { name="smokegen"; } + { name="smokekde"; } + { name="smokeqt"; } + ]; +} +{ + module="kdeaccessibility"; + split=true; + pkgs=[ + { name="jovie"; } + { name="kaccessible"; } + { name="kmag"; } + { name="kmousetool"; } + { name="kmouth"; } + ]; +} +{ + module="kde-baseapps"; +sane="kde_baseapps"; split=true; + pkgs=[ + { name="kate"; } + { name="kde-baseapps"; sane="kde_baseapps"; } + { name="konsole"; } + ]; +} +{ module="kactivities"; split=false;} +{ module="kdeadmin"; split=false; + pkgs=[ + { name="strigi-analyzer"; sane="strigi_analyzer";} + { name="kuser"; } + { name="kcron"; } + { name="ksystemlog"; } + { name="system-config-printer-kde"; sane="system_config_printer_kde";} + ]; + +} +{ module="kdeartwork"; split=false; + pkgs=[ + { name="ColorSchemes"; } + { name="IconThemes"; } + { name="emoticons"; } + { name="kscreensaver"; } + { name="kwin-styles"; sane="kwin_styles";} + { name="sounds"; } + { name="styles"; } + { name="wallpapers"; } + { name="HighResolutionWallpapers"; } + { name="WeatherWallpapers"; } + { name="desktopthemes"; } + { name="aurorae"; } + ]; + +} +{ module="kdegames"; split=false;} +{ module="kdelibs"; split=false;} +{ module="kdemultimedia"; split=false;} +{ module="kdenetwork"; split=false; + pkgs=[ + { name="kfile-plugins"; sane="kfile_plugins";} + { name="kget"; } + { name="kopete"; } + { name="krdc"; } + { name="kppp"; } + { name="krfb"; } + { name="kdnssd"; } + { name="filesharing"; } + ]; + +} +{ module="kdepim"; split=false;} +{ module="kdepimlibs"; split=false;} +{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;} +{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;} +{ module="kde-runtime"; sane="kde_runtime"; split=false;} +{ module="kdesdk"; split=false; + pkgs=[ + { name="cervisia"; } + { name="lokalize"; } + { name="kdeaccounts-plugin"; sane="kdeaccounts_plugin";} + { name="dolphin-plugins-svn"; sane="dolphin_plugins_svn";subdir="dolphin-plugins/svn"; } + { name="dolphin-plugins-git"; sane="dolphin_plugins_git";subdir="dolphin-plugins/git"; } + { name="dolphin-plugins-hg"; sane="dolphin_plugins_hg";subdir="dolphin-plugins/hg"; } + { name="dolphin-plugins-bazaar"; sane="dolphin_plugins_bazaar";subdir="dolphin-plugins/bazaar"; } + { name="kcachegrind"; } + { name="kapptemplate"; } + { name="kpartloader"; } + { name="strigi-analyzer"; sane="strigi_analyzer";} + { name="kioslave"; } + { name="okteta"; } + { name="kmtrace"; } + { name="kompare"; } + { name="kprofilemethod"; } + { name="kstartperf"; } + { name="kuiviewer"; } + { name="poxml"; } + { name="scripts"; } + { name="umbrello"; } + ]; + +} +{ module="kdetoys"; split=false; + pkgs=[ + { name="kteatime"; } + { name="ktux"; } + { name="amor"; } + ]; + +} +{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;} +{ module="kdewebdev"; split=false; + pkgs=[ + { name="klinkstatus"; } + { name="kfilereplace"; } + { name="kimagemapeditor"; } + { name="kommander"; } + ]; + +} +{ module="kde-workspace"; sane="kde_workspace"; split=false;} +{ module="oxygen-icons"; sane="oxygen_icons"; split=false;} +]; +} diff --git a/pkgs/desktops/kde-4.8/kde-wallpapers.nix b/pkgs/desktops/kde-4.8/kde-wallpapers.nix index 4fadc9edf00..803b027668a 100644 --- a/pkgs/desktops/kde-4.8/kde-wallpapers.nix +++ b/pkgs/desktops/kde-4.8/kde-wallpapers.nix @@ -9,7 +9,7 @@ kde { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "69cbb2e8c6fd78931af7196c3a79918f87b5aed31c52521b8d4089eb98e7557b"; + outputHash = "b8dfcc905abc46eebac2dd07267879d6a27e6e77f5253eb9c65fe594766770c4"; meta = { description = "Wallpapers for KDE"; diff --git a/pkgs/desktops/kde-4.8/l10n/manifest-4.8.2.nix b/pkgs/desktops/kde-4.8/l10n/manifest-4.8.2.nix deleted file mode 100644 index 20734ec9424..00000000000 --- a/pkgs/desktops/kde-4.8/l10n/manifest-4.8.2.nix +++ /dev/null @@ -1,277 +0,0 @@ -[ -{ - lang = "ar"; - saneName = "ar"; - sha256 = "0xg4rp3k7zcvrrs7y2c3rxmb07mlmkfxnw5vnhgj0hp67zsa0xqc"; -} -{ - lang = "bg"; - saneName = "bg"; - sha256 = "13xh14bknqp0yfy093y70bkkazbfi81x190m0mqbc03npp7f0fny"; -} -{ - lang = "bs"; - saneName = "bs"; - sha256 = "1wdkxij7w04f73ha8aqqrh5awvad1flsv2yhl5qd5yrsf0f47pcn"; -} -{ - lang = "ca"; - saneName = "ca"; - sha256 = "03ngb8jidmh5xsfgrbcsgs387cwrqlb5bclyrx7x66ig2a6cj293"; -} -{ - lang = "ca@valencia"; - saneName = "ca_valencia"; - sha256 = "1lnir36hv69a2lr70l3gc787r4dmkwfm4cnygkajwz13hh02a5yw"; -} -{ - lang = "cs"; - saneName = "cs"; - sha256 = "0zrmcmxkcc31sys9svnvqdhls9z121hy6x4649hlvqykjy906wsx"; -} -{ - lang = "da"; - saneName = "da"; - sha256 = "18zwx64wsrlfamhq81573ss4zci4jsh9fzfiibqfnailyq7vh6af"; -} -{ - lang = "de"; - saneName = "de"; - sha256 = "14fm8lmwqzs741s9vpp6avq0xv41g528glj1inq53p9shxnnyqii"; -} -{ - lang = "el"; - saneName = "el"; - sha256 = "1282cf55vb6j1p7xj6k5yjvs5js6j2ia82qrk1lbilrp0z2i0gmv"; -} -{ - lang = "en_GB"; - saneName = "en_GB"; - sha256 = "03irsv325yl552afa6cwzvm51bsdhlvkk7p3j09bld64jdafsy51"; -} -{ - lang = "es"; - saneName = "es"; - sha256 = "1a2jwbzx1nygygsmhpiwchrm4lsfji0823dbhmi5a7nccdz8qcl7"; -} -{ - lang = "et"; - saneName = "et"; - sha256 = "0h3a2kpf2658mgix1p8l84mh64vd4d3pd57s9s0hhgkqz393rfyw"; -} -{ - lang = "eu"; - saneName = "eu"; - sha256 = "0mzyq0z6kjpp442i4y2v2xkfygd816ija2p9s4rmh8p83z3m4vf3"; -} -{ - lang = "fa"; - saneName = "fa"; - sha256 = "1ha1rnqki9ydlqyb8m9kxpvj706rg6jzzqpsy5dd3jwmbq9p3hih"; -} -{ - lang = "fi"; - saneName = "fi"; - sha256 = "0wljp5ka2mm4xxmf6gplsh06ynibw3vcn62dxhawpw04xpj561z0"; -} -{ - lang = "fr"; - saneName = "fr"; - sha256 = "18dihln161rrh8269j0c2pypxwhddigd6qgscjqypkhh3nclc158"; -} -{ - lang = "ga"; - saneName = "ga"; - sha256 = "0r8hv5lnrjjxbzbpxfsipaj0nd8lmlwf69073x0nyxvins6yl8r8"; -} -{ - lang = "gl"; - saneName = "gl"; - sha256 = "1qh81dqz5wm7viqvx9mkb6v5m11c67igqz2n44ax8f87m4d2n14n"; -} -{ - lang = "he"; - saneName = "he"; - sha256 = "1ld68csc2dxwmql2j79xnnbi7ib1hjs9hd28bbqcn3v240jmfrhc"; -} -{ - lang = "hr"; - saneName = "hr"; - sha256 = "00m40mxfgm8ymfq1l51i3kd1493cmddn0my6sahh6hy21zhbfb7p"; -} -{ - lang = "hu"; - saneName = "hu"; - sha256 = "0vxanrd8q8ykmzhyz9h2a38izccfyssmck2gvrm2r53hli3zfnl5"; -} -{ - lang = "ia"; - saneName = "ia"; - sha256 = "0ys5ysq15aazifmjx26sd73801bdfl5hsaranbwarrmky2w0ahmw"; -} -{ - lang = "id"; - saneName = "id"; - sha256 = "0lw4gi3p4cms519l36p1xa7hpavwmbvl60chw8ji1xyh29fkylz8"; -} -{ - lang = "is"; - saneName = "is"; - sha256 = "09lzndfxck7s5bryn7i9w8pya18wiy9y27rzqaq8sa9hmjswmkc7"; -} -{ - lang = "it"; - saneName = "it"; - sha256 = "1s2b9rrwj4yfx4xk323wcyzvidxiipb3sfws3hsb56vdvhkmr7hs"; -} -{ - lang = "ja"; - saneName = "ja"; - sha256 = "0gzishadvm9s863r0z6xbi35qgcl5da5l2nn8b5dqdjz61ndj7w7"; -} -{ - lang = "kk"; - saneName = "kk"; - sha256 = "1yy3yaifcgj8203wajnqvr7li42w8zvy02gqirxjb5n2kshcjnm3"; -} -{ - lang = "km"; - saneName = "km"; - sha256 = "1a717bsxp75xb8wrxg6a1817d69a9zdvhsha9dlrxqif8krvg8kw"; -} -{ - lang = "ko"; - saneName = "ko"; - sha256 = "1965ai6hchhmdsi8lz68zwgb0hynzdpv60vx7z716428qki4kaxy"; -} -{ - lang = "lt"; - saneName = "lt"; - sha256 = "15d6r4jyp3qkf64wfqixrkc899a27s7vkgzgaxr6qpln5nhwxhiz"; -} -{ - lang = "lv"; - saneName = "lv"; - sha256 = "0y6xdl7rpb78s4mdisr33afvmhvk2pn0x13vylv7rxcxa34qzgp0"; -} -{ - lang = "nb"; - saneName = "nb"; - sha256 = "1llf9w22ys3kr1gbff60rqr8x55b8rjchxwk3zx8sidpflfj2jxx"; -} -{ - lang = "nds"; - saneName = "nds"; - sha256 = "1qixvdl916lriar5cq5s2ssin9klavy1kap6n4mlj2v1pwzqncv0"; -} -{ - lang = "nl"; - saneName = "nl"; - sha256 = "1bq6dshbbl36pd1kik60kdqpm3fj95409wrz07rvw21bc5wn4ng0"; -} -{ - lang = "nn"; - saneName = "nn"; - sha256 = "085vkfx26sfqz2vg1zs38fri99h344gmjfg9p64l82csx9fkr6d3"; -} -{ - lang = "pa"; - saneName = "pa"; - sha256 = "01q6kirkn7ah0m9hkd5i90la52p9cdjs01q0a99ic6jyfkjnzdms"; -} -{ - lang = "pl"; - saneName = "pl"; - sha256 = "1ixrfkb8lklh0475j2w97s21hwxcsf1vqafq5hg0819g6qd2aijl"; -} -{ - lang = "pt"; - saneName = "pt"; - sha256 = "0hcbfhxw66vilad81rmw88wybbsalidq50wfy4c2cb415cfqi1sr"; -} -{ - lang = "pt_BR"; - saneName = "pt_BR"; - sha256 = "0pwzmhkk2acmkqfvsbv2r58wjfrikqzpy5j74prpwk7w3ikch683"; -} -{ - lang = "ro"; - saneName = "ro"; - sha256 = "0xs9m6hqiqgknbm139wv46g4gwz595bqdnhzxibaadibrpaby8yq"; -} -{ - lang = "ru"; - saneName = "ru"; - sha256 = "0j2nb2nwipm8y894s0dqxs46slwcwgj5c6j62xw40jxr3zl726xc"; -} -{ - lang = "si"; - saneName = "si"; - sha256 = "1np69csgvfmg9nr07jxy45z1hpr0s7x0cfyv4gzidgwgrrjgy9rx"; -} -{ - lang = "sk"; - saneName = "sk"; - sha256 = "0f46d1wkac2mnl9wmzg3xhak5jxs1rdnqafk26zvg84ksdapy9ji"; -} -{ - lang = "sl"; - saneName = "sl"; - sha256 = "1ca7z7n4hsf6x9dh1xy9if1i8x7vdmapwl03q67752rvms60zgpc"; -} -{ - lang = "sr"; - saneName = "sr"; - sha256 = "0vqhy5s3pw53h0mh0vqwicg9yxb7dc45qa1y37lrb3rxbl0hf4b2"; -} -{ - lang = "sv"; - saneName = "sv"; - sha256 = "0f864y58jg3cm7wl2almljqhdcspyxcxb0ig2axb4ynmk1m7qfwd"; -} -{ - lang = "tg"; - saneName = "tg"; - sha256 = "1xybl1cp7hivzyw2j4s3j3ahv18kpxx54zpi8qn9nfpsxwz6nzzm"; -} -{ - lang = "th"; - saneName = "th"; - sha256 = "06n7r9pc44y53qs3lkmywsh40g0mmlq91sn6ma1j4nxbyglyk851"; -} -{ - lang = "tr"; - saneName = "tr"; - sha256 = "1ibypwg8wgwsgwp6s7n56wa3j4paxl948cmbhmiahmclpyhs8g3k"; -} -{ - lang = "ug"; - saneName = "ug"; - sha256 = "0z99bs4yxr4w6d5xxbr4k8h6494b64g00i3fkv4r1lrbldp0nsmi"; -} -{ - lang = "uk"; - saneName = "uk"; - sha256 = "05jrypr1gwlv15yymk3qmh6y982256lz2jyyw6jak4pwv2l4pdp1"; -} -{ - lang = "vi"; - saneName = "vi"; - sha256 = "1wzrdgp6w33qzy6w4jk0w9yk4v1pbx31lnjg1423c3f4byb4rx8s"; -} -{ - lang = "wa"; - saneName = "wa"; - sha256 = "0grlfffq3qzh2l0pnxwil0812l1a628i9gsi7zm1p6rp6hhv9fwp"; -} -{ - lang = "zh_CN"; - saneName = "zh_CN"; - sha256 = "18q6nhk12fi10i582vm6sdbhirq81702pfc1793dww4s8ys8lf1x"; -} -{ - lang = "zh_TW"; - saneName = "zh_TW"; - sha256 = "0x4yq975xwn2igyzdw0ygc1qiwcg30fvdhwnv15md6bfwk2m813l"; -} -] diff --git a/pkgs/desktops/kde-4.8/l10n/manifest-4.8.4.nix b/pkgs/desktops/kde-4.8/l10n/manifest-4.8.4.nix new file mode 100644 index 00000000000..fb823440abd --- /dev/null +++ b/pkgs/desktops/kde-4.8/l10n/manifest-4.8.4.nix @@ -0,0 +1,277 @@ +[ +{ + lang = "ar"; + saneName = "ar"; + sha256 = "1s17fypvwbr7v2jz1cdmxcgyav8ggj6sjiamvxdb9c6waahhmpjv"; +} +{ + lang = "bg"; + saneName = "bg"; + sha256 = "1lpdd4h9xgssvd5srkiyfzl7ngiyq7pipjm896qfmz03j3yzbwnz"; +} +{ + lang = "bs"; + saneName = "bs"; + sha256 = "0g6f5nihxizixc17y92453b4gj6w0bfwk4kndg2z60in9m4cswz5"; +} +{ + lang = "ca"; + saneName = "ca"; + sha256 = "02har0kybcj2jj51lxkrm6akr9dmv0afrxmzggbrbhfglhln8221"; +} +{ + lang = "ca@valencia"; + saneName = "ca_valencia"; + sha256 = "06wcfrbq1yh1vmzcyn7klym9cvmk8p56b23k9nbgw129z0ylhqxx"; +} +{ + lang = "cs"; + saneName = "cs"; + sha256 = "14kn3xq62fxn138gkc63icmngl97vb1bkmqv93cscbr4zc5sfkvw"; +} +{ + lang = "da"; + saneName = "da"; + sha256 = "10h3crypajdrxghn3hwprsgm09dblwsr17pg99c03zs4cd3gyv6s"; +} +{ + lang = "de"; + saneName = "de"; + sha256 = "1pp5d3s1450wf1kwawj9n3gv4pgr32dh3nnvkl5n58wjq07b9ah7"; +} +{ + lang = "el"; + saneName = "el"; + sha256 = "1wkp2v8yspgyixyki962vb3y8qdkdlp9mkrvfbw8lr6w2ivhkd90"; +} +{ + lang = "en_GB"; + saneName = "en_GB"; + sha256 = "07qw1qinlndfdkz2dzdr9bbb9kqxqhq3ya1qmcz999bw3ggjyi25"; +} +{ + lang = "es"; + saneName = "es"; + sha256 = "0wfl76s3zdb29dckbds63cfi96v2v59f6cm9yzjhwn87kyicq7k1"; +} +{ + lang = "et"; + saneName = "et"; + sha256 = "04ip1493m35qdv9f42590r1zqf9g6cksqzp6n7xcfzi1lr0cipyv"; +} +{ + lang = "eu"; + saneName = "eu"; + sha256 = "1pisn8myphk38jym2i8rp60rnvh3jn8lxnjghf5ng7h6ac1ydki3"; +} +{ + lang = "fa"; + saneName = "fa"; + sha256 = "1vx01f0i8mcxzbizn32hpl737bgih73qnsysvzl6cdv06ckvxrmm"; +} +{ + lang = "fi"; + saneName = "fi"; + sha256 = "1gx78cc294xnq2n96br2ahr2p6jzgv9d7bbaf9rm4nsamzbdd5m6"; +} +{ + lang = "fr"; + saneName = "fr"; + sha256 = "0skvnga1xavx10l3hhyqdr0mfapnjnbh75pbjvibg96d7wzxxi23"; +} +{ + lang = "ga"; + saneName = "ga"; + sha256 = "1pqcxhsgca3c5h9i9jpx67b572r3nhxrd6zmpkhidp3b476j2fx4"; +} +{ + lang = "gl"; + saneName = "gl"; + sha256 = "03k0w0byra36krrm8gbfmfv7am74y85zy6n01nl3j4xgiy41yqy4"; +} +{ + lang = "he"; + saneName = "he"; + sha256 = "0llqgsp9nw92px54lidsgdx5mk6z5nivshs4p193iplypa1pcfck"; +} +{ + lang = "hr"; + saneName = "hr"; + sha256 = "0w8l6msbxmjg889kpprh3bfzbgks2abp30b0m6xn43jkrghghxsj"; +} +{ + lang = "hu"; + saneName = "hu"; + sha256 = "0j63m00ilk9k5dy12bp3ndrwk5vcz79pwqhj9znp9l077lr1ah5n"; +} +{ + lang = "ia"; + saneName = "ia"; + sha256 = "0d3nkv9kbh6rdaf46psy2iia1phkj49xf67cdmnhr8kqgh557vh6"; +} +{ + lang = "id"; + saneName = "id"; + sha256 = "1gq4asqwsayd7wgkyqqg93lhqa8m0ac35as4dlrbqph4rk56k54y"; +} +{ + lang = "is"; + saneName = "is"; + sha256 = "05l9d9xmf08nr14gjsl8qbqyn8xc3qji4wc4zsqnmnp2fk8l3ndd"; +} +{ + lang = "it"; + saneName = "it"; + sha256 = "0hhl7pdfs1kcmz18k08961xq7y5vvjkwwzibkg238xagjq6wh1wl"; +} +{ + lang = "ja"; + saneName = "ja"; + sha256 = "1ipf5y1vy5accxbxs74641iqs785n2nkgxy31lgcm0ay0s6y3kx4"; +} +{ + lang = "kk"; + saneName = "kk"; + sha256 = "1arhyqn4yarcff3zhpi7a0c26b0rr1k3dwds9r6vq383vmv5la4a"; +} +{ + lang = "km"; + saneName = "km"; + sha256 = "1ny008qwxpdl9l4a56y664hxb3y0c9i5rpbbwnpcmynm6fmnm1ik"; +} +{ + lang = "ko"; + saneName = "ko"; + sha256 = "0aimxflnbx716bdph6snfzw17kkqqsbxrxawgjwmdp69h02pj5zh"; +} +{ + lang = "lt"; + saneName = "lt"; + sha256 = "14np3z28z946mf1g93ci202mqmg3qlgi1wlv8yp7949lq36psfx2"; +} +{ + lang = "lv"; + saneName = "lv"; + sha256 = "1jqxyih3m9p0km610dmpv9c3nzxjfm2aga1lm7nz3akgb8n6lhdi"; +} +{ + lang = "nb"; + saneName = "nb"; + sha256 = "000lmksgcinsxr5ny607b2q4h108pk4jzyygrf38zpw02crsa0i5"; +} +{ + lang = "nds"; + saneName = "nds"; + sha256 = "0spg23ngm8lj7bkbcj0s62i22flqzwvnhg12ghkiyqrdg8v725hq"; +} +{ + lang = "nl"; + saneName = "nl"; + sha256 = "1qpdabq9clbb6r59gs7s0k3l1rb5fxvbhsasxsw1r7m4l32gnlib"; +} +{ + lang = "nn"; + saneName = "nn"; + sha256 = "1nfkwmic4vs287ywi0mrqw95fvy42xdaxrsafxhjwdxqiynq6z66"; +} +{ + lang = "pa"; + saneName = "pa"; + sha256 = "078m4ph7kcjvkbivhaa54wdqr8fz8qa8r8db76w1wlynwgqy4qfs"; +} +{ + lang = "pl"; + saneName = "pl"; + sha256 = "1vcgkikbq48kxcgpi0vp95gj3wgfmghrvr6gqhlfql19wp5mjvm8"; +} +{ + lang = "pt"; + saneName = "pt"; + sha256 = "04pjxaxllhhccwinn33ild0xjjn05wqb3a660xhf3cgr6wkgx02f"; +} +{ + lang = "pt_BR"; + saneName = "pt_BR"; + sha256 = "1bb2f14h73ba35ysl3snnbiawx2ciz8h80f80k76qnyxix6zk885"; +} +{ + lang = "ro"; + saneName = "ro"; + sha256 = "1gm22h89j0s91gdnpn8nf0zw761ddwj5wg5i58v8aza45dh026rx"; +} +{ + lang = "ru"; + saneName = "ru"; + sha256 = "13hmbpsvzxiz4ci29388crr8xwhqmbrgs3yn12ay6z8fcwi3v528"; +} +{ + lang = "si"; + saneName = "si"; + sha256 = "0557m5r07xdqc0ambzw7b5kqnjaxyx6si2w2zi804gx89cjkjzyn"; +} +{ + lang = "sk"; + saneName = "sk"; + sha256 = "0yy379i8hy37sq61xz3n9309srjgm46n8jhj5dqf120jfc4knp2m"; +} +{ + lang = "sl"; + saneName = "sl"; + sha256 = "03qk82hz3zdaj1rcpfyrzks4ss6rrqfwz1wkjqp1rrm5g7kl835w"; +} +{ + lang = "sr"; + saneName = "sr"; + sha256 = "1dz2ckc7h7sm8ac66ajpypfifkpnx94d5d24hsm9gnp271x3134a"; +} +{ + lang = "sv"; + saneName = "sv"; + sha256 = "0rynj1db0yijlb2ilwzia53h2xqaj5prz4ap0y06vpw5i84xf6f5"; +} +{ + lang = "tg"; + saneName = "tg"; + sha256 = "0s78pb4b6fkqwvn9hp0n2mb6jkdwnx3hfh7vs9dxdx3m7zpgjq9z"; +} +{ + lang = "th"; + saneName = "th"; + sha256 = "0xf646xnyjkwa5m32chsnsbb5ndfvbrzgc7i76g2fwp843wrn4rq"; +} +{ + lang = "tr"; + saneName = "tr"; + sha256 = "0bfawc1cp9f7q1cq69y0w9bwawh2f4bhl1795f0i171pvfmmwq9g"; +} +{ + lang = "ug"; + saneName = "ug"; + sha256 = "1lj7kjmfjk6micrspkpzx4jhskw33zi7jyshfz8i8234vzzn9j6d"; +} +{ + lang = "uk"; + saneName = "uk"; + sha256 = "09ssi2zx24cfwc4bm039i9p6si8cx22fqwisi356ijjclrb3k7sh"; +} +{ + lang = "vi"; + saneName = "vi"; + sha256 = "0sc3mjbi7gsyllgkqck75qgnfdmrlqh5ffmxl2p4q8m1whkgxqr1"; +} +{ + lang = "wa"; + saneName = "wa"; + sha256 = "06rfw2l812gf3zyw7kl500lxda751q3bhrl7dh67zsc4s18gy9cb"; +} +{ + lang = "zh_CN"; + saneName = "zh_CN"; + sha256 = "1zaxjza3q5ana63kqm9mbqssz73my07iikfq2w0i29naqx570p0y"; +} +{ + lang = "zh_TW"; + saneName = "zh_TW"; + sha256 = "1svp8ykbcssl028hn6vxb6yb5agkbzlzvxnm6imkillsvmqlchdj"; +} +] diff --git a/pkgs/desktops/kde-4.8/oxygen-icons.nix b/pkgs/desktops/kde-4.8/oxygen-icons.nix index 32af5be1799..c821e2a7aac 100644 --- a/pkgs/desktops/kde-4.8/oxygen-icons.nix +++ b/pkgs/desktops/kde-4.8/oxygen-icons.nix @@ -3,7 +3,7 @@ kde { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "973f53b59e31e1e1dca41aa5abf0fc50e9cf0cbee57f156d90c2e754f33cc1b9"; + outputHash = "3984dac79aa7398578bcd9d69d74988bd992807518d46cd1dabc03867044c8a4"; buildNativeInputs = [ cmake ]; From 1629524bb23cf412e364b8718735aebe53b16f35 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 9 Jun 2012 13:09:33 +0000 Subject: [PATCH 213/403] qt-gstreamer-0.10.2 svn path=/nixpkgs/trunk/; revision=34401 --- .../libraries/gstreamer/qt-gstreamer/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix index e84c1600558..8bfeb8a4bea 100644 --- a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix @@ -2,17 +2,19 @@ , automoc4, flex, bison, pkgconfig }: stdenv.mkDerivation rec { - name = "${pname}-0.10.1"; + name = "${pname}-0.10.2"; pname = "qt-gstreamer"; src = fetchurl { url = "http://gstreamer.freedesktop.org/src/${pname}/${name}.tar.bz2"; - sha256 = "0g377jlzlwgywgk7nbv9fd0aimv8wpzrymwzdiaffczxv5xvip5h"; + sha256 = "1laryg5vgc3prdi7dmpfwa71nsrc3ngv27sgax44c4qfrgpsgwbf"; }; buildInputs = [ gstreamer gst_plugins_base glib qt4 ]; propagatedBuildInputs = [ boost ]; buildNativeInputs = [ cmake automoc4 flex bison pkgconfig ]; + cmakeFlags = "-DUSE_QT_PLUGIN_DIR=OFF -DUSE_GST_PLUGIN_DIR=OFF"; + patches = [ ./boost1.48.patch ]; } From 6b6dba1bce9c12e65d82fad95d1ad98c1a73b7f7 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 9 Jun 2012 13:09:37 +0000 Subject: [PATCH 214/403] kde-telepathy-0.3.1 Drop upstream patches already included in this version svn path=/nixpkgs/trunk/; revision=34402 --- .../telepathy/kde/0.3.0.nix | 13 ---------- .../telepathy/kde/0.3.1.nix | 13 ++++++++++ .../telepathy/kde/contact-applet-po.patch | 24 ------------------- .../telepathy/kde/default.nix | 7 ++---- .../telepathy/kde/presence-applet-po.patch | 24 ------------------- 5 files changed, 15 insertions(+), 66 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/telepathy/kde/0.3.0.nix create mode 100644 pkgs/applications/networking/instant-messengers/telepathy/kde/0.3.1.nix delete mode 100644 pkgs/applications/networking/instant-messengers/telepathy/kde/contact-applet-po.patch delete mode 100644 pkgs/applications/networking/instant-messengers/telepathy/kde/presence-applet-po.patch diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/0.3.0.nix b/pkgs/applications/networking/instant-messengers/telepathy/kde/0.3.0.nix deleted file mode 100644 index f2340415be7..00000000000 --- a/pkgs/applications/networking/instant-messengers/telepathy/kde/0.3.0.nix +++ /dev/null @@ -1,13 +0,0 @@ -[ -{name="ktp-accounts-kcm";key="accounts_kcm";sha256="0i4x4z6w4l9ngx0j258p2vjmsnsdn8hckq7cfld1iliq6fxb1vwv";} -{name="ktp-approver";key="approver";sha256="0nj89jsina8b736sygxia8jmz6l81n6j0ffin8cpqbp9mczzpv9f";} -{name="ktp-auth-handler";key="auth_handler";sha256="1fggj8aa56m7ycwi4q44kfzlx6gfigk0zaq8lhms4wdhm6736fhs";} -{name="ktp-common-internals";key="common_internals";sha256="196f6gkfb3w11qdbamwvkq6hxk2zbdc3js53mh352yhmdyf3cya6";} -{name="ktp-contact-applet";key="contact_applet";sha256="1vhv78qcyna1r4lmzpixb2a0p973ywjyi1izy8jf1vfhy3kk28dw";} -{name="ktp-contact-list";key="contact_list";sha256="15gnm09j4g6ip7vgisayd3ixv2sryjazakzkfksxfkdxl3mgfzg3";} -{name="ktp-filetransfer-handler";key="filetransfer_handler";sha256="1mq48clrlqwbg08211pr7hm24kagjzd8zs287mk9xl2wbv70jgc1";} -{name="ktp-kded-integration-module";key="kded_integration_module";sha256="1p47dks5cvda4i8xhij01z1qmcv2vw27az0la15rhzqlf8kh4sam";} -{name="ktp-presence-applet";key="presence_applet";sha256="1npr59g42yxb67dnplingqa2paaxdw60p99kilbvw15chfbrh47r";} -{name="ktp-send-file";key="send_file";sha256="1961zh4b1bamjyqw3wkm2aclx5sbfbr84i3x7lvfr74vw6cky8mc";} -{name="ktp-text-ui";key="text_ui";sha256="184zyw6l779nkgpc5dx9lcmh543kmr4ay8cvm8vsnrsknn6p0dgp";} -] diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/0.3.1.nix b/pkgs/applications/networking/instant-messengers/telepathy/kde/0.3.1.nix new file mode 100644 index 00000000000..73eda93f7e8 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telepathy/kde/0.3.1.nix @@ -0,0 +1,13 @@ +[ +{name="ktp-accounts-kcm";key="accounts_kcm";sha256="1lkqiwibxabg5p3k8l0zyzjyysi56dvbbcxp1sybd81hmxf6fzxh";} +{name="ktp-approver";key="approver";sha256="0bw3i8av55n93ac6phvar03b6rz34wbqrzx7l2vd48d0y5ib0j6m";} +{name="ktp-auth-handler";key="auth_handler";sha256="0kby9935df474b7jvzzg7v3zvrgml5caf96ps4dcrcvyz91ckd1y";} +{name="ktp-common-internals";key="common_internals";sha256="1g22b0g9g14dsdl0qkdglgkf26c3pjc96q19kj2kai1i644i8k5h";} +{name="ktp-contact-applet";key="contact_applet";sha256="0iwr202snsm72xjxv1jb9z24j8ikdx6ljaz5v9i0ha8f8rb1vrp5";} +{name="ktp-contact-list";key="contact_list";sha256="06y1cw2kkn6ig5qnmzl7bdz9nghpv2c83c9vf9glgbxf77qfg3ms";} +{name="ktp-filetransfer-handler";key="filetransfer_handler";sha256="1cdnl4sn34lmm7h7qv8rrkp7ia5gcg2704fqhvpv8n8gxwwhrc1a";} +{name="ktp-kded-integration-module";key="kded_integration_module";sha256="1ccihqk0pg28v2q6p9dx37ql7hnwdz2060jf1s6p9yyd27fc4is0";} +{name="ktp-presence-applet";key="presence_applet";sha256="0zgl8z81kmy2a03kzgvvqlr244cw9gw2kfrph1d6ax8zk4fqvxnz";} +{name="ktp-send-file";key="send_file";sha256="1d1j0klp8dvmldn5c19zqfsxcm5hbaq5fxikpjg0q3j9ib8yh9la";} +{name="ktp-text-ui";key="text_ui";sha256="0qikjh8ywlnwkfr4nd4hc9b15b824simhdj3n62yd87pmkk3avw6";} +] diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/contact-applet-po.patch b/pkgs/applications/networking/instant-messengers/telepathy/kde/contact-applet-po.patch deleted file mode 100644 index 6b73781af5c..00000000000 --- a/pkgs/applications/networking/instant-messengers/telepathy/kde/contact-applet-po.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit eaf09e1242408ac8652ba3ffd1d698326e4b2360 -Author: Rohan Garg -Date: Wed Feb 8 00:19:19 2012 +0530 - - Do not use CMake 2.8 just yet - - CMake 2.8 has some scope issues which cause the pofile target to - interfere while building translations in the tarball releases. - Not requiring CMake 2.8 fixes the build issue. - - BUGS: 292593 293030 - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0b34038..50e94f3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,7 +1,5 @@ - project(ktp-contact-applet) - --cmake_minimum_required(VERSION 2.8) -- - set(CMAKE_MODULE_PATH - "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" - ${CMAKE_MODULE_PATH} diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix index 3a7f2d32463..0bced075b88 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix @@ -2,12 +2,9 @@ , qt_gstreamer }: let - version = "0.3.0"; + version = "0.3.1"; manifest = import (./. + "/${version}.nix"); - overrides = { - presence_applet = x : (x // { patches = [ ./presence-applet-po.patch ]; }); - contact_applet = x: (x // { patches = [ ./contact-applet-po.patch ]; }); - }; + overrides = { }; ktpFun = { name, key, sha256 }: { name = key; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/presence-applet-po.patch b/pkgs/applications/networking/instant-messengers/telepathy/kde/presence-applet-po.patch deleted file mode 100644 index 10d190a6294..00000000000 --- a/pkgs/applications/networking/instant-messengers/telepathy/kde/presence-applet-po.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit bf59d0488708eb57ca91a9b6d0ce8951b99ba778 -Author: Rohan Garg -Date: Wed Feb 8 01:19:42 2012 +0530 - - Do not use CMake 2.8 just yet - - CMake 2.8 has some scope issues which cause the pofile target to - interfere while building translations in the tarball releases. - Not requiring CMake 2.8 fixes the build issue. - - BUG: 292593 - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8e2c1de..80add26 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,7 +1,5 @@ - project(ktp-presence-applet) - --cmake_minimum_required(VERSION 2.8) -- - set(CMAKE_MODULE_PATH - "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" - ${CMAKE_MODULE_PATH} From 3640b0c1e9ba961835a8763ec755978a85c6b3dc Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 9 Jun 2012 13:09:41 +0000 Subject: [PATCH 215/403] Add GiNaC svn path=/nixpkgs/trunk/; revision=34403 --- .../science/math/ginac/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/science/math/ginac/default.nix diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix new file mode 100644 index 00000000000..081d2bd6253 --- /dev/null +++ b/pkgs/applications/science/math/ginac/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, cln, pkgconfig, readline }: + +stdenv.mkDerivation rec { + name = "ginac-1.6.2"; + + src = fetchurl { + url = "${meta.homepage}/${name}.tar.bz2"; + sha256 = "1pivcqqaf142l6vrj2azq6dxrcyzhag4za2dwicb4gsb09ax4d0g"; + }; + + propagatedBuildInputs = [ cln ]; + buildInputs = [ readline ]; + + buildNativeInputs = [ pkgconfig ]; + + configureFlags = "--disable-rpath"; + + meta = { + description = "GiNaC is Not a CAS"; + homepage = http://www.ginac.de/; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.urkud ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index efa94f1d178..807a858b2b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8284,8 +8284,10 @@ let paths = [ texLive texLiveExtra ]; + }; }; - }; + + ginac = callPackage ../applications/science/math/ginac { }; hol = callPackage ../applications/science/logic/hol { }; From f6e6e4287dfbc3adf03442d35c27860659cc45ac Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 9 Jun 2012 13:09:45 +0000 Subject: [PATCH 216/403] Add kbibtex svn path=/nixpkgs/trunk/; revision=34404 --- pkgs/applications/office/kbibtex/default.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/applications/office/kbibtex/default.nix diff --git a/pkgs/applications/office/kbibtex/default.nix b/pkgs/applications/office/kbibtex/default.nix new file mode 100644 index 00000000000..ba0d719a049 --- /dev/null +++ b/pkgs/applications/office/kbibtex/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, kdelibs, libxslt, popplerQt4 }: + +stdenv.mkDerivation rec { + pname = "kbibtex"; + version = "0.4"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://download.gna.org/${pname}/${version}/${name}.tar.bz2"; + sha256 = "1hq0az0dp96195z26wjfwj9ynd57pfv13f1xcl5vbsswcjfrczws"; + }; + + patchPhase = '' + sed -e '25i#include ' -i src/gui/preferences/settingsabstractwidget.h + ''; + + buildInputs = [ kdelibs libxslt popplerQt4 ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 807a858b2b7..8c6ebaa8550 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8091,6 +8091,8 @@ let kadu = callPackage ../applications/networking/instant-messengers/kadu { }; + kbibtex = callPackage ../applications/office/kbibtex { }; + kbluetooth = callPackage ../tools/bluetooth/kbluetooth { }; kde_wacomtablet = callPackage ../applications/misc/kde-wacomtablet { }; From baff5fc9f33f0f89851f88879f6b51510dcb0ddd Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 9 Jun 2012 13:09:50 +0000 Subject: [PATCH 217/403] calligra-2.4.2 svn path=/nixpkgs/trunk/; revision=34405 --- pkgs/applications/office/calligra/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index a447323332a..b64338adaf1 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -4,11 +4,11 @@ , libkdcraw, libxslt, fftw, glew, gsl, shared_desktop_ontologies }: stdenv.mkDerivation rec { - name = "calligra-2.3.92"; + name = "calligra-2.4.2"; src = fetchurl { - url = "mirror://kde/unstable/${name}/${name}.tar.bz2"; - sha256 = "1ad7vzdhfkv48xhs9p84mwpq8zsdiajz3qjng3h2rswd88sgrblg"; + url = "mirror://kde/stable/${name}/${name}.tar.bz2"; + sha256 = "14wi8mr87aas12f75qi6p8x0pij365sbz4c737qhh4302fh8fsqg"; }; buildNativeInputs = [ cmake perl pkgconfig ]; From 63deb1d30a1072be7d99d11f3fb61d1d9c1a8cca Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 9 Jun 2012 13:09:53 +0000 Subject: [PATCH 218/403] skrooge-1.3.0 svn path=/nixpkgs/trunk/; revision=34406 --- pkgs/applications/office/skrooge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index b83f79f46e4..9b27a3e2379 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, kdelibs, grantlee, qca2, libofx, gettext }: stdenv.mkDerivation rec { - name = "skrooge-1.1.1"; + name = "skrooge-1.3.0"; src = fetchurl { url = "http://skrooge.org/files/${name}.tar.bz2"; - sha256 = "0qkd1hay7lglb0b4iw3arlwgm0yr8x789x7zf815skxvfhdaclv5"; + sha256 = "1sfzzn9xz01c0095w4scckiiwv2gfbaxx05h7ds5n02a113w53kz"; }; buildInputs = [ kdelibs grantlee qca2 libofx ]; From 98a130a5047d8f6a91c012cf09e8e76ad18c31dc Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 9 Jun 2012 13:09:56 +0000 Subject: [PATCH 219/403] Fix some find_* svn path=/nixpkgs/trunk/; revision=34407 --- pkgs/desktops/kde-4.8/kde-runtime.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/kde-4.8/kde-runtime.nix b/pkgs/desktops/kde-4.8/kde-runtime.nix index a3b687404cc..b219bd4599a 100644 --- a/pkgs/desktops/kde-4.8/kde-runtime.nix +++ b/pkgs/desktops/kde-4.8/kde-runtime.nix @@ -1,13 +1,16 @@ { kde, kdelibs, shared_desktop_ontologies, bzip2, libssh, exiv2, attica -, libcanberra, virtuoso, samba, ntrack, libjpeg, fetchurl +, libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, qca2, xz, pulseaudio +, networkmanager }: kde { buildInputs = - [ kdelibs shared_desktop_ontologies bzip2 libssh exiv2 attica - samba (libcanberra.override { gtk = null; }) ntrack libjpeg + [ kdelibs shared_desktop_ontologies bzip2 libssh exiv2 attica xz networkmanager + samba (libcanberra.override { gtk = null; }) ntrack libjpeg qca2 pulseaudio ]; + buildNativeInputs = [ pkgconfig ]; + passthru.propagatedUserEnvPackages = [ virtuoso ]; meta = { From 29b8d20f33bedb2dd443103c65370adb65f00c48 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 9 Jun 2012 13:09:59 +0000 Subject: [PATCH 220/403] Fix old typo in kdeutils/superkaramba.nix svn path=/nixpkgs/trunk/; revision=34408 --- pkgs/desktops/kde-4.7/kdeutils/superkaramba.nix | 2 +- pkgs/desktops/kde-4.8/kdeutils/superkaramba.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/kde-4.7/kdeutils/superkaramba.nix b/pkgs/desktops/kde-4.7/kdeutils/superkaramba.nix index 1475ab041ac..4dce768078b 100644 --- a/pkgs/desktops/kde-4.7/kdeutils/superkaramba.nix +++ b/pkgs/desktops/kde-4.7/kdeutils/superkaramba.nix @@ -3,7 +3,7 @@ kde { buildInputs = [ kdelibs qimageblitz ]; - cmakeFlags = [ "-DBUILD_icons=TRUE" "-DBULD_plasma=TRUE" ]; + cmakeFlags = [ "-DBUILD_icons=TRUE" "-DBUILD_plasma=TRUE" ]; meta = { description = "A KDE Eye-candy Application"; diff --git a/pkgs/desktops/kde-4.8/kdeutils/superkaramba.nix b/pkgs/desktops/kde-4.8/kdeutils/superkaramba.nix index 1475ab041ac..4dce768078b 100644 --- a/pkgs/desktops/kde-4.8/kdeutils/superkaramba.nix +++ b/pkgs/desktops/kde-4.8/kdeutils/superkaramba.nix @@ -3,7 +3,7 @@ kde { buildInputs = [ kdelibs qimageblitz ]; - cmakeFlags = [ "-DBUILD_icons=TRUE" "-DBULD_plasma=TRUE" ]; + cmakeFlags = [ "-DBUILD_icons=TRUE" "-DBUILD_plasma=TRUE" ]; meta = { description = "A KDE Eye-candy Application"; From 94726d19e7fb0a445ba7582367f443a3daf9be56 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 9 Jun 2012 20:10:35 +0000 Subject: [PATCH 221/403] gutenprint-5.2.7, fix FTBFS svn path=/nixpkgs/trunk/; revision=34409 --- pkgs/misc/drivers/gutenprint/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix index 9788d601744..79b819c12a7 100644 --- a/pkgs/misc/drivers/gutenprint/default.nix +++ b/pkgs/misc/drivers/gutenprint/default.nix @@ -3,7 +3,7 @@ , libtiff, libpng, openssl, gimp }: let - version = "5.2.6"; + version = "5.2.7"; inherit (composableDerivation) edf wwf; in @@ -12,13 +12,14 @@ composableDerivation.composableDerivation {} { src = fetchurl { url = "mirror://sourceforge/gimp-print/gutenprint-${version}.tar.bz2"; - sha256 = "0znwbv51vqf20p4isc3if4hqsgfav21rsqnsz1d8mixlmasy2i27"; + sha256 = "1lgf7d9vsszv0bzgsd8j3x5smby1lpk07d8x7isv1sz34y98jk0i"; }; # gimp, gui is still not working (TODO) buildInputs = [ openssl pkgconfig ]; configureFlags = ["--enable-static-genppd"]; + NIX_CFLAGS_COMPILE="-include stdio.h"; #preConfigure = '' # configureFlags="--with-cups=$out/usr-cups $configureFlags" @@ -52,7 +53,7 @@ composableDerivation.composableDerivation {} { name = "gimp2"; enable = { buildInputs = [gimp gimp.gtk]; - installArgs = [ "gimp2_plug_indir=$out/${gimp.name}-plugins" ]; + installArgs = [ "gimp2_plug_indir=$out/${gimp.name}-plugins" ]; }; } // { From 70dbdd0e5bef33db9b5d46b376740bc4018e891c Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 9 Jun 2012 20:10:40 +0000 Subject: [PATCH 222/403] cups-bjnp: fix FTBFS svn path=/nixpkgs/trunk/; revision=34410 --- pkgs/misc/cups/drivers/cups-bjnp/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/cups/drivers/cups-bjnp/default.nix b/pkgs/misc/cups/drivers/cups-bjnp/default.nix index f752ac84a84..483ec7aab97 100644 --- a/pkgs/misc/cups/drivers/cups-bjnp/default.nix +++ b/pkgs/misc/cups/drivers/cups-bjnp/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { preConfigure = ''configureFlags="--with-cupsbackenddir=$out/lib/cups/backend"''; buildInputs = [cups]; + NIX_CFLAGS_COMPILE = "-include stdio.h"; meta = { homepage = http://cups-bjnp.sourceforge.net; From 9ebd661fb8dffad3ff4504e1d4fa0f9334808a48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 9 Jun 2012 20:25:48 +0000 Subject: [PATCH 223/403] Updating linux 3.4 to 3.4.1 svn path=/nixpkgs/trunk/; revision=34411 --- pkgs/os-specific/linux/kernel/linux-3.4.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 18633ec7d34..629fd556024 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -233,8 +233,7 @@ in import ./generic.nix ( rec { - version = "3.4"; - modDirVersion = "3.4.0"; + version = "3.4.1"; testing = false; preConfigure = '' @@ -243,7 +242,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "ff3dee6a855873d12487a6f4070ec2f7996d073019171361c955639664baa0c6"; + sha256 = "05m3zpl20x7lfh4d27dx7jwxnnxa44zhza6f8aq356mamjbrvvb6"; }; config = configWithPlatform stdenv.platform; From 5d263987a041c2b0805a68436cb4d79d87f1bb96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 9 Jun 2012 20:27:00 +0000 Subject: [PATCH 224/403] Updating the sheevaplug kernel config to include btrfs and netconsole. svn path=/nixpkgs/trunk/; revision=34412 --- pkgs/top-level/platforms.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index 386ca566d55..622fdde8e90 100644 --- a/pkgs/top-level/platforms.nix +++ b/pkgs/top-level/platforms.nix @@ -44,6 +44,7 @@ rec { DM_CRYPT m MD y REISERFS_FS m + BTRFS_FS m EXT4_FS m USB_STORAGE_CYPRESS_ATACB m @@ -75,6 +76,7 @@ rec { CIFS_ACL y ZRAM m + NETCONSOLE m # Fail to build DRM n From 192291eb010a618e8dc5a6b249ade8ab5d6702ef Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 9 Jun 2012 23:28:07 +0000 Subject: [PATCH 225/403] * Added net-snmp. svn path=/nixpkgs/trunk/; revision=34413 --- pkgs/tools/networking/net-snmp/default.nix | 28 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/networking/net-snmp/default.nix diff --git a/pkgs/tools/networking/net-snmp/default.nix b/pkgs/tools/networking/net-snmp/default.nix new file mode 100644 index 00000000000..c35b2f67600 --- /dev/null +++ b/pkgs/tools/networking/net-snmp/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, file, openssl }: + +stdenv.mkDerivation rec { + name = "net-snmp-5.7.1"; + + src = fetchurl { + url = "mirror://sourceforge/net-snmp/${name}.tar.gz"; + sha256 = "07qqdgs3flraqccwry4a4x23jcg6vfi0rqj7clsibdv51ijwjwbw"; + }; + + configureFlags = + [ "--with-default-snmp-version=3" + "--with-sys-location=Unknown" + "--with-sys-contact=root@unknown" + "--with-logfile=/var/log/net-snmpd.log" + "--with-persistent-directory=/var/lib/net-snmp" + ]; + + buildInputs = [ file openssl ]; + + enableParallelBuilding = true; + + meta = { + description = "Clients and server for the SNMP network monitoring protocol"; + homepage = http://net-snmp.sourceforge.net/; + license = "bsd"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c6ebaa8550..7c69aed3ee7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1092,6 +1092,8 @@ let ndisc6 = callPackage ../tools/networking/ndisc6 { }; + net_snmp = callPackage ../tools/networking/net-snmp { }; + netboot = callPackage ../tools/networking/netboot {}; netcat = callPackage ../tools/networking/netcat { }; From b81add35200a80b78597dd9378caf41024bf015c Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Sun, 10 Jun 2012 00:51:46 +0000 Subject: [PATCH 226/403] Change download location for qt everywhere 4.8.2; was not found. svn path=/nixpkgs/trunk/; revision=34414 --- pkgs/development/libraries/qt-4.x/4.8/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 28999151580..99a80c2c406 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { name = "qt-${v}"; src = fetchurl { - url = "ftp://ftp.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${v}.tar.gz"; + url = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${v}.tar.gz"; sha256 = "0y93vkkn44md37gyg4y8sc9ylk27xkniaimfcpdcwd090qnjl6wj"; }; From 0f6b8dbd5221de8fbe4606d71234f0eddcb7beb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 10 Jun 2012 10:47:16 +0000 Subject: [PATCH 227/403] Updating pv to 1.3.1 svn path=/nixpkgs/trunk/; revision=34415 --- pkgs/tools/misc/pv/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix index f39ce5eff9b..5da3fe9dbe6 100644 --- a/pkgs/tools/misc/pv/default.nix +++ b/pkgs/tools/misc/pv/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl } : -stdenv.mkDerivation { - name = "pv-1.2.0"; +stdenv.mkDerivation rec { + name = "pv-1.3.1"; src = fetchurl { - url = http://pipeviewer.googlecode.com/files/pv-1.2.0.tar.bz2; - sha256 = "0rn6rpiw7c16pgkhcslax9p1mxkxkmk6ivc9hjmsis7r69niyag3"; + url = "http://pipeviewer.googlecode.com/files/${name}.tar.bz2"; + sha256 = "1fwvdj663g3jf3rcxi788pv1l7s86sxna78xi2nl5qimng05y8jl"; }; meta = { From 4a380e1eb199531c06569edfa126c7d2a62a94d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 10 Jun 2012 14:41:22 +0000 Subject: [PATCH 228/403] Updating xfsprogs svn path=/nixpkgs/trunk/; revision=34417 --- pkgs/tools/filesystems/xfsprogs/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix index 16aefe18283..229802d1d78 100644 --- a/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/pkgs/tools/filesystems/xfsprogs/default.nix @@ -1,13 +1,17 @@ { stdenv, fetchurl, libtool, gettext, libuuid }: stdenv.mkDerivation rec { - name = "xfsprogs-3.1.3"; + name = "xfsprogs-3.1.8"; src = fetchurl { urls = [ "ftp://oss.sgi.com/projects/xfs/cmd_tars/${name}.tar.gz" "ftp://oss.sgi.com/projects/xfs/previous/${name}.tar.gz" ]; - sha256 = "1mazg6sl4gbm204ndgw585xvcsxg3hg22d989ww6lgmycp635l7s"; + sha256 = "1aryr6w76hyc1dznfzk0sc5rlr914rr0zh15vyclj1s86wp9wh3l"; }; + patchPhase = '' + sed -i s,/bin/bash,`type -P bash`, install-sh + ''; + buildInputs = [ libtool gettext libuuid ]; configureFlags = "MAKE=make MSGFMT=msgfmt MSGMERGE=msgmerge XGETTEXT=xgettext ZIP=gzip AWK=gawk --disable-shared"; From 169748567887fd167ab7c30ac92005d192ed819b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 10 Jun 2012 15:24:28 +0000 Subject: [PATCH 229/403] Updating linux 3.4.1 to 3.4.2 svn path=/nixpkgs/trunk/; revision=34423 --- pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 629fd556024..191508af750 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -233,7 +233,7 @@ in import ./generic.nix ( rec { - version = "3.4.1"; + version = "3.4.2"; testing = false; preConfigure = '' @@ -242,7 +242,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "05m3zpl20x7lfh4d27dx7jwxnnxa44zhza6f8aq356mamjbrvvb6"; + sha256 = "0pd96g1qcp2wgdnvk79hljjrpr6xjk0159lks47n181a3yirzf4x"; }; config = configWithPlatform stdenv.platform; From c9f95fa0c2bc07936748f76aa11ea0f808571075 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 10 Jun 2012 17:06:35 +0000 Subject: [PATCH 230/403] * net-snmp: enable Perl support. svn path=/nixpkgs/trunk/; revision=34424 --- pkgs/tools/networking/net-snmp/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/net-snmp/default.nix b/pkgs/tools/networking/net-snmp/default.nix index c35b2f67600..190c48ba56e 100644 --- a/pkgs/tools/networking/net-snmp/default.nix +++ b/pkgs/tools/networking/net-snmp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, file, openssl }: +{ stdenv, fetchurl, file, openssl, perl }: stdenv.mkDerivation rec { name = "net-snmp-5.7.1"; @@ -8,6 +8,13 @@ stdenv.mkDerivation rec { sha256 = "07qqdgs3flraqccwry4a4x23jcg6vfi0rqj7clsibdv51ijwjwbw"; }; + preConfigure = + '' + perlversion=$(perl -e 'use Config; print $Config{version};') + perlarchname=$(perl -e 'use Config; print $Config{archname};') + installFlags="INSTALLSITEARCH=$out/lib/perl5/site_perl/$perlversion/$perlarchname INSTALLSITEMAN3DIR=$out/share/man/man3" + ''; + configureFlags = [ "--with-default-snmp-version=3" "--with-sys-location=Unknown" @@ -16,7 +23,7 @@ stdenv.mkDerivation rec { "--with-persistent-directory=/var/lib/net-snmp" ]; - buildInputs = [ file openssl ]; + buildInputs = [ file openssl perl ]; enableParallelBuilding = true; From 3119e4983dd0757da272661a597eefc3dabd6df2 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 10 Jun 2012 18:01:37 +0000 Subject: [PATCH 231/403] pv: Update source url svn path=/nixpkgs/trunk/; revision=34425 --- pkgs/tools/misc/pv/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix index 5da3fe9dbe6..8150e7118dc 100644 --- a/pkgs/tools/misc/pv/default.nix +++ b/pkgs/tools/misc/pv/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "pv-1.3.1"; src = fetchurl { - url = "http://pipeviewer.googlecode.com/files/${name}.tar.bz2"; + url = "http://www.ivarch.com/programs/sources/${name}.tar.bz2"; sha256 = "1fwvdj663g3jf3rcxi788pv1l7s86sxna78xi2nl5qimng05y8jl"; }; From 0820367a356fa98333e84cb64140e469d10cc32e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 10 Jun 2012 19:11:07 +0000 Subject: [PATCH 232/403] Adding the XFS and JFS modules to the sheevaplug kernel. They may be worth using. svn path=/nixpkgs/trunk/; revision=34426 --- pkgs/top-level/platforms.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index 622fdde8e90..7a45492b032 100644 --- a/pkgs/top-level/platforms.nix +++ b/pkgs/top-level/platforms.nix @@ -45,6 +45,8 @@ rec { MD y REISERFS_FS m BTRFS_FS m + XFS_FS m + JFS_FS m EXT4_FS m USB_STORAGE_CYPRESS_ATACB m From 9629d6692884275dc5f7cf40df66de2e26837a37 Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Sun, 10 Jun 2012 21:31:06 +0000 Subject: [PATCH 233/403] qt_mobility is a requirement for monav i'm going to package soon svn path=/nixpkgs/trunk/; revision=34427 --- .../libraries/qt-mobility/default.nix | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 pkgs/development/libraries/qt-mobility/default.nix diff --git a/pkgs/development/libraries/qt-mobility/default.nix b/pkgs/development/libraries/qt-mobility/default.nix new file mode 100644 index 00000000000..2c299305410 --- /dev/null +++ b/pkgs/development/libraries/qt-mobility/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, qt4, libX11, coreutils, bluez, perl }: +# possible additional dependencies: pulseaudio udev networkmanager immerson qmf + +stdenv.mkDerivation rec { + version = "1.2.0"; + name = "qt-mobility-${version}"; + download = "qt-mobility-opensource-src-${version}"; + src = fetchurl { + url = "http://get.qt.nokia.com/qt/add-ons/${download}.tar.gz"; + sha256 = "ee3c88975e04139ac9589f76d4be646d44fcbc4c8c1cf2db621abc154cf0ba44"; + }; + + NIX_CFLAGS_COMPILE="-fpermissive"; + + configurePhase = '' + ./configure -prefix $out + ''; + + # we need to prevent the 'make install' to want to write to ${qt4}! + preBuild = '' + for i in connectivity contacts feedback gallery location multimedia organizer publishsubscribe sensors serviceframework systeminfo; do + substituteInPlace plugins/declarative/$i/Makefile --replace "${qt4}/lib/qt4/imports/" "$out/lib/qt4/imports/" + done + ''; + + patchPhase = '' + # required to make the configure script work + substituteInPlace configure --replace "/bin/pwd" "${coreutils}/bin/pwd" + + # required to make /include generator work + substituteInPlace bin/syncheaders --replace "/usr/bin/perl" "${perl}/bin/perl" + + # required to make the -prefix variable parsing work + substituteInPlace bin/pathhelper --replace "/usr/bin/perl" "${perl}/bin/perl" + ''; + + buildInputs = [ qt4 libX11 bluez perl]; + + meta = { + description = "Qt Mobility"; + homepage = http://qt.nokia.com/products/qt-addons/mobility; + maintainers = with stdenv.lib.maintainers; [qknight]; + }; +} + + From 249badd76f328219106681429f00332378966f0d Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Sun, 10 Jun 2012 22:35:35 +0000 Subject: [PATCH 234/403] a minor update as the package seems to be incomplete svn path=/nixpkgs/trunk/; revision=34428 --- pkgs/development/libraries/qt-mobility/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-mobility/default.nix b/pkgs/development/libraries/qt-mobility/default.nix index 2c299305410..71ec5e77a73 100644 --- a/pkgs/development/libraries/qt-mobility/default.nix +++ b/pkgs/development/libraries/qt-mobility/default.nix @@ -17,12 +17,16 @@ stdenv.mkDerivation rec { ''; # we need to prevent the 'make install' to want to write to ${qt4}! + # according to thiago#qt@freenode these are used for the QML engine preBuild = '' for i in connectivity contacts feedback gallery location multimedia organizer publishsubscribe sensors serviceframework systeminfo; do substituteInPlace plugins/declarative/$i/Makefile --replace "${qt4}/lib/qt4/imports/" "$out/lib/qt4/imports/" - done ''; + # Features files (*.prf) are not installed on nixos + # https://bugreports.qt-project.org/browse/QTMOBILITY-1085 + # - features/mobility.prf (/tmp/nix-build-9kh12nhf9cyplfwiws96gz414v6wgl67-qt-mobility-1.2.0.drv-0/qt-mobility-opensource-src-1.2.0) + patchPhase = '' # required to make the configure script work substituteInPlace configure --replace "/bin/pwd" "${coreutils}/bin/pwd" @@ -34,7 +38,7 @@ stdenv.mkDerivation rec { substituteInPlace bin/pathhelper --replace "/usr/bin/perl" "${perl}/bin/perl" ''; - buildInputs = [ qt4 libX11 bluez perl]; + buildInputs = [ qt4 libX11 bluez perl ]; meta = { description = "Qt Mobility"; From ea102b34f636dec6fad83f04562128294ad0caba Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Mon, 11 Jun 2012 06:05:18 +0000 Subject: [PATCH 235/403] Patch PAKCS to build with GHC 7.4.1 . Also fix symbolic links to emacs lisp files. svn path=/nixpkgs/trunk/; revision=34430 --- pkgs/development/compilers/pakcs/default.nix | 4 +- .../compilers/pakcs/pakcs-ghc741.patch | 1004 +++++++++++++++++ 2 files changed, 1007 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/pakcs/pakcs-ghc741.patch diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix index bd194b0bf32..35771f6691f 100644 --- a/pkgs/development/compilers/pakcs/default.nix +++ b/pkgs/development/compilers/pakcs/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation { sed -i '68d' configure-pakcs ''; + patches = [ ./pakcs-ghc741.patch ]; + preConfigure = '' # Path to GHC and SWI Prolog sed -i 's@GHC=@GHC=${ghc}/bin/ghc@' bin/.pakcs_variables @@ -43,7 +45,7 @@ stdenv.mkDerivation { mkdir -p $out/share/emacs/site-lisp/curry-pakcs for e in "$out/tools/emacs/"*.el ; do - ln -s $out/tools/emacs/$e $out/share/emacs/site-lisp/curry-pakcs/; + ln -s $e $out/share/emacs/site-lisp/curry-pakcs/; done sed -i 's@which@type -P@' $out/bin/.pakcs_wrapper diff --git a/pkgs/development/compilers/pakcs/pakcs-ghc741.patch b/pkgs/development/compilers/pakcs/pakcs-ghc741.patch new file mode 100644 index 00000000000..439cb787d67 --- /dev/null +++ b/pkgs/development/compilers/pakcs/pakcs-ghc741.patch @@ -0,0 +1,1004 @@ +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/AbstractCurry.hs pakcs-new/mccparser/src/AbstractCurry.hs +--- pakcs/mccparser/src/AbstractCurry.hs 2011-11-14 09:23:10.000000000 -0430 ++++ pakcs-new/mccparser/src/AbstractCurry.hs 2012-06-10 23:41:02.278126416 -0430 +@@ -29,7 +29,7 @@ + readCurry, writeCurry) where + + import PathUtils (writeModule,readModule) +-import List(intersperse) ++import Data.List(intersperse) + + ------------------------------------------------------------------------------ + -- Definition of data types for representing abstract Curry programs: +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/AnsiCodes.hs pakcs-new/mccparser/src/AnsiCodes.hs +--- pakcs/mccparser/src/AnsiCodes.hs 2011-11-14 09:23:10.000000000 -0430 ++++ pakcs-new/mccparser/src/AnsiCodes.hs 2012-06-10 23:41:02.278126416 -0430 +@@ -27,8 +27,8 @@ + + ) where + +-import Char +-import List ++import Data.Char ++import Data.List + + -- escape character + esc = chr 27 +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/Base.lhs pakcs-new/mccparser/src/Base.lhs +--- pakcs/mccparser/src/Base.lhs 2011-11-14 09:23:07.000000000 -0430 ++++ pakcs-new/mccparser/src/Base.lhs 2012-06-10 23:41:02.302127057 -0430 +@@ -22,12 +22,12 @@ + > import FlatWithSrcRefs hiding (SrcRef, Fixity(..), TypeExpr, Expr(..)) + > import Env + > import TopEnv +-> import List ++> import Data.List + > import Map +-> import Monad ++> import Control.Monad + > import Set + > import Utils +-> import Maybe ++> import Data.Maybe + + > import qualified FlatWithSrcRefs (Fixity(..), TypeExpr) + +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/Cam.lhs pakcs-new/mccparser/src/Cam.lhs +--- pakcs/mccparser/src/Cam.lhs 2011-11-14 09:23:08.000000000 -0430 ++++ pakcs-new/mccparser/src/Cam.lhs 2012-06-10 23:41:02.302127057 -0430 +@@ -10,7 +10,7 @@ + \begin{verbatim} + + > module Cam where +-> import Char ++> import Data.Char + + \end{verbatim} + An abstract machine code module consists of a list of import, data, +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/CamPP.lhs pakcs-new/mccparser/src/CamPP.lhs +--- pakcs/mccparser/src/CamPP.lhs 2011-11-14 09:23:08.000000000 -0430 ++++ pakcs-new/mccparser/src/CamPP.lhs 2012-06-10 23:41:02.303127084 -0430 +@@ -9,7 +9,7 @@ + + > module CamPP where + > import Cam +-> import Char ++> import Data.Char + > import Pretty + + > default(Int) +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/CaseCompletion.hs pakcs-new/mccparser/src/CaseCompletion.hs +--- pakcs/mccparser/src/CaseCompletion.hs 2011-11-14 09:23:10.000000000 -0430 ++++ pakcs-new/mccparser/src/CaseCompletion.hs 2012-06-10 23:41:02.280126456 -0430 +@@ -21,7 +21,7 @@ + import Position (SrcRef) + import OldScopeEnv as ScopeEnv + import ILScope +-import Maybe ++import Data.Maybe + + + ------------------------------------------------------------------------------- +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/CCode.lhs pakcs-new/mccparser/src/CCode.lhs +--- pakcs/mccparser/src/CCode.lhs 2011-11-14 09:23:08.000000000 -0430 ++++ pakcs-new/mccparser/src/CCode.lhs 2012-06-10 23:41:02.303127084 -0430 +@@ -15,8 +15,8 @@ + \begin{verbatim} + + > module CCode where +-> import List +-> import Maybe ++> import Data.List ++> import Data.Maybe + > infixl 9 `CElem`,`CField` + > infixr 8 `CCast` + > infixl 7 `CMul`,`CDiv`,`CMod` +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/CGen.lhs pakcs-new/mccparser/src/CGen.lhs +--- pakcs/mccparser/src/CGen.lhs 2011-11-14 09:23:08.000000000 -0430 ++++ pakcs-new/mccparser/src/CGen.lhs 2012-06-10 23:41:02.306127165 -0430 +@@ -13,10 +13,10 @@ + > import CCode + > import CPS + > import CElim +-> import Char +-> import List ++> import Data.Char ++> import Data.List + > import Map +-> import Maybe ++> import Data.Maybe + > import Set + > import Utils + +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/Combined.lhs pakcs-new/mccparser/src/Combined.lhs +--- pakcs/mccparser/src/Combined.lhs 2011-11-14 09:23:08.000000000 -0430 ++++ pakcs-new/mccparser/src/Combined.lhs 2012-06-10 23:41:02.306127165 -0430 +@@ -19,8 +19,8 @@ + + > module Combined where + > import Error +-> import Monad +-> import IO ++> import Control.Monad ++> import System.IO + > import IORefCompat + + \end{verbatim} +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/config.hs pakcs-new/mccparser/src/config.hs +--- pakcs/mccparser/src/config.hs 2011-11-14 09:23:11.000000000 -0430 ++++ pakcs-new/mccparser/src/config.hs 2012-06-10 23:41:02.280126456 -0430 +@@ -9,9 +9,9 @@ + -- Martin Engelke (men@informatik.uni-kiel.de) + -- + +-import Time +-import System +-import Directory ++import System.Time ++import System.Cmd ++import System.Directory + + + ------------------------------------------------------------------------------- +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/CPretty.lhs pakcs-new/mccparser/src/CPretty.lhs +--- pakcs/mccparser/src/CPretty.lhs 2011-11-14 09:23:08.000000000 -0430 ++++ pakcs-new/mccparser/src/CPretty.lhs 2012-06-10 23:41:02.307127192 -0430 +@@ -18,7 +18,7 @@ + + > import CCode + > import Pretty +-> import List ++> import Data.List + + > ppCFile :: CFile -> Doc + > ppCFile = vsep . map ppTopDecl +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/CPS.lhs pakcs-new/mccparser/src/CPS.lhs +--- pakcs/mccparser/src/CPS.lhs 2011-11-14 09:23:08.000000000 -0430 ++++ pakcs-new/mccparser/src/CPS.lhs 2012-06-10 23:41:02.308127219 -0430 +@@ -12,7 +12,7 @@ + > cpsFunction, cpsApply, cpsVars, fromCaseBlock, caseBlockTag, + > fresh) where + > import Cam +-> import List ++> import Data.List + > import Set + > import SCC + +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/CurryBuilder.hs pakcs-new/mccparser/src/CurryBuilder.hs +--- pakcs/mccparser/src/CurryBuilder.hs 2011-11-14 09:23:10.000000000 -0430 ++++ pakcs-new/mccparser/src/CurryBuilder.hs 2012-06-10 23:46:43.708361686 -0430 +@@ -18,13 +18,13 @@ + import Ident + import PathUtils + import Env +-import System +-import Directory +-import Time +-import Monad +-import Maybe +-import List +-import IO ++import System.Directory ++import System.Exit ++import System.Time ++import Control.Monad ++import Data.Maybe ++import Data.List ++import System.IO + + + ------------------------------------------------------------------------------- +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/CurryCompiler.hs pakcs-new/mccparser/src/CurryCompiler.hs +--- pakcs/mccparser/src/CurryCompiler.hs 2011-11-14 09:23:10.000000000 -0430 ++++ pakcs-new/mccparser/src/CurryCompiler.hs 2012-06-10 23:46:11.828499672 -0430 +@@ -13,8 +13,8 @@ + import CurryCompilerOpts + import CompilerResults + import Modules +-import System +-import IO ++import System.Exit ++import System.IO + + + ------------------------------------------------------------------------------- +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/CurryDeps.lhs pakcs-new/mccparser/src/CurryDeps.lhs +--- pakcs/mccparser/src/CurryDeps.lhs 2011-11-14 09:23:08.000000000 -0430 ++++ pakcs-new/mccparser/src/CurryDeps.lhs 2012-06-10 23:41:02.309127246 -0430 +@@ -20,11 +20,11 @@ + > import CurryParser(parseHeader) + > import SCC + > import Env +-> import List +-> import Maybe +-> import Monad ++> import Data.List ++> import Data.Maybe ++> import Control.Monad + > import Error +-> import IO ++> import System.IO + > import PathUtils + + > data Source = Source FilePath [ModuleIdent] +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/CurryEnv.hs pakcs-new/mccparser/src/CurryEnv.hs +--- pakcs/mccparser/src/CurryEnv.hs 2011-11-14 09:23:11.000000000 -0430 ++++ pakcs-new/mccparser/src/CurryEnv.hs 2012-06-10 23:41:02.283126538 -0430 +@@ -15,7 +15,7 @@ + import Ident + import Base + import Env +-import Maybe ++import Data.Maybe + + ------------------------------------------------------------------------------ + +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/CurryHtml.hs pakcs-new/mccparser/src/CurryHtml.hs +--- pakcs/mccparser/src/CurryHtml.hs 2011-11-14 09:23:11.000000000 -0430 ++++ pakcs-new/mccparser/src/CurryHtml.hs 2012-06-10 23:48:58.040993372 -0430 +@@ -2,8 +2,8 @@ + + import SyntaxColoring + import Ident +-import Maybe +-import Char ++import Data.Maybe ++import Data.Char hiding (Space) + import System.Environment + import CurryDeps(getCurryPath) + import PathUtils (writeModule) +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/CurryLexer.lhs pakcs-new/mccparser/src/CurryLexer.lhs +--- pakcs/mccparser/src/CurryLexer.lhs 2011-11-14 09:23:08.000000000 -0430 ++++ pakcs-new/mccparser/src/CurryLexer.lhs 2012-06-10 23:41:02.310127273 -0430 +@@ -15,8 +15,8 @@ + > import LexComb + > import Position + > import Map +-> import Char +-> import List ++> import Data.Char ++> import Data.List + + \end{verbatim} + \paragraph{Tokens} Note that the equality and ordering instances of +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/CurrySubdir.hs pakcs-new/mccparser/src/CurrySubdir.hs +--- pakcs/mccparser/src/CurrySubdir.hs 2011-11-14 09:23:11.000000000 -0430 ++++ pakcs-new/mccparser/src/CurrySubdir.hs 2012-06-10 23:41:02.283126538 -0430 +@@ -1,9 +1,9 @@ + module CurrySubdir where + +-import Directory ++import System.Directory + import System.Time (ClockTime) + import Control.Monad (when) +-import List(intersperse) ++import Data.List(intersperse) + + -- some definitions from PathUtils + +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/CurrySyntaxTools.lhs pakcs-new/mccparser/src/CurrySyntaxTools.lhs +--- pakcs/mccparser/src/CurrySyntaxTools.lhs 2011-11-14 09:23:08.000000000 -0430 ++++ pakcs-new/mccparser/src/CurrySyntaxTools.lhs 2012-06-10 23:41:02.314127381 -0430 +@@ -2,7 +2,7 @@ + + > import CurrySyntax + > import Ident +-> import Maybe ++> import Data.Maybe + + >------------------------------------------------------------------------------ + +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/cycc.hs pakcs-new/mccparser/src/cycc.hs +--- pakcs/mccparser/src/cycc.hs 2011-11-14 09:23:11.000000000 -0430 ++++ pakcs-new/mccparser/src/cycc.hs 2012-06-10 23:41:02.283126538 -0430 +@@ -7,9 +7,9 @@ + import PathUtils + import Options + import GetOpt +-import Maybe +-import IO +-import System ++import Data.Maybe ++import System.IO ++import System.Cmd + + main :: IO () + main = +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/cymake.hs pakcs-new/mccparser/src/cymake.hs +--- pakcs/mccparser/src/cymake.hs 2011-11-14 09:23:11.000000000 -0430 ++++ pakcs-new/mccparser/src/cymake.hs 2012-06-10 23:50:08.306892587 -0430 +@@ -14,13 +14,14 @@ + import GetOpt + import CurryBuilder + import CurryBuilderOpts +-import System +-import Maybe +-import IO ++import System.Environment ++import System.Exit ++import Data.Maybe ++import System.IO + import CurryHtml +-import List ++import Data.List + import Control.Monad (unless) +-import Char (isDigit) ++import Data.Char (isDigit) + + + ------------------------------------------------------------------------------- +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/cymk.hs pakcs-new/mccparser/src/cymk.hs +--- pakcs/mccparser/src/cymk.hs 2011-11-14 09:23:11.000000000 -0430 ++++ pakcs-new/mccparser/src/cymk.hs 2012-06-10 23:41:02.284126572 -0430 +@@ -7,11 +7,11 @@ + + import CurryDeps + import GetOpt +-import Maybe +-import Monad +-import IO ++import Data.Maybe ++import Control.Monad ++import System.IO + import PathUtils +-import System ++import System.Cmd + + data Options = + Options{ +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/cyxml.hs pakcs-new/mccparser/src/cyxml.hs +--- pakcs/mccparser/src/cyxml.hs 2011-11-14 09:23:11.000000000 -0430 ++++ pakcs-new/mccparser/src/cyxml.hs 2012-06-10 23:41:02.285126603 -0430 +@@ -9,8 +9,8 @@ + -- Martin Engelke (men@informatik.uni-kiel.de) + -- + +-import System +-import Directory ++import System.Cmd ++import System.Directory + + + ------------------------------------------------------------------------------- +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/Desugar.lhs pakcs-new/mccparser/src/Desugar.lhs +--- pakcs/mccparser/src/Desugar.lhs 2011-11-14 09:23:08.000000000 -0430 ++++ pakcs-new/mccparser/src/Desugar.lhs 2012-06-10 23:41:02.316127435 -0430 +@@ -64,12 +64,12 @@ + > import Base + > import Combined + > import TopEnv (qualRebindTopEnv) +-> import List +-> import Monad ++> import Data.List ++> import Control.Monad + > import Typing + > import Utils + > import Ident +-> import Maybe ++> import Data.Maybe + + posE = undefined + +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/DTransform.lhs pakcs-new/mccparser/src/DTransform.lhs +--- pakcs/mccparser/src/DTransform.lhs 2011-11-14 09:23:08.000000000 -0430 ++++ pakcs-new/mccparser/src/DTransform.lhs 2012-06-10 23:41:02.318127490 -0430 +@@ -18,7 +18,7 @@ + + > module DTransform(module DTransform) where + > import Ident +-> import List ++> import Data.List + > import IL + + \end{verbatim} +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/Error.lhs pakcs-new/mccparser/src/Error.lhs +--- pakcs/mccparser/src/Error.lhs 2011-11-14 09:23:08.000000000 -0430 ++++ pakcs-new/mccparser/src/Error.lhs 2012-06-10 23:41:02.318127490 -0430 +@@ -13,7 +13,7 @@ + \begin{verbatim} + + > module Error where +-> import Monad ++> import Control.Monad + + > data Error a = Ok a | Error String deriving (Eq,Ord,Show) + +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/Exports.lhs pakcs-new/mccparser/src/Exports.lhs +--- pakcs/mccparser/src/Exports.lhs 2011-11-14 09:23:09.000000000 -0430 ++++ pakcs-new/mccparser/src/Exports.lhs 2012-06-10 23:41:02.319127517 -0430 +@@ -14,9 +14,9 @@ + + > module Exports(expandInterface,exportInterface) where + > import Base +-> import List ++> import Data.List + > import Map +-> import Maybe ++> import Data.Maybe + > import Set + > import TopEnv + +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/FlatCurry.hs pakcs-new/mccparser/src/FlatCurry.hs +--- pakcs/mccparser/src/FlatCurry.hs 2011-11-14 09:23:11.000000000 -0430 ++++ pakcs-new/mccparser/src/FlatCurry.hs 2012-06-10 23:41:02.286126629 -0430 +@@ -24,8 +24,8 @@ + writeFlatCurry) where + + import PathUtils (writeModule,maybeReadModule) +-import Directory +-import List(intersperse) ++import System.Directory ++import Data.List(intersperse) + import Control.Monad (liftM) + + ------------------------------------------------------------------------------ +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/FlatCurry.lhs pakcs-new/mccparser/src/FlatCurry.lhs +--- pakcs/mccparser/src/FlatCurry.lhs 2011-11-14 09:23:09.000000000 -0430 ++++ pakcs-new/mccparser/src/FlatCurry.lhs 2012-06-10 23:41:02.320127544 -0430 +@@ -19,9 +19,9 @@ + > CaseType(..), CombType(..), Expr(..), BranchExpr(..), + > Pattern(..), Literal(..)) where + +-import System +-import Directory +-import Char ++import System.Cmd ++import System.Directory ++import Data.Char + import ReadShowTerm + import PathUtils (doesModuleExist) + +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/FlatInfo.lhs pakcs-new/mccparser/src/FlatInfo.lhs +--- pakcs/mccparser/src/FlatInfo.lhs 2011-11-14 09:23:09.000000000 -0430 ++++ pakcs-new/mccparser/src/FlatInfo.lhs 2012-06-10 23:41:02.320127544 -0430 +@@ -6,7 +6,7 @@ + > import CurrySyntax + > import qualified IL + > import Ident +-> import Maybe ++> import Data.Maybe + + ------------------------------------------------------------------------------ + +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/FlatWithSrcRefs.hs pakcs-new/mccparser/src/FlatWithSrcRefs.hs +--- pakcs/mccparser/src/FlatWithSrcRefs.hs 2011-11-14 09:23:11.000000000 -0430 ++++ pakcs-new/mccparser/src/FlatWithSrcRefs.hs 2012-06-10 23:41:02.286126629 -0430 +@@ -27,8 +27,8 @@ + writeFlatCurry,gshowsPrec) where + + import PathUtils (writeModule,maybeReadModule) +-import Directory +-import List(intersperse) ++import System.Directory ++import Data.List(intersperse) + import Control.Monad (liftM) + import Data.Generics hiding (Fixity) + import Position (SrcRef) +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/Frontend.hs pakcs-new/mccparser/src/Frontend.hs +--- pakcs/mccparser/src/Frontend.hs 2011-11-14 09:23:11.000000000 -0430 ++++ pakcs-new/mccparser/src/Frontend.hs 2012-06-10 23:41:02.287126654 -0430 +@@ -33,10 +33,10 @@ + import Position + import PathUtils + import Env +-import List +-import Maybe +-import Monad +-import System ++import Data.List ++import Data.Maybe ++import Control.Monad ++import System.Cmd + import Prelude hiding (lex) + + +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/GenAbstractCurry.hs pakcs-new/mccparser/src/GenAbstractCurry.hs +--- pakcs/mccparser/src/GenAbstractCurry.hs 2011-11-14 09:23:11.000000000 -0430 ++++ pakcs-new/mccparser/src/GenAbstractCurry.hs 2012-06-10 23:41:02.289126703 -0430 +@@ -18,9 +18,9 @@ + import Position + import TopEnv + import Env +-import Maybe +-import List +-import Char ++import Data.Maybe ++import Data.List ++import Data.Char + + + ------------------------------------------------------------------------------- +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/GenFlatCurry.hs pakcs-new/mccparser/src/GenFlatCurry.hs +--- pakcs/mccparser/src/GenFlatCurry.hs 2011-11-14 09:23:11.000000000 -0430 ++++ pakcs-new/mccparser/src/GenFlatCurry.hs 2012-06-10 23:41:02.292126785 -0430 +@@ -37,9 +37,9 @@ + import TopEnv + import Env + import Map +-import Monad +-import Maybe +-import List ++import Control.Monad ++import Data.Maybe ++import Data.List + + + ------------------------------------------------------------------------------- +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/GetOpt.hs pakcs-new/mccparser/src/GetOpt.hs +--- pakcs/mccparser/src/GetOpt.hs 2011-11-14 09:23:11.000000000 -0430 ++++ pakcs-new/mccparser/src/GetOpt.hs 2012-06-10 23:41:02.292126785 -0430 +@@ -19,7 +19,7 @@ + + module GetOpt (ArgOrder(..), OptDescr(..), ArgDescr(..), usageInfo, getOpt) where + +-import List(isPrefixOf) ++import Data.List(isPrefixOf) + + data ArgOrder a -- what to do with options following non-options: + = RequireOrder -- no option processing after first non-option +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/HeaderTable.lhs pakcs-new/mccparser/src/HeaderTable.lhs +--- pakcs/mccparser/src/HeaderTable.lhs 2011-11-14 09:23:09.000000000 -0430 ++++ pakcs-new/mccparser/src/HeaderTable.lhs 2012-06-10 23:41:02.321127571 -0430 +@@ -3,7 +3,7 @@ + > import CurrySyntax + > import Ident + > import Env +-> import Maybe ++> import Data.Maybe + + + ------------------------------------------------------------------------------- +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/Ident.lhs pakcs-new/mccparser/src/Ident.lhs +--- pakcs/mccparser/src/Ident.lhs 2011-11-14 09:23:09.000000000 -0430 ++++ pakcs-new/mccparser/src/Ident.lhs 2012-06-10 23:41:02.322127598 -0430 +@@ -49,9 +49,9 @@ + > addPositionIdent, removePositionIdent, positionOfIdent, + > addPositionModuleIdent, removePositionModuleIdent,addRef,addRefId, + > positionOfModuleIdent,positionOfQualIdent,updQualIdent ) where +-> import Char +-> import List +-> import Maybe ++> import Data.Char ++> import Data.List ++> import Data.Maybe + > import Position + > import Data.Generics + +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/ILCompile.lhs pakcs-new/mccparser/src/ILCompile.lhs +--- pakcs/mccparser/src/ILCompile.lhs 2011-11-14 09:23:09.000000000 -0430 ++++ pakcs-new/mccparser/src/ILCompile.lhs 2012-06-10 23:41:02.323127625 -0430 +@@ -18,10 +18,10 @@ + > import IL + > import qualified Cam + > import Env +-> import List ++> import Data.List + > import Map +-> import Maybe +-> import Monad ++> import Data.Maybe ++> import Control.Monad + > import SCC + > import Combined + +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/ILLift.lhs pakcs-new/mccparser/src/ILLift.lhs +--- pakcs/mccparser/src/ILLift.lhs 2011-11-14 09:23:09.000000000 -0430 ++++ pakcs-new/mccparser/src/ILLift.lhs 2012-06-10 23:41:02.323127625 -0430 +@@ -20,8 +20,8 @@ + > import IL + > import Ident + > import Combined +-> import List +-> import Monad ++> import Data.List ++> import Control.Monad + > import Utils + + > type LiftState a = St [QualIdent] a +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/ILTrans.lhs pakcs-new/mccparser/src/ILTrans.lhs +--- pakcs/mccparser/src/ILTrans.lhs 2011-11-14 09:23:09.000000000 -0430 ++++ pakcs-new/mccparser/src/ILTrans.lhs 2012-06-10 23:41:02.325127679 -0430 +@@ -26,8 +26,8 @@ + > import Env + > import Set + > import Map +-> import Maybe +-> import List ++> import Data.Maybe ++> import Data.List + + \end{verbatim} + \paragraph{Modules} +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/ILxml.lhs pakcs-new/mccparser/src/ILxml.lhs +--- pakcs/mccparser/src/ILxml.lhs 2011-11-14 09:23:09.000000000 -0430 ++++ pakcs-new/mccparser/src/ILxml.lhs 2012-06-10 23:41:02.326127706 -0430 +@@ -25,8 +25,8 @@ + > import qualified CurrySyntax as CS + > import CurryEnv + > import Pretty +-> import Char(chr,ord,isAlphaNum) +-> import Maybe ++> import Data.Char(chr,ord,isAlphaNum) ++> import Data.Maybe + + > -- identation level + > level::Int +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/Imports.lhs pakcs-new/mccparser/src/Imports.lhs +--- pakcs/mccparser/src/Imports.lhs 2011-11-14 09:23:09.000000000 -0430 ++++ pakcs-new/mccparser/src/Imports.lhs 2012-06-10 23:41:02.327127733 -0430 +@@ -14,7 +14,7 @@ + > import Base + > import Env + > import TopEnv +-> import Maybe ++> import Data.Maybe + > import Map + > import Set + +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/InterfaceCheck.hs pakcs-new/mccparser/src/InterfaceCheck.hs +--- pakcs/mccparser/src/InterfaceCheck.hs 2011-11-14 09:23:11.000000000 -0430 ++++ pakcs-new/mccparser/src/InterfaceCheck.hs 2012-06-10 23:41:02.293126815 -0430 +@@ -10,7 +10,7 @@ + module InterfaceCheck where + + import FlatWithSrcRefs +-import List ++import Data.List + + + ------------------------------------------------------------------------------- +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/IntfCheck.lhs pakcs-new/mccparser/src/IntfCheck.lhs +--- pakcs/mccparser/src/IntfCheck.lhs 2011-11-14 09:23:09.000000000 -0430 ++++ pakcs-new/mccparser/src/IntfCheck.lhs 2012-06-10 23:41:02.328127760 -0430 +@@ -16,8 +16,8 @@ + + > module IntfCheck(intfCheck,fixInterface,intfEquiv) where + > import Base +-> import Maybe +-> import List(deleteFirstsBy) ++> import Data.Maybe ++> import Data.List(deleteFirstsBy) + > import Set + + \end{verbatim} +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/KindCheck.lhs pakcs-new/mccparser/src/KindCheck.lhs +--- pakcs/mccparser/src/KindCheck.lhs 2011-11-14 09:23:09.000000000 -0430 ++++ pakcs-new/mccparser/src/KindCheck.lhs 2012-06-10 23:41:02.329127787 -0430 +@@ -25,7 +25,7 @@ + + > module KindCheck(kindCheck,kindCheckGoal) where + > import Base hiding (bindArity) +-> import Maybe ++> import Data.Maybe + > import TopEnv + + \end{verbatim} +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/LexComb.lhs pakcs-new/mccparser/src/LexComb.lhs +--- pakcs/mccparser/src/LexComb.lhs 2011-11-14 09:23:09.000000000 -0430 ++++ pakcs-new/mccparser/src/LexComb.lhs 2012-06-10 23:41:02.329127787 -0430 +@@ -19,7 +19,7 @@ + > module LexComb where + > import Position + > import Error +-> import Char ++> import Data.Char + + > infixl 1 `thenP`, `thenP_` + +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/Lift.lhs pakcs-new/mccparser/src/Lift.lhs +--- pakcs/mccparser/src/Lift.lhs 2011-11-14 09:23:09.000000000 -0430 ++++ pakcs-new/mccparser/src/Lift.lhs 2012-06-10 23:41:02.330127814 -0430 +@@ -22,8 +22,8 @@ + > import Env + > import TopEnv + > import Set +-> import List +-> import Monad ++> import Data.List ++> import Control.Monad + > import Combined + > import SCC + +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/LLParseComb.lhs pakcs-new/mccparser/src/LLParseComb.lhs +--- pakcs/mccparser/src/LLParseComb.lhs 2011-11-14 09:23:09.000000000 -0430 ++++ pakcs-new/mccparser/src/LLParseComb.lhs 2012-06-10 23:41:02.330127814 -0430 +@@ -29,8 +29,8 @@ + > import Position + > import Set + > import Map +-> import Maybe +-> import Monad ++> import Data.Maybe ++> import Control.Monad + > import Error + > import LexComb + +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/Map.lhs pakcs-new/mccparser/src/Map.lhs +--- pakcs/mccparser/src/Map.lhs 2011-11-14 09:23:09.000000000 -0430 ++++ pakcs-new/mccparser/src/Map.lhs 2012-06-10 23:41:02.331127841 -0430 +@@ -11,7 +11,7 @@ + + > module Map(FM, nullFM, zeroFM, unitFM, addToFM, deleteFromFM, + > lookupFM, fromListFM, toListFM) where +-> import List ++> import Data.List + + \end{verbatim} + A 2-3 tree is either empty or a node with either two or three children +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/Modules.lhs pakcs-new/mccparser/src/Modules.lhs +--- pakcs/mccparser/src/Modules.lhs 2011-11-14 09:23:09.000000000 -0430 ++++ pakcs-new/mccparser/src/Modules.lhs 2012-06-10 23:41:02.333127895 -0430 +@@ -55,10 +55,10 @@ + > import CaseCompletion + > import PathUtils + > import TypeSubst +-> import List +-> import IO +-> import Maybe +-> import Monad ++> import Data.List ++> import System.IO ++> import Data.Maybe ++> import Control.Monad + > import Pretty + > import Error + > import Env +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/newer.lhs pakcs-new/mccparser/src/newer.lhs +--- pakcs/mccparser/src/newer.lhs 2011-11-14 09:23:10.000000000 -0430 ++++ pakcs-new/mccparser/src/newer.lhs 2012-06-10 23:41:02.333127895 -0430 +@@ -24,10 +24,10 @@ + code 2. + \begin{verbatim} + +-> import IO +-> import Directory +-> import System +-> import Time ++> import System.IO ++> import System.Directory ++> import System.Cmd ++> import System.Time + > import PathUtils (getModuleModTime) + + > main = +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/OldScopeEnv.hs pakcs-new/mccparser/src/OldScopeEnv.hs +--- pakcs/mccparser/src/OldScopeEnv.hs 2011-11-14 09:23:11.000000000 -0430 ++++ pakcs-new/mccparser/src/OldScopeEnv.hs 2012-06-10 23:41:02.294126843 -0430 +@@ -8,7 +8,7 @@ + + import Ident + import Env +-import Maybe ++import Data.Maybe + + + ------------------------------------------------------------------------------- +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/PathUtils.lhs pakcs-new/mccparser/src/PathUtils.lhs +--- pakcs/mccparser/src/PathUtils.lhs 2011-11-14 09:23:10.000000000 -0430 ++++ pakcs-new/mccparser/src/PathUtils.lhs 2012-06-10 23:41:02.334127922 -0430 +@@ -15,8 +15,8 @@ + > listSep, pathList, lookupFile, + > currySubdir,writeModule,readModule, + > doesModuleExist,maybeReadModule,getModuleModTime) where +-> -- import List +-> import Directory ++> -- import Data.List ++> import System.Directory + > import CurrySubdir + + \end{verbatim} +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/PrecCheck.lhs pakcs-new/mccparser/src/PrecCheck.lhs +--- pakcs/mccparser/src/PrecCheck.lhs 2011-11-14 09:23:10.000000000 -0430 ++++ pakcs-new/mccparser/src/PrecCheck.lhs 2012-06-10 23:41:02.335127950 -0430 +@@ -18,7 +18,7 @@ + + > module PrecCheck(precCheck,precCheckGoal) where + > import Base +-> import List ++> import Data.List + > import Env + > import TopEnv + +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/Pretty.lhs pakcs-new/mccparser/src/Pretty.lhs +--- pakcs/mccparser/src/Pretty.lhs 2011-11-14 09:23:10.000000000 -0430 ++++ pakcs-new/mccparser/src/Pretty.lhs 2012-06-10 23:41:02.337128004 -0430 +@@ -180,7 +180,7 @@ + + -- Don't import Util( assertPanic ) because it makes a loop in the module structure + +-import Ratio ++import Data.Ratio + infixl 6 <> + infixl 6 <+> + infixl 5 $$, $+$ +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/Set.lhs pakcs-new/mccparser/src/Set.lhs +--- pakcs/mccparser/src/Set.lhs 2011-11-14 09:23:10.000000000 -0430 ++++ pakcs-new/mccparser/src/Set.lhs 2012-06-10 23:41:02.338128031 -0430 +@@ -11,9 +11,9 @@ + \begin{verbatim} + + > module Set where +-> import List ++> import Data.List + > import Map +-> import Maybe ++> import Data.Maybe + + > infixl 8 `addToSet`, `deleteFromSet` + > infixl 7 `unionSet`, `intersectionSet` +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/Simplify.lhs pakcs-new/mccparser/src/Simplify.lhs +--- pakcs/mccparser/src/Simplify.lhs 2011-11-14 09:23:10.000000000 -0430 ++++ pakcs-new/mccparser/src/Simplify.lhs 2012-06-10 23:41:02.339128058 -0430 +@@ -26,10 +26,10 @@ + > import Base + > import Combined + > import Env +-> import Monad ++> import Control.Monad + > import SCC + > import Typing +-> import List (partition) ++> import Data.List (partition) + + > type SimplifyState a = StateT ValueEnv (ReaderT EvalEnv (StateT Int Id)) a + > type InlineEnv = Env Ident Expression +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/smake.hs pakcs-new/mccparser/src/smake.hs +--- pakcs/mccparser/src/smake.hs 2011-11-14 09:23:12.000000000 -0430 ++++ pakcs-new/mccparser/src/smake.hs 2012-06-10 23:41:02.296126896 -0430 +@@ -22,11 +22,11 @@ + -- Martin Engelke (men@informatik.uni-kiel.de) + -- + +-import System +-import Directory +-import Time +-import Monad +-import Maybe ++import System.Cmd ++import System.Directory ++import System.Time ++import Control.Monad ++import Data.Maybe + import PathUtils (getModuleModTime) + + +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/SyntaxCheck.lhs pakcs-new/mccparser/src/SyntaxCheck.lhs +--- pakcs/mccparser/src/SyntaxCheck.lhs 2011-11-14 09:23:10.000000000 -0430 ++++ pakcs-new/mccparser/src/SyntaxCheck.lhs 2012-06-10 23:41:02.342128139 -0430 +@@ -24,9 +24,9 @@ + > import Base + > import Env + > import NestEnv +-> import List +-> import Maybe +-> import Monad ++> import Data.List ++> import Data.Maybe ++> import Control.Monad + > import Combined + > import Utils + +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/SyntaxColoring.hs pakcs-new/mccparser/src/SyntaxColoring.hs +--- pakcs/mccparser/src/SyntaxColoring.hs 2011-11-14 09:23:11.000000000 -0430 ++++ pakcs-new/mccparser/src/SyntaxColoring.hs 2012-06-10 23:48:14.526817048 -0430 +@@ -10,9 +10,9 @@ + import Frontend + import Ident + import CurrySyntax +-import Char +-import Maybe +-import List ++import Data.Char hiding (Space) ++import Data.Maybe ++import Data.List + import Debug.Trace + import Message + import Control.Exception +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/TopEnv.lhs pakcs-new/mccparser/src/TopEnv.lhs +--- pakcs/mccparser/src/TopEnv.lhs 2011-11-14 09:23:10.000000000 -0430 ++++ pakcs-new/mccparser/src/TopEnv.lhs 2012-06-10 23:41:02.342128139 -0430 +@@ -41,7 +41,7 @@ + > allImports,moduleImports,localBindings) where + > import Env + > import Ident +-> import Maybe ++> import Data.Maybe + > import Utils + + > data Source = Local | Import [ModuleIdent] deriving (Eq,Show) +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/TypeCheck.lhs pakcs-new/mccparser/src/TypeCheck.lhs +--- pakcs/mccparser/src/TypeCheck.lhs 2011-11-14 09:23:10.000000000 -0430 ++++ pakcs-new/mccparser/src/TypeCheck.lhs 2012-06-10 23:45:05.513706248 -0430 +@@ -33,9 +33,9 @@ + > import SCC + > import TypeSubst + > import Utils +-> import List +-> import Monad +-> import Maybe ++> import Data.List ++> import Control.Monad ++> import Data.Maybe + + > infixl 5 $-$ + +@@ -1136,9 +1136,6 @@ + > where tvs = [tv | tv <- nub (typeVars ty), tv `notElemSet` gvs] + > tvs' = map TypeVariable [0..] + +-> replicateM :: Monad m => Int -> m a -> m [a] +-> replicateM n = sequence . replicate n +- + \end{verbatim} + \paragraph{Auxiliary Functions} + The functions \texttt{constrType}, \texttt{varType}, and +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/Types.lhs pakcs-new/mccparser/src/Types.lhs +--- pakcs/mccparser/src/Types.lhs 2011-11-14 09:23:10.000000000 -0430 ++++ pakcs-new/mccparser/src/Types.lhs 2012-06-10 23:41:02.346128247 -0430 +@@ -13,8 +13,8 @@ + + > module Types where + > import Ident +-> import List +-> import Maybe ++> import Data.List ++> import Data.Maybe + + \end{verbatim} + A type is either a type variable, an application of a type constructor +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/TypeSubst.lhs pakcs-new/mccparser/src/TypeSubst.lhs +--- pakcs/mccparser/src/TypeSubst.lhs 2011-11-14 09:23:10.000000000 -0430 ++++ pakcs-new/mccparser/src/TypeSubst.lhs 2012-06-10 23:41:02.346128247 -0430 +@@ -12,8 +12,8 @@ + > module TypeSubst(module TypeSubst, idSubst,bindSubst,compose) where + > import Base + > import TopEnv +-> import Maybe +-> import List ++> import Data.Maybe ++> import Data.List + > import Subst + + > type TypeSubst = Subst Int Type +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/Typing.lhs pakcs-new/mccparser/src/Typing.lhs +--- pakcs/mccparser/src/Typing.lhs 2011-11-14 09:23:10.000000000 -0430 ++++ pakcs-new/mccparser/src/Typing.lhs 2012-06-10 23:41:02.347128274 -0430 +@@ -12,10 +12,10 @@ + > import Base + > import TypeSubst + > import Combined +-> import Monad ++> import Control.Monad + > import TopEnv + > import Utils +-> import Maybe ++> import Data.Maybe + + \end{verbatim} + During the transformation of Curry source code into the intermediate +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/Unlit.lhs pakcs-new/mccparser/src/Unlit.lhs +--- pakcs/mccparser/src/Unlit.lhs 2011-11-14 09:23:10.000000000 -0430 ++++ pakcs-new/mccparser/src/Unlit.lhs 2012-06-10 23:41:02.347128274 -0430 +@@ -27,7 +27,7 @@ + \begin{verbatim} + + > module Unlit(unlit) where +-> import Char ++> import Data.Char + > import Position + + \end{verbatim} +diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/WarnCheck.hs pakcs-new/mccparser/src/WarnCheck.hs +--- pakcs/mccparser/src/WarnCheck.hs 2011-11-14 09:23:11.000000000 -0430 ++++ pakcs-new/mccparser/src/WarnCheck.hs 2012-06-10 23:41:02.300127003 -0430 +@@ -17,8 +17,8 @@ + import ScopeEnv (ScopeEnv) + import Message + import Env +-import Monad +-import List ++import Control.Monad ++import Data.List + + + ------------------------------------------------------------------------------- From 58f3a6e25e8479e42136667c722d0452dcf0b418 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Jun 2012 07:04:40 +0000 Subject: [PATCH 236/403] Updated Haskell packages. - accelerate-cuda: updated to version 0.12.1.0 - accelerate-examples: updated to version 0.12.1.0 - accelerate-io: updated to version 0.12.1.0 - accelerate: updated to version 0.12.1.0 - hakyll: updated to version 3.3.0.1 - pandoc: updated to version 1.9.4.1 - Vec: updated to version 0.9.9 svn path=/nixpkgs/trunk/; revision=34431 --- pkgs/development/libraries/haskell/Vec/default.nix | 7 +++---- .../libraries/haskell/accelerate-cuda/default.nix | 9 ++++----- .../libraries/haskell/accelerate-examples/default.nix | 4 ++-- .../libraries/haskell/accelerate-io/default.nix | 4 ++-- .../development/libraries/haskell/accelerate/default.nix | 4 ++-- pkgs/development/libraries/haskell/hakyll/default.nix | 4 ++-- pkgs/development/libraries/haskell/pandoc/default.nix | 4 ++-- 7 files changed, 17 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/haskell/Vec/default.nix b/pkgs/development/libraries/haskell/Vec/default.nix index 232fb0f7272..77cc9e37a9d 100644 --- a/pkgs/development/libraries/haskell/Vec/default.nix +++ b/pkgs/development/libraries/haskell/Vec/default.nix @@ -1,10 +1,9 @@ -{ cabal, QuickCheck }: +{ cabal }: cabal.mkDerivation (self: { pname = "Vec"; - version = "0.9.8"; - sha256 = "0yaqy0p2jh2ajf8897vsxl5w6bmavixn6n5cc7w8kdnybpbdms6v"; - buildDepends = [ QuickCheck ]; + version = "0.9.9"; + sha256 = "1ms6w8003aplcndqglw2gxj0ji4m3jki9ndj5gni24w8dqiy5x47"; meta = { homepage = "http://graphics.cs.ucdavis.edu/~sdillard/Vec"; description = "Fixed-length lists and low-dimensional linear algebra"; diff --git a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix index 5433eb4858e..aae77de6c6c 100644 --- a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix @@ -1,16 +1,15 @@ { cabal, accelerate, binary, blazeBuilder, cryptohash, cuda , fclabels, filepath, hashable, hashtables, languageCQuote -, mainlandPretty, mtl, srcloc, symbol, transformers -, unorderedContainers +, mainlandPretty, mtl, srcloc, transformers, unorderedContainers }: cabal.mkDerivation (self: { pname = "accelerate-cuda"; - version = "0.12.0.0"; - sha256 = "1h8rx8jcv3x7hg8fr23fzy59lcv72rb914vyczs40bgfr4cgdaaa"; + version = "0.12.1.0"; + sha256 = "1y6viivizv4frdh3xk5wqhs7wwnhqyjr9wid1y1d5l42mz41vp84"; buildDepends = [ accelerate binary blazeBuilder cryptohash cuda fclabels filepath - hashable hashtables languageCQuote mainlandPretty mtl srcloc symbol + hashable hashtables languageCQuote mainlandPretty mtl srcloc transformers unorderedContainers ]; meta = { diff --git a/pkgs/development/libraries/haskell/accelerate-examples/default.nix b/pkgs/development/libraries/haskell/accelerate-examples/default.nix index 6a73274336d..f1f7aefb736 100644 --- a/pkgs/development/libraries/haskell/accelerate-examples/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-examples/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "accelerate-examples"; - version = "0.12.0.0"; - sha256 = "08mkfr46vl8vgcsxvmbs499frvybfq0chbcj1chpb8rwy8w9fa9h"; + version = "0.12.1.0"; + sha256 = "0vlax90yy9h4ljm87ffmnqv881nr4ssbc968mbbwi2704hn4chhb"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/accelerate-io/default.nix b/pkgs/development/libraries/haskell/accelerate-io/default.nix index caa4eeaf759..1cefda35325 100644 --- a/pkgs/development/libraries/haskell/accelerate-io/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-io/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "accelerate-io"; - version = "0.12.0.0"; - sha256 = "0jc6vcxmji11kj041cds6j90by3mvaybswgmsiflxdlf4zlagd6h"; + version = "0.12.1.0"; + sha256 = "1hcyshzfh7ldswv7sjklxlw5h1hx7spx6dy23bvdryrkq929gb8a"; buildDepends = [ accelerate repa vector ]; meta = { homepage = "http://www.cse.unsw.edu.au/~chak/project/accelerate/"; diff --git a/pkgs/development/libraries/haskell/accelerate/default.nix b/pkgs/development/libraries/haskell/accelerate/default.nix index d7e7205b83c..a2dc4cb2e59 100644 --- a/pkgs/development/libraries/haskell/accelerate/default.nix +++ b/pkgs/development/libraries/haskell/accelerate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "accelerate"; - version = "0.12.0.0"; - sha256 = "1hb1zqsh8598brnjhdds8knp9dfsdlshrx5c7lj4pgl37gqyb5q5"; + version = "0.12.1.0"; + sha256 = "1zvrb36xvvzfdl0k7a25329mdplwa76k9wk0yf3za3j0kb20d4f4"; meta = { homepage = "https://github.com/AccelerateHS/accelerate/"; description = "An embedded language for accelerated array processing"; diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index a3291ac4cec..11e4d90205c 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "3.3.0.0"; - sha256 = "0ljfdmmqigdzg8vaj502vrsz4i6ynaw3vhc9ys24m9xcqdmyha4h"; + version = "3.3.0.1"; + sha256 = "1rymj7j97803hy7nv235m29m0rird1c0ik81mkaicdfiabkihmrq"; buildDepends = [ binary blazeHtml blazeMarkup citeprocHs cryptohash filepath hamlet mtl pandoc parsec regexBase regexTdfa snapCore snapServer tagsoup diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index fba804bb69b..da52a43d8f6 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "pandoc"; - version = "1.9.4"; - sha256 = "0rqj9a3pkbhlqsmpxvjzahn992lm1pdg1bry677y8f5203ji10p2"; + version = "1.9.4.1"; + sha256 = "0n3jfk7b1vn8b1ryys6lm1drdx469q26gi0chzlf0wss1ss07x78"; isLibrary = true; isExecutable = true; buildDepends = [ From 3ecf94ae27c1435008bad0a3a8b90258dfb49853 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Jun 2012 07:15:03 +0000 Subject: [PATCH 237/403] Update VirtualBox and guest additions to v4.1.16. This includes fixes for kernels up to v3.4, so we shouldn't get build failures with kernel 3.4 anymore. svn path=/nixpkgs/trunk/; revision=34438 --- pkgs/applications/virtualization/virtualbox/default.nix | 4 ++-- .../virtualization/virtualbox/guest-additions/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index a2a8cff84d2..1e17c10ffd2 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -8,7 +8,7 @@ with stdenv.lib; -let version = "4.1.12"; in +let version = "4.1.16"; in stdenv.mkDerivation { name = "virtualbox-${version}-${kernel.version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "00hx7cl8n4qdmipxxx8a96x8yw6yim9bz3fjbyzcrs8yls0r2jsf"; + sha256 = "0kl21wqz822qgdcilfail5qqgsbhgzixwbbwpkmsh6670jc4jw5n"; }; buildInputs = diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index a11e4ee8218..7583b706e4c 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper , libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor}: -let version = "4.1.12"; in +let version = "4.1.16"; in stdenv.mkDerivation { name = "VirtualBox-GuestAdditions-${version}"; src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "0if2q188zf608p1dkq6pd46dafhslqcxmfpmarypbd68k7fi7kkx"; + sha256 = "1f2p26cg005xc6vi9dbim0macv60d8k8nq20rk7awrbghfib5imm"; }; KERN_DIR = "${kernel}/lib/modules/*/build"; buildInputs = [ patchelf cdrkit makeWrapper ]; From befd7e0ee89f25fb5671382d38010de332f0346c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Jun 2012 07:15:06 +0000 Subject: [PATCH 238/403] Update figlet to version 2.2.4. This is primarily because version 222 is no longer available at the upstream FTP site. svn path=/nixpkgs/trunk/; revision=34439 --- pkgs/tools/misc/figlet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/figlet/default.nix b/pkgs/tools/misc/figlet/default.nix index 3f89713918f..100cfda0d39 100644 --- a/pkgs/tools/misc/figlet/default.nix +++ b/pkgs/tools/misc/figlet/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "figlet-222"; + name = "figlet-2.2.4"; # some tools can be found here ftp://ftp.figlet.org/pub/figlet/util/ src = fetchurl { - url = ftp://ftp.figlet.org/pub/figlet/program/unix/figlet222.tar.gz; - sha256 = "1y22hhwxhnwd6yrjgl5p3p44r22xzrhv9cksj58n85laac6jdfhs"; + url = ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-2.2.4.tar.gz; + sha256 = "19qcmm9cmf78w1z7gbpyj9wmrfjzjl25sax9f2j37sijznrh263f"; }; preConfigure = '' From 5375a3edf6bd4c6e5a3afc0ae4b6a28de7db3f19 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Jun 2012 07:15:10 +0000 Subject: [PATCH 239/403] Fix installation of figlet 2.2.4. svn path=/nixpkgs/trunk/; revision=34440 --- pkgs/tools/misc/figlet/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/misc/figlet/default.nix b/pkgs/tools/misc/figlet/default.nix index 100cfda0d39..488f8020b63 100644 --- a/pkgs/tools/misc/figlet/default.nix +++ b/pkgs/tools/misc/figlet/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation { sha256 = "19qcmm9cmf78w1z7gbpyj9wmrfjzjl25sax9f2j37sijznrh263f"; }; + installPhase = "make prefix=$out install"; + preConfigure = '' mkdir -p $out/{man/man6,bin} makeFlags="DESTDIR=$out/bin MANDIR=$out/man/man6 DEFAULTFONTDIR=$out/share/figlet" From 499161282e2b06b038c7ef8c29d13829fbb1ac70 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Jun 2012 07:15:12 +0000 Subject: [PATCH 240/403] Update Django to version 1.4. svn path=/nixpkgs/trunk/; revision=34441 --- pkgs/top-level/python-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cfd15c7105f..22f63958c10 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -461,11 +461,12 @@ let pythonPackages = python.modules // rec { django = buildPythonPackage rec { - name = "Django-1.3.1"; + name = "Django-${version}"; + version = "1.4"; src = fetchurl { - url = "http://www.djangoproject.com/m/releases/1.3/${name}.tar.gz"; - sha256 = "0sqmvqy3y5h76pa3zjcnyiy5x01bzzy03afdp2qdwqx0x321i4dg"; + url = "http://www.djangoproject.com/m/releases/${version}/${name}.tar.gz"; + sha256 = "1sc8ajixaqfylb7jmmhn38hgbnqipylh1sqmpicx7rqhxbxvm5n0"; }; doCheck = false; From 7b14de6733af677acc51fa9181fde7a35ec83c36 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Jun 2012 07:16:11 +0000 Subject: [PATCH 241/403] Add package for vlock from Debian mirror. This is mainly because the original upstream URL is not available anymore. svn path=/nixpkgs/trunk/; revision=34442 --- pkgs/misc/screensavers/vlock/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/misc/screensavers/vlock/default.nix diff --git a/pkgs/misc/screensavers/vlock/default.nix b/pkgs/misc/screensavers/vlock/default.nix new file mode 100644 index 00000000000..f2cea3f257b --- /dev/null +++ b/pkgs/misc/screensavers/vlock/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pam }: + +stdenv.mkDerivation { + name = "vlock-2.2.2"; + src = fetchurl + { + url = mirror://debian/pool/main/v/vlock/vlock_2.2.2.orig.tar.gz; + sha256 = "1b9gv7hmlb8swda5bn40lp1yki8b8wv29vdnhcjqfl6ir98551za"; + }; + + prePatch = '' + sed -i -e '/INSTALL/s/-[og] [^ ]*//g' Makefile modules/Makefile + ''; + + configureFlags = "VLOCK_GROUP=root ROOT_GROUP=root"; + + buildInputs = [ pam ]; + + meta = { + description = "Virtual console locking program"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c69aed3ee7..b5d09a3a991 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4747,6 +4747,8 @@ let inherit (pkgs.pythonPackages) numpy; }; + vlock = callPackage ../misc/screensavers/vlock { }; + vmime = callPackage ../development/libraries/vmime { }; vrpn = callPackage ../development/libraries/vrpn { }; From 84547c53077f70dd8b5efd5cad48094923c07d36 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Jun 2012 07:16:51 +0000 Subject: [PATCH 242/403] Fix xfontsel to find the app defaults file. svn path=/nixpkgs/trunk/; revision=34443 --- pkgs/applications/misc/xfontsel/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix index c81a346914c..3179e1f3440 100644 --- a/pkgs/applications/misc/xfontsel/default.nix +++ b/pkgs/applications/misc/xfontsel/default.nix @@ -2,7 +2,7 @@ # at http://www.x.org/releases/individual/. # That is why this expression is not inside pkgs.xorg -{stdenv, fetchurl, libX11, pkgconfig, libXaw}: +{stdenv, fetchurl, makeWrapper, libX11, pkgconfig, libXaw}: stdenv.mkDerivation rec { name = "xfontsel-1.0.2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1a86a08sf0wjrki9ydh7hr5qf6hrixc4ljlxizakjzmx20wvlrks"; }; - buildInputs = [libX11 pkgconfig libXaw]; + buildInputs = [libX11 makeWrapper pkgconfig libXaw]; # Without this, it gets Xmu as a dependency, but without rpath entry NIX_LDFLAGS = "-lXmu"; @@ -19,8 +19,10 @@ stdenv.mkDerivation rec { # This will not make xfontsel find its app-defaults, but at least the $out # directory will contain them. # hack: Copying the XFontSel app-defaults file to $HOME makes xfontsel work. - preInstall = '' - installFlags="appdefaultdir=$out/share/X11/app-defaults" + installPhase = '' + make install appdefaultdir=$out/share/X11/app-defaults + wrapProgram $out/bin/xfontsel \ + --set XAPPLRESDIR $out/share/X11/app-defaults ''; meta = { From a7949741f6453629340904595f16241cf39baf1d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Jun 2012 07:17:39 +0000 Subject: [PATCH 243/403] gimp 2.8 - rename package from gimp_2_8_0 to gimp_2_8 as discussed on mailing list[1] - remove babl_0_1_10 and gegl_0_2_0 and use them as default versions [1] http://article.gmane.org/gmane.linux.distributions.nixos/8708 svn path=/nixpkgs/trunk/; revision=34444 --- .../graphics/gimp/{2.8.0.nix => 2.8.nix} | 0 pkgs/development/libraries/babl/0.1.10.nix | 16 ------------- pkgs/development/libraries/babl/default.nix | 6 ++--- pkgs/development/libraries/gegl/0.2.0.nix | 24 ------------------- pkgs/development/libraries/gegl/default.nix | 10 ++++---- pkgs/top-level/all-packages.nix | 10 +------- 6 files changed, 9 insertions(+), 57 deletions(-) rename pkgs/applications/graphics/gimp/{2.8.0.nix => 2.8.nix} (100%) delete mode 100644 pkgs/development/libraries/babl/0.1.10.nix delete mode 100644 pkgs/development/libraries/gegl/0.2.0.nix diff --git a/pkgs/applications/graphics/gimp/2.8.0.nix b/pkgs/applications/graphics/gimp/2.8.nix similarity index 100% rename from pkgs/applications/graphics/gimp/2.8.0.nix rename to pkgs/applications/graphics/gimp/2.8.nix diff --git a/pkgs/development/libraries/babl/0.1.10.nix b/pkgs/development/libraries/babl/0.1.10.nix deleted file mode 100644 index 41280e87253..00000000000 --- a/pkgs/development/libraries/babl/0.1.10.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - name = "babl-0.1.10"; - - src = fetchurl { - url = "ftp://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2"; - sha256 = "943fc36ceac7dd25bc928256bc7b535a42989c6b971578146869eee5fe5955f4"; - }; - - meta = { - description = "Image pixel format conversion library"; - homepage = http://gegl.org/babl/; - license = "GPL3"; - }; -} diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index 3449314a381..41280e87253 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "babl-0.1.4"; + name = "babl-0.1.10"; src = fetchurl { - url = "http://ftp.snt.utwente.nl/pub/software/gimp/babl/0.1/${name}.tar.bz2"; - sha256 = "0cz7zw206bb87c0n0h54h4wlkaa3hx3wsia30mgq316y50jk2djv"; + url = "ftp://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2"; + sha256 = "943fc36ceac7dd25bc928256bc7b535a42989c6b971578146869eee5fe5955f4"; }; meta = { diff --git a/pkgs/development/libraries/gegl/0.2.0.nix b/pkgs/development/libraries/gegl/0.2.0.nix deleted file mode 100644 index 5da6e3e40f4..00000000000 --- a/pkgs/development/libraries/gegl/0.2.0.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg -, librsvg, pango, gtk, bzip2, intltool }: - -stdenv.mkDerivation rec { - name = "gegl-0.2.0"; - - src = fetchurl { - url = "ftp://ftp.gtk.org/pub/gegl/0.2/${name}.tar.bz2"; - sha256 = "df2e6a0d9499afcbc4f9029c18d9d1e0dd5e8710a75e17c9b1d9a6480dd8d426"; - }; - - # needs fonts otherwise don't know how to pass them - configureFlags = "--disable-docs"; - - buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk bzip2 intltool ]; - - buildNativeInputs = [ pkgconfig ]; - - meta = { - description = "Graph-based image processing framework"; - homepage = http://www.gegl.org; - license = "GPL3"; - }; -} diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index 3e7f29ecb6f..5da6e3e40f4 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg -, librsvg, pango, gtk, bzip2 }: +, librsvg, pango, gtk, bzip2, intltool }: stdenv.mkDerivation rec { - name = "gegl-0.1.6"; + name = "gegl-0.2.0"; src = fetchurl { - url = "http://ftp.snt.utwente.nl/pub/software/gimp/gegl/0.1/${name}.tar.bz2"; - sha256 = "1l966ygss2zkksyw62nm139v2abfzbqqrj0psizvbgzf4mb24rm1"; + url = "ftp://ftp.gtk.org/pub/gegl/0.2/${name}.tar.bz2"; + sha256 = "df2e6a0d9499afcbc4f9029c18d9d1e0dd5e8710a75e17c9b1d9a6480dd8d426"; }; # needs fonts otherwise don't know how to pass them configureFlags = "--disable-docs"; - buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk bzip2 ]; + buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk bzip2 intltool ]; buildNativeInputs = [ pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b5d09a3a991..b6f409a559c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3184,8 +3184,6 @@ let babl = callPackage ../development/libraries/babl { }; - babl_0_1_10 = callPackage ../development/libraries/babl/0.1.10.nix {}; - beecrypt = callPackage ../development/libraries/beecrypt { }; boehmgc = callPackage ../development/libraries/boehm-gc { }; @@ -3442,10 +3440,6 @@ let # avocodec avformat librsvg }; - gegl_0_2_0 = callPackage ../development/libraries/gegl/0.2.0.nix { - babl = babl_0_1_10; - }; - geoclue = callPackage ../development/libraries/geoclue {}; geoip = builderDefsPackage ../development/libraries/geoip { @@ -6771,10 +6765,8 @@ let inherit (gnome) libart_lgpl; }; - gimp_2_8_0 = callPackage ../applications/graphics/gimp/2.8.0.nix { + gimp_2_8 = callPackage ../applications/graphics/gimp/2.8.nix { inherit (gnome) libart_lgpl; - babl = babl_0_1_10; - gegl = gegl_0_2_0; }; gimpPlugins = recurseIntoAttrs (import ../applications/graphics/gimp/plugins { From 8b65b2e2bc58103face8050bcbbf9630ac608f50 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Jun 2012 07:18:17 +0000 Subject: [PATCH 244/403] afew and alot updates svn path=/nixpkgs/trunk/; revision=34445 --- pkgs/top-level/python-packages.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 22f63958c10..12a98ff6b78 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -33,12 +33,12 @@ let pythonPackages = python.modules // rec { afew = buildPythonPackage rec { - rev = "a3ea63d7048faedb6cc58b4abcb6d4ecfddfb5db"; + rev = "8abd64bfdcd83a486b2a3977c08fe071523b2551"; name = "afew-1.0pre${rev}"; src = fetchurl { url = "https://github.com/teythoon/afew/tarball/${rev}"; name = "${name}.tar.bz"; - sha256 = "4e8850242a3845602331cabb47299b5a3af21993036a715c83e8dd698ab5d716"; + sha256 = "9b140d0eb0e5013419983604bb09a51f087a4abdf0a390c24a9596f867dc8c05"; }; propagatedBuildInputs = [ notmuch pkgs.dbacl ]; @@ -60,12 +60,13 @@ let pythonPackages = python.modules // rec { alot = buildPythonPackage rec { - name = "alot-0.3"; + version = "0.3.1"; + name = "alot-${version}"; src = fetchurl { - url = "https://github.com/pazz/alot/tarball/0.3"; + url = "https://github.com/pazz/alot/tarball/${version}"; name = "${name}.tar.bz"; - md5 = "fa4944a1a7e9e380da0ee75ea3571a79"; + md5 = "6c5986d9192863879e95a3f8f30ccb75"; }; doCheck = false; From 6db9c6f241c1f3867ec4f6510cc90c851548b8bb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Jun 2012 07:18:52 +0000 Subject: [PATCH 245/403] update i3status and i3lock svn path=/nixpkgs/trunk/; revision=34446 --- pkgs/applications/window-managers/i3/lock.nix | 4 ++-- pkgs/applications/window-managers/i3/status.nix | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix index a1d7409eaf2..12e4c91e24d 100644 --- a/pkgs/applications/window-managers/i3/lock.nix +++ b/pkgs/applications/window-managers/i3/lock.nix @@ -2,11 +2,11 @@ pam, libX11, libev, cairo }: stdenv.mkDerivation rec { - name = "i3lock-2.4"; + name = "i3lock-2.4.1"; src = fetchurl { url = "http://i3wm.org/i3lock/${name}.tar.bz2"; - sha256 = "ce6a47aaa25357ef6214628ddb992b5ba1562a116f63621a6095d422e5001229"; + sha256 = "4d29e66841138de562e71903d31ecaaefd8ecffe5e68da0d6c8d560ed543047c"; }; buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11 diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix index a60db1b3802..549cfc5d20d 100644 --- a/pkgs/applications/window-managers/i3/status.nix +++ b/pkgs/applications/window-managers/i3/status.nix @@ -1,15 +1,15 @@ -{ fetchurl, stdenv, confuse, alsaLib, wirelesstools +{ fetchurl, stdenv, confuse, yajl, alsaLib, wirelesstools }: stdenv.mkDerivation rec { - name = "i3status-2.4"; + name = "i3status-2.5.1"; src = fetchurl { url = "http://i3wm.org/i3status/${name}.tar.bz2"; - sha256 = "620f3768dc4e9ea391ca5b5e358d018ca5d2820da1fce71a71664ca554778abd"; + sha256 = "7734efdf79a77617023f1e6d80080251eab3a05defb67313283568511d3e58f2"; }; - buildInputs = [ confuse alsaLib wirelesstools ]; + buildInputs = [ confuse yajl alsaLib wirelesstools ]; makeFlags = "all"; installFlags = "PREFIX=\${out}"; From b4ebc3bb423c6b324ef0a0939a796d58fbf66c35 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Jun 2012 07:44:12 +0000 Subject: [PATCH 246/403] emacs: version emacs-24.1 is out The 24.x version is still low-prio in nixpkgs until we've figured out how to support multiple 'emacsPackages' sets properly. svn path=/nixpkgs/trunk/; revision=34447 --- pkgs/applications/editors/emacs-24/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index ae6b4677b59..cdd92d78bb3 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -9,19 +9,19 @@ assert (libXft != null) -> libpng != null; # probably a bug assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise stdenv.mkDerivation rec { - name = "emacs-24.0.94"; + name = "emacs-24.1"; builder = ./builder.sh; src = fetchurl { - url = "http://alpha.gnu.org/gnu/emacs/pretest/${name}.tar.gz"; - sha256 = "1dgy53dxpnwrn6h3i3z8fpcyasms0wlvhqfyih4cwkz712var393"; + url = "mirror://gnu/emacs/${name}.tar.bz2"; + sha256 = "eeea272732146e2be9aee2f8d71d6cf07b8654c0282da62a26b921d433f02b7c"; }; - buildInputs = + buildInputs = [ ncurses x11 texinfo libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft gconf libxml2 imagemagick gnutls alsaLib - ] + ] ++ stdenv.lib.optionals (gtk != null) [ gtk pkgconfig ] ++ stdenv.lib.optional stdenv.isLinux dbus; @@ -64,7 +64,7 @@ EOF separately. ''; - homepage = http://www.gnu.org/software/emacs/; + homepage = "http://www.gnu.org/software/emacs/"; license = "GPLv3+"; maintainers = with stdenv.lib.maintainers; [ ludo simons chaoflow ]; From 73ede3160beb7f61d71926ccf2b7900410ab1913 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Jun 2012 07:44:16 +0000 Subject: [PATCH 247/403] all-packages.nix: strip trailing whitespace svn path=/nixpkgs/trunk/; revision=34448 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b6f409a559c..7446dba14ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1093,7 +1093,7 @@ let ndisc6 = callPackage ../tools/networking/ndisc6 { }; net_snmp = callPackage ../tools/networking/net-snmp { }; - + netboot = callPackage ../tools/networking/netboot {}; netcat = callPackage ../tools/networking/netcat { }; From cc54e3e695f13e1cb69a25312ab2627665940223 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Jun 2012 08:21:32 +0000 Subject: [PATCH 248/403] all-packages.nix: removed recurseIntoAttrs from emacs24Packages Offering the names of those packages in "nix-env -qa *" is pointless because it's impossible to install any of those packages by name. Only packages from emacs23Packages can be installed by name. svn path=/nixpkgs/trunk/; revision=34449 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7446dba14ec..f0943edb94c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6625,7 +6625,7 @@ let emacs22Packages = emacsPackages emacs22 pkgs.emacs22Packages; emacs23Packages = recurseIntoAttrs (emacsPackages emacs23 pkgs.emacs23Packages); - emacs24Packages = recurseIntoAttrs (emacsPackages emacs24 pkgs.emacs24Packages); + emacs24Packages = emacsPackages emacs24 pkgs.emacs24Packages; epdfview = callPackage ../applications/misc/epdfview { }; From 22da1866a7d3050f6265c59b8ed6b8d6f4e7809c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 11 Jun 2012 09:31:43 +0000 Subject: [PATCH 249/403] Qt 4.8: Disable dependency on MESA when the platform doesn't support it. svn path=/nixpkgs/trunk/; revision=34450 --- pkgs/development/libraries/qt-4.x/4.8/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 99a80c2c406..f56886259a6 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -79,8 +79,12 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libXrender libXrandr libXinerama libXcursor libXext libXfixes - libXv libXi libSM mesa - ] ++ (stdenv.lib.optional (buildWebkit || buildMultimedia) alsaLib) + libXv libXi libSM + ] + ++ (stdenv.lib.optional (stdenv.lib.lists.elem stdenv.system + stdenv.lib.platforms.mesaPlatforms) + mesa) + ++ (stdenv.lib.optional (buildWebkit || buildMultimedia) alsaLib) ++ [ zlib libpng openssl dbus.libs freetype fontconfig glib ] ++ (stdenv.lib.optionals (buildWebkit || buildMultimedia) [ gstreamer gst_plugins_base ]); From a44af6bbc1286ac62f9c7e0db4c722bc0676f2f5 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Mon, 11 Jun 2012 10:28:21 +0000 Subject: [PATCH 250/403] powertop-2.0 svn path=/nixpkgs/trunk/; revision=34451 --- pkgs/os-specific/linux/powertop/default.nix | 19 ++++++------- .../linux/powertop/inotify_user.patch | 28 ------------------- .../linux/powertop/modprobe_configs.patch | 28 ------------------- .../linux/powertop/powertop-1.13.patch | 15 ---------- 4 files changed, 8 insertions(+), 82 deletions(-) delete mode 100644 pkgs/os-specific/linux/powertop/inotify_user.patch delete mode 100644 pkgs/os-specific/linux/powertop/modprobe_configs.patch delete mode 100644 pkgs/os-specific/linux/powertop/powertop-1.13.patch diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index 3d8ca36c3ed..d175c5f0478 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -1,17 +1,14 @@ -{stdenv, fetchurl, ncurses, gettext}: +{ stdenv, fetchurl, gettext, libnl1, ncurses, pciutils, pkgconfig, zlib }: -stdenv.mkDerivation { - name = "powertop-1.13"; +stdenv.mkDerivation rec { + name = "powertop-2.0"; src = fetchurl { - url = http://www.lesswatts.org/projects/powertop/download/powertop-1.13.tar.gz; - sha256 = "164dqp6msdaxpi2bmvwawasyrf1sfvanlc9ddp97v1wnjh46dj1b"; + url = "https://01.org/powertop/sites/default/files/downloads/${name}.tar.bz2"; + sha256 = "7af51d320856b3446bcc314c9414385f3b05b9360f650883b0210cd3b12c5c1c"; }; - patches = [ - ./powertop-1.13.patch - ./inotify_user.patch - ./modprobe_configs.patch - ]; - buildInputs = [ncurses gettext]; + + buildInputs = [ gettext libnl1 ncurses pciutils pkgconfig zlib ]; + meta = { description = "Analyze power consumption on Intel-based laptops"; license = "GPLv2"; diff --git a/pkgs/os-specific/linux/powertop/inotify_user.patch b/pkgs/os-specific/linux/powertop/inotify_user.patch deleted file mode 100644 index 46caed050f4..00000000000 --- a/pkgs/os-specific/linux/powertop/inotify_user.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 89e46f3270e3b6d704959c4d0f44ae6bab8f7616 Mon Sep 17 00:00:00 2001 -From: Florian Friesdorf -Date: Thu, 13 Oct 2011 10:14:34 +0200 -Subject: [PATCH] CONFIG_INOTIFY_USER instead of CONFIG_INOTIFY - -since 2.6.36 the former fully replaced the latter ---- - powertop.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/powertop.c b/powertop.c -index 74eb328..8df3652 100644 ---- a/powertop.c -+++ b/powertop.c -@@ -1191,8 +1191,8 @@ int main(int argc, char **argv) - suggest_kernel_config("CONFIG_CPU_FREQ_STAT", 1, - _("Suggestion: Enable the CONFIG_CPU_FREQ_STAT kernel configuration option.\n" - "This option allows PowerTOP to show P-state percentages \n" "P-states correspond to CPU frequencies."), 2); -- suggest_kernel_config("CONFIG_INOTIFY", 1, -- _("Suggestion: Enable the CONFIG_INOTIFY kernel configuration option.\n" -+ suggest_kernel_config("CONFIG_INOTIFY_USER", 1, -+ _("Suggestion: Enable the CONFIG_INOTIFY_USER kernel configuration option.\n" - "This option allows programs to wait for changes in files and directories\n" - "instead of having to poll for these changes"), 5); - --- -1.7.6 - diff --git a/pkgs/os-specific/linux/powertop/modprobe_configs.patch b/pkgs/os-specific/linux/powertop/modprobe_configs.patch deleted file mode 100644 index 3d6e2a28761..00000000000 --- a/pkgs/os-specific/linux/powertop/modprobe_configs.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0002a70b83221a8a831d776836d13105ac886323 Mon Sep 17 00:00:00 2001 -From: Florian Friesdorf -Date: Thu, 13 Oct 2011 14:57:02 +0200 -Subject: [PATCH] powertop tries to load configs, if /proc/config.gz is - missing - ---- - config.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/config.c b/config.c -index b2567f2..62ac978 100644 ---- a/config.c -+++ b/config.c -@@ -44,6 +44,10 @@ static void read_kernel_config(void) - char filename[100]; - if (configcount) - return; -+ if (access("/proc/config.gz", R_OK) != 0) { -+ file = popen("modprobe configs >/dev/null 2>&1", "r"); -+ pclose(file); -+ } - if (access("/proc/config.gz", R_OK) == 0) { - file = popen("zcat /proc/config.gz 2> /dev/null", "r"); - while (file && !feof(file)) { --- -1.7.6 - diff --git a/pkgs/os-specific/linux/powertop/powertop-1.13.patch b/pkgs/os-specific/linux/powertop/powertop-1.13.patch deleted file mode 100644 index cf66b297190..00000000000 --- a/pkgs/os-specific/linux/powertop/powertop-1.13.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ru powertop-1.13/Makefile powertop-1.13.new/Makefile ---- powertop-1.13/Makefile -+++ powertop-1.13.new/Makefile -@@ -1,8 +1,8 @@ - VERSION = 1.13 - --BINDIR=/usr/bin --LOCALESDIR=/usr/share/locale --MANDIR=/usr/share/man/man8 -+BINDIR=${out}/bin -+LOCALESDIR=${out}/share/locale -+MANDIR=${out}/share/man/man8 - WARNFLAGS=-Wall -Wshadow -W -Wformat -Wimplicit-function-declaration -Wimplicit-int - CFLAGS?=-Os -g ${WARNFLAGS} - CC?=gcc From 3133b579402f23a347e4c9aa39e6d31a9b1f1418 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Mon, 11 Jun 2012 10:28:25 +0000 Subject: [PATCH 251/403] leptonica-1.68 needs older libpng12 no newer leptonica release available svn path=/nixpkgs/trunk/; revision=34452 --- pkgs/development/libraries/leptonica/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix index e5229961b80..232f2775c00 100644 --- a/pkgs/development/libraries/leptonica/default.nix +++ b/pkgs/development/libraries/leptonica/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libpng, libtiff, libjpeg, zlib}: +{stdenv, fetchurl, libpng12, libtiff, libjpeg, zlib}: stdenv.mkDerivation { name = "leptonica-1.68"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "13qzm24zy46bj9b476jxzbw9qh7p96jikfzxg88kz4dj1p2vdvxc"; }; - buildInputs = [ libpng libtiff libjpeg zlib ]; + buildInputs = [ libpng12 libtiff libjpeg zlib ]; meta = { description = "Image processing and analysis library"; From 892947cd93b985531fca01e076b799592b6440de Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Mon, 11 Jun 2012 10:28:28 +0000 Subject: [PATCH 252/403] tesseract-3.0.1 svn path=/nixpkgs/trunk/; revision=34453 --- .../applications/graphics/tesseract/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/tesseract/default.nix b/pkgs/applications/graphics/tesseract/default.nix index 07a160a2e48..da38cce1442 100644 --- a/pkgs/applications/graphics/tesseract/default.nix +++ b/pkgs/applications/graphics/tesseract/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libtiff }: +{ stdenv, fetchurl, autoconf, automake, libtool, leptonica, libpng, libtiff }: let f = lang : sha256 : let @@ -18,14 +18,21 @@ let in stdenv.mkDerivation { - name = "tesseract-3.0.0"; + name = "tesseract-3.0.1"; src = fetchurl { - url = http://tesseract-ocr.googlecode.com/files/tesseract-3.00.tar.gz; - sha256 = "111r9hy1rcs2ch4kdi9dkzwch3xg38vv379sf3cjpkswkigx8clw"; + url = http://tesseract-ocr.googlecode.com/files/tesseract-3.01.tar.gz; + sha256 = "c24b0bd278291bc93ab242f93841c1d8743689c943bd804afbc5b898dc0a1c9b"; }; - buildInputs = [ libtiff ]; + buildInputs = [ autoconf automake libtool leptonica libpng libtiff ]; + + preConfigure = '' + ./autogen.sh + substituteInPlace "configure" \ + --replace 'LIBLEPT_HEADERSDIR="/usr/local/include /usr/include"' \ + 'LIBLEPT_HEADERSDIR=${leptonica}/include' + ''; postInstall = extraLanguages; From 6054beaee784f627c229832cab4bf80dd5df70fd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Jun 2012 10:40:10 +0000 Subject: [PATCH 253/403] haskell-Agda: patched to support modern versions of mtl Committed on behalf of Karn Kallio. svn path=/nixpkgs/trunk/; revision=34454 --- pkgs/development/libraries/haskell/Agda/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/haskell/Agda/default.nix b/pkgs/development/libraries/haskell/Agda/default.nix index 1aa4d4f8423..c72177e2108 100644 --- a/pkgs/development/libraries/haskell/Agda/default.nix +++ b/pkgs/development/libraries/haskell/Agda/default.nix @@ -13,6 +13,9 @@ cabal.mkDerivation (self: { QuickCheck syb xhtml zlib ]; buildTools = [ alex happy ]; + patchPhase = '' + sed -i -e 's|mtl == 2.0.\*|mtl|' Agda.cabal + ''; meta = { homepage = "http://wiki.portal.chalmers.se/agda/"; description = "A dependently typed functional programming language and proof assistant"; From a89d66337c07ce7faae09cff59662241e211572d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Jun 2012 14:55:52 +0000 Subject: [PATCH 254/403] haskell-packages.nix: updated default 'cgi' reference to the latest version svn path=/nixpkgs/trunk/; revision=34456 --- pkgs/top-level/haskell-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index fc6c42f2d8f..ee99cd24504 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -515,7 +515,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cgi_3001_1_7_3 = callPackage ../development/libraries/haskell/cgi/3001.1.7.3.nix {}; cgi_3001_1_7_4 = callPackage ../development/libraries/haskell/cgi/3001.1.7.4.nix {}; cgi_3001_1_8_2 = callPackage ../development/libraries/haskell/cgi/3001.1.8.2.nix {}; - cgi = self.cgi_3001_1_7_1; + cgi = self.cgi_3001_1_8_2; Chart = callPackage ../development/libraries/haskell/Chart {}; From edb10988b35042873a9d45f7492fc773696f4c3b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Jun 2012 14:55:56 +0000 Subject: [PATCH 255/403] xmonad: fixed build with GHC 7.4.1 svn path=/nixpkgs/trunk/; revision=34457 --- .../window-managers/xmonad/xmonad-extras.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix index ac0be1e70c4..5e38b6e34bb 100644 --- a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix +++ b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix @@ -1,5 +1,5 @@ -{ cabal, hint, HList, libmpd, mtl, network, parsec, random -, regexPosix, split, X11, xmonad, xmonadContrib +{ cabal, hint, libmpd, mtl, network, parsec, random, regexPosix +, split, X11, xmonad, xmonadContrib }: cabal.mkDerivation (self: { @@ -7,9 +7,10 @@ cabal.mkDerivation (self: { version = "0.10.1"; sha256 = "17rac0xjw1zw1jlc1rpq54vg50xscb3b98knk4gkb8bv1khpgz27"; buildDepends = [ - hint HList libmpd mtl network parsec random regexPosix split X11 - xmonad xmonadContrib + hint libmpd mtl network parsec random regexPosix split X11 xmonad + xmonadContrib ]; + configureFlags = "-f-with_hlist"; meta = { homepage = "http://projects.haskell.org/xmonad-extras"; description = "Third party extensions for xmonad with wacky dependencies"; From 1c9727a81c37ea080bfb0cd68a1ca4eb7e997af6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Jun 2012 15:04:44 +0000 Subject: [PATCH 256/403] haskell-defaults.nix: explicitly set mtl version in Haskell Platform 2009.2.0.2 to fix builds with GHC 6.10.4 svn path=/nixpkgs/trunk/; revision=34458 --- pkgs/top-level/haskell-defaults.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 9ff9c91aacc..fb82245344c 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -83,6 +83,7 @@ ghc6104Prefs = self : self.haskellPlatformArgs_2009_2_0_2 self // { haskellPlatform = self.haskellPlatform_2009_2_0_2; + mtl = self.mtl_1_1_0_2; mtl1 = self.mtl_1_1_0_2; extensibleExceptions = self.extensibleExceptions_0_1_1_0; text = self.text_0_11_0_6; From f723b4dcb49e62778b31dc710745a2bc5c766291 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Jun 2012 15:07:33 +0000 Subject: [PATCH 257/403] haskell-defaults.nix: added empty 'haskellPlatform' attribute to ghcHEADPrefs Writing generic expressions is easier if this attribute always exists. svn path=/nixpkgs/trunk/; revision=34459 --- pkgs/top-level/haskell-defaults.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index fb82245344c..f566270d3df 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -17,6 +17,7 @@ ghcHEADPrefs = self : self.haskellPlatformArgs_future self // { + haskellPlatform = null; binary = null; # now a core package }; From 09321105f1ecd4f4ac41ff890390dfc7c0e12a21 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Jun 2012 16:25:45 +0000 Subject: [PATCH 258/403] ghc: added version 7.4.2 svn path=/nixpkgs/trunk/; revision=34460 --- pkgs/development/compilers/ghc/7.4.2.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ghc/7.4.2.nix b/pkgs/development/compilers/ghc/7.4.2.nix index 660f316e120..ea44e49cca3 100644 --- a/pkgs/development/compilers/ghc/7.4.2.nix +++ b/pkgs/development/compilers/ghc/7.4.2.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ghc, perl, gmp, ncurses }: stdenv.mkDerivation rec { - version = "7.4.1.20120508"; + version = "7.4.2"; name = "ghc-${version}"; src = fetchurl { - url = "http://haskell.org/ghc/dist/7.4.2-rc1/${name}-src.tar.bz2"; - sha256 = "0i55003p6ns5vzx8dpni5jv45kxwjqqgspf76505l2vcilra8j2c"; + url = "http://haskell.org/ghc/dist/7.4.2/${name}-src.tar.bz2"; + sha256 = "0vc3zmxqi4gflssmj35n5c8idbvyrhd88abi50whbirwlf4i5vpj"; }; buildInputs = [ ghc perl gmp ncurses ]; From e0f5d8870ec0c7b94231db051f50c196a0b4d665 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Jun 2012 16:41:31 +0000 Subject: [PATCH 259/403] Updated Emacs default version from 23.3 to 24.1. Yay! svn path=/nixpkgs/trunk/; revision=34461 --- pkgs/top-level/all-packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f0943edb94c..27d4cff6d44 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6501,7 +6501,7 @@ let elvis = callPackage ../applications/editors/elvis { }; - emacs = emacs23; + emacs = emacs24; emacs22 = callPackage ../applications/editors/emacs-22 { stdenv = @@ -6542,7 +6542,7 @@ let librsvg = null /* if stdenv.isDarwin then null else librsvg */; }; - emacs24 = lowPrio (callPackage ../applications/editors/emacs-24 { + emacs24 = callPackage ../applications/editors/emacs-24 { # use override to select the appropriate gui toolkit libXaw = if stdenv.isDarwin then xlibs.libXaw else null; Xaw3d = null; @@ -6553,7 +6553,7 @@ let # alsa only on linux alsaLib = if stdenv.isLinux then alsaLib else null; imagemagick = imagemagickBig; - }); + }; emacsPackages = emacs: self: let callPackage = newScope self; in rec { inherit emacs; @@ -6624,8 +6624,8 @@ let }; emacs22Packages = emacsPackages emacs22 pkgs.emacs22Packages; - emacs23Packages = recurseIntoAttrs (emacsPackages emacs23 pkgs.emacs23Packages); - emacs24Packages = emacsPackages emacs24 pkgs.emacs24Packages; + emacs23Packages = emacsPackages emacs23 pkgs.emacs23Packages; + emacs24Packages = recurseIntoAttrs (emacsPackages emacs24 pkgs.emacs24Packages); epdfview = callPackage ../applications/misc/epdfview { }; @@ -8296,7 +8296,7 @@ let isabelle = import ../applications/science/logic/isabelle { inherit (pkgs) stdenv fetchurl nettools perl polyml; - inherit (pkgs.emacs23Packages) proofgeneral; + inherit (pkgs.emacs24Packages) proofgeneral; }; iprover = callPackage ../applications/science/logic/iprover {}; From d63bcce03827d329ff514f529623ab235660e553 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 11 Jun 2012 16:45:54 +0000 Subject: [PATCH 260/403] * Added pam_ssh_agent_auth, a PAM module for authentication through the SSH agent. svn path=/nixpkgs/trunk/; revision=34462 --- .../linux/pam_ssh_agent_auth/default.nix | 17 +++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix diff --git a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix new file mode 100644 index 00000000000..34600870671 --- /dev/null +++ b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl, pam, openssl, perl }: + +stdenv.mkDerivation rec { + name = "pam_ssh_agent_auth-0.9.3"; + + src = fetchurl { + url = "mirror://sourceforge/pamsshagentauth/${name}.tar.bz2"; + sha256 = "19p5mzplnr9g9vlp16nipf5rjw4v8zncvimarwgix958yml7j08h"; + }; + + buildInputs = [ pam openssl perl ]; + + meta = { + homepage = http://pamsshagentauth.sourceforge.net/; + description = "PAM module for authentication through the SSH agent"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27d4cff6d44..d4340fa3f6f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5912,6 +5912,8 @@ let pam_login = callPackage ../os-specific/linux/pam_login { }; + pam_ssh_agent_auth = callPackage ../os-specific/linux/pam_ssh_agent_auth { }; + pam_unix2 = callPackage ../os-specific/linux/pam_unix2 { }; pam_usb = callPackage ../os-specific/linux/pam_usb { }; From ac3df043d635333d59662e553d659199f6cb25dd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Jun 2012 17:15:52 +0000 Subject: [PATCH 261/403] haskell-happstack-data: obsolete package removed svn path=/nixpkgs/trunk/; revision=34463 --- .../haskell/happstack/happstack-data.nix | 24 ------------------- pkgs/top-level/haskell-packages.nix | 2 -- 2 files changed, 26 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/happstack/happstack-data.nix diff --git a/pkgs/development/libraries/haskell/happstack/happstack-data.nix b/pkgs/development/libraries/haskell/happstack/happstack-data.nix deleted file mode 100644 index aa540e98bd5..00000000000 --- a/pkgs/development/libraries/haskell/happstack/happstack-data.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ cabal, binary, mtl, syb, sybWithClass, sybWithClassInstancesText -, text, time -}: - -cabal.mkDerivation (self: { - pname = "happstack-data"; - version = "6.0.1"; - sha256 = "0v2ln4mdnild72p02mzjn8mn5srvjixsjqjgkdqzshvxjnnm95l8"; - isLibrary = true; - isExecutable = true; - buildDepends = [ - binary mtl syb sybWithClass sybWithClassInstancesText text time - ]; - patchPhase = '' - sed -i -e 's|mtl >= 1.1 && < 2.1|mtl|' happstack-data.cabal - ''; - meta = { - homepage = "http://happstack.com"; - description = "Happstack data manipulation libraries"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ee99cd24504..0dc174cef48 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -770,8 +770,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hamlet = callPackage ../development/libraries/haskell/hamlet {}; - happstackData = callPackage ../development/libraries/haskell/happstack/happstack-data.nix {}; - happstackUtil = callPackage ../development/libraries/haskell/happstack/happstack-util.nix {}; happstackServer = callPackage ../development/libraries/haskell/happstack/happstack-server.nix {}; From b40092010cc18d305357e08b227cf981163d5e97 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 11 Jun 2012 17:40:55 +0000 Subject: [PATCH 262/403] mkvtoolnix: upgraded to 5.6.0 svn path=/nixpkgs/trunk/; revision=34465 --- pkgs/applications/video/mkvtoolnix/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 7355266b934..812826d7ec2 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -11,17 +11,19 @@ , zlib , ruby , gettext +, pkgconfig +, curl }: stdenv.mkDerivation rec { - name = "mkvtoolnix-4.4.0"; + name = "mkvtoolnix-5.6.0"; src = fetchurl { url = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${name}.tar.bz2"; - sha256 = "0apgmah1d4dh5x1phr4n5vgwmy0w1nym9pydzh4kdgcs167l8n6l"; + sha256 = "1hzwf4zaamny3qzmd6hyhy4hy9l67s3fjvznbi0avw0ad7g05i89"; }; - buildInputs = [ libmatroska flac libvorbis file boost lzo xdg_utils expat wxGTK zlib ruby gettext ]; + buildInputs = [ libmatroska flac libvorbis file boost lzo xdg_utils expat wxGTK zlib ruby gettext pkgconfig curl ]; configureFlags = "--with-boost-libdir=${boost}/lib"; buildPhase = '' From e19cc94e1a941038dcae6e7525b82b17af3a545a Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 11 Jun 2012 17:40:58 +0000 Subject: [PATCH 263/403] added vobcopy: nice CLI dvd ripper svn path=/nixpkgs/trunk/; revision=34466 --- pkgs/tools/cd-dvd/vobcopy/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/cd-dvd/vobcopy/default.nix diff --git a/pkgs/tools/cd-dvd/vobcopy/default.nix b/pkgs/tools/cd-dvd/vobcopy/default.nix new file mode 100644 index 00000000000..fd0f131b8c2 --- /dev/null +++ b/pkgs/tools/cd-dvd/vobcopy/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, libdvdread, libdvdcss }: + +stdenv.mkDerivation rec { + name = "vobcopy-1.2.0"; + + src = fetchurl { + url = "http://www.vobcopy.org/download/${name}.tar.bz2"; + sha256 = "01l1yihbd73srzghzzx5dgfg3yfb5kml5dix52mq0snhjp8h89c9"; + }; + + buildInputs = [libdvdread libdvdcss]; + makeFlags = "DESTDIR=$(out) PREFIX=/"; + + meta = { + description = "Copies DVD .vob files to harddisk, decrypting them on the way"; + homepage = http://vobcopy.org/projects/c/c.shtml; + license = "GPLv2"; + + maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d4340fa3f6f..0f25808a968 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1521,6 +1521,8 @@ let libXp; }; + vobcopy = callPackage ../tools/cd-dvd/vobcopy { }; + vorbisgain = callPackage ../tools/misc/vorbisgain { }; vpnc = callPackage ../tools/networking/vpnc { }; From 25b199771dbe94f53f8b7b3fe0549f59ae5b7c8e Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 11 Jun 2012 17:41:03 +0000 Subject: [PATCH 264/403] google-talk-plugin: upgraded to 2.9.10.0 svn path=/nixpkgs/trunk/; revision=34467 --- .../browsers/mozilla-plugins/google-talk-plugin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index 01f4fb901fd..8a2ef6fe0a1 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -40,18 +40,18 @@ let in stdenv.mkDerivation { - name = "google-talk-plugin-2.8.5.0"; + name = "google-talk-plugin-2.9.10.0"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "http://dl.google.com/linux/direct/google-talkplugin_current_x86_64.rpm"; - sha256 = "15909wnhspjci0fspvh5j87v1xl7dfix36zrpvk6fpc3m0vys0nh"; + sha256 = "1dma067h7qj8rbcnm0n7wy3wd1clkysq9xj4kaxijbb5zrw06k3q"; } else if stdenv.system == "i686-linux" then fetchurl { url = "http://dl.google.com/linux/direct/google-talkplugin_current_i386.rpm"; - sha256 = "0sclsj6mcaynkw28kipgmcj6sx5vbyrz1rwwyx89ll48n46k65ya"; + sha256 = "02ymhhbfby0sn9132cvdr6jp9c7sk6hfg0jwg1fc3kzjg7q3y7fs"; } else throw "Google Talk does not support your platform."; From 46beccef20a8aaa23c2c1ebb3a099e23186aaf65 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 11 Jun 2012 17:41:05 +0000 Subject: [PATCH 265/403] linux kernel aufs (needed for livecd): added to 3.4 upgraded 3.3 version to stable svn path=/nixpkgs/trunk/; revision=34468 --- pkgs/os-specific/linux/kernel/patches.nix | 24 ++++++++++++++++++----- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index df153d01548..7aefc7c5c0f 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -267,14 +267,28 @@ rec { }; aufs3_3 = rec { - name = "aufs3.x-rcN-20120312"; + name = "aufs3.3"; version = "3.3"; - utilRev = "8f8b22d8b29c8f7ccc10b212f2deec8848c020a1"; - utilHash = "0a54efeeb17d5d7542ebee3f10bb4b82364a600858893e34c0e4221e4307ccd0"; + utilRev = "91af15f977d12e02165759620005f6ce1a4d7602"; + utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996"; patch = makeAufs3StandalonePatch { inherit version; - rev = "187f3c592873b1d30efd2c9b5073aa7fe728620b"; - sha256 = "d22b75165cbc8cb0417c114a9f3e3306bb9288b3557f57a1d20481e8cd339b8f"; + rev = "91c3d8c80172db05575ee82c931f3541947a6aff"; + sha256 = "8fe54993b6a7a290649c193aab5a4f7f2dcecaedb5422d951f898d03753b83fb"; + }; + features.aufsBase = true; + features.aufs3 = true; + }; + + aufs3_4 = rec { + name = "aufs3.4"; + version = "3.4"; + utilRev = "91af15f977d12e02165759620005f6ce1a4d7602"; + utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996"; + patch = makeAufs3StandalonePatch { + inherit version; + rev = "a5f7df8e59d57d6d9d749d49adc7e5a37ce2e342"; + sha256 = "20a8f113bb654f92231726de8177eb51d7be1b900fd42c2b5f48726a7d5d3ce6"; }; features.aufsBase = true; features.aufs3 = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f25808a968..c4e79ef1df9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5682,6 +5682,7 @@ let kernelPatches = [ #kernelPatches.fbcondecor_2_6_38 kernelPatches.sec_perm_2_6_24 + kernelPatches.aufs3_4 ]; }; From 3d4ab75229d8b83c6e05733f6aaba597b9de3b7e Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 11 Jun 2012 17:41:11 +0000 Subject: [PATCH 266/403] linux kernel headers: copy generated headers as well as they are referenced from other kernel headers, this seems like the best thing to do. Ubuntu seems to do so too. Fixes issues with nvidia's binary driver and bbswitch on kernels > 3.3 svn path=/nixpkgs/trunk/; revision=34469 --- pkgs/os-specific/linux/kernel/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/builder.sh b/pkgs/os-specific/linux/kernel/builder.sh index 5d6d48d2fc3..4c095bf8bbc 100644 --- a/pkgs/os-specific/linux/kernel/builder.sh +++ b/pkgs/os-specific/linux/kernel/builder.sh @@ -138,6 +138,7 @@ installPhase() { (cd include && cp -a * $includeDir) (cd arch/$archDir/include && cp -a * $includeDir || true) (cd arch/$archDir/include && cp -a asm/* $includeDir/asm/ || true) + (cd arch/$archDir/include && cp -a generated/asm/* $includeDir/asm/ || true) (cd arch/$archDir/include/asm/mach-generic && cp -a * $includeDir/ || true) fi fi From 51ec873c8dae8e5bbb040954cf9422c64769d36e Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 11 Jun 2012 17:41:14 +0000 Subject: [PATCH 267/403] mongodb: upgraded to 2.0.6 svn path=/nixpkgs/trunk/; revision=34470 --- pkgs/servers/nosql/mongodb/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index 85b949ef12c..685aeb05ce7 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -2,12 +2,14 @@ assert useV8 -> v8 != null; +with stdenv.lib; + stdenv.mkDerivation rec { - name = "mongodb-2.0.5"; + name = "mongodb-2.0.6"; src = fetchurl { - url = "http://downloads.mongodb.org/src/mongodb-src-r2.0.5.tar.gz"; - sha256 = "0vnwphjn0iqgjrvfk18vridx5324zmmbrapp2d9rbqc9xg6jrpav"; + url = "http://downloads.mongodb.org/src/mongodb-src-r2.0.6.tar.gz"; + sha256 = "0kiiz8crx318sdn0wd9d88pzx9s1c6ak2dhd0zw7kl63gmd74wm9"; }; buildInputs = [scons which boost] ++ stdenv.lib.optional useV8 v8; @@ -22,11 +24,13 @@ stdenv.mkDerivation rec { buildPhase = '' export TERM="" - scons all --cc=`which gcc` --cxx=`which g++` --libpath=${boost}/lib --cpppath=${boost}/include ${if useV8 then "--usev8" else ""} + scons all --cc=`which gcc` --cxx=`which g++` --libpath=${boost}/lib --cpppath=${boost}/include \ + ${optionalString useV8 "--usev8"} ''; installPhase = '' - scons install --cc=`which gcc` --cxx=`which g++` --libpath=${boost}/lib --cpppath=${boost}/include --full --prefix=$out + scons install --cc=`which gcc` --cxx=`which g++` --libpath=${boost}/lib --cpppath=${boost}/include \ + ${optionalString useV8 "--usev8"} --full --prefix=$out if [ -d $out/lib64 ]; then mv $out/lib64 $out/lib fi From c0efa356fc7920db6995d2e8b2e1ffd94ab465af Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 11 Jun 2012 18:58:28 +0000 Subject: [PATCH 268/403] uhc: fixed building on ghc 7.2.1+ by removing the check for the 'binary' package, which is built-in from that version onward. This is a workaround for the problem where ghc's built-in libraries (like containers, array, binary) don't show up in "ghc-pkg list" output. svn path=/nixpkgs/trunk/; revision=34471 --- pkgs/development/compilers/uhc/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix index 8aa27674677..2c812e8842b 100644 --- a/pkgs/development/compilers/uhc/default.nix +++ b/pkgs/development/compilers/uhc/default.nix @@ -2,7 +2,11 @@ , uuagc, mtl, network, binary, llvm, fgl, syb }: -stdenv.mkDerivation { +# this check won't be needed anymore after ghc-wrapper is fixed +# to show ghc-builtin packages in "ghc-pkg list" output. +let binaryIsBuiltIn = builtins.compareVersions "7.2.1" ghc.ghcVersion != 1; + +in stdenv.mkDerivation { name = "uhc-svn-git20120502"; src = fetchgit { @@ -30,6 +34,8 @@ stdenv.mkDerivation { sed -i "s|-fglasgow-exts|-fglasgow-exts -package-conf=$p|g" mk/shared.mk.in sed -i "s|/bin/date|${coreutils}/bin/date|g" mk/dist.mk sed -i "s|/bin/date|${coreutils}/bin/date|g" mk/config.mk.in + '' + stdenv.lib.optionalString binaryIsBuiltIn '' + sed -i "s|ghcLibBinary=no|ghcLibBinaryExists=yes|" configure ''; meta = { From fece483f5ee8c3f10e8005da089deb668170e1d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 11 Jun 2012 20:24:55 +0000 Subject: [PATCH 269/403] Updating vimprobable2. svn path=/nixpkgs/trunk/; revision=34472 --- .../networking/browsers/vimprobable2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix index 071dcd37117..2402d2a902b 100644 --- a/pkgs/applications/networking/browsers/vimprobable2/default.nix +++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix @@ -2,10 +2,10 @@ pkgconfig, webkit }: stdenv.mkDerivation { - name = "vimprobable2-1.0.0"; + name = "vimprobable2-1.0.2"; src = fetchurl { - url = "mirror://sourceforge/vimprobable/vimprobable2_1.0.0.tar.bz2"; - sha256 = "1jlx8ssgk42vg1d70n0aa86lr5zixdkkagmcxjc4c7pjvh8vq3gn"; + url = "mirror://sourceforge/vimprobable/vimprobable2_1.0.2.tar.bz2"; + sha256 = "19gwlfv0lczbns73xg3637q7ixly62y3ijccnv0m1bqaqxjl4v8x"; }; buildInputs = [ makeWrapper gtk libsoup libX11 perl pkgconfig webkit ]; installPhase = '' From 7a626565dfc5c11363950e2fe6d617654dde1ae5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 12 Jun 2012 08:39:32 +0000 Subject: [PATCH 270/403] Updated Haskell packages. - parsec: added version 3.1.3 - xmonad-extras: updated to version 0.10.1.1 svn path=/nixpkgs/trunk/; revision=34475 --- .../window-managers/xmonad/xmonad-extras.nix | 4 +- .../libraries/haskell/parsec/3.1.3.nix | 15 +++++ pkgs/top-level/haskell-packages.nix | 57 ++++++++++--------- 3 files changed, 46 insertions(+), 30 deletions(-) create mode 100644 pkgs/development/libraries/haskell/parsec/3.1.3.nix diff --git a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix index 5e38b6e34bb..42ffeae6f9c 100644 --- a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix +++ b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "xmonad-extras"; - version = "0.10.1"; - sha256 = "17rac0xjw1zw1jlc1rpq54vg50xscb3b98knk4gkb8bv1khpgz27"; + version = "0.10.1.1"; + sha256 = "1pkp9z58w2x8yhxhvm5nifxb1qcajv52ji53n77rjhpysvrgq5m7"; buildDepends = [ hint libmpd mtl network parsec random regexPosix split X11 xmonad xmonadContrib diff --git a/pkgs/development/libraries/haskell/parsec/3.1.3.nix b/pkgs/development/libraries/haskell/parsec/3.1.3.nix new file mode 100644 index 00000000000..b9b10f2e5b0 --- /dev/null +++ b/pkgs/development/libraries/haskell/parsec/3.1.3.nix @@ -0,0 +1,15 @@ +{ cabal, mtl, text }: + +cabal.mkDerivation (self: { + pname = "parsec"; + version = "3.1.3"; + sha256 = "1a64gzirgpa1i78gbbp9z059nh29xmcja4g8vgjb1fbylx6vn54z"; + buildDepends = [ mtl text ]; + meta = { + homepage = "http://www.cs.uu.nl/~daan/parsec.html"; + description = "Monadic parser combinators"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 0dc174cef48..ad3a4f4a484 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -120,33 +120,33 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellPlatformArgs_future = self : { inherit (self) cabal ghc; - cgi = self.cgi_3001_1_7_4; # 7.4.1 ok - fgl = self.fgl_5_4_2_4; # 7.4.1 ok - GLUT = self.GLUT_2_1_2_1; # 7.4.1 ok - haskellSrc = self.haskellSrc_1_0_1_5; # 7.4.1 ok - html = self.html_1_0_1_2; # 7.4.1 ok - HTTP = self.HTTP_4000_2_3; # 7.4.1 ok - HUnit = self.HUnit_1_2_4_2; # 7.4.1 ok - mtl = self.mtl_2_1_1; # 7.4.1 ok - network = self.network_2_3_0_14; # 7.4.1 ok - OpenGL = self.OpenGL_2_2_3_1; # 7.4.1 ok - parallel = self.parallel_3_2_0_2; # 7.4.1 ok - parsec = self.parsec_3_1_2; # 7.4.1 ok - QuickCheck = self.QuickCheck_2_4_2; # 7.4.1 ok - random = self.random_1_0_1_1; # 7.4.1 ok - regexBase = self.regexBase_0_93_2; # 7.4.1 ok - regexCompat = self.regexCompat_0_95_1; # 7.4.1 ok - regexPosix = self.regexPosix_0_95_1; # 7.4.1 ok - stm = self.stm_2_3; # 7.4.1 ok - syb = self.syb_0_3_6_1; # 7.4.1 ok - text = self.text_0_11_2_0; # 7.4.1 ok - transformers = self.transformers_0_3_0_0; # 7.4.1 ok - xhtml = self.xhtml_3000_2_1; # 7.4.1 ok - zlib = self.zlib_0_5_3_3; # 7.4.1 ok - cabalInstall = self.cabalInstall_0_14_0; # 7.4.1 ok - alex = self.alex_3_0_1; # 7.4.1 ok - haddock = self.haddock_2_10_0; # 7.4.1 ok - happy = self.happy_1_18_9; # 7.4.1 ok + cgi = self.cgi_3001_1_7_4; # 7.4.2 ok + fgl = self.fgl_5_4_2_4; # 7.4.2 ok + GLUT = self.GLUT_2_1_2_1; # 7.4.2 ok + haskellSrc = self.haskellSrc_1_0_1_5; # 7.4.2 ok + html = self.html_1_0_1_2; # 7.4.2 ok + HTTP = self.HTTP_4000_2_3; # 7.4.2 ok + HUnit = self.HUnit_1_2_4_2; # 7.4.2 ok + mtl = self.mtl_2_1_1; # 7.4.2 ok + network = self.network_2_3_0_14; # 7.4.2 ok + OpenGL = self.OpenGL_2_2_3_1; # 7.4.2 ok + parallel = self.parallel_3_2_0_2; # 7.4.2 ok + parsec = self.parsec_3_1_3; # 7.4.2 ok + QuickCheck = self.QuickCheck_2_4_2; # 7.4.2 ok + random = self.random_1_0_1_1; # 7.4.2 ok + regexBase = self.regexBase_0_93_2; # 7.4.2 ok + regexCompat = self.regexCompat_0_95_1; # 7.4.2 ok + regexPosix = self.regexPosix_0_95_1; # 7.4.2 ok + stm = self.stm_2_3; # 7.4.2 ok + syb = self.syb_0_3_6_1; # 7.4.2 ok + text = self.text_0_11_2_0; # 7.4.2 ok + transformers = self.transformers_0_3_0_0; # 7.4.2 ok + xhtml = self.xhtml_3000_2_1; # 7.4.2 ok + zlib = self.zlib_0_5_3_3; # 7.4.2 ok + cabalInstall = self.cabalInstall_0_14_0; # 7.4.2 ok + alex = self.alex_3_0_1; # 7.4.2 ok + haddock = self.haddock_2_10_0; # 7.4.2 ok + happy = self.happy_1_18_9; # 7.4.2 ok }; @@ -1105,8 +1105,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); parsec_2_1_0_1 = callPackage ../development/libraries/haskell/parsec/2.1.0.1.nix {}; parsec_3_1_1 = callPackage ../development/libraries/haskell/parsec/3.1.1.nix {}; parsec_3_1_2 = callPackage ../development/libraries/haskell/parsec/3.1.2.nix {}; + parsec_3_1_3 = callPackage ../development/libraries/haskell/parsec/3.1.3.nix {}; parsec2 = self.parsec_2_1_0_1; - parsec3 = self.parsec_3_1_2; + parsec3 = self.parsec_3_1_3; parsec = self.parsec3; parsimony = callPackage ../development/libraries/haskell/parsimony {}; From d2d77e702e0d7d07c126a2f75ceec4bcec6a8d06 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 12 Jun 2012 08:42:55 +0000 Subject: [PATCH 271/403] haskell-cabal2nix: updated to version 1.34 svn path=/nixpkgs/trunk/; revision=34476 --- pkgs/development/tools/haskell/cabal2nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index bf647013e5a..082683af243 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.33"; - sha256 = "0fqbrl6ih0ngj15pfydhaffm3wlq5584z0sv308gkff13hplci2k"; + version = "1.34"; + sha256 = "0iz9a91hp6frrkshjhyi3sacqlb547bjs2mqlzfjxiyhkfb3mc40"; isLibrary = false; isExecutable = true; buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ]; From 6ace4728f531b9e67b310817219182ca84945c5b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 12 Jun 2012 12:18:12 +0000 Subject: [PATCH 272/403] emacs-24: improved meta.description svn path=/nixpkgs/trunk/; revision=34477 --- pkgs/applications/editors/emacs-24/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index cdd92d78bb3..388972abd01 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -45,7 +45,7 @@ EOF doCheck = true; meta = { - description = "PRETEST: GNU Emacs 24.x, the extensible, customizable text editor"; + description = "GNU Emacs 24, the extensible, customizable text editor"; longDescription = '' GNU Emacs is an extensible, customizable text editor—and more. At its From 4c868ec33087b98564cbdb7f2112d414ffd6bdf3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 12 Jun 2012 17:39:59 +0000 Subject: [PATCH 273/403] * PHP updated to 5.3.13. svn path=/nixpkgs/trunk/; revision=34480 --- pkgs/development/interpreters/php/5.3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix index af550c6bc6c..d071070f9a6 100644 --- a/pkgs/development/interpreters/php/5.3.nix +++ b/pkgs/development/interpreters/php/5.3.nix @@ -8,7 +8,7 @@ in composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { - version = "5.3.10"; + version = "5.3.13"; name = "php-${version}"; @@ -157,7 +157,7 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { src = args.fetchurl { url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror"; - sha256 = "0jilzwscbcjzabzb7s2jnkcq2pjlya9a4z98gmck8r9q5fpmg49k"; + sha256 = "16yr678bgks6hlhmmmi5s9ivhcx1f1bhvxkk3zrlkr3bn4sp46pg"; name = "php-${version}.tar.bz2"; }; From ebd5ec8296eb59604ccddc4fb0f1b0486529bb28 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 12 Jun 2012 20:11:31 +0000 Subject: [PATCH 274/403] * Delete bad directory. svn path=/nixpkgs/trunk/; revision=34481 --- tools/backup/obnam/default.nix | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 tools/backup/obnam/default.nix diff --git a/tools/backup/obnam/default.nix b/tools/backup/obnam/default.nix deleted file mode 100644 index e69de29bb2d..00000000000 From c7fb96a6840ad0e9d007fbb7dc9ba6b72cedbf58 Mon Sep 17 00:00:00 2001 From: karltk Date: Tue, 12 Jun 2012 20:16:04 +0000 Subject: [PATCH 275/403] * Added coilmq and dependencies; distribute and stompclient. svn path=/nixpkgs/trunk/; revision=34482 --- pkgs/top-level/python-packages.nix | 65 ++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 12a98ff6b78..6e6a9b00534 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -347,6 +347,26 @@ let pythonPackages = python.modules // rec { }; }); + coilmq = buildPythonPackage (rec { + name = "coilmq-0.6.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/C/CoilMQ/CoilMQ-0.6.1.tar.gz"; + md5 = "5f39727415b837abd02651eeb2721749"; + }; + + propagatedBuildInputs = [ stompclient distribute ]; + + doCheck = false; + + meta = { + description = "Simple, lightweight, and easily extensible STOMP message broker"; + homepage = http://code.google.com/p/coilmq/; + license = pkgs.lib.licenses.asl20; + platforms = python.meta.platforms; + }; + }); + configobj = buildPythonPackage (rec { name = "configobj-4.7.2"; @@ -445,6 +465,32 @@ let pythonPackages = python.modules // rec { }; }; + distribute = buildPythonPackage (rec { + name = "distribute-0.6.26"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/d/distribute/distribute-0.6.26.tar.gz"; + md5 = "841f4262a70107f85260362f5def8206"; #"ecd75ea629fee6d59d26f88c39b2d291"; + + }; + + buildInputs = [ pkgs.unzip ]; + + installCommand = + '' + # ehm, YES, the --verbose flags needs to be there, otherwise it tries to patch setuptools! + easy_install --verbose --prefix=$out . + ''; + doCheck = false; + + meta = { + description = "Easily download, build, install, upgrade, and uninstall Python packages"; + homepage = http://packages.python.org/distribute; + license = "PSF or ZPL"; + platforms = python.meta.platforms; + }; + }); + distutils_extra = buildPythonPackage rec { name = "distutils-extra-2.26"; @@ -2261,6 +2307,25 @@ let pythonPackages = python.modules // rec { }; }; + stompclient = buildPythonPackage (rec { + name = "stompclient-0.3.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/s/stompclient/${name}.tar.gz"; + md5 = "af0a314b6106dd80da24a918c24a1eab"; + }; + + doCheck = false; + + meta = { + description = "Lightweight and extensible STOMP messaging client"; + homepage = http://bitbucket.org/hozn/stompclient; + license = pkgs.lib.licenses.asl20; + platforms = python.meta.platforms; + }; + }); + + svneverever = buildPythonPackage rec { name = "svneverever-778489a8"; From 20db3374cf9d6e6f36b242b383cad7d1e20861b5 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 12 Jun 2012 21:18:22 +0000 Subject: [PATCH 276/403] js2-mode-0-20120601 svn path=/nixpkgs/trunk/; revision=34484 --- pkgs/applications/editors/emacs-modes/js2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/js2/default.nix b/pkgs/applications/editors/emacs-modes/js2/default.nix index e5958021aa2..87661d75ff5 100644 --- a/pkgs/applications/editors/emacs-modes/js2/default.nix +++ b/pkgs/applications/editors/emacs-modes/js2/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, emacs }: stdenv.mkDerivation { - name = "js2-mode-0-20120130"; + name = "js2-mode-0-20120601"; src = fetchgit { url = "git://github.com/mooz/js2-mode.git"; - rev = "4c008b1987aa53769899e24808b6d74b41b4ff40"; - sha256 = "6af5f52e46ffe85b7610e2db19a96afbef60a6f5374f1c5db3653448e30160be"; + rev = "81bcbf7df7077db27facf0470cf9e31c18b8333e"; + sha256 = "1bec62816ec9d5f5882832902020573d95d038fff25b17bf1975b84a3ab535c3"; }; buildInputs = [ emacs ]; From c89f37078dd0a784eefc1dc9fa7ce8cf9a995280 Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Tue, 12 Jun 2012 21:51:53 +0000 Subject: [PATCH 277/403] Make ProofGeneral build with Emacs 24. svn path=/nixpkgs/trunk/; revision=34485 --- pkgs/applications/editors/emacs-modes/proofgeneral/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix index 34acaa6d880..18c16569cf8 100644 --- a/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix +++ b/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix @@ -22,6 +22,9 @@ stdenv.mkDerivation (rec { # @image{ProofGeneral} fails, so remove it. sed -i '94d' doc/PG-adapting.texi sed -i '101d' doc/ProofGeneral.texi + + # Emacs 24 compatibility. + sed -i 's|interactive-p|called-interactively-p '\'''any|' isar/isabelle-system.el generic/proof-{menu,script,splash}.el lib/scomint.el ''; preBuild = '' From 4cfe058218cb555b383cd4a39b420abd90498c08 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 12 Jun 2012 22:27:55 +0000 Subject: [PATCH 278/403] * Linux 3.2.20. svn path=/nixpkgs/trunk/; revision=34486 --- pkgs/os-specific/linux/kernel/linux-3.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index 5ca3db655b4..19716169d6d 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -234,7 +234,7 @@ in import ./generic.nix ( rec { - version = "3.2.19"; + version = "3.2.20"; testing = false; modDirVersion = version; @@ -245,7 +245,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "14kym3lhkbxvn1fcavxjsn4siccnyk85ax0n25lsispv0pvyzph1"; + sha256 = "11j36vg96ic0qvx78ilpgy6yc8pax5wdwkc3k93pr5ca9dnax891"; }; config = configWithPlatform stdenv.platform; From e0b38f88db9ca6f1fadda29965439315926ba44b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 12 Jun 2012 23:41:05 +0000 Subject: [PATCH 279/403] * Fortune: use a "-" instead of a "_" to separate the package name from the version. Otherwise "nix-env -i fortune-mod" doesn't work. (Reported on IRC.) svn path=/nixpkgs/trunk/; revision=34487 --- pkgs/tools/misc/fortune/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fortune/default.nix b/pkgs/tools/misc/fortune/default.nix index 8e44b0998a2..68f826a9d93 100644 --- a/pkgs/tools/misc/fortune/default.nix +++ b/pkgs/tools/misc/fortune/default.nix @@ -1,20 +1,24 @@ { stdenv, fetchurl, recode }: stdenv.mkDerivation { - name = "fortune-mod_1.99.1"; + name = "fortune-mod-1.99.1"; + src = fetchurl { url = http://ftp.de.debian.org/debian/pool/main/f/fortune-mod/fortune-mod_1.99.1.orig.tar.gz; sha256 = "1kpa2hgbglj5dbfasvl9wc1q3xpl91mqn3sfby46r4rwyzhswlgw"; }; - buildInputs = [recode]; + + buildInputs = [ recode ]; + preConfigure = '' sed -i "s|/usr/|$out/|" Makefile ''; + postInstall = '' ln -s $out/games/fortune $out/bin/fortune ''; meta = { - description = "fortune is a simple program that displays a pseudorandom message from a database of quotations that first appeared in Version 7 Unix."; + description = "A program that displays a pseudorandom message from a database of quotations"; }; } From ff2b57f957e698eae69e40b6e005742698d0ea5e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 13 Jun 2012 07:08:57 +0000 Subject: [PATCH 280/403] Updated Haskell packages. - BNFC-meta: updated to version 0.3.0.3 - HUnit: added version 1.2.4.3 - multirec: updated to version 0.7.2 - resourcet: updated to version 0.3.2.2 svn path=/nixpkgs/trunk/; revision=34489 --- .../libraries/haskell/HUnit/1.2.4.3.nix | 17 +++++++++++++++++ .../libraries/haskell/multirec/default.nix | 4 ++-- .../libraries/haskell/resourcet/default.nix | 4 ++-- .../tools/haskell/BNFC-meta/default.nix | 4 ++-- pkgs/top-level/haskell-packages.nix | 5 +++-- 5 files changed, 26 insertions(+), 8 deletions(-) create mode 100644 pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix b/pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix new file mode 100644 index 00000000000..9ac01e70865 --- /dev/null +++ b/pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix @@ -0,0 +1,17 @@ +{ cabal, deepseq }: + +cabal.mkDerivation (self: { + pname = "HUnit"; + version = "1.2.4.3"; + sha256 = "0sk2s0g28wly64nisgrj4wr914zx940pvj5zvkv9n467vssywzbr"; + isLibrary = true; + isExecutable = true; + buildDepends = [ deepseq ]; + meta = { + homepage = "http://hunit.sourceforge.net/"; + description = "A unit testing framework for Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/multirec/default.nix b/pkgs/development/libraries/haskell/multirec/default.nix index e636fc9dc8e..4f73ffa98ae 100644 --- a/pkgs/development/libraries/haskell/multirec/default.nix +++ b/pkgs/development/libraries/haskell/multirec/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "multirec"; - version = "0.7.1"; - sha256 = "1a3snlv6lr9mi4nrl4cyc5ilk6flbdn0ck2sqla6dyb2zdlgf5ph"; + version = "0.7.2"; + sha256 = "1f715h27x8gz73d2irgl1gw74zd5lyda80nzk9xxwihqqkzvbhsm"; noHaddock = true; meta = { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec"; diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix index adc6c2b40a8..eee4ace64bb 100644 --- a/pkgs/development/libraries/haskell/resourcet/default.nix +++ b/pkgs/development/libraries/haskell/resourcet/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "resourcet"; - version = "0.3.2.1"; - sha256 = "1gqcqbj9f13b9myrg7nhydrbbqnn80k69s65qsk3rc8wsqyk8i6g"; + version = "0.3.2.2"; + sha256 = "0smff49b8sbxkvzlw59qgk5mdd4lp3605mcy4amjyz9fhcn3cky2"; buildDepends = [ liftedBase monadControl transformers transformersBase ]; diff --git a/pkgs/development/tools/haskell/BNFC-meta/default.nix b/pkgs/development/tools/haskell/BNFC-meta/default.nix index 42006a81b5b..1b0397ead1b 100644 --- a/pkgs/development/tools/haskell/BNFC-meta/default.nix +++ b/pkgs/development/tools/haskell/BNFC-meta/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "BNFC-meta"; - version = "0.3.0.2"; - sha256 = "0x4x3lpqwjid8rdy6v2wlfbxjvxlg24wjj9fb2niwaqw8b3lyza4"; + version = "0.3.0.3"; + sha256 = "06k8jnb4gw96gc0ffmczbywn4q2n87zwqa0pl0ada3ldvwaagv4l"; buildDepends = [ alexMeta happyMeta haskellSrcMeta syb ]; noHaddock = true; meta = { diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ad3a4f4a484..b009bcad23e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -126,7 +126,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellSrc = self.haskellSrc_1_0_1_5; # 7.4.2 ok html = self.html_1_0_1_2; # 7.4.2 ok HTTP = self.HTTP_4000_2_3; # 7.4.2 ok - HUnit = self.HUnit_1_2_4_2; # 7.4.2 ok + HUnit = self.HUnit_1_2_4_3; # 7.4.2 ok mtl = self.mtl_2_1_1; # 7.4.2 ok network = self.network_2_3_0_14; # 7.4.2 ok OpenGL = self.OpenGL_2_2_3_1; # 7.4.2 ok @@ -906,7 +906,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HUnit_1_2_2_1 = callPackage ../development/libraries/haskell/HUnit/1.2.2.1.nix {}; HUnit_1_2_2_3 = callPackage ../development/libraries/haskell/HUnit/1.2.2.3.nix {}; HUnit_1_2_4_2 = callPackage ../development/libraries/haskell/HUnit/1.2.4.2.nix {}; - HUnit = self.HUnit_1_2_4_2; + HUnit_1_2_4_3 = callPackage ../development/libraries/haskell/HUnit/1.2.4.3.nix {}; + HUnit = self.HUnit_1_2_4_3; hxt = callPackage ../development/libraries/haskell/hxt {}; From 4638c52fb620df42f09cfb2becbe2a404353895d Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 13 Jun 2012 07:09:03 +0000 Subject: [PATCH 281/403] dovecot-2.1.7 svn path=/nixpkgs/trunk/; revision=34490 --- pkgs/servers/mail/dovecot/{2.0.nix => 2.x.nix} | 8 ++++---- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) rename pkgs/servers/mail/dovecot/{2.0.nix => 2.x.nix} (74%) diff --git a/pkgs/servers/mail/dovecot/2.0.nix b/pkgs/servers/mail/dovecot/2.x.nix similarity index 74% rename from pkgs/servers/mail/dovecot/2.0.nix rename to pkgs/servers/mail/dovecot/2.x.nix index 80cb237f6df..294a58b4f24 100644 --- a/pkgs/servers/mail/dovecot/2.0.nix +++ b/pkgs/servers/mail/dovecot/2.x.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, openssl, pam, bzip2, zlib}: -stdenv.mkDerivation { - name = "dovecot-2.0.15"; +stdenv.mkDerivation rec { + name = "dovecot-2.1.7"; buildInputs = [openssl pam bzip2 zlib]; src = fetchurl { - url = http://dovecot.org/releases/2.0/dovecot-2.0.15.tar.gz; - sha256 = "03byp6alxxk65qfjjnqp6kcncs5cdiqgskx90nk9kcnynl1h6r33"; + url = "http://dovecot.org/releases/2.1/${name}.tar.gz"; + sha256 = "0lpldhs0nvy6rxabqkp14wzcwf1cx4jvnbp1xcm74izrzxhvrdym"; }; # It will hardcode this for /var/lib/dovecot. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c4e79ef1df9..b98456108b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5087,7 +5087,8 @@ let dovecot = callPackage ../servers/mail/dovecot { }; dovecot_1_1_1 = callPackage ../servers/mail/dovecot/1.1.1.nix { }; - dovecot_2_0 = callPackage ../servers/mail/dovecot/2.0.nix { }; + dovecot_2 = callPackage ../servers/mail/dovecot/2.x.nix { }; + dovecot_2_0 = pkgs.dovecot_2; # Actually, 2.1 ejabberd = callPackage ../servers/xmpp/ejabberd { }; From 7ad2658f83735540976abb3d8ce43e3f89952a22 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 13 Jun 2012 07:09:07 +0000 Subject: [PATCH 282/403] zanshin-0.2.1, fix advertised version svn path=/nixpkgs/trunk/; revision=34491 --- pkgs/applications/office/zanshin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix index 5cfe2d01f58..12334288254 100644 --- a/pkgs/applications/office/zanshin/default.nix +++ b/pkgs/applications/office/zanshin/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, kdelibs, kdepimlibs, boost }: stdenv.mkDerivation rec { - name = "zanshin-0.2.2"; + name = "zanshin-0.2.1"; src = fetchurl { - url = "http://files.kde.org/zanshin/zanshin-0.2.0.tar.bz2"; - sha256 = "0kskk8rj4bwx5zywxw0h2lgl7byw9dxzdcafb6xp5cvdkjkg9j87"; + url = "http://files.kde.org/zanshin/${name}.tar.bz2"; + sha256 = "155k72vk7kw0p0x9dhlky6q017kanzcbwvp4dpf1hcbr1dsr55fx"; }; buildInputs = [ kdelibs kdepimlibs boost ]; From c6d9ead04755d35decd4051c2667ca9f9a440f89 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 13 Jun 2012 07:09:10 +0000 Subject: [PATCH 283/403] Add vanilla pkg-config Some packages (e.g., telepathy) rely on the upstream way to handle Requires.private in pkg-config. svn path=/nixpkgs/trunk/; revision=34492 --- pkgs/development/tools/misc/pkgconfig/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix index f323a7d7dbc..49b2cbfe66e 100644 --- a/pkgs/development/tools/misc/pkgconfig/default.nix +++ b/pkgs/development/tools/misc/pkgconfig/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, automake}: +{stdenv, fetchurl, automake, vanilla ? false}: stdenv.mkDerivation (rec { name = "pkg-config-0.23"; @@ -10,7 +10,7 @@ stdenv.mkDerivation (rec { sha256 = "0lrvk17724mc2nzpaa0vwybarrl50r7qdnr4h6jijm50srrf1808"; }; - patches = [ + patches = if vanilla then [] else [ # Process Requires.private properly, see # http://bugs.freedesktop.org/show_bug.cgi?id=4738. ./requires-private.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b98456108b4..12dd024798d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3050,6 +3050,7 @@ let buildNativeInput after the renaming. */ pkgconfig = forceBuildDrv (callPackage ../development/tools/misc/pkgconfig { }); + pkgconfigUpstream = pkgconfig.override { vanilla = true; }; premake = callPackage ../development/tools/misc/premake { }; From 28aabd6311686cfaa4c755f0ff5086acc8079b8c Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 13 Jun 2012 07:09:15 +0000 Subject: [PATCH 284/403] kde-telepathy-0.4.0, tweak update script etc. svn path=/nixpkgs/trunk/; revision=34493 --- .../telepathy/kde/0.4.0.nix | 16 ++++++ .../telepathy/kde/default.nix | 56 ++++++++++--------- .../telepathy/kde/update.sh | 44 +++++++-------- 3 files changed, 68 insertions(+), 48 deletions(-) create mode 100644 pkgs/applications/networking/instant-messengers/telepathy/kde/0.4.0.nix diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/0.4.0.nix b/pkgs/applications/networking/instant-messengers/telepathy/kde/0.4.0.nix new file mode 100644 index 00000000000..aadeb3e2a67 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telepathy/kde/0.4.0.nix @@ -0,0 +1,16 @@ +[ +{name="ktp-accounts-kcm";key="accounts_kcm";sha256="1a312cfm1i8ipqp0r09zfhlk7vacp006pbhwwvyf0sgracizr0cp";} +{name="ktp-approver";key="approver";sha256="0wfpwlk5f3n37xl619jzjxmgrq81qnr9kg9m955zbcad2jsx3z35";} +{name="ktp-auth-handler";key="auth_handler";sha256="1q5jjj3np3kg7py28jb74q8lpi6camw7907950igpnwzbzmacxwa";} +{name="ktp-call-ui";key="call_ui";sha256="08k59q0gf6fq0mmz72akiqkldqy6grw1gs7jz44gzmr82jvaqjb3";} +{name="ktp-common-internals";key="common_internals";sha256="1cmil7wp6rgqzl0bciphqmvdzipm856c45kx2mzrk6n1vnl9l500";} +{name="ktp-contact-applet";key="contact_applet";sha256="1j42yqq06bkpfb4jgm88qqbwnz9538ys5aghyfg147jr50h9pk8k";} +{name="ktp-contact-list";key="contact_list";sha256="1ndpr2z99clmy8f7l8l6ws7bljmmqvfrb5f0nrym91lyvcdz7sb2";} +{name="ktp-contact-runner";key="contact_runner";sha256="1v8mcp8q1cfmxdg65qqh159q9pynz3pc3y0ycr6hn1nrgxncs48k";} +{name="ktp-filetransfer-handler";key="filetransfer_handler";sha256="0dj2if34wxajwylgfxwd5chvxk63lxmsq52sc039dsj9p174cp3y";} +{name="ktp-kded-integration-module";key="kded_integration_module";sha256="0p873h6cjdinfinfz1cggyw611v2gllmkvzczszxnl8q2hcprx96";} +{name="ktp-presence-applet";key="presence_applet";sha256="1y8yhbbjp9qgycn93lqd6ss7jln1hpxa0dnqgirijfjn15c20nfl";} +{name="ktp-send-file";key="send_file";sha256="0sacvda2xs5g7w2xca9p6z61f2w69sgw0g3sj2fazrsm0x7a0z0d";} +{name="ktp-text-ui";key="text_ui";sha256="1xsslwaisk90wa45rgps3500wl1fbxq4qp6njljf4qbysyw4wfdb";} +{name="telepathy-logger-qt";key="telepathy_logger_qt";sha256="1398iyb72grhwwi0idxdwj1qdi2s02cp2wvjv72wvv3vyfwb51kn";} +] diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix index 0bced075b88..70e6293c9a3 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix @@ -1,15 +1,34 @@ -{ stdenv, fetchurl, fetchgit, telepathy_qt, kdelibs, gettext, pkgconfig -, qt_gstreamer }: +{ stdenv, fetchurl, fetchgit, telepathy_qt, kdelibs, kde_workspace, gettext, dbus_libs +, pkgconfigUpstream , qt_gstreamer, telepathy_glib, telepathy_logger, qjson, flex, bison }: let - version = "0.3.1"; + pkgconfig = pkgconfigUpstream; + version = "0.4.0"; manifest = import (./. + "/${version}.nix"); - overrides = { }; + + overrides = { + telepathy_logger_qt = x : x // { + NIX_CFLAGS_COMPILE = "-I${dbus_libs}/include/dbus-1.0"; + }; + }; + + extraBuildInputs = { + auth_handler = [ qjson ]; + call_ui = [ qt_gstreamer telepathy_glib ]; + contact_applet = [ kde_workspace ]; + telepathy_logger_qt = [ telepathy_logger qt_gstreamer ]; + text_ui = [ ktp.telepathy_logger_qt qt_gstreamer telepathy_logger ]; + }; + + extraBuildNativeInputs = { + telepathy_logger_qt = [ flex bison ]; + }; + ktpFun = { name, key, sha256 }: { name = key; value = stdenv.mkDerivation ( - (if builtins.hasAttr key overrides then builtins.getAttr key overrides else (x: x)) + (stdenv.lib.attrByPath [ key ] (x : x) overrides) { name = "${name}-${version}"; @@ -18,9 +37,10 @@ let inherit sha256; }; - buildNativeInputs = [ gettext pkgconfig ]; + buildNativeInputs = [ gettext pkgconfig ] ++ (stdenv.lib.attrByPath [ key ] [] extraBuildNativeInputs); buildInputs = [ kdelibs telepathy_qt ] - ++ stdenv.lib.optional (name != "ktp-common-internals") common_internals; + ++ stdenv.lib.optional (name != "ktp-common-internals") ktp.common_internals + ++ (stdenv.lib.attrByPath [ key ] [] extraBuildInputs); meta = { inherit (kdelibs.meta) platforms; @@ -30,26 +50,10 @@ let ); }; - stable = builtins.listToAttrs (map ktpFun manifest); - unstable = { - call_ui = stdenv.mkDerivation { - name = "ktp-call-ui-20120314"; - - src = fetchgit { - url = git://anongit.kde.org/ktp-call-ui; - rev = "3587166d1ace83b115e113853514a7acc04d9d86"; - sha256 = "0yv386rqy4vkwmd38wvvsrbam59sbv5k2lwimv96kf93xgkp5g0l"; - }; - - buildInputs = [ kdelibs telepathy_qt common_internals qt_gstreamer ]; - buildNativeInputs = [ gettext pkgconfig ]; - }; - }; - common_internals = pkgs.common_internals; - pkgs = unstable // stable; + ktp = builtins.listToAttrs (map ktpFun manifest); in -pkgs // { +ktp // { inherit version; recurseForDerivations = true; - full = stdenv.lib.attrValues stable; + full = stdenv.lib.attrValues ktp; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/update.sh b/pkgs/applications/networking/instant-messengers/telepathy/kde/update.sh index 19a8e2053bf..199607047b8 100755 --- a/pkgs/applications/networking/instant-messengers/telepathy/kde/update.sh +++ b/pkgs/applications/networking/instant-messengers/telepathy/kde/update.sh @@ -1,38 +1,38 @@ #!/bin/sh usage() { - echo "$0 version|directory" + echo "$0 version|directory" } download() { - URL=ftp://ftp.kde.org/pub/kde/unstable/kde-telepathy/$1/src - destdir=$2 - if test -n "$KDE_FULL_SESSION"; then - kioclient copy $URL $destdir - else - mkdir $destdir - lftp -c "open $URL; lcd $destdir; mget -c *" - fi + URL=ftp://ftp.kde.org/pub/kde/unstable/kde-telepathy/$1/src + destdir=$2 + if test -n "$KDE_FULL_SESSION"; then + kioclient copy $URL $destdir + else + mkdir $destdir + lftp -c "open $URL; lcd $destdir; mget -c *" + fi } if [[ -d $1 ]]; then - directory=$1 - version=$(ls $directory/* | head -n1 | - sed -e "s,$directory/[^0-9.]*\\([0-9.]\\+\\)\\.tar.*,\\1,") - echo "Version $version" + directory=$1 + version=$(ls $directory/* | head -n1 | + sed -e "s,$directory/[^0-9.]*\\([0-9.]\\+\\)\\.tar.*,\\1,") + echo "Version $version" else - version=$1 - directory=src-$version - download $version $directory + version=$1 + directory=src-$version + download $version $directory fi -packages=$(ls $directory/* | sed -e "s,$directory/ktp-\\(.*\\)-$version.*,\\1,") +packages=$(ls $directory/* | sed -e "s,$directory/\\(.*\\)-$version.*,\\1,") echo $packages exec >$version.nix echo "[" -for pkg in $packages; do - hash=$(nix-hash --flat --type sha256 --base32 $directory/ktp-$pkg-$version.*) - echo "{name=\"ktp-${pkg}\";key=\"${pkg//-/_}\";sha256=\"${hash}\";}" +for name in $packages; do + hash=$(nix-hash --flat --type sha256 --base32 $directory/$name-$version.*) + key=${name#ktp-} + echo "{name=\"${name}\";key=\"${key//-/_}\";sha256=\"${hash}\";}" done -echo "]" - +echo "]" \ No newline at end of file From 316222e2e1f60d5b213080a2f7e50d1e5dc66e32 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 13 Jun 2012 07:09:19 +0000 Subject: [PATCH 285/403] Mass telepathy update, add telepathy-haze svn path=/nixpkgs/trunk/; revision=34494 --- .../telepathy/gabble/default.nix | 4 ++-- .../telepathy/haze/default.nix | 20 +++++++++++++++++++ .../telepathy/logger/default.nix | 4 ++-- .../telepathy/mission-control/default.nix | 4 ++-- .../telepathy/rakia/default.nix | 4 ++-- .../telepathy/salut/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 ++ 7 files changed, 32 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index 154057b9377..25919875bd1 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -2,11 +2,11 @@ , sqlite, libsoup, libnice, gnutls }: stdenv.mkDerivation rec { - name = "telepathy-gabble-0.15.4"; + name = "telepathy-gabble-0.16.0"; src = fetchurl { url = "${meta.homepage}/releases/telepathy-gabble/${name}.tar.gz"; - sha256 = "0rgqxsdcxds0ljcc01f9ifav26y80p4my37wqzkicr9hmv54h98s"; + sha256 = "0fk65f7q75z3wm5h4wad7g5sm2j6r8v2845b74ycl29br78ki2hf"; }; buildNativeInputs = [pkgconfig libxslt]; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix new file mode 100644 index 00000000000..1e2ded5292a --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pidgin, telepathy_glib, glib, dbus_glib, pkgconfig, libxslt }: + +stdenv.mkDerivation rec { + pname = "telepathy-haze"; + name = "${pname}-0.6.0"; + + src = fetchurl { + url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; + sha256 = "1qrgmcr8ga6nvaz9hhn0mv0p7v799wsawrg3k5l791cgxx5carz2"; + }; + + buildInputs = [ glib telepathy_glib dbus_glib pidgin ]; + + buildNativeInputs = [ pkgconfig libxslt ]; + + meta = { + description = "A Telepathy connection manager based on libpurple"; + platforms = stdenv.lib.platforms.gnu; # Random choice + }; +} diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index 27d41140be0..a820e0f8a99 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { project = "telepathy-logger"; - name = "${project}-0.2.12"; + name = "${project}-0.4.0"; src = fetchurl { url = "http://telepathy.freedesktop.org/releases/${project}/${name}.tar.bz2"; - sha256 = "1681m1j6vqzy089fnbfpz9i8jsg64fq6x6kf25b9p2090dnqrkj3"; + sha256 = "1rb58ipz56c9bac8b31md5gk1fw7jim8x9dx3cm5gmxg2q3apd86"; }; buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib pkgconfig intltool ]; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix index 3d24fdf2a19..4d79f0c89d8 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, telepathy_glib, libxslt }: stdenv.mkDerivation rec { - name = "${pname}-5.11.0"; + name = "${pname}-5.12.0"; pname = "telepathy-mission-control"; src = fetchurl { url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; - sha256 = "19fz1lrsvrm0p58wkxhjn7xyickz8bgzks4mkhlvgp692ypvvppm"; + sha256 = "0xsycjk2l19h026adqms8ik7c2xj9j9rba76znfh46ryaijyn2k6"; }; buildInputs = [ telepathy_glib ]; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix index 33a935fa7eb..9056febd7d6 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "telepathy-rakia"; - name = "${pname}-0.7.3"; + name = "${pname}-0.7.4"; src = fetchurl { url = "${meta.homepage}/releases/${pname}/${name}.tar.gz"; - sha256 = "1jnxlx135c660vb1n2vpg6ci2ps0rbrp3244jgchik3g6q5vwbb4"; + sha256 = "11cmmdq31kivm6nsv61hxy3hxnnmbd8sj55xqwx9hyqzybh70dyf"; }; buildNativeInputs = [pkgconfig libxslt python]; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix index 02701f9f1ce..dc5675c1b2c 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "telepathy-salut"; - name = "${pname}-0.7.2"; + name = "${pname}-0.8.0"; src = fetchurl { url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; - sha256 = "0vahmqi78pbmsn472kijl3d4rshz07pmihxk5xkp99hvbqd4mb1f"; + sha256 = "1kmmpwjbfph37bjvpkfphff8dzhr896i55knf311f778fbsgl17m"; }; buildInputs = [ glib libxml2 telepathy_glib avahi libsoup libuuid gnutls diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 12dd024798d..a8a6124361f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7488,6 +7488,8 @@ let inherit (pkgs.gnome) libsoup; }; + telepathy_haze = callPackage ../applications/networking/instant-messengers/telepathy/haze {}; + telepathy_logger = callPackage ../applications/networking/instant-messengers/telepathy/logger {}; telepathy_mission_control = callPackage ../applications/networking/instant-messengers/telepathy/mission-control { }; From 5487fbe94add5b70ba1a21fc8006b77e181aeb06 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 13 Jun 2012 07:09:23 +0000 Subject: [PATCH 286/403] telepathy-glib-0.18.1 (0.19.x requires glib-2.32.x) Drop pkg-config patch, pass pkgconfigUpstream to rakia and salut. svn path=/nixpkgs/trunk/; revision=34495 --- .../instant-messengers/telepathy/rakia/default.nix | 4 ++-- .../instant-messengers/telepathy/salut/default.nix | 4 ++-- .../libraries/telepathy/glib/default.nix | 6 ++---- .../libraries/telepathy/glib/fix-pkgconfig.patch | 14 -------------- 4 files changed, 6 insertions(+), 22 deletions(-) delete mode 100644 pkgs/development/libraries/telepathy/glib/fix-pkgconfig.patch diff --git a/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix index 9056febd7d6..e8b120b9331 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxslt, telepathy_glib, libxml2, dbus_glib +{ stdenv, fetchurl, pkgconfigUpstream, libxslt, telepathy_glib, libxml2, dbus_glib , python, sofia_sip }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "11cmmdq31kivm6nsv61hxy3hxnnmbd8sj55xqwx9hyqzybh70dyf"; }; - buildNativeInputs = [pkgconfig libxslt python]; + buildNativeInputs = [pkgconfigUpstream libxslt python]; buildInputs = [ libxml2 dbus_glib telepathy_glib sofia_sip]; meta = { diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix index dc5675c1b2c..3c100282aa4 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libxslt, glib, libxml2, telepathy_glib, avahi, libsoup -, libuuid, gnutls, sqlite, pkgconfig }: +, libuuid, gnutls, sqlite, pkgconfigUpstream }: stdenv.mkDerivation rec { pname = "telepathy-salut"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib libxml2 telepathy_glib avahi libsoup libuuid gnutls sqlite ]; - buildNativeInputs = [ libxslt pkgconfig ]; + buildNativeInputs = [ libxslt pkgconfigUpstream ]; configureFlags = "--disable-avahi-tests"; diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index 22a6aef5c3a..b31338a6595 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -1,19 +1,17 @@ { stdenv, fetchurl, dbus_glib, glib, python, pkgconfig, libxslt }: stdenv.mkDerivation rec { - name = "telepathy-glib-0.17.7"; + name = "telepathy-glib-0.18.1"; src = fetchurl { url = "${meta.homepage}/releases/telepathy-glib/${name}.tar.gz"; - sha256 = "1brzw0cqawcyh7rffzbmydzbymrrsmzf8rksgamiqpwsdvcnksxz"; + sha256 = "0vac5wk9rpaniqxwa50szcc5ql779ks37sy4z7fj4k73i5k2af1p"; }; propagatedBuildInputs = [dbus_glib glib python]; buildInputs = [pkgconfig libxslt]; - patches = [ ./fix-pkgconfig.patch ]; - meta = { homepage = http://telepathy.freedesktop.org; }; diff --git a/pkgs/development/libraries/telepathy/glib/fix-pkgconfig.patch b/pkgs/development/libraries/telepathy/glib/fix-pkgconfig.patch deleted file mode 100644 index bba92d408a0..00000000000 --- a/pkgs/development/libraries/telepathy/glib/fix-pkgconfig.patch +++ /dev/null @@ -1,14 +0,0 @@ -Adjust telepathy-glib.pc to our version of pkg-config -diff --git a/telepathy-glib/telepathy-glib.pc.in b/telepathy-glib/telepathy-glib.pc.in -index e2ddf03..6038011 100644 ---- a/telepathy-glib/telepathy-glib.pc.in -+++ b/telepathy-glib/telepathy-glib.pc.in -@@ -6,7 +6,6 @@ includedir=@includedir@ - Name: Telepathy-GLib - Description: GLib utility library for the Telepathy framework - Version: @VERSION@ --Requires: pkg-config >= 0.21 --Requires.private: dbus-1 >= 0.95, dbus-glib-1 >= 0.90, glib-2.0 >= 2.30, gobject-2.0 >= 2.30, gio-2.0 >= 2.30 -+Requires: pkg-config >= 0.21 dbus-1 >= 0.95, dbus-glib-1 >= 0.90, glib-2.0 >= 2.30, gobject-2.0 >= 2.30, gio-2.0 >= 2.30 - Libs: -L${libdir} -ltelepathy-glib - Cflags: -I${includedir}/telepathy-1.0 From c5e03fecce12b052a355f2ac6a2086e2eec1373b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 13 Jun 2012 12:44:52 +0000 Subject: [PATCH 287/403] Updating doxygen to 1.8.1. It fixes some parsing issues in 1.8.0. svn path=/nixpkgs/trunk/; revision=34496 --- pkgs/development/tools/documentation/doxygen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 776c0bf450c..07893987bbf 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, perl, flex, bison, qt4 }: let - name = "doxygen-1.8.0"; + name = "doxygen-1.8.1"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "ftp://ftp.stack.nl/pub/users/dimitri/${name}.src.tar.gz"; - sha256 = "0cymkk8wpws326aqpsixyzr4pk98xgpzrvxxjm76ar79pcs91ykh"; + sha256 = "0qmprax8d5fwx6sc7x9l06ilh2ffgvm6xs0rh54k3v5q5879r7mg"; }; patches = [ ./tmake.patch ]; From 1de91e33f364449e6d184eb71b669b780101afe2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 13 Jun 2012 12:57:29 +0000 Subject: [PATCH 288/403] haskell-async: updated to version 2.0.0.0 svn path=/nixpkgs/trunk/; revision=34497 --- pkgs/development/libraries/haskell/async/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/async/default.nix b/pkgs/development/libraries/haskell/async/default.nix index d66ab5e8658..15cef9b35f1 100644 --- a/pkgs/development/libraries/haskell/async/default.nix +++ b/pkgs/development/libraries/haskell/async/default.nix @@ -1,12 +1,13 @@ -{ cabal }: +{ cabal, stm }: cabal.mkDerivation (self: { pname = "async"; - version = "1.4"; - sha256 = "1d24bcvmw687jcf75wgavlhfs55f0va02xhl4xdnj2lrlr19s5dl"; + version = "2.0.0.0"; + sha256 = "03aqgfgpar53k7bzb3s988a4fg0pzy7jmjv299wz2hxl7vr6fzkr"; + buildDepends = [ stm ]; meta = { - homepage = "http://gitorious.org/async/"; - description = "Asynchronous Computations"; + homepage = "https://github.com/simonmar/async"; + description = "Run IO operations asynchronously and wait for their results"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; From abdd4f34980206127c9855fb20465fec17231e42 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 13 Jun 2012 12:57:33 +0000 Subject: [PATCH 289/403] haskell-ghc-mod: updated to version 1.10.18 svn path=/nixpkgs/trunk/; revision=34498 --- pkgs/development/libraries/haskell/ghc-mod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index 8501ac9a7e3..a79c35e2c5a 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ghc-mod"; - version = "1.10.17"; - sha256 = "1ij04p6yw5sz1krsrqga9capahhkdazk4awmg15pvqsr62085hwj"; + version = "1.10.18"; + sha256 = "1kpy0mjxag3xs8zs5kbl1arkd3341g1xr52qvzryks2ivax1zi9s"; isLibrary = false; isExecutable = true; buildDepends = [ From 4f19239875e7e01c984822ac51d7331115346c0f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 13 Jun 2012 14:11:52 +0000 Subject: [PATCH 290/403] * Clean up the Ant name, e.g. "ant-openjdk-1.8.0RC1" instead of "ant-". * Remove openjdkDarwin/ecjDarwin/antDarwin attributes. Instead the openjdk attribute refers to the Darwin package on Darwin. svn path=/nixpkgs/trunk/; revision=34505 --- .../build-managers/apache-ant/default.nix | 37 ++++++++++--------- pkgs/top-level/all-packages.nix | 28 ++++++-------- 2 files changed, 32 insertions(+), 33 deletions(-) diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix index 47a916f48e2..bec71a291d6 100644 --- a/pkgs/development/tools/build-managers/apache-ant/default.nix +++ b/pkgs/development/tools/build-managers/apache-ant/default.nix @@ -1,23 +1,26 @@ -{fetchurl, stdenv, jdk, name}: +{ fetchurl, stdenv, jdk }: -let { - body = - stdenv.mkDerivation { - name = name; +let - builder = ./builder.sh; - buildInputs = [antContrib jdk]; + antContrib = import ./ant-contrib.nix { + inherit fetchurl stdenv; + }; - inherit antContrib jdk; + version = "1.8.0RC1"; - src = fetchurl { - url = http://apache.mirror.transip.nl/ant/binaries/apache-ant-1.8.0RC1-bin.tar.bz2 ; - sha256 = "0xvmrsghibq7p3wvfkmvmkkg0zzfmw32lrfjl5f6cfzchjjnw9wx"; - }; - }; +in - antContrib = - (import ./ant-contrib.nix) { - inherit fetchurl stdenv; - }; +stdenv.mkDerivation { + name = "ant-${(builtins.parseDrvName jdk.name).name}-${version}"; + + builder = ./builder.sh; + + buildInputs = [ antContrib jdk ]; + + inherit antContrib jdk; + + src = fetchurl { + url = "http://apache.mirror.transip.nl/ant/binaries/apache-ant-${version}-bin.tar.bz2"; + sha256 = "0xvmrsghibq7p3wvfkmvmkkg0zzfmw32lrfjl5f6cfzchjjnw9wx"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a8a6124361f..726900e7a3c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2265,9 +2265,11 @@ let path64 = callPackage ../development/compilers/path64 { }; - openjdkDarwin = callPackage ../development/compilers/openjdk-darwin { }; - - openjdk = callPackage ../development/compilers/openjdk { }; + openjdk = + if stdenv.isDarwin then + callPackage ../development/compilers/openjdk-darwin { } + else + callPackage ../development/compilers/openjdk { }; openjre = callPackage ../development/compilers/openjdk { jreOnly = true; @@ -2283,7 +2285,7 @@ let assert system == "i686-linux" || system == "x86_64-linux"; callPackage ../development/compilers/jdk/default-5.nix { }); - jdk = if stdenv.isDarwin then openjdkDarwin else jdkdistro true false; + jdk = if stdenv.isDarwin then openjdk else jdkdistro true false; jre = jdkdistro false false; jdkPlugin = lowPrio (jdkdistro true true); @@ -2751,8 +2753,6 @@ let ecj = callPackage ../development/eclipse/ecj { }; - ecjDarwin = ecj.override { gcj = openjdkDarwin; ant = antDarwin; }; - jdtsdk = callPackage ../development/eclipse/jdt-sdk { }; jruby165 = callPackage ../development/interpreters/jruby { }; @@ -2781,20 +2781,16 @@ let antlr3 = callPackage ../development/tools/parsing/antlr { }; - antDarwin = apacheAnt.override rec { jdk = openjdkDarwin; name = "ant-" + jdk.name; } ; - ant = apacheAnt; - apacheAnt = callPackage ../development/tools/build-managers/apache-ant { - name = "ant-" + jdk.name; - }; + apacheAnt = callPackage ../development/tools/build-managers/apache-ant { }; - apacheAnt14 = callPackage ../development/tools/build-managers/apache-ant { - jdk = j2sdk14x; - name = "ant-" + j2sdk14x.name; - }; + apacheAntOpenJDK = apacheAnt.override { jdk = openjdk; }; - apacheAntGcj = callPackage ../development/tools/build-managers/apache-ant/from-source.nix { # must be either pre-built or built with GCJ *alone* + apacheAnt14 = apacheAnt.override { jdk = j2sdk14x; }; + + apacheAntGcj = callPackage ../development/tools/build-managers/apache-ant/from-source.nix { + # must be either pre-built or built with GCJ *alone* gcj = gcj.gcc; # use the raw GCJ, which has ${gcj}/lib/jvm }; From 3c948a1a033e8d1a28cfc1cbfa7e00c68c459edd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 13 Jun 2012 15:26:50 +0000 Subject: [PATCH 291/403] * libiodbc: fix the iodbctest program, which had a broken RPATH. svn path=/nixpkgs/trunk/; revision=34506 --- pkgs/development/libraries/libiodbc/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libiodbc/default.nix b/pkgs/development/libraries/libiodbc/default.nix index fb3a2fd11d0..b97d4becb62 100644 --- a/pkgs/development/libraries/libiodbc/default.nix +++ b/pkgs/development/libraries/libiodbc/default.nix @@ -1,15 +1,20 @@ { stdenv, fetchurl, pkgconfig, gtk, useGTK ? false }: stdenv.mkDerivation rec { - name = "libiodbc-3.52.7"; + name = "libiodbc-3.52.8"; src = fetchurl { - url = "${meta.homepage}/downloads/iODBC/${name}.tar.gz"; - sha256 = "d7002cc7e566785f1203f6096dcb49b0aad02a9d9946a8eca5d663ac1a85c0c7"; + url = "mirror://sourceforge/iodbc/${name}.tar.gz"; + sha256 = "16hjb6fcval85gnkgkxfhw4c5h3pgf86awyh8p2bhnnvzc0ma5hq"; }; buildInputs = stdenv.lib.optionals useGTK [ gtk pkgconfig ]; + preBuild = + '' + export NIX_LDFLAGS_BEFORE="-rpath $out/lib" + ''; + meta = { description = "iODBC driver manager"; homepage = http://www.iodbc.org; From 4b5c1dec62395a662665067f14894bd64ba6de0f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 14 Jun 2012 19:07:01 +0000 Subject: [PATCH 292/403] =?UTF-8?q?*=20Add=20a=20function=20=E2=80=98mapAt?= =?UTF-8?q?trsToList=E2=80=99=20that=20maps=20a=20function=20over=20the=20?= =?UTF-8?q?=20=20attributes=20in=20a=20set,=20returning=20a=20list.=20=20(?= =?UTF-8?q?Note=20that=20the=20regular=20=20=20=E2=80=98mapAttrs=E2=80=99?= =?UTF-8?q?=20returns=20an=20attribute=20set.)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/nixpkgs/trunk/; revision=34509 --- pkgs/lib/attrsets.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/lib/attrsets.nix b/pkgs/lib/attrsets.nix index 260c61558a4..5e4e9df3711 100644 --- a/pkgs/lib/attrsets.nix +++ b/pkgs/lib/attrsets.nix @@ -146,6 +146,18 @@ rec { listToAttrs (map (attr: f attr (getAttr attr set)) (attrNames set)); + /* Call a function for each attribute in the given set and return + the result in a list. + + Example: + mapAttrsToList (name: value: name + value) + { x = "a"; y = "b"; } + => [ "xa" "yb" ] + */ + mapAttrsToList = f: attrs: + map (name: f name (getAttr name attrs)) (attrNames attrs); + + /* Like `mapAttrs', except that it recursively applies itself to attribute sets. Also, the first argument of the argument function is a *list* of the names of the containing attributes. From e71f2ed1f7120744ea9cb7ff60f03d4fd588e5ac Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 14 Jun 2012 19:44:34 +0000 Subject: [PATCH 293/403] all-packages.nix: disable dependencies in Emacs 24 that we didn't have in Emacs 23 either It's unclear what adding these dependencies accomplishes. If you find that a feature you need doesn't work anymore, please feel free to re-enable the appropriate dependencies. svn path=/nixpkgs/trunk/; revision=34510 --- pkgs/top-level/all-packages.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 726900e7a3c..3461e85c36c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6546,16 +6546,14 @@ let }; emacs24 = callPackage ../applications/editors/emacs-24 { - # use override to select the appropriate gui toolkit + # use override to enable additional features libXaw = if stdenv.isDarwin then xlibs.libXaw else null; Xaw3d = null; gtk = if stdenv.isDarwin then null else gtk; - # TODO: these packages don't build on Darwin. - gconf = null /* if stdenv.isDarwin then null else gnome.GConf */; - librsvg = if stdenv.isDarwin then null else librsvg; - # alsa only on linux - alsaLib = if stdenv.isLinux then alsaLib else null; - imagemagick = imagemagickBig; + gconf = null; + librsvg = null; + alsaLib = null; + imagemagick = null; }; emacsPackages = emacs: self: let callPackage = newScope self; in rec { From 0f795aea78592088be91a2324d3971f425c256bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 14 Jun 2012 19:54:19 +0000 Subject: [PATCH 294/403] Making libtheora build on mips64el-linux svn path=/nixpkgs/trunk/; revision=34511 --- pkgs/development/libraries/libtheora/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix index 432e6edc61c..8514c299679 100644 --- a/pkgs/development/libraries/libtheora/default.nix +++ b/pkgs/development/libraries/libtheora/default.nix @@ -1,6 +1,6 @@ -{stdenv, fetchurl, libogg, libvorbis, tremor}: +{stdenv, fetchurl, libogg, libvorbis, tremor, autoconf, automake, libtool}: -stdenv.mkDerivation { +stdenv.mkDerivation ({ name = "libtheora-1.1.1"; src = fetchurl { url = http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.gz; @@ -14,3 +14,10 @@ stdenv.mkDerivation { configureFlags = "--disable-examples"; }; } + +# It has an old config.guess that doesn't know the mips64el. +// (if (stdenv.system == "mips64el-linux") then +{ + propagatedBuildInputs = [libogg libvorbis autoconf automake libtool]; + preConfigure = "rm config.guess; sh autogen.sh"; +} else {})) From 6ccf519fc6b858c1870841206443d792b9538897 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 14 Jun 2012 20:40:22 +0000 Subject: [PATCH 295/403] GCC 4.7.1. svn path=/nixpkgs/trunk/; revision=34512 --- pkgs/top-level/all-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3461e85c36c..843379dbd4d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1971,10 +1971,10 @@ let })); gcc47 = lowPrio (wrapGCC (lib.overrideDerivation gcc46_debug.gcc (a: { - name = "gcc-debug-4.7.0"; + name = "gcc-debug-4.7.1"; src = fetchurl { - url = "mirror://gnu/gcc/gcc-4.7.0/gcc-4.7.0.tar.bz2"; - sha256 = "19f9kpqwq75ax3iz1jzzpdqhxrqjk5rbjifdgamnsrbg04z0i056"; + url = "mirror://gnu/gcc/gcc-4.7.1/gcc-4.7.1.tar.bz2"; + sha256 = "0vs0v89zzgkngkw2p8kdynyk7j8ky4wf6zyrg3rsschpl1pky28n"; }; configureFlags = a.configureFlags From 24ed82236a3e59f0373c9b5e87c7410edba46b9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 14 Jun 2012 21:28:41 +0000 Subject: [PATCH 296/403] Changing an 'if' to cleaner optionalAttrs. svn path=/nixpkgs/trunk/; revision=34513 --- pkgs/development/libraries/libtheora/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix index 8514c299679..e846b213ee0 100644 --- a/pkgs/development/libraries/libtheora/default.nix +++ b/pkgs/development/libraries/libtheora/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation ({ } # It has an old config.guess that doesn't know the mips64el. -// (if (stdenv.system == "mips64el-linux") then +// stdenv.lib.optionalAttrs (stdenv.system == "mips64el-linux") { propagatedBuildInputs = [libogg libvorbis autoconf automake libtool]; preConfigure = "rm config.guess; sh autogen.sh"; -} else {})) +}) From 44210695c848f6439dd870ea18ead1c909ffd15f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 14 Jun 2012 22:10:52 +0000 Subject: [PATCH 297/403] * systemd: fix path to loadkeys/setfont, and add SysV compatibility links (reboot/shutdown/etc.). svn path=/nixpkgs/trunk/; revision=34515 --- pkgs/os-specific/linux/systemd/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index f867b3e224b..9aecaedb8cc 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, intltool, gperf, libcap, udev, dbus, kmod , xz, pam, acl, cryptsetup, libuuid, m4, utillinux, usbutils, pciutils -, glib +, glib, kbd }: stdenv.mkDerivation rec { @@ -42,6 +42,8 @@ stdenv.mkDerivation rec { done ''; + NIX_CFLAGS_COMPILE = "-DKBD_LOADKEYS=\"${kbd}/bin/loadkeys\" -DKBD_SETFONT=\"${kbd}/bin/setfont\""; + installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc"; # Get rid of configuration-specific data. @@ -50,6 +52,13 @@ stdenv.mkDerivation rec { mkdir -p $out/example/systemd mv $out/lib/{modules-load.d,binfmt.d,sysctl.d,tmpfiles.d} $out/example mv $out/lib/systemd/{system,user} $out/example/systemd + + # Install SysV compatibility commands. + mkdir -p $out/sbin + ln -s $out/lib/systemd/systemd $out/sbin/telinit + for i in init halt poweroff runlevel reboot shutdown; do + ln -s $out/bin/systemctl $out/sbin/$i + done ''; enableParallelBuilding = true; From 75cd74c72c2aed986659f5f2cda208b874b2aed1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 15 Jun 2012 08:06:06 +0000 Subject: [PATCH 298/403] haskell-defaults.nix: switched GHC 7.4.2 to use the Haskell Platform 2012.2.0.0 configuration svn path=/nixpkgs/trunk/; revision=34516 --- pkgs/top-level/haskell-defaults.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index f566270d3df..d09d34dbf6d 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -249,7 +249,7 @@ packages_ghc742 = packages { ghcPath = ../development/compilers/ghc/7.4.2.nix; ghcBinary = ghc6121BinaryDarwin; - prefFun = ghcHEADPrefs; + prefFun = ghc741Prefs; }; # Reasonably current HEAD snapshot. Should *always* be lowPrio. From da350b93a2a1b27e625c7fcf29b06c693cb56e4e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 15 Jun 2012 08:06:11 +0000 Subject: [PATCH 299/403] Updated Haskell packages. - bson: updated to version 0.2.0 - cpu: updated to version 0.1.1 - defaults.nix: cosmetic - iteratee: updated to version 0.8.9.1 - ListLike: updated to version 3.1.5 - mongoDB: updated to version 1.3.0 - packages.nix: cosmetic - stringsearch: added version 0.3.6.3 - system-fileio: updated to version 0.3.8 - wai-extra: updated to version 1.2.0.5 svn path=/nixpkgs/trunk/; revision=34517 --- .../libraries/haskell/ListLike/default.nix | 4 ++-- pkgs/development/libraries/haskell/bson/default.nix | 13 ++++++------- pkgs/development/libraries/haskell/cpu/default.nix | 4 ++-- .../libraries/haskell/iteratee/default.nix | 10 ++++++---- .../libraries/haskell/mongoDB/default.nix | 10 +++++----- .../libraries/haskell/stringsearch/default.nix | 13 +++++++++++++ .../libraries/haskell/system-fileio/default.nix | 4 ++-- .../libraries/haskell/wai-extra/default.nix | 11 ++++++----- pkgs/top-level/haskell-defaults.nix | 4 +--- pkgs/top-level/haskell-packages.nix | 3 ++- 10 files changed, 45 insertions(+), 31 deletions(-) create mode 100644 pkgs/development/libraries/haskell/stringsearch/default.nix diff --git a/pkgs/development/libraries/haskell/ListLike/default.nix b/pkgs/development/libraries/haskell/ListLike/default.nix index a50fdb8ddc0..f0b1ccd8bc0 100644 --- a/pkgs/development/libraries/haskell/ListLike/default.nix +++ b/pkgs/development/libraries/haskell/ListLike/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "ListLike"; - version = "3.1.4"; - sha256 = "0cpj7vqlazs2yzh0ffhlg69kdb18xyicybfw614nlqfhhrp53lj9"; + version = "3.1.5"; + sha256 = "0hxpjmj5qdyb55wda2bgd3crkg9q6dklhj2kff7qz6wkx5fdbvjs"; isLibrary = true; isExecutable = true; meta = { diff --git a/pkgs/development/libraries/haskell/bson/default.nix b/pkgs/development/libraries/haskell/bson/default.nix index 3e0aacbaa9d..95700df7eef 100644 --- a/pkgs/development/libraries/haskell/bson/default.nix +++ b/pkgs/development/libraries/haskell/bson/default.nix @@ -1,17 +1,16 @@ -{ cabal, binary, compactStringFix, cryptohash, dataBinaryIeee754 -, mtl, network, time +{ cabal, binary, cryptohash, dataBinaryIeee754, mtl, network, text +, time }: cabal.mkDerivation (self: { pname = "bson"; - version = "0.1.7"; - sha256 = "1dmndq0rx22h9kxv31rxwqhwkgsvqg9qy4l0xmvpcvvl101zj4jx"; + version = "0.2.0"; + sha256 = "1m4bzbl3i9p8v78zjb4ilrpdxbxpqz5bgcpklvvkb2ipfkgqhmhx"; buildDepends = [ - binary compactStringFix cryptohash dataBinaryIeee754 mtl network - time + binary cryptohash dataBinaryIeee754 mtl network text time ]; meta = { - homepage = "http://github.com/TonyGen/bson-haskell"; + homepage = "http://github.com/selectel/bson-haskell"; description = "BSON documents are JSON-like objects with a standard binary encoding"; license = "unknown"; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/cpu/default.nix b/pkgs/development/libraries/haskell/cpu/default.nix index 832b7db0369..dc27553c2a3 100644 --- a/pkgs/development/libraries/haskell/cpu/default.nix +++ b/pkgs/development/libraries/haskell/cpu/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cpu"; - version = "0.1.0"; - sha256 = "020s1cv3qkhjq0gypxligg2x68izb3z82krv8y1m1k360554nqyg"; + version = "0.1.1"; + sha256 = "0ygkxx8ksa0rh63569d3g0w8pzgwg6062sd4yyi3q646zcmryhj6"; isLibrary = true; isExecutable = true; meta = { diff --git a/pkgs/development/libraries/haskell/iteratee/default.nix b/pkgs/development/libraries/haskell/iteratee/default.nix index 2a2708f70ac..14c125121bd 100644 --- a/pkgs/development/libraries/haskell/iteratee/default.nix +++ b/pkgs/development/libraries/haskell/iteratee/default.nix @@ -1,14 +1,16 @@ -{ cabal, ListLike, MonadCatchIOTransformers, parallel, transformers +{ cabal, ListLike, MonadCatchIOTransformers, monadControl, parallel +, transformers, transformersBase }: cabal.mkDerivation (self: { pname = "iteratee"; - version = "0.8.8.2"; - sha256 = "1d76an95y8svaja5ksx8p05fk22z62hp3gfwnd1d917qccffw6ry"; + version = "0.8.9.1"; + sha256 = "1yk7jvabmabf0qjcd00imbg7vx84yjf71h7x3zbv4a51ykfy5hax"; isLibrary = true; isExecutable = true; buildDepends = [ - ListLike MonadCatchIOTransformers parallel transformers + ListLike MonadCatchIOTransformers monadControl parallel + transformers transformersBase ]; meta = { homepage = "http://www.tiresiaspress.us/haskell/iteratee"; diff --git a/pkgs/development/libraries/haskell/mongoDB/default.nix b/pkgs/development/libraries/haskell/mongoDB/default.nix index ddbbdcb8093..aec216ea59d 100644 --- a/pkgs/development/libraries/haskell/mongoDB/default.nix +++ b/pkgs/development/libraries/haskell/mongoDB/default.nix @@ -1,17 +1,17 @@ { cabal, binary, bson, cryptohash, liftedBase, monadControl, mtl -, network, parsec, random, randomShuffle, transformersBase +, network, parsec, random, randomShuffle, text, transformersBase }: cabal.mkDerivation (self: { pname = "mongoDB"; - version = "1.2.0"; - sha256 = "0rffa13p889mxbbkj2bmqy3yada3mrhngvp8pp7qvrll1acm7s13"; + version = "1.3.0"; + sha256 = "1l6r55bicjdybn8jn9rp94aamjqy5j5qs2775m05aba8svsl4kma"; buildDepends = [ binary bson cryptohash liftedBase monadControl mtl network parsec - random randomShuffle transformersBase + random randomShuffle text transformersBase ]; meta = { - homepage = "http://github.com/TonyGen/mongoDB-haskell"; + homepage = "http://github.com/selectel/mongodb-haskell"; description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS"; license = "unknown"; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/stringsearch/default.nix b/pkgs/development/libraries/haskell/stringsearch/default.nix new file mode 100644 index 00000000000..8b5a8146150 --- /dev/null +++ b/pkgs/development/libraries/haskell/stringsearch/default.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "stringsearch"; + version = "0.3.6.3"; + sha256 = "1f0sl1zjya8glvlscf3g5i0in0ai1knls7kg9dp82grg2k287sgz"; + meta = { + homepage = "https://bitbucket.org/dafis/stringsearch"; + description = "Fast searching, splitting and replacing of ByteStrings"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/system-fileio/default.nix b/pkgs/development/libraries/haskell/system-fileio/default.nix index 4176cf2f6e2..58284655eb8 100644 --- a/pkgs/development/libraries/haskell/system-fileio/default.nix +++ b/pkgs/development/libraries/haskell/system-fileio/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "system-fileio"; - version = "0.3.7"; - sha256 = "0vjjpn3fq0s2assfg3p3wpk60jsrjp1f6i0djm3abdbmc53gqyi0"; + version = "0.3.8"; + sha256 = "0zv7ngxc3qgrlfbp0vqirzcwmkmi9ql8pgqhn1ls56iqwbxbb654"; buildDepends = [ systemFilepath text time ]; meta = { homepage = "https://john-millikin.com/software/haskell-filesystem/"; diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 9e716eb6c13..3c808dd430b 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -1,16 +1,17 @@ { cabal, ansiTerminal, blazeBuilder, blazeBuilderConduit , caseInsensitive, conduit, dataDefault, fastLogger, httpTypes -, network, resourcet, text, time, transformers, wai, zlibConduit +, network, resourcet, stringsearch, text, time, transformers, wai +, zlibConduit }: cabal.mkDerivation (self: { pname = "wai-extra"; - version = "1.2.0.4"; - sha256 = "10nd87bs6q1827ihwm13czflha2g8dhza443n55xpakba1sdgsaz"; + version = "1.2.0.5"; + sha256 = "0m9zdn6cdh2j7bwsf17225rdn7jwj7iy97khbd9g7p9rv1lpdain"; buildDepends = [ ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive - conduit dataDefault fastLogger httpTypes network resourcet text - time transformers wai zlibConduit + conduit dataDefault fastLogger httpTypes network resourcet + stringsearch text time transformers wai zlibConduit ]; meta = { homepage = "http://github.com/yesodweb/wai"; diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index d09d34dbf6d..64291854a03 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -245,7 +245,6 @@ prefFun = ghc741Prefs; }; - # Stable branch snapshot. packages_ghc742 = packages { ghcPath = ../development/compilers/ghc/7.4.2.nix; ghcBinary = ghc6121BinaryDarwin; @@ -255,8 +254,7 @@ # Reasonably current HEAD snapshot. Should *always* be lowPrio. packages_ghcHEAD = packages { ghcPath = ../development/compilers/ghc/head.nix; - ghcBinary = # (packages_ghc704.ghcWithPackages (self : [ self.alex self.happy ])) - ghc704Binary; + ghcBinary = ghc704Binary; prefFun = ghcHEADPrefs; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b009bcad23e..85ac31b46ef 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -149,7 +149,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); happy = self.happy_1_18_9; # 7.4.2 ok }; - haskellPlatformArgs_2012_2_0_0 = self : { inherit (self) cabal ghc; cgi = self.cgi_3001_1_7_4; # 7.4.1 ok @@ -1279,6 +1278,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); stringCombinators = callPackage ../development/libraries/haskell/string-combinators {}; + stringsearch = callPackage ../development/libraries/haskell/stringsearch {}; + syb_0_2_2 = callPackage ../development/libraries/haskell/syb/0.2.2.nix {}; syb_0_3 = callPackage ../development/libraries/haskell/syb/0.3.nix {}; syb_0_3_3 = callPackage ../development/libraries/haskell/syb/0.3.3.nix {}; From 2a60c221d14d9d16ecf9fa6bbc2cea6c70814a6d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 15 Jun 2012 15:33:47 +0000 Subject: [PATCH 300/403] git-annex: updated to version 3.20120614 svn path=/nixpkgs/trunk/; revision=34518 --- .../version-management/git-and-tools/git-annex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 d814c521398..c50999e41a4 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 @@ -5,14 +5,14 @@ }: let - version = "3.20120605"; + version = "3.20120614"; in stdenv.mkDerivation { name = "git-annex-${version}"; src = fetchurl { url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=refs/tags/${version}"; - sha256 = "5c8f6575bc6e1bc9bc19e1fb1b6305d2a1aee3365927ccfaf9aa48a200775900"; + sha256 = "ecb3b144a75a2eeb27061c46f3300c5117a5df260dddb36349eb8e75b6eebb16"; name = "git-annex-${version}.tar.gz"; }; From d9df48bd36626dc0e3027bc77e792be3b69aa340 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 15 Jun 2012 17:06:06 +0000 Subject: [PATCH 301/403] * Copy some things from the udev package. svn path=/nixpkgs/trunk/; revision=34519 --- pkgs/os-specific/linux/systemd/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 9aecaedb8cc..3a2df8d88d4 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { "--with-dbuspolicydir=$(out)/etc/dbus-1/system.d" "--with-dbussystemservicedir=$(out)/share/dbus-1/system-services" "--with-dbussessionservicedir=$(out)/share/dbus-1/services" + "--with-firmware-path=/root/test-firmware:/var/run/current-system/firmware" + "--with-pci-ids-path=${pciutils}/share/pci.ids" ]; preConfigure = From 9e76f38ee231c64a424d23e6e1d04a4d47383ed1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 15 Jun 2012 17:58:42 +0000 Subject: [PATCH 302/403] * kmod updated to version 8. Disabled the xz and zlib dependencies because they're inconvenient in the initrd. Put modprobe etc. in $out/sbin. svn path=/nixpkgs/trunk/; revision=34520 --- pkgs/os-specific/linux/kmod/default.nix | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix index b97a55b2ab5..db426b99c31 100644 --- a/pkgs/os-specific/linux/kmod/default.nix +++ b/pkgs/os-specific/linux/kmod/default.nix @@ -1,23 +1,26 @@ { stdenv, fetchurl, xz, zlib, pkgconfig }: -stdenv.mkDerivation { - name = "kmod-7"; +stdenv.mkDerivation rec { + name = "kmod-8"; src = fetchurl { - url = ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/kmod-7.tar.xz; - sha256 = "1xvsy2zcfdimj4j5b5yyxaqx2byabmwq8qlzjm0hqzpyxxgfw1lq"; + url = "mirror://kernel/linux/utils/kernel/kmod/${name}.tar.xz"; + sha256 = "0kbkjzcyhkwgcplwa29n0f03ccwpg4df83pdl5nkvsk2rzgx3xrm"; }; - buildInputs = [ pkgconfig xz zlib ]; + # Disable xz/zlib support to prevent needing them in the initrd. + + buildInputs = [ pkgconfig /* xz zlib */ ]; - configureFlags = [ "--with-xz" "--with-zlib" ]; + #configureFlags = [ "--with-xz" "--with-zlib" ]; patches = [ ./module-dir.patch ]; postInstall = '' - for prog in lsmod rmmod insmod modinfo modprobe depmod - do - ln -sv kmod $out/bin/$prog + ln -s kmod $out/bin/lsmod + mkdir -p $out/sbin + for prog in rmmod insmod modinfo modprobe depmod; do + ln -sv $out/bin/kmod $out/sbin/$prog done ''; From 404c21de2fa7ec36e92504f36a3dce95f8114704 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 15 Jun 2012 18:12:25 +0000 Subject: [PATCH 303/403] * kmod: look in /etc/modprobe.d. svn path=/nixpkgs/trunk/; revision=34521 --- pkgs/os-specific/linux/kmod/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix index db426b99c31..89d4c463cc7 100644 --- a/pkgs/os-specific/linux/kmod/default.nix +++ b/pkgs/os-specific/linux/kmod/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig /* xz zlib */ ]; - #configureFlags = [ "--with-xz" "--with-zlib" ]; + configureFlags = [ "--sysconfdir=/etc" /* "--with-xz" "--with-zlib" */ ]; patches = [ ./module-dir.patch ]; From 3874e5812d6cf07b6ee778c3f58df73b913bae93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 16 Jun 2012 10:49:03 +0000 Subject: [PATCH 304/403] Adding two kernel patches for mips, that make the life easier on loongson2f (less sigill, less sigbus). Related to bad handling of FPU instructions. I apply them only to linux 3.4, although I think they can apply to many older kernels too. svn path=/nixpkgs/trunk/; revision=34522 --- .../linux/kernel/mips-fpu-sigill.patch | 108 +++++++++++++ .../linux/kernel/mips-fpureg-emulation.patch | 144 ++++++++++++++++++ pkgs/os-specific/linux/kernel/patches.nix | 10 ++ pkgs/top-level/all-packages.nix | 3 + 4 files changed, 265 insertions(+) create mode 100644 pkgs/os-specific/linux/kernel/mips-fpu-sigill.patch create mode 100644 pkgs/os-specific/linux/kernel/mips-fpureg-emulation.patch diff --git a/pkgs/os-specific/linux/kernel/mips-fpu-sigill.patch b/pkgs/os-specific/linux/kernel/mips-fpu-sigill.patch new file mode 100644 index 00000000000..5a54f77dcb8 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/mips-fpu-sigill.patch @@ -0,0 +1,108 @@ +From bf55ef4e3c2f622ac013f196affbd11b67b59223 Mon Sep 17 00:00:00 2001 +From: Mark H Weaver +Date: Fri, 28 Oct 2011 13:24:37 -0400 +Subject: [PATCH 2/4] Fix handling of prefx instruction in mips/math-emu + +* The instruction is named prefx, not pfetch, and its function + field is 0x17, not 0x07. + +* Recognize the prefx instruction regardless of what bits happen to be + in bits 21-25, which is the format field of the floating-point ops, + but holds the base register of the prefx instruction. +--- + arch/mips/include/asm/inst.h | 4 ++-- + arch/mips/math-emu/cp1emu.c | 16 +++++++--------- + 2 files changed, 9 insertions(+), 11 deletions(-) + +diff --git a/arch/mips/include/asm/inst.h b/arch/mips/include/asm/inst.h +index ab84064..3048edc 100644 +--- a/arch/mips/include/asm/inst.h ++++ b/arch/mips/include/asm/inst.h +@@ -161,8 +161,8 @@ enum cop1_sdw_func { + */ + enum cop1x_func { + lwxc1_op = 0x00, ldxc1_op = 0x01, +- pfetch_op = 0x07, swxc1_op = 0x08, +- sdxc1_op = 0x09, madd_s_op = 0x20, ++ swxc1_op = 0x08, sdxc1_op = 0x09, ++ prefx_op = 0x17, madd_s_op = 0x20, + madd_d_op = 0x21, madd_e_op = 0x22, + msub_s_op = 0x28, msub_d_op = 0x29, + msub_e_op = 0x2a, nmadd_s_op = 0x30, +diff --git a/arch/mips/math-emu/cp1emu.c b/arch/mips/math-emu/cp1emu.c +index dbf2f93..87ddba1 100644 +--- a/arch/mips/math-emu/cp1emu.c ++++ b/arch/mips/math-emu/cp1emu.c +@@ -739,7 +739,7 @@ static int fpux_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx, + break; + + default: +- return SIGILL; ++ goto SIGILL_unless_prefx_op; + } + break; + } +@@ -809,19 +809,17 @@ static int fpux_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx, + goto copcsr; + + default: +- return SIGILL; ++ goto SIGILL_unless_prefx_op; + } + break; + } + +- case 0x7: /* 7 */ +- if (MIPSInst_FUNC(ir) != pfetch_op) { +- return SIGILL; +- } +- /* ignore prefx operation */ +- break; +- + default: ++ SIGILL_unless_prefx_op: ++ if (MIPSInst_FUNC(ir) == prefx_op) { ++ /* ignore prefx operation */ ++ break; ++ } + return SIGILL; + } + +-- +1.7.5.4 + +From 97a564e3eddbfb84844b8eccb3bd751c71dfb3eb Mon Sep 17 00:00:00 2001 +From: Mark H Weaver +Date: Fri, 28 Oct 2011 13:35:27 -0400 +Subject: [PATCH 3/4] Don't process empty cause flags after simple fp move on + mips + +--- + arch/mips/math-emu/cp1emu.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/mips/math-emu/cp1emu.c b/arch/mips/math-emu/cp1emu.c +index 87ddba1..fefcba2 100644 +--- a/arch/mips/math-emu/cp1emu.c ++++ b/arch/mips/math-emu/cp1emu.c +@@ -912,7 +912,7 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx, + case fmov_op: + /* an easy one */ + SPFROMREG(rv.s, MIPSInst_FS(ir)); +- goto copcsr; ++ break; + + /* binary op on handler */ + scopbop: +@@ -1099,7 +1099,7 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx, + case fmov_op: + /* an easy one */ + DPFROMREG(rv.d, MIPSInst_FS(ir)); +- goto copcsr; ++ break; + + /* binary op on handler */ + dcopbop:{ +-- +1.7.5.4 + diff --git a/pkgs/os-specific/linux/kernel/mips-fpureg-emulation.patch b/pkgs/os-specific/linux/kernel/mips-fpureg-emulation.patch new file mode 100644 index 00000000000..452c4f26f6f --- /dev/null +++ b/pkgs/os-specific/linux/kernel/mips-fpureg-emulation.patch @@ -0,0 +1,144 @@ +From ab1ce0a6cd51ca83194a865837f3b90f366a733d Mon Sep 17 00:00:00 2001 +From: Lluis Batlle i Rossell +Date: Sat, 16 Jun 2012 00:22:53 +0200 +Subject: [PATCH] MIPS: Add emulation for fpureg-mem unaligned access +To: linux-mips@linux-mips.org +Cc: loongson-dev@googlegroups.com + +Reusing most of the code from lw,ld,sw,sd emulation, +I add the emulation for lwc1,ldc1,swc1,sdc1. + +This avoids the direct SIGBUS sent to userspace processes that have +misaligned memory accesses. + +I've tested the change in Loongson2F, with an own test program, and +WebKit 1.4.0, as both were killed by sigbus without this patch. + +Signed-off: Lluis Batlle i Rossell +--- + arch/mips/kernel/unaligned.c | 43 +++++++++++++++++++++++++++++------------- + 1 file changed, 30 insertions(+), 13 deletions(-) + +diff --git a/arch/mips/kernel/unaligned.c b/arch/mips/kernel/unaligned.c +index 9c58bdf..4531e6c 100644 +--- a/arch/mips/kernel/unaligned.c ++++ b/arch/mips/kernel/unaligned.c +@@ -85,6 +85,7 @@ + #include + #include + #include ++#include + + #define STR(x) __STR(x) + #define __STR(x) #x +@@ -108,6 +109,7 @@ static void emulate_load_store_insn(struct pt_regs *regs, + union mips_instruction insn; + unsigned long value; + unsigned int res; ++ fpureg_t *fpuregs; + + perf_sw_event(PERF_COUNT_SW_EMULATION_FAULTS, 1, regs, 0); + +@@ -183,6 +185,7 @@ static void emulate_load_store_insn(struct pt_regs *regs, + break; + + case lw_op: ++ case lwc1_op: + if (!access_ok(VERIFY_READ, addr, 4)) + goto sigbus; + +@@ -209,7 +212,12 @@ static void emulate_load_store_insn(struct pt_regs *regs, + if (res) + goto fault; + compute_return_epc(regs); +- regs->regs[insn.i_format.rt] = value; ++ if (insn.i_format.opcode == lw_op) { ++ regs->regs[insn.i_format.rt] = value; ++ } else { ++ fpuregs = get_fpu_regs(current); ++ fpuregs[insn.i_format.rt] = value; ++ } + break; + + case lhu_op: +@@ -291,6 +299,7 @@ static void emulate_load_store_insn(struct pt_regs *regs, + goto sigill; + + case ld_op: ++ case ldc1_op: + #ifdef CONFIG_64BIT + /* + * A 32-bit kernel might be running on a 64-bit processor. But +@@ -325,7 +334,12 @@ static void emulate_load_store_insn(struct pt_regs *regs, + if (res) + goto fault; + compute_return_epc(regs); +- regs->regs[insn.i_format.rt] = value; ++ if (insn.i_format.opcode == ld_op) { ++ regs->regs[insn.i_format.rt] = value; ++ } else { ++ fpuregs = get_fpu_regs(current); ++ fpuregs[insn.i_format.rt] = value; ++ } + break; + #endif /* CONFIG_64BIT */ + +@@ -370,10 +384,16 @@ static void emulate_load_store_insn(struct pt_regs *regs, + break; + + case sw_op: ++ case swc1_op: + if (!access_ok(VERIFY_WRITE, addr, 4)) + goto sigbus; + +- value = regs->regs[insn.i_format.rt]; ++ if (insn.i_format.opcode == sw_op) { ++ value = regs->regs[insn.i_format.rt]; ++ } else { ++ fpuregs = get_fpu_regs(current); ++ value = fpuregs[insn.i_format.rt]; ++ } + __asm__ __volatile__ ( + #ifdef __BIG_ENDIAN + "1:\tswl\t%1,(%2)\n" +@@ -401,6 +421,7 @@ static void emulate_load_store_insn(struct pt_regs *regs, + break; + + case sd_op: ++ case sdc1_op: + #ifdef CONFIG_64BIT + /* + * A 32-bit kernel might be running on a 64-bit processor. But +@@ -412,7 +433,12 @@ static void emulate_load_store_insn(struct pt_regs *regs, + if (!access_ok(VERIFY_WRITE, addr, 8)) + goto sigbus; + +- value = regs->regs[insn.i_format.rt]; ++ if (insn.i_format.opcode == sd_op) { ++ value = regs->regs[insn.i_format.rt]; ++ } else { ++ fpuregs = get_fpu_regs(current); ++ value = fpuregs[insn.i_format.rt]; ++ } + __asm__ __volatile__ ( + #ifdef __BIG_ENDIAN + "1:\tsdl\t%1,(%2)\n" +@@ -443,15 +469,6 @@ static void emulate_load_store_insn(struct pt_regs *regs, + /* Cannot handle 64-bit instructions in 32-bit kernel */ + goto sigill; + +- case lwc1_op: +- case ldc1_op: +- case swc1_op: +- case sdc1_op: +- /* +- * I herewith declare: this does not happen. So send SIGBUS. +- */ +- goto sigbus; +- + /* + * COP2 is available to implementor for application specific use. + * It's up to applications to register a notifier chain and do +-- +1.7.9.5 + diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 7aefc7c5c0f..4ac33380398 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -353,6 +353,16 @@ rec { patch = ./mips_restart.patch; }; + mips_fpureg_emu = + { name = "mips-fpureg-emulation"; + patch = ./mips-fpureg-emulation.patch; + }; + + mips_fpu_sigill = + { name = "mips-fpu-sigill"; + patch = ./mips-fpu-sigill.patch; + }; + guruplug_defconfig = { # Default configuration for the GuruPlug. From # . diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 843379dbd4d..f3131898bd3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5681,6 +5681,9 @@ let [ #kernelPatches.fbcondecor_2_6_38 kernelPatches.sec_perm_2_6_24 kernelPatches.aufs3_4 + ] ++ lib.optionals (platform.kernelArch == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill ]; }; From a77ecd2199d0834f8c745fba89a26971068e8518 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 16 Jun 2012 14:15:32 +0000 Subject: [PATCH 305/403] libsigcxx: strip trailing whitespace svn path=/nixpkgs/trunk/; revision=34524 --- pkgs/development/libraries/libsigcxx/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix index c8aa87b26e0..f8fdb4c28c2 100644 --- a/pkgs/development/libraries/libsigcxx/default.nix +++ b/pkgs/development/libraries/libsigcxx/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "libsigc++-2.2.10"; - + src = fetchurl { url = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.2/${name}.tar.xz"; sha256 = "8ceb6f2732f5399ef50d5b70f433d49945a12e0900b8f9f43c135866a2e5bf47"; From ba3c1f4a93f728be109711361aacb3ba32c5b2f0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 16 Jun 2012 14:15:42 +0000 Subject: [PATCH 306/403] libtorrent: updated to version 0.13.2 svn path=/nixpkgs/trunk/; revision=34525 --- pkgs/tools/networking/p2p/libtorrent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix index 76aedf1c0ef..fb0a889d3ee 100644 --- a/pkgs/tools/networking/p2p/libtorrent/default.nix +++ b/pkgs/tools/networking/p2p/libtorrent/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, openssl, libsigcxx }: let - version = "0.12.9"; + version = "0.13.2"; in stdenv.mkDerivation { name = "libtorrent-${version}"; src = fetchurl { url = "http://libtorrent.rakshasa.no/downloads/libtorrent-${version}.tar.gz"; - sha256 = "0r5gjh2kc6fdimh5xxg7qsx2390cxw4fz6srgr20y1sxsj6rxp0m"; + sha256 = "ed2f2dea16c29cac63fa2724f6658786d955f975861fa6811bcf1597ff8a5e4f"; }; buildInputs = [ pkgconfig openssl libsigcxx ]; From 3c57d2b40e6538f10a26d34f3355e3716c592927 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 16 Jun 2012 14:15:46 +0000 Subject: [PATCH 307/403] rtorrent: updated to version 0.9.2 svn path=/nixpkgs/trunk/; revision=34526 --- pkgs/tools/networking/p2p/rtorrent/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix index ae52865eace..b503c1d9152 100644 --- a/pkgs/tools/networking/p2p/rtorrent/default.nix +++ b/pkgs/tools/networking/p2p/rtorrent/default.nix @@ -2,21 +2,22 @@ , zlib, openssl }: let - version = "0.8.9"; + version = "0.9.2"; in stdenv.mkDerivation { name = "rtorrent-${version}"; src = fetchurl { url = "http://libtorrent.rakshasa.no/downloads/rtorrent-${version}.tar.gz"; - sha256 = "cca70eb36a0c176bbd6fdb3afe2bc9f163fa4c9377fc33bc29689dec60cf6d84"; + sha256 = "5c8f8c780bee376afce3c1cde2f5ecb928f40bac23b2b8171deed5cf3c888c3d"; }; buildInputs = [ libtorrent ncurses pkgconfig libsigcxx curl zlib openssl ]; postInstall = '' - mkdir -p $out/share/man/man1 + mkdir -p $out/share/man/man1 $out/share/rtorrent mv doc/rtorrent.1 $out/share/man/man1/rtorrent.1 + mv doc/rtorrent.rc $out/share/rtorrent/rtorrent.rc ''; meta = { From a5c2318d0852863ec50f39e8640c56d885a0c9aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 16 Jun 2012 15:37:04 +0000 Subject: [PATCH 308/403] Fixing the mips patch for sigill fpu cases. svn path=/nixpkgs/trunk/; revision=34527 --- .../linux/kernel/mips-fpu-sigill.patch | 399 ++++++++++++++++++ 1 file changed, 399 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/mips-fpu-sigill.patch b/pkgs/os-specific/linux/kernel/mips-fpu-sigill.patch index 5a54f77dcb8..248aba2b2c2 100644 --- a/pkgs/os-specific/linux/kernel/mips-fpu-sigill.patch +++ b/pkgs/os-specific/linux/kernel/mips-fpu-sigill.patch @@ -106,3 +106,402 @@ index 87ddba1..fefcba2 100644 -- 1.7.5.4 +From 4051727b3007ef3675e7258ed86fa8517f86d929 Mon Sep 17 00:00:00 2001 +From: Mark H Weaver +Date: Fri, 28 Oct 2011 13:39:10 -0400 +Subject: [PATCH 4/4] Support Loongson2f floating-point instructions in + mips/math-emu + +* (arch/mips/include/asm/inst.h): Add Loongson2f function field values + for madd/msub/nmadd/nmsub that use the spec2 opcode, and the + Loongson2f/MIPS-5 format field value for paired-single + floating-point operations. + +* (arch/mips/math-emu/cp1emu.c): Add support for the Loongson2f + instructions for madd/msub/nmadd/nmsub, which use the spec2 opcode. + Also add support for the Loongson2f instructions that use the + paired-single floating-point format. +--- + arch/mips/include/asm/inst.h | 4 +- + arch/mips/math-emu/cp1emu.c | 287 +++++++++++++++++++++++++++++++++++++++++- + 2 files changed, 289 insertions(+), 2 deletions(-) + +diff --git a/arch/mips/include/asm/inst.h b/arch/mips/include/asm/inst.h +index 3048edc..0e8ba7c 100644 +--- a/arch/mips/include/asm/inst.h ++++ b/arch/mips/include/asm/inst.h +@@ -61,6 +61,8 @@ enum spec_op { + enum spec2_op { + madd_op, maddu_op, mul_op, spec2_3_unused_op, + msub_op, msubu_op, /* more unused ops */ ++ loongson_madd_op = 0x18, loongson_msub_op, ++ loongson_nmadd_op, loongson_nmsub_op, + clz_op = 0x20, clo_op, + dclz_op = 0x24, dclo_op, + sdbpp_op = 0x3f +@@ -133,7 +135,7 @@ enum cop0_com_func { + */ + enum cop1_fmt { + s_fmt, d_fmt, e_fmt, q_fmt, +- w_fmt, l_fmt ++ w_fmt, l_fmt, ps_fmt + }; + + /* +diff --git a/arch/mips/math-emu/cp1emu.c b/arch/mips/math-emu/cp1emu.c +index fefcba2..166b2a4 100644 +--- a/arch/mips/math-emu/cp1emu.c ++++ b/arch/mips/math-emu/cp1emu.c +@@ -7,6 +7,9 @@ + * Kevin D. Kissell, kevink@mips.com and Carsten Langgaard, carstenl@mips.com + * Copyright (C) 2000 MIPS Technologies, Inc. + * ++ * Loongson instruction support ++ * Copyright (C) 2011 Mark H Weaver ++ * + * This program is free software; you can distribute it and/or modify it + * under the terms of the GNU General Public License (Version 2) as + * published by the Free Software Foundation. +@@ -57,6 +60,14 @@ + #endif + #define __mips 4 + ++#ifdef __loongson_fp ++#undef __loongson_fp ++#endif ++#if __mips >= 4 && __mips != 32 ++/* Include support for Loongson floating point instructions */ ++#define __loongson_fp 1 ++#endif ++ + /* Function which emulates a floating point instruction. */ + + static int fpu_emu(struct pt_regs *, struct mips_fpu_struct *, +@@ -66,6 +77,10 @@ static int fpu_emu(struct pt_regs *, struct mips_fpu_struct *, + static int fpux_emu(struct pt_regs *, + struct mips_fpu_struct *, mips_instruction, void *__user *); + #endif ++#ifdef __loongson_fp ++static int loongson_spec2_emu(struct pt_regs *, ++ struct mips_fpu_struct *, mips_instruction, void *__user *); ++#endif + + /* Further private data for which no space exists in mips_fpu_struct */ + +@@ -203,6 +218,14 @@ static inline int cop1_64bit(struct pt_regs *xcp) + #define DPFROMREG(dp, x) DIFROMREG((dp).bits, x) + #define DPTOREG(dp, x) DITOREG((dp).bits, x) + ++/* Support for Loongson paired single floating-point format */ ++#define PSIFROMREG(si1, si2, x) ({ u64 di; DIFROMREG(di, x); \ ++ (si1) = (u32)di; (si2) = (u32)(di >> 32); }) ++#define PSITOREG(si1, si2, x) DITOREG((si1) | ((u64)(si2) << 32), x) ++ ++#define PSPFROMREG(sp1, sp2, x) PSIFROMREG((sp1).bits, (sp2).bits, x) ++#define PSPTOREG(sp1, sp2, x) PSITOREG((sp1).bits, (sp2).bits, x) ++ + /* + * Emulate the single floating point instruction pointed at by EPC. + * Two instructions if the instruction is in a branch delay slot. +@@ -568,6 +591,15 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx, + break; + #endif + ++#ifdef __loongson_fp ++ case spec2_op:{ ++ int sig = loongson_spec2_emu(xcp, ctx, ir, fault_addr); ++ if (sig) ++ return sig; ++ break; ++ } ++#endif ++ + default: + return SIGILL; + } +@@ -646,6 +678,172 @@ DEF3OP(msub, dp, ieee754dp_mul, ieee754dp_sub, ); + DEF3OP(nmadd, dp, ieee754dp_mul, ieee754dp_add, ieee754dp_neg); + DEF3OP(nmsub, dp, ieee754dp_mul, ieee754dp_sub, ieee754dp_neg); + ++#ifdef __loongson_fp ++static int loongson_spec2_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx, ++ mips_instruction ir, void *__user *fault_addr) ++{ ++ int rfmt; /* resulting format */ ++ unsigned rcsr = 0; /* resulting csr */ ++ union { ++ ieee754dp d; ++ struct { ++ ieee754sp s; ++ ieee754sp s2; ++ }; ++ } rv; /* resulting value */ ++ ++ /* XXX maybe add a counter for loongson spec2 fp instructions? */ ++ /* MIPS_FPU_EMU_INC_STATS(cp1xops); */ ++ ++ switch (rfmt = (MIPSInst_FFMT(ir) & 0xf)) { ++ case s_fmt:{ ++ ieee754sp(*handler) (ieee754sp, ieee754sp, ieee754sp); ++ ieee754sp fd, fs, ft; ++ ++ switch (MIPSInst_FUNC(ir)) { ++ case loongson_madd_op: ++ handler = fpemu_sp_madd; ++ goto scoptop; ++ case loongson_msub_op: ++ handler = fpemu_sp_msub; ++ goto scoptop; ++ case loongson_nmadd_op: ++ handler = fpemu_sp_nmadd; ++ goto scoptop; ++ case loongson_nmsub_op: ++ handler = fpemu_sp_nmsub; ++ goto scoptop; ++ ++ scoptop: ++ SPFROMREG(fd, MIPSInst_FD(ir)); ++ SPFROMREG(fs, MIPSInst_FS(ir)); ++ SPFROMREG(ft, MIPSInst_FT(ir)); ++ rv.s = (*handler) (fd, fs, ft); ++ ++ copcsr: ++ if (ieee754_cxtest(IEEE754_INEXACT)) ++ rcsr |= FPU_CSR_INE_X | FPU_CSR_INE_S; ++ if (ieee754_cxtest(IEEE754_UNDERFLOW)) ++ rcsr |= FPU_CSR_UDF_X | FPU_CSR_UDF_S; ++ if (ieee754_cxtest(IEEE754_OVERFLOW)) ++ rcsr |= FPU_CSR_OVF_X | FPU_CSR_OVF_S; ++ if (ieee754_cxtest(IEEE754_INVALID_OPERATION)) ++ rcsr |= FPU_CSR_INV_X | FPU_CSR_INV_S; ++ ++ break; ++ ++ default: ++ return SIGILL; ++ } ++ break; ++ } ++ ++ case d_fmt:{ ++ ieee754dp(*handler) (ieee754dp, ieee754dp, ieee754dp); ++ ieee754dp fd, fs, ft; ++ ++ switch (MIPSInst_FUNC(ir)) { ++ case loongson_madd_op: ++ handler = fpemu_dp_madd; ++ goto dcoptop; ++ case loongson_msub_op: ++ handler = fpemu_dp_msub; ++ goto dcoptop; ++ case loongson_nmadd_op: ++ handler = fpemu_dp_nmadd; ++ goto dcoptop; ++ case loongson_nmsub_op: ++ handler = fpemu_dp_nmsub; ++ goto dcoptop; ++ ++ dcoptop: ++ DPFROMREG(fd, MIPSInst_FD(ir)); ++ DPFROMREG(fs, MIPSInst_FS(ir)); ++ DPFROMREG(ft, MIPSInst_FT(ir)); ++ rv.d = (*handler) (fd, fs, ft); ++ goto copcsr; ++ ++ default: ++ return SIGILL; ++ } ++ break; ++ } ++ ++ case ps_fmt:{ ++ ieee754sp(*handler) (ieee754sp, ieee754sp, ieee754sp); ++ struct _ieee754_csr ieee754_csr_save; ++ ieee754sp fd1, fs1, ft1; ++ ieee754sp fd2, fs2, ft2; ++ ++ switch (MIPSInst_FUNC(ir)) { ++ case loongson_madd_op: ++ handler = fpemu_sp_madd; ++ goto pscoptop; ++ case loongson_msub_op: ++ handler = fpemu_sp_msub; ++ goto pscoptop; ++ case loongson_nmadd_op: ++ handler = fpemu_sp_nmadd; ++ goto pscoptop; ++ case loongson_nmsub_op: ++ handler = fpemu_sp_nmsub; ++ goto pscoptop; ++ ++ pscoptop: ++ PSPFROMREG(fd1, fd2, MIPSInst_FD(ir)); ++ PSPFROMREG(fs1, fs2, MIPSInst_FS(ir)); ++ PSPFROMREG(ft1, ft2, MIPSInst_FT(ir)); ++ rv.s = (*handler) (fd1, fs1, ft1); ++ ieee754_csr_save = ieee754_csr; ++ rv.s2 = (*handler) (fd2, fs2, ft2); ++ ieee754_csr.cx |= ieee754_csr_save.cx; ++ ieee754_csr.sx |= ieee754_csr_save.sx; ++ goto copcsr; ++ ++ default: ++ return SIGILL; ++ } ++ break; ++ } ++ ++ default: ++ return SIGILL; ++ } ++ ++ /* ++ * Update the fpu CSR register for this operation. ++ * If an exception is required, generate a tidy SIGFPE exception, ++ * without updating the result register. ++ * Note: cause exception bits do not accumulate, they are rewritten ++ * for each op; only the flag/sticky bits accumulate. ++ */ ++ ctx->fcr31 = (ctx->fcr31 & ~FPU_CSR_ALL_X) | rcsr; ++ if ((ctx->fcr31 >> 5) & ctx->fcr31 & FPU_CSR_ALL_E) { ++ /*printk ("SIGFPE: fpu csr = %08x\n",ctx->fcr31); */ ++ return SIGFPE; ++ } ++ ++ /* ++ * Now we can safely write the result back to the register file. ++ */ ++ switch (rfmt) { ++ case d_fmt: ++ DPTOREG(rv.d, MIPSInst_FD(ir)); ++ break; ++ case s_fmt: ++ SPTOREG(rv.s, MIPSInst_FD(ir)); ++ break; ++ case ps_fmt: ++ PSPTOREG(rv.s, rv.s2, MIPSInst_FD(ir)); ++ break; ++ default: ++ return SIGILL; ++ } ++ ++ return 0; ++} ++#endif ++ + static int fpux_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx, + mips_instruction ir, void *__user *fault_addr) + { +@@ -840,7 +1038,12 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx, + unsigned cond; + union { + ieee754dp d; +- ieee754sp s; ++ struct { ++ ieee754sp s; ++#ifdef __loongson_fp ++ ieee754sp s2; /* for Loongson paired singles */ ++#endif ++ }; + int w; + #ifdef __mips64 + s64 l; +@@ -1210,6 +1413,83 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx, + break; + } + ++#ifdef __loongson_fp ++ case ps_fmt:{ /* 6 */ ++ /* Support for Loongson paired single fp instructions */ ++ union { ++ ieee754sp(*b) (ieee754sp, ieee754sp); ++ ieee754sp(*u) (ieee754sp); ++ } handler; ++ ++ switch (MIPSInst_FUNC(ir)) { ++ /* binary ops */ ++ case fadd_op: ++ handler.b = ieee754sp_add; ++ goto pscopbop; ++ case fsub_op: ++ handler.b = ieee754sp_sub; ++ goto pscopbop; ++ case fmul_op: ++ handler.b = ieee754sp_mul; ++ goto pscopbop; ++ ++ /* unary ops */ ++ case fabs_op: ++ handler.u = ieee754sp_abs; ++ goto pscopuop; ++ case fneg_op: ++ handler.u = ieee754sp_neg; ++ goto pscopuop; ++ case fmov_op: ++ /* an easy one */ ++ PSPFROMREG(rv.s, rv.s2, MIPSInst_FS(ir)); ++ break; ++ ++ pscopbop: /* paired binary op handler */ ++ { ++ struct _ieee754_csr ieee754_csr_save; ++ ieee754sp fs1, ft1; ++ ieee754sp fs2, ft2; ++ ++ PSPFROMREG(fs1, fs2, MIPSInst_FS(ir)); ++ PSPFROMREG(ft1, ft2, MIPSInst_FT(ir)); ++ rv.s = (*handler.b) (fs1, ft1); ++ ieee754_csr_save = ieee754_csr; ++ rv.s2 = (*handler.b) (fs2, ft2); ++ ieee754_csr.cx |= ieee754_csr_save.cx; ++ ieee754_csr.sx |= ieee754_csr_save.sx; ++ goto copcsr; ++ } ++ pscopuop: /* paired unary op handler */ ++ { ++ struct _ieee754_csr ieee754_csr_save; ++ ieee754sp fs1; ++ ieee754sp fs2; ++ ++ PSPFROMREG(fs1, fs2, MIPSInst_FS(ir)); ++ rv.s = (*handler.u) (fs1); ++ ieee754_csr_save = ieee754_csr; ++ rv.s2 = (*handler.u) (fs2); ++ ieee754_csr.cx |= ieee754_csr_save.cx; ++ ieee754_csr.sx |= ieee754_csr_save.sx; ++ goto copcsr; ++ } ++ break; ++ ++ default: ++ if (MIPSInst_FUNC(ir) >= fcmp_op) { ++ /* Loongson fp hardware handles all ++ cases of fp compare insns, so we ++ shouldn't have to */ ++ printk ("Loongson paired-single fp compare" ++ " unimplemented in cp1emu.c\n"); ++ } ++ return SIGILL; ++ } ++ break; ++ } ++#endif ++ + case w_fmt:{ + ieee754sp fs; + +@@ -1299,6 +1579,11 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx, + DITOREG(rv.l, MIPSInst_FD(ir)); + break; + #endif ++#ifdef __loongson_fp ++ case ps_fmt: ++ PSPTOREG(rv.s, rv.s2, MIPSInst_FD(ir)); ++ break; ++#endif + default: + return SIGILL; + } +-- +1.7.5.4 + From 5808b3804cfc66950af371c66aa3554364d0f98b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 17 Jun 2012 03:36:22 +0000 Subject: [PATCH 309/403] * Add bchunk. svn path=/nixpkgs/trunk/; revision=34529 --- pkgs/tools/cd-dvd/bchunk/default.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/cd-dvd/bchunk/default.nix diff --git a/pkgs/tools/cd-dvd/bchunk/default.nix b/pkgs/tools/cd-dvd/bchunk/default.nix new file mode 100644 index 00000000000..b70ad1fa685 --- /dev/null +++ b/pkgs/tools/cd-dvd/bchunk/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "bchunk-1.2.0"; + + src = fetchurl { + url = "http://he.fi/bchunk/${name}.tar.gz"; + sha256 = "0pcbyx3689cbl23dcij497hb3q5f1wmki7cxic5nzldx71g9vp5g"; + }; + + preConfigure = + '' + substituteInPlace Makefile \ + --replace "-o root -g root" "" \ + --replace "-o bin -g bin" "" + ''; + + makeFlags = "PREFIX=$(out) MAN_DIR=$(out)/share/man"; + + preInstall = "mkdir -p $out/bin $out/share/man/man1"; + + meta = { + homepage = http://he.fi/bchunk/; + description = "A program that converts CD-ROM images in BIN/CUE format into a set of ISO and CDR tracks"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3131898bd3..cb02af387c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -431,6 +431,8 @@ let bc = callPackage ../tools/misc/bc { }; + bchunk = callPackage ../tools/cd-dvd/bchunk { }; + bfr = callPackage ../tools/misc/bfr { }; bootchart = callPackage ../tools/system/bootchart { }; From d3ffbea9d648c4d2456601f761aa9448f7bb7841 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 17 Jun 2012 17:12:31 +0000 Subject: [PATCH 310/403] Updating firefox 13.0 to 13.0.1. Maybe this improves the flash issue. svn path=/nixpkgs/trunk/; revision=34530 --- pkgs/applications/networking/browsers/firefox/13.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/13.0.nix b/pkgs/applications/networking/browsers/firefox/13.0.nix index 8b1ab901c23..e66fa4d28a1 100644 --- a/pkgs/applications/networking/browsers/firefox/13.0.nix +++ b/pkgs/applications/networking/browsers/firefox/13.0.nix @@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; rec { - firefoxVersion = "13.0"; + firefoxVersion = "13.0.1"; xulVersion = "13.0"; # this attribute is used by other packages src = fetchurl { url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha1 = "f90608874a54883b9fbb90b8d6dd3dc75a305572"; + sha1 = "3752f13f26a51dd2e42d2805a707a842e6f8d1b1"; }; commonConfigureFlags = From 0de49e8c04e71b9235ccccb63c104328b75d71ab Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Sun, 17 Jun 2012 18:41:00 +0000 Subject: [PATCH 311/403] StarDict is a Cross-Platform and international dictionary Software. Now it is available on NixOS. See https://nixos.org/wiki/Solve_GConf_errors_when_running_GNOME_applications if you want to get it running. svn path=/nixpkgs/trunk/; revision=34531 --- .../stardict-3.0.3-compositelookup_cpp.patch | 19 ++++++++ .../stardict-3.0.3-correct-glib-include.patch | 13 ++++++ .../misc/stardict/stardict-3.0.3-entry.patch | 20 ++++++++ .../misc/stardict/stardict-3.0.3-gcc46.patch | 13 ++++++ .../stardict/stardict-3.0.3-overflow.patch | 26 +++++++++++ .../stardict-3.0.3-zlib-1.2.5.2.patch | 39 ++++++++++++++++ pkgs/applications/misc/stardict/stardict.nix | 46 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 8 files changed, 180 insertions(+) create mode 100644 pkgs/applications/misc/stardict/stardict-3.0.3-compositelookup_cpp.patch create mode 100644 pkgs/applications/misc/stardict/stardict-3.0.3-correct-glib-include.patch create mode 100644 pkgs/applications/misc/stardict/stardict-3.0.3-entry.patch create mode 100644 pkgs/applications/misc/stardict/stardict-3.0.3-gcc46.patch create mode 100644 pkgs/applications/misc/stardict/stardict-3.0.3-overflow.patch create mode 100644 pkgs/applications/misc/stardict/stardict-3.0.3-zlib-1.2.5.2.patch create mode 100644 pkgs/applications/misc/stardict/stardict.nix diff --git a/pkgs/applications/misc/stardict/stardict-3.0.3-compositelookup_cpp.patch b/pkgs/applications/misc/stardict/stardict-3.0.3-compositelookup_cpp.patch new file mode 100644 index 00000000000..86825555d9c --- /dev/null +++ b/pkgs/applications/misc/stardict/stardict-3.0.3-compositelookup_cpp.patch @@ -0,0 +1,19 @@ +This patch is from OpenSUSE .src.rpm for the following crash on startup: + +ERROR:compositelookup.cpp:53:void CompositeLookup::send_net_dict_request(const string&, const string&): assertion failed: (NetDictRequests.end() == std::find(NetDictRequests.begin(), NetDictRequests.end(), request)) + +--- dict/src/lib/compositelookup.cpp ++++ dict/src/lib/compositelookup.cpp +@@ -50,8 +50,10 @@ + void CompositeLookup::send_net_dict_request(const std::string& dict_id, const std::string& key) + { + NetDictRequest request(dict_id, key); +- g_assert(NetDictRequests.end() == std::find(NetDictRequests.begin(), NetDictRequests.end(), request)); +- NetDictRequests.push_back(request); ++ if(NetDictRequests.end() == std::find(NetDictRequests.begin(), NetDictRequests.end(), request)) ++ { ++ NetDictRequests.push_back(request); ++ } + } + + /* returns true if got expected response */ diff --git a/pkgs/applications/misc/stardict/stardict-3.0.3-correct-glib-include.patch b/pkgs/applications/misc/stardict/stardict-3.0.3-correct-glib-include.patch new file mode 100644 index 00000000000..fd89243938e --- /dev/null +++ b/pkgs/applications/misc/stardict/stardict-3.0.3-correct-glib-include.patch @@ -0,0 +1,13 @@ +http://bugs.gentoo.org/396219 + +--- dict/src/tomboykeybinder.h ++++ dict/src/tomboykeybinder.h +@@ -21,7 +21,7 @@ + #ifndef __TOMBOY_KEY_BINDER_H__ + #define __TOMBOY_KEY_BINDER_H__ + +-#include ++#include + + G_BEGIN_DECLS + diff --git a/pkgs/applications/misc/stardict/stardict-3.0.3-entry.patch b/pkgs/applications/misc/stardict/stardict-3.0.3-entry.patch new file mode 100644 index 00000000000..38182b0c8e0 --- /dev/null +++ b/pkgs/applications/misc/stardict/stardict-3.0.3-entry.patch @@ -0,0 +1,20 @@ +warning: key "Encoding" in group "Desktop Entry" is deprecated +error: value "stardict.png" for key "Icon" in group "Desktop Entry" is an icon name with an extension, but there should be no extension +error: value "Dictionary" in key "Categories" in group "Desktop Entry" requires another category to be present among the following categories: Office;TextTools + +--- dict/data/stardict.desktop.in ++++ dict/data/stardict.desktop.in +@@ -1,11 +1,10 @@ + [Desktop Entry] +-Encoding=UTF-8 + _Name=StarDict + _Comment=Lookup words + Exec=stardict + Terminal=false + Type=Application +-Icon=stardict.png ++Icon=stardict + StartupNotify=true +-Categories=Utility;Dictionary; ++Categories=Utility;Office;TextTools;Dictionary; + X-GNOME-DocPath=stardict/stardict.xml diff --git a/pkgs/applications/misc/stardict/stardict-3.0.3-gcc46.patch b/pkgs/applications/misc/stardict/stardict-3.0.3-gcc46.patch new file mode 100644 index 00000000000..d85bc0de5ce --- /dev/null +++ b/pkgs/applications/misc/stardict/stardict-3.0.3-gcc46.patch @@ -0,0 +1,13 @@ +http://bugs.gentoo.org/362299 + +--- dict/stardict-plugins/stardict-wordnet-plugin/scene.h ++++ dict/stardict-plugins/stardict-wordnet-plugin/scene.h +@@ -25,6 +25,8 @@ + #ifndef __PHYSICS_H__ + #define __PHYSICS_H__ + ++#include ++ + #include "partic.h" + #include "spring.h" + diff --git a/pkgs/applications/misc/stardict/stardict-3.0.3-overflow.patch b/pkgs/applications/misc/stardict/stardict-3.0.3-overflow.patch new file mode 100644 index 00000000000..48249010570 --- /dev/null +++ b/pkgs/applications/misc/stardict/stardict-3.0.3-overflow.patch @@ -0,0 +1,26 @@ +This patch is stardict-tools-3.0.3-destbufferoverflow.patch from OpenSUSE .src.rpm for: + +warning: call to ‘__fgets_chk_warn’ declared with attribute warning: fgets called with bigger size than length of destination buffer [enabled by default] + +--- tools/src/myspell2dic.c ++++ tools/src/myspell2dic.c +@@ -132,7 +132,7 @@ if (argc<3) + + fprintf(stderr, "Enter grammar language [Spanish]: "); + fflush(stderr); +-fgets(lang, 100, stdin); ++fgets(lang, 50, stdin); + if ((p=strchr(lang, '\n'))!=NULL) *p=0; + if (*lang==0) strcpy(lang, "Spanish"); + +--- tools/src/ooo2dict.c ++++ tools/src/ooo2dict.c +@@ -71,7 +71,7 @@ current2=malloc(10000); + + fprintf(stderr, "Enter thesaurus language [WordNet_English]: "); + fflush(stderr); +-fgets(lang, 100, stdin); ++fgets(lang, 50, stdin); + if ((p=strchr(lang, '\n'))!=NULL) *p=0; + if (*lang==0) strcpy(lang, "WordNet_English"); + F=fopen((argc>1)? argv[1]: "/usr/share/myspell/dicts/th_en_US_v2.dat", "rt"); diff --git a/pkgs/applications/misc/stardict/stardict-3.0.3-zlib-1.2.5.2.patch b/pkgs/applications/misc/stardict/stardict-3.0.3-zlib-1.2.5.2.patch new file mode 100644 index 00000000000..6a320bd4a9f --- /dev/null +++ b/pkgs/applications/misc/stardict/stardict-3.0.3-zlib-1.2.5.2.patch @@ -0,0 +1,39 @@ +http://bugs.gentoo.org/401887 + +diff --git a/lib/src/libcommon.cpp b/lib/src/libcommon.cpp +index 16770a3..a4299e7 100644 +--- a/lib/src/libcommon.cpp ++++ b/lib/src/libcommon.cpp +@@ -614,7 +614,7 @@ int unpack_zlib(const char* arch_file_name, const char* out_file_name) + return EXIT_FAILURE; + } + while(true) { +- len = gzread(get_impl(in), buf, buffer_size); ++ len = gzread((gzFile)get_impl(in), buf, buffer_size); + if(len < 0) { + g_critical(read_file_err, arch_file_name, ""); + return EXIT_FAILURE; +@@ -871,3 +871,8 @@ int remove_recursive(const std::string& path) + return res; + } + } ++ ++int gzclose_compat(void * file) ++{ ++ return gzclose ((gzFile)file); ++} +diff --git a/lib/src/libcommon.h b/lib/src/libcommon.h +index 10f13b4..bdcbf2f 100644 +--- a/lib/src/libcommon.h ++++ b/lib/src/libcommon.h +@@ -187,8 +187,9 @@ namespace clib { + typedef ResourceWrapper File; + } + ++extern int gzclose_compat(void * file); + namespace zip { +-typedef ResourceWrapper gzFile; ++typedef ResourceWrapper gzFile; + } + + /* Create a new temporary file. Return file name in file name encoding. diff --git a/pkgs/applications/misc/stardict/stardict.nix b/pkgs/applications/misc/stardict/stardict.nix new file mode 100644 index 00000000000..9eb3e112342 --- /dev/null +++ b/pkgs/applications/misc/stardict/stardict.nix @@ -0,0 +1,46 @@ +{stdenv, fetchurl, pkgconfig, gtk, glib, zlib, libxml2, intltool, gnome_doc_utils, libgnomeui, scrollkeeper, mysql, pcre, which, libxslt}: +stdenv.mkDerivation rec { + name= "stardict-3.0.3"; + + src = fetchurl { + url = "http://stardict-3.googlecode.com/files/${name}.tar.bz2"; + sha256 = "0wrb8xqy6x9piwrn0vw5alivr9h3b70xlf51qy0jpl6d7mdhm8cv"; + }; + + buildInputs = [ pkgconfig gtk glib zlib libxml2 intltool gnome_doc_utils libgnomeui scrollkeeper mysql pcre which libxslt]; + + postPatch = '' + # mysql hacks: we need dynamic linking as there is no libmysqlclient.a + substituteInPlace tools/configure --replace '/usr/local/include/mysql' '${mysql}/include/mysql/' + substituteInPlace tools/configure --replace 'AC_FIND_FILE([libmysqlclient.a]' 'AC_FIND_FILE([libmysqlclient.so]' + substituteInPlace tools/configure --replace '/usr/local/lib/mysql' '${mysql}/lib/mysql/' + substituteInPlace tools/configure --replace 'for y in libmysqlclient.a' 'for y in libmysqlclient.so' + substituteInPlace tools/configure --replace 'libmysqlclient.a' 'libmysqlclient.so' + + # a list of p0 patches from gentoo devs + patch -p0 < ${./stardict-3.0.3-overflow.patch} + patch -p0 < ${./stardict-3.0.3-gcc46.patch} + patch -p0 < ${./stardict-3.0.3-compositelookup_cpp.patch} + patch -p0 < ${./stardict-3.0.3-correct-glib-include.patch} + patch -p0 < ${./stardict-3.0.3-entry.patch} + + # disable the xsltproc internet query + substituteInPlace dict/help/Makefile.am --replace 'xsltproc -o' 'xsltproc --nonet -o' + substituteInPlace dict/help/Makefile.in --replace 'xsltproc -o' 'xsltproc --nonet -o' + ''; + + # another gentoo patch: a p1 patch + patches = [ ./stardict-3.0.3-zlib-1.2.5.2.patch ]; + + configurePhase = '' + ./configure --disable-spell --disable-gucharmap --disable-festival --disable-espeak --disable-scrollkeeper --prefix=$out + ''; + + meta = { + description = "stardict"; + homepage = "A international dictionary supporting fuzzy and glob style matching"; + license = "LGPL3"; + maintainers = with stdenv.lib.maintainers; [qknight]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cb02af387c5..e536dc572e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1414,6 +1414,10 @@ let smbnetfs = callPackage ../tools/filesystems/smbnetfs {}; + stardict = callPackage ./stardict/stardict.nix { + inherit (gnome) libgnomeui scrollkeeper; + }; + fusesmb = callPackage ../tools/filesystems/fusesmb { }; socat = callPackage ../tools/networking/socat { }; From 71882eb19389174224e3793adb5453ede0e8cc85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 17 Jun 2012 20:44:49 +0000 Subject: [PATCH 312/403] Fixing bad version in xulrunner for firefox 13. svn path=/nixpkgs/trunk/; revision=34532 --- pkgs/applications/networking/browsers/firefox/13.0.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/13.0.nix b/pkgs/applications/networking/browsers/firefox/13.0.nix index e66fa4d28a1..1de05f33d82 100644 --- a/pkgs/applications/networking/browsers/firefox/13.0.nix +++ b/pkgs/applications/networking/browsers/firefox/13.0.nix @@ -17,7 +17,7 @@ rec { firefoxVersion = "13.0.1"; - xulVersion = "13.0"; # this attribute is used by other packages + xulVersion = "13.0.1"; # this attribute is used by other packages src = fetchurl { From 5f81184129339b887c9febacce10cf35ae7614c4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Jun 2012 09:52:30 +0000 Subject: [PATCH 313/403] all-packages.nix: fixed path to stardict expression svn path=/nixpkgs/trunk/; revision=34540 --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e536dc572e4..54ee0b320a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1414,8 +1414,8 @@ let smbnetfs = callPackage ../tools/filesystems/smbnetfs {}; - stardict = callPackage ./stardict/stardict.nix { - inherit (gnome) libgnomeui scrollkeeper; + stardict = callPackage ../applications/misc/stardict/stardict.nix { + inherit (gnome) libgnomeui scrollkeeper; }; fusesmb = callPackage ../tools/filesystems/fusesmb { }; From 1e196a120f26b71dc83255d292c1977c4bd2c2bf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Jun 2012 09:52:37 +0000 Subject: [PATCH 314/403] all-packages.nix: stripped trailing whitespace svn path=/nixpkgs/trunk/; revision=34541 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54ee0b320a8..90a9945e8e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -432,7 +432,7 @@ let bc = callPackage ../tools/misc/bc { }; bchunk = callPackage ../tools/cd-dvd/bchunk { }; - + bfr = callPackage ../tools/misc/bfr { }; bootchart = callPackage ../tools/system/bootchart { }; From bc7c4c1951f1a1c4fedbd9d0640b76fc4ac07bb0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Jun 2012 09:52:42 +0000 Subject: [PATCH 315/403] Updated Haskell packages. - base16-bytestring: updated to version 0.1.1.5 - base64-bytestring: updated to version 0.1.1.3 - bloomfilter: updated to version 1.2.6.10 - cryptocipher: updated to version 0.3.5 - gtk: updated to version 0.12.3.1 - http-conduit: updated to version 1.4.1.9 - snap-core: updated to version 0.9.0 - snap-server: updated to version 0.9.0 - stringsearch: updated to version 0.3.6.3 - text: updated to version 0.11.2.2 - void: updated to version 0.5.6 svn path=/nixpkgs/trunk/; revision=34542 --- .../libraries/haskell/base16-bytestring/default.nix | 4 ++-- .../libraries/haskell/base64-bytestring/default.nix | 4 ++-- .../libraries/haskell/bloomfilter/default.nix | 6 +++--- .../libraries/haskell/cryptocipher/default.nix | 4 ++-- pkgs/development/libraries/haskell/gtk/default.nix | 4 ++-- .../libraries/haskell/http-conduit/default.nix | 4 ++-- pkgs/development/libraries/haskell/snap/core.nix | 4 ++-- pkgs/development/libraries/haskell/snap/server.nix | 11 +++++------ .../libraries/haskell/stringsearch/default.nix | 1 + .../haskell/text/{0.11.2.1.nix => 0.11.2.2.nix} | 4 ++-- pkgs/development/libraries/haskell/void/default.nix | 4 ++-- pkgs/top-level/haskell-packages.nix | 6 +++--- 12 files changed, 28 insertions(+), 28 deletions(-) rename pkgs/development/libraries/haskell/text/{0.11.2.1.nix => 0.11.2.2.nix} (80%) diff --git a/pkgs/development/libraries/haskell/base16-bytestring/default.nix b/pkgs/development/libraries/haskell/base16-bytestring/default.nix index 43bc5253538..3f81258f426 100644 --- a/pkgs/development/libraries/haskell/base16-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/base16-bytestring/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "base16-bytestring"; - version = "0.1.1.4"; - sha256 = "061rxlw5kjwj0s08kml46qpw602xwwp05285gpad8c7baw5mzxlr"; + version = "0.1.1.5"; + sha256 = "1fgd3zdzjfry6jaz8hwhim0p2c35l73cxxambh0ff7p5fqjrlwym"; meta = { homepage = "http://github.com/bos/base16-bytestring"; description = "Fast base16 (hex) encoding and decoding for ByteStrings"; diff --git a/pkgs/development/libraries/haskell/base64-bytestring/default.nix b/pkgs/development/libraries/haskell/base64-bytestring/default.nix index 014256b9049..3ad6b417431 100644 --- a/pkgs/development/libraries/haskell/base64-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/base64-bytestring/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "base64-bytestring"; - version = "0.1.1.1"; - sha256 = "0j0jns0yf7dv2bx91hayc8hx0pdab7rhkjllmkl8019kf8rx3gwd"; + version = "0.1.1.3"; + sha256 = "0gyms4nf5j9ick1l5ys9h7h0nxpsi5vgs4dbynrqyhm9yd09cscg"; meta = { homepage = "https://github.com/bos/base64-bytestring"; description = "Fast base64 encoding and deconding for ByteStrings"; diff --git a/pkgs/development/libraries/haskell/bloomfilter/default.nix b/pkgs/development/libraries/haskell/bloomfilter/default.nix index fb88cf3d50a..2545c3f4f40 100644 --- a/pkgs/development/libraries/haskell/bloomfilter/default.nix +++ b/pkgs/development/libraries/haskell/bloomfilter/default.nix @@ -2,11 +2,11 @@ cabal.mkDerivation (self: { pname = "bloomfilter"; - version = "1.2.6.8"; - sha256 = "0qv25dfyqbkswcbw1cxs4zcm8zl0xi5880zx6fab8ka6vnx2a5nf"; + version = "1.2.6.10"; + sha256 = "1z2jc7588fkv42dxf0dxsrgk5pmj3xapshy1vyfwipp1q6y20x4j"; buildDepends = [ deepseq ]; meta = { - homepage = "http://www.serpentine.com/software/bloomfilter"; + homepage = "https://github.com/bos/bloomfilter"; description = "Pure and impure Bloom Filter implementations"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/cryptocipher/default.nix b/pkgs/development/libraries/haskell/cryptocipher/default.nix index 2864b0f7404..1798f4e21a5 100644 --- a/pkgs/development/libraries/haskell/cryptocipher/default.nix +++ b/pkgs/development/libraries/haskell/cryptocipher/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cryptocipher"; - version = "0.3.4"; - sha256 = "12ndzvb9sa37yn118f9ixm3qka36x6whvmxc5wax97rfm7y49p6r"; + version = "0.3.5"; + sha256 = "02qc1rr9l51dnk0sn7js8zv2w2qhkha3ik828j5s729h80cyw99s"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/gtk/default.nix b/pkgs/development/libraries/haskell/gtk/default.nix index 81c34f20c1c..57e6e20f78d 100644 --- a/pkgs/development/libraries/haskell/gtk/default.nix +++ b/pkgs/development/libraries/haskell/gtk/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "gtk"; - version = "0.12.3"; - sha256 = "0a5bb1qkxpkmm69b31jpqy7njnsk9bhhhp6z0h971zsxsrxpi04q"; + version = "0.12.3.1"; + sha256 = "0v9sh07lpvih2gk4ivy0jx2slw7rpvbf75xp20plzgzmay1y978s"; buildDepends = [ cairo glib mtl pango ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 8f347ffa87b..2f2fad74d56 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.4.1.8"; - sha256 = "0vf72r4dpqdkl951bmjq3hjy6wnqyhxkjq9hr2p8scw91606cxyl"; + version = "1.4.1.9"; + sha256 = "0c0dnk3iqkx85453spry6qsw66pg3pjvqah0c1m64qqmv869bwbn"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix index 08616b1b841..1d51b9d9933 100644 --- a/pkgs/development/libraries/haskell/snap/core.nix +++ b/pkgs/development/libraries/haskell/snap/core.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "snap-core"; - version = "0.8.1"; - sha256 = "11r4zd9z241qvzji7gcmynkib5w9b7c7wa8jx7al2z2aq4qhfx1b"; + version = "0.9.0"; + sha256 = "1fsjamv9sl19in2ws97v246sbvlnj05rm9dljc0pz7kasawyqsb7"; buildDepends = [ attoparsec attoparsecEnumerator base16Bytestring blazeBuilder blazeBuilderEnumerator bytestringMmap bytestringNums diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix index 37111f3b847..20a6af0ba90 100644 --- a/pkgs/development/libraries/haskell/snap/server.nix +++ b/pkgs/development/libraries/haskell/snap/server.nix @@ -1,20 +1,19 @@ { cabal, attoparsec, attoparsecEnumerator, binary, blazeBuilder , blazeBuilderEnumerator, bytestringNums, caseInsensitive , directoryTree, enumerator, filepath, MonadCatchIOTransformers -, mtl, murmurHash, network, PSQueue, snapCore, text, time -, transformers, unixCompat, vector, vectorAlgorithms +, mtl, murmurHash, network, snapCore, text, time, transformers +, unixCompat, vector, vectorAlgorithms }: cabal.mkDerivation (self: { pname = "snap-server"; - version = "0.8.1.1"; - sha256 = "0k47z9fhc64bnv86ixaxvndwc7hk28ny3mf5ny9d5jmp77a3ws46"; + version = "0.9.0"; + sha256 = "12mjy1w6gsnw93bcpsnxnw7kc2v73dfps7gk542iw73lldfhh3va"; buildDepends = [ attoparsec attoparsecEnumerator binary blazeBuilder blazeBuilderEnumerator bytestringNums caseInsensitive directoryTree enumerator filepath MonadCatchIOTransformers mtl murmurHash network - PSQueue snapCore text time transformers unixCompat vector - vectorAlgorithms + snapCore text time transformers unixCompat vector vectorAlgorithms ]; meta = { homepage = "http://snapframework.com/"; diff --git a/pkgs/development/libraries/haskell/stringsearch/default.nix b/pkgs/development/libraries/haskell/stringsearch/default.nix index 8b5a8146150..fb31ab76a2c 100644 --- a/pkgs/development/libraries/haskell/stringsearch/default.nix +++ b/pkgs/development/libraries/haskell/stringsearch/default.nix @@ -9,5 +9,6 @@ cabal.mkDerivation (self: { description = "Fast searching, splitting and replacing of ByteStrings"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/text/0.11.2.1.nix b/pkgs/development/libraries/haskell/text/0.11.2.2.nix similarity index 80% rename from pkgs/development/libraries/haskell/text/0.11.2.1.nix rename to pkgs/development/libraries/haskell/text/0.11.2.2.nix index b34c1349ff7..a4dc9f88277 100644 --- a/pkgs/development/libraries/haskell/text/0.11.2.1.nix +++ b/pkgs/development/libraries/haskell/text/0.11.2.2.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "text"; - version = "0.11.2.1"; - sha256 = "0ajh2xhf8khh5vi4crdjgcs7w27dga7hlwzi8ia5xjs3hzgvbjb9"; + version = "0.11.2.2"; + sha256 = "0ch0fiwjwkpiwamfxxbcka2gp6lbwpqcv7pmik6qm850163f4i33"; buildDepends = [ deepseq ]; meta = { homepage = "https://github.com/bos/text"; diff --git a/pkgs/development/libraries/haskell/void/default.nix b/pkgs/development/libraries/haskell/void/default.nix index c2b56d95d98..8c129568479 100644 --- a/pkgs/development/libraries/haskell/void/default.nix +++ b/pkgs/development/libraries/haskell/void/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "void"; - version = "0.5.5.1"; - sha256 = "1j8rss4b5j4213h40n4nl38p12z275lbsk46dvy4x5s96gqyximp"; + version = "0.5.6"; + sha256 = "168xp4jxrlhxdw47y3xyr3hi57xharsrll8521a1phh8vzrbpi4z"; buildDepends = [ semigroups ]; meta = { homepage = "http://github.com/ekmett/void"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 85ac31b46ef..9116814fcb0 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -139,7 +139,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); regexPosix = self.regexPosix_0_95_1; # 7.4.2 ok stm = self.stm_2_3; # 7.4.2 ok syb = self.syb_0_3_6_1; # 7.4.2 ok - text = self.text_0_11_2_0; # 7.4.2 ok + text = self.text_0_11_2_2; # 7.4.2 ok transformers = self.transformers_0_3_0_0; # 7.4.2 ok xhtml = self.xhtml_3000_2_1; # 7.4.2 ok zlib = self.zlib_0_5_3_3; # 7.4.2 ok @@ -1388,8 +1388,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); text_0_11_1_5 = callPackage ../development/libraries/haskell/text/0.11.1.5.nix {}; text_0_11_1_13 = callPackage ../development/libraries/haskell/text/0.11.1.13.nix {}; text_0_11_2_0 = callPackage ../development/libraries/haskell/text/0.11.2.0.nix {}; - text_0_11_2_1 = callPackage ../development/libraries/haskell/text/0.11.2.1.nix {}; - text = self.text_0_11_2_1; + text_0_11_2_2 = callPackage ../development/libraries/haskell/text/0.11.2.2.nix {}; + text = self.text_0_11_2_2; thespian = callPackage ../development/libraries/haskell/thespian {}; From 8a79b20781406a296ae66331dfb97284b4ca7115 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 18 Jun 2012 11:10:43 +0000 Subject: [PATCH 316/403] Fixing the firefox 13 crash of plugin-container, using wrapProgram instead of patchelf. svn path=/nixpkgs/trunk/; revision=34543 --- .../networking/browsers/firefox/13.0.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/13.0.nix b/pkgs/applications/networking/browsers/firefox/13.0.nix index 1de05f33d82..1b021955742 100644 --- a/pkgs/applications/networking/browsers/firefox/13.0.nix +++ b/pkgs/applications/networking/browsers/firefox/13.0.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL , libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify -, yasm, mesa, sqlite, unzip +, yasm, mesa, sqlite, unzip, makeWrapper , # If you want the resulting program to call itself "Firefox" instead # of "Shiretoko" or whatever, enable this option. However, those @@ -56,7 +56,7 @@ rec { xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file alsaLib nspr /* nss */ libnotify xlibs.pixman yasm mesa xlibs.libXScrnSaver xlibs.scrnsaverproto - xlibs.libXext xlibs.xextproto sqlite unzip + xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper ]; configureFlags = @@ -108,10 +108,13 @@ rec { echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")"; chmod a+x "$out/bin/$(basename "$i")"; fi; - done; - for i in $out/lib/$libDir/{xpcshell,plugin-container,*.so}; do - patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true - done; + done + for i in $out/lib/$libDir/*.so; do + patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true + done + for i in $out/lib/$libDir/{xpcshell,plugin-container}; do + wrapProgram $i --prefix LD_LIBRARY_PATH ':' "$out/lib/$libDir" + done rm -f $out/bin/run-mozilla.sh ''; # */ From 19be0c1f27e8840fb0189573d65600a25d33b43a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 18 Jun 2012 12:39:44 +0000 Subject: [PATCH 317/403] Updating skype from 2.2 to 4.0 svn path=/nixpkgs/trunk/; revision=34544 --- .../networking/instant-messengers/skype/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/skype/default.nix b/pkgs/applications/networking/instant-messengers/skype/default.nix index f94d7e125f6..ddbba59e145 100644 --- a/pkgs/applications/networking/instant-messengers/skype/default.nix +++ b/pkgs/applications/networking/instant-messengers/skype/default.nix @@ -5,11 +5,11 @@ assert stdenv.system == "i686-linux"; stdenv.mkDerivation rec { - name = "skype-2.2.0.35"; + name = "skype-4.0.0.7"; src = fetchurl { url = "http://download.skype.com/linux/${name}.tar.bz2"; - sha256 = "157ba3ci12bq0nv2m8wlsab45ib5sccqagyna8nixnhqw9q72sxm"; + sha256 = "0mrswawqsv53mfghqlj1bzq0jfswha6b0c06px7snd85pd4gn5fn"; }; buildInputs = From 1a856c200db19822b2e26734e6606fe215e11666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 18 Jun 2012 15:18:45 +0000 Subject: [PATCH 318/403] Updated transmission to 2.52. svn path=/nixpkgs/trunk/; revision=34545 --- .../stardict-3.0.3-compositelookup_cpp.patch | 19 -------- .../stardict-3.0.3-correct-glib-include.patch | 13 ------ .../misc/stardict/stardict-3.0.3-entry.patch | 20 -------- .../misc/stardict/stardict-3.0.3-gcc46.patch | 13 ------ .../stardict/stardict-3.0.3-overflow.patch | 26 ----------- .../stardict-3.0.3-zlib-1.2.5.2.patch | 39 ---------------- pkgs/applications/misc/stardict/stardict.nix | 46 ------------------- .../networking/p2p/transmission/default.nix | 14 +++--- 8 files changed, 7 insertions(+), 183 deletions(-) delete mode 100644 pkgs/applications/misc/stardict/stardict-3.0.3-compositelookup_cpp.patch delete mode 100644 pkgs/applications/misc/stardict/stardict-3.0.3-correct-glib-include.patch delete mode 100644 pkgs/applications/misc/stardict/stardict-3.0.3-entry.patch delete mode 100644 pkgs/applications/misc/stardict/stardict-3.0.3-gcc46.patch delete mode 100644 pkgs/applications/misc/stardict/stardict-3.0.3-overflow.patch delete mode 100644 pkgs/applications/misc/stardict/stardict-3.0.3-zlib-1.2.5.2.patch delete mode 100644 pkgs/applications/misc/stardict/stardict.nix diff --git a/pkgs/applications/misc/stardict/stardict-3.0.3-compositelookup_cpp.patch b/pkgs/applications/misc/stardict/stardict-3.0.3-compositelookup_cpp.patch deleted file mode 100644 index 86825555d9c..00000000000 --- a/pkgs/applications/misc/stardict/stardict-3.0.3-compositelookup_cpp.patch +++ /dev/null @@ -1,19 +0,0 @@ -This patch is from OpenSUSE .src.rpm for the following crash on startup: - -ERROR:compositelookup.cpp:53:void CompositeLookup::send_net_dict_request(const string&, const string&): assertion failed: (NetDictRequests.end() == std::find(NetDictRequests.begin(), NetDictRequests.end(), request)) - ---- dict/src/lib/compositelookup.cpp -+++ dict/src/lib/compositelookup.cpp -@@ -50,8 +50,10 @@ - void CompositeLookup::send_net_dict_request(const std::string& dict_id, const std::string& key) - { - NetDictRequest request(dict_id, key); -- g_assert(NetDictRequests.end() == std::find(NetDictRequests.begin(), NetDictRequests.end(), request)); -- NetDictRequests.push_back(request); -+ if(NetDictRequests.end() == std::find(NetDictRequests.begin(), NetDictRequests.end(), request)) -+ { -+ NetDictRequests.push_back(request); -+ } - } - - /* returns true if got expected response */ diff --git a/pkgs/applications/misc/stardict/stardict-3.0.3-correct-glib-include.patch b/pkgs/applications/misc/stardict/stardict-3.0.3-correct-glib-include.patch deleted file mode 100644 index fd89243938e..00000000000 --- a/pkgs/applications/misc/stardict/stardict-3.0.3-correct-glib-include.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://bugs.gentoo.org/396219 - ---- dict/src/tomboykeybinder.h -+++ dict/src/tomboykeybinder.h -@@ -21,7 +21,7 @@ - #ifndef __TOMBOY_KEY_BINDER_H__ - #define __TOMBOY_KEY_BINDER_H__ - --#include -+#include - - G_BEGIN_DECLS - diff --git a/pkgs/applications/misc/stardict/stardict-3.0.3-entry.patch b/pkgs/applications/misc/stardict/stardict-3.0.3-entry.patch deleted file mode 100644 index 38182b0c8e0..00000000000 --- a/pkgs/applications/misc/stardict/stardict-3.0.3-entry.patch +++ /dev/null @@ -1,20 +0,0 @@ -warning: key "Encoding" in group "Desktop Entry" is deprecated -error: value "stardict.png" for key "Icon" in group "Desktop Entry" is an icon name with an extension, but there should be no extension -error: value "Dictionary" in key "Categories" in group "Desktop Entry" requires another category to be present among the following categories: Office;TextTools - ---- dict/data/stardict.desktop.in -+++ dict/data/stardict.desktop.in -@@ -1,11 +1,10 @@ - [Desktop Entry] --Encoding=UTF-8 - _Name=StarDict - _Comment=Lookup words - Exec=stardict - Terminal=false - Type=Application --Icon=stardict.png -+Icon=stardict - StartupNotify=true --Categories=Utility;Dictionary; -+Categories=Utility;Office;TextTools;Dictionary; - X-GNOME-DocPath=stardict/stardict.xml diff --git a/pkgs/applications/misc/stardict/stardict-3.0.3-gcc46.patch b/pkgs/applications/misc/stardict/stardict-3.0.3-gcc46.patch deleted file mode 100644 index d85bc0de5ce..00000000000 --- a/pkgs/applications/misc/stardict/stardict-3.0.3-gcc46.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://bugs.gentoo.org/362299 - ---- dict/stardict-plugins/stardict-wordnet-plugin/scene.h -+++ dict/stardict-plugins/stardict-wordnet-plugin/scene.h -@@ -25,6 +25,8 @@ - #ifndef __PHYSICS_H__ - #define __PHYSICS_H__ - -+#include -+ - #include "partic.h" - #include "spring.h" - diff --git a/pkgs/applications/misc/stardict/stardict-3.0.3-overflow.patch b/pkgs/applications/misc/stardict/stardict-3.0.3-overflow.patch deleted file mode 100644 index 48249010570..00000000000 --- a/pkgs/applications/misc/stardict/stardict-3.0.3-overflow.patch +++ /dev/null @@ -1,26 +0,0 @@ -This patch is stardict-tools-3.0.3-destbufferoverflow.patch from OpenSUSE .src.rpm for: - -warning: call to ‘__fgets_chk_warn’ declared with attribute warning: fgets called with bigger size than length of destination buffer [enabled by default] - ---- tools/src/myspell2dic.c -+++ tools/src/myspell2dic.c -@@ -132,7 +132,7 @@ if (argc<3) - - fprintf(stderr, "Enter grammar language [Spanish]: "); - fflush(stderr); --fgets(lang, 100, stdin); -+fgets(lang, 50, stdin); - if ((p=strchr(lang, '\n'))!=NULL) *p=0; - if (*lang==0) strcpy(lang, "Spanish"); - ---- tools/src/ooo2dict.c -+++ tools/src/ooo2dict.c -@@ -71,7 +71,7 @@ current2=malloc(10000); - - fprintf(stderr, "Enter thesaurus language [WordNet_English]: "); - fflush(stderr); --fgets(lang, 100, stdin); -+fgets(lang, 50, stdin); - if ((p=strchr(lang, '\n'))!=NULL) *p=0; - if (*lang==0) strcpy(lang, "WordNet_English"); - F=fopen((argc>1)? argv[1]: "/usr/share/myspell/dicts/th_en_US_v2.dat", "rt"); diff --git a/pkgs/applications/misc/stardict/stardict-3.0.3-zlib-1.2.5.2.patch b/pkgs/applications/misc/stardict/stardict-3.0.3-zlib-1.2.5.2.patch deleted file mode 100644 index 6a320bd4a9f..00000000000 --- a/pkgs/applications/misc/stardict/stardict-3.0.3-zlib-1.2.5.2.patch +++ /dev/null @@ -1,39 +0,0 @@ -http://bugs.gentoo.org/401887 - -diff --git a/lib/src/libcommon.cpp b/lib/src/libcommon.cpp -index 16770a3..a4299e7 100644 ---- a/lib/src/libcommon.cpp -+++ b/lib/src/libcommon.cpp -@@ -614,7 +614,7 @@ int unpack_zlib(const char* arch_file_name, const char* out_file_name) - return EXIT_FAILURE; - } - while(true) { -- len = gzread(get_impl(in), buf, buffer_size); -+ len = gzread((gzFile)get_impl(in), buf, buffer_size); - if(len < 0) { - g_critical(read_file_err, arch_file_name, ""); - return EXIT_FAILURE; -@@ -871,3 +871,8 @@ int remove_recursive(const std::string& path) - return res; - } - } -+ -+int gzclose_compat(void * file) -+{ -+ return gzclose ((gzFile)file); -+} -diff --git a/lib/src/libcommon.h b/lib/src/libcommon.h -index 10f13b4..bdcbf2f 100644 ---- a/lib/src/libcommon.h -+++ b/lib/src/libcommon.h -@@ -187,8 +187,9 @@ namespace clib { - typedef ResourceWrapper File; - } - -+extern int gzclose_compat(void * file); - namespace zip { --typedef ResourceWrapper gzFile; -+typedef ResourceWrapper gzFile; - } - - /* Create a new temporary file. Return file name in file name encoding. diff --git a/pkgs/applications/misc/stardict/stardict.nix b/pkgs/applications/misc/stardict/stardict.nix deleted file mode 100644 index 9eb3e112342..00000000000 --- a/pkgs/applications/misc/stardict/stardict.nix +++ /dev/null @@ -1,46 +0,0 @@ -{stdenv, fetchurl, pkgconfig, gtk, glib, zlib, libxml2, intltool, gnome_doc_utils, libgnomeui, scrollkeeper, mysql, pcre, which, libxslt}: -stdenv.mkDerivation rec { - name= "stardict-3.0.3"; - - src = fetchurl { - url = "http://stardict-3.googlecode.com/files/${name}.tar.bz2"; - sha256 = "0wrb8xqy6x9piwrn0vw5alivr9h3b70xlf51qy0jpl6d7mdhm8cv"; - }; - - buildInputs = [ pkgconfig gtk glib zlib libxml2 intltool gnome_doc_utils libgnomeui scrollkeeper mysql pcre which libxslt]; - - postPatch = '' - # mysql hacks: we need dynamic linking as there is no libmysqlclient.a - substituteInPlace tools/configure --replace '/usr/local/include/mysql' '${mysql}/include/mysql/' - substituteInPlace tools/configure --replace 'AC_FIND_FILE([libmysqlclient.a]' 'AC_FIND_FILE([libmysqlclient.so]' - substituteInPlace tools/configure --replace '/usr/local/lib/mysql' '${mysql}/lib/mysql/' - substituteInPlace tools/configure --replace 'for y in libmysqlclient.a' 'for y in libmysqlclient.so' - substituteInPlace tools/configure --replace 'libmysqlclient.a' 'libmysqlclient.so' - - # a list of p0 patches from gentoo devs - patch -p0 < ${./stardict-3.0.3-overflow.patch} - patch -p0 < ${./stardict-3.0.3-gcc46.patch} - patch -p0 < ${./stardict-3.0.3-compositelookup_cpp.patch} - patch -p0 < ${./stardict-3.0.3-correct-glib-include.patch} - patch -p0 < ${./stardict-3.0.3-entry.patch} - - # disable the xsltproc internet query - substituteInPlace dict/help/Makefile.am --replace 'xsltproc -o' 'xsltproc --nonet -o' - substituteInPlace dict/help/Makefile.in --replace 'xsltproc -o' 'xsltproc --nonet -o' - ''; - - # another gentoo patch: a p1 patch - patches = [ ./stardict-3.0.3-zlib-1.2.5.2.patch ]; - - configurePhase = '' - ./configure --disable-spell --disable-gucharmap --disable-festival --disable-espeak --disable-scrollkeeper --prefix=$out - ''; - - meta = { - description = "stardict"; - homepage = "A international dictionary supporting fuzzy and glob style matching"; - license = "LGPL3"; - maintainers = with stdenv.lib.maintainers; [qknight]; - }; -} - diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index a1269b09e37..0a86e140347 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchurl, pkgconfig, openssl, curl, intltool, libevent, gtkClient ? true, gtk }: stdenv.mkDerivation rec { - name = "transmission-2.31"; - + name = "transmission-2.52"; + src = fetchurl { - url = "http://download.transmissionbt.com/files/${name}.tar.bz2"; - sha256 = "0z0npasbrbii5qnjyk31v0kfr04kwm57dmnl2542bpx615q212zk"; + url = "http://download.transmissionbt.com/files/${name}.tar.xz"; + sha256 = "05sfq5h3731xc9a1k5r1q4gbs9yk0dr229asfxjjgg0lw1xzppdw"; }; - + buildInputs = [ pkgconfig openssl curl intltool libevent ] ++ stdenv.lib.optional gtkClient gtk; - + configureFlags = if gtkClient then "--enable-gtk" else "--disable-gtk"; postInstall = '' rm $out/share/icons/hicolor/icon-theme.cache ''; - + meta = { description = "A fast, easy and free BitTorrent client"; longDescription = '' From df3afb4d136b3ed8c0eaaecd986d33103b160d0e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Jun 2012 15:22:01 +0000 Subject: [PATCH 319/403] haskell-QuickCheck: added version 2.5 svn path=/nixpkgs/trunk/; revision=34546 --- .../libraries/haskell/QuickCheck/2.5.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 5 +++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/QuickCheck/2.5.nix diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.5.nix b/pkgs/development/libraries/haskell/QuickCheck/2.5.nix new file mode 100644 index 00000000000..127d90ca5e7 --- /dev/null +++ b/pkgs/development/libraries/haskell/QuickCheck/2.5.nix @@ -0,0 +1,15 @@ +{ cabal, extensibleExceptions, random }: + +cabal.mkDerivation (self: { + pname = "QuickCheck"; + version = "2.5"; + sha256 = "0a4ibyw5abm7ds6pds41147phjkccx8v60vqdj05c5n28hbzbgbh"; + buildDepends = [ extensibleExceptions random ]; + meta = { + homepage = "http://code.haskell.org/QuickCheck"; + description = "Automatic testing of Haskell programs"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 9116814fcb0..b34d47ea421 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -132,7 +132,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); OpenGL = self.OpenGL_2_2_3_1; # 7.4.2 ok parallel = self.parallel_3_2_0_2; # 7.4.2 ok parsec = self.parsec_3_1_3; # 7.4.2 ok - QuickCheck = self.QuickCheck_2_4_2; # 7.4.2 ok + QuickCheck = self.QuickCheck_2_5; # 7.4.2 ok random = self.random_1_0_1_1; # 7.4.2 ok regexBase = self.regexBase_0_93_2; # 7.4.2 ok regexCompat = self.regexCompat_0_95_1; # 7.4.2 ok @@ -1164,8 +1164,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); QuickCheck_2_4_0_1 = callPackage ../development/libraries/haskell/QuickCheck/2.4.0.1.nix {}; QuickCheck_2_4_1_1 = callPackage ../development/libraries/haskell/QuickCheck/2.4.1.1.nix {}; QuickCheck_2_4_2 = callPackage ../development/libraries/haskell/QuickCheck/2.4.2.nix {}; + QuickCheck_2_5 = callPackage ../development/libraries/haskell/QuickCheck/2.5.nix {}; QuickCheck1 = self.QuickCheck_1_2_0_1; - QuickCheck2 = self.QuickCheck_2_4_2; + QuickCheck2 = self.QuickCheck_2_5; QuickCheck = self.QuickCheck2; RangedSets = callPackage ../development/libraries/haskell/Ranged-sets {}; From 8261e2a1330886557a31170f16719aa9aab807d6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Jun 2012 15:22:05 +0000 Subject: [PATCH 320/403] Removed obsolete hledger-{chart,vty} packages. svn path=/nixpkgs/trunk/; revision=34547 --- .../haskell/hledger-chart/default.nix | 27 ------------------- .../libraries/haskell/hledger-vty/default.nix | 17 ------------ pkgs/top-level/haskell-packages.nix | 2 -- 3 files changed, 46 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/hledger-chart/default.nix delete mode 100644 pkgs/development/libraries/haskell/hledger-vty/default.nix diff --git a/pkgs/development/libraries/haskell/hledger-chart/default.nix b/pkgs/development/libraries/haskell/hledger-chart/default.nix deleted file mode 100644 index 020a8dfa2af..00000000000 --- a/pkgs/development/libraries/haskell/hledger-chart/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ cabal, Chart, cmdargs, colour, hledger, hledgerLib, HUnit, safe -, time -}: - -cabal.mkDerivation (self: { - pname = "hledger-chart"; - version = "0.16.1"; - sha256 = "1yk563032ir98gqdvxazjjl1alg6q1pflzawh11pr3zrdnriracn"; - isLibrary = false; - isExecutable = true; - buildDepends = [ - Chart cmdargs colour hledger hledgerLib HUnit safe time - ]; - patchPhase = '' - sed -i hledger-chart.cabal -e 's|Chart >= 0.11 && < 0.15|Chart|g' - ''; - meta = { - homepage = "http://hledger.org"; - description = "A pie chart image generator for the hledger accounting tool"; - license = "GPL"; - platforms = self.stdenv.lib.platforms.linux; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/hledger-vty/default.nix b/pkgs/development/libraries/haskell/hledger-vty/default.nix deleted file mode 100644 index c304a6646ec..00000000000 --- a/pkgs/development/libraries/haskell/hledger-vty/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal, cmdargs, hledger, hledgerLib, HUnit, safe, time, vty }: - -cabal.mkDerivation (self: { - pname = "hledger-vty"; - version = "0.16.1"; - sha256 = "10aq9apxz6nrzvvynha0wkhy34dn8dybizr8assni6rns8ylh188"; - isLibrary = false; - isExecutable = true; - buildDepends = [ cmdargs hledger hledgerLib HUnit safe time vty ]; - meta = { - homepage = "http://hledger.org"; - description = "A curses-style console interface for the hledger accounting tool"; - license = "GPL"; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b34d47ea421..b918d09837e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -847,8 +847,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hledger = callPackage ../development/libraries/haskell/hledger {}; hledgerLib = callPackage ../development/libraries/haskell/hledger-lib {}; - #hledgerVty = callPackage ../development/libraries/haskell/hledger-vty {}; - #hledgerChart = callPackage ../development/libraries/haskell/hledger-chart {}; hledgerInterest = callPackage ../applications/office/hledger-interest {}; #hledgerWeb = callPackage ../development/libraries/haskell/hledger-web {}; From fc496faab07e16558ebb13aab9d931bb01f8fe87 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Jun 2012 15:22:07 +0000 Subject: [PATCH 321/403] Resurrect the hledger-web package. svn path=/nixpkgs/trunk/; revision=34548 --- pkgs/top-level/haskell-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b918d09837e..de4164dd50f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -848,7 +848,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hledger = callPackage ../development/libraries/haskell/hledger {}; hledgerLib = callPackage ../development/libraries/haskell/hledger-lib {}; hledgerInterest = callPackage ../applications/office/hledger-interest {}; - #hledgerWeb = callPackage ../development/libraries/haskell/hledger-web {}; + hledgerWeb = callPackage ../development/libraries/haskell/hledger-web {}; HList = callPackage ../development/libraries/haskell/HList {}; From 1a33b4b654903ec597fcdb743e649466bc563304 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 18 Jun 2012 15:37:35 +0000 Subject: [PATCH 322/403] Fixing stardict broken by my mistake. svn path=/nixpkgs/trunk/; revision=34549 --- .../stardict-3.0.3-compositelookup_cpp.patch | 19 ++++++++ .../stardict-3.0.3-correct-glib-include.patch | 13 ++++++ .../misc/stardict/stardict-3.0.3-entry.patch | 20 ++++++++ .../misc/stardict/stardict-3.0.3-gcc46.patch | 13 ++++++ .../stardict/stardict-3.0.3-overflow.patch | 26 +++++++++++ .../stardict-3.0.3-zlib-1.2.5.2.patch | 39 ++++++++++++++++ pkgs/applications/misc/stardict/stardict.nix | 46 +++++++++++++++++++ 7 files changed, 176 insertions(+) create mode 100644 pkgs/applications/misc/stardict/stardict-3.0.3-compositelookup_cpp.patch create mode 100644 pkgs/applications/misc/stardict/stardict-3.0.3-correct-glib-include.patch create mode 100644 pkgs/applications/misc/stardict/stardict-3.0.3-entry.patch create mode 100644 pkgs/applications/misc/stardict/stardict-3.0.3-gcc46.patch create mode 100644 pkgs/applications/misc/stardict/stardict-3.0.3-overflow.patch create mode 100644 pkgs/applications/misc/stardict/stardict-3.0.3-zlib-1.2.5.2.patch create mode 100644 pkgs/applications/misc/stardict/stardict.nix diff --git a/pkgs/applications/misc/stardict/stardict-3.0.3-compositelookup_cpp.patch b/pkgs/applications/misc/stardict/stardict-3.0.3-compositelookup_cpp.patch new file mode 100644 index 00000000000..86825555d9c --- /dev/null +++ b/pkgs/applications/misc/stardict/stardict-3.0.3-compositelookup_cpp.patch @@ -0,0 +1,19 @@ +This patch is from OpenSUSE .src.rpm for the following crash on startup: + +ERROR:compositelookup.cpp:53:void CompositeLookup::send_net_dict_request(const string&, const string&): assertion failed: (NetDictRequests.end() == std::find(NetDictRequests.begin(), NetDictRequests.end(), request)) + +--- dict/src/lib/compositelookup.cpp ++++ dict/src/lib/compositelookup.cpp +@@ -50,8 +50,10 @@ + void CompositeLookup::send_net_dict_request(const std::string& dict_id, const std::string& key) + { + NetDictRequest request(dict_id, key); +- g_assert(NetDictRequests.end() == std::find(NetDictRequests.begin(), NetDictRequests.end(), request)); +- NetDictRequests.push_back(request); ++ if(NetDictRequests.end() == std::find(NetDictRequests.begin(), NetDictRequests.end(), request)) ++ { ++ NetDictRequests.push_back(request); ++ } + } + + /* returns true if got expected response */ diff --git a/pkgs/applications/misc/stardict/stardict-3.0.3-correct-glib-include.patch b/pkgs/applications/misc/stardict/stardict-3.0.3-correct-glib-include.patch new file mode 100644 index 00000000000..fd89243938e --- /dev/null +++ b/pkgs/applications/misc/stardict/stardict-3.0.3-correct-glib-include.patch @@ -0,0 +1,13 @@ +http://bugs.gentoo.org/396219 + +--- dict/src/tomboykeybinder.h ++++ dict/src/tomboykeybinder.h +@@ -21,7 +21,7 @@ + #ifndef __TOMBOY_KEY_BINDER_H__ + #define __TOMBOY_KEY_BINDER_H__ + +-#include ++#include + + G_BEGIN_DECLS + diff --git a/pkgs/applications/misc/stardict/stardict-3.0.3-entry.patch b/pkgs/applications/misc/stardict/stardict-3.0.3-entry.patch new file mode 100644 index 00000000000..38182b0c8e0 --- /dev/null +++ b/pkgs/applications/misc/stardict/stardict-3.0.3-entry.patch @@ -0,0 +1,20 @@ +warning: key "Encoding" in group "Desktop Entry" is deprecated +error: value "stardict.png" for key "Icon" in group "Desktop Entry" is an icon name with an extension, but there should be no extension +error: value "Dictionary" in key "Categories" in group "Desktop Entry" requires another category to be present among the following categories: Office;TextTools + +--- dict/data/stardict.desktop.in ++++ dict/data/stardict.desktop.in +@@ -1,11 +1,10 @@ + [Desktop Entry] +-Encoding=UTF-8 + _Name=StarDict + _Comment=Lookup words + Exec=stardict + Terminal=false + Type=Application +-Icon=stardict.png ++Icon=stardict + StartupNotify=true +-Categories=Utility;Dictionary; ++Categories=Utility;Office;TextTools;Dictionary; + X-GNOME-DocPath=stardict/stardict.xml diff --git a/pkgs/applications/misc/stardict/stardict-3.0.3-gcc46.patch b/pkgs/applications/misc/stardict/stardict-3.0.3-gcc46.patch new file mode 100644 index 00000000000..d85bc0de5ce --- /dev/null +++ b/pkgs/applications/misc/stardict/stardict-3.0.3-gcc46.patch @@ -0,0 +1,13 @@ +http://bugs.gentoo.org/362299 + +--- dict/stardict-plugins/stardict-wordnet-plugin/scene.h ++++ dict/stardict-plugins/stardict-wordnet-plugin/scene.h +@@ -25,6 +25,8 @@ + #ifndef __PHYSICS_H__ + #define __PHYSICS_H__ + ++#include ++ + #include "partic.h" + #include "spring.h" + diff --git a/pkgs/applications/misc/stardict/stardict-3.0.3-overflow.patch b/pkgs/applications/misc/stardict/stardict-3.0.3-overflow.patch new file mode 100644 index 00000000000..48249010570 --- /dev/null +++ b/pkgs/applications/misc/stardict/stardict-3.0.3-overflow.patch @@ -0,0 +1,26 @@ +This patch is stardict-tools-3.0.3-destbufferoverflow.patch from OpenSUSE .src.rpm for: + +warning: call to ‘__fgets_chk_warn’ declared with attribute warning: fgets called with bigger size than length of destination buffer [enabled by default] + +--- tools/src/myspell2dic.c ++++ tools/src/myspell2dic.c +@@ -132,7 +132,7 @@ if (argc<3) + + fprintf(stderr, "Enter grammar language [Spanish]: "); + fflush(stderr); +-fgets(lang, 100, stdin); ++fgets(lang, 50, stdin); + if ((p=strchr(lang, '\n'))!=NULL) *p=0; + if (*lang==0) strcpy(lang, "Spanish"); + +--- tools/src/ooo2dict.c ++++ tools/src/ooo2dict.c +@@ -71,7 +71,7 @@ current2=malloc(10000); + + fprintf(stderr, "Enter thesaurus language [WordNet_English]: "); + fflush(stderr); +-fgets(lang, 100, stdin); ++fgets(lang, 50, stdin); + if ((p=strchr(lang, '\n'))!=NULL) *p=0; + if (*lang==0) strcpy(lang, "WordNet_English"); + F=fopen((argc>1)? argv[1]: "/usr/share/myspell/dicts/th_en_US_v2.dat", "rt"); diff --git a/pkgs/applications/misc/stardict/stardict-3.0.3-zlib-1.2.5.2.patch b/pkgs/applications/misc/stardict/stardict-3.0.3-zlib-1.2.5.2.patch new file mode 100644 index 00000000000..6a320bd4a9f --- /dev/null +++ b/pkgs/applications/misc/stardict/stardict-3.0.3-zlib-1.2.5.2.patch @@ -0,0 +1,39 @@ +http://bugs.gentoo.org/401887 + +diff --git a/lib/src/libcommon.cpp b/lib/src/libcommon.cpp +index 16770a3..a4299e7 100644 +--- a/lib/src/libcommon.cpp ++++ b/lib/src/libcommon.cpp +@@ -614,7 +614,7 @@ int unpack_zlib(const char* arch_file_name, const char* out_file_name) + return EXIT_FAILURE; + } + while(true) { +- len = gzread(get_impl(in), buf, buffer_size); ++ len = gzread((gzFile)get_impl(in), buf, buffer_size); + if(len < 0) { + g_critical(read_file_err, arch_file_name, ""); + return EXIT_FAILURE; +@@ -871,3 +871,8 @@ int remove_recursive(const std::string& path) + return res; + } + } ++ ++int gzclose_compat(void * file) ++{ ++ return gzclose ((gzFile)file); ++} +diff --git a/lib/src/libcommon.h b/lib/src/libcommon.h +index 10f13b4..bdcbf2f 100644 +--- a/lib/src/libcommon.h ++++ b/lib/src/libcommon.h +@@ -187,8 +187,9 @@ namespace clib { + typedef ResourceWrapper File; + } + ++extern int gzclose_compat(void * file); + namespace zip { +-typedef ResourceWrapper gzFile; ++typedef ResourceWrapper gzFile; + } + + /* Create a new temporary file. Return file name in file name encoding. diff --git a/pkgs/applications/misc/stardict/stardict.nix b/pkgs/applications/misc/stardict/stardict.nix new file mode 100644 index 00000000000..9eb3e112342 --- /dev/null +++ b/pkgs/applications/misc/stardict/stardict.nix @@ -0,0 +1,46 @@ +{stdenv, fetchurl, pkgconfig, gtk, glib, zlib, libxml2, intltool, gnome_doc_utils, libgnomeui, scrollkeeper, mysql, pcre, which, libxslt}: +stdenv.mkDerivation rec { + name= "stardict-3.0.3"; + + src = fetchurl { + url = "http://stardict-3.googlecode.com/files/${name}.tar.bz2"; + sha256 = "0wrb8xqy6x9piwrn0vw5alivr9h3b70xlf51qy0jpl6d7mdhm8cv"; + }; + + buildInputs = [ pkgconfig gtk glib zlib libxml2 intltool gnome_doc_utils libgnomeui scrollkeeper mysql pcre which libxslt]; + + postPatch = '' + # mysql hacks: we need dynamic linking as there is no libmysqlclient.a + substituteInPlace tools/configure --replace '/usr/local/include/mysql' '${mysql}/include/mysql/' + substituteInPlace tools/configure --replace 'AC_FIND_FILE([libmysqlclient.a]' 'AC_FIND_FILE([libmysqlclient.so]' + substituteInPlace tools/configure --replace '/usr/local/lib/mysql' '${mysql}/lib/mysql/' + substituteInPlace tools/configure --replace 'for y in libmysqlclient.a' 'for y in libmysqlclient.so' + substituteInPlace tools/configure --replace 'libmysqlclient.a' 'libmysqlclient.so' + + # a list of p0 patches from gentoo devs + patch -p0 < ${./stardict-3.0.3-overflow.patch} + patch -p0 < ${./stardict-3.0.3-gcc46.patch} + patch -p0 < ${./stardict-3.0.3-compositelookup_cpp.patch} + patch -p0 < ${./stardict-3.0.3-correct-glib-include.patch} + patch -p0 < ${./stardict-3.0.3-entry.patch} + + # disable the xsltproc internet query + substituteInPlace dict/help/Makefile.am --replace 'xsltproc -o' 'xsltproc --nonet -o' + substituteInPlace dict/help/Makefile.in --replace 'xsltproc -o' 'xsltproc --nonet -o' + ''; + + # another gentoo patch: a p1 patch + patches = [ ./stardict-3.0.3-zlib-1.2.5.2.patch ]; + + configurePhase = '' + ./configure --disable-spell --disable-gucharmap --disable-festival --disable-espeak --disable-scrollkeeper --prefix=$out + ''; + + meta = { + description = "stardict"; + homepage = "A international dictionary supporting fuzzy and glob style matching"; + license = "LGPL3"; + maintainers = with stdenv.lib.maintainers; [qknight]; + }; +} + From ef188787a0f195dabcd43be494dae1bb6521b970 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 18 Jun 2012 15:41:18 +0000 Subject: [PATCH 323/403] A minor LyX update. svn path=/nixpkgs/trunk/; revision=34550 --- pkgs/applications/misc/lyx/default.nix | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index 64ff3142ef1..4358c3fe6e7 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -4,25 +4,21 @@ }: stdenv.mkDerivation rec { - version = "2.0.0"; + version = "2.0.3"; name = "lyx-${version}"; src = fetchurl { url = "ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/${name}.tar.xz"; - sha256 = "a790951d6ed660b254e82d682b478665f119dd522ab4759fdeb5cd8d42f66f61"; + sha256 = "1j2sl22w41h4vrgnxv2n0s7d11k6zchjbggjw3ai9yxcahvrj72f"; }; buildInputs = [texLive qt python makeWrapper pkgconfig ]; - # don't ask me why it can't find libX11.so.6 - postInstall = '' - wrapProgram $out/bin/lyx \ - --prefix LD_LIBRARY_PATH ":" ${libX11}/lib - ''; - - meta = { - description = "WYSIWYM frontend for LaTeX, DocBook, etc."; - homepage = "http://www.lyx.org"; - license = "GPL2"; + meta = { + description = "WYSIWYM frontend for LaTeX, DocBook, etc."; + homepage = "http://www.lyx.org"; + license = "GPL2"; + maintainers = [ stdenv.lib.maintainers.neznalek ]; + platforms = stdenv.lib.platforms.linux; }; } From 9f350c653a1e255958918279fb4e7799c9cabbad Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 18 Jun 2012 16:58:57 +0000 Subject: [PATCH 324/403] * Ant updated to 1.8.4. svn path=/nixpkgs/trunk/; revision=34551 --- .../development/tools/build-managers/apache-ant/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix index bec71a291d6..03428552229 100644 --- a/pkgs/development/tools/build-managers/apache-ant/default.nix +++ b/pkgs/development/tools/build-managers/apache-ant/default.nix @@ -6,7 +6,7 @@ let inherit fetchurl stdenv; }; - version = "1.8.0RC1"; + version = "1.8.4"; in @@ -20,7 +20,7 @@ stdenv.mkDerivation { inherit antContrib jdk; src = fetchurl { - url = "http://apache.mirror.transip.nl/ant/binaries/apache-ant-${version}-bin.tar.bz2"; - sha256 = "0xvmrsghibq7p3wvfkmvmkkg0zzfmw32lrfjl5f6cfzchjjnw9wx"; + url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2"; + sha1 = "d9e3e83dd9664cfe1dcd4841c082db3f559af922"; }; } From 972006aa43c5597767077d794aabebbabdeb61cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 18 Jun 2012 18:15:26 +0000 Subject: [PATCH 325/403] Making nvidia 96.x build on linux 3.4. I took patches from AUR. svn path=/nixpkgs/trunk/; revision=34552 --- .../os-specific/linux/nvidia-x11/acpixf.patch | 27 +++++++++ .../linux/nvidia-x11/builder-legacy.sh | 6 ++ .../linux/nvidia-x11/generated.patch | 12 ++++ .../os-specific/linux/nvidia-x11/legacy96.nix | 10 ++++ .../linux/nvidia-x11/patchlevel.patch | 59 +++++++++++++++++++ .../linux/nvidia-x11/switch_to.patch | 24 ++++++++ 6 files changed, 138 insertions(+) create mode 100644 pkgs/os-specific/linux/nvidia-x11/acpixf.patch create mode 100644 pkgs/os-specific/linux/nvidia-x11/generated.patch create mode 100644 pkgs/os-specific/linux/nvidia-x11/patchlevel.patch create mode 100644 pkgs/os-specific/linux/nvidia-x11/switch_to.patch diff --git a/pkgs/os-specific/linux/nvidia-x11/acpixf.patch b/pkgs/os-specific/linux/nvidia-x11/acpixf.patch new file mode 100644 index 00000000000..c94641c6919 --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/acpixf.patch @@ -0,0 +1,27 @@ +diff -pur 96.43.20/conftest.sh 96.43.20-3.4/conftest.sh +--- 96.43.20/conftest.sh 2011-07-18 10:51:11.000000000 +0400 ++++ 96.43.20-3.4/conftest.sh 2012-06-16 00:04:22.870746239 +0400 +@@ -908,6 +908,7 @@ compile_test() { + # + echo "$CONFTEST_PREAMBLE + #include ++ #include + void conftest_acpi_walk_namespace(void) { + acpi_walk_namespace(); + }" > conftest$$.c +@@ -923,6 +924,7 @@ compile_test() { + + echo "$CONFTEST_PREAMBLE + #include ++ #include + void conftest_acpi_walk_namespace(void) { + acpi_walk_namespace(0, NULL, 0, NULL, NULL, NULL, NULL); + }" > conftest$$.c +@@ -939,6 +941,7 @@ compile_test() { + + echo "$CONFTEST_PREAMBLE + #include ++ #include + void conftest_acpi_walk_namespace(void) { + acpi_walk_namespace(0, NULL, 0, NULL, NULL, NULL); + }" > conftest$$.c diff --git a/pkgs/os-specific/linux/nvidia-x11/builder-legacy.sh b/pkgs/os-specific/linux/nvidia-x11/builder-legacy.sh index e0af21759c9..6062566cbfb 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder-legacy.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder-legacy.sh @@ -14,6 +14,12 @@ buildPhase() { cd usr/src/nv/ + shopt -s nullglob + + for a in $kpatches; do + patch -p1 < $a + done + # Workaround: get it to build on kernels that have CONFIG_XEN # set. Disable the test, apply a patch to disable the Xen # functionality. diff --git a/pkgs/os-specific/linux/nvidia-x11/generated.patch b/pkgs/os-specific/linux/nvidia-x11/generated.patch new file mode 100644 index 00000000000..6cf7a93c644 --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/generated.patch @@ -0,0 +1,12 @@ +diff -pur 173.14.31/conftest.sh 173.14.31-3.3/conftest.sh +--- 173.14.31/conftest.sh 2011-07-18 09:49:58.000000000 +0400 ++++ 173.14.31-3.3/conftest.sh 2012-04-09 19:33:34.407928432 +0400 +@@ -123,7 +123,7 @@ build_cflags() { + CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS" + + if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then +- CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include" ++ CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$SOURCES/arch/x86/include/generated" + fi + if [ -n "$BUILD_PARAMS" ]; then + CFLAGS="$CFLAGS -D$BUILD_PARAMS" diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy96.nix b/pkgs/os-specific/linux/nvidia-x11/legacy96.nix index 156484f53e1..fd27a989c07 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy96.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy96.nix @@ -26,6 +26,16 @@ stdenv.mkDerivation { inherit versionNumber kernel; + # Only for kernels 3.4 and over + # Patches taken from arch linux AUR + # https://aur.archlinux.org/packages.php?ID=57698 + kpatches = stdenv.lib.optionals (stdenv.lib.strings.versionOlder "3.4" kernel.version) + [ ./acpixf.patch + ./generated.patch + ./patchlevel.patch + ./switch_to.patch + ]; + dontStrip = true; glPath = stdenv.lib.makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr]; diff --git a/pkgs/os-specific/linux/nvidia-x11/patchlevel.patch b/pkgs/os-specific/linux/nvidia-x11/patchlevel.patch new file mode 100644 index 00000000000..256922ca966 --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/patchlevel.patch @@ -0,0 +1,59 @@ +diff -pur 96.43.20-t1/conftest.sh 96.43.20-t2/conftest.sh +--- 96.43.20-t1/conftest.sh 2012-06-16 17:14:47.206589267 +0400 ++++ 96.43.20-t2/conftest.sh 2012-06-16 15:35:45.049203248 +0400 +@@ -1303,10 +1303,14 @@ case "$5" in + MAKEFILE=$HEADERS/../Makefile + + if [ -f $MAKEFILE ]; then ++ VERSION=$(grep "^VERSION =" $MAKEFILE | cut -d " " -f 3) + PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d " " -f 3) + +- if [ -z "$PATCHLEVEL" ]; then ++ if [ -z "$PATCHLEVEL" -o -z "$VERSION" ]; then + exit 1 ++ elif [ "$VERSION" = '3' ]; then ++ echo 6 ++ exit 0 + else + echo $PATCHLEVEL + exit 0 +@@ -1426,10 +1430,11 @@ case "$5" in + # kernel older than 2.6.6, that's all we require to + # build the module. + # ++ VERSION=$(grep "^VERSION =" $MAKEFILE | cut -d " " -f 3) + PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d " " -f 3) + SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3) + +- if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \ ++ if [ "$VERSION" = '2' -a -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \ + -a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then + SELECTED_MAKEFILE=Makefile.kbuild + RET=0 +@@ -1525,11 +1530,12 @@ case "$5" in + # This source tree is not configured, but includes + # the top-level Makefile. + # ++ VERSION=$(grep "^VERSION =" $MAKEFILE | cut -d " " -f 3) + PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d " " -f 3) + SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3) + +- if [ -n "$PATCHLEVEL" -a -n "$SUBLEVEL" ]; then +- echo 2.$PATCHLEVEL.$SUBLEVEL ++ if [ -n "$VERSION" -a -n "$PATCHLEVEL" -a -n "$SUBLEVEL" ]; then ++ echo $VERSION.$PATCHLEVEL.$SUBLEVEL + RET=0 + fi + fi +diff -pur 96.43.20-t1/Makefile.kbuild 96.43.20-t2/Makefile.kbuild +--- 96.43.20-t1/Makefile.kbuild 2011-07-18 10:51:11.000000000 +0400 ++++ 96.43.20-t2/Makefile.kbuild 2012-06-16 17:08:11.694605133 +0400 +@@ -132,7 +132,7 @@ MODULE_ROOT := /lib/modules/$(KERNEL_UNA + # + + TOPDIR ?= $(KERNEL_SOURCES) +-PATCHLEVEL ?= $(shell $(CONFTEST) kernel_patch_level) ++PATCHLEVEL := $(shell $(CONFTEST) kernel_patch_level) + + # + # Linux 2.4 uses the .o module extension. Linux 2.6, however, uses the .ko diff --git a/pkgs/os-specific/linux/nvidia-x11/switch_to.patch b/pkgs/os-specific/linux/nvidia-x11/switch_to.patch new file mode 100644 index 00000000000..51ffa7f83f1 --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/switch_to.patch @@ -0,0 +1,24 @@ +diff -pur 173.14.31-3.3/conftest.sh 173.14.31-3.4/conftest.sh +--- 173.14.31-3.3/conftest.sh 2012-04-09 19:33:34.407928432 +0400 ++++ 173.14.31-3.4/conftest.sh 2012-04-10 19:50:36.052346728 +0400 +@@ -465,7 +465,7 @@ compile_test() { + # and if it as an 'event' member. + # + echo "$CONFTEST_PREAMBLE +- #include ++ #include + #include + void conftest_pm_message_t(pm_message_t state) { + pm_message_t *p = &state; +diff -pur 173.14.31-3.3/nv-linux.h 173.14.31-3.4/nv-linux.h +--- 173.14.31-3.3/nv-linux.h 2011-07-18 09:49:58.000000000 +0400 ++++ 173.14.31-3.4/nv-linux.h 2012-04-10 19:53:04.853776013 +0400 +@@ -92,7 +92,7 @@ + #include + + #include /* do_div() */ +-#include /* cli, sli, save_flags */ ++#include /* cli, sli, save_flags */ + #include /* ioremap, virt_to_phys */ + #include /* access_ok */ + #include /* PAGE_OFFSET */ From a3224ededca1f5c338eda4d17fe2d9d0a75cca03 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Jun 2012 18:16:23 +0000 Subject: [PATCH 326/403] git-and-tools: fixed build in the presence of QuickCheck 2.5 svn path=/nixpkgs/trunk/; revision=34553 --- .../applications/version-management/git-and-tools/default.nix | 4 ++-- .../version-management/git-and-tools/git-annex/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 965e3e884c8..7cda4cffd71 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -44,9 +44,9 @@ rec { gitAnnex = lib.makeOverridable (import ./git-annex) { inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which coreutils openssh; - inherit (haskellPackages_ghc741) ghc MissingH utf8String pcreLight SHA dataenc + inherit (haskellPackages) ghc MissingH utf8String pcreLight SHA dataenc HTTP testpack hS3 mtl network hslogger hxt json liftedBase monadControl IfElse - QuickCheck2 bloomfilter editDistance; + QuickCheck bloomfilter editDistance; }; 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 c50999e41a4..6385834ff52 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,6 +1,6 @@ { 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 +, QuickCheck, rsync, SHA, testpack, utf8String, which, liftedBase, coreutils , IfElse, bloomfilter, editDistance, openssh }: @@ -18,7 +18,7 @@ stdenv.mkDerivation { buildInputs = [ curl dataenc findutils ghc git hS3 hslogger HTTP hxt ikiwiki json - libuuid MissingH monadControl mtl network pcreLight perl QuickCheck2 + libuuid MissingH monadControl mtl network pcreLight perl QuickCheck rsync SHA testpack utf8String which liftedBase IfElse bloomfilter editDistance openssh ]; From fc6ce9f79937fe494119bd61765703fa3cd8c4fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 18 Jun 2012 20:18:09 +0000 Subject: [PATCH 327/403] Minor kile update. svn path=/nixpkgs/trunk/; revision=34554 --- pkgs/applications/editors/kile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/kile/default.nix b/pkgs/applications/editors/kile/default.nix index c2d2167e3dd..e837dfdecc1 100644 --- a/pkgs/applications/editors/kile/default.nix +++ b/pkgs/applications/editors/kile/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, kdelibs, cmake, gettext }: stdenv.mkDerivation rec { - name = "kile-2.1"; + name = "kile-2.1.2"; src = fetchurl { url = "mirror://sourceforge/kile/${name}.tar.bz2"; - sha256 = "0ag6ya0625w34hpk0bpkjyi0ydw699zbkf86vwc19mh9cb0n0aic"; + sha256 = "0nx5fmjrxrndnzvknxnybd8qh15jzfxzbny2rljq3amjw02y9lc2"; }; buildNativeInputs = [ cmake gettext ]; From ecbccbcd1c4706ccc25e6c9927f99e2893444cb8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 19 Jun 2012 08:24:18 +0000 Subject: [PATCH 328/403] haskell-HaXml: updated to version 1.23.3 svn path=/nixpkgs/trunk/; revision=34555 --- pkgs/development/libraries/haskell/HaXml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/HaXml/default.nix b/pkgs/development/libraries/haskell/HaXml/default.nix index e1b061690fe..55898e9d9d9 100644 --- a/pkgs/development/libraries/haskell/HaXml/default.nix +++ b/pkgs/development/libraries/haskell/HaXml/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "HaXml"; - version = "1.22.5"; - sha256 = "1ckmi8iwyaid4mcnh8117s9kq45f8r7sidh6dbhzbj0dl29rrkbz"; + version = "1.23.3"; + sha256 = "1gp3vjv8g0i9bd0sryfjarzp7n8ddfbrib68jzhqgjkqbyj2bs8g"; isLibrary = true; isExecutable = true; buildDepends = [ filepath polyparse random ]; From 4007f293677bfc9cd535cbd93c0cc9da35ca7a4b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 19 Jun 2012 08:24:22 +0000 Subject: [PATCH 329/403] haskell-haxr: patched to support HaXml 1.12.3 svn path=/nixpkgs/trunk/; revision=34556 --- pkgs/development/libraries/haskell/haxr/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/haskell/haxr/default.nix b/pkgs/development/libraries/haskell/haxr/default.nix index 3e14485ea1a..12f2b2f84f3 100644 --- a/pkgs/development/libraries/haskell/haxr/default.nix +++ b/pkgs/development/libraries/haskell/haxr/default.nix @@ -9,6 +9,9 @@ cabal.mkDerivation (self: { buildDepends = [ blazeBuilder dataenc HaXml HTTP mtl network time utf8String ]; + patchPhase = '' + sed -i haxr.cabal -e 's|HaXml == 1.22.\*|HaXml|' + ''; meta = { homepage = "http://www.haskell.org/haskellwiki/HaXR"; description = "XML-RPC client and server library"; From cf6db2bbac96c347110f8f4d61c7643edd9e46e7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 19 Jun 2012 15:01:49 +0000 Subject: [PATCH 330/403] * "powermanagement" is not a word. svn path=/nixpkgs/trunk/; revision=34557 --- pkgs/os-specific/linux/kernel/linux-2.6.39.nix | 2 +- pkgs/os-specific/linux/kernel/linux-3.0.nix | 2 +- pkgs/os-specific/linux/kernel/linux-3.1.nix | 2 +- pkgs/os-specific/linux/kernel/linux-3.2.nix | 2 +- pkgs/os-specific/linux/kernel/linux-3.3.nix | 2 +- pkgs/os-specific/linux/kernel/linux-3.4.nix | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.39.nix b/pkgs/os-specific/linux/kernel/linux-2.6.39.nix index 64aa288c8c8..001486f5ba5 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.39.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.39.nix @@ -5,7 +5,7 @@ args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "" let configWithPlatform = kernelPlatform : '' - # powermanagement and debugging for powertop + # Power management and debugging for powertop. DEBUG_KERNEL y PM_ADVANCED_DEBUG y PM_RUNTIME y diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix index 9325b15a6c4..d207b2c8b81 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix @@ -5,7 +5,7 @@ args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "" let configWithPlatform = kernelPlatform : '' - # powermanagement and debugging for powertop + # Power management and debugging for powertop. DEBUG_KERNEL y PM_ADVANCED_DEBUG y PM_RUNTIME y diff --git a/pkgs/os-specific/linux/kernel/linux-3.1.nix b/pkgs/os-specific/linux/kernel/linux-3.1.nix index 9321bbdd479..9b3af876699 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.1.nix @@ -5,7 +5,7 @@ args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "" let configWithPlatform = kernelPlatform : '' - # powermanagement and debugging for powertop + # Power management and debugging for powertop. DEBUG_KERNEL y PM_ADVANCED_DEBUG y PM_RUNTIME y diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index 19716169d6d..faf79891dbb 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -5,7 +5,7 @@ args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "" let configWithPlatform = kernelPlatform : '' - # powermanagement and debugging for powertop + # Power management and debugging for powertop. DEBUG_KERNEL y PM_ADVANCED_DEBUG y PM_RUNTIME y diff --git a/pkgs/os-specific/linux/kernel/linux-3.3.nix b/pkgs/os-specific/linux/kernel/linux-3.3.nix index b6c74b79b83..ce0deff3839 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.3.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.3.nix @@ -5,7 +5,7 @@ args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "" let configWithPlatform = kernelPlatform : '' - # powermanagement and debugging for powertop + # Power management and debugging for powertop. DEBUG_KERNEL y PM_ADVANCED_DEBUG y PM_RUNTIME y diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 191508af750..8a2e8a4d995 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -5,7 +5,7 @@ args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "" let configWithPlatform = kernelPlatform : '' - # powermanagement and debugging for powertop + # Power management and debugging for powertop. DEBUG_KERNEL y PM_ADVANCED_DEBUG y PM_RUNTIME y From 15822766024b5212239e3dc139695b1d965fe453 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 19 Jun 2012 15:56:17 +0000 Subject: [PATCH 331/403] * Drop some old obsolete kernels and unused patches. svn path=/nixpkgs/trunk/; revision=34558 --- pkgs/os-specific/linux/kernel/aufs2-34.patch | 358 ---- .../linux/kernel/aufs2.1-3.0.patch | 70 - .../os-specific/linux/kernel/aufs2.1-36.patch | 81 - .../os-specific/linux/kernel/aufs2.1-38.patch | 368 ---- .../os-specific/linux/kernel/aufs2.1-39.patch | 70 - .../linux/kernel/cifs-timeout-2.6.25.patch | 46 - .../linux/kernel/config-2.6.31-armv5tel | 1786 ----------------- .../os-specific/linux/kernel/linux-2.6.27.nix | 219 -- .../os-specific/linux/kernel/linux-2.6.38.nix | 208 -- .../os-specific/linux/kernel/linux-2.6.39.nix | 221 -- .../linux/kernel/linux-nanonote-jz-2.6.34.nix | 241 --- .../linux/kernel/linux-nanonote-jz-2.6.35.nix | 241 --- .../linux/kernel/linux-nanonote-jz-2.6.36.nix | 241 --- .../linux/kernel/mips_restart.patch | 12 - pkgs/os-specific/linux/kernel/patches.nix | 132 -- pkgs/top-level/all-packages.nix | 91 +- 16 files changed, 3 insertions(+), 4382 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/aufs2-34.patch delete mode 100644 pkgs/os-specific/linux/kernel/aufs2.1-3.0.patch delete mode 100644 pkgs/os-specific/linux/kernel/aufs2.1-36.patch delete mode 100644 pkgs/os-specific/linux/kernel/aufs2.1-38.patch delete mode 100644 pkgs/os-specific/linux/kernel/aufs2.1-39.patch delete mode 100644 pkgs/os-specific/linux/kernel/cifs-timeout-2.6.25.patch delete mode 100644 pkgs/os-specific/linux/kernel/config-2.6.31-armv5tel delete mode 100644 pkgs/os-specific/linux/kernel/linux-2.6.27.nix delete mode 100644 pkgs/os-specific/linux/kernel/linux-2.6.38.nix delete mode 100644 pkgs/os-specific/linux/kernel/linux-2.6.39.nix delete mode 100644 pkgs/os-specific/linux/kernel/linux-nanonote-jz-2.6.34.nix delete mode 100644 pkgs/os-specific/linux/kernel/linux-nanonote-jz-2.6.35.nix delete mode 100644 pkgs/os-specific/linux/kernel/linux-nanonote-jz-2.6.36.nix delete mode 100644 pkgs/os-specific/linux/kernel/mips_restart.patch diff --git a/pkgs/os-specific/linux/kernel/aufs2-34.patch b/pkgs/os-specific/linux/kernel/aufs2-34.patch deleted file mode 100644 index dd9e7d9f6df..00000000000 --- a/pkgs/os-specific/linux/kernel/aufs2-34.patch +++ /dev/null @@ -1,358 +0,0 @@ -From: -http://git.c3sl.ufpr.br/gitweb?p=aufs/aufs2-standalone.git;a=blob_plain;f=aufs2-base.patch;hb=aufs2-34 -http://git.c3sl.ufpr.br/gitweb?p=aufs/aufs2-standalone.git;a=blob_plain;f=aufs2-standalone.patch;hb=aufs2-34 - -aufs2 base patch for linux-2.6.34 - -diff --git a/fs/namei.c b/fs/namei.c -index b86b96f..c43d6b8 100644 ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -1177,7 +1177,7 @@ out: - * needs parent already locked. Doesn't follow mounts. - * SMP-safe. - */ --static struct dentry *lookup_hash(struct nameidata *nd) -+struct dentry *lookup_hash(struct nameidata *nd) - { - int err; - -@@ -1187,7 +1187,7 @@ static struct dentry *lookup_hash(struct nameidata *nd) - return __lookup_hash(&nd->last, nd->path.dentry, nd); - } - --static int __lookup_one_len(const char *name, struct qstr *this, -+int __lookup_one_len(const char *name, struct qstr *this, - struct dentry *base, int len) - { - unsigned long hash; -diff --git a/fs/splice.c b/fs/splice.c -index 9313b61..b9e871f 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1054,8 +1054,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); - /* - * Attempt to initiate a splice from pipe to file. - */ --static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -- loff_t *ppos, size_t len, unsigned int flags) -+long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags) - { - ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, - loff_t *, size_t, unsigned int); -@@ -1082,9 +1082,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - /* - * Attempt to initiate a splice from a file to a pipe. - */ --static long do_splice_to(struct file *in, loff_t *ppos, -- struct pipe_inode_info *pipe, size_t len, -- unsigned int flags) -+long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags) - { - ssize_t (*splice_read)(struct file *, loff_t *, - struct pipe_inode_info *, size_t, unsigned int); -diff --git a/include/linux/namei.h b/include/linux/namei.h -index 05b441d..91bc74e 100644 ---- a/include/linux/namei.h -+++ b/include/linux/namei.h -@@ -73,6 +73,9 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *, - extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry, - int (*open)(struct inode *, struct file *)); - -+extern struct dentry *lookup_hash(struct nameidata *nd); -+extern int __lookup_one_len(const char *name, struct qstr *this, -+ struct dentry *base, int len); - extern struct dentry *lookup_one_len(const char *, struct dentry *, int); - - extern int follow_down(struct path *); -diff --git a/include/linux/splice.h b/include/linux/splice.h -index 18e7c7c..8393b5c 100644 ---- a/include/linux/splice.h -+++ b/include/linux/splice.h -@@ -82,4 +82,10 @@ extern ssize_t splice_to_pipe(struct pipe_inode_info *, - extern ssize_t splice_direct_to_actor(struct file *, struct splice_desc *, - splice_direct_actor *); - -+extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags); -+extern long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags); -+ - #endif - -aufs2 standalone patch for linux-2.6.34 - -diff --git a/fs/namei.c b/fs/namei.c -index c43d6b8..538d40a 100644 ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -348,6 +348,7 @@ int deny_write_access(struct file * file) - - return 0; - } -+EXPORT_SYMBOL(deny_write_access); - - /** - * path_get - get a reference to a path -@@ -1186,6 +1187,7 @@ struct dentry *lookup_hash(struct nameidata *nd) - return ERR_PTR(err); - return __lookup_hash(&nd->last, nd->path.dentry, nd); - } -+EXPORT_SYMBOL(lookup_hash); - - int __lookup_one_len(const char *name, struct qstr *this, - struct dentry *base, int len) -@@ -1208,6 +1210,7 @@ int __lookup_one_len(const char *name, struct qstr *this, - this->hash = end_name_hash(hash); - return 0; - } -+EXPORT_SYMBOL(__lookup_one_len); - - /** - * lookup_one_len - filesystem helper to lookup single pathname component -diff --git a/fs/namespace.c b/fs/namespace.c -index f20cb57..7cc1b42 100644 ---- a/fs/namespace.c -+++ b/fs/namespace.c -@@ -1282,6 +1282,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, - } - return 0; - } -+EXPORT_SYMBOL(iterate_mounts); - - static void cleanup_group_ids(struct vfsmount *mnt, struct vfsmount *end) - { -diff --git a/fs/notify/group.c b/fs/notify/group.c -index 0e16771..3fab10a 100644 ---- a/fs/notify/group.c -+++ b/fs/notify/group.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - #include - #include "fsnotify.h" -@@ -169,6 +170,7 @@ void fsnotify_put_group(struct fsnotify_group *group) - fsnotify_recalc_global_mask(); - fsnotify_destroy_group(group); - } -+EXPORT_SYMBOL(fsnotify_put_group); - - /* - * Simply run the fsnotify_groups list and find a group which matches -@@ -252,3 +254,4 @@ struct fsnotify_group *fsnotify_obtain_group(unsigned int group_num, __u32 mask, - - return group; - } -+EXPORT_SYMBOL(fsnotify_obtain_group); -diff --git a/fs/notify/inode_mark.c b/fs/notify/inode_mark.c -index 0399bcb..74cdc13 100644 ---- a/fs/notify/inode_mark.c -+++ b/fs/notify/inode_mark.c -@@ -105,6 +105,7 @@ void fsnotify_put_mark(struct fsnotify_mark_entry *entry) - if (atomic_dec_and_test(&entry->refcnt)) - entry->free_mark(entry); - } -+EXPORT_SYMBOL(fsnotify_put_mark); - - /* - * Recalculate the mask of events relevant to a given inode locked. -@@ -215,6 +216,7 @@ void fsnotify_destroy_mark_by_entry(struct fsnotify_mark_entry *entry) - if (unlikely(atomic_dec_and_test(&group->num_marks))) - fsnotify_final_destroy_group(group); - } -+EXPORT_SYMBOL(fsnotify_destroy_mark_by_entry); - - /* - * Given a group, destroy all of the marks associated with that group. -@@ -281,6 +283,7 @@ struct fsnotify_mark_entry *fsnotify_find_mark_entry(struct fsnotify_group *grou - } - return NULL; - } -+EXPORT_SYMBOL(fsnotify_find_mark_entry); - - /* - * Nothing fancy, just initialize lists and locks and counters. -@@ -297,6 +300,7 @@ void fsnotify_init_mark(struct fsnotify_mark_entry *entry, - entry->inode = NULL; - entry->free_mark = free_mark; - } -+EXPORT_SYMBOL(fsnotify_init_mark); - - /* - * Attach an initialized mark entry to a given group and inode. -@@ -352,6 +356,7 @@ int fsnotify_add_mark(struct fsnotify_mark_entry *entry, - - return ret; - } -+EXPORT_SYMBOL(fsnotify_add_mark); - - /** - * fsnotify_unmount_inodes - an sb is unmounting. handle any watched inodes. -diff --git a/fs/open.c b/fs/open.c -index 74e5cd9..8192b46 100644 ---- a/fs/open.c -+++ b/fs/open.c -@@ -225,6 +225,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, - mutex_unlock(&dentry->d_inode->i_mutex); - return ret; - } -+EXPORT_SYMBOL(do_truncate); - - static long do_sys_truncate(const char __user *pathname, loff_t length) - { -diff --git a/fs/splice.c b/fs/splice.c -index b9e871f..b069be4 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1078,6 +1078,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - - return splice_write(pipe, out, ppos, len, flags); - } -+EXPORT_SYMBOL(do_splice_from); - - /* - * Attempt to initiate a splice from a file to a pipe. -@@ -1104,6 +1105,7 @@ long do_splice_to(struct file *in, loff_t *ppos, - - return splice_read(in, ppos, pipe, len, flags); - } -+EXPORT_SYMBOL(do_splice_to); - - /** - * splice_direct_to_actor - splices data directly between two non-pipes -diff --git a/security/commoncap.c b/security/commoncap.c -index 6166973..a702444 100644 ---- a/security/commoncap.c -+++ b/security/commoncap.c -@@ -951,3 +951,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot, - } - return ret; - } -+EXPORT_SYMBOL(cap_file_mmap); -diff --git a/security/device_cgroup.c b/security/device_cgroup.c -index f77c604..743f39b 100644 ---- a/security/device_cgroup.c -+++ b/security/device_cgroup.c -@@ -515,6 +515,7 @@ found: - - return -EPERM; - } -+EXPORT_SYMBOL(devcgroup_inode_permission); - - int devcgroup_inode_mknod(int mode, dev_t dev) - { -diff --git a/security/security.c b/security/security.c -index 687c6fd..e9e5f6b 100644 ---- a/security/security.c -+++ b/security/security.c -@@ -411,6 +411,7 @@ int security_path_mkdir(struct path *dir, struct dentry *dentry, int mode) - return 0; - return security_ops->path_mkdir(dir, dentry, mode); - } -+EXPORT_SYMBOL(security_path_mkdir); - - int security_path_rmdir(struct path *dir, struct dentry *dentry) - { -@@ -418,6 +419,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry) - return 0; - return security_ops->path_rmdir(dir, dentry); - } -+EXPORT_SYMBOL(security_path_rmdir); - - int security_path_unlink(struct path *dir, struct dentry *dentry) - { -@@ -425,6 +427,7 @@ int security_path_unlink(struct path *dir, struct dentry *dentry) - return 0; - return security_ops->path_unlink(dir, dentry); - } -+EXPORT_SYMBOL(security_path_unlink); - - int security_path_symlink(struct path *dir, struct dentry *dentry, - const char *old_name) -@@ -433,6 +436,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry, - return 0; - return security_ops->path_symlink(dir, dentry, old_name); - } -+EXPORT_SYMBOL(security_path_symlink); - - int security_path_link(struct dentry *old_dentry, struct path *new_dir, - struct dentry *new_dentry) -@@ -441,6 +445,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir, - return 0; - return security_ops->path_link(old_dentry, new_dir, new_dentry); - } -+EXPORT_SYMBOL(security_path_link); - - int security_path_rename(struct path *old_dir, struct dentry *old_dentry, - struct path *new_dir, struct dentry *new_dentry) -@@ -451,6 +456,7 @@ int security_path_rename(struct path *old_dir, struct dentry *old_dentry, - return security_ops->path_rename(old_dir, old_dentry, new_dir, - new_dentry); - } -+EXPORT_SYMBOL(security_path_rename); - - int security_path_truncate(struct path *path, loff_t length, - unsigned int time_attrs) -@@ -459,6 +465,7 @@ int security_path_truncate(struct path *path, loff_t length, - return 0; - return security_ops->path_truncate(path, length, time_attrs); - } -+EXPORT_SYMBOL(security_path_truncate); - - int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, - mode_t mode) -@@ -467,6 +474,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, - return 0; - return security_ops->path_chmod(dentry, mnt, mode); - } -+EXPORT_SYMBOL(security_path_chmod); - - int security_path_chown(struct path *path, uid_t uid, gid_t gid) - { -@@ -474,6 +482,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid) - return 0; - return security_ops->path_chown(path, uid, gid); - } -+EXPORT_SYMBOL(security_path_chown); - - int security_path_chroot(struct path *path) - { -@@ -550,6 +559,7 @@ int security_inode_readlink(struct dentry *dentry) - return 0; - return security_ops->inode_readlink(dentry); - } -+EXPORT_SYMBOL(security_inode_readlink); - - int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd) - { -@@ -564,6 +574,7 @@ int security_inode_permission(struct inode *inode, int mask) - return 0; - return security_ops->inode_permission(inode, mask); - } -+EXPORT_SYMBOL(security_inode_permission); - - int security_inode_setattr(struct dentry *dentry, struct iattr *attr) - { -@@ -664,6 +675,7 @@ int security_file_permission(struct file *file, int mask) - { - return security_ops->file_permission(file, mask); - } -+EXPORT_SYMBOL(security_file_permission); - - int security_file_alloc(struct file *file) - { -@@ -691,6 +703,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot, - return ret; - return ima_file_mmap(file, prot); - } -+EXPORT_SYMBOL(security_file_mmap); - - int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot, - unsigned long prot) diff --git a/pkgs/os-specific/linux/kernel/aufs2.1-3.0.patch b/pkgs/os-specific/linux/kernel/aufs2.1-3.0.patch deleted file mode 100644 index 000c6b995c7..00000000000 --- a/pkgs/os-specific/linux/kernel/aufs2.1-3.0.patch +++ /dev/null @@ -1,70 +0,0 @@ -aufs2.1 base patch for linux-3.0 - -diff --git a/fs/namei.c b/fs/namei.c -index 14ab8d3..eb4aef1 100644 ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -1697,7 +1697,7 @@ static struct dentry *__lookup_hash(struct qstr *name, - * needs parent already locked. Doesn't follow mounts. - * SMP-safe. - */ --static struct dentry *lookup_hash(struct nameidata *nd) -+struct dentry *lookup_hash(struct nameidata *nd) - { - return __lookup_hash(&nd->last, nd->path.dentry, nd); - } -diff --git a/fs/splice.c b/fs/splice.c -index aa866d3..19afec6 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1085,8 +1085,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); - /* - * Attempt to initiate a splice from pipe to file. - */ --static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -- loff_t *ppos, size_t len, unsigned int flags) -+long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags) - { - ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, - loff_t *, size_t, unsigned int); -@@ -1113,9 +1113,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - /* - * Attempt to initiate a splice from a file to a pipe. - */ --static long do_splice_to(struct file *in, loff_t *ppos, -- struct pipe_inode_info *pipe, size_t len, -- unsigned int flags) -+long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags) - { - ssize_t (*splice_read)(struct file *, loff_t *, - struct pipe_inode_info *, size_t, unsigned int); -diff --git a/include/linux/namei.h b/include/linux/namei.h -index eba45ea..21ed6c9 100644 ---- a/include/linux/namei.h -+++ b/include/linux/namei.h -@@ -82,6 +82,7 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *, - extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry, - int (*open)(struct inode *, struct file *)); - -+extern struct dentry *lookup_hash(struct nameidata *nd); - extern struct dentry *lookup_one_len(const char *, struct dentry *, int); - - extern int follow_down_one(struct path *); -diff --git a/include/linux/splice.h b/include/linux/splice.h -index 997c3b4..be9a153 100644 ---- a/include/linux/splice.h -+++ b/include/linux/splice.h -@@ -89,4 +89,10 @@ extern int splice_grow_spd(struct pipe_inode_info *, struct splice_pipe_desc *); - extern void splice_shrink_spd(struct pipe_inode_info *, - struct splice_pipe_desc *); - -+extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags); -+extern long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags); -+ - #endif diff --git a/pkgs/os-specific/linux/kernel/aufs2.1-36.patch b/pkgs/os-specific/linux/kernel/aufs2.1-36.patch deleted file mode 100644 index 9003e67620c..00000000000 --- a/pkgs/os-specific/linux/kernel/aufs2.1-36.patch +++ /dev/null @@ -1,81 +0,0 @@ -aufs2.1 base patch for linux-2.6.36 - -diff --git a/fs/namei.c b/fs/namei.c -index 24896e8..19d69c5 100644 ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -1159,7 +1159,7 @@ out: - * needs parent already locked. Doesn't follow mounts. - * SMP-safe. - */ --static struct dentry *lookup_hash(struct nameidata *nd) -+struct dentry *lookup_hash(struct nameidata *nd) - { - int err; - -@@ -1169,7 +1169,7 @@ static struct dentry *lookup_hash(struct nameidata *nd) - return __lookup_hash(&nd->last, nd->path.dentry, nd); - } - --static int __lookup_one_len(const char *name, struct qstr *this, -+int __lookup_one_len(const char *name, struct qstr *this, - struct dentry *base, int len) - { - unsigned long hash; -diff --git a/fs/splice.c b/fs/splice.c -index 8f1dfae..278c94f 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1092,8 +1092,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); - /* - * Attempt to initiate a splice from pipe to file. - */ --static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -- loff_t *ppos, size_t len, unsigned int flags) -+long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags) - { - ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, - loff_t *, size_t, unsigned int); -@@ -1120,9 +1120,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - /* - * Attempt to initiate a splice from a file to a pipe. - */ --static long do_splice_to(struct file *in, loff_t *ppos, -- struct pipe_inode_info *pipe, size_t len, -- unsigned int flags) -+long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags) - { - ssize_t (*splice_read)(struct file *, loff_t *, - struct pipe_inode_info *, size_t, unsigned int); -diff --git a/include/linux/namei.h b/include/linux/namei.h -index 05b441d..91bc74e 100644 ---- a/include/linux/namei.h -+++ b/include/linux/namei.h -@@ -73,6 +73,9 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *, - extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry, - int (*open)(struct inode *, struct file *)); - -+extern struct dentry *lookup_hash(struct nameidata *nd); -+extern int __lookup_one_len(const char *name, struct qstr *this, -+ struct dentry *base, int len); - extern struct dentry *lookup_one_len(const char *, struct dentry *, int); - - extern int follow_down(struct path *); -diff --git a/include/linux/splice.h b/include/linux/splice.h -index 997c3b4..be9a153 100644 ---- a/include/linux/splice.h -+++ b/include/linux/splice.h -@@ -89,4 +89,10 @@ extern int splice_grow_spd(struct pipe_inode_info *, struct splice_pipe_desc *); - extern void splice_shrink_spd(struct pipe_inode_info *, - struct splice_pipe_desc *); - -+extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags); -+extern long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags); -+ - #endif diff --git a/pkgs/os-specific/linux/kernel/aufs2.1-38.patch b/pkgs/os-specific/linux/kernel/aufs2.1-38.patch deleted file mode 100644 index e6d4ccbb164..00000000000 --- a/pkgs/os-specific/linux/kernel/aufs2.1-38.patch +++ /dev/null @@ -1,368 +0,0 @@ -aufs2.1 base patch for linux-2.6.38 - -diff --git a/fs/namei.c b/fs/namei.c -index a4689eb..0513563 100644 ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -1842,12 +1842,12 @@ out: - * needs parent already locked. Doesn't follow mounts. - * SMP-safe. - */ --static struct dentry *lookup_hash(struct nameidata *nd) -+struct dentry *lookup_hash(struct nameidata *nd) - { - return __lookup_hash(&nd->last, nd->path.dentry, nd); - } - --static int __lookup_one_len(const char *name, struct qstr *this, -+int __lookup_one_len(const char *name, struct qstr *this, - struct dentry *base, int len) - { - unsigned long hash; -diff --git a/fs/splice.c b/fs/splice.c -index 50a5d978..886e942 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1081,8 +1081,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); - /* - * Attempt to initiate a splice from pipe to file. - */ --static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -- loff_t *ppos, size_t len, unsigned int flags) -+long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags) - { - ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, - loff_t *, size_t, unsigned int); -@@ -1109,9 +1109,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - /* - * Attempt to initiate a splice from a file to a pipe. - */ --static long do_splice_to(struct file *in, loff_t *ppos, -- struct pipe_inode_info *pipe, size_t len, -- unsigned int flags) -+long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags) - { - ssize_t (*splice_read)(struct file *, loff_t *, - struct pipe_inode_info *, size_t, unsigned int); -diff --git a/include/linux/namei.h b/include/linux/namei.h -index f276d4f..4eb5fcb 100644 ---- a/include/linux/namei.h -+++ b/include/linux/namei.h -@@ -79,6 +79,9 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *, - extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry, - int (*open)(struct inode *, struct file *)); - -+extern struct dentry *lookup_hash(struct nameidata *nd); -+extern int __lookup_one_len(const char *name, struct qstr *this, -+ struct dentry *base, int len); - extern struct dentry *lookup_one_len(const char *, struct dentry *, int); - - extern int follow_down_one(struct path *); -diff --git a/include/linux/splice.h b/include/linux/splice.h -index 997c3b4..be9a153 100644 ---- a/include/linux/splice.h -+++ b/include/linux/splice.h -@@ -89,4 +89,10 @@ extern int splice_grow_spd(struct pipe_inode_info *, struct splice_pipe_desc *); - extern void splice_shrink_spd(struct pipe_inode_info *, - struct splice_pipe_desc *); - -+extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags); -+extern long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags); -+ - #endif -aufs2.1 standalone patch for linux-2.6.38 - -diff --git a/fs/file_table.c b/fs/file_table.c -index eb36b6b..12f2809 100644 ---- a/fs/file_table.c -+++ b/fs/file_table.c -@@ -393,6 +393,8 @@ void file_sb_list_del(struct file *file) - } - } - -+EXPORT_SYMBOL(file_sb_list_del); -+ - #ifdef CONFIG_SMP - - /* -diff --git a/fs/inode.c b/fs/inode.c -index 0647d80..294b8ad 100644 ---- a/fs/inode.c -+++ b/fs/inode.c -@@ -82,6 +82,7 @@ static struct hlist_head *inode_hashtable __read_mostly; - * the i_state of an inode while it is in use.. - */ - DEFINE_SPINLOCK(inode_lock); -+EXPORT_SYMBOL(inode_lock); - - /* - * iprune_sem provides exclusion between the kswapd or try_to_free_pages -diff --git a/fs/namei.c b/fs/namei.c -index 0513563..e1d996e 100644 ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -353,6 +353,7 @@ int deny_write_access(struct file * file) - - return 0; - } -+EXPORT_SYMBOL(deny_write_access); - - /** - * path_get - get a reference to a path -@@ -1846,6 +1847,7 @@ struct dentry *lookup_hash(struct nameidata *nd) - { - return __lookup_hash(&nd->last, nd->path.dentry, nd); - } -+EXPORT_SYMBOL(lookup_hash); - - int __lookup_one_len(const char *name, struct qstr *this, - struct dentry *base, int len) -@@ -1868,6 +1870,7 @@ int __lookup_one_len(const char *name, struct qstr *this, - this->hash = end_name_hash(hash); - return 0; - } -+EXPORT_SYMBOL(__lookup_one_len); - - /** - * lookup_one_len - filesystem helper to lookup single pathname component -diff --git a/fs/namespace.c b/fs/namespace.c -index d1edf26..44ca259 100644 ---- a/fs/namespace.c -+++ b/fs/namespace.c -@@ -1465,6 +1465,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, - } - return 0; - } -+EXPORT_SYMBOL(iterate_mounts); - - static void cleanup_group_ids(struct vfsmount *mnt, struct vfsmount *end) - { -diff --git a/fs/notify/group.c b/fs/notify/group.c -index d309f38..f0e9568 100644 ---- a/fs/notify/group.c -+++ b/fs/notify/group.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - #include - #include "fsnotify.h" -@@ -70,6 +71,7 @@ void fsnotify_put_group(struct fsnotify_group *group) - if (atomic_dec_and_test(&group->refcnt)) - fsnotify_destroy_group(group); - } -+EXPORT_SYMBOL(fsnotify_put_group); - - /* - * Create a new fsnotify_group and hold a reference for the group returned. -@@ -102,3 +104,4 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops) - - return group; - } -+EXPORT_SYMBOL(fsnotify_alloc_group); -diff --git a/fs/notify/mark.c b/fs/notify/mark.c -index 325185e..adede09 100644 ---- a/fs/notify/mark.c -+++ b/fs/notify/mark.c -@@ -113,6 +113,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark) - if (atomic_dec_and_test(&mark->refcnt)) - mark->free_mark(mark); - } -+EXPORT_SYMBOL(fsnotify_put_mark); - - /* - * Any time a mark is getting freed we end up here. -@@ -190,6 +191,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark) - if (unlikely(atomic_dec_and_test(&group->num_marks))) - fsnotify_final_destroy_group(group); - } -+EXPORT_SYMBOL(fsnotify_destroy_mark); - - void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask) - { -@@ -277,6 +279,7 @@ err: - - return ret; - } -+EXPORT_SYMBOL(fsnotify_add_mark); - - /* - * clear any marks in a group in which mark->flags & flags is true -@@ -332,6 +335,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark, - atomic_set(&mark->refcnt, 1); - mark->free_mark = free_mark; - } -+EXPORT_SYMBOL(fsnotify_init_mark); - - static int fsnotify_mark_destroy(void *ignored) - { -diff --git a/fs/open.c b/fs/open.c -index b47aab3..cf7b1ac 100644 ---- a/fs/open.c -+++ b/fs/open.c -@@ -60,6 +60,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, - mutex_unlock(&dentry->d_inode->i_mutex); - return ret; - } -+EXPORT_SYMBOL(do_truncate); - - static long do_sys_truncate(const char __user *pathname, loff_t length) - { -diff --git a/fs/splice.c b/fs/splice.c -index 886e942..9a77a3e 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1105,6 +1105,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - - return splice_write(pipe, out, ppos, len, flags); - } -+EXPORT_SYMBOL(do_splice_from); - - /* - * Attempt to initiate a splice from a file to a pipe. -@@ -1131,6 +1132,7 @@ long do_splice_to(struct file *in, loff_t *ppos, - - return splice_read(in, ppos, pipe, len, flags); - } -+EXPORT_SYMBOL(do_splice_to); - - /** - * splice_direct_to_actor - splices data directly between two non-pipes -diff --git a/security/commoncap.c b/security/commoncap.c -index 64c2ed9..e58b5d8 100644 ---- a/security/commoncap.c -+++ b/security/commoncap.c -@@ -929,3 +929,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot, - } - return ret; - } -+EXPORT_SYMBOL(cap_file_mmap); -diff --git a/security/device_cgroup.c b/security/device_cgroup.c -index 8d9c48f..29108aa 100644 ---- a/security/device_cgroup.c -+++ b/security/device_cgroup.c -@@ -515,6 +515,7 @@ found: - - return -EPERM; - } -+EXPORT_SYMBOL(devcgroup_inode_permission); - - int devcgroup_inode_mknod(int mode, dev_t dev) - { -diff --git a/security/security.c b/security/security.c -index 7b7308a..140afc7 100644 ---- a/security/security.c -+++ b/security/security.c -@@ -359,6 +359,7 @@ int security_path_mkdir(struct path *dir, struct dentry *dentry, int mode) - return 0; - return security_ops->path_mkdir(dir, dentry, mode); - } -+EXPORT_SYMBOL(security_path_mkdir); - - int security_path_rmdir(struct path *dir, struct dentry *dentry) - { -@@ -366,6 +367,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry) - return 0; - return security_ops->path_rmdir(dir, dentry); - } -+EXPORT_SYMBOL(security_path_rmdir); - - int security_path_unlink(struct path *dir, struct dentry *dentry) - { -@@ -373,6 +375,7 @@ int security_path_unlink(struct path *dir, struct dentry *dentry) - return 0; - return security_ops->path_unlink(dir, dentry); - } -+EXPORT_SYMBOL(security_path_unlink); - - int security_path_symlink(struct path *dir, struct dentry *dentry, - const char *old_name) -@@ -381,6 +384,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry, - return 0; - return security_ops->path_symlink(dir, dentry, old_name); - } -+EXPORT_SYMBOL(security_path_symlink); - - int security_path_link(struct dentry *old_dentry, struct path *new_dir, - struct dentry *new_dentry) -@@ -389,6 +393,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir, - return 0; - return security_ops->path_link(old_dentry, new_dir, new_dentry); - } -+EXPORT_SYMBOL(security_path_link); - - int security_path_rename(struct path *old_dir, struct dentry *old_dentry, - struct path *new_dir, struct dentry *new_dentry) -@@ -399,6 +404,7 @@ int security_path_rename(struct path *old_dir, struct dentry *old_dentry, - return security_ops->path_rename(old_dir, old_dentry, new_dir, - new_dentry); - } -+EXPORT_SYMBOL(security_path_rename); - - int security_path_truncate(struct path *path) - { -@@ -406,6 +412,7 @@ int security_path_truncate(struct path *path) - return 0; - return security_ops->path_truncate(path); - } -+EXPORT_SYMBOL(security_path_truncate); - - int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, - mode_t mode) -@@ -414,6 +421,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, - return 0; - return security_ops->path_chmod(dentry, mnt, mode); - } -+EXPORT_SYMBOL(security_path_chmod); - - int security_path_chown(struct path *path, uid_t uid, gid_t gid) - { -@@ -421,6 +429,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid) - return 0; - return security_ops->path_chown(path, uid, gid); - } -+EXPORT_SYMBOL(security_path_chown); - - int security_path_chroot(struct path *path) - { -@@ -497,6 +506,7 @@ int security_inode_readlink(struct dentry *dentry) - return 0; - return security_ops->inode_readlink(dentry); - } -+EXPORT_SYMBOL(security_inode_readlink); - - int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd) - { -@@ -511,6 +521,7 @@ int security_inode_permission(struct inode *inode, int mask) - return 0; - return security_ops->inode_permission(inode, mask); - } -+EXPORT_SYMBOL(security_inode_permission); - - int security_inode_exec_permission(struct inode *inode, unsigned int flags) - { -@@ -619,6 +630,7 @@ int security_file_permission(struct file *file, int mask) - - return fsnotify_perm(file, mask); - } -+EXPORT_SYMBOL(security_file_permission); - - int security_file_alloc(struct file *file) - { -@@ -646,6 +658,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot, - return ret; - return ima_file_mmap(file, prot); - } -+EXPORT_SYMBOL(security_file_mmap); - - int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot, - unsigned long prot) - diff --git a/pkgs/os-specific/linux/kernel/aufs2.1-39.patch b/pkgs/os-specific/linux/kernel/aufs2.1-39.patch deleted file mode 100644 index e98dc85a214..00000000000 --- a/pkgs/os-specific/linux/kernel/aufs2.1-39.patch +++ /dev/null @@ -1,70 +0,0 @@ -aufs2.1 base patch for linux-2.6.39 - -diff --git a/fs/namei.c b/fs/namei.c -index e3c4f11..202d358 100644 ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -1769,7 +1769,7 @@ static struct dentry *__lookup_hash(struct qstr *name, - * needs parent already locked. Doesn't follow mounts. - * SMP-safe. - */ --static struct dentry *lookup_hash(struct nameidata *nd) -+struct dentry *lookup_hash(struct nameidata *nd) - { - return __lookup_hash(&nd->last, nd->path.dentry, nd); - } -diff --git a/fs/splice.c b/fs/splice.c -index 50a5d978..886e942 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1081,8 +1081,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); - /* - * Attempt to initiate a splice from pipe to file. - */ --static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -- loff_t *ppos, size_t len, unsigned int flags) -+long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags) - { - ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, - loff_t *, size_t, unsigned int); -@@ -1109,9 +1109,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - /* - * Attempt to initiate a splice from a file to a pipe. - */ --static long do_splice_to(struct file *in, loff_t *ppos, -- struct pipe_inode_info *pipe, size_t len, -- unsigned int flags) -+long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags) - { - ssize_t (*splice_read)(struct file *, loff_t *, - struct pipe_inode_info *, size_t, unsigned int); -diff --git a/include/linux/namei.h b/include/linux/namei.h -index eba45ea..21ed6c9 100644 ---- a/include/linux/namei.h -+++ b/include/linux/namei.h -@@ -82,6 +82,7 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *, - extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry, - int (*open)(struct inode *, struct file *)); - -+extern struct dentry *lookup_hash(struct nameidata *nd); - extern struct dentry *lookup_one_len(const char *, struct dentry *, int); - - extern int follow_down_one(struct path *); -diff --git a/include/linux/splice.h b/include/linux/splice.h -index 997c3b4..be9a153 100644 ---- a/include/linux/splice.h -+++ b/include/linux/splice.h -@@ -89,4 +89,10 @@ extern int splice_grow_spd(struct pipe_inode_info *, struct splice_pipe_desc *); - extern void splice_shrink_spd(struct pipe_inode_info *, - struct splice_pipe_desc *); - -+extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags); -+extern long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags); -+ - #endif diff --git a/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.25.patch b/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.25.patch deleted file mode 100644 index 1c9544ae1df..00000000000 --- a/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.25.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- /tmp/linux-2.6.32.14/fs/cifs/transport.c 2011-04-07 10:50:40.844188400 +0200 -+++ linux-2.6.32.14/fs/cifs/transport.c 2011-04-07 10:52:22.092690465 +0200 -@@ -277,9 +277,9 @@ - n_vec - first_vec, total_len); - if ((rc == -ENOSPC) || (rc == -EAGAIN)) { - i++; -- if (i >= 14) { -+ if (i >= 119) { - cERROR(1, -- ("sends on sock %p stuck for 15 seconds", -+ ("sends on sock %p stuck for 120 seconds", - ssocket)); - rc = -EAGAIN; - break; -@@ -553,11 +553,11 @@ - goto out; - - if (long_op == CIFS_STD_OP) -- timeout = 15 * HZ; -+ timeout = 120 * HZ; - else if (long_op == CIFS_VLONG_OP) /* e.g. slow writes past EOF */ - timeout = 180 * HZ; - else if (long_op == CIFS_LONG_OP) -- timeout = 45 * HZ; /* should be greater than -+ timeout = 120 * HZ; /* should be greater than - servers oplock break timeout (about 43 seconds) */ - else if (long_op == CIFS_ASYNC_OP) - goto out; -@@ -744,7 +744,7 @@ - goto out; - - if (long_op == CIFS_STD_OP) -- timeout = 15 * HZ; -+ timeout = 120 * HZ; - /* wait for 15 seconds or until woken up due to response arriving or - due to last connection to this server being unmounted */ - else if (long_op == CIFS_ASYNC_OP) -@@ -752,7 +752,7 @@ - else if (long_op == CIFS_VLONG_OP) /* writes past EOF can be slow */ - timeout = 180 * HZ; - else if (long_op == CIFS_LONG_OP) -- timeout = 45 * HZ; /* should be greater than -+ timeout = 120 * HZ; /* should be greater than - servers oplock break timeout (about 43 seconds) */ - else if (long_op == CIFS_BLOCKING_OP) - timeout = 0x7FFFFFFF; /* large but no so large as to wrap */ diff --git a/pkgs/os-specific/linux/kernel/config-2.6.31-armv5tel b/pkgs/os-specific/linux/kernel/config-2.6.31-armv5tel deleted file mode 100644 index 827f9711511..00000000000 --- a/pkgs/os-specific/linux/kernel/config-2.6.31-armv5tel +++ /dev/null @@ -1,1786 +0,0 @@ -# -# Automatically generated make config: don't edit -# Linux kernel version: 2.6.31 -# Tue Sep 22 01:20:57 2009 -# -CONFIG_ARM=y -CONFIG_SYS_SUPPORTS_APM_EMULATION=y -CONFIG_GENERIC_GPIO=y -CONFIG_GENERIC_TIME=y -CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_MMU=y -CONFIG_GENERIC_HARDIRQS=y -CONFIG_STACKTRACE_SUPPORT=y -CONFIG_HAVE_LATENCYTOP_SUPPORT=y -CONFIG_LOCKDEP_SUPPORT=y -CONFIG_TRACE_IRQFLAGS_SUPPORT=y -CONFIG_HARDIRQS_SW_RESEND=y -CONFIG_GENERIC_IRQ_PROBE=y -CONFIG_RWSEM_GENERIC_SPINLOCK=y -CONFIG_GENERIC_HWEIGHT=y -CONFIG_GENERIC_CALIBRATE_DELAY=y -CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y -CONFIG_VECTORS_BASE=0xffff0000 -CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" -CONFIG_CONSTRUCTORS=y - -# -# General setup -# -CONFIG_EXPERIMENTAL=y -CONFIG_BROKEN_ON_SMP=y -CONFIG_LOCK_KERNEL=y -CONFIG_INIT_ENV_ARG_LIMIT=32 -CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y -CONFIG_SWAP=y -CONFIG_SYSVIPC=y -CONFIG_SYSVIPC_SYSCTL=y -# CONFIG_POSIX_MQUEUE is not set -# CONFIG_BSD_PROCESS_ACCT is not set -# CONFIG_TASKSTATS is not set -# CONFIG_AUDIT is not set - -# -# RCU Subsystem -# -CONFIG_CLASSIC_RCU=y -# CONFIG_TREE_RCU is not set -# CONFIG_PREEMPT_RCU is not set -# CONFIG_TREE_RCU_TRACE is not set -# CONFIG_PREEMPT_RCU_TRACE is not set -# CONFIG_IKCONFIG is not set -CONFIG_LOG_BUF_SHIFT=19 -# CONFIG_GROUP_SCHED is not set -# CONFIG_CGROUPS is not set -# CONFIG_SYSFS_DEPRECATED_V2 is not set -# CONFIG_RELAY is not set -CONFIG_NAMESPACES=y -# CONFIG_UTS_NS is not set -# CONFIG_IPC_NS is not set -# CONFIG_USER_NS is not set -# CONFIG_PID_NS is not set -# CONFIG_NET_NS is not set -CONFIG_BLK_DEV_INITRD=y -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_SYSCTL=y -CONFIG_ANON_INODES=y -# CONFIG_EMBEDDED is not set -CONFIG_UID16=y -CONFIG_SYSCTL_SYSCALL=y -CONFIG_KALLSYMS=y -# CONFIG_KALLSYMS_ALL is not set -# CONFIG_KALLSYMS_EXTRA_PASS is not set -CONFIG_HOTPLUG=y -CONFIG_PRINTK=y -CONFIG_BUG=y -CONFIG_ELF_CORE=y -CONFIG_BASE_FULL=y -CONFIG_FUTEX=y -CONFIG_EPOLL=y -CONFIG_SIGNALFD=y -CONFIG_TIMERFD=y -CONFIG_EVENTFD=y -CONFIG_SHMEM=y -CONFIG_AIO=y - -# -# Performance Counters -# -CONFIG_VM_EVENT_COUNTERS=y -CONFIG_PCI_QUIRKS=y -CONFIG_SLUB_DEBUG=y -# CONFIG_STRIP_ASM_SYMS is not set -CONFIG_COMPAT_BRK=y -# CONFIG_SLAB is not set -CONFIG_SLUB=y -# CONFIG_SLOB is not set -CONFIG_PROFILING=y -CONFIG_TRACEPOINTS=y -CONFIG_MARKERS=y -CONFIG_OPROFILE=y -CONFIG_HAVE_OPROFILE=y -CONFIG_KPROBES=y -CONFIG_KRETPROBES=y -CONFIG_HAVE_KPROBES=y -CONFIG_HAVE_KRETPROBES=y - -# -# GCOV-based kernel profiling -# -# CONFIG_GCOV_KERNEL is not set -# CONFIG_SLOW_WORK is not set -CONFIG_HAVE_GENERIC_DMA_COHERENT=y -CONFIG_SLABINFO=y -CONFIG_RT_MUTEXES=y -CONFIG_BASE_SMALL=0 -CONFIG_MODULES=y -# CONFIG_MODULE_FORCE_LOAD is not set -CONFIG_MODULE_UNLOAD=y -# CONFIG_MODULE_FORCE_UNLOAD is not set -# CONFIG_MODVERSIONS is not set -# CONFIG_MODULE_SRCVERSION_ALL is not set -CONFIG_BLOCK=y -CONFIG_LBDAF=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_BLK_DEV_INTEGRITY is not set - -# -# IO Schedulers -# -CONFIG_IOSCHED_NOOP=y -CONFIG_IOSCHED_AS=y -CONFIG_IOSCHED_DEADLINE=y -CONFIG_IOSCHED_CFQ=y -# CONFIG_DEFAULT_AS is not set -# CONFIG_DEFAULT_DEADLINE is not set -CONFIG_DEFAULT_CFQ=y -# CONFIG_DEFAULT_NOOP is not set -CONFIG_DEFAULT_IOSCHED="cfq" -# CONFIG_FREEZER is not set - -# -# System Type -# -# CONFIG_ARCH_AAEC2000 is not set -# CONFIG_ARCH_INTEGRATOR is not set -# CONFIG_ARCH_REALVIEW is not set -# CONFIG_ARCH_VERSATILE is not set -# CONFIG_ARCH_AT91 is not set -# CONFIG_ARCH_CLPS711X is not set -# CONFIG_ARCH_GEMINI is not set -# CONFIG_ARCH_EBSA110 is not set -# CONFIG_ARCH_EP93XX is not set -# CONFIG_ARCH_FOOTBRIDGE is not set -# CONFIG_ARCH_MXC is not set -# CONFIG_ARCH_STMP3XXX is not set -# CONFIG_ARCH_NETX is not set -# CONFIG_ARCH_H720X is not set -# CONFIG_ARCH_IOP13XX is not set -# CONFIG_ARCH_IOP32X is not set -# CONFIG_ARCH_IOP33X is not set -# CONFIG_ARCH_IXP23XX is not set -# CONFIG_ARCH_IXP2000 is not set -# CONFIG_ARCH_IXP4XX is not set -# CONFIG_ARCH_L7200 is not set -CONFIG_ARCH_KIRKWOOD=y -# CONFIG_ARCH_LOKI is not set -# CONFIG_ARCH_MV78XX0 is not set -# CONFIG_ARCH_ORION5X is not set -# CONFIG_ARCH_MMP is not set -# CONFIG_ARCH_KS8695 is not set -# CONFIG_ARCH_NS9XXX is not set -# CONFIG_ARCH_W90X900 is not set -# CONFIG_ARCH_PNX4008 is not set -# CONFIG_ARCH_PXA is not set -# CONFIG_ARCH_MSM is not set -# CONFIG_ARCH_RPC is not set -# CONFIG_ARCH_SA1100 is not set -# CONFIG_ARCH_S3C2410 is not set -# CONFIG_ARCH_S3C64XX is not set -# CONFIG_ARCH_SHARK is not set -# CONFIG_ARCH_LH7A40X is not set -# CONFIG_ARCH_U300 is not set -# CONFIG_ARCH_DAVINCI is not set -# CONFIG_ARCH_OMAP is not set - -# -# Marvell Kirkwood Implementations -# -CONFIG_MACH_DB88F6281_BP=y -CONFIG_MACH_RD88F6192_NAS=y -CONFIG_MACH_RD88F6281=y -CONFIG_MACH_MV88F6281GTW_GE=y -CONFIG_MACH_SHEEVAPLUG=y -CONFIG_MACH_TS219=y -CONFIG_PLAT_ORION=y - -# -# Processor Type -# -CONFIG_CPU_32=y -CONFIG_CPU_FEROCEON=y -# CONFIG_CPU_FEROCEON_OLD_ID is not set -CONFIG_CPU_32v5=y -CONFIG_CPU_ABRT_EV5T=y -CONFIG_CPU_PABRT_NOIFAR=y -CONFIG_CPU_CACHE_VIVT=y -CONFIG_CPU_COPY_FEROCEON=y -CONFIG_CPU_TLB_FEROCEON=y -CONFIG_CPU_CP15=y -CONFIG_CPU_CP15_MMU=y - -# -# Processor Features -# -CONFIG_ARM_THUMB=y -# CONFIG_CPU_ICACHE_DISABLE is not set -# CONFIG_CPU_DCACHE_DISABLE is not set -CONFIG_OUTER_CACHE=y -CONFIG_CACHE_FEROCEON_L2=y -# CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set - -# -# Bus support -# -CONFIG_PCI=y -CONFIG_PCI_SYSCALL=y -# CONFIG_ARCH_SUPPORTS_MSI is not set -CONFIG_PCI_LEGACY=y -# CONFIG_PCI_DEBUG is not set -# CONFIG_PCI_STUB is not set -# CONFIG_PCI_IOV is not set -# CONFIG_PCCARD is not set - -# -# Kernel Features -# -CONFIG_TICK_ONESHOT=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_GENERIC_CLOCKEVENTS_BUILD=y -CONFIG_VMSPLIT_3G=y -# CONFIG_VMSPLIT_2G is not set -# CONFIG_VMSPLIT_1G is not set -CONFIG_PAGE_OFFSET=0xC0000000 -CONFIG_PREEMPT=y -CONFIG_HZ=100 -CONFIG_AEABI=y -# CONFIG_OABI_COMPAT is not set -# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set -# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set -# CONFIG_HIGHMEM is not set -CONFIG_SELECT_MEMORY_MODEL=y -CONFIG_FLATMEM_MANUAL=y -# CONFIG_DISCONTIGMEM_MANUAL is not set -# CONFIG_SPARSEMEM_MANUAL is not set -CONFIG_FLATMEM=y -CONFIG_FLAT_NODE_MEM_MAP=y -CONFIG_PAGEFLAGS_EXTENDED=y -CONFIG_SPLIT_PTLOCK_CPUS=4096 -# CONFIG_PHYS_ADDR_T_64BIT is not set -CONFIG_ZONE_DMA_FLAG=0 -CONFIG_VIRT_TO_BUS=y -CONFIG_HAVE_MLOCK=y -CONFIG_HAVE_MLOCKED_PAGE_BIT=y -CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 -CONFIG_ALIGNMENT_TRAP=y -CONFIG_UACCESS_WITH_MEMCPY=y - -# -# Boot options -# -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="" -# CONFIG_XIP_KERNEL is not set -# CONFIG_KEXEC is not set - -# -# CPU Power Management -# -CONFIG_CPU_IDLE=y -CONFIG_CPU_IDLE_GOV_LADDER=y -CONFIG_CPU_IDLE_GOV_MENU=y - -# -# Floating point emulation -# - -# -# At least one emulation must be selected -# -# CONFIG_VFP is not set - -# -# Userspace binary formats -# -CONFIG_BINFMT_ELF=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_HAVE_AOUT=y -# CONFIG_BINFMT_AOUT is not set -# CONFIG_BINFMT_MISC is not set - -# -# Power management options -# -# CONFIG_PM is not set -CONFIG_ARCH_SUSPEND_POSSIBLE=y -CONFIG_NET=y - -# -# Networking options -# -CONFIG_PACKET=y -CONFIG_PACKET_MMAP=y -CONFIG_UNIX=y -CONFIG_XFRM=y -# CONFIG_XFRM_USER is not set -# CONFIG_XFRM_SUB_POLICY is not set -# CONFIG_XFRM_MIGRATE is not set -# CONFIG_XFRM_STATISTICS is not set -# CONFIG_NET_KEY is not set -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -# CONFIG_IP_ADVANCED_ROUTER is not set -CONFIG_IP_FIB_HASH=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -# CONFIG_IP_PNP_RARP is not set -# CONFIG_NET_IPIP is not set -# CONFIG_NET_IPGRE is not set -# CONFIG_IP_MROUTE is not set -# CONFIG_ARPD is not set -# CONFIG_SYN_COOKIES is not set -# CONFIG_INET_AH is not set -# CONFIG_INET_ESP is not set -# CONFIG_INET_IPCOMP is not set -# CONFIG_INET_XFRM_TUNNEL is not set -# CONFIG_INET_TUNNEL is not set -CONFIG_INET_XFRM_MODE_TRANSPORT=y -CONFIG_INET_XFRM_MODE_TUNNEL=y -CONFIG_INET_XFRM_MODE_BEET=y -CONFIG_INET_LRO=y -CONFIG_INET_DIAG=y -CONFIG_INET_TCP_DIAG=y -# CONFIG_TCP_CONG_ADVANCED is not set -CONFIG_TCP_CONG_CUBIC=y -CONFIG_DEFAULT_TCP_CONG="cubic" -# CONFIG_TCP_MD5SIG is not set -# CONFIG_IPV6 is not set -# CONFIG_NETWORK_SECMARK is not set -# CONFIG_NETFILTER is not set -# CONFIG_IP_DCCP is not set -# CONFIG_IP_SCTP is not set -# CONFIG_TIPC is not set -# CONFIG_ATM is not set -# CONFIG_BRIDGE is not set -CONFIG_NET_DSA=y -# CONFIG_NET_DSA_TAG_DSA is not set -CONFIG_NET_DSA_TAG_EDSA=y -# CONFIG_NET_DSA_TAG_TRAILER is not set -CONFIG_NET_DSA_MV88E6XXX=y -# CONFIG_NET_DSA_MV88E6060 is not set -# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set -# CONFIG_NET_DSA_MV88E6131 is not set -CONFIG_NET_DSA_MV88E6123_61_65=y -# CONFIG_VLAN_8021Q is not set -# CONFIG_DECNET is not set -# CONFIG_LLC2 is not set -# CONFIG_IPX is not set -# CONFIG_ATALK is not set -# CONFIG_X25 is not set -# CONFIG_LAPB is not set -# CONFIG_ECONET is not set -# CONFIG_WAN_ROUTER is not set -# CONFIG_PHONET is not set -# CONFIG_IEEE802154 is not set -# CONFIG_NET_SCHED is not set -# CONFIG_DCB is not set - -# -# Network testing -# -CONFIG_NET_PKTGEN=m -# CONFIG_NET_TCPPROBE is not set -# CONFIG_NET_DROP_MONITOR is not set -# CONFIG_HAMRADIO is not set -# CONFIG_CAN is not set -# CONFIG_IRDA is not set -# CONFIG_BT is not set -# CONFIG_AF_RXRPC is not set -CONFIG_WIRELESS=y -CONFIG_CFG80211=y -# CONFIG_CFG80211_REG_DEBUG is not set -# CONFIG_CFG80211_DEBUGFS is not set -CONFIG_WIRELESS_OLD_REGULATORY=y -CONFIG_WIRELESS_EXT=y -CONFIG_WIRELESS_EXT_SYSFS=y -CONFIG_LIB80211=y -# CONFIG_LIB80211_DEBUG is not set -CONFIG_MAC80211=y -CONFIG_MAC80211_DEFAULT_PS=y -CONFIG_MAC80211_DEFAULT_PS_VALUE=1 - -# -# Rate control algorithm selection -# -CONFIG_MAC80211_RC_MINSTREL=y -# CONFIG_MAC80211_RC_DEFAULT_PID is not set -CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y -CONFIG_MAC80211_RC_DEFAULT="minstrel" -# CONFIG_MAC80211_LEDS is not set -# CONFIG_MAC80211_DEBUGFS is not set -# CONFIG_MAC80211_DEBUG_MENU is not set -# CONFIG_WIMAX is not set -# CONFIG_RFKILL is not set -# CONFIG_NET_9P is not set - -# -# Device Drivers -# - -# -# Generic Driver Options -# -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_STANDALONE=y -CONFIG_PREVENT_FIRMWARE_BUILD=y -CONFIG_FW_LOADER=y -CONFIG_FIRMWARE_IN_KERNEL=y -CONFIG_EXTRA_FIRMWARE="" -# CONFIG_DEBUG_DRIVER is not set -# CONFIG_DEBUG_DEVRES is not set -# CONFIG_SYS_HYPERVISOR is not set -# CONFIG_CONNECTOR is not set -CONFIG_MTD=y -# CONFIG_MTD_DEBUG is not set -# CONFIG_MTD_CONCAT is not set -CONFIG_MTD_PARTITIONS=y -# CONFIG_MTD_TESTS is not set -# CONFIG_MTD_REDBOOT_PARTS is not set -CONFIG_MTD_CMDLINE_PARTS=y -# CONFIG_MTD_AFS_PARTS is not set -# CONFIG_MTD_AR7_PARTS is not set - -# -# User Modules And Translation Layers -# -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLKDEVS=y -CONFIG_MTD_BLOCK=y -# CONFIG_FTL is not set -# CONFIG_NFTL is not set -# CONFIG_INFTL is not set -# CONFIG_RFD_FTL is not set -# CONFIG_SSFDC is not set -# CONFIG_MTD_OOPS is not set - -# -# RAM/ROM/Flash chip drivers -# -CONFIG_MTD_CFI=y -CONFIG_MTD_JEDECPROBE=y -CONFIG_MTD_GEN_PROBE=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_NOSWAP=y -# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set -# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set -CONFIG_MTD_CFI_GEOMETRY=y -CONFIG_MTD_MAP_BANK_WIDTH_1=y -CONFIG_MTD_MAP_BANK_WIDTH_2=y -# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set -CONFIG_MTD_CFI_I1=y -CONFIG_MTD_CFI_I2=y -# CONFIG_MTD_CFI_I4 is not set -# CONFIG_MTD_CFI_I8 is not set -# CONFIG_MTD_OTP is not set -CONFIG_MTD_CFI_INTELEXT=y -# CONFIG_MTD_CFI_AMDSTD is not set -CONFIG_MTD_CFI_STAA=y -CONFIG_MTD_CFI_UTIL=y -# CONFIG_MTD_RAM is not set -# CONFIG_MTD_ROM is not set -# CONFIG_MTD_ABSENT is not set - -# -# Mapping drivers for chip access -# -# CONFIG_MTD_COMPLEX_MAPPINGS is not set -CONFIG_MTD_PHYSMAP=y -# CONFIG_MTD_PHYSMAP_COMPAT is not set -# CONFIG_MTD_ARM_INTEGRATOR is not set -# CONFIG_MTD_IMPA7 is not set -# CONFIG_MTD_INTEL_VR_NOR is not set -# CONFIG_MTD_PLATRAM is not set - -# -# Self-contained MTD device drivers -# -# CONFIG_MTD_PMC551 is not set -# CONFIG_MTD_DATAFLASH is not set -CONFIG_MTD_M25P80=y -CONFIG_M25PXX_USE_FAST_READ=y -# CONFIG_MTD_SLRAM is not set -# CONFIG_MTD_PHRAM is not set -# CONFIG_MTD_MTDRAM is not set -# CONFIG_MTD_BLOCK2MTD is not set - -# -# Disk-On-Chip Device Drivers -# -# CONFIG_MTD_DOC2000 is not set -# CONFIG_MTD_DOC2001 is not set -# CONFIG_MTD_DOC2001PLUS is not set -CONFIG_MTD_NAND=y -# CONFIG_MTD_NAND_VERIFY_WRITE is not set -# CONFIG_MTD_NAND_ECC_SMC is not set -# CONFIG_MTD_NAND_MUSEUM_IDS is not set -# CONFIG_MTD_NAND_GPIO is not set -CONFIG_MTD_NAND_IDS=y -# CONFIG_MTD_NAND_DISKONCHIP is not set -# CONFIG_MTD_NAND_CAFE is not set -# CONFIG_MTD_NAND_NANDSIM is not set -# CONFIG_MTD_NAND_PLATFORM is not set -# CONFIG_MTD_ALAUDA is not set -CONFIG_MTD_NAND_ORION=y -# CONFIG_MTD_ONENAND is not set - -# -# LPDDR flash memory drivers -# -# CONFIG_MTD_LPDDR is not set - -# -# UBI - Unsorted block images -# -CONFIG_MTD_UBI=y -# CONFIG_PARPORT is not set -CONFIG_BLK_DEV=y -# CONFIG_BLK_CPQ_DA is not set -# CONFIG_BLK_CPQ_CISS_DA is not set -# CONFIG_BLK_DEV_DAC960 is not set -# CONFIG_BLK_DEV_UMEM is not set -# CONFIG_BLK_DEV_COW_COMMON is not set -CONFIG_BLK_DEV_LOOP=y -# CONFIG_BLK_DEV_CRYPTOLOOP is not set -# CONFIG_BLK_DEV_NBD is not set -# CONFIG_BLK_DEV_SX8 is not set -# CONFIG_BLK_DEV_UB is not set -# CONFIG_BLK_DEV_RAM is not set -# CONFIG_CDROM_PKTCDVD is not set -# CONFIG_ATA_OVER_ETH is not set -# CONFIG_MG_DISK is not set -# CONFIG_MISC_DEVICES is not set -CONFIG_HAVE_IDE=y -# CONFIG_IDE is not set - -# -# SCSI device support -# -# CONFIG_RAID_ATTRS is not set -CONFIG_SCSI=y -CONFIG_SCSI_DMA=y -# CONFIG_SCSI_TGT is not set -# CONFIG_SCSI_NETLINK is not set -# CONFIG_SCSI_PROC_FS is not set - -# -# SCSI support type (disk, tape, CD-ROM) -# -CONFIG_BLK_DEV_SD=y -# CONFIG_CHR_DEV_ST is not set -# CONFIG_CHR_DEV_OSST is not set -CONFIG_BLK_DEV_SR=m -# CONFIG_BLK_DEV_SR_VENDOR is not set -CONFIG_CHR_DEV_SG=m -# CONFIG_CHR_DEV_SCH is not set -# CONFIG_SCSI_MULTI_LUN is not set -# CONFIG_SCSI_CONSTANTS is not set -# CONFIG_SCSI_LOGGING is not set -# CONFIG_SCSI_SCAN_ASYNC is not set -CONFIG_SCSI_WAIT_SCAN=m - -# -# SCSI Transports -# -# CONFIG_SCSI_SPI_ATTRS is not set -# CONFIG_SCSI_FC_ATTRS is not set -# CONFIG_SCSI_ISCSI_ATTRS is not set -# CONFIG_SCSI_SAS_LIBSAS is not set -# CONFIG_SCSI_SRP_ATTRS is not set -CONFIG_SCSI_LOWLEVEL=y -# CONFIG_ISCSI_TCP is not set -# CONFIG_SCSI_BNX2_ISCSI is not set -# CONFIG_BLK_DEV_3W_XXXX_RAID is not set -# CONFIG_SCSI_3W_9XXX is not set -# CONFIG_SCSI_ACARD is not set -# CONFIG_SCSI_AACRAID is not set -# CONFIG_SCSI_AIC7XXX is not set -# CONFIG_SCSI_AIC7XXX_OLD is not set -# CONFIG_SCSI_AIC79XX is not set -# CONFIG_SCSI_AIC94XX is not set -# CONFIG_SCSI_MVSAS is not set -# CONFIG_SCSI_DPT_I2O is not set -# CONFIG_SCSI_ADVANSYS is not set -# CONFIG_SCSI_ARCMSR is not set -# CONFIG_MEGARAID_NEWGEN is not set -# CONFIG_MEGARAID_LEGACY is not set -# CONFIG_MEGARAID_SAS is not set -# CONFIG_SCSI_MPT2SAS is not set -# CONFIG_SCSI_HPTIOP is not set -# CONFIG_LIBFC is not set -# CONFIG_LIBFCOE is not set -# CONFIG_FCOE is not set -# CONFIG_SCSI_DMX3191D is not set -# CONFIG_SCSI_FUTURE_DOMAIN is not set -# CONFIG_SCSI_IPS is not set -# CONFIG_SCSI_INITIO is not set -# CONFIG_SCSI_INIA100 is not set -# CONFIG_SCSI_STEX is not set -# CONFIG_SCSI_SYM53C8XX_2 is not set -# CONFIG_SCSI_IPR is not set -# CONFIG_SCSI_QLOGIC_1280 is not set -# CONFIG_SCSI_QLA_FC is not set -# CONFIG_SCSI_QLA_ISCSI is not set -# CONFIG_SCSI_LPFC is not set -# CONFIG_SCSI_DC395x is not set -# CONFIG_SCSI_DC390T is not set -# CONFIG_SCSI_NSP32 is not set -# CONFIG_SCSI_DEBUG is not set -# CONFIG_SCSI_SRP is not set -# CONFIG_SCSI_DH is not set -# CONFIG_SCSI_OSD_INITIATOR is not set -CONFIG_ATA=y -# CONFIG_ATA_NONSTANDARD is not set -CONFIG_SATA_PMP=y -CONFIG_SATA_AHCI=y -# CONFIG_SATA_SIL24 is not set -CONFIG_ATA_SFF=y -# CONFIG_SATA_SVW is not set -# CONFIG_ATA_PIIX is not set -CONFIG_SATA_MV=y -# CONFIG_SATA_NV is not set -# CONFIG_PDC_ADMA is not set -# CONFIG_SATA_QSTOR is not set -# CONFIG_SATA_PROMISE is not set -# CONFIG_SATA_SX4 is not set -# CONFIG_SATA_SIL is not set -# CONFIG_SATA_SIS is not set -# CONFIG_SATA_ULI is not set -# CONFIG_SATA_VIA is not set -# CONFIG_SATA_VITESSE is not set -# CONFIG_SATA_INIC162X is not set -# CONFIG_PATA_ALI is not set -# CONFIG_PATA_AMD is not set -# CONFIG_PATA_ARTOP is not set -# CONFIG_PATA_ATIIXP is not set -# CONFIG_PATA_CMD640_PCI is not set -# CONFIG_PATA_CMD64X is not set -# CONFIG_PATA_CS5520 is not set -# CONFIG_PATA_CS5530 is not set -# CONFIG_PATA_CYPRESS is not set -# CONFIG_PATA_EFAR is not set -# CONFIG_ATA_GENERIC is not set -# CONFIG_PATA_HPT366 is not set -# CONFIG_PATA_HPT37X is not set -# CONFIG_PATA_HPT3X2N is not set -# CONFIG_PATA_HPT3X3 is not set -# CONFIG_PATA_IT821X is not set -# CONFIG_PATA_IT8213 is not set -# CONFIG_PATA_JMICRON is not set -# CONFIG_PATA_TRIFLEX is not set -# CONFIG_PATA_MARVELL is not set -# CONFIG_PATA_MPIIX is not set -# CONFIG_PATA_OLDPIIX is not set -# CONFIG_PATA_NETCELL is not set -# CONFIG_PATA_NINJA32 is not set -# CONFIG_PATA_NS87410 is not set -# CONFIG_PATA_NS87415 is not set -# CONFIG_PATA_OPTI is not set -# CONFIG_PATA_OPTIDMA is not set -# CONFIG_PATA_PDC_OLD is not set -# CONFIG_PATA_RADISYS is not set -# CONFIG_PATA_RZ1000 is not set -# CONFIG_PATA_SC1200 is not set -# CONFIG_PATA_SERVERWORKS is not set -# CONFIG_PATA_PDC2027X is not set -# CONFIG_PATA_SIL680 is not set -# CONFIG_PATA_SIS is not set -# CONFIG_PATA_VIA is not set -# CONFIG_PATA_WINBOND is not set -# CONFIG_PATA_SCH is not set -# CONFIG_MD is not set -# CONFIG_FUSION is not set - -# -# IEEE 1394 (FireWire) support -# - -# -# You can enable one or both FireWire driver stacks. -# - -# -# See the help texts for more information. -# -# CONFIG_FIREWIRE is not set -# CONFIG_IEEE1394 is not set -# CONFIG_I2O is not set -CONFIG_NETDEVICES=y -# CONFIG_DUMMY is not set -# CONFIG_BONDING is not set -# CONFIG_MACVLAN is not set -# CONFIG_EQUALIZER is not set -# CONFIG_TUN is not set -# CONFIG_VETH is not set -# CONFIG_ARCNET is not set -CONFIG_PHYLIB=y - -# -# MII PHY device drivers -# -CONFIG_MARVELL_PHY=y -# CONFIG_DAVICOM_PHY is not set -# CONFIG_QSEMI_PHY is not set -# CONFIG_LXT_PHY is not set -# CONFIG_CICADA_PHY is not set -# CONFIG_VITESSE_PHY is not set -# CONFIG_SMSC_PHY is not set -# CONFIG_BROADCOM_PHY is not set -# CONFIG_ICPLUS_PHY is not set -# CONFIG_REALTEK_PHY is not set -# CONFIG_NATIONAL_PHY is not set -# CONFIG_STE10XP is not set -# CONFIG_LSI_ET1011C_PHY is not set -# CONFIG_FIXED_PHY is not set -# CONFIG_MDIO_BITBANG is not set -CONFIG_NET_ETHERNET=y -CONFIG_MII=y -# CONFIG_AX88796 is not set -# CONFIG_HAPPYMEAL is not set -# CONFIG_SUNGEM is not set -# CONFIG_CASSINI is not set -# CONFIG_NET_VENDOR_3COM is not set -# CONFIG_SMC91X is not set -# CONFIG_DM9000 is not set -# CONFIG_ENC28J60 is not set -# CONFIG_ETHOC is not set -# CONFIG_SMC911X is not set -# CONFIG_SMSC911X is not set -# CONFIG_DNET is not set -# CONFIG_NET_TULIP is not set -# CONFIG_HP100 is not set -# CONFIG_IBM_NEW_EMAC_ZMII is not set -# CONFIG_IBM_NEW_EMAC_RGMII is not set -# CONFIG_IBM_NEW_EMAC_TAH is not set -# CONFIG_IBM_NEW_EMAC_EMAC4 is not set -# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set -# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set -# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set -CONFIG_NET_PCI=y -# CONFIG_PCNET32 is not set -# CONFIG_AMD8111_ETH is not set -# CONFIG_ADAPTEC_STARFIRE is not set -# CONFIG_B44 is not set -# CONFIG_FORCEDETH is not set -# CONFIG_E100 is not set -# CONFIG_FEALNX is not set -# CONFIG_NATSEMI is not set -# CONFIG_NE2K_PCI is not set -# CONFIG_8139CP is not set -# CONFIG_8139TOO is not set -# CONFIG_R6040 is not set -# CONFIG_SIS900 is not set -# CONFIG_EPIC100 is not set -# CONFIG_SMSC9420 is not set -# CONFIG_SUNDANCE is not set -# CONFIG_TLAN is not set -# CONFIG_KS8842 is not set -# CONFIG_KS8851 is not set -# CONFIG_VIA_RHINE is not set -# CONFIG_SC92031 is not set -# CONFIG_ATL2 is not set -CONFIG_NETDEV_1000=y -# CONFIG_ACENIC is not set -# CONFIG_DL2K is not set -# CONFIG_E1000 is not set -# CONFIG_E1000E is not set -# CONFIG_IP1000 is not set -# CONFIG_IGB is not set -# CONFIG_IGBVF is not set -# CONFIG_NS83820 is not set -# CONFIG_HAMACHI is not set -# CONFIG_YELLOWFIN is not set -# CONFIG_R8169 is not set -# CONFIG_SIS190 is not set -# CONFIG_SKGE is not set -# CONFIG_SKY2 is not set -# CONFIG_VIA_VELOCITY is not set -# CONFIG_TIGON3 is not set -# CONFIG_BNX2 is not set -# CONFIG_CNIC is not set -CONFIG_MV643XX_ETH=y -# CONFIG_QLA3XXX is not set -# CONFIG_ATL1 is not set -# CONFIG_ATL1E is not set -# CONFIG_ATL1C is not set -# CONFIG_JME is not set -# CONFIG_NETDEV_10000 is not set -# CONFIG_TR is not set - -# -# Wireless LAN -# -# CONFIG_WLAN_PRE80211 is not set -CONFIG_WLAN_80211=y -CONFIG_LIBERTAS=y -# CONFIG_LIBERTAS_USB is not set -CONFIG_LIBERTAS_SDIO=y -# CONFIG_LIBERTAS_SPI is not set -# CONFIG_LIBERTAS_DEBUG is not set -# CONFIG_LIBERTAS_THINFIRM is not set -# CONFIG_ATMEL is not set -# CONFIG_AT76C50X_USB is not set -# CONFIG_PRISM54 is not set -# CONFIG_USB_ZD1201 is not set -# CONFIG_USB_NET_RNDIS_WLAN is not set -# CONFIG_RTL8180 is not set -# CONFIG_RTL8187 is not set -# CONFIG_ADM8211 is not set -# CONFIG_MAC80211_HWSIM is not set -# CONFIG_MWL8K is not set -# CONFIG_P54_COMMON is not set -# CONFIG_ATH5K is not set -# CONFIG_ATH9K is not set -# CONFIG_AR9170_USB is not set -# CONFIG_IPW2100 is not set -# CONFIG_IPW2200 is not set -# CONFIG_IWLWIFI is not set -# CONFIG_HOSTAP is not set -# CONFIG_B43 is not set -# CONFIG_B43LEGACY is not set -# CONFIG_ZD1211RW is not set -# CONFIG_RT2X00 is not set -# CONFIG_HERMES is not set -# CONFIG_WL12XX is not set -# CONFIG_IWM is not set - -# -# Enable WiMAX (Networking options) to see the WiMAX drivers -# - -# -# USB Network Adapters -# -# CONFIG_USB_CATC is not set -# CONFIG_USB_KAWETH is not set -# CONFIG_USB_PEGASUS is not set -# CONFIG_USB_RTL8150 is not set -# CONFIG_USB_USBNET is not set -# CONFIG_WAN is not set -# CONFIG_FDDI is not set -# CONFIG_HIPPI is not set -# CONFIG_PPP is not set -# CONFIG_SLIP is not set -# CONFIG_NET_FC is not set -# CONFIG_NETCONSOLE is not set -# CONFIG_NETPOLL is not set -# CONFIG_NET_POLL_CONTROLLER is not set -# CONFIG_ISDN is not set - -# -# Input device support -# -CONFIG_INPUT=y -# CONFIG_INPUT_FF_MEMLESS is not set -# CONFIG_INPUT_POLLDEV is not set - -# -# Userland interfaces -# -CONFIG_INPUT_MOUSEDEV=y -CONFIG_INPUT_MOUSEDEV_PSAUX=y -CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 -# CONFIG_INPUT_JOYDEV is not set -CONFIG_INPUT_EVDEV=y -# CONFIG_INPUT_EVBUG is not set - -# -# Input Device Drivers -# -CONFIG_INPUT_KEYBOARD=y -CONFIG_KEYBOARD_ATKBD=y -# CONFIG_KEYBOARD_LKKBD is not set -CONFIG_KEYBOARD_GPIO=y -# CONFIG_KEYBOARD_MATRIX is not set -# CONFIG_KEYBOARD_LM8323 is not set -# CONFIG_KEYBOARD_NEWTON is not set -# CONFIG_KEYBOARD_STOWAWAY is not set -# CONFIG_KEYBOARD_SUNKBD is not set -# CONFIG_KEYBOARD_XTKBD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_INPUT_JOYSTICK is not set -# CONFIG_INPUT_TABLET is not set -# CONFIG_INPUT_TOUCHSCREEN is not set -# CONFIG_INPUT_MISC is not set - -# -# Hardware I/O ports -# -CONFIG_SERIO=y -CONFIG_SERIO_SERPORT=y -# CONFIG_SERIO_PCIPS2 is not set -CONFIG_SERIO_LIBPS2=y -# CONFIG_SERIO_RAW is not set -# CONFIG_GAMEPORT is not set - -# -# Character devices -# -CONFIG_VT=y -CONFIG_CONSOLE_TRANSLATIONS=y -CONFIG_VT_CONSOLE=y -CONFIG_HW_CONSOLE=y -# CONFIG_VT_HW_CONSOLE_BINDING is not set -# CONFIG_DEVKMEM is not set -# CONFIG_SERIAL_NONSTANDARD is not set -# CONFIG_NOZOMI is not set - -# -# Serial drivers -# -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_PCI=y -CONFIG_SERIAL_8250_NR_UARTS=4 -CONFIG_SERIAL_8250_RUNTIME_UARTS=2 -# CONFIG_SERIAL_8250_EXTENDED is not set - -# -# Non-8250 serial port support -# -# CONFIG_SERIAL_MAX3100 is not set -CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_CORE_CONSOLE=y -# CONFIG_SERIAL_JSM is not set -CONFIG_UNIX98_PTYS=y -# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set -CONFIG_LEGACY_PTYS=y -CONFIG_LEGACY_PTY_COUNT=16 -# CONFIG_IPMI_HANDLER is not set -# CONFIG_HW_RANDOM is not set -# CONFIG_R3964 is not set -# CONFIG_APPLICOM is not set -# CONFIG_RAW_DRIVER is not set -# CONFIG_TCG_TPM is not set -CONFIG_DEVPORT=y -CONFIG_I2C=y -CONFIG_I2C_BOARDINFO=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_HELPER_AUTO=y - -# -# I2C Hardware Bus support -# - -# -# PC SMBus host controller drivers -# -# CONFIG_I2C_ALI1535 is not set -# CONFIG_I2C_ALI1563 is not set -# CONFIG_I2C_ALI15X3 is not set -# CONFIG_I2C_AMD756 is not set -# CONFIG_I2C_AMD8111 is not set -# CONFIG_I2C_I801 is not set -# CONFIG_I2C_ISCH is not set -# CONFIG_I2C_PIIX4 is not set -# CONFIG_I2C_NFORCE2 is not set -# CONFIG_I2C_SIS5595 is not set -# CONFIG_I2C_SIS630 is not set -# CONFIG_I2C_SIS96X is not set -# CONFIG_I2C_VIA is not set -# CONFIG_I2C_VIAPRO is not set - -# -# I2C system bus drivers (mostly embedded / system-on-chip) -# -# CONFIG_I2C_GPIO is not set -CONFIG_I2C_MV64XXX=y -# CONFIG_I2C_OCORES is not set -# CONFIG_I2C_SIMTEC is not set - -# -# External I2C/SMBus adapter drivers -# -# CONFIG_I2C_PARPORT_LIGHT is not set -# CONFIG_I2C_TAOS_EVM is not set -# CONFIG_I2C_TINY_USB is not set - -# -# Graphics adapter I2C/DDC channel drivers -# -# CONFIG_I2C_VOODOO3 is not set - -# -# Other I2C/SMBus bus drivers -# -# CONFIG_I2C_PCA_PLATFORM is not set -# CONFIG_I2C_STUB is not set - -# -# Miscellaneous I2C Chip support -# -# CONFIG_DS1682 is not set -# CONFIG_SENSORS_PCF8574 is not set -# CONFIG_PCF8575 is not set -# CONFIG_SENSORS_PCA9539 is not set -# CONFIG_SENSORS_TSL2550 is not set -# CONFIG_I2C_DEBUG_CORE is not set -# CONFIG_I2C_DEBUG_ALGO is not set -# CONFIG_I2C_DEBUG_BUS is not set -# CONFIG_I2C_DEBUG_CHIP is not set -CONFIG_SPI=y -# CONFIG_SPI_DEBUG is not set -CONFIG_SPI_MASTER=y - -# -# SPI Master Controller Drivers -# -# CONFIG_SPI_BITBANG is not set -# CONFIG_SPI_GPIO is not set -CONFIG_SPI_ORION=y - -# -# SPI Protocol Masters -# -# CONFIG_SPI_SPIDEV is not set -# CONFIG_SPI_TLE62X0 is not set -CONFIG_ARCH_REQUIRE_GPIOLIB=y -CONFIG_GPIOLIB=y -# CONFIG_DEBUG_GPIO is not set -# CONFIG_GPIO_SYSFS is not set - -# -# Memory mapped GPIO expanders: -# - -# -# I2C GPIO expanders: -# -# CONFIG_GPIO_MAX732X is not set -# CONFIG_GPIO_PCA953X is not set -# CONFIG_GPIO_PCF857X is not set - -# -# PCI GPIO expanders: -# -# CONFIG_GPIO_BT8XX is not set - -# -# SPI GPIO expanders: -# -# CONFIG_GPIO_MAX7301 is not set -# CONFIG_GPIO_MCP23S08 is not set -# CONFIG_W1 is not set -# CONFIG_POWER_SUPPLY is not set -# CONFIG_HWMON is not set -# CONFIG_THERMAL is not set -# CONFIG_THERMAL_HWMON is not set -# CONFIG_WATCHDOG is not set -CONFIG_SSB_POSSIBLE=y - -# -# Sonics Silicon Backplane -# -# CONFIG_SSB is not set - -# -# Multifunction device drivers -# -# CONFIG_MFD_CORE is not set -# CONFIG_MFD_SM501 is not set -# CONFIG_MFD_ASIC3 is not set -# CONFIG_HTC_EGPIO is not set -# CONFIG_HTC_PASIC3 is not set -# CONFIG_TPS65010 is not set -# CONFIG_TWL4030_CORE is not set -# CONFIG_MFD_TMIO is not set -# CONFIG_MFD_TC6393XB is not set -# CONFIG_PMIC_DA903X is not set -# CONFIG_MFD_WM8400 is not set -# CONFIG_MFD_WM8350_I2C is not set -# CONFIG_MFD_PCF50633 is not set -# CONFIG_AB3100_CORE is not set -# CONFIG_EZX_PCAP is not set -# CONFIG_MEDIA_SUPPORT is not set - -# -# Graphics support -# -# CONFIG_DRM is not set -# CONFIG_VGASTATE is not set -# CONFIG_VIDEO_OUTPUT_CONTROL is not set -# CONFIG_FB is not set -# CONFIG_BACKLIGHT_LCD_SUPPORT is not set - -# -# Display device support -# -# CONFIG_DISPLAY_SUPPORT is not set - -# -# Console display driver support -# -# CONFIG_VGA_CONSOLE is not set -CONFIG_DUMMY_CONSOLE=y -# CONFIG_SOUND is not set -CONFIG_HID_SUPPORT=y -CONFIG_HID=y -# CONFIG_HID_DEBUG is not set -# CONFIG_HIDRAW is not set - -# -# USB Input Devices -# -CONFIG_USB_HID=y -# CONFIG_HID_PID is not set -# CONFIG_USB_HIDDEV is not set - -# -# Special HID drivers -# -CONFIG_HID_A4TECH=y -CONFIG_HID_APPLE=y -CONFIG_HID_BELKIN=y -CONFIG_HID_CHERRY=y -CONFIG_HID_CHICONY=y -CONFIG_HID_CYPRESS=y -CONFIG_HID_DRAGONRISE=y -# CONFIG_DRAGONRISE_FF is not set -CONFIG_HID_EZKEY=y -CONFIG_HID_KYE=y -CONFIG_HID_GYRATION=y -CONFIG_HID_KENSINGTON=y -CONFIG_HID_LOGITECH=y -# CONFIG_LOGITECH_FF is not set -# CONFIG_LOGIRUMBLEPAD2_FF is not set -CONFIG_HID_MICROSOFT=y -CONFIG_HID_MONTEREY=y -CONFIG_HID_NTRIG=y -CONFIG_HID_PANTHERLORD=y -# CONFIG_PANTHERLORD_FF is not set -CONFIG_HID_PETALYNX=y -CONFIG_HID_SAMSUNG=y -CONFIG_HID_SONY=y -CONFIG_HID_SUNPLUS=y -CONFIG_HID_GREENASIA=y -# CONFIG_GREENASIA_FF is not set -CONFIG_HID_SMARTJOYPLUS=y -# CONFIG_SMARTJOYPLUS_FF is not set -CONFIG_HID_TOPSEED=y -CONFIG_HID_THRUSTMASTER=y -# CONFIG_THRUSTMASTER_FF is not set -CONFIG_HID_ZEROPLUS=y -# CONFIG_ZEROPLUS_FF is not set -CONFIG_USB_SUPPORT=y -CONFIG_USB_ARCH_HAS_HCD=y -CONFIG_USB_ARCH_HAS_OHCI=y -CONFIG_USB_ARCH_HAS_EHCI=y -CONFIG_USB=y -# CONFIG_USB_DEBUG is not set -# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set - -# -# Miscellaneous USB options -# -CONFIG_USB_DEVICEFS=y -CONFIG_USB_DEVICE_CLASS=y -# CONFIG_USB_DYNAMIC_MINORS is not set -# CONFIG_USB_OTG is not set -# CONFIG_USB_MON is not set -# CONFIG_USB_WUSB is not set -# CONFIG_USB_WUSB_CBAF is not set - -# -# USB Host Controller Drivers -# -# CONFIG_USB_C67X00_HCD is not set -# CONFIG_USB_XHCI_HCD is not set -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_ROOT_HUB_TT=y -CONFIG_USB_EHCI_TT_NEWSCHED=y -# CONFIG_USB_OXU210HP_HCD is not set -# CONFIG_USB_ISP116X_HCD is not set -# CONFIG_USB_ISP1760_HCD is not set -# CONFIG_USB_OHCI_HCD is not set -# CONFIG_USB_UHCI_HCD is not set -# CONFIG_USB_SL811_HCD is not set -# CONFIG_USB_R8A66597_HCD is not set -# CONFIG_USB_WHCI_HCD is not set -# CONFIG_USB_HWA_HCD is not set - -# -# USB Device Class drivers -# -# CONFIG_USB_ACM is not set -CONFIG_USB_PRINTER=m -# CONFIG_USB_WDM is not set -# CONFIG_USB_TMC is not set - -# -# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may -# - -# -# also be needed; see USB_STORAGE Help for more info -# -CONFIG_USB_STORAGE=y -# CONFIG_USB_STORAGE_DEBUG is not set -CONFIG_USB_STORAGE_DATAFAB=y -CONFIG_USB_STORAGE_FREECOM=y -# CONFIG_USB_STORAGE_ISD200 is not set -# CONFIG_USB_STORAGE_USBAT is not set -CONFIG_USB_STORAGE_SDDR09=y -CONFIG_USB_STORAGE_SDDR55=y -CONFIG_USB_STORAGE_JUMPSHOT=y -# CONFIG_USB_STORAGE_ALAUDA is not set -# CONFIG_USB_STORAGE_ONETOUCH is not set -# CONFIG_USB_STORAGE_KARMA is not set -# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set -# CONFIG_USB_LIBUSUAL is not set - -# -# USB Imaging devices -# -# CONFIG_USB_MDC800 is not set -# CONFIG_USB_MICROTEK is not set - -# -# USB port drivers -# -# CONFIG_USB_SERIAL is not set - -# -# USB Miscellaneous drivers -# -# CONFIG_USB_EMI62 is not set -# CONFIG_USB_EMI26 is not set -# CONFIG_USB_ADUTUX is not set -# CONFIG_USB_SEVSEG is not set -# CONFIG_USB_RIO500 is not set -# CONFIG_USB_LEGOTOWER is not set -# CONFIG_USB_LCD is not set -# CONFIG_USB_BERRY_CHARGE is not set -# CONFIG_USB_LED is not set -# CONFIG_USB_CYPRESS_CY7C63 is not set -# CONFIG_USB_CYTHERM is not set -# CONFIG_USB_IDMOUSE is not set -# CONFIG_USB_FTDI_ELAN is not set -# CONFIG_USB_APPLEDISPLAY is not set -# CONFIG_USB_SISUSBVGA is not set -# CONFIG_USB_LD is not set -# CONFIG_USB_TRANCEVIBRATOR is not set -# CONFIG_USB_IOWARRIOR is not set -# CONFIG_USB_TEST is not set -# CONFIG_USB_ISIGHTFW is not set -# CONFIG_USB_VST is not set -# CONFIG_USB_GADGET is not set - -# -# OTG and related infrastructure -# -# CONFIG_USB_GPIO_VBUS is not set -# CONFIG_NOP_USB_XCEIV is not set -# CONFIG_UWB is not set -CONFIG_MMC=y -# CONFIG_MMC_DEBUG is not set -# CONFIG_MMC_UNSAFE_RESUME is not set - -# -# MMC/SD/SDIO Card Drivers -# -CONFIG_MMC_BLOCK=y -CONFIG_MMC_BLOCK_BOUNCE=y -CONFIG_SDIO_UART=y -# CONFIG_MMC_TEST is not set - -# -# MMC/SD/SDIO Host Controller Drivers -# -# CONFIG_MMC_SDHCI is not set -# CONFIG_MMC_TIFM_SD is not set -CONFIG_MMC_MVSDIO=y -# CONFIG_MMC_SPI is not set -# CONFIG_MMC_CB710 is not set -# CONFIG_MMC_VIA_SDMMC is not set -# CONFIG_MEMSTICK is not set -# CONFIG_ACCESSIBILITY is not set -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y - -# -# LED drivers -# -# CONFIG_LEDS_PCA9532 is not set -CONFIG_LEDS_GPIO=y -CONFIG_LEDS_GPIO_PLATFORM=y -# CONFIG_LEDS_LP3944 is not set -# CONFIG_LEDS_PCA955X is not set -# CONFIG_LEDS_DAC124S085 is not set -# CONFIG_LEDS_BD2802 is not set - -# -# LED Triggers -# -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set -# CONFIG_LEDS_TRIGGER_GPIO is not set -CONFIG_LEDS_TRIGGER_DEFAULT_ON=y - -# -# iptables trigger is under Netfilter config (LED target) -# -CONFIG_RTC_LIB=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_HCTOSYS=y -CONFIG_RTC_HCTOSYS_DEVICE="rtc0" -# CONFIG_RTC_DEBUG is not set - -# -# RTC interfaces -# -CONFIG_RTC_INTF_SYSFS=y -CONFIG_RTC_INTF_PROC=y -CONFIG_RTC_INTF_DEV=y -# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set -# CONFIG_RTC_DRV_TEST is not set - -# -# I2C RTC drivers -# -# CONFIG_RTC_DRV_DS1307 is not set -# CONFIG_RTC_DRV_DS1374 is not set -# CONFIG_RTC_DRV_DS1672 is not set -# CONFIG_RTC_DRV_MAX6900 is not set -# CONFIG_RTC_DRV_RS5C372 is not set -# CONFIG_RTC_DRV_ISL1208 is not set -# CONFIG_RTC_DRV_X1205 is not set -# CONFIG_RTC_DRV_PCF8563 is not set -# CONFIG_RTC_DRV_PCF8583 is not set -# CONFIG_RTC_DRV_M41T80 is not set -CONFIG_RTC_DRV_S35390A=y -# CONFIG_RTC_DRV_FM3130 is not set -# CONFIG_RTC_DRV_RX8581 is not set -# CONFIG_RTC_DRV_RX8025 is not set - -# -# SPI RTC drivers -# -# CONFIG_RTC_DRV_M41T94 is not set -# CONFIG_RTC_DRV_DS1305 is not set -# CONFIG_RTC_DRV_DS1390 is not set -# CONFIG_RTC_DRV_MAX6902 is not set -# CONFIG_RTC_DRV_R9701 is not set -# CONFIG_RTC_DRV_RS5C348 is not set -# CONFIG_RTC_DRV_DS3234 is not set - -# -# Platform RTC drivers -# -# CONFIG_RTC_DRV_CMOS is not set -# CONFIG_RTC_DRV_DS1286 is not set -# CONFIG_RTC_DRV_DS1511 is not set -# CONFIG_RTC_DRV_DS1553 is not set -# CONFIG_RTC_DRV_DS1742 is not set -# CONFIG_RTC_DRV_STK17TA8 is not set -# CONFIG_RTC_DRV_M48T86 is not set -# CONFIG_RTC_DRV_M48T35 is not set -# CONFIG_RTC_DRV_M48T59 is not set -# CONFIG_RTC_DRV_BQ4802 is not set -# CONFIG_RTC_DRV_V3020 is not set - -# -# on-CPU RTC drivers -# -CONFIG_RTC_DRV_MV=y -CONFIG_DMADEVICES=y - -# -# DMA Devices -# -CONFIG_MV_XOR=y -CONFIG_DMA_ENGINE=y - -# -# DMA Clients -# -# CONFIG_NET_DMA is not set -# CONFIG_ASYNC_TX_DMA is not set -# CONFIG_DMATEST is not set -# CONFIG_AUXDISPLAY is not set -# CONFIG_REGULATOR is not set -# CONFIG_UIO is not set -# CONFIG_STAGING is not set - -# -# File systems -# -CONFIG_EXT2_FS=y -# CONFIG_EXT2_FS_XATTR is not set -# CONFIG_EXT2_FS_XIP is not set -CONFIG_EXT3_FS=y -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set -# CONFIG_EXT3_FS_XATTR is not set -# CONFIG_EXT4_FS is not set -CONFIG_JBD=y -# CONFIG_JBD_DEBUG is not set -CONFIG_REISERFS_FS=y -# CONFIG_JFS_FS is not set -# CONFIG_FS_POSIX_ACL is not set -# CONFIG_XFS_FS is not set -# CONFIG_GFS2_FS is not set -# CONFIG_OCFS2_FS is not set -# CONFIG_BTRFS_FS is not set -CONFIG_FILE_LOCKING=y -CONFIG_FSNOTIFY=y -CONFIG_DNOTIFY=y -CONFIG_INOTIFY=y -CONFIG_INOTIFY_USER=y -# CONFIG_QUOTA is not set -# CONFIG_AUTOFS_FS is not set -# CONFIG_AUTOFS4_FS is not set -CONFIG_FUSE_FS=y - -# -# Caches -# -# CONFIG_FSCACHE is not set - -# -# CD-ROM/DVD Filesystems -# -CONFIG_ISO9660_FS=y -CONFIG_JOLIET=y -# CONFIG_ZISOFS is not set -CONFIG_UDF_FS=m -CONFIG_UDF_NLS=y - -# -# DOS/FAT/NT Filesystems -# -CONFIG_FAT_FS=y -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_FAT_DEFAULT_CODEPAGE=437 -CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" -# CONFIG_NTFS_FS is not set - -# -# Pseudo filesystems -# -CONFIG_PROC_FS=y -CONFIG_PROC_SYSCTL=y -CONFIG_PROC_PAGE_MONITOR=y -CONFIG_SYSFS=y -CONFIG_TMPFS=y -# CONFIG_TMPFS_POSIX_ACL is not set -# CONFIG_HUGETLB_PAGE is not set -# CONFIG_CONFIGFS_FS is not set -CONFIG_MISC_FILESYSTEMS=y -# CONFIG_ADFS_FS is not set -# CONFIG_AFFS_FS is not set -# CONFIG_HFS_FS is not set -# CONFIG_HFSPLUS_FS is not set -# CONFIG_BEFS_FS is not set -# CONFIG_BFS_FS is not set -# CONFIG_EFS_FS is not set -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_FS_DEBUG=0 -CONFIG_JFFS2_FS_WRITEBUFFER=y -# CONFIG_JFFS2_FS_WBUF_VERIFY is not set -# CONFIG_JFFS2_SUMMARY is not set -# CONFIG_JFFS2_FS_XATTR is not set -# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set -CONFIG_JFFS2_ZLIB=y -# CONFIG_JFFS2_LZO is not set -CONFIG_JFFS2_RTIME=y -# CONFIG_JFFS2_RUBIN is not set -CONFIG_CRAMFS=y -# CONFIG_SQUASHFS is not set -# CONFIG_VXFS_FS is not set -# CONFIG_MINIX_FS is not set -# CONFIG_OMFS_FS is not set -# CONFIG_HPFS_FS is not set -# CONFIG_QNX4FS_FS is not set -# CONFIG_ROMFS_FS is not set -# CONFIG_SYSV_FS is not set -# CONFIG_UFS_FS is not set -# CONFIG_NILFS2_FS is not set -CONFIG_NETWORK_FILESYSTEMS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -# CONFIG_NFS_V3_ACL is not set -# CONFIG_NFS_V4 is not set -CONFIG_ROOT_NFS=y -# CONFIG_NFSD is not set -CONFIG_LOCKD=y -CONFIG_LOCKD_V4=y -CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=y -# CONFIG_RPCSEC_GSS_KRB5 is not set -# CONFIG_RPCSEC_GSS_SPKM3 is not set -# CONFIG_SMB_FS is not set -# CONFIG_CIFS is not set -# CONFIG_NCP_FS is not set -# CONFIG_CODA_FS is not set -# CONFIG_AFS_FS is not set - -# -# Partition Types -# -# CONFIG_PARTITION_ADVANCED is not set -CONFIG_MSDOS_PARTITION=y -CONFIG_NLS=y -CONFIG_NLS_DEFAULT="iso8859-1" -CONFIG_NLS_CODEPAGE_437=y -# CONFIG_NLS_CODEPAGE_737 is not set -# CONFIG_NLS_CODEPAGE_775 is not set -CONFIG_NLS_CODEPAGE_850=y -# CONFIG_NLS_CODEPAGE_852 is not set -# CONFIG_NLS_CODEPAGE_855 is not set -# CONFIG_NLS_CODEPAGE_857 is not set -# CONFIG_NLS_CODEPAGE_860 is not set -# CONFIG_NLS_CODEPAGE_861 is not set -# CONFIG_NLS_CODEPAGE_862 is not set -# CONFIG_NLS_CODEPAGE_863 is not set -# CONFIG_NLS_CODEPAGE_864 is not set -# CONFIG_NLS_CODEPAGE_865 is not set -# CONFIG_NLS_CODEPAGE_866 is not set -# CONFIG_NLS_CODEPAGE_869 is not set -# CONFIG_NLS_CODEPAGE_936 is not set -# CONFIG_NLS_CODEPAGE_950 is not set -# CONFIG_NLS_CODEPAGE_932 is not set -# CONFIG_NLS_CODEPAGE_949 is not set -# CONFIG_NLS_CODEPAGE_874 is not set -# CONFIG_NLS_ISO8859_8 is not set -# CONFIG_NLS_CODEPAGE_1250 is not set -# CONFIG_NLS_CODEPAGE_1251 is not set -# CONFIG_NLS_ASCII is not set -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_ISO8859_2=y -# CONFIG_NLS_ISO8859_3 is not set -# CONFIG_NLS_ISO8859_4 is not set -# CONFIG_NLS_ISO8859_5 is not set -# CONFIG_NLS_ISO8859_6 is not set -# CONFIG_NLS_ISO8859_7 is not set -# CONFIG_NLS_ISO8859_9 is not set -# CONFIG_NLS_ISO8859_13 is not set -# CONFIG_NLS_ISO8859_14 is not set -# CONFIG_NLS_ISO8859_15 is not set -# CONFIG_NLS_KOI8_R is not set -# CONFIG_NLS_KOI8_U is not set -CONFIG_NLS_UTF8=y -# CONFIG_DLM is not set - -# -# Kernel hacking -# -# CONFIG_PRINTK_TIME is not set -CONFIG_ENABLE_WARN_DEPRECATED=y -CONFIG_ENABLE_MUST_CHECK=y -CONFIG_FRAME_WARN=1024 -CONFIG_MAGIC_SYSRQ=y -# CONFIG_UNUSED_SYMBOLS is not set -CONFIG_DEBUG_FS=y -# CONFIG_HEADERS_CHECK is not set -CONFIG_DEBUG_KERNEL=y -# CONFIG_DEBUG_SHIRQ is not set -CONFIG_DETECT_SOFTLOCKUP=y -# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set -CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 -CONFIG_DETECT_HUNG_TASK=y -# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set -CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 -# CONFIG_SCHED_DEBUG is not set -# CONFIG_SCHEDSTATS is not set -# CONFIG_TIMER_STATS is not set -# CONFIG_DEBUG_OBJECTS is not set -# CONFIG_SLUB_DEBUG_ON is not set -# CONFIG_SLUB_STATS is not set -# CONFIG_DEBUG_KMEMLEAK is not set -# CONFIG_DEBUG_PREEMPT is not set -# CONFIG_DEBUG_RT_MUTEXES is not set -# CONFIG_RT_MUTEX_TESTER is not set -# CONFIG_DEBUG_SPINLOCK is not set -# CONFIG_DEBUG_MUTEXES is not set -# CONFIG_DEBUG_LOCK_ALLOC is not set -# CONFIG_PROVE_LOCKING is not set -# CONFIG_LOCK_STAT is not set -# CONFIG_DEBUG_SPINLOCK_SLEEP is not set -# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set -CONFIG_STACKTRACE=y -# CONFIG_DEBUG_KOBJECT is not set -CONFIG_DEBUG_BUGVERBOSE=y -CONFIG_DEBUG_INFO=y -# CONFIG_DEBUG_VM is not set -# CONFIG_DEBUG_WRITECOUNT is not set -CONFIG_DEBUG_MEMORY_INIT=y -# CONFIG_DEBUG_LIST is not set -# CONFIG_DEBUG_SG is not set -# CONFIG_DEBUG_NOTIFIERS is not set -# CONFIG_BOOT_PRINTK_DELAY is not set -# CONFIG_RCU_TORTURE_TEST is not set -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -# CONFIG_KPROBES_SANITY_TEST is not set -# CONFIG_BACKTRACE_SELF_TEST is not set -# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set -# CONFIG_LKDTM is not set -# CONFIG_FAULT_INJECTION is not set -# CONFIG_LATENCYTOP is not set -CONFIG_SYSCTL_SYSCALL_CHECK=y -# CONFIG_PAGE_POISONING is not set -CONFIG_NOP_TRACER=y -CONFIG_HAVE_FUNCTION_TRACER=y -CONFIG_RING_BUFFER=y -CONFIG_EVENT_TRACING=y -CONFIG_CONTEXT_SWITCH_TRACER=y -CONFIG_TRACING=y -CONFIG_TRACING_SUPPORT=y -CONFIG_FTRACE=y -# CONFIG_FUNCTION_TRACER is not set -# CONFIG_IRQSOFF_TRACER is not set -# CONFIG_PREEMPT_TRACER is not set -# CONFIG_SCHED_TRACER is not set -# CONFIG_ENABLE_DEFAULT_TRACERS is not set -# CONFIG_BOOT_TRACER is not set -CONFIG_BRANCH_PROFILE_NONE=y -# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set -# CONFIG_PROFILE_ALL_BRANCHES is not set -# CONFIG_STACK_TRACER is not set -# CONFIG_KMEMTRACE is not set -# CONFIG_WORKQUEUE_TRACER is not set -# CONFIG_BLK_DEV_IO_TRACE is not set -# CONFIG_RING_BUFFER_BENCHMARK is not set -# CONFIG_DYNAMIC_DEBUG is not set -# CONFIG_SAMPLES is not set -CONFIG_HAVE_ARCH_KGDB=y -# CONFIG_KGDB is not set -CONFIG_ARM_UNWIND=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -# CONFIG_DEBUG_STACK_USAGE is not set -CONFIG_DEBUG_LL=y -# CONFIG_DEBUG_ICEDCC is not set - -# -# Security options -# -# CONFIG_KEYS is not set -# CONFIG_SECURITY is not set -# CONFIG_SECURITYFS is not set -# CONFIG_SECURITY_FILE_CAPABILITIES is not set -CONFIG_CRYPTO=y - -# -# Crypto core or helper -# -# CONFIG_CRYPTO_FIPS is not set -CONFIG_CRYPTO_ALGAPI=y -CONFIG_CRYPTO_ALGAPI2=y -CONFIG_CRYPTO_AEAD2=y -CONFIG_CRYPTO_BLKCIPHER=y -CONFIG_CRYPTO_BLKCIPHER2=y -CONFIG_CRYPTO_HASH=y -CONFIG_CRYPTO_HASH2=y -CONFIG_CRYPTO_RNG2=y -CONFIG_CRYPTO_PCOMP=y -CONFIG_CRYPTO_MANAGER=y -CONFIG_CRYPTO_MANAGER2=y -# CONFIG_CRYPTO_GF128MUL is not set -# CONFIG_CRYPTO_NULL is not set -CONFIG_CRYPTO_WORKQUEUE=y -# CONFIG_CRYPTO_CRYPTD is not set -# CONFIG_CRYPTO_AUTHENC is not set -# CONFIG_CRYPTO_TEST is not set - -# -# Authenticated Encryption with Associated Data -# -# CONFIG_CRYPTO_CCM is not set -# CONFIG_CRYPTO_GCM is not set -# CONFIG_CRYPTO_SEQIV is not set - -# -# Block modes -# -CONFIG_CRYPTO_CBC=m -# CONFIG_CRYPTO_CTR is not set -# CONFIG_CRYPTO_CTS is not set -CONFIG_CRYPTO_ECB=y -# CONFIG_CRYPTO_LRW is not set -CONFIG_CRYPTO_PCBC=m -# CONFIG_CRYPTO_XTS is not set - -# -# Hash modes -# -# CONFIG_CRYPTO_HMAC is not set -# CONFIG_CRYPTO_XCBC is not set - -# -# Digest -# -CONFIG_CRYPTO_CRC32C=y -# CONFIG_CRYPTO_MD4 is not set -# CONFIG_CRYPTO_MD5 is not set -# CONFIG_CRYPTO_MICHAEL_MIC is not set -# CONFIG_CRYPTO_RMD128 is not set -# CONFIG_CRYPTO_RMD160 is not set -# CONFIG_CRYPTO_RMD256 is not set -# CONFIG_CRYPTO_RMD320 is not set -# CONFIG_CRYPTO_SHA1 is not set -# CONFIG_CRYPTO_SHA256 is not set -# CONFIG_CRYPTO_SHA512 is not set -# CONFIG_CRYPTO_TGR192 is not set -# CONFIG_CRYPTO_WP512 is not set - -# -# Ciphers -# -CONFIG_CRYPTO_AES=y -# CONFIG_CRYPTO_ANUBIS is not set -CONFIG_CRYPTO_ARC4=y -# CONFIG_CRYPTO_BLOWFISH is not set -# CONFIG_CRYPTO_CAMELLIA is not set -# CONFIG_CRYPTO_CAST5 is not set -# CONFIG_CRYPTO_CAST6 is not set -# CONFIG_CRYPTO_DES is not set -# CONFIG_CRYPTO_FCRYPT is not set -# CONFIG_CRYPTO_KHAZAD is not set -# CONFIG_CRYPTO_SALSA20 is not set -# CONFIG_CRYPTO_SEED is not set -# CONFIG_CRYPTO_SERPENT is not set -# CONFIG_CRYPTO_TEA is not set -# CONFIG_CRYPTO_TWOFISH is not set - -# -# Compression -# -# CONFIG_CRYPTO_DEFLATE is not set -# CONFIG_CRYPTO_ZLIB is not set -# CONFIG_CRYPTO_LZO is not set - -# -# Random Number Generation -# -# CONFIG_CRYPTO_ANSI_CPRNG is not set -CONFIG_CRYPTO_HW=y -# CONFIG_CRYPTO_DEV_HIFN_795X is not set -CONFIG_BINARY_PRINTF=y - -# -# Library routines -# -CONFIG_BITREVERSE=y -CONFIG_GENERIC_FIND_LAST_BIT=y -CONFIG_CRC_CCITT=y -CONFIG_CRC16=y -# CONFIG_CRC_T10DIF is not set -CONFIG_CRC_ITU_T=m -CONFIG_CRC32=y -# CONFIG_CRC7 is not set -CONFIG_LIBCRC32C=y -CONFIG_ZLIB_INFLATE=y -CONFIG_ZLIB_DEFLATE=y -CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT=y -CONFIG_HAS_DMA=y -CONFIG_NLATTR=y diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.27.nix b/pkgs/os-specific/linux/kernel/linux-2.6.27.nix deleted file mode 100644 index 046b07b9e64..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-2.6.27.nix +++ /dev/null @@ -1,219 +0,0 @@ -args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "", ... }: - -import ./generic.nix ( - - rec { - version = "2.6.27.61"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v2.6/longterm/v2.6.27/linux-${version}.tar.bz2"; - sha256 = "1lian4fj84fry3yanammawzsqi7ix9pvic6qfr578xnvsbf5pbi7"; - }; - - features.iwlwifi = true; - - config = - '' - # Don't include any debug features. - DEBUG_KERNEL n - - # Support drivers that need external firmware. - STANDALONE n - - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Virtualisation (KVM, Xen...). - PARAVIRT_GUEST y - KVM_CLOCK y - KVM_GUEST y - XEN y - - # We need 64 GB (PAE) support for Xen guest support. - HIGHMEM64G? y - - # Enable the kernel's built-in memory tester. - MEMTEST y - - # Include the CFQ I/O scheduler in the kernel, rather than as a - # module, so that the initrd gets a good I/O scheduler. - IOSCHED_CFQ y - - # Disable some expensive (?) features. - MARKERS n - KPROBES n - NUMA? n - PM_TRACE_RTC n - - # Enable various subsystems. - ACCESSIBILITY y # Accessibility support - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI y - MTD_COMPLEX_MAPPINGS y # needed for many devices - NET_POCKET y # enable pocket and portable adapters - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - - # Networking options. - IP_PNP n - IPV6_PRIVACY y - NETFILTER_ADVANCED y - IP_VS_PROTO_TCP y - IP_VS_PROTO_UDP y - IP_VS_PROTO_ESP y - IP_VS_PROTO_AH y - IP_DCCP_CCID3 n # experimental - CLS_U32_PERF y - CLS_U32_MARK y - - # Wireless networking. - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR y # support promiscuous mode - IWLWIFI_LEDS? y - IWLWIFI_RFKILL y - IWLAGN_SPECTRUM_MEASUREMENT y - IWLAGN_LEDS y - IWL4965 y # Intel Wireless WiFi 4965AGN - IWL5000 y # Intel Wireless WiFi 5000AGN - IWL3945_RFKILL y - IWL3945_LEDS y - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM y - - # Some settings to make sure that fbcondecor works - in particular, - # disable tileblitting and the drivers that need it. - - # Enable various FB devices. - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_TRIDENT_ACCEL y - FB_GEODE y - - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - - # Enable a bunch of USB storage devices. - USB_STORAGE_DATAFAB y - USB_STORAGE_FREECOM y - USB_STORAGE_ISD200 y - USB_STORAGE_USBAT y - USB_STORAGE_SDDR09 y - USB_STORAGE_SDDR55 y - USB_STORAGE_JUMPSHOT y - USB_STORAGE_ONETOUCH y - USB_STORAGE_KARMA y - USB_STORAGE_CYPRESS_ATACB y - - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - UBIFS_FS_XATTR y - UBIFS_FS_ADVANCED_COMPR y - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - CIFS_XATTR y - CIFS_POSIX y - - # Security related features. - STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default - - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - B43_PCMCIA y - BLK_DEV_BSG n - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_INTEGRITY y - BLK_DEV_IO_TRACE n - BSD_PROCESS_ACCT_V3 y - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_RFCOMM_TTY y # RFCOMM TTY support - CPU_FREQ_DEBUG n - CRASH_DUMP n - DMAR? n # experimental - FUSION y # Fusion MPT device support - IRDA_ULTRA y # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED - KALLSYMS_EXTRA_PASS n - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support - LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback - LOGO n # not needed - MEDIA_ATTACH y - MEGARAID_NEWGEN y - MODVERSIONS y - MTRR_SANITIZER y - NET_FC y # Fibre Channel driver support - PCI_LEGACY y - PPP_MULTILINK y # PPP multilink support - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - X86_MCE y - - ${extraConfig} - ''; - } - - // args -) diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.38.nix b/pkgs/os-specific/linux/kernel/linux-2.6.38.nix deleted file mode 100644 index c9f2fc90684..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-2.6.38.nix +++ /dev/null @@ -1,208 +0,0 @@ -args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "" -, ... }: - -let - configWithPlatform = kernelPlatform : - '' - # Don't include any debug features. - DEBUG_KERNEL n - - # Support drivers that need external firmware. - STANDALONE n - - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Enable the kernel's built-in memory tester. - MEMTEST y - - # Disable some expensive (?) features. - FTRACE n - KPROBES n - NUMA? n - PM_TRACE_RTC n - - # Enable various subsystems. - ACCESSIBILITY y # Accessibility support - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI y - MTD_COMPLEX_MAPPINGS y # needed for many devices - NET_POCKET y # enable pocket and portable adapters - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - - # Networking options. - IP_PNP n - IPV6_PRIVACY y - NETFILTER_ADVANCED y - IP_VS_PROTO_TCP y - IP_VS_PROTO_UDP y - IP_VS_PROTO_ESP y - IP_VS_PROTO_AH y - IP_DCCP_CCID3 n # experimental - CLS_U32_PERF y - CLS_U32_MARK y - - # Wireless networking. - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR y # support promiscuous mode - IWL4965 y # Intel Wireless WiFi 4965AGN - IWL5000 y # Intel Wireless WiFi 5000AGN - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM y - - # Some settings to make sure that fbcondecor works - in particular, - # disable tileblitting and the drivers that need it. - - # Enable various FB devices. - FB y - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_GEODE y - - # Video configuration - # The intel drivers already require KMS - DRM_I915_KMS y - # Hybrid graphics support - VGA_SWITCHEROO y - - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_HDA_INPUT_BEEP y # Support digital beep via input layer - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - EXT4_FS_POSIX_ACL y - EXT4_FS_SECURITY y - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - BTRFS_FS_POSIX_ACL y - UBIFS_FS_XATTR y - UBIFS_FS_ADVANCED_COMPR y - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - CIFS_XATTR y - CIFS_POSIX y - - # Security related features. - STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default - - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - B43_PCMCIA y - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_INTEGRITY y - BSD_PROCESS_ACCT_V3 y - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_RFCOMM_TTY y # RFCOMM TTY support - CPU_FREQ_DEBUG n - CRASH_DUMP n - DMAR? n # experimental - DVB_DYNAMIC_MINORS y # we use udev - FUSION y # Fusion MPT device support - IDE_GD_ATAPI y # ATAPI floppy support - IRDA_ULTRA y # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED - KALLSYMS_EXTRA_PASS n - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support - LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback - LOGO n # not needed - MEDIA_ATTACH y - MEGARAID_NEWGEN y - MICROCODE_AMD y - MODVERSIONS y - MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension - MTRR_SANITIZER y - NET_FC y # Fibre Channel driver support - PPP_MULTILINK y # PPP multilink support - REGULATOR y # Voltage and Current Regulator Support - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - X86_CHECK_BIOS_CORRUPTION y - X86_MCE y - - ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} - ${extraConfig} - ''; -in - -import ./generic.nix ( - - rec { - version = "2.6.38.8"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2"; - sha256 = "16zrwb2wjsg02l4sbbm7aipq9f9v267ys4n6hmaixa6v5rrf7gbi"; - }; - - config = configWithPlatform stdenv.platform; - configCross = configWithPlatform stdenv.cross.platform; - - features.iwlwifi = true; - } - - // removeAttrs args ["extraConfig"] -) diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.39.nix b/pkgs/os-specific/linux/kernel/linux-2.6.39.nix deleted file mode 100644 index 001486f5ba5..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-2.6.39.nix +++ /dev/null @@ -1,221 +0,0 @@ -args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "" -, perl, mktemp, module_init_tools -, ... }: - -let - configWithPlatform = kernelPlatform : - '' - # Power management and debugging for powertop. - DEBUG_KERNEL y - PM_ADVANCED_DEBUG y - PM_RUNTIME y - TIMER_STATS y - USB_SUSPEND y - BACKTRACE_SELF_TEST n - CPU_NOTIFIER_ERROR_INJECT n - DEBUG_DEVRES n - DEBUG_NX_TEST n - DEBUG_STACK_USAGE n - DEBUG_STACKOVERFLOW n - RCU_TORTURE_TEST n - SCHEDSTATS n - - # Support drivers that need external firmware. - STANDALONE n - - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Enable the kernel's built-in memory tester. - MEMTEST y - - # Disable some expensive (?) features. - FTRACE n - KPROBES n - NUMA? n - PM_TRACE_RTC n - - # Enable various subsystems. - ACCESSIBILITY y # Accessibility support - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI y - MTD_COMPLEX_MAPPINGS y # needed for many devices - NET_POCKET y # enable pocket and portable adapters - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - - # Networking options. - IP_PNP n - IPV6_PRIVACY y - NETFILTER_ADVANCED y - IP_VS_PROTO_TCP y - IP_VS_PROTO_UDP y - IP_VS_PROTO_ESP y - IP_VS_PROTO_AH y - IP_DCCP_CCID3 n # experimental - CLS_U32_PERF y - CLS_U32_MARK y - - # Wireless networking. - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR y # support promiscuous mode - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM y - - # Some settings to make sure that fbcondecor works - in particular, - # disable tileblitting and the drivers that need it. - - # Enable various FB devices. - FB y - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_GEODE y - - # Video configuration - # The intel drivers already require KMS - DRM_I915_KMS y - # Hybrid graphics support - VGA_SWITCHEROO y - - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_HDA_INPUT_BEEP y # Support digital beep via input layer - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - EXT4_FS_POSIX_ACL y - EXT4_FS_SECURITY y - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - BTRFS_FS_POSIX_ACL y - UBIFS_FS_XATTR y - UBIFS_FS_ADVANCED_COMPR y - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - CIFS_XATTR y - CIFS_POSIX y - - # Security related features. - STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default - - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - B43_PCMCIA y - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_INTEGRITY y - BSD_PROCESS_ACCT_V3 y - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_L2CAP y - BT_RFCOMM m - BT_RFCOMM_TTY y # RFCOMM TTY support - CPU_FREQ_DEBUG n - CRASH_DUMP n - DMAR? n # experimental - DVB_DYNAMIC_MINORS y # we use udev - FUSION y # Fusion MPT device support - IDE_GD_ATAPI y # ATAPI floppy support - IRDA_ULTRA y # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED - KALLSYMS_EXTRA_PASS n - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support - LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback - LOGO n # not needed - MEDIA_ATTACH y - MEGARAID_NEWGEN y - MICROCODE_AMD y - MODVERSIONS y - MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension - MTRR_SANITIZER y - NET_FC y # Fibre Channel driver support - PPP_MULTILINK y # PPP multilink support - REGULATOR y # Voltage and Current Regulator Support - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - X86_CHECK_BIOS_CORRUPTION y - X86_MCE y - - ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} - ${extraConfig} - ''; -in - -import ./generic.nix ( - - rec { - version = "2.6.39.4"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2"; - sha256 = "10qijh322zbcnsjq21rj228fwksx1ij23gal8zw67gxlvgp48vnj"; - }; - - config = configWithPlatform stdenv.platform; - configCross = configWithPlatform stdenv.cross.platform; - - features.iwlwifi = true; - } - - // removeAttrs args ["extraConfig"] -) diff --git a/pkgs/os-specific/linux/kernel/linux-nanonote-jz-2.6.34.nix b/pkgs/os-specific/linux/kernel/linux-nanonote-jz-2.6.34.nix deleted file mode 100644 index 0eb291d5b55..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-nanonote-jz-2.6.34.nix +++ /dev/null @@ -1,241 +0,0 @@ -args @ { stdenv, fetchurl, fetchsvn, userModeLinux ? false, extraConfig ? "" -, ... }: - -let - configWithPlatform = kernelPlatform : - '' - # Don't include any debug features. - DEBUG_KERNEL n - - # Support drivers that need external firmware. - STANDALONE n - - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Enable the kernel's built-in memory tester. - MEMTEST y - - # Include the CFQ I/O scheduler in the kernel, rather than as a - # module, so that the initrd gets a good I/O scheduler. - IOSCHED_CFQ y - - # Disable some expensive (?) features. - FTRACE n - KPROBES n - NUMA? n - PM_TRACE_RTC n - - # Enable various subsystems. - ACCESSIBILITY y # Accessibility support - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI y - MTD_COMPLEX_MAPPINGS y # needed for many devices - NET_POCKET y # enable pocket and portable adapters - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - - # Networking options. - IP_PNP n - IPV6_PRIVACY y - NETFILTER_ADVANCED y - IP_VS_PROTO_TCP y - IP_VS_PROTO_UDP y - IP_VS_PROTO_ESP y - IP_VS_PROTO_AH y - IP_DCCP_CCID3 n # experimental - CLS_U32_PERF y - CLS_U32_MARK y - - # Wireless networking. - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR y # support promiscuous mode - IWL4965 y # Intel Wireless WiFi 4965AGN - IWL5000 y # Intel Wireless WiFi 5000AGN - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM y - - # Some settings to make sure that fbcondecor works - in particular, - # disable tileblitting and the drivers that need it. - - # Enable various FB devices. - FB y - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_GEODE y - - # Video configuration - # The intel drivers already require KMS - DRM_I915_KMS y - - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_HDA_INPUT_BEEP y # Support digital beep via input layer - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - EXT4_FS_POSIX_ACL y - EXT4_FS_SECURITY y - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - BTRFS_FS_POSIX_ACL y - UBIFS_FS_XATTR y - UBIFS_FS_ADVANCED_COMPR y - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - CIFS_XATTR y - CIFS_POSIX y - - # Security related features. - STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default - - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - B43_PCMCIA y - BLK_DEV_BSG n - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_INTEGRITY y - BSD_PROCESS_ACCT_V3 y - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_RFCOMM_TTY y # RFCOMM TTY support - CPU_FREQ_DEBUG n - CRASH_DUMP n - DMAR? n # experimental - DVB_DYNAMIC_MINORS y # we use udev - FUSION y # Fusion MPT device support - IDE_GD_ATAPI y # ATAPI floppy support - IRDA_ULTRA y # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED - KALLSYMS_EXTRA_PASS n - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support - LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback - LOGO n # not needed - MEDIA_ATTACH y - MEGARAID_NEWGEN y - MICROCODE_AMD y - MODVERSIONS y - MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension - MTRR_SANITIZER y - NET_FC y # Fibre Channel driver support - PPP_MULTILINK y # PPP multilink support - REGULATOR y # Voltage and Current Regulator Support - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - X86_CHECK_BIOS_CORRUPTION y - X86_MCE y - - ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} - ${extraConfig} - ''; -in - -import ./generic.nix ( - - rec { - version = "qi_lb60-2.6.34.1-openwrt-22513"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v2.6/linux-2.6.34.1.tar.bz2"; - sha256 = "0v78yvkwr100v7bnrkkabxmpv5hjg1ngrjbr5d0kkzsw4d7bmm5x"; - }; - - srcPatch = fetchsvn { - url = "svn://svn.openwrt.org/openwrt/trunk/target/linux"; - rev = 22513; - sha256 = "0b7wzgqnbq8sq32z9ik08n1b7fnc9v9d91zwvb6qz7vj3dlrxw3g"; - }; - - preConfigure = '' - cp -R ${srcPatch}/generic/files/* . - chmod +w -R * - GLOBIGNORE='.:..:*preinit_as_init*' - for a in ${srcPatch}/generic/patches-2.6.34/* ${srcPatch}/xburst/patches-2.6.34/* ; do - echo applying patch $a - patch -p1 < $a - done - unset GLOBIGNORE - cat ${srcPatch}/generic/config-2.6.34 ${srcPatch}/xburst/config-2.6.34 \ - ${srcPatch}/xburst/qi_lb60/config-2.6.34 > arch/mips/configs/qi_lb60_defconfig - ''; - - postInstall = '' - set -x - gzip -9 -c $out/vmlinux.bin > $out/vmlinux.bin.gz - KERNEL_ENTRY="0x`$crossConfig-nm $out/vmlinux 2>/dev/null | - grep " kernel_entry" | cut -f1 -d ' '`" - mkimage -A mips -O linux -T kernel -a 0x80010000 -C gzip \ - -e $KERNEL_ENTRY -n "MIPS Nix Linux-2.6.34" \ - -d $out/vmlinux.bin.gz $out/uImage - set +x - ''; - - config = configWithPlatform stdenv.platform; - configCross = configWithPlatform stdenv.cross.platform; - - features.iwlwifi = true; - } - - // removeAttrs args ["extraConfig"] -) diff --git a/pkgs/os-specific/linux/kernel/linux-nanonote-jz-2.6.35.nix b/pkgs/os-specific/linux/kernel/linux-nanonote-jz-2.6.35.nix deleted file mode 100644 index ac0b000f9cd..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-nanonote-jz-2.6.35.nix +++ /dev/null @@ -1,241 +0,0 @@ -args @ { stdenv, fetchurl, fetchsvn, userModeLinux ? false, extraConfig ? "" -, ... }: - -let - configWithPlatform = kernelPlatform : - '' - # Don't include any debug features. - DEBUG_KERNEL n - - # Support drivers that need external firmware. - STANDALONE n - - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Enable the kernel's built-in memory tester. - MEMTEST y - - # Include the CFQ I/O scheduler in the kernel, rather than as a - # module, so that the initrd gets a good I/O scheduler. - IOSCHED_CFQ y - - # Disable some expensive (?) features. - FTRACE n - KPROBES n - NUMA? n - PM_TRACE_RTC n - - # Enable various subsystems. - ACCESSIBILITY y # Accessibility support - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI y - MTD_COMPLEX_MAPPINGS y # needed for many devices - NET_POCKET y # enable pocket and portable adapters - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - - # Networking options. - IP_PNP n - IPV6_PRIVACY y - NETFILTER_ADVANCED y - IP_VS_PROTO_TCP y - IP_VS_PROTO_UDP y - IP_VS_PROTO_ESP y - IP_VS_PROTO_AH y - IP_DCCP_CCID3 n # experimental - CLS_U32_PERF y - CLS_U32_MARK y - - # Wireless networking. - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR y # support promiscuous mode - IWL4965 y # Intel Wireless WiFi 4965AGN - IWL5000 y # Intel Wireless WiFi 5000AGN - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM y - - # Some settings to make sure that fbcondecor works - in particular, - # disable tileblitting and the drivers that need it. - - # Enable various FB devices. - FB y - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_GEODE y - - # Video configuration - # The intel drivers already require KMS - DRM_I915_KMS y - - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_HDA_INPUT_BEEP y # Support digital beep via input layer - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - EXT4_FS_POSIX_ACL y - EXT4_FS_SECURITY y - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - BTRFS_FS_POSIX_ACL y - UBIFS_FS_XATTR y - UBIFS_FS_ADVANCED_COMPR y - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - CIFS_XATTR y - CIFS_POSIX y - - # Security related features. - STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default - - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - B43_PCMCIA y - BLK_DEV_BSG n - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_INTEGRITY y - BSD_PROCESS_ACCT_V3 y - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_RFCOMM_TTY y # RFCOMM TTY support - CPU_FREQ_DEBUG n - CRASH_DUMP n - DMAR? n # experimental - DVB_DYNAMIC_MINORS y # we use udev - FUSION y # Fusion MPT device support - IDE_GD_ATAPI y # ATAPI floppy support - IRDA_ULTRA y # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED - KALLSYMS_EXTRA_PASS n - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support - LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback - LOGO n # not needed - MEDIA_ATTACH y - MEGARAID_NEWGEN y - MICROCODE_AMD y - MODVERSIONS y - MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension - MTRR_SANITIZER y - NET_FC y # Fibre Channel driver support - PPP_MULTILINK y # PPP multilink support - REGULATOR y # Voltage and Current Regulator Support - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - X86_CHECK_BIOS_CORRUPTION y - X86_MCE y - - ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} - ${extraConfig} - ''; -in - -import ./generic.nix ( - - rec { - version = "qi_lb60-2.6.35-openwrt-22513"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v2.6/linux-2.6.35.tar.bz2"; - sha256 = "1kxz87nwksx4hvq1i45i9w1zq1fb09rvf8i6jin3cbh36v1y5chq"; - }; - - srcPatch = fetchsvn { - url = "svn://svn.openwrt.org/openwrt/trunk/target/linux"; - rev = 22530; - sha256 = "1j5ls7dg0pvdxh6isczmq4r0lkwhz1c1s46mvdkcjsm3qq633fpc"; - }; - - preConfigure = '' - cp -R ${srcPatch}/generic/files/* . - chmod +w -R * - GLOBIGNORE='.:..:*preinit_as_init*' - for a in ${srcPatch}/generic/patches-2.6.35/* ${srcPatch}/xburst/patches-2.6.35/* ; do - echo applying patch $a - patch -p1 < $a - done - unset GLOBIGNORE - cat ${srcPatch}/generic/config-2.6.35 ${srcPatch}/xburst/config-2.6.35 \ - ${srcPatch}/xburst/qi_lb60/config-2.6.35 > arch/mips/configs/qi_lb60_defconfig - ''; - - postInstall = '' - set -x - gzip -9 -c $out/vmlinux.bin > $out/vmlinux.bin.gz - KERNEL_ENTRY="0x`$crossConfig-nm $out/vmlinux 2>/dev/null | - grep " kernel_entry" | cut -f1 -d ' '`" - mkimage -A mips -O linux -T kernel -a 0x80010000 -C gzip \ - -e $KERNEL_ENTRY -n "MIPS Nix Linux-2.6.35" \ - -d $out/vmlinux.bin.gz $out/uImage - set +x - ''; - - config = configWithPlatform stdenv.platform; - configCross = configWithPlatform stdenv.cross.platform; - - features.iwlwifi = true; - } - - // removeAttrs args ["extraConfig"] -) diff --git a/pkgs/os-specific/linux/kernel/linux-nanonote-jz-2.6.36.nix b/pkgs/os-specific/linux/kernel/linux-nanonote-jz-2.6.36.nix deleted file mode 100644 index 14fbe5afe9e..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-nanonote-jz-2.6.36.nix +++ /dev/null @@ -1,241 +0,0 @@ -args @ { stdenv, fetchurl, fetchsvn, userModeLinux ? false, extraConfig ? "" -, ... }: - -let - configWithPlatform = kernelPlatform : - '' - # Don't include any debug features. - DEBUG_KERNEL n - - # Support drivers that need external firmware. - STANDALONE n - - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Enable the kernel's built-in memory tester. - MEMTEST y - - # Include the CFQ I/O scheduler in the kernel, rather than as a - # module, so that the initrd gets a good I/O scheduler. - IOSCHED_CFQ y - - # Disable some expensive (?) features. - FTRACE n - KPROBES n - NUMA? n - PM_TRACE_RTC n - - # Enable various subsystems. - ACCESSIBILITY y # Accessibility support - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI y - MTD_COMPLEX_MAPPINGS y # needed for many devices - NET_POCKET y # enable pocket and portable adapters - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - - # Networking options. - IP_PNP n - IPV6_PRIVACY y - NETFILTER_ADVANCED y - IP_VS_PROTO_TCP y - IP_VS_PROTO_UDP y - IP_VS_PROTO_ESP y - IP_VS_PROTO_AH y - IP_DCCP_CCID3 n # experimental - CLS_U32_PERF y - CLS_U32_MARK y - - # Wireless networking. - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR y # support promiscuous mode - IWL4965 y # Intel Wireless WiFi 4965AGN - IWL5000 y # Intel Wireless WiFi 5000AGN - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM y - - # Some settings to make sure that fbcondecor works - in particular, - # disable tileblitting and the drivers that need it. - - # Enable various FB devices. - FB y - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_GEODE y - - # Video configuration - # The intel drivers already require KMS - DRM_I915_KMS y - - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_HDA_INPUT_BEEP y # Support digital beep via input layer - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - EXT4_FS_POSIX_ACL y - EXT4_FS_SECURITY y - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - BTRFS_FS_POSIX_ACL y - UBIFS_FS_XATTR y - UBIFS_FS_ADVANCED_COMPR y - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - CIFS_XATTR y - CIFS_POSIX y - - # Security related features. - STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default - - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - B43_PCMCIA y - BLK_DEV_BSG n - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_INTEGRITY y - BSD_PROCESS_ACCT_V3 y - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_RFCOMM_TTY y # RFCOMM TTY support - CPU_FREQ_DEBUG n - CRASH_DUMP n - DMAR? n # experimental - DVB_DYNAMIC_MINORS y # we use udev - FUSION y # Fusion MPT device support - IDE_GD_ATAPI y # ATAPI floppy support - IRDA_ULTRA y # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED - KALLSYMS_EXTRA_PASS n - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support - LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback - LOGO n # not needed - MEDIA_ATTACH y - MEGARAID_NEWGEN y - MICROCODE_AMD y - MODVERSIONS y - MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension - MTRR_SANITIZER y - NET_FC y # Fibre Channel driver support - PPP_MULTILINK y # PPP multilink support - REGULATOR y # Voltage and Current Regulator Support - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - X86_CHECK_BIOS_CORRUPTION y - X86_MCE y - - ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} - ${extraConfig} - ''; -in - -import ./generic.nix ( - - rec { - version = "qi_lb60-2.6.36.3-openwrt-24283"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v2.6/linux-2.6.36.3.tar.bz2"; - sha256 = "1kxj4m9f5iplbll1c5inszg5yxywakz533nl5p4ia84mq2ch03dc"; - }; - - srcPatch = fetchsvn { - url = "svn://svn.openwrt.org/openwrt/trunk/target/linux"; - rev = 24283; - sha256 = "4e30266bbaf004acb10b5c182d0c01c7aba685956d36e76ea7c24dd55ae51c10"; - }; - - preConfigure = '' - cp -R ${srcPatch}/generic/files/* . - chmod +w -R * - GLOBIGNORE='.:..:*preinit_as_init*:*gpio-for-the-6th-row-of-the-keyboard*' - for a in ${srcPatch}/generic/patches-2.6.36/* ${srcPatch}/xburst/patches-2.6.36/* ; do - echo applying patch $a - patch -p1 < $a - done - unset GLOBIGNORE - cat ${srcPatch}/generic/config-2.6.36 ${srcPatch}/xburst/config-2.6.36 \ - ${srcPatch}/xburst/qi_lb60/config-2.6.36 > arch/mips/configs/qi_lb60_defconfig - ''; - - postInstall = '' - set -x - gzip -9 -c $out/vmlinux.bin > $out/vmlinux.bin.gz - KERNEL_ENTRY="0x`$crossConfig-nm $out/vmlinux 2>/dev/null | - grep " kernel_entry" | cut -f1 -d ' '`" - mkimage -A mips -O linux -T kernel -a 0x80010000 -C gzip \ - -e $KERNEL_ENTRY -n "MIPS Nix Linux-2.6.36" \ - -d $out/vmlinux.bin.gz $out/uImage - set +x - ''; - - config = configWithPlatform stdenv.platform; - configCross = configWithPlatform stdenv.cross.platform; - - features.iwlwifi = true; - } - - // removeAttrs args ["extraConfig"] -) diff --git a/pkgs/os-specific/linux/kernel/mips_restart.patch b/pkgs/os-specific/linux/kernel/mips_restart.patch deleted file mode 100644 index 42a9b4f253c..00000000000 --- a/pkgs/os-specific/linux/kernel/mips_restart.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c -index 9996094..ae167df 100644 ---- a/arch/mips/kernel/process.c -+++ b/arch/mips/kernel/process.c -@@ -142,7 +142,6 @@ int copy_thread(unsigned long clone_flags, unsigned long usp, - childregs->regs[7] = 0; /* Clear error flag */ - - childregs->regs[2] = 0; /* Child gets zero as return value */ -- regs->regs[2] = p->pid; - - if (childregs->cp0_status & ST0_CU0) { - childregs->regs[28] = (unsigned long) ti; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 4ac33380398..26a8bf55225 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -64,26 +64,6 @@ rec { features.secPermPatch = true; }; - fbcondecor_2_6_25 = - { name = "fbcondecor-0.9.4-2.6.25-rc6"; - patch = fetchurl { - url = http://dev.gentoo.org/~spock/projects/fbcondecor/archive/fbcondecor-0.9.4-2.6.25-rc6.patch; - sha256 = "1wm94n7f0qyb8xvafip15r158z5pzw7zb7q8hrgddb092c6ibmq8"; - }; - extraConfig = fbcondecorConfig; - features.fbConDecor = true; - }; - - fbcondecor_2_6_27 = - { name = "fbcondecor-0.9.4-2.6.27"; - patch = fetchurl { - url = http://dev.gentoo.org/~spock/projects/fbcondecor/archive/fbcondecor-0.9.4-2.6.27.patch; - sha256 = "170l9l5fvbgjrr4klqcwbgjg4kwvrrhjpmgbfpqj0scq0s4q4vk6"; - }; - extraConfig = fbcondecorConfig; - features.fbConDecor = true; - }; - fbcondecor_2_6_31 = { name = "fbcondecor-0.9.6-2.6.31.2"; patch = fetchurl { @@ -105,55 +85,6 @@ rec { features.fbConDecor = true; }; - fbcondecor_2_6_38 = - rec { - name = "fbcondecor-0.9.6-2.6.38"; - patch = fetchurl { - url = "http://dev.gentoo.org/~spock/projects/fbcondecor/archive/${name}.patch"; - sha256 = "1l8xqf5z227m5ay6azqba1qw10y26a4cwfhzzapzmmwq1bpr8mlw"; - }; - extraConfig = fbcondecorConfig; - features.fbConDecor = true; - }; - - gcov_2_6_28 = - { name = "gcov"; - patch = fetchurl { - url = http://buildfarm.st.ewi.tudelft.nl/~eelco/dist/linux-2.6.28-gcov.patch; - sha256 = "0ck9misa3pgh3vzyb7714ibf7ix7piyg5dvfa9r42v15scjqiyny"; - }; - extraConfig = - '' - GCOV_PROFILE y - GCOV_ALL y - GCOV_PROC m - GCOV_HAMMER n - ''; - }; - - tracehook_2_6_32 = - { # From . - name = "tracehook"; - patch = fetchurl { - url = http://userweb.kernel.org/~frob/utrace/2.6.32/tracehook.patch; - sha256 = "1y009p8dyqknbjm8ryb495jqmvl372gfhswdn167xh2g1f24xqv8"; - }; - }; - - utrace_2_6_32 = - { # From , depends on the - # `tracehook' patch above. - # See also . - name = "utrace"; - patch = fetchurl { - url = http://userweb.kernel.org/~frob/utrace/2.6.32/utrace.patch; - sha256 = "0argf19k9f0asiv4l4cnsxm5hw2xx8d794npaln88vwz87sj5nnq"; - }; - extraConfig = - '' UTRACE y - ''; - }; - aufs2_2_6_32 = { # From http://git.c3sl.ufpr.br/gitweb?p=aufs/aufs2-standalone.git;a=tree;h=refs/heads/aufs2-32;hb=aufs2-32 # Note that this merely the patch needed to build AUFS2 as a @@ -164,16 +95,6 @@ rec { features.aufs2 = true; }; - aufs2_2_6_34 = - { # From http://git.c3sl.ufpr.br/gitweb?p=aufs/aufs2-standalone.git;a=tree;h=refs/heads/aufs2-34;hb=aufs2-34 - # Note that this merely the patch needed to build AUFS2 as a - # standalone package. - name = "aufs2"; - patch = ./aufs2-34.patch; - features.aufsBase = true; - features.aufs2 = true; - }; - aufs2_2_6_35 = { # From http://git.c3sl.ufpr.br/gitweb?p=aufs/aufs2-standalone.git;a=tree;h=refs/heads/aufs2-35;hb=aufs2-35 # Note that this merely the patch needed to build AUFS2 as a @@ -184,46 +105,6 @@ rec { features.aufs2 = true; }; - aufs2_2_6_36 = - { # From http://git.c3sl.ufpr.br/gitweb?p=aufs/aufs2-standalone.git;a=tree;h=refs/heads/aufs2.1-36;hb=aufs2.1-36 - # Note that this merely the patch needed to build AUFS2 as a - # standalone package. - name = "aufs2"; - patch = ./aufs2.1-36.patch; - features.aufsBase = true; - features.aufs2_1 = true; - }; - - aufs2_1_2_6_38 = - { # From http://aufs.git.sourceforge.net/git/gitweb.cgi?p=aufs/aufs2-standalone.git;a=tree;h=refs/heads/aufs2.1-38;hb=refs/heads/aufs2.1-38 - # Note that this merely the patch needed to build AUFS2.1 as a - # standalone package. - name = "aufs2.1"; - patch = ./aufs2.1-38.patch; - features.aufsBase = true; - features.aufs2_1 = true; - }; - - aufs2_1_2_6_39 = - { # From http://aufs.git.sourceforge.net/git/gitweb.cgi?p=aufs/aufs2-standalone.git;a=tree;h=refs/heads/aufs2.1-39;hb=refs/heads/aufs2.1-39 - # Note that this merely the patch needed to build AUFS2.1 as a - # standalone package. - name = "aufs2.1"; - patch = ./aufs2.1-39.patch; - features.aufsBase = true; - features.aufs2_1 = true; - }; - - aufs2_1_3_0 = - { # From http://aufs.git.sourceforge.net/git/gitweb.cgi?p=aufs/aufs2-standalone.git;a=tree;h=ac52a37b0debba539bdfabba101f82b99136b380;hb=ac52a37b0debba539bdfabba101f82b99136b380 - # Note that this merely the patch needed to build AUFS2.1 as a - # standalone package. - name = "aufs2.1"; - patch = ./aufs2.1-3.0.patch; - features.aufsBase = true; - features.aufs2_1 = true; - }; - aufs3_0 = rec { name = "aufs3.0"; version = "3.0"; @@ -302,12 +183,6 @@ rec { features.cifsTimeout = true; }; - cifs_timeout_2_6_25 = - { name = "cifs-timeout"; - patch = ./cifs-timeout-2.6.25.patch; - features.cifsTimeout = true; - }; - cifs_timeout_2_6_29 = { name = "cifs-timeout"; patch = ./cifs-timeout-2.6.29.patch; @@ -326,8 +201,6 @@ rec { features.cifsTimeout = true; }; - cifs_timeout = cifs_timeout_2_6_29; - no_xsave = { name = "no-xsave"; patch = fetchurl { @@ -348,11 +221,6 @@ rec { patch = ./sheevaplug_modules-2.6.35.patch; }; - mips_restart_2_6_36 = - { name = "mips_restart_2_6_36"; - patch = ./mips_restart.patch; - }; - mips_fpureg_emu = { name = "mips-fpureg-emulation"; patch = ./mips-fpureg-emulation.patch; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90a9945e8e0..9fde8edf4fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1468,9 +1468,11 @@ let tcpdump = callPackage ../tools/networking/tcpdump { }; + /* tcng = callPackage ../tools/networking/tcng { kernel = linux_2_6_27; }; + */ telnet = callPackage ../tools/networking/telnet { }; @@ -5518,16 +5520,6 @@ let ]; }; - linux_2_6_27 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.27.nix) { - inherit fetchurl perl mktemp module_init_tools; - stdenv = overrideGCC (overrideInStdenv stdenv [ gnumake381 ]) gcc45; - kernelPatches = - [ kernelPatches.fbcondecor_2_6_27 - kernelPatches.sec_perm_2_6_24 - kernelPatches.cifs_timeout_2_6_25 - ]; - }; - linux_2_6_32 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.32.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = @@ -5546,32 +5538,12 @@ let [ kernelPatches.fbcondecor_2_6_31 kernelPatches.sec_perm_2_6_24 kernelPatches.aufs2_2_6_32 - kernelPatches.cifs_timeout + kernelPatches.cifs_timeout_2_6_29 kernelPatches.no_xsave kernelPatches.dell_rfkill ]; }; - linux_2_6_32_systemtap = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.32.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; - extraConfig = - '' - DEBUG_KERNEL y - KPROBES y # kernel probes (needs `utrace' for process probes) - DEBUG_INFO y - RELAY y - DEBUG_FS y - ''; - dontStrip = true; - kernelPatches = - [ kernelPatches.fbcondecor_2_6_31 - kernelPatches.sec_perm_2_6_24 - kernelPatches.aufs2_2_6_32 - kernelPatches.tracehook_2_6_32 - kernelPatches.utrace_2_6_32 - ]; - }; - linux_2_6_35 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.35.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = @@ -5583,34 +5555,6 @@ let kernelPatches.sheevaplug_modules_2_6_35; }; - linux_nanonote_jz_2_6_34 = makeOverridable - (import ../os-specific/linux/kernel/linux-nanonote-jz-2.6.34.nix) { - inherit fetchurl fetchsvn stdenv perl mktemp module_init_tools ubootChooser; - kernelPatches = - [ kernelPatches.aufs2_2_6_34 - ]; - }; - - linux_nanonote_jz_2_6_35 = makeOverridable - (import ../os-specific/linux/kernel/linux-nanonote-jz-2.6.35.nix) { - inherit fetchurl fetchsvn stdenv perl mktemp module_init_tools ubootChooser; - kernelPatches = - [ kernelPatches.aufs2_2_6_35 - ]; - }; - - linux_nanonote_jz_2_6_36 = makeOverridable - (import ../os-specific/linux/kernel/linux-nanonote-jz-2.6.36.nix) { - inherit fetchurl fetchsvn stdenv perl mktemp module_init_tools ubootChooser; - kernelPatches = - [ #kernelPatches.fbcondecor_2_6_35 - kernelPatches.sec_perm_2_6_24 - kernelPatches.aufs2_2_6_36 - kernelPatches.mips_restart_2_6_36 - kernelPatches.cifs_timeout_2_6_35 - ]; - }; - linux_2_6_35_oldI686 = linux_2_6_35.override { extraConfig = '' HIGHMEM64G? n @@ -5622,27 +5566,6 @@ let }; }; - linux_2_6_38 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.38.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; - kernelPatches = - [ kernelPatches.fbcondecor_2_6_38 - kernelPatches.sec_perm_2_6_24 - kernelPatches.aufs2_1_2_6_38 - kernelPatches.cifs_timeout_2_6_38 - ]; - }; - - linux_2_6_38_ati = linux_2_6_38.override { extraConfig="DRM_RADEON_KMS y"; }; - - linux_2_6_39 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.39.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; - kernelPatches = - [ #kernelPatches.fbcondecor_2_6_38 - kernelPatches.sec_perm_2_6_24 - kernelPatches.aufs2_1_2_6_39 - ]; - }; - linux_3_0 = makeOverridable (import ../os-specific/linux/kernel/linux-3.0.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = @@ -5804,19 +5727,11 @@ let }; # Build the kernel modules for the some of the kernels. - linuxPackages_2_6_27 = recurseIntoAttrs (linuxPackagesFor linux_2_6_27 pkgs.linuxPackages_2_6_27); linuxPackages_2_6_32 = recurseIntoAttrs (linuxPackagesFor linux_2_6_32 pkgs.linuxPackages_2_6_32); - linuxPackages_2_6_32_systemtap = linuxPackagesFor linux_2_6_32_systemtap pkgs.linuxPackages_2_6_32_systemtap; linuxPackages_2_6_32_xen = linuxPackagesFor linux_2_6_32_xen pkgs.linuxPackages_2_6_32_xen; linuxPackages_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_2_6_35 pkgs.linuxPackages_2_6_35); - linuxPackages_2_6_38 = recurseIntoAttrs (linuxPackagesFor linux_2_6_38 pkgs.linuxPackages_2_6_38); - linuxPackages_2_6_38_ati = linuxPackagesFor linux_2_6_38_ati pkgs.linuxPackages_2_6_38; - linuxPackages_2_6_39 = recurseIntoAttrs (linuxPackagesFor linux_2_6_39 pkgs.linuxPackages_2_6_39); linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0 pkgs.linuxPackages_3_0); linuxPackages_3_1 = recurseIntoAttrs (linuxPackagesFor linux_3_1 pkgs.linuxPackages_3_1); - linuxPackages_nanonote_jz_2_6_34 = linuxPackagesFor linux_nanonote_jz_2_6_34 pkgs.linuxPackages_nanonote_jz_2_6_34; - linuxPackages_nanonote_jz_2_6_35 = linuxPackagesFor linux_nanonote_jz_2_6_35 pkgs.linuxPackages_nanonote_jz_2_6_35; - linuxPackages_nanonote_jz_2_6_36 = linuxPackagesFor linux_nanonote_jz_2_6_36 pkgs.linuxPackages_nanonote_jz_2_6_36; linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 pkgs.linuxPackages_3_2); linuxPackages_3_3 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_3 pkgs.linuxPackages_3_3); linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 pkgs.linuxPackages_3_4); From 7de1a6a0746b7d5c480d6700ae74d6e0f2c0c5f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 19 Jun 2012 17:42:08 +0000 Subject: [PATCH 332/403] Updating digikam to 2.6.0. It builds. svn path=/nixpkgs/trunk/; revision=34564 --- .../applications/graphics/digikam/default.nix | 6 +- .../graphics/digikam/ftbfs-libkipi.patch | 68 ------------------- .../digikam/libkvkontakte-not-topdir.patch | 33 --------- 3 files changed, 2 insertions(+), 105 deletions(-) delete mode 100644 pkgs/applications/graphics/digikam/ftbfs-libkipi.patch delete mode 100644 pkgs/applications/graphics/digikam/libkvkontakte-not-topdir.patch diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 1c152195d68..a293311e2a4 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -4,11 +4,11 @@ liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost shared_desktop_ontologies, marble, mysql }: stdenv.mkDerivation rec { - name = "digikam-2.5.0"; + name = "digikam-2.6.0"; src = fetchurl { url = "mirror://sourceforge/digikam/${name}.tar.bz2"; - sha256 = "06l52j8i45vyfj3b81ivifqsqdjlcj4g68d8w06c5lhzniwjqaam"; + sha256 = "1prnaywnbv0xpw6knqagzc4gn1vsj9kw2hvdasjwknc9ljiyl721"; }; buildNativeInputs = [ cmake automoc4 pkgconfig ]; @@ -20,8 +20,6 @@ stdenv.mkDerivation rec { # Make digikam find some FindXXXX.cmake KDEDIRS="${marble}:${qjson}"; - patches = [ ./libkvkontakte-not-topdir.patch ./ftbfs-libkipi.patch ]; - meta = { description = "Photo Management Program"; license = "GPL"; diff --git a/pkgs/applications/graphics/digikam/ftbfs-libkipi.patch b/pkgs/applications/graphics/digikam/ftbfs-libkipi.patch deleted file mode 100644 index cf7e77f7ef8..00000000000 --- a/pkgs/applications/graphics/digikam/ftbfs-libkipi.patch +++ /dev/null @@ -1,68 +0,0 @@ -commit 25cc9c9876a5233bd630105d0110319892d4e18c -Author: Gilles Caulier -Date: Tue Jan 3 15:16:37 2012 +0100 - - enable checkall and clearall buttons only with libkipi version 1.4.0 - BUGS: 290496 - -diff --git a/core/utilities/setup/setupplugins.cpp b/utilities/setup/setupplugins.cpp -index 0f4030a..b8efb35 100644 ---- a/core/utilities/setup/setupplugins.cpp -+++ b/core/utilities/setup/setupplugins.cpp -@@ -6,8 +6,8 @@ - * Date : 2004-01-02 - * Description : setup Kipi plugins tab. - * -- * Copyright (C) 2004-2011 by Gilles Caulier -- * Copyright (C) 2011 by Andi Clemens -+ * Copyright (C) 2004-2012 by Gilles Caulier -+ * Copyright (C) 2011-2012 by Andi Clemens - * - * This program is free software; you can redistribute it - * and/or modify it under the terms of the GNU General -@@ -100,6 +100,11 @@ SetupPlugins::SetupPlugins(QWidget* parent) - - panel->setLayout(mainLayout); - -+#if KIPI_VERSION < 0x010400 -+ d->checkAllBtn->setVisible(false); -+ d->clearBtn->setVisible(false); -+#endif -+ - initPlugins(); - - // -------------------------------------------------------- -@@ -158,14 +163,18 @@ void SetupPlugins::applyPlugins() - void SetupPlugins::slotCheckAll() - { - QApplication::setOverrideCursor(Qt::WaitCursor); -+#if KIPI_VERSION >= 0x010400 - d->kipiConfig->slotCheckAll(); -+#endif - QApplication::restoreOverrideCursor(); - } - - void SetupPlugins::slotClear() - { - QApplication::setOverrideCursor(Qt::WaitCursor); -+#if KIPI_VERSION >= 0x010400 - d->kipiConfig->slotClear(); -+#endif - QApplication::restoreOverrideCursor(); - } - -diff --git a/core/utilities/setup/setupplugins.h b/utilities/setup/setupplugins.h -index 271a569..114e0fa 100644 ---- a/core/utilities/setup/setupplugins.h -+++ b/core/utilities/setup/setupplugins.h -@@ -6,8 +6,8 @@ - * Date : 2004-01-02 - * Description : setup Kipi plugins tab. - * -- * Copyright (C) 2004-2011 by Gilles Caulier -- * Copyright (C) 2011 by Andi Clemens -+ * Copyright (C) 2004-2012 by Gilles Caulier -+ * Copyright (C) 2011-2012 by Andi Clemens - * - * This program is free software; you can redistribute it - * and/or modify it under the terms of the GNU General diff --git a/pkgs/applications/graphics/digikam/libkvkontakte-not-topdir.patch b/pkgs/applications/graphics/digikam/libkvkontakte-not-topdir.patch deleted file mode 100644 index ee92a886c79..00000000000 --- a/pkgs/applications/graphics/digikam/libkvkontakte-not-topdir.patch +++ /dev/null @@ -1,33 +0,0 @@ -commit 0f0cfa14805519cfd9e0b97ee9668dc4f86379de -Author: Yury G. Kudryashov -Date: Wed Jan 18 05:07:13 2012 +0400 - - Use CMAKE_CURRENT_{SOURCE,BINARY}_DIR - - Some projects (e.g., digikam) include snapshots of this library into their - release tarballs, so the libkvkontakte_SOURCE_DIR != CMAKE_SOURCE_DIR. - -diff --git a/extra/libkvkontakte/CMakeLists.txt b/extra/libkvkontakte/CMakeLists.txt -index f19b28b..4310a74 100644 ---- a/extra/libkvkontakte/CMakeLists.txt -+++ b/extra/libkvkontakte/CMakeLists.txt -@@ -21,7 +21,7 @@ set(INCLUDE_INSTALL_DIR include ) - - - # === Closer to the code, close to the body === --set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules") -+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") - find_package(KDE4 REQUIRED) - include(KDE4Defaults) - include(MacroLibrary) -@@ -35,8 +35,8 @@ macro_log_feature(QJSON_FOUND "QJSON" "Qt library for handling JSON data" "http: - add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) - - include_directories( -- ${CMAKE_SOURCE_DIR} -- ${CMAKE_BINARY_DIR} -+ ${CMAKE_CURRENT_SOURCE_DIR} -+ ${CMAKE_CURRENT_BINARY_DIR} - ${KDE4_INCLUDES} - ${QJSON_INCLUDE_DIR} - ) From 6551b822afee2970bdbe8ef8b892328c1a19cf81 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 19 Jun 2012 19:10:54 +0000 Subject: [PATCH 333/403] * Enable devtmpfs since recent udev (systemd) versions need it. svn path=/nixpkgs/trunk/; revision=34565 --- pkgs/os-specific/linux/kernel/linux-2.6.35.nix | 3 +++ pkgs/os-specific/linux/kernel/linux-3.0.nix | 3 +++ pkgs/os-specific/linux/kernel/linux-3.1.nix | 3 +++ pkgs/os-specific/linux/kernel/linux-3.2.nix | 3 +++ pkgs/os-specific/linux/kernel/linux-3.3.nix | 3 +++ pkgs/os-specific/linux/kernel/linux-3.4.nix | 3 +++ 6 files changed, 18 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.35.nix b/pkgs/os-specific/linux/kernel/linux-2.6.35.nix index a6d03db9b86..1b8f9fded70 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.35.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.35.nix @@ -194,6 +194,9 @@ let CONNECTOR y PROC_EVENTS y + # Devtmpfs support. + DEVTMPFS y + ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} ${extraConfig} ''; diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix index d207b2c8b81..e2ed7fc8c5d 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix @@ -219,6 +219,9 @@ let CONNECTOR y PROC_EVENTS y + # Devtmpfs support. + DEVTMPFS y + ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} ${extraConfig} ''; diff --git a/pkgs/os-specific/linux/kernel/linux-3.1.nix b/pkgs/os-specific/linux/kernel/linux-3.1.nix index 9b3af876699..76e2942c6a3 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.1.nix @@ -219,6 +219,9 @@ let CONNECTOR y PROC_EVENTS y + # Devtmpfs support. + DEVTMPFS y + ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} ${extraConfig} ''; diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index faf79891dbb..931c990612d 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -226,6 +226,9 @@ let FTRACE_SYSCALLS y SCHED_TRACER y + # Devtmpfs support. + DEVTMPFS y + ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} ${extraConfig} ''; diff --git a/pkgs/os-specific/linux/kernel/linux-3.3.nix b/pkgs/os-specific/linux/kernel/linux-3.3.nix index ce0deff3839..956e55014e5 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.3.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.3.nix @@ -225,6 +225,9 @@ let FTRACE_SYSCALLS y SCHED_TRACER y + # Devtmpfs support. + DEVTMPFS y + ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} ${extraConfig} ''; diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 8a2e8a4d995..bf951c0a818 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -225,6 +225,9 @@ let FTRACE_SYSCALLS y SCHED_TRACER y + # Devtmpfs support. + DEVTMPFS y + ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} ${extraConfig} ''; From 1c5f4b8b453788b08fc87e7e8ba4cc857ad5afb2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 19 Jun 2012 19:58:49 +0000 Subject: [PATCH 334/403] * Fix the gid for /dev/pts/ ttys. svn path=/nixpkgs/trunk/; revision=34566 --- pkgs/os-specific/linux/systemd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 3a2df8d88d4..bc60400146d 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { "--with-dbussessionservicedir=$(out)/share/dbus-1/services" "--with-firmware-path=/root/test-firmware:/var/run/current-system/firmware" "--with-pci-ids-path=${pciutils}/share/pci.ids" + "--with-tty-gid=3" # tty in NixOS has gid 3 ]; preConfigure = From 9c3087b6cb295ab750e4a7eddbbf516de7814853 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 19 Jun 2012 22:25:39 +0000 Subject: [PATCH 335/403] * Set $VARTEXFONTS to make LaTeX documents build in a chroot. svn path=/nixpkgs/trunk/; revision=34567 --- pkgs/tools/typesetting/tex/nix/run-latex.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/typesetting/tex/nix/run-latex.sh b/pkgs/tools/typesetting/tex/nix/run-latex.sh index 2886057c894..fa27520d11c 100644 --- a/pkgs/tools/typesetting/tex/nix/run-latex.sh +++ b/pkgs/tools/typesetting/tex/nix/run-latex.sh @@ -2,6 +2,7 @@ source $stdenv/setup mkdir -p $out +export VARTEXFONTS=$TMPDIR/texfonts export TEXMFCNF=$TMPDIR: echo 'max_print_line = 8192' >> $TMPDIR/texmf.cnf From cf2a383bc721887f361bdd12369ed28161857131 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 20 Jun 2012 09:11:58 +0000 Subject: [PATCH 336/403] Hot-fixing kile's nl handbook compilation problem on KDE-4.7 by removing it. svn path=/nixpkgs/trunk/; revision=34568 --- pkgs/applications/editors/kile/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/editors/kile/default.nix b/pkgs/applications/editors/kile/default.nix index e837dfdecc1..a24c6b18d8c 100644 --- a/pkgs/applications/editors/kile/default.nix +++ b/pkgs/applications/editors/kile/default.nix @@ -11,6 +11,9 @@ stdenv.mkDerivation rec { buildNativeInputs = [ cmake gettext ]; buildInputs = [ kdelibs ]; + # for KDE 4.7 the nl translations fail since kile-2.1.2 + preConfigure = "rm -r translations/nl"; + meta = { description = "An integrated LaTeX editor for KDE"; homepage = http://kile.sourceforge.net; From 4490fe934e73ce5bf40b07e497a1224d2ce1c8d8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 20 Jun 2012 10:56:24 +0000 Subject: [PATCH 337/403] Updated Haskell packages. - base64-bytestring: updated to version 0.1.2.0 - binary-shared: updated to version 0.8.2 - bson: updated to version 0.2.1 - leksah-server: updated to version 0.12.1.2 - leksah: updated to version 0.12.1.2 - MonadRandom: updated to version 0.1.7 - random-shuffle: updated to version 0.0.4 svn path=/nixpkgs/trunk/; revision=34569 --- pkgs/applications/editors/leksah/default.nix | 4 ++-- pkgs/development/libraries/haskell/MonadRandom/default.nix | 4 ++-- .../libraries/haskell/base64-bytestring/default.nix | 4 ++-- pkgs/development/libraries/haskell/binary-shared/default.nix | 4 ++-- pkgs/development/libraries/haskell/bson/default.nix | 4 ++-- pkgs/development/libraries/haskell/leksah/leksah-server.nix | 4 ++-- pkgs/development/libraries/haskell/random-shuffle/default.nix | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/editors/leksah/default.nix b/pkgs/applications/editors/leksah/default.nix index fe9315809a5..900d5744a77 100644 --- a/pkgs/applications/editors/leksah/default.nix +++ b/pkgs/applications/editors/leksah/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "leksah"; - version = "0.12.1.0"; - sha256 = "1993h74wfrndqgjx7xcfdhh5f2gqhg6kcbvzl1ckdbk8hynkia94"; + version = "0.12.1.2"; + sha256 = "01gang44cdm9xg1dx1273prkhcniidagm2r90qh4v5mrdq8139v0"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/MonadRandom/default.nix b/pkgs/development/libraries/haskell/MonadRandom/default.nix index 1ee1734a9e4..da343a527ce 100644 --- a/pkgs/development/libraries/haskell/MonadRandom/default.nix +++ b/pkgs/development/libraries/haskell/MonadRandom/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "MonadRandom"; - version = "0.1.6"; - sha256 = "1429w2h66sf0cw992xj4w9clapcqgpdzmh80as7zxf8l87rarqqp"; + version = "0.1.7"; + sha256 = "0y4fsb3j0babq388rw3y1kbxbjz6plfgbg4g1y27hdf7jf5c8x33"; buildDepends = [ mtl random ]; meta = { description = "Random-number generation monad"; diff --git a/pkgs/development/libraries/haskell/base64-bytestring/default.nix b/pkgs/development/libraries/haskell/base64-bytestring/default.nix index 3ad6b417431..5fd552d6272 100644 --- a/pkgs/development/libraries/haskell/base64-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/base64-bytestring/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "base64-bytestring"; - version = "0.1.1.3"; - sha256 = "0gyms4nf5j9ick1l5ys9h7h0nxpsi5vgs4dbynrqyhm9yd09cscg"; + version = "0.1.2.0"; + sha256 = "039naasb3z8q42zl067paylxb9i1m1pkp4w6b5yqsc38sbmikv1z"; meta = { homepage = "https://github.com/bos/base64-bytestring"; description = "Fast base64 encoding and deconding for ByteStrings"; diff --git a/pkgs/development/libraries/haskell/binary-shared/default.nix b/pkgs/development/libraries/haskell/binary-shared/default.nix index 63ba8acddf6..6d70e384c38 100644 --- a/pkgs/development/libraries/haskell/binary-shared/default.nix +++ b/pkgs/development/libraries/haskell/binary-shared/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "binary-shared"; - version = "0.8.1"; - sha256 = "0niq6hgsawsdg3kkjgkwyrgy8w7pfkqfph5d1x5bzcjrcl982jrg"; + version = "0.8.2"; + sha256 = "05cqdpclb4xc6ydwdpxfi3bvaaw7syxlmb5r9kxjcp3f6fji5rm2"; buildDepends = [ binary mtl ]; meta = { homepage = "http://www.leksah.org"; diff --git a/pkgs/development/libraries/haskell/bson/default.nix b/pkgs/development/libraries/haskell/bson/default.nix index 95700df7eef..20107eb1784 100644 --- a/pkgs/development/libraries/haskell/bson/default.nix +++ b/pkgs/development/libraries/haskell/bson/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "bson"; - version = "0.2.0"; - sha256 = "1m4bzbl3i9p8v78zjb4ilrpdxbxpqz5bgcpklvvkb2ipfkgqhmhx"; + version = "0.2.1"; + sha256 = "1g5xvkpn5j2yn9figxiv5dindwv6gg90np56k235hy9cwmdicmwq"; buildDepends = [ binary cryptohash dataBinaryIeee754 mtl network text time ]; diff --git a/pkgs/development/libraries/haskell/leksah/leksah-server.nix b/pkgs/development/libraries/haskell/leksah/leksah-server.nix index c86e4bddedf..cfcc69641b5 100644 --- a/pkgs/development/libraries/haskell/leksah/leksah-server.nix +++ b/pkgs/development/libraries/haskell/leksah/leksah-server.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "leksah-server"; - version = "0.12.1.1"; - sha256 = "063pijwj5mpczmjwwcj49dc2zgyc0l2j9j5902f1hgnvj4xg4hq6"; + version = "0.12.1.2"; + sha256 = "0fzfyq1g1jrfl40nklgvkahlcv32m4gjbcyw52dky2qzc05b0g6m"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/random-shuffle/default.nix b/pkgs/development/libraries/haskell/random-shuffle/default.nix index b4fc02da2f0..1104091ae57 100644 --- a/pkgs/development/libraries/haskell/random-shuffle/default.nix +++ b/pkgs/development/libraries/haskell/random-shuffle/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "random-shuffle"; - version = "0.0.3"; - sha256 = "120yh2k1n57vc9mi4dlnvv9dr79qaz4dsbvl3qp3y82mdz8maifw"; + version = "0.0.4"; + sha256 = "0586bnlh0g2isc44jbjvafkcl4yw6lp1db8x6vr0pza0y08l8w2j"; buildDepends = [ MonadRandom random ]; meta = { description = "Random shuffle implementation"; From 023e8f2fb97727d5dfa8a92c9f7b6134a5e81386 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 20 Jun 2012 12:42:56 +0000 Subject: [PATCH 338/403] * Linux 3.2.21. svn path=/nixpkgs/trunk/; revision=34570 --- pkgs/os-specific/linux/kernel/linux-3.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index 931c990612d..aa5ef29a609 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -237,7 +237,7 @@ in import ./generic.nix ( rec { - version = "3.2.20"; + version = "3.2.21"; testing = false; modDirVersion = version; @@ -248,7 +248,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "11j36vg96ic0qvx78ilpgy6yc8pax5wdwkc3k93pr5ca9dnax891"; + sha256 = "0m3jn3nr1ghlhxch06hv9naidfy1kiwyabyzdl6k5lwkbqi7l1gi"; }; config = configWithPlatform stdenv.platform; From 08818770214b85e7ac278f3571db8975878c7396 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 20 Jun 2012 23:13:22 -0400 Subject: [PATCH 339/403] sqlite: Updated to 3.7.13 First Nixpkgs Git commit! Yay! --- pkgs/development/libraries/sqlite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index e6f1249ffa2..de154964fe5 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -3,11 +3,11 @@ assert readline != null -> ncurses != null; stdenv.mkDerivation { - name = "sqlite-3.7.11"; + name = "sqlite-3.7.13"; src = fetchurl { - url = http://www.sqlite.org/sqlite-autoconf-3071100.tar.gz; - sha256 = "0ss7nd61jmfkz6piw9838c2msa14axjjlkf4d36rn91nqmfwgb9b"; + url = http://www.sqlite.org/sqlite-autoconf-3071300.tar.gz; + sha1 = "d3833b6ad68db8505d1044f761dd962f415cd302"; }; buildInputs = [ readline ncurses ]; From c1c74e45c5e09a4bcc97d6d4b542e1077eb2d647 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 4 Jun 2012 21:57:56 +0200 Subject: [PATCH 340/403] Add fonts from the DOSEmu project. These are mainly fonts like the DOS standard VGA fonts. --- pkgs/data/fonts/dosemu-fonts/default.nix | 34 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/data/fonts/dosemu-fonts/default.nix diff --git a/pkgs/data/fonts/dosemu-fonts/default.nix b/pkgs/data/fonts/dosemu-fonts/default.nix new file mode 100644 index 00000000000..6f325b4ea4f --- /dev/null +++ b/pkgs/data/fonts/dosemu-fonts/default.nix @@ -0,0 +1,34 @@ +{stdenv, fetchurl, bdftopcf, mkfontdir, mkfontscale}: + +stdenv.mkDerivation { + name = "dosemu-fonts"; + + src = fetchurl { + url = mirror://sourceforge/dosemu/dosemu-1.4.0.tgz; + sha256 = "0l1zwmw42mpakjrzmbygshcg2qzq9mv8lx42738rz3j9hrqzg4pw"; + }; + + configurePhase = "true"; + buildPhase = "true"; + + buildInputs = [bdftopcf mkfontdir mkfontscale]; + + installPhase = '' + fontPath="$out/share/fonts/X11/misc/dosemu" + mkdir -p "$fontPath" + for i in etc/*.bdf; do + fontOut="$out/share/fonts/X11/misc/dosemu/$(basename "$i" .bdf).pcf.gz" + echo -n "Installing font $fontOut..." >&2 + bdftopcf $i | gzip -c -9 > "$fontOut" + echo " done." >&2 + done + cp etc/dosemu.alias "$fontPath/fonts.alias" + cd "$fontPath" + mkfontdir + mkfontscale + ''; + + meta = { + description = "Various fonts from the DOSEmu project"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9fde8edf4fa..5526d33f1a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6131,6 +6131,8 @@ let docbook_xsl_ns = callPackage ../data/sgml+xml/stylesheets/xslt/docbook-xsl-ns { }; + dosemu_fonts = callPackage ../data/fonts/dosemu-fonts { }; + freefont_ttf = callPackage ../data/fonts/freefont-ttf { }; gentium = callPackage ../data/fonts/gentium {}; From ba766ebcf41236d5d46d849d10fa7579fc7403b0 Mon Sep 17 00:00:00 2001 From: Kirill Elagin Date: Thu, 7 Jun 2012 17:52:38 +0400 Subject: [PATCH 341/403] Do not use old way of setting `url` and `rev` This was breaking `nix-prefetch-git --url smth --ref smth` (when expected hash is not specified) --- pkgs/build-support/fetchgit/nix-prefetch-git | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 979aa531092..e5ee43a138c 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -1,8 +1,8 @@ #! /bin/sh -e -url=$1 -rev=$2 -expHash=$3 +url= +rev= +expHash= hashType=$NIX_HASH_ALGO deepClone=$NIX_PREFETCH_GIT_DEEP_CLONE leaveDotGit=$NIX_PREFETCH_GIT_LEAVE_DOT_GIT From 1be62b87fe15821d0513ded1bf9e7fae37819874 Mon Sep 17 00:00:00 2001 From: Kirill Elagin Date: Thu, 7 Jun 2012 18:01:07 +0400 Subject: [PATCH 342/403] Handle invalid references --- pkgs/build-support/fetchgit/nix-prefetch-git | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index e5ee43a138c..00cd7d3129b 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -189,21 +189,19 @@ clone(){ clone_user_rev() { local dir="$1" local url="$2" - local rev="$3" + local rev="${3:-HEAD}" # Perform the checkout. case "$rev" in HEAD|refs/*) clone "$dir" "$url" "" "$rev" 1>&2;; - [0-9a-f]*) + *) if test -z "$(echo $rev | tr -d 0123456789abcdef)"; then clone "$dir" "$url" "$rev" "" 1>&2; else echo 1>&2 "Bad commit hash or bad reference."; exit 1; fi;; - "") - clone "$dir" "$url" "" "HEAD" 1>&2;; esac # Allow doing additional processing before .git removal From e2ec2e27e2629468ccb9e01aed515bada4f36eeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 21 Jun 2012 09:40:51 +0200 Subject: [PATCH 343/403] Updating gdb to 7.4.1 --- pkgs/development/tools/misc/gdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index a1be30b4b14..8cde30737d2 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -14,7 +14,7 @@ let basename = if bleedingEdgeVersion then "gdb-7.3.20110726" - else "gdb-7.4"; + else "gdb-7.4.1"; # Whether (cross-)building for GNU/Hurd. This is an approximation since # having `stdenv ? cross' doesn't tell us if we're building `hostDrv' and @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { url = "mirror://gnu/gdb/${basename}.tar.bz2"; # md5 is provided by the annoucement page # http://www.gnu.org/s/gdb/download/ANNOUNCEMENT - md5 = "95a9a8305fed4d30a30a6dc28ff9d060"; + md5 = "8854d34691087ec127d934692639855f"; }; # I think python is not a native input, but I leave it From b0359cdf11c8ab66b50bb4ba943472c971b1288b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 21 Jun 2012 09:28:17 -0400 Subject: [PATCH 344/403] gdb: Drop outdated "bleeding edge" version Also note that Nixpkgs shoould ship "bleeding edge" versions unless there is some compelling reason. --- pkgs/development/tools/misc/gdb/default.nix | 37 +++++++-------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 8cde30737d2..3b394b235c1 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -1,20 +1,14 @@ { fetchurl, fetchgit, stdenv, ncurses, readline, gmp, mpfr, expat, texinfo , dejagnu, python, target ? null -# Set it to true to fetch the latest release/branchpoint from git. -, bleedingEdgeVersion ? false - # Additional dependencies for GNU/Hurd. , mig ? null, hurd ? null -# needed for the git version -, flex, bison }: +}: let - basename = - if bleedingEdgeVersion - then "gdb-7.3.20110726" - else "gdb-7.4.1"; + + basename = "gdb-7.4.1"; # Whether (cross-)building for GNU/Hurd. This is an approximation since # having `stdenv ? cross' doesn't tell us if we're building `hostDrv' and @@ -22,6 +16,7 @@ let isGNU = stdenv.system == "i686-gnu" || (stdenv ? cross && stdenv.cross.config == "i586-pc-gnu"); + in assert isGNU -> mig != null && hurd != null; @@ -30,36 +25,28 @@ stdenv.mkDerivation rec { name = basename + stdenv.lib.optionalString (target != null) ("-" + target.config); - src = - if bleedingEdgeVersion - then fetchgit { - url = "git://sourceware.org/git/gdb.git"; - rev = "refs/tags/gdb_7_3-2011-07-26-release"; - } - else fetchurl { - url = "mirror://gnu/gdb/${basename}.tar.bz2"; - # md5 is provided by the annoucement page - # http://www.gnu.org/s/gdb/download/ANNOUNCEMENT - md5 = "8854d34691087ec127d934692639855f"; - }; + src = fetchurl { + url = "mirror://gnu/gdb/${basename}.tar.bz2"; + md5 = "8854d34691087ec127d934692639855f"; + }; # I think python is not a native input, but I leave it # here while I will not need it cross building buildNativeInputs = [ texinfo python ] - ++ stdenv.lib.optional isGNU mig - ++ stdenv.lib.optionals bleedingEdgeVersion [ flex bison ]; + ++ stdenv.lib.optional isGNU mig; buildInputs = [ ncurses readline gmp mpfr expat ] ++ stdenv.lib.optional isGNU hurd ++ stdenv.lib.optional doCheck dejagnu; + enableParallelBuilding = true; + configureFlags = with stdenv.lib; '' --with-gmp=${gmp} --with-mpfr=${mpfr} --with-system-readline --with-expat --with-libexpat-prefix=${expat} '' + optionalString (target != null) " --target=${target.config}" - + optionalString (elem stdenv.system platforms.cygwin) " --without-python" - ; + + optionalString (elem stdenv.system platforms.cygwin) " --without-python"; crossAttrs = { # Do not add --with-python here to avoid cross building it. From 7925441bab14bd99d893a0423d4aef9a09d06cc7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 21 Jun 2012 15:22:17 -0400 Subject: [PATCH 345/403] net-snmp: Moved to pkgs/servers/monitoring --- .../networking => servers/monitoring}/net-snmp/default.nix | 0 pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/{tools/networking => servers/monitoring}/net-snmp/default.nix (100%) diff --git a/pkgs/tools/networking/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix similarity index 100% rename from pkgs/tools/networking/net-snmp/default.nix rename to pkgs/servers/monitoring/net-snmp/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5526d33f1a3..71a961480ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1094,8 +1094,6 @@ let ndisc6 = callPackage ../tools/networking/ndisc6 { }; - net_snmp = callPackage ../tools/networking/net-snmp { }; - netboot = callPackage ../tools/networking/netboot {}; netcat = callPackage ../tools/networking/netcat { }; @@ -5202,6 +5200,8 @@ let nagiosPluginsOfficial = callPackage ../servers/monitoring/nagios/plugins/official { }; + net_snmp = callPackage ../servers/monitoring/net-snmp { }; + oidentd = callPackage ../servers/identd/oidentd { }; openfire = callPackage ../servers/xmpp/openfire { }; From 9365981409f3a16d8cc63a20f0907558c8d90746 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 21 Jun 2012 15:23:29 -0400 Subject: [PATCH 346/403] git: Updated to 1.7.11 --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index a898cc5f6da..46c23c87b60 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -9,7 +9,7 @@ let - version = "1.7.10.4"; + version = "1.7.11"; svn = subversionClient.override { perlBindings = true; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://git-core.googlecode.com/files/git-${version}.tar.gz"; - sha256 = "1pd8vd9bgvai3n7xw7b11i7gznjma2pb97d29k304wk89mj57kkp"; + sha256 = "0qgi1cj19dnn0sl3n38dbz68nllvyppdvs2jb77ksiar4jb9lsc3"; }; patches = [ ./docbook2texi.patch ]; From 94812c9dd3dd09a027b6ae05c4875ad03e63b29f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 21 Jun 2012 15:23:40 -0400 Subject: [PATCH 347/403] git: Fix the "notSupported" scripts for "git send-email" and "git gui" --- .../version-management/git-and-tools/default.nix | 2 +- .../version-management/git-and-tools/git/default.nix | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 7cda4cffd71..49d2df8fe2f 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -39,7 +39,7 @@ rec { gitFull = appendToName "full" (git.override { svnSupport = true; guiSupport = true; - sendEmailSupport = stdenv.isDarwin == false; + sendEmailSupport = !stdenv.isDarwin; }); gitAnnex = lib.makeOverridable (import ./git-annex) { diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 46c23c87b60..4ed5f78d6e0 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { postInstall = '' - notSupported(){ + notSupported() { echo -e "#\!/bin/sh\necho '`basename $1` not supported, $2'\nexit 1" > "$1" chmod +x $1 } @@ -72,11 +72,11 @@ stdenv.mkDerivation { for i in ${builtins.toString perlLibs} ${svn}; do gitperllib=$gitperllib:$i/lib/perl5/site_perl done - wrapProgram "$out/libexec/git-core/git-svn" \ - --set GITPERLLIB "$gitperllib" \ + wrapProgram $out/libexec/git-core/git-svn \ + --set GITPERLLIB "$gitperllib" \ --prefix PATH : "${svn}/bin" '' else '' # replace git-svn by notification script - notSupported $out/bin/git-svn "reinstall with config git = { svnSupport = true } set" + notSupported $out/libexec/git-core/git-svn "reinstall with config git = { svnSupport = true } set" '') + (if sendEmailSupport then @@ -85,10 +85,10 @@ stdenv.mkDerivation { for i in ${builtins.toString smtpPerlLibs}; do gitperllib=$gitperllib:$i/lib/perl5/site_perl done - wrapProgram "$out/libexec/git-core/git-send-email" \ + wrapProgram $out/libexec/git-core/git-send-email \ --set GITPERLLIB "$gitperllib" '' else '' # replace git-send-email by notification script - notSupported $out/bin/git-send-email "reinstall with config git = { sendEmailSupport = true } set" + notSupported $out/libexec/git-core/git-send-email "reinstall with config git = { sendEmailSupport = true } set" '') + ''# Install man pages and Info manual From b293ced9a85de9d48a1e2b600e218e26ad94c018 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle?= Date: Thu, 21 Jun 2012 22:10:06 +0200 Subject: [PATCH 348/403] Making 'npm' work from commandline (fix interpreter). --- pkgs/development/web/nodejs/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index cff2a5e2b11..043ab36c93f 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -23,7 +23,9 @@ stdenv.mkDerivation rec { sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i tools/{*.py,waf-light,node-waf} ''; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = '' + sed -e 's|^#!/usr/bin/env node$|#!'$out'/bin/node|' -i $out/lib/node_modules/npm/bin/npm-cli.js + '' + stdenv.lib.optionalString stdenv.isDarwin '' install_name_tool -change libv8.dylib ${v8}/lib/libv8.dylib $out/bin/node ''; From d12ff528ea8bd3432bc3e551b09f47f529eb39a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle?= Date: Thu, 21 Jun 2012 22:40:33 +0200 Subject: [PATCH 349/403] Updating nodejs to 0.6.19. --- pkgs/development/web/nodejs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 043ab36c93f..98e4736b4f1 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, openssl, python, zlib, v8 }: stdenv.mkDerivation rec { - version = "0.6.18"; + version = "0.6.19"; name = "nodejs-${version}"; src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "6cf4311ecbc1700e88f4382a31b3a7017c1572cd641fd06e653fc1692c2cffff"; + sha256 = "1frgnl7i111b8x3fr43lh3zybwsszn0daa661gszq7dhfwj2jcsf"; }; configureFlags = [ From a4045a92d76c7f72da6b0af5f50cac07dbd94dba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle?= Date: Thu, 21 Jun 2012 22:10:06 +0200 Subject: [PATCH 350/403] Making 'npm' work from commandline (fix interpreter). --- pkgs/development/web/nodejs/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index cff2a5e2b11..043ab36c93f 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -23,7 +23,9 @@ stdenv.mkDerivation rec { sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i tools/{*.py,waf-light,node-waf} ''; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = '' + sed -e 's|^#!/usr/bin/env node$|#!'$out'/bin/node|' -i $out/lib/node_modules/npm/bin/npm-cli.js + '' + stdenv.lib.optionalString stdenv.isDarwin '' install_name_tool -change libv8.dylib ${v8}/lib/libv8.dylib $out/bin/node ''; From 0067a945d47509a31c425abd6b2a98f16e9ebf2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle?= Date: Thu, 21 Jun 2012 22:40:33 +0200 Subject: [PATCH 351/403] Updating nodejs to 0.6.19. --- pkgs/development/web/nodejs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 043ab36c93f..98e4736b4f1 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, openssl, python, zlib, v8 }: stdenv.mkDerivation rec { - version = "0.6.18"; + version = "0.6.19"; name = "nodejs-${version}"; src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "6cf4311ecbc1700e88f4382a31b3a7017c1572cd641fd06e653fc1692c2cffff"; + sha256 = "1frgnl7i111b8x3fr43lh3zybwsszn0daa661gszq7dhfwj2jcsf"; }; configureFlags = [ From d5bb10417e0b63710e32a71e352fe0b57512673d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 22 Jun 2012 10:34:08 -0400 Subject: [PATCH 352/403] nixUnstable: Updated to 1.1pre2714_2f3f413 This version brings systemd support and automatic log compression. --- pkgs/tools/package-management/nix/unstable.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 912248b694c..4442deb36bc 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.0pre2668_46cdc6a"; + name = "nix-1.1pre2714_2f3f413"; src = fetchurl { - url = "http://hydra.nixos.org/build/2492261/download/4/${name}.tar.bz2"; - sha256 = "d9a1cfbee1670bc700593d81211c47eb8d7623aa9699d18a414ecaddccabfa1a"; + url = "http://hydra.nixos.org/build/2724747/download/4/${name}.tar.bz2"; + sha256 = "ec026709405dfcbff387418c007915711312ac574c046c38798990666bd339a6"; }; buildNativeInputs = [ perl pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71a961480ef..4328c7c7d36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8422,14 +8422,10 @@ let stateDir = getConfig [ "nix" "stateDir" ] "/nix/var"; }; - /* nixUnstable = callPackage ../tools/package-management/nix/unstable.nix { storeDir = getConfig [ "nix" "storeDir" ] "/nix/store"; stateDir = getConfig [ "nix" "stateDir" ] "/nix/var"; }; - */ - - nixUnstable = nixStable; nixCustomFun = src: preConfigure: enableScripts: configureFlags: import ../tools/package-management/nix/custom.nix { From d3cdacab038052eda3bc90828d74dc1d63d3c1a2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 22 Jun 2012 11:35:00 -0400 Subject: [PATCH 353/403] klibc: Fix URL P.S. the only reason we need klibc is because of the "nfsmount" program in the initrd. But I'm pretty sure we can use Busybox's mount command there. --- pkgs/os-specific/linux/klibc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix index e1f347af23c..781bb67edca 100644 --- a/pkgs/os-specific/linux/klibc/default.nix +++ b/pkgs/os-specific/linux/klibc/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { name = "klibc-${version}${stdenv.lib.optionalString (kernel != null) "-${kernel.version}"}"; src = fetchurl { - url = "http://ftp.eu.openbsd.org/pub/linux/libs/klibc/1.5/klibc-${version}.tar.bz2"; + url = "mirror://kernel/linux/libs/klibc/1.5/klibc-${version}.tar.bz2"; sha256 = "18lm32dlj9k2ky9wwk274zmc3jndgrb41b6qm82g3lza6wlw3yki"; }; From e350003667eec965200228fb481a61ce8a0679f5 Mon Sep 17 00:00:00 2001 From: Antono Vasiljev Date: Fri, 22 Jun 2012 21:30:44 +0300 Subject: [PATCH 354/403] Fix url for guile-lint (geocities is dead now) It doesn't fix build though... --- pkgs/development/tools/guile/guile-lint/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/guile/guile-lint/default.nix b/pkgs/development/tools/guile/guile-lint/default.nix index 18625a3ec31..156def09187 100644 --- a/pkgs/development/tools/guile/guile-lint/default.nix +++ b/pkgs/development/tools/guile/guile-lint/default.nix @@ -3,8 +3,7 @@ stdenv.mkDerivation rec { name = "guile-lint-14"; src = fetchurl { - url = "http://www.geocities.com/user42_kevin/guile-lint/" - + name + ".tar.bz2.bin"; + url = "http://download.tuxfamily.org/user42/" + name + ".tar.bz2"; sha256 = "5bfcf7a623338b2ef81ac097e3e136eaf32856dd0730b7eeaff3161067b5d0be"; }; @@ -21,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Guile-Lint checks syntax and semantics in a Guile program or module"; - homepage = http://www.geocities.com/user42_kevin/guile-lint/index.html; + homepage = http://user42.tuxfamily.org/guile-lint/index.html; license = "GPL"; }; } From 6c8509b98dc1e5990689c2899882242d149eb79a Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 4 Jun 2012 20:05:11 +0200 Subject: [PATCH 355/403] Add tkabber dependency bwidget v1.9.5. --- .../development/libraries/bwidget/default.nix | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/libraries/bwidget/default.nix diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix new file mode 100644 index 00000000000..693e0587a0b --- /dev/null +++ b/pkgs/development/libraries/bwidget/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, tcl }: + +stdenv.mkDerivation rec { + name = "bwidget-${version}"; + version = "1.9.5"; + + src = fetchurl { + url = "mirror://sourceforge/tcllib/bwidget-${version}.tar.gz"; + sha256 = "1njssjjvfalsfh37prkxwqi4hf0zj1d54qzggvjwpzkm424jjcii"; + }; + + dontBuild = true; + + installPhase = '' + ensureDir "$out/tcltk" + cp -R *.tcl lang images "$out/tcltk/" + ''; + + buildInputs = [tcl]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4328c7c7d36..e5ca5013e1f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3220,6 +3220,8 @@ let buddy = callPackage ../development/libraries/buddy { }; + bwidget = callPackage ../development/libraries/bwidget { }; + caelum = callPackage ../development/libraries/caelum { }; cairomm = callPackage ../development/libraries/cairomm { }; From 3c7da30e12090edfa84d3ccff3a62059b0c8cb71 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 4 Jun 2012 20:07:58 +0200 Subject: [PATCH 356/403] Add tkabber dependency tcllib v1.14. --- pkgs/development/libraries/tcllib/default.nix | 13 +++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/tcllib/default.nix diff --git a/pkgs/development/libraries/tcllib/default.nix b/pkgs/development/libraries/tcllib/default.nix new file mode 100644 index 00000000000..fcfbbe19d94 --- /dev/null +++ b/pkgs/development/libraries/tcllib/default.nix @@ -0,0 +1,13 @@ +{ stdenv, fetchurl, tcl }: + +stdenv.mkDerivation rec { + name = "tcllib-${version}"; + version = "1.14"; + + src = fetchurl { + url = "mirror://sourceforge/tcllib/tcllib-${version}.tar.gz"; + sha256 = "11052fgfmv9vyswzjjgfvh3pi0k3fnfnl9ri6nl4vc6f6z5ry56x"; + }; + + buildInputs = [tcl]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e5ca5013e1f..e0279d31cfc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4704,6 +4704,8 @@ let tclap = callPackage ../development/libraries/tclap {}; + tcllib = callPackage ../development/libraries/tcllib { }; + tcp_wrappers = callPackage ../development/libraries/tcp-wrappers {}; tdb = callPackage ../development/libraries/tdb { }; From 572cc1232157aa0790d2b540324f481bccb90620 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 4 Jun 2012 20:08:56 +0200 Subject: [PATCH 357/403] Add tkabber dependency tcltls v1.6. --- pkgs/development/libraries/tcltls/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/libraries/tcltls/default.nix diff --git a/pkgs/development/libraries/tcltls/default.nix b/pkgs/development/libraries/tcltls/default.nix new file mode 100644 index 00000000000..dbbfc3d3855 --- /dev/null +++ b/pkgs/development/libraries/tcltls/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, tcl, openssl }: + +stdenv.mkDerivation rec { + name = "tcltls-${version}"; + version = "1.6"; + + configureFlags = "--with-tcl=" + tcl + "/lib " + + "--with-tclinclude=" + tcl + "/include " + + "--with-ssl-dir=" + openssl; + + preConfigure = '' + configureFlags="--exec_prefix=$prefix $configureFlags" + ''; + + src = fetchurl { + url = "mirror://sourceforge/tls/tls${version}-src.tar.gz"; + sha256 = "adec50143a9ad634a671d24f7c7bbf2455487eb5f12d290f41797c32a98b93f3"; + }; + + buildInputs = [tcl openssl]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0279d31cfc..ed04014bf9b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4706,6 +4706,8 @@ let tcllib = callPackage ../development/libraries/tcllib { }; + tcltls = callPackage ../development/libraries/tcltls { }; + tcp_wrappers = callPackage ../development/libraries/tcp-wrappers {}; tdb = callPackage ../development/libraries/tdb { }; From 74b408e151de47be6332b4babccf123af839fd63 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 4 Jun 2012 20:28:40 +0200 Subject: [PATCH 358/403] Add tkabber v0.11.1. --- .../instant-messengers/tkabber/default.nix | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/tkabber/default.nix diff --git a/pkgs/applications/networking/instant-messengers/tkabber/default.nix b/pkgs/applications/networking/instant-messengers/tkabber/default.nix new file mode 100644 index 00000000000..30c91d3d905 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/tkabber/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, tcl, tk, tcllib, tcltls, bwidget, cacert, makeWrapper, x11 }: + +stdenv.mkDerivation rec { + name = "tkabber-0.11.1"; + + src = fetchurl { + url = "http://files.jabber.ru/tkabber/tkabber-0.11.1.tar.gz"; + sha256 = "19xv555cm7a2gczdalf9srxm39hmsh0fbidhwxa74a89nqkbf4lv"; + }; + + defaultTheme = "ocean-deep"; + + patchPhase = '' + substituteInPlace login.tcl --replace \ + "custom::defvar loginconf(sslcacertstore) \"\"" \ + "custom::defvar loginconf(sslcacertstore) \"${cacert}/etc/ca-bundle.crt\"" + + sed -i '/^if.*load_default_xrdb/,/^}$/ { + s@option readfile \(\[fullpath [^]]*\]\)@option readfile "'"$out/share/doc/tkabber/examples/xrdb/${defaultTheme}.xrdb"'"@ + }' tkabber.tcl + ''; + + configurePhase = '' + mkdir -p $out/bin + sed -e "s@/usr/local@$out@" -i Makefile + ''; + + postInstall = '' + wrapProgram $out/bin/tkabber --set TCLLIBPATH "${bwidget}/tcltk\ ${tcllib}/lib/tcllib${tcllib.version}\ ${tcltls}/lib/tls${tcltls.version}" + ''; + + buildInputs = [tcl tk tcllib tcltls bwidget x11 makeWrapper]; + + meta = { + homepage = "http://tkabber.jabber.ru/"; + description = "A GUI client for the XMPP (Jabber) instant messaging protocol"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed04014bf9b..e009d590a21 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1555,6 +1555,8 @@ let time = callPackage ../tools/misc/time { }; + tkabber = callPackage ../applications/networking/instant-messengers/tkabber { }; + tm = callPackage ../tools/system/tm { }; trang = callPackage ../tools/text/xml/trang { }; From b06fb762b4a2dc1e568e6f9298ffb4df5f94805a Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 4 Jun 2012 20:30:45 +0200 Subject: [PATCH 359/403] Add tkabber plugins v0.11.1. --- .../tkabber-plugins/default.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/tkabber-plugins/default.nix diff --git a/pkgs/applications/networking/instant-messengers/tkabber-plugins/default.nix b/pkgs/applications/networking/instant-messengers/tkabber-plugins/default.nix new file mode 100644 index 00000000000..c361f3270e6 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/tkabber-plugins/default.nix @@ -0,0 +1,18 @@ +{stdenv, fetchurl, tkabber}: + +stdenv.mkDerivation rec { + name = "tkabber-plugins-${version}"; + version = "0.11.1"; + + src = fetchurl { + url = "http://files.jabber.ru/tkabber/tkabber-plugins-${version}.tar.gz"; + sha256 = "0jxriqvsckbih5a4lpisxy6wjw022wsz5j5n171gz0q3xw19dbgz"; + }; + + configurePhase = '' + mkdir -p $out/bin + sed -e "s@/usr/local@$out@" -i Makefile + ''; + + buildInputs = [tkabber]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e009d590a21..0dc6197a282 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1557,6 +1557,8 @@ let tkabber = callPackage ../applications/networking/instant-messengers/tkabber { }; + tkabber_plugins = callPackage ../applications/networking/instant-messengers/tkabber-plugins { }; + tm = callPackage ../tools/system/tm { }; trang = callPackage ../tools/text/xml/trang { }; From a31301dab4d1fd63ff0b7153a6530c702706cd64 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 12 Jun 2012 10:19:22 +0200 Subject: [PATCH 360/403] chromium: Minimal build (no install) from source. This only gets chromium to build so far, installation is missing by upstream, so we need to manually copy the corresponding files. And I guess with nix, we also need to patch a few paths on installation. Another issue is that at the moment, a lot of dependencies are used from the source tree, rather than from the system. Also, it would be nice to build using LLVM, as it really speeds up compilation a *LOT* and also has the side effect of resulting in smaller binaries. Working unit tests would be nice, too. Unfortunately they're quite heavyweight and take hours to run, so I guess "someday" would be the most appropriate time to integrate. Further todo's: - Allow to disable GConf, GIO and CUPS. - Option to disable the sandbox (for whatever reason the user might have). - Integrate gold binutils. - Pulseaudio support. - Clearly separate Linux specific stuff. --- .../networking/browsers/chromium/default.nix | 123 +++++++++++------- pkgs/top-level/all-packages.nix | 3 +- 2 files changed, 75 insertions(+), 51 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 2ea5bac0600..3fb29081b5f 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,62 +1,87 @@ -{ GConf, alsaLib, bzip2, cairo, cups, dbus, dbus_glib, expat -, fetchurl, ffmpeg, fontconfig, freetype, libX11, libXfixes -, glib, gtk, gdk_pixbuf, pango -, libXScrnSaver, libXdamage, libXext, libXrender, libXt, libXtst, libXcomposite -, libgcrypt, libjpeg, libpng, makeWrapper, nspr, nss, patchelf -, stdenv, unzip, zlib, pam, pcre, udev }: +{ stdenv, fetchurl, fetchsvn +, python, perl, pkgconfig +, nspr, nss, udev, bzip2 +, utillinux, alsaLib +, gcc, bison, gperf +, krb5 +, glib, gtk, gconf, libgcrypt, libgnome_keyring, dbus_glib +, libXScrnSaver, libXcursor -assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ; +, useSELinux ? false +, naclSupport ? false +, gnomeKeyringSupport ? false +, useProprietaryCodecs ? false +}: -stdenv.mkDerivation rec { - name = "chromium-19.0.1061.0-pre${version}"; +let + mkGypFlags = with stdenv.lib; let + sanitize = value: + if value == true then "1" + else if value == false then "0" + else "${value}"; + toFlag = key: value: "-D${key}=${sanitize value}"; + in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); - # To determine the latest revision, get - # ‘http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux/LAST_CHANGE’. - # For the version number, see ‘about:version’. - version = "124950"; - - src = - if stdenv.system == "x86_64-linux" then - fetchurl { - url = "http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux_x64/${version}/chrome-linux.zip"; - sha256 = "4472bf584a96e477e2c17f96d4452dd41f4f34ac3d6a9bb4c845cf15d8db0c73"; - } - else if stdenv.system == "i686-linux" then - fetchurl { - url = "http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux/${version}/chrome-linux.zip"; - sha256 = "6e8a49d9917ee26b67d14cd10b85711c3b9382864197ba02b3cfe8e636d3d69c"; - } - else throw "Chromium is not supported on this platform."; +in stdenv.mkDerivation rec { + name = "chromium-${version}"; - phases = "unpackPhase installPhase"; + version = "21.0.1171.0"; - buildInputs = [ makeWrapper unzip ]; + src = fetchurl { + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.bz2"; + sha256 = "3fd9b2d8895750a4435a585b9c2dc7d34b583c6470ba67eb6ea6c2579f126377"; + }; - libPath = - stdenv.lib.makeLibraryPath - [ GConf alsaLib bzip2 cairo cups dbus dbus_glib expat - ffmpeg fontconfig freetype libX11 libXScrnSaver libXfixes libXcomposite - libXdamage libXext libXrender libXt libXtst libgcrypt libjpeg - libpng nspr stdenv.gcc.gcc zlib stdenv.gcc.libc - glib gtk gdk_pixbuf pango - pam udev - ]; + buildInputs = [ + python perl pkgconfig + nspr nss udev bzip2 + utillinux alsaLib + gcc bison gperf + krb5 + glib gtk gconf libgcrypt dbus_glib + libXScrnSaver libXcursor + ] ++ stdenv.lib.optional gnomeKeyringSupport libgnome_keyring; - installPhase = '' - mkdir -p $out/bin - mkdir -p $out/libexec/chrome + prePatch = "patchShebangs ."; - cp -R * $out/libexec/chrome + gypFlags = mkGypFlags { + linux_use_gold_binary = false; + linux_use_gold_flags = false; + proprietary_codecs = false; + use_gnome_keyring = gnomeKeyringSupport; + disable_nacl = !naclSupport; + use_cups = false; + }; - strip $out/libexec/chrome/chrome - - ${patchelf}/bin/patchelf \ - --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath}:$out/lib:${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib \ - $out/libexec/chrome/chrome + /* TODO: + use_system_bzip2 = true; + use_system_ffmpeg = true; + use_system_flac = true; + use_system_harfbuzz = true; + use_system_icu = true; + use_system_libevent = true; + use_system_libexpat = true; + use_system_libjpeg = true; + use_system_libpng = true; + use_system_libwebp = true; + use_system_libxml = true; + use_system_skia = true; + use_system_speex = true; + use_system_sqlite = true; + use_system_ssl = true; + use_system_stlport = true; + use_system_v8 = true; + use_system_xdg_utils = true; + use_system_yasm = true; + use_system_zlib = true; + */ - makeWrapper $out/libexec/chrome/chrome $out/bin/chrome \ - --prefix LD_LIBRARY_PATH : "${pcre}/lib:${nss}/lib" + configurePhase = '' + python build/gyp_chromium --depth $(pwd) ${gypFlags} + ''; + + buildPhase = '' + make CC=${gcc}/bin/gcc BUILDTYPE=Release library=shared_library chrome chrome_sandbox ''; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0dc6197a282..71702c0bea3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6341,8 +6341,7 @@ let }; chrome = lowPrio (callPackage ../applications/networking/browsers/chromium { - inherit (gnome) GConf; - libpng = libpng12; + gconf = gnome.GConf; }); chromeWrapper = wrapFirefox From b5956ec17957812025a04882208cbbfe29cbea2a Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 15 Jun 2012 10:19:26 +0200 Subject: [PATCH 361/403] chromium: Add an install phase. This tries to put pathes unte the same directory as the previous prebuilt version of Chromium. --- .../networking/browsers/chromium/default.nix | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 3fb29081b5f..af2e23a5407 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchsvn +{ stdenv, fetchurl, fetchsvn, makeWrapper , python, perl, pkgconfig , nspr, nss, udev, bzip2 , utillinux, alsaLib @@ -33,6 +33,7 @@ in stdenv.mkDerivation rec { }; buildInputs = [ + makeWrapper python perl pkgconfig nspr nss udev bzip2 utillinux alsaLib @@ -84,6 +85,28 @@ in stdenv.mkDerivation rec { make CC=${gcc}/bin/gcc BUILDTYPE=Release library=shared_library chrome chrome_sandbox ''; + installPhase = '' + mkdir -vp "$out/libexec/chrome" + cp -v "out/${buildType}/"*.pak "$out/libexec/chrome/" + cp -vR "out/${buildType}/locales" "out/${buildType}/resources" "$out/libexec/chrome/" + + cp -v "out/${buildType}/chrome" "$out/libexec/chrome/chrome" + + mkdir -vp "$out/bin" + makeWrapper "$out/libexec/chrome/chrome" "$out/bin/chrome" + + mkdir -vp "$out/share/man/man1" + cp -v "out/${buildType}/chrome.1" "$out/share/man/man1/chrome.1" + + for icon_file in chrome/app/theme/chromium/product_logo_*[0-9].png; do + num_and_suffix="''${icon_file##*logo_}" + icon_size="''${num_and_suffix%.*}" + logo_output_path="$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps" + mkdir -vp "$logo_output_path" + cp -v "$icon_file" "$logo_output_path/chrome.png" + done + ''; + meta = with stdenv.lib; { description = "Chromium, an open source web browser"; homepage = http://www.chromium.org/; From d342672f5a962f278f23196800a7d0afbf65c695 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 15 Jun 2012 10:23:33 +0200 Subject: [PATCH 362/403] chromium: Add an update script. It fetches the latest version based on the bucketlist XML from commondatastorage and generates a "source.nix" which contains an attribute set about where to fetch the latest version. The XML is parsed in a somewhat hackish way using sed, but as this is just an updater, its okay and we don't want to break a fly on the wheel by employing a full XML parser. --- .../networking/browsers/chromium/default.nix | 8 +++-- .../networking/browsers/chromium/update.sh | 34 +++++++++++++++++++ 2 files changed, 39 insertions(+), 3 deletions(-) create mode 100755 pkgs/applications/networking/browsers/chromium/update.sh diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index af2e23a5407..f5aea590369 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -14,6 +14,8 @@ }: let + sourceInfo = import ./source.nix; + mkGypFlags = with stdenv.lib; let sanitize = value: if value == true then "1" @@ -25,11 +27,11 @@ let in stdenv.mkDerivation rec { name = "chromium-${version}"; - version = "21.0.1171.0"; + version = sourceInfo.version; src = fetchurl { - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.bz2"; - sha256 = "3fd9b2d8895750a4435a585b9c2dc7d34b583c6470ba67eb6ea6c2579f126377"; + url = sourceInfo.url; + sha256 = sourceInfo.sha256; }; buildInputs = [ diff --git a/pkgs/applications/networking/browsers/chromium/update.sh b/pkgs/applications/networking/browsers/chromium/update.sh new file mode 100755 index 00000000000..066cd1c147f --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/update.sh @@ -0,0 +1,34 @@ +#!/bin/sh + +bucket_url="http://commondatastorage.googleapis.com/chromium-browser-official/"; + +get_newest_version() +{ + curl -s "$bucket_url" | sed -ne ' H;/<[Kk][Ee][Yy]>chromium-[^<]*chromium-\([^<.]\+\(\.[^<.]\+\)\+\)\.tar\.bz2<.*$/\1/p + }'; +} + +cd "$(dirname "$0")"; + +version="$(get_newest_version)"; + +if [ -e source.nix ]; then + oldver="$(sed -n 's/^ *version *= *"\([^"]\+\)".*$/\1/p' source.nix)"; + if [ "x$oldver" = "x$version" ]; then + echo "Already the newest version: $version" >&2; + exit 1; + fi; +fi; + +url="${bucket_url%/}/chromium-$version.tar.bz2"; + +sha256="$(nix-prefetch-url "$url")"; + +cat > source.nix < Date: Fri, 15 Jun 2012 10:27:14 +0200 Subject: [PATCH 363/403] chromium: Generate the latest source.nix. --- pkgs/applications/networking/browsers/chromium/source.nix | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 pkgs/applications/networking/browsers/chromium/source.nix diff --git a/pkgs/applications/networking/browsers/chromium/source.nix b/pkgs/applications/networking/browsers/chromium/source.nix new file mode 100644 index 00000000000..ce7ef056ba9 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/source.nix @@ -0,0 +1,5 @@ +{ + version = "21.0.1174.1"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1174.1.tar.bz2"; + sha256 = "00jd3lzdbxm4rlqvxf0wfz9pvsza85rhlb0pzdzrdjy45kn06a75"; +} From 2571488e6a213bc1f3897db754bfd2c3ecefcc7d Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 15 Jun 2012 11:06:07 +0200 Subject: [PATCH 364/403] chromium: Clean up build flags. This also includes setting compiler architectures and paths. --- .../networking/browsers/chromium/default.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index f5aea590369..87dce9841e2 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -47,14 +47,20 @@ in stdenv.mkDerivation rec { prePatch = "patchShebangs ."; - gypFlags = mkGypFlags { + gypFlags = mkGypFlags ({ linux_use_gold_binary = false; linux_use_gold_flags = false; proprietary_codecs = false; use_gnome_keyring = gnomeKeyringSupport; disable_nacl = !naclSupport; use_cups = false; - }; + } // stdenv.lib.optionalAttrs (stdenv.system == "x86_64-linux") { + target_arch = "x64"; + } // stdenv.lib.optionalAttrs (stdenv.system == "i686-linux") { + target_arch = "ia32"; + }); + + buildType = "Release"; /* TODO: use_system_bzip2 = true; @@ -80,11 +86,16 @@ in stdenv.mkDerivation rec { */ configurePhase = '' - python build/gyp_chromium --depth $(pwd) ${gypFlags} + python build/gyp_chromium --depth "$(pwd)" ${gypFlags} ''; + extraBuildFlags = let + CC = "${gcc}/bin/gcc"; + CXX = "${gcc}/bin/g++"; + in "CC=\"${CC}\" CXX=\"${CXX}\" CC.host=\"${CC}\" CXX.host=\"${CXX}\" LINK.host=\"${CXX}\""; + buildPhase = '' - make CC=${gcc}/bin/gcc BUILDTYPE=Release library=shared_library chrome chrome_sandbox + make ${extraBuildFlags} BUILDTYPE=${buildType} library=shared_library chrome chrome_sandbox ''; installPhase = '' From ef45195126bfb905f12fa70642768e3bb593dd75 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 15 Jun 2012 11:07:30 +0200 Subject: [PATCH 365/403] chromium: Enable seccomp by default. If useSELinux is not set, enable seccomp mode by default and avoid building the SUID helper sandbox at all. This involves a small patch which causes the commandline arguments to be swapped: --disable-seccomp-sandbox to disable it, while the option is active by default. --- .../networking/browsers/chromium/default.nix | 5 ++++- .../browsers/chromium/enable_seccomp.patch | 20 +++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/networking/browsers/chromium/enable_seccomp.patch diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 87dce9841e2..2e96eb57381 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -47,12 +47,15 @@ in stdenv.mkDerivation rec { prePatch = "patchShebangs ."; + patches = stdenv.lib.optional (!useSELinux) ./enable_seccomp.patch; + gypFlags = mkGypFlags ({ linux_use_gold_binary = false; linux_use_gold_flags = false; proprietary_codecs = false; use_gnome_keyring = gnomeKeyringSupport; disable_nacl = !naclSupport; + selinux = useSELinux; use_cups = false; } // stdenv.lib.optionalAttrs (stdenv.system == "x86_64-linux") { target_arch = "x64"; @@ -95,7 +98,7 @@ in stdenv.mkDerivation rec { in "CC=\"${CC}\" CXX=\"${CXX}\" CC.host=\"${CC}\" CXX.host=\"${CXX}\" LINK.host=\"${CXX}\""; buildPhase = '' - make ${extraBuildFlags} BUILDTYPE=${buildType} library=shared_library chrome chrome_sandbox + make ${extraBuildFlags} BUILDTYPE=${buildType} library=shared_library chrome ''; installPhase = '' diff --git a/pkgs/applications/networking/browsers/chromium/enable_seccomp.patch b/pkgs/applications/networking/browsers/chromium/enable_seccomp.patch new file mode 100644 index 00000000000..edeee37f19c --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/enable_seccomp.patch @@ -0,0 +1,20 @@ +diff --git a/content/common/seccomp_sandbox.h b/content/common/seccomp_sandbox.h +index a07d6f3..a622a35 100644 +--- a/content/common/seccomp_sandbox.h ++++ b/content/common/seccomp_sandbox.h +@@ -29,15 +29,9 @@ static bool SeccompSandboxEnabled() { + // TODO(evan): turn on for release too once we've flushed out all the bugs, + // allowing us to delete this file entirely and just rely on the "disabled" + // switch. +-#ifdef NDEBUG +- // Off by default; allow turning on with a switch. +- return CommandLine::ForCurrentProcess()->HasSwitch( +- switches::kEnableSeccompSandbox); +-#else + // On by default; allow turning off with a switch. + return !CommandLine::ForCurrentProcess()->HasSwitch( + switches::kDisableSeccompSandbox); +-#endif // NDEBUG + } + #endif // SECCOMP_SANDBOX + From 6350706c0d233cd7c986542036b458d016c40f89 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 19 Jun 2012 06:53:00 +0200 Subject: [PATCH 366/403] chromium: Add "which" to build dependencies. This is needed by a lot of scripts within chromium, so we're not going to patch them using type, which is shell-specific anyway. --- pkgs/applications/networking/browsers/chromium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 2e96eb57381..24de7bc2e91 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchsvn, makeWrapper +{ stdenv, fetchurl, fetchsvn, makeWrapper, which , python, perl, pkgconfig , nspr, nss, udev, bzip2 , utillinux, alsaLib @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { }; buildInputs = [ - makeWrapper + which makeWrapper python perl pkgconfig nspr nss udev bzip2 utillinux alsaLib From 22f5045bdeb04be163d3b732f1e129d5c5d0e5b9 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 19 Jun 2012 06:56:50 +0200 Subject: [PATCH 367/403] chromium: Use system libraries whenever possible. There are still some libraries left, which we either need to patch or provide more recent versions. Plus we're going to use openssl, as libnss doesn't want to do proper SSL (let's debug this later). --- .../networking/browsers/chromium/default.nix | 71 ++++++++++++------- 1 file changed, 44 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 24de7bc2e91..872c2230acd 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,6 +1,14 @@ { stdenv, fetchurl, fetchsvn, makeWrapper, which + +# default dependencies +, bzip2, ffmpeg, flac #, harfbuzz +, icu, libevent, expat, libjpeg +, libpng, libwebp, libxml2, libxslt #, skia +, speex, sqlite, openssl #, stlport +, v8, xdg_utils, yasm, zlib + , python, perl, pkgconfig -, nspr, nss, udev, bzip2 +, nspr, udev , utillinux, alsaLib , gcc, bison, gperf , krb5 @@ -24,6 +32,37 @@ let toFlag = key: value: "-D${key}=${sanitize value}"; in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); + gypFlagsUseSystemLibs = { + use_system_bzip2 = true; + use_system_ffmpeg = false; # FIXME: libavformat... + use_system_flac = true; + use_system_harfbuzz = false; # TODO + use_system_icu = false; # FIXME: wrong version! + use_system_libevent = true; + use_system_libexpat = true; + use_system_libjpeg = true; + use_system_libpng = true; + use_system_libwebp = false; # See chromium issue #133161 + use_system_libxml = true; + use_system_skia = false; # TODO + use_system_speex = true; + use_system_sqlite = false; # FIXME + use_system_ssl = true; + use_system_stlport = true; + use_system_v8 = false; # TODO... + use_system_xdg_utils = true; + use_system_yasm = true; + use_system_zlib = true; + }; + + defaultDependencies = [ + bzip2 ffmpeg flac # harfbuzz + icu libevent expat libjpeg + libpng libwebp libxml2 libxslt # skia + speex sqlite openssl # stlport + v8 xdg_utils yasm zlib + ]; + in stdenv.mkDerivation rec { name = "chromium-${version}"; @@ -34,10 +73,10 @@ in stdenv.mkDerivation rec { sha256 = sourceInfo.sha256; }; - buildInputs = [ + buildInputs = defaultDependencies ++ [ which makeWrapper python perl pkgconfig - nspr nss udev bzip2 + nspr udev utillinux alsaLib gcc bison gperf krb5 @@ -49,12 +88,13 @@ in stdenv.mkDerivation rec { patches = stdenv.lib.optional (!useSELinux) ./enable_seccomp.patch; - gypFlags = mkGypFlags ({ + gypFlags = mkGypFlags (gypFlagsUseSystemLibs // { linux_use_gold_binary = false; linux_use_gold_flags = false; proprietary_codecs = false; use_gnome_keyring = gnomeKeyringSupport; disable_nacl = !naclSupport; + use_openssl = true; selinux = useSELinux; use_cups = false; } // stdenv.lib.optionalAttrs (stdenv.system == "x86_64-linux") { @@ -65,29 +105,6 @@ in stdenv.mkDerivation rec { buildType = "Release"; - /* TODO: - use_system_bzip2 = true; - use_system_ffmpeg = true; - use_system_flac = true; - use_system_harfbuzz = true; - use_system_icu = true; - use_system_libevent = true; - use_system_libexpat = true; - use_system_libjpeg = true; - use_system_libpng = true; - use_system_libwebp = true; - use_system_libxml = true; - use_system_skia = true; - use_system_speex = true; - use_system_sqlite = true; - use_system_ssl = true; - use_system_stlport = true; - use_system_v8 = true; - use_system_xdg_utils = true; - use_system_yasm = true; - use_system_zlib = true; - */ - configurePhase = '' python build/gyp_chromium --depth "$(pwd)" ${gypFlags} ''; From b1fdecc4600ce95067bc552a491e5262ba0d6ab6 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 19 Jun 2012 17:56:44 +0200 Subject: [PATCH 368/403] chromium: Rename "chrome" binary to "chromium". This is to make it more consistent with the naming of the package file and also consistent with the build, as we're not using the Google branded version. In addition the derivation attribute set now has a packageName value which can be used to easily switch the binary names and paths, just in case we want to switch to using "chrome" (or something entirely different) again. --- .../networking/browsers/chromium/default.nix | 17 +++++++++-------- pkgs/top-level/all-packages.nix | 6 +++--- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 872c2230acd..fe7f62d157b 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -64,7 +64,8 @@ let ]; in stdenv.mkDerivation rec { - name = "chromium-${version}"; + name = "${packageName}-${version}"; + packageName = "chromium"; version = sourceInfo.version; @@ -119,24 +120,24 @@ in stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -vp "$out/libexec/chrome" - cp -v "out/${buildType}/"*.pak "$out/libexec/chrome/" - cp -vR "out/${buildType}/locales" "out/${buildType}/resources" "$out/libexec/chrome/" + mkdir -vp "$out/libexec/${packageName}" + cp -v "out/${buildType}/"*.pak "$out/libexec/${packageName}/" + cp -vR "out/${buildType}/locales" "out/${buildType}/resources" "$out/libexec/${packageName}/" - cp -v "out/${buildType}/chrome" "$out/libexec/chrome/chrome" + cp -v "out/${buildType}/chrome" "$out/libexec/${packageName}/${packageName}" mkdir -vp "$out/bin" - makeWrapper "$out/libexec/chrome/chrome" "$out/bin/chrome" + makeWrapper "$out/libexec/${packageName}/${packageName}" "$out/bin/${packageName}" mkdir -vp "$out/share/man/man1" - cp -v "out/${buildType}/chrome.1" "$out/share/man/man1/chrome.1" + cp -v "out/${buildType}/chrome.1" "$out/share/man/man1/${packageName}.1" for icon_file in chrome/app/theme/chromium/product_logo_*[0-9].png; do num_and_suffix="''${icon_file##*logo_}" icon_size="''${num_and_suffix%.*}" logo_output_path="$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps" mkdir -vp "$logo_output_path" - cp -v "$icon_file" "$logo_output_path/chrome.png" + cp -v "$icon_file" "$logo_output_path/${packageName}.png" done ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71702c0bea3..7bfe8f2b3a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6340,13 +6340,13 @@ let xulrunner = firefox36Pkgs.xulrunner; }; - chrome = lowPrio (callPackage ../applications/networking/browsers/chromium { + chromium = lowPrio (callPackage ../applications/networking/browsers/chromium { gconf = gnome.GConf; }); chromeWrapper = wrapFirefox - { browser = chrome; browserName = "chrome"; desktopName = "Chrome"; - icon = "${chrome}/libexec/chrome/product_logo_48.png"; + { browser = chromium; browserName = chromium.packageName; desktopName = "Chromium"; + icon = "${chromium}/share/icons/hicolor/48x48/apps/${chromium.packageName}.png"; }; cinelerra = callPackage ../applications/video/cinelerra { }; From f0cdea2e9983679a0a6c7d650ec459ce11deef9b Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 19 Jun 2012 18:05:38 +0200 Subject: [PATCH 369/403] chromium: Use patches from system OpenSSL. This is mainly because of the patch to use OPENSSL_X509_CERT_FILE as a way to specify the CA bundle. A browser which isn't able to verify SSL certificates might be somewhat useless. --- pkgs/applications/networking/browsers/chromium/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index fe7f62d157b..7b71df6f715 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -85,10 +85,16 @@ in stdenv.mkDerivation rec { libXScrnSaver libXcursor ] ++ stdenv.lib.optional gnomeKeyringSupport libgnome_keyring; + opensslPatches = openssl.patches; + prePatch = "patchShebangs ."; patches = stdenv.lib.optional (!useSELinux) ./enable_seccomp.patch; + postPatch = stdenv.lib.optionalString useOpenSSL '' + cat $opensslPatches | patch -p1 -d third_party/openssl/openssl + ''; + gypFlags = mkGypFlags (gypFlagsUseSystemLibs // { linux_use_gold_binary = false; linux_use_gold_flags = false; From c2b145c32fb050a5b8882db0df88dd021a061205 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 19 Jun 2012 18:11:59 +0200 Subject: [PATCH 370/403] chromium: Allow to switch off openssl support. Currently building fails with NSS, so we're using OpenSSL by default. And that's why we want to make this configurable so if we manage to fix that build failure, we could switch to using NSS by default. --- .../networking/browsers/chromium/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 7b71df6f715..57f07385df3 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -8,7 +8,7 @@ , v8, xdg_utils, yasm, zlib , python, perl, pkgconfig -, nspr, udev +, nspr, nss, udev , utillinux, alsaLib , gcc, bison, gperf , krb5 @@ -17,6 +17,7 @@ , useSELinux ? false , naclSupport ? false +, useOpenSSL ? true , gnomeKeyringSupport ? false , useProprietaryCodecs ? false }: @@ -59,7 +60,7 @@ let bzip2 ffmpeg flac # harfbuzz icu libevent expat libjpeg libpng libwebp libxml2 libxslt # skia - speex sqlite openssl # stlport + speex sqlite # stlport v8 xdg_utils yasm zlib ]; @@ -78,6 +79,7 @@ in stdenv.mkDerivation rec { which makeWrapper python perl pkgconfig nspr udev + (if useOpenSSL then openssl else nss) utillinux alsaLib gcc bison gperf krb5 @@ -85,7 +87,7 @@ in stdenv.mkDerivation rec { libXScrnSaver libXcursor ] ++ stdenv.lib.optional gnomeKeyringSupport libgnome_keyring; - opensslPatches = openssl.patches; + opensslPatches = stdenv.lib.optional useOpenSSL openssl.patches; prePatch = "patchShebangs ."; @@ -101,7 +103,7 @@ in stdenv.mkDerivation rec { proprietary_codecs = false; use_gnome_keyring = gnomeKeyringSupport; disable_nacl = !naclSupport; - use_openssl = true; + use_openssl = useOpenSSL; selinux = useSELinux; use_cups = false; } // stdenv.lib.optionalAttrs (stdenv.system == "x86_64-linux") { From 57e127099b106b5d584a896051c9f2df0e6965ee Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 19 Jun 2012 20:21:31 +0200 Subject: [PATCH 371/403] chromium: Add flag to disable Gnome support. This also separates gcrypt and gconf from the basic dependencies. Unfortunately we cannot get rid of dbus_glib altogether, but maybe we want to work on a patch to get rid of it? On the other hand it seems to be a TODO of the chromium project itself, so let's wait and see. --- .../applications/networking/browsers/chromium/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 57f07385df3..90c146f8e3b 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -18,6 +18,7 @@ , useSELinux ? false , naclSupport ? false , useOpenSSL ? true +, enableGnomeSupport ? false , gnomeKeyringSupport ? false , useProprietaryCodecs ? false }: @@ -83,9 +84,10 @@ in stdenv.mkDerivation rec { utillinux alsaLib gcc bison gperf krb5 - glib gtk gconf libgcrypt dbus_glib + glib gtk dbus_glib libXScrnSaver libXcursor - ] ++ stdenv.lib.optional gnomeKeyringSupport libgnome_keyring; + ] ++ stdenv.lib.optional gnomeKeyringSupport libgnome_keyring + ++ stdenv.lib.optionals enableGnomeSupport [ gconf libgcrypt ]; opensslPatches = stdenv.lib.optional useOpenSSL openssl.patches; @@ -102,6 +104,8 @@ in stdenv.mkDerivation rec { linux_use_gold_flags = false; proprietary_codecs = false; use_gnome_keyring = gnomeKeyringSupport; + use_gconf = enableGnomeSupport; + use_gio = enableGnomeSupport; disable_nacl = !naclSupport; use_openssl = useOpenSSL; selinux = useSELinux; From 70c0af9a379bd6973ed8bedf0b80e96c77bcdf19 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 20 Jun 2012 06:57:25 +0200 Subject: [PATCH 372/403] chromium: Add mesa to build dependencies. This finally enables support for WebGL and accelerated rendering. --- .../networking/browsers/chromium/default.nix | 48 ++++++++++--------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 90c146f8e3b..5a04731bc0e 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchsvn, makeWrapper, which +{ stdenv, getConfig, fetchurl, fetchsvn, makeWrapper, which # default dependencies , bzip2, ffmpeg, flac #, harfbuzz @@ -13,17 +13,21 @@ , gcc, bison, gperf , krb5 , glib, gtk, gconf, libgcrypt, libgnome_keyring, dbus_glib -, libXScrnSaver, libXcursor - -, useSELinux ? false -, naclSupport ? false -, useOpenSSL ? true -, enableGnomeSupport ? false -, gnomeKeyringSupport ? false -, useProprietaryCodecs ? false +, libXScrnSaver, libXcursor, mesa }: let + mkConfigurable = stdenv.lib.mapAttrs (flag: default: getConfig ["chromium" flag] default); + + config = mkConfigurable { + useSELinux = false; + naclSupport = false; + useOpenSSL = true; + enableGnomeSupport = false; + gnomeKeyringSupport = false; + useProprietaryCodecs = false; + }; + sourceInfo = import ./source.nix; mkGypFlags = with stdenv.lib; let @@ -80,22 +84,22 @@ in stdenv.mkDerivation rec { which makeWrapper python perl pkgconfig nspr udev - (if useOpenSSL then openssl else nss) + (if config.useOpenSSL then openssl else nss) utillinux alsaLib gcc bison gperf krb5 glib gtk dbus_glib - libXScrnSaver libXcursor - ] ++ stdenv.lib.optional gnomeKeyringSupport libgnome_keyring - ++ stdenv.lib.optionals enableGnomeSupport [ gconf libgcrypt ]; + libXScrnSaver libXcursor mesa + ] ++ stdenv.lib.optional config.gnomeKeyringSupport libgnome_keyring + ++ stdenv.lib.optionals config.enableGnomeSupport [ gconf libgcrypt ]; - opensslPatches = stdenv.lib.optional useOpenSSL openssl.patches; + opensslPatches = stdenv.lib.optional config.useOpenSSL openssl.patches; prePatch = "patchShebangs ."; - patches = stdenv.lib.optional (!useSELinux) ./enable_seccomp.patch; + patches = stdenv.lib.optional (!config.useSELinux) ./enable_seccomp.patch; - postPatch = stdenv.lib.optionalString useOpenSSL '' + postPatch = stdenv.lib.optionalString config.useOpenSSL '' cat $opensslPatches | patch -p1 -d third_party/openssl/openssl ''; @@ -103,12 +107,12 @@ in stdenv.mkDerivation rec { linux_use_gold_binary = false; linux_use_gold_flags = false; proprietary_codecs = false; - use_gnome_keyring = gnomeKeyringSupport; - use_gconf = enableGnomeSupport; - use_gio = enableGnomeSupport; - disable_nacl = !naclSupport; - use_openssl = useOpenSSL; - selinux = useSELinux; + use_gnome_keyring = config.gnomeKeyringSupport; + use_gconf = config.enableGnomeSupport; + use_gio = config.enableGnomeSupport; + disable_nacl = !config.naclSupport; + use_openssl = config.useOpenSSL; + selinux = config.useSELinux; use_cups = false; } // stdenv.lib.optionalAttrs (stdenv.system == "x86_64-linux") { target_arch = "x64"; From 8371d508360a6f517934409c1508778b702b21e4 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 20 Jun 2012 07:38:10 +0200 Subject: [PATCH 373/403] chromium: Update source to version 21.0.1179.1. --- pkgs/applications/networking/browsers/chromium/source.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/source.nix b/pkgs/applications/networking/browsers/chromium/source.nix index ce7ef056ba9..2dc94ea2943 100644 --- a/pkgs/applications/networking/browsers/chromium/source.nix +++ b/pkgs/applications/networking/browsers/chromium/source.nix @@ -1,5 +1,5 @@ { - version = "21.0.1174.1"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1174.1.tar.bz2"; - sha256 = "00jd3lzdbxm4rlqvxf0wfz9pvsza85rhlb0pzdzrdjy45kn06a75"; + version = "21.0.1179.1"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1179.1.tar.bz2"; + sha256 = "1ynm1dv8nwjg6a0absid1g3r62y0mpb74pmal8g9nmqb92rlkdnc"; } From 04ae9f288d3756a5f1d03eda9651ead7e3aeec2c Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 20 Jun 2012 10:31:54 +0200 Subject: [PATCH 374/403] chromium: Implement handling of enableCUPS. We also need to patch the compilation process, so it allows deprecated declarations when building support for the cups backend. In addition, we also need to add libgcrypt to dependencies as it's needed by the cups implementation. --- .../browsers/chromium/cups_allow_deprecated.patch | 14 ++++++++++++++ .../networking/browsers/chromium/default.nix | 9 ++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/networking/browsers/chromium/cups_allow_deprecated.patch diff --git a/pkgs/applications/networking/browsers/chromium/cups_allow_deprecated.patch b/pkgs/applications/networking/browsers/chromium/cups_allow_deprecated.patch new file mode 100644 index 00000000000..4fd6a24cc14 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/cups_allow_deprecated.patch @@ -0,0 +1,14 @@ +diff --git a/printing/printing.gyp b/printing/printing.gyp +index 19fa1b2..f11d76e 100644 +--- a/printing/printing.gyp ++++ b/printing/printing.gyp +@@ -26,6 +26,9 @@ + 'include_dirs': [ + '..', + ], ++ 'cflags': [ ++ '-Wno-deprecated-declarations', ++ ], + 'sources': [ + 'backend/print_backend.cc', + 'backend/print_backend.h', diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 5a04731bc0e..f0f443d15d6 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -26,6 +26,7 @@ let enableGnomeSupport = false; gnomeKeyringSupport = false; useProprietaryCodecs = false; + enableCUPS = false; }; sourceInfo = import ./source.nix; @@ -91,13 +92,15 @@ in stdenv.mkDerivation rec { glib gtk dbus_glib libXScrnSaver libXcursor mesa ] ++ stdenv.lib.optional config.gnomeKeyringSupport libgnome_keyring - ++ stdenv.lib.optionals config.enableGnomeSupport [ gconf libgcrypt ]; + ++ stdenv.lib.optionals config.enableGnomeSupport [ gconf libgcrypt ] + ++ stdenv.lib.optional config.enableCUPS libgcrypt; opensslPatches = stdenv.lib.optional config.useOpenSSL openssl.patches; prePatch = "patchShebangs ."; - patches = stdenv.lib.optional (!config.useSELinux) ./enable_seccomp.patch; + patches = stdenv.lib.optional (!config.useSELinux) ./enable_seccomp.patch + ++ stdenv.lib.optional config.enableCUPS ./cups_allow_deprecated.patch; postPatch = stdenv.lib.optionalString config.useOpenSSL '' cat $opensslPatches | patch -p1 -d third_party/openssl/openssl @@ -113,7 +116,7 @@ in stdenv.mkDerivation rec { disable_nacl = !config.naclSupport; use_openssl = config.useOpenSSL; selinux = config.useSELinux; - use_cups = false; + use_cups = config.enableCUPS; } // stdenv.lib.optionalAttrs (stdenv.system == "x86_64-linux") { target_arch = "x64"; } // stdenv.lib.optionalAttrs (stdenv.system == "i686-linux") { From a88eb35ff164444747a1c8c969ae5e779a194d81 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 20 Jun 2012 10:36:26 +0200 Subject: [PATCH 375/403] chromium: Enable proprietary codecs by default. We now switch to using bundled ffmpeg, as this adds stuff such as support for the H.264 codec. --- .../networking/browsers/chromium/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index f0f443d15d6..4818bac5452 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -25,7 +25,7 @@ let useOpenSSL = true; enableGnomeSupport = false; gnomeKeyringSupport = false; - useProprietaryCodecs = false; + useProprietaryCodecs = true; enableCUPS = false; }; @@ -41,7 +41,6 @@ let gypFlagsUseSystemLibs = { use_system_bzip2 = true; - use_system_ffmpeg = false; # FIXME: libavformat... use_system_flac = true; use_system_harfbuzz = false; # TODO use_system_icu = false; # FIXME: wrong version! @@ -63,7 +62,7 @@ let }; defaultDependencies = [ - bzip2 ffmpeg flac # harfbuzz + bzip2 flac # harfbuzz icu libevent expat libjpeg libpng libwebp libxml2 libxslt # skia speex sqlite # stlport @@ -117,6 +116,10 @@ in stdenv.mkDerivation rec { use_openssl = config.useOpenSSL; selinux = config.useSELinux; use_cups = config.enableCUPS; + } // stdenv.lib.optionalAttrs config.useProprietaryCodecs { + # enable support for the H.264 codec + proprietary_codecs = true; + ffmpeg_branding = "Chrome"; } // stdenv.lib.optionalAttrs (stdenv.system == "x86_64-linux") { target_arch = "x64"; } // stdenv.lib.optionalAttrs (stdenv.system == "i686-linux") { From c7db5ff34df17b24f94a04b19ec3662c27b7b454 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 20 Jun 2012 10:39:48 +0200 Subject: [PATCH 376/403] chromium: Add dependency for libselinux. This doesn't really work at the current state of NixOS and SELinux support, but will make it easier in case we someday support SELinux altogether. --- pkgs/applications/networking/browsers/chromium/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 4818bac5452..c8574f32699 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -14,6 +14,7 @@ , krb5 , glib, gtk, gconf, libgcrypt, libgnome_keyring, dbus_glib , libXScrnSaver, libXcursor, mesa +, libselinux }: let @@ -92,6 +93,7 @@ in stdenv.mkDerivation rec { libXScrnSaver libXcursor mesa ] ++ stdenv.lib.optional config.gnomeKeyringSupport libgnome_keyring ++ stdenv.lib.optionals config.enableGnomeSupport [ gconf libgcrypt ] + ++ stdenv.lib.optional config.useSELinux libselinux ++ stdenv.lib.optional config.enableCUPS libgcrypt; opensslPatches = stdenv.lib.optional config.useOpenSSL openssl.patches; From d8e95364988768d21dfe443eb71668873a4be4c7 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 20 Jun 2012 10:41:49 +0200 Subject: [PATCH 377/403] chromium: Cleanup dependencies. This mostly is a code structure change, but also involves deleting some unused dependencies and adding a few constraints on existing ones. --- .../networking/browsers/chromium/default.nix | 41 +++++++++++-------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index c8574f32699..64139572394 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,20 +1,26 @@ { stdenv, getConfig, fetchurl, fetchsvn, makeWrapper, which # default dependencies -, bzip2, ffmpeg, flac #, harfbuzz -, icu, libevent, expat, libjpeg -, libpng, libwebp, libxml2, libxslt #, skia -, speex, sqlite, openssl #, stlport +, bzip2, ffmpeg, flac +, libevent, expat, libjpeg +, libpng, libxml2, libxslt +, speex, sqlite , v8, xdg_utils, yasm, zlib , python, perl, pkgconfig -, nspr, nss, udev +, nspr, udev , utillinux, alsaLib , gcc, bison, gperf , krb5 -, glib, gtk, gconf, libgcrypt, libgnome_keyring, dbus_glib +, glib, gtk, dbus_glib , libXScrnSaver, libXcursor, mesa -, libselinux + +# optional dependencies +, libgnome_keyring # gnomeKeyringSupport +, gconf # enableGnomeSupport +, libgcrypt # enableGnomeSupport || enableCUPS +, nss, openssl # useOpenSSL +, libselinux # useSELinux }: let @@ -43,30 +49,31 @@ let gypFlagsUseSystemLibs = { use_system_bzip2 = true; use_system_flac = true; - use_system_harfbuzz = false; # TODO - use_system_icu = false; # FIXME: wrong version! use_system_libevent = true; use_system_libexpat = true; use_system_libjpeg = true; use_system_libpng = true; - use_system_libwebp = false; # See chromium issue #133161 use_system_libxml = true; - use_system_skia = false; # TODO use_system_speex = true; - use_system_sqlite = false; # FIXME use_system_ssl = true; use_system_stlport = true; - use_system_v8 = false; # TODO... use_system_xdg_utils = true; use_system_yasm = true; use_system_zlib = true; + + use_system_harfbuzz = false; # TODO + use_system_icu = false; # FIXME: wrong version! + use_system_libwebp = false; # See chromium issue #133161 + use_system_skia = false; # TODO + use_system_sqlite = false; # FIXME + use_system_v8 = false; # TODO... }; defaultDependencies = [ - bzip2 flac # harfbuzz - icu libevent expat libjpeg - libpng libwebp libxml2 libxslt # skia - speex sqlite # stlport + bzip2 flac + libevent expat libjpeg + libpng libxml2 libxslt + speex sqlite v8 xdg_utils yasm zlib ]; From fc24f460f19b3e56bb5f3aa724ea030844829f93 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 20 Jun 2012 11:19:01 +0200 Subject: [PATCH 378/403] chromium: Use bundled versions of some libraries. These libraries are heavily patched by the chromium project itself, so let's use the bundled versions as those won't build anyway and also don't break functional purity. --- .../networking/browsers/chromium/default.nix | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 64139572394..b297a3a257f 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,17 +1,15 @@ -{ stdenv, getConfig, fetchurl, fetchsvn, makeWrapper, which +{ stdenv, getConfig, fetchurl, makeWrapper, which # default dependencies -, bzip2, ffmpeg, flac +, bzip2, flac, speex , libevent, expat, libjpeg , libpng, libxml2, libxslt -, speex, sqlite -, v8, xdg_utils, yasm, zlib +, xdg_utils, yasm, zlib , python, perl, pkgconfig -, nspr, udev +, nspr, udev, krb5 , utillinux, alsaLib , gcc, bison, gperf -, krb5 , glib, gtk, dbus_glib , libXScrnSaver, libXcursor, mesa @@ -61,20 +59,19 @@ let use_system_yasm = true; use_system_zlib = true; - use_system_harfbuzz = false; # TODO - use_system_icu = false; # FIXME: wrong version! + use_system_harfbuzz = false; + use_system_icu = false; use_system_libwebp = false; # See chromium issue #133161 - use_system_skia = false; # TODO - use_system_sqlite = false; # FIXME - use_system_v8 = false; # TODO... + use_system_skia = false; + use_system_sqlite = false; # See chromium issue #22208 + use_system_v8 = false; }; defaultDependencies = [ - bzip2 flac + bzip2 flac speex libevent expat libjpeg libpng libxml2 libxslt - speex sqlite - v8 xdg_utils yasm zlib + xdg_utils yasm zlib ]; in stdenv.mkDerivation rec { From a2984e3d82e973fabdf96ba904f70e6c545e6099 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 20 Jun 2012 11:33:36 +0200 Subject: [PATCH 379/403] chromium: Simplify names of getConfig options. This makes it easier to remember, as so far the naming wasn't quite consistent, sometimes "use*", sometimes "enable*". So in using just use the feature name itself, it should be pretty clear. --- .../networking/browsers/chromium/default.nix | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index b297a3a257f..1b5b6a54f0f 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -14,24 +14,24 @@ , libXScrnSaver, libXcursor, mesa # optional dependencies -, libgnome_keyring # gnomeKeyringSupport -, gconf # enableGnomeSupport -, libgcrypt # enableGnomeSupport || enableCUPS -, nss, openssl # useOpenSSL -, libselinux # useSELinux +, libgnome_keyring # config.gnomeKeyring +, gconf # config.gnome +, libgcrypt # config.gnome || config.cups +, nss, openssl # config.openssl +, libselinux # config.selinux }: let mkConfigurable = stdenv.lib.mapAttrs (flag: default: getConfig ["chromium" flag] default); config = mkConfigurable { - useSELinux = false; - naclSupport = false; - useOpenSSL = true; - enableGnomeSupport = false; - gnomeKeyringSupport = false; - useProprietaryCodecs = true; - enableCUPS = false; + selinux = false; + nacl = false; + openssl = true; + gnome = false; + gnomeKeyring = false; + proprietaryCodecs = true; + cups = false; }; sourceInfo = import ./source.nix; @@ -89,25 +89,25 @@ in stdenv.mkDerivation rec { which makeWrapper python perl pkgconfig nspr udev - (if config.useOpenSSL then openssl else nss) + (if config.openssl then openssl else nss) utillinux alsaLib gcc bison gperf krb5 glib gtk dbus_glib libXScrnSaver libXcursor mesa - ] ++ stdenv.lib.optional config.gnomeKeyringSupport libgnome_keyring - ++ stdenv.lib.optionals config.enableGnomeSupport [ gconf libgcrypt ] - ++ stdenv.lib.optional config.useSELinux libselinux - ++ stdenv.lib.optional config.enableCUPS libgcrypt; + ] ++ stdenv.lib.optional config.gnomeKeyring libgnome_keyring + ++ stdenv.lib.optionals config.gnome [ gconf libgcrypt ] + ++ stdenv.lib.optional config.selinux libselinux + ++ stdenv.lib.optional config.cups libgcrypt; - opensslPatches = stdenv.lib.optional config.useOpenSSL openssl.patches; + opensslPatches = stdenv.lib.optional config.openssl openssl.patches; prePatch = "patchShebangs ."; - patches = stdenv.lib.optional (!config.useSELinux) ./enable_seccomp.patch - ++ stdenv.lib.optional config.enableCUPS ./cups_allow_deprecated.patch; + patches = stdenv.lib.optional (!config.selinux) ./enable_seccomp.patch + ++ stdenv.lib.optional config.cups ./cups_allow_deprecated.patch; - postPatch = stdenv.lib.optionalString config.useOpenSSL '' + postPatch = stdenv.lib.optionalString config.openssl '' cat $opensslPatches | patch -p1 -d third_party/openssl/openssl ''; @@ -115,14 +115,14 @@ in stdenv.mkDerivation rec { linux_use_gold_binary = false; linux_use_gold_flags = false; proprietary_codecs = false; - use_gnome_keyring = config.gnomeKeyringSupport; - use_gconf = config.enableGnomeSupport; - use_gio = config.enableGnomeSupport; - disable_nacl = !config.naclSupport; - use_openssl = config.useOpenSSL; - selinux = config.useSELinux; - use_cups = config.enableCUPS; - } // stdenv.lib.optionalAttrs config.useProprietaryCodecs { + use_gnome_keyring = config.gnomeKeyring; + use_gconf = config.gnome; + use_gio = config.gnome; + disable_nacl = !config.nacl; + use_openssl = config.openssl; + selinux = config.selinux; + use_cups = config.cups; + } // stdenv.lib.optionalAttrs config.proprietaryCodecs { # enable support for the H.264 codec proprietary_codecs = true; ffmpeg_branding = "Chrome"; From 59f8de864ff106d56e21bca9e9192a4db46b7195 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 20 Jun 2012 12:45:14 +0200 Subject: [PATCH 380/403] chromium: Add support for pulseaudio. Which is enabled by default if neither pulseaudio or chromium.pulseaudio is explicitly set. The reason is that chromium falls back to ALSA in case no pulseaudio is available. In addition it was necessary to patch media.gyp to ignore the array-out-of- bounds warning. --- .../networking/browsers/chromium/default.nix | 9 +++++++-- .../browsers/chromium/pulseaudio_array_bounds.patch | 12 ++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/networking/browsers/chromium/pulseaudio_array_bounds.patch diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 1b5b6a54f0f..308547673ce 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -18,6 +18,7 @@ , gconf # config.gnome , libgcrypt # config.gnome || config.cups , nss, openssl # config.openssl +, pulseaudio # config.pulseaudio , libselinux # config.selinux }: @@ -32,6 +33,7 @@ let gnomeKeyring = false; proprietaryCodecs = true; cups = false; + pulseaudio = getConfig ["pulseaudio"] true; }; sourceInfo = import ./source.nix; @@ -98,14 +100,16 @@ in stdenv.mkDerivation rec { ] ++ stdenv.lib.optional config.gnomeKeyring libgnome_keyring ++ stdenv.lib.optionals config.gnome [ gconf libgcrypt ] ++ stdenv.lib.optional config.selinux libselinux - ++ stdenv.lib.optional config.cups libgcrypt; + ++ stdenv.lib.optional config.cups libgcrypt + ++ stdenv.lib.optional config.pulseaudio pulseaudio; opensslPatches = stdenv.lib.optional config.openssl openssl.patches; prePatch = "patchShebangs ."; patches = stdenv.lib.optional (!config.selinux) ./enable_seccomp.patch - ++ stdenv.lib.optional config.cups ./cups_allow_deprecated.patch; + ++ stdenv.lib.optional config.cups ./cups_allow_deprecated.patch + ++ stdenv.lib.optional config.pulseaudio ./pulseaudio_array_bounds.patch; postPatch = stdenv.lib.optionalString config.openssl '' cat $opensslPatches | patch -p1 -d third_party/openssl/openssl @@ -118,6 +122,7 @@ in stdenv.mkDerivation rec { use_gnome_keyring = config.gnomeKeyring; use_gconf = config.gnome; use_gio = config.gnome; + use_pulseaudio = config.pulseaudio; disable_nacl = !config.nacl; use_openssl = config.openssl; selinux = config.selinux; diff --git a/pkgs/applications/networking/browsers/chromium/pulseaudio_array_bounds.patch b/pkgs/applications/networking/browsers/chromium/pulseaudio_array_bounds.patch new file mode 100644 index 00000000000..ca78b6959c0 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/pulseaudio_array_bounds.patch @@ -0,0 +1,12 @@ +diff --git a/media/media.gyp b/media/media.gyp +index 2a8c6c6..66ca767 100644 +--- a/media/media.gyp ++++ b/media/media.gyp +@@ -399,6 +399,7 @@ + ['use_pulseaudio == 1', { + 'cflags': [ + ' Date: Thu, 21 Jun 2012 17:27:36 +0200 Subject: [PATCH 381/403] chromium: Enable parallel building. Always did this manually by putting -j8 into make flags, which i didn't commit, as it obviously doesn't make sense to hardcode. However, this flag makes more sense and obviously we need to avoid overriding buildPhase. --- .../networking/browsers/chromium/default.nix | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 308547673ce..a486c80e185 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -139,18 +139,28 @@ in stdenv.mkDerivation rec { buildType = "Release"; + enableParallelBuilding = true; + configurePhase = '' python build/gyp_chromium --depth "$(pwd)" ${gypFlags} ''; - extraBuildFlags = let + makeFlags = let CC = "${gcc}/bin/gcc"; CXX = "${gcc}/bin/g++"; - in "CC=\"${CC}\" CXX=\"${CXX}\" CC.host=\"${CC}\" CXX.host=\"${CXX}\" LINK.host=\"${CXX}\""; + in [ + "CC=${CC}" + "CXX=${CXX}" + "CC.host=${CC}" + "CXX.host=${CXX}" + "LINK.host=${CXX}" + ]; - buildPhase = '' - make ${extraBuildFlags} BUILDTYPE=${buildType} library=shared_library chrome - ''; + buildFlags = [ + "BUILDTYPE=${buildType}" + "library=shared_library" + "chrome" + ]; installPhase = '' mkdir -vp "$out/libexec/${packageName}" From 1b2d1f839992f7f93346bdc20fd2fb9bea9f92e2 Mon Sep 17 00:00:00 2001 From: Antono Vasiljev Date: Sat, 23 Jun 2012 01:55:47 +0300 Subject: [PATCH 382/403] Added ubuntu-font-family --- .../data/fonts/ubuntu-font-family/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/data/fonts/ubuntu-font-family/default.nix diff --git a/pkgs/data/fonts/ubuntu-font-family/default.nix b/pkgs/data/fonts/ubuntu-font-family/default.nix new file mode 100644 index 00000000000..ad798b84eb9 --- /dev/null +++ b/pkgs/data/fonts/ubuntu-font-family/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + name = "ubuntu-font-family-0.80"; + buildInputs = [unzip]; + + src = fetchurl { + url = http://font.ubuntu.com/download/ubuntu-font-family-0.80.zip; + sha256 = "107170099bbc3beae8602b97a5c423525d363106c3c24f787d43e09811298e4c"; + }; + + installPhase = + '' + mkdir -p $out/share/fonts/ubuntu + cp *.ttf $out/share/fonts/ubuntu + ''; + + meta = { + description = "The Ubuntu typeface has been specially created to complement the Ubuntu tone of voice. It has a contemporary style and contains characteristics unique to the Ubuntu brand that convey a precise, reliable and free attitude."; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7bfe8f2b3a3..5cddfc5fcb1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6213,6 +6213,8 @@ let vistafonts = callPackage ../data/fonts/vista-fonts { }; + ubuntu_font_family = callPackage ../data/fonts/ubuntu-font-family { }; + wqy_zenhei = callPackage ../data/fonts/wqy-zenhei { }; xhtml1 = callPackage ../data/sgml+xml/schemas/xml-dtd/xhtml1 { }; From 76021a76cb0fef19b0fae8d05401417c66c21c84 Mon Sep 17 00:00:00 2001 From: Antono Vasiljev Date: Sat, 23 Jun 2012 02:22:38 +0300 Subject: [PATCH 383/403] Add myself to maintainers.nix --- pkgs/lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index b790d7d1c11..aab4d685361 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -8,6 +8,7 @@ all = "Nix Committers "; amiddelk = "Arie Middelkoop "; andres = "Andres Loeh "; + antono = "Antono Vasiljev "; astsmtl = "Alexander Tsamutali "; bjg = "Brian Gough "; bluescreen303 = "Mathijs Kwik "; From 48eeb312c56d896a3a8b58c4b72573d63f7f4973 Mon Sep 17 00:00:00 2001 From: Antono Vasiljev Date: Sat, 23 Jun 2012 02:23:02 +0300 Subject: [PATCH 384/403] Improved meta section for ubuntu-font-family --- pkgs/data/fonts/ubuntu-font-family/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/data/fonts/ubuntu-font-family/default.nix b/pkgs/data/fonts/ubuntu-font-family/default.nix index ad798b84eb9..81222938ad3 100644 --- a/pkgs/data/fonts/ubuntu-font-family/default.nix +++ b/pkgs/data/fonts/ubuntu-font-family/default.nix @@ -16,6 +16,14 @@ stdenv.mkDerivation rec { ''; meta = { - description = "The Ubuntu typeface has been specially created to complement the Ubuntu tone of voice. It has a contemporary style and contains characteristics unique to the Ubuntu brand that convey a precise, reliable and free attitude."; + description = "Ubuntu Font Family"; + longDescription = "The Ubuntu typeface has been specially + created to complement the Ubuntu tone of voice. It has a + contemporary style and contains characteristics unique to + the Ubuntu brand that convey a precise, reliable and free attitude."; + homepage = http://font.ubuntu.com/; + license = free; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.antono ]; }; } From bca195dcb84b80662c20c1fbeabe6eb9e15d6114 Mon Sep 17 00:00:00 2001 From: Antono Vasiljev Date: Sat, 23 Jun 2012 02:26:39 +0300 Subject: [PATCH 385/403] Reordered alphabetically --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5cddfc5fcb1..45df41e84bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6207,14 +6207,14 @@ let ttf_bitstream_vera = callPackage ../data/fonts/ttf-bitstream-vera { }; + ubuntu_font_family = callPackage ../data/fonts/ubuntu-font-family { }; + ucsFonts = callPackage ../data/fonts/ucs-fonts { }; unifont = callPackage ../data/fonts/unifont { }; vistafonts = callPackage ../data/fonts/vista-fonts { }; - ubuntu_font_family = callPackage ../data/fonts/ubuntu-font-family { }; - wqy_zenhei = callPackage ../data/fonts/wqy-zenhei { }; xhtml1 = callPackage ../data/sgml+xml/schemas/xml-dtd/xhtml1 { }; From b5b9b0371c6d8cfaffbe6c3f19b489f6d226f03f Mon Sep 17 00:00:00 2001 From: Antono Vasiljev Date: Sat, 23 Jun 2012 02:36:46 +0300 Subject: [PATCH 386/403] sha256 in base32 format --- pkgs/data/fonts/ubuntu-font-family/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/ubuntu-font-family/default.nix b/pkgs/data/fonts/ubuntu-font-family/default.nix index 81222938ad3..f7f5e6d3fb5 100644 --- a/pkgs/data/fonts/ubuntu-font-family/default.nix +++ b/pkgs/data/fonts/ubuntu-font-family/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = http://font.ubuntu.com/download/ubuntu-font-family-0.80.zip; - sha256 = "107170099bbc3beae8602b97a5c423525d363106c3c24f787d43e09811298e4c"; + sha256 = "0k4f548riq23gmw4zhn30qqkcpaj4g2ab5rbc3lflfxwkc4p0w8h"; }; installPhase = From d4092f153e5a9af93b8f7826476e8ff61122d2d1 Mon Sep 17 00:00:00 2001 From: Antono Vasiljev Date: Sat, 23 Jun 2012 02:38:27 +0300 Subject: [PATCH 387/403] Cleaning up ubuntu-font-family --- pkgs/data/fonts/ubuntu-font-family/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/ubuntu-font-family/default.nix b/pkgs/data/fonts/ubuntu-font-family/default.nix index f7f5e6d3fb5..e2139bcbc12 100644 --- a/pkgs/data/fonts/ubuntu-font-family/default.nix +++ b/pkgs/data/fonts/ubuntu-font-family/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "ubuntu-font-family-0.80"; buildInputs = [unzip]; src = fetchurl { - url = http://font.ubuntu.com/download/ubuntu-font-family-0.80.zip; + url = "http://font.ubuntu.com/download/${name}.zip"; sha256 = "0k4f548riq23gmw4zhn30qqkcpaj4g2ab5rbc3lflfxwkc4p0w8h"; }; From 6db0c4c51d6d9ee1e0cac1995e44202f1e4420ea Mon Sep 17 00:00:00 2001 From: Antono Vasiljev Date: Sat, 23 Jun 2012 02:40:04 +0300 Subject: [PATCH 388/403] ubuntu-font-family: free is a string, not var --- pkgs/data/fonts/ubuntu-font-family/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/ubuntu-font-family/default.nix b/pkgs/data/fonts/ubuntu-font-family/default.nix index e2139bcbc12..bab2f3337e1 100644 --- a/pkgs/data/fonts/ubuntu-font-family/default.nix +++ b/pkgs/data/fonts/ubuntu-font-family/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { contemporary style and contains characteristics unique to the Ubuntu brand that convey a precise, reliable and free attitude."; homepage = http://font.ubuntu.com/; - license = free; + license = "free"; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.antono ]; }; From dd3354f0029739cc92d7d533b5e2fa642b286d5b Mon Sep 17 00:00:00 2001 From: Antono Vasiljev Date: Sat, 23 Jun 2012 02:42:37 +0300 Subject: [PATCH 389/403] ubuntu-font-family: rec back --- pkgs/data/fonts/ubuntu-font-family/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/ubuntu-font-family/default.nix b/pkgs/data/fonts/ubuntu-font-family/default.nix index bab2f3337e1..130aeef88ab 100644 --- a/pkgs/data/fonts/ubuntu-font-family/default.nix +++ b/pkgs/data/fonts/ubuntu-font-family/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, unzip }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "ubuntu-font-family-0.80"; buildInputs = [unzip]; From f97a277efcd2f09499c3b49f073f13d10b3842a5 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 24 Jun 2012 10:03:09 +0200 Subject: [PATCH 390/403] linux kernel: 3.4.2 -> 3.4.4 --- pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index bf951c0a818..b643de8bff6 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -236,7 +236,7 @@ in import ./generic.nix ( rec { - version = "3.4.2"; + version = "3.4.4"; testing = false; preConfigure = '' @@ -245,7 +245,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0pd96g1qcp2wgdnvk79hljjrpr6xjk0159lks47n181a3yirzf4x"; + sha256 = "0l4h7amhsmgpnii8rgwi32nd7ajsifk2xckjd39pfzwdifacw5yw"; }; config = configWithPlatform stdenv.platform; From 1fb5c38fce538fbc40740b551f42488cd2979d4d Mon Sep 17 00:00:00 2001 From: Antono Vasiljev Date: Sun, 24 Jun 2012 16:37:32 +0300 Subject: [PATCH 391/403] Updated ncompress url (prev version missing on mirrors) (Fixes #21) --- pkgs/tools/compression/ncompress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/ncompress/default.nix b/pkgs/tools/compression/ncompress/default.nix index bfdb70c697d..937cf987513 100644 --- a/pkgs/tools/compression/ncompress/default.nix +++ b/pkgs/tools/compression/ncompress/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "ncompress-4.2.4.3"; + name = "ncompress-4.2.4.4"; builder = ./builder.sh; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/project/ncompress/${name}.tar.gz"; - sha256 = "1y44ixc1w2vfvj1lm4dkcljlwv882ynrvm5i6l0lg1gf883j246l"; + sha256 = "0yjiwv1hwb253x3m6r1dq2k7m5c9nz0ib2j7fnm3hark7y6s42xh"; }; meta = { From c6457c322ba2af31686d503274375908e51b3fb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 24 Jun 2012 16:51:42 +0200 Subject: [PATCH 392/403] Upgrading sonic-visualiser to 1.9 and adding pkgconfig so that it finds rasqal.h successfully --- pkgs/applications/audio/sonic-visualiser/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index 3a2beff0413..aabddef8eac 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -2,15 +2,16 @@ { stdenv, fetchurl, alsaLib, bzip2, fftw, jackaudio, libX11, liblo, libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate, -libsndfile, makeWrapper, pulseaudio, qt4, redland, rubberband, vampSDK +libsndfile, makeWrapper, pkgconfig, pulseaudio, qt4, redland, rubberband, vampSDK }: -stdenv.mkDerivation { - name = "sonic-visualiser-1.8"; +stdenv.mkDerivation rec { + name = "sonic-visualiser-${version}"; + version = "1.9"; src = fetchurl { - url = http://downloads.sourceforge.net/sv1/sonic-visualiser-1.8.tar.gz; - sha256 = "16ik6q9n92wljvnqcv7hyzb9v3yp3ixxp6df9kasf53fii973dh7"; + url = "http://code.soundsoftware.ac.uk/attachments/download/194/${name}.tar.gz"; + sha256 = "00igf7j6s8xfyxnlkbqma0yby9pknxqzy8cmh0aw95ix80cw56fq"; }; buildInputs = @@ -18,6 +19,7 @@ stdenv.mkDerivation { libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland # optional jackaudio + pkgconfig # portaudio pulseaudio libmad From 1afe86a7b7da36cc98a2547b3f2f4da08bba7132 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 24 Jun 2012 16:54:51 +0200 Subject: [PATCH 393/403] Tidy up --- .../audio/sonic-visualiser/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index aabddef8eac..aeb90c09455 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -1,8 +1,9 @@ # TODO add plugins having various licenses, see http://www.vamp-plugins.org/download.html -{ stdenv, fetchurl, alsaLib, bzip2, fftw, jackaudio, libX11, liblo, -libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate, -libsndfile, makeWrapper, pkgconfig, pulseaudio, qt4, redland, rubberband, vampSDK +{ stdenv, fetchurl, alsaLib, bzip2, fftw, jackaudio, libX11, liblo +, libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate +, libsndfile, makeWrapper, pkgconfig, pulseaudio, qt4, redland +, rubberband, vampSDK }: stdenv.mkDerivation rec { @@ -17,9 +18,9 @@ stdenv.mkDerivation rec { buildInputs = [ libsndfile qt4 fftw /* should be fftw3f ??*/ bzip2 librdf rubberband libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland + pkgconfig # optional jackaudio - pkgconfig # portaudio pulseaudio libmad @@ -48,8 +49,10 @@ stdenv.mkDerivation rec { description = "View and analyse contents of music audio files"; homepage = http://www.sonicvisualiser.org/; license = "GPLv2"; - maintainers = [ stdenv.lib.maintainers.marcweber - stdenv.lib.maintainers.goibhniu ]; + maintainers = + [ stdenv.lib.maintainers.marcweber + stdenv.lib.maintainers.goibhniu + ]; platforms = stdenv.lib.platforms.linux; }; } From 6dc45870af2d6b73f4d09d9dc852827f05234509 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Sun, 24 Jun 2012 20:24:58 +0200 Subject: [PATCH 394/403] * Add MiniDLNA 1.0.24, media server --- pkgs/tools/networking/minidlna/config.patch | 57 +++++++++++++++++++++ pkgs/tools/networking/minidlna/default.nix | 28 ++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 87 insertions(+) create mode 100644 pkgs/tools/networking/minidlna/config.patch create mode 100644 pkgs/tools/networking/minidlna/default.nix diff --git a/pkgs/tools/networking/minidlna/config.patch b/pkgs/tools/networking/minidlna/config.patch new file mode 100644 index 00000000000..74442a75656 --- /dev/null +++ b/pkgs/tools/networking/minidlna/config.patch @@ -0,0 +1,57 @@ +diff -rc minidlna-1.0.24/genconfig.sh minidlna-1.0.24-new/genconfig.sh +*** minidlna-1.0.24/genconfig.sh 2012-06-24 20:08:26.697884140 +0200 +--- minidlna-1.0.24-new/genconfig.sh 2012-06-24 20:10:44.742874979 +0200 +*************** +*** 38,68 **** + + ${RM} ${CONFIGFILE} + +- # Detect if there are missing headers +- # NOTE: This check only works with a normal distro +- [ ! -e "/usr/include/sqlite3.h" ] && MISSING="libsqlite3 $MISSING" +- [ ! -e "/usr/include/jpeglib.h" ] && MISSING="libjpeg $MISSING" +- [ ! -e "/usr/include/libexif/exif-loader.h" ] && MISSING="libexif $MISSING" +- [ ! -e "/usr/include/id3tag.h" ] && MISSING="libid3tag $MISSING" +- [ ! -e "/usr/include/ogg/ogg.h" ] && MISSING="libogg $MISSING" +- [ ! -e "/usr/include/vorbis/codec.h" ] && MISSING="libvorbis $MISSING" +- [ ! -e "/usr/include/FLAC/metadata.h" ] && MISSING="libflac $MISSING" +- [ ! -e "/usr/include/ffmpeg/avutil.h" -a \ +- ! -e "/usr/include/libavutil/avutil.h" -a \ +- ! -e "/usr/include/ffmpeg/libavutil/avutil.h" ] && MISSING="libavutil $MISSING" +- [ ! -e "/usr/include/ffmpeg/avformat.h" -a \ +- ! -e "/usr/include/libavformat/avformat.h" -a \ +- ! -e "/usr/include/ffmpeg/libavformat/avformat.h" ] && MISSING="libavformat $MISSING" +- [ ! -e "/usr/include/ffmpeg/avcodec.h" -a \ +- ! -e "/usr/include/libavcodec/avcodec.h" -a \ +- ! -e "/usr/include/ffmpeg/libavcodec/avcodec.h" ] && MISSING="libavcodec $MISSING" +- if [ -n "$MISSING" ]; then +- echo -e "\nERROR! Cannot continue." +- echo -e "The following required libraries are either missing, or are missing development headers:\n" +- echo -e "$MISSING\n" +- exit 1 +- fi +- + echo "/* MiniDLNA Project" >> ${CONFIGFILE} + echo " * http://sourceforge.net/projects/minidlna/" >> ${CONFIGFILE} + echo " * (c) 2008-2009 Justin Maggard" >> ${CONFIGFILE} +--- 38,43 ---- +diff -rc minidlna-1.0.24/Makefile minidlna-1.0.24-new/Makefile +*** minidlna-1.0.24/Makefile 2012-06-24 20:16:08.673195909 +0200 +--- minidlna-1.0.24-new/Makefile 2012-06-24 20:16:18.615267052 +0200 +*************** +*** 64,70 **** + $(INSTALL) -d $(ETCINSTALLDIR) + $(INSTALL) --mode=0644 minidlna.conf $(ETCINSTALLDIR) + +! minidlna: $(BASEOBJS) $(LNXOBJS) $(LIBS) + @echo Linking $@ + @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(BASEOBJS) $(LNXOBJS) $(LIBS) + +--- 64,70 ---- + $(INSTALL) -d $(ETCINSTALLDIR) + $(INSTALL) --mode=0644 minidlna.conf $(ETCINSTALLDIR) + +! minidlna: $(BASEOBJS) $(LNXOBJS) + @echo Linking $@ + @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(BASEOBJS) $(LNXOBJS) $(LIBS) + diff --git a/pkgs/tools/networking/minidlna/default.nix b/pkgs/tools/networking/minidlna/default.nix new file mode 100644 index 00000000000..736ca980cfb --- /dev/null +++ b/pkgs/tools/networking/minidlna/default.nix @@ -0,0 +1,28 @@ +{stdenv, fetchurl, libav, flac, libvorbis, libogg, libid3tag, libexif, libjpeg, sqlite }: +stdenv.mkDerivation rec { + name = "minidlna-1.0.24"; + src = fetchurl { + url = mirror://sourceforge/project/minidlna/minidlna/1.0.24/minidlna_1.0.24_src.tar.gz; + sha256 = "0hmrrrq7d8940rckwj93bcdpdxxy3qfkjl17j5k31mi37hqc42l4"; + }; + + preConfigure = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libav}/include/libavutil -I${libav}/include/libavcodec -I${libav}/include/libavformat" + export makeFlags="INSTALLPREFIX=$out" + ''; + + buildInputs = [ libav flac libvorbis libogg libid3tag libexif libjpeg sqlite ]; + patches = [ ./config.patch ]; + + meta = { + description = "MiniDLNA Media Server"; + longDescription = '' + MiniDLNA (aka ReadyDLNA) is server software with the aim of being fully + compliant with DLNA/UPnP-AV clients. + ''; + homepage = http://sourceforge.net/projects/minidlna/; + license = stdenv.lib.licenses.gpl2; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45df41e84bd..64829164584 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -947,6 +947,8 @@ let less = callPackage ../tools/misc/less { }; + minidlna = callPackage ../tools/networking/minidlna { }; + most = callPackage ../tools/misc/most { }; netperf = callPackage ../applications/networking/netperf { }; From 484c13cce19c7c2894f6d63270685048e933807a Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 25 Jun 2012 11:40:17 +0200 Subject: [PATCH 395/403] nixUnstable: Updated to 1.1pre2718_8da6772 This version brings better isolation in chroot builds (private network and SysV IPC namespace). --- pkgs/tools/package-management/nix/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 4442deb36bc..a5466114358 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.1pre2714_2f3f413"; + name = "nix-1.1pre2718_8da6772"; src = fetchurl { - url = "http://hydra.nixos.org/build/2724747/download/4/${name}.tar.bz2"; - sha256 = "ec026709405dfcbff387418c007915711312ac574c046c38798990666bd339a6"; + url = "http://hydra.nixos.org/build/2727338/download/4/${name}.tar.bz2"; + sha256 = "99466467b01102d8a2e1022283259ac490427b9a45c3c4784af027977014d7c5"; }; buildNativeInputs = [ perl pkgconfig ]; From 019963b256f6d1983357926fd53d8d39c7374a94 Mon Sep 17 00:00:00 2001 From: Antono Vasiljev Date: Mon, 25 Jun 2012 15:34:05 +0300 Subject: [PATCH 396/403] Fix ikarus download url (ikarus-scheme.org is down) --- pkgs/development/compilers/ikarus/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ikarus/default.nix b/pkgs/development/compilers/ikarus/default.nix index bf63dfd2082..4c3845f9ee5 100644 --- a/pkgs/development/compilers/ikarus/default.nix +++ b/pkgs/development/compilers/ikarus/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, gmp }: stdenv.mkDerivation rec { - name = "ikarus-0.0.3"; + version = "0.0.3"; + name = "ikarus-${version}"; src = fetchurl { - url = "http://ikarus-scheme.org/${name}.tar.gz"; + url = "http://launchpad.net/ikarus/0.0/${version}/+download/${name}.tar.gz"; sha256 = "0d4vqwqfnj39l0gar2di021kcf6bfpkc6g40yapkmxm6sxpdcvjv"; }; From e6e6301c5f80a845282fba673d003f57d8466f58 Mon Sep 17 00:00:00 2001 From: Antono Vasiljev Date: Mon, 25 Jun 2012 16:46:26 +0300 Subject: [PATCH 397/403] Vala 14, 15, 16, 17. Default is 17 now --- pkgs/development/compilers/vala/14.2.nix | 22 +++++++++++++++++++++ pkgs/development/compilers/vala/15.2.nix | 22 +++++++++++++++++++++ pkgs/development/compilers/vala/16.1.nix | 22 +++++++++++++++++++++ pkgs/development/compilers/vala/default.nix | 9 ++++++--- pkgs/top-level/all-packages.nix | 8 +++++++- 5 files changed, 79 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/compilers/vala/14.2.nix create mode 100644 pkgs/development/compilers/vala/15.2.nix create mode 100644 pkgs/development/compilers/vala/16.1.nix diff --git a/pkgs/development/compilers/vala/14.2.nix b/pkgs/development/compilers/vala/14.2.nix new file mode 100644 index 00000000000..ffdf7b1aeb8 --- /dev/null +++ b/pkgs/development/compilers/vala/14.2.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl, yacc, flex, pkgconfig, glib, xz}: + +stdenv.mkDerivation rec { + name = "vala-0.14.2"; + + src = fetchurl { + url = mirror://gnome/sources/vala/0.14/vala-0.14.2.tar.xz; + sha256 = "1l5kllw9vpwv24lzv9fp64l3sad46wpxgvsgryrwlrjg91w6jzl0"; + }; + + buildNativeInputs = [ yacc flex pkgconfig xz ]; + + buildInputs = [ glib ]; + + meta = { + description = "Compiler for the GObject type system"; + homepage = "http://live.gnome.org/Vala"; + license = "free-copyleft"; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.antono ]; + }; +} diff --git a/pkgs/development/compilers/vala/15.2.nix b/pkgs/development/compilers/vala/15.2.nix new file mode 100644 index 00000000000..55c61c3b321 --- /dev/null +++ b/pkgs/development/compilers/vala/15.2.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl, yacc, flex, pkgconfig, glib, xz}: + +stdenv.mkDerivation rec { + name = "vala-0.15.2"; + + src = fetchurl { + url = mirror://gnome/sources/vala/0.15/vala-0.15.2.tar.xz; + sha256 = "0g71zq6dpqrw2f40wfzdf18fdw41ymr17laqniy2kr622hkxdi8w"; + }; + + buildNativeInputs = [ yacc flex pkgconfig xz ]; + + buildInputs = [ glib ]; + + meta = { + description = "Compiler for the GObject type system"; + homepage = "http://live.gnome.org/Vala"; + license = "free-copyleft"; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.antono ]; + }; +} diff --git a/pkgs/development/compilers/vala/16.1.nix b/pkgs/development/compilers/vala/16.1.nix new file mode 100644 index 00000000000..70422798075 --- /dev/null +++ b/pkgs/development/compilers/vala/16.1.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl, yacc, flex, pkgconfig, glib, xz}: + +stdenv.mkDerivation rec { + name = "vala-0.16.1"; + + src = fetchurl { + url = mirror://gnome/sources/vala/0.16/vala-0.16.1.tar.xz; + sha256 = "1n708n9ixyy9qrzyv1wf4ybvcclx43ib9ki028wwpvkz6kv8zqlb"; + }; + + buildNativeInputs = [ yacc flex pkgconfig xz ]; + + buildInputs = [ glib ]; + + meta = { + description = "Compiler for the GObject type system"; + homepage = "http://live.gnome.org/Vala"; + license = "free-copyleft"; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.antono ]; + }; +} diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 0aaab91cd81..12b01baf53d 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, yacc, flex, pkgconfig, glib, xz}: stdenv.mkDerivation rec { - name = "vala-0.14.2"; + name = "vala-0.17.2"; src = fetchurl { - url = mirror://gnome/sources/vala/0.14/vala-0.14.2.tar.xz; - sha256 = "1l5kllw9vpwv24lzv9fp64l3sad46wpxgvsgryrwlrjg91w6jzl0"; + url = mirror://gnome/sources/vala/0.17/vala-0.17.2.tar.xz; + sha256 = "09i2s0dwmrk147ind2dx7nq845g12fp6fsjqrphhrr0dbi0zzgh3"; }; buildNativeInputs = [ yacc flex pkgconfig xz ]; @@ -15,5 +15,8 @@ stdenv.mkDerivation rec { meta = { description = "Compiler for the GObject type system"; homepage = "http://live.gnome.org/Vala"; + license = "free-copyleft"; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.antono ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 64829164584..c22a40953ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2500,7 +2500,13 @@ let urweb = callPackage ../development/compilers/urweb { }; - vala = callPackage ../development/compilers/vala { }; + vala14 = callPackage ../development/compilers/vala/14.2.nix { }; + + vala15 = callPackage ../development/compilers/vala/15.2.nix { }; + + vala16 = callPackage ../development/compilers/vala/16.1.nix { }; + + vala = callPackage ../development/compilers/vala/default.nix { }; visualcpp = callPackage ../development/compilers/visual-c++ { }; From 182f0dfe5e24ab00e12b0af39722e25abb7ec737 Mon Sep 17 00:00:00 2001 From: Antono Vasiljev Date: Mon, 25 Jun 2012 17:25:01 +0300 Subject: [PATCH 398/403] Added bsod emulator for unix --- pkgs/misc/emulators/bsod/builder.sh | 8 ++++++++ pkgs/misc/emulators/bsod/default.nix | 28 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 38 insertions(+) create mode 100644 pkgs/misc/emulators/bsod/builder.sh create mode 100644 pkgs/misc/emulators/bsod/default.nix diff --git a/pkgs/misc/emulators/bsod/builder.sh b/pkgs/misc/emulators/bsod/builder.sh new file mode 100644 index 00000000000..05637db6771 --- /dev/null +++ b/pkgs/misc/emulators/bsod/builder.sh @@ -0,0 +1,8 @@ +source $stdenv/setup + +tar xvfz $src +cd bsod-* +make +mkdir -p $out/bin +cp bsod $out/bin + diff --git a/pkgs/misc/emulators/bsod/default.nix b/pkgs/misc/emulators/bsod/default.nix new file mode 100644 index 00000000000..7dd1e31b36c --- /dev/null +++ b/pkgs/misc/emulators/bsod/default.nix @@ -0,0 +1,28 @@ +{stdenv, fetchurl, ncurses}: + +stdenv.mkDerivation { + name = "bsod-0.1"; + + builder = ./builder.sh; + + src = fetchurl { + url = http://www.vanheusden.com/bsod/bsod-0.1.tgz; + sha256 = "0hqwacazyq5rhc04j8w8w0j0dgb6ca8k66c9lxf6bsyi6wvbhvmd"; + }; + + buildInputs = [ ncurses ]; + + meta = { + description = "Blue Screen Of Death emulator for Unix"; + longDescription = " + This program will let you UNIX user experience the authentic + microsoft windows experience. Bsod displays the famous windows xp + blue screen of death on the console. Errors and drivers causing the + error are selected randomly from a large set of examples."; + homepage = "http://www.vanheusden.com/bsod/"; + license = "GPLv2"; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.antono ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 64829164584..e56c8465f47 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -437,6 +437,8 @@ let bootchart = callPackage ../tools/system/bootchart { }; + bsod = callPackage ../misc/emulators/bsod { }; + btrfsProgs = builderDefsPackage (import ../tools/filesystems/btrfsprogs) { inherit (pkgs) libuuid zlib acl attr fetchgit e2fsprogs; }; From 584ff70a169ec98c25b3aa62b16bc825c132bc6b Mon Sep 17 00:00:00 2001 From: Antono Vasiljev Date: Mon, 25 Jun 2012 18:04:08 +0300 Subject: [PATCH 399/403] Use installPhase instead of builder for BSOD --- pkgs/misc/emulators/bsod/builder.sh | 8 -------- pkgs/misc/emulators/bsod/default.nix | 7 +++++-- 2 files changed, 5 insertions(+), 10 deletions(-) delete mode 100644 pkgs/misc/emulators/bsod/builder.sh diff --git a/pkgs/misc/emulators/bsod/builder.sh b/pkgs/misc/emulators/bsod/builder.sh deleted file mode 100644 index 05637db6771..00000000000 --- a/pkgs/misc/emulators/bsod/builder.sh +++ /dev/null @@ -1,8 +0,0 @@ -source $stdenv/setup - -tar xvfz $src -cd bsod-* -make -mkdir -p $out/bin -cp bsod $out/bin - diff --git a/pkgs/misc/emulators/bsod/default.nix b/pkgs/misc/emulators/bsod/default.nix index 7dd1e31b36c..181a89b6667 100644 --- a/pkgs/misc/emulators/bsod/default.nix +++ b/pkgs/misc/emulators/bsod/default.nix @@ -3,8 +3,6 @@ stdenv.mkDerivation { name = "bsod-0.1"; - builder = ./builder.sh; - src = fetchurl { url = http://www.vanheusden.com/bsod/bsod-0.1.tgz; sha256 = "0hqwacazyq5rhc04j8w8w0j0dgb6ca8k66c9lxf6bsyi6wvbhvmd"; @@ -12,6 +10,11 @@ stdenv.mkDerivation { buildInputs = [ ncurses ]; + installPhase = '' + ensureDir $out/bin + cp bsod $out/bin + ''; + meta = { description = "Blue Screen Of Death emulator for Unix"; longDescription = " From 6a1d4504ad14bec71dbd852978c66cd3b1d95ecf Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 25 Jun 2012 11:24:05 -0400 Subject: [PATCH 400/403] Fix duplicate ID --- doc/package-notes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/package-notes.xml b/doc/package-notes.xml index 9a687464b59..9d2cd0ef16b 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -1,6 +1,6 @@ + xml:id="chap-package-notes"> Package Notes From 58738223ab0de7c8df5091f38b01161c194b3b9a Mon Sep 17 00:00:00 2001 From: Antono Vasiljev Date: Mon, 25 Jun 2012 19:01:51 +0300 Subject: [PATCH 401/403] Rm vala 14 add versions --- pkgs/development/compilers/vala/14.2.nix | 22 --------------------- pkgs/development/compilers/vala/15.2.nix | 6 ++++-- pkgs/development/compilers/vala/16.1.nix | 6 ++++-- pkgs/development/compilers/vala/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 ++-- 5 files changed, 14 insertions(+), 30 deletions(-) delete mode 100644 pkgs/development/compilers/vala/14.2.nix diff --git a/pkgs/development/compilers/vala/14.2.nix b/pkgs/development/compilers/vala/14.2.nix deleted file mode 100644 index ffdf7b1aeb8..00000000000 --- a/pkgs/development/compilers/vala/14.2.nix +++ /dev/null @@ -1,22 +0,0 @@ -{stdenv, fetchurl, yacc, flex, pkgconfig, glib, xz}: - -stdenv.mkDerivation rec { - name = "vala-0.14.2"; - - src = fetchurl { - url = mirror://gnome/sources/vala/0.14/vala-0.14.2.tar.xz; - sha256 = "1l5kllw9vpwv24lzv9fp64l3sad46wpxgvsgryrwlrjg91w6jzl0"; - }; - - buildNativeInputs = [ yacc flex pkgconfig xz ]; - - buildInputs = [ glib ]; - - meta = { - description = "Compiler for the GObject type system"; - homepage = "http://live.gnome.org/Vala"; - license = "free-copyleft"; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.antono ]; - }; -} diff --git a/pkgs/development/compilers/vala/15.2.nix b/pkgs/development/compilers/vala/15.2.nix index 55c61c3b321..822102b7bd4 100644 --- a/pkgs/development/compilers/vala/15.2.nix +++ b/pkgs/development/compilers/vala/15.2.nix @@ -1,10 +1,12 @@ {stdenv, fetchurl, yacc, flex, pkgconfig, glib, xz}: stdenv.mkDerivation rec { - name = "vala-0.15.2"; + + version = "0.15.2"; + name = "vala-${version}"; src = fetchurl { - url = mirror://gnome/sources/vala/0.15/vala-0.15.2.tar.xz; + url = "mirror://gnome/sources/vala/0.15/${name}.tar.xz"; sha256 = "0g71zq6dpqrw2f40wfzdf18fdw41ymr17laqniy2kr622hkxdi8w"; }; diff --git a/pkgs/development/compilers/vala/16.1.nix b/pkgs/development/compilers/vala/16.1.nix index 70422798075..54e6af8798d 100644 --- a/pkgs/development/compilers/vala/16.1.nix +++ b/pkgs/development/compilers/vala/16.1.nix @@ -1,10 +1,12 @@ {stdenv, fetchurl, yacc, flex, pkgconfig, glib, xz}: stdenv.mkDerivation rec { - name = "vala-0.16.1"; + + version = "0.16.1"; + name = "vala-${version}"; src = fetchurl { - url = mirror://gnome/sources/vala/0.16/vala-0.16.1.tar.xz; + url = "mirror://gnome/sources/vala/0.16/${name}.tar.xz"; sha256 = "1n708n9ixyy9qrzyv1wf4ybvcclx43ib9ki028wwpvkz6kv8zqlb"; }; diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 12b01baf53d..a60a71e3580 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -1,10 +1,12 @@ {stdenv, fetchurl, yacc, flex, pkgconfig, glib, xz}: stdenv.mkDerivation rec { - name = "vala-0.17.2"; + + version = "0.17.2"; + name = "vala-${version}"; src = fetchurl { - url = mirror://gnome/sources/vala/0.17/vala-0.17.2.tar.xz; + url = "mirror://gnome/sources/vala/0.17/${name}.tar.xz"; sha256 = "09i2s0dwmrk147ind2dx7nq845g12fp6fsjqrphhrr0dbi0zzgh3"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c22a40953ed..fbee8a05152 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2500,13 +2500,13 @@ let urweb = callPackage ../development/compilers/urweb { }; - vala14 = callPackage ../development/compilers/vala/14.2.nix { }; + vala = vala17; vala15 = callPackage ../development/compilers/vala/15.2.nix { }; vala16 = callPackage ../development/compilers/vala/16.1.nix { }; - vala = callPackage ../development/compilers/vala/default.nix { }; + vala17 = callPackage ../development/compilers/vala/default.nix { }; visualcpp = callPackage ../development/compilers/visual-c++ { }; From 2ead90a36bdb70a115257445e69c5c1d765deda9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 25 Jun 2012 15:28:00 -0400 Subject: [PATCH 402/403] pan: Updated to 0.138 --- pkgs/applications/networking/newsreaders/pan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index 0f2f1ae985f..ae6e7dd4681 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -5,14 +5,14 @@ assert spellChecking -> gtkspell != null; -let version = "0.137"; in +let version = "0.138"; in stdenv.mkDerivation { name = "pan-${version}"; src = fetchurl { url = "http://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2"; - sha1 = "372f1f6406e2fcd9ce413774730975560f546fcf"; + sha1 = "8ad70d0b2bfb771eb7af1f973af6520f9998591a"; }; buildInputs = [ pkgconfig gtk perl gmime gettext intltool dbus_glib libnotify ] From f5a5915f6e3e1756b4ce78d38c2655a912e156c4 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 27 Jun 2012 16:39:14 +0200 Subject: [PATCH 403/403] Work around SSP build failure in glibc214, too. Glibc 2.14 also produces a build failure in Hydra, so we need to apply the same fix here, too. --- pkgs/development/libraries/glibc/2.14/common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/glibc/2.14/common.nix b/pkgs/development/libraries/glibc/2.14/common.nix index a8d0f661b72..ab3ef7c42f4 100644 --- a/pkgs/development/libraries/glibc/2.14/common.nix +++ b/pkgs/development/libraries/glibc/2.14/common.nix @@ -97,6 +97,7 @@ stdenv.mkDerivation ({ "--enable-add-ons" "--sysconfdir=/etc" "--localedir=/var/run/current-system/sw/lib/locale" + "libc_cv_ssp=no" (if kernelHeaders != null then "--with-headers=${kernelHeaders}/include" else "--without-headers")