diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 103 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 593 | ||||
| -rw-r--r-- | pkgs/top-level/default.nix | 148 | ||||
| -rw-r--r-- | pkgs/top-level/go-packages.nix | 375 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 14 | ||||
| -rw-r--r-- | pkgs/top-level/metrics.nix | 55 | ||||
| -rw-r--r-- | pkgs/top-level/perl-packages.nix | 413 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 540 | ||||
| -rw-r--r-- | pkgs/top-level/release.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/rust-packages.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/stdenv.nix | 31 |
11 files changed, 1524 insertions, 758 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix new file mode 100644 index 00000000000..9d278b19342 --- /dev/null +++ b/pkgs/top-level/aliases.nix @@ -0,0 +1,103 @@ +self: + +with self; + +let + # Removing recurseForDerivation prevents derivations of aliased attribute + # set to appear while listing all the packages available. + removeRecurseForDerivations = _n: alias: with lib; + if alias.recurseForDerivations or false then + removeAttrs alias ["recurseForDerivations"] + else alias; + + doNotDisplayTwice = aliases: + lib.mapAttrs removeRecurseForDerivations aliases; +in + + ### Deprecated aliases - for backward compatibility + +doNotDisplayTwice rec { + accounts-qt = qt5.accounts-qt; # added 2015-12-19 + adobeReader = adobe-reader; + aircrackng = aircrack-ng; # added 2016-01-14 + arduino_core = arduino-core; # added 2015-02-04 + asciidocFull = asciidoc-full; # added 2014-06-22 + bar = lemonbar; # added 2015-01-16 + bar-xft = lemonbar-xft; # added 2015-01-16 + bridge_utils = bridge-utils; # added 2015-02-20 + btrfsProgs = btrfs-progs; # added 2016-01-03 + buildbotSlave = buildbot-slave; # added 2014-12-09 + bundler_HEAD = bundler; # added 2015-11-15 + cheetahTemplate = pythonPackages.cheetah; # 2015-06-15 + clangAnalyzer = clang-analyzer; # added 2015-02-20 + conkerorWrapper = conkeror; # added 2015-01 + cool-old-term = cool-retro-term; # added 2015-01-31 + cupsBjnp = cups-bjnp; # added 2016-01-02 + cv = progress; # added 2015-09-06 + debian_devscripts = debian-devscripts; # added 2016-03-23 + dwarf_fortress = dwarf-fortress; # added 2016-01-23 + dwbWrapper = dwb; # added 2015-01 + enblendenfuse = enblend-enfuse; # 2015-09-30 + exfat-utils = exfat; # 2015-09-11 + firefox-esr-wrapper = firefox-esr; # 2016-01 + firefox-wrapper = firefox; # 2016-01 + firefoxWrapper = firefox; # 2015-09 + fuse_exfat = exfat; # 2015-09-11 + gettextWithExpat = gettext; # 2016-02-19 + grantlee5 = qt5.grantlee; # added 2015-12-19 + gupnptools = gupnp-tools; # added 2015-12-19 + htmlTidy = html-tidy; # added 2014-12-06 + inherit (haskell.compiler) jhc uhc; # 2015-05-15 + inotifyTools = inotify-tools; + joseki = apache-jena-fuseki; # added 2016-02-28 + jquery_ui = jquery-ui; # added 2014-09-07 + libdbusmenu_qt5 = qt5.libdbusmenu; # added 2015-12-19 + libtidy = html-tidy; # added 2014-12-21 + links = links2; # added 2016-01-31 + lttngTools = lttng-tools; # added 2014-07-31 + lttngUst = lttng-ust; # added 2014-07-31 + manpages = man-pages; # added 2015-12-06 + midoriWrapper = midori; # added 2015-01 + mlt-qt5 = qt5.mlt; # added 2015-12-19 + mssys = ms-sys; # added 2015-12-13 + multipath_tools = multipath-tools; # added 2016-01-21 + mupen64plus1_5 = mupen64plus; # added 2016-02-12 + nfsUtils = nfs-utils; # added 2014-12-06 + phonon_qt5 = qt5.phonon; # added 2015-12-19 + phonon_qt5_backend_gstreamer = qt5.phonon-backend-gstreamer; # added 2015-12-19 + pidginlatexSF = pidginlatex; # added 2014-11-02 + poppler_qt5 = qt5.poppler; # added 2015-12-19 + qca-qt5 = qt5.qca-qt5; # added 2015-12-19 + qtcreator = qt5.qtcreator; # added 2015-12-19 + quake3game = ioquake3; # added 2016-01-14 + quassel_kf5 = kde5.quassel; # added 2015-09-30 + quassel_qt5 = kde5.quassel_qt5; # added 2015-09-30 + quasselClient_kf5 = kde5.quasselClient; # added 2015-09-30 + quasselClient_qt5 = kde5.quasselClient_qt5; # added 2015-09-30 + quasselDaemon_qt5 = kde5.quasselDaemon; # added 2015-09-30 + qwt6 = qt5.qwt; # added 2015-12-19 + rdiff_backup = rdiff-backup; # added 2014-11-23 + rekonqWrapper = rekonq; # added 2015-01 + rssglx = rss-glx; #added 2015-03-25 + rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby"; + rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02 + samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25 + saneBackends = sane-backends; # added 2016-01-02 + saneBackendsGit = sane-backends-git; # added 2016-01-02 + saneFrontends = sane-frontends; # added 2016-01-02 + scim = sc-im; # added 2016-01-22 + signon = qt5.signon; # added 2015-12-19 + speedtest_cli = speedtest-cli; # added 2015-02-17 + sqliteInteractive = sqlite-interactive; # added 2014-12-06 + system_config_printer = system-config-printer; # added 2016-01-03 + telepathy_qt5 = qt5.telepathy; # added 2015-12-19 + tftp_hpa = tftp-hpa; # added 2015-04-03 + vimbWrapper = vimb; # added 2015-01 + vimprobable2Wrapper = vimprobable2; # added 2015-01 + virtviewer = virt-viewer; # added 2015-12-24 + vorbisTools = vorbis-tools; # added 2016-01-26 + x11 = xlibsWrapper; # added 2015-09 + xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09 + xlibs = xorg; # added 2015-09 + youtubeDL = youtube-dl; # added 2014-10-26 +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d4f87a47668..2ed708b1c51 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1,133 +1,16 @@ -/* This file composes the Nix Packages collection. That is, it - imports the functions that build the various packages, and calls - them with appropriate arguments. The result is a set of all the - packages in the Nix Packages collection for some particular - platform. */ +{ system, bootStdenv, noSysDirs, gccWithCC, gccWithProfiling +, config, crossSystem, platform, lib +, pkgsWithOverrides +, ... }: +self: pkgs: - -{ # The system (e.g., `i686-linux') for which to build the packages. - system ? builtins.currentSystem - -, # The standard environment to use. Only used for bootstrapping. If - # null, the default standard environment is used. - bootStdenv ? null - -, # Non-GNU/Linux OSes are currently "impure" platforms, with their libc - # outside of the store. Thus, GCC, GFortran, & co. must always look for - # files in standard system directories (/usr/include, etc.) - noSysDirs ? (system != "x86_64-freebsd" && system != "i686-freebsd" - && system != "x86_64-solaris" - && system != "x86_64-kfreebsd-gnu") - - # More flags for the bootstrapping of stdenv. -, gccWithCC ? true -, gccWithProfiling ? true - -, # Allow a configuration attribute set to be passed in as an - # argument. Otherwise, it's read from $NIXPKGS_CONFIG or - # ~/.nixpkgs/config.nix. - config ? null - -, crossSystem ? null -, platform ? null -}: - - -let config_ = config; platform_ = platform; in # rename the function arguments +with pkgs; let + defaultScope = pkgs // pkgs.xorg; +in - lib = import ../../lib; - - # The contents of the configuration file found at $NIXPKGS_CONFIG or - # $HOME/.nixpkgs/config.nix. - # for NIXOS (nixos-rebuild): use nixpkgs.config option - config = - let - toPath = builtins.toPath; - getEnv = x: if builtins ? getEnv then builtins.getEnv x else ""; - pathExists = name: - builtins ? pathExists && builtins.pathExists (toPath name); - - configFile = getEnv "NIXPKGS_CONFIG"; - homeDir = getEnv "HOME"; - configFile2 = homeDir + "/.nixpkgs/config.nix"; - - configExpr = - if config_ != null then config_ - else if configFile != "" && pathExists configFile then import (toPath configFile) - else if homeDir != "" && pathExists configFile2 then import (toPath configFile2) - else {}; - - in - # allow both: - # { /* the config */ } and - # { pkgs, ... } : { /* the config */ } - if builtins.isFunction configExpr - then configExpr { inherit pkgs; } - else configExpr; - - # Allow setting the platform in the config file. Otherwise, let's use a reasonable default (pc) - - platformAuto = let - platforms = (import ./platforms.nix); - in - if system == "armv6l-linux" then platforms.raspberrypi - else if system == "armv7l-linux" then platforms.armv7l-hf-multiplatform - else if system == "armv5tel-linux" then platforms.sheevaplug - else if system == "mips64el-linux" then platforms.fuloong2f_n32 - else if system == "x86_64-linux" then platforms.pc64 - else if system == "i686-linux" then platforms.pc32 - else platforms.pcBase; - - platform = if platform_ != null then platform_ - else config.platform or platformAuto; - - # Helper functions that are exported through `pkgs'. - helperFunctions = - stdenvAdapters // - (import ../build-support/trivial-builders.nix { inherit lib; inherit (pkgs) stdenv; inherit (pkgs.xorg) lndir; }); - - stdenvAdapters = - import ../stdenv/adapters.nix pkgs; - - - # Allow packages to be overriden globally via the `packageOverrides' - # configuration option, which must be a function that takes `pkgs' - # as an argument and returns a set of new or overriden packages. - # The `packageOverrides' function is called with the *original* - # (un-overriden) set of packages, allowing packageOverrides - # attributes to refer to the original attributes (e.g. "foo = - # ... pkgs.foo ..."). - pkgs = applyGlobalOverrides (config.packageOverrides or (pkgs: {})); - - mkOverrides = pkgsOrig: overrides: overrides // - (lib.optionalAttrs (pkgsOrig.stdenv ? overrides && crossSystem == null) (pkgsOrig.stdenv.overrides pkgsOrig)); - - # Return the complete set of packages, after applying the overrides - # returned by the `overrider' function (see above). Warning: this - # function is very expensive! - applyGlobalOverrides = overrider: - let - # Call the overrider function. We don't want stdenv overrides - # in the case of cross-building, or otherwise the basic - # overrided packages will not be built with the crossStdenv - # adapter. - overrides = mkOverrides pkgsOrig (overrider pkgsOrig); - - # The un-overriden packages, passed to `overrider'. - pkgsOrig = pkgsFun pkgs {}; - - # The overriden, final packages. - pkgs = pkgsFun pkgs overrides; - in pkgs; - - - # The package compositions. Yes, this isn't properly indented. - pkgsFun = pkgs: overrides: - with helperFunctions; - let defaultScope = pkgs // pkgs.xorg; self = self_ // overrides; - self_ = with self; helperFunctions // { +{ # Make some arguments passed to all-packages.nix available inherit system platform; @@ -157,11 +40,7 @@ let # # The result is `pkgs' where all the derivations depending on `foo' # will use the new version. - overridePackages = f: - let - newpkgs = pkgsFun newpkgs overrides; - overrides = mkOverrides pkgs (f newpkgs pkgs); - in newpkgs; + overridePackages = f: pkgsWithOverrides f; # Override system. This is useful to build i686 packages on x86_64-linux. forceSystem = system: kernel: (import ./../..) { @@ -171,19 +50,31 @@ let crossSystem; }; - # Used by wine, firefox with debugging version of Flash, ... pkgsi686Linux = forceSystem "i686-linux" "i386"; callPackage_i686 = lib.callPackageWith (pkgsi686Linux // pkgsi686Linux.xorg); + forceNativeDrv = drv : if crossSystem == null then drv else + (drv // { crossDrv = drv.nativeDrv; }); + + stdenvCross = lowPrio (makeStdenvCross defaultStdenv crossSystem binutilsCross gccCrossStageFinal); + + # A stdenv capable of building 32-bit binaries. On x86_64-linux, + # it uses GCC compiled with multilib support; on i686-linux, it's + # just the plain stdenv. + stdenv_32bit = lowPrio ( + if system == "x86_64-linux" then + overrideCC stdenv gcc_multi + else + stdenv); # For convenience, allow callers to get the path to Nixpkgs. path = ../..; ### Helper functions. - inherit lib config stdenvAdapters; + inherit lib config; inherit (lib) lowPrio hiPrio appendToName makeOverridable; inherit (misc) versionedDerivation; @@ -206,49 +97,6 @@ let nixpkgs-lint = callPackage ../../maintainers/scripts/nixpkgs-lint.nix { }; - ### STANDARD ENVIRONMENT - - - allStdenvs = import ../stdenv { - inherit system platform config lib; - allPackages = args: import ./../.. ({ inherit config system; } // args); - }; - - defaultStdenv = allStdenvs.stdenv // { inherit platform; }; - - stdenvCross = lowPrio (makeStdenvCross defaultStdenv crossSystem binutilsCross gccCrossStageFinal); - - stdenv = - if bootStdenv != null then (bootStdenv // {inherit platform;}) else - if crossSystem != null then - stdenvCross - else - let - changer = config.replaceStdenv or null; - in if changer != null then - changer { - # We import again all-packages to avoid recursivities. - pkgs = import ./../.. { - # We remove packageOverrides to avoid recursivities - config = removeAttrs config [ "replaceStdenv" ]; - }; - } - else - defaultStdenv; - - forceNativeDrv = drv : if crossSystem == null then drv else - (drv // { crossDrv = drv.nativeDrv; }); - - # A stdenv capable of building 32-bit binaries. On x86_64-linux, - # it uses GCC compiled with multilib support; on i686-linux, it's - # just the plain stdenv. - stdenv_32bit = lowPrio ( - if system == "x86_64-linux" then - overrideCC stdenv gcc_multi - else - stdenv); - - ### BUILD SUPPORT attrSetToDir = arg: callPackage ../build-support/upstream-updater/attrset-to-dir.nix { @@ -264,7 +112,7 @@ let postUnpackHooks+=(_ensureNewerSources) _ensureNewerSources() { '${findutils}/bin/find' "$sourceRoot" \ - '!' -newermt '${year}-01-01' -exec touch -d '${year}-01-02' '{}' '+' + '!' -newermt '${year}-01-01' -exec touch -h -d '${year}-01-02' '{}' '+' } ''); @@ -303,9 +151,7 @@ let dotnetfx = dotnetfx40; }; - dotnetbuildhelpers = callPackage ../build-support/dotnetbuildhelpers { - inherit helperFunctions; - }; + dotnetbuildhelpers = callPackage ../build-support/dotnetbuildhelpers { }; dispad = callPackage ../tools/X11/dispad { }; @@ -540,6 +386,8 @@ let analog = callPackage ../tools/admin/analog {}; + ansifilter = callPackage ../tools/text/ansifilter {}; + apktool = callPackage ../development/tools/apktool { buildTools = androidenv.buildTools; }; @@ -631,8 +479,6 @@ let lastpass-cli = callPackage ../tools/security/lastpass-cli { }; - otool = callPackage ../os-specific/darwin/otool { }; - pass = callPackage ../tools/security/pass { }; oracle-instantclient = callPackage ../development/libraries/oracle-instantclient { }; @@ -660,7 +506,9 @@ let at = callPackage ../tools/system/at { }; - atftp = callPackage ../tools/networking/atftp {}; + atftp = callPackage ../tools/networking/atftp { + gcc = gcc49; + }; autogen = callPackage ../development/tools/misc/autogen { }; @@ -768,6 +616,9 @@ let bsod = callPackage ../misc/emulators/bsod { }; btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { }; + btrfs-progs_4_4_1 = callPackage ../tools/filesystems/btrfs-progs/4.4.1.nix { }; + + btrbk = callPackage ../tools/backup/btrbk { }; bwm_ng = callPackage ../tools/networking/bwm-ng { }; @@ -872,6 +723,8 @@ let dlx = callPackage ../misc/emulators/dlx { }; + dosage = pythonPackages.dosage; + dpic = callPackage ../tools/graphics/dpic { }; dragon-drop = callPackage ../tools/X11/dragon-drop { @@ -906,6 +759,8 @@ let gencfsm = callPackage ../tools/security/gencfsm { }; + genromfs = callPackage ../tools/filesystems/genromfs { }; + gist = callPackage ../tools/text/gist { }; gmic = callPackage ../tools/graphics/gmic { }; @@ -1009,8 +864,6 @@ let asynk = callPackage ../tools/networking/asynk { }; - b2 = callPackage ../tools/backup/b2 { }; - bacula = callPackage ../tools/backup/bacula { }; bareos = callPackage ../tools/backup/bareos { }; @@ -1062,6 +915,10 @@ let burp = callPackage ../tools/backup/burp { }; + buku = callPackage ../applications/misc/buku { + pythonPackages = python3Packages; + }; + byzanz = callPackage ../applications/video/byzanz {}; ori = callPackage ../tools/backup/ori { }; @@ -1095,7 +952,7 @@ let cdrkit = callPackage ../tools/cd-dvd/cdrkit { }; libceph = ceph.lib; - ceph = callPackage ../tools/filesystems/ceph { }; + ceph = callPackage ../tools/filesystems/ceph { boost = boost159; }; ceph-dev = ceph; #ceph-dev = lowPrio (callPackage ../tools/filesystems/ceph/dev.nix { }); @@ -1188,7 +1045,7 @@ let ibus-qt = callPackage ../tools/inputmethods/ibus/ibus-qt.nix { }; - ibus-engines = { + ibus-engines = recurseIntoAttrs { anthy = callPackage ../tools/inputmethods/ibus-engines/ibus-anthy { inherit (python3Packages) pygobject3; @@ -1334,7 +1191,7 @@ let dcfldd = callPackage ../tools/system/dcfldd { }; - debian_devscripts = callPackage ../tools/misc/debian-devscripts { + debian-devscripts = callPackage ../tools/misc/debian-devscripts { inherit (perlPackages) CryptSSLeay LWP TimeDate DBFile FileDesktopEntry; }; @@ -1551,7 +1408,7 @@ let fcitx = callPackage ../tools/inputmethods/fcitx { }; - fcitx-engines = { + fcitx-engines = recurseIntoAttrs { anthy = callPackage ../tools/inputmethods/fcitx-engines/fcitx-anthy { }; @@ -1652,6 +1509,8 @@ let fping = callPackage ../tools/networking/fping {}; + fpm = callPackage ../tools/package-management/fpm { }; + fprot = callPackage ../tools/security/fprot { }; fprintd = callPackage ../tools/security/fprintd { }; @@ -1778,17 +1637,11 @@ let gnupatch = callPackage ../tools/text/gnupatch { }; gnupg1orig = callPackage ../tools/security/gnupg/1.nix { }; - gnupg1compat = callPackage ../tools/security/gnupg/1compat.nix { }; - - # use config.packageOverrides if you prefer original gnupg1 - gnupg1 = gnupg1compat; - + gnupg1 = gnupg1compat; # use config.packageOverrides if you prefer original gnupg1 gnupg20 = callPackage ../tools/security/gnupg/20.nix { }; - - gnupg21 = lowPrio (callPackage ../tools/security/gnupg/21.nix { }); - - gnupg = gnupg20; + gnupg21 = callPackage ../tools/security/gnupg/21.nix { }; + gnupg = gnupg21; gnuplot = callPackage ../tools/graphics/gnuplot { qt = qt4; }; @@ -1809,6 +1662,8 @@ let go-pup = goPackages.pup.bin // { outputs = [ "bin" ]; }; + go-sct = goPackages.go-sct.bin // { outputs = [ "bin" ]; }; + go-upower-notify = goPackages.upower-notify.bin // { outputs = [ "bin" ]; }; googleAuthenticator = callPackage ../os-specific/linux/google-authenticator { }; @@ -2035,6 +1890,8 @@ let darkice = callPackage ../tools/audio/darkice { }; + deco = callPackage ../applications/misc/deco { }; + icoutils = callPackage ../tools/graphics/icoutils { }; idutils = callPackage ../tools/misc/idutils { }; @@ -2232,12 +2089,10 @@ let nodejs-5_x = callPackage ../development/web/nodejs/v5.nix { libtool = darwin.cctools; - openssl = openssl_1_0_2; }; nodejs-4_x = callPackage ../development/web/nodejs/v4.nix { libtool = darwin.cctools; - openssl = openssl_1_0_2; }; nodejs-0_10 = callPackage ../development/web/nodejs/v0_10.nix { @@ -2418,6 +2273,8 @@ let mednafen-server = callPackage ../misc/emulators/mednafen/server.nix { }; + mednaffe = callPackage ../misc/emulators/mednaffe/default.nix { }; + megacli = callPackage ../tools/misc/megacli { }; megatools = callPackage ../tools/networking/megatools { }; @@ -2527,6 +2384,8 @@ let netcdfcxx4 = callPackage ../development/libraries/netcdf-cxx4 { }; + netcdffortran = callPackage ../development/libraries/netcdf-fortran { }; + nco = callPackage ../development/libraries/nco { }; nc6 = callPackage ../tools/networking/nc6 { }; @@ -3170,6 +3029,8 @@ let s3cmd = callPackage ../tools/networking/s3cmd { }; + s3gof3r = goPackages.s3gof3r.bin // { outputs = [ "bin" ]; }; + s6Dns = callPackage ../tools/networking/s6-dns { }; s6LinuxUtils = callPackage ../os-specific/linux/s6-linux-utils { }; @@ -3297,10 +3158,6 @@ let sqliteman = callPackage ../applications/misc/sqliteman { }; - stardict = callPackage ../applications/misc/stardict/stardict.nix { - inherit (gnome) libgnomeui scrollkeeper; - }; - stdman = callPackage ../data/documentation/stdman { }; storebrowse = callPackage ../tools/system/storebrowse { }; @@ -3417,6 +3274,8 @@ let talkfilters = callPackage ../misc/talkfilters {}; + znapzend = callPackage ../tools/backup/znapzend { }; + tarsnap = callPackage ../tools/backup/tarsnap { }; tcpcrypt = callPackage ../tools/security/tcpcrypt { }; @@ -3648,6 +3507,8 @@ let python = python2; }; + xautoclick = callPackage ../applications/misc/xautoclick {}; + xl2tpd = callPackage ../tools/networking/xl2tpd { }; xe = callPackage ../tools/system/xe { }; @@ -4024,7 +3885,9 @@ let avra = callPackage ../development/compilers/avra { }; - bigloo = callPackage ../development/compilers/bigloo { }; + bigloo = callPackage ../development/compilers/bigloo { + stdenv = overrideCC stdenv gcc49; + }; boo = callPackage ../development/compilers/boo { inherit (gnome) gtksourceview; @@ -4048,6 +3911,7 @@ let clang = llvmPackages.clang; + clang_38 = llvmPackages_38.clang; clang_37 = llvmPackages_37.clang; clang_36 = llvmPackages_36.clang; clang_35 = wrapCC llvmPackages_35.clang; @@ -4108,7 +3972,7 @@ let gambit = callPackage ../development/compilers/gambit { }; - gcc = gcc49; + gcc = gcc5; gcc_multi = if system == "x86_64-linux" then lowPrio ( @@ -4169,13 +4033,6 @@ let cross = crossSystem; }; - gcc44 = lowPrio (wrapCC (makeOverridable (import ../development/compilers/gcc/4.4) { - inherit fetchurl stdenv gmp mpfr /* ppl cloogppl */ - gettext which noSysDirs; - texinfo = texinfo4; - profiledCompiler = true; - })); - gcc45 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.5 { inherit noSysDirs; texinfo = texinfo4; @@ -4259,7 +4116,7 @@ let isl = isl_0_14; })); - gfortran = if !stdenv.isDarwin then gfortran49 + gfortran = if !stdenv.isDarwin then gfortran5 else callPackage ../development/compilers/gcc/gfortran-darwin.nix { inherit (darwin) Libsystem; }; @@ -4280,6 +4137,14 @@ let profiledCompiler = false; }); + gfortran5 = wrapCC (gcc5.cc.override { + name = "gfortran"; + langFortran = true; + langCC = false; + langC = false; + profiledCompiler = false; + }); + gcj = gcj49; gcj49 = wrapCC (gcc49.cc.override { name = "gcj"; @@ -4331,17 +4196,6 @@ let profiledCompiler = false; }); - ghdl = wrapCC (import ../development/compilers/gcc/4.3 { - inherit stdenv fetchurl gmp mpfr noSysDirs gnat; - texinfo = texinfo4; - name = "ghdl"; - langVhdl = true; - langCC = false; - langC = false; - profiledCompiler = false; - enableMultilib = false; - }); - ghdl_mcode = callPackage ../development/compilers/ghdl { }; gcl = callPackage ../development/compilers/gcl { @@ -4552,6 +4406,7 @@ let llvm = llvmPackages.llvm; + llvm_38 = llvmPackages_38.llvm; llvm_37 = llvmPackages_37.llvm; llvm_36 = llvmPackages_36.llvm; llvm_35 = llvmPackages_35.llvm; @@ -4579,6 +4434,10 @@ let inherit (stdenvAdapters) overrideCC; }; + llvmPackages_38 = callPackage ../development/compilers/llvm/3.8 { + inherit (stdenvAdapters) overrideCC; + }; + manticore = callPackage ../development/compilers/manticore { }; mentorToolchains = recurseIntoAttrs ( @@ -5171,7 +5030,7 @@ let scala_2_11 = callPackage ../development/compilers/scala { }; scala = scala_2_11; - sdcc = callPackage ../development/compilers/sdcc { }; + sdcc = callPackage ../development/compilers/sdcc { boost = boost159; }; smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { }; smlnj = if stdenv.isDarwin @@ -5293,7 +5152,6 @@ let clooj = callPackage ../development/interpreters/clojure/clooj.nix { }; erlangR14 = callPackage ../development/interpreters/erlang/R14.nix { }; - erlangR15 = callPackage ../development/interpreters/erlang/R15.nix { }; erlangR16 = callPackage ../development/interpreters/erlang/R16.nix { }; erlangR16_odbc = callPackage ../development/interpreters/erlang/R16.nix { odbcSupport = true; }; erlangR17 = callPackage ../development/interpreters/erlang/R17.nix { }; @@ -5421,9 +5279,9 @@ let mujs = callPackage ../development/interpreters/mujs { }; nix-exec = callPackage ../development/interpreters/nix-exec { - git = gitMinimal; - nix = nixUnstable; + + git = gitMinimal; }; octave = callPackage ../development/interpreters/octave { @@ -5558,14 +5416,11 @@ let pixie = callPackage ../development/interpreters/pixie { }; dust = callPackage ../development/interpreters/pixie/dust.nix { }; - bundix = callPackage ../development/interpreters/ruby/bundix { - ruby = ruby_2_1; - }; - bundler = callPackage ../development/interpreters/ruby/bundler.nix { }; - bundler_HEAD = bundler; - defaultGemConfig = callPackage ../development/interpreters/ruby/gemconfig/default.nix { }; - buildRubyGem = callPackage ../development/interpreters/ruby/build-ruby-gem { }; - bundlerEnv = callPackage ../development/interpreters/ruby/bundler-env { }; + buildRubyGem = callPackage ../development/ruby-modules/gem { }; + defaultGemConfig = callPackage ../development/ruby-modules/gem-config { }; + bundix = callPackage ../development/ruby-modules/bundix { }; + bundler = callPackage ../development/ruby-modules/bundler { }; + bundlerEnv = callPackage ../development/ruby-modules/bundler-env { }; inherit (callPackage ../development/interpreters/ruby {}) ruby_1_9_3 @@ -5582,8 +5437,6 @@ let ruby_2_2 = ruby_2_2_3; ruby_2_3 = ruby_2_3_0; - rubygems = hiPrio (callPackage ../development/interpreters/ruby/rubygems.nix {}); - scsh = callPackage ../development/interpreters/scsh { }; scheme48 = callPackage ../development/interpreters/scheme48 { }; @@ -5743,7 +5596,9 @@ let avrdude = callPackage ../development/tools/misc/avrdude { }; - avarice = callPackage ../development/tools/misc/avarice { }; + avarice = callPackage ../development/tools/misc/avarice { + gcc = gcc49; + }; babeltrace = callPackage ../development/tools/misc/babeltrace { }; @@ -5974,6 +5829,8 @@ let findbugs = callPackage ../development/tools/analysis/findbugs { }; + foreman = callPackage ../tools/system/foreman { }; + flow = callPackage ../development/tools/analysis/flow { inherit (darwin.apple_sdk.frameworks) CoreServices; inherit (darwin) cf-private; @@ -6281,6 +6138,8 @@ let strace = callPackage ../development/tools/misc/strace { }; + swarm = callPackage ../development/tools/analysis/swarm { }; + swig1 = callPackage ../development/tools/misc/swig { }; swig2 = callPackage ../development/tools/misc/swig/2.x.nix { }; swig3 = callPackage ../development/tools/misc/swig/3.x.nix { }; @@ -6306,9 +6165,9 @@ let texi2html = callPackage ../development/tools/misc/texi2html { }; - uhd = callPackage ../development/tools/misc/uhd { - boost = boost155; - }; + tweak = callPackage ../applications/editors/tweak { }; + + uhd = callPackage ../development/tools/misc/uhd { }; uisp = callPackage ../development/tools/misc/uisp { }; @@ -6377,9 +6236,7 @@ let acl = callPackage ../development/libraries/acl { }; - activemq = callPackage ../development/libraries/apache-activemq/5.8.nix { }; - - activemq512 = callPackage ../development/libraries/apache-activemq/5.12.nix { }; + activemq = callPackage ../development/libraries/apache-activemq { }; adns = callPackage ../development/libraries/adns { }; @@ -6449,7 +6306,8 @@ let boost155 = callPackage ../development/libraries/boost/1.55.nix { }; boost159 = callPackage ../development/libraries/boost/1.59.nix { }; - boost = boost159; + boost160 = callPackage ../development/libraries/boost/1.60.nix { }; + boost = boost160; boost_process = callPackage ../development/libraries/boost-process { }; @@ -6906,6 +6764,7 @@ let gobjectIntrospection = callPackage ../development/libraries/gobject-introspection { nixStoreDir = config.nix.storeDir or builtins.storeDir; + inherit (darwin) cctools; }; goocanvas = callPackage ../development/libraries/goocanvas { }; @@ -7308,7 +7167,7 @@ let libav = libav_11; # branch 11 is API-compatible with branch 10 libav_all = callPackage ../development/libraries/libav { }; - inherit (libav_all) libav_0_8 libav_9 libav_11; + inherit (libav_all) libav_0_8 libav_11; libavc1394 = callPackage ../development/libraries/libavc1394 { }; @@ -7380,6 +7239,8 @@ let libcangjie = callPackage ../development/libraries/libcangjie { }; + libcollectdclient = callPackage ../development/libraries/libcollectdclient { }; + libcredis = callPackage ../development/libraries/libcredis { }; libctemplate = callPackage ../development/libraries/libctemplate { }; @@ -7737,6 +7598,8 @@ let libmatchbox = callPackage ../development/libraries/libmatchbox { }; + libmatheval = callPackage ../development/libraries/libmatheval { }; + libmatthew_java = callPackage ../development/libraries/java/libmatthew-java { }; libmatroska = callPackage ../development/libraries/libmatroska { }; @@ -8362,7 +8225,7 @@ let wolfssl = callPackage ../development/libraries/wolfssl { }; - openssl = openssl_1_0_1; + openssl = openssl_1_0_2; inherit (callPackages ../development/libraries/openssl { fetchurl = fetchurlBoot; @@ -8381,7 +8244,9 @@ let }; }; - opensubdiv = callPackage ../development/libraries/opensubdiv { }; + opensubdiv = callPackage ../development/libraries/opensubdiv { + cudatoolkit = cudatoolkit75; + }; openwsman = callPackage ../development/libraries/openwsman {}; @@ -9560,16 +9425,8 @@ let dnschain = callPackage ../servers/dnschain { }; - dovecot = dovecot22; - - dovecot21 = callPackage ../servers/mail/dovecot { }; - - dovecot22 = callPackage ../servers/mail/dovecot/2.2.x.nix { }; - - dovecot_pigeonhole = callPackage ../servers/mail/dovecot/plugins/pigeonhole { - dovecot = dovecot22; - }; - + dovecot = callPackage ../servers/mail/dovecot { }; + dovecot_pigeonhole = callPackage ../servers/mail/dovecot/plugins/pigeonhole { }; dovecot_antispam = callPackage ../servers/mail/dovecot/plugins/antispam { }; dspam = callPackage ../servers/mail/dspam { @@ -9770,14 +9627,14 @@ let mariadb = callPackage ../servers/sql/mariadb { inherit (darwin) cctools; inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; + boost = boost159; }; mongodb = callPackage ../servers/nosql/mongodb { sasl = cyrus_sasl; }; - riak = callPackage ../servers/nosql/riak/1.3.1.nix { }; - riak2 = callPackage ../servers/nosql/riak/2.1.1.nix { }; + riak = callPackage ../servers/nosql/riak/2.1.1.nix { }; influxdb = (callPackage ../servers/nosql/influxdb { }).bin // { outputs = [ "bin" ]; }; @@ -9787,7 +9644,10 @@ let ps = procps; /* !!! Linux only */ }; - mysql55 = callPackage ../servers/sql/mysql/5.5.x.nix { }; + mysql55 = callPackage ../servers/sql/mysql/5.5.x.nix { + inherit (darwin) cctools; + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; mysql = mariadb; libmysql = mysql.lib; @@ -9960,8 +9820,7 @@ let spawn_fcgi = callPackage ../servers/http/spawn-fcgi { }; - squids = recurseIntoAttrs (callPackages ../servers/squid/squids.nix {}); - squid = squids.squid31; # has ipv6 support + squid = callPackage ../servers/squid { }; sslh = callPackage ../servers/sslh { }; @@ -10253,9 +10112,13 @@ let firejail = callPackage ../os-specific/linux/firejail {}; - freefall = callPackage ../os-specific/linux/freefall { }; + freefall = callPackage ../os-specific/linux/freefall { + inherit (linuxPackages) kernel; + }; - fuse = callPackage ../os-specific/linux/fuse { }; + fuse = callPackage ../os-specific/linux/fuse { + utillinux = utillinuxMinimal; + }; fusionio-util = callPackage ../os-specific/linux/fusionio/util.nix { }; @@ -10279,14 +10142,9 @@ let hostapd = callPackage ../os-specific/linux/hostapd { }; - htop = - if stdenv.isLinux then - callPackage ../os-specific/linux/htop { } - else if stdenv.isDarwin then - callPackage ../os-specific/darwin/htop { - inherit (darwin.apple_sdk.frameworks) IOKit; - } - else null; + htop = callPackage ../tools/system/htop { + inherit (darwin) IOKit; + }; # GNU/Hurd core packages. gnu = recurseIntoAttrs (callPackage ../os-specific/gnu { @@ -10450,6 +10308,15 @@ let ]; }; + linux_4_5 = callPackage ../os-specific/linux/kernel/linux-4.5.nix { + kernelPatches = [ kernelPatches.bridge_stp_helper ] + ++ lib.optionals ((platform.kernelArch or null) == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 + ]; + }; + linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper ] ++ lib.optionals ((platform.kernelArch or null) == "mips") @@ -10620,6 +10487,8 @@ let mba6x_bl = callPackage ../os-specific/linux/mba6x_bl { }; + mxu11x0 = callPackage ../os-specific/linux/mxu11x0 { }; + /* compiles but has to be integrated into the kernel somehow Let's have it uncommented and finish it.. */ @@ -10676,7 +10545,7 @@ let linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = pkgs.linuxPackages_4_4; + linuxPackages_latest = pkgs.linuxPackages_4_5; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -10690,6 +10559,7 @@ let linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1 linuxPackages_4_1); linuxPackages_4_3 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_3 linuxPackages_4_3); linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4 linuxPackages_4_4); + linuxPackages_4_5 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_5 linuxPackages_4_5); linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing); linuxPackages_custom = {version, src, configfile}: let linuxPackages_self = (linuxPackagesFor (pkgs.linuxManualConfig {inherit version src configfile; @@ -11505,6 +11375,7 @@ let afterstep = callPackage ../applications/window-managers/afterstep { fltk = fltk13; gtk = gtk2; + stdenv = overrideCC stdenv gcc49; }; ahoviewer = callPackage ../applications/graphics/ahoviewer { }; @@ -11655,8 +11526,8 @@ let bleachbit = callPackage ../applications/misc/bleachbit { }; blender = callPackage ../applications/misc/blender { - cudatoolkit = cudatoolkit7; - python = python34; + cudatoolkit = cudatoolkit75; + python = python35; }; bluefish = callPackage ../applications/editors/bluefish { @@ -11700,6 +11571,10 @@ let carddav-util = callPackage ../tools/networking/carddav-util { }; + catfish = callPackage ../applications/search/catfish { + pythonPackages = python3Packages; + }; + cava = callPackage ../applications/audio/cava { }; cb2bib = callPackage ../applications/office/cb2bib { @@ -11900,7 +11775,10 @@ let dmtx-utils = callPackage (callPackage ../tools/graphics/dmtx-utils) { }; - docker = callPackage ../applications/virtualization/docker { go = go_1_4; }; + docker = callPackage ../applications/virtualization/docker { + btrfs-progs = btrfs-progs_4_4_1; + go = go_1_4; + }; docker-gc = callPackage ../applications/virtualization/docker/gc.nix { }; @@ -11916,6 +11794,8 @@ let dvdauthor = callPackage ../applications/video/dvdauthor { }; + dvdbackup = callPackage ../applications/video/dvdbackup { }; + dvd-slideshow = callPackage ../applications/video/dvd-slideshow { }; dwb-unwrapped = callPackage ../applications/networking/browsers/dwb { dconf = gnome3.dconf; }; @@ -12283,6 +12163,8 @@ let grass = callPackage ../applications/gis/grass { }; + grepm = callPackage ../applications/search/grepm { }; + grip = callPackage ../applications/misc/grip { inherit (gnome) libgnome libgnomeui vte; }; @@ -12634,6 +12516,8 @@ let hydrogen = callPackage ../applications/audio/hydrogen { }; + slack = callPackage ../applications/networking/instant-messengers/slack { }; + spectrwm = callPackage ../applications/window-managers/spectrwm { }; wlc = callPackage ../development/libraries/wlc { }; @@ -13390,6 +13274,8 @@ let purple-vk-plugin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin { }; + telegram-purple = callPackage ../applications/networking/instant-messengers/pidgin-plugins/telegram-purple { }; + toxprpl = callPackage ../applications/networking/instant-messengers/pidgin-plugins/tox-prpl { }; pidgin-opensteamworks = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks { }; @@ -13518,7 +13404,7 @@ let demo = false; }; - rapcad = qt5.callPackage ../applications/graphics/rapcad {}; + rapcad = qt5.callPackage ../applications/graphics/rapcad { boost = boost159; }; rapidsvn = callPackage ../applications/version-management/rapidsvn { }; @@ -13635,7 +13521,11 @@ let siproxd = callPackage ../applications/networking/siproxd { }; - skype = callPackage_i686 ../applications/networking/instant-messengers/skype { }; + skype = callPackage_i686 ../applications/networking/instant-messengers/skype { + qt4 = pkgsi686Linux.qt4.override { + stdenv = clangStdenv; + }; + }; skype4pidgin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/skype4pidgin { }; @@ -13738,7 +13628,9 @@ let smartdeblur = callPackage ../applications/graphics/smartdeblur { }; - snapper = callPackage ../tools/misc/snapper { }; + snapper = callPackage ../tools/misc/snapper { + btrfs-progs = btrfs-progs_4_4_1; + }; snd = callPackage ../applications/audio/snd { }; @@ -14223,10 +14115,12 @@ let ([] ++ optional (config.kodi.enableAdvancedLauncher or false) advanced-launcher ++ optional (config.kodi.enableGenesis or false) genesis + ++ optionals (config.kodi.enableHyperLauncher or false) + (with hyper-launcher; [ plugin service pdfreader ]) + ++ optionals (config.kodi.enableSALTS or false) [salts urlresolver t0mm0-common] ++ optional (config.kodi.enableSVTPlay or false) svtplay ++ optional (config.kodi.enableSteamLauncher or false) steam-launcher ++ optional (config.kodi.enablePVRHTS or false) pvr-hts - ++ optionals (config.kodi.enableSALTS or false) [salts urlresolver t0mm0-common] ); }; @@ -14305,9 +14199,9 @@ let xdotool = callPackage ../tools/X11/xdotool { }; - xen_4_5_0 = callPackage ../applications/virtualization/xen/4.5.0.nix { }; - xen_4_5_2 = callPackage ../applications/virtualization/xen/4.5.2.nix { }; - xen_xenServer = callPackage ../applications/virtualization/xen/4.5.0.nix { xenserverPatched = true; }; + xen_4_5_0 = callPackage ../applications/virtualization/xen/4.5.0.nix { stdenv = overrideCC stdenv gcc49; }; + xen_4_5_2 = callPackage ../applications/virtualization/xen/4.5.2.nix { stdenv = overrideCC stdenv gcc49; }; + xen_xenServer = callPackage ../applications/virtualization/xen/4.5.0.nix { xenserverPatched = true; stdenv = overrideCC stdenv gcc49; }; xen = xen_4_5_2; win-spice = callPackage ../applications/virtualization/driver/win-spice { }; @@ -14437,6 +14331,8 @@ let qgis = callPackage ../applications/gis/qgis {}; + qgroundcontrol = qt55.callPackage ../applications/science/robotics/qgroundcontrol { }; + qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { qt = qt4; }; @@ -14507,7 +14403,9 @@ let andyetitmoves = if stdenv.isLinux then callPackage ../games/andyetitmoves {} else null; - anki = callPackage ../games/anki { }; + anki = callPackage ../games/anki { + inherit (pythonPackages) wrapPython pysqlite sqlalchemy pyaudio beautifulsoup httplib2 matplotlib; + }; armagetronad = callPackage ../games/armagetronad { }; @@ -14590,7 +14488,7 @@ let duckmarines = callPackage ../games/duckmarines { love = love_0_9; }; - dwarf-fortress-packages = callPackage ../games/dwarf-fortress { }; + dwarf-fortress-packages = recurseIntoAttrs (callPackage ../games/dwarf-fortress { }); dwarf-fortress = dwarf-fortress-packages.dwarf-fortress.override { }; @@ -15344,6 +15242,8 @@ let themes = []; # extra themes, etc. }; + yakuake = callPackage ../applications/misc/yakuake/3.0.nix {}; + }; kde5 = @@ -15403,7 +15303,9 @@ let motif = lesstif; }; - archimedes = callPackage ../applications/science/electronics/archimedes { }; + archimedes = callPackage ../applications/science/electronics/archimedes { + stdenv = overrideCC stdenv gcc49; + }; emboss = callPackage ../applications/science/biology/emboss { }; @@ -15791,6 +15693,8 @@ let withX = true; }; + scotch = callPackage ../applications/science/math/scotch { }; + msieve = callPackage ../applications/science/math/msieve { }; weka = callPackage ../applications/science/math/weka { }; @@ -15878,6 +15782,10 @@ let beep = callPackage ../misc/beep { }; + brgenml1lpr = callPackage ../misc/cups/drivers/brgenml1lpr {}; + + brgenml1cupswrapper = callPackage ../misc/cups/drivers/brgenml1cupswrapper {}; + cups = callPackage ../misc/cups { libusb = libusb1; }; @@ -15979,10 +15887,6 @@ let gnuk-unstable = callPackage ../misc/gnuk/unstable.nix { }; gnuk-git = callPackage ../misc/gnuk/git.nix { }; - guix = callPackage ../tools/package-management/guix { - libgcrypt = libgcrypt_1_5; - }; - gxemul = callPackage ../misc/emulators/gxemul { }; hatari = callPackage ../misc/emulators/hatari { }; @@ -16188,6 +16092,8 @@ let sqsh = callPackage ../development/tools/sqsh { }; + terraform = go16Packages.terraform.bin // { outputs = [ "bin" ]; }; + tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; }; tewi-font = callPackage ../data/fonts/tewi {}; @@ -16345,6 +16251,8 @@ let yafc = callPackage ../applications/networking/yafc { }; + yamdi = callPackage ../tools/video/yamdi { }; + yandex-disk = callPackage ../tools/filesystems/yandex-disk { }; yara = callPackage ../tools/security/yara { }; @@ -16406,98 +16314,7 @@ let mg = callPackage ../applications/editors/mg { }; -}; # self_ = - - - ### Deprecated aliases - for backward compatibility - -aliases = with self; rec { - accounts-qt = qt5.accounts-qt; # added 2015-12-19 - adobeReader = adobe-reader; - aircrackng = aircrack-ng; # added 2016-01-14 - arduino_core = arduino-core; # added 2015-02-04 - asciidocFull = asciidoc-full; # added 2014-06-22 - bar = lemonbar; # added 2015-01-16 - bar-xft = lemonbar-xft; # added 2015-01-16 - bridge_utils = bridge-utils; # added 2015-02-20 - btrfsProgs = btrfs-progs; # added 2016-01-03 - buildbotSlave = buildbot-slave; # added 2014-12-09 - cheetahTemplate = pythonPackages.cheetah; # 2015-06-15 - clangAnalyzer = clang-analyzer; # added 2015-02-20 - conkerorWrapper = conkeror; # added 2015-01 - cool-old-term = cool-retro-term; # added 2015-01-31 - cupsBjnp = cups-bjnp; # added 2016-01-02 - cv = progress; # added 2015-09-06 - dwarf_fortress = dwarf-fortress; # added 2016-01-23 - dwbWrapper = dwb; # added 2015-01 - enblendenfuse = enblend-enfuse; # 2015-09-30 - exfat-utils = exfat; # 2015-09-11 - firefox-esr-wrapper = firefox-esr; # 2016-01 - firefox-wrapper = firefox; # 2016-01 - firefoxWrapper = firefox; # 2015-09 - fuse_exfat = exfat; # 2015-09-11 - gettextWithExpat = gettext; # 2016-02-19 - grantlee5 = qt5.grantlee; # added 2015-12-19 - gupnptools = gupnp-tools; # added 2015-12-19 - htmlTidy = html-tidy; # added 2014-12-06 - inherit (haskell.compiler) jhc uhc; # 2015-05-15 - inotifyTools = inotify-tools; - joseki = apache-jena-fuseki; # added 2016-02-28 - jquery_ui = jquery-ui; # added 2014-09-07 - libdbusmenu_qt5 = qt5.libdbusmenu; # added 2015-12-19 - libtidy = html-tidy; # added 2014-12-21 - links = links2; # added 2016-01-31 - lttngTools = lttng-tools; # added 2014-07-31 - lttngUst = lttng-ust; # added 2014-07-31 - manpages = man-pages; # added 2015-12-06 - midoriWrapper = midori; # added 2015-01 - mlt-qt5 = qt5.mlt; # added 2015-12-19 - mssys = ms-sys; # added 2015-12-13 - multipath_tools = multipath-tools; # added 2016-01-21 - mupen64plus1_5 = mupen64plus; # added 2016-02-12 - ncat = nmap; # added 2016-01-26 - nfsUtils = nfs-utils; # added 2014-12-06 - phonon_qt5 = qt5.phonon; # added 2015-12-19 - phonon_qt5_backend_gstreamer = qt5.phonon-backend-gstreamer; # added 2015-12-19 - pidginlatexSF = pidginlatex; # added 2014-11-02 - poppler_qt5 = qt5.poppler; # added 2015-12-19 - qca-qt5 = qt5.qca-qt5; # added 2015-12-19 - qtcreator = qt5.qtcreator; # added 2015-12-19 - quake3game = ioquake3; # added 2016-01-14 - quassel_kf5 = kde5.quassel; # added 2015-09-30 - quassel_qt5 = kde5.quassel_qt5; # added 2015-09-30 - quasselClient_kf5 = kde5.quasselClient; # added 2015-09-30 - quasselClient_qt5 = kde5.quasselClient_qt5; # added 2015-09-30 - quasselDaemon_qt5 = kde5.quasselDaemon; # added 2015-09-30 - qwt6 = qt5.qwt; # added 2015-12-19 - rdiff_backup = rdiff-backup; # added 2014-11-23 - rekonqWrapper = rekonq; # added 2015-01 - rssglx = rss-glx; #added 2015-03-25 - rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02 - samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25 - saneBackends = sane-backends; # added 2016-01-02 - saneBackendsGit = sane-backends-git; # added 2016-01-02 - saneFrontends = sane-frontends; # added 2016-01-02 - scim = sc-im; # added 2016-01-22 - signon = qt5.signon; # added 2015-12-19 - speedtest_cli = speedtest-cli; # added 2015-02-17 - sqliteInteractive = sqlite-interactive; # added 2014-12-06 - system_config_printer = system-config-printer; # added 2016-01-03 - telepathy_qt5 = qt5.telepathy; # added 2015-12-19 - tftp_hpa = tftp-hpa; # added 2015-04-03 - vimbWrapper = vimb; # added 2015-01 - vimprobable2Wrapper = vimprobable2; # added 2015-01 - virtviewer = virt-viewer; # added 2015-12-24 - vorbisTools = vorbis-tools; # added 2016-01-26 - x11 = xlibsWrapper; # added 2015-09 - xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09 - xlibs = xorg; # added 2015-09 - youtubeDL = youtube-dl; # added 2014-10-26 -}; - -tweakAlias = _n: alias: with lib; - if alias.recurseForDerivations or false then - removeAttrs alias ["recurseForDerivations"] - else alias; - -in lib.mapAttrs tweakAlias aliases // self; in pkgs + togglesg-download = callPackage ../tools/misc/togglesg-download { }; + +} + diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix new file mode 100644 index 00000000000..4de75c2ed57 --- /dev/null +++ b/pkgs/top-level/default.nix @@ -0,0 +1,148 @@ +/* This file composes the Nix Packages collection. That is, it + imports the functions that build the various packages, and calls + them with appropriate arguments. The result is a set of all the + packages in the Nix Packages collection for some particular + platform. */ + + +{ # The system (e.g., `i686-linux') for which to build the packages. + system ? builtins.currentSystem + +, # The standard environment to use. Only used for bootstrapping. If + # null, the default standard environment is used. + bootStdenv ? null + +, # Non-GNU/Linux OSes are currently "impure" platforms, with their libc + # outside of the store. Thus, GCC, GFortran, & co. must always look for + # files in standard system directories (/usr/include, etc.) + noSysDirs ? (system != "x86_64-freebsd" && system != "i686-freebsd" + && system != "x86_64-solaris" + && system != "x86_64-kfreebsd-gnu") + + # More flags for the bootstrapping of stdenv. +, gccWithCC ? true +, gccWithProfiling ? true + +, # Allow a configuration attribute set to be passed in as an + # argument. Otherwise, it's read from $NIXPKGS_CONFIG or + # ~/.nixpkgs/config.nix. + config ? null + +, crossSystem ? null +, platform ? null +}: + + +let config_ = config; platform_ = platform; in # rename the function arguments + +let + + lib = import ../../lib; + + # The contents of the configuration file found at $NIXPKGS_CONFIG or + # $HOME/.nixpkgs/config.nix. + # for NIXOS (nixos-rebuild): use nixpkgs.config option + config = + let + toPath = builtins.toPath; + getEnv = x: if builtins ? getEnv then builtins.getEnv x else ""; + pathExists = name: + builtins ? pathExists && builtins.pathExists (toPath name); + + configFile = getEnv "NIXPKGS_CONFIG"; + homeDir = getEnv "HOME"; + configFile2 = homeDir + "/.nixpkgs/config.nix"; + + configExpr = + if config_ != null then config_ + else if configFile != "" && pathExists configFile then import (toPath configFile) + else if homeDir != "" && pathExists configFile2 then import (toPath configFile2) + else {}; + + in + # allow both: + # { /* the config */ } and + # { pkgs, ... } : { /* the config */ } + if builtins.isFunction configExpr + then configExpr { inherit pkgs; } + else configExpr; + + # Allow setting the platform in the config file. Otherwise, let's use a reasonable default (pc) + + platformAuto = let + platforms = (import ./platforms.nix); + in + if system == "armv6l-linux" then platforms.raspberrypi + else if system == "armv7l-linux" then platforms.armv7l-hf-multiplatform + else if system == "armv5tel-linux" then platforms.sheevaplug + else if system == "mips64el-linux" then platforms.fuloong2f_n32 + else if system == "x86_64-linux" then platforms.pc64 + else if system == "i686-linux" then platforms.pc32 + else platforms.pcBase; + + platform = if platform_ != null then platform_ + else config.platform or platformAuto; + + topLevelArguments = { + inherit system bootStdenv noSysDirs gccWithCC gccWithProfiling config + crossSystem platform lib; + }; + + # Allow packages to be overridden globally via the `packageOverrides' + # configuration option, which must be a function that takes `pkgs' + # as an argument and returns a set of new or overridden packages. + # The `packageOverrides' function is called with the *original* + # (un-overridden) set of packages, allowing packageOverrides + # attributes to refer to the original attributes (e.g. "foo = + # ... pkgs.foo ..."). + pkgs = pkgsWithOverrides (self: config.packageOverrides or (super: {})); + + # Return the complete set of packages, after applying the overrides + # returned by the `overrider' function (see above). Warning: this + # function is very expensive! + pkgsWithOverrides = overrider: + let + stdenvAdapters = self: super: + let res = import ../stdenv/adapters.nix self; in res // { + stdenvAdapters = res; + }; + + trivialBuilders = self: super: + (import ../build-support/trivial-builders.nix { + inherit lib; inherit (self) stdenv; inherit (self.xorg) lndir; + }); + + stdenvDefault = self: super: (import ./stdenv.nix topLevelArguments) {} pkgs; + + allPackagesArgs = topLevelArguments // { inherit pkgsWithOverrides; }; + allPackages = self: super: + let res = import ./all-packages.nix allPackagesArgs res self; + in res; + + aliases = self: super: import ./aliases.nix super; + + # stdenvOverrides is used to avoid circular dependencies for building + # the standard build environment. This mechanism uses the override + # mechanism to implement some staged compilation of the stdenv. + # + # We don't want stdenv overrides in the case of cross-building, or + # otherwise the basic overridden packages will not be built with the + # crossStdenv adapter. + stdenvOverrides = self: super: + lib.optionalAttrs (crossSystem == null && super.stdenv ? overrides) + (super.stdenv.overrides super); + + customOverrides = self: super: + lib.optionalAttrs (bootStdenv == null) (overrider self super); + in + lib.fix' ( + lib.extends customOverrides ( + lib.extends stdenvOverrides ( + lib.extends aliases ( + lib.extends allPackages ( + lib.extends stdenvDefault ( + lib.extends trivialBuilders ( + lib.extends stdenvAdapters ( + self: {})))))))); +in + pkgs diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index e49fe451681..5735aac8ad1 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -5,14 +5,16 @@ let isGo14 = go.meta.branch == "1.4"; + isGo15 = go.meta.branch == "1.5"; + isGo16 = go.meta.branch == "1.6"; self = _self // overrides; _self = with self; { inherit go buildGoPackage; - buildFromGitHub = { rev, date ? null, owner, repo, sha256, name ? repo, goPackagePath ? "github.com/${owner}/${repo}", ... }@args: buildGoPackage (args // { + buildFromGitHub = { rev, version ? null, owner, repo, sha256, name ? repo, goPackagePath ? "github.com/${owner}/${repo}", ... }@args: buildGoPackage (args // { inherit rev goPackagePath; - name = "${name}-${if date != null then date else if builtins.stringLength rev != 40 then rev else stdenv.lib.strings.substring 0 7 rev}"; + name = "${name}-${if version != null then version else if builtins.stringLength rev != 40 then rev else stdenv.lib.strings.substring 0 7 rev}"; src = fetchFromGitHub { inherit rev owner repo sha256; }; }); @@ -20,7 +22,7 @@ let crypto = buildFromGitHub { rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; - date = "2015-08-29"; + version = "2015-08-29"; owner = "golang"; repo = "crypto"; sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; @@ -33,7 +35,7 @@ let glog = buildFromGitHub { rev = "fca8c8854093a154ff1eb580aae10276ad6b1b5f"; - date = "2015-07-31"; + version = "2015-07-31"; owner = "golang"; repo = "glog"; sha256 = "1nr2q0vas0a2f395f4shjxqpas18mjsf8yhgndsav7svngpbbpg8"; @@ -41,7 +43,7 @@ let codesearch = buildFromGitHub { rev = "a45d81b686e85d01f2838439deaf72126ccd5a96"; - date = "2015-06-17"; + version = "2015-06-17"; owner = "google"; repo = "codesearch"; sha256 = "12bv3yz0l3bmsxbasfgv7scm9j719ch6pmlspv4bd4ix7wjpyhny"; @@ -49,7 +51,7 @@ let image = buildFromGitHub { rev = "8ab1ac6834edd43d91cbe24272897a87ce7e835e"; - date = "2015-08-23"; + version = "2015-08-23"; owner = "golang"; repo = "image"; sha256 = "1ckr7yh5dx2kbvp9mis7i090ss9qcz46sazrj9f2hw4jj5g3y7dr"; @@ -59,7 +61,7 @@ let net_go15 = buildFromGitHub { rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; - date = "2015-11-04"; + version = "2015-11-04"; owner = "golang"; repo = "net"; sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; @@ -75,7 +77,7 @@ let net_go14 = buildFromGitHub { rev = "ea47fc708ee3e20177f3ca3716217c4ab75942cb"; - date = "2015-08-29"; + version = "2015-08-29"; owner = "golang"; repo = "net"; sha256 = "0x1pmg97n7l62vak9qnjdjrrfl98jydhv6j0w3jkk4dycdlzn30d"; @@ -93,7 +95,7 @@ let oauth2 = buildFromGitHub { rev = "397fe7649477ff2e8ced8fc0b2696f781e53745a"; - date = "2015-06-23"; + version = "2015-06-23"; owner = "golang"; repo = "oauth2"; sha256 = "0fza0l7iwh6llkq2yzqn7dxi138vab0da64lnghfj1p71fprjzn8"; @@ -105,7 +107,7 @@ let protobuf = buildFromGitHub { rev = "59b73b37c1e45995477aae817e4a653c89a858db"; - date = "2015-08-23"; + version = "2015-08-23"; owner = "golang"; repo = "protobuf"; sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; @@ -115,7 +117,7 @@ let snappy = buildFromGitHub { rev = "723cc1e459b8eea2dea4583200fd60757d40097a"; - date = "2015-07-21"; + version = "2015-07-21"; owner = "golang"; repo = "snappy"; sha256 = "0bprq0qb46f5511b5scrdqqzskqqi2z8b4yh3216rv0n1crx536h"; @@ -124,7 +126,7 @@ let sys = buildFromGitHub { rev = "d9157a9621b69ad1d8d77a1933590c416593f24f"; - date = "2015-02-01"; + version = "2015-02-01"; owner = "golang"; repo = "sys"; sha256 = "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931"; @@ -136,7 +138,7 @@ let text = buildFromGitHub { rev = "5eb8d4684c4796dd36c74f6452f2c0fa6c79597e"; - date = "2015-08-27"; + version = "2015-08-27"; owner = "golang"; repo = "text"; sha256 = "1cjwm2pv42dbfqc6ylr7jmma902zg4gng5aarqrbjf1k2nf2vs14"; @@ -146,7 +148,7 @@ let tools = buildFromGitHub { rev = "b48dc8da98ae78c3d11f220e7d327304c84e623a"; - date = "2015-08-24"; + version = "2015-08-24"; owner = "golang"; repo = "tools"; sha256 = "187p3jjxrw2qjnzqwwrq7f9w10zh6vcnwnfl3q7ms8rbiffpjy5c"; @@ -195,7 +197,7 @@ let adapted = buildFromGitHub { rev = "eaea06aaff855227a71b1c58b18bc6de822e3e77"; - date = "2015-06-03"; + version = "2015-06-03"; owner = "michaelmacinnis"; repo = "adapted"; sha256 = "0f28sn5mj48087zhjdrph2sjcznff1i1lwnwplx32bc5ax8nx5xm"; @@ -238,6 +240,14 @@ let sha256 = "0k48k8815k433s25lh8my2swl89kczp0m2gbqzjlpy1xwmk06nxc"; }; + asmfmt = buildFromGitHub { + rev = "7971758b0c6584f67d745c62d006814ae7b44e9d"; + owner = "klauspost"; + repo = "asmfmt"; + sha256 = "07i3f8jzs4yvfpm16s2c2hd65r3q729m0agg8q1i3lwbs3fimyj5"; + buildInputs = [ tools goreturns ]; + }; + asn1-ber = buildGoPackage rec { rev = "f4b6f4a84f5cde443d1925b5ec185ee93c2bdc72"; name = "asn1-ber-${stdenv.lib.strings.substring 0 7 rev}"; @@ -270,6 +280,13 @@ let doCheck = false; }; + astrotime = buildFromGitHub { + rev = "9c7d514efdb561775030eaf8f1a9ae6bddb3a2ca"; + owner = "cpucycle"; + repo = "astrotime"; + sha256 = "024sc7g55v4s54irssm5wsn74sr2k2ynsm6z16w47q66cxhgvby1"; + }; + aws-sdk-go = buildFromGitHub { #rev = "a28ecdc9741b7905b5198059c94aed20868ffc08"; rev = "127313c1b41e534a0456a68b6b3a16712dacb35d"; @@ -323,7 +340,7 @@ let bleve = buildFromGitHub { rev = "fc34a97875840b2ae24517e7d746b69bdae9be90"; - date = "2016-01-19"; + version = "2016-01-19"; owner = "blevesearch"; repo = "bleve"; sha256 = "0ny7nvilrxmmzcdvpivwyrjkynnhc22c5gdrxzs421jly35jw8jx"; @@ -341,7 +358,7 @@ let bitset = buildFromGitHub { rev = "bb0da3785c4fe9d26f6029c77c8fce2aa4d0b291"; - date = "2016-01-13"; + version = "2016-01-13"; owner = "willf"; repo = "bitset"; sha256 = "1d4z2hjjs9jk6aysi4mf50p8lbbzag4ir4y1f0z4sz8gkwagh7b7"; @@ -524,7 +541,7 @@ let consul-alerts = buildFromGitHub { rev = "6eb4bc556d5f926dbf15d86170664d35d504ae54"; - date = "2015-08-09"; + version = "2015-08-09"; owner = "AcalephStorage"; repo = "consul-alerts"; sha256 = "191bmxix3nl4pr26hcdfxa9qpv5dzggjvi86h2slajgyd2rzn23b"; @@ -545,7 +562,7 @@ let consul-migrate = buildFromGitHub { rev = "678fb10cdeae25ab309e99e655148f0bf65f9710"; - date = "2015-05-19"; + version = "2015-05-19"; owner = "hashicorp"; repo = "consul-migrate"; sha256 = "18zqyzbc3pny700fnh4hi45i5mlsramqykikcr7lgyx7id6alf16"; @@ -615,7 +632,7 @@ let dbus-old-2015-05-19 = buildFromGitHub { rev = "a5942dec6340eb0d57f43f2003c190ce06e43dea"; - date = "2015-05-19"; + version = "2015-05-19"; owner = "godbus"; repo = "dbus"; sha256 = "1vk31wal7ncvjwvnb8q1myrkihv1np46f3q8dndi5k0csflbxxdf"; @@ -623,7 +640,7 @@ let dbus = buildFromGitHub { rev = "230e4b23db2fd81c53eaa0073f76659d4849ce51"; - date = "2016-03-02"; + version = "2016-03-02"; owner = "godbus"; repo = "dbus"; sha256 = "1wxv2cbihzcsz2z7iycyzl7f3arhhgagcc5kqln1k1mkm4l85z0q"; @@ -645,7 +662,7 @@ let dns = buildFromGitHub { rev = "e59f851c912767b1db587dcabee6e6652e495c75"; - date = "2015-07-22"; + version = "2015-07-22"; owner = "miekg"; repo = "dns"; sha256 = "1zcj4drmmskwvjy5ld54qd8a34ls9651ysl3q7c2bcambax5r0hp"; @@ -732,7 +749,7 @@ let du = buildFromGitHub { rev = "3c0690cca16228b97741327b1b6781397afbdb24"; - date = "2015-08-05"; + version = "2015-08-05"; owner = "calmh"; repo = "du"; sha256 = "1mv6mkbslfc8giv47kyl97ny0igb3l7jya5hc75sm54xi6g205wa"; @@ -749,6 +766,21 @@ let }; }; + errcheck = buildFromGitHub { + rev = "f76568f8d87e48ccbbd17a827c2eaf31805bf58c"; + owner = "kisielk"; + repo = "errcheck"; + sha256 = "1y1cqd0ibgr03zf96q6aagk65yhv6vcnq9xa8nqhjpnz7jhfndhs"; + postPatch = '' + for f in $(find -name "*.go"); do + substituteInPlace $f \ + --replace '"go/types"' '"golang.org/x/tools/go/types"' + done + ''; + excludedPackages = [ "testdata" ]; + buildInputs = [ gotool tools ]; + }; + errwrap = buildFromGitHub { rev = "7554cd9344cec97297fa6649b055a8c98c2a1e55"; owner = "hashicorp"; @@ -757,10 +789,11 @@ let }; etcd = buildFromGitHub { - rev = "v2.1.2"; + rev = "v2.3.0"; owner = "coreos"; repo = "etcd"; - sha256 = "1d3wl9rqbhkkdhfkjfrzjfcwz8hx315zbjbmij3pf62bc1p5nh60"; + sha256 = "1cchlhsdbbqal145cvdiq7rzqqi131iq7z0r2hmzwx414k04wyn7"; + buildInputs = [ pkgs.libpcap tablewriter ]; }; fsnotify.v0 = buildGoPackage rec { @@ -829,7 +862,7 @@ let gawp = buildFromGitHub { rev = "488705639109de54d38974cc31353d34cc2cd609"; - date = "2015-08-31"; + version = "2015-08-31"; owner = "martingallagher"; repo = "gawp"; sha256 = "0iqqd63nqdijdskdb9f0jwnm6akkh1p2jw4p2w7r1dbaqz1znyay"; @@ -869,6 +902,15 @@ let sha256 = "1iz4wjxc3zkj0xkfs88ig670gb08p1sd922l0ig2cxpjcfjp1y99"; }; + gosexy.gettext = buildFromGitHub { + rev = "4a979356fe964fec12e18326a32a89661f93dea7"; + version = "2016-02-20"; + owner = "gosexy"; + repo = "gettext"; + sha256 = "07f3dmq4qsdykbn3fkha3v1w61hic6xw82dvdmvzhf0m41jxsgy6"; + buildInputs = [ pkgs.gettext go-flags ]; + }; + ginkgo = buildGoPackage rec { rev = "5ed93e443a4b7dfe9f5e95ca87e6082e503021d2"; name = "ginkgo-${stdenv.lib.strings.substring 0 7 rev}"; @@ -898,7 +940,7 @@ let }; git-lfs = buildFromGitHub { - date = "1.1.1"; # "date" is effectively "version" + version = "1.1.1"; rev = "v1.1.1"; owner = "github"; repo = "git-lfs"; @@ -982,6 +1024,14 @@ let sha256 = "1nyg6sckwd0iafs9vcmgbga2k3hid2q0avhwj29qbdhj3l78xi47"; }; + gocapability = buildFromGitHub { + rev = "2c00daeb6c3b45114c80ac44119e7b8801fdd852"; + version = "2015-07-16"; + owner = "syndtr"; + repo = "gocapability"; + sha256 = "1x7jdcg2r5pakjf20q7bdiidfmv7vcjiyg682186rkp2wz0yws0l"; + }; + gocryptfs = buildFromGitHub { rev = "v0.5"; owner = "rfjakob"; @@ -1011,7 +1061,7 @@ let gocode = buildFromGitHub { rev = "680a0fbae5119fb0dbea5dca1d89e02747a80de0"; - date = "2015-09-03"; + version = "2015-09-03"; owner = "nsf"; repo = "gocode"; sha256 = "1ay2xakz4bcn8r3ylicbj753gjljvv4cj9l4wfly55cj1vjybjpv"; @@ -1065,6 +1115,13 @@ let sha256 = "0yg1jpr7lcaqh6i8n9wbs9r128kk541qjv06r9a6fp9vj56rqr3m"; }; + gotool = buildFromGitHub { + rev = "58a7a198f2ec6ea7af221fd216e7f559d663ce02"; + owner = "kisielk"; + repo = "gotool"; + sha256 = "1l1w4mczqmah0c154vb1daw5l3cc7vn5gmy5s67p3ad1lnz5l79x"; + }; + gotty = buildFromGitHub { rev = "v0.0.10"; owner = "yudai"; @@ -1083,7 +1140,7 @@ let govers = buildFromGitHub { rev = "3b5f175f65d601d06f48d78fcbdb0add633565b9"; - date = "2015-01-09"; + version = "2015-01-09"; owner = "rogpeppe"; repo = "govers"; sha256 = "0din5a7nff6hpc4wg0yad2nwbgy4q1qaazxl8ni49lkkr4hyp8pc"; @@ -1106,7 +1163,7 @@ let golang_protobuf_extensions = buildFromGitHub { rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; - date = "2015-04-06"; + version = "2015-04-06"; owner = "matttproud"; repo = "golang_protobuf_extensions"; sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; @@ -1115,7 +1172,7 @@ let goleveldb = buildFromGitHub { rev = "1a9d62f03ea92815b46fcaab357cfd4df264b1a0"; - date = "2015-08-19"; + version = "2015-08-19"; owner = "syndtr"; repo = "goleveldb"; sha256 = "04ywbif36fiah4fw0x2abr5q3p4fdhi6q57d5icc2mz03q889vhb"; @@ -1143,9 +1200,17 @@ let sha256 = "1r8fpzwhakq8fsppc33n4iivq1pz47xhs0h6bv4x5qiip5mswwvg"; }; + gometalinter = buildFromGitHub { + rev = "be87b7414dc44dbea2fee33ccb8bd8a859ebcaf1"; + owner = "alecthomas"; + repo = "gometalinter"; + sha256 = "05n852kf11gq5k7b4h6kz85z99qfa46dy6b6fqkg9xfk2bmvdxms"; + buildInputs = [ shlex kingpin testify ]; + }; + google-api-go-client = buildFromGitHub { rev = "a5c3e2a4792aff40e59840d9ecdff0542a202a80"; - date = "2015-08-19"; + version = "2015-08-19"; owner = "google"; repo = "google-api-go-client"; sha256 = "1kigddnbyrl9ddpj5rs8njvf1ck54ipi4q1282k0d6b3am5qfbj8"; @@ -1154,6 +1219,15 @@ let buildInputs = [ net ]; }; + goreturns = buildFromGitHub { + rev = "b368f1f77f2950c753e05a6a29acfc487fa7a959"; + owner = "sqs"; + repo = "goreturns"; + sha256 = "0qllmcvg3xd43pymn24zrjn7vb39zj83ayq3sg7kzgxvba0ylb05"; + goPackagePath = "sourcegraph.com/sqs/goreturns"; + buildInputs = [ tools ]; + }; + odeke-em.google-api-go-client = buildGoPackage rec { rev = "30f4c144b02321ebbc712f35dc95c3e72a5a7fdc"; name = "odeke-em-google-api-go-client-${stdenv.lib.strings.substring 0 7 rev}"; @@ -1185,7 +1259,7 @@ let goproxy = buildFromGitHub { rev = "2624781dc373cecd1136cafdaaaeba6c9bb90e96"; - date = "2015-07-26"; + version = "2015-07-26"; owner = "elazarl"; repo = "goproxy"; sha256 = "1zz425y8byjaa9i7mslc9anz9w2jc093fjl0562rmm5hh4rc5x5f"; @@ -1194,7 +1268,7 @@ let goreq = buildFromGitHub { rev = "72c51a544272e007ab3da4f7d9ac959b7af7af03"; - date = "2015-08-18"; + version = "2015-08-18"; owner = "franela"; repo = "goreq"; sha256 = "0dnqbijdzp2dgsf6m934nadixqbv73q0zkqglaa956zzw0pyhcxp"; @@ -1202,7 +1276,7 @@ let gotags = buildFromGitHub { rev = "be986a34e20634775ac73e11a5b55916085c48e7"; - date = "2015-08-03"; + version = "2015-08-03"; owner = "jstemmer"; repo = "gotags"; sha256 = "071wyq90b06xlb3bb0l4qjz1gf4nnci4bcngiddfcxf2l41w1vja"; @@ -1230,7 +1304,7 @@ let gozim = buildFromGitHub { rev = "ea9b7c39cb1d13bd8bf19ba4dc4e2a16bab52f14"; - date = "2016-01-15"; + version = "2016-01-15"; owner = "akhenakh"; repo = "gozim"; sha256 = "1n50fdd56r3s1sgjbpa72nvdh50gfpf6fq55c077w2p3bxn6p8k6"; @@ -1314,8 +1388,7 @@ let owner = "elazarl"; repo = "go-bindata-assetfs"; sha256 = "636ce247ff6f85c14f38a421f46662fa77bdc29762692e1f72b3cd1f9d7a1d17"; - - date = "2015-08-13"; + version = "2015-08-13"; meta = with stdenv.lib; { description = "Serves embedded files from jteeuwen/go-bindata with net/http"; @@ -1351,7 +1424,7 @@ let go-charset = buildFromGitHub { rev = "61cdee49014dc952076b5852ce4707137eb36b64"; - date = "2014-07-13"; + version = "2014-07-13"; owner = "paulrosania"; repo = "go-charset"; sha256 = "0jp6rwxlgl66dipk6ssk8ly55jxncvsxs7jc3abgdrhr3rzccab8"; @@ -1407,7 +1480,7 @@ let go-fuse = buildFromGitHub rec { rev = "324ea173d0a4d90e0e97c464a6ad33f80c9587a8"; - date = "2015-07-27"; + version = "2015-07-27"; owner = "hanwen"; repo = "go-fuse"; sha256 = "0r5amgnpb4g7b6kpz42vnj01w515by4yhy64s5lqf3snzjygaycf"; @@ -1453,7 +1526,7 @@ let go-hostpool = buildFromGitHub { rev = "d0e59c22a56e8dadfed24f74f452cea5a52722d2"; - date = "2015-03-31"; + version = "2015-03-31"; owner = "bitly"; repo = "go-hostpool"; sha256 = "14ph12krn5zlg00vh9g6g08lkfjxnpw46nzadrfb718yl1hgyk3g"; @@ -1475,7 +1548,7 @@ let go-incremental = buildFromGitHub { rev = "92fd0ce4a694213e8b3dfd2d39b16e51d26d0fbf"; - date = "2015-02-20"; + version = "2015-02-20"; owner = "GeertJohan"; repo = "go.incremental"; sha256 = "160cspmq73bk6cvisa6kq1dwrrp1yqpkrpq8dl69wcnaf91cbnml"; @@ -1490,7 +1563,7 @@ let go-liblzma = buildFromGitHub { rev = "e74be71c3c60411922b5424e875d7692ea638b78"; - date = "2016-01-01"; + version = "2016-01-01"; owner = "remyoudompheng"; repo = "go-liblzma"; sha256 = "12lwjmdcv2l98097rhvjvd2yz8jl741hxcg29i1c18grwmwxa7nf"; @@ -1513,10 +1586,11 @@ let }; go-lxc = buildFromGitHub { - rev = "a0fa4019e64b385dfa2fb8abcabcdd2f66871639"; + rev = "d89df0ad9dc13a7ce491eedaa771b076cf32db16"; + version = "2016-02-12"; owner = "lxc"; repo = "go-lxc"; - sha256 = "0fkkmn7ynmzpr7j0ha1qsmh3k86ncxcbajmcb90hs0k0iaaiaahz"; + sha256 = "051kqvvclfcinqcbi4zch694llvnxa5vvbw6cbdxbkzhr5zxm36q"; goPackagePath = "gopkg.in/lxc/go-lxc.v2"; nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = [ pkgs.lxc ]; @@ -1531,7 +1605,7 @@ let rcrowley.go-metrics = buildFromGitHub { rev = "1ce93efbc8f9c568886b2ef85ce305b2217b3de3"; - date = "2015-08-22"; + version = "2015-08-22"; owner = "rcrowley"; repo = "go-metrics"; sha256 = "06gg72krlmd0z3zdq6s716blrga95pyj8dc2f2psfbknbkyrkfqa"; @@ -1588,7 +1662,7 @@ let go-options = buildFromGitHub { rev = "7c174072188d0cfbe6f01bb457626abb22bdff52"; - date = "2014-12-20"; + version = "2014-12-20"; owner = "mreiferson"; repo = "go-options"; sha256 = "0ksyi2cb4k6r2fxamljg42qbz5hdcb9kv5i7y6cx4ajjy0xznwgm"; @@ -1596,7 +1670,7 @@ let go-porterstemmer = buildFromGitHub { rev = "23a2c8e5cf1f380f27722c6d2ae8896431dc7d0e"; - date = "2014-12-30"; + version = "2014-12-30"; owner = "blevesearch"; repo = "go-porterstemmer"; sha256 = "0rcfbrad79xd114h3dhy5d3zs3b5bcgqwm3h5ih1lk69zr9wi91d"; @@ -1628,6 +1702,14 @@ let }; }; + mattn.go-runewidth = buildFromGitHub { + rev = "d6bea18f789704b5f83375793155289da36a3c7f"; + version = "2016-03-15"; + owner = "mattn"; + repo = "go-runewidth"; + sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"; + }; + go-shellwords = buildGoPackage rec { rev = "35d512af75e283aae4ca1fc3d44b159ed66189a4"; name = "go-shellwords-${rev}"; @@ -1649,7 +1731,7 @@ let go-repo-root = buildFromGitHub { rev = "90041e5c7dc634651549f96814a452f4e0e680f9"; - date = "2014-09-11"; + version = "2014-09-11"; owner = "cstrahan"; repo = "go-repo-root"; sha256 = "1rlzp8kjv0a3dnfhyqcggny0ad648j5csr2x0siq5prahlp48mg4"; @@ -1658,7 +1740,7 @@ let go-rice = buildFromGitHub { rev = "4f3c5af2322e393f305d9674845bc36cd1dea589"; - date = "2016-01-04"; + version = "2016-01-04"; owner = "GeertJohan"; repo = "go.rice"; sha256 = "01q2d5iwibwdl68gn8sg6dm7byc42hax3zmiqgmdw63ir1fsv4ag"; @@ -1673,9 +1755,24 @@ let sha256 = "00f2rfhsaqj2wjanh5qp73phx7x12a5pwd7lc0rjfv68l6sgpg2v"; }; + go-sct = buildFromGitHub { + rev = "b82c2f81727357c45a47a43965c50ed5da5a2e74"; + version = "2016-01-11"; + owner = "d4l3k"; + repo = "go-sct"; + sha256 = "13hgmpv2c8ll5ap8fn1n480bdv1j21n86jjwcssd36kh2i933anl"; + buildInputs = [ astrotime pkgs.xorg.libX11 pkgs.xorg.libXrandr ]; + meta = with stdenv.lib; { + description = "Color temperature setting library and CLI that operates in a similar way to f.lux and Redshift"; + license = licenses.mit; + maintainers = with maintainers; [ cstrahan ]; + platforms = platforms.unix; + }; + }; + go-simplejson = buildFromGitHub { rev = "18db6e68d8fd9cbf2e8ebe4c81a78b96fd9bf05a"; - date = "2015-03-31"; + version = "2015-03-31"; owner = "bitly"; repo = "go-simplejson"; sha256 = "0lj9cxyncchlw6p35j0yym5q5waiz0giw6ri41qdwm8y3dghwwiy"; @@ -1683,7 +1780,7 @@ let go-snappystream = buildFromGitHub { rev = "028eae7ab5c4c9e2d1cb4c4ca1e53259bbe7e504"; - date = "2015-04-16"; + version = "2015-04-16"; owner = "mreiferson"; repo = "go-snappystream"; sha256 = "0jdd5whp74nvg35d9hzydsi3shnb1vrnd7shi9qz4wxap7gcrid6"; @@ -1691,7 +1788,7 @@ let go-spew = buildFromGitHub { rev = "5215b55f46b2b919f50a1df0eaa5886afe4e3b3d"; - date = "2015-11-05"; + version = "2015-11-05"; owner = "davecgh"; repo = "go-spew"; sha256 = "15h9kl73rdbzlfmsdxp13jja5gs7sknvqkpq2qizq3qv3nr1x8dk"; @@ -1699,7 +1796,7 @@ let go-sqlite3 = buildFromGitHub { rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42"; - date = "2015-07-29"; + version = "2015-07-29"; owner = "mattn"; repo = "go-sqlite3"; sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla"; @@ -1714,7 +1811,7 @@ let go-systemd = buildFromGitHub { rev = "7b2428fec40033549c68f54e26e89e7ca9a9ce31"; - date = "2016-03-10"; + version = "2016-03-10"; owner = "coreos"; repo = "go-systemd"; sha256 = "0kfbxvm9zsjgvgmiq2jl807y4s5z0rya65rm399llr5rr7vz1lxd"; @@ -1722,15 +1819,6 @@ let buildInputs = [ dbus ]; }; - lxd-go-systemd = buildFromGitHub { - rev = "a3dcd1d0480ee0ae9ec354f1632202bfba715e03"; - date = "2015-07-01"; - owner = "stgraber"; - repo = "lxd-go-systemd"; - sha256 = "006dhy3j8ld0kycm8hrjxvakd7xdn1b6z2dsjp1l4sqrxdmm188w"; - buildInputs = [ dbus-old-2015-05-19 ]; - }; - go-update-v0 = buildFromGitHub { rev = "d8b0b1d421aa1cbf392c05869f8abbc669bb7066"; owner = "inconshreveable"; @@ -1742,7 +1830,7 @@ let go-uuid = buildFromGitHub { rev = "6b8e5b55d20d01ad47ecfe98e5171688397c61e9"; - date = "2015-07-22"; + version = "2015-07-22"; owner = "satori"; repo = "go.uuid"; sha256 = "0injxzds41v8nc0brvyrrjl66fk3hycz6im38s5r9ccbwlp68p44"; @@ -1757,7 +1845,7 @@ let go-zipexe = buildFromGitHub { rev = "a5fe2436ffcb3236e175e5149162b41cd28bd27d"; - date = "2015-03-29"; + version = "2015-03-29"; owner = "daaku"; repo = "go.zipexe"; sha256 = "0vi5pskhifb6zw78w2j97qbhs09zmrlk4b48mybgk5b3sswp6510"; @@ -1765,7 +1853,7 @@ let go-zookeeper = buildFromGitHub { rev = "5bb5cfc093ad18a28148c578f8632cfdb4d802e4"; - date = "2015-06-02"; + version = "2015-06-02"; owner = "samuel"; repo = "go-zookeeper"; sha256 = "1kpx1ymh7rds0b2km291idnyqi0zck74nd8hnk72crgz7wmpqv6z"; @@ -1773,7 +1861,7 @@ let lint = buildFromGitHub { rev = "7b7f4364ff76043e6c3610281525fabc0d90f0e4"; - date = "2015-06-23"; + version = "2015-06-23"; owner = "golang"; repo = "lint"; sha256 = "1bj7zv534hyh87bp2vsbhp94qijc5nixb06li1dzfz9n0wcmlqw9"; @@ -1806,7 +1894,7 @@ let grpc = buildFromGitHub { rev = "d455e65570c07e6ee7f23275063fbf34660ea616"; - date = "2015-08-29"; + version = "2015-08-29"; owner = "grpc"; repo = "grpc-go"; sha256 = "08vra95hc8ihnj353680zhiqrv3ssw5yywkrifzb1zwl0l3cs2hr"; @@ -1818,7 +1906,7 @@ let gtreap = buildFromGitHub { rev = "0abe01ef9be25c4aedc174758ec2d917314d6d70"; - date = "2015-08-07"; + version = "2015-08-07"; owner = "steveyen"; repo = "gtreap"; sha256 = "03z5j8myrpmd0jk834l318xnyfm0n4rg15yq0d35y7j1aqx26gvk"; @@ -1918,7 +2006,7 @@ let httprouter = buildFromGitHub { rev = "6aacfd5ab513e34f7e64ea9627ab9670371b34e7"; - date = "2015-07-08"; + version = "2015-07-08"; owner = "julienschmidt"; repo = "httprouter"; sha256 = "00rrjysmq898qcrf2hfwfh9s70vwvmjx2kp5w03nz1krxa4zhrkl"; @@ -1938,7 +2026,7 @@ let i3cat = buildFromGitHub { rev = "b9ba886a7c769994ccd8d4627978ef4b51fcf576"; - date = "2015-03-21"; + version = "2015-03-21"; owner = "vincent-petithory"; repo = "i3cat"; sha256 = "1xlm5c9ajdb71985nq7hcsaraq2z06przbl6r4ykvzi8w2lwgv72"; @@ -2000,7 +2088,7 @@ let ipfs = buildFromGitHub{ rev = "7070b4d878baad57dcc8da80080dd293aa46cabd"; - date = "2016-01-12"; + version = "2016-01-12"; owner = "ipfs"; repo = "go-ipfs"; sha256 = "1b7aimnbz287fy7p27v3qdxnz514r5142v3jihqxanbk9g384gcd"; @@ -2034,7 +2122,7 @@ let kagome = buildFromGitHub { rev = "1bbdbdd590e13a8c2f4508c67a079113cd7b9f51"; - date = "2016-01-19"; + version = "2016-01-19"; owner = "ikawaha"; repo = "kagome"; sha256 = "1isnjdkn9hnrkp5g37p2k5bbsrx0ma32v3icwlmwwyc5mppa4blb"; @@ -2125,7 +2213,7 @@ let logger = buildFromGitHub { rev = "c96f6a1a8c7b6bf2f4860c667867d90174799eb2"; - date = "2015-05-23"; + version = "2015-05-23"; owner = "calmh"; repo = "logger"; sha256 = "1f67xbvvf210g5cqa84l12s00ynfbkjinhl8y6m88yrdb025v1vg"; @@ -2148,26 +2236,34 @@ let luhn = buildFromGitHub { rev = "0c8388ff95fa92d4094011e5a04fc99dea3d1632"; - date = "2015-01-13"; + version = "2015-01-13"; owner = "calmh"; repo = "luhn"; sha256 = "1hfj1lx7wdpifn16zqrl4xml6cj5gxbn6hfz1f46g2a6bdf0gcvs"; }; lxd = buildFromGitHub { - rev = "lxd-0.17"; + rev = "lxd-2.0.0.rc4"; owner = "lxc"; repo = "lxd"; - sha256 = "1yi3dr1bgdplc6nya10k5jsj3psbf3077vqad8x8cjza2z9i48fp"; + sha256 = "1rpyyj6d38d9kmb47dcmy1x41fiacj384yx01yslsrj2l6qxcdjn"; excludedPackages = "test"; # Don't build the binary called test which causes conflicts buildInputs = [ - gettext-go websocket crypto log15 go-lxc yaml-v2 tomb protobuf pongo2 - lxd-go-systemd go-uuid tablewriter golang-petname mux go-sqlite3 goproxy - pkgs.python3 + gosexy.gettext websocket crypto log15 go-lxc yaml-v2 tomb protobuf pongo2 + go-uuid tablewriter golang-petname mux go-sqlite3 goproxy + pkgs.python3 go-systemd uuid gocapability ]; postInstall = '' cp go/src/$goPackagePath/scripts/lxd-images $bin/bin ''; + + meta = with stdenv.lib; { + description = "Daemon based on liblxc offering a REST API to manage containers"; + homepage = https://github.com/lxc/lxd; + license = licenses.asl20; + maintainers = with maintainers; [ globin fpletz ]; + platforms = platforms.linux; + }; }; manners = buildFromGitHub { @@ -2308,6 +2404,14 @@ let ''; }; + motion = buildFromGitHub { + rev = "e09baac69ad86bff1de868e8d6c4327eb0a918d7"; + owner = "fatih"; + repo = "motion"; + sha256 = "0yay4a1b5l9f4zmwkcsmr5plnp7a9b66bczy1xz4nzhl20bal6sx"; + excludedPackages = [ "testdata" ]; + }; + mousetrap = buildFromGitHub { rev = "9dbb96d2c3a964935b0870b5abaea13c98b483aa"; owner = "inconshreveable"; @@ -2330,7 +2434,7 @@ let mtpfs = buildFromGitHub { rev = "3ef47f91c38cf1da3e965e37debfc81738e9cd94"; - date = "2015-08-01"; + version = "2015-08-01"; owner = "hanwen"; repo = "go-mtpfs"; sha256 = "1f7lcialkpkwk01f7yxw77qln291sqjkspb09mh0yacmrhl231g8"; @@ -2340,7 +2444,7 @@ let mux = buildFromGitHub { rev = "5a8a0400500543e28b2886a8c52d21a435815411"; - date = "2015-08-05"; + version = "2015-08-05"; owner = "gorilla"; repo = "mux"; sha256 = "15w1bw14vx157r6v98fhy831ilnbzdsm5xzvs23j8hw6gnknzaw1"; @@ -2488,11 +2592,11 @@ let }; oh = buildFromGitHub { - rev = "f3e482f664e76dcf98d5f94dd93c216da300b78e"; - date = "2016-02-23"; + rev = "f54be52450a07398a2f605222eb22e69bb34f565"; + version = "2016-03-02"; owner = "michaelmacinnis"; repo = "oh"; - sha256 = "1j5g37jjl1kxri44ihb1bsrzx4al07dvl4s5dglb2m7bjia6iqs2"; + sha256 = "0gczqi9aw6sv7vmjdandxmaz1m6pfzchmbkf12qmpmc6dmh2wy6b"; goPackageAliases = [ "github.com/michaelmacinnis/oh" ]; buildInputs = [ adapted liner ]; disabled = isGo14; @@ -2527,7 +2631,7 @@ let opsgenie-go-sdk = buildFromGitHub { rev = "c6e1235dfed2126eb9b562c4d776baf55ccd23e3"; - date = "2015-08-24"; + version = "2015-08-24"; owner = "opsgenie"; repo = "opsgenie-go-sdk"; sha256 = "1prvnjiqmhnp9cggp9f6882yckix2laqik35fcj32117ry26p4jm"; @@ -2583,7 +2687,7 @@ let }; perks = buildFromGitHub rec { - date = "2014-07-16"; + version = "2014-07-16"; owner = "bmizerany"; repo = "perks"; rev = "d9a9656a3a4b1c2864fdb44db2ef8619772d92aa"; @@ -2591,7 +2695,7 @@ let }; beorn7.perks = buildFromGitHub rec { - date = "2015-02-23"; + version = "2015-02-23"; owner = "beorn7"; repo = "perks"; rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; @@ -2599,9 +2703,9 @@ let }; pflag = buildGoPackage rec { - date = "20131112"; + version = "20131112"; rev = "94e98a55fb412fcbcfc302555cb990f5e1590627"; - name = "pflag-${date}-${stdenv.lib.strings.substring 0 7 rev}"; + name = "pflag-${version}-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/spf13/pflag"; src = fetchgit { inherit rev; @@ -2641,7 +2745,7 @@ let pongo2 = buildFromGitHub { rev = "5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9"; - date = "2014-10-27"; + version = "2014-10-27"; owner = "flosch"; repo = "pongo2"; sha256 = "0fd7d79644zmcirsb1gvhmh0l5vb5nyxmkzkvqpmzzcg6yfczph8"; @@ -2758,7 +2862,7 @@ let prometheus.client_model = buildFromGitHub { rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; - date = "2015-02-12"; + version = "2015-02-12"; owner = "prometheus"; repo = "client_model"; sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; @@ -2797,7 +2901,7 @@ let prometheus.log = buildFromGitHub { rev = "439e5db48fbb50ebbaf2c816030473a62f505f55"; - date = "2015-05-29"; + version = "2015-05-29"; owner = "prometheus"; repo = "log"; sha256 = "1fl23gsw2hn3c1y91qckr661sybqcw2gqnd1gllxn3hp6p2w6hxv"; @@ -2836,7 +2940,7 @@ let prometheus.nginx-exporter = buildFromGitHub { rev = "2cf16441591f6b6e58a8c0439dcaf344057aea2b"; - date = "2015-06-01"; + version = "2015-06-01"; owner = "discordianfish"; repo = "nginx_exporter"; sha256 = "0p9j0bbr2lr734980x2p8d67lcify21glwc5k3i3j4ri4vadpxvc"; @@ -2878,7 +2982,7 @@ let prometheus.procfs = buildFromGitHub { rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; - date = "2015-06-16"; + version = "2015-06-16"; owner = "prometheus"; repo = "procfs"; sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; @@ -3105,7 +3209,7 @@ let ratelimit = buildFromGitHub { rev = "772f5c38e468398c4511514f4f6aa9a4185bc0a0"; - date = "2015-06-19"; + version = "2015-06-19"; owner = "juju"; repo = "ratelimit"; sha256 = "02rs61ay6sq499lxxszjsrxp33m6zklds1xrmnr5fk73vpqfa28p"; @@ -3120,7 +3224,7 @@ let raven-go = buildFromGitHub { rev = "74c334d7b8aaa4fd1b4fc6aa428c36fed1699e28"; - date = "2015-07-21"; + version = "2015-07-21"; owner = "getsentry"; repo = "raven-go"; sha256 = "1356a7h8zp1mcywnr0y83w0h4qdblp65rcf9slbx667n8x2rzda8"; @@ -3169,7 +3273,7 @@ let restic = buildFromGitHub { rev = "4d7e802c44369b40177cd52938bc5b0930bd2be1"; - date = "2016-01-17"; + version = "2016-01-17"; owner = "restic"; repo = "restic"; sha256 = "0lf40539dy2xa5l1xy1kyn1vk3w0fmapa1h65ciksrdhn89ilrxv"; @@ -3193,12 +3297,22 @@ let rsrc = buildFromGitHub { rev = "ba14da1f827188454a4591717fff29999010887f"; - date = "2015-11-03"; + version = "2015-11-03"; owner = "akavel"; repo = "rsrc"; sha256 = "0g9fj10xnxcv034c8hpcgbhswv6as0d8l176c5nfgh1lh6klmmzc"; }; + s3gof3r = buildFromGitHub rec { + owner = "rlmcpherson"; + repo = "s3gof3r"; + rev = "v${version}"; + version = "0.5.0"; + sha256 = "10banc8hnhxpsdmlkf9nc5fjkh1349bgpd9k7lggw3yih1rvmh7k"; + disabled = isGo14; + propagatedBuildInputs = [ go-flags ]; + }; + sandblast = buildGoPackage rec { rev = "694d24817b9b7b8bacb6d458b7989b30d7fe3555"; name = "sandblast-${stdenv.lib.strings.substring 0 7 rev}"; @@ -3240,7 +3354,7 @@ let seelog = buildFromGitHub { rev = "c510775bb50d98213cfafca75a4bc5e3fddc8d8f"; - date = "2015-05-26"; + version = "2015-05-26"; owner = "cihub"; repo = "seelog"; sha256 = "1f0rwgqlffv1a7b05736a4gf4l9dn80wsfyqcnz6qd2skhwnzv29"; @@ -3248,7 +3362,7 @@ let segment = buildFromGitHub { rev = "db70c57796cc8c310613541dfade3dce627d09c7"; - date = "2016-01-05"; + version = "2016-01-05"; owner = "blevesearch"; repo = "segment"; sha256 = "09xfdlcc6bsrr5grxp6fgnw9p4cf6jc0wwa9049fd1l0zmhj2m1g"; @@ -3256,7 +3370,7 @@ let semver = buildFromGitHub { rev = "31b736133b98f26d5e078ec9eb591666edfd091f"; - date = "2015-07-20"; + version = "2015-07-20"; owner = "blang"; repo = "semver"; sha256 = "19ifi0na4cj23q3h8xv89mx7p48y0ciymhmlrq9milm0xz80wk10"; @@ -3264,7 +3378,7 @@ let serf = buildFromGitHub { rev = "668982d8f90f5eff4a766583c1286393c1d27f68"; - date = "2015-05-15"; + version = "2015-05-15"; owner = "hashicorp"; repo = "serf"; sha256 = "1h05h5xhaj27r1mh5zshnykax29lqjhfc0bx4v9swiwb873c24qk"; @@ -3288,6 +3402,13 @@ let propagatedBuildInputs = [ slices ]; }; + shlex = buildFromGitHub { + rev = "6f45313302b9c56850fc17f99e40caebce98c716"; + owner = "google"; + repo = "shlex"; + sha256 = "0ybz1w3hndma8myq3pxan36533hy9f4w598hsv4hnj21l4br8jpx"; + }; + skydns = buildFromGitHub { rev = "2.5.2b"; owner = "skynetservices"; @@ -3356,7 +3477,7 @@ let structfield = buildFromGitHub { rev = "01a738558a47fbf16712994d1737fb31c77e7d11"; - date = "2014-08-01"; + version = "2014-08-01"; owner = "vincent-petithory"; repo = "structfield"; sha256 = "1kyx71z13mf6hc8ly0j0b9zblgvj5lzzvgnc3fqh61wgxrsw24dw"; @@ -3430,7 +3551,7 @@ let syncthing-protocol011 = buildFromGitHub { rev = "84365882de255d2204d0eeda8dee288082a27f98"; - date = "2015-08-28"; + version = "2015-08-28"; owner = "syncthing"; repo = "protocol"; sha256 = "07xjs43lpd51pc339f8x487yhs39riysj3ifbjxsx329kljbflwx"; @@ -3438,11 +3559,12 @@ let }; tablewriter = buildFromGitHub { - rev = "bc39950e081b457853031334b3c8b95cdfe428ba"; - date = "2015-06-03"; + rev = "cca8bbc0798408af109aaaa239cbd2634846b340"; + version = "2016-01-15"; owner = "olekukonko"; repo = "tablewriter"; - sha256 = "0n4gqjc2dqmnbpqgi9i8vrwdk4mkgyssc7l2n4r5bqx0n3nxpbps"; + sha256 = "0f9ph3z7lh6p6gihbl1461j9yq5qiaqxr9mzdkp512n18v89ml48"; + propagatedBuildInputs = [ mattn.go-runewidth ]; }; termbox-go = buildGoPackage rec { @@ -3459,6 +3581,16 @@ let subPackages = [ "./" ]; # prevent building _demos }; + terraform = buildFromGitHub { + rev = "v0.6.13"; + owner = "hashicorp"; + repo = "terraform"; + disabled = isGo14 || isGo15; + sha256 = "1f1xm5pyz1hxqm2k74psanirpydf71pmxixplyc2x2w68hgjzi2l"; + + buildInputs = [ ]; + }; + testify = buildGoPackage rec { rev = "089c7181b8c728499929ff09b62d3fdd8df8adff"; name = "testify-${stdenv.lib.strings.substring 0 7 rev}"; @@ -3489,7 +3621,7 @@ let timer_metrics = buildFromGitHub { rev = "afad1794bb13e2a094720aeb27c088aa64564895"; - date = "2015-02-02"; + version = "2015-02-02"; owner = "bitly"; repo = "timer_metrics"; sha256 = "1b717vkwj63qb5kan4b92kx4rg6253l5mdb3lxpxrspy56a6rl0c"; @@ -3506,7 +3638,7 @@ let toml = buildFromGitHub { rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4"; - date = "2015-05-01"; + version = "2015-05-01"; owner = "BurntSushi"; repo = "toml"; sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"; @@ -3536,7 +3668,7 @@ let usb = buildFromGitHub rec { rev = "69aee4530ac705cec7c5344418d982aaf15cf0b1"; - date = "2014-12-17"; + version = "2014-12-17"; owner = "hanwen"; repo = "usb"; sha256 = "01k0c2g395j65vm1w37mmrfkg6nm900khjrrizzpmx8f8yf20dky"; @@ -3547,7 +3679,7 @@ let uuid = buildFromGitHub { rev = "cccd189d45f7ac3368a0d127efb7f4d08ae0b655"; - date = "2015-08-24"; + version = "2015-08-24"; owner = "pborman"; repo = "uuid"; sha256 = "0hswk9ihv3js5blp9pk2bpig64zkmyp5p1zhmgydfhb0dr2w8iad"; @@ -3617,7 +3749,7 @@ let xmpp-client = buildFromGitHub { rev = "525bd26cf5f56ec5aee99464714fd1d019c119ff"; - date = "2016-01-10"; + version = "2016-01-10"; owner = "agl"; repo = "xmpp-client"; sha256 = "0a1r08zs723ikcskmn6ylkdi3frcd0i0lkx30i9q39ilf734v253"; @@ -3646,7 +3778,7 @@ let yaml-v2 = buildFromGitHub { rev = "7ad95dd0798a40da1ccdff6dff35fd177b5edf40"; - date = "2015-06-24"; + version = "2015-06-24"; owner = "go-yaml"; repo = "yaml"; sha256 = "0d4jh46jq2yjg5dp00l7yl9ilhly7k4mfvi4harafd5ap5k9wnpb"; @@ -3662,7 +3794,7 @@ let xdr = buildFromGitHub { rev = "e467b5aeb65ca8516fb3925c84991bf1d7cc935e"; - date = "2015-04-08"; + version = "2015-04-08"; owner = "calmh"; repo = "xdr"; sha256 = "1bi4b2xkjzcr0vq1wxz14i9943k71sj092dam0gdmr9yvdrg0nra"; @@ -3677,7 +3809,7 @@ let ninefans = buildFromGitHub { rev = "65b8cf069318223b1e722b4b36e729e5e9bb9eab"; - date = "2015-10-24"; + version = "2015-10-24"; owner = "9fans"; repo = "go"; sha256 = "0kzyxhs2xf0339nlnbm9gc365b2svyyjxnr86rphx5m072r32ims"; @@ -3691,7 +3823,7 @@ let godef = buildFromGitHub { rev = "ea14e800fd7d16918be88dae9f0195f7bd688586"; - date = "2015-10-24"; + version = "2015-10-24"; owner = "rogpeppe"; repo = "godef"; sha256 = "1wkvsz8nqwyp36wbm8vcw4449sfs46894nskrfj9qbsrjijvamyc"; @@ -3702,7 +3834,7 @@ let godep = buildFromGitHub { rev = "5598a9815350896a2cdf9f4f1d0a3003ab9677fb"; - date = "2015-10-15"; + version = "2015-10-15"; owner = "tools"; repo = "godep"; sha256 = "0zc1ah5cvaqa3zw0ska89a40x445vwl1ixz8v42xi3zicx16ibwz"; @@ -3817,7 +3949,7 @@ let godotenv = buildFromGitHub rec { rev = "4ed13390c0acd2ff4e371e64d8b97c8954138243"; - date = "2015-09-07"; + version = "2015-09-07"; owner = "joho"; repo = "godotenv"; sha256 = "1wzgws4dnlavi14aw3jzdl3mdr348skgqaq8xx4j8l68irfqyh0p"; @@ -3827,7 +3959,6 @@ let goreman = buildFromGitHub rec { version = "0.0.8-rc0"; rev = "d3e62509ccf23e47a390447886c51b1d89d0934b"; - date = "2016-01-30"; owner = "mattn"; repo = "goreman"; sha256 = "153hf4dq4jh1yv35pv30idmxhc917qzl590qy5394l48d4rapgb5"; @@ -3842,7 +3973,7 @@ let # ''; upower-notify = buildFromGitHub rec { rev = "14c581e683a7e90ec9fa6d409413c16599a5323c"; - date = "2016-03-10"; + version = "2016-03-10"; owner = "omeid"; repo = "upower-notify"; sha256 = "16zlvn53p9m10ph8n9gps51fkkvl6sf4afdzni6azk05j0ng49jw"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 1bf97876d88..45b5fa31407 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -362,7 +362,19 @@ rec { lts-5_5 = packages.ghc7103.override { packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-5.5.nix { }; }; - lts-5 = packages.lts-5_5; + lts-5_6 = packages.ghc7103.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-5.6.nix { }; + }; + lts-5_7 = packages.ghc7103.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-5.7.nix { }; + }; + lts-5_8 = packages.ghc7103.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-5.8.nix { }; + }; + lts-5_9 = packages.ghc7103.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-5.9.nix { }; + }; + lts-5 = packages.lts-5_9; lts = packages.lts-5; }; diff --git a/pkgs/top-level/metrics.nix b/pkgs/top-level/metrics.nix new file mode 100644 index 00000000000..2a54566ef4a --- /dev/null +++ b/pkgs/top-level/metrics.nix @@ -0,0 +1,55 @@ +{ nixpkgs, pkgs }: + +with pkgs; + +runCommand "nixpkgs-metrics" + { buildInputs = [ nix time ]; + requiredSystemFeatures = [ "benchmark" ]; + } + '' + export NIX_DB_DIR=$TMPDIR + export NIX_STATE_DIR=$TMPDIR + nix-store --init + + mkdir -p $out/nix-support + touch $out/nix-support/hydra-build-products + + run() { + local name="$1" + shift + + echo "running $@" + NIX_SHOW_STATS=1 time "$@" > /dev/null 2> stats + + cat stats + + x=$(sed -e 's/.*time elapsed: \([0-9\.]\+\).*/\1/ ; t ; d' stats) + [[ -n $x ]] || exit 1 + echo "$name.time $x s" >> $out/nix-support/hydra-metrics + + x=$(sed -e 's/.* \([0-9]\+\)maxresident.*/\1/ ; t ; d' stats) + [[ -n $x ]] || exit 1 + echo "$name.maxresident $x KiB" >> $out/nix-support/hydra-metrics + + x=$(sed -e 's/.*total allocations: \([0-9]\+\) bytes.*/\1/ ; t ; d' stats) + [[ -n $x ]] || exit 1 + echo "$name.allocations $x B" >> $out/nix-support/hydra-metrics + + x=$(sed -e 's/.*values allocated: \([0-9]\+\) .*/\1/ ; t ; d' stats) + [[ -n $x ]] || exit 1 + echo "$name.values $x" >> $out/nix-support/hydra-metrics + } + + run nixos.smallContainer nix-instantiate --dry-run ${nixpkgs}/nixos/release.nix -A closures.smallContainer.x86_64-linux + run nixos.kde nix-instantiate --dry-run ${nixpkgs}/nixos/release.nix -A closures.kde.x86_64-linux + run nixos.lapp nix-instantiate --dry-run ${nixpkgs}/nixos/release.nix -A closures.lapp.x86_64-linux + run nix-env.qa nix-env -f ${nixpkgs} -qa + run nix-env.qaDrv nix-env -f ${nixpkgs} -qa --drv-path --meta --xml + + export GC_INITIAL_HEAP_SIZE=128k + run nix-env.qaAggressive nix-env -f ${nixpkgs} -qa + run nix-env.qaDrvAggressive nix-env -f ${nixpkgs} -qa --drv-path --meta --xml + + lines=$(find ${nixpkgs} -name "*.nix" -type f | xargs cat | wc -l) + echo "loc $lines" >> $out/nix-support/hydra-metrics + '' diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 47d8c2814ad..fbc237b5de4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -113,7 +113,8 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/M/MD/MDOOTSON/${name}.tar.gz"; sha256 = "075m880klf66pbcfk0la2nl60vd37jljizqndrklh5y4zvzdy1nr"; }; - propagatedBuildInputs = [ pkgs.pkgconfig pkgs.gtk2 pkgs.wxGTK ModulePluggable ]; + propagatedBuildInputs = [ pkgs.pkgconfig pkgs.gtk2 pkgs.wxGTK + ModulePluggable ModuleBuild ]; }; AnyEvent = buildPerlPackage rec { @@ -166,13 +167,16 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Mouse ]; }; - ApacheLogFormatCompiler = buildPerlModule { - name = "Apache-LogFormat-Compiler-0.13"; + ApacheLogFormatCompiler = buildPerlModule rec { + name = "Apache-LogFormat-Compiler-0.33"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZEBURO/Apache-LogFormat-Compiler-0.13.tar.gz; - sha256 = "b4185125501e288efbc664da8b723ff86f0b69eb57d3c7c69c7d2069aab0efb0"; + url = "mirror://cpan/authors/id/K/KA/KAZEBURO/${name}.tar.gz"; + sha256 = "17blk3zhp05azgypn25ydxf3d7fyfgr9bxyiv7xkchhqma96vwqv"; }; - buildInputs = [ HTTPMessage TestRequires TryTiny URI ]; + buildInputs = [ HTTPMessage TestRequires TryTiny URI TestMockTime + POSIXstrftimeCompiler ]; + # We cannot change the timezone on the fly. + prePatch = "rm t/04_tz.t"; meta = { homepage = https://github.com/kazeburo/Apache-LogFormat-Compiler; description = "Compile a log format string to perl-code"; @@ -274,11 +278,11 @@ let self = _self // overrides; _self = with self; { }; AppSqitch = buildPerlModule rec { - version = "0.9993"; + version = "0.9994"; name = "App-Sqitch-${version}"; src = fetchurl { url = "mirror://cpan/authors/id/D/DW/DWHEELER/${name}.tar.gz"; - sha256 = "0pf7gvssldhify9dn3sxyi6av5gld4h27d3krdpcql3hbv886gcc"; + sha256 = "0in602z40s50fdlmws4g0a1pb8p7yn0wx8jgsacz26a4i1q7gpi4"; }; buildInputs = [ CaptureTiny PathClass TestDeep TestDir TestException @@ -408,6 +412,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; sha256 = "67f45fef6a23b7548f387b675cbf7881bf9da62d7d007cbf90d3a4b851b99eb7"; }; + buildInputs = [ ModuleBuild ]; propagatedBuildInputs = [ ScalarString DataInteger DigestCRC ]; }; @@ -426,6 +431,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; sha256 = "55db4520617d859d88c0ee54965da815b7226d792b8cdc8debf92073559e0463"; }; + buildInputs = [ ModuleBuild ]; propagatedBuildInputs = [ModuleRuntime ParamsClassify CryptPasswdMD5 CryptDES DataEntropy CryptUnixCryptXS CryptEksblowfish CryptMySQL DigestMD4 AuthenDecHpwd]; }; @@ -703,10 +709,10 @@ let self = _self // overrides; _self = with self; { }; CacheFastMmap = buildPerlPackage rec { - name = "Cache-FastMmap-1.40"; + name = "Cache-FastMmap-1.43"; src = fetchurl { url = "mirror://cpan/modules/by-module/Cache/${name}.tar.gz"; - sha256 = "0h3ckr04cdn6dvl40m4m97vl5ybf30v1lwhw3jvkr92kpksvq4hd"; + sha256 = "18k10bhi67iyy8igw8hwb339miwscgnsh9y2pbncw6gdr2b610vi"; }; }; @@ -887,14 +893,13 @@ let self = _self // overrides; _self = with self; { }; CatalystActionREST = buildPerlPackage rec { - name = "Catalyst-Action-REST-1.19"; + name = "Catalyst-Action-REST-1.20"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FR/FREW/${name}.tar.gz"; - sha256 = "0qiw6b932a73prrg8vw9brpdvjqm37c6wmbliyxvmz0kij6pi2qd"; + url = mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-Action-REST-1.20.tar.gz; + sha256 = "c0470541ec0016b837db3186ed77915813c8b856b941db89b86db8602e31ead6"; }; buildInputs = [ TestRequires ]; - propagatedBuildInputs = [ CatalystRuntime ClassInspector LWP MROCompat - ModulePluggable Moose ParamsValidate URIFind namespaceautoclean ]; + propagatedBuildInputs = [ CatalystRuntime ClassInspector JSONMaybeXS MROCompat ModulePluggable Moose ParamsValidate URIFind namespaceautoclean ]; meta = { description = "Automated REST Method Dispatching"; license = "perl"; @@ -1428,13 +1433,13 @@ let self = _self // overrides; _self = with self; { }; CGI = buildPerlPackage rec { - name = "CGI-4.27"; + name = "CGI-4.28"; src = fetchurl { url = "mirror://cpan/authors/id/L/LE/LEEJO/${name}.tar.gz"; - sha256 = "0rjif2z44lnfk4hkf95mq52nsgvlgjdigabjpx3v697lfibhx37c"; + sha256 = "1297d3ed6616cacb4eb57860e3e743f3890111e7a63ca08849930f42f1360532"; }; buildInputs = [ TestDeep TestWarn ]; - propagatedBuildInputs = [ HTMLParser self."if" ]; + propagatedBuildInputs = [ HTMLParser ]; meta = { homepage = https://metacpan.org/module/CGI; description = "Handle Common Gateway Interface requests and responses"; @@ -1500,6 +1505,8 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/N/NW/NWIGER/${name}.tgz"; sha256 = "0qx8kxj0iy55ss9kraqr8q2m4igi2ylajff7d6qvphqpfx90fjb5"; }; + + propagatedBuildInputs = [ CGI ]; }; CGIPSGI = buildPerlPackage { @@ -1521,6 +1528,7 @@ let self = _self // overrides; _self = with self; { sha256 = "1xsl2pz1jrh127pq0b01yffnj4mnp9nvkp88h5mndrscq9hn8xa6"; }; buildInputs = [ DBFile ]; + propagatedBuildInputs = [ CGI ]; }; CGISimple = buildPerlPackage rec { @@ -1731,6 +1739,11 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; sha256 = "09ifd6v0c94vr20n9yr1dxgcp7hyscqq851szdip7y24bd26nlbc"; }; + buildInputs = [ ModuleBuild ]; + meta = { + description = "Provide utility methods for factory classes"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; }; ClassInspector = buildPerlPackage { @@ -1804,6 +1817,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; sha256 = "054d0db62df90f22601f2a18fc84e9ca026d81601f5940b2fcc543e39d69b36b"; }; + buildInputs = [ ModuleBuild ]; propagatedBuildInputs = [ParamsClassify]; }; @@ -2408,6 +2422,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; sha256 = "3cc7126d5841107237a9be2dc5c7fbc167cf3c4b4ce34678a8448b850757014c"; }; + buildInputs = [ ModuleBuild ]; propagatedBuildInputs = [ClassMix]; }; @@ -2570,10 +2585,10 @@ let self = _self // overrides; _self = with self; { }; CSSDOM = buildPerlPackage rec { - name = "CSS-DOM-0.15"; + name = "CSS-DOM-0.16"; src = fetchurl { url = "mirror://cpan/authors/id/S/SP/SPROUT/${name}.tar.gz"; - sha256 = "12xb6xsd828r5pxavvamhqf3pilj9prvcnxmzs4fpjj07x1ikwy4"; + sha256 = "0s1gg6jvcxlj87sbbbcn9riw7rrh2n85hkbaim9civki8vj8vg9z"; }; buildInputs = [ Clone ]; @@ -2692,6 +2707,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; sha256 = "2611c4a1a3038594d79ea4ed14d9e15a9af8f77105f51667795fe4f8a53427e4"; }; + buildInputs = [ ModuleBuild ]; propagatedBuildInputs = [ParamsClassify DataFloat CryptRijndael HTTPLite]; }; @@ -2701,6 +2717,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; sha256 = "698ecb092a3284e260cd3c3208408feb791d7d0f06a02673f9125ab2d51cc2d8"; }; + buildInputs = [ ModuleBuild ]; }; DataGUID = buildPerlPackage { @@ -2717,6 +2734,18 @@ let self = _self // overrides; _self = with self; { }; }; + DataHexDump = buildPerlPackage { + name = "Data-HexDump-0.02"; + src = fetchurl { + url = mirror://cpan/authors/id/F/FT/FTASSIN/Data-HexDump-0.02.tar.gz; + sha256 = "1a9d843e7f667c1c6f77c67af5d77e7462ff23b41937cb17454d03535cd9be70"; + }; + meta = { + description = "Hexadecimal Dumper"; + maintainers = with stdenv.lib.maintainers; [ AndersonTorres ]; + }; + }; + DataHierarchy = buildPerlPackage { name = "Data-Hierarchy-0.34"; src = fetchurl { @@ -2746,6 +2775,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; sha256 = "1dk04jf78sv63lww1qzagxlywcc04cfd3cfvzz168d24db9cr5bz"; }; + buildInputs = [ ModuleBuild ]; }; DataOptList = buildPerlPackage { @@ -2799,6 +2829,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/N/NE/NEELY/Data-Serializer-0.60.tar.gz; sha256 = "0ca4s811l7f2bqkx7vnyxbpp4f0qska89g2pvsfb3k0bhhbk0jdk"; }; + buildInputs = [ ModuleBuild ]; meta = { description = "Modules that serialize data structures"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -2983,6 +3014,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/J/JH/JHOBLITT/DateTime-Format-DateParse-0.05.tar.gz; sha256 = "f6eca4c8be66ce9992ee150932f8fcf07809fd3d1664caf200b8a5fd3a7e5ebc"; }; + buildInputs = [ ModuleBuild ]; propagatedBuildInputs = [ DateTime DateTimeTimeZone TimeDate ]; meta = { description = "Parses Date::Parse compatible formats"; @@ -3022,7 +3054,8 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-ICal-0.09.tar.gz; sha256 = "8b09f6539f5e9c0df0e6135031699ed4ef9eef8165fc80aefeecc817ef997c33"; }; - propagatedBuildInputs = [ DateTime DateTimeEventICal DateTimeSet DateTimeTimeZone ParamsValidate ]; + buildInputs = [ ModuleBuild ]; + propagatedBuildInputs = [ DateTime DateTimeEventICal DateTimeSet DateTimeTimeZone ]; meta = { description = "Parse and format iCal datetime and duration strings"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -3185,7 +3218,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/R/RO/ROKR/DateTimeX-Easy-0.089.tar.gz; sha256 = "17e6d202e7ac6049523048e97bb8f195e3c79208570da1504f4313584e487a79"; }; - buildInputs = [ TestMost ]; + buildInputs = [ TestMost ModuleBuild ]; propagatedBuildInputs = [ DateTime DateTimeFormatFlexible DateTimeFormatICal DateTimeFormatNatural TimeDate ]; doCheck = false; meta = { @@ -3229,6 +3262,15 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ IOCaptureOutput ]; }; + DevelCheckOS = buildPerlPackage rec { + name = "Devel-CheckOS-1.76"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DC/DCANTRELL/${name}.tar.gz"; + sha256 = "f83fb4cb8de060f607214b1e88c98ac6c4e065371e646fe896f16ea887aecb0c"; + }; + propagatedBuildInputs = [ DataCompare FileFindRule ]; + }; + DevelDProf = buildPerlPackage { name = "Devel-DProf-20110802.00"; src = fetchurl { @@ -3624,14 +3666,15 @@ let self = _self // overrides; _self = with self; { }; DevelSymdump = buildPerlPackage rec { - name = "Devel-Symdump-2.11"; + name = "Devel-Symdump-2.15"; src = fetchurl { url = "mirror://cpan/authors/id/A/AN/ANDK/${name}.tar.gz"; - sha256 = "0i5m2w8rsmp5lqi1y5y6b6938pidpz9hg92xahrshaddph00358i"; + sha256 = "76c2a90d31318204ecf1977f0217ce57b142e6681fe2b99fb8789efc5dd86f41"; + }; + meta = { + description = "Dump symbol names or the symbol table"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; - propagatedBuildInputs = [ - TestPod /* cyclic dependency: TestPodCoverage */ - ]; }; Digest = buildPerlPackage { @@ -4828,6 +4871,21 @@ let self = _self // overrides; _self = with self; { }; }; + FileHandleUnget = buildPerlPackage rec { + name = "FileHandle-Unget-0.1628"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DC/DCOPPIT/${name}.tar.gz"; + sha256 = "9ef4eb765ddfdc35b350905d8dd0a1e12139eabc586652811bfab41972100fdf"; + }; + buildInputs = [ FileSlurp URI ]; + meta = { + homepage = https://github.com/coppit/filehandle-unget/; + description = "FileHandle which supports multi-byte unget"; + license = stdenv.lib.licenses.gpl2; + maintainers = with maintainers; [ romildo ]; + }; + }; + FileHomeDir = buildPerlPackage { name = "File-HomeDir-1.00"; src = fetchurl { @@ -5330,6 +5388,22 @@ let self = _self // overrides; _self = with self; { }; }; + grepmail = buildPerlPackage rec { + name = "grepmail-5.3104"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DC/DCOPPIT/${name}.tar.gz"; + sha256 = "7969e569ec54b2f569a5af56ac4d884c630ad850974658219b0b6953e97b5d3d"; + }; + buildInputs = [ FileSlurp URI ]; + propagatedBuildInputs = [ DateManip DigestMD5 MailMboxMessageParser TimeDate ]; + meta = { + homepage = https://github.com/coppit/grepmail; + description = "Search mailboxes for mail matching a regular expression"; + license = stdenv.lib.licenses.gpl2; + maintainers = with maintainers; [ romildo ]; + }; + }; + GrowlGNTP = buildPerlModule rec { name = "Growl-GNTP-0.20"; src = fetchurl { @@ -5452,12 +5526,17 @@ let self = _self // overrides; _self = with self; { }; HookLexWrap = buildPerlPackage rec { - name = "Hook-LexWrap-0.24"; + name = "Hook-LexWrap-0.25"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CH/CHORNY/${name}.tar.gz"; - sha256 = "0nyfirbdrgs2cknifqr1pf8xd5q9xnv91gy7jha4crp1hjqvihj4"; + url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + sha256 = "08ab9af6bd9b4560702d9d994ad9d905af0c2fd24090d1480ff640f137c1430d"; + }; + buildInputs = [ ModuleBuildTiny pkgs.unzip ]; + meta = { + homepage = https://github.com/chorny/Hook-LexWrap; + description = "Lexically scoped subroutine wrappers"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; - buildInputs = [ pkgs.unzip ]; }; HTMLElementExtended = buildPerlPackage { @@ -5684,6 +5763,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/W/WO/WONKO/${name}.tar.gz"; sha256 = "07ahpfgidxsw2yb7y8i7bbr8s64aq6qgq832h9jswmksxbd0l43q"; }; + propagatedBuildInputs = [ CGI ]; }; HTMLTidy = buildPerlPackage rec { @@ -5829,6 +5909,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/N/NE/NEILB/${name}.tar.gz"; sha256 = "10svyy8r5ca86spz21r0k2mdy8g2slzssin4qbg101zc9kr5r65a"; }; + buildInputs = [ ModuleBuild ]; }; HTTPMessage = buildPerlPackage { @@ -5925,26 +6006,7 @@ let self = _self // overrides; _self = with self; { }; }; - I18NLangTags = buildPerlPackage { - name = "I18N-LangTags-0.35"; - src = fetchurl { - url = mirror://cpan/authors/id/S/SB/SBURKE/I18N-LangTags-0.35.tar.gz; - sha256 = "0idwfi7k8l44d9akpdj6ygdz3q8zxr690m18s7w23ms9d55bh3jy"; - }; - }; - - "if" = buildPerlPackage rec { - name = "if-0.0606"; - src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "63d69282d6c4c9e76370b78d770ca720cea88cfe5ee5b612709240fc6078d50e"; - }; - meta = { - description = "C<use> a Perl module if a condition holds (also can C<no> a module)"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; - }; - }; + "if" = null; # For backwards compatibility. if_ = self."if"; @@ -6317,19 +6379,20 @@ let self = _self // overrides; _self = with self; { }; InlineC = buildPerlPackage rec { - name = "Inline-C-0.62"; + name = "Inline-C-0.76"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETJ/${name}.tar.gz"; - sha256 = "0clggdpj5mmi35vm2991f9jsgv2a3s8r4f1bd88xxk8akv5b8i3r"; + url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz"; + sha256 = "0dcs39zjiglif3ss8p8yl0jyqk7qvc9g1ad9wi4kq79k9lxp3s92"; }; postPatch = '' # this test will fail with chroot builds rm -f t/08taint.t + rm -f t/28autowrap.t ''; - buildInputs = [ TestWarn FileCopyRecursive ]; + buildInputs = [ TestWarn FileCopyRecursive FileShareDirInstall IOAll Pegex YAMLLibYAML ]; propagatedBuildInputs = [ Inline ]; meta = { @@ -6677,13 +6740,15 @@ let self = _self // overrides; _self = with self; { }; }; - ListMoreUtils = buildPerlPackage { - name = "List-MoreUtils-0.33"; + ListMoreUtils = buildPerlPackage rec { + name = "List-MoreUtils-0.413"; src = fetchurl { - url = mirror://cpan/authors/id/A/AD/ADAMK/List-MoreUtils-0.33.tar.gz; - sha256 = "1bcljhhsk5g0xykvgbxz10ilmj02s58ydiy3g8hbzdr29i20np1i"; + url = "mirror://cpan/authors/id/R/RE/REHSACK/${name}.tar.gz"; + sha256 = "4d6429d5672ce74a59d6490320252cb8b5b8285db8fe9c6551a4162e5375ef37"; }; + propagatedBuildInputs = [ ExporterTiny ]; meta = { + homepage = https://metacpan.org/release/List-MoreUtils; description = "Provide the stuff missing in List::Util"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -6729,7 +6794,6 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/T/TO/TODDR/Locale-Maketext-1.23.tar.gz; sha256 = "1r1sq7djafvk5abzc4l068p39dz44hlpgdldj3igvn2bjz78cli1"; }; - propagatedBuildInputs = [I18NLangTags]; }; LocaleMaketextFuzzy = buildPerlPackage { @@ -6892,11 +6956,11 @@ let self = _self // overrides; _self = with self; { }; }; - Log4Perl = buildPerlPackage rec { - name = "Log-Log4perl-1.46"; + LogLog4perl = buildPerlPackage rec { + name = "Log-Log4perl-1.47"; src = fetchurl { url = "mirror://cpan/authors/id/M/MS/MSCHILLI/${name}.tar.gz"; - sha256 = "31011a17c04e78016e73eaa4865d0481d2ffc3dc22813c61065d90ad73c64e6f"; + sha256 = "9001dded011226538b9a50c7856815bb0dba72a1e6218fdcaba56f651356b96f"; }; meta = { homepage = https://mschilli.github.io/log4perl/; @@ -6906,6 +6970,9 @@ let self = _self // overrides; _self = with self; { }; }; + # For backwards compatibility. + Log4Perl = self.LogLog4perl; + LogDispatchArray = buildPerlPackage { name = "Log-Dispatch-Array-1.003"; src = fetchurl { @@ -7066,6 +7133,22 @@ let self = _self // overrides; _self = with self; { inherit fetchurl buildPerlPackage stdenv DBDmysql; }; + MailMboxMessageParser = buildPerlPackage rec { + name = "Mail-Mbox-MessageParser-1.5105"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DC/DCOPPIT/${name}.tar.gz"; + sha256 = "641edd8b7ab74de671ab4931311413c1bd037a1c3eaa0a0c97451cd7b104f2d8"; + }; + buildInputs = [ FileSlurp TextDiff URI ]; + propagatedBuildInputs = [ FileHandleUnget ]; + meta = { + homepage = https://github.com/coppit/mail-mbox-messageparser; + description = "A fast and simple mbox folder reader"; + license = stdenv.lib.licenses.gpl2; + maintainers = with maintainers; [ romildo ]; + }; + }; + MailDKIM = buildPerlPackage rec { name = "Mail-DKIM-0.40"; src = fetchurl { @@ -7578,11 +7661,11 @@ let self = _self // overrides; _self = with self; { }; }; - ModulePluggable = buildPerlPackage { - name = "Module-Pluggable-5.1"; + ModulePluggable = buildPerlPackage rec { + name = "Module-Pluggable-5.2"; src = fetchurl { - url = mirror://cpan/authors/id/S/SI/SIMONW/Module-Pluggable-5.1.tar.gz; - sha256 = "0vwi433pk7n1ia5wy67j3545jvmjf1hb4jwcvzrz25mv8d03bp72"; + url = "mirror://cpan/authors/id/S/SI/SIMONW/${name}.tar.gz"; + sha256 = "b3f2ad45e4fd10b3fb90d912d78d8b795ab295480db56dc64e86b9fa75c5a6df"; }; patches = [ # !!! merge this patch into Perl itself (which contains Module::Pluggable as well) @@ -7622,6 +7705,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Module-Runtime-0.014.tar.gz; sha256 = "19326f094jmjs6mgpwkyisid54k67w34br8yfh0gvaaml87gwi2c"; }; + buildInputs = [ ModuleBuild ]; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Runtime module handling"; @@ -7722,17 +7806,43 @@ let self = _self // overrides; _self = with self; { description = "Embed a Perl interpreter in the Apache HTTP server"; }; }; - - Mojolicious = buildPerlPackage { - name = "Mojolicious-4.63"; + Mojolicious = buildPerlPackage rec { + name = "Mojolicious-6.56"; src = fetchurl { - url = mirror://cpan/authors/id/S/SR/SRI/Mojolicious-4.63.tar.gz; - sha256 = "f20f77e86fc560dac1c958e765ed64242dcf6343939ed605b45f2bbe2596d5e9"; + url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz"; + sha256 = "82f73553836ac378edf825fd9f24be982653be9e0d78f8ba38b7841aabdafb02"; }; + propagatedBuildInputs = [ JSONPP ]; meta = { - homepage = http://mojolicio.us; + homepage = http://mojolicious.org; description = "Real-time web framework"; - license = stdenv.lib.licenses.artistic2; + license = with stdenv.lib.licenses; [ artistic2 ]; + }; + }; + + MojoIOLoopForkCall = buildPerlModule rec { + name = "Mojo-IOLoop-ForkCall-0.17"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JB/JBERGER/${name}.tar.gz"; + sha256 = "886de5c3b44194a86228471075fac4036073bda19093e776c702aa65c3ef1824"; + }; + propagatedBuildInputs = [ IOPipely Mojolicious ]; + meta = { + description = "Run blocking functions asynchronously by forking"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + IOPipely = buildPerlPackage rec { + name = "IO-Pipely-0.005"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RC/RCAPUTO/${name}.tar.gz"; + sha256 = "e33b6cf5cb2b46ee308513f51e623987a50a89901e81bf19701dce35179f2e74"; + }; + meta = { + homepage = http://search.cpan.org/dist/IO-Pipely/; + description = "Portably create pipe() or pipe-like handles"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8004,15 +8114,16 @@ let self = _self // overrides; _self = with self; { }; }; - MooseXDaemonize = buildPerlPackage { - name = "MooseX-Daemonize-0.15"; + MooseXDaemonize = buildPerlPackage rec { + name = "MooseX-Daemonize-0.21"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MICHAELR/MooseX-Daemonize-0.15.tar.gz; - sha256 = "1h6rzdmk68q4p0nh2bzmwwvr5iaf7pvdfrpwdxmr3z5pc64wajvd"; + url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + sha256 = "111f391221d00f8b09cdcc6c806ab114324cf7f529d12f627fb97d054da42225"; }; - buildInputs = [ TestMoose ]; - propagatedBuildInputs = [ Moose MooseXGetopt MooseXTypesPathClass ]; + buildInputs = [ DevelCheckOS ModuleBuildTiny Moose TestFatal ]; + propagatedBuildInputs = [ Moose MooseXGetopt MooseXTypesPathClass namespaceautoclean ]; meta = { + homepage = https://github.com/moose/MooseX-Daemonize; description = "Role for daemonizing your Moose based application"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -8295,7 +8406,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; sha256 = "e9e8c36284cf1adc6563c980c0a4f0a7df720dbaaece0dd6be66b975dde5db7a"; }; - buildInputs = [ ModuleBuildTiny Moose TestFatal TestRequires self."if" ]; + buildInputs = [ ModuleBuildTiny Moose TestFatal TestRequires ]; propagatedBuildInputs = [ CarpClan Moose SubExporterForMethods SubName namespaceautoclean ]; meta = { homepage = https://github.com/moose/MooseX-Types; @@ -8312,7 +8423,7 @@ let self = _self // overrides; _self = with self; { sha256 = "ff0c963f5e8304acb5f64bdf9ba1f19284311148e1a8f0d1f81f123f9950f5f2"; }; buildInputs = [ ModuleBuildTiny TestDeep TestWarnings perl ]; - propagatedBuildInputs = [ MooseXTypes self."if" ]; + propagatedBuildInputs = [ MooseXTypes ]; meta = { homepage = https://github.com/moose/MooseX-Types-Common; description = "A library of commonly used type constraints"; @@ -8456,10 +8567,10 @@ let self = _self // overrides; _self = with self; { }; Mouse = buildPerlModule rec { - name = "Mouse-2.3.0"; + name = "Mouse-v2.4.5"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GF/GFUJI/${name}.tar.gz"; - sha256 = "0ycl521mmc5989934502730rzsi9xqihdpnjihrkhflqmrzmaqwq"; + url = "mirror://cpan/authors/id/S/SY/SYOHEX/${name}.tar.gz"; + sha256 = "1f4dps68f2w1fwqjfpr4kllbcbwd744v3h1r9rkpwc2fhvq3q8hl"; }; buildInputs = [ ModuleBuildXSUtil TestException TestLeakTrace TestRequires TestOutput @@ -8859,10 +8970,10 @@ let self = _self // overrides; _self = with self; { }; NetSMTPSSL = buildPerlPackage { - name = "Net-SMTP-SSL-1.01"; + name = "Net-SMTP-SSL-1.03"; src = fetchurl { - url = mirror://cpan/authors/id/C/CW/CWEST/Net-SMTP-SSL-1.01.tar.gz; - sha256 = "12b2xvrd253ngvzwf81s9han4jr94l39vs5ca70pzr3wpi39qn8k"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Net-SMTP-SSL-1.03.tar.gz; + sha256 = "05y94mb1vdw32mvwb0cp2h4ggh32f8j8nwwfjb8kjwxvfkfhyp9h"; }; propagatedBuildInputs = [IOSocketSSL]; }; @@ -9033,7 +9144,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/W/WR/WROG/${name}.tar.gz"; sha256 = "1nh9988436rmmmd6x2zz1fyrqy2005a1gvqzgvnc1pg2ylg61fqf"; }; - propagatedBuildInputs = [ NetOpenIDCommon JSON LWP ]; + propagatedBuildInputs = [ CGI NetOpenIDCommon JSON LWP ]; }; PackageConstants = buildPerlPackage { @@ -9128,7 +9239,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/modules/by-module/Params/${name}.tar.gz"; sha256 = "1d4ysd95flszrxrnjgy6s7b80jkagjsb939h42i2hix4q20sy0a1"; }; - buildInputs = [ ExtUtilsParseXS ]; + buildInputs = [ ModuleBuild ExtUtilsParseXS ]; }; ParamsUtil = buildPerlPackage { @@ -9280,6 +9391,20 @@ let self = _self // overrides; _self = with self; { }; }; + Pegex = buildPerlPackage rec { + name = "Pegex-0.60"; + src = fetchurl { + url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz"; + sha256 = "317347f8c6355e886d87aef4c30fb4cb6cfa3e46adf62f59e6141ec05a97f2cf"; + }; + buildInputs = [ FileShareDirInstall YAMLLibYAML ]; + meta = { + homepage = https://github.com/ingydotnet/pegex-pm; + description = "Acmeist PEG Parser Framework"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + Perl5lib = buildPerlPackage rec { name = "perl5lib-1.02"; src = fetchurl { @@ -9423,7 +9548,10 @@ let self = _self // overrides; _self = with self; { sha256 = "0vvppxs36729lggrx4s1gn37lzsm794wfkm3k386bwhkmk7sr31i"; }; buildInputs = [ FileShareDirInstall TestRequires ]; - propagatedBuildInputs = [ ApacheLogFormatCompiler DevelStackTrace DevelStackTraceAsHTML FileShareDir FilesysNotifySimple HTTPBody HTTPMessage HashMultiValue LWP StreamBuffered TestTCP TryTiny URI ]; + propagatedBuildInputs = [ ApacheLogFormatCompiler DevelStackTrace + DevelStackTraceAsHTML FileShareDir FilesysNotifySimple HTTPBody + HTTPMessage HashMultiValue LWP StreamBuffered TestTCP TryTiny URI + POSIXstrftimeCompiler ]; meta = { homepage = https://github.com/plack/Plack; description = "Perl Superglue for Web frameworks and Web Servers (PSGI toolkit)"; @@ -9614,13 +9742,11 @@ let self = _self // overrides; _self = with self; { }; }; - PadWalker = buildPerlPackage { - name = "PadWalker-1.98"; + PadWalker = buildPerlPackage rec { + name = "PadWalker-2.2"; src = fetchurl { - url = mirror://cpan/authors/id/R/RO/ROBIN/PadWalker-1.98.tar.gz; - sha256 = "0v2pldb5awflf10w1p9pwn8w37lkpfc2h459gd9zz6p57883ibw0"; - }; - meta = { + url = "mirror://cpan/authors/id/R/RO/ROBIN/${name}.tar.gz"; + sha256 = "fc1df2084522e29e892da393f3719d2c1be0da022fdd89cff4b814167aecfea3"; }; }; @@ -9900,6 +10026,21 @@ let self = _self // overrides; _self = with self; { }; }; + POSIXstrftimeCompiler = buildPerlModule rec { + name = "POSIX-strftime-Compiler-0.41"; + src = fetchurl { + url = "mirror://cpan/authors/id/K/KA/KAZEBURO/${name}.tar.gz"; + sha256 = "670b89e11500f3808c9e21b1c300089622f68906ff12b1cbfba8e30d3a1c3739"; + }; + # We cannot change timezones on the fly. + prePatch = "rm t/04_tzset.t"; + meta = { + homepage = https://github.com/kazeburo/POSIX-strftime-Compiler; + description = "GNU C library compatible strftime for loggers and servers"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + Readonly = buildPerlModule rec { name = "Readonly-2.01"; src = fetchurl { @@ -10113,7 +10254,7 @@ let self = _self // overrides; _self = with self; { sha256 = "832c84b4f19e97781e8902f123a659fdcfef68e0ed9cfe09055852e9d68f7afc"; }; buildInputs = [ TestException ]; - propagatedBuildInputs = [ DateTime DateTimeFormatDateParse Error ExceptionClass HTTPCookies HTTPMessage LWP ParamsValidate URI ]; + propagatedBuildInputs = [ CGI DateTime DateTimeFormatDateParse Error ExceptionClass HTTPCookies HTTPMessage LWP ParamsValidate URI ]; meta = { description = "Talk to RT installation using REST protocol"; license = "perl"; @@ -10159,6 +10300,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; sha256 = "d3a45cc137bb9f7d8848d5a10a5142d275a98f8dcfd3adb60593cee9d33fa6ae"; }; + buildInputs = [ ModuleBuild ]; }; ScopeGuard = buildPerlPackage { @@ -10403,22 +10545,20 @@ let self = _self // overrides; _self = with self; { }; SQLTranslator = buildPerlPackage rec { - name = "SQL-Translator-0.11020"; + name = "SQL-Translator-0.11021"; src = fetchurl { url = "mirror://cpan/authors/id/I/IL/ILMARI/${name}.tar.gz"; - sha256 = "18mqnppwk1076sxcink5ajk75ysway0bd049hwxvk8md39x0y7ar"; + sha256 = "64cb38a9f78367bc115359a999003bbeb3c32cc75bba8306ec1a938fc441bfd1"; }; - propagatedBuildInputs = [ - ClassBase ClassDataInheritable ClassMakeMethods DigestSHA1 CarpClan IOStringy - ParseRecDescent ClassAccessor DBI FileShareDir XMLWriter YAML TestDifferences - TemplateToolkit GraphViz XMLLibXML TestPod TextRecordParser HTMLParser - SpreadsheetParseExcel Graph GD Moo TryTiny PackageVariant - ]; + buildInputs = [ JSON TestDifferences TestException XMLWriter YAML ]; + propagatedBuildInputs = [ CarpClan DBI FileShareDir ListMoreUtils Moo PackageVariant ParseRecDescent TryTiny ]; meta = { + description = "SQL DDL transformations and more"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux; }; }; - + PackageVariant = buildPerlPackage { name = "Package-Variant-1.002002"; src = fetchurl { @@ -10846,13 +10986,13 @@ let self = _self // overrides; _self = with self; { }; SubName = buildPerlPackage rec { - name = "Sub-Name-0.14"; + name = "Sub-Name-0.15"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "9276412677b445e7e9bdf6ab3a034a05a860e5c5dc560dd9272967745eeb3f17"; + sha256 = "dabc9a4abcbe067d120ce005b4203b8a44291cbda013900152ba19a1e7c1c8c8"; }; meta = { - homepage = https://github.com/karenetheridge/Sub-Name; + homepage = https://github.com/p5sagit/Sub-Name; description = "(re)name a sub"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.rycee ]; @@ -11657,17 +11797,17 @@ let self = _self // overrides; _self = with self; { }; }; - TestMemoryCycle = buildPerlPackage { - name = "Test-Memory-Cycle-1.04"; + TestMemoryCycle = buildPerlPackage rec { + name = "Test-Memory-Cycle-1.06"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PETDANCE/Test-Memory-Cycle-1.04.tar.gz; - sha256 = "09qj48gmj25xgm0k12n1xx7chdk9gdy3sck4pabvzs0v00nmv9p5"; + url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz"; + sha256 = "9d53ddfdc964cd8454cb0da4c695b6a3ae47b45839291c34cb9d8d1cfaab3202"; }; propagatedBuildInputs = [ DevelCycle PadWalker ]; meta = { description = "Verifies code hasn't left circular references"; maintainers = with maintainers; [ ocharles ]; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.unix; }; }; @@ -11687,25 +11827,45 @@ let self = _self // overrides; _self = with self; { }; }; - TestMockModule = buildPerlPackage { - name = "Test-MockModule-0.05"; + TestMockModule = buildPerlModule { + name = "Test-MockModule-0.11"; src = fetchurl { - url = mirror://cpan/authors/id/S/SI/SIMONFLK/Test-MockModule-0.05.tar.gz; - sha256 = "01vf75higpap5mwm5fyas08b3qcmy5bfq1c3wl4h0y3nihjibib7"; + url = mirror://cpan/authors/id/G/GF/GFRANKS/Test-MockModule-0.11.tar.gz; + sha256 = "1f8l5y9dzik7a19mdbydqa0yxc4x0ilgpf9yaq6ix0bzlsilnn05"; }; + propagatedBuildInputs = [ SUPER ]; meta = { maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; }; - TestMockObject = buildPerlPackage { - name = "Test-MockObject-1.09"; + SUPER = buildPerlPackage rec { + name = "SUPER-1.20141117"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHROMATIC/Test-MockObject-1.09.tar.gz; - sha256 = "1cz385x0jrkj84nmfs6qyzwwvv8m9v8r2isagfj1zxvhdw49wdyy"; + url = "mirror://cpan/authors/id/C/CH/CHROMATIC/${name}.tar.gz"; + sha256 = "1a620e7d60aee9b13b1b26a44694c43fdb2bba1755cfff435dae83c7d42cc0b2"; + }; + propagatedBuildInputs = [ SubIdentify ]; + meta = { + description = "Control superclass method dispatch"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + + TestMockObject = buildPerlPackage rec { + name = "Test-MockObject-1.20150527"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CH/CHROMATIC/${name}.tar.gz"; + sha256 = "adf1357a9014b3a397ff7ecbf1835dec376a67a37bb2e788734a627e17dc1d98"; + }; + buildInputs = [ TestException TestWarn CGI ]; + propagatedBuildInputs = [ UNIVERSALcan UNIVERSALisa ]; + meta = { + description = "Perl extension for emulating troublesome interfaces"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; - propagatedBuildInputs = [TestException UNIVERSALisa UNIVERSALcan]; }; TestMoose = Moose; @@ -12034,7 +12194,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; sha256 = "ae2b68b1b5616704598ce07f5118efe42dc4605834453b7b2be14e26f9cc9a08"; }; - buildInputs = [ TestTester CPANMetaCheck ModuleMetadata self."if" ]; + buildInputs = [ TestTester CPANMetaCheck ModuleMetadata ]; meta = { homepage = https://github.com/karenetheridge/Test-Warnings; description = "Test for warnings and the lack of them"; @@ -12063,6 +12223,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/P/PE/PETDANCE/Test-WWW-Mechanize-1.44.tar.gz; sha256 = "062pj242vsc73bw11jqpap92ax9wzc9f2m4xhyp1wzrwkfchpl2q"; }; + buildInputs = [ CGI ]; propagatedBuildInputs = [ CarpAssertMore HTMLTree HTTPServerSimple LWP TestLongString URI WWWMechanize ]; meta = { homepage = https://github.com/petdance/test-www-mechanize; @@ -12105,7 +12266,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/L/LB/LBROCARD/Test-WWW-Mechanize-PSGI-0.35.tar.gz; sha256 = "1hih8s49zf38bisvhnhzrrj0zwyiivkrbs7nmmdqm1qqy27wv7pc"; }; - buildInputs = [ TestPod ]; + buildInputs = [ TestPod CGI ]; propagatedBuildInputs = [ Plack TestWWWMechanize TryTiny ]; meta = { description = "Test PSGI programs using WWW::Mechanize"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4ef8ba4409d..9c4a6989daa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15,8 +15,10 @@ let callPackage = pkgs.newScope self; + bootstrapped-pip = callPackage ../development/python-modules/bootstrapped-pip { }; + buildPythonPackage = makeOverridable (callPackage ../development/python-modules/generic { - bootstrapped-pip = callPackage ../development/python-modules/bootstrapped-pip { }; + inherit bootstrapped-pip; }); buildPythonApplication = args: buildPythonPackage ({namePrefix="";} // args ); @@ -40,7 +42,7 @@ let in modules // { - inherit python isPy26 isPy27 isPy33 isPy34 isPy35 isPyPy isPy3k pythonName buildPythonPackage buildPythonApplication; + inherit python bootstrapped-pip isPy26 isPy27 isPy33 isPy34 isPy35 isPyPy isPy3k pythonName buildPythonPackage buildPythonApplication; # helpers @@ -87,6 +89,8 @@ in modules // { blivet = callPackage ../development/python-modules/blivet { }; + bugseverywhere = callPackage ../applications/version-management/bugseverywhere {}; + dbus = callPackage ../development/python-modules/dbus { dbus = pkgs.dbus; }; @@ -234,7 +238,7 @@ in modules // { sha256 = "1ywimbisgb5g7xl9nrfwcm7dv3j8fsrjfp7bxb3l58zbsrzj6z2s"; }; - propagatedBuildInputs = with self; [ appdirs colorama dateutil requests2 requests_toolbelt sqlalchemy7 ]; + propagatedBuildInputs = with self; [ appdirs colorama dateutil requests2 requests_toolbelt sqlalchemy ]; makeWrapperArgs = [ "--prefix LIBFUSE_PATH : ${pkgs.fuse}/lib/libfuse.so" ]; @@ -772,13 +776,18 @@ in modules // { }; application = buildPythonPackage rec { - name = "python-application-${version}"; - version = "1.5.0"; + pname = "python-application"; + name = "${pname}-${version}"; + version = "2.0.2"; + disabled = isPy3k; + + src = pkgs.fetchdarcs { + url = "http://devel.ag-projects.com/repositories/${pname}"; + rev = "release-${version}"; + sha256 = "19dszv44py8qrq0jcjdycxpa7z2p8hi3ijq9gnqdsazbbjzf9svn"; + }; + buildInputs = with self; [ zope_interface ]; - src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/p/python-application/${name}.tar.gz"; - sha256 = "9bc00c2c639bf633e2c5e08d4bf1bb5d7edaad6ccdd473692f0362df08f8aafc"; - }; }; appnope = buildPythonPackage rec { @@ -918,20 +927,38 @@ in modules // { }); + chai = buildPythonPackage rec { + name = "chai-${version}"; + version = "1.1.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/c/chai/${name}.tar.gz"; + sha256 = "016kf3irrclpkpvcm7q0gmkfibq7jgy30a9v73pp42bq9h9a32bl"; + }; + + meta = { + description = "Mocking, stubbing and spying framework for python"; + }; + }; + arrow = buildPythonPackage rec { name = "arrow-${version}"; - version = "0.5.0"; + version = "0.7.0"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/a/arrow/${name}.tar.gz"; - sha256 = "1q3a6arjm6ysl2ff6lgdm504np7b1rbivrzspybjypq1nczcb7qy"; + sha256 = "0yx10dz3hp825fcq9w15zbp26v622npcjscb91da05zig8036lra"; }; - doCheck = false; + checkPhase = '' + nosetests + ''; + + buildInputs = with self; [ nose chai simplejson ]; propagatedBuildInputs = with self; [ dateutil ]; meta = { - description = "Twitter API library"; + description = "Python library for date manipulation"; license = "apache"; maintainers = with maintainers; [ thoughtpolice ]; }; @@ -1789,6 +1816,26 @@ in modules // { propagatedBuildInputs = with self; [ boto crcmod psutil ]; }; + cached-property = buildPythonPackage rec { + version = "1.3.0"; + name = "cached-property-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/c/cached-property/${name}.tar.gz"; + sha256 = "10dwi3s6f154ag9dvqy5jiwp31fs57lbxjcjgn4cwvi8qyqpi3j5"; + }; + + buildInputs = with self; [ freezegun ]; + + meta = { + description = "A decorator for caching properties in classes"; + homepage = https://github.com/pydanny/cached-property; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ ericsagnes ]; + }; + }; + cgroup-utils = buildPythonPackage rec { version = "0.6"; name = "cgroup-utils-${version}"; @@ -1966,6 +2013,28 @@ in modules // { }; }; + dosage = buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "dosage"; + version = "2016.03.17"; + PBR_VERSION = version; + src = pkgs.fetchFromGitHub { + owner = "webcomics"; + repo = "dosage"; + rev = "1af022895e5f86bc43da95754c4c4ed305790f5b"; + sha256 = "1bkqhlzigy656pam0znp2ddp1y5sqzyhw3c4fyy58spcafldq4j6"; + }; + buildInputs = with self; [ pytest ]; + propagatedBuildInputs = with self; [ requests2 lxml pbr ]; + # prompt_toolkit doesn't work on 3.5 on OSX. + doCheck = !isPy35; + + meta = { + description = "A comic strip downloader and archiver"; + homepage = http://dosage.rocks/; + }; + }; + dugong = buildPythonPackage rec { name = "${pname}-${version}"; pname = "dugong"; @@ -2507,7 +2576,6 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/b/bugwarrior/${name}.tar.gz"; - # md5 = "09c93f86a27ffc092e69b46889a3bf50"; # provided by pypi website. sha256 = "efe41756c152789f39006f157add9bedfa2b85d2cac15c067e635e37c70cb8f8"; }; @@ -2553,7 +2621,6 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/python-bugzilla/python-${name}.tar.gz"; - # md5 = "c95befd1fecad21f742beaa8180538c0"; # provided by pypi website. sha256 = "11361635a4f1613803a0b9b93ba9126f7fd36180653f953e2590b1536d107d46"; }; @@ -2681,7 +2748,7 @@ in modules // { }; }; - zc_recipe_egg_fun = { buildout, version, md5 }: buildPythonPackage rec { + zc_recipe_egg_fun = { buildout, version, sha256 }: buildPythonPackage rec { inherit version; name = "zc.recipe.egg-${version}"; @@ -2689,7 +2756,7 @@ in modules // { doCheck = false; src = pkgs.fetchurl { - inherit md5; + inherit sha256; url = "https://pypi.python.org/packages/source/z/zc.recipe.egg/zc.recipe.egg-${version}.tar.gz"; }; meta.broken = true; # https://bitbucket.org/pypa/setuptools/issues/462/pkg_resourcesfind_on_path-thinks-the @@ -2697,12 +2764,12 @@ in modules // { zc_recipe_egg_buildout171 = self.zc_recipe_egg_fun { buildout = self.zc_buildout171; version = "1.3.2"; - md5 = "1cb6af73f527490dde461d3614a36475"; + sha256 = "12zl16fdz85l6hgrkqwily7d2brr9w5pdfqri5n978gh36mqf526"; }; zc_recipe_egg_buildout2 = self.zc_recipe_egg_fun { buildout = self.zc_buildout2; version = "2.0.3"; - md5 = "69a8ce276029390a36008150444aa0b4"; + sha256 = "0d7xkxxhm5bwrscchjzc88559njirqxishdwl2qjx3gij3s12l5s"; }; bunch = buildPythonPackage (rec { @@ -3591,11 +3658,11 @@ in modules // { cryptography = buildPythonPackage rec { # also bump cryptography_vectors - name = "cryptography-1.1.1"; + name = "cryptography-1.2.3"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/c/cryptography/${name}.tar.gz"; - sha256 = "1q5snbnn2am85zb5jrnxwzncl4kwa11740ws8g9b4ps5ywx944i9"; + sha256 = "0kj511z4g21fhcr649pyzpl0zzkkc7hsgxxjys6z8wwfvmvirccf"; }; buildInputs = [ pkgs.openssl self.pretend self.cryptography_vectors @@ -3611,11 +3678,11 @@ in modules // { cryptography_vectors = buildPythonPackage rec { # also bump cryptography - name = "cryptography_vectors-1.1.1"; + name = "cryptography_vectors-1.2.3"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/c/cryptography-vectors/${name}.tar.gz"; - sha256 = "17gi301p3wi39dr4dhrmpfflid3k004jp9cnvdp46b7p5lm6hb3w"; + sha256 = "0shawgpax79gvjrj0a313sll9gaqys7q1hxngn6j4k24lmz7bwki"; }; }; @@ -3963,18 +4030,25 @@ in modules // { }; cffi = if isPyPy then null else buildPythonPackage rec { - name = "cffi-1.3.0"; + name = "cffi-1.5.2"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/c/cffi/${name}.tar.gz"; - sha256 = "1s9lcwmyhshrmvgcwy0vww70v23ncz7bgshhbk469kxmy2pm7alx"; + sha256 = "1p91p1n8n46y0k3q7ddgxxjnfh08rjqsjh7zbjxzfiifhycxx6ys"; }; propagatedBuildInputs = with self; [ pkgs.libffi pycparser ]; buildInputs = with self; [ pytest ]; + checkPhase = '' + py.test + ''; + meta = { maintainers = with maintainers; [ iElectric ]; + homepage = https://cffi.readthedocs.org/; + license = with licenses; [ mit ]; + description = "Foreign Function Interface for Python calling C code"; }; }; @@ -4843,11 +4917,12 @@ in modules // { }; docker = buildPythonPackage rec { - name = "docker-py-1.5.0"; + name = "docker-py-${version}"; + version = "1.7.2"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/d/docker-py/${name}.tar.gz"; - sha256 = "1l7q0179y4lmv24z4q12653141wc1b1zzgbfw46yzbs6mj7i4939"; + sha256 = "0k6hm3vmqh1d3wr9rryyif5n4rzvcffdlb1k4jvzp7g4996d3ccm"; }; propagatedBuildInputs = with self; [ six requests2 websocket_client ]; @@ -4863,11 +4938,11 @@ in modules // { }; dockerpty = buildPythonPackage rec { - name = "dockerpty-0.3.4"; + name = "dockerpty-0.4.1"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/d/dockerpty/${name}.tar.gz"; - sha256 = "a51044cc49089a2408fdf6769a63eebe0b16d91f34716ecee681984446ce467d"; + sha256 = "1kjn64wx23jmr8dcc6g7bwlmrhfmxr77gh6iphqsl39sayfxdab9"; }; propagatedBuildInputs = with self; [ six ]; @@ -5289,16 +5364,18 @@ in modules // { eventlib = buildPythonPackage rec { - name = "python-eventlib-${version}"; - version = "0.2.1"; + pname = "python-eventlib"; + name = "${pname}-${version}"; + version = "0.2.2"; # Judging from SyntaxError disabled = isPy3k; - src = pkgs.fetchurl { - url = "http://download.ag-projects.com/SipClient/${name}.tar.gz"; - sha256 = "25224794420f430946fe46932718b521a6264903fe8c0ed3563dfdb844c623e7"; - }; + src = pkgs.fetchdarcs { + url = "http://devel.ag-projects.com/repositories/${pname}"; + rev = "release-${version}"; + sha256 = "1zxhpq8i4jwsk7wmfncqfm211hqikj3hp38cfv509924bi76wak8"; + }; propagatedBuildInputs = with self; [ greenlet ]; @@ -5730,8 +5807,8 @@ in modules // { gnutls = buildPythonPackage rec { name = "python-gnutls"; src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/p/python-gnutls/python-gnutls-2.0.1.tar.gz"; - sha256 = "d8fb368c6a4dd58bc6cd5e61d4a12d119c4506fd344a371b3429b3ac2623b9ac"; + url = "https://pypi.python.org/packages/source/p/python-gnutls/python-gnutls-3.0.0.tar.gz"; + sha256 = "1yrdxcj5rzvz8iglircz6icvyggz5fmdcd010n6w3j60yp4p84kc"; }; propagatedBuildInputs = with self; [ pkgs.gnutls ]; @@ -6316,12 +6393,12 @@ in modules // { }; jupyter_console = buildPythonPackage rec { - version = "4.1.0"; + version = "4.1.1"; name = "jupyter_console-${version}"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/j/jupyter_console/${name}.tar.gz"; - sha256 = "3f9703b632e38d68713fc2ea1f546edc4db2a8f925c94b6dd91a8d0c13816ce9"; + sha256 = "1qsa9h7db8qzd4hg9l5mfl8299y4i7jkd6p3vpksk3r5ip8wym6p"; }; buildInputs = with self; [ nose ]; @@ -6724,7 +6801,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pew/${name}.tar.gz"; - md5 = "0a06ab0885b39f1ef3890893942f3225"; + sha256 = "0p188ah80l0rzbib2srahj2sswz8rcpqwbrbajyv2r5c1m5k6r4b"; }; propagatedBuildInputs = with self; [ virtualenv virtualenv-clone ]; @@ -7167,7 +7244,7 @@ in modules // { propagatedBuildInputs = with self; [ flup ldap - sqlalchemy7 + sqlalchemy ]; doCheck = true; @@ -7821,16 +7898,18 @@ in modules // { }); distutils_extra = buildPythonPackage rec { - name = "distutils-extra-2.26"; + name = "distutils-extra-${version}"; + version = "2.39"; src = pkgs.fetchurl { - url = "http://launchpad.net/python-distutils-extra/trunk/2.26/+download/python-${name}.tar.gz"; - sha256 = "11a3d16efffb00c2b50f40c48531dadaf553ed7a36c5621fde437a16ca40f7ea"; + url = "http://launchpad.net/python-distutils-extra/trunk/${version}/+download/python-${name}.tar.gz"; + sha256 = "1bv3h2p9ffbzyddhi5sccsfwrm3i6yxzn0m06fdxkj2zsvs28gvj"; }; meta = { homepage = https://launchpad.net/python-distutils-extra; description = "Enhancements to Python's distutils"; + license = licenses.gpl2; }; }; @@ -8134,7 +8213,6 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/d/django-classy-tags/${name}.tar.gz"; - md5 = "eb686aa767ad8cf88c1fa0f400a42516"; sha256 = "0wxvpmjdzk0aajk33y4himn3wqjx7k0aqlka9j8ay3yfav78bdq0"; }; @@ -8257,7 +8335,6 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/d/django-reversion/${name}.tar.gz"; - md5 = "2de5a3fe82aaf505c134570f96fcc7a8"; sha256 = "0z8fxvxgbxfnalr5br74rsw6g42nry2q656rx7rsgmicd8n42v2r"; }; @@ -8767,14 +8844,13 @@ in modules // { }; docker_compose = buildPythonPackage rec { - version = "1.5.2"; + version = "1.6.2"; name = "docker-compose-${version}"; namePrefix = ""; - disabled = isPy3k || isPyPy; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/d/docker-compose/${name}.tar.gz"; - sha256 = "79aa7e2e6ef9ab1936f8777476ffd4bb329875ec3d3664d239896d2f2a3c4f4f"; + sha256 = "10i4032d99hm5nj1p74pcad9i3gz1h5x3096byklncgssfyjqki6"; }; # lots of networking and other fails @@ -8782,8 +8858,9 @@ in modules // { buildInputs = with self; [ mock pytest nose ]; propagatedBuildInputs = with self; [ requests2 six pyyaml texttable docopt docker dockerpty websocket_client - enum34 jsonschema + enum34 jsonschema cached-property ]; + patchPhase = '' sed -i "s/'requests >= 2.6.1, < 2.8'/'requests'/" setup.py ''; @@ -9121,7 +9198,7 @@ in modules // { # py3k disabled, see https://travis-ci.org/NixOS/nixpkgs/builds/48759067 graph-tool = if isPy3k then throw "graph-tool in Nix doesn't support py3k yet" - else callPackage ../development/python-modules/graph-tool/2.x.x.nix { }; + else callPackage ../development/python-modules/graph-tool/2.x.x.nix { boost = pkgs.boost159; }; grappelli_safe = buildPythonPackage rec { version = "0.3.13"; @@ -10276,6 +10353,8 @@ in modules // { }; }; + icdiff = callPackage ../tools/text/icdiff {}; + importlib = buildPythonPackage rec { name = "importlib-1.0.2"; @@ -10283,7 +10362,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/i/importlib/importlib-1.0.2.tar.gz"; - md5 = "4aa23397da8bd7c7426864e88e4db7e1"; + sha256 = "131jvp6ahllcqblszjg6fxrzh4k50w8g60sq924b4nb8lxm9dl14"; }; }; @@ -10505,12 +10584,12 @@ in modules // { }; ipython = buildPythonPackage rec { - version = "4.0.3"; + version = "4.1.2"; name = "ipython-${version}"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/i/ipython/${name}.tar.gz"; - sha256 = "3a928f59e8ac8dd97858c28390867c87c09510f1f8bbe97e4e9c6b036eb84fc0"; + sha256 = "14hnf3m087z39ndn5irj1ficc6l197bmdj6fpvz8bwi7la99cbq5"; }; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' @@ -11203,11 +11282,11 @@ in modules // { }; llfuse = buildPythonPackage rec { - name = "llfuse-0.40"; + name = "llfuse-1.0"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/l/llfuse/${name}.tar.bz2"; - sha256 = "0mx87n6j2g63mgiimjqn0gj6jgqfdkc04xkxc56r1azjlqji32zf"; + sha256 = "1li7q04ljrvwharw4fblcbfhvk6s0l3lnv8yqb4c22lcgbkiqlps"; }; buildInputs = [ pkgs.pkgconfig pkgs.fuse pkgs.attr ]; @@ -12109,14 +12188,16 @@ in modules // { }; msrplib = buildPythonPackage rec { - name = "python-msrplib-${version}"; - version = "0.18.0"; - - src = pkgs.fetchurl { - url = "http://download.ag-projects.com/MSRP/${name}.tar.gz"; - sha256 = "0vp9g5p015g3f67rl4vz0qnn6x7hciry6nmvwf82h9h5rx11r43j"; - }; - + pname = "python-msrplib"; + name = "${pname}-${version}"; + version = "0.19"; + + src = pkgs.fetchdarcs { + url = "http://devel.ag-projects.com/repositories/${pname}"; + rev = "release-${version}"; + sha256 = "0jqvvssbwzq7bwqn3wrjfnpj8zb558mynn2visnlrcma6b57yhwd"; + }; + propagatedBuildInputs = with self; [ eventlib application gnutls ]; }; @@ -12847,7 +12928,6 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/n/nose-cover3/${name}.tar.gz"; sha256 = "1la4hhc1yszjpcchvkqk5xmzlb2g1b3fgxj9wwc58qc549whlcc1"; - md5 = "82f981eaa007b430679899256050fa0c"; }; propagatedBuildInputs = with self; [ nose ]; @@ -13127,7 +13207,7 @@ in modules // { blas = pkgs.openblasCompat_2_14; }; - numpy = self.numpy_1_10; + numpy = self.numpy_1_11; numpy_1_10 = self.buildNumpyPackage rec { version = "1.10.4"; @@ -13137,6 +13217,14 @@ in modules // { }; }; + numpy_1_11 = self.buildNumpyPackage rec { + version = "1.11.0"; + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/n/numpy/numpy-${version}.tar.gz"; + sha256 = "0gml1ng7iqk4xcrvspjd5vnfqdwfinvjfyksfawvy5h8426jdld1"; + }; + }; + numpydoc = buildPythonPackage rec { name = "numpydoc-${version}"; version = "0.5"; @@ -13395,17 +13483,20 @@ in modules // { }; openpyxl = buildPythonPackage rec { - version = "2.3.0"; + version = "2.3.3"; name = "openpyxl-${version}"; - src = pkgs.fetchhg { - url = "https://bitbucket.org/openpyxl/openpyxl"; - rev = "${version}"; - sha256 = "1iisk6rfh9h5xb411kfyzkcab6fdnsx573i0d83wfn4csk4p3p4d"; + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/o/openpyxl/${name}.tar.gz"; + sha256 = "1zigyvsq45izkhr1h5gisgi0ag5dm6kz09f01c2cgdfav1bl3mlk"; }; buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ jdcal et_xmlfile ]; + propagatedBuildInputs = with self; [ jdcal et_xmlfile lxml ]; + + # Tests are not included in archive. + # https://bitbucket.org/openpyxl/openpyxl/issues/610 + doCheck = false; meta = { description = "A Python library to read/write Excel 2007 xlsx/xlsm files"; @@ -13444,7 +13535,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/o/ordereddict/${name}.tar.gz"; - md5 = "a0ed854ee442051b249bfad0f638bbec"; + sha256 = "07qvy11nvgxpzarrni3wrww3vpc9yafgi2bch4j2vvvc42nb8d8w"; }; meta = { @@ -13454,6 +13545,31 @@ in modules // { }; }; + python-otr = buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "python-otr"; + version = "1.2.0"; + + disabled = isPy3k; + + src = pkgs.fetchFromGitHub { + owner = "AGProjects"; + repo = pname; + rev = "release-" + version; + sha256 = "0p3b1n8jlxwd65gbk2k5007fkhdyjwcvr4982s42hncivxvabzzy"; + }; + + propagatedBuildInputs = with self; [ zope_interface cryptography application gmpy2 ]; + + meta = { + description = "A pure python implementation of OTR"; + homepage = https://github.com/AGProjects/otr; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ edwtjo ]; + }; + }; + ply = buildPythonPackage (rec { name = "ply-3.8"; @@ -14785,7 +14901,9 @@ in modules // { }; }; - pandas = let + pandas = self.pandas_18; + + pandas_17 = let inherit (pkgs.stdenv.lib) optional optionalString; inherit (pkgs.stdenv) isDarwin; in buildPythonPackage rec { @@ -14800,16 +14918,14 @@ in modules // { buildInputs = with self; [ nose ] ++ optional isDarwin pkgs.libcxx; propagatedBuildInputs = with self; [ dateutil - numpy - scipy + scipy_0_17 numexpr pytz xlrd bottleneck sqlalchemy lxml - # Disabling this because an upstream dependency, pep8, is broken on v3.5. - (if isPy35 then null else html5lib) + html5lib modules.sqlite3 beautifulsoup4 ] ++ optional isDarwin pkgs.darwin.locale; # provides the locale command @@ -14845,7 +14961,7 @@ in modules // { runHook preCheck # The flag `-A 'not network'` will disable tests that use internet. # The `-e` flag disables a few problematic tests. - ${python.executable} setup.py nosetests -A 'not network' --stop \ + ${python.executable} setup.py nosetests -A 'not slow and not network' --stop \ -e '${concatStringsSep "|" testsToSkip}' --verbosity=3 runHook postCheck @@ -14860,13 +14976,93 @@ in modules // { }; }; + pandas_18 = let + inherit (pkgs.stdenv.lib) optional optionalString; + inherit (pkgs.stdenv) isDarwin; + in buildPythonPackage rec { + name = "pandas-${version}"; + version = "0.18.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pandas/${name}.tar.gz"; + sha256 = "050qw0ap5bhyv5flp78x3lcq1dlminl3xaj6kbrm0jqmx0672xf9"; + }; + + + LC_ALL = "en_US.UTF-8"; + buildInputs = with self; [ nose pkgs.glibcLocales ] ++ optional isDarwin pkgs.libcxx; + propagatedBuildInputs = with self; [ + dateutil + scipy + numexpr + pytz + xlrd + bottleneck + sqlalchemy + lxml + html5lib + modules.sqlite3 + beautifulsoup4 + openpyxl + xlwt + ] ++ optional isDarwin pkgs.darwin.locale; # provides the locale command + + # For OSX, we need to add a dependency on libcxx, which provides + # `complex.h` and other libraries that pandas depends on to build. + patchPhase = optionalString isDarwin '' + cpp_sdk="${pkgs.libcxx}/include/c++/v1"; + echo "Adding $cpp_sdk to the setup.py common_include variable" + substituteInPlace setup.py \ + --replace "['pandas/src/klib', 'pandas/src']" \ + "['pandas/src/klib', 'pandas/src', '$cpp_sdk']" + + # disable clipboard tests since pbcopy/pbpaste are not open source + substituteInPlace pandas/io/tests/test_clipboard.py \ + --replace pandas.util.clipboard no_such_module \ + --replace OSError ImportError + ''; + + # The flag `-A 'not network'` will disable tests that use internet. + # The `-e` flag disables a few problematic tests. + # https://github.com/pydata/pandas/issues/11169 + # https://github.com/pydata/pandas/issues/11287 + # The test_sql checks fail specifically on python 3.5; see here: + # https://github.com/pydata/pandas/issues/11112 + checkPhase = let + testsToSkip = []; + in '' + runHook preCheck + # The flag `-A 'not network'` will disable tests that use internet. + # The `-e` flag disables a few problematic tests. + ${python.executable} setup.py nosetests -A 'not slow and not network' \ + --verbosity=3 + + runHook postCheck + ''; + + meta = { + homepage = "http://pandas.pydata.org/"; + description = "Python Data Analysis Library"; + license = licenses.bsd3; + maintainers = with maintainers; [ raskin fridh ]; + platforms = platforms.unix; + }; + }; + xlrd = buildPythonPackage rec { name = "xlrd-${version}"; + version = "0.9.4"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/x/xlrd/xlrd-${version}.tar.gz"; sha256 = "8e8d3359f39541a6ff937f4030db54864836a06e42988c452db5b6b86d29ea72"; }; + + buildInputs = with self; [ nose ]; + checkPhase = '' + nosetests -v + ''; + }; bottleneck = buildPythonPackage rec { @@ -15380,20 +15576,40 @@ in modules // { }; }; + piep = buildPythonPackage rec { + version = "0.8.0"; + name = "piep-${version}"; + disabled = isPy3k; + + src = pkgs.fetchurl { + url = "http://pypi.python.org/packages/source/p/piep/piep-${version}.tar.gz"; + sha256 = "1wgkg1kc28jpya5k4zvbc9jmpa60b3d5c3gwxfbp15hw6smyqirj"; + }; + + propagatedBuildInputs = with self; [pygments]; + + meta = { + description = "Bringing the power of python to stream editing"; + homepage = https://github.com/timbertson/piep; + maintainers = with maintainers; [ gfxmonk ]; + license = licenses.gpl3; + }; + }; + pip = buildPythonPackage rec { - version = "8.0.2"; + version = "8.1.1"; name = "pip-${version}"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pip/pip-${version}.tar.gz"; - sha256 = "46f4bd0d8dfd51125a554568d646fe4200a3c2c6c36b9f2d06d2212148439521"; + sha256 = "160pa7xg0vybidhszd1n0ik2xah0yz6gsym5hp8k7dmfd83d6y1y"; }; # pip detects that we already have bootstrapped_pip "installed", so we need # to force it a little. installFlags = [ "--ignore-installed" ]; - buildInputs = with self; [ mock scripttest virtualenv pytest ]; + buildInputs = with self; [ mock scripttest virtualenv pretend pytest ]; }; @@ -15529,7 +15745,7 @@ in modules // { src = pkgs.fetchurl { url = https://pypi.python.org/packages/source/p/python3-pika/python3-pika-0.9.14.tar.gz; - md5 = "f3a3ee58afe0ae06f1fa553710e1aa28"; + sha256 = "1c3hifwvn04kvlja88iawf0awyz726jynwnpcb6gn7376b4nfch7"; }; buildInputs = with self; [ nose mock pyyaml ]; @@ -17009,7 +17225,7 @@ in modules // { downloadPage = https://github.com/progrium/pyjwt/releases; license = licenses.mit; maintainers = with maintainers; [ prikhi ]; - platforms = platforms.linux; + platforms = platforms.unix; }; }; @@ -19261,7 +19477,7 @@ in modules // { url = "https://pypi.python.org/packages/source/s/scipy/scipy-${version}.tar.gz"; sha256 = "f600b755fb69437d0f70361f9e560ab4d304b1b66987ed5a28bdd9dd7793e089"; }; - numpy = self.numpy_1_10; + numpy = self.numpy; }; scikitimage = buildPythonPackage rec { @@ -20110,15 +20326,15 @@ in modules // { sipsimple = buildPythonPackage rec { name = "sipsimple-${version}"; - version = "2.6.0"; + version = "3.0.0"; disabled = isPy3k; src = pkgs.fetchurl { url = "http://download.ag-projects.com/SipClient/python-${name}.tar.gz"; - sha256 = "0xcyasas28q1ad1hgw4vd62b72mf1sng7xwfcls6dc05k9p3q8v3"; + sha256 = "1q35kgz151rr99240jq55rs39y741m8shh9yihl3x95rkjxchji4"; }; - propagatedBuildInputs = with self; [ cython pkgs.openssl dns dateutil xcaplib msrplib lxml ]; + propagatedBuildInputs = with self; [ cython pkgs.openssl dns dateutil xcaplib msrplib lxml python-otr ]; buildInputs = with pkgs; [ alsaLib ffmpeg libv4l pkgconfig sqlite libvpx ]; }; @@ -20362,21 +20578,22 @@ in modules // { sphinxcontrib_plantuml = buildPythonPackage (rec { - name = "sphinxcontrib-plantuml-0.5"; + name = "sphinxcontrib-plantuml-0.7"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/s/sphinxcontrib-plantuml/${name}.tar.gz"; - sha256 = "654a1c206156634398ffdc87c481c67777610a9311c6677d280963cf28813400"; + sha256 = "011yprqf41dcm1824zgk2w8vi9115286pmli6apwhlrsxc6b6cwv"; }; + # No tests included. + doCheck = false; + propagatedBuildInputs = with self; [sphinx plantuml]; meta = { description = "Provides a Sphinx domain for embedding UML diagram with PlantUML"; - homepage = http://bitbucket.org/birkenfeld/sphinx-contrib; - - license = "BSD"; + license = with licenses; [ bsd2 ]; }; }); @@ -20523,10 +20740,11 @@ in modules // { version = "0.8.2"; disabled = isPy33; - src = pkgs.fetchgit { - url = https://github.com/crosspop/sqlalchemy-imageattach.git; - rev = "refs/tags/${version}"; - md5 = "cffdcde30952176e35fccf385f579dda"; + src = pkgs.fetchFromGitHub { + repo = "sqlalchemy-imageattach"; + owner = "crosspop"; + rev = "${version}"; + sha256 = "1pqf7vk4lsvnhw169cqfyk0iz5f8n45470mdslklpi38z2fax9p0"; }; buildInputs = with self; [ pytest webob pkgs.imagemagick nose ]; @@ -21554,7 +21772,6 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/T/Twiggy/Twiggy-0.4.5.tar.gz"; - # md5 = "b0dfbbb7f56342e448af4d22a47a339c"; # provided by pypi website. sha256 = "4e8f1894e5aee522db6cb245ccbfde3c5d1aa08d31330c7e3af783b0e66eec23"; }; @@ -22390,12 +22607,15 @@ in modules // { }; xcaplib = buildPythonPackage rec { - name = "python-xcaplib-${version}"; - version = "1.1.0"; + pname = "python-xcaplib"; + name = "${pname}-${version}"; + version = "1.2.0"; + disabled = isPy3k; - src = pkgs.fetchurl { - url = "http://download.ag-projects.com/XCAP/${name}.tar.gz"; - sha256 = "2f8ea6fe7d005104ef1d854aa87bd8ee85ca242a70cde42f409f8e5557f864b3"; + src = pkgs.fetchdarcs { + url = "http://devel.ag-projects.com/repositories/${pname}"; + rev = "release-${version}"; + sha256 = "0vna5r4ihv7z1yx6r93954jqskcxky77znzy1m9dg9vna1dgwfdn"; }; propagatedBuildInputs = with self; [ eventlib application ]; @@ -22459,11 +22679,11 @@ in modules // { xarray = buildPythonPackage rec { name = "xarray-${version}"; - version = "0.7.0"; + version = "0.7.1"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/x/xarray/${name}.tar.gz"; - sha256 = "b1562e8e2c61f1c3587d557ff48d2bc7be36574d6a8e86f11186c356bdd794cf"; + sha256 = "1swcpq8x0p5pp94r9j4hr2anz1rqh7fnqax16xn9xsgrikdjipj5"; }; buildInputs = with self; [ pytest ]; @@ -22481,6 +22701,27 @@ in modules // { }; }; + xlwt = buildPythonPackage rec { + name = "xlwt-${version}"; + version = "1.0.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/x/xlwt/${name}.tar.gz"; + sha256 = "1y8w5imsicp01gn749qhw6j0grh9y19zz57ribwaknn8xqwjjhxc"; + }; + + buildInputs = with self; [ nose ]; + checkPhase = '' + nosetests -v + ''; + + meta = { + description = "Library to create spreadsheet files compatible with MS"; + homepage = https://github.com/python-excel/xlwt; + license = with licenses; [ bsdOriginal bsd3 lgpl21 ]; + }; + }; + youtube-dl = callPackage ../tools/misc/youtube-dl { # Release versions don't need pandoc because the formatted man page # is included in the tarball. @@ -24089,13 +24330,13 @@ in modules // { }; libvirt = let - version = "1.3.0"; + version = "1.3.2"; in assert version == pkgs.libvirt.version; pkgs.stdenv.mkDerivation rec { name = "libvirt-python-${version}"; src = pkgs.fetchurl { url = "http://libvirt.org/sources/python/${name}.tar.gz"; - sha256 = "0z7w79mkx7w322d2mf9d4bz56mmfic3nx0q4bc6fa063aay42z89"; + sha256 = "1y0b2sglc6q43pw1sr0by5wx8037kvrp2969p69k6mq1g2gawdbd"; }; buildInputs = with self; [ python pkgs.pkgconfig pkgs.libvirt lxml ]; @@ -24108,25 +24349,29 @@ in modules // { homepage = http://www.libvirt.org/; description = "libvirt Python bindings"; license = licenses.lgpl2; + maintainers = [ maintainers.fpletz ]; }; }; searx = buildPythonPackage rec { - name = "searx-0.7.0"; + name = "searx-0.8.1"; src = pkgs.fetchurl { - url = "https://github.com/asciimoo/searx/archive/v0.7.0.tar.gz"; - sha256 = "0vq2zjdr1c8mr3zkycqq3732zf4pybbbrs3kzplqgf851k9zfpbw"; + url = "https://github.com/asciimoo/searx/archive/v0.8.1.tar.gz"; + sha256 = "0z0s9n8iblrw7y5xrh2apzsazkgm4vzmxn0ckw4yfiya9am8zk32"; }; - propagatedBuildInputs = with self; [ pyyaml lxml grequests flaskbabel flask requests - gevent speaklater Babel pytz dateutil pygments ]; + propagatedBuildInputs = with self; [ + pyyaml lxml grequests flaskbabel flask requests2 + gevent speaklater Babel pytz dateutil pygments + pyasn1 pyasn1-modules ndg-httpsclient certifi + ]; meta = { homepage = https://github.com/asciimoo/searx; description = "A privacy-respecting, hackable metasearch engine"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ matejc ]; + maintainers = with maintainers; [ matejc fpletz ]; }; }; @@ -24211,13 +24456,16 @@ in modules // { }; power = buildPythonPackage rec { - name = "power-1.2"; + name = "power-1.4"; src = pkgs.fetchurl { - url = "http://pypi.python.org/packages/source/p/power/${name}.tar.gz"; - sha256 = "09a00af8357f63dbb1a1eb13b82e39ccc0a14d6d2e44e5b235afe60ce8ee8195"; + url = "https://pypi.python.org/packages/source/p/power/${name}.tar.gz"; + sha256 = "7d7d60ec332acbe3a7d00379b45e39abf650bf7ee311d61da5ab921f52f060f0"; }; + # Tests can't work because there is no power information available. + doCheck = false; + meta = { description = "Cross-platform system power status information"; homepage = https://github.com/Kentzo/Power; @@ -24774,7 +25022,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/${baseName}/${name}.tar.gz"; - md5 = "5cc79077f386a17b539f1e51c05a3650"; + sha256 = "0lc1x0pai85avm1r452xnvxc12wijnhz87xv20yp3is9fs6rnkrh"; }; buildInputs = with self; [ pkgs.coreutils ]; @@ -26018,4 +26266,62 @@ in modules // { }; }; + termstyle = buildPythonPackage rec { + name = "python-termstyle-${version}"; + version = "0.1.10"; + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/python-termstyle/${name}.tar.gz"; + sha256 = "1qllzkx1alf14zcfapppf8w87si4cpa7lgjmdp3f5idzdyqnnapl"; + }; + + meta = { + description = "console colouring for python"; + homepage = "https://pypi.python.org/pypi/python-termstyle/0.1.10"; + license = licenses.bsdOriginal; + }; + + }; + + green = buildPythonPackage rec { + name = "green-${version}"; + version = "2.3.0"; + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/g/green/${name}.tar.gz"; + sha256 = "1888khfl9yxb8yfxq9b48dxwplqlxx8s0l530z5j7c6bx74v08b4"; + }; + + propagatedBuildInputs = with self; [ termstyle colorama ]; + buildInputs = with self; [ mock ]; + + meta = { + description = "python test runner"; + homepage = "https://github.com/CleanCut/green"; + licence = licenses.mit; + }; + }; + + topydo = buildPythonPackage rec { + name = "topydo-${version}"; + version = "0.9"; + disabled = (!isPy3k); + + src = pkgs.fetchFromGitHub { + owner = "bram85"; + repo = "topydo"; + rev = version; + sha256 = "0vmfr2cxn3r5zc0c4q3a94xy1r0cv177b9zrm9hkkjcmhgq42s3h"; + }; + + propagatedBuildInputs = with self; [ arrow icalendar ]; + buildInputs = with self; [ mock freezegun coverage pkgs.glibcLocales ]; + + LC_ALL="en_US.UTF-8"; + }; + + meta = { + description = "A cli todo application compatible with the todo.txt format"; + homepage = "https://github.com/bram85/topydo"; + license = license.gpl3; + }; + } diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 8d86149e4f9..5aa1fd87881 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -25,6 +25,8 @@ let jobs = { tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease; }; + metrics = import ./metrics.nix { inherit pkgs nixpkgs; }; + manual = import ../../doc; lib-tests = import ../../lib/tests/release.nix { inherit nixpkgs; }; @@ -33,6 +35,7 @@ let meta.description = "Release-critical builds for the Nixpkgs unstable channel"; constituents = [ jobs.tarball + jobs.metrics jobs.manual jobs.lib-tests jobs.stdenv.x86_64-linux @@ -117,7 +120,6 @@ let gajim = linux; gawk = all; gcc = linux; - gcc44 = linux; gcj = linux; ghostscript = linux; ghostscriptX = linux; diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index 3acd9c4843d..2b3b98dba63 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,15 +7,15 @@ { runCommand, fetchFromGitHub, git }: let - version = "2016-03-10"; - rev = "5e78a14c1b82522e019586687f7dbfd36ce67fa5"; + version = "2016-03-22"; + rev = "f28cdedb698cf76f513fb4514b5ed2892ec89b2f"; src = fetchFromGitHub { inherit rev; owner = "rust-lang"; repo = "crates.io-index"; - sha256 = "0hzhfhlv8qbqb5nm9id36dlzvhalhlrh2k82ks67ap4mdcs3c650"; + sha256 = "05j43pgdlf554y9r781xdc5la55anwiq6k7vml9icak699ywfxqq"; }; in diff --git a/pkgs/top-level/stdenv.nix b/pkgs/top-level/stdenv.nix new file mode 100644 index 00000000000..aeb36b8edc3 --- /dev/null +++ b/pkgs/top-level/stdenv.nix @@ -0,0 +1,31 @@ +{ system, bootStdenv, crossSystem, config, platform, lib, ... }: +self: super: + +with super; + +rec { + allStdenvs = import ../stdenv { + inherit system platform config lib; + allPackages = args: import ./../.. ({ inherit config system; } // args); + }; + + defaultStdenv = allStdenvs.stdenv // { inherit platform; }; + + stdenv = + if bootStdenv != null then (bootStdenv // {inherit platform;}) else + if crossSystem != null then + stdenvCross + else + let + changer = config.replaceStdenv or null; + in if changer != null then + changer { + # We import again all-packages to avoid recursivities. + pkgs = import ./../.. { + # We remove packageOverrides to avoid recursivities + config = removeAttrs config [ "replaceStdenv" ]; + }; + } + else + defaultStdenv; +} |