diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 753 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 454 | ||||
| -rw-r--r-- | pkgs/top-level/perl-packages.nix | 1104 | ||||
| -rw-r--r-- | pkgs/top-level/platforms.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 194 | ||||
| -rw-r--r-- | pkgs/top-level/release.nix | 27 |
6 files changed, 1806 insertions, 736 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 327b97d07f5c..9dd103db8611 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -261,16 +261,12 @@ let }; fetchgit = import ../build-support/fetchgit { - inherit stdenv git; + inherit stdenv git cacert; }; fetchgitrevision = import ../build-support/fetchgitrevision runCommand git; - fetchmtn = import ../build-support/fetchmtn { - inherit monotone stdenv; - cacheDB = getConfig ["fetchmtn" "cacheDB"] ""; - defaultDBMirrors = getConfig ["fetchmtn" "defaultDBMirrors"] []; - }; + fetchmtn = callPackage ../build-support/fetchmtn (getConfig ["fetchmtn"] {}); fetchsvn = import ../build-support/fetchsvn { inherit stdenv subversion openssh; @@ -391,6 +387,8 @@ let at = callPackage ../tools/system/at { }; + atftp = callPackage ../tools/networking/atftp {}; + autogen = callPackage ../development/tools/misc/autogen { guile = guile_1_8; }; @@ -401,6 +399,8 @@ let qt4Support = getConfig [ "avahi" "qt4Support" ] false; }; + aws_mturk_clt = callPackage ../tools/misc/aws-mturk-clt { }; + axel = callPackage ../tools/networking/axel { }; azureus = callPackage ../tools/networking/p2p/azureus { }; @@ -413,8 +413,6 @@ let bfr = callPackage ../tools/misc/bfr { }; - bluedevil = newScope pkgs.kde4 ../tools/bluetooth/bluedevil { }; - bootchart = callPackage ../tools/system/bootchart { }; btrfsProgs = builderDefsPackage (import ../tools/filesystems/btrfsprogs) { @@ -429,12 +427,14 @@ let mcrl2 = callPackage ../tools/misc/mcrl2 { }; - syslogng = callPackage ../tools/misc/syslog-ng { }; + syslogng = callPackage ../tools/system/syslog-ng { }; asciidoc = callPackage ../tools/typesetting/asciidoc { }; autossh = callPackage ../tools/networking/autossh { }; + bacula = callPackage ../tools/backup/bacula { }; + bibtextools = callPackage ../tools/typesetting/bibtex-tools { inherit (strategoPackages016) strategoxt sdf; }; @@ -459,6 +459,8 @@ let bsdiff = callPackage ../tools/compression/bsdiff { }; + bup = callPackage ../tools/backup/bup { }; + bzip2 = callPackage ../tools/compression/bzip2 { }; cabextract = callPackage ../tools/archivers/cabextract { }; @@ -535,6 +537,8 @@ let neon = neon029; }; + dbench = callPackage ../development/tools/misc/dbench { }; + dcraw = callPackage ../tools/graphics/dcraw { }; debootstrap = callPackage ../tools/misc/debootstrap { }; @@ -593,6 +597,8 @@ let dvdplusrwtools = callPackage ../tools/cd-dvd/dvd+rw-tools { }; + dvgrab = callPackage ../tools/video/dvgrab { }; + e2fsprogs = callPackage ../tools/filesystems/e2fsprogs { }; ebook_tools = callPackage ../tools/text/ebook-tools { }; @@ -657,14 +663,14 @@ let ftgl = callPackage ../development/libraries/ftgl { }; - fuppes = callPackage ../tools/networking/fuppes {}; + fuppes = callPackage ../tools/networking/fuppes { + ffmpeg = ffmpeg_0_6_90; + }; fsfs = callPackage ../tools/filesystems/fsfs { }; dos2unix = callPackage ../tools/text/dos2unix { }; - unix2dos = callPackage ../tools/text/unix2dos { }; - uni2ascii = callPackage ../tools/text/uni2ascii { }; gawk = callPackage ../tools/text/gawk { }; @@ -802,6 +808,8 @@ let hdf5 = callPackage ../tools/misc/hdf5 { }; + heimdall = callPackage ../tools/misc/heimdall { }; + hevea = callPackage ../tools/typesetting/hevea { }; highlight = callPackage ../tools/text/highlight { }; @@ -868,8 +876,6 @@ let jwhois = callPackage ../tools/networking/jwhois { }; - kdiff3 = newScope pkgs.kde4 ../tools/text/kdiff3 { }; - keychain = callPackage ../tools/misc/keychain { }; kismet = callPackage ../applications/networking/sniffers/kismet { }; @@ -910,6 +916,8 @@ let guile = guile_1_8; }; + mairix = callPackage ../tools/text/mairix { }; + man = callPackage ../tools/misc/man { }; man_db = callPackage ../tools/misc/man-db { }; @@ -1000,6 +1008,8 @@ let ndisc6 = callPackage ../tools/networking/ndisc6 { }; + netboot = callPackage ../tools/networking/netboot {}; + netcat = callPackage ../tools/networking/netcat { }; netkittftp = callPackage ../tools/networking/netkit/tftp { }; @@ -1132,7 +1142,7 @@ let philter = callPackage ../tools/networking/philter { }; - pinentry = callPackage ../tools/misc/pinentry { + pinentry = callPackage ../tools/security/pinentry { inherit (gnome) glib gtk; }; @@ -1150,7 +1160,7 @@ let polipo = callPackage ../servers/polipo { }; - polkit_gnome = callPackage ../tools/misc/polkit-gnome { }; + polkit_gnome = callPackage ../tools/security/polkit-gnome { }; povray = callPackage ../tools/graphics/povray { }; @@ -1178,10 +1188,7 @@ let pystringtemplate = callPackage ../development/python-modules/stringtemplate { }; - pythonDBus = builderDefsPackage (import ../development/python-modules/dbus) { - inherit python pkgconfig dbus_glib; - dbus = dbus.libs; - }; + pythonDBus = callPackage ../development/python-modules/dbus { }; pythonIRClib = builderDefsPackage (import ../development/python-modules/irclib) { inherit python; @@ -1260,6 +1267,8 @@ let s3backer = callPackage ../tools/filesystems/s3backer { }; + s3cmd = callPackage ../tools/networking/s3cmd { }; + s3sync = callPackage ../tools/networking/s3sync { }; sablotron = callPackage ../tools/text/xml/sablotron { }; @@ -1282,6 +1291,8 @@ let siege = callPackage ../tools/networking/siege {}; + sleuthkit = callPackage ../tools/system/sleuthkit {}; + slimrat = callPackage ../tools/networking/slimrat { inherit (perlPackages) WWWMechanize LWP; }; @@ -1308,8 +1319,9 @@ let sudo = callPackage ../tools/security/sudo { }; - suidChroot = builderDefsPackage (import ../tools/system/suid-chroot) { - }; + suidChroot = builderDefsPackage (import ../tools/system/suid-chroot) { }; + + super = callPackage ../tools/security/super { }; ssmtp = callPackage ../tools/networking/ssmtp { tlsSupport = true; @@ -1330,7 +1342,6 @@ let svnfs = callPackage ../tools/filesystems/svnfs { }; system_config_printer = callPackage ../tools/misc/system-config-printer { - inherit (pythonPackages) notify; libxml2 = libxml2Python; }; @@ -1389,6 +1400,8 @@ let vfdecrypt = callPackage ../tools/misc/vfdecrypt { }; + vifm = callPackage ../applications/misc/vifm {}; + viking = callPackage ../applications/misc/viking { }; vncrec = builderDefsPackage ../tools/video/vncrec { @@ -1409,6 +1422,8 @@ let htmlTidy = callPackage ../tools/text/html-tidy { }; + tftp_hpa = callPackage ../tools/networking/tftp-hpa {}; + tigervnc = callPackage ../tools/admin/tigervnc { fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc xorg.fontbhlucidatypewriter75dpi ]; @@ -1553,6 +1568,8 @@ let xsel = callPackage ../tools/misc/xsel { }; + xtreemfs = callPackage ../tools/filesystems/xtreemfs {}; + zdelta = callPackage ../tools/compression/zdelta { }; zile = callPackage ../applications/editors/zile { }; @@ -1573,6 +1590,8 @@ let interactive = true; }); + bashCompletion = callPackage ../shells/bash-completion { }; + dash = callPackage ../shells/dash { }; ipython = callPackage ../shells/ipython { }; @@ -1606,6 +1625,10 @@ let buildClang = true; }; + clangSVN = llvmSVN.override { + buildClang = true; + }; + clean = callPackage ../development/compilers/clean { }; cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { }; @@ -1654,7 +1677,8 @@ let }); gcc41 = wrapGCC (makeOverridable (import ../development/compilers/gcc-4.1) { - inherit fetchurl stdenv noSysDirs; + inherit fetchurl noSysDirs gmp mpfr; + stdenv = overrideGCC stdenv gcc42; texinfo = texinfo49; profiledCompiler = false; }); @@ -2031,58 +2055,122 @@ let inherit fetchurl stdenv perl ncurses gmp libedit; }); + ghc6121Binary = lowPrio (import ../development/compilers/ghc/6.12.1-binary.nix { + inherit fetchurl stdenv perl ncurses gmp; + }); + + ghc704Binary = lowPrio (import ../development/compilers/ghc/7.0.4-binary.nix { + inherit fetchurl stdenv perl ncurses gmp; + }); + # For several compiler versions, we export a large set of Haskell-related # packages. # This should point to the current default version. - haskellPackages = haskellPackages_ghc702; + haskellPackages = haskellPackages_ghc704; - # NOTE: After discussion, we decided to enable recurseIntoAttrs for all - # currently available ghc versions. (Before, it used to be enabled only - # for a selected few versions.) If someone complains about nix-env -qa - # output being spammed by lots of Haskell packages, we can talk about - # reducing the number or "enabled" versions again. + # NOTE (recurseIntoAttrs): After discussion, we originally decided to + # enable it for all GHC versions. However, this is getting too much, + # particularly in connection with Hydra builds for all these packages. + # So we enable it for selected versions only. # Helper functions to abstract away from repetitive instantiations. - haskellPackagesFun = ghcPath : prefFun : profDefault : modifyPrio : recurseIntoAttrs (import ./haskell-packages.nix { - inherit pkgs newScope modifyPrio prefFun; - enableLibraryProfiling = getConfig [ "cabal" "libraryProfiling" ] profDefault; - ghc = callPackage ghcPath { ghc = ghc6101Binary; }; - }); + haskellPackagesFun = + ghcPath : ghcBinary : prefFun : profExplicit : profDefault : modifyPrio : + import ./haskell-packages.nix { + inherit pkgs newScope modifyPrio prefFun; + enableLibraryProfiling = + if profExplicit then profDefault + else getConfig [ "cabal" "libraryProfiling" ] profDefault; + ghc = callPackage ghcPath { ghc = ghcBinary; }; + }; # Currently active GHC versions. haskellPackages_ghc6104 = - haskellPackagesFun ../development/compilers/ghc/6.10.4.nix (x : x.ghc6104Prefs) false (x : x); + recurseIntoAttrs + (haskellPackagesFun ../development/compilers/ghc/6.10.4.nix + ghc6101Binary (x : x.ghc6104Prefs) false false lowPrio); haskellPackages_ghc6121 = - haskellPackagesFun ../development/compilers/ghc/6.12.1.nix (x : x.ghc6121Prefs) false (x : x); + haskellPackagesFun ../development/compilers/ghc/6.12.1.nix + ghc6101Binary (x : x.ghc6121Prefs) false false lowPrio; haskellPackages_ghc6122 = - haskellPackagesFun ../development/compilers/ghc/6.12.2.nix (x : x.ghc6122Prefs) false (x : x); + haskellPackagesFun ../development/compilers/ghc/6.12.2.nix + ghc6101Binary (x : x.ghc6122Prefs) false false lowPrio; haskellPackages_ghc6123 = - haskellPackagesFun ../development/compilers/ghc/6.12.3.nix (x : x.ghc6123Prefs) false (x : x); + recurseIntoAttrs + (haskellPackagesFun ../development/compilers/ghc/6.12.3.nix + ghc6101Binary (x : x.ghc6123Prefs) false false lowPrio); # Will never make it into a platform release, severe bugs; leave at lowPrio. haskellPackages_ghc701 = - haskellPackagesFun ../development/compilers/ghc/7.0.1.nix (x : x.ghc701Prefs) false lowPrio; + haskellPackagesFun ../development/compilers/ghc/7.0.1.nix + ghc6101Binary (x : x.ghc701Prefs) false false lowPrio; - # Current default version. haskellPackages_ghc702 = - haskellPackagesFun ../development/compilers/ghc/7.0.2.nix (x : x.ghc702Prefs) false (x : x); + haskellPackagesFun ../development/compilers/ghc/7.0.2.nix + ghc6101Binary (x : x.ghc702Prefs) false false lowPrio; - # The only thing that keeps this one from becoming default is that - # the Haskell Platform based on 703 is released improperly. - # Please keep at lowPrio until fixed. haskellPackages_ghc703 = - haskellPackagesFun ../development/compilers/ghc/7.0.3.nix (x : x.ghc703Prefs) false lowPrio; + haskellPackagesFun ../development/compilers/ghc/7.0.3.nix + ghc6101Binary (x : x.ghc703Prefs) false false lowPrio; + + # Current default version: 7.0.4 + # Note that the platform isn't officially released for ghc-7.0.4, but + # it works without problems. + + # The following items are a bit convoluted, but they serve the + # following purpose: + # - for the default version of GHC, both profiling and + # non-profiling versions should be built by Hydra -- + # therefore, the _no_profiling and _profiling calls; + # - however, if a user just upgrades a profile, then the + # cabal/libraryProfiling setting should be respected; i.e., + # the versions not matching the profiling config setting + # should have low priority -- therefore, the use of + # haskellDefaultVersionPrioFun; + # - it should be possible to select library versions that + # respect the config setting using the standard + # haskellPackages_ghc704 path -- therefore, the additional + # call in haskellPackages_ghc704, without recurseIntoAttrs, + # so that Hydra doesn't build these. + haskellDefaultVersionPrioFun = + profDefault : + if getConfig [ "cabal" "libraryProfiling" ] false == profDefault + then (x : x) + else lowPrio; + + haskellPackages_ghc704_no_profiling = + recurseIntoAttrs + (haskellPackagesFun ../development/compilers/ghc/7.0.4.nix + (if stdenv.isDarwin then ghc704Binary else ghc6101Binary) + (x : x.ghc704Prefs) true false + (haskellDefaultVersionPrioFun false)); + + haskellPackages_ghc704_profiling = + recurseIntoAttrs + (haskellPackagesFun ../development/compilers/ghc/7.0.4.nix + (if stdenv.isDarwin then ghc704Binary else ghc6101Binary) + (x : x.ghc704Prefs) true true + (haskellDefaultVersionPrioFun true)); - # Just released. Needs some testing first. Please keep at lowPrio for now. haskellPackages_ghc704 = - haskellPackagesFun ../development/compilers/ghc/7.0.4.nix (x : x.ghc704Prefs) false lowPrio; + haskellPackagesFun ../development/compilers/ghc/7.0.4.nix + (if stdenv.isDarwin then ghc704Binary else ghc6101Binary) + (x : x.ghc704Prefs) false false (x : x); + haskellPackages_ghc721 = + recurseIntoAttrs + (haskellPackagesFun ../development/compilers/ghc/7.2.1.nix + (if stdenv.isDarwin then ghc704Binary else ghc6121Binary) + (x : x.ghc721Prefs) false false lowPrio); + + # Still a release candidate. haskellPackages_ghcHEAD = - haskellPackagesFun ../development/compilers/ghc/head.nix (x : x.ghcHEADPrefs) false lowPrio; + haskellPackagesFun ../development/compilers/ghc/head.nix + ghc6121Binary (x : x.ghcHEADPrefs) false false lowPrio; haxeDist = import ../development/compilers/haxe { inherit fetchurl sourceFromHead stdenv lib ocaml zlib makeWrapper neko; @@ -2113,6 +2201,12 @@ let openjdkDarwin = callPackage ../development/compilers/openjdk-darwin { }; + openjdk = callPackage ../development/compilers/openjdk { }; + + openjre = callPackage ../development/compilers/openjdk { + jreOnly = true; + }; + j2sdk14x = ( assert system == "i686-linux"; import ../development/compilers/jdk/default-1.4.nix { @@ -2152,6 +2246,9 @@ let llvm = callPackage ../development/compilers/llvm { }; + # Works partially + llvmSVN = callPackage ../development/compilers/llvm/svn-head.nix { }; + mitscheme = callPackage ../development/compilers/mit-scheme { }; mlton = callPackage ../development/compilers/mlton { }; @@ -2255,6 +2352,9 @@ let roadsend = callPackage ../development/compilers/roadsend { }; + # TODO: the corresponding nix file is missing + # rust = pkgsi686Linux.callPackage ../development/compilers/rust {}; + sbcl = builderDefsPackage (import ../development/compilers/sbcl) { inherit makeWrapper clisp; }; @@ -2499,17 +2599,14 @@ let xulrunnerWrapper = {application, launcher}: import ../development/interpreters/xulrunner/wrapper { - inherit stdenv application launcher; - xulrunner = firefox50Pkgs.xulrunner; + inherit stdenv application launcher xulrunner; }; - xulrunner = firefox50Pkgs.xulrunner; + xulrunner = pkgs.firefoxPkgs.xulrunner; ### DEVELOPMENT / MISC - avrgcclibc = callPackage ../development/misc/avr-gcc-with-avr-libc { - gcc = gcc40; - }; + avrgcclibc = callPackage ../development/misc/avr-gcc-with-avr-libc {}; avr8burnomat = callPackage ../development/misc/avr8-burn-omat { }; @@ -2654,6 +2751,8 @@ let cscope = callPackage ../development/tools/misc/cscope { }; + csslint = callPackage ../development/web/csslint { }; + dejagnu = callPackage ../development/tools/misc/dejagnu { }; ddd = callPackage ../development/tools/misc/ddd { }; @@ -2664,7 +2763,11 @@ let inherit python pil makeWrapper; }; - doxygen = callPackage ../development/tools/documentation/doxygen { + doxygen = lowPrio (callPackage ../development/tools/documentation/doxygen { + qt = null; + }); + + doxygen_gui = doxygen.override { qt = qt4; }; @@ -2790,6 +2893,8 @@ let patchelf06 = callPackage ../development/tools/misc/patchelf/0.6.nix { }; + peg = callPackage ../development/tools/parsing/peg { }; + pmccabe = callPackage ../development/tools/misc/pmccabe { }; /* Make pkgconfig always return a buildDrv, never a proper hostDrv, @@ -2879,10 +2984,9 @@ let acl = callPackage ../development/libraries/acl { }; - adns = import ../development/libraries/adns/1.4.nix { - inherit stdenv fetchurl; - static = getConfig [ "adns" "static" ] (stdenv ? isStatic || stdenv ? isDietLibC); - }; + adns = callPackage ../development/libraries/adns { }; + + afflib = callPackage ../development/libraries/afflib {}; agg = callPackage ../development/libraries/agg { }; @@ -2912,6 +3016,8 @@ let aterm28 = lowPrio (callPackage ../development/libraries/aterm/2.8.nix { }); + attica = callPackage ../development/libraries/attica { }; + attr = callPackage ../development/libraries/attr { }; aubio = callPackage ../development/libraries/aubio { }; @@ -2926,11 +3032,13 @@ let boolstuff = callPackage ../development/libraries/boolstuff { }; - boost = callPackage ../development/libraries/boost { }; - boost142 = callPackage ../development/libraries/boost/1.42.nix { }; boost144 = callPackage ../development/libraries/boost/1.44.nix { }; boost146 = callPackage ../development/libraries/boost/1.46.nix { }; + boost147 = callPackage ../development/libraries/boost/1.47.nix { }; + # 1.47.0 doesn't compile on Darwin. The issue is probably trivial to + # fix, but no-one has done it yet. + boost = if stdenv.isDarwin then boost146 else boost147; # A Boost build with all library variants enabled. Very large (about 250 MB). boostFull = appendToName "full" (boost.override { @@ -2995,7 +3103,9 @@ let clppcre = builderDefsPackage (import ../development/libraries/cl-ppcre) { }; - cluceneCore = callPackage ../development/libraries/clucene-core { }; + clucene_core = callPackage ../development/libraries/clucene-core { }; + + cluceneCore = clucene_core; # !!! remove this clutter = callPackage ../development/libraries/clutter { inherit (gnome) glib pango gtk; @@ -3038,14 +3148,28 @@ let db48 = callPackage ../development/libraries/db4/db4-4.8.nix { }; - dbus = callPackage ../development/libraries/dbus { + dbus = pkgs.dbus_all.libs // { inherit (pkgs.dbus_all) libs; }; + + dbus_daemon = pkgs.dbus_all.daemon; + + dbus_tools = pkgs.dbus_all.tools; + + dbus_libs = pkgs.dbus_all.libs; + + dbus_all = callPackage ../development/libraries/dbus { + useX11 = true; + }; + + dbus_all_1_5_6 = callPackage ../development/libraries/dbus/1.5.6.nix { useX11 = true; }; - dbus_glib = makeOverridable (import ../development/libraries/dbus-glib) { - inherit fetchurl stdenv pkgconfig gettext dbus expat glib libiconv; + dbus_glib_0_94 = callPackage ../development/libraries/dbus-glib/0.94.nix { + dbus = pkgs.dbus_all_1_5_6.libs; }; + dbus_glib = callPackage ../development/libraries/dbus-glib { }; + dbus_java = callPackage ../development/libraries/java/dbus-java { }; dclib = callPackage ../development/libraries/dclib { }; @@ -3102,6 +3226,10 @@ let vpxSupport = if !stdenv.isMips then true else false; }; + ffmpeg_0_6_90 = callPackage ../development/libraries/ffmpeg/0.6.90.nix { + vpxSupport = if !stdenv.isMips then true else false; + }; + fftw = callPackage ../development/libraries/fftw { singlePrecision = false; }; @@ -3192,7 +3320,7 @@ let glibc = glibc212; glibc25 = callPackage ../development/libraries/glibc-2.5 { - kernelHeaders = linuxHeaders; + kernelHeaders = linuxHeaders_2_6_28; installLocales = false; }; @@ -3317,7 +3445,8 @@ let gst_all = recurseIntoAttrs (let callPackage = newScope pkgs.gst_all; in - import ../development/libraries/gstreamer { inherit callPackage pkgs; }); + import ../development/libraries/gstreamer { inherit callPackage; } + ); gnet = callPackage ../development/libraries/gnet { }; @@ -3325,6 +3454,10 @@ let guileBindings = getConfig ["gnutls" "guile"] true; }; + gnutls2 = callPackage ../development/libraries/gnutls/2.12.nix { + guileBindings = getConfig ["gnutls" "guile"] true; + }; + gpgme = callPackage ../development/libraries/gpgme { }; grantlee = callPackage ../development/libraries/grantlee { }; @@ -3345,11 +3478,9 @@ let gtkmathview = callPackage ../development/libraries/gtkmathview { }; - gtkLibs = gtkLibs224; + gtkLibs = pkgs.gtkLibs224; - glib = gtkLibs.glib; - gtk = gtkLibs.gtk; - pango = gtkLibs.pango; + inherit (pkgs.gtkLibs) glib gtk pango; gtkLibs1x = recurseIntoAttrs (let callPackage = newScope pkgs.gtkLibs1x; in { @@ -3450,11 +3581,7 @@ let heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { }; - herqqSvn = callPackage ../development/libraries/herqq/svn.nix { }; - - herqq070 = callPackage ../development/libraries/herqq/0.7.0.nix { }; - - herqq080 = callPackage ../development/libraries/herqq/0.8.0.nix { }; + herqq = callPackage ../development/libraries/herqq { }; hspell = callPackage ../development/libraries/hspell { }; @@ -3518,8 +3645,6 @@ let judy = callPackage ../development/libraries/judy { }; - kdevplatform = newScope pkgs.kde4 ../development/libraries/kdevplatform { }; - krb5 = callPackage ../development/libraries/kerberos/krb5.nix { }; lcms = lcms1; @@ -3565,13 +3690,7 @@ let libcaca = callPackage ../development/libraries/libcaca { }; libcanberra = callPackage ../development/libraries/libcanberra { - /* Using GNU Make 3.82 leads to this: - - Makefile:939: *** missing separator (did you mean TAB instead of 8 spaces?). Stop. - - So use 3.81. */ - stdenv = overrideInStdenv stdenv [gnumake381]; - gstreamer = gst_all.gstreamer; + # gstreamer = gst_all.gstreamer; }; libcdaudio = callPackage ../development/libraries/libcdaudio { }; @@ -3611,10 +3730,10 @@ let libdmtx = callPackage ../development/libraries/libdmtx { }; - libdrm = if stdenv.isDarwin then null else (callPackage ../development/libraries/libdrm { + libdrm = callPackage ../development/libraries/libdrm { inherit fetchurl stdenv pkgconfig; inherit (xorg) libpthreadstubs; - }); + }; libdv = callPackage ../development/libraries/libdv { }; @@ -3689,14 +3808,10 @@ let useGTK = getConfig [ "libiodbc" "gtk" ] false; }; - libktorrent = newScope pkgs.kde4 ../development/libraries/libktorrent { }; - liblastfmSF = callPackage ../development/libraries/liblastfmSF { }; liblastfm = callPackage ../development/libraries/liblastfm { }; - liblikeback = newScope pkgs.kde4 ../development/libraries/liblikeback { }; - liblqr1 = callPackage ../development/libraries/liblqr-1 { inherit (gnome) glib; }; @@ -3715,9 +3830,7 @@ let libsamplerate = callPackage ../development/libraries/libsamplerate { }; - libspectre = callPackage ../development/libraries/libspectre { - ghostscript = ghostscriptX; - }; + libspectre = callPackage ../development/libraries/libspectre { }; libgsf = callPackage ../development/libraries/libgsf { inherit (gnome) glib gnomevfs libbonobo; @@ -3769,6 +3882,8 @@ let libmilter = callPackage ../development/libraries/libmilter { }; + libmms = callPackage ../development/libraries/libmms { }; + libmowgli = callPackage ../development/libraries/libmowgli { }; libmng = callPackage ../development/libraries/libmng { }; @@ -4000,7 +4115,9 @@ let qt = qt4; }; - mpeg2dec = callPackage ../development/libraries/mpeg2dec { }; + libmpeg2 = callPackage ../development/libraries/libmpeg2 { }; + + mpeg2dec = libmpeg2; msilbc = callPackage ../development/libraries/msilbc { }; @@ -4010,6 +4127,8 @@ let mpich2 = callPackage ../development/libraries/mpich2 { }; + mtdev = callPackage ../development/libraries/mtdev { }; + muparser = callPackage ../development/libraries/muparser { }; mygui = callPackage ../development/libraries/mygui {}; @@ -4071,7 +4190,13 @@ let openct = callPackage ../development/libraries/openct { }; opencv = callPackage ../development/libraries/opencv { - inherit (gst_all) gstreamer; + ffmpeg = ffmpeg_0_6_90; + inherit (gst_all) gstreamer; + }; + + opencv_2_1 = callPackage ../development/libraries/opencv/2.1.nix { + ffmpeg = ffmpeg_0_6_90; + inherit (gst_all) gstreamer; }; # this ctl version is needed by openexr_viewers @@ -4116,6 +4241,10 @@ let pdf2xml = callPackage ../development/libraries/pdf2xml {} ; + phonon = callPackage ../development/libraries/phonon { }; + + phonon_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer { }; + phonon_backend_vlc = newScope pkgs.kde4 ../development/libraries/phonon-backend-vlc { }; physfs = callPackage ../development/libraries/physfs { }; @@ -4128,14 +4257,17 @@ let polkit = callPackage ../development/libraries/polkit { }; + polkit_qt_1 = callPackage ../development/libraries/polkit-qt-1 { }; + policykit = callPackage ../development/libraries/policykit { }; poppler = callPackage ../development/libraries/poppler { + gtkSupport = true; qt4Support = false; }; popplerQt4 = poppler.override { - inherit qt4; + gtkSupport = false; qt4Support = true; }; @@ -4144,6 +4276,8 @@ let portaudio = callPackage ../development/libraries/portaudio { }; portaudioSVN = callPackage ../development/libraries/portaudio/svn-head.nix { }; + prison = callPackage ../development/libraries/prison { }; + proj = callPackage ../development/libraries/proj { }; postgis = callPackage ../development/libraries/postgis { }; @@ -4179,26 +4313,15 @@ let }; qt47 = callPackage ../development/libraries/qt-4.x/4.7 { - inherit (pkgs.gst_all) gstreamer gstPluginsBase; inherit (pkgs.gnome) glib; }; qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { }; - quassel = newScope pkgs.kde4 ../applications/networking/irc/quassel { }; - - quasselDaemon = appendToName "daemon" (quassel.override { - monolithic = false; - daemon = true; - }); - - quasselClient = appendToName "client" (quassel.override { - monolithic = false; - client = true; - }); - quesoglc = callPackage ../development/libraries/quesoglc { }; + qwt = callPackage ../development/libraries/qwt {}; + readline = readline6; readline4 = callPackage ../development/libraries/readline/readline4.nix { }; @@ -4209,16 +4332,17 @@ let librdf_raptor = callPackage ../development/libraries/librdf/raptor.nix { }; + librdf_raptor2 = callPackage ../development/libraries/librdf/raptor2.nix { }; + librdf_rasqal = callPackage ../development/libraries/librdf/rasqal.nix { }; + librdf_redland = callPackage ../development/libraries/librdf/redland.nix { }; + librdf = callPackage ../development/libraries/librdf { }; qrupdate = callPackage ../development/libraries/qrupdate { }; - redland = callPackage ../development/libraries/redland/1.0.10.nix { - bdb = db4; - postgresql = null; - }; + redland = pkgs.librdf_redland; rhino = callPackage ../development/libraries/java/rhino { ant = apacheAntGcj; @@ -4320,6 +4444,8 @@ let ## inherit stdenv fetchurl cmake qt4 telepathy_qt; ## }; + tcp_wrappers = callPackage ../development/libraries/tcp-wrappers {}; + tdb = callPackage ../development/libraries/tdb { }; tecla = callPackage ../development/libraries/tecla { }; @@ -4591,6 +4717,8 @@ let pycups = callPackage ../development/python-modules/pycups { }; + pyexiv2 = callPackage ../development/python-modules/pyexiv2 { }; + pygame = callPackage ../development/python-modules/pygame { }; pygobject = callPackage ../development/python-modules/pygobject { }; @@ -4697,7 +4825,9 @@ let lighttpd = callPackage ../servers/http/lighttpd { }; - mediatomb = callPackage ../servers/mediatomb { }; + mediatomb = callPackage ../servers/mediatomb { + ffmpeg = ffmpeg_0_6_90; + }; mod_python = callPackage ../servers/http/apache-modules/mod_python { }; @@ -4707,6 +4837,8 @@ let mpd = callPackage ../servers/mpd { }; + miniHttpd = callPackage ../servers/http/mini-httpd {}; + myserver = callPackage ../servers/http/myserver { }; nginx = builderDefsPackage (import ../servers/http/nginx) { @@ -4717,6 +4849,11 @@ let pulseaudio = callPackage ../servers/pulseaudio { gconf = gnome.GConf; + # The following are disabled in the default build, because if this + # functionality is desired, they are only needed in the PulseAudio + # server. + bluez = null; + avahi = null; }; tomcat_connectors = callPackage ../servers/http/apache-modules/tomcat-connectors { }; @@ -4742,6 +4879,8 @@ let ps = procps; /* !!! Linux only */ }; + mysql55 = callPackage ../servers/sql/mysql55 { }; + mysql = mysql51; mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; @@ -4785,9 +4924,11 @@ let sipwitch = callPackage ../servers/sip/sipwitch { }; squids = recurseIntoAttrs( import ../servers/squid/squids.nix { - inherit fetchurl stdenv perl lib composableDerivation; + inherit fetchurl stdenv perl lib composableDerivation + openldap pam db4 cyrus_sasl kerberos libcap expat libxml2 libtool + openssl; }); - squid = squids.squid3Beta; # has ipv6 support + squid = squids.squid31; # has ipv6 support tomcat5 = callPackage ../servers/http/tomcat/5.0.nix { }; @@ -4838,7 +4979,10 @@ let alsaLib = callPackage ../os-specific/linux/alsa-lib { }; - alsaPlugins = callPackage ../os-specific/linux/alsa-plugins { }; + alsaPlugins = callPackage ../os-specific/linux/alsa-plugins { + jackaudio = null; + }; + alsaPluginWrapper = callPackage ../os-specific/linux/alsa-plugins/wrapper.nix { }; alsaUtils = callPackage ../os-specific/linux/alsa-utils { }; @@ -5025,6 +5169,8 @@ let libaio = callPackage ../os-specific/linux/libaio { }; + libatasmart = callPackage ../os-specific/linux/libatasmart { }; + libcgroup = callPackage ../os-specific/linux/libcg { }; libnl = callPackage ../os-specific/linux/libnl { }; @@ -5077,7 +5223,7 @@ let [ kernelPatches.fbcondecor_2_6_25 kernelPatches.sec_perm_2_6_24 kernelPatches.glibc_getline - kernelPatches.cifs_timeout_2_6_25 + kernelPatches.cifs_timeout_2_6_25 ]; }; @@ -5088,7 +5234,7 @@ let [ kernelPatches.fbcondecor_2_6_25 kernelPatches.sec_perm_2_6_24 kernelPatches.glibc_getline - kernelPatches.cifs_timeout_2_6_25 + kernelPatches.cifs_timeout_2_6_25 ]; }; @@ -5098,7 +5244,7 @@ let kernelPatches = [ kernelPatches.fbcondecor_2_6_27 kernelPatches.sec_perm_2_6_24 - kernelPatches.cifs_timeout_2_6_25 + kernelPatches.cifs_timeout_2_6_25 ]; }; @@ -5110,7 +5256,7 @@ let kernelPatches.sec_perm_2_6_24 kernelPatches.ext4_softlockups_2_6_28 kernelPatches.glibc_getline - kernelPatches.cifs_timeout_2_6_25 + kernelPatches.cifs_timeout_2_6_25 ]; }; @@ -5119,7 +5265,7 @@ let kernelPatches = [ kernelPatches.fbcondecor_2_6_29 kernelPatches.sec_perm_2_6_24 - kernelPatches.cifs_timeout_2_6_29 + kernelPatches.cifs_timeout_2_6_29 ]; }; @@ -5168,6 +5314,7 @@ let 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 ]; @@ -5193,8 +5340,9 @@ let inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = [ kernelPatches.fbcondecor_2_6_33 + kernelPatches.aufs2_2_6_33 kernelPatches.sec_perm_2_6_24 - kernelPatches.cifs_timeout_2_6_29 + kernelPatches.cifs_timeout_2_6_29 ]; }; @@ -5220,7 +5368,7 @@ let [ /*kernelPatches.fbcondecor_2_6_33*/ kernelPatches.sec_perm_2_6_24 kernelPatches.aufs2_2_6_34 - kernelPatches.cifs_timeout_2_6_29 + kernelPatches.cifs_timeout_2_6_29 ]; }; @@ -5236,7 +5384,7 @@ let [ #kernelPatches.fbcondecor_2_6_35 kernelPatches.sec_perm_2_6_24 kernelPatches.aufs2_2_6_35 - kernelPatches.cifs_timeout_2_6_35 + kernelPatches.cifs_timeout_2_6_35 ] ++ lib.optional (platform.kernelArch == "arm") kernelPatches.sheevaplug_modules_2_6_35; }; @@ -5250,11 +5398,17 @@ let 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 @@ -5263,9 +5417,9 @@ let kernelPatches = [ #kernelPatches.fbcondecor_2_6_35 kernelPatches.sec_perm_2_6_24 - #kernelPatches.aufs2_2_6_35 + kernelPatches.aufs2_2_6_36 kernelPatches.mips_restart_2_6_36 - kernelPatches.cifs_timeout_2_6_35 + kernelPatches.cifs_timeout_2_6_35 ]; }; @@ -5276,7 +5430,7 @@ let ''; extraMeta = { platforms = ["i686-linux"]; - maintainers = [lib.maintainers.raskin]; + maintainers = [lib.maintainers.raskin]; }; }; @@ -5285,9 +5439,9 @@ let kernelPatches = [ #kernelPatches.fbcondecor_2_6_35 kernelPatches.sec_perm_2_6_24 - #kernelPatches.aufs2_2_6_35 + kernelPatches.aufs2_2_6_36 kernelPatches.mips_restart_2_6_36 - kernelPatches.cifs_timeout_2_6_35 + kernelPatches.cifs_timeout_2_6_35 ]; }; @@ -5303,7 +5457,7 @@ let [ kernelPatches.fbcondecor_2_6_37 kernelPatches.sec_perm_2_6_24 kernelPatches.aufs2_1_2_6_37 - kernelPatches.cifs_timeout_2_6_35 + kernelPatches.cifs_timeout_2_6_35 #kernelPatches.mips_restart_2_6_36 ]; }; @@ -5320,7 +5474,7 @@ let [ kernelPatches.fbcondecor_2_6_38 kernelPatches.sec_perm_2_6_24 kernelPatches.aufs2_1_2_6_38 - kernelPatches.cifs_timeout_2_6_38 + kernelPatches.cifs_timeout_2_6_38 #kernelPatches.mips_restart_2_6_36 ]; }; @@ -5332,6 +5486,26 @@ let kernelPatches = [ #kernelPatches.fbcondecor_2_6_38 kernelPatches.sec_perm_2_6_24 + kernelPatches.aufs2_1_2_6_39 + #kernelPatches.mips_restart_2_6_36 + ]; + }; + + linux_3_0 = makeOverridable (import ../os-specific/linux/kernel/linux-3.0.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_3_0 + #kernelPatches.mips_restart_2_6_36 + ]; + }; + + linux_3_1 = makeOverridable (import ../os-specific/linux/kernel/linux-3.1.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.mips_restart_2_6_36 ]; @@ -5467,6 +5641,8 @@ let linuxPackages_2_6_38 = recurseIntoAttrs (linuxPackagesFor linux_2_6_38 pkgs.linuxPackages_2_6_38); linuxPackages_2_6_38_ati = recurseIntoAttrs (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 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_34 pkgs.linuxPackages_nanonote_jz_2_6_34); linuxPackages_nanonote_jz_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_35 pkgs.linuxPackages_nanonote_jz_2_6_35); linuxPackages_nanonote_jz_2_6_36 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_36 pkgs.linuxPackages_nanonote_jz_2_6_36); @@ -5617,6 +5793,7 @@ let radeonR700 = callPackage ../os-specific/linux/firmware/radeon-r700 { }; radeonR600 = callPackage ../os-specific/linux/firmware/radeon-r600 { }; + radeonJuniper = callPackage ../os-specific/linux/firmware/radeon-juniper { }; rfkill = callPackage ../os-specific/linux/rfkill { }; @@ -5626,6 +5803,10 @@ let rt73fw = callPackage ../os-specific/linux/firmware/rt73 { }; + rtkit = callPackage ../os-specific/linux/rtkit { }; + + rtl8192cfw = callPackage ../os-specific/linux/firmware/rtl8192c { }; + sdparm = callPackage ../os-specific/linux/sdparm { }; shadow = callPackage ../os-specific/linux/shadow { }; @@ -5691,8 +5872,10 @@ let }; udev145 = callPackage ../os-specific/linux/udev/145.nix { }; - udev166 = callPackage ../os-specific/linux/udev/166.nix { }; - udev = udev166; + udev173 = callPackage ../os-specific/linux/udev/173.nix { }; + udev = pkgs.udev173; + + udisks = callPackage ../os-specific/linux/udisks { }; uml = import ../os-specific/linux/kernel/linux-2.6.29.nix { inherit fetchurl stdenv perl mktemp module_init_tools; @@ -5705,6 +5888,10 @@ let untie = callPackage ../os-specific/linux/untie {}; + upower = callPackage ../os-specific/linux/upower { + dbus_glib = pkgs.dbus_glib_0_94; + }; + upstart = callPackage ../os-specific/linux/upstart { }; usbutils = callPackage ../os-specific/linux/usbutils { }; @@ -5722,6 +5909,8 @@ let inherit ncurses perl; }; + v4l_utils = callPackage ../os-specific/linux/v4l-utils {}; + windows = rec { w32api = callPackage ../os-specific/windows/w32api { gccCross = gccCrossStageStatic; @@ -5771,6 +5960,9 @@ let wpa_supplicant_gui = pkgs.wpa_supplicant.gui; + xf86_input_multitouch = + callPackage ../os-specific/linux/xf86-input-multitouch { }; + xf86_input_wacom = callPackage ../os-specific/linux/xf86-input-wacom { }; xmoto = builderDefsPackage (import ../games/xmoto) { @@ -5925,14 +6117,12 @@ let adobeReader = callPackage_i686 ../applications/misc/adobe-reader { }; - akunambol = newScope pkgs.kde4 ../applications/networking/sync/akunambol { }; - - amarok = newScope pkgs.kde4 ../applications/audio/amarok { }; - amsn = callPackage ../applications/networking/instant-messengers/amsn { libstdcpp = gcc33.gcc; }; + antiword = callPackage ../applications/office/antiword {}; + ardour = callPackage ../applications/audio/ardour { inherit (gtkLibs) glib pango gtk glibmm gtkmm; inherit (gnome) libgnomecanvas; @@ -5949,6 +6139,7 @@ let audacity = callPackage ../applications/audio/audacity { portaudio = portaudioSVN; + ffmpeg = ffmpeg_0_6_90; }; aumix = callPackage ../applications/audio/aumix { @@ -5960,14 +6151,14 @@ let avidemux = callPackage ../applications/video/avidemux { }; + avogadro = callPackage ../applications/science/chemistry/avogadro { }; + awesome = callPackage ../applications/window-managers/awesome { inherit (gtkLibs) glib pango; lua = lua5; cairo = cairo.override { xcbSupport = true; }; }; - bangarang = newScope pkgs.kde4 ../applications/video/bangarang { }; - batik = callPackage ../applications/graphics/batik { }; bazaar = callPackage ../applications/version-management/bazaar { }; @@ -5981,9 +6172,7 @@ let guile = guile_1_8; }; - bibletime = newScope pkgs.kde45 ../applications/misc/bibletime { - qt = qt4; - }; + bibletime = callPackage ../applications/misc/bibletime { }; bitcoin = callPackage ../applications/misc/bitcoin { wxGTK = wxGTK290; @@ -6092,13 +6281,12 @@ let darcs = haskellPackages.darcs; darktable = callPackage ../applications/graphics/darktable { - inherit (gnome) GConf gnome_keyring libglade; + inherit (gnome) GConf gnome_keyring libglade atk; + inherit (xlibs) libxcb pixman libpthreadstubs libXau; }; dia = callPackage ../applications/graphics/dia { }; - digikam = newScope pkgs.kde4 ../applications/graphics/digikam { }; - djvulibre = callPackage ../applications/misc/djvulibre { }; djview4 = callPackage ../applications/graphics/djview { }; @@ -6283,11 +6471,11 @@ let feh = callPackage ../applications/graphics/feh { }; - filelight = newScope pkgs.kde4 ../applications/misc/filelight { }; + firefox = pkgs.firefoxPkgs.firefox; - firefox = firefox50Pkgs.firefox; + firefoxWrapper = wrapFirefox pkgs.firefox "firefox" ""; - firefoxWrapper = firefox50Wrapper; + firefoxPkgs = pkgs.firefox60Pkgs; firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix { inherit (gtkLibs) gtk pango; @@ -6296,19 +6484,26 @@ let firefox36Wrapper = wrapFirefox firefox36Pkgs.firefox "firefox" ""; - firefox40Pkgs = callPackage ../applications/networking/browsers/firefox/4.0.nix { + firefox50Pkgs = callPackage ../applications/networking/browsers/firefox/5.0.nix { inherit (gtkLibs) gtk pango; inherit (gnome) libIDL; }; - firefox40Wrapper = wrapFirefox firefox40Pkgs.firefox "firefox" ""; + firefox50Wrapper = wrapFirefox firefox50Pkgs.firefox "firefox" ""; - firefox50Pkgs = callPackage ../applications/networking/browsers/firefox/5.0.nix { + firefox60Pkgs = callPackage ../applications/networking/browsers/firefox/6.0.nix { inherit (gtkLibs) gtk pango; inherit (gnome) libIDL; }; - firefox50Wrapper = wrapFirefox firefox50Pkgs.firefox "firefox" ""; + firefox60Wrapper = wrapFirefox firefox60Pkgs.firefox "firefox" ""; + + firefox70b1Pkgs = callPackage ../applications/networking/browsers/firefox/7.0.nix { + inherit (gtkLibs) gtk pango; + inherit (gnome) libIDL; + }; + + firefox70b1Wrapper = lowPrio (wrapFirefox firefox70b1Pkgs.firefox "firefox" ""); flac = callPackage ../applications/audio/flac { }; @@ -6342,6 +6537,8 @@ let gtksharp = gtksharp1; }; + get_iplayer = callPackage ../applications/misc/get_iplayer {}; + gimp = callPackage ../applications/graphics/gimp { inherit (gnome) gtk libart_lgpl; }; @@ -6415,8 +6612,13 @@ let inherit (gnome) libglade; }; + jbidwatcher = callPackage ../applications/misc/jbidwatcher { + java = if stdenv.isLinux then jre else jdk; + }; + qrdecode = builderDefsPackage (import ../tools/graphics/qrdecode) { - inherit libpng opencv; + inherit libpng; + opencv = opencv_2_1; }; qrencode = builderDefsPackage (import ../tools/graphics/qrencode) { @@ -6569,21 +6771,11 @@ let joe = callPackage ../applications/editors/joe { }; - jwm = callPackage ../applications/window-managers/jwm { }; - - k3b = newScope pkgs.kde4 ../applications/misc/k3b { }; - - kadu = newScope pkgs.kde45 ../applications/networking/instant-messengers/kadu { }; - - kbluetooth = newScope pkgs.kde4 ../tools/bluetooth/kbluetooth { }; - - kde_wacomtablet = newScope pkgs.kde4 ../applications/misc/kde-wacomtablet { }; - - kdenlive = newScope pkgs.kde4 ../applications/video/kdenlive { }; - - kdesvn = newScope pkgs.kde4 ../applications/version-management/kdesvn { }; + jbrout = callPackage ../applications/graphics/jbrout { + inherit (pythonPackages) lxml; + }; - kdevelop = newScope pkgs.kde4 ../applications/editors/kdevelop { }; + jwm = callPackage ../applications/window-managers/jwm { }; keepnote = callPackage ../applications/office/keepnote { pygtk = pyGtkGlade; @@ -6595,24 +6787,6 @@ let inherit (gnome) libglade; }; - kipi_plugins = newScope pkgs.kde4 ../applications/graphics/kipi-plugins { }; - - kmplayer = newScope pkgs.kde4 ../applications/video/kmplayer { - inherit (pkgs.gtkLibs) pango; - }; - - koffice = newScope pkgs.kde4 ../applications/office/koffice { }; - - konq_plugins = newScope pkgs.kde4 ../applications/networking/browsers/konq-plugins { }; - - konversation = newScope pkgs.kde4 ../applications/networking/irc/konversation { }; - - krename = newScope pkgs.kde4 ../applications/misc/krename { }; - - krusader = newScope pkgs.kde4 ../applications/misc/krusader { }; - - ktorrent = newScope pkgs.kde4 ../applications/networking/p2p/ktorrent { }; - lame = callPackage ../applications/audio/lame { }; larswm = callPackage ../applications/window-managers/larswm { }; @@ -6638,6 +6812,7 @@ let links = callPackage ../applications/networking/browsers/links { }; ledger = callPackage ../applications/office/ledger { }; + ledger3 = callPackage ../applications/office/ledger/3.0.nix { }; links2 = (builderDefsPackage ../applications/networking/browsers/links2) { inherit fetchurl stdenv bzip2 zlib libjpeg libpng libtiff @@ -6830,20 +7005,14 @@ let paraview = callPackage ../applications/graphics/paraview { }; - partitionManager = newScope pkgs.kde4 ../tools/misc/partition-manager { }; - pdftk = callPackage ../tools/typesetting/pdftk { }; - pidgin = import ../applications/networking/instant-messengers/pidgin { - inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 nss nspr farsight2 python - gtkspell aspell gettext ncurses avahi dbus dbus_glib lib intltool libidn; + pidgin = callPackage ../applications/networking/instant-messengers/pidgin { openssl = if (getConfig ["pidgin" "openssl"] true) then openssl else null; gnutls = if (getConfig ["pidgin" "gnutls"] false) then gnutls else null; libgcrypt = if (getConfig ["pidgin" "gnutls"] false) then libgcrypt else null; GStreamer = gst_all.gstreamer; - inherit (gtkLibs) gtk; inherit (gnome) startupnotification; - inherit (xlibs) libXScrnSaver; inherit (gst_all) gstPluginsBase; }; @@ -6919,10 +7088,6 @@ let libstdcpp5 = gcc33.gcc; }; - rekonq = newScope pkgs.kde4 ../applications/networking/browsers/rekonq { }; - - rsibreak = newScope pkgs.kde4 ../applications/misc/rsibreak { }; - recode = callPackage ../tools/text/recode { }; retroshare = callPackage ../applications/networking/p2p/retroshare { @@ -6958,8 +7123,6 @@ let wxGTK = wxGTK28.override { unicode = false; }; }; - semnotes = newScope pkgs.kde4 ../applications/misc/semnotes { }; - seq24 = callPackage ../applications/audio/seq24 { inherit (gtkLibs) gtkmm; }; @@ -6982,11 +7145,10 @@ let guile = guile_1_8; }; - sonicVisualiser = callPackage ../applications/audio/sonic-visualiser { - inherit (vamp) vampSDK; - inherit (xlibs) libX11; - qt = qt4; - fftw = fftwSinglePrec; + sonic_visualiser = callPackage ../applications/audio/sonic-visualiser { + inherit (pkgs.vamp) vampSDK; + inherit (pkgs.xlibs) libX11; + fftw = pkgs.fftwSinglePrec; }; sox = callPackage ../applications/misc/audio/sox { }; @@ -7017,12 +7179,19 @@ let httpd = apacheHttpd; }; + subversionClient = lowPrio (appendToName "client" (subversion.override { bdbSupport = false; perlBindings = true; pythonBindings = true; })); + + surf = callPackage ../applications/misc/surf { + inherit (gtkLibs) gtk glib; + libsoup = gnome28.libsoup; + }; + svk = perlPackages.SVK; sylpheed = callPackage ../applications/networking/mailreaders/sylpheed { @@ -7071,6 +7240,10 @@ let inherit (gnome) libIDL; }; + thunderbird5 = callPackage ../applications/networking/mailreaders/thunderbird/5.x.nix { + inherit (gnome) libIDL; + }; + timidity = callPackage ../tools/misc/timidity { }; tkcvs = callPackage ../applications/version-management/tkcvs { }; @@ -7079,6 +7252,12 @@ let transmission = callPackage ../applications/networking/p2p/transmission { }; + trayer = callPackage ../applications/window-managers/trayer { + inherit (gtkLibs) gdk_pixbuf; + }; + + tree = callPackage ../tools/system/tree { }; + tribler = callPackage ../applications/networking/p2p/tribler { }; twinkle = callPackage ../applications/networking/twinkle { @@ -7148,8 +7327,6 @@ let }; vlc = callPackage ../applications/video/vlc { - dbus = dbus.libs; - alsa = alsaLib; lua = lua5; }; @@ -7200,7 +7377,7 @@ let ++ lib.optional (getConfig [browserName "enableMPlayer"] false) (MPlayerPlugin browser) ++ lib.optional (getConfig [browserName "enableGeckoMediaPlayer"] false) gecko_mediaplayer ++ lib.optional (supportsJDK && getConfig [browserName "jre"] false && jrePlugin ? mozillaPlugin) jrePlugin - ++ lib.optional (getConfig [browserName "enableGoogleTalkPlugin"] false) google_talk_plugin + ++ lib.optional (getConfig [browserName "enableGoogleTalkPlugin"] false) google_talk_plugin ); }; @@ -7305,28 +7482,7 @@ let qt = qt4; }; - # doesn't compile yet - in case someone else want's to continue .. - # use Trunk because qgisReleased segfaults no resize for now - qgis = qgisTrunk; - qgisReleased = (import ../applications/misc/qgis) { - inherit composableDerivation fetchsvn stdenv flex lib - ncurses fetchurl perl cmake gdal geos proj x11 - gsl libpng zlib bison - sqlite glibc fontconfig freetype /* use libc from stdenv ? - to lazy now - Marc */ - python postgresql pyqt4; - inherit (xlibs) libSM libXcursor libXinerama libXrandr libXrender; - inherit (xorg) libICE; - qt = qt4; - - # optional features - # grass = "not yet supported" # cmake -D WITH_GRASS=TRUE and GRASS_PREFX=.. - }; - - qgisTrunk = callPackage ../applications/misc/qgis/trunk.nix { - qgis = qgisReleased; - }; - - yakuake = newScope pkgs.kde4 ../applications/misc/yakuake { }; + qgis = callPackage ../applications/misc/qgis {}; yoshimi = callPackage ../applications/audio/yoshimi { fltk = fltk11; @@ -7405,6 +7561,8 @@ let flightgear = callPackage ../games/flightgear {}; + freeciv = callPackage ../games/freeciv { }; + freedink = callPackage ../games/freedink { }; fsg = callPackage ../games/fsg { @@ -7587,6 +7745,9 @@ let xconq = callPackage ../games/xconq {}; + # TODO: the corresponding nix file is missing + # xracer = callPackage ../games/xracer { }; + xsokoban = builderDefsPackage (import ../games/xsokoban) { inherit (xlibs) libX11 xproto libXpm libXt; }; @@ -7659,15 +7820,107 @@ let }; - kde4 = kde45; + kde4 = recurseIntoAttrs pkgs.kde45; - kde45 = callPackage ../desktops/kde-4.5 { - callPackage = newScope pkgs.kde45; - }; + # TODO: merge with branches/drop-kde4.5 if you want to remove KDE SC 4.5 + # This branch removes kde45 and quite a few compatibility hacks + kde45 = kdePackagesFor pkgs.kde45 "4.5"; + kde47 = kdePackagesFor pkgs.kde47 "4.7"; - kde46 = callPackage ../desktops/kde-4.6 { - callPackage = newScope pkgs.kde46; - }; + kdePackagesFor = self: version: + let callPackageOrig = callPackage; in + let + callPackage = newScope self; + kde4 = callPackageOrig (../desktops/kde- + version) { + inherit callPackage callPackageOrig; + }; + in kde4 // { + inherit kde4; + + recurseForRelease = true; + + akunambol = callPackage ../applications/networking/sync/akunambol { }; + + amarok = callPackage ../applications/audio/amarok { }; + + bangarang = callPackage ../applications/video/bangarang { }; + + bluedevil = callPackage ../tools/bluetooth/bluedevil { }; + + digikam = callPackage ../applications/graphics/digikam { }; + + filelight = callPackage ../applications/misc/filelight { }; + + k3b = callPackage ../applications/misc/k3b { }; + + kadu = callPackage ../applications/networking/instant-messengers/kadu { }; + + kbluetooth = callPackage ../tools/bluetooth/kbluetooth { }; + + kde_wacomtablet = callPackage ../applications/misc/kde-wacomtablet { }; + + kdenlive = callPackage ../applications/video/kdenlive { }; + + kdesvn = callPackage ../applications/version-management/kdesvn { }; + + kdevelop = callPackage ../applications/editors/kdevelop { }; + + kdevplatform = callPackage ../development/libraries/kdevplatform { }; + + kdiff3 = callPackage ../tools/text/kdiff3 { }; + + kmplayer = callPackage ../applications/video/kmplayer { + inherit (pkgs.gtkLibs) pango; + }; + + kmymoney = callPackage ../applications/office/kmymoney { }; + + kipi_plugins = callPackage ../applications/graphics/kipi-plugins { + inherit (pkgs.gtkLibs) gdk_pixbuf; + }; + + koffice = callPackage ../applications/office/koffice { }; + + konq_plugins = callPackage ../applications/networking/browsers/konq-plugins { }; + + konversation = callPackage ../applications/networking/irc/konversation { }; + + krename = callPackage ../applications/misc/krename { }; + + krusader = callPackage ../applications/misc/krusader { }; + + ktorrent = callPackage ../applications/networking/p2p/ktorrent { }; + + libktorrent = callPackage ../development/libraries/libktorrent { }; + + liblikeback = callPackage ../development/libraries/liblikeback { }; + + partitionManager = callPackage ../tools/misc/partition-manager { }; + + polkit_kde_agent = callPackage ../tools/security/polkit-kde-agent { }; + + psi = callPackage ../applications/networking/instant-messengers/psi { }; + + quassel = callPackage ../applications/networking/irc/quassel { }; + + quasselDaemon = appendToName "daemon" (self.quassel.override { + monolithic = false; + daemon = true; + }); + + quasselClient = appendToName "client" (self.quassel.override { + monolithic = false; + client = true; + }); + + rekonq = callPackage ../applications/networking/browsers/rekonq { }; + + rsibreak = callPackage ../applications/misc/rsibreak { }; + + semnotes = callPackage ../applications/misc/semnotes { }; + + yakuake = callPackage ../applications/misc/yakuake { }; + }; redshift = callPackage ../applications/misc/redshift { inherit (xorg) libX11 libXrandr libxcb randrproto libXxf86vm @@ -7678,11 +7931,15 @@ let inherit (gtkLibs) glib gtk; }; - xfce = xfce4; + xfce = xfce46; + + xfce46 = recurseIntoAttrs + (let callPackage = newScope pkgs.xfce46; in + import ../desktops/xfce-4.6 { inherit callPackage pkgs; }); - xfce4 = recurseIntoAttrs - (let callPackage = newScope pkgs.xfce4; in - import ../desktops/xfce-4 { inherit callPackage pkgs; }); + xfce48 = recurseIntoAttrs + (let callPackage = newScope pkgs.xfce48; in + import ../desktops/xfce-4.8 { inherit callPackage pkgs; }); ### SCIENCE @@ -7973,6 +8230,8 @@ let mess = callPackage ../misc/emulators/mess { }; + mupen64plus = callPackage ../misc/emulators/mupen64plus { }; + nix = nixStable; nixStable = callPackage ../tools/package-management/nix { @@ -7991,7 +8250,7 @@ let import ../tools/package-management/nix/custom.nix { inherit fetchurl stdenv perl curl bzip2 openssl src preConfigure automake autoconf libtool configureFlags enableScripts lib libxml2 boehmgc - pkgconfig flex bison sqlite perlPackages; + pkgconfig flex bison sqlite perlPackages; aterm = aterm25; db4 = db45; inherit docbook5_xsl libxslt docbook5 docbook_xml_dtd_43 w3m; @@ -8042,17 +8301,13 @@ let polytable = callPackage ../misc/tex/polytable { }; - psi = newScope pkgs.kde45 ../applications/networking/instant-messengers/psi { }; - uae = callPackage ../misc/emulators/uae { }; putty = callPackage ../applications/networking/remote/putty { }; rssglx = callPackage ../misc/screensavers/rss-glx { }; - xlockmore = callPackage ../misc/screensavers/xlockmore { - pam = if getConfig [ "xlockmore" "pam" ] true then pam else null; - }; + xlockmore = callPackage ../misc/screensavers/xlockmore { }; saneBackends = callPackage ../misc/sane-backends { gt68xxFirmware = getConfig ["sane" "gt68xxFirmware"] null; @@ -8131,6 +8386,8 @@ let vice = callPackage ../misc/emulators/vice { }; + VisualBoyAdvance = callPackage ../misc/emulators/VisualBoyAdvance { }; + # Wine cannot be built in 64-bit; use a 32-bit build instead. wine = callPackage_i686 ../misc/emulators/wine { }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 9d14ad9fe2f9..b65394a7dd77 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -88,7 +88,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); ghc702Prefs = super : super // super.haskellPlatformDefaults_2011_2_0_0 super; ghc703Prefs = super : super // super.haskellPlatformDefaults_2011_2_0_1 super; ghc704Prefs = super : super // super.haskellPlatformDefaults_2011_2_0_1 super; # link - ghcHEADPrefs = super : super // super.haskellPlatformDefaults_2011_2_0_1 super; # link + ghc721Prefs = super : super // super.haskellPlatformDefaults_future super; + ghcHEADPrefs = super : super // super.haskellPlatformDefaults_future super; # link # GHC and its wrapper # @@ -118,9 +119,44 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); # We try to support several platform versions. For these, we set all # versions explicitly. - haskellPlatform = self.haskellPlatform_2011_2_0_0; # global platform default - # NOTE: 2011.2.0.0 is the current default. 2011.2.0.1 is not yet released - # and provided for testing purposes. + # NOTE: 2011.2.0.1 is the current default. + + haskellPlatformArgs_future = self : { + inherit (self) cabal ghc; + cgi = self.cgi_3001_1_7_4; # 7.2 ok, 7.3 ok + fgl = self.fgl_5_4_2_4; # 7.2 ok, 7.3 fails + GLUT = self.GLUT_2_1_2_1; # 7.2 ok, 7.3 ok + haskellSrc = self.haskellSrc_1_0_1_4; # 7.2 fails, 7.3 fails + html = self.html_1_0_1_2; # 7.2 ok, 7.3 ok + HUnit = self.HUnit_1_2_2_3; # 7.2 ok, 7.3 ok + network = self.network_2_3_0_5; # 7.2 ok, 7.3 ok + OpenGL = self.OpenGL_2_2_3_0; # 7.2 ok, 7.3 ok + parallel = self.parallel_3_1_0_1; # 7.2 ok, 7.3 ok + parsec = self.parsec_3_1_1; # 7.2 ok, 7.3 ok + QuickCheck = self.QuickCheck_2_4_0_1; # 7.2 ok, 7.3 ok + regexBase = self.regexBase_0_93_2; # 7.2 ok, 7.3 ok + regexCompat = self.regexCompat_0_93_1; # 7.2 ok, 7.3 ok + regexPosix = self.regexPosix_0_94_4; # 7.2 ok, 7.3 ok + stm = self.stm_2_2_0_1; # 7.2 ok, 7.3 ok + syb = self.syb_0_3_3; # 7.2 ok, 7.3 ok + xhtml = self.xhtml_3000_2_0_1; # 7.2 ok, 7.3 ok + zlib = self.zlib_0_5_3_1; # 7.2 ok, 7.3 ok + HTTP = self.HTTP_4000_1_2; # 7.2 ok, 7.3 fails + deepseq = self.deepseq_1_1_0_2; # 7.2 ok, 7.3 ok + text = self.text_0_11_1_5; # 7.2 ok, 7.3 fails + transformers = self.transformers_0_2_2_0; # 7.2 ok, 7.3 ok + mtl = self.mtl_2_0_1_0; # 7.2 ok, 7.3 ok + random = self.random_1_0_0_3; # 7.2 ok, 7.3 ok + cabalInstall = self.cabalInstall_0_10_2; # 7.2 fails, 7.3 fails + alex = self.alex_3_0_1; # 7.2 ok, 7.3 ok + happy = self.happy_1_18_6; # 7.2 ok, 7.3 ok + haddock = self.haddock_2_9_2; # 7.2 fails, 7.3 fails + }; + + haskellPlatformDefaults_future = + self : self.haskellPlatformArgs_future self // { + mtl1 = self.mtl_1_1_1_1; # 7.2 ok, 7.3 ok + }; haskellPlatformArgs_2011_2_0_1 = self : { inherit (self) cabal ghc; @@ -157,6 +193,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); self : self.haskellPlatformArgs_2011_2_0_1 self // { haskellPlatform = self.haskellPlatform_2011_2_0_1; mtl1 = self.mtl_1_1_1_1; + text = self.text_0_11_1_5; }; haskellPlatform_2011_2_0_1 = @@ -270,6 +307,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellPlatformDefaults_2010_1_0_0 = self : self.haskellPlatformArgs_2010_1_0_0 self // { haskellPlatform = self.haskellPlatform_2010_1_0_0; + extensibleExceptions = self.extensibleExceptions_0_1_1_0; }; haskellPlatform_2010_1_0_0 = @@ -306,6 +344,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellPlatformDefaults_2009_2_0_2 = self : self.haskellPlatformArgs_2009_2_0_2 self // { haskellPlatform = self.haskellPlatform_2009_2_0_2; + extensibleExceptions = self.extensibleExceptions_0_1_1_0; }; haskellPlatform_2009_2_0_2 = @@ -316,30 +355,47 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); # Haskell libraries. Agda = callPackage ../development/libraries/haskell/Agda { - # I've been trying to get the latest Agda to build with ghc-6.12, too, - # but failed so far. - # mtl = self.mtl2; - # QuickCheck = self.QuickCheck2; - syb = self.syb02; + syb = self.syb02; + haskellSrcExts = self.haskellSrcExts_1_9_6; }; ACVector = callPackage ../development/libraries/haskell/AC-Vector {}; aeson = callPackage ../development/libraries/haskell/aeson {}; + aesonNative = callPackage ../development/libraries/haskell/aeson-native {}; + ansiTerminal = callPackage ../development/libraries/haskell/ansi-terminal {}; - ansiWLPprint = callPackage ../development/libraries/haskell/ansi-wl-pprint {}; + ansiWlPprint = callPackage ../development/libraries/haskell/ansi-wl-pprint {}; + + asn1Data = callPackage ../development/libraries/haskell/asn1-data {}; AspectAG = callPackage ../development/libraries/haskell/AspectAG {}; + async = callPackage ../development/libraries/haskell/async {}; + + attempt = callPackage ../development/libraries/haskell/attempt {}; + attoparsec = callPackage ../development/libraries/haskell/attoparsec {}; attoparsecEnumerator = callPackage ../development/libraries/haskell/attoparsec/enumerator.nix {}; + attoparsecText = callPackage ../development/libraries/haskell/attoparsec-text {}; + + attoparsecTextEnumerator = callPackage ../development/libraries/haskell/attoparsec-text-enumerator {}; + + authenticate = callPackage ../development/libraries/haskell/authenticate {}; + + base64String = callPackage ../development/libraries/haskell/base64-string {}; + + base64Bytestring = callPackage ../development/libraries/haskell/base64-bytestring {}; + baseUnicodeSymbols = callPackage ../development/libraries/haskell/base-unicode-symbols {}; - benchpress = callPackage ../development/libraries/haskell/benchpress {}; + benchpress = callPackage ../development/libraries/haskell/benchpress { + time = self.time_1_1_3; + }; bimap = callPackage ../development/libraries/haskell/bimap {}; @@ -359,28 +415,37 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); blazeTextual = callPackage ../development/libraries/haskell/blaze-textual {}; + blazeTextualNative = callPackage ../development/libraries/haskell/blaze-textual-native {}; + bmp = callPackage ../development/libraries/haskell/bmp {}; Boolean = callPackage ../development/libraries/haskell/Boolean {}; bytestringNums = callPackage ../development/libraries/haskell/bytestring-nums {}; + bytestringMmap = callPackage ../development/libraries/haskell/bytestring-mmap {}; + bytestringTrie = callPackage ../development/libraries/haskell/bytestring-trie {}; cairo = callPackage ../development/libraries/haskell/cairo { inherit (pkgs) cairo zlib; }; - caseInsensitive = callPackage ../development/libraries/haskell/case-insensitive {}; + caseInsensitive_0_3 = callPackage ../development/libraries/haskell/case-insensitive/0.3.nix {}; + caseInsensitive_0_3_0_1 = callPackage ../development/libraries/haskell/case-insensitive/0.3.0.1.nix {}; + caseInsensitive = self.caseInsensitive_0_3_0_1; cautiousFile = callPackage ../development/libraries/haskell/cautious-file {}; cereal = callPackage ../development/libraries/haskell/cereal {}; + certificate = callPackage ../development/libraries/haskell/certificate {}; + cgi_3001_1_7_1 = callPackage ../development/libraries/haskell/cgi/3001.1.7.1.nix {}; cgi_3001_1_7_2 = callPackage ../development/libraries/haskell/cgi/3001.1.7.2.nix {}; 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; Chart = callPackage ../development/libraries/haskell/Chart {}; @@ -391,31 +456,44 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cmdargs = callPackage ../development/libraries/haskell/cmdargs {}; + cmdlib = callPackage ../development/libraries/haskell/cmdlib {}; + colorizeHaskell = callPackage ../development/libraries/haskell/colorize-haskell {}; colour = callPackage ../development/libraries/haskell/colour {}; ConfigFile = callPackage ../development/libraries/haskell/ConfigFile {}; + controlMonadAttempt = callPackage ../development/libraries/haskell/control-monad-attempt {}; + convertible = callPackage ../development/libraries/haskell/convertible { time = self.time_1_1_3; }; + continuedFractions = callPackage ../development/libraries/haskell/continued-fractions {}; + + converge = callPackage ../development/libraries/haskell/converge {}; + cookie = callPackage ../development/libraries/haskell/cookie {}; + cprngAes = callPackage ../development/libraries/haskell/cprng-aes {}; + criterion = callPackage ../development/libraries/haskell/criterion { parsec = self.parsec3; }; Crypto = callPackage ../development/libraries/haskell/Crypto {}; - CS173Tourney = callPackage ../development/libraries/haskell/CS173Tourney { - inherit (pkgs) fetchgit; - json = self.json_0_3_6; - }; + cryptoApi = callPackage ../development/libraries/haskell/crypto-api {}; + + cryptocipher = callPackage ../development/libraries/haskell/cryptocipher {}; + + cryptohash = callPackage ../development/libraries/haskell/cryptohash {}; csv = callPackage ../development/libraries/haskell/csv {}; + cssText = callPackage ../development/libraries/haskell/css-text {}; + dataAccessor = callPackage ../development/libraries/haskell/data-accessor/data-accessor.nix {}; dataAccessorTemplate = callPackage ../development/libraries/haskell/data-accessor/data-accessor-template.nix {}; @@ -426,9 +504,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); dataReify = callPackage ../development/libraries/haskell/data-reify {}; - datetime = callPackage ../development/libraries/haskell/datetime { - QuickCheck = self.QuickCheck1; - }; + datetime = callPackage ../development/libraries/haskell/datetime {}; deepseq_1_1_0_0 = callPackage ../development/libraries/haskell/deepseq/1.1.0.0.nix {}; deepseq_1_1_0_2 = callPackage ../development/libraries/haskell/deepseq/1.1.0.2.nix {}; @@ -442,12 +518,16 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); inherit (pkgs) zlib; }; + dimensional = callPackage ../development/libraries/haskell/dimensional {}; + directoryTree = callPackage ../development/libraries/haskell/directory-tree {}; dlist = callPackage ../development/libraries/haskell/dlist {}; dotgen = callPackage ../development/libraries/haskell/dotgen {}; + doubleConversion = callPackage ../development/libraries/haskell/double-conversion {}; + editline = callPackage ../development/libraries/haskell/editline { inherit (pkgs) libedit; }; @@ -456,13 +536,16 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); enumerator = callPackage ../development/libraries/haskell/enumerator {}; + entropy = callPackage ../development/libraries/haskell/entropy {}; + erf = callPackage ../development/libraries/haskell/erf {}; filepath = callPackage ../development/libraries/haskell/filepath {}; - emgm = callPackage ../development/libraries/haskell/emgm {}; - - extensibleExceptions = callPackage ../development/libraries/haskell/extensible-exceptions {}; + extensibleExceptions_0_1_1_0 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.0.nix {}; + extensibleExceptions_0_1_1_2 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.2.nix {}; + extensibleExceptions_0_1_1_3 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.3.nix {}; + extensibleExceptions = null; # a core package in recent GHCs failure = callPackage ../development/libraries/haskell/failure {}; @@ -472,14 +555,21 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); feed = callPackage ../development/libraries/haskell/feed {}; + fileEmbed = callPackage ../development/libraries/haskell/file-embed {}; + + flexibleDefaults = callPackage ../development/libraries/haskell/flexible-defaults {}; + filestore = callPackage ../development/libraries/haskell/filestore {}; fgl_5_4_2_2 = callPackage ../development/libraries/haskell/fgl/5.4.2.2.nix {}; fgl_5_4_2_3 = callPackage ../development/libraries/haskell/fgl/5.4.2.3.nix {}; + fgl_5_4_2_4 = callPackage ../development/libraries/haskell/fgl/5.4.2.4.nix {}; fgl = self.fgl_5_4_2_2; fingertree = callPackage ../development/libraries/haskell/fingertree {}; + gamma = callPackage ../development/libraries/haskell/gamma {}; + gdiff = callPackage ../development/libraries/haskell/gdiff {}; getOptions = callPackage ../development/libraries/haskell/get-options {}; @@ -492,18 +582,23 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); ghcMtl = callPackage ../development/libraries/haskell/ghc-mtl {}; + ghcPaths_0_1_0_5 = callPackage ../development/libraries/haskell/ghc-paths/0.1.0.5.nix {}; ghcPaths_0_1_0_6 = callPackage ../development/libraries/haskell/ghc-paths/0.1.0.6.nix {}; - - ghcPaths = callPackage ../development/libraries/haskell/ghc-paths {}; + ghcPaths_0_1_0_8 = callPackage ../development/libraries/haskell/ghc-paths/0.1.0.8.nix {}; + ghcPaths = self.ghcPaths_0_1_0_6; # version 0.1.0.5 doesn't build with an up-to-date GHC ghcSyb = callPackage ../development/libraries/haskell/ghc-syb {}; ghcSybUtils = callPackage ../development/libraries/haskell/ghc-syb-utils {}; - gitit = callPackage ../development/libraries/haskell/gitit {}; + gitit = callPackage ../development/libraries/haskell/gitit { + xssSanitize = self.xssSanitize_0_2_6; + }; glade = callPackage ../development/libraries/haskell/glade { - inherit (pkgs) pkgconfig gnome glibc; + inherit (pkgs) pkgconfig glibc; + inherit (pkgs.gnome) libglade; + gtkC = pkgs.gnome.gtk; }; glib = callPackage ../development/libraries/haskell/glib { @@ -512,18 +607,26 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); GlomeVec = callPackage ../development/libraries/haskell/GlomeVec {}; + GLURaw = callPackage ../development/libraries/haskell/GLURaw { + GLU = pkgs.freeglut; + }; + GLUT_2_1_1_2 = callPackage ../development/libraries/haskell/GLUT/2.1.1.2.nix { glut = pkgs.freeglut; inherit (pkgs) mesa; inherit (pkgs.xlibs) libSM libICE libXmu libXi; }; - GLUT_2_1_2_1 = callPackage ../development/libraries/haskell/GLUT/2.1.2.1.nix { glut = pkgs.freeglut; inherit (pkgs) mesa; inherit (pkgs.xlibs) libSM libICE libXmu libXi; }; - + GLUT_2_2_2_0 = callPackage ../development/libraries/haskell/GLUT/2.2.2.0.nix { + glut = pkgs.freeglut; + OpenGL = self.OpenGL_2_4_0_1; + inherit (pkgs) mesa; + inherit (pkgs.xlibs) libSM libICE libXmu libXi; + }; GLUT = self.GLUT_2_1_1_2; gtk = callPackage ../development/libraries/haskell/gtk { @@ -532,24 +635,26 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); }; gtk2hsBuildtools = callPackage ../development/libraries/haskell/gtk2hs-buildtools {}; + gtk2hsC2hs = self.gtk2hsBuildtools; gtksourceview2 = callPackage ../development/libraries/haskell/gtksourceview2 { inherit (pkgs) pkgconfig glibc; inherit (pkgs.gnome) gtksourceview; - gtkC = pkgs.gtkLibs.gtk; }; Graphalyze = callPackage ../development/libraries/haskell/Graphalyze {}; graphviz = callPackage ../development/libraries/haskell/graphviz {}; - hakyll = callPackage ../development/libraries/haskell/hakyll {}; + hakyll = callPackage ../development/libraries/haskell/hakyll { + hamlet = self.hamlet_0_8_2_1; + }; - hamlet = callPackage ../development/libraries/haskell/hamlet {}; + hamlet_0_8_2_1 = callPackage ../development/libraries/haskell/hamlet/0.8.2.1.nix {}; + hamlet_0_10_0 = callPackage ../development/libraries/haskell/hamlet/0.10.0.nix {}; + hamlet = self.hamlet_0_10_0; - happstackData = callPackage ../development/libraries/haskell/happstack/happstack-data.nix { - HaXml = self.HaXml113; - }; + happstackData = callPackage ../development/libraries/haskell/happstack/happstack-data.nix {}; happstackUtil = callPackage ../development/libraries/haskell/happstack/happstack-util.nix {}; @@ -561,7 +666,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskeline = callPackage ../development/libraries/haskell/haskeline {}; - haskelineClass = callPackage ../development/libraries/haskell/haskeline-class {}; + haskelineClass = callPackage ../development/libraries/haskell/haskeline-class { + mtl = self.mtl1; + }; haskellLexer = callPackage ../development/libraries/haskell/haskell-lexer {}; @@ -569,7 +676,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellSrc_1_0_1_4 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.4.nix {}; haskellSrc = self.haskellSrc_1_0_1_3; - haskellSrcExts = callPackage ../development/libraries/haskell/haskell-src-exts {}; + # The old version is required for Agda. + haskellSrcExts_1_11_1 = callPackage ../development/libraries/haskell/haskell-src-exts/1.11.1.nix {}; + haskellSrcExts_1_9_6 = callPackage ../development/libraries/haskell/haskell-src-exts/1.9.6.nix {}; + haskellSrcExts = self.haskellSrcExts_1_11_1; haskellSrcMeta = callPackage ../development/libraries/haskell/haskell-src-meta {}; @@ -577,19 +687,16 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HTTP_4000_0_6 = callPackage ../development/libraries/haskell/HTTP/4000.0.6.nix {}; HTTP_4000_0_9 = callPackage ../development/libraries/haskell/HTTP/4000.0.9.nix {}; HTTP_4000_1_1 = callPackage ../development/libraries/haskell/HTTP/4000.1.1.nix {}; + HTTP_4000_1_2 = callPackage ../development/libraries/haskell/HTTP/4000.1.2.nix {}; HTTP = self.HTTP_4000_0_6; - haxr = callPackage ../development/libraries/haskell/haxr { - HaXml = self.HaXml113; - }; + hackageDb = callPackage ../development/libraries/haskell/hackage-db {}; + + haxr = callPackage ../development/libraries/haskell/haxr {}; haxr_th = callPackage ../development/libraries/haskell/haxr-th {}; - HaXml_1_13_3 = callPackage ../development/libraries/haskell/HaXml/1.13.3.nix {}; - HaXml_1_20_2 = callPackage ../development/libraries/haskell/HaXml/1.20.2.nix {}; - HaXml113 = self.HaXml_1_13_3; - HaXml120 = self.HaXml_1_20_2; - HaXml = self.HaXml120; + HaXml = callPackage ../development/libraries/haskell/HaXml {}; HDBC = callPackage ../development/libraries/haskell/HDBC/HDBC.nix {}; @@ -601,6 +708,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); inherit (pkgs) sqlite; }; + HFuse = callPackage ../development/libraries/haskell/hfuse { + inherit (pkgs) fuse; + }; + HGL = callPackage ../development/libraries/haskell/HGL {}; highlightingKate = callPackage ../development/libraries/haskell/highlighting-kate {}; @@ -611,6 +722,16 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); Hipmunk = callPackage ../development/libraries/haskell/Hipmunk {}; + hjsmin = callPackage ../development/libraries/haskell/hjsmin {}; + + hledger = callPackage ../development/libraries/haskell/hledger {}; + hledgerLib = callPackage ../development/libraries/haskell/hledger-lib {}; + hledgerVty = callPackage ../development/libraries/haskell/hledger-vty { + vty = self.vty_4_6_0_4; + }; + hledgerChart = callPackage ../development/libraries/haskell/hledger-chart {}; + hledgerInterest = callPackage ../applications/office/hledger-interest {}; + HList = callPackage ../development/libraries/haskell/HList {}; hmatrix = callPackage ../development/libraries/haskell/hmatrix { @@ -623,10 +744,18 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hp2anyCore = callPackage ../development/libraries/haskell/hp2any-core {}; - hp2anyGraph = callPackage ../development/libraries/haskell/hp2any-graph {}; + hp2anyGraph = callPackage ../development/libraries/haskell/hp2any-graph { + glut = pkgs.freeglut; + }; + + hsBibutils = callPackage ../development/libraries/haskell/hs-bibutils {}; hscolour = callPackage ../development/libraries/haskell/hscolour {}; + hsdns = callPackage ../development/libraries/haskell/hsdns { + inherit (pkgs) adns; + }; + hsemail = callPackage ../development/libraries/haskell/hsemail {}; HsSyck = callPackage ../development/libraries/haskell/HsSyck {}; @@ -637,18 +766,29 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hsloggerTemplate = callPackage ../development/libraries/haskell/hslogger-template {}; + hsyslog = callPackage ../development/libraries/haskell/hsyslog {}; + html_1_0_1_2 = callPackage ../development/libraries/haskell/html/1.0.1.2.nix {}; html = self.html_1_0_1_2; httpdShed = callPackage ../development/libraries/haskell/httpd-shed {}; + httpDate = callPackage ../development/libraries/haskell/http-date {}; + + httpEnumerator = callPackage ../development/libraries/haskell/http-enumerator {}; + httpTypes = callPackage ../development/libraries/haskell/http-types {}; HUnit_1_2_0_3 = callPackage ../development/libraries/haskell/HUnit/1.2.0.3.nix {}; 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_3 = callPackage ../development/libraries/haskell/HUnit/1.2.4.2.nix {}; HUnit = self.HUnit_1_2_0_3; + irc = callPackage ../development/libraries/haskell/irc { + parsec = self.parsec2; + }; + ivor = callPackage ../development/libraries/haskell/ivor {}; jpeg = callPackage ../development/libraries/haskell/jpeg {}; @@ -657,17 +797,19 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); WebBits = self.WebBits_1_0; }; - json = callPackage ../development/libraries/haskell/json {}; - - json_0_3_6 = callPackage ../development/libraries/haskell/json/0.3.6.nix {}; + json = callPackage ../development/libraries/haskell/json/default.nix {}; jsonEnumerator = callPackage ../development/libraries/haskell/jsonEnumerator {}; jsonTypes = callPackage ../development/libraries/haskell/jsonTypes {}; - leksahServer = callPackage ../development/libraries/haskell/leksah/leksah-server.nix { - network = self.network_2_2_1_7; - }; + languageJavascript = callPackage ../development/libraries/haskell/language-javascript {}; + + languageHaskellExtract = callPackage ../development/libraries/haskell/language-haskell-extract {}; + + largeword = callPackage ../development/libraries/haskell/largeword {}; + + leksahServer = callPackage ../development/libraries/haskell/leksah/leksah-server.nix {}; ListLike = callPackage ../development/libraries/haskell/ListLike {}; @@ -675,16 +817,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); logfloat = callPackage ../development/libraries/haskell/logfloat {}; - maybench = callPackage ../development/libraries/haskell/maybench {}; - MaybeT = callPackage ../development/libraries/haskell/MaybeT {}; - MaybeTTransformers = callPackage ../development/libraries/haskell/MaybeT-transformers {}; - MemoTrie = callPackage ../development/libraries/haskell/MemoTrie {}; mersenneRandomPure64 = callPackage ../development/libraries/haskell/mersenne-random-pure64 {}; + mimeMail = callPackage ../development/libraries/haskell/mime-mail {}; + MissingH = callPackage ../development/libraries/haskell/MissingH {}; mmap = callPackage ../development/libraries/haskell/mmap {}; @@ -695,18 +835,16 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); monadControl = callPackage ../development/libraries/haskell/monad-control {}; - monadlab = callPackage ../development/libraries/haskell/monadlab {}; - monadLoops = callPackage ../development/libraries/haskell/monad-loops {}; + monadPar = callPackage ../development/libraries/haskell/monad-par {}; + monadPeel = callPackage ../development/libraries/haskell/monad-peel {}; MonadPrompt = callPackage ../development/libraries/haskell/MonadPrompt {}; MonadRandom = callPackage ../development/libraries/haskell/MonadRandom {}; - monadsFd = callPackage ../development/libraries/haskell/monads-fd {}; - mpppc = callPackage ../development/libraries/haskell/mpppc {}; mtl_1_1_0_2 = callPackage ../development/libraries/haskell/mtl/1.1.0.2.nix {}; @@ -716,9 +854,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); mtl2 = self.mtl_2_0_1_0; mtl = self.mtl1; + mtlparse = callPackage ../development/libraries/haskell/mtlparse {}; + multiplate = callPackage ../development/libraries/haskell/multiplate {}; - multirec = callPackage ../development/libraries/haskell/multirec {}; + multirec_0_5_1 = callPackage ../development/libraries/haskell/multirec/0.5.1.nix {}; + multirec_0_6 = callPackage ../development/libraries/haskell/multirec/0.6.nix {}; + multirec = self.multirec_0_6; multiset = callPackage ../development/libraries/haskell/multiset {}; @@ -731,14 +873,21 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); network_2_2_1_4 = callPackage ../development/libraries/haskell/network/2.2.1.4.nix {}; network_2_2_1_7 = callPackage ../development/libraries/haskell/network/2.2.1.7.nix {}; 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 = self.network_2_2_1_4; + nixosTypes = callPackage ../development/libraries/haskell/nixos-types {}; + nonNegative = callPackage ../development/libraries/haskell/non-negative {}; numericPrelude = callPackage ../development/libraries/haskell/numeric-prelude {}; + numtype = callPackage ../development/libraries/haskell/numtype {}; + OneTuple = callPackage ../development/libraries/haskell/OneTuple {}; + ObjectName = callPackage ../development/libraries/haskell/ObjectName {}; + OpenAL = callPackage ../development/libraries/haskell/OpenAL { inherit (pkgs) openal; }; @@ -747,15 +896,23 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); inherit (pkgs) mesa; inherit (pkgs.xlibs) libX11; }; - OpenGL_2_2_3_0 = callPackage ../development/libraries/haskell/OpenGL/2.2.3.0.nix { inherit (pkgs) mesa; inherit (pkgs.xlibs) libX11; }; - + OpenGL_2_4_0_1 = callPackage ../development/libraries/haskell/OpenGL/2.4.0.1.nix { + inherit (pkgs) mesa; + inherit (pkgs.xlibs) libX11; + }; OpenGL = self.OpenGL_2_2_1_1; - pandoc = callPackage ../development/libraries/haskell/pandoc {}; + OpenGLRaw = callPackage ../development/libraries/haskell/OpenGLRaw { + GL = pkgs.mesa; + }; + + pathPieces = callPackage ../development/libraries/haskell/path-pieces {}; + + pandoc = callPackage ../development/libraries/haskell/pandoc/default.nix {}; pandocTypes = callPackage ../development/libraries/haskell/pandoc-types {}; @@ -789,7 +946,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); persistentTemplate = callPackage ../development/libraries/haskell/persistent-template {}; - polyparse = callPackage ../development/libraries/haskell/polyparse {}; + polyparse = callPackage ../development/libraries/haskell/polyparse/default.nix {}; pool = callPackage ../development/libraries/haskell/pool {}; @@ -805,27 +962,38 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); pureMD5 = callPackage ../development/libraries/haskell/pureMD5 {}; + pwstoreFast = callPackage ../development/libraries/haskell/pwstore-fast {}; + QuickCheck_1_2_0_0 = callPackage ../development/libraries/haskell/QuickCheck/1.2.0.0.nix {}; QuickCheck_1_2_0_1 = callPackage ../development/libraries/haskell/QuickCheck/1.2.0.1.nix {}; QuickCheck_2_1_0_3 = callPackage ../development/libraries/haskell/QuickCheck/2.1.0.3.nix {}; QuickCheck_2_1_1_1 = callPackage ../development/libraries/haskell/QuickCheck/2.1.1.1.nix {}; 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 {}; QuickCheck1 = self.QuickCheck_1_2_0_1; - QuickCheck2 = self.QuickCheck_2_4_0_1; + QuickCheck2 = self.QuickCheck_2_4_1_1; QuickCheck = self.QuickCheck2; RangedSets = callPackage ../development/libraries/haskell/Ranged-sets {}; - random_newtime = callPackage ../development/libraries/haskell/random { + random_1_0_0_2_newtime = callPackage ../development/libraries/haskell/random/1.0.0.2.nix { time = self.time_1_2_0_3; }; + random_1_0_0_3 = callPackage ../development/libraries/haskell/random/1.0.0.3.nix {}; + random_1_0_1_0 = callPackage ../development/libraries/haskell/random/1.0.1.0.nix {}; + random = null; # core package until ghc-7.2.1 + random_newtime = self.random_1_0_0_2_newtime; randomFu = callPackage ../development/libraries/haskell/random-fu {}; + randomSource = callPackage ../development/libraries/haskell/random-source {}; + randomShuffle = callPackage ../development/libraries/haskell/random-shuffle {}; ranges = callPackage ../development/libraries/haskell/ranges {}; + rvar = callPackage ../development/libraries/haskell/rvar {}; + readline = callPackage ../development/libraries/haskell/readline { inherit (pkgs) readline ncurses; }; @@ -840,17 +1008,27 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); regexCompat_0_71_0_1 = callPackage ../development/libraries/haskell/regex-compat/0.71.0.1.nix {}; regexCompat_0_92 = callPackage ../development/libraries/haskell/regex-compat/0.92.nix {}; regexCompat_0_93_1 = callPackage ../development/libraries/haskell/regex-compat/0.93.1.nix {}; + regexCompat_0_95_1 = callPackage ../development/libraries/haskell/regex-compat/0.95.1.nix { + regexPosix = self.regexPosix_0_95_1; + }; regexCompat = self.regexCompat_0_71_0_1; regexPosix_0_72_0_3 = callPackage ../development/libraries/haskell/regex-posix/0.72.0.3.nix {}; regexPosix_0_94_1 = callPackage ../development/libraries/haskell/regex-posix/0.94.1.nix {}; regexPosix_0_94_2 = callPackage ../development/libraries/haskell/regex-posix/0.94.2.nix {}; regexPosix_0_94_4 = callPackage ../development/libraries/haskell/regex-posix/0.94.4.nix {}; + regexPosix_0_95_1 = callPackage ../development/libraries/haskell/regex-posix/0.95.1.nix {}; regexPosix = self.regexPosix_0_72_0_3; regexTDFA = callPackage ../development/libraries/haskell/regex-tdfa {}; + regexTdfa = self.regexTDFA; regexPCRE = callPackage ../development/libraries/haskell/regex-pcre {}; + regexPcre = self.regexPCRE; + + regexPcreBuiltin = callPackage ../development/libraries/haskell/regex-pcre-builtin {}; + + regexpr = callPackage ../development/libraries/haskell/regexpr {}; regular = callPackage ../development/libraries/haskell/regular {}; @@ -862,32 +1040,42 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); repaExamples = callPackage ../development/libraries/haskell/repa-examples {}; - repaIO = callPackage ../development/libraries/haskell/repa-io {}; - - safe = callPackage ../development/libraries/haskell/safe {}; - - salvia = callPackage ../development/libraries/haskell/salvia {}; + repaIo = callPackage ../development/libraries/haskell/repa-io {}; - salviaProtocol = callPackage ../development/libraries/haskell/salvia-protocol {}; + RSA = callPackage ../development/libraries/haskell/RSA {}; - scion = callPackage ../development/libraries/haskell/scion {}; + safe = callPackage ../development/libraries/haskell/safe {}; sendfile = callPackage ../development/libraries/haskell/sendfile {}; + semigroups = callPackage ../development/libraries/haskell/semigroups {}; + simpleSendfile = callPackage ../development/libraries/haskell/simple-sendfile {}; smallcheck = callPackage ../development/libraries/haskell/smallcheck {}; - snapCore = callPackage ../development/libraries/haskell/snap/core.nix {}; - snapServer = callPackage ../development/libraries/haskell/snap/server.nix {}; + snapCore = callPackage ../development/libraries/haskell/snap/core.nix { + caseInsensitive = self.caseInsensitive_0_3; + }; + + snapServer = callPackage ../development/libraries/haskell/snap/server.nix { + vectorAlgorithms = self.vectorAlgorithms_0_4; + caseInsensitive = self.caseInsensitive_0_3; + }; stateref = callPackage ../development/libraries/haskell/stateref {}; + StateVar = callPackage ../development/libraries/haskell/StateVar {}; + statistics = callPackage ../development/libraries/haskell/statistics {}; - # TODO: investigate status of syb in older platform versions + streamproc = callPackage ../development/libraries/haskell/streamproc {}; + + strict = callPackage ../development/libraries/haskell/strict {}; + 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 {}; syb02 = self.syb_0_2_2; syb03 = self.syb_0_3; syb = null; # by default, we assume that syb ships with GHC, which is @@ -915,6 +1103,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); SHA = callPackage ../development/libraries/haskell/SHA {}; + shakespeare = callPackage ../development/libraries/haskell/shakespeare {}; + + shakespeareJs = callPackage ../development/libraries/haskell/shakespeare-js {}; + + shakespeareCss = callPackage ../development/libraries/haskell/shakespeare-css {}; + Shellac = callPackage ../development/libraries/haskell/Shellac/Shellac.nix {}; ShellacHaskeline = callPackage ../development/libraries/haskell/Shellac/Shellac-haskeline.nix {}; @@ -934,44 +1128,64 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); storableComplex = callPackage ../development/libraries/haskell/storable-complex {}; + storableRecord = callPackage ../development/libraries/haskell/storable-record {}; + strictConcurrency = callPackage ../development/libraries/haskell/strictConcurrency {}; svgcairo = callPackage ../development/libraries/haskell/svgcairo {}; + tabular = callPackage ../development/libraries/haskell/tabular {}; + tagged = callPackage ../development/libraries/haskell/tagged {}; tagsoup = callPackage ../development/libraries/haskell/tagsoup {}; + Tensor = callPackage ../development/libraries/haskell/Tensor {}; + terminfo = callPackage ../development/libraries/haskell/terminfo { - inherit (self) extensibleExceptions /* only required for <= ghc6102 ?*/; inherit (pkgs) ncurses; }; testFramework = callPackage ../development/libraries/haskell/test-framework {}; - testFrameworkHUnit = callPackage ../development/libraries/haskell/test-framework-hunit {}; + testFrameworkHunit = callPackage ../development/libraries/haskell/test-framework-hunit {}; + + testFrameworkQuickcheck = callPackage ../development/libraries/haskell/test-framework-quickcheck { + QuickCheck = self.QuickCheck1; + }; - testFrameworkQuickCheck = callPackage ../development/libraries/haskell/test-framework-quickcheck {}; + testFrameworkQuickcheck2 = callPackage ../development/libraries/haskell/test-framework-quickcheck2 {}; - testFrameworkQuickCheck2 = callPackage ../development/libraries/haskell/test-framework-quickcheck2 {}; + testFrameworkTh = callPackage ../development/libraries/haskell/test-framework-th {}; testpack = callPackage ../development/libraries/haskell/testpack {}; - texmath = callPackage ../development/libraries/haskell/texmath {}; + texmath_0_4 = callPackage ../development/libraries/haskell/texmath/0.4.nix {}; + texmath_0_5_0_1 = callPackage ../development/libraries/haskell/texmath/0.5.0.1.nix {}; + texmath = self.texmath_0_5_0_1; text_0_11_0_5 = callPackage ../development/libraries/haskell/text/0.11.0.5.nix {}; text_0_11_0_6 = callPackage ../development/libraries/haskell/text/0.11.0.6.nix {}; - text = self.text_0_11_0_5; + text_0_11_1_5 = callPackage ../development/libraries/haskell/text/0.11.1.5.nix {}; + text = self.text_0_11_1_5; + + thLift = callPackage ../development/libraries/haskell/th-lift {}; threadmanager = callPackage ../development/libraries/haskell/threadmanager {}; time_1_1_2_4 = callPackage ../development/libraries/haskell/time/1.1.2.4.nix {}; time_1_1_3 = callPackage ../development/libraries/haskell/time/1.1.3.nix {}; time_1_2_0_3 = callPackage ../development/libraries/haskell/time/1.2.0.3.nix {}; + time_1_2_0_5 = callPackage ../development/libraries/haskell/time/1.2.0.5.nix {}; + time_1_3 = callPackage ../development/libraries/haskell/time/1.3.nix {}; # time is in the core package set. It should only be necessary to # pass it explicitly in rare circumstances. time = null; + tls = callPackage ../development/libraries/haskell/tls {}; + + tlsExtra = callPackage ../development/libraries/haskell/tls-extra {}; + transformers_0_2_2_0 = callPackage ../development/libraries/haskell/transformers/0.2.2.0.nix {}; transformers = self.transformers_0_2_2_0; @@ -987,6 +1201,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); url = callPackage ../development/libraries/haskell/url {}; + utf8Light = callPackage ../development/libraries/haskell/utf8-light {}; + utf8String = callPackage ../development/libraries/haskell/utf8-string {}; utilityHt = callPackage ../development/libraries/haskell/utility-ht {}; @@ -1005,16 +1221,20 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); vector = callPackage ../development/libraries/haskell/vector {}; - vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms {}; + vectorAlgorithms_0_4 = callPackage ../development/libraries/haskell/vector-algorithms/0.4.nix {}; + vectorAlgorithms_0_5_2 = callPackage ../development/libraries/haskell/vector-algorithms/0.5.2.nix {}; + vectorAlgorithms = self.vectorAlgorithms_0_5_2; vectorSpace = callPackage ../development/libraries/haskell/vector-space {}; - vty = callPackage ../development/libraries/haskell/vty { - mtl = self.mtl2; - }; + vty_4_6_0_4 = callPackage ../development/libraries/haskell/vty/4.6.0.4.nix {}; + vty_4_7_0_4 = callPackage ../development/libraries/haskell/vty/4.7.0.4.nix {}; + vty = self.vty_4_7_0_4; wai = callPackage ../development/libraries/haskell/wai {}; + waiAppStatic = callPackage ../development/libraries/haskell/wai-app-static {}; + waiExtra = callPackage ../development/libraries/haskell/wai-extra {}; warp = callPackage ../development/libraries/haskell/warp {}; @@ -1033,21 +1253,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); webRoutesQuasi = callPackage ../development/libraries/haskell/web-routes-quasi {}; - WebServer = callPackage ../development/libraries/haskell/WebServer { - inherit (pkgs) fetchgit; - }; - - WebServerExtras = callPackage ../development/libraries/haskell/WebServer-Extras { - json = self.json_0_3_6; - inherit (pkgs) fetchgit; - }; - - CouchDB = callPackage ../development/libraries/haskell/CouchDB { - HTTP = self.HTTP_3001_1_5; - json = self.json_0_3_6; - }; + CouchDB = callPackage ../development/libraries/haskell/CouchDB {}; - base64string = callPackage ../development/libraries/haskell/base64-string {}; + wlPprintText = callPackage ../development/libraries/haskell/wl-pprint-text {}; wx = callPackage ../development/libraries/haskell/wxHaskell/wx.nix {}; @@ -1070,11 +1278,24 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); }; xhtml_3000_2_0_1 = callPackage ../development/libraries/haskell/xhtml/3000.2.0.1.nix {}; + xhtml_3000_2_0_2 = callPackage ../development/libraries/haskell/xhtml/3000.2.0.2.nix {}; xhtml = self.xhtml_3000_2_0_1; xml = callPackage ../development/libraries/haskell/xml {}; - xssSanitize = callPackage ../development/libraries/haskell/xss-sanitize {}; + xmlEnumerator = callPackage ../development/libraries/haskell/xml-enumerator {}; + + xmlTypes = callPackage ../development/libraries/haskell/xml-types {}; + + xssSanitize_0_2_6 = callPackage ../development/libraries/haskell/xss-sanitize/0.2.6.nix {}; + xssSanitize_0_3_0_1 = callPackage ../development/libraries/haskell/xss-sanitize/0.3.0.1.nix {}; + xssSanitize = self.xssSanitize_0_3_0_1; + + yap = callPackage ../development/libraries/haskell/yap {}; + + yesod = callPackage ../development/libraries/haskell/yesod {}; + + yesodAuth = callPackage ../development/libraries/haskell/yesod-auth {}; yesodCore = callPackage ../development/libraries/haskell/yesod-core {}; @@ -1084,11 +1305,15 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); yesodPersistent = callPackage ../development/libraries/haskell/yesod-persistent {}; + yesodStatic = callPackage ../development/libraries/haskell/yesod-static {}; + yst = callPackage ../development/libraries/haskell/yst {}; zipArchive = callPackage ../development/libraries/haskell/zip-archive {}; - zipper = callPackage ../development/libraries/haskell/zipper {}; + zipper = callPackage ../development/libraries/haskell/zipper { + multirec = self.multirec_0_5_1; + }; zlib_0_5_0_0 = callPackage ../development/libraries/haskell/zlib/0.5.0.0.nix { inherit (pkgs) zlib; @@ -1106,6 +1331,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); zlibBindings = callPackage ../development/libraries/haskell/zlib-bindings {}; + zlibEnum = callPackage ../development/libraries/haskell/zlib-enum {}; + # Compilers. AgdaExecutable = callPackage ../development/compilers/Agda-executable {}; @@ -1134,8 +1361,15 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); alex_2_3_2 = callPackage ../development/tools/parsing/alex/2.3.2.nix {}; alex_2_3_3 = callPackage ../development/tools/parsing/alex/2.3.3.nix {}; alex_2_3_5 = callPackage ../development/tools/parsing/alex/2.3.5.nix {}; + alex_3_0_1 = callPackage ../development/tools/parsing/alex/3.0.1.nix {}; alex = self.alex_2_3_1; + alexMeta = callPackage ../development/tools/haskell/alex-meta {}; + + BNFC = callPackage ../development/tools/haskell/BNFC {}; + + BNFCMeta = callPackage ../development/tools/haskell/BNFC-meta {}; + cpphs = callPackage ../development/tools/misc/cpphs {}; frown = callPackage ../development/tools/parsing/frown {}; @@ -1154,32 +1388,30 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); happy_1_18_6 = callPackage ../development/tools/parsing/happy/1.18.6.nix {}; happy = self.happy_1_18_4; + happyMeta = callPackage ../development/tools/haskell/happy-meta {}; + HaRe = callPackage ../development/tools/haskell/HaRe {}; hlint = callPackage ../development/tools/haskell/hlint {}; hslogger = callPackage ../development/tools/haskell/hslogger {}; - mkcabal = callPackage ../development/tools/haskell/mkcabal {}; - tar = callPackage ../development/tools/haskell/tar {}; threadscope = callPackage ../development/tools/haskell/threadscope {}; + uuagcBootstrap = callPackage ../development/tools/haskell/uuagc/bootstrap.nix {}; + uuagcCabal = callPackage ../development/tools/haskell/uuagc/cabal.nix {}; uuagc = callPackage ../development/tools/haskell/uuagc {}; # Applications. - darcs = callPackage ../applications/version-management/darcs/darcs-2.nix { + darcs = callPackage ../applications/version-management/darcs { inherit (pkgs) curl; parsec = self.parsec2; }; - leksah = callPackage ../applications/editors/leksah { - network = self.network_2_2_1_7; - regexBase = self.regexBase_0_93_2; - inherit (pkgs) makeWrapper; - }; + leksah = callPackage ../applications/editors/leksah {}; xmobar = callPackage ../applications/misc/xmobar {}; @@ -1193,6 +1425,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); # Tools. + cabal2nix = callPackage ../development/tools/haskell/cabal2nix {}; + cabalInstall_0_6_2 = callPackage ../tools/package-management/cabal-install/0.6.2.nix {}; cabalInstall_0_8_0 = callPackage ../tools/package-management/cabal-install/0.8.0.nix {}; cabalInstall_0_8_2 = callPackage ../tools/package-management/cabal-install/0.8.2.nix {}; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 36d470f70668..ca740b488b5f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11,6 +11,17 @@ rec { inherit (pkgs) buildPerlPackage fetchurl stdenv perl fetchsvn; + # Helper functions for packages that use Module::Build to build. + buildModule = { buildInputs ? [], ... } @ args: + buildPerlPackage (args // { + buildInputs = buildInputs ++ [ ModuleBuild ]; + preConfigure = "touch Makefile.PL"; + buildPhase = "perl Build.PL --prefix=$out"; + installPhase = "./Build install"; + checkPhase = "./Build test"; + }); + + ack = buildPerlPackage rec { name = "ack-1.92"; src = fetchurl { @@ -46,6 +57,14 @@ rec { buildInputs = [pkgs.unzip]; }; + aliased = buildPerlPackage rec { + name = "aliased-0.30"; + src = fetchurl { + url = "mirror://cpan/authors/id/O/OV/OVID/${name}.tar.gz"; + sha256 = "1iqcbfv600m31rfvl7r9ckr0hh0vny63q7a6yyhfrh4ppcgj4ig4"; + }; + }; + AnyMoose = buildPerlPackage rec { name = "Any-Moose-0.10"; src = fetchurl { @@ -88,6 +107,15 @@ rec { }; }; + AuthenHtpasswd = buildPerlPackage rec { + name = "Authen-Htpasswd-0.171"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Authen/${name}.tar.gz"; + sha256 = "0rw06hwpxg388d26l0jvirczx304f768ijvc20l4b2ll7xzg9ymm"; + }; + propagatedBuildInputs = [ ClassAccessor CryptPasswdMD5 DigestSHA1 IOLockedFile ]; + }; + AuthenSASL = buildPerlPackage rec { name = "Authen-SASL-2.1401"; src = fetchurl { @@ -175,13 +203,21 @@ rec { }; }; - CacheFastMmap = buildPerlPackage { - name = "Cache-FastMmap-1.28"; + CacheCache = buildPerlPackage rec { + name = "Cache-Cache-1.06"; src = fetchurl { - url = mirror://cpan/authors/id/R/RO/ROBM/Cache-FastMmap-1.28.tar.gz; - sha256 = "1m851bz5025wy24mzsi1i8hdyg8bm7lszx9rnn47llsv6hb9v0da"; + url = "mirror://cpan/modules/by-module/Cache/${name}.tar.gz"; + sha256 = "14s75bsm5irisp8wkbwl3ycw160srr1rks7x9jcbvcxh79wr6gbh"; + }; + propagatedBuildInputs = [ DigestSHA1 Error IPCShareLite ]; + }; + + CacheFastMmap = buildPerlPackage rec { + name = "Cache-FastMmap-1.39"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Cache/${name}.tar.gz"; + sha256 = "0dq93pz6lqya26pzgpgfa7c7i67h8rg0ylshzmvqzq4brqjpbqsk"; }; - doCheck = false; }; cam_pdf = buildPerlPackage rec { @@ -205,10 +241,10 @@ rec { }; CaptureTiny = buildPerlPackage rec { - name = "Capture-Tiny-0.06"; + name = "Capture-Tiny-0.11"; src = fetchurl { url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz"; - sha256 = "0qg74sfqc3cj8g21nsbif413c8vzvvs49v4vnqbw1410sa4fxsaw"; + sha256 = "09rhfjgryvfap2v6ym7ywl130r3q8a1p2rq70l1jv415qhj0194c"; }; }; @@ -239,12 +275,24 @@ rec { }; CatalystActionRenderView = buildPerlPackage rec { - name = "Catalyst-Action-RenderView-0.11"; + name = "Catalyst-Action-RenderView-0.16"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz"; - sha256 = "1qmjygjb5rzfanvw75czambfk4xmp1bc225mshzc6sddn7fc226s"; + url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz"; + sha256 = "0j1rrld13cjk7ks92b5hv3xw4rfm2lvmksb4rlzd8mx0a0wj0rc5"; }; - propagatedBuildInputs = [CatalystRuntime HTTPRequestAsCGI DataVisitor]; + propagatedBuildInputs = + [ CatalystRuntime HTTPRequestAsCGI DataVisitor MROCompat ]; + }; + + CatalystAuthenticationStoreHtpasswd = buildPerlPackage rec { + name = "Catalyst-Authentication-Store-Htpasswd-1.003"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz"; + sha256 = "09mn0wjwfvnfi28y47g816nx50zdpvwvbxp0nrpsap0ir1m80wi3"; + }; + buildInputs = [ TestWWWMechanizeCatalyst TestUseOk ]; + propagatedBuildInputs = + [ CatalystPluginAuthentication ClassAccessor CryptPasswdMD5 AuthenHtpasswd ]; }; CatalystAuthenticationStoreDBIxClass = buildPerlPackage rec { @@ -283,17 +331,18 @@ rec { }; CatalystDevel = buildPerlPackage rec { - name = "Catalyst-Devel-1.21"; + name = "Catalyst-Devel-1.33"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz"; - sha256 = "0akqzyagx3fzngmnc880wk0z2spnmzs32s2mmpskkrq2yc7spyjn"; + url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz"; + sha256 = "0g41rglw460y2n2xbysjbsjb56jkkz2m5jhap2nw3a5jby1ymp07"; }; - propagatedBuildInputs = [ - CatalystRuntime CatalystActionRenderView - CatalystPluginStaticSimple CatalystPluginConfigLoader PathClass - TemplateToolkit ClassAccessor ConfigGeneral FileCopyRecursive - Parent FileChangeNotify - ]; + buildInputs = [ TestFatal TestMore ]; + propagatedBuildInputs = + [ CatalystRuntime CatalystActionRenderView + CatalystPluginStaticSimple CatalystPluginConfigLoader + ClassAccessor ConfigGeneral FileChangeNotify FileCopyRecursive + FileShareDir Parent PathClass TemplateToolkit YAMLTiny + ]; CATALYST_DEVEL_NO_510_CHECK = 1; # bug in Perl 5.10.0 }; @@ -325,42 +374,48 @@ rec { }; CatalystModelDBICSchema = buildPerlPackage rec { - name = "Catalyst-Model-DBIC-Schema-0.31"; + name = "Catalyst-Model-DBIC-Schema-0.54"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSTROUT/${name}.tar.gz"; - sha256 = "136m988xkxbjzaj4jix7arb9l65sx6bahbw7v1ma6m4ifpgpj5fq"; + url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz"; + sha256 = "19iasq94nph33vz4jrk5x6cqd9ivq0db867s524faba8avrrlxz9"; }; - propagatedBuildInputs = [ - CatalystRuntime CatalystDevel DBIxClass UNIVERSALrequire - ClassDataAccessor DBIxClassSchemaLoader CatalystXComponentTraits - TieIxhash - ]; + buildInputs = [ TestMore TestException TestRequires DBDSQLite ]; + propagatedBuildInputs = + [ DBIxClass CatalystRuntime CatalystXComponentTraits Moose MooseXTypes + NamespaceAutoclean CarpClan ListMoreUtils TieIxHash TryTiny + CatalystDevel DBIxClassSchemaLoader MooseXNonMoose + NamespaceClean HashMerge DBIxClassCursorCached + ]; }; CatalystRuntime = buildPerlPackage rec{ - name = "Catalyst-Runtime-5.80012"; + name = "Catalyst-Runtime-5.80033"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MR/MRAMBERG/${name}.tar.gz"; - sha256 = "1kafxm92b5q2chdrcwqk73gdh3dbvfqa2718sms0md637vqczpip"; + url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz"; + sha256 = "1q542lrnvc0a11923awhk51fqzzxfa8zdkbch7z07dl8y81mwhl2"; }; - propagatedBuildInputs = [ - LWP ClassAccessor ClassDataInheritable ClassInspector - CGISimple DataDump FileModified HTTPBody HTTPRequestAsCGI - PathClass TextSimpleTable TreeSimple TreeSimpleVisitorFactory - SubExporter MROCompat TestMockObject ClassMOP Moose - NamespaceClean ScopeUpper MooseXEmulateClassAccessorFast - ClassC3 ClassC3AdoptNEXT NamespaceAutoclean MooseXMethodAttributes - StringRewritePrefix ModulePluggable - ]; + buildInputs = [ TestException ]; + propagatedBuildInputs = + [ ClassDataInheritable ListMoreUtils NamespaceAutoclean NamespaceClean + BHooksEndOfScope MooseXEmulateClassAccessorFast ClassMOP + Moose MooseXMethodAttributes MooseXRoleWithOverloading + ClassC3AdoptNEXT CGISimple DataDump DataOptList + HTMLParser HTTPBody HTTPRequestAsCGI + LWP ModulePluggable PathClass SubExporter + TextSimpleTable TimeHiRes TreeSimple TreeSimpleVisitorFactory + URI TaskWeaken /* TextBalanced */ MROCompat MooseXTypes + MooseXGetopt MooseXTypesCommon StringRewritePrefix + ]; }; CatalystPluginAuthentication = buildPerlPackage rec { - name = "Catalyst-Plugin-Authentication-0.10015"; + name = "Catalyst-Plugin-Authentication-0.10018"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz"; - sha256 = "01hfsxgbpkvcli4hpmzig1hfrjfllwnig6p287v0bc72l6gklzbd"; + url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz"; + sha256 = "1znm81baidzhiiyanigy8rs8jq97vh94fiv4xvkrmaxz0k6vppdx"; }; - propagatedBuildInputs = [CatalystRuntime CatalystPluginSession]; + propagatedBuildInputs = + [ CatalystRuntime CatalystPluginSession ClassInspector ]; }; CatalystPluginAuthorizationACL = buildPerlPackage rec { @@ -385,10 +440,10 @@ rec { }; CatalystPluginConfigLoader = buildPerlPackage rec { - name = "Catalyst-Plugin-ConfigLoader-0.24"; + name = "Catalyst-Plugin-ConfigLoader-0.30"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BR/BRICAS/${name}.tar.gz"; - sha256 = "08h72b9hndvfp9m8mpn21m5yiw77wzxvwf2vx6d0i9zbb83k3fk8"; + url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz"; + sha256 = "1rshgsvs9ngpd4nang4flq6mx9v71w1z5klp1rm8llc88pxlqahm"; }; propagatedBuildInputs = [CatalystRuntime DataVisitor ConfigAny MROCompat]; }; @@ -403,15 +458,14 @@ rec { }; CatalystPluginSession = buildPerlPackage rec { - name = "Catalyst-Plugin-Session-0.27"; + name = "Catalyst-Plugin-Session-0.32"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz"; - sha256 = "1sdrcip5ipi2jz9af3ak200l4qdimypljfc55wyp7228s2rlv99s"; + url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz"; + sha256 = "1pyrvwfan3qiaixbii57q4g34r9i1v61c5rfri6c25wryfh4f2bj"; }; - propagatedBuildInputs = [ - CatalystRuntime TestMockObject ObjectSignature - TestDeep MROCompat - ]; + buildInputs = [ TestMockObject TestDeep ]; + propagatedBuildInputs = + [ CatalystRuntime ObjectSignature MROCompat ]; }; CatalystPluginSessionStateCookie = buildPerlPackage rec { @@ -420,20 +474,18 @@ rec { url = "mirror://cpan/authors/id/M/MS/MSTROUT/${name}.tar.gz"; sha256 = "1rvxbfnpf9x2pc2zgpazlcgdlr2dijmxgmcs0m5nazs0w6xikssb"; }; - propagatedBuildInputs = [ - CatalystRuntime CatalystPluginSession TestMockObject - ]; + buildInputs = [ TestMockObject ]; + propagatedBuildInputs = [ CatalystRuntime CatalystPluginSession ]; }; CatalystPluginSessionStoreFastMmap = buildPerlPackage rec { - name = "Catalyst-Plugin-Session-Store-FastMmap-0.13"; + name = "Catalyst-Plugin-Session-Store-FastMmap-0.14"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSTROUT/${name}.tar.gz"; - sha256 = "0h46848mr3i9yadaxvsrdpfn7z22bvk8pa3g71hs7f8m4wd19ns7"; + url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz"; + sha256 = "1ywm96k1kpw9vbh7ihrxlfnfc5s4frb37cbix7xxlfz2vk10jw0d"; }; - propagatedBuildInputs = [ - PathClass CatalystPluginSession CacheFastMmap - ]; + propagatedBuildInputs = + [ PathClass CatalystPluginSession CacheFastMmap MROCompat ]; }; CatalystPluginStackTrace = buildPerlPackage rec { @@ -442,14 +494,14 @@ rec { url = "mirror://cpan/authors/id/M/MS/MSTROUT/${name}.tar.gz"; sha256 = "1ingivnga1yb4dqsj6icc4a58i9wdalzpn2qflsn8n2skgm223qb"; }; - propagatedBuildInputs = [CatalystRuntime DevelStackTrace]; + propagatedBuildInputs = [ CatalystRuntime DevelStackTrace MROCompat ]; }; CatalystPluginStaticSimple = buildPerlPackage rec { - name = "Catalyst-Plugin-Static-Simple-0.25"; + name = "Catalyst-Plugin-Static-Simple-0.29"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz"; - sha256 = "1f457b8sci1wablvzwplp4n5gn8902qz3s1qp40jb4k7y13wq74j"; + url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz"; + sha256 = "1wjh1a24gksjxzzl9wblbaar5gjvlm38kndjx8629fm9dcbqvc14"; }; propagatedBuildInputs = [CatalystRuntime MIMETypes]; }; @@ -457,20 +509,27 @@ rec { CatalystViewDownload = buildPerlPackage rec { name = "Catalyst-View-Download-0.06"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GA/GAUDEON/${name}.tar.gz"; + url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz"; sha256 = "0l9jvc4sqchhpmhn70lm46k2avdsdk19i9wgas1awhzyr445c0b3"; }; - propagatedBuildInputs = [ - CatalystRuntime TestWWWMechanizeCatalyst TestUseOk - TextCSV XMLSimple - ]; + buildInputs = [ TestWWWMechanizeCatalyst TestUseOk ]; + propagatedBuildInputs = [ CatalystRuntime TextCSV XMLSimple ]; + }; + + CatalystViewJSON = buildPerlPackage rec { + name = "Catalyst-View-JSON-0.33"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz"; + sha256 = "03yda9skcfnwkm4hf2a3y7g2rdjdia5hzfnll0h7z4wiyb8kxfii"; + }; + propagatedBuildInputs = [ CatalystRuntime JSONAny YAML ]; }; CatalystViewTT = buildPerlPackage rec { - name = "Catalyst-View-TT-0.30"; + name = "Catalyst-View-TT-0.37"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MR/MRAMBERG/${name}.tar.gz"; - sha256 = "15r5l0b943x2s863n38g3ir5xazja1s1kj022gs5bm4lw2hnkcvm"; + url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz"; + sha256 = "00vv4rkhpablmmfn70nybxy1jlfxhyf72ck3bch2gcfgqqysxvqz"; }; propagatedBuildInputs = [ CatalystRuntime TemplateToolkit ClassAccessor @@ -479,14 +538,13 @@ rec { }; CatalystXComponentTraits = buildPerlPackage rec { - name = "CatalystX-Component-Traits-0.03"; + name = "CatalystX-Component-Traits-0.16"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RK/RKITOVER/${name}.tar.gz"; - sha256 = "1xsy3i2019rl0mdpzs375al8ckb07s5pzg2h3nv3s4xn4qnn4vnk"; + url = "mirror://cpan/modules/by-module/CatalystX/${name}.tar.gz"; + sha256 = "0a2mhfgv0kqmaxf2crs8mqk44lyhd9qcwlpzhrc0b0dh4z503mr4"; }; - propagatedBuildInputs = [ - CatalystRuntime NamespaceAutoclean ListMoreUtils MooseXTraitsPluggable - ]; + propagatedBuildInputs = + [ CatalystRuntime MooseXTraitsPluggable NamespaceAutoclean ListMoreUtils ]; }; CGICookieXS = buildPerlPackage rec { @@ -514,12 +572,13 @@ rec { buildInputs = [ DBFile ]; }; - CGISimple = buildPerlPackage { - name = "CGI-Simple-1.106"; + CGISimple = buildPerlPackage rec { + name = "CGI-Simple-1.113"; src = fetchurl { - url = mirror://cpan/authors/id/A/AN/ANDYA/CGI-Simple-1.106.tar.gz; - sha256 = "0r0wc2260jnnch7dv7f6ailjf5w8hpqm2w146flfcchcryfxjlpg"; + url = "mirror://cpan/modules/by-module/CGI/${name}.tar.gz"; + sha256 = "0g8v0jd7dk310k6ncz47qa1cfrysi8yib1zwkhasv4zhswgqiqjj"; }; + propagatedBuildInputs = [ IOStringy ]; }; ClassAccessor = buildPerlPackage { @@ -540,12 +599,13 @@ rec { }; ClassAccessorGrouped = buildPerlPackage rec { - name = "Class-Accessor-Grouped-0.09002"; + name = "Class-Accessor-Grouped-0.10003"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RK/RKITOVER/${name}.tar.gz"; - sha256 = "1r1jbml1zc51x3p3mixq90d27pjlmx9mv4bz1bcp0whm335b1lr6"; + url = "mirror://cpan/modules/by-module/Class/${name}.tar.gz"; + sha256 = "036cyp74cdz8y5nig2b1iyqk6ps60sbqb0dqy0ybp3j5qiy28mix"; }; - propagatedBuildInputs = [ClassInspector MROCompat SubName SubIdentify]; + buildInputs = [ TestMore TestException ]; + propagatedBuildInputs = [ ClassInspector SubName ClassXSAccessor ]; }; ClassAutouse = buildPerlPackage { @@ -582,14 +642,13 @@ rec { }; ClassC3Componentised = buildPerlPackage rec { - name = "Class-C3-Componentised-1.0005"; + name = "Class-C3-Componentised-1.001000"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AS/ASH/${name}.tar.gz"; - sha256 = "1ka8af8wxypgfkys6dkcp0rh87kx5rsgfm9k582smrjjs0b8zmvv"; + url = "mirror://cpan/modules/by-module/Class/${name}.tar.gz"; + sha256 = "1nzav8arxll0rya7r2vp032s3acliihbb9mjlfa13rywhh77bzvl"; }; - propagatedBuildInputs = [ - ClassC3 ClassInspector TestException MROCompat - ]; + buildInputs = [ TestException ]; + propagatedBuildInputs = [ ClassC3 ClassInspector MROCompat ]; }; ClassDataAccessor = buildPerlPackage { @@ -632,17 +691,7 @@ rec { }; }; - ClassMOP = buildPerlPackage rec { - name = "Class-MOP-0.88"; - src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "00y5hl2sx1w0i1gl0cxj8x6k6xi8wagr0gwn388n1d0pv10mw12z"; - }; - propagatedBuildInputs = [ - MROCompat TaskWeaken TestException SubName SubIdentify - DevelGlobalDestruction - ]; - }; + ClassMOP = Moose; ClassSingleton = buildPerlPackage rec { name = "Class-Singleton-1.4"; @@ -660,13 +709,31 @@ rec { }; }; - ClassUnload = buildPerlPackage { - name = "Class-Unload-0.05"; + ClassLoad = buildPerlPackage rec { + name = "Class-Load-0.08"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Class/${name}.tar.gz"; + sha256 = "0qyxa5dd75dxna7y995wx589p7smsybcqkg1rach2cg04yff0dh1"; + }; + buildInputs = [ TestFatal ]; + propagatedBuildInputs = [ DataOptList ]; + }; + + ClassUnload = buildPerlPackage rec { + name = "Class-Unload-0.07"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Class//${name}.tar.gz"; + sha256 = "1alvn94j0wgfyyym092g9cq0mbhzin0zf7lfja6578jk5cc788rr"; + }; + propagatedBuildInputs = [ ClassInspector ]; + }; + + ClassXSAccessor = buildPerlPackage rec { + name = "Class-XSAccessor-1.11"; src = fetchurl { - url = mirror://cpan/authors/id/I/IL/ILMARI/Class-Unload-0.05.tar.gz; - sha256 = "01b0j10nxbz37xnnzw3hgmpfgq09mc489kq2d8f5nswsrlk75001"; + url = "mirror://cpan/modules/by-module/Class/${name}.tar.gz"; + sha256 = "0mf7rp73r1pzy47m4bp49jw8iwpi6l1drdpk4qqxik6n7nx15mh2"; }; - propagatedBuildInputs = [ClassInspector]; }; Clone = buildPerlPackage rec { @@ -677,6 +744,14 @@ rec { }; }; + CommonSense = buildPerlPackage rec { + name = "common-sense-3.4"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz"; + sha256 = "0s1lym5519gwdgwd6c6cq9c9iagr7bmb16jklq5iq3nsdyb0qc2l"; + }; + }; + CompressRawBzip2 = import ../development/perl-modules/Compress-Raw-Bzip2 { inherit fetchurl buildPerlPackage; inherit (pkgs) bzip2; @@ -710,18 +785,18 @@ rec { }; ConfigAny = buildPerlPackage rec { - name = "Config-Any-0.18"; + name = "Config-Any-0.23"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BR/BRICAS/${name}.tar.gz"; - sha256 = "0hjfvbbhi8r52ycpw507y6d4cway5x5z9pij117q04r1xmwf0qnj"; + url = "mirror://cpan/modules/by-module/Config/${name}.tar.gz"; + sha256 = "17k62vdq3wr7m397ginp8525nqmlcjsmlqqpvnnfm3sr5vcxhjgz"; }; }; ConfigGeneral = buildPerlPackage rec { - name = "Config-General-2.42"; + name = "Config-General-2.50"; src = fetchurl { url = "mirror://cpan/authors/id/T/TL/TLINDEN/${name}.tar.gz"; - sha256 = "0r7qj4nhmflcda2r72yysl93ziwzc1qjnjfzi7ifd4fxh53zjy59"; + sha256 = "0ff5qh6dx8qijbkx5yfvn3fhn5m2hkcl8yjmqxwnvcg78h33s3ps"; }; }; @@ -741,12 +816,13 @@ rec { }; }; - CommonSense = buildPerlPackage { - name = "common-sense-3.3"; + ContextPreserve = buildPerlPackage rec { + name = "Context-Preserve-0.01"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/common-sense-3.3.tar.gz; - sha256 = "04j0lf5lwc70x33dfxxhqhylgikyb6p43mpc3daydx601wblscbj"; + url = "mirror://cpan/authors/id/J/JR/JROCKWAY/${name}.tar.gz"; + sha256 = "0gssillawjknqks81x7fg7w2x94bnyklgd8ry2pr1k6ifkjhwz46"; }; + buildInputs = [ TestException TestUseOk ]; }; CookieXS = buildPerlPackage rec { @@ -755,9 +831,26 @@ rec { url = "mirror://cpan/authors/id/A/AG/AGENT/${name}.tar.gz"; sha256 = "1616rcn2qn1cwiv3rxb8mq5fmwxpj4gya1lxxxq2w952h03p3fd3"; }; - propagatedBuildInputs = [ - TestMore CGICookieXS - ]; + buildInputs = [ TestMore ]; + propagatedBuildInputs = [ CGICookieXS ]; + }; + + CPANMeta = buildPerlPackage rec { + name = "CPAN-Meta-2.112150"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/CPAN/${name}.tar.gz"; + sha256 = "0k48ccws3j158mrr348gishh5q7vg4fmx36fgrnnnydv0psic4n0"; + }; + propagatedBuildInputs = + [ CPANMetaYAML JSONPP ParseCPANMeta VersionRequirements version ]; + }; + + CPANMetaYAML = buildPerlPackage rec { + name = "CPAN-Meta-YAML-0.003"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/CPAN/${name}.tar.gz"; + sha256 = "1mdmn9znk60izxdvvawsylv7n85x4y6lx8pa0gnkcp6d96q031af"; + }; }; CryptCBC = buildPerlPackage rec { @@ -777,7 +870,7 @@ rec { buildInputs = [CryptCBC]; }; - CryptPasswordMD5 = buildPerlPackage { + CryptPasswdMD5 = buildPerlPackage { name = "Crypt-PasswdMD5-1.3"; src = fetchurl { url = mirror://cpan/authors/id/L/LU/LUISMUNOZ/Crypt-PasswdMD5-1.3.tar.gz; @@ -810,6 +903,15 @@ rec { makeMakerFlags = "--lib=${pkgs.openssl}/lib"; }; + DataCompare = buildPerlPackage rec { + name = "Data-Compare-1.22"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Data/${name}.tar.gz"; + sha256 = "1bz8qasp3ndiprxq2l0llbc0xbnjq11lz0l1lfzxiap7v1y2r3yf"; + }; + propagatedBuildInputs = [ FileFindRule ]; + }; + DataDump = buildPerlPackage { name = "Data-Dump-1.11"; src = fetchurl { @@ -819,10 +921,10 @@ rec { }; DataDumperConcise = buildPerlPackage rec { - name = "Data-Dumper-Concise-1.100"; + name = "Data-Dumper-Concise-2.020"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSTROUT/${name}.tar.gz"; - sha256 = "123iy2nnf41sq3sk4plrmqlbwsciir6ww31frrm7vzg388zziz7x"; + url = "mirror://cpan/modules/by-module/Data/${name}.tar.gz"; + sha256 = "0zb792d2dmpl0dnfmwcgh6wppb5h56hwycdbcf97wqxcgjk3k7hn"; }; }; @@ -836,10 +938,10 @@ rec { }; DataOptList = buildPerlPackage rec { - name = "Data-OptList-0.104"; + name = "Data-OptList-0.107"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "1k1qvf3ik2rn9mg65ginv3lyy6dlg1z08yddcnzbnizs8vbqqaxd"; + sha256 = "0r2sbvh1kj69al5crg394v5j5wkffvqdb17fz1rjfgb6h3v93xi8"; }; propagatedBuildInputs = [SubInstall ParamsUtil]; }; @@ -974,18 +1076,29 @@ rec { }; DBIxClass = buildPerlPackage rec { - name = "DBIx-Class-0.08115"; + name = "DBIx-Class-0.08195"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/DBIx/${name}.tar.gz"; + sha256 = "197q2pkkk6dpq1r76jcnzamk5dqac5k9n3wgq8dd5ak8sw6cj7p6"; + }; + buildInputs = [ DBDSQLite TestException TestWarn ]; + propagatedBuildInputs = + [ PackageStash ClassAccessorGrouped ClassC3Componentised + ClassInspector ConfigAny ContextPreserve DBI DataCompare + DataDumperConcise DataPage HashMerge MROCompat ModuleFind + PathClass SQLAbstract ScopeGuard SubName TryTiny VariableMagic + NamespaceClean + ]; + }; + + DBIxClassCursorCached = buildPerlPackage rec { + name = "DBIx-Class-Cursor-Cached-1.001002"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FR/FREW/${name}.tar.gz"; - sha256 = "1addd0763q2jyvh9hdi0ayppqk0bmypw48s1xcwfximbnja8z9mw"; + url = "mirror://cpan/modules/by-module/DBIx/${name}.tar.gz"; + sha256 = "19r7jr6pknxiirrybq0cd0lnr76xiw05arnfqgk9nrhp6c7vvil0"; }; - propagatedBuildInputs = [ - TestNoWarnings TestException DBI ScopeGuard PathClass - ClassInspector ClassAccessorGrouped CarpClan TestWarn DataPage - SQLAbstract SQLAbstractLimit ClassC3 ClassC3Componentised - ModuleFind DBDSQLite JSONAny SubName DataDumperConcise - ]; - buildInputs = [TestPod TestPodCoverage]; + buildInputs = [ DBDSQLite ]; + propagatedBuildInputs = [ CacheCache DBIxClass CarpClan ]; }; DBIxClassHTMLWidget = buildPerlPackage rec { @@ -998,18 +1111,18 @@ rec { }; DBIxClassSchemaLoader = buildPerlPackage rec { - name = "DBIx-Class-Schema-Loader-0.05000"; + name = "DBIx-Class-Schema-Loader-0.07010"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RK/RKITOVER/${name}.tar.gz"; - sha256 = "00lwggmwfwi3qbsx9jl5kdi5aszflpiggvksinmsam6sfyfpz2rq"; + url = "mirror://cpan/modules/by-module/DBIx/${name}.tar.gz"; + sha256 = "08yy5lsrb7h1xzp7d1bqsgnjpa2d8ik14qhsq2d7v7r3f5fk5q3g"; }; - propagatedBuildInputs = [ - DBI DBDSQLite DataDump UNIVERSALrequire - ClassAccessor ClassDataAccessor ClassC3 CarpClan - ClassInspector DBIxClass LinguaENInflectNumber - ClassUnload - ]; - doCheck = false; # disabled for now, since some tests fail + buildInputs = [ TestException TestMore TestWarn DBDSQLite ]; + propagatedBuildInputs = + [ DataDump LinguaENInflectNumber LinguaENInflectPhrase ClassAccessor + ClassAccessorGrouped ClassC3Componentised MROCompat CarpClan + DBIxClass ClassLoad ClassUnload FileSlurp ListMoreUtils + NamespaceClean ScopeGuard TryTiny + ]; }; DevelGlobalDestruction = buildPerlPackage rec { @@ -1021,11 +1134,19 @@ rec { propagatedBuildInputs = [SubExporter ScopeGuard]; }; + DevelHide = buildPerlPackage rec { + name = "Devel-Hide-0.0008"; + src = fetchurl { + url = "mirror://cpan/authors/id/F/FE/FERREIRA/${name}.tar.gz"; + sha256 = "14hwwirpc9cnwn50rshb8hb778mia4ni75jv2dih8l9i033m4i26"; + }; + }; + DevelStackTrace = buildPerlPackage rec { - name = "Devel-StackTrace-1.20"; + name = "Devel-StackTrace-1.27"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "15zh9gzhw6gv7l6sklp02pfmiiv8kwmmjsyvirppsca6aagy4603"; + url = "mirror://cpan/modules/by-module/Devel/${name}.tar.gz"; + sha256 = "01p7b9cmji582bld81c3b84jffhdi59zydnxjj6fh3m29zyysmfs"; }; }; @@ -1065,6 +1186,16 @@ rec { }; }; + DistCheckConflicts = buildPerlPackage rec { + name = "Dist-CheckConflicts-0.02"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DO/DOY/${name}.tar.gz"; + sha256 = "1lh7j20vvsh4dyh74hr0wnabyv8vcdkilfi93m2fbk69qk3w995j"; + }; + buildInputs = [ TestFatal ]; + propagatedBuildInputs = [ ListMoreUtils SubExporter ]; + }; + EmailAbstract = buildPerlPackage rec { name = "Email-Abstract-3.001"; src = fetchurl { @@ -1100,20 +1231,16 @@ rec { }; EmailSender = buildPerlPackage rec { - name = "Email-Sender-0.091870"; + name = "Email-Sender-0.110001"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "1vr1xigx25ikhljhpc5sv75bpczb7ny625ynzbxvic6qm0a3kaqc"; + sha256 = "0z4nl7aizbailraqwkkqhx6k3hdz67wxszjfhd5yg2vn06ybsjwj"; }; - propagatedBuildInputs = [ - CaptureTiny EmailAbstract EmailAddress ListMoreUtils Moose - SysHostnameLong - ]; - preConfigure = - '' - chmod u+x util/sendmail - patchShebangs util/sendmail - ''; + buildInputs = [ TestMore ]; + propagatedBuildInputs = + [ CaptureTiny EmailAbstract EmailAddress ListMoreUtils Moose + Throwable TryTiny + ]; }; EmailSimple = buildPerlPackage rec { @@ -1143,6 +1270,24 @@ rec { }; }; + Error = buildPerlPackage rec { + name = "Error-0.17016"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + sha256 = "1akr35g7nbhch8fgkrqixjy08gx19brp981wyxplscizwcya64zh"; + }; + }; + + EvalClosure = buildPerlPackage rec { + name = "Eval-Closure-0.06"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DO/DOY/${name}.tar.gz"; + sha256 = "0qjfigd7r3xwizf8wff3g2mhidbqqlb6xy125iwd03f3i5hmnhic"; + }; + buildInputs = [ TestFatal TestRequires ]; + propagatedBuildInputs = [ SubExporter TryTiny ]; + }; + ExceptionClass = buildPerlPackage rec { name = "Exception-Class-1.30"; src = fetchurl { @@ -1152,13 +1297,20 @@ rec { propagatedBuildInputs = [ ClassDataInheritable DevelStackTrace ]; }; - ExtUtilsInstall = buildPerlPackage { - name = "ExtUtils-Install-1.50"; + ExtUtilsCBuilder = buildPerlPackage rec { + name = "ExtUtils-CBuilder-0.280202"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; + sha256 = "13qjdz1kmrp5mp404by94cdsyydjadg974ykinqga450djjaqpbq"; + }; + }; + + ExtUtilsInstall = buildPerlPackage rec { + name = "ExtUtils-Install-1.54"; src = fetchurl { - url = mirror://cpan/authors/id/Y/YV/YVES/ExtUtils-Install-1.50.tar.gz; - sha256 = "18fr056fwnnhvgc646crx2p9mybf69mh5rkcphc7bbvahw9i61jy"; + url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; + sha256 = "19igil4iwh3jdyvjm8s0ypm8wxsny6nv4z3b3lkwhq0ccjgd3rp3"; }; - propagatedBuildInputs = [ExtUtilsMakeMaker]; }; ExtUtilsMakeMaker = buildPerlPackage { @@ -1169,23 +1321,33 @@ rec { }; }; - ExtUtilsManifest = buildPerlPackage { - name = "ExtUtils-Manifest-1.53"; + ExtUtilsManifest = buildPerlPackage rec { + name = "ExtUtils-Manifest-1.59"; src = fetchurl { - url = mirror://cpan/authors/id/R/RK/RKOBES/ExtUtils-Manifest-1.53.tar.gz; - sha256 = "0xgfzivw0dfy29ydfjkg0c9mvlhjvlhc54s0yvbb4sxb2mdvrfkp"; + url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; + sha256 = "0cb7mjmfsk2rlwdr5y91x2w5ffb0yjf9gblibk9wplivlpa48jhs"; }; }; - FileChangeNotify = buildPerlPackage rec { - name = "File-ChangeNotify-0.07"; + ExtUtilsParseXS = buildPerlPackage rec { + name = "ExtUtils-ParseXS-3.03"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "0qklyrxii0i651gn42csdc0lhcvrwh0m9d316zc7kl75anwl6hly"; + url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; + sha256 = "0ziq4iwn3bc1zyrm7aigc7nk5lxb69shzix9irxw17i5lfc923xg"; }; - propagatedBuildInputs = [ - ClassMOP Moose MooseXParamsValidate MooseXSemiAffordanceAccessor - ]; + }; + + FileChangeNotify = buildModule rec { + name = "File-ChangeNotify-0.20"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/File/${name}.tar.gz"; + sha256 = "000aiiijf16j5cf8gql4vr6l9y561famkfb5qv5d29xz2ad4mmd9"; + }; + buildInputs = [ TestException ]; + propagatedBuildInputs = + [ ClassMOP Moose MooseXParamsValidate MooseXSemiAffordanceAccessor + NamespaceAutoclean + ] ++ stdenv.lib.optional stdenv.isLinux LinuxInotify2; }; Filechdir = buildPerlPackage { @@ -1204,6 +1366,15 @@ rec { }; }; + FileFindRule = buildPerlPackage rec { + name = "File-Find-Rule-0.32"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/File/${name}.tar.gz"; + sha256 = "0fdci3k9j8x69p28jb793gni4y9qbgzpfnnj1avzf8nnib9w1wrd"; + }; + propagatedBuildInputs = [ NumberCompare TextGlob ]; + }; + FileModified = buildPerlPackage { name = "File-Modified-0.07"; src = fetchurl { @@ -1262,6 +1433,14 @@ rec { propagatedBuildInputs = [ TestScript ]; }; + FontTTF = buildPerlPackage { + name = "Font-TTF-0.43"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MH/MHOSKEN/Font-TTF-0.43.tar.gz; + sha256 = "0782mj5n5a2qbghvvr20x51llizly6q5smak98kzhgq9a7q3fg89"; + }; + }; + FreezeThaw = buildPerlPackage { name = "FreezeThaw-0.43"; src = fetchurl { @@ -1278,7 +1457,7 @@ rec { }; buildInputs = [ pkgs.gd pkgs.libjpeg pkgs.zlib pkgs.freetype - pkgs.libpng pkgs.fontconfig pkgs.xlibs.libXpm GetOptLong ]; + pkgs.libpng pkgs.fontconfig pkgs.xlibs.libXpm GetoptLong ]; # Patch needed to get arguments past the first GetOptions call # and to specify libfontconfig search path. @@ -1295,14 +1474,34 @@ rec { makeMakerFlags = "--lib_png_path=${pkgs.libpng} --lib_jpeg_path=${pkgs.libjpeg} --lib_zlib_path=${pkgs.zlib} --lib_ft_path=${pkgs.freetype} --lib_fontconfig_path=${pkgs.fontconfig} --lib_xpm_path=${pkgs.xlibs.libXpm}"; }; - GetOptLong = buildPerlPackage rec { + GeoIP = buildPerlPackage rec { + name = "Geo-IP-1.39"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BO/BORISZ/${name}.tar.gz"; + sha256 = "1yc0rn67nk4z8aq8d82axhfmgi0l91rkksqbf27ylasrhyb6ykx5"; + }; + makeMakerFlags = "LIBS=-L${pkgs.geoip}/lib INC=-I${pkgs.geoip}/include"; + doCheck = false; # seems to access the network + }; + + GetoptLong = buildPerlPackage rec { name = "Getopt-Long-2.38"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JV/JV/modules/${name}.tar.gz"; + url = "mirror://cpan/authors/id/J/JV/JV/${name}.tar.gz"; sha256 = "0lrsm8vlqhdnkzfvyaiyfivmaar0rirrnwa2v0qk6l130a497mky"; }; }; + GetoptLongDescriptive = buildPerlPackage rec { + name = "Getopt-Long-Descriptive-0.090"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Getopt/${name}.tar.gz"; + sha256 = "17ghqd50y3627ajc7wl6n7sv055p2gg0h40lavx7qhwyg5rf46lw"; + }; + buildInputs = [ TestMore ]; + propagatedBuildInputs = [ ParamsValidate SubExporter ]; + }; + Graph = buildPerlPackage rec { name = "Graph-0.94"; src = fetchurl { @@ -1331,6 +1530,15 @@ rec { }; }; + HashMerge = buildPerlPackage rec { + name = "Hash-Merge-0.12"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Hash/${name}.tar.gz"; + sha256 = "07h7dyldxwqhq3x4fp9hacnc4vgipp0jk50b5cbvib975nfxx98z"; + }; + propagatedBuildInputs = [ Clone ]; + }; + HookLexWrap = buildPerlPackage rec { name = "Hook-LexWrap-0.22"; src = fetchurl { @@ -1433,12 +1641,13 @@ rec { }; HTTPBody = buildPerlPackage rec { - name = "HTTP-Body-1.05"; + name = "HTTP-Body-1.12"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AG/AGRUNDMA/${name}.tar.gz"; - sha256 = "0s0496sb9l8jfkdx86vahwgdaaxrqb0j6acyww6nk0ajh82qrzfv"; + url = "mirror://cpan/modules/by-module/HTTP/${name}.tar.gz"; + sha256 = "1229hhcm762n9x82jkhl8hmjcaigprcsrhymcdbkqlwch2agm6g2"; }; - propagatedBuildInputs = [LWP YAML]; + buildInputs = [ TestDeep ]; + propagatedBuildInputs = [ LWP ]; }; HTTPHeaderParserXS = buildPerlPackage rec { @@ -1450,12 +1659,12 @@ rec { }; HTTPRequestAsCGI = buildPerlPackage rec { - name = "HTTP-Request-AsCGI-0.9"; + name = "HTTP-Request-AsCGI-1.2"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HD/HDP/${name}.tar.gz"; - sha256 = "1k17bgvscjvr4v96l9vm14mpk4r4b5g9w1gpmwl8qfga3czp6sd4"; + url = "mirror://cpan/modules/by-module/HTTP/${name}.tar.gz"; + sha256 = "1smwmiarwcgq7vjdblnb6ldi2x1s5sk5p15p7xvm5byiqq3znnwl"; }; - propagatedBuildInputs = [ClassAccessor LWP]; + propagatedBuildInputs = [ ClassAccessor LWP ]; }; HTTPResponseEncoding = buildPerlPackage rec { @@ -1485,20 +1694,6 @@ rec { }; }; - PerlMagick = buildPerlPackage { - name = "PerlMagick-6.59"; - src = fetchurl { - url = http://image_magick.veidrodis.com:8003/image_magick/perl/PerlMagick-6.59.tar.gz; - sha256 = "6d7a33f6431b5650637cf73dd696927dbb2073f28e8f8d11a465d7de4c4638b3"; - }; - buildInputs = [pkgs.imagemagick]; - preConfigure = - '' - sed -i -e 's|my \$INC_magick = .*|my $INC_magick = "-I${pkgs.imagemagick}/include/ImageMagick";|' Makefile.PL - ''; - doCheck = false; - }; - IOCompressBase = buildPerlPackage rec { name = "IO-Compress-Base-2.015"; src = fetchurl { @@ -1534,6 +1729,14 @@ rec { propagatedBuildInputs = [PerlIOviadynamic]; }; + IOLockedFile = buildPerlPackage rec { + name = "IO-LockedFile-0.23"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/IO/${name}.tar.gz"; + sha256 = "1dgq8zfkaszisdb5hz8jgcl0xc3qpv7bbv562l31xgpiddm7xnxi"; + }; + }; + IOPager = buildPerlPackage { name = "IO-Pager-0.06.tgz"; src = fetchurl { @@ -1593,6 +1796,14 @@ rec { }; }; + IPCShareLite = buildPerlPackage rec { + name = "IPC-ShareLite-0.17"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/IPC/${name}.tar.gz"; + sha256 = "1gz7dbwxrzbzdsjv11kb49jlf9q6lci2va6is0hnavd93nwhdm0l"; + }; + }; + ImageExifTool = buildPerlPackage rec { name = "Image-ExifTool-8.41"; @@ -1700,6 +1911,14 @@ rec { propagatedBuildInputs = [JSON]; }; + JSONPP = buildPerlPackage rec { + name = "JSON-PP-2.27200"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/JSON/${name}.tar.gz"; + sha256 = "1lv9riws9f72gya2fsp5jvbd1fbzyi8423x38a491ryy9cai2ph3"; + }; + }; + JSONXS = buildPerlPackage rec { name = "JSON-XS-2.29"; src = fetchurl { @@ -1718,28 +1937,66 @@ rec { propagatedBuildInputs = [XMLParser]; }; - LinguaENInflect = buildPerlPackage { - name = "Lingua-EN-Inflect-1.89"; + LinguaENInflect = buildPerlPackage rec { + name = "Lingua-EN-Inflect-1.893"; src = fetchurl { - url = mirror://cpan/authors/id/D/DC/DCONWAY/Lingua-EN-Inflect-1.89.tar.gz; - sha256 = "1jvj67mvvfqxgxspmblay1c844vvhfwrviiarglkaw6phpg74rby"; + url = "mirror://cpan/modules/by-module/Lingua/${name}.tar.gz"; + sha256 = "1j0jxf3pqnsshakmpdwkgcmlz26hzmkrhg33kz52qzdfys254xmy"; }; }; - LinguaENInflectNumber = buildPerlPackage { + LinguaENInflectNumber = buildPerlPackage rec { name = "Lingua-EN-Inflect-Number-1.1"; src = fetchurl { - url = mirror://cpan/authors/id/S/SI/SIMON/Lingua-EN-Inflect-Number-1.1.tar.gz; + url = "mirror://cpan/modules/by-module/Lingua/${name}.tar.gz"; sha256 = "13hlr1srp9cd9mcc78snkng9il8iavvylfyh81iadvn2y7wikwfy"; }; - propagatedBuildInputs = [LinguaENInflect]; + propagatedBuildInputs = [ LinguaENInflect ]; + }; + + LinguaENInflectPhrase = buildPerlPackage rec { + name = "Lingua-EN-Inflect-Phrase-0.04"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Lingua/${name}.tar.gz"; + sha256 = "12a74zkc1rybsvxwg8fxdjs6frfq7naky2ks4idcwd48lya3nw90"; + }; + buildInputs = [ TestMore ]; + propagatedBuildInputs = + [ LinguaENInflect LinguaENInflectNumber LinguaENTagger ]; + }; + + LinguaENTagger = buildPerlPackage rec { + name = "Lingua-EN-Tagger-0.16"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Lingua/${name}.tar.gz"; + sha256 = "0nzjgpxd0i5a3sacxsqfvvrfyamxlmzfa9y14r4vs7sc8qm20xd2"; + }; + propagatedBuildInputs = [ HTMLParser LinguaStem ]; + }; + + LinguaStem = buildPerlPackage rec { + name = "Lingua-Stem-0.84"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Lingua/${name}.tar.gz"; + sha256 = "12avh2mnnc7llmmshrr5bgb473fvydxnlqrqbl2815mf2dp4pxcg"; + }; + doCheck = false; }; - ListMoreUtils = buildPerlPackage { - name = "List-MoreUtils-0.22"; + LinuxInotify2 = buildPerlPackage rec { + name = "Linux-Inotify2-1.22"; src = fetchurl { - url = mirror://cpan/authors/id/V/VP/VPARSEVAL/List-MoreUtils-0.22.tar.gz; - sha256 = "1dv21xclh6r1cyy19r34xv2w6pc1jb5pwj7b2739m78xhlk8p55l"; + url = "mirror://cpan/modules/by-module/Linux/${name}.tar.gz"; + sha256 = "1l916p8xak6c51x4x1vrzd8wpi55bld74wf0p5w5m4vr80zjb7dw"; + }; + propagatedBuildInputs = [ CommonSense ]; + }; + + ListMoreUtils = buildPerlPackage rec { + name = "List-MoreUtils-0.33"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz"; + sha256 = "1bcljhhsk5g0xykvgbxz10ilmj02s58ydiy3g8hbzdr29i20np1i"; }; }; @@ -1777,6 +2034,15 @@ rec { }; }; + LockFileSimple = buildPerlPackage rec { + name = "LockFile-Simple-0.207"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JV/JV/LockFile-Simple-0.207.tar.gz"; + sha256 = "171vi9y6jlkny0d4jaavz48d1vbxljknnmbq8h22fi8lnc5kvipa"; + }; + }; + + LWP = buildPerlPackage rec { name = "libwww-perl-5.825"; src = fetchurl { @@ -1826,13 +2092,16 @@ rec { propagatedBuildInputs = [TestPod]; }; - ModuleBuild = buildPerlPackage { - name = "Module-Build-0.2808"; + ModuleBuild = buildPerlPackage rec { + name = "Module-Build-0.3800"; src = fetchurl { - url = mirror://cpan/authors/id/K/KW/KWILLIAMS/Module-Build-0.2808.tar.gz; - sha256 = "1h8zpf4g2n8v47l9apmdqbdgcg039g70w75hpn84m37pmqkbnj8v"; + url = "mirror://cpan/modules/by-module/Module/${name}.tar.gz"; + sha256 = "1gk0xn5s48f0n3a6k4izw6sigsk84rk06hky7dd48hdmvrq23f4v"; }; - propagatedBuildInputs = [ExtUtilsInstall ExtUtilsManifest TestHarness]; + propagatedBuildInputs = + [ ExtUtilsInstall ExtUtilsManifest ExtUtilsCBuilder ExtUtilsParseXS + CPANMeta PerlOSType ModuleMetadata + ]; }; ModuleFind = buildPerlPackage { @@ -1843,16 +2112,27 @@ rec { }; }; + ModuleMetadata = buildPerlPackage rec { + name = "Module-Metadata-1.000005"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Module/${name}.tar.gz"; + sha256 = "04xxs3542mqdadcs2bdlpyldmbbxdn9x0gwjnyy5p1d5c3ajnq9k"; + }; + propagatedBuildInputs = [ version ]; + }; + Moose = buildPerlPackage rec { - name = "Moose-0.85"; + name = "Moose-2.0202"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "1fim2kg6hcawbhn26sm1dq0q8ikmq0qwngd3wys7h0n9vs5hqdkb"; + url = "mirror://cpan/authors/id/D/DO/DOY/${name}.tar.gz"; + sha256 = "1xp0052ig06f5axw9djrq5ws8r9mcs4g1qs55yzgynl2hjrkazi4"; }; - propagatedBuildInputs = [ - TestMore TestException TaskWeaken ListMoreUtils - ClassMOP SubExporter - ]; + buildInputs = [ TestFatal TestRequires ]; + propagatedBuildInputs = + [ DataOptList DevelGlobalDestruction DistCheckConflicts EvalClosure + ListMoreUtils MROCompat PackageDeprecationManager PackageStash + PackageStashXS ParamsUtil SubExporter SubName TaskWeaken TryTiny + ]; }; MooseAutobox = buildPerlPackage rec { @@ -1865,21 +2145,43 @@ rec { }; MooseXEmulateClassAccessorFast = buildPerlPackage rec { - name = "MooseX-Emulate-Class-Accessor-Fast-0.00900"; + name = "MooseX-Emulate-Class-Accessor-Fast-0.00903"; src = fetchurl { url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz"; - sha256 = "1sxkhyi44h30ba5ca7fmjpwc2pjwqm2n7ll67dn02dzgh68zaha7"; + sha256 = "1lkn1h4sxr1483jicsgsgzclbfw63g2i2c3m4v4j9ar75yrb0kh8"; + }; + buildInputs = [ TestException ]; + propagatedBuildInputs = [ Moose NamespaceClean ]; + }; + + MooseXGetopt = buildPerlPackage rec { + name = "MooseX-Getopt-0.37"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz"; + sha256 = "161j44v2b4qzv75lk35gvfvs864vcyhkzq6phmhh8zllg3cnfc8k"; }; - propagatedBuildInputs = [Moose NamespaceClean]; + buildInputs = [ TestFatal TestRequires TestWarn ]; + propagatedBuildInputs = [ Moose GetoptLongDescriptive MooseXRoleParameterized ]; }; MooseXMethodAttributes = buildPerlPackage rec { - name = "MooseX-MethodAttributes-0.16"; + name = "MooseX-MethodAttributes-0.25"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz"; - sha256 = "1cfpslsn7kqcbi6rvb5095ba8f4qdjb2bksxdbalpr4yf88hrc5n"; + url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz"; + sha256 = "0rkk0rija7s96747y46qz49g88kymgxvn70mr21id9i8n7cdacww"; }; - propagatedBuildInputs = [Moose MooseXTypes TestException]; + buildInputs = [ TestException ]; + propagatedBuildInputs = [ Moose MooseXTypes NamespaceAutoclean NamespaceClean ]; + }; + + MooseXNonMoose = buildPerlPackage rec { + name = "MooseX-NonMoose-0.22"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz"; + sha256 = "0mhyabg5f6kngkm1w7hfglkdzjdn5pbgm7vgia0aqy9mwwclbpdp"; + }; + buildInputs = [ TestFatal ]; + propagatedBuildInputs = [ ListMoreUtils Moose ]; }; MooseXParamsValidate = buildPerlPackage rec { @@ -1891,13 +2193,32 @@ rec { propagatedBuildInputs = [Moose ParamsValidate SubExporter TestException]; }; + MooseXRoleParameterized = buildPerlPackage rec { + name = "MooseX-Role-Parameterized-0.26"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz"; + sha256 = "1wfqdkjhwzbzk2cm65r5gz9n6406j8mdq78iga7dnj3mp2csn631"; + }; + buildInputs = [ TestFatal TestMore ]; + propagatedBuildInputs = [ Moose ]; + }; + + MooseXRoleWithOverloading = buildPerlPackage rec { + name = "MooseX-Role-WithOverloading-0.09"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz"; + sha256 = "0qs013vkm0ysykd3hibk4m8bkl0rnysxzralwq19zrvxaqk2krn8"; + }; + propagatedBuildInputs = [ Moose MooseXTypes NamespaceAutoclean aliased ]; + }; + MooseXSemiAffordanceAccessor = buildPerlPackage rec { - name = "MooseX-SemiAffordanceAccessor-0.03"; + name = "MooseX-SemiAffordanceAccessor-0.09"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "073lq5dlwqxbrdzsn5ragjvwgpsfwcdls83n513kscgcq56y7014"; + url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz"; + sha256 = "1724cxvgy1wh1kfawcj2sanlm90zarfh7k186pgyx1lk8fhnlj4m"; }; - propagatedBuildInputs = [Moose]; + propagatedBuildInputs = [ Moose ]; }; MooseXTraits = buildPerlPackage rec { @@ -1912,24 +2233,35 @@ rec { }; MooseXTraitsPluggable = buildPerlPackage rec { - name = "MooseX-Traits-Pluggable-0.04"; + name = "MooseX-Traits-Pluggable-0.10"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RK/RKITOVER/${name}.tar.gz"; - sha256 = "1cgkjcfx87kkrfg814fgfwl19cjqwx8wn40308z5p135vlbcbins"; + url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz"; + sha256 = "0gv79bsnacrzwpac3dll64zj40qcsbp4kdk8yr9z5bwim7nkvnv3"; }; - propagatedBuildInputs = [ - Moose TestException NamespaceAutoclean ClassMOP TestUseOk - MooseXTraits MooseAutobox - ]; + buildInputs =[ TestException ]; + propagatedBuildInputs = + [ ClassMOP Moose NamespaceAutoclean ListMoreUtils ]; }; MooseXTypes = buildPerlPackage rec { - name = "MooseX-Types-0.16"; + name = "MooseX-Types-0.28"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RK/RKITOVER/${name}.tar.gz"; - sha256 = "0b7w9wyh44qqjipw0gy5xsvdb5hwaqjk3vbqiwq07aliwnlfgi9a"; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; + sha256 = "0wjqdxd2qlzgrvi4z2rl82xns9kh7m4chf9yzkj5il9g9gprwl57"; }; - propagatedBuildInputs = [Moose CarpClan NamespaceClean]; + buildInputs = [ TestFatal TestRequires ]; + propagatedBuildInputs = + [ Moose CarpClan NamespaceClean SubInstall SubName ]; + }; + + MooseXTypesCommon = buildPerlPackage rec { + name = "MooseX-Types-Common-0.001002"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz"; + sha256 = "0mddl25gkb3qggdfx9fjzs321bj89y8dr4bw307l1dr3zr082xkr"; + }; + buildInputs = [ TestException ]; + propagatedBuildInputs = [ Moose MooseXTypes ]; }; Mouse = buildPerlPackage rec { @@ -1942,30 +2274,30 @@ rec { doCheck = false; # check can't find its own Mouse::Tiny module }; - MROCompat = buildPerlPackage { - name = "MRO-Compat-0.09"; + MROCompat = buildPerlPackage rec { + name = "MRO-Compat-0.11"; src = fetchurl { - url = mirror://cpan/authors/id/B/BL/BLBLACK/MRO-Compat-0.09.tar.gz; - sha256 = "16l37bxd5apax4kyvnadiplz8xmmx76y9pyq9iksqrv0d5rl5vl8"; + url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz"; + sha256 = "0p2hl0cygcds3jjq3awackd72j3vzidfyjacj7gxdlqh65a2fjq7"; }; }; NamespaceAutoclean = buildPerlPackage rec { - name = "namespace-autoclean-0.08"; + name = "namespace-autoclean-0.12"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz"; - sha256 = "1276incn27dpz955yx44l7rqs27bp1nc4gzqvw1x4aif8kw91185"; + url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz"; + sha256 = "125g5ny4sqf9kj1sxaqh1jipzyii56p9nsp45jg9fg67i4ljm9pg"; }; - propagatedBuildInputs = [BHooksEndOfScope ClassMOP NamespaceClean]; + propagatedBuildInputs = [ BHooksEndOfScope ClassMOP NamespaceClean Moose ]; }; NamespaceClean = buildPerlPackage rec { - name = "namespace-clean-0.11"; + name = "namespace-clean-0.21"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz"; - sha256 = "00fpj8a5p9z577cha3cgb95r042v7kbz7pwls5p0rl7jqvpax4lb"; + url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/${name}.tar.gz"; + sha256 = "0djqishj6mcw1jn9saff4i2glq89dq3rc7slpprcky31jay6jq5i"; }; - propagatedBuildInputs = [BHooksEndOfScope]; + propagatedBuildInputs = [ BHooksEndOfScope DevelHide PackageStash ]; }; NetAmazonEC2 = buildPerlPackage rec { @@ -1985,6 +2317,19 @@ rec { doCheck = false; # wants to create actual EC2 instances (for $$$) }; + NetAmazonMechanicalTurk = buildPerlPackage rec { + name = "Net-Amazon-MechanicalTurk-1.01"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MT/MTURK/${name}.tar.gz"; + sha256 = "17xh6qcp2sw721r8cpcal80an49264db497namms4k139fsr1yig"; + }; + patches = + [ ../development/perl-modules/net-amazon-mechanicalturk.patch ]; + propagatedBuildInputs = + [ DigestHMAC LWP URI XMLParser IOString ]; + buildInputs = [ DBI DBDSQLite ]; + }; + NetDNS = buildPerlPackage { name = "Net-DNS-0.63"; src = fetchurl { @@ -2066,6 +2411,14 @@ rec { doCheck = false; # tests currently don't work }; + NumberCompare = buildPerlPackage rec { + name = "Number-Compare-0.01"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Number/${name}.tar.gz"; + sha256 = "1vs95lbax3f63jg98jwkiahlvg1jhmd0xyyzmbxxifsl7fkv1d9j"; + }; + }; + ObjectSignature = buildPerlPackage { name = "Object-Signature-1.05"; src = fetchurl { @@ -2082,6 +2435,35 @@ rec { }; }; + PackageDeprecationManager = buildPerlPackage rec { + name = "Package-DeprecationManager-0.11"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; + sha256 = "1q2jgq3dfva5wfsl1jn8711bk7fvf5cgpjddd8if9cx3zixnq2n1"; + }; + buildInputs = [ TestFatal TestRequires ]; + propagatedBuildInputs = [ ListMoreUtils ParamsUtil SubInstall ]; + }; + + PackageStash = buildPerlPackage rec { + name = "Package-Stash-0.31"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DO/DOY/${name}.tar.gz"; + sha256 = "0m5mibmy49gjhb5kvgyg2cfzs4d1ghav75f19x80s3bv6vr0ls6x"; + }; + buildInputs = [ TestFatal TestRequires ]; + propagatedBuildInputs = [ DistCheckConflicts PackageDeprecationManager PackageStashXS ]; + }; + + PackageStashXS = buildPerlPackage rec { + name = "Package-Stash-XS-0.23"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DO/DOY/${name}.tar.gz"; + sha256 = "0dr86sbpb67dxbq64ix48f0n3dgac820ibci4xy4hbijja6lzwj6"; + }; + buildInputs = [ TestFatal ]; + }; + ParamsUtil = buildPerlPackage rec { name = "Params-Util-1.01"; src = fetchurl { @@ -2090,11 +2472,11 @@ rec { }; }; - ParamsValidate = buildPerlPackage rec { - name = "Params-Validate-0.91"; + ParamsValidate = buildModule rec { + name = "Params-Validate-1.00"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "1j0hx3pbfdyggbhrawa9k0wdm6lln3zdkrhjrdg1hzzf6csrlc1v"; + url = "mirror://cpan/modules/by-module/Params/${name}.tar.gz"; + sha256 = "1yziygqb8km28xr3yzzsllzgg7xnxdh4wqfm2kmf2s6qck0dkij4"; }; }; @@ -2106,6 +2488,15 @@ rec { }; }; + ParseCPANMeta = buildPerlPackage rec { + name = "Parse-CPAN-Meta-1.4401"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Parse/${name}.tar.gz"; + sha256 = "0g381a0wynh9xc9wf44drw5vhfbd3wa693myy018jwq9vp51pf5q"; + }; + propagatedBuildInputs = [ CPANMetaYAML JSONPP ]; + }; + ParseRecDescent = buildPerlPackage rec { name = "Parse-RecDescent-1.965001"; src = fetchurl { @@ -2114,11 +2505,11 @@ rec { }; }; - PathClass = buildPerlPackage { - name = "Path-Class-0.16"; + PathClass = buildPerlPackage rec { + name = "Path-Class-0.24"; src = fetchurl { - url = mirror://cpan/authors/id/K/KW/KWILLIAMS/Path-Class-0.16.tar.gz; - sha256 = "0zisxkj58jm84fwcssmdq8g6n37s33v5h7j28m12sbkqib0h76gc"; + url = "mirror://cpan/authors/id/K/KW/KWILLIAMS/${name}.tar.gz"; + sha256 = "1g4in1k3nvk7w034hmhix9hjbjgpshwc5m8xvpga84rfzbadpnyc"; }; }; @@ -2166,6 +2557,28 @@ rec { }; }; + PerlMagick = buildPerlPackage { + name = "PerlMagick-6.59"; + src = fetchurl { + url = http://image_magick.veidrodis.com:8003/image_magick/perl/PerlMagick-6.59.tar.gz; + sha256 = "6d7a33f6431b5650637cf73dd696927dbb2073f28e8f8d11a465d7de4c4638b3"; + }; + buildInputs = [pkgs.imagemagick]; + preConfigure = + '' + sed -i -e 's|my \$INC_magick = .*|my $INC_magick = "-I${pkgs.imagemagick}/include/ImageMagick";|' Makefile.PL + ''; + doCheck = false; + }; + + PerlOSType = buildPerlPackage rec { + name = "Perl-OSType-1.002"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Perl/${name}.tar.gz"; + sha256 = "0clbfgq0800dip3821ibh29vrwcc159qnakidbiqrmhcisd95xbs"; + }; + }; + PerlTidy = buildPerlPackage rec { name = "Perl-Tidy-20090616"; src = fetchurl { @@ -2373,14 +2786,14 @@ rec { }; SQLAbstract = buildPerlPackage rec { - name = "SQL-Abstract-1.60"; + name = "SQL-Abstract-1.72"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/${name}.tar.gz"; - sha256 = "0m9xjp5wiknpibvpav7jf72g3v3x7rpqsdqpnqnma6bws6ci66gf"; + url = "mirror://cpan/modules/by-module/SQL/${name}.tar.gz"; + sha256 = "12abz50zz51s1f5hvs5xl6smb369sjid1zyjkfygkiglqp4an0kr"; }; - propagatedBuildInputs = [ - TestDeep TestException TestWarn Clone - ]; + buildInputs = [ TestDeep TestException TestWarn ]; + propagatedBuildInputs = + [ ClassAccessorGrouped GetoptLongDescriptive HashMerge ]; }; SQLAbstractLimit = buildPerlPackage rec { @@ -2458,11 +2871,11 @@ rec { }; }; - SubName = buildPerlPackage { - name = "Sub-Name-0.04"; + SubName = buildPerlPackage rec { + name = "Sub-Name-0.05"; src = fetchurl { - url = mirror://cpan/authors/id/X/XM/XMATH/Sub-Name-0.04.tar.gz; - sha256 = "1nlin0ag2krpmiyapp3lzb6qw2yfqvqmx57iz5zwbhr4pyi46bhb"; + url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz"; + sha256 = "1w9sf51ai2r3i0kv5wnq7h9g3hcd6zb6i51ivvykb3hzx82vilf9"; }; }; @@ -2633,13 +3046,22 @@ rec { propagatedBuildInputs = [ TestMore TextDiff ]; }; - TestException = buildPerlPackage { - name = "Test-Exception-0.27"; + TestException = buildPerlPackage rec { + name = "Test-Exception-0.31"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz"; + sha256 = "1lyd6mcg00348xsn9fl59spx68a69ybli7h7gd2k0p4y21q8p0ks"; + }; + propagatedBuildInputs = [ SubUplevel ]; + }; + + TestFatal = buildPerlPackage rec { + name = "Test-Fatal-0.006"; src = fetchurl { - url = mirror://cpan/authors/id/A/AD/ADIE/Test-Exception-0.27.tar.gz; - sha256 = "1s921j7yv2szywd1ffi6yz3ngrbq97f9dh38bvvajqnm29g1xb9j"; + url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + sha256 = "0laxzphmqwq0rrizv3n7pcnrn345yh70cip61sl8f8mw8dir1jdx"; }; - propagatedBuildInputs = [TestHarness TestSimple SubUplevel]; + propagatedBuildInputs = [ TryTiny ]; }; TestHarness = buildPerlPackage rec { @@ -2720,13 +3142,20 @@ rec { propagatedBuildInputs = [PodCoverage]; }; + TestRequires = buildPerlPackage rec { + name = "Test-Requires-0.06"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/${name}.tar.gz"; + sha256 = "1ksyg4npzx5faf2sj80rm74qjra4q679750vfqfvw3kg1d69wvwv"; + }; + }; + TestSimple = buildPerlPackage rec { - name = "Test-Simple-0.94"; + name = "Test-Simple-0.98"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSCHWERN/${name}.tar.gz"; - sha256 = "1sdf9azxdbswbmzxasdp38mi1sznjc2g2ywi5ymbr6dcb3vs94vg"; + url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz"; + sha256 = "1a0jrl3n2g05qn6c79pv5bnc1wlq36qccwdgf1pjrrvmrgi07cig"; }; - propagatedBuildInputs = [TestHarness]; }; TestScript = buildPerlPackage rec { @@ -2824,6 +3253,14 @@ rec { propagatedBuildInputs = [ AlgorithmDiff ]; }; + TextGlob = buildPerlPackage rec { + name = "Text-Glob-0.09"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Text/${name}.tar.gz"; + sha256 = "0lr76wrsj8wcxrq4wi8z1640w4dmdbkznp06q744rg3g0bd238d5"; + }; + }; + TextMarkdown = buildPerlPackage rec { name = "Text-Markdown-1.0.26"; src = fetchurl { @@ -2884,7 +3321,16 @@ rec { propagatedBuildInputs = [TextAligner]; }; - TieIxhash = buildPerlPackage rec { + Throwable = buildPerlPackage rec { + name = "Throwable-0.102080"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + sha256 = "0vjzlh23rpmgr5h8qfh9pb3kqw0j8sxn2bpbc1p2306dwqwbymm5"; + }; + propagatedBuildInputs = [ DevelStackTrace Moose ]; + }; + + TieIxHash = buildPerlPackage rec { name = "Tie-IxHash-1.21"; src = fetchurl { url = "mirror://cpan/authors/id/G/GS/GSAR/${name}.tar.gz"; @@ -2909,11 +3355,11 @@ rec { }; }; - TimeHiRes = buildPerlPackage { - name = "Time-HiRes-1.9715"; + TimeHiRes = buildPerlPackage rec { + name = "Time-HiRes-1.9724"; src = fetchurl { - url = mirror://cpan/authors/id/J/JH/JHI/Time-HiRes-1.9715.tar.gz; - sha256 = "0pgqrfkysy3mdcx5nd0x8c80lgqb7rkb3nrkii3vc576dcbpvw0i"; + url = "mirror://cpan/modules/by-module/Time/${name}.tar.gz"; + sha256 = "0lrwfixr3qg8j4vkfax1z4gqiccq0v0jyvc7db40qpvi88655gjs"; }; }; @@ -2944,11 +3390,11 @@ rec { buildInputs = [TestException]; }; - FontTTF = buildPerlPackage { - name = "perl-Font-TTF-0.43"; + TryTiny = buildPerlPackage rec { + name = "Try-Tiny-0.09"; src = fetchurl { - url = mirror://cpan/authors/id/M/MH/MHOSKEN/Font-TTF-0.43.tar.gz; - sha256 = "0782mj5n5a2qbghvvr20x51llizly6q5smak98kzhgq9a7q3fg89"; + url = "mirror://cpan/authors/id/D/DO/DOY/${name}.tar.gz"; + sha256 = "1fjhwq347wa74h94nd54lx194s26s7x9whfc0kkpcng2sgs54vvs"; }; }; @@ -2960,19 +3406,12 @@ rec { }; }; - UNIVERSALisa = stdenv.mkDerivation rec { + UNIVERSALisa = buildModule rec { name = "UNIVERSAL-isa-1.01"; src = fetchurl { url = "mirror://cpan/authors/id/C/CH/CHROMATIC/${name}.tar.gz"; sha256 = "0iksklmfhiaxg2rsw827n97k1mris6dg596rdwk2gmrwl0rsk0wz"; }; - # Urgh, this package doesn't have a Makefile.PL. - buildInputs = [perl]; - configurePhase = "perl Build.PL --prefix=$out"; - buildPhase = "perl ./Build"; - doCheck = true; - checkPhase = "perl ./Build test"; - installPhase = "perl ./Build install"; }; UNIVERSALrequire = buildPerlPackage { @@ -3001,10 +3440,26 @@ rec { }; VariableMagic = buildPerlPackage rec { - name = "Variable-Magic-0.36"; + name = "Variable-Magic-0.46"; src = fetchurl { - url = "mirror://cpan/authors/id/V/VP/VPIT/${name}.tar.gz"; - sha256 = "15305b54e948f74a0cf77c1c6bd8aa399caac12d6b1dee8cc4a69ff7d1421db6"; + url = "mirror://cpan/modules/by-module/Variable/${name}.tar.gz"; + sha256 = "0z8fbna6nhn0hlvj1qbjw7yjn3dzl7pz1psmc8amv8kg6avgj33q"; + }; + }; + + version = buildPerlPackage rec { + name = "version-0.93"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/version/${name}.tar.gz"; + sha256 = "1lfq27hshq1gvdqksicp22ag8n1aiijhjw68q3r254kp6zimrz69"; + }; + }; + + VersionRequirements = buildPerlPackage rec { + name = "Version-Requirements-0.101020"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + sha256 = "18bcfxwn21gcih0bc6p1sp42iis8lwnqh7fpprkniflj8q0ps0x4"; }; }; @@ -3054,24 +3509,25 @@ rec { propagatedBuildInputs = [XMLRegExp XMLParser LWP libxml_perl]; }; - XMLLibXML = buildPerlPackage { - name = "XML-LibXML-1.70"; + XMLLibXML = buildPerlPackage rec { + name = "XML-LibXML-1.86"; src = fetchurl { - url = mirror://cpan/authors/id/P/PA/PAJAS/XML-LibXML-1.70.tar.gz; - sha256 = "181viglnw93kz9w3bvs8dqvx4xnqvf448vnwam8dia9bfw3czrjk"; + url = "mirror://cpan/modules/by-module/XML/${name}.tar.gz"; + sha256 = "0wgf9898vmjac4mr2k4zvz6aw7nx0yvfv8f093y6w44vv6prxchp"; }; - SKIP_SAX_INSTALL=1; - buildInputs = [pkgs.libxml2]; - propagatedBuildInputs = [XMLLibXMLCommon XMLSAX]; + SKIP_SAX_INSTALL = 1; + buildInputs = [ pkgs.libxml2 ]; + propagatedBuildInputs = [ XMLSAX ]; }; - XMLLibXMLCommon = buildPerlPackage { - name = "XML-LibXML-Common-0.13"; + XMLLibXSLT = buildPerlPackage rec { + name = "XML-LibXSLT-1.70"; src = fetchurl { - url = mirror://cpan/authors/id/P/PH/PHISH/XML-LibXML-Common-0.13.tar.gz; - md5 = "13b6d93f53375d15fd11922216249659"; + url = "mirror://cpan/modules/by-module/XML/${name}.tar.gz"; + sha256 = "0x8lqlxr6xhgwwa6zj4shrwrqlgbgs0piripc1fsnw4z1yl2gf9p"; }; - buildInputs = [pkgs.libxml2]; + buildInputs = [ pkgs.zlib pkgs.libxml2 pkgs.libxslt ]; + propagatedBuildInputs = [ XMLLibXML ]; }; XMLNamespaceSupport = buildPerlPackage { @@ -3167,4 +3623,12 @@ rec { }; }; + YAMLTiny = buildPerlPackage rec { + name = "YAML-Tiny-1.50"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/YAML/${name}.tar.gz"; + sha256 = "0ag1llgf0qn3sxy832xhvc1mq6s0bdv13ij7vh7df8nv0jnxyyd3"; + }; + }; + } diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index f44306785709..259b9898f36b 100644 --- a/pkgs/top-level/platforms.nix +++ b/pkgs/top-level/platforms.nix @@ -24,6 +24,10 @@ rec { ''; }; + pc_simplekernel = pc // { + kernelAutoModules = false; + }; + sheevaplug = { name = "sheevaplug"; kernelMajor = "2.6"; @@ -55,6 +59,12 @@ rec { NFSD_V3 y NFSD_V3_ACL y NFSD_V4 y + NETFILTER y + IP_NF_IPTABLES y + IP_NF_FILTER y + IP_NF_MATCH_ADDRTYPE y + IP_NF_TARGET_LOG y + IP_NF_MANGLE y # Fail to build DRM n diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 81c80200b294..2efb8a9fe8a0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12,7 +12,7 @@ let pythonPackages = python.modules // rec { inherit python wrapPython setuptools; }; - + setuptools = import ../development/python-modules/setuptools { inherit (pkgs) stdenv fetchurl; inherit python wrapPython; @@ -62,7 +62,7 @@ let pythonPackages = python.modules // rec { apsw = buildPythonPackage rec { name = "apsw-3.7.6.2-r1"; - + src = fetchurl { url = "http://apsw.googlecode.com/files/${name}.zip"; sha1 = "fa4aec08e59fa5964197f59ba42408d64031675b"; @@ -78,7 +78,7 @@ let pythonPackages = python.modules // rec { }; }; - + argparse = buildPythonPackage (rec { name = "argparse-1.1"; @@ -110,6 +110,16 @@ let pythonPackages = python.modules // rec { }; }); + astng = buildPythonPackage rec { + name = "logilab-astng-0.21.1"; + + src = fetchurl { + url = "http://ftp.logilab.org/pub/astng/${name}.tar.gz"; + sha256 = "0rqp2vwrnv6gkzdd96j078h1sz26plh49cmnyswy2wb6l4wans67"; + }; + propagatedBuildInputs = [logilabCommon]; + }; + beautifulsoap = buildPythonPackage (rec { name = "beautifulsoap-3.0.8"; @@ -218,7 +228,7 @@ let pythonPackages = python.modules // rec { }; }; - + cherrypy = buildPythonPackage (rec { name = "cherrypy-3.1.2"; @@ -347,10 +357,10 @@ let pythonPackages = python.modules // rec { }; }; - + dtopt = buildPythonPackage rec { name = "dtopt-0.1"; - + src = fetchurl { url = "http://pypi.python.org/packages/source/d/dtopt/${name}.tar.gz"; md5 = "9a41317149e926fcc408086aedee6bab"; @@ -362,7 +372,26 @@ let pythonPackages = python.modules // rec { }; }; - + + enum = buildPythonPackage rec { + name = "enum-0.4.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/e/enum/${name}.tar.gz"; + md5 = "ce75c7c3c86741175a84456cc5bd531e"; + }; + + buildInputs = [ ]; + + propagatedBuildInputs = [ ]; + + meta = { + homepage = http://pypi.python.org/pypi/enum/; + description = "Robust enumerated type support in Python."; + }; + }; + + eventlet = buildPythonPackage rec { name = "eventlet-0.9.16"; @@ -385,7 +414,7 @@ let pythonPackages = python.modules // rec { }; }; - + flup = buildPythonPackage (rec { name = "flup-1.0.2"; @@ -456,7 +485,25 @@ let pythonPackages = python.modules // rec { }; }; - + genzshcomp = buildPythonPackage { + name = "genzshcomp-0.2.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/g/genzshcomp/genzshcomp-0.2.2.tar.gz"; + sha256 = "0bhiyx41kilvy04cgjbvjy2r4b6l7zz31fbrg3l6lvnqm26nihb0"; + }; + + buildInputs = [ pkgs.setuptools ]; + + meta = { + description = "automatically generated zsh completion function for Python's option parser modules"; + license = "BSD"; + maintainers = [ stdenv.lib.maintainers.simons ]; + platforms = python.meta.platforms; + }; + }; + + gflags = buildPythonPackage rec { name = "gflags-1.5.1"; @@ -471,7 +518,7 @@ let pythonPackages = python.modules // rec { }; }; - + glance = buildPythonPackage rec { name = "glance-0.1.7"; @@ -492,7 +539,7 @@ let pythonPackages = python.modules // rec { }; }; - + greenlet = buildPythonPackage rec { name = "greenlet-0.3.1"; @@ -507,7 +554,7 @@ let pythonPackages = python.modules // rec { }; }; - + httplib2 = buildPythonPackage rec { name = "httplib2-0.6.0"; @@ -524,11 +571,11 @@ let pythonPackages = python.modules // rec { }; }; - + ipy = buildPythonPackage rec { version = "0.74"; name = "ipy-${version}"; - + src = fetchurl { url = "http://pypi.python.org/packages/source/I/IPy/IPy-${version}.tar.gz"; md5 = "f4f7ddc7c5e55a47222a5cc6c0a87b6d"; @@ -542,7 +589,7 @@ let pythonPackages = python.modules // rec { }; }; - + jinja2 = buildPythonPackage { name = "jinja2-2.2.1"; @@ -563,7 +610,7 @@ let pythonPackages = python.modules // rec { }; }; - + libcloud = buildPythonPackage (rec { name = "libcloud-0.3.1"; @@ -582,7 +629,7 @@ let pythonPackages = python.modules // rec { }; }); - + lockfile = buildPythonPackage rec { name = "lockfile-0.9.1"; @@ -599,7 +646,16 @@ let pythonPackages = python.modules // rec { }; }; - + logilabCommon = buildPythonPackage rec { + name = "logilab-common-0.56.0"; + + src = fetchurl { + url = "http://ftp.logilab.org/pub/common/${name}.tar.gz"; + sha256 = "14p557nqypbd10d8k7qs6jlm58pksiwh86wvvl0axyki00hj6971"; + }; + propagatedBuildInputs = [unittest2]; + }; + lxml = buildPythonPackage ( rec { name = "lxml-2.2.2"; @@ -637,11 +693,11 @@ let pythonPackages = python.modules // rec { }; }; - + m2crypto = buildPythonPackage rec { version = "0.21.1"; name = "m2crypto-${version}"; - + src = fetchurl { url = "http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${version}.tar.gz"; md5 = "f93d8462ff7646397a9f77a2fe602d17"; @@ -659,7 +715,7 @@ let pythonPackages = python.modules // rec { }; }; - + markdown = buildPythonPackage rec { version = "2.0.3"; name = "markdown-${version}"; @@ -676,7 +732,7 @@ let pythonPackages = python.modules // rec { }; }; - + matplotlib = buildPythonPackage ( rec { name = "matplotlib-0.99.1.2"; @@ -714,7 +770,7 @@ let pythonPackages = python.modules // rec { }; }); - + mock = buildPythonPackage (rec { name = "mock-0.7.0"; @@ -751,7 +807,7 @@ let pythonPackages = python.modules // rec { }; }; - + mutagen = buildPythonPackage (rec { name = "mutagen-1.20"; @@ -821,7 +877,7 @@ let pythonPackages = python.modules // rec { }; }); - + netaddr = buildPythonPackage rec { name = "netaddr-0.7.5"; @@ -838,7 +894,7 @@ let pythonPackages = python.modules // rec { }; }; - + nevow = buildPythonPackage (rec { name = "nevow-${version}"; version = "0.10.0"; @@ -910,6 +966,8 @@ let pythonPackages = python.modules // rec { buildInputs = [ python pkgs.pkgconfig pkgs.libnotify pkgs.pygobject pkgs.pygtk pkgs.gtkLibs.glib pkgs.gtkLibs.gtk pkgs.dbus_glib ]; + postInstall = "cd $out/lib/python*/site-packages && ln -s gtk-*/pynotify ."; + meta = { description = "Python bindings for libnotify"; homepage = http://www.galago-project.org/; @@ -1033,7 +1091,7 @@ let pythonPackages = python.modules // rec { paste = buildPythonPackage rec { name = "paste-1.7.5.1"; - + src = fetchurl { url = http://pypi.python.org/packages/source/P/Paste/Paste-1.7.5.1.tar.gz; md5 = "7ea5fabed7dca48eb46dc613c4b6c4ed"; @@ -1049,11 +1107,11 @@ let pythonPackages = python.modules // rec { }; }; - + paste_deploy = buildPythonPackage rec { version = "1.3.4"; name = "paste-deploy-${version}"; - + src = fetchurl { url = "http://pypi.python.org/packages/source/P/PasteDeploy/PasteDeploy-${version}.tar.gz"; md5 = "eb4b3e2543d54401249c2cbd9f2d014f"; @@ -1069,7 +1127,7 @@ let pythonPackages = python.modules // rec { }; }; - + pexpect = buildPythonPackage { name = "pexpect-2.3"; @@ -1106,10 +1164,10 @@ let pythonPackages = python.modules // rec { }; }; - + prettytable = buildPythonPackage rec { name = "prettytable-0.5"; - + src = fetchurl { url = "http://pypi.python.org/packages/source/P/PrettyTable/${name}.tar.gz"; md5 = "13a6930d775395f393afd86948afa4fa"; @@ -1121,7 +1179,20 @@ let pythonPackages = python.modules // rec { }; }; - + + protobuf = buildPythonPackage rec { + inherit (pkgs.protobuf) name src; + + propagatedBuildInputs = [pkgs.protobuf]; + sourceRoot = "${name}/python"; + + meta = { + description = "Protocol Buffers are Google's data interchange format."; + homepage = http://code.google.com/p/protobuf/; + }; + }; + + psycopg2 = buildPythonPackage rec { name = "psycopg2-2.0.13"; @@ -1220,6 +1291,15 @@ let pythonPackages = python.modules // rec { }; }); + pylint = buildPythonPackage rec { + name = "pylint-0.23.0"; + + src = fetchurl { + url = "http://ftp.logilab.org/pub/pylint/${name}.tar.gz"; + sha256 = "07091avcc2b374i5f3blszmawjcin8xssjfryz91qbxybb8r7c6d"; + }; + propagatedBuildInputs = [astng]; + }; pymacs = pkgs.stdenv.mkDerivation rec { version = "v0.24-beta2"; @@ -1331,7 +1411,7 @@ let pythonPackages = python.modules // rec { }; }); - + pysvn = pkgs.stdenv.mkDerivation { name = "pysvn-1.7.2"; @@ -1378,7 +1458,7 @@ let pythonPackages = python.modules // rec { }; }; - + pyutil = buildPythonPackage (rec { name = "pyutil-1.7.9"; @@ -1497,10 +1577,10 @@ let pythonPackages = python.modules // rec { }; }; - + routes = buildPythonPackage rec { name = "routes-1.12.3"; - + src = fetchurl { url = http://pypi.python.org/packages/source/R/Routes/Routes-1.12.3.tar.gz; md5 = "9740ff424ff6b841632c784a38fb2be3"; @@ -1514,11 +1594,11 @@ let pythonPackages = python.modules // rec { }; }; - + scripttest = buildPythonPackage rec { version = "1.1.1"; name = "scripttest-${version}"; - + src = fetchurl { url = "http://pypi.python.org/packages/source/S/ScriptTest/ScriptTest-${version}.tar.gz"; md5 = "592ce890764c3f546d35b4d7c40c32ef"; @@ -1532,7 +1612,7 @@ let pythonPackages = python.modules // rec { }; }; - + setuptoolsDarcs = buildPythonPackage { name = "setuptools-darcs-1.2.9"; @@ -1720,7 +1800,7 @@ let pythonPackages = python.modules // rec { unittest2 = buildPythonPackage rec { name = "unittest2-0.5.1"; - + src = fetchurl { url = "http://pypi.python.org/packages/source/u/unittest2/${name}.tar.gz"; md5 = "a0af5cac92bbbfa0c3b0e99571390e0f"; @@ -1732,11 +1812,29 @@ let pythonPackages = python.modules // rec { }; }; - + + vnc2flv = buildPythonPackage rec { + name = "vnc2flv-20100207"; + namePrefix = ""; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/v/vnc2flv/${name}.tar.gz"; + md5 = "8492e46496e187b49fe5569b5639804e"; + }; + + doCheck = false; + + meta = { + description = "Tool to record VNC sessions to Flash Video"; + homepage = http://www.unixuser.org/~euske/python/vnc2flv/; + }; + }; + + webob = buildPythonPackage rec { version = "1.0.6"; name = "webob-${version}"; - + src = fetchurl { url = "http://pypi.python.org/packages/source/W/WebOb/WebOb-${version}.zip"; md5 = "8e46dd755f6998d471bfbcb4def897ff"; @@ -1753,11 +1851,11 @@ let pythonPackages = python.modules // rec { }; }; - + webtest = buildPythonPackage rec { version = "1.2.3"; name = "webtest-${version}"; - + src = fetchurl { url = "http://pypi.python.org/packages/source/W/WebTest/WebTest-${version}.tar.gz"; md5 = "585f9331467e6d99acaba4051c1c5878"; @@ -1773,7 +1871,7 @@ let pythonPackages = python.modules // rec { wxPython = wxPython28; - + wxPython26 = import ../development/python-modules/wxPython/2.6.nix { inherit (pkgs) stdenv fetchurl pkgconfig; @@ -1781,14 +1879,14 @@ let pythonPackages = python.modules // rec { wxGTK = pkgs.wxGTK26; }; - + wxPython28 = import ../development/python-modules/wxPython/2.8.nix { inherit (pkgs) stdenv fetchurl pkgconfig; inherit pythonPackages; wxGTK = pkgs.wxGTK28; }; - + zbase32 = buildPythonPackage (rec { name = "zbase32-1.1.2"; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 648eef655d8d..490d943cf201 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -167,7 +167,6 @@ with (import ./release-lib.nix); kbd = linux; keen4 = ["i686-linux"]; # klibc = linux; - ktorrent = linux; kvm = linux; qemu = linux; qemu_kvm = linux; @@ -203,9 +202,11 @@ with (import ./release-lib.nix); module_init_tools = linux; mono = linux; mpg321 = linux; + mupen64plus = linux; mutt = linux; mysql = linux; mysql51 = linux; + mysql55 = linux; namazu = all; nano = allBut "i686-cygwin"; ncat = linux; @@ -306,6 +307,7 @@ with (import ./release-lib.nix); tightvnc = linux; time = linux; tinycc = ["i686-linux"]; + uae = linux; udev = linux; uml = ["i686-linux"]; unrar = linux; @@ -319,6 +321,7 @@ with (import ./release-lib.nix); vice = linux; vim = linux; vimHugeX = linux; + VisualBoyAdvance = linux; vlc = linux; vncrec = linux; vorbisTools = linux; @@ -352,6 +355,7 @@ with (import ./release-lib.nix); zile = linux; zip = all; zsh = linux; + zsnes = ["i686-linux"]; aspellDicts = { de = all; @@ -362,7 +366,7 @@ with (import ./release-lib.nix); ru = all; }; - dbus = { + dbus_all = { libs = linux; tools = linux; }; @@ -381,8 +385,8 @@ with (import ./release-lib.nix); }; firefox36Pkgs.firefox = linux; - firefox40Pkgs.firefox = linux; firefox50Pkgs.firefox = linux; + firefox60Pkgs.firefox = linux; gnome = { gnome_panel = linux; @@ -394,6 +398,7 @@ with (import ./release-lib.nix); gtk = linux; }; + /* haskellPackages_ghc6104 = { ghc = ghcSupported; haskellPlatform_2009_2_0_2 = ghcSupported; @@ -405,14 +410,10 @@ with (import ./release-lib.nix); }; haskellPackages_ghc6123 = { - darcs = ghcSupported; ghc = ghcSupported; gitit = linux; gtk = linux; - leksah = linux; - haskellPlatform_2010_2_0_0 = ghcSupported; - lhs2tex = ghcSupported; - xmonad = linux; + haskellPlatform = ghcSupported; }; haskellPackages_ghc701 = { @@ -420,14 +421,20 @@ with (import ./release-lib.nix); }; haskellPackages_ghc702 = { + ghc = ghcSupported; + haskellPlatform = ghcSupported; + }; + + haskellPackages_ghc704 = { darcs = ghcSupported; ghc = ghcSupported; gitit = linux; gtk = linux; - haskellPlatform_2011_2_0_0 = ghcSupported; + haskellPlatform = ghcSupported; lhs2tex = ghcSupported; xmonad = linux; }; + */ kde3 = { kdebase = linux; @@ -558,7 +565,7 @@ with (import ./release-lib.nix); xwininfo = linux; }; - xfce4 = { + xfce = { gtk_xfce_engine = linux; mousepad = linux; ristretto = linux; |