diff options
author | William A. Kennington III <william@wkennington.com> | 2015-09-19 14:39:57 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-09-19 14:39:57 -0700 |
commit | 8b670fba26b6b4536377c6178b29a6ff17169506 (patch) | |
tree | 41f8a58e614df712eec4891c51f9ccba2a14d79b /pkgs/top-level | |
parent | 3acffb730aeb1bcab009dcc6ba57707462a3abaa (diff) | |
parent | 6e092236273bbcd95654392430a281365bc2278a (diff) | |
download | nixlib-8b670fba26b6b4536377c6178b29a6ff17169506.tar nixlib-8b670fba26b6b4536377c6178b29a6ff17169506.tar.gz nixlib-8b670fba26b6b4536377c6178b29a6ff17169506.tar.bz2 nixlib-8b670fba26b6b4536377c6178b29a6ff17169506.tar.lz nixlib-8b670fba26b6b4536377c6178b29a6ff17169506.tar.xz nixlib-8b670fba26b6b4536377c6178b29a6ff17169506.tar.zst nixlib-8b670fba26b6b4536377c6178b29a6ff17169506.zip |
Merge branch 'staging.upstream' into staging.post-15.06
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 150 | ||||
-rw-r--r-- | pkgs/top-level/emacs-packages.nix | 17 | ||||
-rw-r--r-- | pkgs/top-level/perl-packages.nix | 331 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 56 |
4 files changed, 375 insertions, 179 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d734b21bfed..605ee0c9ec61 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -424,13 +424,17 @@ let makeAutostartItem = callPackage ../build-support/make-startupitem { }; - makeInitrd = { contents, compressor ? "gzip -9n", prepend ? [ ] }@args: - callPackage ../build-support/kernel/make-initrd.nix args; + makeInitrd = { contents, compressor ? "gzip -9n", prepend ? [ ] }: + callPackage ../build-support/kernel/make-initrd.nix { + inherit contents compressor prepend; + }; makeWrapper = makeSetupHook { } ../build-support/setup-hooks/make-wrapper.sh; - makeModulesClosure = { kernel, rootModules, allowMissing ? false }@args: - callPackage ../build-support/kernel/modules-closure.nix args; + makeModulesClosure = { kernel, rootModules, allowMissing ? false }: + callPackage ../build-support/kernel/modules-closure.nix { + inherit kernel rootModules allowMissing; + }; pathsFromGraph = ../build-support/kernel/paths-from-graph.pl; @@ -473,6 +477,8 @@ let deps = [ makeWrapper ]; } ../build-support/setup-hooks/wrap-gapps-hook.sh; + separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh; + ### TOOLS @@ -876,7 +882,6 @@ let syslogng_incubator = callPackage ../tools/system/syslog-ng-incubator { }; rsyslog = callPackage ../tools/system/rsyslog { - czmq = null; # Currently Broken hadoop = null; # Currently Broken }; @@ -896,6 +901,7 @@ let openssl = null; librelp = null; libgt = null; + libksi = null; liblogging = null; libnet = null; hadoop = null; @@ -1047,7 +1053,7 @@ let cksfv = callPackage ../tools/networking/cksfv { }; clementine = callPackage ../applications/audio/clementine { - boost = boost156; + boost = boost155; gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_ugly gst_ffmpeg ]; }; @@ -2085,6 +2091,8 @@ let librdmacm = callPackage ../development/libraries/librdmacm { }; + libwebsockets = callPackage ../development/libraries/libwebsockets { }; + limesurvey = callPackage ../servers/limesurvey { }; logcheck = callPackage ../tools/system/logcheck { @@ -2198,6 +2206,8 @@ let libpng = libpng12; }; + minissdpd = callPackage ../tools/networking/minissdpd { }; + miniupnpc = callPackage ../tools/networking/miniupnpc { }; miniupnpd = callPackage ../tools/networking/miniupnpd { }; @@ -2271,6 +2281,8 @@ let mysql2pgsql = callPackage ../tools/misc/mysql2pgsql { }; + nabi = callPackage ../tools/inputmethods/nabi { }; + namazu = callPackage ../tools/text/namazu { }; nbd = callPackage ../tools/networking/nbd { }; @@ -3065,7 +3077,7 @@ let svnfs = callPackage ../tools/filesystems/svnfs { }; svtplay-dl = callPackage ../tools/misc/svtplay-dl { - inherit (pythonPackages) nose mock; + inherit (pythonPackages) nose mock requests2; }; sysbench = callPackage ../development/tools/misc/sysbench {}; @@ -3109,7 +3121,7 @@ let telnet = callPackage ../tools/networking/telnet { }; texmacs = callPackage ../applications/editors/texmacs { - tex = texLive; /* tetex is also an option */ + tex = texlive.combined.scheme-small; extraFonts = true; }; @@ -3163,6 +3175,8 @@ let tpm-luks = callPackage ../tools/security/tpm-luks { }; + tthsum = callPackage ../applications/misc/tthsum { }; + chaps = callPackage ../tools/security/chaps { }; trace-cmd = callPackage ../os-specific/linux/trace-cmd { }; @@ -3939,11 +3953,6 @@ let gcl = builderDefsPackage (callPackage ../development/compilers/gcl) { gmp = gmp4; - texLive = texLiveAggregationFun { - paths = [ - texLive texLiveExtra - ]; - }; }; gcc-arm-embedded-4_7 = callPackage_i686 ../development/compilers/gcc-arm-embedded { @@ -5554,6 +5563,8 @@ let leiningen = callPackage ../development/tools/build-managers/leiningen { }; + lemon = callPackage ../development/tools/parsing/lemon { }; + libtool = libtool_2; libtool_1_5 = callPackage ../development/tools/misc/libtool { }; @@ -5745,7 +5756,7 @@ let tcptrack = callPackage ../development/tools/misc/tcptrack { }; - teensy-loader = callPackage ../development/tools/misc/teensy { }; + teensy-loader-cli = callPackage ../development/tools/misc/teensy-loader-cli { }; texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; texinfo4 = texinfo413; @@ -5759,7 +5770,7 @@ let texi2html = callPackage ../development/tools/misc/texi2html { }; uhd = callPackage ../development/tools/misc/uhd { - boost = boost157; + boost = boost155; }; uisp = callPackage ../development/tools/misc/uisp { }; @@ -5889,9 +5900,6 @@ let boolstuff = callPackage ../development/libraries/boolstuff { }; boost155 = callPackage ../development/libraries/boost/1.55.nix { }; - boost156 = callPackage ../development/libraries/boost/1.56.nix { }; - boost157 = callPackage ../development/libraries/boost/1.57.nix { }; - boost158 = callPackage ../development/libraries/boost/1.58.nix { }; boost159 = callPackage ../development/libraries/boost/1.59.nix { }; boost = boost159; @@ -6097,8 +6105,9 @@ let farstream = callPackage ../development/libraries/farstream { inherit (gst_all_1) - gstreamer gst-plugins-base gst-python gst-plugins-good gst-plugins-bad + gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav; + inherit (pythonPackages) gst-python; }; fcgi = callPackage ../development/libraries/fcgi { }; @@ -6168,9 +6177,7 @@ let fontconfig-ultimate = callPackage ../development/libraries/fontconfig-ultimate {}; - folly = callPackage ../development/libraries/folly { - boost = boost157; - }; + folly = callPackage ../development/libraries/folly { }; makeFontsConf = let fontconfig_ = fontconfig; in {fontconfig ? fontconfig_, fontDirectories}: callPackage ../development/libraries/fontconfig/make-fonts-conf.nix { @@ -6373,7 +6380,7 @@ let qt_gstreamer = callPackage ../development/libraries/gstreamer/legacy/qt-gstreamer {}; - qt_gstreamer1 = callPackage ../development/libraries/gstreamer/qt-gstreamer { boost = boost156;}; + qt_gstreamer1 = callPackage ../development/libraries/gstreamer/qt-gstreamer { boost = boost155;}; gnet = callPackage ../development/libraries/gnet { }; @@ -6932,6 +6939,8 @@ let inherit (perlPackages) libintlperl GetoptLong SysVirt; }; + libhangul = callPackage ../development/libraries/libhangul { }; + libharu = callPackage ../development/libraries/libharu { }; libHX = callPackage ../development/libraries/libHX { }; @@ -7072,6 +7081,8 @@ let libksba = callPackage ../development/libraries/libksba { }; + libksi = callPackage ../development/libraries/libksi { }; + libmad = callPackage ../development/libraries/libmad { }; libmatchbox = callPackage ../development/libraries/libmatchbox { }; @@ -7772,6 +7783,11 @@ let poppler = callPackage ../development/libraries/poppler { lcms = lcms2; }; + poppler_min = poppler.override { # TODO: maybe reduce even more + minimal = true; + suffix = "min"; + }; + poppler_qt4 = poppler.override { qt4Support = true; suffix = "qt4"; @@ -7938,6 +7954,8 @@ let redland = pkgs.librdf_redland; + resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { }; + rhino = callPackage ../development/libraries/java/rhino { javac = gcj; jvm = gcj; @@ -8402,6 +8420,8 @@ let czmq = callPackage ../development/libraries/czmq { }; + zimlib = callPackage ../development/libraries/zimlib { }; + zita-convolver = callPackage ../development/libraries/audio/zita-convolver { }; zita-alsa-pcmi = callPackage ../development/libraries/audio/zita-alsa-pcmi { }; @@ -8491,7 +8511,7 @@ let lucene = callPackage ../development/libraries/java/lucene { }; lucenepp = callPackage ../development/libraries/lucene++ { - boost = boost157; + boost = boost155; }; mockobjects = callPackage ../development/libraries/java/mockobjects { }; @@ -8700,7 +8720,10 @@ let ### DEVELOPMENT / R MODULES R = callPackage ../applications/science/math/R { - texLive = texLiveAggregationFun { paths = [ texLive texLiveExtra ]; }; + # TODO: split docs into a separate output + texLive = texlive.combine { + inherit (texlive) scheme-small inconsolata helvetic texinfo fancyvrb cm-super; + }; openblas = openblasCompat; withRecommendedPackages = false; }; @@ -9100,7 +9123,7 @@ let rethinkdb = callPackage ../servers/nosql/rethinkdb { }; rippled = callPackage ../servers/rippled { - boost = boost157; + boost = boost155; }; ripple-rest = callPackage ../servers/rippled/ripple-rest.nix { }; @@ -9214,6 +9237,11 @@ let quartz-wm = callPackage ../servers/x11/quartz-wm { stdenv = clangStdenv; }; xorg = recurseIntoAttrs (lib.callPackagesWith pkgs ../servers/x11/xorg/default.nix { + inherit clangStdenv fetchurl fetchgit fetchpatch stdenv pkgconfig intltool freetype fontconfig + libxslt expat libpng zlib perl mesa_drivers spice_protocol + dbus libuuid openssl gperf m4 libevdev tradcpp libinput mcpp makeWrapper autoreconfHook + autoconf automake libtool xmlto asciidoc flex bison python mtdev pixman; + inherit (darwin) apple_sdk; bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null; mesa = mesa_noglu; udev = if stdenv.isLinux then udev else null; @@ -9238,7 +9266,7 @@ let afuse = callPackage ../os-specific/linux/afuse { }; - autofs5 = callPackage ../os-specific/linux/autofs/autofs-v5.nix { }; + autofs5 = callPackage ../os-specific/linux/autofs { }; _915resolution = callPackage ../os-specific/linux/915resolution { }; @@ -9269,18 +9297,12 @@ let microcodeIntel = callPackage ../os-specific/linux/microcode/intel.nix { }; - apparmor = callPackage ../os-specific/linux/apparmor { - inherit (perlPackages) LocaleGettext TermReadKey RpcXML; - bison = bison2; - perl = perl516; # ${perl}/.../CORE/handy.h:124:34: error: 'bool' undeclared - }; - - apparmor_2_9 = callPackage ../os-specific/linux/apparmor/2.9 { }; - libapparmor = apparmor_2_9.libapparmor; - apparmor-pam = apparmor_2_9.apparmor-pam; - apparmor-parser = apparmor_2_9.apparmor-parser; - apparmor-profiles = apparmor_2_9.apparmor-profiles; - apparmor-utils = apparmor_2_9.apparmor-utils; + apparmor = callPackage ../os-specific/linux/apparmor { swig = swig2; }; + libapparmor = apparmor.libapparmor; + apparmor-pam = apparmor.apparmor-pam; + apparmor-parser = apparmor.apparmor-parser; + apparmor-profiles = apparmor.apparmor-profiles; + apparmor-utils = apparmor.apparmor-utils; atop = callPackage ../os-specific/linux/atop { }; @@ -9655,9 +9677,14 @@ let grPackage = opts: recurseIntoAttrs (mkGrsecurity opts).grsecPackage; # Stable kernels - linux_grsec_stable_desktop = grKernel grFlavors.linux_grsec_stable_desktop; - linux_grsec_stable_server = grKernel grFlavors.linux_grsec_stable_server; - linux_grsec_stable_server_xen = grKernel grFlavors.linux_grsec_stable_server_xen; + # This is no longer supported. Please see the official announcement on the + # grsecurity page. https://grsecurity.net/announce.php + linux_grsec_stable_desktop = throw "No longer supported due to https://grsecurity.net/announce.php. " + + "Please use linux_grsec_testing_desktop."; + linux_grsec_stable_server = throw "No longer supported due to https://grsecurity.net/announce.php. " + + "Please use linux_grsec_testing_server."; + linux_grsec_stable_server_xen = throw "No longer supporteddue to https://grsecurity.net/announce.php. " + + "Please use linux_grsec_testing_server_xen."; # Testing kernels linux_grsec_testing_desktop = grKernel grFlavors.linux_grsec_testing_desktop; @@ -10246,8 +10273,6 @@ let xf86_video_nested = callPackage ../os-specific/linux/xf86-video-nested { }; - xf86_video_nouveau = xorg.xf86videonouveau; - xmoto = callPackage ../games/xmoto { }; xorg_sys_opengl = callPackage ../os-specific/linux/opengl/xorg-sys { }; @@ -10618,7 +10643,7 @@ let schismtracker = callPackage ../applications/audio/schismtracker { }; altcoins = recurseIntoAttrs ( callPackage ../applications/altcoins { - callPackage = newScope { boost = boost157; }; + callPackage = newScope { boost = boost155; }; } ); bitcoin = altcoins.bitcoin; bitcoin-xt = altcoins.bitcoin-xt; @@ -11104,15 +11129,11 @@ let proofgeneral_4_2 = callPackage ../applications/editors/emacs-modes/proofgeneral/4.2.nix { texinfo = texinfo4 ; - texLive = pkgs.texLiveAggregationFun { - paths = [ pkgs.texLive pkgs.texLiveCMSuper ]; - }; + texLive = texlive.combine { inherit (texlive) scheme-basic cm-super ec; }; }; proofgeneral_4_3_pre = callPackage ../applications/editors/emacs-modes/proofgeneral/4.3pre.nix { texinfo = texinfo4 ; - texLive = pkgs.texLiveAggregationFun { - paths = [ pkgs.texLive pkgs.texLiveCMSuper ]; - }; + texLive = texlive.combine { inherit (texlive) scheme-basic cm-super ec; }; }; proofgeneral = self.proofgeneral_4_2; @@ -11342,7 +11363,7 @@ let fomp = callPackage ../applications/audio/fomp { }; freecad = callPackage ../applications/graphics/freecad { - boost = boost156; + boost = boost155; opencascade = opencascade_6_5; inherit (pythonPackages) matplotlib pycollada; }; @@ -11365,7 +11386,7 @@ let }; freicoin = callPackage ../applications/misc/freicoin { - boost = boost157; + boost = boost155; }; fuze = callPackage ../applications/networking/instant-messengers/fuze {}; @@ -11817,7 +11838,7 @@ let ledger2 = callPackage ../applications/office/ledger/2.6.3.nix { }; ledger3 = callPackage ../applications/office/ledger { - boost = boost157; + boost = boost155; }; ledger = ledger3; @@ -12424,10 +12445,16 @@ let inherit (python34Packages) buildPythonPackage python pyqt5 jinja2 pygments pyyaml pypeg2; }; + rabbitvcs = callPackage ../applications/version-management/rabbitvcs {}; + rakarrack = callPackage ../applications/audio/rakarrack { fltk = fltk13; }; + renoise = callPackage ../applications/audio/renoise { + demo = false; + }; + rapcad = callPackage ../applications/graphics/rapcad {}; rapidsvn = callPackage ../applications/version-management/rapidsvn { }; @@ -13825,7 +13852,7 @@ let { libusb = libusb1; libcanberra = libcanberra_kde; - boost = boost156; + boost = boost155; kdelibs = kdeApps_stable.kdelibs; } ../desktops/kde-4.14; @@ -13879,7 +13906,7 @@ let kdevelop = callPackage ../applications/editors/kdevelop { }; kdevplatform = callPackage ../development/libraries/kdevplatform { - boost = boost156; + boost = boost155; }; kdiff3 = callPackage ../tools/text/kdiff3 { }; @@ -13911,7 +13938,7 @@ let libalkimia = callPackage ../development/libraries/libalkimia { }; libktorrent = callPackage ../development/libraries/libktorrent { - boost = boost156; + boost = boost155; }; libkvkontakte = callPackage ../development/libraries/libkvkontakte { }; @@ -14617,8 +14644,6 @@ let keynav = callPackage ../tools/X11/keynav { }; - lazylist = callPackage ../tools/typesetting/tex/lazylist { }; - lilypond = callPackage ../misc/lilypond { guile = guile_1_8; }; mailcore2 = callPackage ../development/libraries/mailcore2 { }; @@ -14721,8 +14746,6 @@ let pjsip = callPackage ../applications/networking/pjsip { }; - polytable = callPackage ../tools/typesetting/tex/polytable { }; - PPSSPP = callPackage ../misc/emulators/ppsspp { SDL = SDL2; }; uae = callPackage ../misc/emulators/uae { }; @@ -14802,6 +14825,10 @@ let texFunctions = callPackage ../tools/typesetting/tex/nix pkgs; + # All the new TeX Live is inside. See description in default.nix. + texlive = recurseIntoAttrs + (callPackage ../tools/typesetting/tex/texlive-new { }); + texLive = builderDefsPackage (callPackage ../tools/typesetting/tex/texlive) { ghostscript = ghostscriptX; harfbuzz = harfbuzz.override { @@ -15029,6 +15056,7 @@ let rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02 speedtest_cli = speedtest-cli; # added 2015-02-17 sqliteInteractive = sqlite-interactive; # added 2014-12-06 + xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09 youtube-dl = pythonPackages.youtube-dl; # added 2015-06-07 youtubeDL = youtube-dl; # added 2014-10-26 diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index af07706e03db..2600fe1b82a6 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -440,6 +440,22 @@ let self = _self // overrides; }; }; + engine-mode = melpaBuild rec { + pname = "engine-mode"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "hrs"; + repo = "engine-mode"; + rev = "v${version}"; + sha256 = "1dsa3r39ip20ddbw0m9vq8z3r4ahrxvb37adyqi4mbdgyr6fq6sw"; + }; + + meta = { + description = "Minor mode for defining and querying search engines through Emacs"; + license = gpl3Plus; + }; + }; + epl = melpaBuild rec { pname = "epl"; version = "20140823"; @@ -1502,5 +1518,4 @@ let self = _self // overrides; meta = { license = gpl3Plus; }; }; - }; in self diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6c80901789c1..d73f8210941c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -404,11 +404,11 @@ let self = _self // overrides; _self = with self; { autobox = pkgs.perlPackages.Autobox; - Autobox = buildPerlPackage { - name = "autobox-2.82"; + Autobox = buildPerlPackage rec { + name = "autobox-2.83"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHOCOLATE/autobox-2.82.tar.gz; - sha256 = "0w008z8ych54czr6drmhqrrvikcfhra6ig3v1fhk36apq64p9k1p"; + url = "mirror://cpan/authors/id/C/CH/CHOCOLATE/${name}.tar.gz"; + sha256 = "1i493ss5nr0hp3wncn0s31gyka4r09wx65b8g2f8av2nm4zs70rz"; }; propagatedBuildInputs = [ ScopeGuard ]; meta = { @@ -512,11 +512,11 @@ let self = _self // overrides; _self = with self; { inherit (pkgs) db; }; - BHooksEndOfScope = buildPerlPackage { - name = "B-Hooks-EndOfScope-0.13"; + BHooksEndOfScope = buildPerlPackage rec { + name = "B-Hooks-EndOfScope-0.15"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/B-Hooks-EndOfScope-0.13.tar.gz; - sha256 = "1f5d0lbkwf23dfjn60g6fynmjhy5rxdyxcpdfb07srm73qpg2zpi"; + url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + sha256 = "0bllq4077hxbdsh31r3cwpm6mzmc0247rrg1lr7rk7flscif8bhj"; }; propagatedBuildInputs = [ ModuleImplementation ModuleRuntime SubExporterProgressive ]; meta = { @@ -1397,6 +1397,21 @@ let self = _self // overrides; _self = with self; { }; }; + CHI = buildPerlPackage rec { + name = "CHI-0.60"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JS/JSWARTZ/${name}.tar.gz"; + sha256 = "c7f1a2b3570a8fede484e933f89ba1729e0abd05935791d146c522dd120ee851"; + }; + buildInputs = [ TestClass TestDeep TestException TestWarn TimeDate ]; + propagatedBuildInputs = [ CarpAssert ClassLoad DataUUID DigestJHash HashMoreUtils JSONMaybeXS ListMoreUtils LogAny Moo MooXTypesMooseLike MooXTypesMooseLikeNumeric StringRewritePrefix TaskWeaken TimeDuration TimeDurationParse TryTiny ]; + meta = { + description = "Unified cache handling interface"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; + }; + }; + ClassAccessor = buildPerlPackage { name = "Class-Accessor-0.34"; src = fetchurl { @@ -1839,17 +1854,18 @@ let self = _self // overrides; _self = with self; { }; }; - ConfigINI = buildPerlPackage { - name = "Config-INI-0.020"; + ConfigINI = buildPerlPackage rec { + name = "Config-INI-0.025"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Config-INI-0.020.tar.gz; - sha256 = "0ef298da75e3a7becd1f358422cea621c5cf0420278aa6a1bdd2dd14efe07bc9"; + url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + sha256 = "628bf76d5b91f89dde22d4813ec033026ebf71b772bb61ccda909da00c869732"; }; - propagatedBuildInputs = [ IOString MixinLinewise ]; + propagatedBuildInputs = [ MixinLinewise ]; meta = { homepage = https://github.com/rjbs/Config-INI; description = "Simple .ini-file format"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; }; }; @@ -2025,23 +2041,24 @@ let self = _self // overrides; _self = with self; { }; }; - CPANChanges = buildPerlPackage { - name = "CPAN-Changes-0.27"; + CPANChanges = buildPerlPackage rec { + name = "CPAN-Changes-0.400002"; src = fetchurl { - url = mirror://cpan/authors/id/B/BR/BRICAS/CPAN-Changes-0.27.tar.gz; - sha256 = "14dizyvgzp81hmg0djwnvvkdhqd3bsmms462cj0ai84z221scv1q"; + url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz"; + sha256 = "01eedea90d07468cb58e4a50bfa3bb1d4eeda9073596add1118fc359153abe8d"; }; meta = { description = "Read and write Changes files"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ rycee ]; }; }; - CPANMeta = buildPerlPackage { - name = "CPAN-Meta-2.142690"; + CPANMeta = buildPerlPackage rec { + name = "CPAN-Meta-2.150005"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-2.142690.tar.gz; - sha256 = "495770e22e91e3d2bd04dc364f05061cabacfdce35baa3868bc0c05733d145db"; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz"; + sha256 = "04g7cfbx7vi8kqc9pwv7n3z95vimkbv0h7v6p1ky37gzz3nsw66j"; }; propagatedBuildInputs = [ ParseCPANMeta CPANMetaYAML CPANMetaRequirements JSONPP ]; meta = { @@ -2051,13 +2068,13 @@ let self = _self // overrides; _self = with self; { }; }; - CPANMetaCheck = buildPerlPackage { - name = "CPAN-Meta-Check-0.009"; + CPANMetaCheck = buildPerlPackage rec { + name = "CPAN-Meta-Check-0.012"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/CPAN-Meta-Check-0.009.tar.gz; - sha256 = "eb2d43afd1da276e4acdebd24937f5171d0aaca8d19a5ef0c3e834b8792b7361"; + url = "mirror://cpan/authors/id/L/LE/LEONT/${name}.tar.gz"; + sha256 = "1rymh4l6sdh8l1q2q25lncmi4afbh2il0bpk8gxmd13qmjidjk2b"; }; - buildInputs = [ TestDeep ]; + buildInputs = [ TestDeep ModuleMetadata ]; propagatedBuildInputs = [ CPANMeta CPANMetaRequirements ]; meta = { description = "Verify requirements in a CPAN::Meta object"; @@ -2253,10 +2270,10 @@ let self = _self // overrides; _self = with self; { }; CryptRijndael = buildPerlPackage rec { - name = "Crypt-Rijndael-1.12"; + name = "Crypt-Rijndael-1.13"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BD/BDFOY/${name}.tar.gz"; - sha256 = "1rgzlxp882cc52287awwha4ipglm6nxw5jryd6cshrr99qcx55m0"; + url = "mirror://cpan/authors/id/L/LE/LEONT/${name}.tar.gz"; + sha256 = "0ki16vkgzvzyjdx6mmvjfpngyvhf7cis46pymy6dr8z0vyk0jwnd"; }; }; @@ -2304,10 +2321,10 @@ let self = _self // overrides; _self = with self; { }; CryptOpenSSLRandom = buildPerlPackage rec { - name = "Crypt-OpenSSL-Random-0.06"; + name = "Crypt-OpenSSL-Random-0.10"; src = fetchurl { url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz"; - sha256 = "10yhjh04jxdf4ghqqvrcfds7vvylxv671l57lkkbg3k8qzpdzd7g"; + sha256 = "12pirh1pj8lpvzcwj2if9i6dbr6a7s9g1zc7gzbd3v87d6mx0rdf"; }; NIX_CFLAGS_COMPILE = "-I${pkgs.openssl}/include"; NIX_CFLAGS_LINK = "-L${pkgs.openssl}/lib -lcrypto"; @@ -2325,12 +2342,13 @@ let self = _self // overrides; _self = with self; { }; CryptSSLeay = buildPerlPackage rec { - name = "Crypt-SSLeay-0.57"; + name = "Crypt-SSLeay-0.72"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DL/DLAND/${name}.tar.gz"; - sha256 = "1f0i5y99ly39vf86jpzwqz8mkz1460vryv85jgqmfx007p781s0l"; + url = "mirror://cpan/authors/id/N/NA/NANIS/${name}.tar.gz"; + sha256 = "1s7zm6ph37kg8jzaxnhi4ff4snxl7mi5h14arxbri0kp6s0lzlzm"; }; - makeMakerFlags = "--lib=${pkgs.openssl}/lib"; + makeMakerFlags = "--libpath=${pkgs.openssl}/lib --incpath=${pkgs.openssl}/include"; + buildInputs = [ PathClass TryTiny ]; }; CSSDOM = buildPerlPackage rec { @@ -2751,6 +2769,20 @@ let self = _self // overrides; _self = with self; { }; }; + DateTimeFormatMySQL = buildPerlPackage rec { + name = "DateTime-Format-MySQL-0.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/X/XM/XMIKEW/${name}.tar.gz"; + sha256 = "26d0348a930aa34d3b33ec1b2a9d9629f2ee78234e224ca74d594703922ca2e9"; + }; + propagatedBuildInputs = [ DateTime DateTimeFormatBuilder ]; + meta = { + description = "Parse and format MySQL dates and times"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; + }; + }; + DateTimeFormatPg = buildPerlPackage { name = "DateTime-Format-Pg-0.16008"; src = fetchurl { @@ -3305,6 +3337,19 @@ let self = _self // overrides; _self = with self; { }; }; + DigestJHash = buildPerlPackage rec { + name = "Digest-JHash-0.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + sha256 = "ba77919b7b7a1b6f222f1bb5a7a34d88b1a92093e40a2aec37352cb38926ada3"; + }; + meta = { + description = "Perl extension for 32 bit Jenkins Hashing Algorithm"; + license = stdenv.lib.licenses.artistic2; + maintainers = [ maintainers.rycee ]; + }; + }; + DigestMD4 = buildPerlPackage rec { name = "Digest-MD4-1.9"; src = fetchurl { @@ -3521,7 +3566,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-Compile-2.021.tar.gz; sha256 = "665c48de1c7c33e9b00e8ddc0204d02b45009e60b9b65033fa4a832dfe9fc808"; }; - buildInputs = [ DistCheckConflicts DistZilla JSON ModuleBuildTiny PathClass TestCheckDeps TestWarnings ]; + buildInputs = [ DistCheckConflicts DistZilla JSON ModuleBuildTiny PathClass TestCheckDeps TestWarnings ModuleMetadata ]; propagatedBuildInputs = [ DataSection DistCheckConflicts DistZilla Moose PathTiny SubExporterForMethods namespaceautoclean ModuleCoreList ]; meta = { homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-Test-Compile/; @@ -4423,6 +4468,26 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CryptRijndael ]; }; + FileLibMagic = buildPerlPackage rec { + name = "File-LibMagic-1.13"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; + sha256 = "61f92c3137a3b86d63e61313b51aa2673991110d655eee792ea11c68bf2c0092"; + }; + buildInputs = [ TestFatal pkgs.file ]; + makeMakerFlags = "--lib=${pkgs.file}/lib"; + preCheck = '' + substituteInPlace t/oo-api.t \ + --replace "/usr/share/file/magic.mgc" "${pkgs.file}/share/misc/magic.mgc" + ''; + meta = { + homepage = http://metacpan.org/release/File::LibMagic; + description = "Determine MIME types of data or files using libmagic"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; + }; + }; + FileListing = buildPerlPackage rec { name = "File-Listing-6.04"; src = fetchurl { @@ -4575,6 +4640,21 @@ let self = _self // overrides; _self = with self; { }; }; + FileUtil = buildPerlPackage rec { + name = "File-Util-4.132140"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TO/TOMMY/${name}.tar.gz"; + sha256 = "4233c493468da8b34f2df19b191aaa400f328d877c8c023605e43385976a99d1"; + }; + buildInputs = [ TestFatal TestNoWarnings ]; + meta = { + homepage = https://github.com/tommybutler/file-util/wiki; + description = "Easy, versatile, portable file handling"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; + }; + }; + FileWhich = buildPerlPackage rec { name = "File-Which-1.09"; src = fetchurl { @@ -4731,17 +4811,19 @@ let self = _self // overrides; _self = with self; { }; }; - GetoptLongDescriptive = buildPerlPackage { - name = "Getopt-Long-Descriptive-0.093"; + GetoptLongDescriptive = buildPerlPackage rec { + name = "Getopt-Long-Descriptive-0.099"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Getopt-Long-Descriptive-0.093.tar.gz; - sha256 = "0iccps0jlcjm68i5yywgs477plfnkc6b2386bzb99blm3jwdfyac"; + url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + sha256 = "1sf5r3vy7880ynsn2aqmb5p6rzmhq5v072x33g8c7aqjpz81wkgw"; }; + buildInputs = [ TestFatal TestWarnings ]; propagatedBuildInputs = [ ParamsValidate SubExporter SubExporterUtil ]; meta = { homepage = https://github.com/rjbs/Getopt-Long-Descriptive; description = "Getopt::Long, but simpler and more powerful"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ rycee ]; }; }; @@ -4915,6 +4997,19 @@ let self = _self // overrides; _self = with self; { }; }; + HashMoreUtils = buildPerlModule rec { + name = "Hash-MoreUtils-0.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RE/REHSACK/${name}.tar.gz"; + sha256 = "5e9c8458457eb18315a5669e3bef68488cd5ed8c2220011ac7429ff983288ab1"; + }; + meta = { + description = "Provide the stuff missing in Hash::Util"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; + }; + }; + HashMultiValue = buildPerlPackage { name = "Hash-MultiValue-0.15"; src = fetchurl { @@ -6155,16 +6250,17 @@ let self = _self // overrides; _self = with self; { }; }; - LogAny = buildPerlPackage { + LogAny = buildPerlPackage rec { name = "Log-Any-1.032"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Log-Any-1.032.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz"; sha256 = "808558fa42aa96365ed0af773973a5618b4ad50511d81fc7548f67133efdb956"; }; meta = { homepage = https://github.com/dagolden/Log-Any; description = "Bringing loggers and listeners together"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; }; }; @@ -6199,6 +6295,20 @@ let self = _self // overrides; _self = with self; { }; }; + LogHandler = buildPerlPackage rec { + name = "Log-Handler-0.87"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BL/BLOONIX/${name}.tar.gz"; + sha256 = "aaf68894ddf51aeaec7e6e22069b5840994517a8937cc6ceaff4d73cee2cf3ed"; + }; + propagatedBuildInputs = [ ParamsValidate ]; + meta = { + description = "Log messages to several outputs"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; + }; + }; + LogMessage = buildPerlPackage { name = "Log-Message-0.08"; src = fetchurl { @@ -6440,11 +6550,11 @@ let self = _self // overrides; _self = with self; { NIX_CFLAGS_LINK = "-L${pkgs.gmp}/lib -lgmp"; }; - MathBigRat = buildPerlPackage { - name = "Math-BigRat-0.2606"; + MathBigRat = buildPerlPackage rec { + name = "Math-BigRat-0.260801"; src = fetchurl { - url = mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigRat-0.2606.tar.gz; - sha256 = "a69506468dd3067249e6ba9ce35eb9d5509471d939c1efae8283cbd038ca7e28"; + url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; + sha256 = "0ghzz7qzfvp70ywvb2vnvr06l62sx1bcjbrjyara0pmqdnvpysar"; }; meta = { description = "Arbitrary big rational numbers"; @@ -6649,17 +6759,18 @@ let self = _self // overrides; _self = with self; { }; }; - MixinLinewise = buildPerlPackage { - name = "Mixin-Linewise-0.004"; + MixinLinewise = buildPerlPackage rec { + name = "Mixin-Linewise-0.108"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Mixin-Linewise-0.004.tar.gz; - sha256 = "7a50d171850d3e0dde51e041eecd40abc68396ea822baa4381951a7710833dd9"; + url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + sha256 = "7df20678474c0973930a472b0c55e3f8e85b7790b68ab18ef618f9c453c8aef2"; }; - propagatedBuildInputs = [ IOString SubExporter ]; + propagatedBuildInputs = [ PerlIOutf8_strict SubExporter ]; meta = { homepage = https://github.com/rjbs/mixin-linewise; description = "Write your linewise code for handles; this does the rest"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; }; }; @@ -6851,10 +6962,10 @@ let self = _self // overrides; _self = with self; { }; ModuleMetadata = buildPerlPackage rec { - name = "Module-Metadata-1.000019"; + name = "Module-Metadata-1.000027"; src = fetchurl { url = "mirror://cpan/modules/by-module/Module/${name}.tar.gz"; - sha256 = "0m755qn44nasbaj578628jgdqg0k4ldyn6fm3880hdi1q16skz2s"; + sha256 = "1rrjj48vvv3i1jrmw97i4mvsmknll7hxga4cq2s9qvc2issdrxz2"; }; propagatedBuildInputs = [ version ]; }; @@ -7024,7 +7135,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/E/ET/ETHER/Moose-2.1213.tar.gz; sha256 = "0f3b196ae67dc1daaa43c44ae7703f27c4f92c391ad3e252a90e90c50c851e03"; }; - buildInputs = [ CPANMetaCheck CPANMetaRequirements DistCheckConflicts TestCleanNamespaces TestFatal TestRequires ]; + buildInputs = [ CPANMetaCheck CPANMetaRequirements DistCheckConflicts TestCleanNamespaces TestFatal TestRequires ModuleMetadata ]; propagatedBuildInputs = [ ClassLoad ClassLoadXS DataOptList DevelGlobalDestruction DevelStackTrace DistCheckConflicts EvalClosure ListMoreUtils MROCompat ModuleRuntime ModuleRuntimeConflicts PackageDeprecationManager PackageStash PackageStashXS ParamsUtil SubExporter SubName TaskWeaken TryTiny ]; meta = { homepage = http://moose.perl.org/; @@ -7044,6 +7155,21 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moo TestFatal ]; }; + MooXTypesMooseLikeNumeric = buildPerlPackage rec { + name = "MooX-Types-MooseLike-Numeric-1.02"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MA/MATEU/${name}.tar.gz"; + sha256 = "6186f75ab2747723fd979249ec6ee0c4550f5b47aa50c0d222cc7d3590182bb6"; + }; + buildInputs = [ TestFatal ]; + propagatedBuildInputs = [ MooXTypesMooseLike ]; + meta = { + description = "Moo types for numbers"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; + }; + }; + MooseAutobox = buildPerlPackage { name = "Moose-Autobox-0.15"; src = fetchurl { @@ -7184,23 +7310,23 @@ let self = _self // overrides; _self = with self; { license = "perl"; }; }; - + MouseXGetOpt = buildPerlModule { - name = "mousex-getopt-0.35"; + name = "mousex-getopt-0.36"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOKUHIROM/mousex-getopt-0.35.tar.gz; - sha256 = "5abe243a1ab05d64562358604de1d31d36994414c5c5eaeac688897129d2f9ae"; + url = mirror://cpan/authors/id/G/GF/GFUJI/MouseX-Getopt-0.36.tar.gz; + sha256 = "172ab0609f1638c6d8800d2dff1bdaa044e305aaa2e9b1fbb8a9dc722a3bf430"; }; - buildInputs = [ Mouse MouseXConfigFromFile MouseXSimpleConfig TestException TestWarn ]; + buildInputs = [ MouseXConfigFromFile MouseXSimpleConfig TestException TestWarn ]; propagatedBuildInputs = [ GetoptLongDescriptive Mouse ]; meta = { homepage = https://github.com/gfx/mousex-getopt; description = "A Mouse role for processing command line options"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; }; }; - MooseXAttributeChained = buildPerlModule rec { name = "MooseX-Attribute-Chained-1.0.1"; src = fetchurl { @@ -7284,11 +7410,11 @@ let self = _self // overrides; _self = with self; { }; }; - MooseXGetopt = buildPerlPackage { - name = "MooseX-Getopt-0.65"; + MooseXGetopt = buildPerlPackage rec { + name = "MooseX-Getopt-0.68"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Getopt-0.65.tar.gz; - sha256 = "c07c2b7312c471bf2d331025c0ad6cc02068633eda1e208cbdb5511ef5da7fda"; + url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + sha256 = "acb5118b4666352e58d4268040869d7dc2b68968fe26b5dd6715f51ebd784483"; }; buildInputs = [ CPANMeta ModuleBuildTiny ModuleRuntime Moose PathTiny TestDeep TestFatal TestRequires TestTrap TestWarnings if_ ]; propagatedBuildInputs = [ GetoptLongDescriptive Moose MooseXRoleParameterized TryTiny namespaceautoclean ]; @@ -7296,6 +7422,7 @@ let self = _self // overrides; _self = with self; { homepage = https://github.com/moose/MooseX-Getopt; description = "A Moose role for processing command line options"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; }; }; @@ -7337,7 +7464,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-LazyRequire-0.10.tar.gz; sha256 = "a555f80c0e91bc428f040015f00dd98f3c022704ec089516b9b3507f3d437090"; }; - buildInputs = [ TestCheckDeps TestFatal ]; + buildInputs = [ TestCheckDeps TestFatal ModuleMetadata ]; propagatedBuildInputs = [ Moose aliased namespaceautoclean ]; meta = { homepage = https://github.com/karenetheridge/moosex-lazyrequire; @@ -7367,7 +7494,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-MethodAttributes-0.28.tar.gz; sha256 = "0srk85z6py9brw1jfvacd76y6219wycq3dj0wackbkmmbq04ln0g"; }; - buildInputs = [ namespaceautoclean TestCheckDeps TestException ]; + buildInputs = [ namespaceautoclean TestCheckDeps TestException ModuleMetadata ]; propagatedBuildInputs = [ Moose MooseXTypes namespaceautoclean ]; meta = { homepage = https://github.com/karenetheridge/moosex-methodattributes; @@ -7450,7 +7577,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Role-WithOverloading-0.13.tar.gz; sha256 = "01mqpvbz7yw993918hgp72vl22i6mgicpq5b3zrrsp6vl8sqj2sw"; }; - buildInputs = [ TestCheckDeps TestNoWarnings ]; + buildInputs = [ TestCheckDeps TestNoWarnings ModuleMetadata]; propagatedBuildInputs = [ aliased Moose namespaceautoclean namespaceclean ]; meta = { homepage = http://metacpan.org/release/MooseX-Role-WithOverloading; @@ -7632,7 +7759,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-Path-Tiny-0.006.tar.gz; sha256 = "0260c6fbbf84d411b145238ffd92a73f754bd92434448d9f78798fba0a2dfdd6"; }; - buildInputs = [ Filepushd ModuleBuildTiny TestCheckDeps TestFatal ]; + buildInputs = [ Filepushd ModuleBuildTiny TestCheckDeps TestFatal ModuleMetadata ]; propagatedBuildInputs = [ Moose MooseXTypes MooseXTypesStringlike PathTiny ]; meta = { homepage = https://github.com/karenetheridge/moosex-types-path-tiny; @@ -8501,11 +8628,11 @@ let self = _self // overrides; _self = with self; { }; }; - PerlCritic = buildPerlModule { - name = "Perl-Critic-1.125"; + PerlCritic = buildPerlModule rec { + name = "Perl-Critic-1.126"; src = fetchurl { - url = mirror://cpan/authors/id/T/TH/THALJEF/Perl-Critic-1.125.tar.gz; - sha256 = "503b718356b14d4c00ed486b66a0f622f4bef2b206be406ee7922c8270463fa1"; + url = "mirror://cpan/authors/id/T/TH/THALJEF/${name}.tar.gz"; + sha256 = "b1a6151cb3603aef8555195b807e831655c83003b81e2f64fff095ff7114f5af"; }; buildInputs = [ TestDeep ]; propagatedBuildInputs = [ BKeywords ConfigTiny EmailAddress ExceptionClass FileHomeDir FileWhich IOString ListMoreUtils ModulePluggable PPI PPIxRegexp PPIxUtilities PerlTidy PodSpell Readonly StringFormat TaskWeaken ]; @@ -9063,18 +9190,19 @@ let self = _self // overrides; _self = with self; { }; }; - PodWeaver = buildPerlPackage { - name = "Pod-Weaver-4.004"; + PodWeaver = buildPerlPackage rec { + name = "Pod-Weaver-4.012"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Weaver-4.004.tar.gz; - sha256 = "0hw500qkbmnwm385za5x7ypijx0lqk8cfc9jq232v95ka0hqcg29"; + url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + sha256 = "d801cbfaff22d418943d0c5dcb8c145b8cc4d56741f9c33923ef891241116ad6"; }; buildInputs = [ PPI SoftwareLicense TestDifferences ]; - propagatedBuildInputs = [ ConfigMVP ConfigMVPReaderINI DateTime ListMoreUtils LogDispatchouli Moose MooseAutobox ParamsUtil PodElemental StringFlogger StringFormatter StringRewritePrefix namespaceautoclean ]; + propagatedBuildInputs = [ ConfigMVP ConfigMVPReaderINI DateTime ListMoreUtils LogDispatchouli MixinLinewise ModuleRuntime Moose ParamsUtil PodElemental StringFlogger StringFormatter StringRewritePrefix namespaceautoclean ]; meta = { homepage = https://github.com/rjbs/pod-weaver; description = "Weave together a Pod document from an outline"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; }; }; @@ -9086,14 +9214,18 @@ let self = _self // overrides; _self = with self; { }; }; - Readonly = buildPerlPackage rec { - name = "Readonly-1.03"; + Readonly = buildPerlModule rec { + name = "Readonly-2.00"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RO/ROODE/${name}.tar.gz"; - sha256 = "1shkyxajh6l87nif47ygnfxjwvqf3d3kjpdvxaff4957vqanii2k"; + url = "mirror://cpan/authors/id/S/SA/SANKO/${name}.tar.gz"; + sha256 = "9bd0156e958842fdfd6c3bb27a23b47232d4737a407d81fabc4dc64b9363bf98"; }; meta = { - platforms = stdenv.lib.platforms.linux; + homepage = https://github.com/sanko/readonly; + description = "Facility for creating read-only scalars, arrays, hashes"; + platforms = stdenv.lib.platforms.unix; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ rycee ]; }; }; @@ -10421,7 +10553,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/L/LE/LEONT/Test-CheckDeps-0.006.tar.gz; sha256 = "774c1455566d11746118fd95305d1dbd111af86eac78058918e72468c43d9bcb"; }; - buildInputs = [ ModuleBuildTiny ]; + buildInputs = [ ModuleBuildTiny ModuleMetadata ]; propagatedBuildInputs = [ CPANMetaCheck ]; meta = { description = "Check for presence of dependencies"; @@ -10429,6 +10561,21 @@ let self = _self // overrides; _self = with self; { }; }; + TestClass = buildPerlPackage rec { + name = "Test-Class-0.50"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + sha256 = "099154ed8caf3ff97c71237fab952264ac1c03d9270737a56071cabe65991350"; + }; + buildInputs = [ TestException ]; + propagatedBuildInputs = [ MROCompat ModuleRuntime TryTiny ]; + meta = { + description = "Easily create test classes in an xUnit/JUnit style"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; + }; + }; + TestCleanNamespaces = buildPerlPackage { name = "Test-CleanNamespaces-0.16"; src = fetchurl { @@ -11588,14 +11735,20 @@ let self = _self // overrides; _self = with self; { }; }; - Throwable = buildPerlPackage rec { - name = "Throwable-0.200010"; + name = "Throwable-0.200013"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "0qhq1f5bvgf5kjhmdg45vadq8dbc9gfms81hply5c6a71nmkv8yp"; + sha256 = "184gdcwxqwnkrx5md968v1ny70pq6blzpkihccm3bpdxnpgd11wr"; + }; + buildInputs = [ DevelStackTrace ]; + propagatedBuildInputs = [ DevelStackTrace ModuleRuntime Moo ]; + meta = { + homepage = https://github.com/rjbs/Throwable; + description = "A role for classes that can be thrown"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; }; - propagatedBuildInputs = [ DevelStackTrace Moose Moo MooXTypesMooseLike ]; }; TieCycle = buildPerlPackage rec { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index da228a368847..92fa94b7ab50 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3325,11 +3325,11 @@ let elasticsearchdsl = buildPythonPackage (rec { - name = "elasticsearch-dsl-0.0.4"; + name = "elasticsearch-dsl-0.0.8"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/e/elasticsearch-dsl/${name}.tar.gz"; - sha256 = "0bz8p10qk7rz10glq9dm2nq9m1x6czzlqk518107x39gx18lm1a2"; + sha256 = "0dd46s7g5l2b2jnjhcpcm721kcsnsqwngzik85jl5qbbcvnqqjzi"; }; buildInputs = with self; [ covCore dateutil elasticsearch mock pytest pytestcov unittest2 urllib3 pytz ]; @@ -3342,6 +3342,7 @@ let description = "Python client for Elasticsearch"; homepage = https://github.com/elasticsearch/elasticsearch-dsl-py; license = licenses.asl20; + maintainers = with maintainers; [ desiderius ]; }; }); @@ -3757,6 +3758,10 @@ let propagatedBuildInputs = with self; [ gdata ]; }; + gst-python = callPackage ../development/libraries/gstreamer/python { + gst-plugins-base = pkgs.gst_all_1.gst-plugins-base; + }; + gtimelog = buildPythonPackage rec { name = "gtimelog-${version}"; version = "0.9.1"; @@ -7704,11 +7709,11 @@ let libcloud = buildPythonPackage (rec { - name = "libcloud-0.14.1"; + name = "libcloud-0.18.0"; src = pkgs.fetchurl { - url = https://pypi.python.org/packages/source/a/apache-libcloud/apache-libcloud-0.14.1.tar.bz2; - sha256 = "1l6190pjv54c7y8pzr089ij727qv7bqhhaznr2mkvimgr1wzsql5"; + url = https://pypi.python.org/packages/source/a/apache-libcloud/apache-libcloud-0.18.0.tar.bz2; + sha256 = "0ahdp14ddly074qg5cksxdhqaws0kj445xmhz1y7lzspsp6fk1xg"; }; buildInputs = with self; [ mock ]; @@ -10316,15 +10321,19 @@ let pillow = buildPythonPackage rec { - name = "Pillow-2.3.0"; + name = "Pillow-2.9.0"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/P/Pillow/${name}.zip"; - md5 = "56b6614499aacb7d6b5983c4914daea7"; + sha256 = "1mal92cwh85z6zqx7lrmg0dbqb2gw2cbb2fm6xh0fivmszz8vnyi"; }; + # Check is disabled because of assertion errors, see + # https://github.com/python-pillow/Pillow/issues/1259 + doCheck = false; + buildInputs = with self; [ - pkgs.freetype pkgs.libjpeg pkgs.zlib pkgs.libtiff pkgs.libwebp pkgs.tcl ] + pkgs.freetype pkgs.libjpeg pkgs.zlib pkgs.libtiff pkgs.libwebp pkgs.tcl nose ] ++ optionals (isPy26 || isPy27 || isPy33 || isPyPy) [ pkgs.lcms2 ] ++ optionals (isPyPy) [ pkgs.tk pkgs.xlibs.libX11 ]; @@ -11546,27 +11555,16 @@ let pyparted = buildPythonPackage rec { name = "pyparted-${version}"; - version = "3.10"; + version = "3.10.7"; disabled = isPyPy; src = pkgs.fetchurl { - url = "https://fedorahosted.org/releases/p/y/pyparted/${name}.tar.gz"; - sha256 = "17wq4invmv1nfazaksf59ymqyvgv3i8h4q03ry2az0s9lldyg3dv"; + url = "https://github.com/rhinstaller/pyparted/archive/v${version}.tar.gz"; + sha256 = "0c9ljrdggwawd8wdzqqqzrna9prrlpj6xs59b0vkxzip0jkf652r"; }; - patches = singleton (pkgs.fetchurl { - url = "https://www.redhat.com/archives/pyparted-devel/" - + "2014-April/msg00000.html"; - postFetch = '' - sed -i -ne '/<!--X-Body-of-Message-->/,/<!--X-Body-of-Message-End-->/ { - s/^<[^>]*>//; /^$/!p - }' "$downloadedFile" - ''; - sha256 = "1lakhz3nvx0qacn90bj1nq13zqxphiw4d9dsc44gwa8nj24j2zws"; - }); - postPatch = '' - sed -i -e 's|/sbin/mke2fs|${pkgs.e2fsprogs}&|' tests/baseclass.py + sed -i -e 's|mke2fs|${pkgs.e2fsprogs}/bin/mke2fs|' tests/baseclass.py sed -i -e ' s|e\.path\.startswith("/tmp/temp-device-")|"temp-device-" in e.path| ' tests/test__ped_ped.py @@ -14105,7 +14103,7 @@ let sqlalchemy = self.sqlalchemy9.override rec { name = "SQLAlchemy-0.7.10"; - disabled = isPy34; + disabled = isPy34 || isPy35; doCheck = !isPyPy; src = pkgs.fetchurl { @@ -14124,7 +14122,7 @@ let sqlalchemy8 = self.sqlalchemy9.override rec { name = "SQLAlchemy-0.8.7"; - disabled = isPy34; + disabled = isPy34 || isPy35; doCheck = !isPyPy; src = pkgs.fetchurl { @@ -15598,11 +15596,13 @@ let wxPython = self.wxPython28; - wxPython28 = callPackage ../development/python-modules/wxPython/2.8.nix { + wxPython28 = import ../development/python-modules/wxPython/2.8.nix { + inherit callPackage; wxGTK = pkgs.wxGTK28; }; - wxPython30 = callPackage ../development/python-modules/wxPython/3.0.nix { + wxPython30 = import ../development/python-modules/wxPython/3.0.nix { + inherit callPackage; wxGTK = pkgs.wxGTK30; }; @@ -17150,7 +17150,7 @@ let IMAPClient = buildPythonPackage rec { name = "IMAPClient-${version}"; version = "0.11"; - disabled = isPy34; + disabled = isPy34 || isPy35; src = pkgs.fetchurl { url = "http://freshfoo.com/projects/IMAPClient/${name}.tar.gz"; |