diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 34 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-defaults.nix | 20 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 72 | ||||
| -rw-r--r-- | pkgs/top-level/perl-packages.nix | 155 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 52 |
5 files changed, 214 insertions, 119 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1a610e45aeb..74f829386c11 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1451,6 +1451,8 @@ let ntop = callPackage ../tools/networking/ntop { }; + ntopng = callPackage ../tools/networking/ntopng { }; + ntp = callPackage ../tools/networking/ntp { }; numdiff = callPackage ../tools/text/numdiff { }; @@ -1675,6 +1677,8 @@ let radvd = callPackage ../tools/networking/radvd { }; + ranger = callPackage ../applications/misc/ranger { }; + privateer = callPackage ../games/privateer { }; rtmpdump = callPackage ../tools/video/rtmpdump { }; @@ -1779,6 +1783,8 @@ let shebangfix = callPackage ../tools/misc/shebangfix { }; + shellinabox = callPackage ../servers/shellinabox { }; + siege = callPackage ../tools/networking/siege {}; silc_client = callPackage ../applications/networking/instant-messengers/silc-client { }; @@ -1896,6 +1902,8 @@ let tinc = callPackage ../tools/networking/tinc { }; + tmpwatch = callPackage ../tools/misc/tmpwatch { }; + tmux = callPackage ../tools/misc/tmux { }; tor = callPackage ../tools/security/tor { }; @@ -3210,6 +3218,7 @@ let love = callPackage ../development/interpreters/love {lua=lua5;}; love_luajit = callPackage ../development/interpreters/love {lua=luajit;}; + love_0_9 = callPackage ../development/interpreters/love/0.9.nix { }; lua4 = callPackage ../development/interpreters/lua-4 { }; lua5_0 = callPackage ../development/interpreters/lua-5/5.0.3.nix { }; @@ -3835,6 +3844,8 @@ let uncrustify = callPackage ../development/tools/misc/uncrustify { }; + vagrant = callPackage ../development/tools/vagrant { }; + gdb = callPackage ../development/tools/misc/gdb { hurd = gnu.hurdCross; inherit (gnu) mig; @@ -5739,6 +5750,8 @@ let stlink = callPackage ../development/tools/misc/stlink { }; + stepmania = callPackage ../games/stepmania {}; + stlport = callPackage ../development/libraries/stlport { }; strigi = callPackage ../development/libraries/strigi { clucene_core = clucene_core_2; }; @@ -5777,6 +5790,8 @@ let telepathy_qt = callPackage ../development/libraries/telepathy/qt { }; + thrift = callPackage ../development/libraries/thrift { }; + tinyxml = tinyxml2; tinyxml2 = callPackage ../development/libraries/tinyxml/2.6.2.nix { }; @@ -6027,7 +6042,9 @@ let ### DEVELOPMENT / LISP MODULES - asdf = callPackage ../development/lisp-modules/asdf {}; + asdf = callPackage ../development/lisp-modules/asdf { + texLive = null; + }; clwrapperFunction = callPackage ../development/lisp-modules/clwrapper; wrapLisp = lisp: clwrapperFunction {lisp=lisp;}; lispPackagesFor = clwrapper: callPackage ../development/lisp-modules/lisp-packages.nix{ @@ -7698,6 +7715,8 @@ let patches = config.dwm.patches or []; }; + dzen2 = callPackage ../applications/window-managers/dzen2 { }; + eaglemode = callPackage ../applications/misc/eaglemode { }; eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { }); @@ -7933,6 +7952,8 @@ let fftw = fftwSinglePrec; }; + photivo = callPackage ../applications/graphics/photivo { }; + wavesurfer = callPackage ../applications/misc/audio/wavesurfer { }; wireshark = callPackage ../applications/networking/sniffers/wireshark { }; @@ -7978,6 +7999,7 @@ let freecad = callPackage ../applications/graphics/freecad { opencascade = opencascade_6_5; + inherit (pythonPackages) matplotlib pycollada; }; freemind = callPackage ../applications/misc/freemind { @@ -8095,6 +8117,7 @@ let }; graphicsmagick = callPackage ../applications/graphics/graphicsmagick { }; + graphicsmagick_q16 = callPackage ../applications/graphics/graphicsmagick { quantumdepth = 16; }; graphicsmagick137 = callPackage ../applications/graphics/graphicsmagick/1.3.7.nix { libpng = libpng12; @@ -8427,6 +8450,8 @@ let mmex = callPackage ../applications/office/mmex { }; + moc = callPackage ../applications/audio/moc { }; + monkeysAudio = callPackage ../applications/audio/monkeys-audio { }; monodevelop = callPackage ../applications/editors/monodevelop { @@ -8493,6 +8518,13 @@ let # !!! should depend on MPlayer }; + mpv = callPackage ../applications/video/mpv { + ffmpeg = ffmpeg_1; + bs2bSupport = true; + quviSupport = true; + cacaSupport = true; + }; + mrxvt = callPackage ../applications/misc/mrxvt { }; multisync = callPackage ../applications/misc/multisync { diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 19fcb98c82d9..2dd5b0ca3df1 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -63,6 +63,10 @@ prettyShow = self.prettyShow_1_2; bmp = self.bmp_1_2_2_1; Cabal_1_18_1_2 = self.Cabal_1_18_1_2.override { deepseq = self.deepseq_1_3_0_2; }; + quickcheckIo = self.quickcheckIo.override { + HUnit = self.HUnit_1_2_5_2; + QuickCheck = self.QuickCheck2; + }; }; ghc703Prefs = @@ -75,6 +79,10 @@ prettyShow = self.prettyShow_1_2; bmp = self.bmp_1_2_2_1; Cabal_1_18_1_2 = self.Cabal_1_18_1_2.override { deepseq = self.deepseq_1_3_0_2; }; + quickcheckIo = self.quickcheckIo.override { + HUnit = self.HUnit_1_2_5_2; + QuickCheck = self.QuickCheck2; + }; }; ghc702Prefs = ghc701Prefs; @@ -89,6 +97,10 @@ prettyShow = self.prettyShow_1_2; bmp = self.bmp_1_2_2_1; Cabal_1_18_1_2 = self.Cabal_1_18_1_2.override { deepseq = self.deepseq_1_3_0_2; }; + quickcheckIo = self.quickcheckIo.override { + HUnit = self.HUnit_1_2_5_2; + QuickCheck = self.QuickCheck2; + }; }; ghc6123Prefs = ghc6122Prefs; @@ -108,6 +120,10 @@ mtl = self.mtl_2_1_2; HTTP = self.HTTP_4000_1_1.override { mtl = self.mtl_2_1_2; }; }; + quickcheckIo = self.quickcheckIo.override { + HUnit = self.HUnit_1_2_5_2; + QuickCheck = self.QuickCheck2; + }; }; ghc6121Prefs = @@ -127,6 +143,10 @@ mtl = self.mtl_2_1_2; HTTP = self.HTTP_4000_1_1.override { mtl = self.mtl_2_1_2; }; }; + quickcheckIo = self.quickcheckIo.override { + HUnit = self.HUnit_1_2_5_2; + QuickCheck = self.QuickCheck2; + }; }; ghc6104Prefs = diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 40446bcd3660..5078076350d6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -63,6 +63,7 @@ , enableSharedLibraries ? pkgs.stdenv.lib.versionOlder "7.7" ghc.version , enableSharedExecutables ? pkgs.stdenv.lib.versionOlder "7.7" ghc.version , enableCheckPhase ? pkgs.stdenv.lib.versionOlder "7.4" ghc.version +, enableStaticLibraries ? true }: # We redefine callPackage to take into account the new scope. The optional @@ -113,10 +114,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x # packages. It isn't the Cabal library, which is spelled "Cabal". cabal = callPackage ../build-support/cabal { - inherit enableLibraryProfiling; - inherit enableSharedLibraries; - inherit enableSharedExecutables; - inherit enableCheckPhase; + inherit enableLibraryProfiling enableCheckPhase + enableStaticLibraries enableSharedLibraries enableSharedExecutables; glibcLocales = if pkgs.stdenv.isLinux then pkgs.glibcLocales else null; }; @@ -142,9 +141,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x haskellPlatformArgs_future = self : { inherit (self) cabal ghc; - async = self.async_2_0_1_4; + async = self.async_2_0_1_5; attoparsec = self.attoparsec_0_10_4_0; - caseInsensitive = self.caseInsensitive_1_1_0_1; + caseInsensitive = self.caseInsensitive_1_1_0_2; cgi = self.cgi_3001_1_8_4; fgl = self.fgl_5_4_2_4; GLUT = self.GLUT_2_5_0_2; @@ -152,14 +151,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x haskellSrc = self.haskellSrc_1_0_1_5; hashable = self.hashable_1_2_1_0; html = self.html_1_0_1_2; - HTTP = self.HTTP_4000_2_9; + HTTP = self.HTTP_4000_2_10; HUnit = self.HUnit_1_2_5_2; mtl = self.mtl_2_1_2; network = self.network_2_4_2_1; OpenGL = self.OpenGL_2_9_1_0; OpenGLRaw = self.OpenGLRaw_1_4_0_0; parallel = self.parallel_3_2_0_4; - parsec = self.parsec_3_1_3; + parsec = self.parsec_3_1_4; QuickCheck = self.QuickCheck_2_6; random = self.random_1_0_1_1; regexBase = self.regexBase_0_93_2; @@ -168,7 +167,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x split = self.split_0_2_2; stm = self.stm_2_4_2; syb = self.syb_0_4_1; - text = self.text_0_11_3_1; + text = self.text_1_0_0_0; transformers = self.transformers_0_3_0_0; # this has become a core package in GHC 7.7 unorderedContainers = self.unorderedContainers_0_2_3_3; vector = self.vector_0_10_9_1; @@ -176,7 +175,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x zlib = self.zlib_0_5_4_1; cabalInstall = self.cabalInstall_1_18_0_2; alex = self.alex_3_1_3; - haddock = self.haddock_2_13_2; + haddock = self.haddock_2_13_2_1; happy = self.happy_1_19_2; primitive = self.primitive_0_5_1_0; # semi-official, but specified }; @@ -549,6 +548,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x arrows = callPackage ../development/libraries/haskell/arrows {}; + assertFailure = callPackage ../development/libraries/haskell/assert-failure {}; + asn1Data = callPackage ../development/libraries/haskell/asn1-data {}; asn1Types = callPackage ../development/libraries/haskell/asn1-types {}; @@ -557,7 +558,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x async_2_0_1_3 = callPackage ../development/libraries/haskell/async/2.0.1.3.nix {}; async_2_0_1_4 = callPackage ../development/libraries/haskell/async/2.0.1.4.nix {}; - async = self.async_2_0_1_4; + async_2_0_1_5 = callPackage ../development/libraries/haskell/async/2.0.1.5.nix {}; + async = self.async_2_0_1_5; atomicPrimops = callPackage ../development/libraries/haskell/atomic-primops {}; @@ -687,8 +689,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x cassava = callPackage ../development/libraries/haskell/cassava {}; caseInsensitive_1_0_0_1 = callPackage ../development/libraries/haskell/case-insensitive/1.0.0.1.nix {}; - caseInsensitive_1_1_0_1 = callPackage ../development/libraries/haskell/case-insensitive/1.1.0.1.nix {}; - caseInsensitive = self.caseInsensitive_1_1_0_1; + caseInsensitive_1_1_0_2 = callPackage ../development/libraries/haskell/case-insensitive/1.1.0.2.nix {}; + caseInsensitive = self.caseInsensitive_1_1_0_2; cautiousFile = callPackage ../development/libraries/haskell/cautious-file {}; @@ -963,10 +965,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x enummapset = callPackage ../development/libraries/haskell/enummapset {}; + enummapsetTh = callPackage ../development/libraries/haskell/enummapset-th {}; + entropy = callPackage ../development/libraries/haskell/entropy {}; erf = callPackage ../development/libraries/haskell/erf {}; + errorcallEqInstance = callPackage ../development/libraries/haskell/errorcall-eq-instance {}; + errors = callPackage ../development/libraries/haskell/errors {}; either = callPackage ../development/libraries/haskell/either {}; @@ -1216,11 +1222,19 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x HTTP_4000_2_3 = callPackage ../development/libraries/haskell/HTTP/4000.2.3.nix {}; HTTP_4000_2_5 = callPackage ../development/libraries/haskell/HTTP/4000.2.5.nix {}; HTTP_4000_2_8 = callPackage ../development/libraries/haskell/HTTP/4000.2.8.nix {}; - HTTP_4000_2_9 = callPackage ../development/libraries/haskell/HTTP/4000.2.9.nix {}; - HTTP = self.HTTP_4000_2_9; + HTTP_4000_2_10 = callPackage ../development/libraries/haskell/HTTP/4000.2.10.nix {}; + HTTP = self.HTTP_4000_2_10; httpAttoparsec = callPackage ../development/libraries/haskell/http-attoparsec {}; + httpClient = callPackage ../development/libraries/haskell/http-client {}; + + httpClientConduit = callPackage ../development/libraries/haskell/http-client-conduit {}; + + httpClientMultipart = callPackage ../development/libraries/haskell/http-client-multipart {}; + + httpClientTls = callPackage ../development/libraries/haskell/http-client-tls {}; + httpReverseProxy = callPackage ../development/libraries/haskell/http-reverse-proxy {}; hackageDb = callPackage ../development/libraries/haskell/hackage-db {}; @@ -1523,8 +1537,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x monadLogger = callPackage ../development/libraries/haskell/monad-logger {}; monadPar_0_1_0_3 = callPackage ../development/libraries/haskell/monad-par/0.1.0.3.nix {}; - monadPar_0_3_4_5 = callPackage ../development/libraries/haskell/monad-par/0.3.4.5.nix {}; - monadPar = self.monadPar_0_3_4_5; + monadPar_0_3_4_6 = callPackage ../development/libraries/haskell/monad-par/0.3.4.6.nix {}; + monadPar = self.monadPar_0_3_4_6; monadParExtras = callPackage ../development/libraries/haskell/monad-par-extras {}; @@ -1644,7 +1658,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x oeis = callPackage ../development/libraries/haskell/oeis {}; - OpenAL = callPackage ../development/libraries/haskell/OpenAL {}; + OpenAL = callPackage ../development/libraries/haskell/OpenAL { + OpenGL = self.OpenGL_2_9_1_0; + }; OpenGL_2_2_1_1 = callPackage ../development/libraries/haskell/OpenGL/2.2.1.1.nix {}; OpenGL_2_2_3_0 = callPackage ../development/libraries/haskell/OpenGL/2.2.3.0.nix {}; @@ -1652,7 +1668,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x OpenGL_2_4_0_2 = callPackage ../development/libraries/haskell/OpenGL/2.4.0.2.nix {}; OpenGL_2_6_0_1 = callPackage ../development/libraries/haskell/OpenGL/2.6.0.1.nix {}; OpenGL_2_8_0_0 = callPackage ../development/libraries/haskell/OpenGL/2.8.0.0.nix {}; - OpenGL_2_9_1_0 = callPackage ../development/libraries/haskell/OpenGL/2.9.1.0.nix {}; + OpenGL_2_9_1_0 = callPackage ../development/libraries/haskell/OpenGL/2.9.1.0.nix { + OpenGLRaw = self.OpenGLRaw_1_4_0_0; + }; OpenGL = self.OpenGL_2_9_1_0; OpenGLRaw_1_3_0_0 = callPackage ../development/libraries/haskell/OpenGLRaw/1.3.0.0.nix {}; @@ -1692,13 +1710,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x 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 {}; + parsec_3_1_4 = callPackage ../development/libraries/haskell/parsec/3.1.4.nix {}; parsec2 = self.parsec_2_1_0_1; - parsec3 = self.parsec_3_1_3; + parsec3 = self.parsec_3_1_4; parsec = self.parsec3; parsers_0_9 = callPackage ../development/libraries/haskell/parsers/0.9.nix {}; - parsers_0_10_1_1 = callPackage ../development/libraries/haskell/parsers/0.10.1.1.nix {}; - parsers = self.parsers_0_10_1_1; + parsers_0_10_1_2 = callPackage ../development/libraries/haskell/parsers/0.10.1.2.nix {}; + parsers = self.parsers_0_10_1_2; parsimony = callPackage ../development/libraries/haskell/parsimony {}; @@ -1763,8 +1782,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x ppm = callPackage ../development/libraries/haskell/ppm {}; prettyShow_1_2 = callPackage ../development/libraries/haskell/pretty-show/1.2.nix {}; - prettyShow_1_6_1 = callPackage ../development/libraries/haskell/pretty-show/1.6.1.nix {}; - prettyShow = self.prettyShow_1_6_1; + prettyShow_1_6_2 = callPackage ../development/libraries/haskell/pretty-show/1.6.2.nix { + happy = self.happy_1_19_2; + }; + prettyShow = self.prettyShow_1_6_2; punycode = callPackage ../development/libraries/haskell/punycode {}; @@ -2146,7 +2167,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x text_0_11_2_0 = callPackage ../development/libraries/haskell/text/0.11.2.0.nix {}; text_0_11_2_3 = callPackage ../development/libraries/haskell/text/0.11.2.3.nix {}; text_0_11_3_1 = callPackage ../development/libraries/haskell/text/0.11.3.1.nix {}; - text = self.text_0_11_3_1; + text_1_0_0_0 = callPackage ../development/libraries/haskell/text/1.0.0.0.nix {}; + text = self.text_1_0_0_0; textFormat = callPackage ../development/libraries/haskell/text-format {}; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 05a6aec35a22..6873e2145441 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -27,10 +27,10 @@ rec { ack = buildPerlPackage rec { - name = "ack-2.02"; + name = "ack-2.12"; src = fetchurl { url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz"; - sha256 = "de5560f2ce6334f3f83bef4ee942fdb09b792f05cf534fe67be3cb0431bf758f"; + sha256 = "0avxpgg1fvib4354d9a9710j63sgxpb5j07if5qr83apq9xx7wjj"; }; # use gnused so that the preCheck command passes buildInputs = stdenv.lib.optional stdenv.isDarwin [ gnused ]; @@ -107,10 +107,10 @@ rec { }; AnyEvent = buildPerlPackage { - name = "AnyEvent-7.04"; + name = "AnyEvent-7.05"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-7.04.tar.gz; - sha256 = "6a9d94fa61c7f5dc515c834eb224dbc6ce4123da8fd5bfa0cf3815f3f3e908b2"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-7.05.tar.gz; + sha256 = "0022y5xbn3dn5x0q1kzvx15icf3g1cqqljrfhyriy794a42fply6"; }; meta = { maintainers = with maintainers; [ ocharles ]; @@ -195,10 +195,10 @@ rec { }; ArrayCompare = buildPerlPackage { - name = "Array-Compare-1.16"; + name = "Array-Compare-1.18"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAVECROSS/Array-Compare-1.16.tar.gz; - sha256 = "1iwkn7d07a7vgl3jrv4f0glwapxcbdwwsy3aa6apgwam9119hl7q"; + url = mirror://cpan/authors/id/D/DA/DAVECROSS/Array-Compare-1.18.tar.gz; + sha256 = "0zbvr1bj9bp836b3g9s32193vvn53d03xv0zn317hz247skn15lh"; }; }; @@ -250,10 +250,10 @@ rec { autobox = pkgs.perlPackages.Autobox; Autobox = buildPerlPackage { - name = "autobox-2.79"; + name = "autobox-2.82"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHOCOLATE/autobox-2.79.tar.gz; - sha256 = "8acc8c4a69e1bbb05304d0832d483a07258597529072d869b5960193a2ab950f"; + url = mirror://cpan/authors/id/C/CH/CHOCOLATE/autobox-2.82.tar.gz; + sha256 = "0w008z8ych54czr6drmhqrrvikcfhra6ig3v1fhk36apq64p9k1p"; }; propagatedBuildInputs = [ ScopeGuard ]; meta = { @@ -997,10 +997,10 @@ rec { }; CGISession = buildPerlPackage rec { - name = "CGI-Session-4.46"; + name = "CGI-Session-4.48"; src = fetchurl { url = "mirror://cpan/authors/id/M/MA/MARKSTOS/${name}.tar.gz"; - sha256 = "c04b725be6a1b9bf22387cc6427eb951408ccba1c52471a43a80306f31e68e1b"; + sha256 = "1xsl2pz1jrh127pq0b01yffnj4mnp9nvkp88h5mndrscq9hn8xa6"; }; buildInputs = [ DBFile ]; }; @@ -1052,10 +1052,10 @@ rec { }; ClassAccessorGrouped = buildPerlPackage { - name = "Class-Accessor-Grouped-0.10009"; + name = "Class-Accessor-Grouped-0.10010"; src = fetchurl { - url = mirror://cpan/authors/id/R/RI/RIBASUSHI/Class-Accessor-Grouped-0.10009.tar.gz; - sha256 = "1cs6wvng9xxhmrps7qb7ccxswqkqskwj862dp4fqfra14aprlg4c"; + url = mirror://cpan/authors/id/R/RI/RIBASUSHI/Class-Accessor-Grouped-0.10010.tar.gz; + sha256 = "1hlfjfhagsksskv01viq1z14wlr0i4xl3nvznvq1qrnqwqxs4qi1"; }; buildInputs = [ TestException ]; propagatedBuildInputs = [ ClassXSAccessor ModuleRuntime SubName ]; @@ -1302,10 +1302,10 @@ rec { }; CommonSense = buildPerlPackage rec { - name = "common-sense-3.6"; + name = "common-sense-3.72"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/common-sense-3.6.tar.gz; - sha256 = "0nkbp1by0mpvg1x6053fbh9dl8nnswlyfmqp8k2lppd717hw5ql6"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/common-sense-3.72.tar.gz; + sha256 = "16q95qrjksyykdn3mfj9vx26kb6c3hg97scmcbd00hfbk332xyd4"; }; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; @@ -1313,10 +1313,10 @@ rec { }; CompressRawBzip2 = buildPerlPackage { - name = "Compress-Raw-Bzip2-2.060"; + name = "Compress-Raw-Bzip2-2.063"; src = fetchurl { - url = mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Bzip2-2.060.tar.gz; - sha256 = "02azwhglk2w68aa47sjqhj6vwzi66mv4hwal87jccjfy17gcwvx7"; + url = mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Bzip2-2.063.tar.gz; + sha256 = "0qi2jg76pgx1qkh4897g746cxqjr2njzzbyv2k9pq4m1m2v3jr6s"; }; # Don't build a private copy of bzip2. @@ -1348,10 +1348,10 @@ rec { }; ConfigAny = buildPerlPackage rec { - name = "Config-Any-0.23"; + name = "Config-Any-0.24"; src = fetchurl { url = "mirror://cpan/modules/by-module/Config/${name}.tar.gz"; - sha256 = "17k62vdq3wr7m397ginp8525nqmlcjsmlqqpvnnfm3sr5vcxhjgz"; + sha256 = "06n6jn3q3xhk57icwip0ihzqixxav6sgp6rrb35hahj1z748y3vi"; }; }; @@ -1369,10 +1369,10 @@ rec { }; ConfigGeneral = buildPerlPackage { - name = "Config-General-2.51"; + name = "Config-General-2.52"; src = fetchurl { - url = mirror://cpan/authors/id/T/TL/TLINDEN/Config-General-2.51.tar.gz; - sha256 = "1khby072f10jbml0dlh82bg1s91ph8z6xa9bpk0l180q936k1xcg"; + url = mirror://cpan/authors/id/T/TL/TLINDEN/Config-General-2.52.tar.gz; + sha256 = "07rmabdh21ljyc9yy6gpjg4w1y0lzwz8daljf0jv2g521hpdfdwr"; }; meta = { license = "perl"; @@ -1543,10 +1543,10 @@ rec { }; CPANMetaRequirements = buildPerlPackage { - name = "CPAN-Meta-Requirements-2.122"; + name = "CPAN-Meta-Requirements-2.125"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-Requirements-2.122.tar.gz; - sha256 = "1fq2blw9ynja34fm9ck24m3qcpyk0hp25dhxvgs01k7yz64ryffh"; + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-Requirements-2.125.tar.gz; + sha256 = "1d6sryjkk52n4m8h7l0jc4hr9xrq2d02l8clzm48rq1h6j6q49hq"; }; buildInputs = [ TestMore ]; meta = { @@ -1584,27 +1584,27 @@ rec { }; CryptCBC = buildPerlPackage rec { - name = "Crypt-CBC-2.30"; + name = "Crypt-CBC-2.33"; src = fetchurl { url = "mirror://cpan/authors/id/L/LD/LDS/${name}.tar.gz"; - sha256 = "0cvigpxvwn18kb5i40jlp5fgijbhncvlh23xdgs1cnhxa17yrgwx"; + sha256 = "0ig698lmpjz7fslnznxm0609lvlnvf4f3s370082nzycnqhxww3a"; }; }; CryptDES = buildPerlPackage rec { - name = "Crypt-DES-2.05"; + name = "Crypt-DES-2.07"; src = fetchurl { url = "mirror://cpan/authors/id/D/DP/DPARIS/${name}.tar.gz"; - sha256 = "1w12k1b7868v3ql0yprswlz2qri6ja576k9wlda7b8zf2d0rxgmp"; + sha256 = "1rypxlhpd1jc0c327aghgl9y6ls47drmpvn0a40b4k3vhfsypc9d"; }; buildInputs = [CryptCBC]; }; CryptDHGMP = buildPerlPackage rec { - name = "Crypt-DH-GMP-0.00010"; + name = "Crypt-DH-GMP-0.00011"; src = fetchurl { url = "mirror://cpan/authors/id//D/DM/DMAKI/${name}.tar.gz"; - sha256 = "7d947cd48a98880df4fb5b0785758bef9ae1357eba7c376ad0fca3fd262a5fe9"; + sha256 = "0c9sz67lh2d2pn9z82hngzns4sqqnawdc8a1yl7p7pc0l4r0q3hz"; }; buildInputs = [ DevelChecklib TestRequires pkgs.gmp ]; NIX_CFLAGS_COMPILE = "-I${pkgs.gmp}/include"; @@ -1876,10 +1876,10 @@ rec { }; DataUUID = buildPerlPackage rec { - name = "Data-UUID-1.218"; + name = "Data-UUID-1.219"; src = fetchurl { url = "mirror://cpan/modules/by-module/Data/${name}.tar.gz"; - sha256 = "1cb4i0j48g5dk2dwzz32myl6wv4ngxqnrkdnixq80pzjcmz1qkpl"; + sha256 = "0a6s6qwc548c1ldf459i5z55fvxsrdi4rnc57d167wdbdydd6dn7"; }; }; @@ -1925,10 +1925,10 @@ rec { }; DateManip = buildPerlPackage { - name = "Date-Manip-6.41"; + name = "Date-Manip-6.42"; src = fetchurl { - url = mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.41.tar.gz; - sha256 = "f7f654d8a85836bfbb248e21dd2ad39e592aa259f247bf77ef791ff19360de09"; + url = mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.42.tar.gz; + sha256 = "18zkdvam3qddv810hgzszk2zxra14whl0fs03ba79babqhbpbzna"; }; propagatedBuildInputs = [ TestInter ]; meta = { @@ -4008,10 +4008,10 @@ rec { }; HTTPBody = buildPerlPackage { - name = "HTTP-Body-1.17"; + name = "HTTP-Body-1.19"; src = fetchurl { - url = mirror://cpan/authors/id/G/GE/GETTY/HTTP-Body-1.17.tar.gz; - sha256 = "1476zdcg1cdal3ik6ccwm3rqfgsdac6b63f92wmipvn8lkjdl70k"; + url = mirror://cpan/authors/id/G/GE/GETTY/HTTP-Body-1.19.tar.gz; + sha256 = "0ahhksj0zg6wq6glpjkxdr3byd5riwvq2f5aw21n1jcsl71nll01"; }; buildInputs = [ TestDeep ]; propagatedBuildInputs = [ HTTPMessage ]; @@ -5935,10 +5935,10 @@ rec { }; NetAddrIP = buildPerlPackage rec { - name = "NetAddr-IP-4.062"; + name = "NetAddr-IP-4.071"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIKER/${name}.tar.gz"; - sha256 = "08c037afe314ca2e6369f8aa92eb4b8937f493f977f9f1f35ca396c1de8ed0c6"; + sha256 = "0m8d8ccygpjhbsv00vjfz8cvkjcn8dws0k4x58vbvnbjdv3yhxb3"; }; }; @@ -6380,10 +6380,10 @@ rec { }; Parent = buildPerlPackage { - name = "parent-0.221"; + name = "parent-0.228"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/CORION/parent-0.221.tar.gz; - sha256 = "17jhscpa5p5szh1173pd6wvh2m05an1l941zqq9jkw9bzgk12hm0"; + url = mirror://cpan/authors/id/C/CO/CORION/parent-0.228.tar.gz; + sha256 = "0w0i02y4z8465z050kml57mvhv7c5gl8w8ivplhr3cms0zbaq87b"; }; }; @@ -6716,10 +6716,10 @@ rec { }; PodCoverageTrustPod = buildPerlPackage { - name = "Pod-Coverage-TrustPod-0.100002"; + name = "Pod-Coverage-TrustPod-0.100003"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Coverage-TrustPod-0.100002.tar.gz; - sha256 = "2389f8085c16087b10f59f1bd1b9de5d83cca5eb203778a2af1cee897b89bb6e"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Coverage-TrustPod-0.100003.tar.gz; + sha256 = "19lyc5a5hg3pqhw0k5fnd0q4l2mrdq0ck4kw1smjvwkccp24431z"; }; propagatedBuildInputs = [ PodCoverage PodEventual ]; meta = { @@ -7072,10 +7072,10 @@ rec { }; SetScalar = buildPerlPackage { - name = "Set-Scalar-1.25"; + name = "Set-Scalar-1.26"; src = fetchurl { - url = mirror://cpan/authors/id/J/JH/JHI/Set-Scalar-1.25.tar.gz; - sha256 = "1kbfy97j4cg0pprk8sgsh1fd505mdffn1jr9qbdmwqma8x4qvv7m"; + url = mirror://cpan/authors/id/J/JH/JHI/Set-Scalar-1.26.tar.gz; + sha256 = "121r9n8lqk081vjzn9ppm4zklz1l0c0v0ab94c05y5vrsn5l0zl8"; }; meta = { license = "perl"; @@ -7347,10 +7347,10 @@ rec { }; StringFlogger = buildPerlPackage { - name = "String-Flogger-1.101243"; + name = "String-Flogger-1.101244"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/String-Flogger-1.101243.tar.gz; - sha256 = "05e3f55198e96d56d27867b81c244d801a5d85e5b19b7acc3352993aefbd29fd"; + url = mirror://cpan/authors/id/R/RJ/RJBS/String-Flogger-1.101244.tar.gz; + sha256 = "0cx3d85sz1dqjvbczpf9wx0i1b05jwbxcg7lpq5qygdkblq85nzd"; }; propagatedBuildInputs = [ JSON ParamsUtil SubExporter ]; meta = { @@ -7369,10 +7369,10 @@ rec { }; StringFormatter = buildPerlPackage { - name = "String-Formatter-0.102082"; + name = "String-Formatter-0.102084"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/String-Formatter-0.102082.tar.gz; - sha256 = "93d787dd8f13832a3683d219e086eaf4eb6c5391e396bfcc364c414423b0051a"; + url = mirror://cpan/authors/id/R/RJ/RJBS/String-Formatter-0.102084.tar.gz; + sha256 = "0mlwm0rirv46gj4h072q8gdync5zxxsxy8p028gdyrhczl942dc3"; }; propagatedBuildInputs = [ ParamsUtil SubExporter ]; meta = { @@ -7426,10 +7426,10 @@ rec { }; StringTruncate = buildPerlPackage { - name = "String-Truncate-1.100600"; + name = "String-Truncate-1.100601"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/String-Truncate-1.100600.tar.gz; - sha256 = "e2665f82254a05b2a43c51bb8244661130ad9e052d4d8423b2ce2e9549c0bb5c"; + url = mirror://cpan/authors/id/R/RJ/RJBS/String-Truncate-1.100601.tar.gz; + sha256 = "1mas04qa6sj6x34mid8i6swddcnb3c9zfkgkd72kvz5zip2f4f24"; }; propagatedBuildInputs = [ SubExporter SubInstall ]; meta = { @@ -7795,10 +7795,10 @@ rec { }; TemplateToolkit = buildPerlPackage rec { - name = "Template-Toolkit-2.24"; + name = "Template-Toolkit-2.25"; src = fetchurl { - url = mirror://cpan/authors/id/A/AB/ABW/Template-Toolkit-2.24.tar.gz; - sha256 = "1j01kpsdpwxrwbsz2y1d8xyyliw9l23g0f3jigxvgxs9qal4m0rq"; + url = mirror://cpan/authors/id/A/AB/ABW/Template-Toolkit-2.25.tar.gz; + sha256 = "048yg07j48rix3cly13j5wzms7kd5argviicj0kwykb004xpc8zl"; }; propagatedBuildInputs = [ AppConfig ]; meta = { @@ -8706,11 +8706,12 @@ rec { }; TextTable = buildPerlPackage { - name = "Text-Table-1.126"; + name = "Text-Table-1.128"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Table-1.126.tar.gz; - sha256 = "18v9ll360q4hlhmpks175da7y8nf6ywygd39archnw3zpn1cv7h1"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Table-1.128.tar.gz; + sha256 = "0j9y38y9x9ljjpnvp5clwkfvhnja6vjlnhb8yshv2mmz2h6by70c"; }; + buildInputs = [ TestPod TestPodCoverage ]; propagatedBuildInputs = [ TextAligner ]; meta = { homepage = http://www.shlomifish.org/open-source/projects/docmake/; @@ -8768,10 +8769,10 @@ rec { }; TestVersion = buildPerlPackage { - name = "Test-Version-1.002001"; + name = "Test-Version-1.002004"; src = fetchurl { - url = mirror://cpan/authors/id/X/XE/XENO/Test-Version-1.002001.tar.gz; - sha256 = "84e741a1b9196b41130a7ec3f07b94e0e97e7e3f8abfb65e599f2760e01202ad"; + url = mirror://cpan/authors/id/X/XE/XENO/Test-Version-1.002004.tar.gz; + sha256 = "1lvg1p6i159ssk5br5qb3gvrzdg59wchd97z7j44arnlkhfvwhgv"; }; buildInputs = [ TestException TestRequires TestTester ]; propagatedBuildInputs = [ FileFindRulePerl ]; @@ -8895,10 +8896,10 @@ rec { }; TimeHiRes = buildPerlPackage rec { - name = "Time-HiRes-1.9725"; + name = "Time-HiRes-1.9726"; src = fetchurl { url = "mirror://cpan/modules/by-module/Time/${name}.tar.gz"; - sha256 = "0fr7zkc55kazcjxdkrcjgimic8xpk6imxkckdpjlggjpkggv76f0"; + sha256 = "17hhd53p72z08l1riwz5f6rch6hngby1pympkla5miznn7cjlrpz"; }; }; @@ -9076,10 +9077,10 @@ rec { }; VariableMagic = buildPerlPackage rec { - name = "Variable-Magic-0.48"; + name = "Variable-Magic-0.53"; src = fetchurl { url = "mirror://cpan/modules/by-module/Variable/${name}.tar.gz"; - sha256 = "124isksyw52br0y304dq4fcm26jk1v44s6ni1xd10nnl26fwmzbw"; + sha256 = "1mxygb7q8n01klpzdmf8mvbm1i5zhazcm48yiw6dz0xk2fwrgz8q"; }; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index baf5003ccda3..bc5824c26dec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -96,11 +96,6 @@ pythonPackages = modules // import ./python-packages-generated.nix { inherit python buildPythonPackage; }; - pycrypto25 = import ../development/python-modules/pycrypto/2.5.nix { - inherit (pkgs) fetchurl stdenv gmp; - inherit python buildPythonPackage; - }; - pygobject = import ../development/python-modules/pygobject { inherit (pkgs) stdenv fetchurl pkgconfig glib; inherit python; @@ -1118,6 +1113,30 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }; + pycollada = buildPythonPackage rec { + name = "pycollada-0.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/pycollada/${name}.tar.gz"; + md5 = "5d0f00c035491b945cdccdfd8a698ad2"; + }; + + # pycollada-0.4 needs python-dateutil==1.5 + buildInputs = [ dateutil_1_5 numpy ]; + + # Some tests fail because they refer to test data files that don't exist + # (upstream packaging issue) + doCheck = false; + + meta = with stdenv.lib; { + description = "Python library for reading and writing collada documents"; + homepage = http://pycollada.github.io/; + license = "BSD"; # they don't specify which BSD variant + platforms = with platforms; linux ++ darwin; + maintainers = [ maintainers.bjornfor ]; + }; + }; + pycparser = buildPythonPackage rec { name = "pycparser-2.10"; @@ -3369,11 +3388,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { manuel = buildPythonPackage rec { name = "manuel-${version}"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { url = "http://pypi.python.org/packages/source/m/manuel/${name}.tar.gz"; - md5 = "53d6a6905301a20f6095e41d11968fff"; + sha256 = "1h35ys31zkjd9jssqn9lzwmw8s17ikr4jn2xp5zby1v771ibbbqr"; }; propagatedBuildInputs = [ six zope_testing ]; @@ -7601,11 +7620,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { cliapp = buildPythonPackage rec { name = "cliapp-${version}"; - version = "1.20130313"; + version = "1.20130808"; src = fetchurl rec { url = "http://code.liw.fi/debian/pool/main/p/python-cliapp/python-cliapp_${version}.orig.tar.gz"; - sha256 = "0rk13a68668gsrv6yqgzqxskffqnlyjar4qav6k5iyrp77amn7qm"; + sha256 = "0i9fqkahrc16mnxjw8fcr4hwrq3ibfrj2lzzbzzb7v5yk5dlr532"; }; buildInputs = [ sphinx ]; @@ -7694,11 +7713,12 @@ pythonPackages = modules // import ./python-packages-generated.nix { tracing = buildPythonPackage rec { - name = "tracing-0.7"; + name = "tracing-${version}"; + version = "0.8"; src = fetchurl rec { - url = "http://code.liw.fi/debian/pool/main/p/python-tracing/python-tracing_0.7.orig.tar.gz"; - sha256 = "9954a1b0cc6b957d15975b048f929bbdd46766d397a6fa51bf8f6498b9459276"; + url = "http://code.liw.fi/debian/pool/main/p/python-tracing/python-tracing_${version}.orig.tar.gz"; + sha256 = "1l4ybj5rvrrcxf8csyq7qx52izybd502pmx70zxp46gxqm60d2l0"; }; buildInputs = [ sphinx ]; @@ -7733,11 +7753,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { ttystatus = buildPythonPackage rec { name = "ttystatus-${version}"; - version = "0.22"; + version = "0.23"; src = fetchurl rec { url = "http://code.liw.fi/debian/pool/main/p/python-ttystatus/python-ttystatus_${version}.orig.tar.gz"; - sha256 = "1hzv0sbrvgcmafflhvzh7plci0dg7wcjlk39i8kqdasg6rw0ag6f"; + sha256 = "0ymimviyjyh2iizqilg88g4p26f5vpq1zm3cvg7dr7q4y3gmik8y"; }; buildInputs = [ sphinx ]; @@ -7754,11 +7774,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { larch = buildPythonPackage rec { name = "larch-${version}"; - version = "1.20130316"; + version = "1.20131130"; src = fetchurl rec { url = "http://code.liw.fi/debian/pool/main/p/python-larch/python-larch_${version}.orig.tar.gz"; - sha256 = "1mkvmy0jdzd7dlvdx2a75wsbj5qw1clawcgndx9jwl816a9iy225"; + sha256 = "1hfanp9l6yc5348i3f5sb8c5s4r43y382hflnbl6cnz4pm8yh5r7"; }; buildInputs = [ sphinx ]; |